diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 616d74272..ccf3419a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Tools required
 
-- Python 3.8.x to 3.11.x (3.10.x is highly recommended and 3.12 or greater is proscribed).
+- 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.
diff --git a/README.md b/README.md
index d87fd9aa0..66a87b7ba 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ If you need something that is not already part of Bazarr, feel free to create a
 ## Supported subtitles providers:
 
 - Addic7ed
+- AnimeKalesi
 - Animetosho (requires AniDb HTTP API client described [here](https://wiki.anidb.net/HTTP_API_Definition))
 - Assrt
 - AvistaZ, CinemaZ (Get session cookies using method described [here](https://github.com/morpheus65535/bazarr/pull/2375#issuecomment-2057010996))
@@ -87,6 +88,7 @@ If you need something that is not already part of Bazarr, feel free to create a
 - Titlovi
 - Titrari.ro
 - Titulky.com
+- Turkcealtyazi.org
 - TuSubtitulo
 - TVSubtitles
 - Whisper (requires [ahmetoner/whisper-asr-webservice](https://github.com/ahmetoner/whisper-asr-webservice))
diff --git a/bazarr.py b/bazarr.py
index 2a1adea1d..0e4a34748 100644
--- a/bazarr.py
+++ b/bazarr.py
@@ -107,6 +107,22 @@ def check_status():
             child_process = start_bazarr()
 
 
+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()
+
+    print("Unsupported OS")
+    return False
+
 def interrupt_handler(signum, frame):
     # catch and ignore keyboard interrupt Ctrl-C
     # the child process Server object will catch SIGINT and perform an orderly shutdown
@@ -116,7 +132,9 @@ def interrupt_handler(signum, frame):
         interrupted = True
         print('Handling keyboard interrupt...')
     else:
-        print("Stop doing that! I heard you the first time!")
+        if not is_process_running(child_process):
+            # this will be caught by the main loop below
+            raise SystemExit(EXIT_INTERRUPT)
 
 
 if __name__ == '__main__':
diff --git a/bazarr/api/movies/movies.py b/bazarr/api/movies/movies.py
index 022769d9d..def6c0540 100644
--- a/bazarr/api/movies/movies.py
+++ b/bazarr/api/movies/movies.py
@@ -3,6 +3,7 @@
 from flask_restx import Resource, Namespace, reqparse, fields, marshal
 
 from app.database import TableMovies, database, update, select, func
+from radarr.sync.movies import update_one_movie
 from subtitles.indexer.movies import list_missing_subtitles_movies, movies_scan_subtitles
 from app.event_handler import event_stream
 from subtitles.wanted import wanted_search_missing_subtitles_movies
@@ -158,7 +159,7 @@ class Movies(Resource):
     patch_request_parser = reqparse.RequestParser()
     patch_request_parser.add_argument('radarrid', type=int, required=False, help='Radarr movie ID')
     patch_request_parser.add_argument('action', type=str, required=False, help='Action to perform from ["scan-disk", '
-                                                                               '"search-missing", "search-wanted"]')
+                                                                               '"search-missing", "search-wanted", "sync"]')
 
     @authenticate
     @api_ns_movies.doc(parser=patch_request_parser)
@@ -184,5 +185,8 @@ class Movies(Resource):
         elif action == "search-wanted":
             wanted_search_missing_subtitles_movies()
             return '', 204
+        elif action == "sync":
+            update_one_movie(radarrid, 'updated', True)
+            return '', 204
 
         return 'Unknown action', 400
diff --git a/bazarr/api/series/series.py b/bazarr/api/series/series.py
index a16db2322..c21624d06 100644
--- a/bazarr/api/series/series.py
+++ b/bazarr/api/series/series.py
@@ -6,6 +6,7 @@ from flask_restx import Resource, Namespace, reqparse, fields, marshal
 from functools import reduce
 
 from app.database import get_exclusion_clause, TableEpisodes, TableShows, database, select, update, func
+from sonarr.sync.series import update_one_series
 from subtitles.indexer.series import list_missing_subtitles, series_scan_subtitles
 from subtitles.mass_download import series_download_subtitles
 from subtitles.wanted import wanted_search_missing_subtitles_series
@@ -198,7 +199,7 @@ class Series(Resource):
     patch_request_parser = reqparse.RequestParser()
     patch_request_parser.add_argument('seriesid', type=int, required=False, help='Sonarr series ID')
     patch_request_parser.add_argument('action', type=str, required=False, help='Action to perform from ["scan-disk", '
-                                                                               '"search-missing", "search-wanted"]')
+                                                                               '"search-missing", "search-wanted", "sync"]')
 
     @authenticate
     @api_ns_series.doc(parser=patch_request_parser)
@@ -224,5 +225,8 @@ class Series(Resource):
         elif action == "search-wanted":
             wanted_search_missing_subtitles_series()
             return '', 204
+        elif action == "sync":
+            update_one_series(seriesid, 'updated')
+            return '', 204
 
         return 'Unknown action', 400
diff --git a/bazarr/api/system/__init__.py b/bazarr/api/system/__init__.py
index a491135a8..12e7c2fa3 100644
--- a/bazarr/api/system/__init__.py
+++ b/bazarr/api/system/__init__.py
@@ -9,6 +9,7 @@ from .tasks import api_ns_system_tasks
 from .logs import api_ns_system_logs
 from .status import api_ns_system_status
 from .health import api_ns_system_health
+from .ping import api_ns_system_ping
 from .releases import api_ns_system_releases
 from .settings import api_ns_system_settings
 from .languages import api_ns_system_languages
@@ -25,6 +26,7 @@ api_ns_list_system = [
     api_ns_system_languages_profiles,
     api_ns_system_logs,
     api_ns_system_notifications,
+    api_ns_system_ping,
     api_ns_system_releases,
     api_ns_system_searches,
     api_ns_system_settings,
diff --git a/bazarr/api/system/backups.py b/bazarr/api/system/backups.py
index bbb499800..ad80f5967 100644
--- a/bazarr/api/system/backups.py
+++ b/bazarr/api/system/backups.py
@@ -44,6 +44,7 @@ class SystemBackups(Resource):
     @api_ns_system_backups.response(204, 'Success')
     @api_ns_system_backups.response(400, 'Filename not provided')
     @api_ns_system_backups.response(401, 'Not Authenticated')
+    @api_ns_system_backups.response(500, 'Error while restoring backup. Check logs.')
     def patch(self):
         """Restore a backup file"""
         args = self.patch_request_parser.parse_args()
@@ -52,7 +53,10 @@ class SystemBackups(Resource):
             restored = prepare_restore(filename)
             if restored:
                 return '', 204
-        return 'Filename not provided', 400
+            else:
+                return 'Error while restoring backup. Check logs.', 500
+        else:
+            return 'Filename not provided', 400
 
     delete_request_parser = reqparse.RequestParser()
     delete_request_parser.add_argument('filename', type=str, required=True, help='Backups to delete filename')
diff --git a/bazarr/api/system/logs.py b/bazarr/api/system/logs.py
index 23daa98b4..8a0848ee8 100644
--- a/bazarr/api/system/logs.py
+++ b/bazarr/api/system/logs.py
@@ -23,6 +23,20 @@ class SystemLogs(Resource):
         'exception': fields.String(),
     })
 
+    def handle_record(self, logs, multi_line_record):
+        # finalize the multi line record
+        if logs:
+            # update the exception of the last entry 
+            last_log = logs[-1]
+            last_log["exception"] += "\n".join(multi_line_record)
+        else:
+            # multiline record is first entry in log
+            last_log = dict()
+            last_log["type"] = "ERROR"
+            last_log["message"] = "See exception"
+            last_log["exception"] = "\n".join(multi_line_record)
+            logs.append(last_log)
+
     @authenticate
     @api_ns_system_logs.doc(parser=None)
     @api_ns_system_logs.response(200, 'Success')
@@ -54,9 +68,13 @@ class SystemLogs(Resource):
             include = include.casefold()
             exclude = exclude.casefold()
 
+        # regular expression to identify the start of a log record (timestamp-based)
+        record_start_pattern = re.compile(r"^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}")
+
         with io.open(get_log_file_path(), encoding='UTF-8') as file:
             raw_lines = file.read()
             lines = raw_lines.split('|\n')
+            multi_line_record = []
             for line in lines:
                 if line == '':
                     continue
@@ -86,18 +104,31 @@ class SystemLogs(Resource):
                         skip = exclude in compare_line
                     if skip:
                         continue
-                raw_message = line.split('|')
-                raw_message_len = len(raw_message)
-                if raw_message_len > 3:
-                    log = dict()
-                    log["timestamp"] = raw_message[0]
-                    log["type"] = raw_message[1].rstrip()
-                    log["message"] = raw_message[3]
-                    if raw_message_len > 4 and raw_message[4] != '\n':
-                        log['exception'] = raw_message[4].strip('\'').replace('  ', '\u2003\u2003')
-                    else:
-                        log['exception'] = None
-                logs.append(log)
+                # check if the line has a timestamp that matches the start of a new log record
+                if record_start_pattern.match(line):
+                    if multi_line_record:
+                        self.handle_record(logs, multi_line_record)
+                        # reset for the next multi-line record
+                        multi_line_record = []
+                    raw_message = line.split('|')
+                    raw_message_len = len(raw_message)
+                    if raw_message_len > 3:
+                        log = dict()
+                        log["timestamp"] = raw_message[0]
+                        log["type"] = raw_message[1].rstrip()
+                        log["message"] = raw_message[3]
+                        if raw_message_len > 4 and raw_message[4] != '\n':
+                            log['exception'] = raw_message[4].strip('\'').replace('  ', '\u2003\u2003')
+                        else:
+                            log['exception'] = None
+                        logs.append(log)
+                else:
+                    # accumulate lines that do not have new record header timestamps
+                    multi_line_record.append(line.strip())
+
+            if multi_line_record:
+                # finalize the multi line record and update the exception of the last entry 
+                self.handle_record(logs, multi_line_record)
 
             logs.reverse()
         return marshal(logs, self.get_response_model, envelope='data')
diff --git a/bazarr/api/system/ping.py b/bazarr/api/system/ping.py
new file mode 100644
index 000000000..df85cac42
--- /dev/null
+++ b/bazarr/api/system/ping.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+
+from flask_restx import Resource, Namespace
+
+api_ns_system_ping = Namespace('System Ping', description='Unauthenticated endpoint to check Bazarr availability')
+
+
+@api_ns_system_ping.route('system/ping')
+class SystemPing(Resource):
+    @api_ns_system_ping.response(200, "Success")
+    def get(self):
+        """Return status and http 200"""
+        return {'status': 'OK'}, 200
diff --git a/bazarr/api/system/status.py b/bazarr/api/system/status.py
index cbc54949d..8c213a68b 100644
--- a/bazarr/api/system/status.py
+++ b/bazarr/api/system/status.py
@@ -22,6 +22,8 @@ api_ns_system_status = Namespace('System Status', description='List environment
 @api_ns_system_status.route('system/status')
 class SystemStatus(Resource):
     @authenticate
+    @api_ns_system_status.response(200, "Success")
+    @api_ns_system_status.response(401, 'Not Authenticated')
     def get(self):
         """Return environment information and versions"""
         package_version = ''
diff --git a/bazarr/api/utils.py b/bazarr/api/utils.py
index 75d3bd9bd..13be1f96f 100644
--- a/bazarr/api/utils.py
+++ b/bazarr/api/utils.py
@@ -73,8 +73,8 @@ def postprocess(item):
             if len(language) > 1:
                 item['subtitles'][i].update(
                     {
-                        "forced": language[1] == 'forced',
-                        "hi": language[1] == 'hi',
+                        "forced": language[1].lower() == 'forced',
+                        "hi": language[1].lower() == 'hi',
                     }
                 )
         if settings.general.embedded_subs_show_desired and item.get('profileId'):
diff --git a/bazarr/app/announcements.py b/bazarr/app/announcements.py
index 71a9c9906..d9446a3dc 100644
--- a/bazarr/app/announcements.py
+++ b/bazarr/app/announcements.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 
 import os
+import sys
 import hashlib
 import requests
 import logging
@@ -12,10 +13,16 @@ from operator import itemgetter
 
 from app.get_providers import get_enabled_providers
 from app.database import TableAnnouncements, database, insert, select
-from .get_args import args
+
+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.check_update import deprecated_python_version
+
+
+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 < 9)
 
 
 # Announcements as receive by browser must be in the form of a list of dicts converted to JSON
@@ -79,10 +86,10 @@ def get_local_announcements():
 
     # opensubtitles.org end-of-life
     enabled_providers = get_enabled_providers()
-    if enabled_providers and 'opensubtitles' in enabled_providers:
+    if enabled_providers and 'opensubtitles' in enabled_providers and not settings.opensubtitles.vip:
         announcements.append({
-            'text': 'Opensubtitles.org will be deprecated soon, migrate to Opensubtitles.com ASAP and disable this '
-                    'provider to remove this announcement.',
+            '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': False,
             'timestamp': 1676236978,
@@ -106,13 +113,14 @@ def get_local_announcements():
             'timestamp': 1679606309,
         })
 
-    # deprecated Python versions
-    if deprecated_python_version():
+    # upcoming deprecated Python versions
+    if upcoming_deprecated_python_version():
         announcements.append({
-            'text': 'Starting with Bazarr 1.4, support for Python 3.7 will get dropped. Upgrade your current version of'
+            'text': 'Starting with Bazarr 1.6, support for Python 3.8 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': 1691162383,
+            'timestamp': 1744469706,
         })
 
     for announcement in announcements:
diff --git a/bazarr/app/config.py b/bazarr/app/config.py
index 585b73729..0c6ba9b6e 100644
--- a/bazarr/app/config.py
+++ b/bazarr/app/config.py
@@ -95,6 +95,7 @@ validators = [
     Validator('general.use_postprocessing_threshold_movie', must_exist=True, default=False, is_type_of=bool),
     Validator('general.use_sonarr', must_exist=True, default=False, is_type_of=bool),
     Validator('general.use_radarr', must_exist=True, default=False, is_type_of=bool),
+    Validator('general.use_plex', must_exist=True, default=False, is_type_of=bool),
     Validator('general.path_mappings_movie', must_exist=True, default=[], is_type_of=list),
     Validator('general.serie_tag_enabled', must_exist=True, default=False, is_type_of=bool),
     Validator('general.movie_tag_enabled', must_exist=True, default=False, is_type_of=bool),
@@ -128,14 +129,15 @@ validators = [
     Validator('general.subfolder_custom', must_exist=True, default='', is_type_of=str),
     Validator('general.upgrade_subs', must_exist=True, default=True, is_type_of=bool),
     Validator('general.upgrade_frequency', must_exist=True, default=12, is_type_of=int,
-              is_in=[6, 12, 24, ONE_HUNDRED_YEARS_IN_HOURS]),
+              is_in=[6, 12, 24, 168, ONE_HUNDRED_YEARS_IN_HOURS]),
     Validator('general.days_to_upgrade_subs', must_exist=True, default=7, is_type_of=int, gte=0, lte=30),
     Validator('general.upgrade_manual', must_exist=True, default=True, is_type_of=bool),
     Validator('general.anti_captcha_provider', must_exist=True, default=None, is_type_of=(NoneType, str),
               is_in=[None, 'anti-captcha', 'death-by-captcha']),
-    Validator('general.wanted_search_frequency', must_exist=True, default=6, is_type_of=int, is_in=[6, 12, 24, ONE_HUNDRED_YEARS_IN_HOURS]),
+    Validator('general.wanted_search_frequency', must_exist=True, default=6, is_type_of=int, 
+              is_in=[6, 12, 24, 168, ONE_HUNDRED_YEARS_IN_HOURS]),
     Validator('general.wanted_search_frequency_movie', must_exist=True, default=6, is_type_of=int,
-              is_in=[6, 12, 24, ONE_HUNDRED_YEARS_IN_HOURS]),
+              is_in=[6, 12, 24, 168, ONE_HUNDRED_YEARS_IN_HOURS]),
     Validator('general.subzero_mods', must_exist=True, default='', is_type_of=str),
     Validator('general.dont_notify_manual_actions', must_exist=True, default=False, is_type_of=bool),
     Validator('general.hi_extension', must_exist=True, default='hi', is_type_of=str, is_in=['hi', 'cc', 'sdh']),
@@ -215,9 +217,21 @@ validators = [
     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),
 
+    # plex section
+    Validator('plex.ip', must_exist=True, default='127.0.0.1', is_type_of=str),
+    Validator('plex.port', must_exist=True, default=32400, is_type_of=int, gte=1, lte=65535),
+    Validator('plex.ssl', must_exist=True, default=False, is_type_of=bool),
+    Validator('plex.apikey', must_exist=True, default='', is_type_of=str),
+    Validator('plex.movie_library', must_exist=True, default='', is_type_of=str),
+    Validator('plex.series_library', must_exist=True, default='', is_type_of=str),
+    Validator('plex.set_movie_added', must_exist=True, default=False, is_type_of=bool),
+    Validator('plex.set_episode_added', must_exist=True, default=False, is_type_of=bool),
+    Validator('plex.update_movie_library', must_exist=True, default=False, is_type_of=bool),
+    Validator('plex.update_series_library', must_exist=True, default=False, is_type_of=bool),
+
     # proxy section
     Validator('proxy.type', must_exist=True, default=None, is_type_of=(NoneType, str),
-              is_in=[None, 'socks5', 'http']),
+              is_in=[None, 'socks5', 'socks5h', 'http']),
     Validator('proxy.url', must_exist=True, default='', is_type_of=str),
     Validator('proxy.port', must_exist=True, default='', is_type_of=(str, int)),
     Validator('proxy.username', must_exist=True, default='', is_type_of=str, cast=str),
@@ -351,6 +365,10 @@ validators = [
     # subdl section
     Validator('subdl.api_key', must_exist=True, default='', is_type_of=str, cast=str),
 
+    # turkcealtyaziorg section
+    Validator('turkcealtyaziorg.cookies', must_exist=True, default='', is_type_of=str),
+    Validator('turkcealtyaziorg.user_agent', must_exist=True, default='', is_type_of=str),
+
     # subsync section
     Validator('subsync.use_subsync', must_exist=True, default=False, is_type_of=bool),
     Validator('subsync.use_subsync_threshold', must_exist=True, default=False, is_type_of=bool),
diff --git a/bazarr/app/get_args.py b/bazarr/app/get_args.py
index 5e52a2da8..52fdb0df4 100644
--- a/bazarr/app/get_args.py
+++ b/bazarr/app/get_args.py
@@ -3,7 +3,22 @@
 import os
 import argparse
 
-from distutils.util import strtobool
+
+def strtobool(val):
+    """Convert a string representation of truth to true (1) or false (0).
+
+    True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
+    are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
+    'val' is anything else.
+    """
+    val = val.lower()
+    if val in ('y', 'yes', 't', 'true', 'on', '1'):
+        return 1
+    elif val in ('n', 'no', 'f', 'false', 'off', '0'):
+        return 0
+    else:
+        raise ValueError(f"invalid truth value {val!r}")
+
 
 no_update = os.environ.get("NO_UPDATE", "false").strip() == "true"
 no_cli = os.environ.get("NO_CLI", "false").strip() == "true"
diff --git a/bazarr/app/get_providers.py b/bazarr/app/get_providers.py
index a4316a9d5..f6d0b9876 100644
--- a/bazarr/app/get_providers.py
+++ b/bazarr/app/get_providers.py
@@ -15,7 +15,7 @@ import re
 from requests import ConnectionError
 from subzero.language import Language
 from subliminal_patch.exceptions import TooManyRequests, APIThrottled, ParseResponseError, IPAddressBlocked, \
-    MustGetBlacklisted, SearchLimitReached
+    MustGetBlacklisted, SearchLimitReached, ProviderError
 from subliminal.providers.opensubtitles import DownloadLimitReached, PaymentRequired, Unauthorized
 from subliminal.exceptions import DownloadLimitExceeded, ServiceUnavailable, AuthenticationError, ConfigurationError
 from subliminal import region as subliminal_cache_region
@@ -123,6 +123,11 @@ def provider_throttle_map():
         "whisperai": {
             ConnectionError: (datetime.timedelta(hours=24), "24 hours"),
         },
+        "regielive": {
+            APIThrottled: (datetime.timedelta(hours=1), "1 hour"),
+            TooManyRequests: (datetime.timedelta(minutes=5), "5 minutes"),
+            ProviderError: (datetime.timedelta(minutes=10), "10 minutes"),
+        },
     }
 
 
@@ -341,6 +346,10 @@ def get_providers_auth():
         },
         "subdl": {
             'api_key': settings.subdl.api_key,
+        },
+        'turkcealtyaziorg': {
+            'cookies': settings.turkcealtyaziorg.cookies,
+            'user_agent': settings.turkcealtyaziorg.user_agent,
         }
     }
 
diff --git a/bazarr/app/logger.py b/bazarr/app/logger.py
index 8598912c9..6e63ae922 100644
--- a/bazarr/app/logger.py
+++ b/bazarr/app/logger.py
@@ -142,6 +142,7 @@ def configure_logging(debug=False):
         logging.getLogger("ffsubsync.subtitle_parser").setLevel(logging.DEBUG)
         logging.getLogger("ffsubsync.speech_transformers").setLevel(logging.DEBUG)
         logging.getLogger("ffsubsync.ffsubsync").setLevel(logging.DEBUG)
+        logging.getLogger("ffsubsync.aligners").setLevel(logging.DEBUG)
         logging.getLogger("srt").setLevel(logging.DEBUG)
         logging.debug('Bazarr version: %s', os.environ["BAZARR_VERSION"])
         logging.debug('Bazarr branch: %s', settings.general.branch)
@@ -159,6 +160,7 @@ def configure_logging(debug=False):
         logging.getLogger("ffsubsync.subtitle_parser").setLevel(logging.ERROR)
         logging.getLogger("ffsubsync.speech_transformers").setLevel(logging.ERROR)
         logging.getLogger("ffsubsync.ffsubsync").setLevel(logging.ERROR)
+        logging.getLogger("ffsubsync.aligners").setLevel(logging.ERROR)
         logging.getLogger("srt").setLevel(logging.ERROR)
         logging.getLogger("SignalRCoreClient").setLevel(logging.CRITICAL)
         logging.getLogger("websocket").setLevel(logging.CRITICAL)
diff --git a/bazarr/app/scheduler.py b/bazarr/app/scheduler.py
index 39cbe88b3..d2f577034 100644
--- a/bazarr/app/scheduler.py
+++ b/bazarr/app/scheduler.py
@@ -6,7 +6,6 @@ import pretty
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
 from apscheduler.triggers.cron import CronTrigger
-from apscheduler.triggers.date import DateTrigger
 from apscheduler.events import EVENT_JOB_SUBMITTED, EVENT_JOB_EXECUTED, EVENT_JOB_ERROR
 from datetime import datetime, timedelta
 from calendar import day_name
@@ -65,11 +64,17 @@ class Scheduler:
     def __init__(self):
         self.__running_tasks = []
 
+        # delete empty TZ environment variable to prevent UserWarning
+        if os.environ.get("TZ") == "":
+            del os.environ["TZ"]
+
         try:
             self.timezone = get_localzone()
-        except zoneinfo.ZoneInfoNotFoundError as e:
-            logging.error(f"BAZARR cannot use specified timezone: {e}")
+        except zoneinfo.ZoneInfoNotFoundError:
+            logging.error("BAZARR cannot use the specified timezone and will use UTC instead.")
             self.timezone = tz.gettz("UTC")
+        else:
+            logging.info(f"Scheduler will use this timezone: {self.timezone}")
 
         self.aps_scheduler = BackgroundScheduler({'apscheduler.timezone': self.timezone})
 
@@ -109,7 +114,7 @@ class Scheduler:
 
     def add_job(self, job, name=None, max_instances=1, coalesce=True, args=None, kwargs=None):
         self.aps_scheduler.add_job(
-            job, DateTrigger(run_date=datetime.now()), name=name, id=name, max_instances=max_instances,
+            job, 'date', run_date=datetime.now(), name=name, id=name, max_instances=max_instances,
             coalesce=coalesce, args=args, kwargs=kwargs)
 
     def execute_job_now(self, taskid):
@@ -199,34 +204,34 @@ class Scheduler:
     def __sonarr_update_task(self):
         if settings.general.use_sonarr:
             self.aps_scheduler.add_job(
-                update_series, IntervalTrigger(minutes=int(settings.sonarr.series_sync)), max_instances=1,
+                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)
 
     def __radarr_update_task(self):
         if settings.general.use_radarr:
             self.aps_scheduler.add_job(
-                update_movies, IntervalTrigger(minutes=int(settings.radarr.movies_sync)), max_instances=1,
+                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)
 
     def __cache_cleanup_task(self):
-        self.aps_scheduler.add_job(cache_maintenance, IntervalTrigger(hours=24), max_instances=1, coalesce=True,
+        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')
 
     def __check_health_task(self):
-        self.aps_scheduler.add_job(check_health, IntervalTrigger(hours=6), max_instances=1, coalesce=True,
+        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')
 
     def __automatic_backup(self):
         backup = settings.backup.frequency
         if backup == "Daily":
-            trigger = CronTrigger(hour=settings.backup.hour)
+            trigger = {'hour': settings.backup.hour}
         elif backup == "Weekly":
-            trigger = CronTrigger(day_of_week=settings.backup.day, hour=settings.backup.hour)
-        elif backup == "Manually":
-            trigger = CronTrigger(year=in_a_century())
-        self.aps_scheduler.add_job(backup_to_zip, trigger,
+            trigger = {'day_of_week': settings.backup.day, 'hour': settings.backup.hour}
+        else:
+            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)
 
@@ -235,39 +240,39 @@ class Scheduler:
             full_update = settings.sonarr.full_update
             if full_update == "Daily":
                 self.aps_scheduler.add_job(
-                    update_all_episodes, CronTrigger(hour=settings.sonarr.full_update_hour), max_instances=1,
+                    update_all_episodes, 'cron', hour=settings.sonarr.full_update_hour, max_instances=1,
                     coalesce=True, misfire_grace_time=15, id='update_all_episodes',
                     name='Index All Episode Subtitles from Disk', replace_existing=True)
             elif full_update == "Weekly":
                 self.aps_scheduler.add_job(
-                    update_all_episodes,
-                    CronTrigger(day_of_week=settings.sonarr.full_update_day, hour=settings.sonarr.full_update_hour),
-                    max_instances=1, coalesce=True, misfire_grace_time=15, id='update_all_episodes',
-                    name='Index All Episode Subtitles from Disk', replace_existing=True)
+                    update_all_episodes, '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='update_all_episodes', name='Index All Episode Subtitles from Disk', replace_existing=True)
             elif full_update == "Manually":
                 self.aps_scheduler.add_job(
-                    update_all_episodes, CronTrigger(year=in_a_century()), max_instances=1, coalesce=True,
-                    misfire_grace_time=15, id='update_all_episodes',
-                    name='Index All Episode Subtitles from Disk', replace_existing=True)
+                    update_all_episodes, 'cron', year=in_a_century(), max_instances=1, coalesce=True,
+                    misfire_grace_time=15, id='update_all_episodes', name='Index All Episode Subtitles from Disk',
+                    replace_existing=True)
 
     def __radarr_full_update_task(self):
         if settings.general.use_radarr:
             full_update = settings.radarr.full_update
             if full_update == "Daily":
                 self.aps_scheduler.add_job(
-                    update_all_movies, CronTrigger(hour=settings.radarr.full_update_hour), max_instances=1,
+                    update_all_movies, 'cron', hour=settings.radarr.full_update_hour, max_instances=1,
                     coalesce=True, misfire_grace_time=15,
                     id='update_all_movies', name='Index All Movie Subtitles from Disk', replace_existing=True)
             elif full_update == "Weekly":
                 self.aps_scheduler.add_job(
                     update_all_movies,
-                    CronTrigger(day_of_week=settings.radarr.full_update_day, hour=settings.radarr.full_update_hour),
+                    '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='update_all_movies',
                     name='Index All Movie Subtitles from Disk', replace_existing=True)
             elif full_update == "Manually":
                 self.aps_scheduler.add_job(
-                    update_all_movies, CronTrigger(year=in_a_century()), max_instances=1, coalesce=True, misfire_grace_time=15,
-                    id='update_all_movies', name='Index All Movie Subtitles from Disk', replace_existing=True)
+                    update_all_movies, 'cron', year=in_a_century(), max_instances=1, coalesce=True,
+                    misfire_grace_time=15, id='update_all_movies', name='Index All Movie Subtitles from Disk',
+                    replace_existing=True)
 
     def __update_bazarr_task(self):
         if not args.no_update and os.environ["BAZARR_VERSION"] != '':
@@ -275,43 +280,42 @@ class Scheduler:
 
             if settings.general.auto_update:
                 self.aps_scheduler.add_job(
-                    check_if_new_update, IntervalTrigger(hours=6), max_instances=1, coalesce=True,
+                    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)
             else:
                 self.aps_scheduler.add_job(
-                    check_if_new_update, CronTrigger(year=in_a_century()), hour=4, id='update_bazarr', name=task_name,
+                    check_if_new_update, 'cron', year=in_a_century(), hour=4, id='update_bazarr', name=task_name,
                     replace_existing=True)
                 self.aps_scheduler.add_job(
-                    check_releases, IntervalTrigger(hours=3), max_instances=1, coalesce=True, misfire_grace_time=15,
+                    check_releases, 'interval', hours=3, max_instances=1, coalesce=True, misfire_grace_time=15,
                     id='update_release', name='Update Release Info', replace_existing=True)
 
         else:
             self.aps_scheduler.add_job(
-                check_releases, IntervalTrigger(hours=3), max_instances=1, coalesce=True, misfire_grace_time=15,
+                check_releases, 'interval', hours=3, max_instances=1, coalesce=True, misfire_grace_time=15,
                 id='update_release', name='Update Release Info', replace_existing=True)
 
         self.aps_scheduler.add_job(
-            get_announcements_to_file, IntervalTrigger(hours=6), max_instances=1, coalesce=True, misfire_grace_time=15,
+            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)
 
     def __search_wanted_subtitles_task(self):
         if settings.general.use_sonarr:
             self.aps_scheduler.add_job(
-                wanted_search_missing_subtitles_series,
-                IntervalTrigger(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')
+                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')
         if settings.general.use_radarr:
             self.aps_scheduler.add_job(
-                wanted_search_missing_subtitles_movies,
-                IntervalTrigger(hours=int(settings.general.wanted_search_frequency_movie)), max_instances=1,
-                coalesce=True, misfire_grace_time=15, id='wanted_search_missing_subtitles_movies',
+                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)
 
     def __upgrade_subtitles_task(self):
         if settings.general.use_sonarr or settings.general.use_radarr:
             self.aps_scheduler.add_job(
-                upgrade_subtitles, IntervalTrigger(hours=int(settings.general.upgrade_frequency)), max_instances=1,
+                upgrade_subtitles, 'interval', hours=int(settings.general.upgrade_frequency), max_instances=1,
                 coalesce=True, misfire_grace_time=15, id='upgrade_subtitles',
                 name='Upgrade Previously Downloaded Subtitles', replace_existing=True)
 
diff --git a/bazarr/app/server.py b/bazarr/app/server.py
index 11cadbe1c..62e9309d4 100644
--- a/bazarr/app/server.py
+++ b/bazarr/app/server.py
@@ -64,7 +64,7 @@ class Server:
                     logging.exception("BAZARR cannot bind to default TCP port (6767) because it's already in use, "
                                       "exiting...")
                     self.shutdown(EXIT_PORT_ALREADY_IN_USE_ERROR)
-            elif error.errno == errno.ENOLINK:
+            elif error.errno in [errno.ENOLINK, errno.EAFNOSUPPORT]:
                 logging.exception("BAZARR cannot bind to IPv6 (*), trying with 0.0.0.0")
                 self.address = '0.0.0.0'
                 self.connected = False
@@ -93,8 +93,9 @@ class Server:
     def close_all(self):
         print("Closing database...")
         close_database()
-        print("Closing webserver...")
-        self.server.close()
+        if self.server:
+            print("Closing webserver...")
+            self.server.close()
 
     def shutdown(self, status=EXIT_NORMAL):
         self.close_all()
diff --git a/bazarr/init.py b/bazarr/init.py
index 6dded426c..21577197e 100644
--- a/bazarr/init.py
+++ b/bazarr/init.py
@@ -27,9 +27,6 @@ from utilities.central import make_bazarr_dir, restart_bazarr, stop_bazarr
 global startTime
 startTime = time.time()
 
-# restore backup if required
-restore_from_backup()
-
 # set subliminal_patch user agent
 os.environ["SZ_USER_AGENT"] = f"Bazarr/{os.environ['BAZARR_VERSION']}"
 
@@ -63,6 +60,9 @@ from ga4mp import GtagMP  # noqa E402
 configure_logging(settings.general.debug or args.debug)
 import logging  # noqa E402
 
+# restore backup if required
+restore_from_backup()
+
 
 def is_virtualenv():
     # return True if Bazarr have been start from within a virtualenv or venv
diff --git a/bazarr/plex/__init__.py b/bazarr/plex/__init__.py
new file mode 100644
index 000000000..9bad5790a
--- /dev/null
+++ b/bazarr/plex/__init__.py
@@ -0,0 +1 @@
+# coding=utf-8
diff --git a/bazarr/plex/operations.py b/bazarr/plex/operations.py
new file mode 100644
index 000000000..6600aa2a8
--- /dev/null
+++ b/bazarr/plex/operations.py
@@ -0,0 +1,81 @@
+# coding=utf-8
+from datetime import datetime
+from app.config import settings
+from plexapi.server import PlexServer
+import logging
+
+logger = logging.getLogger(__name__)
+
+# Constants
+DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+
+
+def get_plex_server() -> PlexServer:
+    """Connect to the Plex server and return the server instance."""
+    try:
+        protocol = "https://" if settings.plex.ssl else "http://"
+        baseurl = f"{protocol}{settings.plex.ip}:{settings.plex.port}"
+        return PlexServer(baseurl, settings.plex.apikey)
+    except Exception as e:
+        logger.error(f"Failed to connect to Plex server: {e}")
+        raise
+
+
+def update_added_date(video, added_date: str) -> None:
+    """Update the added date of a video in Plex."""
+    try:
+        updates = {"addedAt.value": added_date}
+        video.edit(**updates)
+        logger.info(f"Updated added date for {video.title} to {added_date}")
+    except Exception as e:
+        logger.error(f"Failed to update added date for {video.title}: {e}")
+        raise
+
+
+def plex_set_movie_added_date_now(movie_metadata) -> None:
+    """
+    Update the added date of a movie in Plex to the current datetime.
+
+    :param movie_metadata: Metadata object containing the movie's IMDb ID.
+    """
+    try:
+        plex = get_plex_server()
+        library = plex.library.section(settings.plex.movie_library)
+        video = library.getGuid(guid=movie_metadata.imdbId)
+        current_date = datetime.now().strftime(DATETIME_FORMAT)
+        update_added_date(video, current_date)
+    except Exception as e:
+        logger.error(f"Error in plex_set_movie_added_date_now: {e}")
+
+
+def plex_set_episode_added_date_now(episode_metadata) -> None:
+    """
+    Update the added date of a TV episode in Plex to the current datetime.
+
+    :param episode_metadata: Metadata object containing the episode's IMDb ID, season, and episode number.
+    """
+    try:
+        plex = get_plex_server()
+        library = plex.library.section(settings.plex.series_library)
+        show = library.getGuid(episode_metadata.imdbId)
+        episode = show.episode(season=episode_metadata.season, episode=episode_metadata.episode)
+        current_date = datetime.now().strftime(DATETIME_FORMAT)
+        update_added_date(episode, current_date)
+    except Exception as e:
+        logger.error(f"Error in plex_set_episode_added_date_now: {e}")
+
+
+def plex_update_library(is_movie_library: bool) -> None:
+    """
+    Trigger a library update for the specified library type.
+
+    :param is_movie_library: True for movie library, False for series library.
+    """
+    try:
+        plex = get_plex_server()
+        library_name = settings.plex.movie_library if is_movie_library else settings.plex.series_library
+        library = plex.library.section(library_name)
+        library.update()
+        logger.info(f"Triggered update for library: {library_name}")
+    except Exception as e:
+        logger.error(f"Error in plex_update_library: {e}")
\ No newline at end of file
diff --git a/bazarr/radarr/sync/movies.py b/bazarr/radarr/sync/movies.py
index 72d18f511..82ac03a26 100644
--- a/bazarr/radarr/sync/movies.py
+++ b/bazarr/radarr/sync/movies.py
@@ -333,16 +333,17 @@ def update_one_movie(movie_id, action, defer_search=False):
             logging.debug(
                 f'BAZARR inserted this movie into the database:{path_mappings.path_replace_movie(movie["path"])}')
 
-    # Storing existing subtitles
-    logging.debug(f'BAZARR storing subtitles for this movie: {path_mappings.path_replace_movie(movie["path"])}')
-    store_subtitles_movie(movie['path'], path_mappings.path_replace_movie(movie['path']))
-
     # Downloading missing subtitles
     if defer_search:
         logging.debug(
             f'BAZARR searching for missing subtitles is deferred until scheduled task execution for this movie: '
             f'{path_mappings.path_replace_movie(movie["path"])}')
     else:
-        logging.debug(
-            f'BAZARR downloading missing subtitles for this movie: {path_mappings.path_replace_movie(movie["path"])}')
-        movies_download_subtitles(movie_id)
+        mapped_movie_path = path_mappings.path_replace_movie(movie["path"])
+        if os.path.exists(mapped_movie_path):
+            logging.debug(f'BAZARR downloading missing subtitles for this movie: {mapped_movie_path}')
+            movies_download_subtitles(movie_id)
+        else:
+            logging.debug(f'BAZARR cannot find this file yet (Radarr may be slow to import movie between disks?). '
+                          f'Searching for missing subtitles is deferred until scheduled task execution for this movie: '
+                          f'{mapped_movie_path}')
diff --git a/bazarr/radarr/sync/parser.py b/bazarr/radarr/sync/parser.py
index cc186df2f..0de277f5b 100644
--- a/bazarr/radarr/sync/parser.py
+++ b/bazarr/radarr/sync/parser.py
@@ -124,7 +124,7 @@ def movieParser(movie, action, tags_dict, language_profiles, movie_default_profi
 
         parsed_movie = {'radarrId': int(movie["id"]),
                         'title': movie["title"],
-                        'path': os.path.join(movie["path"], movie['movieFile']['relativePath']),
+                        'path': movie['movieFile']['path'],
                         'tmdbId': str(movie["tmdbId"]),
                         'poster': poster,
                         'fanart': fanart,
diff --git a/bazarr/radarr/sync/utils.py b/bazarr/radarr/sync/utils.py
index 0c5838fbd..d0d13c253 100644
--- a/bazarr/radarr/sync/utils.py
+++ b/bazarr/radarr/sync/utils.py
@@ -16,7 +16,8 @@ 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, headers=HEADERS)
+        profiles_json = requests.get(url_radarr_api_movies, timeout=int(settings.radarr.http_timeout), verify=False,
+                                     headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get profiles from Radarr. Connection Error.")
     except requests.exceptions.Timeout:
@@ -27,14 +28,14 @@ def get_profile_list():
         # Parsing data returned from radarr
         if get_radarr_info.is_legacy():
             for profile in profiles_json.json():
-                profiles_list.append([profile['id'], profile['language'].capitalize()])
+                if 'language' in profile:
+                    profiles_list.append([profile['id'], profile['language'].capitalize()])
         else:
             for profile in profiles_json.json():
-                profiles_list.append([profile['id'], profile['language']['name'].capitalize()])
+                if 'language' in profile and 'name' in profile['language']:
+                    profiles_list.append([profile['id'], profile['language']['name'].capitalize()])
 
-        return profiles_list
-
-    return None
+    return profiles_list
 
 
 def get_tags():
diff --git a/bazarr/sonarr/sync/episodes.py b/bazarr/sonarr/sync/episodes.py
index e2623ce71..4ad152288 100644
--- a/bazarr/sonarr/sync/episodes.py
+++ b/bazarr/sonarr/sync/episodes.py
@@ -258,16 +258,17 @@ def sync_one_episode(episode_id, defer_search=False):
             logging.debug(
                 f'BAZARR inserted this episode into the database:{path_mappings.path_replace(episode["path"])}')
 
-    # Storing existing subtitles
-    logging.debug(f'BAZARR storing subtitles for this episode: {path_mappings.path_replace(episode["path"])}')
-    store_subtitles(episode['path'], path_mappings.path_replace(episode['path']))
-
     # Downloading missing subtitles
     if defer_search:
         logging.debug(
             f'BAZARR searching for missing subtitles is deferred until scheduled task execution for this episode: '
             f'{path_mappings.path_replace(episode["path"])}')
     else:
-        logging.debug(
-            f'BAZARR downloading missing subtitles for this episode: {path_mappings.path_replace(episode["path"])}')
-        episode_download_subtitles(episode_id)
+        mapped_episode_path = path_mappings.path_replace(episode["path"])
+        if os.path.exists(mapped_episode_path):
+            logging.debug(f'BAZARR downloading missing subtitles for this episode: {mapped_episode_path}')
+            episode_download_subtitles(episode_id, send_progress=True)
+        else:
+            logging.debug(f'BAZARR cannot find this file yet (Sonarr may be slow to import episode between disks?). '
+                          f'Searching for missing subtitles is deferred until scheduled task execution for this episode'
+                          f': {mapped_episode_path}')
diff --git a/bazarr/sonarr/sync/utils.py b/bazarr/sonarr/sync/utils.py
index 34b087451..fe5edb76a 100644
--- a/bazarr/sonarr/sync/utils.py
+++ b/bazarr/sonarr/sync/utils.py
@@ -33,14 +33,16 @@ def get_profile_list():
     except requests.exceptions.RequestException:
         logging.exception("BAZARR Error trying to get profiles from Sonarr.")
         return None
-
-    # Parsing data returned from Sonarr
-    if get_sonarr_info.is_legacy():
-        for profile in profiles_json.json():
-            profiles_list.append([profile['id'], profile['language'].capitalize()])
     else:
-        for profile in profiles_json.json():
-            profiles_list.append([profile['id'], profile['name'].capitalize()])
+        # Parsing data returned from Sonarr
+        if get_sonarr_info.is_legacy():
+            for profile in profiles_json.json():
+                if 'language' in profile:
+                    profiles_list.append([profile['id'], profile['language'].capitalize()])
+        else:
+            for profile in profiles_json.json():
+                if 'name' in profile:
+                    profiles_list.append([profile['id'], profile['name'].capitalize()])
 
     return profiles_list
 
diff --git a/bazarr/subtitles/indexer/series.py b/bazarr/subtitles/indexer/series.py
index 1d1d98ef8..9c86378ae 100644
--- a/bazarr/subtitles/indexer/series.py
+++ b/bazarr/subtitles/indexer/series.py
@@ -132,7 +132,7 @@ def store_subtitles(original_path, reversed_path, use_cache=True):
             .values(subtitles=str(actual_subtitles))
             .where(TableEpisodes.path == original_path))
         matching_episodes = database.execute(
-            select(TableEpisodes.sonarrEpisodeId, TableEpisodes.sonarrSeriesId)
+            select(TableEpisodes.sonarrEpisodeId)
             .where(TableEpisodes.path == original_path))\
             .all()
 
diff --git a/bazarr/subtitles/indexer/utils.py b/bazarr/subtitles/indexer/utils.py
index 4e7c339a6..aa375ca68 100644
--- a/bazarr/subtitles/indexer/utils.py
+++ b/bazarr/subtitles/indexer/utils.py
@@ -11,6 +11,7 @@ from charset_normalizer import detect
 from constants import MAXIMUM_SUBTITLE_SIZE
 from app.config import settings
 from utilities.path_mappings import path_mappings
+from languages.custom_lang import CustomLanguage
 
 
 def get_external_subtitles_path(file, subtitle):
@@ -54,8 +55,7 @@ def guess_external_subtitles(dest_folder, subtitles, media_type, previously_inde
                     break
             if x_found_lang:
                 if not language:
-                    x_hi = ':hi' in x_found_lang
-                    subtitles[subtitle] = Language.rebuild(Language.fromietf(x_found_lang), hi=x_hi)
+                    subtitles[subtitle] = _get_lang_from_str(x_found_lang)
                 continue
 
         if not language:
@@ -141,3 +141,23 @@ def guess_external_subtitles(dest_folder, subtitles, media_type, previously_inde
                                                None):
                         subtitles[subtitle] = Language.rebuild(subtitles[subtitle], forced=False, hi=True)
     return subtitles
+
+
+def _get_lang_from_str(x_found_lang):
+    x_found_lang_split = x_found_lang.split(':')[0]
+    x_hi = ':hi' in x_found_lang.lower()
+    x_forced = ':forced' in x_found_lang.lower()
+
+    if len(x_found_lang_split) == 2:
+        x_custom_lang_attr = "alpha2"
+    elif len(x_found_lang_split) == 3:
+        x_custom_lang_attr = "alpha3"
+    else:
+        x_custom_lang_attr = "language"
+
+    x_custom_lang = CustomLanguage.from_value(x_found_lang_split, attr=x_custom_lang_attr)
+
+    if x_custom_lang is not None:
+        return Language.rebuild(x_custom_lang.subzero_language(), hi=x_hi, forced=x_forced)
+    else:
+        return Language.rebuild(Language.fromietf(x_found_lang), hi=x_hi, forced=x_forced)
diff --git a/bazarr/subtitles/processing.py b/bazarr/subtitles/processing.py
index c008e72fa..0c37c22fb 100644
--- a/bazarr/subtitles/processing.py
+++ b/bazarr/subtitles/processing.py
@@ -7,10 +7,11 @@ from app.config import settings, sync_checker as _defaul_sync_checker
 from utilities.path_mappings import path_mappings
 from utilities.post_processing import pp_replace, set_chmod
 from languages.get_languages import alpha2_from_alpha3, alpha2_from_language, alpha3_from_language, language_from_alpha3
-from app.database import TableEpisodes, TableMovies, database, select
+from app.database import TableShows, TableEpisodes, TableMovies, database, select
 from utilities.analytics import event_tracker
 from radarr.notify import notify_radarr
 from sonarr.notify import notify_sonarr
+from plex.operations import plex_set_movie_added_date_now, plex_update_library, plex_set_episode_added_date_now
 from app.event_handler import event_stream
 
 from .utils import _get_download_code3
@@ -76,8 +77,10 @@ def process_subtitle(subtitle, media_type, audio_language, path, max_score, is_u
 
     if media_type == 'series':
         episode_metadata = database.execute(
-            select(TableEpisodes.sonarrSeriesId, TableEpisodes.sonarrEpisodeId)
-            .where(TableEpisodes.path == path_mappings.path_replace_reverse(path)))\
+            select(TableShows.imdbId, TableEpisodes.sonarrSeriesId, TableEpisodes.sonarrEpisodeId,
+                   TableEpisodes.season, TableEpisodes.episode)
+                .join(TableShows)\
+                .where(TableEpisodes.path == path_mappings.path_replace_reverse(path)))\
             .first()
         if not episode_metadata:
             return
@@ -95,8 +98,8 @@ def process_subtitle(subtitle, media_type, audio_language, path, max_score, is_u
                            sonarr_episode_id=episode_metadata.sonarrEpisodeId)
     else:
         movie_metadata = database.execute(
-            select(TableMovies.radarrId)
-            .where(TableMovies.path == path_mappings.path_replace_reverse_movie(path)))\
+            select(TableMovies.radarrId, TableMovies.imdbId)
+                .where(TableMovies.path == path_mappings.path_replace_reverse_movie(path)))\
             .first()
         if not movie_metadata:
             return
@@ -115,7 +118,8 @@ def process_subtitle(subtitle, media_type, audio_language, path, max_score, is_u
     if use_postprocessing is True:
         command = pp_replace(postprocessing_cmd, path, downloaded_path, downloaded_language, downloaded_language_code2,
                              downloaded_language_code3, audio_language, audio_language_code2, audio_language_code3,
-                             percent_score, subtitle_id, downloaded_provider, uploader, release_info, series_id, episode_id)
+                             percent_score, subtitle_id, downloaded_provider, uploader, release_info, series_id,
+                             episode_id)
 
         if media_type == 'series':
             use_pp_threshold = settings.general.use_postprocessing_threshold
@@ -139,12 +143,22 @@ def process_subtitle(subtitle, media_type, audio_language, path, max_score, is_u
         event_stream(type='series', action='update', payload=episode_metadata.sonarrSeriesId)
         event_stream(type='episode-wanted', action='delete',
                      payload=episode_metadata.sonarrEpisodeId)
+        if settings.general.use_plex is True:
+            if settings.plex.update_series_library is True:
+                plex_update_library(is_movie_library=False)
+            if settings.plex.set_episode_added is True:
+                plex_set_episode_added_date_now(episode_metadata)
 
     else:
         reversed_path = path_mappings.path_replace_reverse_movie(path)
         reversed_subtitles_path = path_mappings.path_replace_reverse_movie(downloaded_path)
         notify_radarr(movie_metadata.radarrId)
         event_stream(type='movie-wanted', action='delete', payload=movie_metadata.radarrId)
+        if settings.general.use_plex is True:
+            if settings.plex.set_movie_added is True:
+                plex_set_movie_added_date_now(movie_metadata)
+            if settings.plex.update_movie_library is True:
+                plex_update_library(is_movie_library=True)
 
     event_tracker.track_subtitles(provider=downloaded_provider, action=action, language=downloaded_language)
 
diff --git a/bazarr/subtitles/tools/translate.py b/bazarr/subtitles/tools/translate.py
index 0bb4c2830..9a47bbe9f 100644
--- a/bazarr/subtitles/tools/translate.py
+++ b/bazarr/subtitles/tools/translate.py
@@ -27,6 +27,7 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
         'zt': 'zh-TW',
     }
 
+    orig_to_lang = to_lang
     to_lang = alpha3_from_alpha2(to_lang)
     try:
         lang_obj = Language(to_lang)
@@ -126,7 +127,7 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
 
     result = ProcessSubtitlesResult(message=message,
                                     reversed_path=prr(video_path),
-                                    downloaded_language_code2=to_lang,
+                                    downloaded_language_code2=orig_to_lang,
                                     downloaded_provider=None,
                                     score=None,
                                     forced=forced,
diff --git a/bazarr/subtitles/upgrade.py b/bazarr/subtitles/upgrade.py
index 46f00fb57..238962518 100644
--- a/bazarr/subtitles/upgrade.py
+++ b/bazarr/subtitles/upgrade.py
@@ -7,7 +7,7 @@ import ast
 
 from datetime import datetime, timedelta
 from functools import reduce
-from sqlalchemy import and_
+from sqlalchemy import and_, or_
 
 from app.config import settings
 from app.database import get_exclusion_clause, get_audio_profile_languages, TableShows, TableEpisodes, TableMovies, \
@@ -118,7 +118,7 @@ def upgrade_subtitles():
                                              episode['seriesTitle'],
                                              'series',
                                              episode['profileId'],
-                                             forced_minimum_score=int(episode['score']),
+                                             forced_minimum_score=int(episode['score'] or 0),
                                              is_upgrade=True,
                                              previous_subtitles_to_delete=path_mappings.path_replace(
                                                  episode['subtitles_path'])))
@@ -221,7 +221,7 @@ def upgrade_subtitles():
                                              movie['title'],
                                              'movie',
                                              movie['profileId'],
-                                             forced_minimum_score=int(movie['score']),
+                                             forced_minimum_score=int(movie['score'] or 0),
                                              is_upgrade=True,
                                              previous_subtitles_to_delete=path_mappings.path_replace_movie(
                                                  movie['subtitles_path'])))
@@ -293,8 +293,8 @@ def get_upgradable_episode_subtitles():
 
     upgradable_episodes_conditions = [(TableHistory.action.in_(query_actions)),
                                       (TableHistory.timestamp > minimum_timestamp),
-                                      TableHistory.score.is_not(None),
-                                      (TableHistory.score < 357)]
+                                      or_(and_(TableHistory.score.is_(None), TableHistory.action == 6),
+                                      (TableHistory.score < 357))]
     upgradable_episodes_conditions += get_exclusion_clause('series')
     subtitles_to_upgrade = database.execute(
         select(TableHistory.id,
@@ -316,6 +316,12 @@ def get_upgradable_episode_subtitles():
     query_actions_without_upgrade = [x for x in query_actions if x != 3]
     upgradable_episode_subtitles = {}
     for subtitle_to_upgrade in subtitles_to_upgrade:
+        # exclude subtitles with ID that as been "upgraded from" and shouldn't be considered (should help prevent
+        # non-matching hi/non-hi bug)
+        if database.execute(select(TableHistory.id).where(TableHistory.upgradedFromId == subtitle_to_upgrade.id)).first():
+            logging.debug(f"Episode subtitle {subtitle_to_upgrade.id} has already been upgraded so we'll skip it.")
+            continue
+
         # check if we have the original subtitles id in database and use it instead of guessing
         if subtitle_to_upgrade.upgradedFromId:
             upgradable_episode_subtitles.update({subtitle_to_upgrade.id: subtitle_to_upgrade.upgradedFromId})
@@ -371,8 +377,8 @@ def get_upgradable_movies_subtitles():
 
     upgradable_movies_conditions = [(TableHistoryMovie.action.in_(query_actions)),
                                     (TableHistoryMovie.timestamp > minimum_timestamp),
-                                    TableHistoryMovie.score.is_not(None),
-                                    (TableHistoryMovie.score < 117)]
+                                    or_(and_(TableHistoryMovie.score.is_(None), TableHistoryMovie.action == 6),
+                                    (TableHistoryMovie.score < 117))]
     upgradable_movies_conditions += get_exclusion_clause('movie')
     subtitles_to_upgrade = database.execute(
         select(TableHistoryMovie.id,
@@ -393,6 +399,13 @@ def get_upgradable_movies_subtitles():
     query_actions_without_upgrade = [x for x in query_actions if x != 3]
     upgradable_movie_subtitles = {}
     for subtitle_to_upgrade in subtitles_to_upgrade:
+        # exclude subtitles with ID that as been "upgraded from" and shouldn't be considered (should help prevent
+        # non-matching hi/non-hi bug)
+        if database.execute(
+                select(TableHistoryMovie.id).where(TableHistoryMovie.upgradedFromId == subtitle_to_upgrade.id)).first():
+            logging.debug(f"Movie subtitle {subtitle_to_upgrade.id} has already been upgraded so we'll skip it.")
+            continue
+
         # check if we have the original subtitles id in database and use it instead of guessing
         if subtitle_to_upgrade.upgradedFromId:
             upgradable_movie_subtitles.update({subtitle_to_upgrade.id: subtitle_to_upgrade.upgradedFromId})
diff --git a/bazarr/utilities/backup.py b/bazarr/utilities/backup.py
index a28eadef5..8a561aaf5 100644
--- a/bazarr/utilities/backup.py
+++ b/bazarr/utilities/backup.py
@@ -80,7 +80,7 @@ def backup_to_zip():
             backupZip.write(database_backup_file, 'bazarr.db')
             try:
                 os.remove(database_backup_file)
-            except OSError:
+            except (OSError, FileNotFoundError):
                 logging.exception(f'Unable to delete temporary database backup file: {database_backup_file}')
         else:
             logging.debug('Database file is not included in backup. See previous exception')
@@ -104,7 +104,7 @@ def restore_from_backup():
         try:
             shutil.copy(restore_config_path, dest_config_path)
             os.remove(restore_config_path)
-        except OSError:
+        except (OSError, FileNotFoundError):
             logging.exception(f'Unable to restore or delete config file to {dest_config_path}')
         else:
             if new_config:
@@ -116,8 +116,7 @@ def restore_from_backup():
         if not settings.postgresql.enabled:
             try:
                 shutil.copy(restore_database_path, dest_database_path)
-                os.remove(restore_database_path)
-            except OSError:
+            except (OSError, FileNotFoundError):
                 logging.exception(f'Unable to restore or delete db to {dest_database_path}')
             else:
                 try:
@@ -125,11 +124,12 @@ def restore_from_backup():
                         os.remove(f'{dest_database_path}-shm')
                     if os.path.isfile(f'{dest_database_path}-wal'):
                         os.remove(f'{dest_database_path}-wal')
-                except OSError:
+                except (OSError, FileNotFoundError):
                     logging.exception('Unable to delete SHM and WAL file.')
+
             try:
                 os.remove(restore_database_path)
-            except OSError:
+            except (OSError, FileNotFoundError):
                 logging.exception(f'Unable to delete {dest_database_path}')
 
         logging.info('Backup restored successfully. Bazarr will restart.')
@@ -144,7 +144,7 @@ def restore_from_backup():
         os.remove(restore_config_path)
     except FileNotFoundError:
         pass
-    except OSError:
+    except (OSError, FileNotFoundError):
         logging.exception(f'Unable to delete {dest_config_path}')
 
 
@@ -154,7 +154,7 @@ def prepare_restore(filename):
     success = False
     try:
         shutil.copy(src_zip_file_path, dest_zip_file_path)
-    except OSError:
+    except (OSError, FileNotFoundError):
         logging.exception(f'Unable to copy backup archive to {dest_zip_file_path}')
     else:
         try:
@@ -162,12 +162,12 @@ def prepare_restore(filename):
                 zipObj.extractall(path=get_restore_path())
         except BadZipFile:
             logging.exception(f'Unable to extract files from backup archive {dest_zip_file_path}')
-
-        success = True
+        else:
+            success = True
     finally:
         try:
             os.remove(dest_zip_file_path)
-        except OSError:
+        except (OSError, FileNotFoundError):
             logging.exception(f'Unable to delete backup archive {dest_zip_file_path}')
 
     if success:
@@ -175,6 +175,8 @@ def prepare_restore(filename):
         from app.server import webserver
         webserver.restart()
 
+    return success
+
 
 def backup_rotation():
     backup_retention = settings.backup.retention
@@ -192,7 +194,7 @@ def backup_rotation():
             logging.debug(f'Deleting old backup file {file}')
             try:
                 os.remove(file)
-            except OSError:
+            except (OSError, FileNotFoundError):
                 logging.debug(f'Unable to delete backup file {file}')
     logging.debug('Finished cleaning up old backup files')
 
@@ -202,7 +204,7 @@ def delete_backup_file(filename):
     try:
         os.remove(backup_file_path)
         return True
-    except OSError:
+    except (OSError, FileNotFoundError):
         logging.debug(f'Unable to delete backup file {backup_file_path}')
     return False
 
diff --git a/custom_libs/imghdr.py b/custom_libs/imghdr.py
new file mode 100644
index 000000000..b45550117
--- /dev/null
+++ b/custom_libs/imghdr.py
@@ -0,0 +1,11 @@
+import filetype
+
+_IMG_MIME = {
+    'image/jpeg': 'jpeg',
+    'image/png': 'png',
+    'image/gif': 'gif'
+}
+
+def what(_, img):
+    img_type = filetype.guess(img)
+    return _IMG_MIME.get(img_type.mime) if img_type else None
diff --git a/custom_libs/libfilebot/main.py b/custom_libs/libfilebot/main.py
index e93822bb3..d87b42621 100644
--- a/custom_libs/libfilebot/main.py
+++ b/custom_libs/libfilebot/main.py
@@ -11,7 +11,7 @@ import binascii
 import types
 import os
 
-from pipes import quote
+from shlex import quote
 from .lib import find_executable
 
 mswindows = False
diff --git a/custom_libs/subliminal/extensions.py b/custom_libs/subliminal/extensions.py
index 547abe98a..b4317ae39 100644
--- a/custom_libs/subliminal/extensions.py
+++ b/custom_libs/subliminal/extensions.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from pkg_resources import EntryPoint
+
+import re
+from importlib.metadata import EntryPoint
 
 from stevedore import ExtensionManager
 
@@ -26,23 +28,23 @@ class RegistrableExtensionManager(ExtensionManager):
         self.registered_extensions = []
 
         #: Internal extensions with entry point syntax
-        self.internal_extensions = internal_extensions
+        self.internal_extensions = list(internal_extensions)
 
-        super(RegistrableExtensionManager, self).__init__(namespace, **kwargs)
+        super().__init__(namespace, **kwargs)
 
     def list_entry_points(self):
         # copy of default extensions
-        eps = list(super(RegistrableExtensionManager, self).list_entry_points())
+        eps = list(super().list_entry_points())
 
         # internal extensions
         for iep in self.internal_extensions:
-            ep = EntryPoint.parse(iep)
+            ep = parse_entry_point(iep, self.namespace)
             if ep.name not in [e.name for e in eps]:
                 eps.append(ep)
 
         # registered extensions
         for rep in self.registered_extensions:
-            ep = EntryPoint.parse(rep)
+            ep = parse_entry_point(rep, self.namespace)
             if ep.name not in [e.name for e in eps]:
                 eps.append(ep)
 
@@ -58,7 +60,7 @@ class RegistrableExtensionManager(ExtensionManager):
         if entry_point in self.registered_extensions:
             raise ValueError('Extension already registered')
 
-        ep = EntryPoint.parse(entry_point)
+        ep = parse_entry_point(entry_point, self.namespace)
         if ep.name in self.names():
             raise ValueError('An extension with the same name already exist')
 
@@ -77,7 +79,7 @@ class RegistrableExtensionManager(ExtensionManager):
         if entry_point not in self.registered_extensions:
             raise ValueError('Extension not registered')
 
-        ep = EntryPoint.parse(entry_point)
+        ep = parse_entry_point(entry_point, self.namespace)
         self.registered_extensions.remove(entry_point)
         if self._extensions_by_name is not None:
             del self._extensions_by_name[ep.name]
@@ -87,6 +89,17 @@ class RegistrableExtensionManager(ExtensionManager):
                 break
 
 
+def parse_entry_point(src: str, group: str) -> EntryPoint:
+    """Parse a string entry point."""
+    pattern = re.compile(r'\s*(?P<name>.+?)\s*=\s*(?P<value>.+)')
+    m = pattern.match(src)
+    if not m:
+        msg = "EntryPoint must be in the 'name = module:attrs' format"
+        raise ValueError(msg, src)
+    res = m.groupdict()
+    return EntryPoint(res['name'], res['value'], group)
+
+
 #: Provider manager
 provider_manager = RegistrableExtensionManager('subliminal.providers', [
     'addic7ed = subliminal.providers.addic7ed:Addic7edProvider',
diff --git a/custom_libs/subliminal/score.py b/custom_libs/subliminal/score.py
index 229e2f3a1..1ab39470e 100644
--- a/custom_libs/subliminal/score.py
+++ b/custom_libs/subliminal/score.py
@@ -45,7 +45,7 @@ movie_scores = {'hash': 119, 'title': 60, 'year': 30, 'release_group': 15,
                 'source': 7, 'audio_codec': 3, 'resolution': 2, 'video_codec': 2, 'hearing_impaired': 1}
 
 #: Equivalent release groups
-equivalent_release_groups = ({'FraMeSToR', 'W4NK3R', 'BHDStudio'}, {'LOL', 'DIMENSION'}, {'ASAP', 'IMMERSE', 'FLEET'}, {'AVS', 'SVA'})
+equivalent_release_groups = ({'FRAMESTOR', 'W4NK3R', 'BHDSTUDIO'}, {'LOL', 'DIMENSION'}, {'ASAP', 'IMMERSE', 'FLEET'}, {'AVS', 'SVA'})
 
 
 def get_equivalent_release_groups(release_group):
diff --git a/custom_libs/subliminal_patch/providers/animekalesi.py b/custom_libs/subliminal_patch/providers/animekalesi.py
new file mode 100644
index 000000000..f73019146
--- /dev/null
+++ b/custom_libs/subliminal_patch/providers/animekalesi.py
@@ -0,0 +1,353 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+import logging
+import re
+import io
+import os
+import zipfile
+from random import randint
+from typing import Optional, Dict, List, Set
+from datetime import datetime, timedelta
+
+from babelfish import Language
+from guessit import guessit
+from bs4 import BeautifulSoup
+from subliminal_patch.providers import Provider
+from subliminal_patch.subtitle import Subtitle, guess_matches
+from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
+from subliminal_patch.http import RetryingCFSession
+from subliminal.subtitle import fix_line_ending
+from subliminal.video import Episode
+from subliminal_patch.utils import sanitize, fix_inconsistent_naming
+from subzero.language import Language
+from subliminal.cache import region
+
+from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
+
+logger = logging.getLogger(__name__)
+
+# Cache expiration times
+SEARCH_EXPIRATION_TIME = timedelta(hours=1).total_seconds()
+
+def fix_turkish_chars(text: str) -> str:
+    """Fix Turkish characters for proper matching."""
+    if not text:
+        return ""
+    tr_chars = {
+        'İ': 'i', 'I': 'i', 'Ğ': 'g', 'Ü': 'u', 'Ş': 's', 'Ö': 'o', 'Ç': 'c',
+        'ı': 'i', 'ğ': 'g', 'ü': 'u', 'ş': 's', 'ö': 'o', 'ç': 'c'
+    }
+    for tr_char, eng_char in tr_chars.items():
+        text = text.replace(tr_char, eng_char)
+    return text
+
+def normalize_series_name(series: str) -> str:
+    """Normalize series name for consistent matching."""
+    if not series:
+        return ""
+    # Remove special characters
+    series = re.sub(r'[^\w\s-]', '', series)
+    # Replace multiple spaces with single space
+    series = re.sub(r'\s+', ' ', series)
+    # Fix Turkish characters
+    series = fix_turkish_chars(series)
+    return series.lower().strip()
+
+class AnimeKalesiSubtitle(Subtitle):
+    """AnimeKalesi Subtitle."""
+    provider_name = 'animekalesi'
+    hearing_impaired_verifiable = False
+
+    def __init__(self, language: Language, page_link: str, series: str, season: int, episode: int, 
+                 version: str, download_link: str, uploader: str = None, release_group: str = None):
+        super().__init__(language)
+        self.page_link = page_link
+        self.series = series
+        self.season = season
+        self.episode = episode
+        self.version = version
+        self.download_link = download_link
+        self.release_info = version
+        self.matches = set()
+        self.uploader = uploader
+        self.release_group = release_group
+        self.hearing_impaired = False
+
+    @property
+    def id(self) -> str:
+        return self.download_link
+
+    def get_matches(self, video: Episode) -> Set[str]:
+        matches = set()
+
+        # Series name match
+        if video.series and self.series:
+            # Direct comparison
+            if video.series.lower() == self.series.lower():
+                matches.add('series')
+            # Normalized comparison
+            elif normalize_series_name(video.series) == normalize_series_name(self.series):
+                matches.add('series')
+            # Alternative series comparison
+            elif getattr(video, 'alternative_series', None):
+                for alt_name in video.alternative_series:
+                    if normalize_series_name(alt_name) == normalize_series_name(self.series):
+                        matches.add('series')
+                        break
+
+        # Season match
+        if video.season and self.season == video.season:
+            matches.add('season')
+
+        # Episode match
+        if video.episode and self.episode == video.episode:
+            matches.add('episode')
+
+        # Release group match
+        if getattr(video, 'release_group', None) and self.release_group:
+            if video.release_group.lower() in self.release_group.lower():
+                matches.add('release_group')
+
+        matches |= guess_matches(video, guessit(self.version))
+
+        self.matches = matches
+        return matches
+
+class AnimeKalesiProvider(Provider, ProviderSubtitleArchiveMixin):
+    """AnimeKalesi Provider."""
+    languages = {Language('tur')}
+    video_types = (Episode,)
+    server_url = 'https://www.animekalesi.com'
+    subtitle_class = AnimeKalesiSubtitle
+    hearing_impaired_verifiable = False
+
+    def __init__(self):
+        self.session = None
+        super().__init__()
+
+    def initialize(self):
+        self.session = RetryingCFSession()
+        self.session.headers['User-Agent'] = AGENT_LIST[randint(0, len(AGENT_LIST) - 1)]
+        self.session.headers['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+        self.session.headers['Accept-Language'] = 'tr,en-US;q=0.7,en;q=0.3'
+        self.session.headers['Connection'] = 'keep-alive'
+        self.session.headers['Referer'] = self.server_url
+        logger.info('AnimeKalesi provider initialized')
+
+    def terminate(self):
+        self.session.close()
+
+    @region.cache_on_arguments(expiration_time=SEARCH_EXPIRATION_TIME)
+    def _search_anime_list(self, series: str) -> Optional[Dict[str, str]]:
+        """Search for series in anime list."""
+        if not series:
+            return None
+
+        try:
+            response = self.session.get(f'{self.server_url}/tum-anime-serileri.html', timeout=10)
+            response.raise_for_status()
+            soup = BeautifulSoup(response.content, 'html.parser')
+
+            normalized_search = normalize_series_name(series)
+            possible_matches = []
+
+            for td in soup.select('td#bolumler'):
+                link = td.find('a')
+                if not link:
+                    continue
+
+                title = link.text.strip()
+                href = link.get('href', '')
+
+                if not href or 'bolumler-' not in href:
+                    continue
+
+                normalized_title = normalize_series_name(title)
+
+                # Exact match
+                if normalized_title == normalized_search:
+                    return {'title': title, 'url': href}
+
+                # Partial match
+                if normalized_search in normalized_title or normalized_title in normalized_search:
+                    possible_matches.append({'title': title, 'url': href})
+
+            # Return best partial match if no exact match found
+            if possible_matches:
+                return possible_matches[0]
+
+        except Exception as e:
+            logger.error('Error searching anime list: %s', e)
+
+        return None
+
+    def _parse_season_episode(self, title: str) -> tuple:
+        """Extract season and episode numbers from title."""
+        if not title:
+            return None, None
+
+        try:
+            ep_match = re.search(r'(\d+)\.\s*Bölüm', title)
+            episode = int(ep_match.group(1)) if ep_match else None
+
+            season_match = re.search(r'(\d+)\.\s*Sezon', title)
+            season = int(season_match.group(1)) if season_match else 1
+
+            return season, episode
+        except (AttributeError, ValueError) as e:
+            logger.error('Error parsing season/episode from title "%s": %s', title, e)
+            return None, None
+
+    @region.cache_on_arguments(expiration_time=SEARCH_EXPIRATION_TIME)
+    def _get_episode_list(self, series_url: str) -> Optional[List[Dict[str, str]]]:
+        """Get episode list for a series."""
+        if not series_url:
+            return None
+
+        try:
+            subtitle_page_url = f'{self.server_url}/{series_url.replace("bolumler-", "altyazib-")}'
+            response = self.session.get(subtitle_page_url, timeout=10)
+            response.raise_for_status()
+            soup = BeautifulSoup(response.content, 'html.parser')
+
+            episodes = []
+            for td in soup.select('td#ayazi_indir'):
+                link = td.find('a', href=True)
+                if not link:
+                    continue
+
+                if 'indir_bolum-' in link['href'] and 'Bölüm Türkçe Altyazısı' in link.get('title', ''):
+                    episodes.append({
+                        'title': link['title'],
+                        'url': f"{self.server_url}/{link['href']}"
+                    })
+
+            return episodes
+
+        except Exception as e:
+            logger.error('Error getting episode list: %s', e)
+            return None
+
+    def query(self, series: str, season: int, episode: int) -> List[AnimeKalesiSubtitle]:
+        """Search subtitles from AnimeKalesi."""
+        if not series or not season or not episode:
+            return []
+
+        subtitles = []
+
+        # Find series information
+        series_data = self._search_anime_list(series)
+        if not series_data:
+            logger.debug('Series not found: %s', series)
+            return subtitles
+
+        # Get episode list
+        episodes = self._get_episode_list(series_data['url'])
+        if not episodes:
+            return subtitles
+
+        try:
+            for episode_data in episodes:
+                title = episode_data['title']
+                link_url = episode_data['url']
+
+                # Extract season and episode numbers
+                current_season, current_episode = self._parse_season_episode(title)
+                if current_season is None or current_episode is None:
+                    continue
+
+                if current_season == season and current_episode == episode:
+                    try:
+                        # Navigate to subtitle download page
+                        response = self.session.get(link_url, timeout=10)
+                        response.raise_for_status()
+                        soup = BeautifulSoup(response.content, 'html.parser')
+
+                        # Find download link
+                        subtitle_div = soup.find('div', id='altyazi_indir')
+                        if subtitle_div and subtitle_div.find('a', href=True):
+                            download_link = f"{self.server_url}/{subtitle_div.find('a')['href']}"
+
+                            # Find uploader information
+                            uploader = None
+                            translator_info = soup.find('strong', text='Altyazı/Çeviri:')
+                            if translator_info and translator_info.parent:
+                                strong_tags = translator_info.parent.find_all('strong')
+                                for i, tag in enumerate(strong_tags):
+                                    if tag.text == 'Altyazı/Çeviri:':
+                                        if i + 1 < len(strong_tags):
+                                            uploader = tag.next_sibling
+                                            if uploader:
+                                                uploader = uploader.strip()
+                                        else:
+                                            uploader = tag.next_sibling
+                                            if uploader:
+                                                uploader = uploader.strip()
+                                        break
+
+                            version = f"{series_data['title']} - S{current_season:02d}E{current_episode:02d}"
+                            if uploader:
+                                version += f" by {uploader}"
+
+                            try:
+                                subtitle = self.subtitle_class(
+                                    Language('tur'),
+                                    link_url,
+                                    series_data['title'],
+                                    current_season,
+                                    current_episode,
+                                    version,
+                                    download_link,
+                                    uploader=uploader,
+                                    release_group=None
+                                )
+                                subtitles.append(subtitle)
+                            except Exception as e:
+                                logger.error('Error creating subtitle object: %s', e)
+                                continue
+
+                    except Exception as e:
+                        logger.error('Error processing subtitle page %s: %s', link_url, e)
+                        continue
+
+        except Exception as e:
+            logger.error('Error querying subtitles: %s', e)
+
+        return subtitles
+
+    def list_subtitles(self, video: Episode, languages: Set[Language]) -> List[AnimeKalesiSubtitle]:
+        if not video.series or not video.episode:
+            return []
+
+        return self.query(video.series, video.season, video.episode)
+
+    def download_subtitle(self, subtitle: AnimeKalesiSubtitle) -> None:
+        try:
+            response = self.session.get(subtitle.download_link, timeout=10)
+            response.raise_for_status()
+
+            # Check for ZIP file
+            if response.content.startswith(b'PK\x03\x04'):
+                with zipfile.ZipFile(io.BytesIO(response.content)) as zf:
+                    subtitle_files = [f for f in zf.namelist() if f.lower().endswith(('.srt', '.ass'))]
+
+                    if not subtitle_files:
+                        logger.error('No subtitle file found in ZIP archive')
+                        return
+
+                    # Select best matching subtitle file
+                    subtitle_file = subtitle_files[0]
+                    if len(subtitle_files) > 1:
+                        for f in subtitle_files:
+                            if subtitle.version.lower() in f.lower():
+                                subtitle_file = f
+                                break
+
+                    subtitle.content = fix_line_ending(zf.read(subtitle_file))
+            else:
+                # Regular subtitle file
+                subtitle.content = fix_line_ending(response.content)
+
+        except Exception as e:
+            logger.error('Error downloading subtitle: %s', e)
+
diff --git a/custom_libs/subliminal_patch/providers/animetosho.py b/custom_libs/subliminal_patch/providers/animetosho.py
index 9cd3d80b9..ff4cb279e 100644
--- a/custom_libs/subliminal_patch/providers/animetosho.py
+++ b/custom_libs/subliminal_patch/providers/animetosho.py
@@ -30,15 +30,19 @@ supported_languages = [
     "eng",  # English
     "fin",  # Finnish
     "fra",  # French
+    "deu",  # German
     "heb",  # Hebrew
+    "ind",  # Indonesian
     "ita",  # Italian
     "jpn",  # Japanese
     "por",  # Portuguese
     "pol",  # Polish
+    "rus",  # Russian
     "spa",  # Spanish
     "swe",  # Swedish
     "tha",  # Thai
     "tur",  # Turkish
+    "vie",  # Vietnamese
 ]
 
 
diff --git a/custom_libs/subliminal_patch/providers/assrt.py b/custom_libs/subliminal_patch/providers/assrt.py
index a30265a44..099d1e14f 100644
--- a/custom_libs/subliminal_patch/providers/assrt.py
+++ b/custom_libs/subliminal_patch/providers/assrt.py
@@ -24,6 +24,8 @@ language_converters.register('assrt = subliminal_patch.converters.assrt:AssrtCon
 server_url = 'https://api.assrt.net/v1'
 supported_languages = list(language_converters['assrt'].to_assrt.keys())
 
+meaningless_videoname = ['不知道']
+
 
 def get_request_delay(max_request_per_minute):
     return ceil(60 / max_request_per_minute)
@@ -203,8 +205,21 @@ class AssrtProvider(Provider):
                     language = Language.fromassrt(match.group('code'))
                     output_language = search_language_in_list(language, languages)
                     if output_language:
-                        subtitles.append(AssrtSubtitle(output_language, sub['id'], sub['videoname'], self.session,
-                                                       self.token, self.max_request_per_minute))
+                        if sub['videoname'] not in meaningless_videoname:
+                            video_name = sub['videoname']
+                        elif 'native_name' in sub and isinstance(sub['native_name'], str):
+                            video_name = sub['native_name']
+                        elif ('native_name' in sub and isinstance(sub['native_name'], list) and
+                              len(sub['native_name']) > 0):
+                            video_name = sub['native_name'][0]
+                        else:
+                            video_name = None
+                        subtitles.append(AssrtSubtitle(language=output_language,
+                                                       subtitle_id=sub['id'],
+                                                       video_name=video_name,
+                                                       session=self.session,
+                                                       token=self.token,
+                                                       max_request_per_minute=self.max_request_per_minute))
                 except:
                     pass
 
diff --git a/custom_libs/subliminal_patch/providers/avistaz_network.py b/custom_libs/subliminal_patch/providers/avistaz_network.py
index 61afefcbf..5d47f333b 100644
--- a/custom_libs/subliminal_patch/providers/avistaz_network.py
+++ b/custom_libs/subliminal_patch/providers/avistaz_network.py
@@ -217,7 +217,6 @@ class AvistazNetworkSubtitle(Subtitle):
         super().__init__(language, page_link=page_link)
         self.provider_name = provider_name
         self.hearing_impaired = None
-        self.language = language
         self.filename = filename
         self.release_info = release
         self.page_link = page_link
diff --git a/custom_libs/subliminal_patch/providers/bsplayer.py b/custom_libs/subliminal_patch/providers/bsplayer.py
index de979a1b7..edf1efa21 100644
--- a/custom_libs/subliminal_patch/providers/bsplayer.py
+++ b/custom_libs/subliminal_patch/providers/bsplayer.py
@@ -30,7 +30,6 @@ class BSPlayerSubtitle(Subtitle):
 
     def __init__(self, language, filename, subtype, video, link, subid):
         super(BSPlayerSubtitle, self).__init__(language)
-        self.language = language
         self.filename = filename
         self.page_link = link
         self.subtype = subtype
diff --git a/custom_libs/subliminal_patch/providers/embeddedsubtitles.py b/custom_libs/subliminal_patch/providers/embeddedsubtitles.py
index 8de224729..5426bef93 100644
--- a/custom_libs/subliminal_patch/providers/embeddedsubtitles.py
+++ b/custom_libs/subliminal_patch/providers/embeddedsubtitles.py
@@ -67,7 +67,7 @@ _ALLOWED_CODECS = ("ass", "subrip", "webvtt", "mov_text")
 class EmbeddedSubtitlesProvider(Provider):
     provider_name = "embeddedsubtitles"
 
-    languages = {Language("por", "BR"), Language("spa", "MX")} | {
+    languages = {Language("por", "BR"), Language("spa", "MX"), Language("zho", "TW")} | {
         Language.fromalpha2(l) for l in language_converters["alpha2"].codes
     }
     languages.update(set(Language.rebuild(lang, hi=True) for lang in languages))
@@ -369,7 +369,7 @@ def _basename_callback(path: str):
 
 
 # TODO: improve this
-_SIGNS_LINE_RE = re.compile(r",([\w|_]{,15}(sign|fx|karaoke))", flags=re.IGNORECASE)
+_SIGNS_LINE_RE = re.compile(r",([\w|_]{,15}(fx|karaoke))", flags=re.IGNORECASE)
 
 
 def _clean_ass_subtitles(path, output_path):
diff --git a/custom_libs/subliminal_patch/providers/legendasdivx.py b/custom_libs/subliminal_patch/providers/legendasdivx.py
index e4d839ed2..00e39671c 100644
--- a/custom_libs/subliminal_patch/providers/legendasdivx.py
+++ b/custom_libs/subliminal_patch/providers/legendasdivx.py
@@ -36,7 +36,6 @@ class LegendasdivxSubtitle(Subtitle):
 
     def __init__(self, language, video, data, skip_wrong_fps=True):
         super(LegendasdivxSubtitle, self).__init__(language)
-        self.language = language
         self.page_link = data['link']
         self.hits = data['hits']
         self.exact_match = data['exact_match']
diff --git a/custom_libs/subliminal_patch/providers/opensubtitlescom.py b/custom_libs/subliminal_patch/providers/opensubtitlescom.py
index 39171b6af..69a2df3be 100644
--- a/custom_libs/subliminal_patch/providers/opensubtitlescom.py
+++ b/custom_libs/subliminal_patch/providers/opensubtitlescom.py
@@ -449,6 +449,7 @@ class OpenSubtitlesComProvider(ProviderRetryMixin, Provider):
             amount=retry_amount
         )
 
+        logger.debug(f'params sent to the download endpoint: {res.request.body}')
         download_data = res.json()
         subtitle.download_link = download_data['link']
 
diff --git a/custom_libs/subliminal_patch/providers/podnapisi.py b/custom_libs/subliminal_patch/providers/podnapisi.py
index 5785570e1..4309a8a91 100644
--- a/custom_libs/subliminal_patch/providers/podnapisi.py
+++ b/custom_libs/subliminal_patch/providers/podnapisi.py
@@ -17,6 +17,8 @@ from requests.adapters import HTTPAdapter
 from subliminal.utils import sanitize
 from subliminal_patch.subtitle import guess_matches
 from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
+from subliminal_patch.exceptions import TooManyRequests
+
 
 try:
     from lxml import etree
@@ -202,10 +204,12 @@ class PodnapisiProvider(_PodnapisiProvider, ProviderSubtitleArchiveMixin):
             # query the server
             content = None
             try:
-                content = self.session.get(self.server_url + 'search/old', params=params, timeout=30).content
-                xml = etree.fromstring(content)
+                content = self.session.get(self.server_url + 'search/old', params=params, timeout=30)
+                xml = etree.fromstring(content.content)
             except etree.ParseError:
-                logger.error("Wrong data returned: %r", content)
+                if '429 Too Many Requests' in content.text:
+                    raise TooManyRequests
+                logger.error("Wrong data returned: %r", content.text)
                 break
 
             # exit if no results
diff --git a/custom_libs/subliminal_patch/providers/regielive.py b/custom_libs/subliminal_patch/providers/regielive.py
index 8c7363bf0..2ef41c625 100644
--- a/custom_libs/subliminal_patch/providers/regielive.py
+++ b/custom_libs/subliminal_patch/providers/regielive.py
@@ -4,8 +4,9 @@ import logging
 import io
 import os
 
-from requests import Session
+from requests import Session, JSONDecodeError
 from guessit import guessit
+from subliminal_patch.exceptions import TooManyRequests, APIThrottled, ProviderError
 from subliminal_patch.providers import Provider
 from subliminal_patch.subtitle import Subtitle, guess_matches
 from subliminal.subtitle import SUBTITLE_EXTENSIONS, fix_line_ending
@@ -28,7 +29,6 @@ class RegieLiveSubtitle(Subtitle):
         self.page_link = link
         self.video = video
         self.rating = rating
-        self.language = language
         self.release_info = filename
 
     @property
@@ -87,13 +87,18 @@ class RegieLiveProvider(Provider):
             payload['nume'] = video.title
         payload['an'] = video.year
 
-        response = self.session.get(
-            self.url + "?" + urllib.parse.urlencode(payload),
-            data=payload, headers=self.headers)
+        response = self.checked(
+            lambda: self.session.get(
+                self.url + "?" + urllib.parse.urlencode(payload),
+                data=payload, headers=self.headers)
+        )
 
         subtitles = []
         if response.status_code == 200:
-            results = response.json()
+            try:
+                results = response.json()
+            except JSONDecodeError:
+                raise ProviderError('Unable to parse JSON response')
             if len(results) > 0:
                 results_subs = results['rezultate']
                 for film in results_subs:
@@ -122,9 +127,13 @@ class RegieLiveProvider(Provider):
             'Cache-Control': 'no-cache'
         }
         session.headers.update(_addheaders)
-        res = session.get('https://subtitrari.regielive.ro')
+        res = self.checked(
+            lambda: session.get('https://subtitrari.regielive.ro')
+        )
         cookies = res.cookies
-        _zipped = session.get(subtitle.page_link, cookies=cookies)
+        _zipped = self.checked(
+            lambda: session.get(subtitle.page_link, cookies=cookies, allow_redirects=False)
+        )
         if _zipped:
             if _zipped.text == '500':
                 raise ValueError('Error 500 on server')
@@ -135,7 +144,8 @@ class RegieLiveProvider(Provider):
             return subtitle
         raise ValueError('Problems conecting to the server')
 
-    def _get_subtitle_from_archive(self, archive):
+    @staticmethod
+    def _get_subtitle_from_archive(archive):
         # some files have a non subtitle with .txt extension
         _tmp = list(SUBTITLE_EXTENSIONS)
         _tmp.remove('.txt')
@@ -153,3 +163,27 @@ class RegieLiveProvider(Provider):
             return archive.read(name)
 
         raise APIThrottled('Can not find the subtitle in the compressed file')
+
+    @staticmethod
+    def checked(fn):
+        """Run :fn: and check the response status before returning it.
+
+        :param fn: the function to make an API call to provider.
+        :return: the response.
+
+        """
+        response = None
+        try:
+            response = fn()
+        except Exception:
+            logger.exception('Unhandled exception raised.')
+            raise ProviderError('Unhandled exception raised. Check log.')
+        else:
+            status_code = response.status_code
+
+            if status_code == 301:
+                raise APIThrottled()
+            elif status_code == 429:
+                raise TooManyRequests()
+
+        return response
diff --git a/custom_libs/subliminal_patch/providers/soustitreseu.py b/custom_libs/subliminal_patch/providers/soustitreseu.py
index 727a70458..86697f288 100644
--- a/custom_libs/subliminal_patch/providers/soustitreseu.py
+++ b/custom_libs/subliminal_patch/providers/soustitreseu.py
@@ -31,7 +31,7 @@ class SoustitreseuSubtitle(Subtitle):
     provider_name = 'soustitreseu'
 
     def __init__(self, language, video, name, data, content, is_perfect_match):
-        self.language = language
+        super().__init__(language)
         self.srt_filename = name
         self.release_info = name
         self.page_link = None
diff --git a/custom_libs/subliminal_patch/providers/subdl.py b/custom_libs/subliminal_patch/providers/subdl.py
index 663e18399..abccc1530 100644
--- a/custom_libs/subliminal_patch/providers/subdl.py
+++ b/custom_libs/subliminal_patch/providers/subdl.py
@@ -181,7 +181,7 @@ class SubdlProvider(ProviderRetryMixin, Provider):
         result = res.json()
 
         if ('success' in result and not result['success']) or ('status' in result and not result['status']):
-            logger.debug(result["error"])
+            logger.debug(result)
             return []
 
         logger.debug(f"Query returned {len(result['subtitles'])} subtitles")
@@ -257,7 +257,7 @@ class SubdlProvider(ProviderRetryMixin, Provider):
             retry_timeout=retry_timeout
         )
 
-        if r.status_code == 429:
+        if r.status_code == 429 or (r.status_code == 500 and r.text == 'Download limit exceeded'):
             raise DownloadLimitExceeded("Daily download limit exceeded")
         elif r.status_code == 403:
             raise ConfigurationError("Invalid API key")
diff --git a/custom_libs/subliminal_patch/providers/subsynchro.py b/custom_libs/subliminal_patch/providers/subsynchro.py
index 9e3c629ec..aad0d6ae7 100644
--- a/custom_libs/subliminal_patch/providers/subsynchro.py
+++ b/custom_libs/subliminal_patch/providers/subsynchro.py
@@ -38,7 +38,6 @@ class SubsynchroSubtitle(Subtitle):
             language, hearing_impaired=False, page_link=download_url
         )
         self.download_url = download_url
-        self.language = language
         self.file_type = file_type
         self.release_info = release_info
         self.filename = filename
diff --git a/custom_libs/subliminal_patch/providers/titrari.py b/custom_libs/subliminal_patch/providers/titrari.py
index a9976df21..e995a48db 100644
--- a/custom_libs/subliminal_patch/providers/titrari.py
+++ b/custom_libs/subliminal_patch/providers/titrari.py
@@ -126,7 +126,8 @@ class TitrariProvider(Provider, ProviderSubtitleArchiveMixin):
     video_types = (Episode, Movie)
     api_url = 'https://www.titrari.ro/'
     # query_advanced_search = 'cautarepreaavansata'
-    query_advanced_search = "maicauta"
+    # query_advanced_search = "maicauta"
+    query_advanced_search = "cautamsavedem"
 
     def __init__(self):
         self.session = None
diff --git a/custom_libs/subliminal_patch/providers/titulky.py b/custom_libs/subliminal_patch/providers/titulky.py
index 0e8a6b9a7..d18a644ff 100644
--- a/custom_libs/subliminal_patch/providers/titulky.py
+++ b/custom_libs/subliminal_patch/providers/titulky.py
@@ -66,7 +66,6 @@ class TitulkySubtitle(Subtitle):
         self.episode = episode
         self.releases = [release_info]
         self.release_info = release_info
-        self.language = language
         self.approved = approved
         self.page_link = page_link
         self.uploader = uploader
diff --git a/custom_libs/subliminal_patch/providers/turkcealtyaziorg.py b/custom_libs/subliminal_patch/providers/turkcealtyaziorg.py
new file mode 100644
index 000000000..05971bad9
--- /dev/null
+++ b/custom_libs/subliminal_patch/providers/turkcealtyaziorg.py
@@ -0,0 +1,375 @@
+# -*- coding: utf-8 -*-
+import logging
+from random import randint
+from datetime import datetime
+
+from subzero.language import Language
+from guessit import guessit
+from subliminal_patch.http import RetryingCFSession
+from subliminal_patch.subtitle import guess_matches
+from subliminal_patch.providers.mixins import ProviderSubtitleArchiveMixin
+from subliminal.utils import sanitize_release_group
+from subliminal.score import get_equivalent_release_groups
+from subliminal.subtitle import Subtitle
+from subliminal.exceptions import AuthenticationError
+
+from http.cookies import SimpleCookie
+
+from .utils import FIRST_THOUSAND_OR_SO_USER_AGENTS as AGENT_LIST
+from .utils import get_archive_from_bytes
+
+from subliminal.providers import ParserBeautifulSoup, Provider
+from subliminal.video import Episode, Movie
+
+from dateutil.relativedelta import relativedelta
+from requests.cookies import RequestsCookieJar
+
+
+logger = logging.getLogger(__name__)
+
+
+class TurkceAltyaziOrgSubtitle(Subtitle):
+    """Turkcealtyazi.org Subtitle."""
+
+    provider_name = "turkcealtyaziorg"
+    hearing_impaired_verifiable = True
+
+    def __init__(
+        self,
+        language,
+        page_link,
+        release_info,
+        uploader,
+        hearing_impaired=False,
+        season=None,
+        episode=None,
+        is_pack=False,
+    ):
+        super().__init__(language, hearing_impaired, page_link)
+        self.season = season
+        self.episode = episode
+        if episode:
+            self.asked_for_episode = True
+        self.release_info = release_info
+        self.releases = release_info
+        self.is_pack = is_pack
+        self.download_link = page_link
+        self.uploader = uploader
+        self.matches = None
+        # Currently we only search by imdb_id, so this will always be True for now
+        self.imdb_match = True
+
+    @property
+    def id(self):
+        id_string = self.page_link
+        if self.season is not None and self.episode is not None:
+            episode_string = f"S{self.season:02d}E{self.episode:02d}"
+            id_string += episode_string
+        return id_string
+
+    def get_matches(self, video):
+        matches = set()
+        type_ = "movie" if isinstance(video, Movie) else "episode"
+
+        # handle movies and series separately
+        if type_ == "episode":
+            # series
+            matches.add("series")
+            # season
+            if video.season == self.season:
+                matches.add("season")
+            # episode
+            if video.episode == self.episode:
+                matches.add("episode")
+            # imdb
+            if self.imdb_match:
+                matches.add("series_imdb_id")
+        else:
+            # imdb
+            if self.imdb_match:
+                matches.add("imdb_id")
+
+        # release_group
+        if (
+            video.release_group
+            and self.release_info
+            and any(
+                r in sanitize_release_group(self.release_info)
+                for r in get_equivalent_release_groups(
+                    sanitize_release_group(video.release_group)
+                )
+            )
+        ):
+            matches.add("release_group")
+
+        # other properties
+        matches |= guess_matches(video, guessit(self.release_info, {"type": type_}))
+
+        self.matches = matches
+
+        return matches
+
+
+class TurkceAltyaziOrgProvider(Provider, ProviderSubtitleArchiveMixin):
+    """Turkcealtyazi.org Provider."""
+
+    languages = {Language.fromalpha3b("tur"), Language.fromalpha3b("eng")}
+    video_types = (Episode, Movie)
+    server_url = "https://turkcealtyazi.org"
+    server_dl_url = f"{server_url}/ind"
+    subtitle_class = TurkceAltyaziOrgSubtitle
+
+    custom_identifiers = {
+        # Rip Types
+        "cps c1": "DVDRip",
+        "cps c2": "HDRip",
+        "cps c3": "TVRip",
+        "rps r1": "HD",
+        "rps r2": "DVDRip",
+        "rps r3": "DVDScr",
+        "rps r4": "R5",
+        "rps r5": "CAM",
+        "rps r6": "WEBRip",
+        "rps r7": "BDRip",
+        "rps r8": "WEB-DL",
+        "rps r9": "HDRip",
+        "rps r10": "HDTS",
+        "rps r12": "BluRay",
+        "rip1": "DVDRip",
+        "rip2": "DVDScr",
+        "rip3": "WEBRip",
+        "rip4": "BDRip",
+        "rip5": "BRRip",
+        "rip6": "CAM",
+        "rip7": "HD",
+        "rip8": "R5",
+        "rip9": "WEB-DL",
+        "rip10": "HDRip",
+        "rip11": "HDTS",
+        # Languages
+        "flagtr": "tur",
+        "flagen": "eng",
+        "flages": "spa",
+        "flagfr": "fra",
+        "flagger": "ger",
+        "flagita": "ita",
+        "flagunk": "unknown",
+        # Turkish time granularity
+        "dakika": "minutes",
+        "saat": "hours",
+        "gün": "days",
+        "hafta": "weeks",
+        "ay": "months",
+        "yıl": "years",
+    }
+
+    def __init__(self, cookies=None, user_agent=None):
+        self.session = None
+        self.cookies = cookies
+        self.user_agent = user_agent
+
+    def initialize(self):
+        self.session = RetryingCFSession()
+        if self.user_agent and self.user_agent != "":
+            self.session.headers["User-Agent"] = self.user_agent
+        else:
+            self.session.headers["User-Agent"] = AGENT_LIST[
+                randint(0, len(AGENT_LIST) - 1)
+            ]
+        self.session.headers["Referer"] = self.server_url
+
+        if self.cookies and self.cookies != "":
+            self.session.cookies = RequestsCookieJar()
+            simple_cookie = SimpleCookie()
+            simple_cookie.load(self.cookies)
+
+            for k, v in simple_cookie.items():
+                self.session.cookies.set(k, v.value)
+
+        rr = self.session.get(self.server_url, allow_redirects=False, timeout=10)
+        if rr.status_code == 403:
+            logger.info("Cookies expired")
+            raise AuthenticationError("Cookies with User Agent are not valid anymore")
+
+    def terminate(self):
+        self.session.close()
+
+    def list_subtitles(self, video, languages):
+        imdbId = None
+        subtitles = []
+
+        if isinstance(video, Episode):
+            imdbId = video.series_imdb_id
+        else:
+            imdbId = video.imdb_id
+
+        if not imdbId:
+            logger.debug("No imdb number available to search with provider")
+            return subtitles
+
+        # query for subtitles with the imdbId
+        if isinstance(video, Episode):
+            subtitles = self.query(
+                video, languages, imdbId, season=video.season, episode=video.episode
+            )
+        else:
+            subtitles = self.query(video, languages, imdbId)
+
+        return subtitles
+
+    def query(self, video, languages, imdb_id, season=None, episode=None):
+        logger.debug("Searching subtitles for %r", imdb_id)
+        subtitles = []
+        type_ = "movie" if isinstance(video, Movie) else "episode"
+        search_link = f"{self.server_url}/find.php?cat=sub&find={imdb_id}"
+
+        r = self.session.get(search_link, timeout=30)
+
+        # 404 should be returned if the imdb_id was not found, but the site returns 200 but just in case
+        if r.status_code == 404:
+            logger.debug("IMDB id {} not found on turkcealtyaziorg".format(imdb_id))
+            return subtitles
+
+        if r.status_code != 200:
+            r.raise_for_status()
+
+        soup_page = ParserBeautifulSoup(
+            r.content.decode("utf-8", "ignore"), ["html.parser"]
+        )
+
+        # 404 Error is in the meta description if the imdb_id was not found
+        meta_tag = soup_page.find("meta", {"name": "description"})
+        if not meta_tag or "404 Error" in meta_tag.attrs.get("content", ""):
+            logger.debug("IMDB id %s not found on turkcealtyaziorg", imdb_id)
+            return subtitles
+        try:
+            if type_ == "movie":
+                entries = soup_page.select(
+                    "div.altyazi-list-wrapper > div > div.altsonsez2"
+                )
+            else:
+                entries = soup_page.select(
+                    f"div.altyazi-list-wrapper > div > div.altsonsez1.sezon_{season}"
+                )
+
+            for item in entries:
+                is_pack = False
+
+                sub_page_link = (
+                    self.server_url
+                    + item.select("div.alisim > div.fl > a")[0].attrs["href"]
+                )
+
+                sub_language = self.custom_identifiers.get(
+                    item.select("div.aldil > span")[0].attrs["class"][0]
+                )
+                sub_language = Language.fromalpha3b(sub_language)
+                if type_ == "episode":
+                    sub_season, sub_episode = [
+                        x.text for x in item.select("div.alcd")[0].find_all("b")
+                    ]
+
+                    sub_season = int(sub_season)
+                    try:
+                        sub_episode = int(sub_episode)
+                    except ValueError:
+                        is_pack = True
+
+                sub_uploader_container = item.select("div.alcevirmen")[0]
+                if sub_uploader_container.text != "":
+                    sub_uploader = sub_uploader_container.text.strip()
+                else:
+                    sub_uploader = self.custom_identifiers.get(
+                        " ".join(sub_uploader_container.find("span").attrs["class"])
+                    )
+
+                _sub_fps = item.select("div.alfps")[0].text
+                _sub_download_count = item.select("div.alindirme")[0].text
+
+                sub_release_info_list = list()
+                sub_rip_container = item.select("div.ta-container > div.ripdiv")[0]
+
+                for sub_rip in sub_rip_container.find_all("span"):
+                    sub_release_info_list.append(
+                        self.custom_identifiers.get(" ".join(sub_rip.attrs["class"]))
+                    )
+                sub_release_info_list.extend(
+                    x.strip() for x in sub_rip_container.text.strip().split("/")
+                )
+                sub_release_info = ",".join(sub_release_info_list)
+
+                sub_hearing_impaired = bool(
+                    sub_rip_container.find("img", {"src": "/images/isitme.png"})
+                )
+
+                sub_released_at_string = item.select("div.ta-container > div.datediv")[
+                    0
+                ].text
+                _sub_released_at = self.get_approximate_time(sub_released_at_string)
+
+                if (sub_language in languages) and (
+                    type_ == "movie"
+                    or (sub_season == season)
+                    and (is_pack or sub_episode == episode)
+                ):
+                    subtitle = self.subtitle_class(
+                        sub_language,
+                        sub_page_link,
+                        sub_release_info,
+                        sub_uploader,
+                        hearing_impaired=sub_hearing_impaired,
+                        season=sub_season if type_ == "episode" else None,
+                        episode=(
+                            (episode if is_pack else sub_episode)
+                            if type_ == "episode"
+                            else None
+                        ),
+                        is_pack=bool(is_pack),
+                    )
+
+                    logger.debug("Found subtitle %r", subtitle)
+                    subtitles.append(subtitle)
+        except Exception as e:
+            logging.debug(e)
+
+        return subtitles
+
+    def download_subtitle(self, subtitle: TurkceAltyaziOrgSubtitle):
+        if not isinstance(subtitle, TurkceAltyaziOrgSubtitle):
+            return
+        page_link = subtitle.page_link
+        sub_page_resp = self.session.get(page_link, timeout=30)
+        dl_page = ParserBeautifulSoup(
+            sub_page_resp.content.decode("utf-8", "ignore"),
+            ["html.parser"],
+        )
+
+        idid = dl_page.find("input", {"name": "idid"}).get("value")
+        altid = dl_page.find("input", {"name": "altid"}).get("value")
+        sidid = dl_page.find("input", {"name": "sidid"}).get("value")
+
+        referer = page_link.encode("utf-8")
+
+        dl_resp = self.session.post(
+            self.server_dl_url,
+            data={
+                "idid": idid,
+                "altid": altid,
+                "sidid": sidid,
+            },
+            headers={"Referer": referer},
+            timeout=10,
+        )
+
+        if not dl_resp.content:
+            logger.error("Unable to download subtitle. No data returned from provider")
+
+        archive = get_archive_from_bytes(dl_resp.content)
+        subtitle.content = self.get_subtitle_from_archive(subtitle, archive)
+
+    def get_approximate_time(self, time_string):
+        time_string = time_string.strip().replace(" önce", "")
+        count, granularity = time_string.split(" ")
+        granularity = self.custom_identifiers[granularity]
+        count = int(count)
+        return (datetime.now() - relativedelta(**{granularity: count})).isoformat()
diff --git a/custom_libs/subliminal_patch/providers/tusubtitulo.py b/custom_libs/subliminal_patch/providers/tusubtitulo.py
index 979c28b5f..ff5af9633 100644
--- a/custom_libs/subliminal_patch/providers/tusubtitulo.py
+++ b/custom_libs/subliminal_patch/providers/tusubtitulo.py
@@ -37,7 +37,6 @@ class TuSubtituloSubtitle(Subtitle):
         super(TuSubtituloSubtitle, self).__init__(
             language, hearing_impaired=False, page_link=sub_dict["download_url"]
         )
-        self.language = language
         self.sub_dict = sub_dict
         self.release_info = sub_dict["metadata"]
         self.found_matches = matches
diff --git a/custom_libs/subliminal_patch/providers/whisperai.py b/custom_libs/subliminal_patch/providers/whisperai.py
index c8535bd4f..9d6b37698 100644
--- a/custom_libs/subliminal_patch/providers/whisperai.py
+++ b/custom_libs/subliminal_patch/providers/whisperai.py
@@ -158,10 +158,18 @@ def encode_audio_stream(path, ffmpeg_path, audio_stream_language=None):
             # Use the ISO 639-2 code if available
             audio_stream_language = get_ISO_639_2_code(audio_stream_language)
             logger.debug(f"Whisper will use the '{audio_stream_language}' audio stream for {path}")
-            inp = inp[f'a:m:language:{audio_stream_language}']
-
-        out, _ = inp.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=16000, af="aresample=async=1") \
-                    .run(cmd=[ffmpeg_path, "-nostdin"], capture_stdout=True, capture_stderr=True)
+            # 0 = Pick first stream in case there are multiple language streams of the same language,
+            # otherwise ffmpeg will try to combine multiple streams, but our output format doesn't support that.
+            # The first stream is probably the correct one, as later streams are usually commentaries
+            lang_map = f"0:m:language:{audio_stream_language}"
+        else:
+            # there is only one stream, so just use that one
+            lang_map = ""
+        out, _ = (
+            inp.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=16000, af="aresample=async=1")
+            .global_args("-map", lang_map)
+            .run(cmd=[ffmpeg_path, "-nostdin"], capture_stdout=True, capture_stderr=True) 
+        )
 
     except ffmpeg.Error as e:
         logger.warning(f"ffmpeg failed to load audio: {e.stderr.decode()}")
@@ -272,9 +280,10 @@ class WhisperAIProvider(Provider):
         if out == None:
             logger.info(f"Whisper cannot detect language of {path} because of missing/bad audio track")
             return None
+        video_name = path if self.pass_video_name else None
 
         r = self.session.post(f"{self.endpoint}/detect-language",
-                              params={'encode': 'false'},
+                              params={'encode': 'false', 'video_file': {video_name}},
                               files={'audio_file': out},
                               timeout=(self.response, self.timeout))
         
diff --git a/custom_libs/subliminal_patch/providers/yavkanet.py b/custom_libs/subliminal_patch/providers/yavkanet.py
index 3741ea405..51e80d021 100644
--- a/custom_libs/subliminal_patch/providers/yavkanet.py
+++ b/custom_libs/subliminal_patch/providers/yavkanet.py
@@ -45,7 +45,7 @@ class YavkaNetSubtitle(Subtitle):
     """YavkaNet Subtitle."""
     provider_name = 'yavkanet'
 
-    def __init__(self, language, filename, type, video, link, fps, subs_id_name, subs_id_value):
+    def __init__(self, language, filename, type, video, link, fps, subs_form_data):
         super(YavkaNetSubtitle, self).__init__(language)
         self.filename = filename
         self.page_link = link
@@ -53,8 +53,7 @@ class YavkaNetSubtitle(Subtitle):
         self.video = video
         self.fps = fps
         self.release_info = filename
-        self.subs_id_name = subs_id_name
-        self.subs_id_value = subs_id_value
+        self.subs_form_data = subs_form_data
         self.content = None
         self._is_valid = False
         if fps:
@@ -110,7 +109,7 @@ class YavkaNetProvider(Provider):
         self.session.headers['User-Agent'] = AGENT_LIST[randint(0, len(AGENT_LIST) - 1)]
         self.session.headers["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
         self.session.headers["Accept-Language"] = "en-US,en;q=0.5"
-        self.session.headers["Accept-Encoding"] = "gzip, deflate, br"
+        self.session.headers["Accept-Encoding"] = "gzip, deflate"
         self.session.headers["DNT"] = "1"
         self.session.headers["Connection"] = "keep-alive"
         self.session.headers["Upgrade-Insecure-Requests"] = "1"
@@ -139,11 +138,11 @@ class YavkaNetProvider(Provider):
             logger.debug('No subtitles found')
             return subtitles
 
-        soup = BeautifulSoup(response.content, 'lxml')
+        soup = BeautifulSoup(response.content, 'html.parser')
         rows = soup.findAll('tr')
 
         # Search on first 25 rows only
-        for row in rows[:25]:
+        for row in rows[-50:]:
             element = row.select_one('a.balon, a.selector')
             if element:
                 link = element.get('href')
@@ -163,20 +162,38 @@ class YavkaNetProvider(Provider):
                 element = row.find('a', {'class': 'click'})
                 uploader = element.get_text() if element else None
                 logger.info('Found subtitle link %r', link)
-                # slow down to prevent being throttled
-                time.sleep(1)
-                response = self.retry(self.session.get('https://yavka.net' + link))
-                if not response:
-                    continue
-                soup = BeautifulSoup(response.content, 'lxml')
-                subs_id = soup.find("input")
-                if subs_id:
-                    subs_id_name = subs_id['name']
-                    subs_id_value = subs_id['value']
+                
+                cache_link = 'https://yavka.net' + link + '/'
+                cache_key = sha1(cache_link.encode("utf-8")).digest()
+                request = region.get(cache_key)
+                if request is NO_VALUE:
+                    # slow down to prevent being throttled
+                    time.sleep(randint(0, 1))
+                    response = self.retry(self.session.get('https://yavka.net' + link))
+                    if not response:
+                        logger.info('Subtitle page did not load: %s', link)
+                        continue
+
+                    soup = BeautifulSoup(response.content, 'html.parser')
+                    post_form = soup.find('form', attrs={'method': 'POST'})
+                    if post_form:
+                        input_fields = post_form.find_all('input')
+                        subs_form_data = {}
+                        for input_field in input_fields:
+                            input_name = input_field.get('name')
+                            if input_name:  # Only add to dictionary if the input has a name
+                                subs_form_data[input_name] = input_field.get('value', '')
+                        logger.info('Found subtitle form data "%s" for %s', subs_form_data, link)
+                    else:
+                        logger.info('Could not find subtitle form data: %s', link)
+                        continue
                 else:
-                    continue
+                    # will fetch from cache
+                    subs_form_data = {}
+                    logger.info('Skipping routines. Will use cache: %s', link)
+
                 sub = self.download_archive_and_add_subtitle_files('https://yavka.net' + link + '/', language, video,
-                                                                   fps, subs_id_name, subs_id_value)
+                                                                   fps, subs_form_data)
                 for s in sub:
                     s.title = title
                     s.notes = notes
@@ -195,52 +212,48 @@ class YavkaNetProvider(Provider):
         else:
             seeking_subtitle_file = subtitle.filename
             arch = self.download_archive_and_add_subtitle_files(subtitle.page_link, subtitle.language, subtitle.video,
-                                                                subtitle.fps, subtitle.subs_id_name,
-                                                                subtitle.subs_id_value)
+                                                                subtitle.fps, subtitle.subs_form_data)
             for s in arch:
                 if s.filename == seeking_subtitle_file:
                     subtitle.content = s.content
 
     @staticmethod
-    def process_archive_subtitle_files(archive_stream, language, video, link, fps, subs_id_name, subs_id_value):
+    def process_archive_subtitle_files(archive_stream, language, video, link, fps, subs_form_data):
         subtitles = []
         media_type = 'episode' if isinstance(video, Episode) else 'movie'
         for file_name in archive_stream.namelist():
             if file_name.lower().endswith(('.srt', '.sub')):
                 logger.info('Found subtitle file %r', file_name)
-                subtitle = YavkaNetSubtitle(language, file_name, media_type, video, link, fps, subs_id_name,
-                                            subs_id_value)
+                subtitle = YavkaNetSubtitle(language, file_name, media_type, video, link, fps, subs_form_data)
                 subtitle.content = fix_line_ending(archive_stream.read(file_name))
                 subtitles.append(subtitle)
         return subtitles
 
-    def download_archive_and_add_subtitle_files(self, link, language, video, fps, subs_id_name, subs_id_value):
+    def download_archive_and_add_subtitle_files(self, link, language, video, fps, subs_form_data):
         logger.info('Downloading subtitle %r', link)
         cache_key = sha1(link.encode("utf-8")).digest()
         request = region.get(cache_key)
         if request is NO_VALUE:
             time.sleep(1)
-            request = self.retry(self.session.post(link, data={
-                subs_id_name: subs_id_value,
-                'lng': language.basename.upper()
-            }, headers={
+            request = self.retry(self.session.post(link, data=subs_form_data, headers={
                 'referer': link
             }, allow_redirects=False))
             if not request:
                 return []
             request.raise_for_status()
             region.set(cache_key, request)
+            logger.info('Writing caching file %s for %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'), link)
         else:
-            logger.info('Cache file: %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'))
+            logger.info('Using cache file %s for %s', codecs.encode(cache_key, 'hex_codec').decode('utf-8'), link)
 
         try:
             archive_stream = io.BytesIO(request.content)
             if is_rarfile(archive_stream):
                 return self.process_archive_subtitle_files(RarFile(archive_stream), language, video, link, fps,
-                                                           subs_id_name, subs_id_value)
+                                                           subs_form_data)
             elif is_zipfile(archive_stream):
                 return self.process_archive_subtitle_files(ZipFile(archive_stream), language, video, link, fps,
-                                                           subs_id_name, subs_id_value)
+                                                           subs_form_data)
         except:
             pass
 
diff --git a/custom_libs/subliminal_patch/providers/zimuku.py b/custom_libs/subliminal_patch/providers/zimuku.py
index 9fc97eba0..b57d9af32 100644
--- a/custom_libs/subliminal_patch/providers/zimuku.py
+++ b/custom_libs/subliminal_patch/providers/zimuku.py
@@ -177,28 +177,41 @@ class ZimukuProvider(Provider):
             ]  # remove ext because it can be an archive type
 
             language = Language("eng")
+            language_list = []
+
             for img in sub.find("td", class_="tac lang").find_all("img"):
                 if (
                         "china" in img.attrs["src"]
                         and "hongkong" in img.attrs["src"]
                 ):
-                    language = Language("zho").add(Language('zho', 'TW', None))
                     logger.debug("language:" + str(language))
+                    
+                    language = Language("zho").add(Language('zho', 'TW', None))
+                    language_list.append(language)
                 elif (
                         "china" in img.attrs["src"]
                         or "jollyroger" in img.attrs["src"]
                 ):
+                    logger.debug("language chinese simplified found: " + str(language))
+
                     language = Language("zho")
+                    language_list.append(language)
                 elif "hongkong" in img.attrs["src"]:
+                    logger.debug("language chinese traditional found: " + str(language))
+
                     language = Language('zho', 'TW', None)
-                    break
+                    language_list.append(language)
             sub_page_link = urljoin(self.server_url, a.attrs["href"])
             backup_session = copy.deepcopy(self.session)
             backup_session.headers["Referer"] = link
 
-            subs.append(
-                self.subtitle_class(language, sub_page_link, name, backup_session, year)
-            )
+            # Mark each language of the subtitle as its own subtitle, and add it to the list, when handling archives or subtitles
+            # with multiple languages to ensure each language is identified as its own subtitle since they are the same archive file
+            # but will have its own file when downloaded and extracted.
+            for language in language_list:
+                subs.append(
+                    self.subtitle_class(language, sub_page_link, name, backup_session, year)
+                )
 
         return subs
 
diff --git a/custom_libs/subliminal_patch/subtitle.py b/custom_libs/subliminal_patch/subtitle.py
index 82d5a6895..5e9a8fd06 100644
--- a/custom_libs/subliminal_patch/subtitle.py
+++ b/custom_libs/subliminal_patch/subtitle.py
@@ -414,7 +414,7 @@ class Subtitle(Subtitle_):
                 encoding=self.get_encoding())
 
         submods = SubtitleModifications(debug=debug)
-        if submods.load(content=self.text, language=self.language):
+        if submods.load(content=self.text, language=self.language, mods=self.mods):
             logger.info("Applying mods: %s", self.mods)
             submods.modify(*self.mods)
             self.mods = submods.mods_used
diff --git a/custom_libs/subzero/modification/main.py b/custom_libs/subzero/modification/main.py
index b0faddd4e..011aaacf3 100644
--- a/custom_libs/subzero/modification/main.py
+++ b/custom_libs/subzero/modification/main.py
@@ -22,7 +22,7 @@ class SubtitleModifications(object):
     language = None
     initialized_mods = {}
     mods_used = []
-    only_uppercase = False
+    mostly_uppercase = False
     f = None
 
     font_style_tag_start = u"{\\"
@@ -32,15 +32,18 @@ class SubtitleModifications(object):
         self.initialized_mods = {}
         self.mods_used = []
 
-    def load(self, fn=None, content=None, language=None, encoding="utf-8"):
+    def load(self, fn=None, content=None, language=None, encoding="utf-8", mods=None):
         """
 
         :param encoding: used for decoding the content when fn is given, not used in case content is given
         :param language: babelfish.Language language of the subtitle
         :param fn:  filename
         :param content: unicode
+        :param mods: list of mods to be applied to subtitles
         :return:
         """
+        if mods is None:
+            mods = []
         if language:
             self.language = Language.rebuild(language, forced=False)
         self.initialized_mods = {}
@@ -48,7 +51,11 @@ class SubtitleModifications(object):
             if fn:
                 self.f = pysubs2.load(fn, encoding=encoding)
             elif content:
-                self.f = pysubs2.SSAFile.from_string(content)
+                from_string_additional_kwargs = {}
+                if 'remove_tags' not in mods:
+                    from_string_additional_kwargs = {'keep_html_tags': True, 'keep_unknown_html_tags': True,
+                                                     'keep_ssa_tags': True}
+                self.f = pysubs2.SSAFile.from_string(content, **from_string_additional_kwargs)
         except (IOError,
                 UnicodeDecodeError,
                 pysubs2.exceptions.UnknownFPSError,
@@ -111,7 +118,7 @@ class SubtitleModifications(object):
                                  identifier, self.language)
                 continue
 
-            if mod_cls.only_uppercase and not self.only_uppercase:
+            if mod_cls.mostly_uppercase and not self.mostly_uppercase:
                 if self.debug:
                     logger.debug("Skipping %s, because the subtitle isn't all uppercase", identifier)
                 continue
@@ -181,41 +188,43 @@ class SubtitleModifications(object):
         return line_mods, non_line_mods, used_mods
 
     def detect_uppercase(self):
-        entries_used = 0
-        for entry in self.f:
-            entry_used = False
-            sub = entry.text
-            # skip HI bracket entries, those might actually be lowercase
-            sub = sub.strip()
-            for processor in registry.mods["remove_HI"].processors[:4]:
-                sub = processor.process(sub)
+            MAXIMUM_ENTRIES = 50
+            MINIMUM_UPPERCASE_PERCENTAGE = 90
+            MINIMUM_UPPERCASE_COUNT = 100
+            entry_count = 0
+            uppercase_count = 0
+            lowercase_count = 0
 
-            if sub.strip():
-                # only consider alphabetic characters to determine if uppercase
-                alpha_sub = ''.join([i for i in sub if i.isalpha()])
-                if alpha_sub and not alpha_sub.isupper():
-                    return False
+            for entry in self.f:
+                sub = entry.text
+                # skip HI bracket entries, those might actually be lowercase
+                sub = sub.strip()
+                for processor in registry.mods["remove_HI"].processors[:4]:
+                    sub = processor.process(sub)
 
-                entry_used = True
-            else:
-                # skip full entry
-                break
+                if sub.strip():
+                    uppercase_count += sum(1 for char in sub if char.isupper())
+                    lowercase_count += sum(1 for char in sub if char.islower())
+                    entry_count += 1
 
-            if entry_used:
-                entries_used += 1
+                if entry_count >= MAXIMUM_ENTRIES:
+                    break
 
-            if entries_used == 40:
-                break
-
-        return True
+            total_character_count = lowercase_count + uppercase_count
+            if total_character_count > 0 and uppercase_count > MINIMUM_UPPERCASE_COUNT:
+                uppercase_percentage = uppercase_count * 100 / total_character_count
+                logger.debug(f"Uppercase mod percentage is {uppercase_percentage:.2f}% vs minimum of {MINIMUM_UPPERCASE_PERCENTAGE}%")
+                return uppercase_percentage >= MINIMUM_UPPERCASE_PERCENTAGE
+            
+            return False
 
     def modify(self, *mods):
         new_entries = []
         start = time.time()
-        self.only_uppercase = self.detect_uppercase()
+        self.mostly_uppercase = self.detect_uppercase()
 
-        if self.only_uppercase and self.debug:
-            logger.debug("Full-uppercase subtitle found")
+        if self.mostly_uppercase and self.debug:
+            logger.debug("Mostly-uppercase subtitle found")
 
         line_mods, non_line_mods, mods_used = self.prepare_mods(*mods)
         self.mods_used = mods_used
diff --git a/custom_libs/subzero/modification/mods/__init__.py b/custom_libs/subzero/modification/mods/__init__.py
index b1a828ad4..3b894e80d 100644
--- a/custom_libs/subzero/modification/mods/__init__.py
+++ b/custom_libs/subzero/modification/mods/__init__.py
@@ -19,7 +19,7 @@ class SubtitleModification(object):
     order = None
     modifies_whole_file = False  # operates on the whole file, not individual entries
     apply_last = False
-    only_uppercase = False
+    mostly_uppercase = False
     pre_processors = []
     processors = []
     post_processors = []
diff --git a/custom_libs/subzero/modification/mods/common.py b/custom_libs/subzero/modification/mods/common.py
index d507347ae..c10d74bf4 100644
--- a/custom_libs/subzero/modification/mods/common.py
+++ b/custom_libs/subzero/modification/mods/common.py
@@ -175,7 +175,7 @@ class FixUppercase(SubtitleModification):
     modifies_whole_file = True
     exclusive = True
     order = 41
-    only_uppercase = True
+    mostly_uppercase = True
     apply_last = True
 
     long_description = "Some subtitles are in all-uppercase letters. This at least makes them readable."
diff --git a/custom_libs/subzero/modification/mods/hearing_impaired.py b/custom_libs/subzero/modification/mods/hearing_impaired.py
index 49bf57096..e1f6b7eff 100644
--- a/custom_libs/subzero/modification/mods/hearing_impaired.py
+++ b/custom_libs/subzero/modification/mods/hearing_impaired.py
@@ -48,8 +48,8 @@ class HearingImpaired(SubtitleTextModification):
                      else "" if not match.group(1).startswith(" ") else " ",
                      name="HI_before_colon_noncaps"),
 
-        # brackets (only remove if at least 3 chars in brackets)
-        NReProcessor(re.compile(r'(?sux)-?%(t)s["\']*[([][^([)\]]+?(?=[A-zÀ-ž"\'.]{3,})[^([)\]]+[)\]]["\']*[\s:]*%(t)s' %
+        # brackets (only remove if at least 3 chars in brackets, allow numbers and spaces inside brackets)
+        NReProcessor(re.compile(r'(?sux)-?%(t)s["\']*\[(?=[^\[\]]{3,})[A-Za-zÀ-ž0-9\s\'".:-_&+]+[)\]]["\']*[\s:]*%(t)s' %
                                 {"t": TAG}), "", name="HI_brackets"),
 
         #NReProcessor(re.compile(r'(?sux)-?%(t)s[([]%(t)s(?=[A-zÀ-ž"\'.]{3,})[^([)\]]+%(t)s$' % {"t": TAG}),
@@ -71,9 +71,19 @@ class HearingImpaired(SubtitleTextModification):
         #NReProcessor(re.compile(r'(?um)(^-?\s?[([][A-zÀ-ž-_\s]{3,}[)\]](?:(?=$)|:\s*))'), "",
         #             name="HI_brackets_special"),
 
-        # all caps line (at least 4 consecutive uppercase chars)
-        NReProcessor(re.compile(r'(?u)(^(?=.*[A-ZÀ-Ž&+]{4,})[A-ZÀ-Ž-_\s&+]+$)'), "", name="HI_all_caps",
-                     supported=lambda p: not p.only_uppercase),
+        # all caps line (at least 4 consecutive uppercase chars,only remove if line matches common HI cues, otherwise keep)
+        NReProcessor(
+            re.compile(r'(?u)(^(?=.*[A-ZÀ-Ž&+]{4,})[A-ZÀ-Ž-_\s&+]+$)'),
+            lambda m: "" if any(
+                cue in m.group(1)
+                for cue in [
+                    "LAUGH", "APPLAU", "CHEER", "MUSIC", "GASP", "SIGHS", "GROAN", "COUGH", "SCREAM", "SHOUT", "WHISPER",
+                    "PHONE", "DOOR", "KNOCK", "FOOTSTEP", "THUNDER", "EXPLOSION", "GUNSHOT", "SIREN"
+                ]
+            ) else m.group(1),
+            name="HI_all_caps",
+            supported=lambda p: not p.mostly_uppercase
+        ),
 
         # remove MAN:
         NReProcessor(re.compile(r'(?suxi)(\b(?:WO)MAN:\s*)'), "", name="HI_remove_man"),
@@ -83,7 +93,7 @@ class HearingImpaired(SubtitleTextModification):
 
         # all caps at start before new sentence
         NReProcessor(re.compile(r'(?u)^(?=[A-ZÀ-Ž]{4,})[A-ZÀ-Ž-_\s]+\s([A-ZÀ-Ž][a-zà-ž].+)'), r"\1",
-                     name="HI_starting_upper_then_sentence", supported=lambda p: not p.only_uppercase),
+                     name="HI_starting_upper_then_sentence", supported=lambda p: not p.mostly_uppercase),
     ]
 
     post_processors = empty_line_post_processors
diff --git a/custom_libs/subzero/modification/mods/ocr_fixes.py b/custom_libs/subzero/modification/mods/ocr_fixes.py
index 1b2940dcd..f50ffd41f 100644
--- a/custom_libs/subzero/modification/mods/ocr_fixes.py
+++ b/custom_libs/subzero/modification/mods/ocr_fixes.py
@@ -41,7 +41,7 @@ class FixOCR(SubtitleTextModification):
             # don't modify stuff inside quotes
             #NReProcessor(re.compile(r'(?u)(^[^"\'’ʼ❜‘‛”“‟„]*(?<=[A-ZÀ-Ž]{3})[A-ZÀ-Ž-_\s0-9]+)'
             #                        r'(["\'’ʼ❜‘‛”“‟„]*[.,‚،⹁、;]+)(\s*)(?!["\'’ʼ❜‘‛”“‟„])'),
-            #             r"\1:\3", name="OCR_fix_HI_colons", supported=lambda p: not p.only_uppercase),
+            #             r"\1:\3", name="OCR_fix_HI_colons", supported=lambda p: not p.mostly_uppercase),
             # fix F'bla
             NReProcessor(re.compile(r'(?u)(\bF)(\')([A-zÀ-ž]*\b)'), r"\1\3", name="OCR_fix_F"),
             WholeLineProcessor(self.data_dict["WholeLines"], name="OCR_replace_line"),
diff --git a/frontend/.nvmrc b/frontend/.nvmrc
index 973f49d55..6fa8dec4c 100644
--- a/frontend/.nvmrc
+++ b/frontend/.nvmrc
@@ -1 +1 @@
-20.13
+22.13.0
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 000000000..1aabc6942
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,33 @@
+# syntax=docker/dockerfile:1  
+ARG NODE_VERSION=20
+
+FROM node:${NODE_VERSION}-alpine  
+
+# Use development node environment by default.  
+ENV NODE_ENV development  
+
+WORKDIR /app  
+
+# Copy package.json and package-lock.json to the working directory  
+COPY package.json package-lock.json ./  
+
+# Install dependencies  
+RUN npm install  
+
+# Copy the rest of the source files into the image  
+COPY . .  
+
+# Change ownership of the /app directory to the node user  
+RUN chown -R node:node /app  
+
+# Switch to the node user  
+USER node  
+
+# Ensure node_modules/.bin is in the PATH  
+ENV PATH /app/node_modules/.bin:$PATH  
+
+# Expose the port that the application listens on  
+EXPOSE 5173  
+
+# Run the application  
+CMD ["npm", "start"]  
\ No newline at end of file
diff --git a/frontend/README.md b/frontend/README.md
index b3af2f6f4..75de12446 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -4,6 +4,7 @@
 
 - Either [Node.js](https://nodejs.org/) installed manually or using [Node Version Manager](https://github.com/nvm-sh/nvm)
 - npm (included in Node.js)
+- (Optional) [Docker](https://www.docker.com/) for building and running the frontend using a Docker image
 
 > The recommended Node version to use and maintained is managed on the `.nvmrc` file. You can either install manually
 > or use `nvm install` followed by `nvm use`.
@@ -55,6 +56,36 @@
    $ npm start
    ```
 
+## Building with Docker
+
+You can now build and run the frontend using Docker. Follow these steps:
+
+### Benefits of Using Docker
+
+- **Consistency**: Ensures the app runs in the same environment across all systems.
+- **Isolation**: Avoids dependency conflicts with other projects on your machine.
+- **Ease of Deployment**: Simplifies the process of deploying the app to production.
+
+### Steps to Build and Run
+
+1. Build the Docker image with the Node.js version specified in `.nvmrc`:
+
+   ```
+   $ docker build --build-arg NODE_VERSION=$(cat .nvmrc 2>/dev/null || echo "20") -t your-image-name .
+   ```
+
+   - The `docker build --build-arg NODE_VERSION=$(cat .nvmrc 2>/dev/null || echo "20") -t your-image-name .` argument ensures the Docker image uses the Node.js version specified in the `.nvmrc` file.
+
+2. Run the Docker container:
+
+   ```
+   $ docker run -p 5173:5173 your-image-name
+   ```
+
+   - Add `.env.development.local` with the path to your environment file if needed.
+
+3. Open the app in your browser at `http://localhost:5173`.
+
 ## Available Scripts
 
 In the project directory, you can run:
@@ -75,4 +106,4 @@ Builds the app in production mode and save to the `build` folder.
 
 Format code for all files in `frontend` folder
 
-This command will be automatic triggered before any commits to git. Run manually if you modify `.prettierignore` or `.prettierrc`
+This command will be automatically triggered before any commits to git. Run manually if you modify `.prettierignore` or `.prettierrc`.
diff --git a/frontend/config/chunks.ts b/frontend/config/chunks.ts
index 6dc7f3772..114a1c2c5 100644
--- a/frontend/config/chunks.ts
+++ b/frontend/config/chunks.ts
@@ -3,7 +3,7 @@ import { dependencies } from "../package.json";
 
 const vendors = [
   "react",
-  "react-router-dom",
+  "react-router",
   "react-dom",
   "@tanstack/react-query",
   "axios",
diff --git a/frontend/config/configReader.ts b/frontend/config/configReader.ts
index e48396992..9f9b94c43 100644
--- a/frontend/config/configReader.ts
+++ b/frontend/config/configReader.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 /// <reference types="node" />
 
-import { readFile } from "fs/promises";
+import { readFileSync } from "fs";
 import { get } from "lodash";
 import { parse } from "yaml";
 
@@ -12,9 +12,9 @@ class ConfigReader {
     this.config = {};
   }
 
-  async open(path: string) {
+  open(path: string) {
     try {
-      const rawConfig = await readFile(path, "utf8");
+      const rawConfig = readFileSync(path, "utf8");
       this.config = parse(rawConfig);
     } catch (err) {
       // We don't want to catch the error here, handle it on getValue method
@@ -33,7 +33,7 @@ class ConfigReader {
   }
 }
 
-export default async function overrideEnv(env: Record<string, string>) {
+export default function overrideEnv(env: Record<string, string>) {
   const configPath = env["VITE_BAZARR_CONFIG_FILE"];
 
   if (configPath === undefined) {
@@ -41,7 +41,7 @@ export default async function overrideEnv(env: Record<string, string>) {
   }
 
   const reader = new ConfigReader();
-  await reader.open(configPath);
+  reader.open(configPath);
 
   if (env["VITE_API_KEY"] === undefined) {
     try {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 844959798..7e7c07445 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9,43 +9,43 @@
       "version": "1.0.0",
       "license": "GPL-3",
       "dependencies": {
-        "@mantine/core": "^7.14.3",
-        "@mantine/dropzone": "^7.14.3",
-        "@mantine/form": "^7.14.3",
-        "@mantine/hooks": "^7.14.3",
-        "@mantine/modals": "^7.14.3",
-        "@mantine/notifications": "^7.14.3",
-        "@tanstack/react-query": "^5.40.1",
+        "@mantine/core": "^7.17.4",
+        "@mantine/dropzone": "^7.17.4",
+        "@mantine/form": "^7.17.4",
+        "@mantine/hooks": "^7.17.4",
+        "@mantine/modals": "^7.17.4",
+        "@mantine/notifications": "^7.17.4",
+        "@tanstack/react-query": "^5.64.1",
         "@tanstack/react-table": "^8.19.2",
-        "axios": "^1.7.4",
+        "axios": "^1.8.2",
         "braces": "^3.0.3",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-router-dom": "^6.23.1",
+        "react": "^19.1.0",
+        "react-dom": "^19.1.0",
+        "react-router": "^7.1.1",
         "socket.io-client": "^4.7.5"
       },
       "devDependencies": {
         "@fontsource/roboto": "^5.0.12",
-        "@fortawesome/fontawesome-svg-core": "^6.7.1",
-        "@fortawesome/free-brands-svg-icons": "^6.7.1",
-        "@fortawesome/free-regular-svg-icons": "^6.7.1",
-        "@fortawesome/free-solid-svg-icons": "^6.7.1",
+        "@fortawesome/fontawesome-svg-core": "^6.7.2",
+        "@fortawesome/free-brands-svg-icons": "^6.7.2",
+        "@fortawesome/free-regular-svg-icons": "^6.7.2",
+        "@fortawesome/free-solid-svg-icons": "^6.7.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
         "@tanstack/react-query-devtools": "^5.40.1",
         "@testing-library/jest-dom": "^6.4.2",
-        "@testing-library/react": "^15.0.5",
+        "@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": "^20.12.6",
-        "@types/react": "^18.3.11",
-        "@types/react-dom": "^18.3.0",
+        "@types/node": "^22.14.1",
+        "@types/react": "^19.1.2",
+        "@types/react-dom": "^19.1.2",
         "@typescript-eslint/eslint-plugin": "^7.16.0",
         "@typescript-eslint/parser": "^7.16.0",
-        "@vite-pwa/assets-generator": "^0.2.4",
+        "@vite-pwa/assets-generator": "^1.0.0",
         "@vitejs/plugin-react": "^4.2.1",
-        "@vitest/coverage-v8": "^1.4.0",
-        "@vitest/ui": "^1.2.2",
+        "@vitest/coverage-v8": "^3.1.1",
+        "@vitest/ui": "^3.1.1",
         "clsx": "^2.1.0",
         "eslint": "^8.57.0",
         "eslint-plugin-react-hooks": "^4.6.0",
@@ -53,32 +53,24 @@
         "eslint-plugin-simple-import-sort": "^12.1.0",
         "eslint-plugin-testing-library": "^6.2.0",
         "husky": "^9.0.11",
-        "jsdom": "^24.0.0",
+        "jsdom": "^26.0.0",
         "lodash": "^4.17.21",
+        "msw": "^2.7.0",
         "postcss-preset-mantine": "^1.14.4",
         "postcss-simple-vars": "^7.0.1",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^3.2.4",
         "pretty-quick": "^4.0.0",
-        "recharts": "^2.12.7",
-        "sass": "^1.74.1",
+        "recharts": "^2.15.0",
+        "sass-embedded": "^1.86.1",
         "typescript": "^5.4.4",
-        "vite": "^5.4.8",
-        "vite-plugin-checker": "^0.6.4",
-        "vite-plugin-pwa": "^0.20.0",
-        "vitest": "^1.2.2",
+        "vite": "^6.3.2",
+        "vite-plugin-checker": "^0.9.1",
+        "vite-plugin-pwa": "^1.0.0",
+        "vitest": "^3.1.1",
         "yaml": "^2.4.1"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@adobe/css-tools": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz",
@@ -98,23 +90,36 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@antfu/utils": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.10.tgz",
-      "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
+    "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==",
       "dev": true,
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
+      "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"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+    "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==",
       "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.2",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -122,30 +127,32 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
-      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
-      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
+      "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.4",
-        "@babel/parser": "^7.24.4",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.10",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.10",
+        "@babel/parser": "^7.26.10",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.10",
+        "@babel/types": "^7.26.10",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -167,53 +174,45 @@
       "dev": true
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
+      "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.0",
+        "@babel/parser": "^7.27.0",
+        "@babel/types": "^7.27.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
+      "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.26.8",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -222,19 +221,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz",
-      "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@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",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -245,13 +243,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -262,10 +261,11 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz",
-      "integrity": "sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -277,75 +277,44 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
-      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -355,35 +324,38 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -393,14 +365,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
-      "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -409,188 +382,88 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
-      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
-      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
+      "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
+        "@babel/template": "^7.27.0",
+        "@babel/types": "^7.27.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
+      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.0"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -599,13 +472,30 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz",
-      "integrity": "sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -615,12 +505,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.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.24.1.tgz",
-      "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -630,14 +521,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -647,13 +539,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz",
-      "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -667,6 +560,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -674,76 +568,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz",
-      "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -753,138 +585,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
-      "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -898,6 +605,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -910,12 +618,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz",
-      "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -925,15 +634,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
-      "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.26.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -943,14 +652,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
-      "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -960,12 +670,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz",
-      "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -975,12 +686,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz",
-      "integrity": "sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -990,13 +702,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
-      "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1006,14 +719,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
-      "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.4",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1023,18 +736,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz",
-      "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@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"
       },
       "engines": {
@@ -1045,13 +757,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
-      "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/template": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1061,12 +774,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz",
-      "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1076,13 +790,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz",
-      "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1092,12 +807,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz",
-      "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1106,14 +822,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz",
-      "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==",
+    "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1123,13 +856,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz",
-      "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1139,13 +872,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
-      "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1155,13 +888,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz",
-      "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1171,14 +905,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz",
-      "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1188,13 +923,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz",
-      "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1204,12 +939,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz",
-      "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1219,13 +955,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
-      "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1235,12 +971,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz",
-      "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1250,13 +987,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz",
-      "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1266,14 +1004,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
-      "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1283,15 +1021,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz",
-      "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@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"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1301,13 +1040,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz",
-      "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1317,13 +1057,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1333,12 +1074,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz",
-      "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1348,13 +1090,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
-      "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1364,13 +1106,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
-      "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1380,15 +1122,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz",
-      "integrity": "sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.1"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1398,13 +1140,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz",
-      "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-replace-supers": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1414,13 +1157,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz",
-      "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1430,14 +1173,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1447,12 +1190,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz",
-      "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1462,13 +1206,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
-      "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1478,15 +1223,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
-      "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1496,12 +1241,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz",
-      "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1511,12 +1257,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz",
-      "integrity": "sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz",
+      "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1526,12 +1273,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.1.tgz",
-      "integrity": "sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz",
+      "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1541,12 +1289,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz",
-      "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.26.5",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1556,13 +1305,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz",
-      "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==",
+    "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1572,12 +1339,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz",
-      "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1587,13 +1355,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz",
-      "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1603,12 +1372,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz",
-      "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1618,12 +1388,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz",
-      "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1633,12 +1404,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz",
-      "integrity": "sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1648,12 +1420,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz",
-      "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1663,13 +1436,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz",
-      "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1679,13 +1453,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz",
-      "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1695,13 +1470,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz",
-      "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1711,91 +1487,80 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz",
-      "integrity": "sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.4",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+        "@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/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.1",
-        "@babel/plugin-syntax-import-attributes": "^7.24.1",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.3",
-        "@babel/plugin-transform-async-to-generator": "^7.24.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
-        "@babel/plugin-transform-block-scoping": "^7.24.4",
-        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-transform-class-static-block": "^7.24.4",
-        "@babel/plugin-transform-classes": "^7.24.1",
-        "@babel/plugin-transform-computed-properties": "^7.24.1",
-        "@babel/plugin-transform-destructuring": "^7.24.1",
-        "@babel/plugin-transform-dotall-regex": "^7.24.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.1",
-        "@babel/plugin-transform-dynamic-import": "^7.24.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-        "@babel/plugin-transform-for-of": "^7.24.1",
-        "@babel/plugin-transform-function-name": "^7.24.1",
-        "@babel/plugin-transform-json-strings": "^7.24.1",
-        "@babel/plugin-transform-literals": "^7.24.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.1",
-        "@babel/plugin-transform-modules-amd": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.1",
-        "@babel/plugin-transform-modules-umd": "^7.24.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.24.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.1",
-        "@babel/plugin-transform-object-super": "^7.24.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1",
-        "@babel/plugin-transform-parameters": "^7.24.1",
-        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-        "@babel/plugin-transform-property-literals": "^7.24.1",
-        "@babel/plugin-transform-regenerator": "^7.24.1",
-        "@babel/plugin-transform-reserved-words": "^7.24.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.1",
-        "@babel/plugin-transform-spread": "^7.24.1",
-        "@babel/plugin-transform-sticky-regex": "^7.24.1",
-        "@babel/plugin-transform-template-literals": "^7.24.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+        "@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/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-corejs3": "^0.11.0",
         "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.31.0",
+        "core-js-compat": "^3.40.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1810,6 +1575,7 @@
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -1819,16 +1585,11 @@
         "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
     "node_modules/@babel/runtime": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz",
-      "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1837,33 +1598,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
+      "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.27.0",
+        "@babel/types": "^7.27.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
+      "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.27.0",
+        "@babel/parser": "^7.27.0",
+        "@babel/template": "^7.27.0",
+        "@babel/types": "^7.27.0",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1872,24 +1632,92 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
+      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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==",
+      "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"
+      }
+    },
+    "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==",
+      "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"
+      }
     },
     "node_modules/@canvas/image-data": {
       "version": "1.0.0",
@@ -1898,10 +1726,125 @@
       "dev": true,
       "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.0.1",
+        "@csstools/css-calc": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.3"
+      }
+    },
+    "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
+      "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
       "cpu": [
         "ppc64"
       ],
@@ -1912,13 +1855,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
+      "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
       "cpu": [
         "arm"
       ],
@@ -1929,13 +1872,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
+      "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
       "cpu": [
         "arm64"
       ],
@@ -1946,13 +1889,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
+      "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
       "cpu": [
         "x64"
       ],
@@ -1963,13 +1906,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
+      "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
       "cpu": [
         "arm64"
       ],
@@ -1980,13 +1923,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
+      "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
       "cpu": [
         "x64"
       ],
@@ -1997,13 +1940,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
+      "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
       "cpu": [
         "arm64"
       ],
@@ -2014,13 +1957,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
+      "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
       "cpu": [
         "x64"
       ],
@@ -2031,13 +1974,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
+      "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
       "cpu": [
         "arm"
       ],
@@ -2048,13 +1991,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
+      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
       "cpu": [
         "arm64"
       ],
@@ -2065,13 +2008,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
+      "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
       "cpu": [
         "ia32"
       ],
@@ -2082,13 +2025,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
+      "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
       "cpu": [
         "loong64"
       ],
@@ -2099,13 +2042,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
+      "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
       "cpu": [
         "mips64el"
       ],
@@ -2116,13 +2059,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
+      "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
       "cpu": [
         "ppc64"
       ],
@@ -2133,13 +2076,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
+      "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
       "cpu": [
         "riscv64"
       ],
@@ -2150,13 +2093,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
+      "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
       "cpu": [
         "s390x"
       ],
@@ -2167,13 +2110,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
+      "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
       "cpu": [
         "x64"
       ],
@@ -2184,13 +2127,30 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
+      "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
       "cpu": [
         "x64"
       ],
@@ -2201,13 +2161,30 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
+      "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
       "cpu": [
         "x64"
       ],
@@ -2218,13 +2195,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
+      "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
       "cpu": [
         "x64"
       ],
@@ -2235,13 +2212,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2252,13 +2229,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
+      "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
       "cpu": [
         "ia32"
       ],
@@ -2269,13 +2246,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
+      "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
       "cpu": [
         "x64"
       ],
@@ -2286,7 +2263,7 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -2373,26 +2350,29 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
-      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
+      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/utils": "^0.2.9"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.12",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz",
-      "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==",
+      "version": "1.6.13",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
+      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/utils": "^0.2.9"
       }
     },
     "node_modules/@floating-ui/react": {
       "version": "0.26.28",
       "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.28.tgz",
       "integrity": "sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/react-dom": "^2.1.2",
         "@floating-ui/utils": "^0.2.8",
@@ -2407,6 +2387,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
       "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.0.0"
       },
@@ -2416,9 +2397,10 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
+      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+      "license": "MIT"
     },
     "node_modules/@fontsource/roboto": {
       "version": "5.0.12",
@@ -2427,57 +2409,62 @@
       "dev": true
     },
     "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.1.tgz",
-      "integrity": "sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz",
+      "integrity": "sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.1.tgz",
-      "integrity": "sha512-8dBIHbfsKlCk2jHQ9PoRBg2Z+4TwyE3vZICSnoDlnsHA6SiMlTwfmW6yX0lHsRmWJugkeb92sA0hZdkXJhuz+g==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz",
+      "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.7.1"
+        "@fortawesome/fontawesome-common-types": "6.7.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-brands-svg-icons": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.1.tgz",
-      "integrity": "sha512-nJR76eqPzCnMyhbiGf6X0aclDirZriTPRcFm1YFvuupyJOGwlNF022w3YBqu+yrHRhnKRpzFX+8wJKqiIjWZkA==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.2.tgz",
+      "integrity": "sha512-zu0evbcRTgjKfrr77/2XX+bU+kuGfjm0LbajJHVIgBWNIDzrhpRxiCPNT8DW5AdmSsq7Mcf9D1bH0aSeSUSM+Q==",
       "dev": true,
+      "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.7.1"
+        "@fortawesome/fontawesome-common-types": "6.7.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-regular-svg-icons": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.1.tgz",
-      "integrity": "sha512-e13cp+bAx716RZOTQ59DhqikAgETA9u1qTBHO3e3jMQQ+4H/N1NC1ZVeFYt1V0m+Th68BrEL1/X6XplISutbXg==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.2.tgz",
+      "integrity": "sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==",
       "dev": true,
+      "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.7.1"
+        "@fortawesome/fontawesome-common-types": "6.7.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-solid-svg-icons": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.1.tgz",
-      "integrity": "sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz",
+      "integrity": "sha512-GsBrnOzU8uj0LECDfD5zomZJIjrPhIlWU82AHwa2s40FKH+kcxQaBvBo3Z4TxyZHIyX8XTDxsyA33/Vx9eFuQA==",
       "dev": true,
+      "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.7.1"
+        "@fortawesome/fontawesome-common-types": "6.7.2"
       },
       "engines": {
         "node": ">=6"
@@ -2529,11 +2516,189 @@
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
       "dev": true
     },
+    "node_modules/@inquirer/confirm": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.3.tgz",
+      "integrity": "sha512-fuF9laMmHoOgWapF9h9hv6opA5WvmGFHsTYGCmuFxcghIhEhb3dN0CdQR4BUMqa2H506NCj8cGX4jwMsE4t6dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^10.1.4",
+        "@inquirer/type": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.4.tgz",
+      "integrity": "sha512-5y4/PUJVnRb4bwWY67KLdebWOhOc7xj5IP2J80oWXa64mVag24rwQ1VAdnj7/eDY/odhguW0zQ1Mp1pj6fO/2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/figures": "^1.0.9",
+        "@inquirer/type": "^3.0.2",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^2.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.9.tgz",
+      "integrity": "sha512-BXvGj0ehzrngHTPTDqUoDT3NXL8U0RxUk2zJm2A66RhCEIWdtU1v6GuUqNAgArW4PQ9CinqIWyHdQgdwOj06zQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.2.tgz",
+      "integrity": "sha512-ZhQ4TvhwHZF+lGhQ2O/rsjo80XoZR5/5qhOY3t6FJuX5XBg5Be8YzYTvaUGJnc12AUGI2nr4QSUE4PhKSigx7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@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==",
+      "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_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==",
+      "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/@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==",
+      "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_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==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2623,10 +2788,11 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
@@ -2639,19 +2805,20 @@
       }
     },
     "node_modules/@mantine/core": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/core/-/core-7.14.3.tgz",
-      "integrity": "sha512-niAi+ZYBr4KrG+X2Mx+muvEzUOOHc/Rx0vsbIGYeNe7urwHSm/xNEGsaapmCqeRC0CSL4KI6TJOq8QhnSuQZcw==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/core/-/core-7.17.4.tgz",
+      "integrity": "sha512-Ea4M/98jxgIWCuxCdM0YIotVYjfLTGQsfIA6zDg0LsClgjo/ZLnnh4zbi+bLNgM+GGjP4ju7gv4MZvaTKuLO8g==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/react": "^0.26.28",
         "clsx": "^2.1.1",
-        "react-number-format": "^5.4.2",
-        "react-remove-scroll": "^2.6.0",
-        "react-textarea-autosize": "8.5.5",
+        "react-number-format": "^5.4.3",
+        "react-remove-scroll": "^2.6.2",
+        "react-textarea-autosize": "8.5.9",
         "type-fest": "^4.27.0"
       },
       "peerDependencies": {
-        "@mantine/hooks": "7.14.3",
+        "@mantine/hooks": "7.17.4",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
@@ -2668,23 +2835,25 @@
       }
     },
     "node_modules/@mantine/dropzone": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/dropzone/-/dropzone-7.14.3.tgz",
-      "integrity": "sha512-9ExiWRod5/gBHBd4hsUnPk7Rles0BiJr5FE2Kuq7lqeEXbtYfuSognJD/f5atMgu/5mMEkkyK/Bq5XesZBumBQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/dropzone/-/dropzone-7.17.4.tgz",
+      "integrity": "sha512-jtKbesdCXrn3QLiHz0Ed3hLcY72rTmAhmB4gztL916LUOptYY+eFwQzXQdPOrquJgxQDt1A9LOA2Nug9cgP7tw==",
+      "license": "MIT",
       "dependencies": {
         "react-dropzone-esm": "15.2.0"
       },
       "peerDependencies": {
-        "@mantine/core": "7.14.3",
-        "@mantine/hooks": "7.14.3",
+        "@mantine/core": "7.17.4",
+        "@mantine/hooks": "7.17.4",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/form": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/form/-/form-7.14.3.tgz",
-      "integrity": "sha512-NquXVQz3IRCT5WTWCEdQjQzThMj7FpX/u0PDD+8XydiMPB7zJGPM9IdV88mWDI2ghT9vS6rBn22XWjTYsKa8+A==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/form/-/form-7.17.4.tgz",
+      "integrity": "sha512-faCz44IpvLSv8ekG962SIOtRQc4gfC+zeXasbycWNYMW0k8ge7ch689KIuSYN00gdZat2UOaCbrr+yrTYjeuCQ==",
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "klona": "^2.0.6"
@@ -2694,47 +2863,69 @@
       }
     },
     "node_modules/@mantine/hooks": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-7.14.3.tgz",
-      "integrity": "sha512-cU3R9b8GLs6aCvpsVC56ZOOJCUIoDqX3RcLWkcfpA5a47LjWa/rzegP4YWfNW6/E9vodPJT4AEbYXVffYlyNwA==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-7.17.4.tgz",
+      "integrity": "sha512-PBcJxDAfGm8k1/JJmaDcxzRVQ3JSE1iXGktbgGz+qEOJmCxwbbAYe+CtGFFgi1xX2bPZ+7dtRr/+XFhnKtt/aw==",
+      "license": "MIT",
       "peerDependencies": {
         "react": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/modals": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-7.14.3.tgz",
-      "integrity": "sha512-wn2eMSROG7bPbeSH2OnTp8iVv1wH9L9tLeBt88mTEXLg3vIPfQtWD9g/kFrjhoCjygYYtyJeqMQFYPUkHQMXDw==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-7.17.4.tgz",
+      "integrity": "sha512-KQYzLCQRBs9bq0svdpSda8fgxmqrwEy4tgvoXpmlr02srsyySvpOxhXmAUZsjPZapG+D97sYi7BscVZKZoIqgA==",
+      "license": "MIT",
       "peerDependencies": {
-        "@mantine/core": "7.14.3",
-        "@mantine/hooks": "7.14.3",
+        "@mantine/core": "7.17.4",
+        "@mantine/hooks": "7.17.4",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/notifications": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-7.14.3.tgz",
-      "integrity": "sha512-7N9u4upi1On8TL94UvrUNhpDGxp1sAkbcgiNcu6zhvy4j29TPFapoXB5CRE9zzjAf3CYq3AigE96bXlCDm9xuQ==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-7.17.4.tgz",
+      "integrity": "sha512-YxNmnZSfIG69lPMFItOZZsizYL3DsOLVUSPkkJILG5pW2F798dc4IA5mhRIbdmzDEx0ArWHJ7gsdd3Vmm5ubPg==",
+      "license": "MIT",
       "dependencies": {
-        "@mantine/store": "7.14.3",
+        "@mantine/store": "7.17.4",
         "react-transition-group": "4.4.5"
       },
       "peerDependencies": {
-        "@mantine/core": "7.14.3",
-        "@mantine/hooks": "7.14.3",
+        "@mantine/core": "7.17.4",
+        "@mantine/hooks": "7.17.4",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/store": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/@mantine/store/-/store-7.14.3.tgz",
-      "integrity": "sha512-o15vbTUNlLqD/yLOtEClnc4fY2ONDaCZiaL9REUy0xhCDbVTeeqnu9BV604yuym50ZH5mhMHix1TX3K9vGsWvA==",
+      "version": "7.17.4",
+      "resolved": "https://registry.npmjs.org/@mantine/store/-/store-7.17.4.tgz",
+      "integrity": "sha512-a/EecHPtYVxhu3oMX9uTymGolmOBWxW8Qs4fLCjiazEJbS1ScI4lS71GK/SuOa2rGuuOJkaotpyritbx3paIRg==",
+      "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@open-draft/deferred-promise": "^2.2.0",
+        "@open-draft/logger": "^0.3.0",
+        "@open-draft/until": "^2.0.0",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "strict-event-emitter": "^0.5.1"
+      },
+      "engines": {
+        "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",
@@ -2770,31 +2961,75 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
-      "dev": true
+    "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",
+      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
-      "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+    "node_modules/@open-draft/logger": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz",
+      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.0"
+      }
+    },
+    "node_modules/@open-draft/until": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz",
+      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
+      "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==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=14"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.28",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+      "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
+      "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/@rollup/plugin-node-resolve": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
-      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
+      "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-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
         "resolve": "^1.22.1"
       },
@@ -2834,15 +3069,15 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -2863,10 +3098,23 @@
       "dev": true,
       "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
-      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.38.0.tgz",
+      "integrity": "sha512-ldomqc4/jDZu/xpYU+aRxo3V4mGCV9HeTgUBANI3oIQMOL+SsxB+S2lxMpkFp5UamSS3XuTMQVbsS24R4J4Qjg==",
       "cpu": [
         "arm"
       ],
@@ -2878,9 +3126,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
-      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.38.0.tgz",
+      "integrity": "sha512-VUsgcy4GhhT7rokwzYQP+aV9XnSLkkhlEJ0St8pbasuWO/vwphhZQxYEKUP3ayeCYLhk6gEtacRpYP/cj3GjyQ==",
       "cpu": [
         "arm64"
       ],
@@ -2892,9 +3140,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
-      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.38.0.tgz",
+      "integrity": "sha512-buA17AYXlW9Rn091sWMq1xGUvWQFOH4N1rqUxGJtEQzhChxWjldGCCup7r/wUnaI6Au8sKXpoh0xg58a7cgcpg==",
       "cpu": [
         "arm64"
       ],
@@ -2906,9 +3154,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
-      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.38.0.tgz",
+      "integrity": "sha512-Mgcmc78AjunP1SKXl624vVBOF2bzwNWFPMP4fpOu05vS0amnLcX8gHIge7q/lDAHy3T2HeR0TqrriZDQS2Woeg==",
       "cpu": [
         "x64"
       ],
@@ -2919,10 +3167,38 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.38.0.tgz",
+      "integrity": "sha512-zzJACgjLbQTsscxWqvrEQAEh28hqhebpRz5q/uUd1T7VTwUNZ4VIXQt5hE7ncs0GrF+s7d3S4on4TiXUY8KoQA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.38.0.tgz",
+      "integrity": "sha512-hCY/KAeYMCyDpEE4pTETam0XZS4/5GXzlLgpi5f0IaPExw9kuB+PDTOTLuPtM10TlRG0U9OSmXJ+Wq9J39LvAg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
-      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.38.0.tgz",
+      "integrity": "sha512-mimPH43mHl4JdOTD7bUMFhBdrg6f9HzMTOEnzRmXbOZqjijCw8LA5z8uL6LCjxSa67H2xiLFvvO67PT05PRKGg==",
       "cpu": [
         "arm"
       ],
@@ -2934,9 +3210,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
-      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.38.0.tgz",
+      "integrity": "sha512-tPiJtiOoNuIH8XGG8sWoMMkAMm98PUwlriOFCCbZGc9WCax+GLeVRhmaxjJtz6WxrPKACgrwoZ5ia/uapq3ZVg==",
       "cpu": [
         "arm"
       ],
@@ -2948,9 +3224,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
-      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.38.0.tgz",
+      "integrity": "sha512-wZco59rIVuB0tjQS0CSHTTUcEde+pXQWugZVxWaQFdQQ1VYub/sTrNdY76D1MKdN2NB48JDuGABP6o6fqos8mA==",
       "cpu": [
         "arm64"
       ],
@@ -2962,9 +3238,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
-      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.38.0.tgz",
+      "integrity": "sha512-fQgqwKmW0REM4LomQ+87PP8w8xvU9LZfeLBKybeli+0yHT7VKILINzFEuggvnV9M3x1Ed4gUBmGUzCo/ikmFbQ==",
       "cpu": [
         "arm64"
       ],
@@ -2975,10 +3251,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.38.0.tgz",
+      "integrity": "sha512-hz5oqQLXTB3SbXpfkKHKXLdIp02/w3M+ajp8p4yWOWwQRtHWiEOCKtc9U+YXahrwdk+3qHdFMDWR5k+4dIlddg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
-      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.38.0.tgz",
+      "integrity": "sha512-NXqygK/dTSibQ+0pzxsL3r4Xl8oPqVoWbZV9niqOnIHV/J92fe65pOir0xjkUZDRSPyFRvu+4YOpJF9BZHQImw==",
       "cpu": [
         "ppc64"
       ],
@@ -2990,9 +3280,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
-      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.38.0.tgz",
+      "integrity": "sha512-GEAIabR1uFyvf/jW/5jfu8gjM06/4kZ1W+j1nWTSSB3w6moZEBm7iBtzwQ3a1Pxos2F7Gz+58aVEnZHU295QTg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.38.0.tgz",
+      "integrity": "sha512-9EYTX+Gus2EGPbfs+fh7l95wVADtSQyYw4DfSBcYdUEAmP2lqSZY0Y17yX/3m5VKGGJ4UmIH5LHLkMJft3bYoA==",
       "cpu": [
         "riscv64"
       ],
@@ -3004,9 +3308,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
-      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.38.0.tgz",
+      "integrity": "sha512-Mpp6+Z5VhB9VDk7RwZXoG2qMdERm3Jw07RNlXHE0bOnEeX+l7Fy4bg+NxfyN15ruuY3/7Vrbpm75J9QHFqj5+Q==",
       "cpu": [
         "s390x"
       ],
@@ -3018,9 +3322,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
-      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.38.0.tgz",
+      "integrity": "sha512-vPvNgFlZRAgO7rwncMeE0+8c4Hmc+qixnp00/Uv3ht2x7KYrJ6ERVd3/R0nUtlE6/hu7/HiiNHJ/rP6knRFt1w==",
       "cpu": [
         "x64"
       ],
@@ -3032,9 +3336,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
-      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.38.0.tgz",
+      "integrity": "sha512-q5Zv+goWvQUGCaL7fU8NuTw8aydIL/C9abAVGCzRReuj5h30TPx4LumBtAidrVOtXnlB+RZkBtExMsfqkMfb8g==",
       "cpu": [
         "x64"
       ],
@@ -3046,9 +3350,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
-      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.38.0.tgz",
+      "integrity": "sha512-u/Jbm1BU89Vftqyqbmxdq14nBaQjQX1HhmsdBWqSdGClNaKwhjsg5TpW+5Ibs1mb8Es9wJiMdl86BcmtUVXNZg==",
       "cpu": [
         "arm64"
       ],
@@ -3060,9 +3364,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
-      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.38.0.tgz",
+      "integrity": "sha512-mqu4PzTrlpNHHbu5qleGvXJoGgHpChBlrBx/mEhTPpnAL1ZAYFlvHD7rLK839LLKQzqEQMFJfGrrOHItN4ZQqA==",
       "cpu": [
         "ia32"
       ],
@@ -3074,9 +3378,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
-      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.38.0.tgz",
+      "integrity": "sha512-jjqy3uWlecfB98Psxb5cD6Fny9Fupv9LrDSPTQZUROqjvZmcCqNu4UMl7qqhlUUGpwiAkotj6GYu4SZdcr/nLw==",
       "cpu": [
         "x64"
       ],
@@ -3122,9 +3426,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.40.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.40.0.tgz",
-      "integrity": "sha512-eD8K8jsOIq0Z5u/QbvOmfvKKE/XC39jA7yv4hgpl/1SRiU+J8QCIwgM/mEHuunQsL87dcvnHqSVLmf9pD4CiaA==",
+      "version": "5.64.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.64.1.tgz",
+      "integrity": "sha512-978Wx4Wl4UJZbmvU/rkaM9cQtXXrbhK0lsz/UZhYIbyKYA8E4LdomTwyh2GHZ4oU0BKKoDH4YlKk2VscCUgNmg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3143,19 +3447,19 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.40.1.tgz",
-      "integrity": "sha512-gOcmu+gpFd2taHrrgMM9RemLYYEDYfsCqszxCC0xtx+csDa4R8t7Hr7SfWXQP13S2sF+mOxySo/+FNXJFYBqcA==",
+      "version": "5.64.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.64.1.tgz",
+      "integrity": "sha512-vW5ggHpIO2Yjj44b4sB+Fd3cdnlMJppXRBJkEHvld6FXh3j5dwWJoQo7mGtKI2RbSFyiyu/PhGAy0+Vv5ev9Eg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.40.0"
+        "@tanstack/query-core": "5.64.1"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "react": "^18.0.0"
+        "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
@@ -3214,6 +3518,7 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.0.0.tgz",
       "integrity": "sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -3293,21 +3598,31 @@
       "dev": true
     },
     "node_modules/@testing-library/react": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.5.tgz",
-      "integrity": "sha512-ttodVWYA2i2w4hRa6krKrmS1vKxAEkwDz34y+CwbcrbZUxFzUYN3a5xZyFKo+K6LBseCRCUkwcjATpaNn/UsIA==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.1.0.tgz",
+      "integrity": "sha512-Q2ToPvg0KsVL0ohND9A3zLJWcOXXcO8IDu3fj11KhNt0UlCWyFyvnCIBkd12tidB2lkiVRG8VFqdhcqhqnAQtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^10.0.0",
-        "@types/react-dom": "^18.0.0"
+        "@babel/runtime": "^7.12.5"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
+        "@testing-library/dom": "^10.0.0",
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "@types/react-dom": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/@testing-library/user-event": {
@@ -3327,7 +3642,8 @@
       "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
+      "dev": true,
+      "peer": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -3370,6 +3686,13 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "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",
@@ -3434,9 +3757,9 @@
       "dev": true
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -3519,37 +3842,33 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.6.tgz",
-      "integrity": "sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==",
+      "version": "22.14.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
+      "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.21.0"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.12",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
-      "devOptional": true
-    },
     "node_modules/@types/react": {
-      "version": "18.3.11",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
-      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
+      "version": "19.1.2",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.2.tgz",
+      "integrity": "sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
-      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+      "version": "19.1.2",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.2.tgz",
+      "integrity": "sha512-XGJkWF41Qq305SKWEILa1O8vzhb3aOo3ogBlSmiqNko/WmRb6QIaweuZCXjKygVDXpzXb5wyxKTSOsmkuqj+Qw==",
       "dev": true,
-      "dependencies": {
-        "@types/react": "*"
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^19.0.0"
       }
     },
     "node_modules/@types/resolve": {
@@ -3571,6 +3890,20 @@
       "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==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -4279,18 +4612,18 @@
       "dev": true
     },
     "node_modules/@vite-pwa/assets-generator": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@vite-pwa/assets-generator/-/assets-generator-0.2.4.tgz",
-      "integrity": "sha512-DXyPLPR/IpbZPSpo1amZEPghY/ziIwpTUKNaz0v1xG+ELzCXmrVQhVzEMqr2JLSqRxjc+UzKfGJA/YdUuaao3w==",
+      "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "colorette": "^2.0.20",
-        "consola": "^3.2.3",
-        "sharp": "^0.32.6",
+        "consola": "^3.4.2",
+        "sharp": "^0.33.5",
         "sharp-ico": "^0.1.5",
-        "unconfig": "^0.3.11"
+        "unconfig": "^7.3.1"
       },
       "bin": {
         "pwa-assets-generator": "bin/pwa-assets-generator.mjs"
@@ -4303,233 +4636,218 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
-      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
+      "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.23.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
+        "@babel/core": "^7.26.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-source": "^7.25.9",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.0"
+        "react-refresh": "^0.14.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.4.0.tgz",
-      "integrity": "sha512-4hDGyH1SvKpgZnIByr9LhGgCEuF9DKM34IBLCC/fVfy24Z3+PZ+Ii9hsVBsHvY1umM1aGPEjceRkzxCfcQ10wg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.1.1.tgz",
+      "integrity": "sha512-MgV6D2dhpD6Hp/uroUoAIvFqA8AuvXEFBC2eepG3WFc1pxTfdk1LEqqkWoWhjz+rytoqrnUUCdf6Lzco3iHkLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@ampproject/remapping": "^2.2.1",
-        "@bcoe/v8-coverage": "^0.2.3",
-        "debug": "^4.3.4",
+        "@ampproject/remapping": "^2.3.0",
+        "@bcoe/v8-coverage": "^1.0.2",
+        "debug": "^4.4.0",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
-        "istanbul-lib-source-maps": "^5.0.4",
-        "istanbul-reports": "^3.1.6",
-        "magic-string": "^0.30.5",
-        "magicast": "^0.3.3",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.5.0",
-        "strip-literal": "^2.0.0",
-        "test-exclude": "^6.0.0",
-        "v8-to-istanbul": "^9.2.0"
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.17",
+        "magicast": "^0.3.5",
+        "std-env": "^3.8.1",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "1.4.0"
+        "@vitest/browser": "3.1.1",
+        "vitest": "3.1.1"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@vitest/expect": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.4.0.tgz",
-      "integrity": "sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==",
+    "node_modules/@vitest/coverage-v8/node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "1.4.0",
-        "@vitest/utils": "1.4.0",
-        "chai": "^4.3.10"
+        "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.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.1.tgz",
+      "integrity": "sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.1.1",
+        "@vitest/utils": "3.1.1",
+        "chai": "^5.2.0",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.1.tgz",
+      "integrity": "sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.1.1",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.17"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0 || ^6.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.1.tgz",
+      "integrity": "sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.4.0.tgz",
-      "integrity": "sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.1.tgz",
+      "integrity": "sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "1.4.0",
-        "p-limit": "^5.0.0",
-        "pathe": "^1.1.1"
+        "@vitest/utils": "3.1.1",
+        "pathe": "^2.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner/node_modules/p-limit": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
-      "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vitest/runner/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@vitest/snapshot": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.4.0.tgz",
-      "integrity": "sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.1.tgz",
+      "integrity": "sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.7.0"
+        "@vitest/pretty-format": "3.1.1",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/snapshot/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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/snapshot/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==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/snapshot/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/@vitest/spy": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz",
-      "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.1.tgz",
+      "integrity": "sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "tinyspy": "^2.2.0"
+        "tinyspy": "^3.0.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-1.4.0.tgz",
-      "integrity": "sha512-XC6CMhN1gzYcGbpn6/Oanj4Au2EXwQEX6vpcOeLlZv8dy7g11Ukx8zwtYQbwxs9duK2s9j2o5rbQiCP5DPAcmw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-3.1.1.tgz",
+      "integrity": "sha512-2HpiRIYg3dlvAJBV9RtsVswFgUSJK4Sv7QhpxoP0eBGkYwzGIKP34PjaV00AULQi9Ovl6LGyZfsetxDWY5BQdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "1.4.0",
-        "fast-glob": "^3.3.2",
-        "fflate": "^0.8.1",
-        "flatted": "^3.2.9",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "sirv": "^2.0.4"
+        "@vitest/utils": "3.1.1",
+        "fflate": "^0.8.2",
+        "flatted": "^3.3.3",
+        "pathe": "^2.0.3",
+        "sirv": "^3.0.1",
+        "tinyglobby": "^0.2.12",
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "1.4.0"
+        "vitest": "3.1.1"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz",
-      "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.1.tgz",
+      "integrity": "sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "diff-sequences": "^29.6.3",
-        "estree-walker": "^3.0.3",
-        "loupe": "^2.3.7",
-        "pretty-format": "^29.7.0"
+        "@vitest/pretty-format": "3.1.1",
+        "loupe": "^3.1.3",
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/utils/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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/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==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/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
-    },
     "node_modules/acorn": {
       "version": "8.11.3",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
@@ -4551,23 +4869,12 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
@@ -4632,6 +4939,8 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4656,13 +4965,14 @@
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4681,19 +4991,19 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4703,21 +5013,32 @@
       }
     },
     "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4738,6 +5059,7 @@
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -4749,30 +5071,25 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/b4a": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
-      "integrity": "sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
+        "@babel/helper-define-polyfill-provider": "^0.6.4",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -4780,25 +5097,27 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
-      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.1",
-        "core-js-compat": "^3.36.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
+        "core-js-compat": "^3.40.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz",
-      "integrity": "sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.1"
+        "@babel/helper-define-polyfill-provider": "^0.6.4"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -4810,83 +5129,13 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true
-    },
-    "node_modules/bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
-      }
-    },
-    "node_modules/bare-os": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true
-    },
-    "node_modules/bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "bare-os": "^2.1.0"
-      }
-    },
-    "node_modules/bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "streamx": "^2.18.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "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/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       },
@@ -4894,18 +5143,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4928,9 +5165,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
       "funding": [
         {
@@ -4946,11 +5183,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4959,30 +5197,12 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+    "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,
-      "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",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
+      "license": "MIT/X11"
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
@@ -4991,19 +5211,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cac": {
       "version": "6.7.14",
       "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
@@ -5014,16 +5221,47 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5051,9 +5289,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001607",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001607.tgz",
-      "integrity": "sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==",
+      "version": "1.0.30001707",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
+      "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
       "dev": true,
       "funding": [
         {
@@ -5068,24 +5306,24 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
-      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
+      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
+        "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": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/chalk": {
@@ -5105,15 +5343,13 @@
       }
     },
     "node_modules/check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 16"
       }
     },
     "node_modules/chokidar": {
@@ -5121,6 +5357,8 @@
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -5145,6 +5383,8 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5152,13 +5392,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/ci-info": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
@@ -5174,6 +5407,49 @@
         "node": ">=8"
       }
     },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/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/clsx": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -5233,6 +5509,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/colorjs.io": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
+      "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -5244,15 +5527,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/common-tags": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
@@ -5270,22 +5544,32 @@
       "dev": true
     },
     "node_modules/consola": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
-      "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
+      "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^14.18.0 || >=16.10.0"
       }
     },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/core-js-compat": {
-      "version": "3.36.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.1.tgz",
-      "integrity": "sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0"
+        "browserslist": "^4.24.4"
       },
       "funding": {
         "type": "opencollective",
@@ -5336,12 +5620,14 @@
       }
     },
     "node_modules/cssstyle": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz",
-      "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz",
+      "integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "rrweb-cssom": "^0.6.0"
+        "@asamuzakjp/css-color": "^2.8.2",
+        "rrweb-cssom": "^0.8.0"
       },
       "engines": {
         "node": ">=18"
@@ -5487,14 +5773,15 @@
       }
     },
     "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5504,29 +5791,31 @@
       }
     },
     "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -5594,44 +5883,16 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+    "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",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -5653,6 +5914,7 @@
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -5670,6 +5932,7 @@
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -5719,7 +5982,8 @@
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
-      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "license": "MIT"
     },
     "node_modules/diff-sequences": {
       "version": "29.6.3",
@@ -5758,17 +6022,41 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
       "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.7",
         "csstype": "^3.0.2"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "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",
@@ -5786,20 +6074,18 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.730",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.730.tgz",
-      "integrity": "sha512-oJRPo82XEqtQAobHpJIR3zW5YO3sSRRkPz2an4yxi1UvqhsGm54vR/wzTFV74a3soDOJ8CKW7ajOOX5ESzddwg==",
-      "dev": true
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "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==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
+      "license": "ISC"
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/engine.io-client": {
       "version": "6.5.4",
@@ -5827,6 +6113,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -5835,57 +6122,63 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "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-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.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-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5895,13 +6188,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -5911,15 +6202,24 @@
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+    "node_modules/es-module-lexer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -5928,28 +6228,31 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5959,9 +6262,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
+      "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -5969,39 +6272,42 @@
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
+        "@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"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6231,6 +6537,7 @@
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
       }
@@ -6273,16 +6580,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "dev": true,
-      "license": "(MIT OR WTFPL)",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/expect": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
@@ -6299,27 +6596,31 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.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==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "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.0.1",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.0.1.tgz",
-      "integrity": "sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==",
+      "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-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -6360,6 +6661,23 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "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",
@@ -6373,7 +6691,8 @@
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
       "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
@@ -6463,10 +6782,11 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
@@ -6488,18 +6808,56 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -6509,36 +6867,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "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,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -6564,20 +6892,24 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6591,6 +6923,7 @@
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6604,26 +6937,33 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": "*"
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6636,6 +6976,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
       "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6647,6 +6988,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -6660,14 +7015,15 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6676,13 +7032,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -6725,12 +7074,14 @@
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6760,12 +7111,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6783,11 +7135,25 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+    "node_modules/graphql": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.10.0.tgz",
+      "integrity": "sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6806,6 +7172,7 @@
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -6814,10 +7181,14 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -6826,10 +7197,11 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6842,6 +7214,7 @@
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -6857,6 +7230,7 @@
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -6864,6 +7238,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/headers-polyfill": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz",
+      "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
@@ -6896,12 +7277,13 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -6958,27 +7340,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "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": "BSD-3-Clause"
-    },
     "node_modules/ignore": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
@@ -6992,7 +7353,9 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
       "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -7044,22 +7407,16 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7074,22 +7431,36 @@
         "node": ">=12"
       }
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7099,12 +7470,16 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7115,6 +7490,8 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -7123,13 +7500,14 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7138,27 +7516,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-builtin-module": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "builtin-modules": "^3.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7167,23 +7530,30 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -7194,12 +7564,14 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7217,6 +7589,51 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -7229,6 +7646,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -7236,17 +7666,12 @@
       "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==",
+    "node_modules/is-node-process": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
+      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
@@ -7258,12 +7683,14 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7298,13 +7725,16 @@
       "dev": true
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7323,13 +7753,27 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7351,12 +7795,14 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7366,12 +7812,15 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7381,12 +7830,13 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7395,13 +7845,47 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7411,7 +7895,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
@@ -7443,10 +7928,11 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.4.tgz",
-      "integrity": "sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==",
+      "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",
@@ -7469,10 +7955,26 @@
         "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.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
-      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -7661,13 +8163,13 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
       "dev": true,
       "license": "MIT",
       "bin": {
-        "jiti": "bin/jiti.js"
+        "jiti": "lib/jiti-cli.mjs"
       }
     },
     "node_modules/js-tokens": {
@@ -7688,38 +8190,39 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz",
-      "integrity": "sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==",
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
+      "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cssstyle": "^4.0.1",
+        "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
         "decimal.js": "^10.4.3",
-        "form-data": "^4.0.0",
+        "form-data": "^4.0.1",
         "html-encoding-sniffer": "^4.0.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.2",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.7",
-        "parse5": "^7.1.2",
-        "rrweb-cssom": "^0.6.0",
+        "nwsapi": "^2.2.16",
+        "parse5": "^7.2.1",
+        "rrweb-cssom": "^0.8.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "^5.0.0",
         "w3c-xmlserializer": "^5.0.0",
         "webidl-conversions": "^7.0.0",
         "whatwg-encoding": "^3.1.1",
         "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.0.0",
-        "ws": "^8.16.0",
+        "whatwg-url": "^14.1.0",
+        "ws": "^8.18.0",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "canvas": "^2.11.2"
+        "canvas": "^3.0.0"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -7727,16 +8230,39 @@
         }
       }
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+    "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",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -7776,12 +8302,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true
-    },
     "node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -7799,6 +8319,7 @@
       "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"
       }
@@ -7853,22 +8374,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/local-pkg": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
-      "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
-      "dev": true,
-      "dependencies": {
-        "mlly": "^1.4.2",
-        "pkg-types": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -7894,7 +8399,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -7921,13 +8427,11 @@
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
+      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
       "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
+      "license": "MIT"
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
@@ -7943,31 +8447,31 @@
       "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.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz",
-      "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/magicast": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.3.tgz",
-      "integrity": "sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
-        "source-map-js": "^1.0.2"
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/make-dir": {
@@ -8018,6 +8522,16 @@
       "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",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -8075,19 +8589,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -8109,32 +8610,14 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/mlly": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
-      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.11.3",
-        "pathe": "^1.1.2",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.2"
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/mri": {
@@ -8147,10 +8630,11 @@
       }
     },
     "node_modules/mrmime": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
-      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -8160,10 +8644,78 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "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==",
+      "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",
+        "@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",
+        "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",
+        "strict-event-emitter": "^0.5.1",
+        "type-fest": "^4.26.1",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "msw": "cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mswjs"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.8.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -8171,6 +8723,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -8178,63 +8731,26 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/node-abi": {
-      "version": "3.65.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz",
-      "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-abi/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/node-addon-api": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
-      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+    "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/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8252,10 +8768,11 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-      "dev": true
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
@@ -8266,10 +8783,14 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -8279,19 +8800,23 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -8326,22 +8851,48 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/outvariant": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
+      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -8372,6 +8923,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "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",
@@ -8385,12 +8943,13 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -8429,6 +8988,37 @@
       "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"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "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",
@@ -8439,24 +9029,26 @@
       }
     },
     "node_modules/pathe": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
-      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 14.16"
       }
     },
     "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
       "license": "ISC"
     },
@@ -8472,30 +9064,20 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "dev": true,
       "funding": [
         {
@@ -8513,8 +9095,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {
@@ -8623,63 +9205,6 @@
         "postcss": "^8.2.1"
       }
     },
-    "node_modules/prebuild-install": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
-      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^2.0.0",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^3.3.0",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "bin": {
-        "prebuild-install": "bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/prebuild-install/node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "node_modules/prebuild-install/node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -8742,6 +9267,7 @@
       "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",
@@ -8756,6 +9282,7 @@
       "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"
       },
@@ -8767,7 +9294,8 @@
       "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
+      "dev": true,
+      "peer": true
     },
     "node_modules/pretty-quick": {
       "version": "4.0.0",
@@ -8821,20 +9349,16 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
       }
     },
     "node_modules/punycode": {
@@ -8846,11 +9370,29 @@
         "node": ">=6"
       }
     },
+    "node_modules/quansync": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz",
+      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -8872,13 +9414,6 @@
         }
       ]
     },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -8889,53 +9424,25 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
+    "node_modules/react": {
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
+      "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz",
+      "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
+      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.26.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.1.0"
       }
     },
     "node_modules/react-dropzone-esm": {
@@ -8958,40 +9465,43 @@
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "node_modules/react-number-format": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.4.2.tgz",
-      "integrity": "sha512-cg//jVdS49PYDgmcYoBnMMHl4XNTMuV723ZnHD2aXYtWWWqbVF3hjQ8iB+UZEuXapLbeA8P8H+1o6ZB1lcw3vg==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/react-number-format/-/react-number-format-5.4.3.tgz",
+      "integrity": "sha512-VCY5hFg/soBighAoGcdE+GagkJq0230qN6jcS5sp8wQX1qy1fYN/RX7/BXkrs0oyzzwqR8/+eSUrqXbGeywdUQ==",
+      "license": "MIT",
       "peerDependencies": {
-        "react": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+        "react": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-remove-scroll": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz",
-      "integrity": "sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz",
+      "integrity": "sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==",
+      "license": "MIT",
       "dependencies": {
-        "react-remove-scroll-bar": "^2.3.6",
+        "react-remove-scroll-bar": "^2.3.7",
         "react-style-singleton": "^2.2.1",
         "tslib": "^2.1.0",
-        "use-callback-ref": "^1.3.0",
+        "use-callback-ref": "^1.3.3",
         "use-sidecar": "^1.1.2"
       },
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -9000,19 +9510,20 @@
       }
     },
     "node_modules/react-remove-scroll-bar": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz",
-      "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "license": "MIT",
       "dependencies": {
-        "react-style-singleton": "^2.2.1",
+        "react-style-singleton": "^2.2.2",
         "tslib": "^2.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -9021,65 +9532,59 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
-      "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.2.tgz",
+      "integrity": "sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==",
+      "license": "MIT",
       "dependencies": {
-        "@remix-run/router": "1.16.1"
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
-      "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
-      "dependencies": {
-        "@remix-run/router": "1.16.1",
-        "react-router": "6.23.1"
+        "react": ">=18",
+        "react-dom": ">=18"
       },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/react-smooth": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",
-      "integrity": "sha512-OE4hm7XqR0jNOq3Qmk9mFLyd6p2+j6bvbPJ7qlB7+oo0eNcL2l7WQzG6MBnT3EXY6xzkLMUBec3AfewJdA0J8w==",
+      "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",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "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.1",
-      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
-      "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "license": "MIT",
       "dependencies": {
         "get-nonce": "^1.0.0",
-        "invariant": "^2.2.4",
         "tslib": "^2.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -9088,9 +9593,10 @@
       }
     },
     "node_modules/react-textarea-autosize": {
-      "version": "8.5.5",
-      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.5.tgz",
-      "integrity": "sha512-CVA94zmfp8m4bSHtWwmANaBR8EPsKy2aZ7KwqhoS4Ftib87F9Kvi7XQhOixypPLMc6kVYgOXvKFuuzZDpHGRPg==",
+      "version": "8.5.9",
+      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.9.tgz",
+      "integrity": "sha512-U1DGlIQN5AwgjTyOEnI1oCcMuEr1pv1qOtklB2l4nyMGbHzWrI0eFsYK0zos2YWqAolJyG0IWJaqWmWj5ETh0A==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "use-composed-ref": "^1.3.0",
@@ -9100,13 +9606,14 @@
         "node": ">=10"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
       "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -9118,26 +9625,13 @@
         "react-dom": ">=16.6.0"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -9146,15 +9640,16 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.7.tgz",
-      "integrity": "sha512-hlLJMhPQfv4/3NBSAyq3gzGg4h2v69RJh6KU7b3pXYNNAELs9kEoXOjbkxdXpALqKBoVmVptGfLpxdaVYqjmXQ==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.21",
-        "react-is": "^16.10.2",
+        "react-is": "^18.3.1",
         "react-smooth": "^4.0.0",
         "recharts-scale": "^0.4.4",
         "tiny-invariant": "^1.3.1",
@@ -9164,8 +9659,8 @@
         "node": ">=14"
       },
       "peerDependencies": {
-        "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
+        "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"
       }
     },
     "node_modules/recharts-scale": {
@@ -9177,6 +9672,13 @@
         "decimal.js-light": "^2.4.1"
       }
     },
+    "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",
@@ -9190,17 +9692,42 @@
         "node": ">=8"
       }
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -9218,20 +9745,24 @@
       "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.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9241,15 +9772,16 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -9257,27 +9789,46 @@
         "node": ">=4"
       }
     },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
       "dev": true,
+      "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==",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "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",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -9292,21 +9843,26 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -9346,13 +9902,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
-      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
+      "version": "4.38.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.38.0.tgz",
+      "integrity": "sha512-5SsIRtJy9bf1ErAOiFMFzl64Ex9X5V7bnJ+WlFMb+zmP459OSWCEG7b0ERZ+PEU7xPt4OG3RHbrp1LJlXxYTrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.7"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -9362,30 +9918,35 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.0",
-        "@rollup/rollup-android-arm64": "4.24.0",
-        "@rollup/rollup-darwin-arm64": "4.24.0",
-        "@rollup/rollup-darwin-x64": "4.24.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
-        "@rollup/rollup-linux-arm64-musl": "4.24.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-musl": "4.24.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
-        "@rollup/rollup-win32-x64-msvc": "4.24.0",
+        "@rollup/rollup-android-arm-eabi": "4.38.0",
+        "@rollup/rollup-android-arm64": "4.38.0",
+        "@rollup/rollup-darwin-arm64": "4.38.0",
+        "@rollup/rollup-darwin-x64": "4.38.0",
+        "@rollup/rollup-freebsd-arm64": "4.38.0",
+        "@rollup/rollup-freebsd-x64": "4.38.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.38.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.38.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.38.0",
+        "@rollup/rollup-linux-arm64-musl": "4.38.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.38.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.38.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.38.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-gnu": "4.38.0",
+        "@rollup/rollup-linux-x64-musl": "4.38.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.38.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.38.0",
+        "@rollup/rollup-win32-x64-msvc": "4.38.0",
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/rrweb-cssom": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-      "dev": true
+      "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",
@@ -9410,15 +9971,27 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+    "node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -9449,15 +10022,33 @@
       ],
       "license": "MIT"
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9477,6 +10068,8 @@
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
       "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -9489,6 +10082,414 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/sass-embedded": {
+      "version": "1.86.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.86.1.tgz",
+      "integrity": "sha512-LMJvytHh7lIUtmjGCqpM4cRdIDvPllLJKznNIK4L7EZJ77BLeUFoOSRXEOHq4G4gqy5CVhHUKlHslzCANkDOhQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bufbuild/protobuf": "^2.0.0",
+        "buffer-builder": "^0.2.0",
+        "colorjs.io": "^0.5.0",
+        "immutable": "^5.0.2",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1",
+        "sync-child-process": "^1.0.2",
+        "varint": "^6.0.0"
+      },
+      "bin": {
+        "sass": "dist/bin/sass.js"
+      },
+      "engines": {
+        "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==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "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==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "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==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "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==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "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"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.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==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "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==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "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",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/saxes": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
@@ -9502,12 +10503,10 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
+      "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -9528,11 +10527,18 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "license": "MIT"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -9550,6 +10556,7 @@
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -9560,28 +10567,59 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/sharp": {
-      "version": "0.32.6",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
-      "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
+      "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "color": "^4.2.3",
-        "detect-libc": "^2.0.2",
-        "node-addon-api": "^6.1.0",
-        "prebuild-install": "^7.1.1",
-        "semver": "^7.5.4",
-        "simple-get": "^4.0.1",
-        "tar-fs": "^3.0.4",
-        "tunnel-agent": "^0.6.0"
+        "detect-libc": "^2.0.3",
+        "semver": "^7.6.3"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-darwin-arm64": "0.33.5",
+        "@img/sharp-darwin-x64": "0.33.5",
+        "@img/sharp-libvips-darwin-arm64": "1.0.4",
+        "@img/sharp-libvips-darwin-x64": "1.0.4",
+        "@img/sharp-libvips-linux-arm": "1.0.5",
+        "@img/sharp-libvips-linux-arm64": "1.0.4",
+        "@img/sharp-libvips-linux-s390x": "1.0.4",
+        "@img/sharp-libvips-linux-x64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
+        "@img/sharp-linux-arm": "0.33.5",
+        "@img/sharp-linux-arm64": "0.33.5",
+        "@img/sharp-linux-s390x": "0.33.5",
+        "@img/sharp-linux-x64": "0.33.5",
+        "@img/sharp-linuxmusl-arm64": "0.33.5",
+        "@img/sharp-linuxmusl-x64": "0.33.5",
+        "@img/sharp-wasm32": "0.33.5",
+        "@img/sharp-win32-ia32": "0.33.5",
+        "@img/sharp-win32-x64": "0.33.5"
       }
     },
     "node_modules/sharp-ico": {
@@ -9597,9 +10635,9 @@
       }
     },
     "node_modules/sharp/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -9631,15 +10669,73 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9652,7 +10748,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
       "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
@@ -9660,53 +10757,6 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "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/simple-get": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
-      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "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",
-      "dependencies": {
-        "decompress-response": "^6.0.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -9725,17 +10775,18 @@
       "license": "MIT"
     },
     "node_modules/sirv": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.1.tgz",
+      "integrity": "sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@polka/url": "^1.0.0-next.24",
         "mrmime": "^2.0.0",
         "totalist": "^3.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=18"
       }
     },
     "node_modules/slash": {
@@ -9888,55 +10939,81 @@
       "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
       "dev": true
     },
-    "node_modules/std-env": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
-      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
-      "dev": true
-    },
-    "node_modules/streamx": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
-      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
-        "text-decoder": "^1.1.0"
-      },
-      "optionalDependencies": {
-        "bare-events": "^2.2.0"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "node_modules/std-env": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.1.tgz",
+      "integrity": "sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/strict-event-emitter": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
+      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/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": {
-        "safe-buffer": "~5.2.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "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.11",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
-      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
+        "es-abstract": "^1.23.6",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "regexp.prototype.flags": "^1.5.2",
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "regexp.prototype.flags": "^1.5.3",
         "set-function-name": "^2.0.2",
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9946,15 +11023,19 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9964,15 +11045,20 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -9982,6 +11068,7 @@
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -10021,6 +11108,20 @@
         "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",
@@ -10064,24 +11165,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strip-literal": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
-      "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^9.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/strip-literal/node_modules/js-tokens": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
-      "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
-      "dev": true
-    },
     "node_modules/sugarss": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-4.0.1.tgz",
@@ -10115,6 +11198,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10128,37 +11212,34 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "node_modules/sync-child-process": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
+      "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sync-message-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/sync-message-port": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
+      "integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/tabbable": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
-    },
-    "node_modules/tar-fs": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      },
-      "optionalDependencies": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
-      }
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "license": "MIT"
     },
     "node_modules/temp-dir": {
       "version": "2.0.0",
@@ -10229,27 +11310,65 @@
       "license": "MIT"
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "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": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       }
     },
-    "node_modules/text-decoder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
-      "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "b4a": "^1.6.4"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "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": {
@@ -10265,29 +11384,114 @@
       "dev": true
     },
     "node_modules/tinybench": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.6.0.tgz",
-      "integrity": "sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==",
-      "dev": true
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
+      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.4.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
     },
     "node_modules/tinypool": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz",
-      "integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
+      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
       "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": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
-      "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
+    "node_modules/tldts": {
+      "version": "6.1.72",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.72.tgz",
+      "integrity": "sha512-QNtgIqSUb9o2CoUjX9T5TwaIvUUJFU1+12PJkgt42DFV2yf9J6549yTF2uGloQsJ/JOC8X+gIB81ind97hRiIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^6.1.72"
+      },
+      "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==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/to-data-view": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/to-data-view/-/to-data-view-1.1.0.tgz",
@@ -10295,15 +11499,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10321,23 +11516,22 @@
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
       "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.0.tgz",
+      "integrity": "sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "tldts": "^6.1.32"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=16"
       }
     },
     "node_modules/tr46": {
@@ -10391,18 +11585,11 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
+    "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",
@@ -10416,15 +11603,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -10438,30 +11616,32 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10471,17 +11651,19 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10491,17 +11673,18 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10523,53 +11706,54 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/ufo": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
-      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
-      "dev": true
-    },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/unconfig": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/unconfig/-/unconfig-0.3.13.tgz",
-      "integrity": "sha512-N9Ph5NC4+sqtcOjPfHrRcHekBCadCXWTBzp2VYYbySOHW0PfD9XLCeXshTXjkPYwLrBr9AtSeU0CZmkYECJhng==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/unconfig/-/unconfig-7.3.1.tgz",
+      "integrity": "sha512-LH5WL+un92tGAzWS87k7LkAfwpMdm7V0IXG2FxEjZz/QxiIW5J5LkcrKQThj0aRz6+h/lFmKI9EUXmK/T0bcrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@antfu/utils": "^0.7.7",
+        "@quansync/fs": "^0.1.1",
         "defu": "^6.1.4",
-        "jiti": "^1.21.0"
+        "jiti": "^2.4.2",
+        "quansync": "^0.2.8"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -10579,6 +11763,7 @@
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -10588,10 +11773,11 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -10601,10 +11787,24 @@
       "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==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unique-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
@@ -10623,6 +11823,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
       "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -10639,9 +11840,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -10657,9 +11858,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -10682,15 +11884,17 @@
       "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.2",
-      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz",
-      "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -10698,8 +11902,8 @@
         "node": ">=10"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -10708,19 +11912,26 @@
       }
     },
     "node_modules/use-composed-ref": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
-      "integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.4.0.tgz",
+      "integrity": "sha512-djviaxuOOh7wkj0paeO1Q/4wMZ8Zrnag5H6yBvzN7AKKe8beOaED9SF5/ByLqsku8NP4zQqsvM2u3ew/tJK8/w==",
+      "license": "MIT",
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
     "node_modules/use-isomorphic-layout-effect": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
+      "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==",
+      "license": "MIT",
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -10729,14 +11940,15 @@
       }
     },
     "node_modules/use-latest": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
-      "integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.3.0.tgz",
+      "integrity": "sha512-mhg3xdm9NaM8q+gLT8KryJPnRFOz1/5XPBhmDEVZK1webPzDjrPk7f/mbpeLqTgB9msytYWANxgALOCJKnLvcQ==",
+      "license": "MIT",
       "dependencies": {
         "use-isomorphic-layout-effect": "^1.1.1"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -10745,9 +11957,10 @@
       }
     },
     "node_modules/use-sidecar": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
-      "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "license": "MIT",
       "dependencies": {
         "detect-node-es": "^1.1.0",
         "tslib": "^2.0.0"
@@ -10756,8 +11969,8 @@
         "node": ">=10"
       },
       "peerDependencies": {
-        "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -10771,25 +11984,12 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
-      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+    "node_modules/varint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+      "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
       "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/v8-to-istanbul/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/victory-vendor": {
       "version": "36.9.2",
@@ -10814,21 +12014,24 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.4.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
-      "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz",
+      "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.3",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.12"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -10837,19 +12040,25 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
         "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
-        "terser": "^5.4.0"
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "jiti": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -10870,68 +12079,99 @@
         },
         "terser": {
           "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
     "node_modules/vite-node": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.4.0.tgz",
-      "integrity": "sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.1.tgz",
+      "integrity": "sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "vite": "^5.0.0"
+        "debug": "^4.4.0",
+        "es-module-lexer": "^1.6.0",
+        "pathe": "^2.0.3",
+        "vite": "^5.0.0 || ^6.0.0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/vite-plugin-checker": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz",
-      "integrity": "sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==",
+    "node_modules/vite-node/node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^4.1.1",
-        "chokidar": "^3.5.1",
-        "commander": "^8.0.0",
-        "fast-glob": "^3.2.7",
-        "fs-extra": "^11.1.0",
-        "npm-run-path": "^4.0.1",
-        "semver": "^7.5.0",
-        "strip-ansi": "^6.0.0",
-        "tiny-invariant": "^1.1.0",
-        "vscode-languageclient": "^7.0.0",
-        "vscode-languageserver": "^7.0.0",
-        "vscode-languageserver-textdocument": "^1.0.1",
-        "vscode-uri": "^3.0.2"
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "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.9.1",
+      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.9.1.tgz",
+      "integrity": "sha512-neH3CSNWdkZ+zi+WPt/0y5+IO2I0UAI0NX6MaXqU/KxN1Lz6np/7IooRB6VVAMBa4nigqm1GRF6qNa4+EL5jDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "chokidar": "^4.0.3",
+        "npm-run-path": "^6.0.0",
+        "picocolors": "^1.1.1",
+        "picomatch": "^4.0.2",
+        "strip-ansi": "^7.1.0",
+        "tiny-invariant": "^1.3.3",
+        "tinyglobby": "^0.2.12",
+        "vscode-uri": "^3.1.0"
       },
       "engines": {
         "node": ">=14.16"
       },
       "peerDependencies": {
+        "@biomejs/biome": ">=1.7",
         "eslint": ">=7",
-        "meow": "^9.0.0",
-        "optionator": "^0.9.1",
-        "stylelint": ">=13",
+        "meow": "^13.2.0",
+        "optionator": "^0.9.4",
+        "stylelint": ">=16",
         "typescript": "*",
         "vite": ">=2.0.0",
         "vls": "*",
         "vti": "*",
-        "vue-tsc": ">=1.3.9"
+        "vue-tsc": "~2.2.2"
       },
       "peerDependenciesMeta": {
+        "@biomejs/biome": {
+          "optional": true
+        },
         "eslint": {
           "optional": true
         },
@@ -10958,51 +12198,120 @@
         }
       }
     },
-    "node_modules/vite-plugin-checker/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/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,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/vite-plugin-checker/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"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vite-plugin-checker/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/vite-plugin-pwa": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.20.0.tgz",
-      "integrity": "sha512-/kDZyqF8KqoXRpMUQtR5Atri/7BWayW8Gp7Kz/4bfstsV6zSFTxjREbXZYL7zSuRL40HGA+o2hvUAFRmC+bL7g==",
+    "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": {
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
+        "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",
+      "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vite-plugin-checker/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vite-plugin-checker/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "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.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.0.0.tgz",
+      "integrity": "sha512-X77jo0AOd5OcxmWj3WnVti8n7Kw2tBgV1c8MCXFclrSlDV23ePzv2eTDIALXI2Qo6nJ5pZJeZAuX0AawvRfoeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.6",
         "pretty-bytes": "^6.1.1",
-        "workbox-build": "^7.1.0",
-        "workbox-window": "^7.1.0"
+        "tinyglobby": "^0.2.10",
+        "workbox-build": "^7.3.0",
+        "workbox-window": "^7.3.0"
       },
       "engines": {
         "node": ">=16.0.0"
@@ -11011,10 +12320,10 @@
         "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "@vite-pwa/assets-generator": "^0.2.4",
-        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0",
-        "workbox-build": "^7.1.0",
-        "workbox-window": "^7.1.0"
+        "@vite-pwa/assets-generator": "^1.0.0",
+        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0 || ^6.0.0",
+        "workbox-build": "^7.3.0",
+        "workbox-window": "^7.3.0"
       },
       "peerDependenciesMeta": {
         "@vite-pwa/assets-generator": {
@@ -11022,47 +12331,102 @@
         }
       }
     },
-    "node_modules/vitest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz",
-      "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==",
+    "node_modules/vite-plugin-pwa/node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "1.4.0",
-        "@vitest/runner": "1.4.0",
-        "@vitest/snapshot": "1.4.0",
-        "@vitest/spy": "1.4.0",
-        "@vitest/utils": "1.4.0",
-        "acorn-walk": "^8.3.2",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
-        "execa": "^8.0.1",
-        "local-pkg": "^0.5.0",
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.5.0",
-        "strip-literal": "^2.0.0",
-        "tinybench": "^2.5.1",
-        "tinypool": "^0.8.2",
-        "vite": "^5.0.0",
-        "vite-node": "1.4.0",
-        "why-is-node-running": "^2.2.2"
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-plugin-pwa/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/node_modules/fdir": {
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/vitest": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.1.tgz",
+      "integrity": "sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "3.1.1",
+        "@vitest/mocker": "3.1.1",
+        "@vitest/pretty-format": "^3.1.1",
+        "@vitest/runner": "3.1.1",
+        "@vitest/snapshot": "3.1.1",
+        "@vitest/spy": "3.1.1",
+        "@vitest/utils": "3.1.1",
+        "chai": "^5.2.0",
+        "debug": "^4.4.0",
+        "expect-type": "^1.2.0",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3",
+        "std-env": "^3.8.1",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.2",
+        "tinypool": "^1.0.2",
+        "tinyrainbow": "^2.0.0",
+        "vite": "^5.0.0 || ^6.0.0",
+        "vite-node": "3.1.1",
+        "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "@edge-runtime/vm": "*",
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "1.4.0",
-        "@vitest/ui": "1.4.0",
+        "@types/debug": "^4.1.12",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@vitest/browser": "3.1.1",
+        "@vitest/ui": "3.1.1",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -11070,6 +12434,9 @@
         "@edge-runtime/vm": {
           "optional": true
         },
+        "@types/debug": {
+          "optional": true
+        },
         "@types/node": {
           "optional": true
         },
@@ -11087,235 +12454,37 @@
         }
       }
     },
-    "node_modules/vitest/node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+    "node_modules/vitest/node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=16.17"
+        "node": ">=6.0"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/vitest/node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+    "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,
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
-    "node_modules/vitest/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vitest/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/vitest/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vscode-jsonrpc": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
-      "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0 || >=10.0.0"
-      }
-    },
-    "node_modules/vscode-languageclient": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
-      "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "^3.0.4",
-        "semver": "^7.3.4",
-        "vscode-languageserver-protocol": "3.16.0"
-      },
-      "engines": {
-        "vscode": "^1.52.0"
-      }
-    },
-    "node_modules/vscode-languageclient/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/vscode-languageclient/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"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vscode-languageclient/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/vscode-languageserver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
-      "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
-      "dev": true,
-      "dependencies": {
-        "vscode-languageserver-protocol": "3.16.0"
-      },
-      "bin": {
-        "installServerIntoExtension": "bin/installServerIntoExtension"
-      }
-    },
-    "node_modules/vscode-languageserver-protocol": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
-      "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
-      "dev": true,
-      "dependencies": {
-        "vscode-jsonrpc": "6.0.0",
-        "vscode-languageserver-types": "3.16.0"
-      }
-    },
-    "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
-      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==",
-      "dev": true
-    },
-    "node_modules/vscode-languageserver-types": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-      "dev": true
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
-      "dev": true
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
@@ -11360,10 +12529,11 @@
       }
     },
     "node_modules/whatwg-url": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
-      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",
+      "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tr46": "^5.0.0",
         "webidl-conversions": "^7.0.0"
@@ -11388,31 +12558,85 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
+      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "for-each": "^0.3.5",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -11423,10 +12647,11 @@
       }
     },
     "node_modules/why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -11438,31 +12663,41 @@
         "node": ">=8"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/workbox-background-sync": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.1.0.tgz",
-      "integrity": "sha512-rMbgrzueVWDFcEq1610YyDW71z0oAXLfdRHRQcKw4SGihkfOK0JUEvqWHFwA6rJ+6TClnMIn7KQI5PNN1XQXwQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.3.0.tgz",
+      "integrity": "sha512-PCSk3eK7Mxeuyatb22pcSx9dlgWNv3+M8PqPaYDokks8Y5/FX4soaOqj3yhAZr5k6Q5JWTOMYgaJBpbw11G9Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "idb": "^7.0.1",
-        "workbox-core": "7.1.0"
+        "workbox-core": "7.3.0"
       }
     },
     "node_modules/workbox-broadcast-update": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-7.1.0.tgz",
-      "integrity": "sha512-O36hIfhjej/c5ar95pO67k1GQw0/bw5tKP7CERNgK+JdxBANQhDmIuOXZTNvwb2IHBx9hj2kxvcDyRIh5nzOgQ==",
+      "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.1.0"
+        "workbox-core": "7.3.0"
       }
     },
     "node_modules/workbox-build": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.1.1.tgz",
-      "integrity": "sha512-WdkVdC70VMpf5NBCtNbiwdSZeKVuhTEd5PV3mAwpTQCGAB5XbOny1P9egEgNdetv4srAMmMKjvBk4RD58LpooA==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.3.0.tgz",
+      "integrity": "sha512-JGL6vZTPlxnlqZRhR/K/msqg3wKP+m0wfEUVosK7gsYzSgeIxvZLi1ViJJzVL7CEeI8r7rGFV973RiEqkP3lWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11488,21 +12723,21 @@
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "7.1.0",
-        "workbox-broadcast-update": "7.1.0",
-        "workbox-cacheable-response": "7.1.0",
-        "workbox-core": "7.1.0",
-        "workbox-expiration": "7.1.0",
-        "workbox-google-analytics": "7.1.0",
-        "workbox-navigation-preload": "7.1.0",
-        "workbox-precaching": "7.1.0",
-        "workbox-range-requests": "7.1.0",
-        "workbox-recipes": "7.1.0",
-        "workbox-routing": "7.1.0",
-        "workbox-strategies": "7.1.0",
-        "workbox-streams": "7.1.0",
-        "workbox-sw": "7.1.0",
-        "workbox-window": "7.1.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"
       },
       "engines": {
         "node": ">=16.0.0"
@@ -11590,16 +12825,16 @@
       "license": "MIT"
     },
     "node_modules/workbox-build/node_modules/ajv": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
-      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.4.1"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -11686,140 +12921,181 @@
       }
     },
     "node_modules/workbox-cacheable-response": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.1.0.tgz",
-      "integrity": "sha512-iwsLBll8Hvua3xCuBB9h92+/e0wdsmSVgR2ZlvcfjepZWwhd3osumQB3x9o7flj+FehtWM2VHbZn8UJeBXXo6Q==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.3.0.tgz",
+      "integrity": "sha512-eAFERIg6J2LuyELhLlmeRcJFa5e16Mj8kL2yCDbhWE+HUun9skRQrGIFVUagqWj4DMaaPSMWfAolM7XZZxNmxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.1.0"
+        "workbox-core": "7.3.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==",
+      "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "idb": "^7.0.1",
+        "workbox-core": "7.3.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==",
+      "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"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.0",
+        "workbox-routing": "7.3.0",
+        "workbox-strategies": "7.3.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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.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==",
+      "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"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "workbox-core": "7.3.0",
+        "workbox-routing": "7.3.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==",
+      "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2",
+        "workbox-core": "7.1.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/workbox-expiration": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-7.1.0.tgz",
-      "integrity": "sha512-m5DcMY+A63rJlPTbbBNtpJ20i3enkyOtSgYfv/l8h+D6YbbNiA0zKEkCUaMsdDlxggla1oOfRkyqTvl5Ni5KQQ==",
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "idb": "^7.0.1",
-        "workbox-core": "7.1.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/workbox-google-analytics": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-7.1.0.tgz",
-      "integrity": "sha512-FvE53kBQHfVTcZyczeBVRexhh7JTkyQ8HAvbVY6mXd2n2A7Oyz/9fIwnY406ZcDhvE4NFfKGjW56N4gBiqkrew==",
+    "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": {
-        "workbox-background-sync": "7.1.0",
-        "workbox-core": "7.1.0",
-        "workbox-routing": "7.1.0",
-        "workbox-strategies": "7.1.0"
-      }
-    },
-    "node_modules/workbox-navigation-preload": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-7.1.0.tgz",
-      "integrity": "sha512-4wyAbo0vNI/X0uWNJhCMKxnPanNyhybsReMGN9QUpaePLTiDpKxPqFxl4oUmBNddPwIXug01eTSLVIFXimRG/A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0"
-      }
-    },
-    "node_modules/workbox-precaching": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-7.1.0.tgz",
-      "integrity": "sha512-LyxzQts+UEpgtmfnolo0hHdNjoB7EoRWcF7EDslt+lQGd0lW4iTvvSe3v5JiIckQSB5KTW5xiCqjFviRKPj1zA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0",
-        "workbox-routing": "7.1.0",
-        "workbox-strategies": "7.1.0"
-      }
-    },
-    "node_modules/workbox-range-requests": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-7.1.0.tgz",
-      "integrity": "sha512-m7+O4EHolNs5yb/79CrnwPR/g/PRzMFYEdo01LqwixVnc/sbzNSvKz0d04OE3aMRel1CwAAZQheRsqGDwATgPQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0"
-      }
-    },
-    "node_modules/workbox-recipes": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-7.1.0.tgz",
-      "integrity": "sha512-NRrk4ycFN9BHXJB6WrKiRX3W3w75YNrNrzSX9cEZgFB5ubeGoO8s/SDmOYVrFYp9HMw6sh1Pm3eAY/1gVS8YLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-cacheable-response": "7.1.0",
-        "workbox-core": "7.1.0",
-        "workbox-expiration": "7.1.0",
-        "workbox-precaching": "7.1.0",
-        "workbox-routing": "7.1.0",
-        "workbox-strategies": "7.1.0"
-      }
-    },
-    "node_modules/workbox-routing": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-7.1.0.tgz",
-      "integrity": "sha512-oOYk+kLriUY2QyHkIilxUlVcFqwduLJB7oRZIENbqPGeBP/3TWHYNNdmGNhz1dvKuw7aqvJ7CQxn27/jprlTdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0"
-      }
-    },
-    "node_modules/workbox-strategies": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-7.1.0.tgz",
-      "integrity": "sha512-/UracPiGhUNehGjRm/tLUQ+9PtWmCbRufWtV0tNrALuf+HZ4F7cmObSEK+E4/Bx1p8Syx2tM+pkIrvtyetdlew==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0"
-      }
-    },
-    "node_modules/workbox-streams": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-7.1.0.tgz",
-      "integrity": "sha512-WyHAVxRXBMfysM8ORwiZnI98wvGWTVAq/lOyBjf00pXFvG0mNaVz4Ji+u+fKa/mf1i2SnTfikoYKto4ihHeS6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "workbox-core": "7.1.0",
-        "workbox-routing": "7.1.0"
-      }
-    },
-    "node_modules/workbox-sw": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-7.1.0.tgz",
-      "integrity": "sha512-Hml/9+/njUXBglv3dtZ9WBKHI235AQJyLBV1G7EFmh4/mUdSQuXui80RtjDeVRrXnm/6QWgRUEHG3/YBVbxtsA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/workbox-window": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.1.0.tgz",
-      "integrity": "sha512-ZHeROyqR+AS5UPzholQRDttLFqGMwP0Np8MKWAdyxsDETxq3qOAyXvqessc3GniohG6e0mAqSQyKOHmT8zPF7g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/trusted-types": "^2.0.2",
-        "workbox-core": "7.1.0"
+        "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": {
@@ -11872,6 +13148,16 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -11879,10 +13165,11 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
-      "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
+      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
@@ -11890,6 +13177,35 @@
         "node": ">= 14"
       }
     },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -11901,6 +13217,19 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }
diff --git a/frontend/package.json b/frontend/package.json
index 1e4fa0002..a128da1cf 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,43 +13,43 @@
   },
   "private": true,
   "dependencies": {
-    "@mantine/core": "^7.14.3",
-    "@mantine/dropzone": "^7.14.3",
-    "@mantine/form": "^7.14.3",
-    "@mantine/hooks": "^7.14.3",
-    "@mantine/modals": "^7.14.3",
-    "@mantine/notifications": "^7.14.3",
-    "@tanstack/react-query": "^5.40.1",
+    "@mantine/core": "^7.17.4",
+    "@mantine/dropzone": "^7.17.4",
+    "@mantine/form": "^7.17.4",
+    "@mantine/hooks": "^7.17.4",
+    "@mantine/modals": "^7.17.4",
+    "@mantine/notifications": "^7.17.4",
+    "@tanstack/react-query": "^5.64.1",
     "@tanstack/react-table": "^8.19.2",
-    "axios": "^1.7.4",
+    "axios": "^1.8.2",
     "braces": "^3.0.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-router-dom": "^6.23.1",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
+    "react-router": "^7.1.1",
     "socket.io-client": "^4.7.5"
   },
   "devDependencies": {
     "@fontsource/roboto": "^5.0.12",
-    "@fortawesome/fontawesome-svg-core": "^6.7.1",
-    "@fortawesome/free-brands-svg-icons": "^6.7.1",
-    "@fortawesome/free-regular-svg-icons": "^6.7.1",
-    "@fortawesome/free-solid-svg-icons": "^6.7.1",
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "@fortawesome/free-brands-svg-icons": "^6.7.2",
+    "@fortawesome/free-regular-svg-icons": "^6.7.2",
+    "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@tanstack/react-query-devtools": "^5.40.1",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^15.0.5",
+    "@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": "^20.12.6",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
+    "@types/node": "^22.14.1",
+    "@types/react": "^19.1.2",
+    "@types/react-dom": "^19.1.2",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.16.0",
-    "@vite-pwa/assets-generator": "^0.2.4",
+    "@vite-pwa/assets-generator": "^1.0.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "@vitest/coverage-v8": "^1.4.0",
-    "@vitest/ui": "^1.2.2",
+    "@vitest/coverage-v8": "^3.1.1",
+    "@vitest/ui": "^3.1.1",
     "clsx": "^2.1.0",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -57,20 +57,21 @@
     "eslint-plugin-simple-import-sort": "^12.1.0",
     "eslint-plugin-testing-library": "^6.2.0",
     "husky": "^9.0.11",
-    "jsdom": "^24.0.0",
+    "jsdom": "^26.0.0",
     "lodash": "^4.17.21",
+    "msw": "^2.7.0",
     "postcss-preset-mantine": "^1.14.4",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^3.2.4",
     "pretty-quick": "^4.0.0",
-    "recharts": "^2.12.7",
-    "sass": "^1.74.1",
+    "recharts": "^2.15.0",
+    "sass-embedded": "^1.86.1",
     "typescript": "^5.4.4",
-    "vite": "^5.4.8",
-    "vite-plugin-checker": "^0.6.4",
-    "vite-plugin-pwa": "^0.20.0",
-    "vitest": "^1.2.2",
+    "vite": "^6.3.2",
+    "vite-plugin-checker": "^0.9.1",
+    "vite-plugin-pwa": "^1.0.0",
+    "vitest": "^3.1.1",
     "yaml": "^2.4.1"
   },
   "scripts": {
diff --git a/frontend/src/App/Header.module.scss b/frontend/src/App/Header.module.scss
index 85b3661a9..8f2239809 100644
--- a/frontend/src/App/Header.module.scss
+++ b/frontend/src/App/Header.module.scss
@@ -1,9 +1,9 @@
 .header {
-  @include light {
+  @include mantine.light {
     color: var(--mantine-color-gray-0);
   }
 
-  @include dark {
+  @include mantine.dark {
     color: var(--mantine-color-dark-0);
   }
 }
diff --git a/frontend/src/App/Navbar.module.scss b/frontend/src/App/Navbar.module.scss
index ddb444e4d..2e15343e0 100644
--- a/frontend/src/App/Navbar.module.scss
+++ b/frontend/src/App/Navbar.module.scss
@@ -2,16 +2,16 @@
   border-color: var(--mantine-color-gray-5);
   text-decoration: none;
 
-  @include dark {
+  @include mantine.dark {
     border-color: var(--mantine-color-dark-5);
   }
 
   &.active {
-    border-left: 2px solid $color-brand-4;
+    border-left: 2px solid bazarr.$color-brand-4;
     background-color: var(--mantine-color-gray-1);
 
-    @include dark {
-      border-left: 2px solid $color-brand-8;
+    @include mantine.dark {
+      border-left: 2px solid bazarr.$color-brand-8;
       background-color: var(--mantine-color-dark-8);
     }
   }
@@ -19,7 +19,7 @@
   &.hover {
     background-color: var(--mantine-color-gray-0);
 
-    @include dark {
+    @include mantine.dark {
       background-color: var(--mantine-color-dark-7);
     }
   }
@@ -39,7 +39,7 @@
 .nav {
   background-color: var(--mantine-color-gray-2);
 
-  @include dark {
+  @include mantine.dark {
     background-color: var(--mantine-color-dark-8);
   }
 }
@@ -50,7 +50,7 @@
   width: 100%;
   color: var(--mantine-color-gray-8);
 
-  @include dark {
+  @include mantine.dark {
     color: var(--mantine-color-gray-5);
   }
 }
diff --git a/frontend/src/App/Navbar.tsx b/frontend/src/App/Navbar.tsx
index 679a0e3e7..7352cb328 100644
--- a/frontend/src/App/Navbar.tsx
+++ b/frontend/src/App/Navbar.tsx
@@ -6,7 +6,7 @@ import React, {
   useMemo,
   useState,
 } from "react";
-import { matchPath, NavLink, RouteObject, useLocation } from "react-router-dom";
+import { matchPath, NavLink, RouteObject, useLocation } from "react-router";
 import {
   Anchor,
   AppShell,
@@ -114,7 +114,10 @@ const AppNavbar: FunctionComponent = () => {
   return (
     <AppShell.Navbar p="xs" className={styles.nav}>
       <Selection.Provider value={{ selection, select }}>
-        <AppShell.Section grow>
+        <AppShell.Section
+          grow
+          style={{ overflowY: "auto", scrollbarWidth: "none" }}
+        >
           <Stack gap={0}>
             {routes.map((route, idx) => (
               <RouteItem
diff --git a/frontend/src/App/app.test.tsx b/frontend/src/App/app.test.tsx
index db9895305..84320fc5e 100644
--- a/frontend/src/App/app.test.tsx
+++ b/frontend/src/App/app.test.tsx
@@ -1,9 +1,18 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
 import { describe, it } from "vitest";
-import { render } from "@/tests";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
 import App from ".";
 
 describe("App", () => {
   it("should render without crash", () => {
-    render(<App />);
+    server.use(
+      http.get("/api/system/searches", () => {
+        return HttpResponse.json({});
+      }),
+    );
+
+    customRender(<App />);
   });
 });
diff --git a/frontend/src/App/index.tsx b/frontend/src/App/index.tsx
index a8ef9f3fb..00b6741fa 100644
--- a/frontend/src/App/index.tsx
+++ b/frontend/src/App/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useEffect, useState } from "react";
-import { Outlet, useNavigate } from "react-router-dom";
+import { Outlet, useNavigate } from "react-router";
 import { AppShell } from "@mantine/core";
 import { useWindowEvent } from "@mantine/hooks";
 import { showNotification } from "@mantine/notifications";
diff --git a/frontend/src/Router/Redirector.tsx b/frontend/src/Router/Redirector.tsx
index 07878c9db..f9b2a00e6 100644
--- a/frontend/src/Router/Redirector.tsx
+++ b/frontend/src/Router/Redirector.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { LoadingOverlay } from "@mantine/core";
 import { useSystemSettings } from "@/apis/hooks";
 
diff --git a/frontend/src/Router/index.tsx b/frontend/src/Router/index.tsx
index 8ccea87f9..7ccff2ceb 100644
--- a/frontend/src/Router/index.tsx
+++ b/frontend/src/Router/index.tsx
@@ -5,7 +5,7 @@ import {
   useContext,
   useMemo,
 } from "react";
-import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { createBrowserRouter, RouterProvider } from "react-router";
 import {
   faClock,
   faCogs,
@@ -34,6 +34,7 @@ import SeriesMassEditor from "@/pages/Series/Editor";
 import SettingsGeneralView from "@/pages/Settings/General";
 import SettingsLanguagesView from "@/pages/Settings/Languages";
 import SettingsNotificationsView from "@/pages/Settings/Notifications";
+import SettingsPlexView from "@/pages/Settings/Plex";
 import SettingsProvidersView from "@/pages/Settings/Providers";
 import SettingsRadarrView from "@/pages/Settings/Radarr";
 import SettingsSchedulerView from "@/pages/Settings/Scheduler";
@@ -222,6 +223,11 @@ function useRoutes(): CustomRouteObject[] {
                 name: "Radarr",
                 element: <SettingsRadarrView></SettingsRadarrView>,
               },
+              {
+                path: "plex",
+                name: "Plex",
+                element: <SettingsPlexView></SettingsPlexView>,
+              },
               {
                 path: "notifications",
                 name: "Notifications",
@@ -324,7 +330,10 @@ export const Router: FunctionComponent = () => {
 
   // TODO: Move this outside the function component scope
   const router = useMemo(
-    () => createBrowserRouter(routes, { basename: Environment.baseUrl }),
+    () =>
+      createBrowserRouter(routes, {
+        basename: Environment.baseUrl,
+      }),
     [routes],
   );
 
diff --git a/frontend/src/Router/type.d.ts b/frontend/src/Router/type.d.ts
index f1cfdaae7..91b820736 100644
--- a/frontend/src/Router/type.d.ts
+++ b/frontend/src/Router/type.d.ts
@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
 
 declare namespace Route {
diff --git a/frontend/src/apis/queries/hooks.ts b/frontend/src/apis/queries/hooks.ts
index 2f17b5efe..40a7d69ee 100644
--- a/frontend/src/apis/queries/hooks.ts
+++ b/frontend/src/apis/queries/hooks.ts
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from "react";
+import { useSearchParams } from "react-router";
 import {
   QueryKey,
   useQuery,
@@ -34,7 +35,12 @@ export function usePaginationQuery<
 ): UsePaginationQueryResult<TObject> {
   const client = useQueryClient();
 
-  const [page, setIndex] = useState(0);
+  const [searchParams] = useSearchParams();
+
+  const [page, setIndex] = useState(
+    searchParams.get("page") ? Number(searchParams.get("page")) - 1 : 0,
+  );
+
   const pageSize = usePageSize();
 
   const start = page * pageSize;
@@ -62,7 +68,14 @@ export function usePaginationQuery<
         }
       });
     }
-  }, [results.isSuccess, results.data, client, cacheIndividual, queryKey]);
+  }, [
+    results.isSuccess,
+    results.data,
+    client,
+    cacheIndividual,
+    queryKey,
+    page,
+  ]);
 
   const totalCount = data?.total ?? 0;
   const pageCount = Math.ceil(totalCount / pageSize);
diff --git a/frontend/src/assets/_bazarr.scss b/frontend/src/assets/_bazarr.scss
index 96e44e619..d86cf8e0b 100644
--- a/frontend/src/assets/_bazarr.scss
+++ b/frontend/src/assets/_bazarr.scss
@@ -1,3 +1,5 @@
+@use "mantine" as *;
+
 $color-brand-0: #f8f0fc;
 $color-brand-1: #f3d9fa;
 $color-brand-2: #eebefa;
diff --git a/frontend/src/assets/_variables.module.scss b/frontend/src/assets/_variables.module.scss
index 262d285b2..c707980bf 100644
--- a/frontend/src/assets/_variables.module.scss
+++ b/frontend/src/assets/_variables.module.scss
@@ -1,18 +1,18 @@
 $navbar-width: 200;
 
 :export {
-  colorBrand0: $color-brand-0;
-  colorBrand1: $color-brand-1;
-  colorBrand2: $color-brand-2;
-  colorBrand3: $color-brand-3;
-  colorBrand4: $color-brand-4;
-  colorBrand5: $color-brand-5;
-  colorBrand6: $color-brand-6;
-  colorBrand7: $color-brand-7;
-  colorBrand8: $color-brand-8;
-  colorBrand9: $color-brand-9;
+  colorBrand0: bazarr.$color-brand-0;
+  colorBrand1: bazarr.$color-brand-1;
+  colorBrand2: bazarr.$color-brand-2;
+  colorBrand3: bazarr.$color-brand-3;
+  colorBrand4: bazarr.$color-brand-4;
+  colorBrand5: bazarr.$color-brand-5;
+  colorBrand6: bazarr.$color-brand-6;
+  colorBrand7: bazarr.$color-brand-7;
+  colorBrand8: bazarr.$color-brand-8;
+  colorBrand9: bazarr.$color-brand-9;
 
-  headerHeight: $header-height;
+  headerHeight: bazarr.$header-height;
 
   navBarWidth: $navbar-width;
 }
diff --git a/frontend/src/assets/action_icon.module.scss b/frontend/src/assets/action_icon.module.scss
index d23cb6ce2..3ff702f35 100644
--- a/frontend/src/assets/action_icon.module.scss
+++ b/frontend/src/assets/action_icon.module.scss
@@ -2,13 +2,13 @@
   .root {
     --ai-bg: transparent;
 
-    @include light {
+    @include mantine.light {
       color: var(--mantine-color-dark-2);
       --ai-hover: var(--mantine-color-gray-1);
       --ai-hover-color: var(--mantine-color-gray-1);
     }
 
-    @include dark {
+    @include mantine.dark {
       color: var(--mantine-color-dark-0);
       --ai-hover: var(--mantine-color-gray-8);
     }
diff --git a/frontend/src/assets/badge.module.scss b/frontend/src/assets/badge.module.scss
index 5b31be59e..e0bd86a99 100644
--- a/frontend/src/assets/badge.module.scss
+++ b/frontend/src/assets/badge.module.scss
@@ -1,44 +1,46 @@
+@use "sass:color";
+
 @layer mantine {
   .root {
-    background-color: transparentize($color-brand-6, 0.8);
+    background-color: color.adjust(bazarr.$color-brand-6, $alpha: -0.8);
 
     &[data-variant="warning"] {
-      color: lighten($color-warning-2, 0.8);
-      background-color: transparentize($color-warning-6, 0.8);
+      color: color.adjust(bazarr.$color-warning-2, $lightness: 80%);
+      background-color: color.adjust(bazarr.$color-warning-6, $alpha: -0.8);
     }
 
     &[data-variant="highlight"] {
-      color: lighten($color-highlight-2, 1);
-      background-color: transparentize($color-highlight-5, 0.8);
+      color: color.adjust(bazarr.$color-highlight-2, $lightness: 100%);
+      background-color: color.adjust(bazarr.$color-highlight-5, $alpha: -0.8);
     }
 
     &[data-variant="disabled"] {
-      color: lighten($color-disabled-0, 1);
-      background-color: transparentize($color-disabled-7, 0.8);
+      color: color.adjust(bazarr.$color-disabled-0, $lightness: 100%);
+      background-color: color.adjust(bazarr.$color-disabled-7, $alpha: -0.8);
     }
 
     &[data-variant="light"] {
       color: var(--mantine-color-dark-0);
-      background-color: transparentize($color-disabled-9, 0.8);
+      background-color: color.adjust(bazarr.$color-disabled-9, $alpha: -0.8);
     }
 
-    @include light {
-      color: $color-brand-6;
-      background-color: transparentize($color-brand-3, 0.8);
+    @include mantine.light {
+      color: bazarr.$color-brand-6;
+      background-color: color.adjust(bazarr.$color-brand-3, $alpha: -0.8);
 
       &[data-variant="warning"] {
-        color: darken($color-warning-7, 1);
-        background-color: transparentize($color-warning-6, 0.8);
+        color: color.adjust(bazarr.$color-warning-7, $lightness: -100%);
+        background-color: color.adjust(bazarr.$color-warning-6, $alpha: -0.8);
       }
 
       &[data-variant="disabled"] {
-        color: darken($color-disabled-6, 1);
-        background-color: transparentize($color-disabled-4, 0.8);
+        color: color.adjust(bazarr.$color-disabled-6, $lightness: -100%);
+        background-color: color.adjust(bazarr.$color-disabled-4, $alpha: -0.8);
       }
 
       &[data-variant="highlight"] {
-        color: darken($color-highlight-6, 1);
-        background-color: transparentize($color-highlight-5, 0.8);
+        color: color.adjust(bazarr.$color-highlight-6, $lightness: -100%);
+        background-color: color.adjust(bazarr.$color-highlight-5, $alpha: -0.8);
       }
 
       &[data-variant="light"] {
diff --git a/frontend/src/assets/button.module.scss b/frontend/src/assets/button.module.scss
index 0c466a4c4..3ac8bca91 100644
--- a/frontend/src/assets/button.module.scss
+++ b/frontend/src/assets/button.module.scss
@@ -1,6 +1,6 @@
 @layer mantine {
   .root {
-    @include dark {
+    @include mantine.dark {
       color: var(--mantine-color-dark-0);
     }
 
@@ -11,7 +11,7 @@
   }
 
   .root:disabled {
-    @include dark {
+    @include mantine.dark {
       color: var(--mantine-color-dark-9);
     }
   }
diff --git a/frontend/src/components/Search.test.tsx b/frontend/src/components/Search.test.tsx
index bac037c7f..15c687743 100644
--- a/frontend/src/components/Search.test.tsx
+++ b/frontend/src/components/Search.test.tsx
@@ -1,9 +1,9 @@
 import { describe, it } from "vitest";
 import { Search } from "@/components/index";
-import { render } from "@/tests";
+import { customRender } from "@/tests";
 
 describe("Search Bar", () => {
   it.skip("should render the closed empty state", () => {
-    render(<Search />);
+    customRender(<Search />);
   });
 });
diff --git a/frontend/src/components/Search.tsx b/frontend/src/components/Search.tsx
index d1c559be5..adcc3d065 100644
--- a/frontend/src/components/Search.tsx
+++ b/frontend/src/components/Search.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import {
   ComboboxItem,
   em,
diff --git a/frontend/src/components/async/MutateAction.tsx b/frontend/src/components/async/MutateAction.tsx
index 92c102ea9..f6ed95986 100644
--- a/frontend/src/components/async/MutateAction.tsx
+++ b/frontend/src/components/async/MutateAction.tsx
@@ -11,7 +11,6 @@ type MutateActionProps<DATA, VAR> = Omit<
   args: () => VAR | null;
   onSuccess?: (args: DATA) => void;
   onError?: () => void;
-  noReset?: boolean;
 };
 
 function MutateAction<DATA, VAR>({
diff --git a/frontend/src/components/async/MutateButton.tsx b/frontend/src/components/async/MutateButton.tsx
index 908c2dfda..8a14e4b0a 100644
--- a/frontend/src/components/async/MutateButton.tsx
+++ b/frontend/src/components/async/MutateButton.tsx
@@ -10,7 +10,6 @@ type MutateButtonProps<DATA, VAR> = Omit<
   args: () => VAR | null;
   onSuccess?: (args: DATA) => void;
   onError?: () => void;
-  noReset?: boolean;
 };
 
 function MutateButton<DATA, VAR>({
diff --git a/frontend/src/components/bazarr/Language.test.tsx b/frontend/src/components/bazarr/Language.test.tsx
index 2cad5d4c8..b4d77edb1 100644
--- a/frontend/src/components/bazarr/Language.test.tsx
+++ b/frontend/src/components/bazarr/Language.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import { Language } from ".";
 
 describe("Language text", () => {
@@ -9,13 +9,13 @@ describe("Language text", () => {
   };
 
   it("should show short text", () => {
-    render(<Language.Text value={testLanguage}></Language.Text>);
+    customRender(<Language.Text value={testLanguage}></Language.Text>);
 
     expect(screen.getByText(testLanguage.code2)).toBeDefined();
   });
 
   it("should show long text", () => {
-    render(<Language.Text value={testLanguage} long></Language.Text>);
+    customRender(<Language.Text value={testLanguage} long></Language.Text>);
 
     expect(screen.getByText(testLanguage.name)).toBeDefined();
   });
@@ -23,7 +23,7 @@ describe("Language text", () => {
   const testLanguageWithHi: Language.Info = { ...testLanguage, hi: true };
 
   it("should show short text with HI", () => {
-    render(<Language.Text value={testLanguageWithHi}></Language.Text>);
+    customRender(<Language.Text value={testLanguageWithHi}></Language.Text>);
 
     const expectedText = `${testLanguageWithHi.code2}:HI`;
 
@@ -31,7 +31,9 @@ describe("Language text", () => {
   });
 
   it("should show long text with HI", () => {
-    render(<Language.Text value={testLanguageWithHi} long></Language.Text>);
+    customRender(
+      <Language.Text value={testLanguageWithHi} long></Language.Text>,
+    );
 
     const expectedText = `${testLanguageWithHi.name} HI`;
 
@@ -44,7 +46,9 @@ describe("Language text", () => {
   };
 
   it("should show short text with Forced", () => {
-    render(<Language.Text value={testLanguageWithForced}></Language.Text>);
+    customRender(
+      <Language.Text value={testLanguageWithForced}></Language.Text>,
+    );
 
     const expectedText = `${testLanguageWithHi.code2}:Forced`;
 
@@ -52,7 +56,9 @@ describe("Language text", () => {
   });
 
   it("should show long text with Forced", () => {
-    render(<Language.Text value={testLanguageWithForced} long></Language.Text>);
+    customRender(
+      <Language.Text value={testLanguageWithForced} long></Language.Text>,
+    );
 
     const expectedText = `${testLanguageWithHi.name} Forced`;
 
@@ -73,7 +79,7 @@ describe("Language list", () => {
   ];
 
   it("should show all languages", () => {
-    render(<Language.List value={elements}></Language.List>);
+    customRender(<Language.List value={elements}></Language.List>);
 
     elements.forEach((value) => {
       expect(screen.getByText(value.name)).toBeDefined();
diff --git a/frontend/src/components/forms/FrameRateForm.tsx b/frontend/src/components/forms/FrameRateForm.tsx
index 7c57daf28..e58f59c4f 100644
--- a/frontend/src/components/forms/FrameRateForm.tsx
+++ b/frontend/src/components/forms/FrameRateForm.tsx
@@ -28,11 +28,11 @@ const FrameRateForm: FunctionComponent<Props> = ({ selections, onSubmit }) => {
     },
     validate: {
       from: FormUtils.validation(
-        (value) => value > 0,
+        (value: number) => value > 0,
         "The From value must be larger than 0",
       ),
       to: FormUtils.validation(
-        (value) => value > 0,
+        (value: number) => value > 0,
         "The To value must be larger than 0",
       ),
     },
diff --git a/frontend/src/components/forms/MovieUploadForm.tsx b/frontend/src/components/forms/MovieUploadForm.tsx
index f7f8f47c5..893a33ea5 100644
--- a/frontend/src/components/forms/MovieUploadForm.tsx
+++ b/frontend/src/components/forms/MovieUploadForm.tsx
@@ -114,10 +114,10 @@ const MovieUploadForm: FunctionComponent<Props> = ({
         })),
     },
     validate: {
-      files: FormUtils.validation((values) => {
+      files: FormUtils.validation((values: SubtitleFile[]) => {
         return (
           values.find(
-            (v) =>
+            (v: SubtitleFile) =>
               v.language === null ||
               v.validateResult === undefined ||
               v.validateResult.state === "error",
diff --git a/frontend/src/components/forms/ProfileEditForm.module.scss b/frontend/src/components/forms/ProfileEditForm.module.scss
index 3d4a8e177..4be3f06cd 100644
--- a/frontend/src/components/forms/ProfileEditForm.module.scss
+++ b/frontend/src/components/forms/ProfileEditForm.module.scss
@@ -1,5 +1,5 @@
 .content {
-  @include smaller-than($mantine-breakpoint-md) {
+  @include mantine.smaller-than(mantine.$mantine-breakpoint-md) {
     padding: 0;
   }
 }
diff --git a/frontend/src/components/forms/ProfileEditForm.tsx b/frontend/src/components/forms/ProfileEditForm.tsx
index 267951fcb..6f7702d81 100644
--- a/frontend/src/components/forms/ProfileEditForm.tsx
+++ b/frontend/src/components/forms/ProfileEditForm.tsx
@@ -70,10 +70,10 @@ const ProfileEditForm: FunctionComponent<Props> = ({
     initialValues: profile,
     validate: {
       name: FormUtils.validation(
-        (value) => value.length > 0,
+        (value: string) => value.length > 0,
         "Must have a name",
       ),
-      tag: FormUtils.validation((value) => {
+      tag: FormUtils.validation((value: string | undefined) => {
         if (!value) {
           return true;
         }
@@ -81,7 +81,7 @@ const ProfileEditForm: FunctionComponent<Props> = ({
         return /^[a-z_0-9-]+$/.test(value);
       }, "Only lowercase alphanumeric characters, underscores (_) and hyphens (-) are allowed"),
       items: FormUtils.validation(
-        (value) => value.length > 0,
+        (value: Language.ProfileItem[]) => value.length > 0,
         "Must contain at least 1 language",
       ),
     },
diff --git a/frontend/src/components/forms/SeriesUploadForm.tsx b/frontend/src/components/forms/SeriesUploadForm.tsx
index 9ae6308c9..e09f8e677 100644
--- a/frontend/src/components/forms/SeriesUploadForm.tsx
+++ b/frontend/src/components/forms/SeriesUploadForm.tsx
@@ -128,9 +128,9 @@ const SeriesUploadForm: FunctionComponent<Props> = ({
     },
     validate: {
       files: FormUtils.validation(
-        (values) =>
+        (values: SubtitleFile[]) =>
           values.find(
-            (v) =>
+            (v: SubtitleFile) =>
               v.language === null ||
               v.episode === null ||
               v.validateResult === undefined ||
diff --git a/frontend/src/components/forms/TimeOffsetForm.tsx b/frontend/src/components/forms/TimeOffsetForm.tsx
index 1a7739dd9..092b99861 100644
--- a/frontend/src/components/forms/TimeOffsetForm.tsx
+++ b/frontend/src/components/forms/TimeOffsetForm.tsx
@@ -32,11 +32,20 @@ const TimeOffsetForm: FunctionComponent<Props> = ({ selections, onSubmit }) => {
       ms: 0,
     },
     validate: {
-      hour: FormUtils.validation((v) => v >= 0, "Hour must be larger than 0"),
-      min: FormUtils.validation((v) => v >= 0, "Minute must be larger than 0"),
-      sec: FormUtils.validation((v) => v >= 0, "Second must be larger than 0"),
+      hour: FormUtils.validation(
+        (v: number) => v >= 0,
+        "Hour must be larger than 0",
+      ),
+      min: FormUtils.validation(
+        (v: number) => v >= 0,
+        "Minute must be larger than 0",
+      ),
+      sec: FormUtils.validation(
+        (v: number) => v >= 0,
+        "Second must be larger than 0",
+      ),
       ms: FormUtils.validation(
-        (v) => v >= 0,
+        (v: number) => v >= 0,
         "Millisecond must be larger than 0",
       ),
     },
diff --git a/frontend/src/components/inputs/Action.test.tsx b/frontend/src/components/inputs/Action.test.tsx
index dc8972630..ff6206cbb 100644
--- a/frontend/src/components/inputs/Action.test.tsx
+++ b/frontend/src/components/inputs/Action.test.tsx
@@ -1,7 +1,7 @@
 import { faStickyNote } from "@fortawesome/free-regular-svg-icons";
 import userEvent from "@testing-library/user-event";
 import { describe, it, vitest } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import Action from "./Action";
 
 const testLabel = "Test Label";
@@ -9,7 +9,7 @@ const testIcon = faStickyNote;
 
 describe("Action button", () => {
   it("should be a button", () => {
-    render(<Action icon={testIcon} label={testLabel}></Action>);
+    customRender(<Action icon={testIcon} label={testLabel}></Action>);
     const element = screen.getByRole("button", { name: testLabel });
 
     expect(element.getAttribute("type")).toEqual("button");
@@ -17,7 +17,7 @@ describe("Action button", () => {
   });
 
   it("should show icon", () => {
-    render(<Action icon={testIcon} label={testLabel}></Action>);
+    customRender(<Action icon={testIcon} label={testLabel}></Action>);
     // TODO: use getBy...
     const element = screen.getByRole("img", { hidden: true });
 
@@ -27,7 +27,7 @@ describe("Action button", () => {
 
   it("should call on-click event when clicked", async () => {
     const onClickFn = vitest.fn();
-    render(
+    customRender(
       <Action icon={testIcon} label={testLabel} onClick={onClickFn}></Action>,
     );
 
diff --git a/frontend/src/components/inputs/ChipInput.test.tsx b/frontend/src/components/inputs/ChipInput.test.tsx
index 4035966fc..b974274b8 100644
--- a/frontend/src/components/inputs/ChipInput.test.tsx
+++ b/frontend/src/components/inputs/ChipInput.test.tsx
@@ -1,6 +1,6 @@
 import userEvent from "@testing-library/user-event";
 import { describe, it, vitest } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import ChipInput from "./ChipInput";
 
 describe("ChipInput", () => {
@@ -8,7 +8,7 @@ describe("ChipInput", () => {
 
   // TODO: Support default value
   it.skip("should works with default value", () => {
-    render(<ChipInput defaultValue={existedValues}></ChipInput>);
+    customRender(<ChipInput defaultValue={existedValues}></ChipInput>);
 
     existedValues.forEach((value) => {
       expect(screen.getByText(value)).toBeDefined();
@@ -16,7 +16,7 @@ describe("ChipInput", () => {
   });
 
   it("should works with value", () => {
-    render(<ChipInput value={existedValues}></ChipInput>);
+    customRender(<ChipInput value={existedValues}></ChipInput>);
 
     existedValues.forEach((value) => {
       expect(screen.getByText(value)).toBeDefined();
@@ -29,7 +29,9 @@ describe("ChipInput", () => {
       expect(values).toContain(typedValue);
     });
 
-    render(<ChipInput value={existedValues} onChange={mockedFn}></ChipInput>);
+    customRender(
+      <ChipInput value={existedValues} onChange={mockedFn}></ChipInput>,
+    );
 
     const element = screen.getByRole("searchbox");
 
diff --git a/frontend/src/components/inputs/Selector.test.tsx b/frontend/src/components/inputs/Selector.test.tsx
index a28772a2d..3e5cb3273 100644
--- a/frontend/src/components/inputs/Selector.test.tsx
+++ b/frontend/src/components/inputs/Selector.test.tsx
@@ -1,6 +1,6 @@
 import userEvent from "@testing-library/user-event";
 import { describe, it, vitest } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import { Selector, SelectorOption } from "./Selector";
 
 const selectorName = "Test Selections";
@@ -18,7 +18,9 @@ const testOptions: SelectorOption<string>[] = [
 describe("Selector", () => {
   describe("options", () => {
     it("should work with the SelectorOption", () => {
-      render(<Selector name={selectorName} options={testOptions}></Selector>);
+      customRender(
+        <Selector name={selectorName} options={testOptions}></Selector>,
+      );
 
       testOptions.forEach((o) => {
         expect(screen.getByText(o.label)).toBeDefined();
@@ -26,7 +28,9 @@ describe("Selector", () => {
     });
 
     it("should display when clicked", async () => {
-      render(<Selector name={selectorName} options={testOptions}></Selector>);
+      customRender(
+        <Selector name={selectorName} options={testOptions}></Selector>,
+      );
 
       const element = screen.getByTestId("input-selector");
 
@@ -41,7 +45,7 @@ describe("Selector", () => {
 
     it("shouldn't show default value", async () => {
       const option = testOptions[0];
-      render(
+      customRender(
         <Selector
           name={selectorName}
           options={testOptions}
@@ -54,7 +58,7 @@ describe("Selector", () => {
 
     it("shouldn't show value", async () => {
       const option = testOptions[0];
-      render(
+      customRender(
         <Selector
           name={selectorName}
           options={testOptions}
@@ -72,7 +76,7 @@ describe("Selector", () => {
       const mockedFn = vitest.fn((value: string | null) => {
         expect(value).toEqual(clickedOption.value);
       });
-      render(
+      customRender(
         <Selector
           name={selectorName}
           options={testOptions}
@@ -112,7 +116,7 @@ describe("Selector", () => {
       const mockedFn = vitest.fn((value: { name: string } | null) => {
         expect(value).toEqual(clickedOption.value);
       });
-      render(
+      customRender(
         <Selector
           name={selectorName}
           options={objectOptions}
@@ -134,7 +138,7 @@ describe("Selector", () => {
   describe("placeholder", () => {
     it("should show when no selection", () => {
       const placeholder = "Empty Selection";
-      render(
+      customRender(
         <Selector
           name={selectorName}
           options={testOptions}
diff --git a/frontend/src/components/modals/SubtitleToolsModal.tsx b/frontend/src/components/modals/SubtitleToolsModal.tsx
index dca20d159..06d1e7869 100644
--- a/frontend/src/components/modals/SubtitleToolsModal.tsx
+++ b/frontend/src/components/modals/SubtitleToolsModal.tsx
@@ -9,23 +9,51 @@ import {
   Text,
 } from "@mantine/core";
 import { ColumnDef } from "@tanstack/react-table";
+import {
+  useEpisodeSubtitleModification,
+  useMovieSubtitleModification,
+} from "@/apis/hooks";
 import Language from "@/components/bazarr/Language";
 import SubtitleToolsMenu from "@/components/SubtitleToolsMenu";
 import SimpleTable from "@/components/tables/SimpleTable";
-import { withModal } from "@/modules/modals";
-import { isMovie } from "@/utilities";
+import { useModals, withModal } from "@/modules/modals";
+import { task, TaskGroup } from "@/modules/task";
+import { fromPython, isMovie, toPython } from "@/utilities";
 
 type SupportType = Item.Episode | Item.Movie;
 
 type TableColumnType = FormType.ModifySubtitle & {
   raw_language: Language.Info;
+  seriesId: number;
+  name: string;
+  isMovie: boolean;
 };
 
-function getIdAndType(item: SupportType): [number, "episode" | "movie"] {
+type LocalisedType = {
+  id: number;
+  seriesId: number;
+  type: "movie" | "episode";
+  name: string;
+  isMovie: boolean;
+};
+
+function getLocalisedValues(item: SupportType): LocalisedType {
   if (isMovie(item)) {
-    return [item.radarrId, "movie"];
+    return {
+      seriesId: 0,
+      id: item.radarrId,
+      type: "movie",
+      name: item.title,
+      isMovie: true,
+    };
   } else {
-    return [item.sonarrEpisodeId, "episode"];
+    return {
+      seriesId: item.sonarrSeriesId,
+      id: item.sonarrEpisodeId,
+      type: "episode",
+      name: item.title,
+      isMovie: false,
+    };
   }
 }
 
@@ -41,6 +69,11 @@ const SubtitleToolView: FunctionComponent<SubtitleToolViewProps> = ({
   payload,
 }) => {
   const [selections, setSelections] = useState<TableColumnType[]>([]);
+  const { remove: removeEpisode, download: downloadEpisode } =
+    useEpisodeSubtitleModification();
+  const { download: downloadMovie, remove: removeMovie } =
+    useMovieSubtitleModification();
+  const modals = useModals();
 
   const columns = useMemo<ColumnDef<TableColumnType>[]>(
     () => [
@@ -109,17 +142,22 @@ const SubtitleToolView: FunctionComponent<SubtitleToolViewProps> = ({
   const data = useMemo<TableColumnType[]>(
     () =>
       payload.flatMap((item) => {
-        const [id, type] = getIdAndType(item);
+        const { seriesId, id, type, name, isMovie } = getLocalisedValues(item);
         return item.subtitles.flatMap((v) => {
           if (v.path) {
             return [
               {
                 id,
+                seriesId,
                 type,
                 language: v.code2,
                 path: v.path,
                 // eslint-disable-next-line camelcase
                 raw_language: v,
+                name,
+                hi: toPython(v.forced),
+                forced: toPython(v.hi),
+                isMovie,
               },
             ];
           } else {
@@ -143,7 +181,51 @@ const SubtitleToolView: FunctionComponent<SubtitleToolViewProps> = ({
       ></SimpleTable>
       <Divider></Divider>
       <Group>
-        <SubtitleToolsMenu selections={selections}>
+        <SubtitleToolsMenu
+          selections={selections}
+          onAction={(action) => {
+            selections.forEach((selection) => {
+              const actionPayload = {
+                form: {
+                  language: selection.language,
+                  hi: fromPython(selection.hi),
+                  forced: fromPython(selection.forced),
+                  path: selection.path,
+                },
+                radarrId: 0,
+                seriesId: 0,
+                episodeId: 0,
+              };
+              if (selection.isMovie) {
+                actionPayload.radarrId = selection.id;
+              } else {
+                actionPayload.seriesId = selection.seriesId;
+                actionPayload.episodeId = selection.id;
+              }
+              const download = selection.isMovie
+                ? downloadMovie
+                : downloadEpisode;
+              const remove = selection.isMovie ? removeMovie : removeEpisode;
+
+              if (action === "search") {
+                task.create(
+                  selection.name,
+                  TaskGroup.SearchSubtitle,
+                  download.mutateAsync,
+                  actionPayload,
+                );
+              } else if (action === "delete" && selection.path) {
+                task.create(
+                  selection.name,
+                  TaskGroup.DeleteSubtitle,
+                  remove.mutateAsync,
+                  actionPayload,
+                );
+              }
+            });
+            modals.closeAll();
+          }}
+        >
           <Button disabled={selections.length === 0} variant="light">
             Select Action
           </Button>
diff --git a/frontend/src/components/tables/PageControl.tsx b/frontend/src/components/tables/PageControl.tsx
index bcdf290e3..e328de7cf 100644
--- a/frontend/src/components/tables/PageControl.tsx
+++ b/frontend/src/components/tables/PageControl.tsx
@@ -1,4 +1,4 @@
-import { FunctionComponent, useEffect } from "react";
+import { FunctionComponent } from "react";
 import { Group, Pagination, Text } from "@mantine/core";
 import { useIsLoading } from "@/contexts";
 
@@ -23,11 +23,6 @@ const PageControl: FunctionComponent<Props> = ({
 
   const isLoading = useIsLoading();
 
-  // Jump to first page if total page count changes
-  useEffect(() => {
-    goto(0);
-  }, [total, goto]);
-
   return (
     <Group p={16} justify="space-between">
       <Text size="sm">
@@ -37,7 +32,9 @@ const PageControl: FunctionComponent<Props> = ({
         size="sm"
         color={isLoading ? "gray" : "primary"}
         value={index + 1}
-        onChange={(page) => goto(page - 1)}
+        onChange={(page) => {
+          return goto(page - 1);
+        }}
         hidden={count <= 1}
         total={count}
       ></Pagination>
diff --git a/frontend/src/components/tables/QueryPageTable.tsx b/frontend/src/components/tables/QueryPageTable.tsx
index 797d7a08e..21889adf7 100644
--- a/frontend/src/components/tables/QueryPageTable.tsx
+++ b/frontend/src/components/tables/QueryPageTable.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from "react";
+import { useSearchParams } from "react-router";
 import { UsePaginationQueryResult } from "@/apis/queries/hooks";
 import SimpleTable, { SimpleTableProps } from "@/components/tables/SimpleTable";
 import { LoadingProvider } from "@/contexts";
@@ -18,6 +19,8 @@ export default function QueryPageTable<T extends object>(props: Props<T>) {
     controls: { gotoPage },
   } = query;
 
+  const [searchParams, setSearchParams] = useSearchParams();
+
   useEffect(() => {
     ScrollToTop();
   }, [page]);
@@ -30,7 +33,13 @@ export default function QueryPageTable<T extends object>(props: Props<T>) {
         index={page}
         size={pageSize}
         total={totalCount}
-        goto={gotoPage}
+        goto={(page) => {
+          searchParams.set("page", (page + 1).toString());
+
+          setSearchParams(searchParams, { replace: true });
+
+          gotoPage(page);
+        }}
       ></PageControl>
     </LoadingProvider>
   );
diff --git a/frontend/src/components/toolbox/Button.tsx b/frontend/src/components/toolbox/Button.tsx
index 0a1d311e1..3767522ef 100644
--- a/frontend/src/components/toolbox/Button.tsx
+++ b/frontend/src/components/toolbox/Button.tsx
@@ -1,6 +1,7 @@
 import {
   ComponentProps,
   FunctionComponent,
+  JSX,
   PropsWithChildren,
   useCallback,
   useState,
diff --git a/frontend/src/components/toolbox/Toolbox.module.scss b/frontend/src/components/toolbox/Toolbox.module.scss
index 10529fd27..5bdd3823e 100644
--- a/frontend/src/components/toolbox/Toolbox.module.scss
+++ b/frontend/src/components/toolbox/Toolbox.module.scss
@@ -1,9 +1,9 @@
 .group {
-  @include light {
+  @include mantine.light {
     background-color: var(--mantine-color-gray-3);
   }
 
-  @include dark {
+  @include mantine.dark {
     background-color: var(--mantine-color-dark-5);
   }
 }
diff --git a/frontend/src/modules/task/group.ts b/frontend/src/modules/task/group.ts
index cbcbea15b..4497a45d1 100644
--- a/frontend/src/modules/task/group.ts
+++ b/frontend/src/modules/task/group.ts
@@ -4,4 +4,5 @@ export enum TaskGroup {
   DeleteSubtitle = "Deleting subtitles...",
   SearchSubtitle = "Searching subtitles...",
   ScanDisk = "Scanning disk...",
+  Sync = "Syncing...",
 }
diff --git a/frontend/src/pages/Authentication.test.tsx b/frontend/src/pages/Authentication.test.tsx
index e5dee6e44..b4e456233 100644
--- a/frontend/src/pages/Authentication.test.tsx
+++ b/frontend/src/pages/Authentication.test.tsx
@@ -1,10 +1,10 @@
 import { describe, it } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import Authentication from "./Authentication";
 
 describe("Authentication", () => {
   it("should render without crash", () => {
-    render(<Authentication></Authentication>);
+    customRender(<Authentication></Authentication>);
 
     expect(screen.getByPlaceholderText("Username")).toBeDefined();
     expect(screen.getByPlaceholderText("Password")).toBeDefined();
diff --git a/frontend/src/pages/Blacklist/Movies/index.test.tsx b/frontend/src/pages/Blacklist/Movies/index.test.tsx
new file mode 100644
index 000000000..5f00801f0
--- /dev/null
+++ b/frontend/src/pages/Blacklist/Movies/index.test.tsx
@@ -0,0 +1,71 @@
+/* eslint-disable camelcase */
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import BlacklistMoviesView from ".";
+
+describe("Blacklist Movies", () => {
+  it("should render with blacklisted movies", async () => {
+    server.use(
+      http.get("/api/system/settings", () => {
+        return HttpResponse.json({
+          general: {
+            theme: "auto",
+          },
+        });
+      }),
+    );
+
+    server.use(
+      http.get("/api/movies/blacklist", () => {
+        return HttpResponse.json({
+          data: [
+            {
+              title: "Batman vs Teenage Mutant Ninja Turtles",
+              radarrId: 50,
+              provider: "yifysubtitles",
+              subs_id:
+                "https://yifysubtitles.ch/subtitles/batman-vs-teenage-mutant-ninja-turtles-2019-english-yify-19252",
+              language: {
+                name: "English",
+                code2: "en",
+                code3: "eng",
+                forced: false,
+                hi: false,
+              },
+              timestamp: "28 seconds ago",
+              parsed_timestamp: "01/23/25 05:39:36",
+            },
+          ],
+        });
+      }),
+    );
+
+    customRender(<BlacklistMoviesView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("yifysubtitles")).toBeInTheDocument();
+    });
+  });
+
+  it("should render without blacklisted movies", async () => {
+    server.use(
+      http.get("/api/movies/blacklist", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<BlacklistMoviesView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No blacklisted movies subtitles"),
+      ).toBeInTheDocument();
+    });
+
+    server.resetHandlers();
+  });
+});
diff --git a/frontend/src/pages/Blacklist/Movies/table.tsx b/frontend/src/pages/Blacklist/Movies/table.tsx
index 00730a850..cb4d5463d 100644
--- a/frontend/src/pages/Blacklist/Movies/table.tsx
+++ b/frontend/src/pages/Blacklist/Movies/table.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Text } from "@mantine/core";
 import { faTrash } from "@fortawesome/free-solid-svg-icons";
 import { ColumnDef } from "@tanstack/react-table";
@@ -82,7 +82,6 @@ const Table: FunctionComponent<Props> = ({ blacklist }) => {
           return (
             <MutateAction
               label="Remove from Blacklist"
-              noReset
               icon={faTrash}
               mutation={remove}
               args={() => ({
diff --git a/frontend/src/pages/Blacklist/Series/index.test.tsx b/frontend/src/pages/Blacklist/Series/index.test.tsx
new file mode 100644
index 000000000..89e77d98c
--- /dev/null
+++ b/frontend/src/pages/Blacklist/Series/index.test.tsx
@@ -0,0 +1,62 @@
+/* eslint-disable camelcase */
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import BlacklistSeriesView from ".";
+
+describe("Blacklist Series", () => {
+  it("should render without blacklisted series", async () => {
+    server.use(
+      http.get("/api/episodes/blacklist", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<BlacklistSeriesView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("No blacklisted series subtitles"),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it("should render with blacklisted series", async () => {
+    server.use(
+      http.get("/api/episodes/blacklist", () => {
+        // TODO: Replace with Factory
+        return HttpResponse.json({
+          data: [
+            {
+              seriesTitle: "Dragon Ball DAIMA",
+              episode_number: "1x14",
+              episodeTitle: "Taboo",
+              sonarrSeriesId: 56,
+              provider: "animetosho",
+              subs_id:
+                "https://animetosho.org/storage/attach/0022fd50/2293072.xz",
+              language: {
+                name: "English",
+                code2: "en",
+                code3: "eng",
+                forced: false,
+                hi: false,
+              },
+              timestamp: "now",
+              parsed_timestamp: "01/24/25 01:38:03",
+            },
+          ],
+        });
+      }),
+    );
+
+    customRender(<BlacklistSeriesView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("animetosho")).toBeInTheDocument();
+    });
+  });
+});
diff --git a/frontend/src/pages/Blacklist/Series/table.tsx b/frontend/src/pages/Blacklist/Series/table.tsx
index 3d67e637d..5a9005504 100644
--- a/frontend/src/pages/Blacklist/Series/table.tsx
+++ b/frontend/src/pages/Blacklist/Series/table.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Text } from "@mantine/core";
 import { faTrash } from "@fortawesome/free-solid-svg-icons";
 import { ColumnDef } from "@tanstack/react-table";
@@ -89,7 +89,6 @@ const Table: FunctionComponent<Props> = ({ blacklist }) => {
           return (
             <MutateAction
               label="Remove from Blacklist"
-              noReset
               icon={faTrash}
               mutation={removeFromBlacklist}
               args={() => ({
diff --git a/frontend/src/pages/Blacklist/blacklist.test.tsx b/frontend/src/pages/Blacklist/blacklist.test.tsx
deleted file mode 100644
index 4360c473c..000000000
--- a/frontend/src/pages/Blacklist/blacklist.test.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { renderTest, RenderTestCase } from "@/tests/render";
-import BlacklistMoviesView from "./Movies";
-import BlacklistSeriesView from "./Series";
-
-const cases: RenderTestCase[] = [
-  {
-    name: "movie page",
-    ui: BlacklistMoviesView,
-  },
-  {
-    name: "series page",
-    ui: BlacklistSeriesView,
-  },
-];
-
-renderTest("Blacklist", cases);
diff --git a/frontend/src/pages/Episodes/index.tsx b/frontend/src/pages/Episodes/index.tsx
index 017a8a15e..f9ed667da 100644
--- a/frontend/src/pages/Episodes/index.tsx
+++ b/frontend/src/pages/Episodes/index.tsx
@@ -5,7 +5,7 @@ import {
   useRef,
   useState,
 } from "react";
-import { Navigate, useParams } from "react-router-dom";
+import { Navigate, useParams } from "react-router";
 import { Container, Group, Stack } from "@mantine/core";
 import { Dropzone } from "@mantine/dropzone";
 import { useDocumentTitle } from "@mantine/hooks";
@@ -17,6 +17,7 @@ import {
   faCircleChevronDown,
   faCircleChevronRight,
   faCloudUploadAlt,
+  faHardDrive,
   faHdd,
   faPlay,
   faSearch,
@@ -140,6 +141,20 @@ const SeriesEpisodesView: FunctionComponent = () => {
             <Toolbox.Button
               icon={faSync}
               disabled={!available || hasTask}
+              onClick={() => {
+                if (series) {
+                  task.create(series.title, TaskGroup.Sync, action, {
+                    action: "sync",
+                    seriesid: id,
+                  });
+                }
+              }}
+            >
+              Sync
+            </Toolbox.Button>
+            <Toolbox.Button
+              icon={faHardDrive}
+              disabled={!available || hasTask}
               onClick={() => {
                 if (series) {
                   task.create(series.title, TaskGroup.ScanDisk, action, {
diff --git a/frontend/src/pages/History/Movies/index.test.tsx b/frontend/src/pages/History/Movies/index.test.tsx
new file mode 100644
index 000000000..bdc5e7978
--- /dev/null
+++ b/frontend/src/pages/History/Movies/index.test.tsx
@@ -0,0 +1,127 @@
+/* eslint-disable camelcase */
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import MoviesHistoryView from ".";
+
+const mockMovieHistory = {
+  data: [
+    {
+      action: "download",
+      title: "The Dark Knight (2008) [1080p.BluRay.x264.DTS-HD.MA.5.1]",
+      radarrId: 1,
+      language: { code2: "en", name: "English" },
+      score: 0.95,
+      matches: ["scene", "release"],
+      dont_matches: [],
+      timestamp: "2024-03-20T10:00:00Z",
+      parsed_timestamp: "March 20, 2024 10:00:00",
+      description: "Test description",
+      upgradable: true,
+      blacklisted: false,
+      provider: "opensubtitles",
+      subs_id: "123",
+      subtitles_path: "/path/to/subtitles.srt",
+    },
+  ],
+  total: 1,
+  page: 1,
+  per_page: 10,
+};
+
+describe("History Movies", () => {
+  beforeEach(() => {
+    server.use(
+      http.get("/api/movies/history", () => {
+        return HttpResponse.json(mockMovieHistory);
+      }),
+      http.get("/api/providers", () => {
+        return HttpResponse.json({
+          data: ["test-provider"],
+        });
+      }),
+      http.get("/api/system/languages", () => {
+        return HttpResponse.json({
+          en: { code2: "en", name: "English" },
+        });
+      }),
+    );
+  });
+
+  it("should render the movies history table", async () => {
+    customRender(<MoviesHistoryView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText(
+          "The Dark Knight (2008) [1080p.BluRay.x264.DTS-HD.MA.5.1]",
+        ),
+      ).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("Name")).toBeInTheDocument();
+    expect(screen.getByText("Language")).toBeInTheDocument();
+    expect(screen.getByText("Score")).toBeInTheDocument();
+    expect(screen.getByText("Match")).toBeInTheDocument();
+    expect(screen.getByText("Date")).toBeInTheDocument();
+    expect(screen.getByText("Info")).toBeInTheDocument();
+    expect(screen.getByText("Upgradable")).toBeInTheDocument();
+    expect(screen.getByText("Blacklist")).toBeInTheDocument();
+  });
+
+  it("should display movie information correctly", async () => {
+    customRender(<MoviesHistoryView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText(
+          "The Dark Knight (2008) [1080p.BluRay.x264.DTS-HD.MA.5.1]",
+        ),
+      ).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("English")).toBeInTheDocument();
+    expect(screen.getByText("0.95")).toBeInTheDocument();
+  });
+
+  it("should show blacklist button when movie is not blacklisted", async () => {
+    customRender(<MoviesHistoryView />);
+
+    await waitFor(() => {
+      expect(screen.getByLabelText("Add to Blacklist")).toBeInTheDocument();
+    });
+  });
+
+  it("should show empty state when no history is found", async () => {
+    server.use(
+      http.get("/api/movies/history", () => {
+        return HttpResponse.json({
+          data: [],
+          total: 0,
+          page: 1,
+          per_page: 10,
+        });
+      }),
+    );
+
+    customRender(<MoviesHistoryView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText("Nothing Found in Movies History"),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it("should navigate to movie details when clicking on movie title", async () => {
+    customRender(<MoviesHistoryView />);
+
+    await waitFor(() => {
+      const movieLink = screen.getByText(
+        "The Dark Knight (2008) [1080p.BluRay.x264.DTS-HD.MA.5.1]",
+      );
+      expect(movieLink).toHaveAttribute("href", "/movies/1");
+    });
+  });
+});
diff --git a/frontend/src/pages/History/Movies/index.tsx b/frontend/src/pages/History/Movies/index.tsx
index d8aa859d2..ed68854e2 100644
--- a/frontend/src/pages/History/Movies/index.tsx
+++ b/frontend/src/pages/History/Movies/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Badge, Text } from "@mantine/core";
 import {
   faFileExcel,
diff --git a/frontend/src/pages/History/Series/index.test.tsx b/frontend/src/pages/History/Series/index.test.tsx
new file mode 100644
index 000000000..6405f64fc
--- /dev/null
+++ b/frontend/src/pages/History/Series/index.test.tsx
@@ -0,0 +1,48 @@
+/* eslint-disable camelcase */
+
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import SeriesHistoryView from ".";
+
+describe("History Series", () => {
+  it("should render with series", async () => {
+    server.use(
+      http.get("/api/episodes/history", () => {
+        return HttpResponse.json({
+          data: [
+            {
+              seriesTitle: "Breaking Bad",
+              episode_number: "S05E07",
+              episodeTitle: "Pilot",
+              language: { code2: "en", name: "English" },
+              action: "download",
+              timestamp: "2023-05-10",
+              parsed_timestamp: "May 10, 2023",
+              sonarrSeriesId: 123,
+              sonarrEpisodeId: 456,
+              description: "Test description",
+              score: 100,
+              matches: [],
+              dont_matches: [],
+              upgradable: false,
+              blacklisted: false,
+            },
+          ],
+          page: 1,
+          totalPages: 1,
+          totalItems: 1,
+        });
+      }),
+    );
+
+    customRender(<SeriesHistoryView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Breaking Bad")).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("S05E07")).toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/pages/History/Series/index.tsx b/frontend/src/pages/History/Series/index.tsx
index b2e162ecd..dd3cc4743 100644
--- a/frontend/src/pages/History/Series/index.tsx
+++ b/frontend/src/pages/History/Series/index.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Badge, Text } from "@mantine/core";
 import {
   faFileExcel,
diff --git a/frontend/src/pages/History/Statistics/HistoryStats.module.scss b/frontend/src/pages/History/Statistics/HistoryStats.module.scss
index 3c7c04e10..9a1bbe874 100644
--- a/frontend/src/pages/History/Statistics/HistoryStats.module.scss
+++ b/frontend/src/pages/History/Statistics/HistoryStats.module.scss
@@ -1,7 +1,7 @@
 .container {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - $header-height);
+  height: calc(100vh - bazarr.$header-height);
 }
 
 .chart {
diff --git a/frontend/src/pages/History/Statistics/HistoryStats.test.tsx b/frontend/src/pages/History/Statistics/HistoryStats.test.tsx
new file mode 100644
index 000000000..c965aecba
--- /dev/null
+++ b/frontend/src/pages/History/Statistics/HistoryStats.test.tsx
@@ -0,0 +1,37 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
+import HistoryStats from "./HistoryStats";
+
+describe("History Stats", () => {
+  it("should render without stats", async () => {
+    server.use(
+      http.get("/api/providers", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+    server.use(
+      http.get("/api/system/languages", () => {
+        return HttpResponse.json({});
+      }),
+    );
+    server.use(
+      http.get("/api/history/stats", () => {
+        return HttpResponse.json({
+          series: [],
+        });
+      }),
+    );
+
+    server.use(
+      http.get("/api/system/providers", () => {
+        return HttpResponse.json({});
+      }),
+    );
+
+    customRender(<HistoryStats />);
+  });
+});
diff --git a/frontend/src/pages/History/history.test.tsx b/frontend/src/pages/History/history.test.tsx
deleted file mode 100644
index 277a268fb..000000000
--- a/frontend/src/pages/History/history.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { renderTest, RenderTestCase } from "@/tests/render";
-import HistoryStats from "./Statistics/HistoryStats";
-import MoviesHistoryView from "./Movies";
-import SeriesHistoryView from "./Series";
-
-const cases: RenderTestCase[] = [
-  {
-    name: "movie page",
-    ui: MoviesHistoryView,
-  },
-  {
-    name: "series page",
-    ui: SeriesHistoryView,
-  },
-  {
-    name: "statistics page",
-    ui: HistoryStats,
-  },
-];
-
-renderTest("History", cases);
diff --git a/frontend/src/pages/Movies/Details/index.tsx b/frontend/src/pages/Movies/Details/index.tsx
index 9bd56c660..35f6d27f0 100644
--- a/frontend/src/pages/Movies/Details/index.tsx
+++ b/frontend/src/pages/Movies/Details/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useCallback, useRef } from "react";
-import { Navigate, useParams } from "react-router-dom";
+import { Navigate, useParams } from "react-router";
 import { Container, Group, Menu, Stack } from "@mantine/core";
 import { Dropzone } from "@mantine/dropzone";
 import { useDocumentTitle } from "@mantine/hooks";
@@ -7,6 +7,7 @@ import { showNotification } from "@mantine/notifications";
 import {
   faCloudUploadAlt,
   faEllipsis,
+  faHardDrive,
   faHistory,
   faSearch,
   faSync,
@@ -127,6 +128,20 @@ const MovieDetailView: FunctionComponent = () => {
             <Toolbox.Button
               icon={faSync}
               disabled={hasTask}
+              onClick={() => {
+                if (movie) {
+                  task.create(movie.title, TaskGroup.Sync, action, {
+                    action: "sync",
+                    radarrid: id,
+                  });
+                }
+              }}
+            >
+              Sync
+            </Toolbox.Button>
+            <Toolbox.Button
+              icon={faHardDrive}
+              disabled={hasTask}
               onClick={() => {
                 if (movie) {
                   task.create(movie.title, TaskGroup.ScanDisk, action, {
diff --git a/frontend/src/pages/Movies/index.tsx b/frontend/src/pages/Movies/index.tsx
index ef5a1ec0d..8e6eef600 100644
--- a/frontend/src/pages/Movies/index.tsx
+++ b/frontend/src/pages/Movies/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Badge, Container } from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";
diff --git a/frontend/src/pages/Movies/movies.test.tsx b/frontend/src/pages/Movies/movies.test.tsx
index c4ac8133a..a611658aa 100644
--- a/frontend/src/pages/Movies/movies.test.tsx
+++ b/frontend/src/pages/Movies/movies.test.tsx
@@ -1,16 +1,46 @@
-import { describe } from "vitest";
-import { render } from "@/tests";
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { beforeEach, describe, it } from "vitest";
+import { customRender, screen } from "@/tests";
+import server from "@/tests/mocks/node";
 import MovieMassEditor from "./Editor";
 import MovieView from ".";
 
 describe("Movies page", () => {
+  beforeEach(() => {
+    server.use(
+      http.get("/api/movies", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+  });
+
   it("should render", () => {
-    render(<MovieView />);
+    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", () => {
-    render(<MovieMassEditor />);
+    customRender(<MovieMassEditor />);
+
+    expect(screen.getByText("Actions")).toBeInTheDocument();
   });
 });
diff --git a/frontend/src/pages/Series/index.tsx b/frontend/src/pages/Series/index.tsx
index 6da300c3a..d965c7b99 100644
--- a/frontend/src/pages/Series/index.tsx
+++ b/frontend/src/pages/Series/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Container, Group, Progress } from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";
diff --git a/frontend/src/pages/Series/series.test.tsx b/frontend/src/pages/Series/series.test.tsx
index b8fd9fad5..268281eb8 100644
--- a/frontend/src/pages/Series/series.test.tsx
+++ b/frontend/src/pages/Series/series.test.tsx
@@ -1,16 +1,44 @@
-import { describe } from "vitest";
-import { render } from "@/tests";
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { beforeEach, describe, it } from "vitest";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
 import SeriesMassEditor from "./Editor";
 import SeriesView from ".";
 
 describe("Series page", () => {
+  beforeEach(() => {
+    server.use(
+      http.get("/api/series", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+  });
+
   it("should render", () => {
-    render(<SeriesView />);
+    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", () => {
-    render(<SeriesMassEditor />);
+    customRender(<SeriesMassEditor />);
   });
 });
diff --git a/frontend/src/pages/Settings/General/options.ts b/frontend/src/pages/Settings/General/options.ts
index 77b1a63bc..098630329 100644
--- a/frontend/src/pages/Settings/General/options.ts
+++ b/frontend/src/pages/Settings/General/options.ts
@@ -13,9 +13,13 @@ export const securityOptions: SelectorOption<string>[] = [
 
 export const proxyOptions: SelectorOption<string>[] = [
   {
-    label: "Socks5",
+    label: "Socks5 (local DNS)",
     value: "socks5",
   },
+  {
+    label: "Socks5h (remote DNS)",
+    value: "socks5h",
+  },
   {
     label: "HTTP(S)",
     value: "http",
diff --git a/frontend/src/pages/Settings/Notifications/components.tsx b/frontend/src/pages/Settings/Notifications/components.tsx
index 8fa17abb2..86151ae2c 100644
--- a/frontend/src/pages/Settings/Notifications/components.tsx
+++ b/frontend/src/pages/Settings/Notifications/components.tsx
@@ -57,7 +57,7 @@ const NotificationForm: FunctionComponent<Props> = ({
         "Please select a notification provider",
       ),
       url: FormUtils.validation(
-        (value) => value.trim().length !== 0,
+        (value: string) => value.trim().length !== 0,
         "URL must not be empty",
       ),
     },
diff --git a/frontend/src/pages/Settings/Plex/index.tsx b/frontend/src/pages/Settings/Plex/index.tsx
new file mode 100644
index 000000000..c93bf011d
--- /dev/null
+++ b/frontend/src/pages/Settings/Plex/index.tsx
@@ -0,0 +1,66 @@
+import { FunctionComponent } from "react";
+import {
+  Check,
+  CollapseBox,
+  Layout,
+  Message,
+  Number,
+  Section,
+  Text,
+} from "@/pages/Settings/components";
+import { plexEnabledKey } from "@/pages/Settings/keys";
+
+const SettingsPlexView: FunctionComponent = () => {
+  return (
+    <Layout name="Interface">
+      <Section header="Use Plex operations">
+        <Check label="Enabled" settingKey={plexEnabledKey}></Check>
+      </Section>
+      <CollapseBox settingKey={plexEnabledKey}>
+        <Section header="Host">
+          <Text label="Address" settingKey="settings-plex-ip"></Text>
+          <Number
+            label="Port"
+            settingKey="settings-plex-port"
+            defaultValue={32400}
+          ></Number>
+          <Message>Hostname or IPv4 Address</Message>
+          <Text label="API Token" settingKey="settings-plex-apikey"></Text>
+          <Check label="SSL" settingKey="settings-plex-ssl"></Check>
+        </Section>
+        <Section header="Movie library">
+          <Text
+            label="Name of the library"
+            settingKey="settings-plex-movie_library"
+          ></Text>
+          <Check
+            label="Mark the movie as recently added after downloading subtitles"
+            settingKey="settings-plex-set_movie_added"
+          ></Check>
+          <Check
+            label="Scan library for new files after downloading subtitles"
+            settingKey="settings-plex-update_movie_library"
+          ></Check>
+          <Message>Can be helpful for remote media files</Message>
+        </Section>
+        <Section header="Series library">
+          <Text
+            label="Name of the library"
+            settingKey="settings-plex-series_library"
+          ></Text>
+          <Check
+            label="Mark the episode as recently added after downloading subtitles"
+            settingKey="settings-plex-set_episode_added"
+          ></Check>
+          <Check
+            label="Scan library for new files after downloading subtitles"
+            settingKey="settings-plex-update_series_library"
+          ></Check>
+          <Message>Can be helpful for remote media files</Message>
+        </Section>
+      </CollapseBox>
+    </Layout>
+  );
+};
+
+export default SettingsPlexView;
diff --git a/frontend/src/pages/Settings/Providers/components.tsx b/frontend/src/pages/Settings/Providers/components.tsx
index d50f0c93c..f342ab0a9 100644
--- a/frontend/src/pages/Settings/Providers/components.tsx
+++ b/frontend/src/pages/Settings/Providers/components.tsx
@@ -1,6 +1,7 @@
 import {
   Fragment,
   FunctionComponent,
+  JSX,
   useCallback,
   useMemo,
   useRef,
diff --git a/frontend/src/pages/Settings/Providers/list.ts b/frontend/src/pages/Settings/Providers/list.ts
index d2217bb6d..622ee9d1d 100644
--- a/frontend/src/pages/Settings/Providers/list.ts
+++ b/frontend/src/pages/Settings/Providers/list.ts
@@ -68,6 +68,11 @@ export const ProviderList: Readonly<ProviderInfo[]> = [
       },
     ],
   },
+  {
+    key: "animekalesi",
+    name: "AnimeKalesi",
+    description: "Turkish Anime Series Subtitles Provider",
+  },
   {
     key: "animetosho",
     name: "Anime Tosho",
@@ -550,6 +555,25 @@ export const ProviderList: Readonly<ProviderInfo[]> = [
       },
     ],
   },
+  {
+    key: "turkcealtyaziorg",
+    name: "Turkcealtyazi.org",
+    description: "Turkish Subtitles Provider",
+    message:
+      "For requests coming from outside of Turkey, cookies and user agent are required. Especially cf_clearance cookie.",
+    inputs: [
+      {
+        type: "text",
+        key: "cookies",
+        name: "Cookies, e.g., PHPSESSID=abc; wikisubtitlesuser=xyz; wikisubtitlespass=efg",
+      },
+      {
+        type: "text",
+        key: "user_agent",
+        name: "User-Agent, e.g., Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:95.0) Gecko/20100101 Firefox/95.0",
+      },
+    ],
+  },
   {
     key: "tusubtitulo",
     name: "Tusubtitulo.com",
diff --git a/frontend/src/pages/Settings/Scheduler/options.ts b/frontend/src/pages/Settings/Scheduler/options.ts
index 0b11a8226..0d8ab140b 100644
--- a/frontend/src/pages/Settings/Scheduler/options.ts
+++ b/frontend/src/pages/Settings/Scheduler/options.ts
@@ -36,4 +36,5 @@ export const upgradeOptions: SelectorOption<number>[] = [
   { label: "6 Hours", value: 6 },
   { label: "12 Hours", value: 12 },
   { label: "24 Hours", value: 24 },
+  { label: "Weekly", value: 168 },
 ];
diff --git a/frontend/src/pages/Settings/components/Card.module.scss b/frontend/src/pages/Settings/components/Card.module.scss
index 746e55e65..fbfa1c3d1 100644
--- a/frontend/src/pages/Settings/components/Card.module.scss
+++ b/frontend/src/pages/Settings/components/Card.module.scss
@@ -4,6 +4,6 @@
 
   &:hover {
     box-shadow: var(--mantine-shadow-md);
-    border: 1px solid $color-brand-5;
+    border: 1px solid bazarr.$color-brand-5;
   }
 }
diff --git a/frontend/src/pages/Settings/components/Layout.test.tsx b/frontend/src/pages/Settings/components/Layout.test.tsx
index a890bc277..373a750c5 100644
--- a/frontend/src/pages/Settings/components/Layout.test.tsx
+++ b/frontend/src/pages/Settings/components/Layout.test.tsx
@@ -1,11 +1,11 @@
 import { Text } from "@mantine/core";
 import { describe, it } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import Layout from "./Layout";
 
 describe("Settings layout", () => {
   it.concurrent("should be able to render without issues", () => {
-    render(
+    customRender(
       <Layout name="Test Settings">
         <Text>Value</Text>
       </Layout>,
@@ -13,7 +13,7 @@ describe("Settings layout", () => {
   });
 
   it.concurrent("save button should be disabled by default", () => {
-    render(
+    customRender(
       <Layout name="Test Settings">
         <Text>Value</Text>
       </Layout>,
diff --git a/frontend/src/pages/Settings/components/Section.test.tsx b/frontend/src/pages/Settings/components/Section.test.tsx
index 535bd8be2..c3231397f 100644
--- a/frontend/src/pages/Settings/components/Section.test.tsx
+++ b/frontend/src/pages/Settings/components/Section.test.tsx
@@ -1,12 +1,13 @@
 import { Text } from "@mantine/core";
 import { describe, it } from "vitest";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import { Section } from "./Section";
 
 describe("Settings section", () => {
   const header = "Section Header";
+
   it("should show header", () => {
-    render(<Section header="Section Header"></Section>);
+    customRender(<Section header="Section Header"></Section>);
 
     expect(screen.getByText(header)).toBeDefined();
     expect(screen.getByRole("separator")).toBeDefined();
@@ -14,7 +15,7 @@ describe("Settings section", () => {
 
   it("should show children", () => {
     const text = "Section Child";
-    render(
+    customRender(
       <Section header="Section Header">
         <Text>{text}</Text>
       </Section>,
@@ -26,7 +27,7 @@ describe("Settings section", () => {
 
   it("should work with hidden", () => {
     const text = "Section Child";
-    render(
+    customRender(
       <Section header="Section Header" hidden>
         <Text>{text}</Text>
       </Section>,
diff --git a/frontend/src/pages/Settings/components/forms.test.tsx b/frontend/src/pages/Settings/components/forms.test.tsx
index 4ec60699b..5cdc3b9fe 100644
--- a/frontend/src/pages/Settings/components/forms.test.tsx
+++ b/frontend/src/pages/Settings/components/forms.test.tsx
@@ -2,7 +2,7 @@ import { FunctionComponent, PropsWithChildren, ReactElement } from "react";
 import { useForm } from "@mantine/form";
 import { describe, it } from "vitest";
 import { FormContext, FormValues } from "@/pages/Settings/utilities/FormValues";
-import { render, screen } from "@/tests";
+import { customRender, screen } from "@/tests";
 import { Number, Text } from "./forms";
 
 const FormSupport: FunctionComponent<PropsWithChildren> = ({ children }) => {
@@ -16,7 +16,7 @@ const FormSupport: FunctionComponent<PropsWithChildren> = ({ children }) => {
 };
 
 const formRender = (ui: ReactElement) =>
-  render(<FormSupport>{ui}</FormSupport>);
+  customRender(<FormSupport>{ui}</FormSupport>);
 
 describe("Settings form", () => {
   describe("number component", () => {
diff --git a/frontend/src/pages/Settings/keys.ts b/frontend/src/pages/Settings/keys.ts
index 3d6444882..f7b3e0757 100644
--- a/frontend/src/pages/Settings/keys.ts
+++ b/frontend/src/pages/Settings/keys.ts
@@ -12,3 +12,4 @@ export const pathMappingsMovieKey = "settings-general-path_mappings_movie";
 
 export const seriesEnabledKey = "settings-general-use_sonarr";
 export const moviesEnabledKey = "settings-general-use_radarr";
+export const plexEnabledKey = "settings-general-use_plex";
diff --git a/frontend/src/pages/Settings/settings.test.tsx b/frontend/src/pages/Settings/settings.test.tsx
index 71aa74158..6dfb6e195 100644
--- a/frontend/src/pages/Settings/settings.test.tsx
+++ b/frontend/src/pages/Settings/settings.test.tsx
@@ -1,11 +1,11 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import server from "@/tests/mocks/node";
 import { renderTest, RenderTestCase } from "@/tests/render";
 import SettingsGeneralView from "./General";
 import SettingsLanguagesView from "./Languages";
-import SettingsNotificationsView from "./Notifications";
 import SettingsProvidersView from "./Providers";
-import SettingsRadarrView from "./Radarr";
 import SettingsSchedulerView from "./Scheduler";
-import SettingsSonarrView from "./Sonarr";
 import SettingsSubtitlesView from "./Subtitles";
 import SettingsUIView from "./UI";
 
@@ -17,27 +17,32 @@ const cases: RenderTestCase[] = [
   {
     name: "languages page",
     ui: SettingsLanguagesView,
+    setupEach: () => {
+      server.use(
+        http.get("/api/system/languages", () => {
+          return HttpResponse.json({});
+        }),
+      );
+      server.use(
+        http.get("/api/system/languages/profiles", () => {
+          return HttpResponse.json({
+            data: [],
+          });
+        }),
+      );
+    },
   },
-  {
-    name: "notifications page",
-    ui: SettingsNotificationsView,
-  },
+  // TODO: Test Notifications Page
   {
     name: "providers page",
     ui: SettingsProvidersView,
   },
-  {
-    name: "radarr page",
-    ui: SettingsRadarrView,
-  },
+  // TODO: Test Radarr Page
   {
     name: "scheduler page",
     ui: SettingsSchedulerView,
   },
-  {
-    name: "sonarr page",
-    ui: SettingsSonarrView,
-  },
+  // TODO: Test Sonarr Page
   {
     name: "subtitles page",
     ui: SettingsSubtitlesView,
diff --git a/frontend/src/pages/System/Announcements/index.test.tsx b/frontend/src/pages/System/Announcements/index.test.tsx
new file mode 100644
index 000000000..3879e2e37
--- /dev/null
+++ b/frontend/src/pages/System/Announcements/index.test.tsx
@@ -0,0 +1,67 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemAnnouncementsView from ".";
+
+describe("System Announcements", () => {
+  it("should render with empty announcements", async () => {
+    server.use(
+      http.get("/api/system/announcements", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemAnnouncementsView />);
+
+    await waitFor(() => {
+      expect(
+        screen.getByText(/No announcements for now, come back later!/i),
+      ).toBeInTheDocument();
+    });
+  });
+
+  it("should render with announcements", async () => {
+    const mockAnnouncements = [
+      {
+        text: "New Subtitle Provider!",
+        dismissible: true,
+      },
+      {
+        text: "Python Deprecated!",
+        dismissible: false,
+      },
+    ];
+
+    server.use(
+      http.get("/api/system/announcements", () => {
+        return HttpResponse.json({
+          data: mockAnnouncements,
+        });
+      }),
+    );
+
+    customRender(<SystemAnnouncementsView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("New Subtitle Provider!")).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("Python Deprecated!")).toBeInTheDocument();
+
+    const dismissButtons = screen.getAllByLabelText("Dismiss announcement");
+
+    const dismissableButton = dismissButtons.find((button) =>
+      button.closest("tr")?.textContent?.includes("New Subtitle Provider!"),
+    );
+
+    const nonDismissableButton = dismissButtons.find((button) =>
+      button.closest("tr")?.textContent?.includes("Python Deprecated!"),
+    );
+
+    expect(dismissableButton).not.toBeDisabled();
+    expect(nonDismissableButton).toBeDisabled();
+  });
+});
diff --git a/frontend/src/pages/System/Announcements/table.tsx b/frontend/src/pages/System/Announcements/table.tsx
index 910fb4bd5..56d94c66d 100644
--- a/frontend/src/pages/System/Announcements/table.tsx
+++ b/frontend/src/pages/System/Announcements/table.tsx
@@ -1,4 +1,4 @@
-import { FunctionComponent, useMemo } from "react";
+import { FunctionComponent, JSX, useMemo } from "react";
 import { Anchor, Text } from "@mantine/core";
 import { faWindowClose } from "@fortawesome/free-solid-svg-icons";
 import { ColumnDef } from "@tanstack/react-table";
diff --git a/frontend/src/pages/System/Backups/index.test.tsx b/frontend/src/pages/System/Backups/index.test.tsx
new file mode 100644
index 000000000..95f76cd43
--- /dev/null
+++ b/frontend/src/pages/System/Backups/index.test.tsx
@@ -0,0 +1,21 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemBackupsView from ".";
+
+describe("System Backups", () => {
+  it("should render with backups", async () => {
+    server.use(
+      http.get("/api/system/backups", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemBackupsView />);
+
+    // TODO: Assert
+  });
+});
diff --git a/frontend/src/pages/System/Logs/index.test.tsx b/frontend/src/pages/System/Logs/index.test.tsx
new file mode 100644
index 000000000..92615b085
--- /dev/null
+++ b/frontend/src/pages/System/Logs/index.test.tsx
@@ -0,0 +1,21 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemLogsView from ".";
+
+describe("System Logs", () => {
+  it("should render with logs", async () => {
+    server.use(
+      http.get("/api/system/logs", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemLogsView />);
+
+    // TODO: Assert
+  });
+});
diff --git a/frontend/src/pages/System/Providers/index.test.tsx b/frontend/src/pages/System/Providers/index.test.tsx
new file mode 100644
index 000000000..f4ee89c24
--- /dev/null
+++ b/frontend/src/pages/System/Providers/index.test.tsx
@@ -0,0 +1,55 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemProvidersView from ".";
+
+describe("System Providers", () => {
+  it("should render with providers", async () => {
+    server.use(
+      http.get("/api/providers", () => {
+        return HttpResponse.json({
+          data: [
+            { name: "OpenSubtitles", status: "active", retry: "0" },
+            { name: "Subscene", status: "inactive", retry: "3" },
+            { name: "Addic7ed", status: "disabled", retry: "1" },
+          ],
+        });
+      }),
+    );
+
+    customRender(<SystemProvidersView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("OpenSubtitles")).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("OpenSubtitles")).toBeInTheDocument();
+    expect(screen.getByText("Subscene")).toBeInTheDocument();
+    expect(screen.getByText("Addic7ed")).toBeInTheDocument();
+
+    expect(screen.getByText("active")).toBeInTheDocument();
+    expect(screen.getByText("inactive")).toBeInTheDocument();
+    expect(screen.getByText("disabled")).toBeInTheDocument();
+
+    expect(screen.getByText("0")).toBeInTheDocument();
+    expect(screen.getByText("3")).toBeInTheDocument();
+    expect(screen.getByText("1")).toBeInTheDocument();
+
+    // Verify toolbar buttons are present
+    expect(screen.getByText("Refresh")).toBeInTheDocument();
+    expect(screen.getByText("Reset")).toBeInTheDocument();
+  });
+
+  it("should render with no providers", async () => {
+    server.use(
+      http.get("/api/providers", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemProvidersView />);
+  });
+});
diff --git a/frontend/src/pages/System/Releases/index.test.tsx b/frontend/src/pages/System/Releases/index.test.tsx
new file mode 100644
index 000000000..8edbb2cd8
--- /dev/null
+++ b/frontend/src/pages/System/Releases/index.test.tsx
@@ -0,0 +1,79 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemReleasesView from ".";
+
+describe("System Releases", () => {
+  it("should render with releases", async () => {
+    const mockReleases = [
+      {
+        name: "v1.0.0",
+        body: [
+          "Added support for embedded subtitles in MKV files",
+          "Improved subtitle synchronization accuracy",
+        ],
+        date: "2024-03-20",
+        prerelease: false,
+        current: true,
+      },
+      {
+        name: "v1.1.0-beta",
+        body: [
+          "Added support for multiple subtitle providers",
+          "Enhanced subtitle language detection",
+        ],
+        date: "2024-03-21",
+        prerelease: true,
+        current: false,
+      },
+    ];
+
+    server.use(
+      http.get("/api/system/releases", () => {
+        return HttpResponse.json({
+          data: mockReleases,
+        });
+      }),
+    );
+
+    customRender(<SystemReleasesView />);
+
+    await screen.findByText("v1.0.0");
+    await screen.findByText("v1.1.0-beta");
+
+    expect(screen.getByText("v1.0.0")).toBeInTheDocument();
+    expect(screen.getByText("v1.1.0-beta")).toBeInTheDocument();
+    expect(screen.getByText("2024-03-20")).toBeInTheDocument();
+    expect(screen.getByText("2024-03-21")).toBeInTheDocument();
+    expect(screen.getByText("Master")).toBeInTheDocument();
+    expect(screen.getByText("Development")).toBeInTheDocument();
+    expect(screen.getByText("Installed")).toBeInTheDocument();
+    expect(
+      screen.getByText("Added support for embedded subtitles in MKV files"),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("Improved subtitle synchronization accuracy"),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("Added support for multiple subtitle providers"),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("Enhanced subtitle language detection"),
+    ).toBeInTheDocument();
+  });
+
+  it("should render empty state when no releases", async () => {
+    server.use(
+      http.get("/api/system/releases", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemReleasesView />);
+
+    expect(screen.queryByRole("card")).not.toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/pages/System/Status/index.test.tsx b/frontend/src/pages/System/Status/index.test.tsx
new file mode 100644
index 000000000..5b775960b
--- /dev/null
+++ b/frontend/src/pages/System/Status/index.test.tsx
@@ -0,0 +1,29 @@
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemStatusView from ".";
+
+describe("System Status", () => {
+  it("should render with status", async () => {
+    server.use(
+      http.get("/api/system/status", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    server.use(
+      http.get("/api/system/health", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemStatusView />);
+
+    // TODO: Assert
+  });
+});
diff --git a/frontend/src/pages/System/Status/index.tsx b/frontend/src/pages/System/Status/index.tsx
index 157935dfb..09981f451 100644
--- a/frontend/src/pages/System/Status/index.tsx
+++ b/frontend/src/pages/System/Status/index.tsx
@@ -1,5 +1,6 @@
 import {
   FunctionComponent,
+  JSX,
   PropsWithChildren,
   ReactNode,
   useCallback,
diff --git a/frontend/src/pages/System/Tasks/index.test.tsx b/frontend/src/pages/System/Tasks/index.test.tsx
new file mode 100644
index 000000000..5bc838a74
--- /dev/null
+++ b/frontend/src/pages/System/Tasks/index.test.tsx
@@ -0,0 +1,69 @@
+/* eslint-disable camelcase */
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen, waitFor } from "@/tests";
+import server from "@/tests/mocks/node";
+import SystemTasksView from ".";
+
+describe("System Tasks", () => {
+  it("should render without tasks", async () => {
+    server.use(
+      http.get("/api/system/tasks", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<SystemTasksView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Refresh")).toBeInTheDocument();
+    });
+  });
+
+  it("should render with system tasks", async () => {
+    const mockTasks = [
+      {
+        name: "Scan Series",
+        interval: "1 hour",
+        next_run_in: "30 minutes",
+        job_id: "series_scan",
+        job_running: false,
+      },
+      {
+        name: "Scan Movies",
+        interval: "1 hour",
+        next_run_in: "45 minutes",
+        job_id: "movies_scan",
+        job_running: true,
+      },
+    ];
+
+    server.use(
+      http.get("/api/system/tasks", () => {
+        return HttpResponse.json({
+          data: mockTasks,
+        });
+      }),
+    );
+
+    customRender(<SystemTasksView />);
+
+    await waitFor(() => {
+      expect(screen.getByText("Scan Series")).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("Scan Movies")).toBeInTheDocument();
+    expect(screen.getByText("30 minutes")).toBeInTheDocument();
+    expect(screen.getByText("45 minutes")).toBeInTheDocument();
+
+    expect(screen.getByText("Name")).toBeInTheDocument();
+    expect(screen.getByText("Interval")).toBeInTheDocument();
+    expect(screen.getByText("Next Execution")).toBeInTheDocument();
+    expect(screen.getByText("Run")).toBeInTheDocument();
+
+    const runButtons = screen.getAllByLabelText("Run Job");
+    expect(runButtons).toHaveLength(2);
+  });
+});
diff --git a/frontend/src/pages/System/system.test.tsx b/frontend/src/pages/System/system.test.tsx
deleted file mode 100644
index 813654a7b..000000000
--- a/frontend/src/pages/System/system.test.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import SystemAnnouncementsView from "@/pages/System/Announcements";
-import { renderTest, RenderTestCase } from "@/tests/render";
-import SystemBackupsView from "./Backups";
-import SystemLogsView from "./Logs";
-import SystemProvidersView from "./Providers";
-import SystemReleasesView from "./Releases";
-import SystemStatusView from "./Status";
-import SystemTasksView from "./Tasks";
-
-const cases: RenderTestCase[] = [
-  {
-    name: "backups page",
-    ui: SystemBackupsView,
-  },
-  {
-    name: "logs page",
-    ui: SystemLogsView,
-  },
-  {
-    name: "providers page",
-    ui: SystemProvidersView,
-  },
-  {
-    name: "releases page",
-    ui: SystemReleasesView,
-  },
-  {
-    name: "status page",
-    ui: SystemStatusView,
-  },
-  {
-    name: "tasks page",
-    ui: SystemTasksView,
-  },
-  {
-    name: "announcements page",
-    ui: SystemAnnouncementsView,
-  },
-];
-
-renderTest("System", cases);
diff --git a/frontend/src/pages/Wanted/Movies/index.test.tsx b/frontend/src/pages/Wanted/Movies/index.test.tsx
new file mode 100644
index 000000000..55f5863a9
--- /dev/null
+++ b/frontend/src/pages/Wanted/Movies/index.test.tsx
@@ -0,0 +1,62 @@
+/* eslint-disable camelcase */
+
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen } from "@/tests";
+import server from "@/tests/mocks/node";
+import WantedMoviesView from ".";
+
+describe("Wanted Movies", () => {
+  it("should render with wanted movies", async () => {
+    const mockMovies = [
+      {
+        title: "The Shawshank Redemption",
+        radarrId: 1,
+        missing_subtitles: [
+          {
+            code2: "en",
+            name: "English",
+            hi: false,
+            forced: false,
+          },
+        ],
+      },
+    ];
+
+    server.use(
+      http.get("/api/movies/wanted", () => {
+        return HttpResponse.json({
+          data: mockMovies,
+        });
+      }),
+    );
+
+    customRender(<WantedMoviesView />);
+
+    const movieTitle = await screen.findByText("The Shawshank Redemption");
+    expect(movieTitle).toBeInTheDocument();
+
+    const movieLink = screen.getByRole("link", {
+      name: "The Shawshank Redemption",
+    });
+    expect(movieLink).toHaveAttribute("href", "/movies/1");
+  });
+
+  it("should render empty state when no wanted movies", async () => {
+    server.use(
+      http.get("/api/movies/wanted", () => {
+        return HttpResponse.json({
+          data: [],
+        });
+      }),
+    );
+
+    customRender(<WantedMoviesView />);
+
+    const table = await screen.findByRole("table");
+    expect(table).toBeInTheDocument();
+
+    const movieTitle = screen.queryByText("The Shawshank Redemption");
+    expect(movieTitle).not.toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/pages/Wanted/Movies/index.tsx b/frontend/src/pages/Wanted/Movies/index.tsx
index c05cfb7c3..e3beb04fd 100644
--- a/frontend/src/pages/Wanted/Movies/index.tsx
+++ b/frontend/src/pages/Wanted/Movies/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Badge, Group } from "@mantine/core";
 import { faSearch } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
diff --git a/frontend/src/pages/Wanted/Series/index.test.tsx b/frontend/src/pages/Wanted/Series/index.test.tsx
new file mode 100644
index 000000000..530c3b2cb
--- /dev/null
+++ b/frontend/src/pages/Wanted/Series/index.test.tsx
@@ -0,0 +1,67 @@
+/* eslint-disable camelcase */
+
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { customRender, screen } from "@/tests";
+import server from "@/tests/mocks/node";
+import WantedSeriesView from ".";
+
+describe("Wanted Series", () => {
+  it("should render with wanted series", async () => {
+    const mockData = {
+      data: [
+        {
+          sonarrSeriesId: 1,
+          sonarrEpisodeId: 101,
+          seriesTitle: "Breaking Bad",
+          episode_number: "S01E01",
+          episodeTitle: "Pilot",
+          missing_subtitles: [
+            {
+              code2: "en",
+              name: "English",
+              hi: false,
+              forced: false,
+            },
+          ],
+        },
+      ],
+      total: 1,
+      page: 1,
+      per_page: 10,
+    };
+
+    server.use(
+      http.get("/api/episodes/wanted", () => {
+        return HttpResponse.json(mockData);
+      }),
+    );
+
+    customRender(<WantedSeriesView />);
+
+    await screen.findByText("Breaking Bad");
+    expect(screen.getByText("Name")).toBeInTheDocument();
+    expect(screen.getByText("Episode")).toBeInTheDocument();
+    expect(screen.getByText("Missing")).toBeInTheDocument();
+    expect(screen.getByText("Breaking Bad")).toBeInTheDocument();
+    expect(screen.getByText("S01E01")).toBeInTheDocument();
+    expect(screen.getByText("Pilot")).toBeInTheDocument();
+  });
+
+  it("should render empty state when no wanted series", async () => {
+    server.use(
+      http.get("/api/episodes/wanted", () => {
+        return HttpResponse.json({
+          data: [],
+          total: 0,
+          page: 1,
+          per_page: 10,
+        });
+      }),
+    );
+
+    customRender(<WantedSeriesView />);
+
+    await screen.findByText(/No missing Series subtitles/i);
+  });
+});
diff --git a/frontend/src/pages/Wanted/Series/index.tsx b/frontend/src/pages/Wanted/Series/index.tsx
index 0501ecef5..f3b6bddf8 100644
--- a/frontend/src/pages/Wanted/Series/index.tsx
+++ b/frontend/src/pages/Wanted/Series/index.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, useMemo } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Anchor, Badge, Group } from "@mantine/core";
 import { faSearch } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
diff --git a/frontend/src/pages/Wanted/wanted.test.tsx b/frontend/src/pages/Wanted/wanted.test.tsx
deleted file mode 100644
index 36e72c4bb..000000000
--- a/frontend/src/pages/Wanted/wanted.test.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { renderTest, RenderTestCase } from "@/tests/render";
-import WantedMoviesView from "./Movies";
-import WantedSeriesView from "./Series";
-
-const cases: RenderTestCase[] = [
-  {
-    name: "movie page",
-    ui: WantedMoviesView,
-  },
-  {
-    name: "series page",
-    ui: WantedSeriesView,
-  },
-];
-
-renderTest("Wanted", cases);
diff --git a/frontend/src/pages/errors/errors.test.tsx b/frontend/src/pages/errors/errors.test.tsx
index eeacfd631..6cae27394 100644
--- a/frontend/src/pages/errors/errors.test.tsx
+++ b/frontend/src/pages/errors/errors.test.tsx
@@ -1,22 +1,22 @@
-import { render } from "@/tests";
+import { customRender } from "@/tests";
 import CriticalError from "./CriticalError";
 import NotFound from "./NotFound";
 import UIError from "./UIError";
 
 describe("Not found page", () => {
   it("should display message", () => {
-    render(<NotFound />);
+    customRender(<NotFound />);
   });
 });
 
 describe("Critical error page", () => {
   it("should disable error", () => {
-    render(<CriticalError message="Test error"></CriticalError>);
+    customRender(<CriticalError message="Test error"></CriticalError>);
   });
 });
 
 describe("UI error page", () => {
   it("should disable error", () => {
-    render(<UIError error={new Error("Test error")}></UIError>);
+    customRender(<UIError error={new Error("Test error")}></UIError>);
   });
 });
diff --git a/frontend/src/pages/views/ItemView.tsx b/frontend/src/pages/views/ItemView.tsx
index c4ff250ea..2da85d181 100644
--- a/frontend/src/pages/views/ItemView.tsx
+++ b/frontend/src/pages/views/ItemView.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { faList } from "@fortawesome/free-solid-svg-icons";
 import { ColumnDef } from "@tanstack/react-table";
 import { UsePaginationQueryResult } from "@/apis/queries/hooks";
diff --git a/frontend/src/pages/views/MassEditor.tsx b/frontend/src/pages/views/MassEditor.tsx
index 48068d1c6..57221888a 100644
--- a/frontend/src/pages/views/MassEditor.tsx
+++ b/frontend/src/pages/views/MassEditor.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+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";
@@ -57,14 +57,6 @@ function MassEditor<T extends Item.Base>(props: MassEditorProps<T>) {
     ];
   }, [profileOptions.options]);
 
-  const getKey = useCallback((value: Language.Profile | null) => {
-    if (value) {
-      return value.name;
-    }
-
-    return "Clear";
-  }, []);
-
   const { mutateAsync } = mutation;
 
   /**
@@ -136,7 +128,6 @@ function MassEditor<T extends Item.Base>(props: MassEditorProps<T>) {
             placeholder="Change Profile"
             withCheckIcon={false}
             options={profileOptionsWithAction}
-            getkey={getKey}
             disabled={selections.length === 0}
             comboboxProps={{
               store: combobox,
diff --git a/frontend/src/providers.tsx b/frontend/src/providers.tsx
index 52a152600..d1eb7b434 100644
--- a/frontend/src/providers.tsx
+++ b/frontend/src/providers.tsx
@@ -15,7 +15,7 @@ export const AllProviders: FunctionComponent<PropsWithChildren> = ({
     <QueryClientProvider client={queryClient}>
       <ThemeProvider>
         <ModalsProvider>
-          <Notifications limit={5} />
+          <Notifications position="bottom-left" limit={5} />
           {/* c8 ignore next 3 */}
           {Environment.queryDev && <ReactQueryDevtools initialIsOpen={false} />}
           {children}
diff --git a/frontend/src/tests/index.tsx b/frontend/src/tests/index.tsx
index 8b4d64c64..e2982017f 100644
--- a/frontend/src/tests/index.tsx
+++ b/frontend/src/tests/index.tsx
@@ -4,11 +4,7 @@ import {
   ReactElement,
   StrictMode,
 } from "react";
-import {
-  createBrowserRouter,
-  RouteObject,
-  RouterProvider,
-} from "react-router-dom";
+import { createBrowserRouter, RouteObject, RouterProvider } from "react-router";
 import { render, RenderOptions } from "@testing-library/react";
 import { AllProviders } from "@/providers";
 
@@ -39,6 +35,7 @@ const customRender = (
 
 // re-export everything
 export * from "@testing-library/react";
+
 // override render method
-export { customRender as render };
+export { customRender };
 export { render as rawRender };
diff --git a/frontend/src/tests/mocks/node.ts b/frontend/src/tests/mocks/node.ts
new file mode 100644
index 000000000..7826431e6
--- /dev/null
+++ b/frontend/src/tests/mocks/node.ts
@@ -0,0 +1,5 @@
+import { setupServer } from "msw/node";
+
+const server = setupServer();
+
+export default server;
diff --git a/frontend/src/tests/render.tsx b/frontend/src/tests/render.tsx
index e0031e903..6fe666fc9 100644
--- a/frontend/src/tests/render.tsx
+++ b/frontend/src/tests/render.tsx
@@ -1,16 +1,23 @@
 import { FunctionComponent } from "react";
-import { render } from ".";
+import { customRender } from ".";
 
 export interface RenderTestCase {
   name: string;
   ui: FunctionComponent;
+  setupEach?: () => void;
 }
 
 export function renderTest(name: string, cases: RenderTestCase[]) {
   describe(name, () => {
+    beforeEach(() => {
+      cases.forEach((element) => {
+        element.setupEach?.();
+      });
+    });
+
     cases.forEach((element) => {
       it(`${element.name.toLowerCase()} should render`, () => {
-        render(<element.ui />);
+        customRender(<element.ui />);
       });
     });
   });
diff --git a/frontend/src/tests/setup.ts b/frontend/src/tests/setup.ts
deleted file mode 100644
index 0f6df68ba..000000000
--- a/frontend/src/tests/setup.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-
-import { vitest } from "vitest";
-import "@testing-library/jest-dom";
-
-// From https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
-Object.defineProperty(window, "matchMedia", {
-  writable: true,
-  value: vitest.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: vitest.fn(), // Deprecated
-    removeListener: vitest.fn(), // Deprecated
-    addEventListener: vitest.fn(),
-    removeEventListener: vitest.fn(),
-    dispatchEvent: vitest.fn(),
-  })),
-});
-
-// From https://github.com/mantinedev/mantine/blob/master/configuration/jest/jsdom.mocks.js
-class ResizeObserver {
-  observe() {}
-  unobserve() {}
-  disconnect() {}
-}
-
-window.ResizeObserver = ResizeObserver;
-
-window.scrollTo = () => {};
diff --git a/frontend/src/tests/setup.tsx b/frontend/src/tests/setup.tsx
new file mode 100644
index 000000000..52310b906
--- /dev/null
+++ b/frontend/src/tests/setup.tsx
@@ -0,0 +1,70 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+
+import { http } from "msw";
+import { HttpResponse } from "msw";
+import { vi, vitest } from "vitest";
+import "@testing-library/jest-dom";
+import queryClient from "@/apis/queries";
+import server from "./mocks/node";
+
+vi.mock("recharts", async () => {
+  const OriginalRechartsModule = await vi.importActual("recharts");
+
+  return {
+    ...OriginalRechartsModule,
+    ResponsiveContainer: ({ children }: { children: React.ReactNode }) => (
+      <div style={{ width: "100%", height: "100%" }}>{children}</div>
+    ),
+  };
+});
+
+// From https://stackoverflow.com/questions/39830580/jest-test-fails-typeerror-window-matchmedia-is-not-a-function
+Object.defineProperty(window, "matchMedia", {
+  writable: true,
+  value: vitest.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: vitest.fn(), // Deprecated
+    removeListener: vitest.fn(), // Deprecated
+    addEventListener: vitest.fn(),
+    removeEventListener: vitest.fn(),
+    dispatchEvent: vitest.fn(),
+  })),
+});
+
+// From https://github.com/mantinedev/mantine/blob/master/configuration/jest/jsdom.mocks.js
+class ResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+
+window.ResizeObserver = ResizeObserver;
+
+window.scrollTo = () => {};
+
+beforeAll(() => {
+  server.listen({ onUnhandledRequest: "error" });
+});
+
+beforeEach(() => {
+  server.resetHandlers();
+  server.use(
+    http.get("/api/system/settings", () => {
+      return HttpResponse.json({
+        general: {
+          theme: "auto",
+        },
+      });
+    }),
+  );
+});
+
+afterEach(() => {
+  server.resetHandlers();
+
+  queryClient.clear();
+});
+
+afterAll(() => server.close());
diff --git a/frontend/src/types/form.d.ts b/frontend/src/types/form.d.ts
index 81b86be96..07457115c 100644
--- a/frontend/src/types/form.d.ts
+++ b/frontend/src/types/form.d.ts
@@ -9,12 +9,12 @@ declare namespace FormType {
   type MoviesAction = OneMovieAction | SearchWantedAction;
 
   interface OneMovieAction {
-    action: "search-missing" | "scan-disk";
+    action: "search-missing" | "scan-disk" | "sync";
     radarrid: number;
   }
 
   interface OneSeriesAction {
-    action: "search-missing" | "scan-disk";
+    action: "search-missing" | "scan-disk" | "sync";
     seriesid: number;
   }
 
diff --git a/frontend/src/types/settings.d.ts b/frontend/src/types/settings.d.ts
index 7b57f10cc..51e21a709 100644
--- a/frontend/src/types/settings.d.ts
+++ b/frontend/src/types/settings.d.ts
@@ -173,6 +173,19 @@ declare namespace Settings {
     excluded_tags: string[];
   }
 
+  interface Plex {
+    ip: string;
+    port: number;
+    apikey?: string;
+    ssl?: boolean;
+    set_movie_added?: boolean;
+    set_episode_added?: boolean;
+    movie_library?: string;
+    series_library?: string;
+    update_movie_library?: boolean;
+    update_series_library?: boolean;
+  }
+
   interface Anticaptcha {
     anti_captcha_key?: string;
   }
diff --git a/frontend/src/utilities/console.ts b/frontend/src/utilities/console.ts
index 64da1330c..372207db3 100644
--- a/frontend/src/utilities/console.ts
+++ b/frontend/src/utilities/console.ts
@@ -6,6 +6,10 @@ import { isProdEnv } from ".";
 type LoggerType = "info" | "warning" | "error";
 
 export function LOG(type: LoggerType, msg: string, ...payload: any[]) {
+  if (import.meta.env.MODE === "test") {
+    return;
+  }
+
   if (!isProdEnv) {
     let logger = console.log;
     if (type === "warning") {
diff --git a/frontend/src/utilities/hooks.ts b/frontend/src/utilities/hooks.ts
index 6ae8a2366..517305cbf 100644
--- a/frontend/src/utilities/hooks.ts
+++ b/frontend/src/utilities/hooks.ts
@@ -6,7 +6,7 @@ import {
   useRef,
   useState,
 } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { SliderProps } from "@mantine/core";
 import { SelectorOption, SelectorProps } from "@/components";
 
@@ -111,7 +111,7 @@ export function useThrottle<F extends GenericFunction>(fn: F, ms: number) {
   const fnRef = useRef(fn);
   fnRef.current = fn;
 
-  const timer = useRef<number>();
+  const timer = useRef<number>(undefined);
 
   return useCallback(
     (...args: Parameters<F>) => {
@@ -153,7 +153,7 @@ export function useOnValueChange<T>(value: T, onChange: (value: T) => void) {
 
 // Mantine's useInterval has some weird issues. This is a workaround.
 export function useInterval(fn: VoidFunction, ms: number) {
-  const timer = useRef<number>();
+  const timer = useRef<number>(undefined);
 
   useEffect(() => {
     timer.current = window.setInterval(fn, ms);
diff --git a/frontend/src/utilities/routers.ts b/frontend/src/utilities/routers.ts
index f3f82c8cd..8583f999e 100644
--- a/frontend/src/utilities/routers.ts
+++ b/frontend/src/utilities/routers.ts
@@ -1,7 +1,7 @@
 // A workaround of built-in hooks in React-Router v6
 // https://gist.github.com/rmorse/426ffcc579922a82749934826fa9f743
 
-import { unstable_usePrompt as useUnstablePrompt } from "react-router-dom";
+import { unstable_usePrompt as useUnstablePrompt } from "react-router";
 
 // TODO: Replace with Mantine's confirmation modal
 export function usePrompt(when: boolean, message: string) {
diff --git a/frontend/src/utilities/validate.ts b/frontend/src/utilities/validate.ts
index 2b3f028f6..56f2d9883 100644
--- a/frontend/src/utilities/validate.ts
+++ b/frontend/src/utilities/validate.ts
@@ -1,10 +1,3 @@
-import { ReactText } from "react";
-import { isNumber, isString } from "lodash";
-
-export function isReactText(v: unknown): v is ReactText {
-  return isString(v) || isNumber(v);
-}
-
 export function isMovie(v: object): v is Item.Movie {
   return "radarrId" in v;
 }
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index fbae83c88..c6685e3f8 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -12,11 +12,11 @@ import { VitePWA } from "vite-plugin-pwa";
 import chunks from "./config/chunks";
 import overrideEnv from "./config/configReader";
 
-export default defineConfig(async ({ mode, command }) => {
+export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd());
 
   if (command === "serve") {
-    await overrideEnv(env);
+    overrideEnv(env);
   }
 
   const target = env.VITE_PROXY_URL;
@@ -106,9 +106,10 @@ export default defineConfig(async ({ mode, command }) => {
     css: {
       preprocessorOptions: {
         scss: {
+          api: "modern-compiler",
           additionalData: `
-            @import "./src/assets/_mantine";
-            @import "./src/assets/_bazarr";
+            @use "${path.join(process.cwd(), "src/assets/_mantine").replace(/\\/g, "/")}" as mantine;
+            @use "${path.join(process.cwd(), "src/assets/_bazarr").replace(/\\/g, "/")}" as bazarr;
           `,
         },
       },
@@ -132,7 +133,7 @@ export default defineConfig(async ({ mode, command }) => {
     test: {
       globals: true,
       environment: "jsdom",
-      setupFiles: "./src/tests/setup.ts",
+      setupFiles: "./src/tests/setup.tsx",
     },
     server: {
       proxy: {
diff --git a/libs/Flask_Cors-4.0.0.dist-info/RECORD b/libs/Flask_Cors-4.0.0.dist-info/RECORD
deleted file mode 100644
index eae9c8673..000000000
--- a/libs/Flask_Cors-4.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-Flask_Cors-4.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_Cors-4.0.0.dist-info/LICENSE,sha256=bhob3FSDTB4HQMvOXV9vLK4chG_Sp_SCsRZJWU-vvV0,1069
-Flask_Cors-4.0.0.dist-info/METADATA,sha256=gH5CIZManWT1lJuvM-YzOlSGJNdzB03QkylAtEc24tY,5417
-Flask_Cors-4.0.0.dist-info/RECORD,,
-Flask_Cors-4.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_Cors-4.0.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-Flask_Cors-4.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=e1u_o5SOcS_gMWGjcQrkyk91uPICnzZ3AXZvy5jQ_FE,14063
-flask_cors/decorator.py,sha256=BeJsyX1wYhVKWN04FAhb6z8YqffiRr7wKqwzHPap4bw,5009
-flask_cors/extension.py,sha256=nP4Zq_BhgDVWwPdIl_f-uucNxD38pXUo-dkL-voXc58,7832
-flask_cors/version.py,sha256=61rJjfThnbRdElpSP2tm31hPmFnHJmcwoPhtqA0Bi_Q,22
diff --git a/libs/Flask_Cors-4.0.0.dist-info/INSTALLER b/libs/Flask_Cors-5.0.0.dist-info/INSTALLER
similarity index 100%
rename from libs/Flask_Cors-4.0.0.dist-info/INSTALLER
rename to libs/Flask_Cors-5.0.0.dist-info/INSTALLER
diff --git a/libs/Flask_Cors-4.0.0.dist-info/LICENSE b/libs/Flask_Cors-5.0.0.dist-info/LICENSE
similarity index 100%
rename from libs/Flask_Cors-4.0.0.dist-info/LICENSE
rename to libs/Flask_Cors-5.0.0.dist-info/LICENSE
diff --git a/libs/Flask_Cors-4.0.0.dist-info/METADATA b/libs/Flask_Cors-5.0.0.dist-info/METADATA
similarity index 89%
rename from libs/Flask_Cors-4.0.0.dist-info/METADATA
rename to libs/Flask_Cors-5.0.0.dist-info/METADATA
index c6e2af695..99902fe9d 100644
--- a/libs/Flask_Cors-4.0.0.dist-info/METADATA
+++ b/libs/Flask_Cors-5.0.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Flask-Cors
-Version: 4.0.0
+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
@@ -16,6 +16,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: Topic :: Internet :: WWW/HTTP :: Dynamic Content
@@ -31,10 +32,10 @@ Flask-CORS
 
 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. 
+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. 
+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
@@ -49,14 +50,14 @@ Install the extension with using pip, or easy\_install.
 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. 
+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. 
+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
@@ -75,7 +76,7 @@ See the full list of options in the `documentation <https://flask-cors.corydolph
 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. 
+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
@@ -90,8 +91,8 @@ See the full list of options in the `documentation <https://flask-cors.corydolph
 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. 
+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
@@ -119,7 +120,7 @@ If things aren't working as you expect, enable logging to help understand what i
 Tests
 -----
 
-A simple set of tests is included in ``test/``. 
+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.
@@ -128,8 +129,8 @@ 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. 
+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
@@ -137,7 +138,7 @@ 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://api.travis-ci.org/corydolphin/flask-cors.svg?branch=master
+.. |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/
diff --git a/libs/Flask_Cors-5.0.0.dist-info/RECORD b/libs/Flask_Cors-5.0.0.dist-info/RECORD
new file mode 100644
index 000000000..5e942ce53
--- /dev/null
+++ b/libs/Flask_Cors-5.0.0.dist-info/RECORD
@@ -0,0 +1,12 @@
+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-4.0.0.dist-info/REQUESTED b/libs/Flask_Cors-5.0.0.dist-info/REQUESTED
similarity index 100%
rename from libs/Flask_Cors-4.0.0.dist-info/REQUESTED
rename to libs/Flask_Cors-5.0.0.dist-info/REQUESTED
diff --git a/libs/Flask_Cors-4.0.0.dist-info/WHEEL b/libs/Flask_Cors-5.0.0.dist-info/WHEEL
similarity index 100%
rename from libs/Flask_Cors-4.0.0.dist-info/WHEEL
rename to libs/Flask_Cors-5.0.0.dist-info/WHEEL
diff --git a/libs/Flask_Cors-4.0.0.dist-info/top_level.txt b/libs/Flask_Cors-5.0.0.dist-info/top_level.txt
similarity index 100%
rename from libs/Flask_Cors-4.0.0.dist-info/top_level.txt
rename to libs/Flask_Cors-5.0.0.dist-info/top_level.txt
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/INSTALLER b/libs/Flask_Migrate-4.1.0.dist-info/INSTALLER
similarity index 100%
rename from libs/Flask_Migrate-4.0.5.dist-info/INSTALLER
rename to libs/Flask_Migrate-4.1.0.dist-info/INSTALLER
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/LICENSE b/libs/Flask_Migrate-4.1.0.dist-info/LICENSE
similarity index 100%
rename from libs/Flask_Migrate-4.0.5.dist-info/LICENSE
rename to libs/Flask_Migrate-4.1.0.dist-info/LICENSE
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/METADATA b/libs/Flask_Migrate-4.1.0.dist-info/METADATA
similarity index 89%
rename from libs/Flask_Migrate-4.0.5.dist-info/METADATA
rename to libs/Flask_Migrate-4.1.0.dist-info/METADATA
index 0590a4cf5..ef8ede367 100644
--- a/libs/Flask_Migrate-4.0.5.dist-info/METADATA
+++ b/libs/Flask_Migrate-4.1.0.dist-info/METADATA
@@ -1,11 +1,10 @@
 Metadata-Version: 2.1
 Name: Flask-Migrate
-Version: 4.0.5
+Version: 4.1.0
 Summary: SQLAlchemy database migrations for Flask applications using Alembic.
-Home-page: https://github.com/miguelgrinberg/flask-migrate
-Author: Miguel Grinberg
-Author-email: miguel.grinberg@gmail.com
+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
@@ -18,6 +17,12 @@ 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'
 
 Flask-Migrate
 =============
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/RECORD b/libs/Flask_Migrate-4.1.0.dist-info/RECORD
similarity index 73%
rename from libs/Flask_Migrate-4.0.5.dist-info/RECORD
rename to libs/Flask_Migrate-4.1.0.dist-info/RECORD
index 740ada03e..d634fa09a 100644
--- a/libs/Flask_Migrate-4.0.5.dist-info/RECORD
+++ b/libs/Flask_Migrate-4.1.0.dist-info/RECORD
@@ -1,12 +1,12 @@
-Flask_Migrate-4.0.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_Migrate-4.0.5.dist-info/LICENSE,sha256=kfkXGlJQvKy3Y__6tAJ8ynIp1HQfeROXhL8jZU1d-DI,1082
-Flask_Migrate-4.0.5.dist-info/METADATA,sha256=d-EcnhZa_vyVAph2u84OpGIteJaBmqLQxO5Rf6wUI7Y,3095
-Flask_Migrate-4.0.5.dist-info/RECORD,,
-Flask_Migrate-4.0.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_Migrate-4.0.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-Flask_Migrate-4.0.5.dist-info/top_level.txt,sha256=jLoPgiMG6oR4ugNteXn3IHskVVIyIXVStZOVq-AWLdU,14
-flask_migrate/__init__.py,sha256=-JFdExGtr7UrwCpmjYvTfzFHqMjE7AmP0Rr3T53tBNU,10037
-flask_migrate/cli.py,sha256=H-N4NNS5HyEB61HpUADLU8pW3naejyDPgeEbzEqG5-w,10298
+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/__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
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/REQUESTED b/libs/Flask_Migrate-4.1.0.dist-info/REQUESTED
similarity index 100%
rename from libs/Flask_Migrate-4.0.5.dist-info/REQUESTED
rename to libs/Flask_Migrate-4.1.0.dist-info/REQUESTED
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/WHEEL b/libs/Flask_Migrate-4.1.0.dist-info/WHEEL
similarity index 65%
rename from libs/Flask_Migrate-4.0.5.dist-info/WHEEL
rename to libs/Flask_Migrate-4.1.0.dist-info/WHEEL
index 98c0d20b7..9b78c4451 100644
--- a/libs/Flask_Migrate-4.0.5.dist-info/WHEEL
+++ b/libs/Flask_Migrate-4.1.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Flask_Migrate-4.0.5.dist-info/top_level.txt b/libs/Flask_Migrate-4.1.0.dist-info/top_level.txt
similarity index 100%
rename from libs/Flask_Migrate-4.0.5.dist-info/top_level.txt
rename to libs/Flask_Migrate-4.1.0.dist-info/top_level.txt
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/RECORD b/libs/Flask_SocketIO-5.3.6.dist-info/RECORD
deleted file mode 100644
index 4a6082118..000000000
--- a/libs/Flask_SocketIO-5.3.6.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-Flask_SocketIO-5.3.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_SocketIO-5.3.6.dist-info/LICENSE,sha256=aNCWbkgKjS_T1cJtACyZbvCM36KxWnfQ0LWTuavuYKQ,1082
-Flask_SocketIO-5.3.6.dist-info/METADATA,sha256=vmIOzjkNLXRjmocRXtso6hLV27aiJgH7_A55TVJyD4k,2631
-Flask_SocketIO-5.3.6.dist-info/RECORD,,
-Flask_SocketIO-5.3.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_SocketIO-5.3.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-Flask_SocketIO-5.3.6.dist-info/top_level.txt,sha256=C1ugzQBJ3HHUJsWGzyt70XRVOX-y4CUAR8MWKjwJOQ8,15
-flask_socketio/__init__.py,sha256=ea3QXRYKBje4JQGcNSEOmj42qlf2peRNbCzZZWfD9DE,54731
-flask_socketio/namespace.py,sha256=b3oyXEemu2po-wpoy4ILTHQMVuVQqicogCDxfymfz_w,2020
-flask_socketio/test_client.py,sha256=9_R1y_vP8yr8wzimQUEMAUyVqX12FMXurLj8t1ecDdc,11034
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/INSTALLER b/libs/Flask_SocketIO-5.5.1.dist-info/INSTALLER
similarity index 100%
rename from libs/Flask_SocketIO-5.3.6.dist-info/INSTALLER
rename to libs/Flask_SocketIO-5.5.1.dist-info/INSTALLER
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/LICENSE b/libs/Flask_SocketIO-5.5.1.dist-info/LICENSE
similarity index 100%
rename from libs/Flask_SocketIO-5.3.6.dist-info/LICENSE
rename to libs/Flask_SocketIO-5.5.1.dist-info/LICENSE
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/METADATA b/libs/Flask_SocketIO-5.5.1.dist-info/METADATA
similarity index 92%
rename from libs/Flask_SocketIO-5.3.6.dist-info/METADATA
rename to libs/Flask_SocketIO-5.5.1.dist-info/METADATA
index ddec6b09a..8676b6140 100644
--- a/libs/Flask_SocketIO-5.3.6.dist-info/METADATA
+++ b/libs/Flask_SocketIO-5.5.1.dist-info/METADATA
@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: Flask-SocketIO
-Version: 5.3.6
+Version: 5.5.1
 Summary: Socket.IO integration for Flask applications
-Home-page: https://github.com/miguelgrinberg/flask-socketio
-Author: Miguel Grinberg
-Author-email: miguel.grinberg@gmail.com
+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
@@ -15,7 +14,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Flask >=0.9
-Requires-Dist: python-socketio >=5.0.2
+Requires-Dist: python-socketio >=5.12.0
 Provides-Extra: docs
 Requires-Dist: sphinx ; extra == 'docs'
 
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/RECORD b/libs/Flask_SocketIO-5.5.1.dist-info/RECORD
new file mode 100644
index 000000000..2b50d3dda
--- /dev/null
+++ b/libs/Flask_SocketIO-5.5.1.dist-info/RECORD
@@ -0,0 +1,10 @@
+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.3.6.dist-info/REQUESTED b/libs/Flask_SocketIO-5.5.1.dist-info/REQUESTED
similarity index 100%
rename from libs/Flask_SocketIO-5.3.6.dist-info/REQUESTED
rename to libs/Flask_SocketIO-5.5.1.dist-info/REQUESTED
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/WHEEL b/libs/Flask_SocketIO-5.5.1.dist-info/WHEEL
similarity index 65%
rename from libs/Flask_SocketIO-5.3.6.dist-info/WHEEL
rename to libs/Flask_SocketIO-5.5.1.dist-info/WHEEL
index 98c0d20b7..9b78c4451 100644
--- a/libs/Flask_SocketIO-5.3.6.dist-info/WHEEL
+++ b/libs/Flask_SocketIO-5.5.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Flask_SocketIO-5.3.6.dist-info/top_level.txt b/libs/Flask_SocketIO-5.5.1.dist-info/top_level.txt
similarity index 100%
rename from libs/Flask_SocketIO-5.3.6.dist-info/top_level.txt
rename to libs/Flask_SocketIO-5.5.1.dist-info/top_level.txt
diff --git a/libs/Jinja2-3.1.3.dist-info/RECORD b/libs/Jinja2-3.1.3.dist-info/RECORD
deleted file mode 100644
index e80904634..000000000
--- a/libs/Jinja2-3.1.3.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-Jinja2-3.1.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Jinja2-3.1.3.dist-info/LICENSE.rst,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
-Jinja2-3.1.3.dist-info/METADATA,sha256=0cLNbRCI91jytc7Bzv3XAQfZzFDF2gxkJuH46eF5vew,3301
-Jinja2-3.1.3.dist-info/RECORD,,
-Jinja2-3.1.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Jinja2-3.1.3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-Jinja2-3.1.3.dist-info/entry_points.txt,sha256=zRd62fbqIyfUpsRtU7EVIFyiu1tPwfgO7EvPErnxgTE,59
-Jinja2-3.1.3.dist-info/top_level.txt,sha256=PkeVWtLb3-CqjWi1fO29OCbj55EhX_chhKrCdrVe_zs,7
-jinja2/__init__.py,sha256=NTBwMwsECrdHmxeXF7seusHLzrh6Ldn1A9qhS5cDuf0,1927
-jinja2/_identifier.py,sha256=_zYctNKzRqlk_murTNlzrju1FFJL7Va_Ijqqd7ii2lU,1958
-jinja2/async_utils.py,sha256=dFcmh6lMNfbh7eLKrBio8JqAKLHdZbpCuurFN4OERtY,2447
-jinja2/bccache.py,sha256=mhz5xtLxCcHRAa56azOhphIAe19u1we0ojifNMClDio,14061
-jinja2/compiler.py,sha256=PJzYdRLStlEOqmnQs1YxlizPrJoj3jTZuUleREn6AIQ,72199
-jinja2/constants.py,sha256=GMoFydBF_kdpaRKPoM5cl5MviquVRLVyZtfp5-16jg0,1433
-jinja2/debug.py,sha256=iWJ432RadxJNnaMOPrjIDInz50UEgni3_HKuFXi2vuQ,6299
-jinja2/defaults.py,sha256=boBcSw78h-lp20YbaXSJsqkAI2uN_mD_TtCydpeq5wU,1267
-jinja2/environment.py,sha256=0qldX3VQKZcm6lgn7zHz94oRFow7YPYERiqkquomNjU,61253
-jinja2/exceptions.py,sha256=ioHeHrWwCWNaXX1inHmHVblvc4haO7AXsjCp3GfWvx0,5071
-jinja2/ext.py,sha256=5fnMpllaXkfm2P_93RIvi-OnK7Tk8mCW8Du-GcD12Hc,31844
-jinja2/filters.py,sha256=vYjKb2zaPShvYtn_LpSmqfS8SScbrA_KOanNibsMDIE,53862
-jinja2/idtracking.py,sha256=GfNmadir4oDALVxzn3DL9YInhJDr69ebXeA2ygfuCGA,10704
-jinja2/lexer.py,sha256=DW2nX9zk-6MWp65YR2bqqj0xqCvLtD-u9NWT8AnFRxQ,29726
-jinja2/loaders.py,sha256=ayAwxfrA1SAffQta0nwSDm3TDT4KYiIGN_D9Z45B310,23085
-jinja2/meta.py,sha256=GNPEvifmSaU3CMxlbheBOZjeZ277HThOPUTf1RkppKQ,4396
-jinja2/nativetypes.py,sha256=7GIGALVJgdyL80oZJdQUaUfwSt5q2lSSZbXt0dNf_M4,4210
-jinja2/nodes.py,sha256=i34GPRAZexXMT6bwuf5SEyvdmS-bRCy9KMjwN5O6pjk,34550
-jinja2/optimizer.py,sha256=tHkMwXxfZkbfA1KmLcqmBMSaz7RLIvvItrJcPoXTyD8,1650
-jinja2/parser.py,sha256=Y199wPL-G67gJoi5G_5sHuu9uEP1PJkjjLEW_xTH8-k,39736
-jinja2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jinja2/runtime.py,sha256=_6LkKIWFJjQdqlrgA3K39zBFQ-7Orm3wGDm96RwxQoE,33406
-jinja2/sandbox.py,sha256=Y0xZeXQnH6EX5VjaV2YixESxoepnRbW_3UeQosaBU3M,14584
-jinja2/tests.py,sha256=Am5Z6Lmfr2XaH_npIfJJ8MdXtWsbLjMULZJulTAj30E,5905
-jinja2/utils.py,sha256=IMwRIcN1SsTw2-jdQtlH2KzNABsXZBW_-tnFXafQBvY,23933
-jinja2/visitor.py,sha256=MH14C6yq24G_KVtWzjwaI7Wg14PCJIYlWW1kpkxYak0,3568
diff --git a/libs/Jinja2-3.1.3.dist-info/entry_points.txt b/libs/Jinja2-3.1.3.dist-info/entry_points.txt
deleted file mode 100644
index 7b9666c8e..000000000
--- a/libs/Jinja2-3.1.3.dist-info/entry_points.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[babel.extractors]
-jinja2 = jinja2.ext:babel_extract[i18n]
diff --git a/libs/Jinja2-3.1.3.dist-info/top_level.txt b/libs/Jinja2-3.1.3.dist-info/top_level.txt
deleted file mode 100644
index 7f7afbf3b..000000000
--- a/libs/Jinja2-3.1.3.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-jinja2
diff --git a/libs/Jinja2-3.1.3.dist-info/INSTALLER b/libs/Mako-1.3.8.dist-info/INSTALLER
similarity index 100%
rename from libs/Jinja2-3.1.3.dist-info/INSTALLER
rename to libs/Mako-1.3.8.dist-info/INSTALLER
diff --git a/libs/Mako-1.3.2.dist-info/LICENSE b/libs/Mako-1.3.8.dist-info/LICENSE
similarity index 100%
rename from libs/Mako-1.3.2.dist-info/LICENSE
rename to libs/Mako-1.3.8.dist-info/LICENSE
diff --git a/libs/Mako-1.3.2.dist-info/METADATA b/libs/Mako-1.3.8.dist-info/METADATA
similarity index 94%
rename from libs/Mako-1.3.2.dist-info/METADATA
rename to libs/Mako-1.3.8.dist-info/METADATA
index 4558ed984..bf0b1f45b 100644
--- a/libs/Mako-1.3.2.dist-info/METADATA
+++ b/libs/Mako-1.3.8.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Mako
-Version: 1.3.2
+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
@@ -25,13 +25,13 @@ 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
+Requires-Dist: MarkupSafe>=0.9.2
 Provides-Extra: babel
-Requires-Dist: Babel ; extra == 'babel'
+Requires-Dist: Babel; extra == "babel"
 Provides-Extra: lingua
-Requires-Dist: lingua ; extra == 'lingua'
+Requires-Dist: lingua; extra == "lingua"
 Provides-Extra: testing
-Requires-Dist: pytest ; extra == 'testing'
+Requires-Dist: pytest; extra == "testing"
 
 =========================
 Mako Templates for Python
diff --git a/libs/Mako-1.3.2.dist-info/RECORD b/libs/Mako-1.3.8.dist-info/RECORD
similarity index 72%
rename from libs/Mako-1.3.2.dist-info/RECORD
rename to libs/Mako-1.3.8.dist-info/RECORD
index fed8f2c56..7e79ae7aa 100644
--- a/libs/Mako-1.3.2.dist-info/RECORD
+++ b/libs/Mako-1.3.8.dist-info/RECORD
@@ -1,18 +1,18 @@
 ../../bin/mako-render,sha256=NK39DgCmw8pz5T7ALDcW2MB6hFGNVOpWXAHq3-GKyss,236
-Mako-1.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Mako-1.3.2.dist-info/LICENSE,sha256=FWJ7NrONBynN1obfmr9gZQPZnWJLL17FyyVKddWvqJE,1098
-Mako-1.3.2.dist-info/METADATA,sha256=G3lsPTYAPanaYdk-_e8yek5DZpuOjT3Qcf-RMLrlMU0,2900
-Mako-1.3.2.dist-info/RECORD,,
-Mako-1.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Mako-1.3.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-Mako-1.3.2.dist-info/entry_points.txt,sha256=LsKkUsOsJQYbJ2M72hZCm968wi5K8Ywb5uFxCuN8Obk,512
-Mako-1.3.2.dist-info/top_level.txt,sha256=LItdH8cDPetpUu8rUyBG3DObS6h9Gcpr9j_WLj2S-R0,5
-mako/__init__.py,sha256=brA7o1ju8zST1YWfFRXDxaKmMlKiRHVqefjxeUN6YjI,242
+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=UgB8K6BMNiBTUGucR4UYkqFqlbNUJfErKI9A-n4Wteg,47307
+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
@@ -25,11 +25,11 @@ 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=dtCZU1eoF3ymEdiCwCzEIw5SH0lgJkDsHJy9VHI_2XY,16324
+mako/lexer.py,sha256=Xi6Lk8CnASf3UYAaPoYrfjuPkrYauNjvYvULCUkKYaY,16321
 mako/lookup.py,sha256=rkMvT5T7EOS5KRvPtgYii-sjh1nWWyKok_mEk-cEzrM,12428
-mako/parsetree.py,sha256=7RNVRTsKcsMt8vU4NQi5C7e4vhdUyA9tqyd1yIkvAAQ,19007
+mako/parsetree.py,sha256=BHdZI9vyxKB27Q4hzym5TdZ_982_3k31_HMsGLz3Tlg,19021
 mako/pygen.py,sha256=d4f_ugRACCXuV9hJgEk6Ncoj38EaRHA3RTxkr_tK7UQ,10416
-mako/pyparser.py,sha256=81rIcSn4PoALpZF0WO6D5rB65TvF8R9Qn_hBSfTGS5Q,7029
+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
diff --git a/libs/Jinja2-3.1.3.dist-info/REQUESTED b/libs/Mako-1.3.8.dist-info/REQUESTED
similarity index 100%
rename from libs/Jinja2-3.1.3.dist-info/REQUESTED
rename to libs/Mako-1.3.8.dist-info/REQUESTED
diff --git a/libs/Mako-1.3.2.dist-info/WHEEL b/libs/Mako-1.3.8.dist-info/WHEEL
similarity index 65%
rename from libs/Mako-1.3.2.dist-info/WHEEL
rename to libs/Mako-1.3.8.dist-info/WHEEL
index 98c0d20b7..9b78c4451 100644
--- a/libs/Mako-1.3.2.dist-info/WHEEL
+++ b/libs/Mako-1.3.8.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Mako-1.3.2.dist-info/entry_points.txt b/libs/Mako-1.3.8.dist-info/entry_points.txt
similarity index 100%
rename from libs/Mako-1.3.2.dist-info/entry_points.txt
rename to libs/Mako-1.3.8.dist-info/entry_points.txt
diff --git a/libs/Mako-1.3.2.dist-info/top_level.txt b/libs/Mako-1.3.8.dist-info/top_level.txt
similarity index 100%
rename from libs/Mako-1.3.2.dist-info/top_level.txt
rename to libs/Mako-1.3.8.dist-info/top_level.txt
diff --git a/libs/Markdown-3.5.2.dist-info/LICENSE.md b/libs/Markdown-3.5.2.dist-info/LICENSE.md
deleted file mode 100644
index 2652d97ad..000000000
--- a/libs/Markdown-3.5.2.dist-info/LICENSE.md
+++ /dev/null
@@ -1,29 +0,0 @@
-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)
-
-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 Markdown 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 PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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/Mako-1.3.2.dist-info/INSTALLER b/libs/Markdown-3.7.dist-info/INSTALLER
similarity index 100%
rename from libs/Mako-1.3.2.dist-info/INSTALLER
rename to libs/Markdown-3.7.dist-info/INSTALLER
diff --git a/libs/Markdown-3.7.dist-info/LICENSE.md b/libs/Markdown-3.7.dist-info/LICENSE.md
new file mode 100644
index 000000000..6249d60ce
--- /dev/null
+++ b/libs/Markdown-3.7.dist-info/LICENSE.md
@@ -0,0 +1,30 @@
+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.
diff --git a/libs/Markdown-3.5.2.dist-info/METADATA b/libs/Markdown-3.7.dist-info/METADATA
similarity index 76%
rename from libs/Markdown-3.5.2.dist-info/METADATA
rename to libs/Markdown-3.7.dist-info/METADATA
index 866453f0b..233bc55ba 100644
--- a/libs/Markdown-3.5.2.dist-info/METADATA
+++ b/libs/Markdown-3.7.dist-info/METADATA
@@ -1,40 +1,41 @@
 Metadata-Version: 2.1
 Name: Markdown
-Version: 3.5.2
+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: 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)
+License: BSD 3-Clause License
         
-        All rights reserved.
+        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:
         
-        * 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 Markdown Project nor the
-          names of its contributors may be used to endorse or promote products
-          derived from this software without specific prior written permission.
+        1. Redistributions of source code must retain the above copyright notice, this
+           list of conditions and the following disclaimer.
         
-        THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-        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.
+        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/
diff --git a/libs/Markdown-3.5.2.dist-info/RECORD b/libs/Markdown-3.7.dist-info/RECORD
similarity index 64%
rename from libs/Markdown-3.5.2.dist-info/RECORD
rename to libs/Markdown-3.7.dist-info/RECORD
index a3e6a9479..34d25a0c7 100644
--- a/libs/Markdown-3.5.2.dist-info/RECORD
+++ b/libs/Markdown-3.7.dist-info/RECORD
@@ -1,26 +1,26 @@
 ../../bin/markdown_py,sha256=a0a3HrUHepb4z4hcrRdCfAEQ8SiB-QoWxf9g1e-KLv8,237
-Markdown-3.5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Markdown-3.5.2.dist-info/LICENSE.md,sha256=bxGTy2NHGOZcOlN9biXr1hSCDsDvaTz8EiSBEmONZNo,1645
-Markdown-3.5.2.dist-info/METADATA,sha256=9pbPWhPBzgBE-uAwHn0vC0CGT-mw0KC8-SanIkqAFUo,7029
-Markdown-3.5.2.dist-info/RECORD,,
-Markdown-3.5.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Markdown-3.5.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-Markdown-3.5.2.dist-info/entry_points.txt,sha256=lMEyiiA_ZZyfPCBlDviBl-SiU0cfoeuEKpwxw361sKQ,1102
-Markdown-3.5.2.dist-info/top_level.txt,sha256=IAxs8x618RXoH1uCqeLLxXsDefJvE_mIibr_M4sOlyk,9
+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=K-Yr6cieMQWMYt9f7Rx8PGkX2PYqz4aVJdupZf_CE2Q,1712
+markdown/__meta__.py,sha256=RhwfJ30zyGvJaJXLHwQdNH5jw69-5fVKu2p-CVaJz0U,1712
 markdown/blockparser.py,sha256=j4CQImVpiq7g9pz8wCxvzT61X_T2iSAjXupHJk8P3eA,5728
-markdown/blockprocessors.py,sha256=dZFoOXABuOs5AFNpWrrsVEmPe1i8_JVe4rOusdRRPAA,26648
+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=J27cKf_vKY5wdKA_Bunwk83c3RpxwfgDeGarFF0FCuk,3540
+markdown/extensions/abbr.py,sha256=Gqt9TUtLWez2cbsy3SQk5152RZekops2fUJj01bfkfw,6903
 markdown/extensions/admonition.py,sha256=Hqcn3I8JG0i-OPWdoqI189TmlQRgH6bs5PmpCANyLlg,6547
-markdown/extensions/attr_list.py,sha256=6PzqkH7N_U5lks7PGH7dSGmEGVuMCYR9MaR3g8c9Spw,6584
+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=Xy4sQDjEsSJuShiAf9bwpv8Khtyf7Y6QDjNlH7QVM-Q,7817
+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
@@ -28,9 +28,9 @@ markdown/extensions/md_in_html.py,sha256=y4HEWEnkvfih22fojcaJeAmjx1AtF8N-a_jb6ID
 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=DLmH22prpdZLDkV7GOCC1OTlCbTknKPHT9UNPs5-TwQ,11048
+markdown/extensions/smarty.py,sha256=yqT0OiE2AqYrqqZtcUFFmp2eJsQHomiKzgyG2JFb9rI,11048
 markdown/extensions/tables.py,sha256=oTDvGD1qp9xjVWPGYNgDBWe9NqsX5gS6UU5wUsQ1bC8,8741
-markdown/extensions/toc.py,sha256=Vo2PFW4I0-ixOxTXzhoMhUTIAGiDeLPT7l0LNc9ZcBI,15293
+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
diff --git a/libs/Mako-1.3.2.dist-info/REQUESTED b/libs/Markdown-3.7.dist-info/REQUESTED
similarity index 100%
rename from libs/Mako-1.3.2.dist-info/REQUESTED
rename to libs/Markdown-3.7.dist-info/REQUESTED
diff --git a/libs/Markdown-3.5.2.dist-info/WHEEL b/libs/Markdown-3.7.dist-info/WHEEL
similarity index 65%
rename from libs/Markdown-3.5.2.dist-info/WHEEL
rename to libs/Markdown-3.7.dist-info/WHEEL
index 98c0d20b7..da25d7b42 100644
--- a/libs/Markdown-3.5.2.dist-info/WHEEL
+++ b/libs/Markdown-3.7.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Markdown-3.5.2.dist-info/entry_points.txt b/libs/Markdown-3.7.dist-info/entry_points.txt
similarity index 100%
rename from libs/Markdown-3.5.2.dist-info/entry_points.txt
rename to libs/Markdown-3.7.dist-info/entry_points.txt
diff --git a/libs/Markdown-3.5.2.dist-info/top_level.txt b/libs/Markdown-3.7.dist-info/top_level.txt
similarity index 100%
rename from libs/Markdown-3.5.2.dist-info/top_level.txt
rename to libs/Markdown-3.7.dist-info/top_level.txt
diff --git a/libs/MarkupSafe-2.1.5.dist-info/RECORD b/libs/MarkupSafe-2.1.5.dist-info/RECORD
index 2b3c4338b..57cd62847 100644
--- a/libs/MarkupSafe-2.1.5.dist-info/RECORD
+++ b/libs/MarkupSafe-2.1.5.dist-info/RECORD
@@ -8,6 +8,6 @@ MarkupSafe-2.1.5.dist-info/top_level.txt,sha256=qy0Plje5IJuvsCBjejJyhDCjEAdcDLK_
 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=_9uBZXDBin5PdKhWn3XnAUpjp031_nC6MFOMuSDD-3g,51480
+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/PlexAPI-4.16.1.dist-info/AUTHORS.txt b/libs/PlexAPI-4.16.1.dist-info/AUTHORS.txt
new file mode 100644
index 000000000..7e5808e13
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/AUTHORS.txt
@@ -0,0 +1,7 @@
+Authors and Contributors:
+  * Michael Shepanski (Primary Author)
+  * Hellowlol (Major Contributor)
+  * Nate Mara (Timeline)
+  * Goni Zahavy (Sync, Media Parts)
+  * Simon W. Jackson (Stream URL)
+  * Håvard Gulldahl (Plex Audio)
diff --git a/libs/Markdown-3.5.2.dist-info/INSTALLER b/libs/PlexAPI-4.16.1.dist-info/INSTALLER
similarity index 100%
rename from libs/Markdown-3.5.2.dist-info/INSTALLER
rename to libs/PlexAPI-4.16.1.dist-info/INSTALLER
diff --git a/libs/PlexAPI-4.16.1.dist-info/LICENSE.txt b/libs/PlexAPI-4.16.1.dist-info/LICENSE.txt
new file mode 100644
index 000000000..5b6bfae02
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/LICENSE.txt
@@ -0,0 +1,25 @@
+Copyright (c) 2010, Michael Shepanski
+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 python-plexapi 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/PlexAPI-4.16.1.dist-info/METADATA b/libs/PlexAPI-4.16.1.dist-info/METADATA
new file mode 100644
index 000000000..97bc91f4b
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/METADATA
@@ -0,0 +1,282 @@
+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
new file mode 100644
index 000000000..02ca75395
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/RECORD
@@ -0,0 +1,31 @@
+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/Markdown-3.5.2.dist-info/REQUESTED b/libs/PlexAPI-4.16.1.dist-info/REQUESTED
similarity index 100%
rename from libs/Markdown-3.5.2.dist-info/REQUESTED
rename to libs/PlexAPI-4.16.1.dist-info/REQUESTED
diff --git a/libs/PlexAPI-4.16.1.dist-info/WHEEL b/libs/PlexAPI-4.16.1.dist-info/WHEEL
new file mode 100644
index 000000000..57e3d840d
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.38.4)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/PlexAPI-4.16.1.dist-info/top_level.txt b/libs/PlexAPI-4.16.1.dist-info/top_level.txt
new file mode 100644
index 000000000..9587b2f29
--- /dev/null
+++ b/libs/PlexAPI-4.16.1.dist-info/top_level.txt
@@ -0,0 +1 @@
+plexapi
diff --git a/libs/PyYAML-6.0.1.dist-info/INSTALLER b/libs/PyYAML-6.0.2.dist-info/INSTALLER
similarity index 100%
rename from libs/PyYAML-6.0.1.dist-info/INSTALLER
rename to libs/PyYAML-6.0.2.dist-info/INSTALLER
diff --git a/libs/PyYAML-6.0.1.dist-info/LICENSE b/libs/PyYAML-6.0.2.dist-info/LICENSE
similarity index 100%
rename from libs/PyYAML-6.0.1.dist-info/LICENSE
rename to libs/PyYAML-6.0.2.dist-info/LICENSE
diff --git a/libs/PyYAML-6.0.1.dist-info/METADATA b/libs/PyYAML-6.0.2.dist-info/METADATA
similarity index 93%
rename from libs/PyYAML-6.0.1.dist-info/METADATA
rename to libs/PyYAML-6.0.2.dist-info/METADATA
index c8905983e..db029b770 100644
--- a/libs/PyYAML-6.0.1.dist-info/METADATA
+++ b/libs/PyYAML-6.0.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyYAML
-Version: 6.0.1
+Version: 6.0.2
 Summary: YAML parser and emitter for Python
 Home-page: https://pyyaml.org/
 Download-URL: https://pypi.org/project/PyYAML/
@@ -20,17 +20,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Cython
 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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Markup
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 License-File: LICENSE
 
 YAML is a data serialization format designed for human readability
diff --git a/libs/PyYAML-6.0.1.dist-info/RECORD b/libs/PyYAML-6.0.2.dist-info/RECORD
similarity index 71%
rename from libs/PyYAML-6.0.1.dist-info/RECORD
rename to libs/PyYAML-6.0.2.dist-info/RECORD
index 079577cf1..f01fe7622 100644
--- a/libs/PyYAML-6.0.1.dist-info/RECORD
+++ b/libs/PyYAML-6.0.2.dist-info/RECORD
@@ -1,12 +1,12 @@
-PyYAML-6.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-PyYAML-6.0.1.dist-info/LICENSE,sha256=jTko-dxEkP1jVwfLiOsmvXZBAqcoKVQwfT5RZ6V36KQ,1101
-PyYAML-6.0.1.dist-info/METADATA,sha256=UNNF8-SzzwOKXVo-kV5lXUGH2_wDWMBmGxqISpp5HQk,2058
-PyYAML-6.0.1.dist-info/RECORD,,
-PyYAML-6.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyYAML-6.0.1.dist-info/WHEEL,sha256=UkJU7GAEhyIKVwGX1j1L5OGjUFT--MirwyCseqfCpZU,109
-PyYAML-6.0.1.dist-info/top_level.txt,sha256=rpj0IVMTisAjh_1vG3Ccf9v5jpCQwAz6cD1IVU5ZdhQ,11
+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=bhl05qSeO-1ZxlSRjGrvl2m9nrXb1n9-GQatTN0Mrqc,12311
+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
diff --git a/libs/PyYAML-6.0.1.dist-info/REQUESTED b/libs/PyYAML-6.0.2.dist-info/REQUESTED
similarity index 100%
rename from libs/PyYAML-6.0.1.dist-info/REQUESTED
rename to libs/PyYAML-6.0.2.dist-info/REQUESTED
diff --git a/libs/PyYAML-6.0.1.dist-info/WHEEL b/libs/PyYAML-6.0.2.dist-info/WHEEL
similarity index 70%
rename from libs/PyYAML-6.0.1.dist-info/WHEEL
rename to libs/PyYAML-6.0.2.dist-info/WHEEL
index 844cf17ca..b8b9cfd4c 100644
--- a/libs/PyYAML-6.0.1.dist-info/WHEEL
+++ b/libs/PyYAML-6.0.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_12_0_x86_64
 
diff --git a/libs/PyYAML-6.0.1.dist-info/top_level.txt b/libs/PyYAML-6.0.2.dist-info/top_level.txt
similarity index 100%
rename from libs/PyYAML-6.0.1.dist-info/top_level.txt
rename to libs/PyYAML-6.0.2.dist-info/top_level.txt
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/RECORD b/libs/SQLAlchemy-2.0.27.dist-info/RECORD
deleted file mode 100644
index 1563d2d52..000000000
--- a/libs/SQLAlchemy-2.0.27.dist-info/RECORD
+++ /dev/null
@@ -1,276 +0,0 @@
-SQLAlchemy-2.0.27.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-SQLAlchemy-2.0.27.dist-info/LICENSE,sha256=PA9Zq4h9BB3mpOUv_j6e212VIt6Qn66abNettue-MpM,1100
-SQLAlchemy-2.0.27.dist-info/METADATA,sha256=fZGrNxgSqoY_vLjP6pXy7Ax_9Fvpy6P0SN_Qmjpaf8M,9602
-SQLAlchemy-2.0.27.dist-info/RECORD,,
-SQLAlchemy-2.0.27.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-SQLAlchemy-2.0.27.dist-info/WHEEL,sha256=UkJU7GAEhyIKVwGX1j1L5OGjUFT--MirwyCseqfCpZU,109
-SQLAlchemy-2.0.27.dist-info/top_level.txt,sha256=rp-ZgB7D8G11ivXON5VGPjupT1voYmWqkciDt5Uaw_Q,11
-sqlalchemy/__init__.py,sha256=s94qQVe-QqqRL9xhlih382KZikm_5rCLehCmTVeMkxo,13033
-sqlalchemy/connectors/__init__.py,sha256=PzXPqZqi3BzEnrs1eW0DcsR4lyknAzhhN9rWcQ97hb4,476
-sqlalchemy/connectors/aioodbc.py,sha256=GSTiNMO9h0qjPxgqaxDwWZ8HvhWMFNVR6MJQnN1oc40,5288
-sqlalchemy/connectors/asyncio.py,sha256=6s4hDYfuMjJ9KbJ4s7bF1fp5DmcgV77ozgZ5-bwZ0wc,5955
-sqlalchemy/connectors/pyodbc.py,sha256=t7AjyxIOnaWg3CrlUEpBs4Y5l0HFdNt3P_cSSKhbi0Y,8501
-sqlalchemy/cyextension/.gitignore,sha256=_4eLZEBj5Ht5WoM-WvbiDSycdViEzM62ucOZYPQWw9c,64
-sqlalchemy/cyextension/__init__.py,sha256=GzhhN8cjMnDTE0qerlUlpbrNmFPHQWCZ4Gk74OAxl04,244
-sqlalchemy/cyextension/collections.cpython-38-darwin.so,sha256=T-PB8ecKVTCk2cZ2puq_f5XZg9d7gJEfgWTUEVD6sEo,258336
-sqlalchemy/cyextension/collections.pyx,sha256=L7DZ3DGKpgw2MT2ZZRRxCnrcyE5pU1NAFowWgAzQPEc,12571
-sqlalchemy/cyextension/immutabledict.cpython-38-darwin.so,sha256=hNhW_0eX4BbJKF-YaZoWSh8nFzoh-iWjs5pzdakZr5A,127440
-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=NF8ouwV4ffK6AnAUb4ms9VaXC_5rc32Q16_cIy3HKKg,104648
-sqlalchemy/cyextension/processors.pyx,sha256=R1rHsGLEaGeBq5VeCydjClzYlivERIJ9B-XLOJlf2MQ,1792
-sqlalchemy/cyextension/resultproxy.cpython-38-darwin.so,sha256=4UKCNsTKsvERmKn5kSDC3cT06p0t1kwjtJ1FrSslVcA,106752
-sqlalchemy/cyextension/resultproxy.pyx,sha256=eWLdyBXiBy_CLQrF5ScfWJm7X0NeelscSXedtj1zv9Q,2725
-sqlalchemy/cyextension/util.cpython-38-darwin.so,sha256=i39G3r6E1dWN3wVt0n-j_uQE074_rcD9uFxOMs5vFYY,125832
-sqlalchemy/cyextension/util.pyx,sha256=B85orxa9LddLuQEaDoVSq1XmAXIbLKxrxpvuB8ogV_o,2530
-sqlalchemy/dialects/__init__.py,sha256=Kos9Gf5JZg1Vg6GWaCqEbD6e0r1jCwCmcnJIfcxDdcY,1770
-sqlalchemy/dialects/_typing.py,sha256=hyv0nKucX2gI8ispB1IsvaUgrEPn9zEcq9hS7kfstEw,888
-sqlalchemy/dialects/mssql/__init__.py,sha256=r5t8wFRNtBQoiUWh0WfIEWzXZW6f3D0uDt6NZTW_7Cc,1880
-sqlalchemy/dialects/mssql/aioodbc.py,sha256=UQd9ecSMIML713TDnLAviuBVJle7P7i1FtqGZZePk2Y,2022
-sqlalchemy/dialects/mssql/base.py,sha256=2Tx9sC5bOd0JbweaMaqnjGOgESur7ZaaN1S66KMTwHk,133298
-sqlalchemy/dialects/mssql/information_schema.py,sha256=HswjDc6y0mPXCf_x6VyylHlBdBa4PSY6Evxmmlch700,8084
-sqlalchemy/dialects/mssql/json.py,sha256=evUACW2O62TAPq8B7QIPagz7jfc664ql9ms68JqiYzg,4816
-sqlalchemy/dialects/mssql/provision.py,sha256=RTVbgYLFAHzEnpVQDJroU8ji_10MqBTiZfyP9_-QNT4,5362
-sqlalchemy/dialects/mssql/pymssql.py,sha256=eZRLz7HGt3SdoZUjFBmA9BS43N7AhIASw7VPBPEJuG0,4038
-sqlalchemy/dialects/mssql/pyodbc.py,sha256=vwM-vBlmRwrqxOc73P0sFOrBSwn24wzc5IkEOpalbXQ,27056
-sqlalchemy/dialects/mysql/__init__.py,sha256=bxbi4hkysUK2OOVvr1F49akUj1cky27kKb07tgFzI9U,2153
-sqlalchemy/dialects/mysql/aiomysql.py,sha256=67JrSUD1BmN88k_ASk6GvrttZFQiFjDY0wBiwdllxMk,9964
-sqlalchemy/dialects/mysql/asyncmy.py,sha256=CGILIRKf_2Ut9Ng2yBlmdg62laL-ockEm6GMuN7xlKE,10033
-sqlalchemy/dialects/mysql/base.py,sha256=KA7tvRxKUw0KwHwMth2rz-NWV0xMkVbYvPoBM9wrAFw,120850
-sqlalchemy/dialects/mysql/cymysql.py,sha256=eXT1ry0w_qRxjiO24M980c-8PZ9qSsbhqBHntjEiKB0,2300
-sqlalchemy/dialects/mysql/dml.py,sha256=HXJMAvimJsqvhj3UZO4vW_6LkF5RqaKbHvklAjor7yU,7645
-sqlalchemy/dialects/mysql/enumerated.py,sha256=ipEPPQqoXfFwcywNdcLlZCEzHBtnitHRah1Gn6nItcg,8448
-sqlalchemy/dialects/mysql/expression.py,sha256=lsmQCHKwfPezUnt27d2kR6ohk4IRFCA64KBS16kx5dc,4097
-sqlalchemy/dialects/mysql/json.py,sha256=l6MEZ0qp8FgiRrIQvOMhyEJq0q6OqiEnvDTx5Cbt9uQ,2269
-sqlalchemy/dialects/mysql/mariadb.py,sha256=kTfBLioLKk4JFFst4TY_iWqPtnvvQXFHknLfm89H2N8,853
-sqlalchemy/dialects/mysql/mariadbconnector.py,sha256=VVRwKLb6GzDmitOM4wLNvmZw6RdhnIwkLl7IZfAmUy8,8734
-sqlalchemy/dialects/mysql/mysqlconnector.py,sha256=qiQdfLPze3QHuASAZ9iqRzD0hDW8FbKoQnfAEQCF7tM,5675
-sqlalchemy/dialects/mysql/mysqldb.py,sha256=9x_JiY4hj4tykG1ckuEGPyH4jCtsh4fgBhNukVnjUos,9658
-sqlalchemy/dialects/mysql/provision.py,sha256=4oGkClQ8jC3YLPF54sB4kCjFc8HRTwf5zl5zftAAXGo,3474
-sqlalchemy/dialects/mysql/pymysql.py,sha256=GUnSHd2M2uKjmN46Hheymtm26g7phEgwYOXrX0zLY8M,4083
-sqlalchemy/dialects/mysql/pyodbc.py,sha256=072crI4qVyPhajYvHnsfFeSrNjLFVPIjBQKo5uyz5yk,4297
-sqlalchemy/dialects/mysql/reflection.py,sha256=XXM8AGpaRTqDvuObg89Bzn_4h2ETG03viYBpWZJM3vc,22822
-sqlalchemy/dialects/mysql/reserved_words.py,sha256=Dm7FINIAkrKLoXmdu26SpE6V8LDCGyp734nmHV2tMd0,9154
-sqlalchemy/dialects/mysql/types.py,sha256=aPzx7hqqZ21aGwByEC-yWZUl6OpMvkbxwTqdN3OUGGI,24267
-sqlalchemy/dialects/oracle/__init__.py,sha256=p4-2gw7TT0bX_MoJXTGD4i8WHctYsK9kCRbkpzykBrc,1493
-sqlalchemy/dialects/oracle/base.py,sha256=-7b5iubFPxJyDRoLXlxj8rk8eBRN2_IdZlB2zzzrrbw,118246
-sqlalchemy/dialects/oracle/cx_oracle.py,sha256=t5yH4svVz7xoDSITF958blgZ01hbCUEWUKrAXwiCiAE,55566
-sqlalchemy/dialects/oracle/dictionary.py,sha256=7WMrbPkqo8ZdGjaEZyQr-5f2pajSOF1OTGb8P97z8-g,19519
-sqlalchemy/dialects/oracle/oracledb.py,sha256=UFcZwrrk0pWfAp_SKJZ1B5rIQHtNhOvuu73_JaSnTbI,9487
-sqlalchemy/dialects/oracle/provision.py,sha256=O9ZpF4OG6Cx4mMzLRfZwhs8dZjrJETWR402n9c7726A,8304
-sqlalchemy/dialects/oracle/types.py,sha256=QK3hJvWzKnnCe3oD3rItwEEIwcoBze8qGg7VFOvVlIk,8231
-sqlalchemy/dialects/postgresql/__init__.py,sha256=kwgzMhtZKDHD12HMGo5MtdKCnDdy6wLezDGZPOEoU3Q,3895
-sqlalchemy/dialects/postgresql/_psycopg_common.py,sha256=7TudtgsPiSB8O5kX8W8KxcNYR8t5h_UHb86b_ChL0P8,5696
-sqlalchemy/dialects/postgresql/array.py,sha256=9dJ_1WjWSBX1-MGDZtJACJ38vtRO3da7d4UId79WsnQ,13713
-sqlalchemy/dialects/postgresql/asyncpg.py,sha256=12DN8hlK-Na_bEFmQ5kXK7MRqu87ze2IMX8aDyiSddU,40183
-sqlalchemy/dialects/postgresql/base.py,sha256=ogY8rcQvT9jjYdtStxZ_nhTl8LmhB_zeJyhZIaUyMLk,176486
-sqlalchemy/dialects/postgresql/dml.py,sha256=Pc69Le6qzmUHHb1FT5zeUSD31dWm6SBgdCAGW89cs3s,11212
-sqlalchemy/dialects/postgresql/ext.py,sha256=1bZ--iNh2O9ym7l2gXZX48yP3yMO4dqb9RpYro2Mj2Q,16262
-sqlalchemy/dialects/postgresql/hstore.py,sha256=otAx-RTDfpi_tcXkMuQV0JOIXtYgevgnsikLKKOkI6U,11541
-sqlalchemy/dialects/postgresql/json.py,sha256=-ffnp85fQBOyt0Bjb7XAupmOxloUdzFZZgixUG3Wj5w,11212
-sqlalchemy/dialects/postgresql/named_types.py,sha256=SFhs9_l108errKNuAMPl761RQ2imTO9PbUAnSv-WtRg,17100
-sqlalchemy/dialects/postgresql/operators.py,sha256=NsAaWun_tL3d_be0fs9YL6T4LPKK6crnmFxxIJHgyeY,2808
-sqlalchemy/dialects/postgresql/pg8000.py,sha256=3yoekiWSF-xnaWMqG76XrYPMqerg-42TdmfsW_ivK9E,18640
-sqlalchemy/dialects/postgresql/pg_catalog.py,sha256=nAKavWTE_4cqxiDKDTdo-ivkCxxRIlzD5GO9Wl1yrG4,8884
-sqlalchemy/dialects/postgresql/provision.py,sha256=yqyx-aDFO9l2YcL9f4T5HBP_Lnt5dHsMjpuXUG8mi7A,5762
-sqlalchemy/dialects/postgresql/psycopg.py,sha256=TF53axr1EkTBAZD85JCq6wA7XTcJTzXueSz26txDbgc,22364
-sqlalchemy/dialects/postgresql/psycopg2.py,sha256=gAP3poHDUxEB6iut6sxe9PhBiOrV_iIMvnP0NUlC-Rw,31607
-sqlalchemy/dialects/postgresql/psycopg2cffi.py,sha256=M7wAYSL6Pvt-4nbfacAHGyyw4XMKJ_bQZ1tc1pBtIdg,1756
-sqlalchemy/dialects/postgresql/ranges.py,sha256=6CgV7qkxEMJ9AQsiibo_XBLJYzGh-2ZxpG83sRaesVY,32949
-sqlalchemy/dialects/postgresql/types.py,sha256=Jfxqw9JaKNOq29JRWBublywgb3lLMyzx8YZI7CXpS2s,7300
-sqlalchemy/dialects/sqlite/__init__.py,sha256=lp9DIggNn349M-7IYhUA8et8--e8FRExWD2V_r1LJk4,1182
-sqlalchemy/dialects/sqlite/aiosqlite.py,sha256=OMvxP2eWyqk5beF-sHhzxRmjzO4VCQp55q7NH2XPVTE,12305
-sqlalchemy/dialects/sqlite/base.py,sha256=lUtigjn7NdPBq831zQsLcBwdwRJqdgKM_tUaDrMElOE,96794
-sqlalchemy/dialects/sqlite/dml.py,sha256=9GE55WvwoktKy2fHeT-Wbc9xPHgsbh5oBfd_fckMH5Q,8443
-sqlalchemy/dialects/sqlite/json.py,sha256=Eoplbb_4dYlfrtmQaI8Xddd2suAIHA-IdbDQYM-LIhs,2777
-sqlalchemy/dialects/sqlite/provision.py,sha256=UCpmwxf4IWlrpb2eLHGbPTpCFVbdI_KAh2mKtjiLYao,5632
-sqlalchemy/dialects/sqlite/pysqlcipher.py,sha256=OL2S_05DK9kllZj6DOz7QtEl7jI7syxjW6woS725ii4,5356
-sqlalchemy/dialects/sqlite/pysqlite.py,sha256=TAOqsHIjhbUZOF_Qk7UooiekkVZNhYJNduxlGQjokeA,27900
-sqlalchemy/dialects/type_migration_guidelines.txt,sha256=-uHNdmYFGB7bzUNT6i8M5nb4j6j9YUKAtW4lcBZqsMg,8239
-sqlalchemy/engine/__init__.py,sha256=Stb2oV6l8w65JvqEo6J4qtKoApcmOpXy3AAxQud4C1o,2818
-sqlalchemy/engine/_py_processors.py,sha256=j9i_lcYYQOYJMcsDerPxI0sVFBIlX5sqoYMdMJlgWPI,3744
-sqlalchemy/engine/_py_row.py,sha256=wSqoUFzLOJ1f89kgDb6sJm9LUrF5LMFpXPcK1vUsKcs,3787
-sqlalchemy/engine/_py_util.py,sha256=f2DI3AN1kv6EplelowesCVpwS8hSXNufRkZoQmJtSH8,2484
-sqlalchemy/engine/base.py,sha256=NGD1iokXsJBw_6sBOpX4STo_05fQFd52qUl1YiJZsdU,122038
-sqlalchemy/engine/characteristics.py,sha256=Qbvt4CPrggJ3GfxHl0hOAxopjnCQy-W_pjtwLIe-Q1g,2590
-sqlalchemy/engine/create.py,sha256=5Me7rgLvmZVJM6QzoH8aBHz0lIratA2vXN8cW6kUgdY,32872
-sqlalchemy/engine/cursor.py,sha256=jSjpGM5DiwX1pwEHGx3wyqgHrgj8rwU5ZpVvMv5GaJs,74443
-sqlalchemy/engine/default.py,sha256=VSqSm-juosz-5WqZPWjgDQf8Fra27M-YsrVVcs7RwPU,84672
-sqlalchemy/engine/events.py,sha256=c0unNFFiHzTAvkUtXoJaxzMFMDwurBkHiiUhuN8qluc,37381
-sqlalchemy/engine/interfaces.py,sha256=gktNzgLjNK-KrYMU__Lk0h85SXQI8LCjDakkuLxagNE,112688
-sqlalchemy/engine/mock.py,sha256=yvpxgFmRw5G4QsHeF-ZwQGHKES-HqQOucTxFtN1uzdk,4179
-sqlalchemy/engine/processors.py,sha256=XyfINKbo-2fjN-mW55YybvFyQMOil50_kVqsunahkNs,2379
-sqlalchemy/engine/reflection.py,sha256=FlT5kPpKm7Lah50GNt5XcnlJWojTL3LD_x0SoCF9kfY,75127
-sqlalchemy/engine/result.py,sha256=j6BI4Wj2bziQNQG5OlG_Cm4KcNWY9AoYvTXVlJUU-D8,77603
-sqlalchemy/engine/row.py,sha256=9AAQo9zYDL88GcZ3bjcQTwMT-YIcuGTSMAyTfmBJ_yM,12032
-sqlalchemy/engine/strategies.py,sha256=DqFSWaXJPL-29Omot9O0aOcuGL8KmCGyOvnPGDkAJoE,442
-sqlalchemy/engine/url.py,sha256=8eWkUaIUyDExOcJ2D4xJXRcn4OY1GQJ3Q2duSX6UGAg,30784
-sqlalchemy/engine/util.py,sha256=hkEql1t19WHl6uzR55-F-Fs_VMCJ7p02KKQVNUDSXTk,5667
-sqlalchemy/event/__init__.py,sha256=KBrp622xojnC3FFquxa2JsMamwAbfkvzfv6Op0NKiYc,997
-sqlalchemy/event/api.py,sha256=BUTAZjSlzvq4Hn2v2pihP_P1yo3lvCVDczK8lV_XJ80,8227
-sqlalchemy/event/attr.py,sha256=X8QeHGK4ioSYht1vkhc11f606_mq_t91jMNIT314ubs,20751
-sqlalchemy/event/base.py,sha256=3n9FmUkcXYHHyGzfpjKDsrIUVCNST_hq4zOtrNm0_a4,14954
-sqlalchemy/event/legacy.py,sha256=teMPs00fO-4g8a_z2omcVKkYce5wj_1uvJO2n2MIeuo,8227
-sqlalchemy/event/registry.py,sha256=nfTSSyhjZZXc5wseWB4sXn-YibSc0LKX8mg17XlWmAo,10835
-sqlalchemy/events.py,sha256=k-ZD38aSPD29LYhED7CBqttp5MDVVx_YSaWC2-cu9ec,525
-sqlalchemy/exc.py,sha256=M_8-O1hd8i6gbyx-TapV400p_Lxq2QqTGMXUAO-YgCc,23976
-sqlalchemy/ext/__init__.py,sha256=S1fGKAbycnQDV01gs-JWGaFQ9GCD4QHwKcU2wnugg_o,322
-sqlalchemy/ext/associationproxy.py,sha256=5O5ANHARO8jytvqBQmOu-QjNVE4Hh3tfYquqKAj5ajs,65771
-sqlalchemy/ext/asyncio/__init__.py,sha256=1OqSxEyIUn7RWLGyO12F-jAUIvk1I6DXlVy80-Gvkds,1317
-sqlalchemy/ext/asyncio/base.py,sha256=fl7wxZD9KjgFiCtG3WXrYjHEvanamcsodCqq9pH9lOk,8905
-sqlalchemy/ext/asyncio/engine.py,sha256=vQRdpBnGuyzyG48ZssDZvFlcS6Y6ZXUYI0GEOQqdDxk,47941
-sqlalchemy/ext/asyncio/exc.py,sha256=8sII7VMXzs2TrhizhFQMzSfcroRtiesq8o3UwLfXSgQ,639
-sqlalchemy/ext/asyncio/result.py,sha256=ID2eh-NHW-lnNFTxbKhje8fr-tnsucUsiw_jcpGcSPc,30409
-sqlalchemy/ext/asyncio/scoping.py,sha256=BmE1UbFV_C4BXB4WngJc523DeMH-nTchNb8ORiSPYfE,52597
-sqlalchemy/ext/asyncio/session.py,sha256=Zhkrwwc4rqZJntUpzbgruQNgpuOwaRmjrBQb8ol19z0,62894
-sqlalchemy/ext/automap.py,sha256=hBlKAfZn2fgAAQh7vh4f2kClbb5ryOgV59tzVHEObQM,61389
-sqlalchemy/ext/baked.py,sha256=H6T1il7GY84BhzPFj49UECSpZh_eBuiHomA-QIsYOYQ,17807
-sqlalchemy/ext/compiler.py,sha256=ONPoxoKD2yUS9R2-oOhmPsA7efm-Bs0BXo7HE1dGlsU,20391
-sqlalchemy/ext/declarative/__init__.py,sha256=20psLdFQbbOWfpdXHZ0CTY6I1k4UqXvKemNVu1LvPOI,1818
-sqlalchemy/ext/declarative/extensions.py,sha256=uCjN1GisQt54AjqYnKYzJdUjnGd2pZBW47WWdPlS7FE,19547
-sqlalchemy/ext/horizontal_shard.py,sha256=wuwAPnHymln0unSBnyx-cpX0AfESKSsypaSQTYCvzDk,16750
-sqlalchemy/ext/hybrid.py,sha256=LXph2NOtBQj6rZMi5ar-WCxkY7qaFp-o-UFIvCy-ep0,52432
-sqlalchemy/ext/indexable.py,sha256=UkTelbydKCdKelzbv3HWFFavoET9WocKaGRPGEOVfN8,11032
-sqlalchemy/ext/instrumentation.py,sha256=sg8ghDjdHSODFXh_jAmpgemnNX1rxCeeXEG3-PMdrNk,15707
-sqlalchemy/ext/mutable.py,sha256=L5ZkHBGYhMaqO75Xtyrk2DBR44RDk0g6Rz2HzHH0F8Q,37355
-sqlalchemy/ext/mypy/__init__.py,sha256=0WebDIZmqBD0OTq5JLtd_PmfF9JGxe4d4Qv3Ml3PKUg,241
-sqlalchemy/ext/mypy/apply.py,sha256=Aek_-XA1eXihT4attxhfE43yBKtCgsxBSb--qgZKUqc,10550
-sqlalchemy/ext/mypy/decl_class.py,sha256=1vVJRII2apnLTUbc5HkJS6Z2GueaUv_eKvhbqh7Wik4,17384
-sqlalchemy/ext/mypy/infer.py,sha256=KVnmLFEVS33Al8pUKI7MJbJQu3KeveBUMl78EluBORw,19369
-sqlalchemy/ext/mypy/names.py,sha256=IQ16GLZFqKxfYxIZxkbTurBqOUYbUV-64V_DSRns1tc,10630
-sqlalchemy/ext/mypy/plugin.py,sha256=74ML8LI9xar0V86oCxnPFv5FQGEEfUzK64vOay4BKFs,9750
-sqlalchemy/ext/mypy/util.py,sha256=1zuDQG8ezmF-XhJmAQU_lcBHiD--sL-lq20clg8t4lE,9448
-sqlalchemy/ext/orderinglist.py,sha256=TGYbsGH72wEZcFNQDYDsZg9OSPuzf__P8YX8_2HtYUo,14384
-sqlalchemy/ext/serializer.py,sha256=YemanWdeMVUDweHCnQc-iMO6mVVXNo2qQ5NK0Eb2_Es,6178
-sqlalchemy/future/__init__.py,sha256=q2mw-gxk_xoxJLEvRoyMha3vO1xSRHrslcExOHZwmPA,512
-sqlalchemy/future/engine.py,sha256=AgIw6vMsef8W6tynOTkxsjd6o_OQDwGjLdbpoMD8ue8,495
-sqlalchemy/inspection.py,sha256=MF-LE358wZDUEl1IH8-Uwt2HI65EsQpQW5o5udHkZwA,5063
-sqlalchemy/log.py,sha256=8x9UR3nj0uFm6or6bQF-JWb4fYv2zOeQjG_w-0wOJFA,8607
-sqlalchemy/orm/__init__.py,sha256=ZYys5nL3RFUDCMOLFDBrRI52F6er3S1U1OY9TeORuKs,8463
-sqlalchemy/orm/_orm_constructors.py,sha256=VWY_MotbcQlECGx2uwEu3IcRkZ4RgLM_ufPad3IA9ZM,99354
-sqlalchemy/orm/_typing.py,sha256=DVBfpHmDVK4x1zxaGJPY2GoTrAsyR6uexv20Lzf1afc,4973
-sqlalchemy/orm/attributes.py,sha256=-IGg2RFjOPwAEr-boohvlZfitz7OtaXz1v8-7uG8ekw,92520
-sqlalchemy/orm/base.py,sha256=HhuarpRU-BpKSHE1LeeBaG8CpdkwwLrvTkUVRK-ofjg,27424
-sqlalchemy/orm/bulk_persistence.py,sha256=SSSR0Omv8A8BzpsOdSo4x75XICoqGpO1sUkyEWUVGso,70022
-sqlalchemy/orm/clsregistry.py,sha256=29LyYiuj0qbebOpgW6DbBPNB2ikTweFQar1byCst7I0,17958
-sqlalchemy/orm/collections.py,sha256=jpMsJGVixmrW9kfT8wevm9kpatKRqyDLcqWd7CjKPxE,52179
-sqlalchemy/orm/context.py,sha256=Wjx0d1Rkxd-wsX1mP2V2_4VbOxdNY6S_HijdXJ-TtKg,112001
-sqlalchemy/orm/decl_api.py,sha256=0gCZWM2sOXb_4OzUXfevVUisZWOUrErQTAHyaSQQL5k,63674
-sqlalchemy/orm/decl_base.py,sha256=Tq6I3Jm3bkM01mmoiHfdFXLE94YDk1ik2u2dXL1RxLc,81601
-sqlalchemy/orm/dependency.py,sha256=hgjksUWhgbmgHK5GdJdiDCBgDAIGQXIrY-Tj79tbL2k,47631
-sqlalchemy/orm/descriptor_props.py,sha256=pKtpP7H1LB_YuHRVrEYpfFZybEnUUdPwQXxduYFe2hA,37180
-sqlalchemy/orm/dynamic.py,sha256=jksBDCOsm6EBMVParcNGuMeaAv12hX4IzouKspC-HPA,9786
-sqlalchemy/orm/evaluator.py,sha256=q292K5vdpP69G7Z9y1RqI5GFAk2diUPwnsXE8De_Wgw,11925
-sqlalchemy/orm/events.py,sha256=_Ttun_bCSGgvsfg-VzAeEcsGpacf8p4c5z12JkSQkjM,127697
-sqlalchemy/orm/exc.py,sha256=w7MZkJMGGlu5J6jOFSmi9XXzc02ctnTv34jrEWpI-eM,7356
-sqlalchemy/orm/identity.py,sha256=jHdCxCpCyda_8mFOfGmN_Pr0XZdKiU-2hFZshlNxbHs,9249
-sqlalchemy/orm/instrumentation.py,sha256=M-kZmkUvHUxtf-0mCA8RIM5QmMH1hWlYR_pKMwaidjA,24321
-sqlalchemy/orm/interfaces.py,sha256=1yyppjMHcP5NPXjxfOlSeFNmc-3_T_o2upeF3KFZtc0,48378
-sqlalchemy/orm/loading.py,sha256=JN2zLnPjNnk7K9DERbyerxESCXin7m7X1XP0gfdWLOE,57537
-sqlalchemy/orm/mapped_collection.py,sha256=3cneB1dfPTLrsTvKoo9_oCY2xtq4UAHfe5WSXPyqIS4,19690
-sqlalchemy/orm/mapper.py,sha256=8SVHr7tO-DDNpNGi68usc7PLQ7mTwzkZNEJu1aMb6dQ,171059
-sqlalchemy/orm/path_registry.py,sha256=bIXllBRevK7Ic5irajYnZgl2iazJ0rKNRkhXJSlfxjY,25850
-sqlalchemy/orm/persistence.py,sha256=dzyB2JOXNwQgaCbN8kh0sEz00WFePr48qf8NWVCUZH8,61701
-sqlalchemy/orm/properties.py,sha256=81I-PIF7f7bB0qdH4BCYMWzCzRpe57yUiEIPv2tzBoA,29127
-sqlalchemy/orm/query.py,sha256=UVNWn_Rq4a8agh5UUWNeu0DJQtPceCWVpXx1-uW7A4E,117555
-sqlalchemy/orm/relationships.py,sha256=DqD3WBKpeVQ59ldh6eCxar_sIToA3tc2-bJPtp3zfpM,127709
-sqlalchemy/orm/scoping.py,sha256=gFYywLeMmd5qjFdVPzeuCX727mTaChrCv8aqn4wPke0,78677
-sqlalchemy/orm/session.py,sha256=yiKyoJBARQj4I1ZBjsIxc6ecCpt2Upjvlxruo2A5HRc,193181
-sqlalchemy/orm/state.py,sha256=mW2f1hMSNeTJ89foutOE1EqLLD6DZkrSeO-pgagZweg,37520
-sqlalchemy/orm/state_changes.py,sha256=qKYg7NxwrDkuUY3EPygAztym6oAVUFcP2wXn7QD3Mz4,6815
-sqlalchemy/orm/strategies.py,sha256=OtmMtWpCDk4ZiaM_ipzGn80sPOi6Opwj3Co4lUHpd_w,114206
-sqlalchemy/orm/strategy_options.py,sha256=RbFl-79Lrh8XIVUnZFmQ5GVvR586SG_szs3prw5DZLQ,84204
-sqlalchemy/orm/sync.py,sha256=g7iZfSge1HgxMk9SKRgUgtHEbpbZ1kP_CBqOIdTOXqc,5779
-sqlalchemy/orm/unitofwork.py,sha256=fiVaqcymbDDHRa1NjS90N9Z466nd5pkJOEi1dHO6QLY,27033
-sqlalchemy/orm/util.py,sha256=MSLKAWZNw3FzFTH094xpfrhoA2Ov5pJQinK_dU_M0zo,80351
-sqlalchemy/orm/writeonly.py,sha256=SYu2sAaHZONk2pW4PmtE871LG-O0P_bjidvKzY1H_zI,22305
-sqlalchemy/pool/__init__.py,sha256=qiDdq4r4FFAoDrK6ncugF_i6usi_X1LeJt-CuBHey0s,1804
-sqlalchemy/pool/base.py,sha256=WF4az4ZKuzQGuKeSJeyexaYjmWZUvYdC6KIi8zTGodw,52236
-sqlalchemy/pool/events.py,sha256=xGjkIUZl490ZDtCHqnQF9ZCwe2Jv93eGXmnQxftB11E,13147
-sqlalchemy/pool/impl.py,sha256=2k2YMY9AepEoqGD_ClP_sUodSoa6atkt3GLPPWI49i4,17717
-sqlalchemy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlalchemy/schema.py,sha256=dKiWmgHYjcKQ4TiiD6vD0UMmIsD8u0Fsor1M9AAeGUs,3194
-sqlalchemy/sql/__init__.py,sha256=UNa9EUiYWoPayf-FzNcwVgQvpsBdInPZfpJesAStN9o,5820
-sqlalchemy/sql/_dml_constructors.py,sha256=YdBJex0MCVACv4q2nl_ii3uhxzwU6aDB8zAsratX5UQ,3867
-sqlalchemy/sql/_elements_constructors.py,sha256=rrxq5Nzyo7GbLaGxb8VRZxko2nW0z7SYEli8ArfMIXI,62550
-sqlalchemy/sql/_orm_types.py,sha256=T-vjcry4C1y0GToFKVxQCnmly_-Zsq4IO4SHN6bvUF4,625
-sqlalchemy/sql/_py_util.py,sha256=hiM9ePbRSGs60bAMxPFuJCIC_p9SQ1VzqXGiPchiYwE,2173
-sqlalchemy/sql/_selectable_constructors.py,sha256=wjE6HrLm9cR7bxvZXT8sFLUqT6t_J9G1XyQCnYmBDl0,18780
-sqlalchemy/sql/_typing.py,sha256=Z3tBzapYRP0sKL7IwqnzPE9b8Bbq9vQtc4iV9tvxDoU,12494
-sqlalchemy/sql/annotation.py,sha256=aqbbVz9kfbCT3_66CZ9GEirVN197Cukoqt8rq48FgkQ,18245
-sqlalchemy/sql/base.py,sha256=2MVQnIL0b8xuzp1Fcv0NAye6h_OcgYpsUgLB4sy8Ahk,73756
-sqlalchemy/sql/cache_key.py,sha256=sJhAA-2jovIteeIU7mw9hSL1liPP9Ez89CZZJFC3h6E,33548
-sqlalchemy/sql/coercions.py,sha256=1xzN_9U5BCJGgokdc5iYj5o2cMAfEEZkr1Oa9Q-JYj8,40493
-sqlalchemy/sql/compiler.py,sha256=aDD100xmz8WpBq8oe7PJ5ar8lk9emd54gEE5K2Hr76g,271187
-sqlalchemy/sql/crud.py,sha256=g9xcol2KRGjZi1qsb2-bVz8zgVy_53gfMtJcnNO2vyQ,56521
-sqlalchemy/sql/ddl.py,sha256=CIqMilCKfuQnF0lrZsQdTxgrbXqcTauKr0Ojzj77PFQ,45602
-sqlalchemy/sql/default_comparator.py,sha256=utXWsZVGEjflhFfCT4ywa6RnhORc1Rryo87Hga71Rps,16707
-sqlalchemy/sql/dml.py,sha256=pn0Lm1ofC5qVZzwGWFW73lPCiNba8OsTeemurJgwRyg,65614
-sqlalchemy/sql/elements.py,sha256=kGRUilpx-rr6TTZgZpC5b71OnxxmCgDJRF2fYjDtxh8,172025
-sqlalchemy/sql/events.py,sha256=iC_Q1Htm1Aobt5tOYxWfHHqNpoytrULORmUKcusH_-E,18290
-sqlalchemy/sql/expression.py,sha256=VMX-dLpsZYnVRJpYNDozDUgaj7iQ0HuewUKVefD57PE,7586
-sqlalchemy/sql/functions.py,sha256=MjXK0IVv45Y4n96_TMDZGJ7fwAhGHPRbFP8hOJgaplQ,63689
-sqlalchemy/sql/lambdas.py,sha256=6P__bsWsFnrD7M18FPiBXI0L0OdWZOEV25FAijT4bwo,49289
-sqlalchemy/sql/naming.py,sha256=ZHs1qSV3ou8TYmZ92uvU3sfdklUQlIz4uhe330n05SU,6858
-sqlalchemy/sql/operators.py,sha256=r4oQp4h5zTMFFOpiFNV56joIK-QIjJCobatsmaZ-724,75935
-sqlalchemy/sql/roles.py,sha256=pOsVn_OZD7mF2gJByHf24Rjopt0_Hu3dUCEOK5t4KS8,7662
-sqlalchemy/sql/schema.py,sha256=WOIBaDVdg-zahrP95CPYgY4--3OQN56DH6xm28JDF-Y,228262
-sqlalchemy/sql/selectable.py,sha256=7lxe79hZvnHyzHe1DobodI1lZ1eo8quSLZ6phw10Zj4,232848
-sqlalchemy/sql/sqltypes.py,sha256=UV46KTkgxSin48oPckPOqk3Gx0tZT1l60qXwk7SbKlo,127101
-sqlalchemy/sql/traversals.py,sha256=NFgJrVJzInO3HrnG90CklxrDXhFydZohPs2vRJkh3Bo,33589
-sqlalchemy/sql/type_api.py,sha256=5DzdVquCJomFfpfMyLYbCb66PWxjxbSRdjh6UYB1Yv4,83841
-sqlalchemy/sql/util.py,sha256=qGHQF-tPCj-m1FBerzT7weCanGcXU7dK5m-W7NHio-4,48077
-sqlalchemy/sql/visitors.py,sha256=71wdVvhhZL4nJvVwFAs6ssaW-qZgNRSmKjpAcOzF_TA,36317
-sqlalchemy/testing/__init__.py,sha256=VsrEHrORpAF5n7Vfl43YQgABh6EP1xBx_gHxs7pSXeE,3126
-sqlalchemy/testing/assertions.py,sha256=gL0rA7CCZJbcVgvWOPV91tTZTRwQc1_Ta0-ykBn83Ew,31439
-sqlalchemy/testing/assertsql.py,sha256=IgQG7l94WaiRP8nTbilJh1ZHZl125g7GPq-S5kmQZN0,16817
-sqlalchemy/testing/asyncio.py,sha256=fkdRz-E37d5OrQKw5hdjmglOTJyXGnJzaJpvNXOBLxg,3728
-sqlalchemy/testing/config.py,sha256=AqyH1qub_gDqX0BvlL-JBQe7N-t2wo8655FtwblUNOY,12090
-sqlalchemy/testing/engines.py,sha256=UnH-8--3zLlYz4IbbCPwC375Za_DC61Spz-oKulbs9Q,13347
-sqlalchemy/testing/entities.py,sha256=IphFegPKbff3Un47jY6bi7_MQXy6qkx_50jX2tHZJR4,3354
-sqlalchemy/testing/exclusions.py,sha256=T8B01hmm8WVs-EKcUOQRzabahPqblWJfOidi6bHJ6GA,12460
-sqlalchemy/testing/fixtures/__init__.py,sha256=dMClrIoxqlYIFpk2ia4RZpkbfxsS_3EBigr9QsPJ66g,1198
-sqlalchemy/testing/fixtures/base.py,sha256=9r_J2ksiTzClpUxW0TczICHrWR7Ny8PV8IsBz6TsGFI,12256
-sqlalchemy/testing/fixtures/mypy.py,sha256=gdxiwNFIzDlNGSOdvM3gbwDceVCC9t8oM5kKbwyhGBk,11973
-sqlalchemy/testing/fixtures/orm.py,sha256=8EFbnaBbXX_Bf4FcCzBUaAHgyVpsLGBHX16SGLqE3Fg,6095
-sqlalchemy/testing/fixtures/sql.py,sha256=MFOuYBUyPIpHJzjRCHL9vU-IT4bD6LXGGMvsp0v1FY8,15704
-sqlalchemy/testing/pickleable.py,sha256=U9mIqk-zaxq9Xfy7HErP7UrKgTov-A3QFnhZh-NiOjI,2833
-sqlalchemy/testing/plugin/__init__.py,sha256=79F--BIY_NTBzVRIlJGgAY5LNJJ3cD19XvrAo4X0W9A,247
-sqlalchemy/testing/plugin/bootstrap.py,sha256=oYScMbEW4pCnWlPEAq1insFruCXFQeEVBwo__i4McpU,1685
-sqlalchemy/testing/plugin/plugin_base.py,sha256=BgNzWNEmgpK4CwhyblQQKnH-7FDKVi_Uul5vw8fFjBU,21578
-sqlalchemy/testing/plugin/pytestplugin.py,sha256=Jtj073ArTcAmetv81sHmrUhlH0SblcSK4wyN8S4hmvo,27554
-sqlalchemy/testing/profiling.py,sha256=PbuPhRFbauFilUONeY3tV_Y_5lBkD7iCa8VVyH2Sk9Y,10148
-sqlalchemy/testing/provision.py,sha256=zXsw2D2Xpmw_chmYLsE1GXQqKQ-so3V8xU_joTcKan0,14619
-sqlalchemy/testing/requirements.py,sha256=N9pSj7z2wVMkBif-DQfPVa_cl9k6p9g_J5FY1OsWtrY,51817
-sqlalchemy/testing/schema.py,sha256=lr4GkGrGwagaHMuSGzWdzkMaj3HnS7dgfLLWfxt__-U,6513
-sqlalchemy/testing/suite/__init__.py,sha256=Y5DRNG0Yl1u3ypt9zVF0Z9suPZeuO_UQGLl-wRgvTjU,722
-sqlalchemy/testing/suite/test_cte.py,sha256=6zBC3W2OwX1Xs-HedzchcKN2S7EaLNkgkvV_JSZ_Pq0,6451
-sqlalchemy/testing/suite/test_ddl.py,sha256=1Npkf0C_4UNxphthAGjG078n0vPEgnSIHpDu5MfokxQ,12031
-sqlalchemy/testing/suite/test_deprecations.py,sha256=BcJxZTcjYqeOAENVElCg3hVvU6fkGEW3KGBMfnW8bng,5337
-sqlalchemy/testing/suite/test_dialect.py,sha256=EH4ZQWbnGdtjmx5amZtTyhYmrkXJCvW1SQoLahoE7uk,22923
-sqlalchemy/testing/suite/test_insert.py,sha256=9azifj6-OCD7s8h_tAO1uPw100ibQv8YoKc_VA3hn3c,18824
-sqlalchemy/testing/suite/test_reflection.py,sha256=tJSbJFg5fw0sSUv3I_FPmhN7rWWeJtq3YyxmylWJUlM,106466
-sqlalchemy/testing/suite/test_results.py,sha256=NQ23m8FDVd0ub751jN4PswGoAhk5nrqvjHvpYULZXnc,15937
-sqlalchemy/testing/suite/test_rowcount.py,sha256=3KDTlRgjpQ1OVfp__1cv8Hvq4CsDKzmrhJQ_WIJWoJg,7900
-sqlalchemy/testing/suite/test_select.py,sha256=FvMFYQW9IJpDWGYZiJk46is6YrtmdSghBdTjZCG8T0Y,58574
-sqlalchemy/testing/suite/test_sequence.py,sha256=66bCoy4xo99GBSaX6Hxb88foANAykLGRz1YEKbvpfuA,9923
-sqlalchemy/testing/suite/test_types.py,sha256=rFmTOg6XuMch9L2-XthfLJRCTTwpZbMfrNss2g09gmc,65677
-sqlalchemy/testing/suite/test_unicode_ddl.py,sha256=c3_eIxLyORuSOhNDP0jWKxPyUf3SwMFpdalxtquwqlM,6141
-sqlalchemy/testing/suite/test_update_delete.py,sha256=yTiM2unnfOK9rK8ZkqeTTU_MkT-RsKFLmdYliniZfAY,3994
-sqlalchemy/testing/util.py,sha256=BFiSp3CEX95Dr-vv4l_7ZRu5vjZi9hjjnp-JKNfuS5E,14080
-sqlalchemy/testing/warnings.py,sha256=fJ-QJUY2zY2PPxZJKv9medW-BKKbCNbA4Ns_V3YwFXM,1546
-sqlalchemy/types.py,sha256=cQFM-hFRmaf1GErun1qqgEs6QxufvzMuwKqj9tuMPpE,3168
-sqlalchemy/util/__init__.py,sha256=B3bedg-LSQEscwqgmYYU-VENUX8_zAE3q9vb7tkfJNY,8277
-sqlalchemy/util/_collections.py,sha256=NE9dGJo8UNXIMbY3l3k8AO9BdPW04DlKTYraKCinchI,20063
-sqlalchemy/util/_concurrency_py3k.py,sha256=v8VVoBfFvFHe4j8mMkVLfdUrTbV897p8RWGAm73Ue9U,8574
-sqlalchemy/util/_has_cy.py,sha256=wCQmeSjT3jaH_oxfCEtGk-1g0gbSpt5MCK5UcWdMWqk,1247
-sqlalchemy/util/_py_collections.py,sha256=U6L5AoyLdgSv7cdqB4xxQbw1rpeJjyOZVXffgxgga8I,16714
-sqlalchemy/util/compat.py,sha256=R6bpBydldtbr6h7oJePihQxFb7jKiI-YDsK465MSOzk,8714
-sqlalchemy/util/concurrency.py,sha256=mhwHm0utriD14DRqxTBWgIW7QuwdSEiLgLiJdUjiR3w,2427
-sqlalchemy/util/deprecations.py,sha256=YBwvvYhSB8LhasIZRKvg_-WNoVhPUcaYI1ZrnjDn868,11971
-sqlalchemy/util/langhelpers.py,sha256=khoFN05HjHiWY9ddeehCYxYG2u8LDzuiIKLOGLSAihU,64905
-sqlalchemy/util/preloaded.py,sha256=az7NmLJLsqs0mtM9uBkIu10-841RYDq8wOyqJ7xXvqE,5904
-sqlalchemy/util/queue.py,sha256=CaeSEaYZ57YwtmLdNdOIjT5PK_LCuwMFiO0mpp39ybM,10185
-sqlalchemy/util/tool_support.py,sha256=9braZyidaiNrZVsWtGmkSmus50-byhuYrlAqvhjcmnA,6135
-sqlalchemy/util/topological.py,sha256=N3M3Le7KzGHCmqPGg0ZBqixTDGwmFLhOZvBtc4rHL_g,3458
-sqlalchemy/util/typing.py,sha256=FqH6WjV3p-8rz68YaXktpiZrPu3kmug2-gktJxBQSnI,16641
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/INSTALLER b/libs/SQLAlchemy-2.0.37.dist-info/INSTALLER
similarity index 100%
rename from libs/SQLAlchemy-2.0.27.dist-info/INSTALLER
rename to libs/SQLAlchemy-2.0.37.dist-info/INSTALLER
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/LICENSE b/libs/SQLAlchemy-2.0.37.dist-info/LICENSE
similarity index 94%
rename from libs/SQLAlchemy-2.0.27.dist-info/LICENSE
rename to libs/SQLAlchemy-2.0.37.dist-info/LICENSE
index 967cdc5dc..dfe1a4d81 100644
--- a/libs/SQLAlchemy-2.0.27.dist-info/LICENSE
+++ b/libs/SQLAlchemy-2.0.37.dist-info/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2005-2024 SQLAlchemy authors and contributors <see AUTHORS file>.
+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
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/METADATA b/libs/SQLAlchemy-2.0.37.dist-info/METADATA
similarity index 95%
rename from libs/SQLAlchemy-2.0.27.dist-info/METADATA
rename to libs/SQLAlchemy-2.0.37.dist-info/METADATA
index e43a4599d..e548f29da 100644
--- a/libs/SQLAlchemy-2.0.27.dist-info/METADATA
+++ b/libs/SQLAlchemy-2.0.37.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SQLAlchemy
-Version: 2.0.27
+Version: 2.0.37
 Summary: Database Abstraction Library
 Home-page: https://www.sqlalchemy.org
 Author: Mike Bayer
@@ -20,6 +20,7 @@ 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
@@ -27,7 +28,7 @@ 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 ; 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: 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'
@@ -45,7 +46,7 @@ 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.2,!=1.1.5,>=1.0.1 ; 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
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/RECORD b/libs/SQLAlchemy-2.0.37.dist-info/RECORD
new file mode 100644
index 000000000..d9bb0e04f
--- /dev/null
+++ b/libs/SQLAlchemy-2.0.37.dist-info/RECORD
@@ -0,0 +1,275 @@
+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.27.dist-info/REQUESTED b/libs/SQLAlchemy-2.0.37.dist-info/REQUESTED
similarity index 100%
rename from libs/SQLAlchemy-2.0.27.dist-info/REQUESTED
rename to libs/SQLAlchemy-2.0.37.dist-info/REQUESTED
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/WHEEL b/libs/SQLAlchemy-2.0.37.dist-info/WHEEL
similarity index 70%
rename from libs/SQLAlchemy-2.0.27.dist-info/WHEEL
rename to libs/SQLAlchemy-2.0.37.dist-info/WHEEL
index 844cf17ca..42e750dfb 100644
--- a/libs/SQLAlchemy-2.0.27.dist-info/WHEEL
+++ b/libs/SQLAlchemy-2.0.37.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_12_0_x86_64
 
diff --git a/libs/SQLAlchemy-2.0.27.dist-info/top_level.txt b/libs/SQLAlchemy-2.0.37.dist-info/top_level.txt
similarity index 100%
rename from libs/SQLAlchemy-2.0.27.dist-info/top_level.txt
rename to libs/SQLAlchemy-2.0.37.dist-info/top_level.txt
diff --git a/libs/alembic-1.13.1.dist-info/WHEEL b/libs/alembic-1.13.1.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/alembic-1.13.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/alembic-1.13.1.dist-info/INSTALLER b/libs/alembic-1.14.0.dist-info/INSTALLER
similarity index 100%
rename from libs/alembic-1.13.1.dist-info/INSTALLER
rename to libs/alembic-1.14.0.dist-info/INSTALLER
diff --git a/libs/alembic-1.13.1.dist-info/LICENSE b/libs/alembic-1.14.0.dist-info/LICENSE
similarity index 95%
rename from libs/alembic-1.13.1.dist-info/LICENSE
rename to libs/alembic-1.14.0.dist-info/LICENSE
index 74b9ce342..be8de0089 100644
--- a/libs/alembic-1.13.1.dist-info/LICENSE
+++ b/libs/alembic-1.14.0.dist-info/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009-2023 Michael Bayer.
+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
@@ -16,4 +16,4 @@ 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
+SOFTWARE.
diff --git a/libs/alembic-1.13.1.dist-info/METADATA b/libs/alembic-1.14.0.dist-info/METADATA
similarity index 99%
rename from libs/alembic-1.13.1.dist-info/METADATA
rename to libs/alembic-1.14.0.dist-info/METADATA
index 7a6884d93..2f6963fc6 100644
--- a/libs/alembic-1.13.1.dist-info/METADATA
+++ b/libs/alembic-1.14.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alembic
-Version: 1.13.1
+Version: 1.14.0
 Summary: A database migration tool for SQLAlchemy.
 Home-page: https://alembic.sqlalchemy.org
 Author: Mike Bayer
diff --git a/libs/alembic-1.13.1.dist-info/RECORD b/libs/alembic-1.14.0.dist-info/RECORD
similarity index 55%
rename from libs/alembic-1.13.1.dist-info/RECORD
rename to libs/alembic-1.14.0.dist-info/RECORD
index f4dee8948..f7cc605d0 100644
--- a/libs/alembic-1.13.1.dist-info/RECORD
+++ b/libs/alembic-1.14.0.dist-info/RECORD
@@ -1,66 +1,66 @@
 ../../bin/alembic,sha256=xqPGhIsDow0IG3BUa3a_VtCtKJgqxLpVJuFe1PQcGoA,236
-alembic-1.13.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-alembic-1.13.1.dist-info/LICENSE,sha256=soUmiob0QW6vTQWyrjiAwVb3xZqPk1pAK8BW6vszrwg,1058
-alembic-1.13.1.dist-info/METADATA,sha256=W1F2NBRkhqW55HiGmEIpdmiRt2skU5wwJd21UHFbSdQ,7390
-alembic-1.13.1.dist-info/RECORD,,
-alembic-1.13.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alembic-1.13.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-alembic-1.13.1.dist-info/entry_points.txt,sha256=aykM30soxwGN0pB7etLc1q0cHJbL9dy46RnK9VX4LLw,48
-alembic-1.13.1.dist-info/top_level.txt,sha256=FwKWd5VsPFC8iQjpu1u9Cn-JnK3-V1RhUCmWqz1cl-s,8
-alembic/__init__.py,sha256=PMiQT_1tHyC_Od3GDBArBk7r14v8F62_xkzliPq9tLU,63
+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=Oc7MRtDhkSICsQ82fYP9bBMYaAjzzW2X_izM3AQU-OY,22171
-alembic/autogenerate/compare.py,sha256=3QLK2yCDW37bXbAIXcHGz4YOFlOW8bSfLHJ8bmzgG1M,44938
-alembic/autogenerate/render.py,sha256=uSbCpkh72mo00xGZ8CJa3teM_gqulCoNtxH0Ey8Ny1k,34939
+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=jWFNS-wPWA-Klfm0GsPfWh_8sPj4n7rKROJ0zrwhoR0,21712
-alembic/config.py,sha256=I12lm4V-AXSt-7nvub-Vtx5Zfa68pYP5xSrFQQd45rQ,22256
+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=0no9ywWP8gjvO57Ozc2naab4qNusVNn2fiJekjc275g,9179
-alembic/ddl/base.py,sha256=Jd7oPoAOGjOMcdMUIzSKnTjd8NKnTd7IjBXXyVpDCkU,9955
-alembic/ddl/impl.py,sha256=vkhkXFpLPJBG9jW2kv_sR5CC5czNd1ERLjLtfLuOFP0,28778
+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=am221U_UK3wX33tNcXNiOObZV-Pa4CXuv7vN-epF9IU,16788
-alembic/ddl/oracle.py,sha256=TmoCq_FlbfyWAAk3e_q6mMQU0YmlfIcgKHpRfNMmgr0,6211
-alembic/ddl/postgresql.py,sha256=dcWLdDSqivzizVCce_H6RnOVAayPXDFfns-NC4-UaA8,29842
+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=8R6SJr1dQharU0blmMJJj23XFO_hk9ZmAQBJBQOeXRU,49816
+alembic/op.pyi,sha256=QZ1ERetxIrpZNTyg48Btn5OJhhpMId-_MLMP36RauOw,50168
 alembic/operations/__init__.py,sha256=e0KQSZAgLpTWvyvreB7DWg7RJV_MWSOPVDgCqsd2FzY,318
-alembic/operations/base.py,sha256=LCx4NH5NA2NLWQFaZTqE_p2KgLtqJ76oVcp1Grj-zFM,74004
+alembic/operations/base.py,sha256=JRaOtPqyqfaPjzGHxuP9VMcO1KsJNmbbLOvwG82qxGA,74474
 alembic/operations/batch.py,sha256=YqtD4hJ3_RkFxvI7zbmBwxcLEyLHYyWQpsz4l5L85yI,26943
-alembic/operations/ops.py,sha256=2vtYFhYFDEVq158HwORfGTsobDM7c-t0lewuR7JKw7g,94353
-alembic/operations/schemaobj.py,sha256=vjoD57QvjbzzA-jyPIXulbOmb5_bGPtxoq58KsKI4Y0,9424
-alembic/operations/toimpl.py,sha256=SoNY2_gZX2baXTD-pNjpCWnON8D2QBSYQBIjo13-WKA,7115
+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=9wSJaePNAXBXvirif_85ql7dSq4bXM1E6pSb2k-6uGI,41508
-alembic/runtime/migration.py,sha256=Yfv2fa11wiQ0WgoZaFldlWxCPq4dVDOCEOxST_-1VB0,50066
+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=4gkppn2FKCYDoBgzGkTslcwdyxSabmHvGq0uGKulwbI,37586
-alembic/script/revision.py,sha256=sfnXQw2UwiXs0E6gEPHBKWuSsB5KyuxZPTrFn__hIEk,62060
+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=uuhJETLWQuiYcs_jAOXHEjshEJ7VslEc1q4RRj0HWbE,3525
+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=sT7F852yN3c8X1-GKFlhuWExXxw9hY1eb1ZZ9flFSzc,3634
+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=mPh8JFJfWiGs6tMtL8_HAQ-Dz1QOoJgE5Vm76nIMqgU,3728
+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=1CbJk8c8-WO9eJ0XJ0jJvMsNRLUrXV41NOeIJUAlOBk,5015
-alembic/testing/env.py,sha256=zJacVb_z6uLs2U1TtkmnFH9P3_F-3IfYbVv4UEPOvfo,10754
-alembic/testing/fixtures.py,sha256=NyP4wE_dFN9ZzSGiBagRu1cdzkka03nwJYJYHYrrkSY,9112
+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
@@ -68,11 +68,11 @@ alembic/testing/schemacompare.py,sha256=N5UqSNCOJetIKC4vKhpYzQEpj08XkdgIoqBmEPQ3
 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=qJeBpc8urnwTFvbwWrSTIbHVkRUuCXP-dKaNbUK2U2U,6077
+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=w9F0xnLEbALeR8k6_-Tz6JHvy91IqiTSypNasVzXfZQ,11877
+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
@@ -80,7 +80,7 @@ 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=KYyOjFjJ26evPmrwhdTvLQNXN0bK7AIy5sRdKD91Fvg,10038
-alembic/util/messaging.py,sha256=BM5OCZ6qmLftFRw5yPSxj539_QmfVwNYoU8qYsDqoJY,3132
+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=toD1S63PgZ6iEteP9bwIf5E7DIUdQPo0UQ_Fn18qWnI,19536
+alembic/util/sqla_compat.py,sha256=XMfZaLdbVbJoniNUyI3RUUXu4gCWljjVBbJ7db6vCgc,19526
diff --git a/libs/alembic-1.13.1.dist-info/REQUESTED b/libs/alembic-1.14.0.dist-info/REQUESTED
similarity index 100%
rename from libs/alembic-1.13.1.dist-info/REQUESTED
rename to libs/alembic-1.14.0.dist-info/REQUESTED
diff --git a/libs/alembic-1.14.0.dist-info/WHEEL b/libs/alembic-1.14.0.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/alembic-1.14.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/alembic-1.13.1.dist-info/entry_points.txt b/libs/alembic-1.14.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/alembic-1.13.1.dist-info/entry_points.txt
rename to libs/alembic-1.14.0.dist-info/entry_points.txt
diff --git a/libs/alembic-1.13.1.dist-info/top_level.txt b/libs/alembic-1.14.0.dist-info/top_level.txt
similarity index 100%
rename from libs/alembic-1.13.1.dist-info/top_level.txt
rename to libs/alembic-1.14.0.dist-info/top_level.txt
diff --git a/libs/alembic/__init__.py b/libs/alembic/__init__.py
index c153c8aaf..637b2d4e1 100644
--- a/libs/alembic/__init__.py
+++ b/libs/alembic/__init__.py
@@ -1,4 +1,4 @@
 from . import context
 from . import op
 
-__version__ = "1.13.1"
+__version__ = "1.14.0"
diff --git a/libs/alembic/autogenerate/api.py b/libs/alembic/autogenerate/api.py
index aa8f32f65..4c0391628 100644
--- a/libs/alembic/autogenerate/api.py
+++ b/libs/alembic/autogenerate/api.py
@@ -596,9 +596,9 @@ class RevisionContext:
         migration_script = self.generated_revisions[-1]
         if not getattr(migration_script, "_needs_render", False):
             migration_script.upgrade_ops_list[-1].upgrade_token = upgrade_token
-            migration_script.downgrade_ops_list[
-                -1
-            ].downgrade_token = downgrade_token
+            migration_script.downgrade_ops_list[-1].downgrade_token = (
+                downgrade_token
+            )
             migration_script._needs_render = True
         else:
             migration_script._upgrade_ops.append(
diff --git a/libs/alembic/autogenerate/compare.py b/libs/alembic/autogenerate/compare.py
index fcef531a5..0d9851964 100644
--- a/libs/alembic/autogenerate/compare.py
+++ b/libs/alembic/autogenerate/compare.py
@@ -983,7 +983,7 @@ def _normalize_computed_default(sqltext: str) -> str:
 
     """
 
-    return re.sub(r"[ \(\)'\"`\[\]]", "", sqltext).lower()
+    return re.sub(r"[ \(\)'\"`\[\]\t\r\n]", "", sqltext).lower()
 
 
 def _compare_computed_default(
diff --git a/libs/alembic/autogenerate/render.py b/libs/alembic/autogenerate/render.py
index 317a6dbed..38bdbfca2 100644
--- a/libs/alembic/autogenerate/render.py
+++ b/libs/alembic/autogenerate/render.py
@@ -187,9 +187,11 @@ def _render_create_table_comment(
         prefix=_alembic_autogenerate_prefix(autogen_context),
         tname=op.table_name,
         comment="%r" % op.comment if op.comment is not None else None,
-        existing="%r" % op.existing_comment
-        if op.existing_comment is not None
-        else None,
+        existing=(
+            "%r" % op.existing_comment
+            if op.existing_comment is not None
+            else None
+        ),
         schema="'%s'" % op.schema if op.schema is not None else None,
         indent="    ",
     )
@@ -216,9 +218,11 @@ def _render_drop_table_comment(
     return templ.format(
         prefix=_alembic_autogenerate_prefix(autogen_context),
         tname=op.table_name,
-        existing="%r" % op.existing_comment
-        if op.existing_comment is not None
-        else None,
+        existing=(
+            "%r" % op.existing_comment
+            if op.existing_comment is not None
+            else None
+        ),
         schema="'%s'" % op.schema if op.schema is not None else None,
         indent="    ",
     )
@@ -275,6 +279,9 @@ def _add_table(autogen_context: AutogenContext, op: ops.CreateTableOp) -> str:
         prefixes = ", ".join("'%s'" % p for p in table._prefixes)
         text += ",\nprefixes=[%s]" % prefixes
 
+    if op.if_not_exists is not None:
+        text += ",\nif_not_exists=%r" % bool(op.if_not_exists)
+
     text += "\n)"
     return text
 
@@ -287,6 +294,10 @@ def _drop_table(autogen_context: AutogenContext, op: ops.DropTableOp) -> str:
     }
     if op.schema:
         text += ", schema=%r" % _ident(op.schema)
+
+    if op.if_exists is not None:
+        text += ", if_exists=%r" % bool(op.if_exists)
+
     text += ")"
     return text
 
@@ -320,6 +331,8 @@ def _add_index(autogen_context: AutogenContext, op: ops.CreateIndexOp) -> str:
     assert index.table is not None
 
     opts = _render_dialect_kwargs_items(autogen_context, index)
+    if op.if_not_exists is not None:
+        opts.append("if_not_exists=%r" % bool(op.if_not_exists))
     text = tmpl % {
         "prefix": _alembic_autogenerate_prefix(autogen_context),
         "name": _render_gen_name(autogen_context, index.name),
@@ -328,9 +341,11 @@ def _add_index(autogen_context: AutogenContext, op: ops.CreateIndexOp) -> str:
             _get_index_rendered_expressions(index, autogen_context)
         ),
         "unique": index.unique or False,
-        "schema": (", schema=%r" % _ident(index.table.schema))
-        if index.table.schema
-        else "",
+        "schema": (
+            (", schema=%r" % _ident(index.table.schema))
+            if index.table.schema
+            else ""
+        ),
         "kwargs": ", " + ", ".join(opts) if opts else "",
     }
     return text
@@ -350,6 +365,8 @@ def _drop_index(autogen_context: AutogenContext, op: ops.DropIndexOp) -> str:
             "table_name=%(table_name)r%(schema)s%(kwargs)s)"
         )
     opts = _render_dialect_kwargs_items(autogen_context, index)
+    if op.if_exists is not None:
+        opts.append("if_exists=%r" % bool(op.if_exists))
     text = tmpl % {
         "prefix": _alembic_autogenerate_prefix(autogen_context),
         "name": _render_gen_name(autogen_context, op.index_name),
@@ -592,9 +609,11 @@ def _get_index_rendered_expressions(
     idx: Index, autogen_context: AutogenContext
 ) -> List[str]:
     return [
-        repr(_ident(getattr(exp, "name", None)))
-        if isinstance(exp, sa_schema.Column)
-        else _render_potential_expr(exp, autogen_context, is_index=True)
+        (
+            repr(_ident(getattr(exp, "name", None)))
+            if isinstance(exp, sa_schema.Column)
+            else _render_potential_expr(exp, autogen_context, is_index=True)
+        )
         for exp in idx.expressions
     ]
 
@@ -1075,9 +1094,11 @@ def _render_check_constraint(
         )
     return "%(prefix)sCheckConstraint(%(sqltext)s%(opts)s)" % {
         "prefix": _sqlalchemy_autogenerate_prefix(autogen_context),
-        "opts": ", " + (", ".join("%s=%s" % (k, v) for k, v in opts))
-        if opts
-        else "",
+        "opts": (
+            ", " + (", ".join("%s=%s" % (k, v) for k, v in opts))
+            if opts
+            else ""
+        ),
         "sqltext": _render_potential_expr(
             constraint.sqltext, autogen_context, wrap_in_text=False
         ),
diff --git a/libs/alembic/command.py b/libs/alembic/command.py
index 37aa6e67e..89c12354a 100644
--- a/libs/alembic/command.py
+++ b/libs/alembic/command.py
@@ -49,7 +49,7 @@ def init(
 
     :param config: a :class:`.Config` object.
 
-    :param directory: string path of the target directory
+    :param directory: string path of the target directory.
 
     :param template: string name of the migration environment template to
      use.
@@ -174,7 +174,7 @@ def revision(
      will be applied to the structure generated by the revision process
      where it can be altered programmatically.   Note that unlike all
      the other parameters, this option is only available via programmatic
-     use of :func:`.command.revision`
+     use of :func:`.command.revision`.
 
     """
 
@@ -315,9 +315,11 @@ def merge(
 
     :param config: a :class:`.Config` instance
 
-    :param message: string message to apply to the revision
+    :param revisions: The revisions to merge.
 
-    :param branch_label: string label name to apply to the new revision
+    :param message: string message to apply to the revision.
+
+    :param branch_label: string label name to apply to the new revision.
 
     :param rev_id: hardcoded revision identifier instead of generating a new
      one.
@@ -370,9 +372,10 @@ def upgrade(
 
     :param config: a :class:`.Config` instance.
 
-    :param revision: string revision target or range for --sql mode
+    :param revision: string revision target or range for --sql mode. May be
+     ``"heads"`` to target the most recent revision(s).
 
-    :param sql: if True, use ``--sql`` mode
+    :param sql: if True, use ``--sql`` mode.
 
     :param tag: an arbitrary "tag" that can be intercepted by custom
      ``env.py`` scripts via the :meth:`.EnvironmentContext.get_tag_argument`
@@ -413,9 +416,10 @@ def downgrade(
 
     :param config: a :class:`.Config` instance.
 
-    :param revision: string revision target or range for --sql mode
+    :param revision: string revision target or range for --sql mode. May
+     be ``"base"`` to target the first revision.
 
-    :param sql: if True, use ``--sql`` mode
+    :param sql: if True, use ``--sql`` mode.
 
     :param tag: an arbitrary "tag" that can be intercepted by custom
      ``env.py`` scripts via the :meth:`.EnvironmentContext.get_tag_argument`
@@ -449,12 +453,13 @@ def downgrade(
         script.run_env()
 
 
-def show(config, rev):
+def show(config: Config, rev: str) -> None:
     """Show the revision(s) denoted by the given symbol.
 
     :param config: a :class:`.Config` instance.
 
-    :param revision: string revision target
+    :param rev: string revision target. May be ``"current"`` to show the
+     revision(s) currently applied in the database.
 
     """
 
@@ -484,7 +489,7 @@ def history(
 
     :param config: a :class:`.Config` instance.
 
-    :param rev_range: string revision range
+    :param rev_range: string revision range.
 
     :param verbose: output in verbose mode.
 
@@ -543,7 +548,9 @@ def history(
         _display_history(config, script, base, head)
 
 
-def heads(config, verbose=False, resolve_dependencies=False):
+def heads(
+    config: Config, verbose: bool = False, resolve_dependencies: bool = False
+) -> None:
     """Show current available heads in the script directory.
 
     :param config: a :class:`.Config` instance.
@@ -568,7 +575,7 @@ def heads(config, verbose=False, resolve_dependencies=False):
         )
 
 
-def branches(config, verbose=False):
+def branches(config: Config, verbose: bool = False) -> None:
     """Show current branch points.
 
     :param config: a :class:`.Config` instance.
@@ -638,7 +645,9 @@ def stamp(
     :param config: a :class:`.Config` instance.
 
     :param revision: target revision or list of revisions.   May be a list
-     to indicate stamping of multiple branch heads.
+     to indicate stamping of multiple branch heads; may be ``"base"``
+     to remove all revisions from the table or ``"heads"`` to stamp the
+     most recent revision(s).
 
      .. note:: this parameter is called "revisions" in the command line
         interface.
@@ -728,7 +737,7 @@ def ensure_version(config: Config, sql: bool = False) -> None:
 
     :param config: a :class:`.Config` instance.
 
-    :param sql: use ``--sql`` mode
+    :param sql: use ``--sql`` mode.
 
      .. versionadded:: 1.7.6
 
diff --git a/libs/alembic/config.py b/libs/alembic/config.py
index 4b2263fdd..2c52e7cd1 100644
--- a/libs/alembic/config.py
+++ b/libs/alembic/config.py
@@ -221,8 +221,7 @@ class Config:
     @overload
     def get_section(
         self, name: str, default: None = ...
-    ) -> Optional[Dict[str, str]]:
-        ...
+    ) -> Optional[Dict[str, str]]: ...
 
     # "default" here could also be a TypeVar
     # _MT = TypeVar("_MT", bound=Mapping[str, str]),
@@ -230,14 +229,12 @@ class Config:
     @overload
     def get_section(
         self, name: str, default: Dict[str, str]
-    ) -> Dict[str, str]:
-        ...
+    ) -> Dict[str, str]: ...
 
     @overload
     def get_section(
         self, name: str, default: Mapping[str, str]
-    ) -> Union[Dict[str, str], Mapping[str, str]]:
-        ...
+    ) -> Union[Dict[str, str], Mapping[str, str]]: ...
 
     def get_section(
         self, name: str, default: Optional[Mapping[str, str]] = None
@@ -313,14 +310,12 @@ class Config:
             return default
 
     @overload
-    def get_main_option(self, name: str, default: str) -> str:
-        ...
+    def get_main_option(self, name: str, default: str) -> str: ...
 
     @overload
     def get_main_option(
         self, name: str, default: Optional[str] = None
-    ) -> Optional[str]:
-        ...
+    ) -> Optional[str]: ...
 
     def get_main_option(
         self, name: str, default: Optional[str] = None
diff --git a/libs/alembic/ddl/_autogen.py b/libs/alembic/ddl/_autogen.py
index e22153c49..74715b18a 100644
--- a/libs/alembic/ddl/_autogen.py
+++ b/libs/alembic/ddl/_autogen.py
@@ -287,18 +287,22 @@ class _fk_constraint_sig(_constraint_sig[ForeignKeyConstraint]):
             self.target_table,
             tuple(self.target_columns),
         ) + (
-            (None if onupdate.lower() == "no action" else onupdate.lower())
-            if onupdate
-            else None,
-            (None if ondelete.lower() == "no action" else ondelete.lower())
-            if ondelete
-            else None,
+            (
+                (None if onupdate.lower() == "no action" else onupdate.lower())
+                if onupdate
+                else None
+            ),
+            (
+                (None if ondelete.lower() == "no action" else ondelete.lower())
+                if ondelete
+                else None
+            ),
             # convert initially + deferrable into one three-state value
-            "initially_deferrable"
-            if initially and initially.lower() == "deferred"
-            else "deferrable"
-            if deferrable
-            else "not deferrable",
+            (
+                "initially_deferrable"
+                if initially and initially.lower() == "deferred"
+                else "deferrable" if deferrable else "not deferrable"
+            ),
         )
 
     @util.memoized_property
diff --git a/libs/alembic/ddl/base.py b/libs/alembic/ddl/base.py
index 7a85a5c19..6fbe95245 100644
--- a/libs/alembic/ddl/base.py
+++ b/libs/alembic/ddl/base.py
@@ -40,7 +40,6 @@ _ServerDefault = Union["TextClause", "FetchedValue", "Function[Any]", str]
 
 
 class AlterTable(DDLElement):
-
     """Represent an ALTER TABLE statement.
 
     Only the string name and optional schema name of the table
@@ -176,7 +175,7 @@ class ColumnComment(AlterColumn):
         self.comment = comment
 
 
-@compiles(RenameTable)  # type: ignore[misc]
+@compiles(RenameTable)
 def visit_rename_table(
     element: RenameTable, compiler: DDLCompiler, **kw
 ) -> str:
@@ -186,7 +185,7 @@ def visit_rename_table(
     )
 
 
-@compiles(AddColumn)  # type: ignore[misc]
+@compiles(AddColumn)
 def visit_add_column(element: AddColumn, compiler: DDLCompiler, **kw) -> str:
     return "%s %s" % (
         alter_table(compiler, element.table_name, element.schema),
@@ -194,7 +193,7 @@ def visit_add_column(element: AddColumn, compiler: DDLCompiler, **kw) -> str:
     )
 
 
-@compiles(DropColumn)  # type: ignore[misc]
+@compiles(DropColumn)
 def visit_drop_column(element: DropColumn, compiler: DDLCompiler, **kw) -> str:
     return "%s %s" % (
         alter_table(compiler, element.table_name, element.schema),
@@ -202,7 +201,7 @@ def visit_drop_column(element: DropColumn, compiler: DDLCompiler, **kw) -> str:
     )
 
 
-@compiles(ColumnNullable)  # type: ignore[misc]
+@compiles(ColumnNullable)
 def visit_column_nullable(
     element: ColumnNullable, compiler: DDLCompiler, **kw
 ) -> str:
@@ -213,7 +212,7 @@ def visit_column_nullable(
     )
 
 
-@compiles(ColumnType)  # type: ignore[misc]
+@compiles(ColumnType)
 def visit_column_type(element: ColumnType, compiler: DDLCompiler, **kw) -> str:
     return "%s %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
@@ -222,7 +221,7 @@ def visit_column_type(element: ColumnType, compiler: DDLCompiler, **kw) -> str:
     )
 
 
-@compiles(ColumnName)  # type: ignore[misc]
+@compiles(ColumnName)
 def visit_column_name(element: ColumnName, compiler: DDLCompiler, **kw) -> str:
     return "%s RENAME %s TO %s" % (
         alter_table(compiler, element.table_name, element.schema),
@@ -231,20 +230,22 @@ def visit_column_name(element: ColumnName, compiler: DDLCompiler, **kw) -> str:
     )
 
 
-@compiles(ColumnDefault)  # type: ignore[misc]
+@compiles(ColumnDefault)
 def visit_column_default(
     element: ColumnDefault, compiler: DDLCompiler, **kw
 ) -> str:
     return "%s %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         alter_column(compiler, element.column_name),
-        "SET DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DROP DEFAULT",
+        (
+            "SET DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DROP DEFAULT"
+        ),
     )
 
 
-@compiles(ComputedColumnDefault)  # type: ignore[misc]
+@compiles(ComputedColumnDefault)
 def visit_computed_column(
     element: ComputedColumnDefault, compiler: DDLCompiler, **kw
 ):
@@ -254,7 +255,7 @@ def visit_computed_column(
     )
 
 
-@compiles(IdentityColumnDefault)  # type: ignore[misc]
+@compiles(IdentityColumnDefault)
 def visit_identity_column(
     element: IdentityColumnDefault, compiler: DDLCompiler, **kw
 ):
diff --git a/libs/alembic/ddl/impl.py b/libs/alembic/ddl/impl.py
index 2e4f1ae94..2609a62de 100644
--- a/libs/alembic/ddl/impl.py
+++ b/libs/alembic/ddl/impl.py
@@ -21,7 +21,12 @@ from typing import TYPE_CHECKING
 from typing import Union
 
 from sqlalchemy import cast
+from sqlalchemy import Column
+from sqlalchemy import MetaData
+from sqlalchemy import PrimaryKeyConstraint
 from sqlalchemy import schema
+from sqlalchemy import String
+from sqlalchemy import Table
 from sqlalchemy import text
 
 from . import _autogen
@@ -43,11 +48,9 @@ if TYPE_CHECKING:
     from sqlalchemy.sql import Executable
     from sqlalchemy.sql.elements import ColumnElement
     from sqlalchemy.sql.elements import quoted_name
-    from sqlalchemy.sql.schema import Column
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.schema import ForeignKeyConstraint
     from sqlalchemy.sql.schema import Index
-    from sqlalchemy.sql.schema import Table
     from sqlalchemy.sql.schema import UniqueConstraint
     from sqlalchemy.sql.selectable import TableClause
     from sqlalchemy.sql.type_api import TypeEngine
@@ -77,7 +80,6 @@ _impls: Dict[str, Type[DefaultImpl]] = {}
 
 
 class DefaultImpl(metaclass=ImplMeta):
-
     """Provide the entrypoint for major migration operations,
     including database-specific behavioral variances.
 
@@ -137,6 +139,40 @@ class DefaultImpl(metaclass=ImplMeta):
         self.output_buffer.write(text + "\n\n")
         self.output_buffer.flush()
 
+    def version_table_impl(
+        self,
+        *,
+        version_table: str,
+        version_table_schema: Optional[str],
+        version_table_pk: bool,
+        **kw: Any,
+    ) -> Table:
+        """Generate a :class:`.Table` object which will be used as the
+        structure for the Alembic version table.
+
+        Third party dialects may override this hook to provide an alternate
+        structure for this :class:`.Table`; requirements are only that it
+        be named based on the ``version_table`` parameter and contains
+        at least a single string-holding column named ``version_num``.
+
+        .. versionadded:: 1.14
+
+        """
+        vt = Table(
+            version_table,
+            MetaData(),
+            Column("version_num", String(32), nullable=False),
+            schema=version_table_schema,
+        )
+        if version_table_pk:
+            vt.append_constraint(
+                PrimaryKeyConstraint(
+                    "version_num", name=f"{version_table}_pkc"
+                )
+            )
+
+        return vt
+
     def requires_recreate_in_batch(
         self, batch_op: BatchOperationsImpl
     ) -> bool:
@@ -168,16 +204,15 @@ class DefaultImpl(metaclass=ImplMeta):
     def _exec(
         self,
         construct: Union[Executable, str],
-        execution_options: Optional[dict[str, Any]] = None,
-        multiparams: Sequence[dict] = (),
-        params: Dict[str, Any] = util.immutabledict(),
+        execution_options: Optional[Mapping[str, Any]] = None,
+        multiparams: Optional[Sequence[Mapping[str, Any]]] = None,
+        params: Mapping[str, Any] = util.immutabledict(),
     ) -> Optional[CursorResult]:
         if isinstance(construct, str):
             construct = text(construct)
         if self.as_sql:
-            if multiparams or params:
-                # TODO: coverage
-                raise Exception("Execution arguments not allowed with as_sql")
+            if multiparams is not None or params:
+                raise TypeError("SQL parameters not allowed with as_sql")
 
             compile_kw: dict[str, Any]
             if self.literal_binds and not isinstance(
@@ -200,11 +235,16 @@ class DefaultImpl(metaclass=ImplMeta):
             assert conn is not None
             if execution_options:
                 conn = conn.execution_options(**execution_options)
-            if params:
-                assert isinstance(multiparams, tuple)
-                multiparams += (params,)
 
-            return conn.execute(construct, multiparams)
+            if params and multiparams is not None:
+                raise TypeError(
+                    "Can't send params and multiparams at the same time"
+                )
+
+            if multiparams:
+                return conn.execute(construct, multiparams)
+            else:
+                return conn.execute(construct, params)
 
     def execute(
         self,
@@ -359,11 +399,11 @@ class DefaultImpl(metaclass=ImplMeta):
             base.RenameTable(old_table_name, new_table_name, schema=schema)
         )
 
-    def create_table(self, table: Table) -> None:
+    def create_table(self, table: Table, **kw: Any) -> None:
         table.dispatch.before_create(
             table, self.connection, checkfirst=False, _ddl_runner=self
         )
-        self._exec(schema.CreateTable(table))
+        self._exec(schema.CreateTable(table, **kw))
         table.dispatch.after_create(
             table, self.connection, checkfirst=False, _ddl_runner=self
         )
@@ -382,11 +422,11 @@ class DefaultImpl(metaclass=ImplMeta):
             if comment and with_comment:
                 self.create_column_comment(column)
 
-    def drop_table(self, table: Table) -> None:
+    def drop_table(self, table: Table, **kw: Any) -> None:
         table.dispatch.before_drop(
             table, self.connection, checkfirst=False, _ddl_runner=self
         )
-        self._exec(schema.DropTable(table))
+        self._exec(schema.DropTable(table, **kw))
         table.dispatch.after_drop(
             table, self.connection, checkfirst=False, _ddl_runner=self
         )
@@ -421,13 +461,15 @@ class DefaultImpl(metaclass=ImplMeta):
                 self._exec(
                     sqla_compat._insert_inline(table).values(
                         **{
-                            k: sqla_compat._literal_bindparam(
-                                k, v, type_=table.c[k].type
+                            k: (
+                                sqla_compat._literal_bindparam(
+                                    k, v, type_=table.c[k].type
+                                )
+                                if not isinstance(
+                                    v, sqla_compat._literal_bindparam
+                                )
+                                else v
                             )
-                            if not isinstance(
-                                v, sqla_compat._literal_bindparam
-                            )
-                            else v
                             for k, v in row.items()
                         }
                     )
diff --git a/libs/alembic/ddl/mysql.py b/libs/alembic/ddl/mysql.py
index f312173e9..3482f672d 100644
--- a/libs/alembic/ddl/mysql.py
+++ b/libs/alembic/ddl/mysql.py
@@ -94,21 +94,29 @@ class MySQLImpl(DefaultImpl):
                     column_name,
                     schema=schema,
                     newname=name if name is not None else column_name,
-                    nullable=nullable
-                    if nullable is not None
-                    else existing_nullable
-                    if existing_nullable is not None
-                    else True,
+                    nullable=(
+                        nullable
+                        if nullable is not None
+                        else (
+                            existing_nullable
+                            if existing_nullable is not None
+                            else True
+                        )
+                    ),
                     type_=type_ if type_ is not None else existing_type,
-                    default=server_default
-                    if server_default is not False
-                    else existing_server_default,
-                    autoincrement=autoincrement
-                    if autoincrement is not None
-                    else existing_autoincrement,
-                    comment=comment
-                    if comment is not False
-                    else existing_comment,
+                    default=(
+                        server_default
+                        if server_default is not False
+                        else existing_server_default
+                    ),
+                    autoincrement=(
+                        autoincrement
+                        if autoincrement is not None
+                        else existing_autoincrement
+                    ),
+                    comment=(
+                        comment if comment is not False else existing_comment
+                    ),
                 )
             )
         elif (
@@ -123,21 +131,29 @@ class MySQLImpl(DefaultImpl):
                     column_name,
                     schema=schema,
                     newname=name if name is not None else column_name,
-                    nullable=nullable
-                    if nullable is not None
-                    else existing_nullable
-                    if existing_nullable is not None
-                    else True,
+                    nullable=(
+                        nullable
+                        if nullable is not None
+                        else (
+                            existing_nullable
+                            if existing_nullable is not None
+                            else True
+                        )
+                    ),
                     type_=type_ if type_ is not None else existing_type,
-                    default=server_default
-                    if server_default is not False
-                    else existing_server_default,
-                    autoincrement=autoincrement
-                    if autoincrement is not None
-                    else existing_autoincrement,
-                    comment=comment
-                    if comment is not False
-                    else existing_comment,
+                    default=(
+                        server_default
+                        if server_default is not False
+                        else existing_server_default
+                    ),
+                    autoincrement=(
+                        autoincrement
+                        if autoincrement is not None
+                        else existing_autoincrement
+                    ),
+                    comment=(
+                        comment if comment is not False else existing_comment
+                    ),
                 )
             )
         elif server_default is not False:
@@ -368,9 +384,11 @@ def _mysql_alter_default(
     return "%s ALTER COLUMN %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         format_column_name(compiler, element.column_name),
-        "SET DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DROP DEFAULT",
+        (
+            "SET DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DROP DEFAULT"
+        ),
     )
 
 
diff --git a/libs/alembic/ddl/oracle.py b/libs/alembic/ddl/oracle.py
index 540117407..eac99124f 100644
--- a/libs/alembic/ddl/oracle.py
+++ b/libs/alembic/ddl/oracle.py
@@ -141,9 +141,11 @@ def visit_column_default(
     return "%s %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         alter_column(compiler, element.column_name),
-        "DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DEFAULT NULL",
+        (
+            "DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DEFAULT NULL"
+        ),
     )
 
 
diff --git a/libs/alembic/ddl/postgresql.py b/libs/alembic/ddl/postgresql.py
index 6507fcbdd..de64a4e05 100644
--- a/libs/alembic/ddl/postgresql.py
+++ b/libs/alembic/ddl/postgresql.py
@@ -218,7 +218,8 @@ class PostgresqlImpl(DefaultImpl):
                         "join pg_class t on t.oid=d.refobjid "
                         "join pg_attribute a on a.attrelid=t.oid and "
                         "a.attnum=d.refobjsubid "
-                        "where c.relkind='S' and c.relname=:seqname"
+                        "where c.relkind='S' and "
+                        "c.oid=cast(:seqname as regclass)"
                     ),
                     seqname=seq_match.group(1),
                 ).first()
diff --git a/libs/alembic/op.pyi b/libs/alembic/op.pyi
index 83deac1eb..920444696 100644
--- a/libs/alembic/op.pyi
+++ b/libs/alembic/op.pyi
@@ -747,7 +747,12 @@ def create_primary_key(
 
     """
 
-def create_table(table_name: str, *columns: SchemaItem, **kw: Any) -> Table:
+def create_table(
+    table_name: str,
+    *columns: SchemaItem,
+    if_not_exists: Optional[bool] = None,
+    **kw: Any,
+) -> Table:
     r"""Issue a "create table" instruction using the current migration
     context.
 
@@ -818,6 +823,10 @@ def create_table(table_name: str, *columns: SchemaItem, **kw: Any) -> Table:
      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 table.
+
+     .. versionadded:: 1.13.3
     :param \**kw: Other keyword arguments are passed to the underlying
      :class:`sqlalchemy.schema.Table` object created for the command.
 
@@ -998,7 +1007,11 @@ def drop_index(
     """
 
 def drop_table(
-    table_name: str, *, schema: Optional[str] = None, **kw: Any
+    table_name: str,
+    *,
+    schema: Optional[str] = None,
+    if_exists: Optional[bool] = None,
+    **kw: Any,
 ) -> None:
     r"""Issue a "drop table" instruction using the current
     migration context.
@@ -1013,6 +1026,10 @@ def drop_table(
      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 table.
+
+     .. versionadded:: 1.13.3
     :param \**kw: Other keyword arguments are passed to the underlying
      :class:`sqlalchemy.schema.Table` object created for the command.
 
diff --git a/libs/alembic/operations/base.py b/libs/alembic/operations/base.py
index bafe441a6..9b52fa6f2 100644
--- a/libs/alembic/operations/base.py
+++ b/libs/alembic/operations/base.py
@@ -406,8 +406,7 @@ class AbstractOperations(util.ModuleClsProxy):
         return self.migration_context
 
     @overload
-    def invoke(self, operation: CreateTableOp) -> Table:
-        ...
+    def invoke(self, operation: CreateTableOp) -> Table: ...
 
     @overload
     def invoke(
@@ -427,12 +426,10 @@ class AbstractOperations(util.ModuleClsProxy):
             DropTableOp,
             ExecuteSQLOp,
         ],
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
-    def invoke(self, operation: MigrateOperation) -> Any:
-        ...
+    def invoke(self, operation: MigrateOperation) -> Any: ...
 
     def invoke(self, operation: MigrateOperation) -> Any:
         """Given a :class:`.MigrateOperation`, invoke it in terms of
@@ -1178,7 +1175,11 @@ class Operations(AbstractOperations):
             ...
 
         def create_table(
-            self, table_name: str, *columns: SchemaItem, **kw: Any
+            self,
+            table_name: str,
+            *columns: SchemaItem,
+            if_not_exists: Optional[bool] = None,
+            **kw: Any,
         ) -> Table:
             r"""Issue a "create table" instruction using the current migration
             context.
@@ -1250,6 +1251,10 @@ class Operations(AbstractOperations):
              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 table.
+
+             .. versionadded:: 1.13.3
             :param \**kw: Other keyword arguments are passed to the underlying
              :class:`sqlalchemy.schema.Table` object created for the command.
 
@@ -1441,7 +1446,12 @@ class Operations(AbstractOperations):
             ...
 
         def drop_table(
-            self, table_name: str, *, schema: Optional[str] = None, **kw: Any
+            self,
+            table_name: str,
+            *,
+            schema: Optional[str] = None,
+            if_exists: Optional[bool] = None,
+            **kw: Any,
         ) -> None:
             r"""Issue a "drop table" instruction using the current
             migration context.
@@ -1456,6 +1466,10 @@ class Operations(AbstractOperations):
              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 table.
+
+             .. versionadded:: 1.13.3
             :param \**kw: Other keyword arguments are passed to the underlying
              :class:`sqlalchemy.schema.Table` object created for the command.
 
@@ -1724,7 +1738,7 @@ class BatchOperations(AbstractOperations):
 
         def create_foreign_key(
             self,
-            constraint_name: str,
+            constraint_name: Optional[str],
             referent_table: str,
             local_cols: List[str],
             remote_cols: List[str],
@@ -1774,7 +1788,7 @@ class BatchOperations(AbstractOperations):
             ...
 
         def create_primary_key(
-            self, constraint_name: str, columns: List[str]
+            self, constraint_name: Optional[str], columns: List[str]
         ) -> None:
             """Issue a "create primary key" instruction using the
             current batch migration context.
diff --git a/libs/alembic/operations/ops.py b/libs/alembic/operations/ops.py
index 7b65191cf..60b856a8f 100644
--- a/libs/alembic/operations/ops.py
+++ b/libs/alembic/operations/ops.py
@@ -349,7 +349,7 @@ class CreatePrimaryKeyOp(AddConstraintOp):
     def batch_create_primary_key(
         cls,
         operations: BatchOperations,
-        constraint_name: str,
+        constraint_name: Optional[str],
         columns: List[str],
     ) -> None:
         """Issue a "create primary key" instruction using the
@@ -681,7 +681,7 @@ class CreateForeignKeyOp(AddConstraintOp):
     def batch_create_foreign_key(
         cls,
         operations: BatchOperations,
-        constraint_name: str,
+        constraint_name: Optional[str],
         referent_table: str,
         local_cols: List[str],
         remote_cols: List[str],
@@ -1159,6 +1159,7 @@ class CreateTableOp(MigrateOperation):
         columns: Sequence[SchemaItem],
         *,
         schema: Optional[str] = None,
+        if_not_exists: Optional[bool] = None,
         _namespace_metadata: Optional[MetaData] = None,
         _constraints_included: bool = False,
         **kw: Any,
@@ -1166,6 +1167,7 @@ class CreateTableOp(MigrateOperation):
         self.table_name = table_name
         self.columns = columns
         self.schema = schema
+        self.if_not_exists = if_not_exists
         self.info = kw.pop("info", {})
         self.comment = kw.pop("comment", None)
         self.prefixes = kw.pop("prefixes", None)
@@ -1228,6 +1230,7 @@ class CreateTableOp(MigrateOperation):
         operations: Operations,
         table_name: str,
         *columns: SchemaItem,
+        if_not_exists: Optional[bool] = None,
         **kw: Any,
     ) -> Table:
         r"""Issue a "create table" instruction using the current migration
@@ -1300,6 +1303,10 @@ class CreateTableOp(MigrateOperation):
          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 table.
+
+         .. versionadded:: 1.13.3
         :param \**kw: Other keyword arguments are passed to the underlying
          :class:`sqlalchemy.schema.Table` object created for the command.
 
@@ -1307,7 +1314,7 @@ class CreateTableOp(MigrateOperation):
          to the parameters given.
 
         """
-        op = cls(table_name, columns, **kw)
+        op = cls(table_name, columns, if_not_exists=if_not_exists, **kw)
         return operations.invoke(op)
 
 
@@ -1320,11 +1327,13 @@ class DropTableOp(MigrateOperation):
         table_name: str,
         *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
         table_kw: Optional[MutableMapping[Any, Any]] = None,
         _reverse: Optional[CreateTableOp] = None,
     ) -> None:
         self.table_name = table_name
         self.schema = schema
+        self.if_exists = if_exists
         self.table_kw = table_kw or {}
         self.comment = self.table_kw.pop("comment", None)
         self.info = self.table_kw.pop("info", None)
@@ -1371,9 +1380,9 @@ class DropTableOp(MigrateOperation):
             info=self.info.copy() if self.info else {},
             prefixes=list(self.prefixes) if self.prefixes else [],
             schema=self.schema,
-            _constraints_included=self._reverse._constraints_included
-            if self._reverse
-            else False,
+            _constraints_included=(
+                self._reverse._constraints_included if self._reverse else False
+            ),
             **self.table_kw,
         )
         return t
@@ -1385,6 +1394,7 @@ class DropTableOp(MigrateOperation):
         table_name: str,
         *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
         **kw: Any,
     ) -> None:
         r"""Issue a "drop table" instruction using the current
@@ -1400,11 +1410,15 @@ class DropTableOp(MigrateOperation):
          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 table.
+
+         .. versionadded:: 1.13.3
         :param \**kw: Other keyword arguments are passed to the underlying
          :class:`sqlalchemy.schema.Table` object created for the command.
 
         """
-        op = cls(table_name, schema=schema, table_kw=kw)
+        op = cls(table_name, schema=schema, if_exists=if_exists, table_kw=kw)
         operations.invoke(op)
 
 
diff --git a/libs/alembic/operations/schemaobj.py b/libs/alembic/operations/schemaobj.py
index 32b26e9b9..59c1002f1 100644
--- a/libs/alembic/operations/schemaobj.py
+++ b/libs/alembic/operations/schemaobj.py
@@ -223,10 +223,12 @@ class SchemaObjects:
         t = sa_schema.Table(name, m, *cols, **kw)
 
         constraints = [
-            sqla_compat._copy(elem, target_table=t)
-            if getattr(elem, "parent", None) is not t
-            and getattr(elem, "parent", None) is not None
-            else elem
+            (
+                sqla_compat._copy(elem, target_table=t)
+                if getattr(elem, "parent", None) is not t
+                and getattr(elem, "parent", None) is not None
+                else elem
+            )
             for elem in columns
             if isinstance(elem, (Constraint, Index))
         ]
diff --git a/libs/alembic/operations/toimpl.py b/libs/alembic/operations/toimpl.py
index 4759f7fd2..4b960049c 100644
--- a/libs/alembic/operations/toimpl.py
+++ b/libs/alembic/operations/toimpl.py
@@ -79,8 +79,14 @@ def alter_column(
 
 @Operations.implementation_for(ops.DropTableOp)
 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)
+        operation.to_table(operations.migration_context), **kw
     )
 
 
@@ -127,8 +133,14 @@ def drop_index(operations: "Operations", operation: "ops.DropIndexOp") -> None:
 def create_table(
     operations: "Operations", operation: "ops.CreateTableOp"
 ) -> "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)
+    operations.impl.create_table(table, **kw)
     return table
 
 
diff --git a/libs/alembic/runtime/environment.py b/libs/alembic/runtime/environment.py
index d64b2adc2..a30972ec9 100644
--- a/libs/alembic/runtime/environment.py
+++ b/libs/alembic/runtime/environment.py
@@ -108,7 +108,6 @@ CompareType = Callable[
 
 
 class EnvironmentContext(util.ModuleClsProxy):
-
     """A configurational facade made available in an ``env.py`` script.
 
     The :class:`.EnvironmentContext` acts as a *facade* to the more
@@ -342,18 +341,17 @@ class EnvironmentContext(util.ModuleClsProxy):
         return self.context_opts.get("tag", None)  # type: ignore[no-any-return]  # noqa: E501
 
     @overload
-    def get_x_argument(self, as_dictionary: Literal[False]) -> List[str]:
-        ...
+    def get_x_argument(self, as_dictionary: Literal[False]) -> List[str]: ...
 
     @overload
-    def get_x_argument(self, as_dictionary: Literal[True]) -> Dict[str, str]:
-        ...
+    def get_x_argument(
+        self, as_dictionary: Literal[True]
+    ) -> Dict[str, str]: ...
 
     @overload
     def get_x_argument(
         self, as_dictionary: bool = ...
-    ) -> Union[List[str], Dict[str, str]]:
-        ...
+    ) -> Union[List[str], Dict[str, str]]: ...
 
     def get_x_argument(
         self, as_dictionary: bool = False
diff --git a/libs/alembic/runtime/migration.py b/libs/alembic/runtime/migration.py
index 95c69bc69..28f01c3b3 100644
--- a/libs/alembic/runtime/migration.py
+++ b/libs/alembic/runtime/migration.py
@@ -24,10 +24,6 @@ from typing import Union
 
 from sqlalchemy import Column
 from sqlalchemy import literal_column
-from sqlalchemy import MetaData
-from sqlalchemy import PrimaryKeyConstraint
-from sqlalchemy import String
-from sqlalchemy import Table
 from sqlalchemy.engine import Engine
 from sqlalchemy.engine import url as sqla_url
 from sqlalchemy.engine.strategies import MockEngineStrategy
@@ -36,6 +32,7 @@ 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
@@ -86,7 +83,6 @@ class _ProxyTransaction:
 
 
 class MigrationContext:
-
     """Represent the database state made available to a migration
     script.
 
@@ -191,18 +187,6 @@ class MigrationContext:
         self.version_table_schema = version_table_schema = opts.get(
             "version_table_schema", None
         )
-        self._version = Table(
-            version_table,
-            MetaData(),
-            Column("version_num", String(32), nullable=False),
-            schema=version_table_schema,
-        )
-        if opts.get("version_table_pk", True):
-            self._version.append_constraint(
-                PrimaryKeyConstraint(
-                    "version_num", name="%s_pkc" % version_table
-                )
-            )
 
         self._start_from_rev: Optional[str] = opts.get("starting_rev")
         self.impl = ddl.DefaultImpl.get_by_dialect(dialect)(
@@ -213,14 +197,23 @@ class MigrationContext:
             self.output_buffer,
             opts,
         )
+
+        self._version = self.impl.version_table_impl(
+            version_table=version_table,
+            version_table_schema=version_table_schema,
+            version_table_pk=opts.get("version_table_pk", True),
+        )
+
         log.info("Context impl %s.", self.impl.__class__.__name__)
         if self.as_sql:
             log.info("Generating static SQL")
         log.info(
             "Will assume %s DDL.",
-            "transactional"
-            if self.impl.transactional_ddl
-            else "non-transactional",
+            (
+                "transactional"
+                if self.impl.transactional_ddl
+                else "non-transactional"
+            ),
         )
 
     @classmethod
@@ -345,9 +338,9 @@ class MigrationContext:
             # except that it will not know it's in "autocommit" and will
             # emit deprecation warnings when an autocommit action takes
             # place.
-            self.connection = (
-                self.impl.connection
-            ) = base_connection.execution_options(isolation_level="AUTOCOMMIT")
+            self.connection = self.impl.connection = (
+                base_connection.execution_options(isolation_level="AUTOCOMMIT")
+            )
 
             # sqlalchemy future mode will "autobegin" in any case, so take
             # control of that "transaction" here
@@ -539,7 +532,10 @@ class MigrationContext:
                 return ()
         assert self.connection is not None
         return tuple(
-            row[0] for row in self.connection.execute(self._version.select())
+            row[0]
+            for row in self.connection.execute(
+                _select(self._version.c.version_num)
+            )
         )
 
     def _ensure_version_table(self, purge: bool = False) -> None:
@@ -1006,8 +1002,7 @@ class MigrationStep:
     if TYPE_CHECKING:
 
         @property
-        def doc(self) -> Optional[str]:
-            ...
+        def doc(self) -> Optional[str]: ...
 
     @property
     def name(self) -> str:
diff --git a/libs/alembic/script/base.py b/libs/alembic/script/base.py
index 5945ca591..30df6ddb2 100644
--- a/libs/alembic/script/base.py
+++ b/libs/alembic/script/base.py
@@ -56,7 +56,6 @@ _split_on_space_comma_colon = re.compile(r", *|(?: +)|\:")
 
 
 class ScriptDirectory:
-
     """Provides operations upon an Alembic script directory.
 
     This object is useful to get information as to current revisions,
@@ -188,6 +187,7 @@ class ScriptDirectory:
             split_on_path = {
                 None: None,
                 "space": " ",
+                "newline": "\n",
                 "os": os.pathsep,
                 ":": ":",
                 ";": ";",
@@ -201,7 +201,8 @@ class ScriptDirectory:
                 raise ValueError(
                     "'%s' is not a valid value for "
                     "version_path_separator; "
-                    "expected 'space', 'os', ':', ';'" % version_path_separator
+                    "expected 'space', 'newline', 'os', ':', ';'"
+                    % version_path_separator
                 ) from ke
             else:
                 if split_char is None:
@@ -211,7 +212,9 @@ class ScriptDirectory:
                     )
                 else:
                     version_locations = [
-                        x for x in version_locations_str.split(split_char) if x
+                        x.strip()
+                        for x in version_locations_str.split(split_char)
+                        if x
                     ]
         else:
             version_locations = None
@@ -610,7 +613,7 @@ class ScriptDirectory:
         if self.timezone is not None:
             if ZoneInfo is None:
                 raise util.CommandError(
-                    "Python >= 3.9 is required for timezone support or"
+                    "Python >= 3.9 is required for timezone support or "
                     "the 'backports.zoneinfo' package must be installed."
                 )
             # First, assume correct capitalization
@@ -732,9 +735,11 @@ class ScriptDirectory:
         if depends_on:
             with self._catch_revision_errors():
                 resolved_depends_on = [
-                    dep
-                    if dep in rev.branch_labels  # maintain branch labels
-                    else rev.revision  # resolve partial revision identifiers
+                    (
+                        dep
+                        if dep in rev.branch_labels  # maintain branch labels
+                        else rev.revision
+                    )  # resolve partial revision identifiers
                     for rev, dep in [
                         (not_none(self.revision_map.get_revision(dep)), dep)
                         for dep in util.to_list(depends_on)
@@ -808,7 +813,6 @@ class ScriptDirectory:
 
 
 class Script(revision.Revision):
-
     """Represent a single revision file in a ``versions/`` directory.
 
     The :class:`.Script` instance is returned by methods
@@ -930,9 +934,11 @@ class Script(revision.Revision):
         if head_indicators or tree_indicators:
             text += "%s%s%s" % (
                 " (head)" if self._is_real_head else "",
-                " (effective head)"
-                if self.is_head and not self._is_real_head
-                else "",
+                (
+                    " (effective head)"
+                    if self.is_head and not self._is_real_head
+                    else ""
+                ),
                 " (current)" if self._db_current_indicator else "",
             )
         if tree_indicators:
diff --git a/libs/alembic/script/revision.py b/libs/alembic/script/revision.py
index 77a802cdc..c3108e985 100644
--- a/libs/alembic/script/revision.py
+++ b/libs/alembic/script/revision.py
@@ -56,8 +56,7 @@ class _CollectRevisionsProtocol(Protocol):
         inclusive: bool,
         implicit_base: bool,
         assert_relative_length: bool,
-    ) -> Tuple[Set[Revision], Tuple[Optional[_RevisionOrBase], ...]]:
-        ...
+    ) -> Tuple[Set[Revision], Tuple[Optional[_RevisionOrBase], ...]]: ...
 
 
 class RevisionError(Exception):
@@ -720,9 +719,11 @@ class RevisionMap:
             resolved_target = target
 
         resolved_test_against_revs = [
-            self._revision_for_ident(test_against_rev)
-            if not isinstance(test_against_rev, Revision)
-            else test_against_rev
+            (
+                self._revision_for_ident(test_against_rev)
+                if not isinstance(test_against_rev, Revision)
+                else test_against_rev
+            )
             for test_against_rev in util.to_tuple(
                 test_against_revs, default=()
             )
@@ -1016,9 +1017,9 @@ class RevisionMap:
                         # each time but it was getting complicated
                         current_heads[current_candidate_idx] = heads_to_add[0]
                         current_heads.extend(heads_to_add[1:])
-                        ancestors_by_idx[
-                            current_candidate_idx
-                        ] = get_ancestors(heads_to_add[0])
+                        ancestors_by_idx[current_candidate_idx] = (
+                            get_ancestors(heads_to_add[0])
+                        )
                         ancestors_by_idx.extend(
                             get_ancestors(head) for head in heads_to_add[1:]
                         )
@@ -1183,9 +1184,13 @@ class RevisionMap:
                         branch_label = symbol
                 # Walk down the tree to find downgrade target.
                 rev = self._walk(
-                    start=self.get_revision(symbol)
-                    if branch_label is None
-                    else self.get_revision("%s@%s" % (branch_label, symbol)),
+                    start=(
+                        self.get_revision(symbol)
+                        if branch_label is None
+                        else self.get_revision(
+                            "%s@%s" % (branch_label, symbol)
+                        )
+                    ),
                     steps=rel_int,
                     no_overwalk=assert_relative_length,
                 )
@@ -1303,9 +1308,13 @@ class RevisionMap:
                 )
             return (
                 self._walk(
-                    start=self.get_revision(symbol)
-                    if branch_label is None
-                    else self.get_revision("%s@%s" % (branch_label, symbol)),
+                    start=(
+                        self.get_revision(symbol)
+                        if branch_label is None
+                        else self.get_revision(
+                            "%s@%s" % (branch_label, symbol)
+                        )
+                    ),
                     steps=relative,
                     no_overwalk=assert_relative_length,
                 ),
@@ -1694,15 +1703,13 @@ class Revision:
 
 
 @overload
-def tuple_rev_as_scalar(rev: None) -> None:
-    ...
+def tuple_rev_as_scalar(rev: None) -> None: ...
 
 
 @overload
 def tuple_rev_as_scalar(
     rev: Union[Tuple[_T, ...], List[_T]]
-) -> Union[_T, Tuple[_T, ...], List[_T]]:
-    ...
+) -> Union[_T, Tuple[_T, ...], List[_T]]: ...
 
 
 def tuple_rev_as_scalar(
diff --git a/libs/alembic/templates/async/alembic.ini.mako b/libs/alembic/templates/async/alembic.ini.mako
index 0e5f43fde..7eee91320 100644
--- a/libs/alembic/templates/async/alembic.ini.mako
+++ b/libs/alembic/templates/async/alembic.ini.mako
@@ -1,7 +1,8 @@
 # A generic, single database configuration.
 
 [alembic]
-# path to migration scripts
+# path to migration scripts.
+# Use forward slashes (/) also on windows to provide an os agnostic path
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
@@ -20,8 +21,7 @@ prepend_sys_path = .
 # leave blank for localtime
 # timezone =
 
-# max length of characters to apply to the
-# "slug" field
+# max length of characters to apply to the "slug" field
 # truncate_slug_length = 40
 
 # set to 'true' to run the environment during
@@ -47,6 +47,7 @@ prepend_sys_path = .
 # 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.
 
 # set to 'true' to search source files recursively
@@ -89,12 +90,12 @@ keys = console
 keys = generic
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
 [logger_sqlalchemy]
-level = WARN
+level = WARNING
 handlers =
 qualname = sqlalchemy.engine
 
diff --git a/libs/alembic/templates/generic/alembic.ini.mako b/libs/alembic/templates/generic/alembic.ini.mako
index 29245dd3f..f1f76cae8 100644
--- a/libs/alembic/templates/generic/alembic.ini.mako
+++ b/libs/alembic/templates/generic/alembic.ini.mako
@@ -2,6 +2,7 @@
 
 [alembic]
 # path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
@@ -22,8 +23,7 @@ prepend_sys_path = .
 # leave blank for localtime
 # timezone =
 
-# max length of characters to apply to the
-# "slug" field
+# max length of characters to apply to the "slug" field
 # truncate_slug_length = 40
 
 # set to 'true' to run the environment during
@@ -49,6 +49,7 @@ prepend_sys_path = .
 # 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.
 
 # set to 'true' to search source files recursively
@@ -91,12 +92,12 @@ keys = console
 keys = generic
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
 [logger_sqlalchemy]
-level = WARN
+level = WARNING
 handlers =
 qualname = sqlalchemy.engine
 
diff --git a/libs/alembic/templates/multidb/alembic.ini.mako b/libs/alembic/templates/multidb/alembic.ini.mako
index c7fbe4822..bf383ea1d 100644
--- a/libs/alembic/templates/multidb/alembic.ini.mako
+++ b/libs/alembic/templates/multidb/alembic.ini.mako
@@ -2,6 +2,7 @@
 
 [alembic]
 # path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
@@ -22,8 +23,7 @@ prepend_sys_path = .
 # leave blank for localtime
 # timezone =
 
-# max length of characters to apply to the
-# "slug" field
+# max length of characters to apply to the "slug" field
 # truncate_slug_length = 40
 
 # set to 'true' to run the environment during
@@ -49,6 +49,7 @@ prepend_sys_path = .
 # 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.
 
 # set to 'true' to search source files recursively
@@ -96,12 +97,12 @@ keys = console
 keys = generic
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
 [logger_sqlalchemy]
-level = WARN
+level = WARNING
 handlers =
 qualname = sqlalchemy.engine
 
diff --git a/libs/alembic/testing/assertions.py b/libs/alembic/testing/assertions.py
index ec9593b71..e071697cd 100644
--- a/libs/alembic/testing/assertions.py
+++ b/libs/alembic/testing/assertions.py
@@ -74,7 +74,9 @@ class _ErrorContainer:
 
 
 @contextlib.contextmanager
-def _expect_raises(except_cls, msg=None, check_context=False):
+def _expect_raises(
+    except_cls, msg=None, check_context=False, text_exact=False
+):
     ec = _ErrorContainer()
     if check_context:
         are_we_already_in_a_traceback = sys.exc_info()[0]
@@ -85,7 +87,10 @@ def _expect_raises(except_cls, msg=None, check_context=False):
         ec.error = err
         success = True
         if msg is not None:
-            assert re.search(msg, str(err), re.UNICODE), f"{msg} !~ {err}"
+            if text_exact:
+                assert str(err) == msg, f"{msg} != {err}"
+            else:
+                assert re.search(msg, str(err), re.UNICODE), f"{msg} !~ {err}"
         if check_context and not are_we_already_in_a_traceback:
             _assert_proper_exception_context(err)
         print(str(err).encode("utf-8"))
@@ -98,8 +103,12 @@ def expect_raises(except_cls, check_context=True):
     return _expect_raises(except_cls, check_context=check_context)
 
 
-def expect_raises_message(except_cls, msg, check_context=True):
-    return _expect_raises(except_cls, msg=msg, check_context=check_context)
+def expect_raises_message(
+    except_cls, msg, check_context=True, text_exact=False
+):
+    return _expect_raises(
+        except_cls, msg=msg, check_context=check_context, text_exact=text_exact
+    )
 
 
 def eq_ignore_whitespace(a, b, msg=None):
diff --git a/libs/alembic/testing/env.py b/libs/alembic/testing/env.py
index 5df7ef822..c37b4d303 100644
--- a/libs/alembic/testing/env.py
+++ b/libs/alembic/testing/env.py
@@ -118,7 +118,7 @@ keys = root,sqlalchemy
 keys = console
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
@@ -171,7 +171,7 @@ keys = root
 keys = console
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
@@ -216,7 +216,7 @@ keys = root
 keys = console
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
@@ -497,7 +497,7 @@ keys = root
 keys = console
 
 [logger_root]
-level = WARN
+level = WARNING
 handlers = console
 qualname =
 
diff --git a/libs/alembic/testing/fixtures.py b/libs/alembic/testing/fixtures.py
index 4b83a745f..3b5ce596e 100644
--- a/libs/alembic/testing/fixtures.py
+++ b/libs/alembic/testing/fixtures.py
@@ -49,6 +49,12 @@ class TestBase(SQLAlchemyTestBase):
             connection, opts=dict(transaction_per_migration=True)
         )
 
+    @testing.fixture
+    def as_sql_migration_context(self, connection):
+        return MigrationContext.configure(
+            connection, opts=dict(transaction_per_migration=True, as_sql=True)
+        )
+
     @testing.fixture
     def connection(self):
         with config.db.connect() as conn:
@@ -268,9 +274,11 @@ class AlterColRoundTripFixture:
                 "x",
                 column.name,
                 existing_type=column.type,
-                existing_server_default=column.server_default
-                if column.server_default is not None
-                else False,
+                existing_server_default=(
+                    column.server_default
+                    if column.server_default is not None
+                    else False
+                ),
                 existing_nullable=True if column.nullable else False,
                 # existing_comment=column.comment,
                 nullable=to_.get("nullable", None),
@@ -298,9 +306,13 @@ class AlterColRoundTripFixture:
             new_col["type"],
             new_col.get("default", None),
             compare.get("type", old_col["type"]),
-            compare["server_default"].text
-            if "server_default" in compare
-            else column.server_default.arg.text
-            if column.server_default is not None
-            else None,
+            (
+                compare["server_default"].text
+                if "server_default" in compare
+                else (
+                    column.server_default.arg.text
+                    if column.server_default is not None
+                    else None
+                )
+            ),
         )
diff --git a/libs/alembic/testing/suite/test_autogen_computed.py b/libs/alembic/testing/suite/test_autogen_computed.py
index 01a89a1fe..04a3caf07 100644
--- a/libs/alembic/testing/suite/test_autogen_computed.py
+++ b/libs/alembic/testing/suite/test_autogen_computed.py
@@ -124,6 +124,7 @@ class AutogenerateComputedTest(AutogenFixtureTest, TestBase):
         lambda: (None, None),
         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,
diff --git a/libs/alembic/testing/suite/test_environment.py b/libs/alembic/testing/suite/test_environment.py
index 8c86859ae..df2d9afbd 100644
--- a/libs/alembic/testing/suite/test_environment.py
+++ b/libs/alembic/testing/suite/test_environment.py
@@ -24,9 +24,9 @@ class MigrationTransactionTest(TestBase):
             self.context = MigrationContext.configure(
                 dialect=conn.dialect, opts=opts
             )
-            self.context.output_buffer = (
-                self.context.impl.output_buffer
-            ) = io.StringIO()
+            self.context.output_buffer = self.context.impl.output_buffer = (
+                io.StringIO()
+            )
         else:
             self.context = MigrationContext.configure(
                 connection=conn, opts=opts
diff --git a/libs/alembic/util/langhelpers.py b/libs/alembic/util/langhelpers.py
index 4a5bf09a9..80d88cbce 100644
--- a/libs/alembic/util/langhelpers.py
+++ b/libs/alembic/util/langhelpers.py
@@ -234,20 +234,17 @@ def rev_id() -> str:
 
 
 @overload
-def to_tuple(x: Any, default: Tuple[Any, ...]) -> Tuple[Any, ...]:
-    ...
+def to_tuple(x: Any, default: Tuple[Any, ...]) -> Tuple[Any, ...]: ...
 
 
 @overload
-def to_tuple(x: None, default: Optional[_T] = ...) -> _T:
-    ...
+def to_tuple(x: None, default: Optional[_T] = ...) -> _T: ...
 
 
 @overload
 def to_tuple(
     x: Any, default: Optional[Tuple[Any, ...]] = None
-) -> Tuple[Any, ...]:
-    ...
+) -> Tuple[Any, ...]: ...
 
 
 def to_tuple(
diff --git a/libs/alembic/util/messaging.py b/libs/alembic/util/messaging.py
index 5f14d5975..6618fa7fa 100644
--- a/libs/alembic/util/messaging.py
+++ b/libs/alembic/util/messaging.py
@@ -95,11 +95,17 @@ def msg(
             write_outstream(sys.stdout, "\n")
     else:
         # left indent output lines
-        lines = textwrap.wrap(msg, TERMWIDTH)
+        indent = "  "
+        lines = textwrap.wrap(
+            msg,
+            TERMWIDTH,
+            initial_indent=indent,
+            subsequent_indent=indent,
+        )
         if len(lines) > 1:
             for line in lines[0:-1]:
-                write_outstream(sys.stdout, "  ", line, "\n")
-        write_outstream(sys.stdout, "  ", lines[-1], ("\n" if newline else ""))
+                write_outstream(sys.stdout, line, "\n")
+        write_outstream(sys.stdout, lines[-1], ("\n" if newline else ""))
     if flush:
         sys.stdout.flush()
 
diff --git a/libs/alembic/util/sqla_compat.py b/libs/alembic/util/sqla_compat.py
index 8489c19fa..d4ed0fdd5 100644
--- a/libs/alembic/util/sqla_compat.py
+++ b/libs/alembic/util/sqla_compat.py
@@ -59,8 +59,7 @@ _CE = TypeVar("_CE", bound=Union["ColumnElement[Any]", "SchemaItem"])
 
 
 class _CompilerProtocol(Protocol):
-    def __call__(self, element: Any, compiler: Any, **kw: Any) -> str:
-        ...
+    def __call__(self, element: Any, compiler: Any, **kw: Any) -> str: ...
 
 
 def _safe_int(value: str) -> Union[int, str]:
@@ -95,8 +94,7 @@ if TYPE_CHECKING:
 
     def compiles(
         element: Type[ClauseElement], *dialects: str
-    ) -> Callable[[_CompilerProtocol], _CompilerProtocol]:
-        ...
+    ) -> Callable[[_CompilerProtocol], _CompilerProtocol]: ...
 
 else:
     from sqlalchemy.ext.compiler import compiles
@@ -529,7 +527,7 @@ class _textual_index_element(sql.ColumnElement):
         self.fake_column = schema.Column(self.text.text, sqltypes.NULLTYPE)
         table.append_column(self.fake_column)
 
-    def get_children(self):
+    def get_children(self, **kw):
         return [self.fake_column]
 
 
diff --git a/libs/aniso8601-9.0.1.dist-info/INSTALLER b/libs/aniso8601-10.0.0.dist-info/INSTALLER
similarity index 100%
rename from libs/aniso8601-9.0.1.dist-info/INSTALLER
rename to libs/aniso8601-10.0.0.dist-info/INSTALLER
diff --git a/libs/aniso8601-9.0.1.dist-info/LICENSE b/libs/aniso8601-10.0.0.dist-info/LICENSE
similarity index 97%
rename from libs/aniso8601-9.0.1.dist-info/LICENSE
rename to libs/aniso8601-10.0.0.dist-info/LICENSE
index 40b077445..a065b6e50 100644
--- a/libs/aniso8601-9.0.1.dist-info/LICENSE
+++ b/libs/aniso8601-10.0.0.dist-info/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2021, Brandon Nielsen
+Copyright (c) 2025, Brandon Nielsen
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/libs/aniso8601-9.0.1.dist-info/METADATA b/libs/aniso8601-10.0.0.dist-info/METADATA
similarity index 98%
rename from libs/aniso8601-9.0.1.dist-info/METADATA
rename to libs/aniso8601-10.0.0.dist-info/METADATA
index a926a412b..01ae66972 100644
--- a/libs/aniso8601-9.0.1.dist-info/METADATA
+++ b/libs/aniso8601-10.0.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aniso8601
-Version: 9.0.1
+Version: 10.0.0
 Summary: A library for parsing ISO 8601 strings.
 Home-page: https://bitbucket.org/nielsenb/aniso8601
 Author: Brandon Nielsen
@@ -17,12 +17,11 @@ 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.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
 Description-Content-Type: text/x-rst
 License-File: LICENSE
diff --git a/libs/aniso8601-10.0.0.dist-info/RECORD b/libs/aniso8601-10.0.0.dist-info/RECORD
new file mode 100644
index 000000000..0133ce0c2
--- /dev/null
+++ b/libs/aniso8601-10.0.0.dist-info/RECORD
@@ -0,0 +1,34 @@
+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-9.0.1.dist-info/REQUESTED b/libs/aniso8601-10.0.0.dist-info/REQUESTED
similarity index 100%
rename from libs/aniso8601-9.0.1.dist-info/REQUESTED
rename to libs/aniso8601-10.0.0.dist-info/REQUESTED
diff --git a/libs/aniso8601-9.0.1.dist-info/WHEEL b/libs/aniso8601-10.0.0.dist-info/WHEEL
similarity index 100%
rename from libs/aniso8601-9.0.1.dist-info/WHEEL
rename to libs/aniso8601-10.0.0.dist-info/WHEEL
diff --git a/libs/aniso8601-9.0.1.dist-info/top_level.txt b/libs/aniso8601-10.0.0.dist-info/top_level.txt
similarity index 100%
rename from libs/aniso8601-9.0.1.dist-info/top_level.txt
rename to libs/aniso8601-10.0.0.dist-info/top_level.txt
diff --git a/libs/aniso8601-9.0.1.dist-info/RECORD b/libs/aniso8601-9.0.1.dist-info/RECORD
deleted file mode 100644
index 7a3fac144..000000000
--- a/libs/aniso8601-9.0.1.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-aniso8601-9.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-aniso8601-9.0.1.dist-info/LICENSE,sha256=Z_-MGC_A4Nc1cViNi8B5tOSmJKknTE4mqSPeIxDTvSk,1501
-aniso8601-9.0.1.dist-info/METADATA,sha256=2Esk-53vD4ruSRkC_RMTnKscxUh9nWSEj9MeS6lTlDU,23416
-aniso8601-9.0.1.dist-info/RECORD,,
-aniso8601-9.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aniso8601-9.0.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-aniso8601-9.0.1.dist-info/top_level.txt,sha256=MVQomyeED8nGIH7PUQdMzxgLppIB48oYHtcmL17ETB0,10
-aniso8601/__init__.py,sha256=tHN7Nq-3I79PLzKkBuWun_UKgolnDrn7ISO8s1HlMdo,704
-aniso8601/builders/__init__.py,sha256=sJanTP5Lo0lRxpLa5VKVBS9u6ZP8R1VRgozx5uSUMUU,17958
-aniso8601/builders/python.py,sha256=I0RhPY2syncaMwYRVJxM6ct-O_5MHnNFY3dcF6wvy0Y,22122
-aniso8601/builders/tests/__init__.py,sha256=XWM00Wzg9EZkSKyy3IW18Z8TiXfCbJS-XJNFVuylvuU,209
-aniso8601/builders/tests/test_init.py,sha256=wnDhjyb5iBt9l_zTXT96uqXus-igSqn5Kn_rqX_NSHA,29997
-aniso8601/builders/tests/test_python.py,sha256=pNr3lwfBKVSUQKc5BPmwCiCTpP_063WpOM-canDz4J8,61593
-aniso8601/compat.py,sha256=2exJsHW2DAxt_D2_mGj5mv0HCSMFeAAkPyFAM-ZFrA0,571
-aniso8601/date.py,sha256=IDn_kqeZshllwr4pICUNZhjbqSVVlYTyHmBOgp2MlNE,4475
-aniso8601/decimalfraction.py,sha256=EtwqSZJTtsQlu05m2guolhii5N1yN4dVv0v1zCZhiyk,333
-aniso8601/duration.py,sha256=6AAl9A-WM2Io898peIz9xbwOvxcLc6WYGUdkYuQlTU8,9583
-aniso8601/exceptions.py,sha256=-zrdcKocZhzhl71HhgVKXWF481XDWO3UhinbcycCzPU,1313
-aniso8601/interval.py,sha256=7e5wICHdF2gTeFluPxBrzaA4-_5b78QzXC62DSnNzlM,10763
-aniso8601/resolution.py,sha256=ee7GxL865D0dJL70TsXScz4Kzo_dwMORNvfuyCXdsgI,684
-aniso8601/tests/__init__.py,sha256=XWM00Wzg9EZkSKyy3IW18Z8TiXfCbJS-XJNFVuylvuU,209
-aniso8601/tests/compat.py,sha256=9HJqKvl0PIFBjePUgT-1eMGkA9tlESX0wNDkPvV7GOk,346
-aniso8601/tests/test_compat.py,sha256=2oFOFLKTfOJIMbLjkeVhrkxSDMjE0wM-NB86SJ6st5g,763
-aniso8601/tests/test_date.py,sha256=3AWmIHTS2sxm9_ZUYcI2w9ALJOYnHkkYEwlD1VW90iQ,8960
-aniso8601/tests/test_decimalfraction.py,sha256=T4R_SY24DW30YuQkyofxvAmngTuXtsmwd77pF25QAlc,578
-aniso8601/tests/test_duration.py,sha256=ZqUxodLrDBZ1GZWutFXjktAFHYS1hidxLclIGZP7aSA,44952
-aniso8601/tests/test_init.py,sha256=GazCeGTv-OFocCx9Cck04b-c1cWiiRnqhGwoGgm4Y1Q,1689
-aniso8601/tests/test_interval.py,sha256=lTg-E1vW1xmgwiWfHHwJDJ25AogSR-1p-0L4O2gQKQw,60457
-aniso8601/tests/test_time.py,sha256=HLutGVdg2_HHU51U2eEEZ9UNwljrQBPU_PtX8JrdVV0,19147
-aniso8601/tests/test_timezone.py,sha256=Shw7-fcUJZAbH7diCx37iXZ4VZEH45lqIgMJvoQQhtQ,4649
-aniso8601/tests/test_utcoffset.py,sha256=fRNuiz3WPMrHtrdMGK3HOuZRYd68hR-VNldbwVG-cDA,1926
-aniso8601/time.py,sha256=9IRsCERfEl_SnBBUIOR8E43XFD7Y2EqhowjiCcfinb0,5688
-aniso8601/timezone.py,sha256=5_LRd_pYd08i2hmXsn_1tTUxKOI4caSvxci-VByHCWU,2134
-aniso8601/utcoffset.py,sha256=8Gh8WNk_q9ELLEFZLMPbMESH-yqcoNFjul7VcpHq_1Q,2423
diff --git a/libs/aniso8601/__init__.py b/libs/aniso8601/__init__.py
index 033d30b9d..c85d218b3 100644
--- a/libs/aniso8601/__init__.py
+++ b/libs/aniso8601/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -23,4 +23,4 @@ from aniso8601.time import (
     parse_time,
 )
 
-__version__ = "9.0.1"
+__version__ = "10.0.0"
diff --git a/libs/aniso8601/builders/__init__.py b/libs/aniso8601/builders/__init__.py
index 834c72a6b..280a00e66 100644
--- a/libs/aniso8601/builders/__init__.py
+++ b/libs/aniso8601/builders/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -137,7 +137,7 @@ class BaseTimeBuilder(object):
         0,
         24,
         HoursOutOfBoundsError,
-        "Hour must be between 0..24 with " "24 representing midnight.",
+        "Hour must be between 0..24 with 24 representing midnight.",
         range_check,
     )
     TIME_MM_LIMIT = Limit(
@@ -153,7 +153,7 @@ class BaseTimeBuilder(object):
         0,
         60,
         SecondsOutOfBoundsError,
-        "Second must be between 0..60 with " "60 representing a leap second.",
+        "Second must be between 0..60 with 60 representing a leap second.",
         range_check,
     )
     TZ_HH_LIMIT = Limit(
@@ -453,7 +453,7 @@ class BaseTimeBuilder(object):
     @classmethod
     def _build_object(cls, parsetuple):
         # Given a TupleBuilder tuple, build the correct object
-        if type(parsetuple) is DateTuple:
+        if isinstance(parsetuple, DateTuple):
             return cls.build_date(
                 YYYY=parsetuple.YYYY,
                 MM=parsetuple.MM,
@@ -463,15 +463,15 @@ class BaseTimeBuilder(object):
                 DDD=parsetuple.DDD,
             )
 
-        if type(parsetuple) is TimeTuple:
+        if isinstance(parsetuple, TimeTuple):
             return cls.build_time(
                 hh=parsetuple.hh, mm=parsetuple.mm, ss=parsetuple.ss, tz=parsetuple.tz
             )
 
-        if type(parsetuple) is DatetimeTuple:
+        if isinstance(parsetuple, DatetimeTuple):
             return cls.build_datetime(parsetuple.date, parsetuple.time)
 
-        if type(parsetuple) is DurationTuple:
+        if isinstance(parsetuple, DurationTuple):
             return cls.build_duration(
                 PnY=parsetuple.PnY,
                 PnM=parsetuple.PnM,
@@ -482,12 +482,12 @@ class BaseTimeBuilder(object):
                 TnS=parsetuple.TnS,
             )
 
-        if type(parsetuple) is IntervalTuple:
+        if isinstance(parsetuple, IntervalTuple):
             return cls.build_interval(
                 start=parsetuple.start, end=parsetuple.end, duration=parsetuple.duration
             )
 
-        if type(parsetuple) is RepeatingIntervalTuple:
+        if isinstance(parsetuple, RepeatingIntervalTuple):
             return cls.build_repeating_interval(
                 R=parsetuple.R, Rnn=parsetuple.Rnn, interval=parsetuple.interval
             )
@@ -502,10 +502,10 @@ class BaseTimeBuilder(object):
 
     @classmethod
     def _is_interval_end_concise(cls, endtuple):
-        if type(endtuple) is TimeTuple:
+        if isinstance(endtuple, TimeTuple):
             return True
 
-        if type(endtuple) is DatetimeTuple:
+        if isinstance(endtuple, DatetimeTuple):
             enddatetuple = endtuple.date
         else:
             enddatetuple = endtuple
@@ -523,16 +523,16 @@ class BaseTimeBuilder(object):
         endtimetuple = None
         enddatetuple = None
 
-        if type(starttuple) is DateTuple:
+        if isinstance(starttuple, DateTuple):
             startdatetuple = starttuple
         else:
             # Start is a datetime
             starttimetuple = starttuple.time
             startdatetuple = starttuple.date
 
-        if type(conciseendtuple) is DateTuple:
+        if isinstance(conciseendtuple, DateTuple):
             enddatetuple = conciseendtuple
-        elif type(conciseendtuple) is DatetimeTuple:
+        elif isinstance(conciseendtuple, DatetimeTuple):
             enddatetuple = conciseendtuple.date
             endtimetuple = conciseendtuple.time
         else:
@@ -559,6 +559,9 @@ class BaseTimeBuilder(object):
                     DDD=enddatetuple.DDD,
                 )
 
+            if endtimetuple is None:
+                return newenddatetuple
+
         if (starttimetuple is not None and starttimetuple.tz is not None) and (
             endtimetuple is not None and endtimetuple.tz != starttimetuple.tz
         ):
@@ -570,9 +573,6 @@ class BaseTimeBuilder(object):
                 tz=starttimetuple.tz,
             )
 
-        if enddatetuple is not None and endtimetuple is None:
-            return newenddatetuple
-
         if enddatetuple is not None and endtimetuple is not None:
             return TupleBuilder.build_datetime(newenddatetuple, endtimetuple)
 
diff --git a/libs/aniso8601/builders/python.py b/libs/aniso8601/builders/python.py
index 8956740e7..b60382e1b 100644
--- a/libs/aniso8601/builders/python.py
+++ b/libs/aniso8601/builders/python.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -12,10 +12,8 @@ from functools import partial
 
 from aniso8601.builders import (
     BaseTimeBuilder,
-    DatetimeTuple,
     DateTuple,
     Limit,
-    TimeTuple,
     TupleBuilder,
     cast,
     range_check,
@@ -23,9 +21,6 @@ from aniso8601.builders import (
 from aniso8601.exceptions import (
     DayOutOfBoundsError,
     HoursOutOfBoundsError,
-    ISOFormatError,
-    LeapSecondError,
-    MidnightBoundsError,
     MinutesOutOfBoundsError,
     MonthOutOfBoundsError,
     SecondsOutOfBoundsError,
@@ -85,7 +80,7 @@ def fractional_range_check(conversion, valuestr, limit):
 
     value = cast(valuestr, castfunc, thrownmessage=limit.casterrorstring)
 
-    if type(value) is FractionalComponent:
+    if isinstance(value, FractionalComponent):
         tocheck = float(valuestr)
     else:
         tocheck = int(valuestr)
@@ -128,7 +123,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
         0,
         24,
         HoursOutOfBoundsError,
-        "Hour must be between 0..24 with " "24 representing midnight.",
+        "Hour must be between 0..24 with 24 representing midnight.",
         partial(fractional_range_check, MICROSECONDS_PER_HOUR),
     )
     TIME_MM_LIMIT = Limit(
@@ -144,7 +139,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
         0,
         60,
         SecondsOutOfBoundsError,
-        "Second must be between 0..60 with " "60 representing a leap second.",
+        "Second must be between 0..60 with 60 representing a leap second.",
         partial(fractional_range_check, MICROSECONDS_PER_SECOND),
     )
     DURATION_PNY_LIMIT = Limit(
@@ -248,19 +243,19 @@ class PythonTimeBuilder(BaseTimeBuilder):
 
         hh, mm, ss, tz = cls.range_check_time(hh, mm, ss, tz)
 
-        if type(hh) is FractionalComponent:
+        if isinstance(hh, FractionalComponent):
             hours = hh.principal
             microseconds = hh.microsecondremainder
         elif hh is not None:
             hours = hh
 
-        if type(mm) is FractionalComponent:
+        if isinstance(mm, FractionalComponent):
             minutes = mm.principal
             microseconds = mm.microsecondremainder
         elif mm is not None:
             minutes = mm
 
-        if type(ss) is FractionalComponent:
+        if isinstance(ss, FractionalComponent):
             seconds = ss.principal
             microseconds = ss.microsecondremainder
         elif ss is not None:
@@ -349,7 +344,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
             endobject = cls._build_object(end)
 
             # Range check
-            if type(end) is DateTuple and datetimerequired is True:
+            if isinstance(end, DateTuple) and datetimerequired is True:
                 # <end> is a date, and <duration> requires datetime resolution
                 return (
                     endobject,
@@ -362,7 +357,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
         startobject = cls._build_object(start)
 
         # Range check
-        if type(start) is DateTuple and datetimerequired is True:
+        if isinstance(start, DateTuple) and datetimerequired is True:
             # <start> is a date, and <duration> requires datetime resolution
             return (
                 startobject,
@@ -448,7 +443,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
         )
 
         if PnY is not None:
-            if type(PnY) is FractionalComponent:
+            if isinstance(PnY, FractionalComponent):
                 years = PnY.principal
                 microseconds = PnY.microsecondremainder
             else:
@@ -458,7 +453,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 raise YearOutOfBoundsError("Duration exceeds maximum timedelta size.")
 
         if PnM is not None:
-            if type(PnM) is FractionalComponent:
+            if isinstance(PnM, FractionalComponent):
                 months = PnM.principal
                 microseconds = PnM.microsecondremainder
             else:
@@ -468,7 +463,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 raise MonthOutOfBoundsError("Duration exceeds maximum timedelta size.")
 
         if PnW is not None:
-            if type(PnW) is FractionalComponent:
+            if isinstance(PnW, FractionalComponent):
                 weeks = PnW.principal
                 microseconds = PnW.microsecondremainder
             else:
@@ -478,7 +473,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 raise WeekOutOfBoundsError("Duration exceeds maximum timedelta size.")
 
         if PnD is not None:
-            if type(PnD) is FractionalComponent:
+            if isinstance(PnD, FractionalComponent):
                 days = PnD.principal
                 microseconds = PnD.microsecondremainder
             else:
@@ -488,7 +483,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 raise DayOutOfBoundsError("Duration exceeds maximum timedelta size.")
 
         if TnH is not None:
-            if type(TnH) is FractionalComponent:
+            if isinstance(TnH, FractionalComponent):
                 hours = TnH.principal
                 microseconds = TnH.microsecondremainder
             else:
@@ -498,7 +493,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 raise HoursOutOfBoundsError("Duration exceeds maximum timedelta size.")
 
         if TnM is not None:
-            if type(TnM) is FractionalComponent:
+            if isinstance(TnM, FractionalComponent):
                 minutes = TnM.principal
                 microseconds = TnM.microsecondremainder
             else:
@@ -510,7 +505,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
                 )
 
         if TnS is not None:
-            if type(TnS) is FractionalComponent:
+            if isinstance(TnS, FractionalComponent):
                 seconds = TnS.principal
                 microseconds = TnS.microsecondremainder
             else:
@@ -586,7 +581,7 @@ class PythonTimeBuilder(BaseTimeBuilder):
             endobject = cls._build_object(end)
 
             # Range check
-            if type(end) is DateTuple:
+            if isinstance(end, DateTuple):
                 enddatetime = cls.build_datetime(end, TupleBuilder.build_time())
 
                 if enddatetime - datetime.datetime.min < durationobject:
diff --git a/libs/aniso8601/builders/tests/__init__.py b/libs/aniso8601/builders/tests/__init__.py
index 1a94e017a..5cfededc9 100644
--- a/libs/aniso8601/builders/tests/__init__.py
+++ b/libs/aniso8601/builders/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/builders/tests/test_init.py b/libs/aniso8601/builders/tests/test_init.py
index 7c9f092c7..0a6ed1aa5 100644
--- a/libs/aniso8601/builders/tests/test_init.py
+++ b/libs/aniso8601/builders/tests/test_init.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/builders/tests/test_python.py b/libs/aniso8601/builders/tests/test_python.py
index 11111a163..ccbed27d1 100644
--- a/libs/aniso8601/builders/tests/test_python.py
+++ b/libs/aniso8601/builders/tests/test_python.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -52,7 +52,9 @@ class TestPythonTimeBuilder_UtiltyFunctions(unittest.TestCase):
             None,
         )
 
-        self.assertEqual(year_range_check("1", yearlimit), 1000)
+        self.assertEqual(year_range_check("19", yearlimit), 1900)
+        self.assertEqual(year_range_check("1234", yearlimit), 1234)
+        self.assertEqual(year_range_check("1985", yearlimit), 1985)
 
     def test_fractional_range_check(self):
         limit = Limit(
@@ -117,7 +119,7 @@ class TestPythonTimeBuilder(unittest.TestCase):
             ),
             (
                 {
-                    "YYYY": "1900",
+                    "YYYY": "19",
                     "MM": None,
                     "DD": None,
                     "Www": None,
@@ -126,6 +128,17 @@ class TestPythonTimeBuilder(unittest.TestCase):
                 },
                 datetime.date(1900, 1, 1),
             ),
+            (
+                {
+                    "YYYY": "10",
+                    "MM": None,
+                    "DD": None,
+                    "Www": None,
+                    "D": None,
+                    "DDD": None,
+                },
+                datetime.date(1000, 1, 1),
+            ),
             (
                 {
                     "YYYY": "1981",
diff --git a/libs/aniso8601/compat.py b/libs/aniso8601/compat.py
index 25af5794a..00cd3f9bb 100644
--- a/libs/aniso8601/compat.py
+++ b/libs/aniso8601/compat.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/date.py b/libs/aniso8601/date.py
index ea0cf9c59..42128483c 100644
--- a/libs/aniso8601/date.py
+++ b/libs/aniso8601/date.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -60,7 +60,8 @@ def parse_date(isodatestr, builder=PythonTimeBuilder):
     # Given a string in any ISO 8601 date format, return a datetime.date
     # object that corresponds to the given date. Valid string formats are:
     #
-    # Y[YYY]
+    # YY
+    # YYYY
     # YYYY-MM-DD
     # YYYYMMDD
     # YYYY-MM
@@ -75,11 +76,12 @@ def parse_date(isodatestr, builder=PythonTimeBuilder):
 
     if isodatestr.startswith("+") or isodatestr.startswith("-"):
         raise NotImplementedError(
-            "ISO 8601 extended year representation " "not supported."
+            "ISO 8601 extended year representation not supported."
         )
 
     if len(isodatestr) == 0 or isodatestr.count("-") > 2:
         raise ISOFormatError('"{0}" is not a valid ISO 8601 date.'.format(isodatestr))
+
     yearstr = None
     monthstr = None
     daystr = None
@@ -87,8 +89,9 @@ def parse_date(isodatestr, builder=PythonTimeBuilder):
     weekdaystr = None
     ordinaldaystr = None
 
-    if len(isodatestr) <= 4:
-        # Y[YYY]
+    if len(isodatestr) in (2, 4):
+        # YY
+        # YYYY
         yearstr = isodatestr
     elif "W" in isodatestr:
         if len(isodatestr) == 10:
diff --git a/libs/aniso8601/decimalfraction.py b/libs/aniso8601/decimalfraction.py
index 3086ee794..204d8a3fa 100644
--- a/libs/aniso8601/decimalfraction.py
+++ b/libs/aniso8601/decimalfraction.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/duration.py b/libs/aniso8601/duration.py
index cdc0f8f7f..8509dcefc 100644
--- a/libs/aniso8601/duration.py
+++ b/libs/aniso8601/duration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -85,14 +85,14 @@ def _parse_duration_prescribed(isodurationstr):
     # Make sure the end character is valid
     # https://bitbucket.org/nielsenb/aniso8601/issues/9/durations-with-trailing-garbage-are-parsed
     if isodurationstr[-1] not in ["Y", "M", "D", "H", "S", "W"]:
-        raise ISOFormatError("ISO 8601 duration must end with a valid " "character.")
+        raise ISOFormatError("ISO 8601 duration must end with a valid character.")
 
     # Make sure only the lowest order element has decimal precision
     durationstr = normalize(isodurationstr)
 
     if durationstr.count(".") > 1:
         raise ISOFormatError(
-            "ISO 8601 allows only lowest order element to " "have a decimal fraction."
+            "ISO 8601 allows only lowest order element to have a decimal fraction."
         )
 
     seperatoridx = durationstr.find(".")
@@ -104,7 +104,7 @@ def _parse_duration_prescribed(isodurationstr):
         # then one, the string is invalid
         if remaining.isdigit() is False:
             raise ISOFormatError(
-                "ISO 8601 duration must end with " "a single valid character."
+                "ISO 8601 duration must end with a single valid character."
             )
 
     # Do not allow W in combination with other designators
@@ -169,7 +169,7 @@ def _parse_duration_prescribed_notime(isodurationstr):
     for componentstr in [yearstr, monthstr, daystr, weekstr]:
         if componentstr is not None:
             if "." in componentstr:
-                intstr, fractionalstr = componentstr.split(".", 1)
+                intstr = componentstr.split(".", 1)[0]
 
                 if intstr.isdigit() is False:
                     raise ISOFormatError(
@@ -227,7 +227,7 @@ def _parse_duration_prescribed_time(isodurationstr):
     for componentstr in [hourstr, minutestr, secondstr]:
         if componentstr is not None:
             if "." in componentstr:
-                intstr, fractionalstr = componentstr.split(".", 1)
+                intstr = componentstr.split(".", 1)[0]
 
                 if intstr.isdigit() is False:
                     raise ISOFormatError(
diff --git a/libs/aniso8601/exceptions.py b/libs/aniso8601/exceptions.py
index c14b44421..0e94dc6bd 100644
--- a/libs/aniso8601/exceptions.py
+++ b/libs/aniso8601/exceptions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/interval.py b/libs/aniso8601/interval.py
index cd0184c6b..ee9bd5f3e 100644
--- a/libs/aniso8601/interval.py
+++ b/libs/aniso8601/interval.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -62,7 +62,7 @@ def _get_interval_resolution(intervaltuple):
 
 
 def _get_interval_component_resolution(componenttuple):
-    if type(componenttuple) is DateTuple:
+    if isinstance(componenttuple, DateTuple):
         if componenttuple.DDD is not None:
             # YYYY-DDD
             # YYYYDDD
@@ -89,7 +89,8 @@ def _get_interval_component_resolution(componenttuple):
 
         # Y[YYY]
         return IntervalResolution.Year
-    elif type(componenttuple) is DatetimeTuple:
+
+    if isinstance(componenttuple, DatetimeTuple):
         # Datetime
         if componenttuple.time.ss is not None:
             return IntervalResolution.Seconds
@@ -193,7 +194,7 @@ def parse_repeating_interval(
         raise ISOFormatError("Repeating interval string is empty.")
 
     if isointervalstr[0] != "R":
-        raise ISOFormatError("ISO 8601 repeating interval must start " "with an R.")
+        raise ISOFormatError("ISO 8601 repeating interval must start with an R.")
 
     if intervaldelimiter not in isointervalstr:
         raise ISOFormatError(
@@ -249,7 +250,8 @@ def _parse_interval(
             endtuple = parse_date(secondpart, builder=TupleBuilder)
 
         return builder.build_interval(end=endtuple, duration=duration)
-    elif secondpart[0] == "P":
+
+    if secondpart[0] == "P":
         # <start>/<duration>
         # We need to figure out if <start> is a date, or a datetime
         duration = parse_duration(secondpart, builder=TupleBuilder)
@@ -288,7 +290,7 @@ def _parse_interval_end(endstr, starttuple, datetimedelimiter):
 
     concise = False
 
-    if type(starttuple) is DateTuple:
+    if isinstance(starttuple, DateTuple):
         startdatetuple = starttuple
     else:
         # Start is a datetime
@@ -304,9 +306,9 @@ def _parse_interval_end(endstr, starttuple, datetimedelimiter):
     if timestr is not None:
         endtimetuple = parse_time(timestr, builder=TupleBuilder)
 
-    # End is just a time
-    if datestr is None:
-        return endtimetuple
+        # End is just a time
+        if datestr is None:
+            return endtimetuple
 
     # Handle backwards concise representation
     if datestr.count("-") == 1:
@@ -326,7 +328,7 @@ def _parse_interval_end(endstr, starttuple, datetimedelimiter):
         # Separators required because concise elements may be missing digits
         if monthstr is not None:
             concisedatestr += "-" + monthstr
-        elif startdatetuple.MM is not None:
+        else:
             concisedatestr += "-" + startdatetuple.MM
 
         concisedatestr += "-" + daystr
diff --git a/libs/aniso8601/resolution.py b/libs/aniso8601/resolution.py
index eca2d4e7e..e7c617bac 100644
--- a/libs/aniso8601/resolution.py
+++ b/libs/aniso8601/resolution.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/__init__.py b/libs/aniso8601/tests/__init__.py
index 1a94e017a..5cfededc9 100644
--- a/libs/aniso8601/tests/__init__.py
+++ b/libs/aniso8601/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/compat.py b/libs/aniso8601/tests/compat.py
index 6c5266589..f693bf97f 100644
--- a/libs/aniso8601/tests/compat.py
+++ b/libs/aniso8601/tests/compat.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_compat.py b/libs/aniso8601/tests/test_compat.py
index 2f7988331..927af1244 100644
--- a/libs/aniso8601/tests/test_compat.py
+++ b/libs/aniso8601/tests/test_compat.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_date.py b/libs/aniso8601/tests/test_date.py
index 54e3076eb..d4c5b518e 100644
--- a/libs/aniso8601/tests/test_date.py
+++ b/libs/aniso8601/tests/test_date.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -122,6 +122,17 @@ class TestDateParserFunctions(unittest.TestCase):
                     "DDD": None,
                 },
             ),
+            (
+                "10",
+                {
+                    "YYYY": "10",
+                    "MM": None,
+                    "DD": None,
+                    "Www": None,
+                    "D": None,
+                    "DDD": None,
+                },
+            ),
             (
                 "1981-04-05",
                 {
@@ -265,7 +276,8 @@ class TestDateParserFunctions(unittest.TestCase):
 
     def test_parse_date_badstr(self):
         testtuples = (
-            "W53",
+            "1",
+            "123" "W53",
             "2004-W",
             "2014-01-230",
             "2014-012-23",
diff --git a/libs/aniso8601/tests/test_decimalfraction.py b/libs/aniso8601/tests/test_decimalfraction.py
index dc52f2406..feb757407 100644
--- a/libs/aniso8601/tests/test_decimalfraction.py
+++ b/libs/aniso8601/tests/test_decimalfraction.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_duration.py b/libs/aniso8601/tests/test_duration.py
index 0d7d40a4d..e6338d78a 100644
--- a/libs/aniso8601/tests/test_duration.py
+++ b/libs/aniso8601/tests/test_duration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_init.py b/libs/aniso8601/tests/test_init.py
index d5604c6b9..b4dd61249 100644
--- a/libs/aniso8601/tests/test_init.py
+++ b/libs/aniso8601/tests/test_init.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_interval.py b/libs/aniso8601/tests/test_interval.py
index f01d15112..91e7cae5c 100644
--- a/libs/aniso8601/tests/test_interval.py
+++ b/libs/aniso8601/tests/test_interval.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_time.py b/libs/aniso8601/tests/test_time.py
index dcee5e03f..df7a8100b 100644
--- a/libs/aniso8601/tests/test_time.py
+++ b/libs/aniso8601/tests/test_time.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_timezone.py b/libs/aniso8601/tests/test_timezone.py
index 5df9671f1..c761869c6 100644
--- a/libs/aniso8601/tests/test_timezone.py
+++ b/libs/aniso8601/tests/test_timezone.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/tests/test_utcoffset.py b/libs/aniso8601/tests/test_utcoffset.py
index 11fa4f7d9..9b05c6fae 100644
--- a/libs/aniso8601/tests/test_utcoffset.py
+++ b/libs/aniso8601/tests/test_utcoffset.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
diff --git a/libs/aniso8601/time.py b/libs/aniso8601/time.py
index 31fab048e..1d782ca36 100644
--- a/libs/aniso8601/time.py
+++ b/libs/aniso8601/time.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -54,7 +54,7 @@ def get_time_resolution(isotimestr):
 def get_datetime_resolution(isodatetimestr, delimiter="T"):
     # <date>T<time>
     #
-    # Time part cannot be omittted so return time resolution
+    # Time part cannot be omitted so return time resolution
     isotimetuple = parse_datetime(
         isodatetimestr, delimiter=delimiter, builder=TupleBuilder
     ).time
diff --git a/libs/aniso8601/timezone.py b/libs/aniso8601/timezone.py
index 3b66105bd..3442f2bac 100644
--- a/libs/aniso8601/timezone.py
+++ b/libs/aniso8601/timezone.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -18,27 +18,28 @@ def parse_timezone(tzstr, builder=PythonTimeBuilder):
 
     if len(tzstr) == 1 and tzstr[0] == "Z":
         return builder.build_timezone(negative=False, Z=True, name=tzstr)
-    elif len(tzstr) == 6:
+
+    if len(tzstr) == 6:
         # ±hh:mm
         hourstr = tzstr[1:3]
         minutestr = tzstr[4:6]
 
         if tzstr[0] == "-" and hourstr == "00" and minutestr == "00":
-            raise ISOFormatError("Negative ISO 8601 time offset must not " "be 0.")
+            raise ISOFormatError("Negative ISO 8601 time offset must not be 0.")
     elif len(tzstr) == 5:
         # ±hhmm
         hourstr = tzstr[1:3]
         minutestr = tzstr[3:5]
 
         if tzstr[0] == "-" and hourstr == "00" and minutestr == "00":
-            raise ISOFormatError("Negative ISO 8601 time offset must not " "be 0.")
+            raise ISOFormatError("Negative ISO 8601 time offset must not be 0.")
     elif len(tzstr) == 3:
         # ±hh
         hourstr = tzstr[1:3]
         minutestr = None
 
         if tzstr[0] == "-" and hourstr == "00":
-            raise ISOFormatError("Negative ISO 8601 time offset must not " "be 0.")
+            raise ISOFormatError("Negative ISO 8601 time offset must not be 0.")
     else:
         raise ISOFormatError('"{0}" is not a valid ISO 8601 time offset.'.format(tzstr))
 
diff --git a/libs/aniso8601/utcoffset.py b/libs/aniso8601/utcoffset.py
index 11872a01e..97f12edd9 100644
--- a/libs/aniso8601/utcoffset.py
+++ b/libs/aniso8601/utcoffset.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021, Brandon Nielsen
+# Copyright (c) 2025, Brandon Nielsen
 # All rights reserved.
 #
 # This software may be modified and distributed under the terms
@@ -51,7 +51,7 @@ class UTCOffset(datetime.tzinfo):
 
         if correcteddays == 0:
             return "-{0}:{1:02}:{2:02} UTC".format(hours, minutes, seconds)
-        elif correcteddays == 1:
+        if correcteddays == 1:
             return "-1 day, {0}:{1:02}:{2:02} UTC".format(hours, minutes, seconds)
 
         return "-{0} days, {1}:{2:02}:{3:02} UTC".format(
diff --git a/libs/apprise-1.7.6.dist-info/RECORD b/libs/apprise-1.7.6.dist-info/RECORD
deleted file mode 100644
index 250648105..000000000
--- a/libs/apprise-1.7.6.dist-info/RECORD
+++ /dev/null
@@ -1,183 +0,0 @@
-../../bin/apprise,sha256=ZJ-e4qqxNLtdW_DAvpuPPX5iROIiQd8I6nvg7vtAv-g,233
-apprise-1.7.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-apprise-1.7.6.dist-info/LICENSE,sha256=gt7qKBxRhVcdmXCYVtrWP6DtYjD0DzONet600dkU994,1343
-apprise-1.7.6.dist-info/METADATA,sha256=z_gaX2IdNJqw4T9q7AYQri9jcIs-OTGCo3t2EgEY-mw,44823
-apprise-1.7.6.dist-info/RECORD,,
-apprise-1.7.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise-1.7.6.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-apprise-1.7.6.dist-info/entry_points.txt,sha256=71YypBuNdjAKiaLsiMG40HEfLHxkU4Mi7o_S0s0d8wI,45
-apprise-1.7.6.dist-info/top_level.txt,sha256=JrCRn-_rXw5LMKXkIgMSE4E0t1Ks9TYrBH54Pflwjkk,8
-apprise/Apprise.py,sha256=Stm2NhJprWRaMwQfTiIQG_nR1bLpHi_zcdwEcsCpa-A,32865
-apprise/Apprise.pyi,sha256=_4TBKvT-QVj3s6PuTh3YX-BbQMeJTdBGdVpubLMY4_k,2203
-apprise/AppriseAsset.py,sha256=jRW8Y1EcAvjVA9h_mINmsjO4DM3S0aDl6INIFVMcUCs,11647
-apprise/AppriseAsset.pyi,sha256=NYLXXYbScgRkspP27XGpRRM_uliPu1OCdWdZBPPvLng,979
-apprise/AppriseAttachment.py,sha256=vhrktSrp8GLr32aK4KqV6BX83IpI1lxZe-pGo1wiSFM,12540
-apprise/AppriseAttachment.pyi,sha256=R9-0dVqWpeaFrVpcREwPhGy3qHWztG5jEjYIOsbE5dM,1145
-apprise/AppriseConfig.py,sha256=wfuR6Mb3ZLHvjvqWdFp9lVmjjDRWs65unY9qa92RkCg,16909
-apprise/AppriseConfig.pyi,sha256=_mUlCnncqAq8sL01WxQTgZjnb2ic9kZXvtqZmVl-fc8,1568
-apprise/AppriseLocale.py,sha256=4uSr4Nj_rz6ISMMAfRVRk58wZVLKOofJgk2x0_E8NkQ,8994
-apprise/AttachmentManager.py,sha256=EwlnjuKn3fv_pioWcmMCkyDTsO178t6vkEOD8AjAPsw,2053
-apprise/ConfigurationManager.py,sha256=MUmGajxjgnr6FGN7xb3q0nD0VVgdTdvapBBR7CsI-rc,2058
-apprise/NotificationManager.py,sha256=ZJgkiCgcJ7Bz_6bwQ47flrcxvLMbA4Vbw0HG_yTsGdE,2041
-apprise/URLBase.py,sha256=xRP0-blocp9UudYh04Hb3fIEmTZWJaTv_tzjrqaB9fg,29423
-apprise/URLBase.pyi,sha256=WLaRREH7FzZ5x3-qkDkupojWGFC4uFwJ1EDt02lVs8c,520
-apprise/__init__.py,sha256=ArtvoarAMnBcSfXF7L_hzq5CUJ9TUnHopiC7xafCe3c,3368
-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/AttachBase.py,sha256=T3WreGrTsqqGplXJO36jm-N14X7ymSc9xt7XdTYuXVE,13656
-apprise/attachment/AttachBase.pyi,sha256=w0XG_QKauiMLJ7eQ4S57IiLIURZHm_Snw7l6-ih9GP8,961
-apprise/attachment/AttachFile.py,sha256=MbHY_av0GeM_AIBKV02Hq7SHiZ9eCr1yTfvDMUgi2I4,4765
-apprise/attachment/AttachHTTP.py,sha256=_CMPp4QGLATfGO2-Nw57sxsQyed9z3ywgoB0vpK3KZk,13779
-apprise/attachment/__init__.py,sha256=xabgXpvV05X-YRuqIt3uGYMXwYNXjHyF6Dwd8HfZCFE,1658
-apprise/cli.py,sha256=h-pWSQPqQficH6J-OEp3MTGydWyt6vMYnDZvHCeAt4Y,20697
-apprise/common.py,sha256=I6wfrndggCL7l7KAl7Cm4uwAX9n0l3SN4-BVvTE0L0M,5593
-apprise/common.pyi,sha256=luF3QRiClDCk8Z23rI6FCGYsVmodOt_JYfYyzGogdNM,447
-apprise/config/ConfigBase.py,sha256=d1efIuQFCJr66WgpudV2DWtxY3-tuZAyMAhHXBzJ8p0,53194
-apprise/config/ConfigBase.pyi,sha256=cngfobwH6v2vxYbQrObDi5Z-t5wcquWF-wR0kBCr3Eg,54
-apprise/config/ConfigFile.py,sha256=u_SDaN3OHMyaAq2X7k_T4_PRKkVsDwleqBz9YIN5lbA,6138
-apprise/config/ConfigHTTP.py,sha256=Iy6Ji8_nX3xDjFgJGLrz4ftrMlMiyKiFGzYGJ7rMSMQ,9457
-apprise/config/ConfigMemory.py,sha256=epEAgNy-eJVWoQaUOvjivMWxXTofy6wAQ-NbCqYmuyE,2829
-apprise/config/__init__.py,sha256=lbsxrUpB1IYM2q7kjYhsXQGgPF-yZXJrKFE361tdIPY,1663
-apprise/conversion.py,sha256=0VZ0eCZfksN-97Vl0TjVjwnCTgus3XTRioceSFnP-gc,6277
-apprise/decorators/CustomNotifyPlugin.py,sha256=i4D-sgOsBWsxO5auWCN2bgXLLPuADaaLlJ1gUKLj2bU,7972
-apprise/decorators/__init__.py,sha256=e_PDAm0kQNzwDPx-NJZLPfLMd2VAABvNZtxx_iDviRM,1487
-apprise/decorators/notify.py,sha256=a2WupErNw1_SMAld7jPC273bskiChMpYy95BOog5A9w,5111
-apprise/emojis.py,sha256=ONF0t8dY9f2XlEkLUG79-ybKVAj2GqbPj2-Be97vAoI,87738
-apprise/i18n/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise/i18n/en/LC_MESSAGES/apprise.mo,sha256=oUTuHREmLEYN07oqYqRMJ_kU71-o5o37NsF4RXlC5AU,3959
-apprise/logger.py,sha256=131hqhed8cUj9x_mfXDEvwA2YbcYDFAYiWVK1HgxRVY,6921
-apprise/manager.py,sha256=R9w8jxQRNy6Z_XDcobkt4JYbrC4jtj2OwRw9Zrib3CA,26857
-apprise/plugins/NotifyAppriseAPI.py,sha256=ISBE0brD3eQdyw3XrGXd4Uc4kSYvIuI3SSUVCt-bkdo,16654
-apprise/plugins/NotifyAprs.py,sha256=xdL_aIVgb4ggxRFeCdkZAbgHYZ8DWLw9pRpLZQ0rHoE,25523
-apprise/plugins/NotifyBark.py,sha256=bsDvKooRy4k1Gg7tvBjv3DIx7-WZiV_mbTrkTwMtd9Q,15698
-apprise/plugins/NotifyBase.py,sha256=G3xkF_a2BWqNSxsrnOW7NUgHjOqBCYC5zihCifWemo8,30360
-apprise/plugins/NotifyBase.pyi,sha256=aKlZXRYUgG8lz_ZgGkYYJ_GKhuf18youTmMU-FlG7z8,21
-apprise/plugins/NotifyBoxcar.py,sha256=vR00-WggHa1nHYWyb-f5P2V-G4f683fU_-GBlIeJvD0,12867
-apprise/plugins/NotifyBulkSMS.py,sha256=stPWAFCfhBP617zYK9Dgk6pNJBN_WcyJtODzo0jR1QQ,16005
-apprise/plugins/NotifyBulkVS.py,sha256=viLGeyUDiirRRM7CgRqqElHSLYFnMugDtWE6Ytjqfaw,13290
-apprise/plugins/NotifyBurstSMS.py,sha256=cN2kRETKIK5LhwpQEA8C68LKv8KEUPmXYe-nTSegGls,15550
-apprise/plugins/NotifyChantify.py,sha256=GJJOAtSnVoIfKbJF_W1DTu7WsvS_zHdjO4T1XTKT87g,6673
-apprise/plugins/NotifyClickSend.py,sha256=UfOJqsas6WLjQskojuJE7I_-lrb5QrkMiBZv-po_Q9c,11229
-apprise/plugins/NotifyD7Networks.py,sha256=4E6Fh0kQoDlMMwgZJDOXky7c7KrdMMvqprcfm29scWU,15043
-apprise/plugins/NotifyDBus.py,sha256=1eVJHIL3XkFjDePMqfcll35Ie1vxggJ1iBsVFAIaF00,14379
-apprise/plugins/NotifyDapnet.py,sha256=KuXjBU0ZrIYtoDei85NeLZ-IP810T4w5oFXH9sWiSh0,13624
-apprise/plugins/NotifyDingTalk.py,sha256=NJyETgN6QjtRqtxQjfBLFVuFpURyWykRftm6WpQJVbY,12009
-apprise/plugins/NotifyDiscord.py,sha256=M_qmTzB7NNL5_agjYDX38KBN1jRzDBp2EMSNwEF_9Tw,26072
-apprise/plugins/NotifyEmail.py,sha256=Y_ZOrdK6hTUKHLvogKpV5VqD8byzDyDSvwIVmfdsC2g,39789
-apprise/plugins/NotifyEmby.py,sha256=OMVO8XsVl_XCBYNNNQi8ni2lS4voLfU8Puk1xJOAvHs,24039
-apprise/plugins/NotifyEnigma2.py,sha256=Hj0Q9YOeljSwbfiuMKLqXTVX_1g_mjNUGEts7wfrwno,11498
-apprise/plugins/NotifyFCM/__init__.py,sha256=mBFtIgIJuLIFnMB5ndx5Makjs9orVMc2oLoD7LaVT48,21669
-apprise/plugins/NotifyFCM/color.py,sha256=8iqDtadloQh2TMxkFmIFwenHqKp1pHHn1bwyWOzZ6TY,4592
-apprise/plugins/NotifyFCM/common.py,sha256=978uBUoNdtopCtylipGiKQdsQ8FTONxkFBp7uJMZHc8,1718
-apprise/plugins/NotifyFCM/oauth.py,sha256=Vvbd0-rd5BPIjAneG3rILU153JIzfSZ0kaDov6hm96M,11197
-apprise/plugins/NotifyFCM/priority.py,sha256=0WuRW1y1HVnybgjlTeCZPHzt7j8SwWnC7faNcjioAOc,8163
-apprise/plugins/NotifyFeishu.py,sha256=IpcABdLZJ1vcQdZHlmASVbNOiOCIrmgKFhz1hbdskY4,7266
-apprise/plugins/NotifyFlock.py,sha256=0rUIa9nToGsO8BTUgixh8Z_qdVixJeH479UNYjcE4EM,12748
-apprise/plugins/NotifyForm.py,sha256=38nL-2m1cf4gEQFQ4NpvA4j9i5_nNUgelReWFSjyV5U,17905
-apprise/plugins/NotifyFreeMobile.py,sha256=XCkgZLc3KKGlx_9UdeoMJVcHpeQrOml9T93S-DGf4bs,6644
-apprise/plugins/NotifyGnome.py,sha256=8MXTa8gZg1wTgNJfLlmq7_fl3WaYK-SX6VR91u308C4,9059
-apprise/plugins/NotifyGoogleChat.py,sha256=lnoN17m6lZANaXcElDTP8lcuVWjIZEK8C6_iqJNAnw4,12622
-apprise/plugins/NotifyGotify.py,sha256=DNlOIHyuYitO5use9oa_REPm2Fant7y9QSaatrZFNI0,10551
-apprise/plugins/NotifyGrowl.py,sha256=M6ViUz967VhEHtXrE7lbCKF3aB4pIXNEzJLjjGAmvhM,14023
-apprise/plugins/NotifyGuilded.py,sha256=eCMCoFFuE0XNY8HlLM21zoxgBNgqEKQ8dwYj8LihfRU,3641
-apprise/plugins/NotifyHomeAssistant.py,sha256=zqWu7TtdXhTbGNuflC8WfydbHsCLiEBw4uBUcF7YZtw,10739
-apprise/plugins/NotifyHttpSMS.py,sha256=pDEUHCCB18IhOgDcVK3_FFDJdAcrdTIfPzj0jNnZZBo,11136
-apprise/plugins/NotifyIFTTT.py,sha256=oMvTQ0bEu2eJQgw9BwxAwTNOtbZ_ER-zleJvWpWTj7w,13425
-apprise/plugins/NotifyJSON.py,sha256=70ctjmArGzuvM1gHNt1bCiQVWE7Fp9vd2nWhSXwFvw0,13851
-apprise/plugins/NotifyJoin.py,sha256=B8FHp7cblZBkxTgfrka6mNnf6oQVBXVuGISgSau00z0,13581
-apprise/plugins/NotifyKavenegar.py,sha256=F5xTUdebM1lK6yGFbZJQB9Zgw2LTI0angeA-3Nu-89w,12620
-apprise/plugins/NotifyKumulos.py,sha256=eCEW2ZverZqETOLHVWMC4E8Ll6rEhhEWOSD73RD80SM,8214
-apprise/plugins/NotifyLametric.py,sha256=h8vZoX-Ll5NBZRprBlxTO2H9w0lOiMxglGvUgJtK4_8,37534
-apprise/plugins/NotifyLine.py,sha256=OVI0ozMJcq_-dI8dodVX52dzUzgENlAbOik-Kw4l-rI,10676
-apprise/plugins/NotifyLunaSea.py,sha256=woN8XdkwAjhgxAXp7Zj4XsWLybNL80l4W3Dx5BvobZg,14459
-apprise/plugins/NotifyMQTT.py,sha256=cnuG4f3bYYNPhEj9qDX8SLmnxLVT9G1b8J5w6-mQGKY,19545
-apprise/plugins/NotifyMSG91.py,sha256=P7JPyT1xmucnaEeCZPf_6aJfe1gS_STYYwEM7hJ7QBw,12677
-apprise/plugins/NotifyMSTeams.py,sha256=dFH575hoLL3zRddbBKfozlYjxvPJGbj3BKvfJSIkvD0,22976
-apprise/plugins/NotifyMacOSX.py,sha256=y2fGpSZXomFiNwKbWImrXQUMVM4JR4uPCnsWpnxQrFA,8271
-apprise/plugins/NotifyMailgun.py,sha256=FNS_QLOQWMo62yVO-mMZkpiXudUtSdbHOjfSrLC4oIo,25409
-apprise/plugins/NotifyMastodon.py,sha256=2ovjQIOOITHH8lOinC8QCFCJN2QA8foIM2pjdknbblc,35277
-apprise/plugins/NotifyMatrix.py,sha256=I8kdaZUZS-drew0JExBbChQVe7Ib4EwAjQd0xE30XT0,50049
-apprise/plugins/NotifyMattermost.py,sha256=JgEc-wC-43FBMItezDJ62zv1Nc9ROFjDiwD_8bt8rgM,12722
-apprise/plugins/NotifyMessageBird.py,sha256=EUPwhs1PHiPZpluIrLiNKQMUPcdlKnx1sdnllCtN_Ns,12248
-apprise/plugins/NotifyMisskey.py,sha256=zYZkBKv0p3jJpm_HLDBugUgKeGb0qpLoPqy0ffwwxVg,9600
-apprise/plugins/NotifyNextcloud.py,sha256=M3EyvUzBMHbTKU3gxW_7fPA6vmQUF5x8GTMZQ78sWCA,12759
-apprise/plugins/NotifyNextcloudTalk.py,sha256=dLl_g7Knq5PVcadbzDuQsxbGHTZlC4r-pQC8wzYnmAo,11011
-apprise/plugins/NotifyNotica.py,sha256=yHmk8HiNFjzoI4Gewo_nBRrx9liEmhT95k1d10wqhYg,12990
-apprise/plugins/NotifyNotifiarr.py,sha256=ADwLJO9eenfLkNa09tXMGSBTM4c3zTY0SEePvyB8WYA,15857
-apprise/plugins/NotifyNotifico.py,sha256=Qe9jMN_M3GL4XlYIWkAf-w_Hf65g9Hde4bVuytGhUW4,12035
-apprise/plugins/NotifyNtfy.py,sha256=AtJt2zH35mMQTwRDxKia93NPy6-4rtixplP53zIYV2M,27979
-apprise/plugins/NotifyOffice365.py,sha256=8TxsVsdbUghmNj0kceMlmoZzTOKQTgn3priI8JuRuHE,25190
-apprise/plugins/NotifyOneSignal.py,sha256=gsw7ckW7xLiJDRUb7eJHNe_4bvdBXmt6_YsB1u_ghjw,18153
-apprise/plugins/NotifyOpsgenie.py,sha256=zJWpknjoHq35Iv9w88ucR62odaeIN3nrGFPtYnhDdjA,20515
-apprise/plugins/NotifyPagerDuty.py,sha256=lu6oNdygrs6UezYm6xgiQxQDeDz8EVUtfP-xsArRvyw,17874
-apprise/plugins/NotifyPagerTree.py,sha256=mPl6ejdelNlWUWGVs46kZT0VV4uFZoeCdcv4VJ_f_XQ,13849
-apprise/plugins/NotifyParsePlatform.py,sha256=6oFOTpu-HMhesaYXRBvu5oaESYlFrKBNYTHE-ItCBRk,10291
-apprise/plugins/NotifyPopcornNotify.py,sha256=kRstzG0tWBdxSRfn2RN2J7FhvIj2qYWlwUyLxxZCbPc,10587
-apprise/plugins/NotifyProwl.py,sha256=EGOdmiZq8CFbjxTtWWKLQEdYiSvr4czZfE_8aCMEokw,9782
-apprise/plugins/NotifyPushBullet.py,sha256=JVd2GQH-DWmPaKjuGBpsE6DXNCcZEUDH7tA5zbM1qEU,15372
-apprise/plugins/NotifyPushDeer.py,sha256=cG1UFG06PfzbmI1RxtrMqmfaHK_Ojk_W-QMEdtkEuUI,6922
-apprise/plugins/NotifyPushMe.py,sha256=ioRzeXbd2X5miTd3h3m7AwCqkIIfbXNm4PjYk0OOXZ0,7134
-apprise/plugins/NotifyPushSafer.py,sha256=hIcYHwUZapmC-VDvaO_UkDY9RSPTxHgF7m2FL-6JBZw,26756
-apprise/plugins/NotifyPushed.py,sha256=NqLMXD9gvihXLfLUtCcMfz5oUAhPM7sKXECqKgD0v-U,12270
-apprise/plugins/NotifyPushjet.py,sha256=8qWpIqM4dKWjO-BjOrRJXZYtvtJBt_mikdBWRxfibnE,8952
-apprise/plugins/NotifyPushover.py,sha256=MJDquV4zl1cNrGZOC55hLlt6lOb6625WeUcgS5ceCbk,21213
-apprise/plugins/NotifyPushy.py,sha256=mmWcnu905Fvc8ihYXvZ7lVYErGZH5Q-GbBNS20v5r48,12496
-apprise/plugins/NotifyRSyslog.py,sha256=W42LT90X65-pNoU7KdhdX1PBcmsz9RyV376CDa_H3CI,11982
-apprise/plugins/NotifyReddit.py,sha256=E78OSyDQfUalBEcg71sdMsNBOwdj7cVBnELrhrZEAXY,25785
-apprise/plugins/NotifyRevolt.py,sha256=DRA9Xylwl6leVjVFuJcP4L1cG49CIBtnQdxh4BKnAZ4,14500
-apprise/plugins/NotifyRocketChat.py,sha256=Cb_nasX0-G3FoPMYvNk55RJ-tHuXUCTLUn2wTSi4IcI,25738
-apprise/plugins/NotifyRyver.py,sha256=yhHPMLGeJtcHwBKSPPk0OBfp59DgTvXio1R59JhrJu4,11823
-apprise/plugins/NotifySES.py,sha256=wtRmpAZkS5mQma6sdiaPT6U1xcgoj77CB9mNFvSEAw8,33545
-apprise/plugins/NotifySMSEagle.py,sha256=voFNqOewD9OC1eRctD0YdUB_ZSWsb06rjUwBfCcxPYA,24161
-apprise/plugins/NotifySMSManager.py,sha256=DbVc35qLfYkNL7eq43_rPD6k-PELL9apf3S09S6qvDA,14125
-apprise/plugins/NotifySMTP2Go.py,sha256=foQ7aMMmNc5Oree8YwrxZJgMnF6yVMFAfqShm_nLbx0,19711
-apprise/plugins/NotifySNS.py,sha256=ZEBWf0ZJ9w_ftzUikKEvQWJ2fkxrUbrLhPmTRD2DvRQ,24159
-apprise/plugins/NotifySendGrid.py,sha256=IBdYmZcthkvGCz1N_Fs8vDnImtHug6LpuKv1mWT_Cdo,16213
-apprise/plugins/NotifyServerChan.py,sha256=WsrClO9f0xi-KpnLZGTUHV7PxeU3l1D875gvMaZRG_M,5779
-apprise/plugins/NotifySignalAPI.py,sha256=OwJ7qjJ-ZJyS8GS-dBWAtgizHMnGegg76GuwFobyWkw,16733
-apprise/plugins/NotifySimplePush.py,sha256=dUC6O8IGuUIAz5z6_H7A7jdv5Gj1plytNm5QyKnHAYg,10876
-apprise/plugins/NotifySinch.py,sha256=tmHLwQa9lWHEI3EcRfigl4i7JU46A6gKAi_GbY0PrX4,16813
-apprise/plugins/NotifySlack.py,sha256=3VdjruU5FPr3jT_s3axwRJKMcBYXP0lvJnyuKedIlcE,42521
-apprise/plugins/NotifySparkPost.py,sha256=6dRTwnYU50Lvmp6AlwCyePe0TMbVEXaSwNeGkg__EYo,27878
-apprise/plugins/NotifyStreamlabs.py,sha256=lx3N8T2ufUWFYIZ-kU_rOv50YyGWBqLSCKk7xim2_Io,16023
-apprise/plugins/NotifySynology.py,sha256=_jTqfgWeOuSi_I8geMOraHBVFtDkvm9mempzymrmeAo,11105
-apprise/plugins/NotifySyslog.py,sha256=J9Kain2bb-PDNiG5Ydb0q678cYjNE_NjZFqMG9oEXM0,10617
-apprise/plugins/NotifyTechulusPush.py,sha256=m43_Qj1scPcgCRX5Dr2Ul7nxMbaiVxNzm_HRuNmfgoA,7253
-apprise/plugins/NotifyTelegram.py,sha256=XE7PC9LRzcrfE2bpLKyor5lO_7B9LS4Xw1UlUmA4a2A,37187
-apprise/plugins/NotifyThreema.py,sha256=C_C3j0fJWgeF2uB7ceJFXOdC6Lt0TFBInFMs5Xlg04M,11885
-apprise/plugins/NotifyTwilio.py,sha256=WCo8eTI9OF1rtg3ueHHRDXt4Lp45eZ6h3IdTZVf5HM8,15976
-apprise/plugins/NotifyTwist.py,sha256=nZA73CYVe-p0tkVMy5q3vFRyflLM4yjUo9LECvkUwgc,28841
-apprise/plugins/NotifyTwitter.py,sha256=qML0jlBkLZMHrkKRxBpVUnBwAz8MWGYyI3cvwi-hrgM,30152
-apprise/plugins/NotifyVoipms.py,sha256=msy_D32YhP8OP4_Mj_L3OYd4iablqQETN-DvilGZeVQ,12552
-apprise/plugins/NotifyVonage.py,sha256=xmzZgobFaGA_whpQ5fDuG2poUrK9W4T77yP7dusHcSo,13431
-apprise/plugins/NotifyWeComBot.py,sha256=5lkhXDgyJ1edzknemKsO1sJVv7miR9F_7xI40Ag7ICI,8789
-apprise/plugins/NotifyWebexTeams.py,sha256=gbbRlHiPuOvUIZexE5m2QNd1dN_5_x0OdT5m6NSrcso,9164
-apprise/plugins/NotifyWhatsApp.py,sha256=PtzW0ue3d2wZ8Pva_LG29jUcpRRP03TFxO5SME_8Juo,19924
-apprise/plugins/NotifyWindows.py,sha256=QgWJfJF8AE6RWr-L81YYVZNWrnImK9Qr3B991HWanqU,8563
-apprise/plugins/NotifyXBMC.py,sha256=5hDuOTP3Kwtp4NEMaokNjWyEKEkQcN_fSx-cUPJvhaU,12096
-apprise/plugins/NotifyXML.py,sha256=WJnmdvXseuTRgioVMRqpR8a09cDfTpPTfuFlTnT_TfI,16973
-apprise/plugins/NotifyZulip.py,sha256=M8cSL7nZvtBYyTX6045g34tyn2vyybltgD1CoI4Xa7A,13968
-apprise/plugins/__init__.py,sha256=jTfLmW47kZC_Wf5eFFta2NoD2J-7_E7JaPrrVMIECkU,18725
-apprise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise/utils.py,sha256=SjRU2tb1UsVnTCTXPUyXVz3WpRbDWwAHH-d3ll38EHY,53185
diff --git a/libs/apprise-1.7.6.dist-info/INSTALLER b/libs/apprise-1.9.2.dist-info/INSTALLER
similarity index 100%
rename from libs/apprise-1.7.6.dist-info/INSTALLER
rename to libs/apprise-1.9.2.dist-info/INSTALLER
diff --git a/libs/apprise-1.7.6.dist-info/LICENSE b/libs/apprise-1.9.2.dist-info/LICENSE
similarity index 95%
rename from libs/apprise-1.7.6.dist-info/LICENSE
rename to libs/apprise-1.9.2.dist-info/LICENSE
index f9154fefe..1bb88d1df 100644
--- a/libs/apprise-1.7.6.dist-info/LICENSE
+++ b/libs/apprise-1.9.2.dist-info/LICENSE
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/libs/apprise-1.7.6.dist-info/METADATA b/libs/apprise-1.9.2.dist-info/METADATA
similarity index 80%
rename from libs/apprise-1.7.6.dist-info/METADATA
rename to libs/apprise-1.9.2.dist-info/METADATA
index ac7cb9aac..d6ebb290d 100644
--- a/libs/apprise-1.7.6.dist-info/METADATA
+++ b/libs/apprise-1.9.2.dist-info/METADATA
@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: apprise
-Version: 1.7.6
+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
-Keywords: Alerts Apprise API Automated Packet Reporting System AWS Boxcar BulkSMS BulkVS Burst SMS Chantify 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 PopcornNotify Prowl PushBullet Pushed Pushjet PushMe Push Notifications Pushover PushSafer Pushy PushDeer Reddit Revolt Rocket.Chat RSyslog Ryver SendGrid ServerChan SES Signal SimplePush Sinch Slack SMSEagle SMS Manager SMTP2Go SNS SparkPost Streamlabs Stride Synology Chat Syslog Techulus Telegram Threema Gateway Twilio Twist Twitter Voipms Vonage Webex WeCom Bot WhatsApp Windows XBMC XML Zulip
+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
@@ -35,7 +35,6 @@ Requires-Dist: requests-oauthlib
 Requires-Dist: click >=5.0
 Requires-Dist: markdown
 Requires-Dist: PyYAML
-Requires-Dist: dataclasses ; python_version < "3.7"
 
 ![Apprise Logo](https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png)
 
@@ -78,10 +77,12 @@ System Administrators and DevOps who wish to send a notification now no longer n
   * [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-->
 
@@ -98,8 +99,7 @@ The table below identifies the services this tool supports and some example serv
 | [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
-| [Boxcar](https://github.com/caronc/apprise/wiki/Notify_boxcar)  | boxcar://   | (TCP) 443   | boxcar://hostname<br />boxcar://hostname/@tag<br/>boxcar://hostname/device_token<br />boxcar://hostname/device_token1/device_token2/device_tokenN<br />boxcar://hostname/@tag/@tag2/device_token
-| [Chantify](https://github.com/caronc/apprise/wiki/Notify_chantify) | chantify://    | (TCP) 443    | chantify://token
+| [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
@@ -122,6 +122,7 @@ The table below identifies the services this tool supports and some example serv
 | [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
@@ -159,42 +160,47 @@ The table below identifies the services this tool supports and some example serv
 | [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"
-| [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
 | [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
-| [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
 | [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
+| [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/
-| [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/
+| [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/
+| [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/
@@ -386,6 +392,17 @@ apprise -vv --title 'custom override' \
 
 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:
@@ -572,6 +589,123 @@ 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:
@@ -580,6 +714,7 @@ If you're interested in reading more about this and other methods on how to cust
 * 🔧 [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)
 
diff --git a/libs/apprise-1.9.2.dist-info/RECORD b/libs/apprise-1.9.2.dist-info/RECORD
new file mode 100644
index 000000000..e4cc8e8ca
--- /dev/null
+++ b/libs/apprise-1.9.2.dist-info/RECORD
@@ -0,0 +1,204 @@
+../../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.7.6.dist-info/REQUESTED b/libs/apprise-1.9.2.dist-info/REQUESTED
similarity index 100%
rename from libs/apprise-1.7.6.dist-info/REQUESTED
rename to libs/apprise-1.9.2.dist-info/REQUESTED
diff --git a/libs/Jinja2-3.1.3.dist-info/WHEEL b/libs/apprise-1.9.2.dist-info/WHEEL
similarity index 100%
rename from libs/Jinja2-3.1.3.dist-info/WHEEL
rename to libs/apprise-1.9.2.dist-info/WHEEL
diff --git a/libs/apprise-1.7.6.dist-info/entry_points.txt b/libs/apprise-1.9.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/apprise-1.7.6.dist-info/entry_points.txt
rename to libs/apprise-1.9.2.dist-info/entry_points.txt
diff --git a/libs/apprise-1.7.6.dist-info/top_level.txt b/libs/apprise-1.9.2.dist-info/top_level.txt
similarity index 100%
rename from libs/apprise-1.7.6.dist-info/top_level.txt
rename to libs/apprise-1.9.2.dist-info/top_level.txt
diff --git a/libs/apprise/__init__.py b/libs/apprise/__init__.py
index 81373c75b..e9f496539 100644
--- a/libs/apprise/__init__.py
+++ b/libs/apprise/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,10 +27,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 __title__ = 'Apprise'
-__version__ = '1.7.6'
+__version__ = '1.9.2'
 __author__ = 'Chris Caron'
-__license__ = 'BSD'
-__copywrite__ = 'Copyright (C) 2024 Chris Caron <lead2gold@gmail.com>'
+__license__ = 'BSD 2-Clause'
+__copywrite__ = 'Copyright (C) 2025 Chris Caron <lead2gold@gmail.com>'
 __email__ = 'lead2gold@gmail.com'
 __status__ = 'Production'
 
@@ -48,18 +48,25 @@ 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 .URLBase import URLBase
-from .URLBase import PrivacyMode
-from .plugins.NotifyBase import NotifyBase
-from .config.ConfigBase import ConfigBase
-from .attachment.AttachBase import AttachBase
-
-from .Apprise import Apprise
-from .AppriseAsset import AppriseAsset
-from .AppriseConfig import AppriseConfig
-from .AppriseAttachment import AppriseAttachment
+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
 
+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 .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
@@ -73,7 +80,11 @@ logging.getLogger(__name__).addHandler(logging.NullHandler())
 __all__ = [
     # Core
     'Apprise', 'AppriseAsset', 'AppriseConfig', 'AppriseAttachment', 'URLBase',
-    'NotifyBase', 'ConfigBase', 'AttachBase',
+    'NotifyBase', 'ConfigBase', 'AttachBase', 'AppriseLocale',
+    'PersistentStore',
+
+    # Exceptions
+    'exception',
 
     # Reference
     'NotifyType', 'NotifyImageSize', 'NotifyFormat', 'OverflowMode',
@@ -81,8 +92,12 @@ __all__ = [
     'ConfigFormat', 'CONFIG_FORMATS',
     'ContentIncludeMode', 'CONTENT_INCLUDE_MODES',
     'ContentLocation', 'CONTENT_LOCATIONS',
+    'PersistentStoreMode', 'PERSISTENT_STORE_MODES',
     'PrivacyMode',
 
+    # Managers
+    'NotificationManager', 'ConfigurationManager', 'AttachmentManager',
+
     # Decorator
     'decorators',
 
diff --git a/libs/apprise/Apprise.py b/libs/apprise/apprise.py
similarity index 98%
rename from libs/apprise/Apprise.py
rename to libs/apprise/apprise.py
index 9a3e8dfc7..9af55b5fa 100644
--- a/libs/apprise/Apprise.py
+++ b/libs/apprise/apprise.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -32,19 +32,18 @@ import os
 from itertools import chain
 from . import common
 from .conversion import convert_between
-from .utils import is_exclusive_match
-from .NotificationManager import NotificationManager
-from .utils import parse_list
-from .utils import parse_urls
-from .utils import cwe312_url
+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 .AppriseAsset import AppriseAsset
-from .AppriseConfig import AppriseConfig
-from .AppriseAttachment import AppriseAttachment
-from .AppriseLocale import AppriseLocale
-from .config.ConfigBase import ConfigBase
-from .plugins.NotifyBase import NotifyBase
+from .asset import AppriseAsset
+from .apprise_config import AppriseConfig
+from .apprise_attachment import AppriseAttachment
+from .locale import AppriseLocale
+from .config.base import ConfigBase
+from .plugins.base import NotifyBase
 
 from . import plugins
 from . import __version__
diff --git a/libs/apprise/Apprise.pyi b/libs/apprise/apprise.pyi
similarity index 100%
rename from libs/apprise/Apprise.pyi
rename to libs/apprise/apprise.pyi
diff --git a/libs/apprise/AppriseAttachment.py b/libs/apprise/apprise_attachment.py
similarity index 96%
rename from libs/apprise/AppriseAttachment.py
rename to libs/apprise/apprise_attachment.py
index fcfed3af6..855b42d44 100644
--- a/libs/apprise/AppriseAttachment.py
+++ b/libs/apprise/apprise_attachment.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,13 +27,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from . import URLBase
-from .attachment.AttachBase import AttachBase
-from .AppriseAsset import AppriseAsset
-from .AttachmentManager import AttachmentManager
+from .attachment.base import AttachBase
+from .asset import AppriseAsset
+from .manager_attachment import AttachmentManager
 from .logger import logger
 from .common import ContentLocation
 from .common import CONTENT_LOCATIONS
-from .utils import GET_SCHEMA_RE
+from .utils.parse import GET_SCHEMA_RE
 
 # Grant access to our Notification Manager Singleton
 A_MGR = AttachmentManager()
@@ -142,13 +142,8 @@ class AppriseAttachment:
             # prepare default asset
             asset = self.asset
 
-        if isinstance(attachments, AttachBase):
-            # Go ahead and just add our attachments into our list
-            self.attachments.append(attachments)
-            return True
-
-        elif isinstance(attachments, str):
-            # Save our path
+        if isinstance(attachments, (AttachBase, str)):
+            # store our instance
             attachments = (attachments, )
 
         elif not isinstance(attachments, (tuple, set, list)):
diff --git a/libs/apprise/AppriseAttachment.pyi b/libs/apprise/apprise_attachment.pyi
similarity index 100%
rename from libs/apprise/AppriseAttachment.pyi
rename to libs/apprise/apprise_attachment.pyi
diff --git a/libs/apprise/AppriseConfig.py b/libs/apprise/apprise_config.py
similarity index 98%
rename from libs/apprise/AppriseConfig.py
rename to libs/apprise/apprise_config.py
index 7e5a9126f..5262b5be4 100644
--- a/libs/apprise/AppriseConfig.py
+++ b/libs/apprise/apprise_config.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,13 +28,12 @@
 
 from . import ConfigBase
 from . import CONFIG_FORMATS
-from .ConfigurationManager import ConfigurationManager
+from .manager_config import ConfigurationManager
 from . import URLBase
-from .AppriseAsset import AppriseAsset
+from .asset import AppriseAsset
 from . import common
-from .utils import GET_SCHEMA_RE
-from .utils import parse_list
-from .utils import is_exclusive_match
+from .utils.parse import GET_SCHEMA_RE, parse_list
+from .utils.logic import is_exclusive_match
 from .logger import logger
 
 # Grant access to our Configuration Manager Singleton
diff --git a/libs/apprise/AppriseConfig.pyi b/libs/apprise/apprise_config.pyi
similarity index 100%
rename from libs/apprise/AppriseConfig.pyi
rename to libs/apprise/apprise_config.pyi
diff --git a/libs/apprise/AppriseAsset.py b/libs/apprise/asset.py
similarity index 75%
rename from libs/apprise/AppriseAsset.py
rename to libs/apprise/asset.py
index 97a7bccfb..aef90f08f 100644
--- a/libs/apprise/AppriseAsset.py
+++ b/libs/apprise/asset.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,7 +33,8 @@ from os.path import dirname
 from os.path import isfile
 from os.path import abspath
 from .common import NotifyType
-from .NotificationManager import NotificationManager
+from .common import PersistentStoreMode
+from .manager_plugins import NotificationManager
 
 
 # Grant access to our Notification Manager Singleton
@@ -70,6 +71,9 @@ class AppriseAsset:
         NotifyType.WARNING: '#CACF29',
     }
 
+    # The default color to return if a mapping isn't found in our table above
+    default_html_color = '#888888'
+
     # Ascii Notification
     ascii_notify_map = {
         NotifyType.INFO: '[i]',
@@ -78,8 +82,8 @@ class AppriseAsset:
         NotifyType.WARNING: '[~]',
     }
 
-    # The default color to return if a mapping isn't found in our table above
-    default_html_color = '#888888'
+    # The default ascii to return if a mapping isn't found in our table above
+    default_ascii_chars = '[?]'
 
     # The default image extension to use
     default_extension = '.png'
@@ -139,6 +143,12 @@ class AppriseAsset:
     # Defines the encoding of the content passed into Apprise
     encoding = 'utf-8'
 
+    # Automatically generate our Pretty Good Privacy (PGP) 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`
+    pgp_autogen = True
+
     # For more detail see CWE-312 @
     #    https://cwe.mitre.org/data/definitions/312.html
     #
@@ -154,6 +164,22 @@ class AppriseAsset:
     # By default, no paths are scanned.
     __plugin_paths = []
 
+    # Optionally set the location of the persistent storage
+    # By default there is no path and thus persistent storage is not used
+    __storage_path = None
+
+    # Optionally define the default salt to apply to all persistent storage
+    # namespace generation (unless over-ridden)
+    __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
+    # by the generator (sha1, md5, sha256, etc)
+    __storage_idlen = 8
+
+    # Set storage to auto
+    __storage_mode = PersistentStoreMode.AUTO
+
     # All internal/system flags are prefixed with an underscore (_)
     # These can only be initialized using Python libraries and are not picked
     # up from (yaml) configuration files (if set)
@@ -168,7 +194,9 @@ class AppriseAsset:
     # A unique identifer we can use to associate our calling source
     _uid = str(uuid4())
 
-    def __init__(self, plugin_paths=None, **kwargs):
+    def __init__(self, plugin_paths=None, storage_path=None,
+                 storage_mode=None, storage_salt=None,
+                 storage_idlen=None, **kwargs):
         """
         Asset Initialization
 
@@ -184,8 +212,49 @@ class AppriseAsset:
 
         if plugin_paths:
             # Load any decorated modules if defined
+            self.__plugin_paths = plugin_paths
             N_MGR.module_detection(plugin_paths)
 
+        if storage_path:
+            # Define our persistent storage path
+            self.__storage_path = storage_path
+
+        if storage_mode:
+            # Define how our persistent storage behaves
+            self.__storage_mode = storage_mode
+
+        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')
+
+            # Store value
+            self.__storage_idlen = storage_idlen
+
+        if storage_salt is not None:
+            # Define the number of characters utilized from our namespace lengh
+
+            if isinstance(storage_salt, bytes):
+                self.__storage_salt = storage_salt
+
+            elif isinstance(storage_salt, str):
+                try:
+                    self.__storage_salt = storage_salt.encode(self.encoding)
+
+                except UnicodeEncodeError:
+                    # Bad data; don't pass it along
+                    raise ValueError(
+                        'AppriseAsset namespace_salt(): '
+                        'Value provided could not be encoded')
+
+            else:  # Unsupported
+                raise ValueError(
+                    '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
@@ -223,9 +292,8 @@ class AppriseAsset:
         Returns an ascii representation based on passed in notify type
 
         """
-
         # look our response up
-        return self.ascii_notify_map.get(notify_type, self.default_html_color)
+        return self.ascii_notify_map.get(notify_type, self.default_ascii_chars)
 
     def image_url(self, notify_type, image_size, logo=False, extension=None):
         """
@@ -354,3 +422,40 @@ class AppriseAsset:
 
         """
         return int(value.lstrip('#'), 16)
+
+    @property
+    def plugin_paths(self):
+        """
+        Return the plugin paths defined
+        """
+        return self.__plugin_paths
+
+    @property
+    def storage_path(self):
+        """
+        Return the persistent storage path defined
+        """
+        return self.__storage_path
+
+    @property
+    def storage_mode(self):
+        """
+        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
+        """
+        return self.__storage_salt
+
+    @property
+    def storage_idlen(self):
+        """
+        Return the persistent storage id length
+        """
+
+        return self.__storage_idlen
diff --git a/libs/apprise/AppriseAsset.pyi b/libs/apprise/asset.pyi
similarity index 100%
rename from libs/apprise/AppriseAsset.pyi
rename to libs/apprise/asset.pyi
diff --git a/libs/apprise/attachment/__init__.py b/libs/apprise/attachment/__init__.py
index 0a88313d6..1f09941dc 100644
--- a/libs/apprise/attachment/__init__.py
+++ b/libs/apprise/attachment/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,8 +27,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Used for testing
-from .AttachBase import AttachBase
-from ..AttachmentManager import AttachmentManager
+from .base import AttachBase
+from ..manager_attachment import AttachmentManager
 
 # Initalize our Attachment Manager Singleton
 A_MGR = AttachmentManager()
@@ -36,4 +36,5 @@ A_MGR = AttachmentManager()
 __all__ = [
     # Reference
     'AttachBase',
+    'AttachmentManager',
 ]
diff --git a/libs/apprise/attachment/AttachBase.py b/libs/apprise/attachment/base.py
similarity index 76%
rename from libs/apprise/attachment/AttachBase.py
rename to libs/apprise/attachment/base.py
index 8cb6bd5cb..0161cab08 100644
--- a/libs/apprise/attachment/AttachBase.py
+++ b/libs/apprise/attachment/base.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,10 +29,12 @@
 import os
 import time
 import mimetypes
-from ..URLBase import URLBase
-from ..utils import parse_bool
+import base64
+from .. import exception
+from ..url import URLBase
+from ..utils.parse import parse_bool
 from ..common import ContentLocation
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class AttachBase(URLBase):
@@ -148,6 +150,9 @@ class AttachBase(URLBase):
         # Absolute path to attachment
         self.download_path = None
 
+        # Track open file pointers
+        self.__pointers = set()
+
         # Set our cache flag; it can be True, False, None, or a (positive)
         # integer... nothing else
         if cache is not None:
@@ -226,15 +231,14 @@ class AttachBase(URLBase):
         Content is cached once determied to prevent overhead of future
         calls.
         """
+        if not self.exists():
+            # we could not obtain our attachment
+            return None
 
         if self._mimetype:
             # return our pre-calculated cached content
             return self._mimetype
 
-        if not self.exists():
-            # we could not obtain our attachment
-            return None
-
         if not self.detected_mimetype:
             # guess_type() returns: (type, encoding) and sets type to None
             # if it can't otherwise determine it.
@@ -258,32 +262,67 @@ class AttachBase(URLBase):
         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
 
-        if self.download_path and os.path.isfile(self.download_path) \
-                and cache:
+        try:
+            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.
-            if cache is True:
-                # return our fixed content as is; we will always cache it
-                return True
+                # We have enough reason to look further into our cached content
+                # and verify it has not expired.
+                if cache is True:
+                    # return our fixed content as is; we will always cache it
+                    return True
 
-            # Verify our cache time to determine whether we will get our
-            # content again.
-            try:
-                age_in_sec = time.time() - os.stat(self.download_path).st_mtime
+                # 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
                 if age_in_sec <= cache:
                     return True
 
-            except (OSError, IOError):
-                # The file is not present
-                pass
+        except (OSError, IOError):
+            # 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.
+
+        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)))
+            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())
+
+        except (TypeError, FileNotFoundError):
+            # We no longer have a path to open
+            raise exception.AppriseFileNotFound("Attachment Missing")
+
+        except (TypeError, OSError, IOError) 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")
+
     def invalidate(self):
         """
         Release any temporary data that may be open by child classes.
@@ -295,6 +334,11 @@ class AttachBase(URLBase):
           - download_path: Must contain a absolute path to content
           - detected_mimetype: Should identify mimetype of content
         """
+
+        # Remove all open pointers
+        while self.__pointers:
+            self.__pointers.pop().close()
+
         self.detected_name = None
         self.download_path = None
         self.detected_mimetype = None
@@ -314,8 +358,43 @@ class AttachBase(URLBase):
         raise NotImplementedError(
             "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)
+        self.__pointers.add(pointer)
+        return pointer
+
+    def chunk(self, size=5242880):
+        """
+        A Generator that yield chunks of a file with the specified size.
+
+        By default the chunk size is set to 5MB (5242880 bytes)
+        """
+
+        with self.open() as file:
+            while True:
+                chunk = file.read(size)
+                if not chunk:
+                    break
+
+                yield chunk
+
+    def __enter__(self):
+        """
+        support with keyword
+        """
+        return self.open()
+
+    def __exit__(self, value_type, value, traceback):
+        """
+        stub to do nothing; but support exit of with statement gracefully
+        """
+        return
+
     @staticmethod
-    def parse_url(url, verify_host=True, mimetype_db=None):
+    def parse_url(url, verify_host=True, mimetype_db=None, sanitize=True):
         """Parses the URL and returns it broken apart into a dictionary.
 
         This is very specific and customized for Apprise.
@@ -333,7 +412,8 @@ class AttachBase(URLBase):
             successful, otherwise None is returned.
         """
 
-        results = URLBase.parse_url(url, verify_host=verify_host)
+        results = URLBase.parse_url(
+            url, verify_host=verify_host, sanitize=sanitize)
 
         if not results:
             # We're done; we failed to parse our url
@@ -367,7 +447,15 @@ class AttachBase(URLBase):
         Returns the filesize of the attachment.
 
         """
-        return os.path.getsize(self.path) if self.path else 0
+        if not self:
+            return 0
+
+        try:
+            return os.path.getsize(self.path) if self.path else 0
+
+        except OSError:
+            # OSError can occur if the file is inaccessible
+            return 0
 
     def __bool__(self):
         """
@@ -375,3 +463,9 @@ class AttachBase(URLBase):
         True is returned if our content was downloaded correctly.
         """
         return True if self.path else False
+
+    def __del__(self):
+        """
+        Perform any house cleaning
+        """
+        self.invalidate()
diff --git a/libs/apprise/attachment/AttachBase.pyi b/libs/apprise/attachment/base.pyi
similarity index 100%
rename from libs/apprise/attachment/AttachBase.pyi
rename to libs/apprise/attachment/base.pyi
diff --git a/libs/apprise/attachment/AttachFile.py b/libs/apprise/attachment/file.py
similarity index 88%
rename from libs/apprise/attachment/AttachFile.py
rename to libs/apprise/attachment/file.py
index 4c9c8f136..20f01ce40 100644
--- a/libs/apprise/attachment/AttachFile.py
+++ b/libs/apprise/attachment/file.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,9 +28,10 @@
 
 import re
 import os
-from .AttachBase import AttachBase
+from .base import AttachBase
+from ..utils.disk import path_decode
 from ..common import ContentLocation
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class AttachFile(AttachBase):
@@ -57,7 +58,10 @@ class AttachFile(AttachBase):
 
         # Store path but mark it dirty since we have not performed any
         # verification at this point.
-        self.dirty_path = os.path.expanduser(path)
+        self.dirty_path = path_decode(path)
+
+        # Track our file as it was saved
+        self.__original_path = os.path.normpath(path)
         return
 
     def url(self, privacy=False, *args, **kwargs):
@@ -77,8 +81,9 @@ class AttachFile(AttachBase):
             params['name'] = self._name
 
         return 'file://{path}{params}'.format(
-            path=self.quote(self.dirty_path),
-            params='?{}'.format(self.urlencode(params)) if params else '',
+            path=self.quote(self.__original_path),
+            params='?{}'.format(self.urlencode(params, safe='/'))
+            if params else '',
         )
 
     def download(self, **kwargs):
@@ -96,7 +101,11 @@ class AttachFile(AttachBase):
         # Ensure any existing content set has been invalidated
         self.invalidate()
 
-        if not os.path.isfile(self.dirty_path):
+        try:
+            if not os.path.isfile(self.dirty_path):
+                return False
+
+        except OSError:
             return False
 
         if self.max_file_size > 0 and \
diff --git a/libs/apprise/attachment/AttachHTTP.py b/libs/apprise/attachment/http.py
similarity index 97%
rename from libs/apprise/attachment/AttachHTTP.py
rename to libs/apprise/attachment/http.py
index 5a3af9467..0c7ccc5db 100644
--- a/libs/apprise/attachment/AttachHTTP.py
+++ b/libs/apprise/attachment/http.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -31,10 +31,10 @@ import os
 import requests
 import threading
 from tempfile import NamedTemporaryFile
-from .AttachBase import AttachBase
+from .base import AttachBase
 from ..common import ContentLocation
-from ..URLBase import PrivacyMode
-from ..AppriseLocale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..locale import gettext_lazy as _
 
 
 class AttachHTTP(AttachBase):
@@ -296,8 +296,7 @@ class AttachHTTP(AttachBase):
         """
         Tidy memory if open
         """
-        with self._lock:
-            self.invalidate()
+        self.invalidate()
 
     def url(self, privacy=False, *args, **kwargs):
         """
@@ -353,7 +352,7 @@ class AttachHTTP(AttachBase):
             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),
+            params=self.urlencode(params, safe='/'),
         )
 
     @staticmethod
@@ -363,8 +362,7 @@ class AttachHTTP(AttachBase):
         us to re-instantiate this object.
 
         """
-        results = AttachBase.parse_url(url)
-
+        results = AttachBase.parse_url(url, sanitize=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
diff --git a/libs/apprise/attachment/memory.py b/libs/apprise/attachment/memory.py
new file mode 100644
index 000000000..fe6e33fce
--- /dev/null
+++ b/libs/apprise/attachment/memory.py
@@ -0,0 +1,231 @@
+# -*- 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.
+
+import re
+import os
+import io
+import base64
+from .base import AttachBase
+from .. import exception
+from ..common import ContentLocation
+from ..locale import gettext_lazy as _
+import uuid
+
+
+class AttachMemory(AttachBase):
+    """
+    A wrapper for Memory based attachment sources
+    """
+
+    # The default descriptive name associated with the service
+    service_name = _('Memory')
+
+    # The default protocol
+    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
+
+        """
+        # Create our BytesIO object
+        self._data = io.BytesIO()
+
+        if content is None:
+            # Empty; do nothing
+            pass
+
+        elif isinstance(content, str):
+            content = content.encode(encoding)
+            if mimetype is None:
+                mimetype = 'text/plain'
+
+            if not name:
+                # Generate a unique filename
+                name = str(uuid.uuid4()) + '.txt'
+
+        elif not isinstance(content, bytes):
+            raise TypeError(
+                'Provided content for memory attachment is invalid')
+
+        # Store our content
+        if content:
+            self._data.write(content)
+
+        if mimetype is None:
+            # Default mimetype
+            mimetype = 'application/octet-stream'
+
+        if not name:
+            # Generate a unique filename
+            name = str(uuid.uuid4()) + '.dat'
+
+        # Initialize our base object
+        super().__init__(name=name, mimetype=mimetype, **kwargs)
+
+        return
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            'mime': self._mimetype,
+        }
+
+        return 'memory://{name}?{params}'.format(
+            name=self.quote(self._name),
+            params=self.urlencode(params, safe='/')
+        )
+
+    def open(self, *args, **kwargs):
+        """
+        return our memory object
+        """
+        # Return our object
+        self._data.seek(0, 0)
+        return self._data
+
+    def __enter__(self):
+        """
+        support with clause
+        """
+        # Return our object
+        self._data.seek(0, 0)
+        return self._data
+
+    def download(self, **kwargs):
+        """
+        Handle memory download() call
+        """
+
+        if self.location == ContentLocation.INACCESSIBLE:
+            # our content is inaccessible
+            return False
+
+        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)))
+
+            # 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.
+        """
+
+        if not self:
+            # We could not access the attachment
+            self.logger.error(
+                'Could not access attachment {}.'.format(
+                    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())
+
+    def invalidate(self):
+        """
+        Removes data
+        """
+        self._data.truncate(0)
+        return
+
+    def exists(self):
+        """
+        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
+
+    @staticmethod
+    def parse_url(url):
+        """
+        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:
+            # Allow fall-back to be from URL
+            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')))
+        return results
+
+    @property
+    def path(self):
+        """
+        return the filename
+        """
+        if not self.exists():
+            # we could not obtain our path
+            return None
+
+        return self._name
+
+    def __len__(self):
+        """
+        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'.
+        True is returned if our content was downloaded correctly.
+        """
+
+        return self.exists()
diff --git a/libs/apprise/cli.py b/libs/apprise/cli.py
index 11a6cbc2b..121fc95f4 100644
--- a/libs/apprise/cli.py
+++ b/libs/apprise/cli.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,26 +27,28 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import click
+import textwrap
 import logging
 import platform
 import sys
 import os
+import shutil
 import re
 
 from os.path import isfile
 from os.path import exists
-from os.path import expanduser
-from os.path import expandvars
 
-from . import NotifyType
-from . import NotifyFormat
 from . import Apprise
 from . import AppriseAsset
 from . import AppriseConfig
+from . import PersistentStore
 
-from .utils import parse_list
+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 .logger import logger
 
@@ -59,6 +61,29 @@ from . import __copywrite__
 # 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))
+
+# The default URL ID Length
+DEFAULT_STORAGE_UID_LENGTH = \
+    int(os.environ.get('APPRISE_STORAGE_UID_LENGTH', 8))
+
+# Defines the envrionment 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'
+
+# Defines the over-ride 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 over-ride 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'])
@@ -104,67 +129,94 @@ DEFAULT_PLUGIN_PATHS = (
     '/var/lib/apprise/plugins',
 )
 
+#
+# Persistent Storage
+#
+DEFAULT_STORAGE_PATH = '~/.local/share/apprise/cache'
+
 # Detect Windows
 if platform.system() == 'Windows':
     # Default Config Search Path for Windows Users
     DEFAULT_CONFIG_PATHS = (
-        expandvars('%APPDATA%\\Apprise\\apprise'),
-        expandvars('%APPDATA%\\Apprise\\apprise.conf'),
-        expandvars('%APPDATA%\\Apprise\\apprise.yml'),
-        expandvars('%APPDATA%\\Apprise\\apprise.yaml'),
-        expandvars('%LOCALAPPDATA%\\Apprise\\apprise'),
-        expandvars('%LOCALAPPDATA%\\Apprise\\apprise.conf'),
-        expandvars('%LOCALAPPDATA%\\Apprise\\apprise.yml'),
-        expandvars('%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\
-        expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise'),
-        expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise.conf'),
-        expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise.yml'),
-        expandvars('%ALLUSERSPROFILE%\\Apprise\\apprise.yaml'),
+        # C:\ProgramData\Apprise
+        '%ALLUSERSPROFILE%\\Apprise\\apprise',
+        '%ALLUSERSPROFILE%\\Apprise\\apprise.conf',
+        '%ALLUSERSPROFILE%\\Apprise\\apprise.yml',
+        '%ALLUSERSPROFILE%\\Apprise\\apprise.yaml',
 
         # C:\Program Files\Apprise
-        expandvars('%PROGRAMFILES%\\Apprise\\apprise'),
-        expandvars('%PROGRAMFILES%\\Apprise\\apprise.conf'),
-        expandvars('%PROGRAMFILES%\\Apprise\\apprise.yml'),
-        expandvars('%PROGRAMFILES%\\Apprise\\apprise.yaml'),
+        '%PROGRAMFILES%\\Apprise\\apprise',
+        '%PROGRAMFILES%\\Apprise\\apprise.conf',
+        '%PROGRAMFILES%\\Apprise\\apprise.yml',
+        '%PROGRAMFILES%\\Apprise\\apprise.yaml',
 
         # C:\Program Files\Common Files
-        expandvars('%COMMONPROGRAMFILES%\\Apprise\\apprise'),
-        expandvars('%COMMONPROGRAMFILES%\\Apprise\\apprise.conf'),
-        expandvars('%COMMONPROGRAMFILES%\\Apprise\\apprise.yml'),
-        expandvars('%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 = (
-        expandvars('%APPDATA%\\Apprise\\plugins'),
-        expandvars('%LOCALAPPDATA%\\Apprise\\plugins'),
+        '%APPDATA%\\Apprise\\plugins',
+        '%LOCALAPPDATA%\\Apprise\\plugins',
 
         #
         # Global Support
         #
 
         # C:\ProgramData\Apprise\plugins
-        expandvars('%ALLUSERSPROFILE%\\Apprise\\plugins'),
+        '%ALLUSERSPROFILE%\\Apprise\\plugins',
         # C:\Program Files\Apprise\plugins
-        expandvars('%PROGRAMFILES%\\Apprise\\plugins'),
+        '%PROGRAMFILES%\\Apprise\\plugins',
         # C:\Program Files\Common Files
-        expandvars('%COMMONPROGRAMFILES%\\Apprise\\plugins'),
+        '%COMMONPROGRAMFILES%\\Apprise\\plugins',
     )
 
+    #
+    # Persistent Storage
+    #
+    DEFAULT_STORAGE_PATH = '%APPDATA%/Apprise/cache'
 
-def print_help_msg(command):
-    """
-    Prints help message when -h or --help is specified.
 
+class PersistentStorageMode:
     """
-    with click.Context(command) as ctx:
-        click.echo(command.get_help(ctx))
+    Persistent Storage Modes
+    """
+    # List all detected configuration loaded
+    LIST = 'list'
+
+    # Prune persistent storage based on age
+    PRUNE = 'prune'
+
+    # Reset all (reguardless of age)
+    CLEAR = 'clear'
+
+
+# Define the types in a list for validation purposes
+PERSISTENT_STORAGE_MODES = (
+    PersistentStorageMode.LIST,
+    PersistentStorageMode.PRUNE,
+    PersistentStorageMode.CLEAR,
+)
+
+if os.environ.get('APPRISE_STORAGE_PATH', '').strip():
+    # Over-ride Default Storage Path
+    DEFAULT_STORAGE_PATH = os.environ.get('APPRISE_STORAGE_PATH')
 
 
 def print_version_msg():
@@ -180,7 +232,113 @@ def print_version_msg():
     click.echo('\n'.join(result))
 
 
-@click.command(context_settings=CONTEXT_SETTINGS)
+class CustomHelpCommand(click.Command):
+    def format_help(self, ctx, formatter):
+        formatter.write_text('Usage:')
+        formatter.write_text(
+            '   apprise [OPTIONS] [APPRISE_URL [APPRISE_URL2 [APPRISE_URL3]]]')
+        formatter.write_text(
+            '   apprise storage [OPTIONS] [ACTION] [UID1 [UID2 [UID3]]]')
+
+        # Custom help message
+        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')
+
+        for line in content:
+            formatter.write_text(line)
+
+        # Display options and arguments in the default format
+        self.format_options(ctx, formatter)
+        self.format_epilog(ctx, formatter)
+
+        # Custom 'Actions:' section after the 'Options:'
+        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',
+            )],
+        )]
+
+        #
+        # Some variables
+        #
+
+        # actions are indented this many spaces
+        # sub actions double this value
+        action_indent = 2
+
+        # label padding (for alignment)
+        action_label_width = 10
+
+        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
+            # 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))
+            for no, line in enumerate(formatted_description):
+                if not no:
+                    formatter.write_text(
+                        f'{ai}{action:<{action_label_width}}{line}')
+
+                else:  # pragma: no cover
+                    # Note: no branch is set intentionally since this is not
+                    #       tested since in 2025.08.13 when this was set up
+                    #       it never entered this area of the code.  But we
+                    #       know it works because we repeat this process with
+                    #       our sub-options below
+                    formatter.write_text(
+                        f'{ai}{space:<{action_label_width}}{line}')
+
+            # Format each subaction
+            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)))
+
+                for no, line in enumerate(formatted_description):
+                    if not no:
+                        formatter.write_text(
+                            f'{ai}{action:<{action_label_width}}{line}')
+                    else:
+                        formatter.write_text(
+                            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>.')
@@ -188,25 +346,47 @@ def print_version_msg():
               help='Specify the message title. This field is complete '
               'optional.')
 @click.option('--plugin-path', '-P', default=None, type=str, multiple=True,
-              metavar='PLUGIN_PATH',
+              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=NotifyType.INFO, type=str,
+@click.option('--notification-type', '-n', default=NOTIFY_TYPES[0], type=str,
               metavar='TYPE',
               help='Specify the message type (default={}). '
               'Possible values are "{}", and "{}".'.format(
-                  NotifyType.INFO, '", "'.join(NOTIFY_TYPES[:-1]),
+                  NOTIFY_TYPES[0], '", "'.join(NOTIFY_TYPES[:-1]),
                   NOTIFY_TYPES[-1]))
-@click.option('--input-format', '-i', default=NotifyFormat.TEXT, type=str,
+@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(
-                  NotifyFormat.TEXT, '", "'.join(NOTIFY_FORMATS[:-1]),
+                  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.')
@@ -241,10 +421,12 @@ def print_version_msg():
               help='Display the apprise version and exit.')
 @click.argument('urls', nargs=-1,
                 metavar='SERVER_URL [SERVER_URL2 [SERVER_URL3]]',)
-def main(body, title, config, attach, urls, notification_type, theme, tag,
+@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, debug,
-         version):
+         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.
@@ -253,7 +435,7 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
     use them, check out at 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 sys.exit()
+    #       want to return a specific error code, you must call ctx.exit()
     #       as you will see below.
 
     debug = True if debug else False
@@ -297,32 +479,96 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
 
     if version:
         print_version_msg()
-        sys.exit(0)
+        ctx.exit(0)
 
     # Simple Error Checking
     notification_type = notification_type.strip().lower()
     if notification_type not in NOTIFY_TYPES:
-        logger.error(
+        click.echo(
             'The --notification-type (-n) value of {} is not supported.'
             .format(notification_type))
+        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
-        sys.exit(2)
+        ctx.exit(2)
 
     input_format = input_format.strip().lower()
     if input_format not in NOTIFY_FORMATS:
-        logger.error(
+        click.echo(
             'The --input-format (-i) value of {} is not supported.'
             .format(input_format))
+        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
-        sys.exit(2)
+        ctx.exit(2)
 
-    if not plugin_path:
-        # Prepare a default set of plugin path
-        plugin_path = \
-            next((path for path in DEFAULT_PLUGIN_PATHS
-                 if exists(expanduser(path))), None)
+    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))
+        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
+    #
+    _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}')
+        logger.debug(
+            '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
+    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())
+
+    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()
+
+    #
+    # Continue with initialization process
+    #
+
+    # 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
+
+    if storage_uid_length < 2:
+        click.echo(
+            'The --storage-uid-length (-SUL) value can not be lower '
+            'then two (2).')
+        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)
 
     # Prepare our asset
     asset = AppriseAsset(
@@ -345,12 +591,24 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
         async_mode=disable_async is not True,
 
         # Load our plugins
-        plugin_paths=plugin_path,
+        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
     )
 
     # 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
+
     if details:
         # Print details and exit
         results = a.details(show_requirements=True, show_disabled=True)
@@ -429,17 +687,16 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
             # new line padding between entries
             click.echo()
 
-        sys.exit(0)
+        ctx.exit(0)
         # end if details()
 
     # The priorities of what is accepted are parsed in order below:
     #    1. URLs by command line
     #    2. Configuration by command line
     #    3. URLs by environment variable: APPRISE_URLS
-    #    4. Configuration by environment variable: APPRISE_CONFIG
-    #    5. Default Configuration File(s) (if found)
+    #    4. Default Configuration File(s)
     #
-    if urls:
+    elif urls and not storage_action:
         if tag:
             # Ignore any tags specified
             logger.warning(
@@ -462,8 +719,10 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
         a.add(AppriseConfig(
             paths=config, asset=asset, recursion=recursion_depth))
 
-    elif os.environ.get('APPRISE_URLS', '').strip():
-        logger.debug('Loading provided APPRISE_URLS environment variable')
+    elif os.environ.get(DEFAULT_ENV_APPRISE_URLS, '').strip():
+        logger.debug(
+            f'Loading provided {DEFAULT_ENV_APPRISE_URLS} environment '
+            'variable')
         if tag:
             # Ignore any tags specified
             logger.warning(
@@ -471,32 +730,153 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
             tag = None
 
         # Attempt to use our APPRISE_URLS environment variable (if populated)
-        a.add(os.environ['APPRISE_URLS'].strip())
-
-    elif os.environ.get('APPRISE_CONFIG', '').strip():
-        logger.debug('Loading provided APPRISE_CONFIG environment variable')
-        # Fall back to config environment variable (if populated)
-        a.add(AppriseConfig(
-            paths=os.environ['APPRISE_CONFIG'].strip(),
-            asset=asset, recursion=recursion_depth))
+        a.add(os.environ[DEFAULT_ENV_APPRISE_URLS].strip())
 
     else:
         # Load default configuration
         a.add(AppriseConfig(
-            paths=[f for f in DEFAULT_CONFIG_PATHS if isfile(expanduser(f))],
+            paths=[f for f in _config_paths if isfile(path_decode(f))],
             asset=asset, recursion=recursion_depth))
 
-    if len(a) == 0 and not urls:
-        logger.error(
+    if not dry_run and not (a or storage_action):
+        click.echo(
             'You must specify at least one server URL or populated '
             'configuration file.')
-        print_help_msg(main)
-        sys.exit(1)
+        click.echo("Try 'apprise --help' for more information.")
+        ctx.exit(1)
 
     # each --tag entry comprises of a comma separated 'and' list
     # we or each of of the --tag and sets specified.
     tags = None if not tag else [parse_list(t) for t in tag]
 
+    # Determine if we're dealing with URLs or url_ids based on the first
+    # entry provided.
+    if storage_action:
+        #
+        # Storage Mode
+        #  - urls are now to be interpreted as best matching namespaces
+        #
+        if storage_prune_days < 0:
+            click.echo(
+                'The --storage-prune-days (-SPD) value can not be lower '
+                'then zero (0).')
+            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)
+
+        # 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
+        # 5 characters are already reserved for the counter on the left
+        (columns, _) = shutil.get_terminal_size(fallback=(80, 24))
+
+        # Pop 'storage' off of the head of our list
+        filter_uids = urls[1:]
+
+        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)
+
+            if _action:
+                # pop 'action' off the head of our list
+                filter_uids = filter_uids[1:]
+                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:
+                continue
+
+            if filter_uids and next(
+                    (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,
+                }
+
+            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)
+
+        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
+
+                elif not tags:
+                    uids[_id] = {
+                        'plugins': [],
+                        # No cross reference (wasted space?)
+                        'state': PersistentStoreState.STALE,
+                        # Acquire disk space
+                        'size': size,
+                    }
+
+            for idx, (uid, meta) in enumerate(uids.items()):
+                fg = "green" \
+                    if meta['state'] == PersistentStoreState.ACTIVE else (
+                        "red"
+                        if meta['state'] == PersistentStoreState.STALE 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']:
+                    url = entry.url(privacy=True)
+                    click.echo("{:>7} {}".format(
+                        '-',
+                        url if len(url) <= (columns - 8) else '{}...'.format(
+                            url[:columns - 11])))
+
+                    if entry.tags:
+                        click.echo("{:>10}: {}".format(
+                            'tags', ', '.join(entry.tags)))
+
+        else:  # PersistentStorageMode.PRUNE or PersistentStorageMode.CLEAR
+            if action == PersistentStorageMode.CLEAR:
+                storage_prune_days = 0
+
+            # clean up storage
+            results = PersistentStore.disk_prune(
+                # 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,
+                # Convert expiry from days to seconds
+                expires=storage_prune_days * 60 * 60 * 24,
+                action=not dry_run)
+
+            ctx.exit(0)
+            # end if disk_prune()
+
+        ctx.exit(0)
+        # end if storage()
+
     if not dry_run:
         if body is None:
             logger.trace('No --body (-b) specified; reading from stdin')
@@ -508,10 +888,10 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
             body=body, title=title, notify_type=notification_type, tag=tags,
             attach=attach)
     else:
-        # Number of rows to assume in the terminal.  In future, maybe this can
-        # be detected and made dynamic. The actual row count is 80, but 5
-        # characters are already reserved for the counter on the left
-        rows = 75
+        # 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
+        # 5 characters are already reserved for the counter on the left
+        (columns, _) = shutil.get_terminal_size(fallback=(80, 24))
 
         # Initialize our URL response;  This is populated within the for/loop
         # below; but plays a factor at the end when we need to determine if
@@ -520,11 +900,18 @@ def main(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("{: 3d}. {}".format(
+            click.echo("{: 4d}. {}".format(
                 idx + 1,
-                url if len(url) <= rows else '{}...'.format(url[:rows - 3])))
+                url if len(url) <= (columns - 8) else '{}...'.format(
+                    url[:columns - 9])))
+
+            # Share our URL ID
+            click.echo("{:>10}: {}".format(
+                'uid', '- n/a -' if not server.url_id()
+                else server.url_id()))
+
             if server.tags:
-                click.echo("{} - {}".format(' ' * 5, ', '.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
@@ -537,11 +924,11 @@ def main(body, title, config, attach, urls, notification_type, theme, tag,
 
         # Exit code 3 is used since Click uses exit code 2 if there is an
         # error with the parameters specified
-        sys.exit(3)
+        ctx.exit(3)
 
     elif result is False:
         # At least 1 notification service failed to send
-        sys.exit(1)
+        ctx.exit(1)
 
     # else:  We're good!
-    sys.exit(0)
+    ctx.exit(0)
diff --git a/libs/apprise/common.py b/libs/apprise/common.py
index d6fe2cd0d..9b8e993c2 100644
--- a/libs/apprise/common.py
+++ b/libs/apprise/common.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -187,6 +187,42 @@ CONTENT_LOCATIONS = (
     ContentLocation.INACCESSIBLE,
 )
 
+
+class PersistentStoreMode:
+    # Allow persistent storage; write on demand
+    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'
+
+    # memory based store only
+    MEMORY = 'memory'
+
+
+PERSISTENT_STORE_MODES = (
+    PersistentStoreMode.AUTO,
+    PersistentStoreMode.FLUSH,
+    PersistentStoreMode.MEMORY,
+)
+
+
+class PersistentStoreState:
+    """
+    Defines the persistent states describing what has been cached
+    """
+    # Persistent Directory is actively cross-referenced against a matching URL
+    ACTIVE = 'active'
+
+    # Persistent Directory is no longer being used or has no cross-reference
+    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'
+
+
 # This is a reserved tag that is automatically assigned to every
 # Notification Plugin
 MATCH_ALL_TAG = 'all'
diff --git a/libs/apprise/config/__init__.py b/libs/apprise/config/__init__.py
index efbace687..edcc55079 100644
--- a/libs/apprise/config/__init__.py
+++ b/libs/apprise/config/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,8 +27,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Used for testing
-from .ConfigBase import ConfigBase
-from ..ConfigurationManager import ConfigurationManager
+from .base import ConfigBase
+from ..manager_config import ConfigurationManager
 
 # Initalize our Config Manager Singleton
 C_MGR = ConfigurationManager()
@@ -36,4 +36,5 @@ C_MGR = ConfigurationManager()
 __all__ = [
     # Reference
     'ConfigBase',
+    'ConfigurationManager',
 ]
diff --git a/libs/apprise/config/ConfigBase.py b/libs/apprise/config/base.py
similarity index 99%
rename from libs/apprise/config/ConfigBase.py
rename to libs/apprise/config/base.py
index 32e1bde34..5aa64312b 100644
--- a/libs/apprise/config/ConfigBase.py
+++ b/libs/apprise/config/base.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,15 +33,12 @@ import time
 
 from .. import plugins
 from .. import common
-from ..AppriseAsset import AppriseAsset
-from ..URLBase import URLBase
-from ..ConfigurationManager import ConfigurationManager
-from ..utils import GET_SCHEMA_RE
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import parse_urls
-from ..utils import cwe312_url
-from ..NotificationManager import NotificationManager
+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 ..manager_config import ConfigurationManager
+from ..manager_plugins import NotificationManager
 
 # Test whether token is valid or not
 VALID_TOKEN = re.compile(
diff --git a/libs/apprise/config/ConfigBase.pyi b/libs/apprise/config/base.pyi
similarity index 100%
rename from libs/apprise/config/ConfigBase.pyi
rename to libs/apprise/config/base.pyi
diff --git a/libs/apprise/config/ConfigFile.py b/libs/apprise/config/file.py
similarity index 94%
rename from libs/apprise/config/ConfigFile.py
rename to libs/apprise/config/file.py
index 172d699f8..3edd6d9a9 100644
--- a/libs/apprise/config/ConfigFile.py
+++ b/libs/apprise/config/file.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,10 +28,11 @@
 
 import re
 import os
-from .ConfigBase import ConfigBase
+from .base import ConfigBase
+from ..utils.disk import path_decode
 from ..common import ConfigFormat
 from ..common import ContentIncludeMode
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class ConfigFile(ConfigBase):
@@ -59,7 +60,10 @@ class ConfigFile(ConfigBase):
         super().__init__(**kwargs)
 
         # Store our file path as it was set
-        self.path = os.path.abspath(os.path.expanduser(path))
+        self.path = path_decode(path)
+
+        # Track the file as it was saved
+        self.__original_path = os.path.normpath(path)
 
         # Update the config path to be relative to our file we just loaded
         self.config_path = os.path.dirname(self.path)
@@ -89,7 +93,7 @@ class ConfigFile(ConfigBase):
             params['format'] = self.config_format
 
         return 'file://{path}{params}'.format(
-            path=self.quote(self.path),
+            path=self.quote(self.__original_path),
             params='?{}'.format(self.urlencode(params)) if params else '',
         )
 
diff --git a/libs/apprise/config/ConfigHTTP.py b/libs/apprise/config/http.py
similarity index 98%
rename from libs/apprise/config/ConfigHTTP.py
rename to libs/apprise/config/http.py
index f6faba8d4..b9c83510a 100644
--- a/libs/apprise/config/ConfigHTTP.py
+++ b/libs/apprise/config/http.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,11 +28,11 @@
 
 import re
 import requests
-from .ConfigBase import ConfigBase
+from .base import ConfigBase
 from ..common import ConfigFormat
 from ..common import ContentIncludeMode
-from ..URLBase import PrivacyMode
-from ..AppriseLocale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..locale import gettext_lazy as _
 
 # Support YAML formats
 # text/yaml
diff --git a/libs/apprise/config/ConfigMemory.py b/libs/apprise/config/memory.py
similarity index 95%
rename from libs/apprise/config/ConfigMemory.py
rename to libs/apprise/config/memory.py
index 413956dfc..b2d70096e 100644
--- a/libs/apprise/config/ConfigMemory.py
+++ b/libs/apprise/config/memory.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,8 +26,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .ConfigBase import ConfigBase
-from ..AppriseLocale import gettext_lazy as _
+from .base import ConfigBase
+from ..locale import gettext_lazy as _
 
 
 class ConfigMemory(ConfigBase):
diff --git a/libs/apprise/conversion.py b/libs/apprise/conversion.py
index 4d5632f59..7f691eae4 100644
--- a/libs/apprise/conversion.py
+++ b/libs/apprise/conversion.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,7 +29,7 @@
 import re
 from markdown import markdown
 from .common import NotifyFormat
-from .URLBase import URLBase
+from .url import URLBase
 
 from html.parser import HTMLParser
 
@@ -180,8 +180,10 @@ class HTMLConverter(HTMLParser, object):
             self._result.append('\n')
 
         elif tag == 'hr':
-            if self._result:
+            if self._result and isinstance(self._result[-1], str):
                 self._result[-1] = self._result[-1].rstrip(' ')
+            else:
+                pass
 
             self._result.append('\n---\n')
 
diff --git a/libs/apprise/decorators/__init__.py b/libs/apprise/decorators/__init__.py
index db9a15a01..bba1b3b06 100644
--- a/libs/apprise/decorators/__init__.py
+++ b/libs/apprise/decorators/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/decorators/CustomNotifyPlugin.py b/libs/apprise/decorators/base.py
similarity index 95%
rename from libs/apprise/decorators/CustomNotifyPlugin.py
rename to libs/apprise/decorators/base.py
index eb5f17b78..82b90f18d 100644
--- a/libs/apprise/decorators/CustomNotifyPlugin.py
+++ b/libs/apprise/decorators/base.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,12 +27,10 @@
 # POSSIBILITY OF SUCH DAMAGE.USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from ..plugins.NotifyBase import NotifyBase
-from ..NotificationManager import NotificationManager
-from ..utils import URL_DETAILS_RE
-from ..utils import parse_url
-from ..utils import url_assembly
-from ..utils import dict_full_update
+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
 from .. import common
 from ..logger import logger
 import inspect
@@ -55,6 +53,12 @@ class CustomNotifyPlugin(NotifyBase):
     # should be treated differently.
     category = 'custom'
 
+    # Support Attachments
+    attachment_support = True
+
+    # Allow persistent storage support
+    storage_mode = common.PersistentStoreMode.AUTO
+
     # Define object templates
     templates = (
         '{schema}://',
diff --git a/libs/apprise/decorators/notify.py b/libs/apprise/decorators/notify.py
index 2dd5f5099..41e49de85 100644
--- a/libs/apprise/decorators/notify.py
+++ b/libs/apprise/decorators/notify.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,7 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .CustomNotifyPlugin import CustomNotifyPlugin
+from .base import CustomNotifyPlugin
 
 
 def notify(on, name=None):
diff --git a/libs/apprise/emojis.py b/libs/apprise/emojis.py
index d8a824813..6b9f2dec0 100644
--- a/libs/apprise/emojis.py
+++ b/libs/apprise/emojis.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/exception.py b/libs/apprise/exception.py
new file mode 100644
index 000000000..216e5cc74
--- /dev/null
+++ b/libs/apprise/exception.py
@@ -0,0 +1,61 @@
+# -*- 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.
+import errno
+
+
+class AppriseException(Exception):
+    """
+    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
+    """
+    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
+    """
+    def __init__(self, message, error_code=errno.EIO):
+        super().__init__(message, error_code=error_code)
+
+
+class AppriseFileNotFound(AppriseDiskIOError, FileNotFoundError):
+    """
+    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/en/LC_MESSAGES/apprise.mo b/libs/apprise/i18n/en/LC_MESSAGES/apprise.mo
index 1d22b89a6..8eafd6512 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/AppriseLocale.py b/libs/apprise/locale.py
similarity index 99%
rename from libs/apprise/AppriseLocale.py
rename to libs/apprise/locale.py
index e900ce5bc..f113cf560 100644
--- a/libs/apprise/AppriseLocale.py
+++ b/libs/apprise/locale.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/logger.py b/libs/apprise/logger.py
index d9efe47c9..c8c9d6710 100644
--- a/libs/apprise/logger.py
+++ b/libs/apprise/logger.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/manager.py b/libs/apprise/manager.py
index c2b715d4f..d44357be4 100644
--- a/libs/apprise/manager.py
+++ b/libs/apprise/manager.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,9 +33,10 @@ import time
 import hashlib
 import inspect
 import threading
-from .utils import import_module
-from .utils import Singleton
-from .utils import parse_list
+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
@@ -61,6 +62,9 @@ class PluginManager(metaclass=Singleton):
     # 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]+))$')
+
     # thread safe loading
     _lock = threading.Lock()
 
@@ -177,7 +181,7 @@ class PluginManager(metaclass=Singleton):
             # The .py extension is optional as we support loading directories
             # too
             module_re = re.compile(
-                r'^(?P<name>' + self.fname_prefix + r'[a-z0-9]+)(\.py)?$',
+                r'^(?P<name>(?!base|_)[a-z0-9_]+)(\.py)?$',
                 re.I)
 
             t_start = time.time()
@@ -188,10 +192,6 @@ class PluginManager(metaclass=Singleton):
                     # keep going
                     continue
 
-                elif match.group('name') == f'{self.fname_prefix}Base':
-                    # keep going
-                    continue
-
                 # Store our notification/plugin name:
                 module_name = match.group('name')
                 module_pyname = '{}.{}'.format(module_name_prefix, module_name)
@@ -216,7 +216,49 @@ class PluginManager(metaclass=Singleton):
                         # logging found in import_module and not needed here
                         continue
 
-                if not hasattr(module, module_name):
+                module_class = None
+                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'):
+                        # 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))
+                        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,
+                    }
+
+                    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))
+                            continue
+
+                        # Assign plugin
+                        self._schema_map[schema] = plugin
+
+                    # Store our class
+                    module_class = m_class
+                    break
+
+                if not module_class:
                     # Not a library we can load as it doesn't follow the simple
                     # rule that the class must bear the same name as the
                     # notification file itself.
@@ -226,38 +268,6 @@ class PluginManager(metaclass=Singleton):
                         self.name, module_name, os.path.join(module_path, f))
                     continue
 
-                # Get our plugin
-                plugin = getattr(module, module_name)
-                if not hasattr(plugin, 'app_id'):
-                    # Filter out non-notification modules
-                    logger.trace(
-                        "(%s) import failed; no app_id defined in %s",
-                        self.name, module_name, 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,
-                }
-
-                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 - {} to {}"
-                            .format(self.name, schema, self._schema_map,
-                                    plugin))
-                        continue
-
-                    # Assign plugin
-                    self._schema_map[schema] = plugin
-
                 logger.trace(
                     '{} {} loaded in {:.6f}s'.format(
                         self.name, module_name, (time.time() - tl_start)))
@@ -366,7 +376,7 @@ class PluginManager(metaclass=Singleton):
             return
 
         for _path in paths:
-            path = os.path.abspath(os.path.expanduser(_path))
+            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
diff --git a/libs/apprise/AttachmentManager.py b/libs/apprise/manager_attachment.py
similarity index 90%
rename from libs/apprise/AttachmentManager.py
rename to libs/apprise/manager_attachment.py
index d296a4996..ffd31ebc9 100644
--- a/libs/apprise/AttachmentManager.py
+++ b/libs/apprise/manager_attachment.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,6 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import re
 from os.path import dirname
 from os.path import abspath
 from os.path import join
@@ -52,3 +53,7 @@ class AttachmentManager(PluginManager):
 
     # 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]+)$')
diff --git a/libs/apprise/ConfigurationManager.py b/libs/apprise/manager_config.py
similarity index 90%
rename from libs/apprise/ConfigurationManager.py
rename to libs/apprise/manager_config.py
index 6696895b9..d7b0fe083 100644
--- a/libs/apprise/ConfigurationManager.py
+++ b/libs/apprise/manager_config.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,6 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import re
 from os.path import dirname
 from os.path import abspath
 from os.path import join
@@ -52,3 +53,7 @@ class ConfigurationManager(PluginManager):
 
     # 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]+)$')
diff --git a/libs/apprise/NotificationManager.py b/libs/apprise/manager_plugins.py
similarity index 89%
rename from libs/apprise/NotificationManager.py
rename to libs/apprise/manager_plugins.py
index abbbdd203..0eb5465e7 100644
--- a/libs/apprise/NotificationManager.py
+++ b/libs/apprise/manager_plugins.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,6 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import re
 from os.path import dirname
 from os.path import abspath
 from os.path import join
@@ -52,3 +53,8 @@ class NotificationManager(PluginManager):
 
     # 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]+)$')
diff --git a/libs/apprise/persistent_store.py b/libs/apprise/persistent_store.py
new file mode 100644
index 000000000..8299d6f45
--- /dev/null
+++ b/libs/apprise/persistent_store.py
@@ -0,0 +1,1676 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 Chris Caron <lead2gold@gmail.com>
+# All rights reserved.
+#
+# This code is licensed under the MIT License.
+#
+# 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.
+import os
+import re
+import gzip
+import zlib
+import base64
+import glob
+import tempfile
+import json
+import binascii
+from . import exception
+from itertools import chain
+from datetime import datetime, timezone, timedelta
+import time
+import hashlib
+from .common import PersistentStoreMode, PERSISTENT_STORE_MODES
+from .utils.disk import path_decode
+from .logger import logger
+
+# 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'
+
+
+def _ntf_tidy(ntf):
+    """
+    Reusable NamedTemporaryFile cleanup
+    """
+    if ntf:
+        # Cleanup
+        try:
+            ntf.close()
+
+        except OSError:
+            # Already closed
+            pass
+
+        try:
+            os.unlink(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:
+            logger.error(
+                'Persistent temporary file removal failed: %s',
+                ntf.name)
+            logger.debug(
+                'Persistent Storage Exception: %s', str(e))
+
+
+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
+        """
+
+        self.__value = value
+        self.__class_name = value.__class__.__name__
+        self.__expires = None
+
+        if expires:
+            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
+
+        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
+        self.__class_name = value.__class__.__name__
+        if expires is not None:
+            self.set_expiry(expires)
+
+        if persistent is not None:
+            self.__persistent = True if persistent else False
+
+    def set_expiry(self, expires=None):
+        """
+        Sets a new expiry
+        """
+
+        if isinstance(expires, datetime):
+            self.__expires = expires.astimezone(timezone.utc)
+
+        elif expires in (None, False):
+            # Accepted - no expiry
+            self.__expires = None
+
+        elif expires is True:
+            # Force expiry to now
+            self.__expires = datetime.now(tz=timezone.utc)
+
+        elif isinstance(expires, (float, int)):
+            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()
+
+        except TypeError:
+            # Python <= v3.8 - usedforsecurity flag does not work
+            return self.hash_engine(str(self).encode('utf-8')).hexdigest()
+
+    def json(self):
+        """
+        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],
+        }
+
+    @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
+
+        """
+        try:
+            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', '')
+            if not isinstance(class_name, str):
+                raise TypeError('Class name not expected string')
+
+            hashsum = content.get('!', '')
+            if not isinstance(hashsum, str):
+                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))
+            return None
+
+        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
+            try:
+                # Python v3.6 Support
+                value = datetime.strptime(value, iso_format)
+
+            except (TypeError, ValueError):
+                # 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}')
+                return None
+
+        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}')
+                return None
+
+        # Initialize our object
+        co = CacheObject(value, expires, persistent=persistent)
+        if verify and co.hash()[:co.hash_length] != hashsum:
+            # Our object was tampered with
+            logger.debug(f'Tampering detected with cache entry {co}')
+            del co
+            return None
+
+        return co
+
+    @property
+    def value(self):
+        """
+        Returns our value
+        """
+        return self.__value
+
+    @property
+    def persistent(self):
+        """
+        Returns our persistent value
+        """
+        return self.__persistent
+
+    @property
+    def expires(self):
+        """
+        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 __bool__(self):
+        """
+        Returns True it the object hasn't expired, and False if it has
+        """
+        if self.__expires is None:
+            # No Expiry
+            return True
+
+        # Calculate if we've expired or not
+        return self.__expires > datetime.now(tz=timezone.utc)
+
+    def __eq__(self, other):
+        """
+        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))
+
+
+class CacheJSONEncoder(json.JSONEncoder):
+    """
+    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)
+
+        elif isinstance(entry, CacheObject):
+            return entry.json()
+
+        elif isinstance(entry, bytes):
+            return base64.b64encode(entry).decode('utf-8')
+
+        return super().default(entry)
+
+
+class PersistentStore:
+    """
+    An object to make working with persistent storage easier
+
+    read() and write() are used for direct file i/o
+
+    set(), get() are used for caching
+    """
+
+    # The maximum file-size we will allow the persistent store to grow to
+    # 1 MB = 1048576 bytes
+    max_file_size = 1048576
+
+    # 30 days in seconds
+    default_file_expiry = 2678400
+
+    # File encoding to use
+    encoding = 'utf-8'
+
+    # Default data set
+    base_key = 'default'
+
+    # Directory to store cache
+    __cache_key = 'cache'
+
+    # Our Temporary working directory
+    temp_dir = 'tmp'
+
+    # The directory our persistent store content gets placed in
+    data_dir = 'var'
+
+    # Our Persistent Store File Extension
+    __extension = '.psdata'
+
+    # Identify our backup file extension
+    __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)
+
+    # 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.
+        """
+        # Initalize our mode so __del__() calls don't go bad on the
+        # error checking below
+        self.__mode = None
+
+        # Populated only once and after size() is called
+        self.__exclude_list = None
+
+        # Files to renew on calls to flush
+        self.__renew = set()
+
+        if not isinstance(namespace, str) \
+                or not self.__valid_key.match(namespace):
+            raise AttributeError(
+                f"Persistent Storage namespace ({namespace}) provided is"
+                " 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]
+
+            # Store our information
+            self.__base_path = os.path.join(path_decode(path), namespace)
+            self.__temp_path = os.path.join(self.__base_path, self.temp_dir)
+            self.__data_path = os.path.join(self.__base_path, self.data_dir)
+
+        else:  # If no storage path is provide we set our mode to MEMORY
+            mode = PersistentStoreMode.MEMORY
+            self.__base_path = 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
+
+        # A caching value to track persistent storage disk size
+        self.__cache_size = None
+        self.__cache_files = {}
+
+        # Internal Cache
+        self._cache = None
+
+        # Prepare our environment
+        self.__prepare()
+
+    def read(self, key=None, compress=True, expires=False):
+        """
+        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.
+
+        Content is always returned as a byte object
+        """
+        try:
+            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}"))
+
+                return results
+
+        except (FileNotFoundError, exception.AppriseDiskIOError):
+            # FileNotFoundError: No problem
+            # exception.AppriseDiskIOError:
+            #   - Logging of error already occurred inside self.open()
+            pass
+
+        except (OSError, zlib.error, EOFError, UnicodeDecodeError,
+                IOError) 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))
+
+        # 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
+        filesize limit.
+
+        Content is always written as a byte object
+
+        _recovery is reserved for internal usage and should not be changed
+        """
+
+        if key is None:
+            key = self.base_key
+
+        elif not isinstance(key, str) or not self.__valid_key.match(key):
+            raise AttributeError(
+                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'))):
+                raise AttributeError(
+                    "Invalid data type {} provided to Persistent Storage"
+                    .format(type(data)))
+
+            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)))
+
+            except Exception as e:
+                logger.warning(
+                    '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)))
+
+        if self.__mode == PersistentStoreMode.MEMORY:
+            # Nothing further can be done
+            return False
+
+        if _recovery:
+            # Attempt to recover from a bad directory structure or setup
+            self.__prepare()
+
+        # generate our filename based on the key provided
+        io_file = os.path.join(self.__data_path, f"{key}{self.__extension}")
+
+        # Calculate the files current filesize
+        try:
+            prev_size = os.stat(io_file).st_size
+
+        except FileNotFoundError:
+            # No worries, no size to accomodate
+            prev_size = 0
+
+        except (OSError, IOError) 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))
+            return False
+
+        # Create a temporary file to write our content into
+        # ntf = NamedTemporaryFile
+        ntf = None
+        new_file_size = 0
+        try:
+            if isinstance(data, str):
+                data = data.encode(self.encoding)
+
+            ntf = tempfile.NamedTemporaryFile(
+                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
+
+            with _open(ntf.name, mode='wb') as fd:
+                # Write our content
+                fd.write(data)
+
+            # Get our file size
+            new_file_size = os.stat(ntf.name).st_size
+
+            # Log our progress
+            logger.trace(
+                '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)
+
+            # We've already made our best effort to recover if we are here in
+            # our code base... we're going to have to exit
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+
+            # Early Exit
+            return False
+
+        except (OSError, UnicodeEncodeError, IOError, 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))
+
+            # 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:
+            # 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)))
+            return False
+
+        # Return our final move
+        if not self.__move(ntf.name, io_file):
+            # Attempt to restore things as they were
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+            return False
+
+        # Resetour reference variables
+        self.__cache_size = None
+        self.__cache_files.clear()
+
+        # Content installed
+        return True
+
+    def __move(self, src, dst):
+        """
+        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
+
+        #
+        # Backup the old file (if it exists) allowing us to have a restore
+        # point in the event of a failure
+        #
+        try:
+            # 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)
+
+        except FileNotFoundError:
+            # no worries; we were removing it anyway
+            pass
+
+        except (OSError, IOError) 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))
+            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)
+
+        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:
+            # 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))
+            return False
+
+        #
+        # Now place the new file
+        #
+        try:
+            os.rename(src, dst)
+            logger.trace('Persistent file installed: %s', dst)
+
+        except (OSError, IOError) 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))
+            try:
+                # Restore our old backup (if it exists)
+                os.rename(dst_backup, dst)
+                logger.trace(
+                    'Restoring original persistent content: %s', dst)
+
+            except FileNotFoundError:
+                # Not a problem
+                pass
+
+            except (OSError, IOError) 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))
+
+            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
+        by the key provided.
+
+        If no key is provided, then the default is used
+        """
+
+        if key is None:
+            key = self.base_key
+
+        elif not isinstance(key, str) or not self.__valid_key.match(key):
+            raise AttributeError(
+                f"Persistent Storage key ({key} provided is invalid")
+
+        if self.__mode == PersistentStoreMode.MEMORY:
+            # Nothing further can be done
+            raise FileNotFoundError()
+
+        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)
+
+        except FileNotFoundError:
+            # pass along (but wrap with Apprise exception)
+            raise exception.AppriseFileNotFound(
+                f"No such file or directory: '{io_file}'")
+
+        except (OSError, IOError, 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
+        """
+
+        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:
+
+            # 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
+
+    def set(self, key, value, expires=None, persistent=True, lazy=True):
+        """
+        Cache reference
+        """
+
+        if self._cache is None and not self.__load_cache():
+            return False
+
+        cache = CacheObject(value, expires, persistent=persistent)
+        # Fetch our cache value
+        try:
+            if lazy and cache == self._cache[key]:
+                # We're done; nothing further to do
+                return True
+
+        except KeyError:
+            pass
+
+        # Store our new cache
+        self._cache[key] = CacheObject(value, expires, persistent=persistent)
+
+        # Set our dirty flag
+        self.__dirty = persistent
+
+        if self.__dirty and self.__mode == PersistentStoreMode.FLUSH:
+            # Flush changes to disk
+            return self.flush()
+
+        return True
+
+    def clear(self, *args):
+        """
+        Remove one or more cache entry by it's key
+
+            e.g: clear('key')
+                 clear('key1', 'key2', key-12')
+
+        Or clear everything:
+                 clear()
+        """
+        if self._cache is None and not self.__load_cache():
+            return False
+
+        if args:
+            for arg in args:
+
+                try:
+                    del self._cache[arg]
+
+                    # Set our dirty flag (if not set already)
+                    self.__dirty = True
+
+                except KeyError:
+                    pass
+
+        elif self._cache:
+            # Request to remove everything and there is something to remove
+
+            # Set our dirty flag (if not set already)
+            self.__dirty = True
+
+            # Reset our object
+            self._cache.clear()
+
+        if self.__dirty and self.__mode == PersistentStoreMode.FLUSH:
+            # Flush changes to disk
+            return self.flush()
+
+    def prune(self):
+        """
+        Eliminates expired cache entries
+        """
+        if self._cache is None and not self.__load_cache():
+            return False
+
+        change = False
+        for key in list(self._cache.keys()):
+            if key not in self:
+                # It's identified as being expired
+                if not change and self._cache[key].persistent:
+                    # track change only if content was persistent
+                    change = True
+
+                    # Set our dirty flag
+                    self.__dirty = True
+
+                del self._cache[key]
+
+        if self.__dirty and self.__mode == PersistentStoreMode.FLUSH:
+            # Flush changes to disk
+            return self.flush()
+
+        return change
+
+    def __load_cache(self, _recovery=False):
+        """
+        Loads our cache
+
+        _recovery is reserved for internal usage and should not be changed
+        """
+
+        # Prepare our dirty flag
+        self.__dirty = False
+
+        if self.__mode == PersistentStoreMode.MEMORY:
+            # Nothing further to do
+            self._cache = {}
+            return True
+
+        # Prepare our cache file
+        cache_file = self.cache_file
+        try:
+            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():
+                    co = CacheObject.instantiate(v)
+                    if co:
+                        # Verify our object before assigning it
+                        self._cache[k] = co
+
+                    elif not self.__dirty:
+                        # Track changes from our loadset
+                        self.__dirty = True
+
+        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)
+
+            if not _recovery:
+                try:
+                    os.unlink(cache_file)
+                    logger.trace(
+                        'Removed previous persistent cache content: %s',
+                        cache_file)
+
+                except FileNotFoundError:
+                    # no worries; we were removing it anyway
+                    pass
+
+                except (OSError, IOError) 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))
+                    return False
+                return self.__load_cache(_recovery=True)
+
+            return False
+
+        except FileNotFoundError:
+            # No problem; no cache to load
+            self._cache = {}
+
+        except (OSError, IOError) 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))
+            return False
+
+        # Ensure our dirty flag is set to False
+        return True
+
+    def __prepare(self, flush=True):
+        """
+        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:
+                # Permission error
+                logger.debug(
+                    '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
+
+            # Ensure our path exists
+            try:
+                os.makedirs(self.__temp_path, mode=0o770, exist_ok=True)
+
+            except (OSError, IOError) as e:
+                # Permission error
+                logger.debug(
+                    '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
+
+            try:
+                os.makedirs(self.__data_path, mode=0o770, exist_ok=True)
+
+            except (OSError, IOError) as e:
+                # Permission error
+                logger.debug(
+                    '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')
+
+            else:
+                if self._cache:
+                    # Recovery taking place
+                    self.__dirty = True
+                    logger.warning(
+                        '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
+        """
+
+        if self._cache is None or self.__mode == PersistentStoreMode.MEMORY:
+            # nothing to do
+            return True
+
+        while self.__renew:
+            # update our files
+            path = self.__renew.pop()
+            ftime = time.time()
+
+            try:
+                # (access_time, modify_time)
+                os.utime(path, (ftime, ftime))
+                logger.trace('file timestamp updated: %s', path)
+
+            except FileNotFoundError:
+                # No worries... move along
+                pass
+
+            except (OSError, IOError) 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))
+
+        if not force and self.__dirty is False:
+            # Nothing further to do
+            logger.trace('Persistent cache is consistent with memory map')
+            return True
+
+        if _recovery:
+            # Attempt to recover from a bad directory structure or setup
+            self.__prepare(flush=False)
+
+        # Unset our size lazy setting
+        self.__cache_size = None
+        self.__cache_files.clear()
+
+        # Prepare our cache file
+        cache_file = self.cache_file
+        if not self._cache:
+            #
+            # 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
+
+            try:
+                os.unlink(backup_file)
+                logger.trace(
+                    'Removed previous persistent cache backup: %s',
+                    backup_file)
+
+            except FileNotFoundError:
+                # no worries; we were removing it anyway
+                pass
+
+            except (OSError, IOError) 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))
+                return False
+
+            try:
+                os.rename(cache_file, backup_file)
+                logger.trace(
+                    '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:
+                # 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))
+                return False
+            return True
+
+        #
+        # If we get here, we need to update our file based cache
+        #
+
+        # ntf = NamedTemporaryFile
+        ntf = None
+
+        try:
+            ntf = tempfile.NamedTemporaryFile(
+                mode="w+", encoding=self.encoding, dir=self.__temp_path,
+                delete=False)
+
+            ntf.close()
+
+        except FileNotFoundError:
+            # This happens if the directory path is gone preventing the file
+            # from being created...
+            if not _recovery:
+                return self.flush(force=True, _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
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+
+            # Early Exit
+            return False
+
+        except OSError as e:
+            logger.error(
+                'Persistent temporary directory inaccessible: %s',
+                self.__temp_path)
+            logger.debug('Persistent Storage Exception: %s', str(e))
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+
+            # Early Exit
+            return False
+
+        try:
+            # write our content currently saved to disk to our temporary file
+            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))
+
+        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))
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+
+            # Early Exit
+            return 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))
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+
+            # Early Exit
+            return False
+
+        if not self.__move(ntf.name, cache_file):
+            # Attempt to restore things as they were
+
+            # Tidy our Named Temporary File
+            _ntf_tidy(ntf)
+            return False
+
+        # Ensure our dirty flag is set to False
+        self.__dirty = False
+
+        return True
+
+    def files(self, exclude=True, lazy=True):
+        """
+        Returns the total files
+        """
+
+        if lazy and exclude in self.__cache_files:
+            # Take an early exit with our cached results
+            return self.__cache_files[exclude]
+
+        elif self.__mode == PersistentStoreMode.MEMORY:
+            # Take an early exit
+            # exclude is our cache switch and can be either True or False.
+            # For the below, we just set both cases and set them up as an
+            # empty record
+            self.__cache_files.update({True: [], False: []})
+            return []
+
+        if not lazy or self.__exclude_list is None:
+            # 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}'))),
+
+                # Exclude temporary files
+                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)),
+            )
+
+        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)]
+
+            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))]
+
+        except (OSError, IOError):
+            # 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
+        """
+
+        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)
+
+        # Handle our namespace searching
+        if namespace:
+            if isinstance(namespace, str):
+                namespace = [namespace]
+
+            elif not isinstance(namespace, (tuple, set, list)):
+                raise AttributeError(
+                    "namespace must be None, a string, or a tuple/set/list "
+                    "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]
+
+        except FileNotFoundError:
+            # no worries; Nothing to do
+            logger.debug('Disk Prune path not found; nothing to clean.')
+            return []
+
+        except (OSError, IOError) 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))
+            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
+
+        you must specify a path to perform the prune within
+
+        if one or more namespaces are provided, then pruning focuses ONLY on
+        those entries (if matched).
+
+        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 \
+            else PersistentStore.default_file_expiry
+
+        # Get our namespaces
+        namespaces = PersistentStore.disk_scan(path, namespace)
+
+        # Track matches
+        _map = {}
+
+        for namespace in namespaces:
+            # Prepare our map
+            _map[namespace] = []
+
+            # Reference Directories
+            base_dir = os.path.join(path, namespace)
+            data_dir = os.path.join(base_dir, PersistentStore.data_dir)
+            temp_dir = os.path.join(base_dir, PersistentStore.temp_dir)
+
+            # 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}'),
+            ]
+
+            # 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')$')
+
+            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))])
+
+            # Track if we should do a directory sweep later on
+            dir_sweep = True
+
+            # Scan our files
+            for file in files:
+                try:
+                    mtime = datetime.fromtimestamp(os.path.getmtime(file))
+
+                except FileNotFoundError:
+                    # no worries; we were removing it anyway
+                    continue
+
+                except (OSError, IOError) 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))
+
+                    # No longer worth doing a directory sweep
+                    dir_sweep = False
+                    continue
+
+                if expires < mtime:
+                    continue
+
+                #
+                # Handle Removing
+                #
+                record = {
+                    'path': file,
+                    'removed': False,
+                }
+
+                if action:
+                    try:
+                        os.unlink(file)
+                        # Update our record
+                        record['removed'] = True
+                        logger.info(
+                            '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
+                        dir_sweep = False
+
+                        # otherwise, no worries; we were removing the file
+                        # anyway
+
+                    except (OSError, IOError) 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)
+
+                        logger.debug(
+                            'Persistent Storage Exception: %s', str(e))
+
+                        # No longer worth doing a directory sweep
+                        dir_sweep = False
+
+                # Store our record
+                _map[namespace].append(record)
+
+            # Memory tidy
+            del files
+
+            if dir_sweep:
+                # Gracefully cleanup our namespace directory. It's okay if we
+                # fail; This just means there were files in the directory.
+                for dirpath in (temp_dir, data_dir, base_dir):
+                    if action:
+                        try:
+                            os.rmdir(dirpath)
+                            logger.info(
+                                'Disk Prune (ns=%s, clean=%s) removed '
+                                'persistent dir: %s', namespace,
+                                'yes' if action else 'no', dirpath)
+                        except OSError:
+                            # do nothing;
+                            pass
+        return _map
+
+    def size(self, exclude=True, lazy=True):
+        """
+        Returns the total size of the persistent storage in bytes
+        """
+
+        if lazy and self.__cache_size is not None:
+            # Take an early exit
+            return self.__cache_size
+
+        elif self.__mode == PersistentStoreMode.MEMORY:
+            # Take an early exit
+            self.__cache_size = 0
+            return self.__cache_size
+
+        # 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)])
+
+        except (OSError, IOError):
+            # 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
+        """
+
+        if self.__mode == PersistentStoreMode.AUTO:
+            # Flush changes to disk
+            self.flush()
+
+    def __delitem__(self, key):
+        """
+        Remove a cache entry by it's key
+        """
+        if self._cache is None and not self.__load_cache():
+            raise KeyError("Could not initialize cache")
+
+        try:
+            if self._cache[key].persistent:
+                # Set our dirty flag in advance
+                self.__dirty = True
+
+            # Store our new cache
+            del self._cache[key]
+
+        except KeyError:
+            # Nothing to do
+            raise
+
+        if self.__dirty and self.__mode == PersistentStoreMode.FLUSH:
+            # Flush changes to disk
+            self.flush()
+
+        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.
+        """
+        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
+        """
+
+        if self._cache is None and not self.__load_cache():
+            raise KeyError("Could not initialize cache")
+
+        if key not in self._cache and not self.set(key, value):
+            raise KeyError("Could not set cache")
+
+        else:
+            # Update our value
+            self._cache[key].set(value)
+
+            if self._cache[key].persistent:
+                # Set our dirty flag in advance
+                self.__dirty = True
+
+        if self.__dirty and self.__mode == PersistentStoreMode.FLUSH:
+            # Flush changes to disk
+            self.flush()
+
+        return
+
+    def __getitem__(self, key):
+        """
+        Returns the indexed value
+        """
+
+        if self._cache is None and not self.__load_cache():
+            raise KeyError("Could not initialize cache")
+
+        result = self.get(key, default=self.__not_found_ref, lazy=False)
+        if result is self.__not_found_ref:
+            raise KeyError(f" {key} not found in cache")
+
+        return result
+
+    def keys(self):
+        """
+        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
+
+        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)
+
+        # Default asignments
+        if all is None:
+            all = True if not (len(args) or temp or cache) else False
+        if temp is None:
+            temp = True if all else False
+        if cache is None:
+            cache = True if all else False
+
+        if cache and self._cache:
+            # Reset our object
+            self._cache.clear()
+            # Reset dirt flag
+            self.__dirty = False
+
+        for path in self.files(exclude=False):
+
+            # Some information we use to validate the actions of our clean()
+            # call. This is so we don't remove anything we shouldn't
+            base = os.path.dirname(path)
+            fname = os.path.basename(path)
+
+            # Clean printable path details
+            ppath = os.path.join(os.path.dirname(base), fname)
+
+            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)
+
+                if validate and key != self.__cache_key:
+                    # We're not dealing with a cache key
+                    logger.debug(
+                        'Persistent File cleanup ignoring file: %s', path)
+                    continue
+
+                #
+                # We should proceed with removing the file if we get here
+                #
+
+            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)
+
+                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)
+                    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)
+                    continue
+
+                #
+                # We should proceed with removing the file if we get here
+                #
+
+            elif base == self.__temp_path and temp:
+                #
+                # This directory is a temporary path and nothing in here needs
+                # to be further verified. Proceed with the removing of the file
+                #
+                pass
+
+            else:
+                # No match; move on
+                logger.debug('Persistent File cleanup ignoring file: %s', path)
+                continue
+
+            try:
+                os.unlink(path)
+                logger.info('Removed persistent file: %s', ppath)
+
+            except FileNotFoundError:
+                # no worries; we were removing it anyway
+                pass
+
+            except (OSError, IOError) 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))
+
+        # Reset our reference variables
+        self.__cache_size = None
+        self.__cache_files.clear()
+
+        return not has_error
+
+    @property
+    def cache_file(self):
+        """
+        Returns the full path to the namespace directory
+        """
+        return os.path.join(
+            self.__base_path,
+            f'{self.__cache_key}{self.__extension}',
+        )
+
+    @property
+    def path(self):
+        """
+        Returns the full path to the namespace directory
+        """
+        return self.__base_path
+
+    @property
+    def mode(self):
+        """
+        Returns the full path to the namespace directory
+        """
+        return self.__mode
diff --git a/libs/apprise/plugins/NotifyBoxcar.py b/libs/apprise/plugins/NotifyBoxcar.py
deleted file mode 100644
index 808920ed5..000000000
--- a/libs/apprise/plugins/NotifyBoxcar.py
+++ /dev/null
@@ -1,395 +0,0 @@
-# -*- coding: utf-8 -*-
-# BSD 2-Clause License
-#
-# Apprise - Push Notification Library.
-# Copyright (c) 2024, 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 re
-import requests
-import hmac
-from json import dumps
-from time import time
-from hashlib import sha1
-from itertools import chain
-from urllib.parse import urlparse
-
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..AppriseLocale import gettext_lazy as _
-
-# Default to sending to all devices if nothing is specified
-DEFAULT_TAG = '@all'
-
-# The tags value is an structure containing an array of strings defining the
-# list of tagged devices that the notification need to be send to, and a
-# boolean operator (‘and’ / ‘or’) that defines the criteria to match devices
-# against those tags.
-IS_TAG = re.compile(r'^[@]?(?P<name>[A-Z0-9]{1,63})$', re.I)
-
-# Device tokens are only referenced when developing.
-# It's not likely you'll send a message directly to a device, but if you do;
-# this plugin supports it.
-IS_DEVICETOKEN = re.compile(r'^[A-Z0-9]{64}$', re.I)
-
-# Used to break apart list of potential tags by their delimiter into a useable
-# list.
-TAGS_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
-
-
-class NotifyBoxcar(NotifyBase):
-    """
-    A wrapper for Boxcar Notifications
-    """
-
-    # The default descriptive name associated with the Notification
-    service_name = 'Boxcar'
-
-    # The services URL
-    service_url = 'https://boxcar.io/'
-
-    # All boxcar notifications are secure
-    secure_protocol = 'boxcar'
-
-    # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_boxcar'
-
-    # Boxcar URL
-    notify_url = 'https://boxcar-api.io/api/push/'
-
-    # Allows the user to specify the NotifyImageSize object
-    image_size = NotifyImageSize.XY_72
-
-    # The maximum allowable characters allowed in the body per message
-    body_maxlen = 10000
-
-    # Define object templates
-    templates = (
-        '{schema}://{access_key}/{secret_key}/',
-        '{schema}://{access_key}/{secret_key}/{targets}',
-    )
-
-    # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'access_key': {
-            'name': _('Access Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]{64}$', 'i'),
-            'map_to': 'access',
-        },
-        'secret_key': {
-            'name': _('Secret Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]{64}$', 'i'),
-            'map_to': 'secret',
-        },
-        'target_tag': {
-            'name': _('Target Tag ID'),
-            'type': 'string',
-            'prefix': '@',
-            'regex': (r'^[A-Z0-9]{1,63}$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_device': {
-            'name': _('Target Device ID'),
-            'type': 'string',
-            'regex': (r'^[A-Z0-9]{64}$', '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',
-        },
-        'access': {
-            'alias_of': 'access_key',
-        },
-        'secret': {
-            'alias_of': 'secret_key',
-        },
-    })
-
-    def __init__(self, access, secret, targets=None, include_image=True,
-                 **kwargs):
-        """
-        Initialize Boxcar Object
-        """
-        super().__init__(**kwargs)
-
-        # Initialize tag list
-        self._tags = list()
-
-        # Initialize device_token list
-        self.device_tokens = list()
-
-        # Access Key (associated with project)
-        self.access = validate_regex(
-            access, *self.template_tokens['access_key']['regex'])
-        if not self.access:
-            msg = 'An invalid Boxcar Access Key ' \
-                  '({}) was specified.'.format(access)
-            self.logger.warning(msg)
-            raise TypeError(msg)
-
-        # Secret Key (associated with project)
-        self.secret = validate_regex(
-            secret, *self.template_tokens['secret_key']['regex'])
-        if not self.secret:
-            msg = 'An invalid Boxcar Secret Key ' \
-                  '({}) was specified.'.format(secret)
-            self.logger.warning(msg)
-            raise TypeError(msg)
-
-        if not targets:
-            self._tags.append(DEFAULT_TAG)
-            targets = []
-
-        # Validate targets and drop bad ones:
-        for target in parse_list(targets):
-            result = IS_TAG.match(target)
-            if result:
-                # store valid tag/alias
-                self._tags.append(result.group('name'))
-                continue
-
-            result = IS_DEVICETOKEN.match(target)
-            if result:
-                # store valid device
-                self.device_tokens.append(target)
-                continue
-
-            self.logger.warning(
-                'Dropped invalid tag/alias/device_token '
-                '({}) specified.'.format(target),
-            )
-
-        # Track whether or not we want to send an image with our notification
-        # or not.
-        self.include_image = include_image
-
-        return
-
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Boxcar Notification
-        """
-        headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
-        }
-
-        # prepare Boxcar Object
-        payload = {
-            'aps': {
-                'badge': 'auto',
-                'alert': '',
-            },
-            'expires': str(int(time() + 30)),
-        }
-
-        if title:
-            payload['aps']['@title'] = title
-
-        payload['aps']['alert'] = body
-
-        if self._tags:
-            payload['tags'] = {'or': self._tags}
-
-        if self.device_tokens:
-            payload['device_tokens'] = self.device_tokens
-
-        # Source picture should be <= 450 DP wide, ~2:1 aspect.
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
-
-        if image_url:
-            # Set our image
-            payload['@img'] = image_url
-
-        # Acquire our hostname
-        host = urlparse(self.notify_url).hostname
-
-        # Calculate signature.
-        str_to_sign = "%s\n%s\n%s\n%s" % (
-            "POST", host, "/api/push", dumps(payload))
-
-        h = hmac.new(
-            bytearray(self.secret, 'utf-8'),
-            bytearray(str_to_sign, 'utf-8'),
-            sha1,
-        )
-
-        params = NotifyBoxcar.urlencode({
-            "publishkey": self.access,
-            "signature": h.hexdigest(),
-        })
-
-        notify_url = '%s?%s' % (self.notify_url, params)
-        self.logger.debug('Boxcar POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Boxcar Payload: %s' % str(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,
-            )
-
-            # Boxcar returns 201 (Created) when successful
-            if r.status_code != requests.codes.created:
-                # We had a problem
-                status_str = \
-                    NotifyBoxcar.http_response_code_lookup(r.status_code)
-
-                self.logger.warning(
-                    'Failed to send Boxcar notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
-
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
-
-                # Return; we're done
-                return False
-
-            else:
-                self.logger.info('Sent Boxcar notification.')
-
-        except requests.RequestException as e:
-            self.logger.warning(
-                'A Connection error occurred sending Boxcar '
-                'notification to %s.' % (host))
-
-            self.logger.debug('Socket Exception: %s' % str(e))
-
-            # Return; we're done
-            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',
-        }
-
-        # Extend our parameters
-        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
-
-        return '{schema}://{access}/{secret}/{targets}?{params}'.format(
-            schema=self.secure_protocol,
-            access=self.pprint(self.access, privacy, safe=''),
-            secret=self.pprint(
-                self.secret, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join([
-                NotifyBoxcar.quote(x, safe='') for x in chain(
-                    self._tags, self.device_tokens) if x != DEFAULT_TAG]),
-            params=NotifyBoxcar.urlencode(params),
-        )
-
-    def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
-        targets = len(self._tags) + len(self.device_tokens)
-        # DEFAULT_TAG is set if no tokens/tags are otherwise set
-        return targets if targets > 0 else 1
-
-    @staticmethod
-    def parse_url(url):
-        """
-        Parses the URL and returns it broken apart into a dictionary.
-
-        """
-        results = NotifyBase.parse_url(url, verify_host=False)
-        if not results:
-            # We're done early
-            return None
-
-        # The first token is stored in the hostname
-        results['access'] = NotifyBoxcar.unquote(results['host'])
-
-        # Get our entries; split_path() looks after unquoting content for us
-        # by default
-        entries = NotifyBoxcar.split_path(results['fullpath'])
-
-        # Now fetch the remaining tokens
-        results['secret'] = entries.pop(0) if entries else None
-
-        # Our recipients make up the remaining entries of our array
-        results['targets'] = entries
-
-        # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyBoxcar.parse_list(results['qsd'].get('to'))
-
-        # Access
-        if 'access' in results['qsd'] and results['qsd']['access']:
-            results['access'] = NotifyBoxcar.unquote(
-                results['qsd']['access'].strip())
-
-        # Secret
-        if 'secret' in results['qsd'] and results['qsd']['secret']:
-            results['secret'] = NotifyBoxcar.unquote(
-                results['qsd']['secret'].strip())
-
-        # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
-
-        return results
diff --git a/libs/apprise/plugins/__init__.py b/libs/apprise/plugins/__init__.py
index 72cb08fbf..87c840e20 100644
--- a/libs/apprise/plugins/__init__.py
+++ b/libs/apprise/plugins/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,19 +30,18 @@ import os
 import copy
 
 # Used for testing
-from .NotifyBase import NotifyBase
+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 import parse_list
-from ..utils import cwe312_url
-from ..utils import GET_SCHEMA_RE
+from ..utils.cwe312 import cwe312_url
+from ..utils.parse import parse_list, GET_SCHEMA_RE
 from ..logger import logger
-from ..AppriseLocale import gettext_lazy as _
-from ..AppriseLocale import LazyTranslation
-from ..NotificationManager import NotificationManager
+from ..locale import gettext_lazy as _
+from ..locale import LazyTranslation
+from ..manager_plugins import NotificationManager
 
 
 # Grant access to our Notification Manager Singleton
diff --git a/libs/apprise/plugins/africas_talking.py b/libs/apprise/plugins/africas_talking.py
new file mode 100644
index 000000000..597587648
--- /dev/null
+++ b/libs/apprise/plugins/africas_talking.py
@@ -0,0 +1,468 @@
+# -*- 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.
+
+# To use this plugin, you must have a Africas Talking Account setup; See here:
+#  https://account.africastalking.com/
+#  From here... acquire your APIKey
+#
+# 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 _
+
+
+class AfricasTalkingSMSMode:
+    """
+    Africas Talking SMS Mode
+    """
+    # BulkSMS Mode
+    BULKSMS = 'bulksms'
+
+    # Premium Mode
+    PREMIUM = 'premium'
+
+    # Sandbox Mode
+    SANDBOX = 'sandbox'
+
+
+# Define the types in a list for validation purposes
+AFRICAS_TALKING_SMS_MODES = (
+    AfricasTalkingSMSMode.BULKSMS,
+    AfricasTalkingSMSMode.PREMIUM,
+    AfricasTalkingSMSMode.SANDBOX,
+)
+
+
+# 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',
+}
+
+
+class NotifyAfricasTalking(NotifyBase):
+    """
+    A wrapper for Africas Talking Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = 'Africas Talking'
+
+    # The services URL
+    service_url = 'https://africastalking.com/'
+
+    # The default secure protocol
+    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'
+
+    # 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',
+    }
+
+    # 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
+
+    # The maximum amount of phone numbers that can reside within a single
+    # batch transfer
+    default_batch_size = 50
+
+    # Define object templates
+    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',
+        },
+    })
+
+    # 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],
+        },
+    })
+
+    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'])
+        if not self.appuser:
+            msg = 'The Africas Talking appuser specified ({}) is invalid.'\
+                .format(appuser)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.apikey = validate_regex(
+            apikey, *self.template_tokens['apikey']['regex'])
+        if not self.apikey:
+            msg = 'The Africas Talking apikey specified ({}) is invalid.'\
+                .format(apikey)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Prepare 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.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)
+
+            if self.mode not in AFRICAS_TALKING_SMS_MODES:
+                msg = 'The Africas Talking mode specified ({}) is invalid.'\
+                    .format(mode)
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            self.mode = self.template_args['mode']['default']
+
+        # Parse our targets
+        self.targets = list()
+
+        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),
+                )
+                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, 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')
+            return False
+
+        headers = {
+            'User-Agent': self.app_id,
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Accept': 'application/json',
+            'apiKey': self.apikey,
+        }
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # Send in batches if identified to do so
+        batch_size = 1 if not self.batch else self.default_batch_size
+
+        # Create a copy of the target list
+        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,
+            }
+
+            # 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))
+
+            # Printable target detail
+            p_target = self.targets[index] if batch_size == 1 \
+                else '{} target(s)'.format(
+                    len(self.targets[index:index + batch_size]))
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    notify_url,
+                    data=payload,
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                # Sample response
+                # {
+                #     "SMSMessageData": {
+                #         "Message": "Sent to 1/1 Total Cost: KES 0.8000",
+                #         "Recipients": [{
+                #             "statusCode": 101,
+                #             "number": "+254711XXXYYY",
+                #             "status": "Success",
+                #             "cost": "KES 0.8000",
+                #             "messageId": "ATPid_SampleTxnId123"
+                #         }]
+                #     }
+                # }
+
+                if r.status_code not in (100, 101, 102, requests.codes.ok):
+                    # We had a problem
+                    status_str = \
+                        NotifyAfricasTalking.http_response_code_lookup(
+                            r.status_code, AFRICAS_TALKING_HTTP_ERROR_MAP)
+
+                    self.logger.warning(
+                        'Failed to send Africas Talking notification to {}: '
+                        '{}{}error={}.'.format(
+                            p_target,
+                            status_str,
+                            ', ' if status_str else '',
+                            r.status_code))
+
+                    self.logger.debug(
+                        'Response Details:\r\n{}'.format(r.content))
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                else:
+                    self.logger.info(
+                        'Sent Africas Talking notification to {}.'
+                        .format(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))
+
+                # 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 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.
+        """
+
+        # Define any URL parameters
+        params = {
+            'batch': 'yes' if self.batch else 'no',
+        }
+
+        if self.sender != self.template_args['from']['default']:
+            # Set our sender if it was set
+            params['from'] = self.sender
+
+        if self.mode != self.template_args['mode']['default']:
+            # Set our mode
+            params['mode'] = self.mode
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        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]),
+            params=NotifyAfricasTalking.urlencode(params),
+        )
+
+    def __len__(self):
+        """
+        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)
+
+        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.
+
+        """
+        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'])
+
+        # Prepare our targets
+        results['targets'] = []
+
+        # Our Application 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'])
+
+            # This means our host is actually a phone number (target)
+            results['targets'].append(
+                NotifyAfricasTalking.unquote(results['host']))
+
+        else:
+            # First item is our apikey
+            results['apikey'] = NotifyAfricasTalking.unquote(results['host'])
+
+        # Store our remaining targets found on path
+        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'])
+
+        # 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'])
+
+        # Get our 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']))
+
+        return results
diff --git a/libs/apprise/plugins/NotifyAppriseAPI.py b/libs/apprise/plugins/apprise_api.py
similarity index 91%
rename from libs/apprise/plugins/NotifyAppriseAPI.py
rename to libs/apprise/plugins/apprise_api.py
index 34c34a6d4..a26162036 100644
--- a/libs/apprise/plugins/NotifyAppriseAPI.py
+++ b/libs/apprise/plugins/apprise_api.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,14 +29,13 @@
 import re
 import requests
 from json import dumps
-import base64
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .. import exception
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class AppriseAPIMethod:
@@ -123,7 +122,7 @@ class NotifyAppriseAPI(NotifyBase):
             'type': 'string',
             'required': True,
             'private': True,
-            'regex': (r'^[A-Z0-9_-]{1,32}$', 'i'),
+            'regex': (r'^[A-Z0-9_-]{1,128}$', 'i'),
         },
     })
 
@@ -261,39 +260,45 @@ class NotifyAppriseAPI(NotifyBase):
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
+                        'Could not access Apprise API attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 try:
+                    # Our Attachment filename
+                    filename = attachment.name \
+                        if attachment.name else f'file{no:03}.dat'
+
                     if self.method == AppriseAPIMethod.JSON:
-                        with open(attachment.path, 'rb') as f:
-                            # Output must be in a DataURL format (that's what
-                            # PushSafer calls it):
-                            attachments.append({
-                                'filename': attachment.name,
-                                'base64': base64.b64encode(f.read())
-                                .decode('utf-8'),
-                                'mimetype': attachment.mimetype,
-                            })
+                        # Output must be in a DataURL format (that's what
+                        # PushSafer calls it):
+                        attachments.append({
+                            "filename": filename,
+                            'base64': attachment.base64(),
+                            'mimetype': attachment.mimetype,
+                        })
 
                     else:  # AppriseAPIMethod.FORM
                         files.append((
                             'file{:02d}'.format(no),
                             (
-                                attachment.name,
+                                filename,
                                 open(attachment.path, 'rb'),
                                 attachment.mimetype,
                             )
                         ))
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except (TypeError, OSError, exception.AppriseException):
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access AppriseAPI attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending AppriseAPI attachment {}'.format(
+                        attachment.url(privacy=True)))
+
         # prepare Apprise API Object
         payload = {
             # Apprise API Payload
diff --git a/libs/apprise/plugins/NotifyAprs.py b/libs/apprise/plugins/aprs.py
similarity index 98%
rename from libs/apprise/plugins/NotifyAprs.py
rename to libs/apprise/plugins/aprs.py
index 5d8c3c100..bf50af9bb 100644
--- a/libs/apprise/plugins/NotifyAprs.py
+++ b/libs/apprise/plugins/aprs.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -70,12 +70,11 @@
 import socket
 import sys
 from itertools import chain
-from .NotifyBase import NotifyBase
-from ..AppriseLocale import gettext_lazy as _
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_call_sign
-from ..utils import parse_call_sign
+from ..utils.parse import is_call_sign, parse_call_sign
 from .. import __version__
 import re
 
@@ -729,6 +728,15 @@ class NotifyAprs(NotifyBase):
             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.
+        """
+        return (self.user, self.password, self.locale)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyBark.py b/libs/apprise/plugins/bark.py
similarity index 90%
rename from libs/apprise/plugins/NotifyBark.py
rename to libs/apprise/plugins/bark.py
index 781a1515e..0122598d4 100644
--- a/libs/apprise/plugins/NotifyBark.py
+++ b/libs/apprise/plugins/bark.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -32,13 +32,12 @@
 import requests
 import json
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool
+from ..locale import gettext_lazy as _
 
 
 # Sounds generated off of: https://github.com/Finb/Bark/tree/master/Sounds
@@ -89,11 +88,14 @@ class NotifyBarkLevel:
 
     PASSIVE = 'passive'
 
+    CRITICAL = 'critical'
+
 
 BARK_LEVELS = (
     NotifyBarkLevel.ACTIVE,
     NotifyBarkLevel.TIME_SENSITIVE,
     NotifyBarkLevel.PASSIVE,
+    NotifyBarkLevel.CRITICAL,
 )
 
 
@@ -178,6 +180,12 @@ class NotifyBark(NotifyBase):
             'type': 'choice:string',
             'values': BARK_LEVELS,
         },
+        'volume': {
+            'name': _('Volume'),
+            'type': 'int',
+            'min': 0,
+            'max': 10,
+        },
         'click': {
             'name': _('Click'),
             'type': 'string',
@@ -205,7 +213,7 @@ class NotifyBark(NotifyBase):
 
     def __init__(self, targets=None, include_image=True, sound=None,
                  category=None, group=None, level=None, click=None,
-                 badge=None, **kwargs):
+                 badge=None, volume=None, **kwargs):
         """
         Initialize Notify Bark Object
         """
@@ -260,6 +268,19 @@ class NotifyBark(NotifyBase):
             self.logger.warning(
                 'The specified Bark sound ({}) was not found ', sound)
 
+        # Volume
+        self.volume = None
+        if volume is not None:
+            try:
+                self.volume = int(volume) if volume is not None else None
+                if self.volume is not None and not (0 <= self.volume <= 10):
+                    raise ValueError()
+
+            except (TypeError, ValueError):
+                self.logger.warning(
+                    'The specified Bark volume ({}) is not valid. '
+                    'Must be between 0 and 10', volume)
+
         # Level
         self.level = None if not level else next(
             (f for f in BARK_LEVELS if f[0] == level[0]), None)
@@ -330,6 +351,9 @@ class NotifyBark(NotifyBase):
         if self.group:
             payload['group'] = self.group
 
+        if self.volume:
+            payload['volume'] = self.volume
+
         auth = None
         if self.user:
             auth = (self.user, self.password)
@@ -395,6 +419,18 @@ class NotifyBark(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -417,6 +453,9 @@ class NotifyBark(NotifyBase):
         if self.level:
             params['level'] = self.level
 
+        if self.volume:
+            params['volume'] = str(self.volume)
+
         if self.category:
             params['category'] = self.category
 
@@ -490,6 +529,11 @@ class NotifyBark(NotifyBase):
             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())
+
         # Level
         if 'level' in results['qsd'] and results['qsd']['level']:
             results['level'] = NotifyBark.unquote(
diff --git a/libs/apprise/plugins/NotifyBase.py b/libs/apprise/plugins/base.py
similarity index 91%
rename from libs/apprise/plugins/NotifyBase.py
rename to libs/apprise/plugins/base.py
index c29417c60..a50cdf071 100644
--- a/libs/apprise/plugins/NotifyBase.py
+++ b/libs/apprise/plugins/base.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,16 +30,18 @@ import asyncio
 import re
 from functools import partial
 
-from ..URLBase import URLBase
+from ..url import URLBase
 from ..common import NotifyType
-from ..utils import parse_bool
+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 ..AppriseLocale import gettext_lazy as _
-from ..AppriseAttachment import AppriseAttachment
+from ..common import PersistentStoreMode
+from ..locale import gettext_lazy as _
+from ..persistent_store import PersistentStore
+from ..apprise_attachment import AppriseAttachment
 
 
 class NotifyBase(URLBase):
@@ -130,12 +132,19 @@ class NotifyBase(URLBase):
     # of lines. Setting this to zero disables this feature.
     body_max_line_count = 0
 
+    # Persistent storage default settings
+    persistent_storage = True
+
     # Default Notify Format
     notify_format = NotifyFormat.TEXT
 
     # Default Overflow Mode
     overflow_mode = OverflowMode.UPSTREAM
 
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.MEMORY
+
     # Default Emoji Interpretation
     interpret_emojis = False
 
@@ -197,6 +206,16 @@ class NotifyBase(URLBase):
             # 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',
+        },
     })
 
     #
@@ -268,6 +287,9 @@ class NotifyBase(URLBase):
         # are turned off (no user over-rides allowed)
         #
 
+        # Our Persistent Storage object is initialized on demand
+        self.__store = None
+
         # Take a default
         self.interpret_emojis = self.asset.interpret_emojis
         if 'emojis' in kwargs:
@@ -301,6 +323,14 @@ class NotifyBase(URLBase):
             # Provide override
             self.overflow_mode = overflow
 
+        # Prepare our Persistent Storage switch
+        self.persistent_storage = parse_bool(
+            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):
         """
@@ -364,6 +394,17 @@ class NotifyBase(URLBase):
             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
+
+        return self.asset.ascii(
+            notify_type=notify_type,
+        )
+
     def notify(self, *args, **kwargs):
         """
         Performs notification
@@ -715,6 +756,10 @@ class NotifyBase(URLBase):
             'overflow': self.overflow_mode,
         }
 
+        # Persistent Storage Setting
+        if self.persistent_storage != NotifyBase.persistent_storage:
+            params['store'] = 'yes' if self.persistent_storage else 'no'
+
         params.update(super().url_parameters(*args, **kwargs))
 
         # return default parameters
@@ -767,6 +812,10 @@ class NotifyBase(URLBase):
         # Allow emoji's override
         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']
 
         return results
 
@@ -787,3 +836,29 @@ class NotifyBase(URLBase):
         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', ...)
+
+          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)
+
+        return self.__store
diff --git a/libs/apprise/plugins/NotifyBase.pyi b/libs/apprise/plugins/base.pyi
similarity index 100%
rename from libs/apprise/plugins/NotifyBase.pyi
rename to libs/apprise/plugins/base.pyi
diff --git a/libs/apprise/plugins/NotifyBulkSMS.py b/libs/apprise/plugins/bulksms.py
similarity index 95%
rename from libs/apprise/plugins/NotifyBulkSMS.py
rename to libs/apprise/plugins/bulksms.py
index 33664fb00..c5608fa68 100644
--- a/libs/apprise/plugins/NotifyBulkSMS.py
+++ b/libs/apprise/plugins/bulksms.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,13 +36,11 @@ import re
 import requests
 import json
 from itertools import chain
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
+from ..locale import gettext_lazy as _
 
 
 IS_GROUP_RE = re.compile(
@@ -269,7 +267,7 @@ class NotifyBulkSMS(NotifyBase):
             'to': None,
             'body': body,
             'routingGroup': self.route,
-            'encoding': BulkSMSEncoding.UNICODE \
+            'encoding': BulkSMSEncoding.UNICODE
             if self.unicode else BulkSMSEncoding.TEXT,
             # Options are NONE, ALL and ERRORS
             'deliveryReports': "ERRORS"
@@ -413,6 +411,19 @@ class NotifyBulkSMS(NotifyBase):
                  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.
+        """
+        return (
+            self.secure_protocol,
+            self.user if self.user else None,
+            self.password if self.password else None,
+        )
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyBulkVS.py b/libs/apprise/plugins/bulkvs.py
similarity index 96%
rename from libs/apprise/plugins/NotifyBulkVS.py
rename to libs/apprise/plugins/bulkvs.py
index e912dff25..835887a90 100644
--- a/libs/apprise/plugins/NotifyBulkVS.py
+++ b/libs/apprise/plugins/bulkvs.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -35,13 +35,11 @@
 #             Messaging/post_messageSend
 import requests
 import json
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
+from ..locale import gettext_lazy as _
 
 
 class NotifyBulkVS(NotifyBase):
@@ -304,6 +302,15 @@ class NotifyBulkVS(NotifyBase):
 
         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.source, self.user, self.password)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyBurstSMS.py b/libs/apprise/plugins/burstsms.py
similarity index 96%
rename from libs/apprise/plugins/NotifyBurstSMS.py
rename to libs/apprise/plugins/burstsms.py
index 39606abba..0cebddabb 100644
--- a/libs/apprise/plugins/NotifyBurstSMS.py
+++ b/libs/apprise/plugins/burstsms.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,14 +33,12 @@
 #
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
+from ..locale import gettext_lazy as _
 
 
 class BurstSMSCountryCode:
@@ -378,6 +376,15 @@ class NotifyBurstSMS(NotifyBase):
                 [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.
+        """
+        return (self.secure_protocol, self.apikey, self.secret, self.source)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyChantify.py b/libs/apprise/plugins/chanify.py
similarity index 81%
rename from libs/apprise/plugins/NotifyChantify.py
rename to libs/apprise/plugins/chanify.py
index d912bd257..caf314942 100644
--- a/libs/apprise/plugins/NotifyChantify.py
+++ b/libs/apprise/plugins/chanify.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,7 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-# Chantify
+# Chanify
 #   1. Visit https://chanify.net/
 
 # The API URL will look something like this:
@@ -35,28 +35,28 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
-class NotifyChantify(NotifyBase):
+class NotifyChanify(NotifyBase):
     """
-    A wrapper for Chantify Notifications
+    A wrapper for Chanify Notifications
     """
 
     # The default descriptive name associated with the Notification
-    service_name = _('Chantify')
+    service_name = _('Chanify')
 
     # The services URL
     service_url = 'https://chanify.net/'
 
     # The default secure protocol
-    secure_protocol = 'chantify'
+    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_chantify'
+    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_chanify'
 
     # Notification URL
     notify_url = 'https://api.chanify.net/v1/sender/{token}/'
@@ -91,14 +91,14 @@ class NotifyChantify(NotifyBase):
 
     def __init__(self, token, **kwargs):
         """
-        Initialize Chantify Object
+        Initialize Chanify Object
         """
         super().__init__(**kwargs)
 
         self.token = validate_regex(
             token, *self.template_tokens['token']['regex'])
         if not self.token:
-            msg = 'The Chantify token specified ({}) is invalid.'\
+            msg = 'The Chanify token specified ({}) is invalid.'\
                 .format(token)
             self.logger.warning(msg)
             raise TypeError(msg)
@@ -121,9 +121,9 @@ class NotifyChantify(NotifyBase):
             'text': body
         }
 
-        self.logger.debug('Chantify GET URL: %s (cert_verify=%r)' % (
+        self.logger.debug('Chanify GET URL: %s (cert_verify=%r)' % (
             self.notify_url, self.verify_certificate))
-        self.logger.debug('Chantify Payload: %s' % str(payload))
+        self.logger.debug('Chanify Payload: %s' % str(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -139,10 +139,10 @@ class NotifyChantify(NotifyBase):
             if r.status_code != requests.codes.ok:
                 # We had a problem
                 status_str = \
-                    NotifyChantify.http_response_code_lookup(r.status_code)
+                    NotifyChanify.http_response_code_lookup(r.status_code)
 
                 self.logger.warning(
-                    'Failed to send Chantify notification: '
+                    'Failed to send Chanify notification: '
                     '{}{}error={}.'.format(
                         status_str,
                         ', ' if status_str else '',
@@ -154,11 +154,11 @@ class NotifyChantify(NotifyBase):
                 return False
 
             else:
-                self.logger.info('Sent Chantify notification.')
+                self.logger.info('Sent Chanify notification.')
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Chantify '
+                'A Connection error occurred sending Chanify '
                 'notification.')
             self.logger.debug('Socket Exception: %s' % str(e))
 
@@ -178,9 +178,18 @@ class NotifyChantify(NotifyBase):
         return '{schema}://{token}/?{params}'.format(
             schema=self.secure_protocol,
             token=self.pprint(self.token, privacy, safe=''),
-            params=NotifyChantify.urlencode(params),
+            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.
+        """
+        return (self.secure_protocol, self.token)
+
     @staticmethod
     def parse_url(url):
         """
@@ -198,9 +207,9 @@ class NotifyChantify(NotifyBase):
 
         # Allow over-ride
         if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyChantify.unquote(results['qsd']['token'])
+            results['token'] = NotifyChanify.unquote(results['qsd']['token'])
 
         else:
-            results['token'] = NotifyChantify.unquote(results['host'])
+            results['token'] = NotifyChanify.unquote(results['host'])
 
         return results
diff --git a/libs/apprise/plugins/NotifyClickSend.py b/libs/apprise/plugins/clicksend.py
similarity index 91%
rename from libs/apprise/plugins/NotifyClickSend.py
rename to libs/apprise/plugins/clicksend.py
index 5e345fe10..f37bd283a 100644
--- a/libs/apprise/plugins/NotifyClickSend.py
+++ b/libs/apprise/plugins/clicksend.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -41,15 +41,12 @@
 #
 import requests
 from json import dumps
-from base64 import b64encode
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 CLICKSEND_HTTP_ERROR_MAP = {
@@ -89,7 +86,7 @@ class NotifyClickSend(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}:{password}@{targets}',
+        '{schema}://{user}:{apikey}@{targets}',
     )
 
     # Define our template tokens
@@ -99,11 +96,12 @@ class NotifyClickSend(NotifyBase):
             'type': 'string',
             'required': True,
         },
-        'password': {
-            'name': _('Password'),
+        'apikey': {
+            'name': _('API Key'),
             'type': 'string',
             'private': True,
             'required': True,
+            'map_to': 'password',
         },
         'target_phone': {
             'name': _('Target Phone No'),
@@ -124,6 +122,9 @@ class NotifyClickSend(NotifyBase):
         'to': {
             'alias_of': 'targets',
         },
+        'key': {
+            'alias_of': 'apikey',
+        },
         'batch': {
             'name': _('Batch Mode'),
             'type': 'bool',
@@ -174,9 +175,6 @@ class NotifyClickSend(NotifyBase):
         headers = {
             'User-Agent': self.app_id,
             'Content-Type': 'application/json; charset=utf-8',
-            'Authorization': 'Basic {}'.format(
-                b64encode('{}:{}'.format(
-                    self.user, self.password).encode('utf-8'))),
         }
 
         # error tracking (used for function return)
@@ -208,6 +206,7 @@ class NotifyClickSend(NotifyBase):
                 r = requests.post(
                     self.notify_url,
                     data=dumps(payload),
+                    auth=(self.user, self.password),
                     headers=headers,
                     verify=self.verify_certificate,
                     timeout=self.request_timeout,
@@ -284,6 +283,15 @@ class NotifyClickSend(NotifyBase):
             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.
+        """
+        return (self.secure_protocol, self.user, self.password)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
@@ -322,6 +330,12 @@ class NotifyClickSend(NotifyBase):
         results['batch'] = \
             parse_bool(results['qsd'].get('batch', False))
 
+        # API 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'])
+
         # 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']):
diff --git a/libs/apprise/plugins/NotifyForm.py b/libs/apprise/plugins/custom_form.py
similarity index 95%
rename from libs/apprise/plugins/NotifyForm.py
rename to libs/apprise/plugins/custom_form.py
index 9690cd4f5..0a1ef96a4 100644
--- a/libs/apprise/plugins/NotifyForm.py
+++ b/libs/apprise/plugins/custom_form.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,11 +29,11 @@
 import re
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class FORMPayloadField:
@@ -272,62 +272,6 @@ class NotifyForm(NotifyBase):
 
         return
 
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
-
-        # Define any URL parameters
-        params = {
-            '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()})
-
-        # Append our GET params into our parameters
-        params.update({'-{}'.format(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()})
-
-        if self.attach_as != self.attach_as_default:
-            # Provide Attach-As extension details
-            params['attach-as'] = self.attach_as
-
-        # Determine Authentication
-        auth = ''
-        if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyForm.quote(self.user, safe=''),
-                password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-            )
-        elif self.user:
-            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(
-            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 '/',
-            params=NotifyForm.urlencode(params),
-        )
-
     def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
              **kwargs):
         """
@@ -358,7 +302,8 @@ class NotifyForm(NotifyBase):
                     files.append((
                         self.attach_as.format(no)
                         if self.attach_multi_support else self.attach_as, (
-                            attachment.name,
+                            attachment.name
+                            if attachment.name else f'file{no:03}.dat',
                             open(attachment.path, 'rb'),
                             attachment.mimetype)
                     ))
@@ -486,6 +431,76 @@ class NotifyForm(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host,
+            self.port if self.port else (443 if self.secure else 80),
+            self.fullpath.rstrip('/'),
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            '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()})
+
+        # Append our GET params into our parameters
+        params.update({'-{}'.format(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()})
+
+        if self.attach_as != self.attach_as_default:
+            # Provide Attach-As extension details
+            params['attach-as'] = self.attach_as
+
+        # Determine Authentication
+        auth = ''
+        if self.user and self.password:
+            auth = '{user}:{password}@'.format(
+                user=NotifyForm.quote(self.user, safe=''),
+                password=self.pprint(
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+            )
+        elif self.user:
+            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(
+            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 '/',
+            params=NotifyForm.urlencode(params),
+        )
+
     @staticmethod
     def parse_url(url):
         """
diff --git a/libs/apprise/plugins/NotifyJSON.py b/libs/apprise/plugins/custom_json.py
similarity index 89%
rename from libs/apprise/plugins/NotifyJSON.py
rename to libs/apprise/plugins/custom_json.py
index 182ff77cf..bd232f6e9 100644
--- a/libs/apprise/plugins/NotifyJSON.py
+++ b/libs/apprise/plugins/custom_json.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,14 +27,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import requests
-import base64
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .. import exception
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class JSONPayloadField:
@@ -195,56 +195,6 @@ class NotifyJSON(NotifyBase):
 
         return
 
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
-
-        # Define any URL parameters
-        params = {
-            '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()})
-
-        # Append our GET params into our parameters
-        params.update({'-{}'.format(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()})
-
-        # Determine Authentication
-        auth = ''
-        if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyJSON.quote(self.user, safe=''),
-                password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-            )
-        elif self.user:
-            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(
-            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 '/',
-            params=NotifyJSON.urlencode(params),
-        )
-
     def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
              **kwargs):
         """
@@ -263,33 +213,34 @@ class NotifyJSON(NotifyBase):
         # Track our potential attachments
         attachments = []
         if attach and self.attachment_support:
-            for attachment in attach:
+            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 {}.'.format(
+                        'Could not access Custom JSON attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Output must be in a DataURL format (that's what
-                        # PushSafer calls it):
-                        attachments.append({
-                            'filename': attachment.name,
-                            'base64': base64.b64encode(f.read())
-                            .decode('utf-8'),
-                            'mimetype': attachment.mimetype,
-                        })
+                    attachments.append({
+                        "filename": attachment.name
+                        if attachment.name else f'file{no:03}.dat',
+                        'base64': attachment.base64(),
+                        'mimetype': attachment.mimetype,
+                    })
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access Custom JSON attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending Custom JSON attachment {}'.format(
+                        attachment.url(privacy=True)))
+
         # Prepare JSON Object
         payload = {
             JSONPayloadField.VERSION: self.json_version,
@@ -395,6 +346,70 @@ class NotifyJSON(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host,
+            self.port if self.port else (443 if self.secure else 80),
+            self.fullpath.rstrip('/'),
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            '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()})
+
+        # Append our GET params into our parameters
+        params.update({'-{}'.format(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()})
+
+        # Determine Authentication
+        auth = ''
+        if self.user and self.password:
+            auth = '{user}:{password}@'.format(
+                user=NotifyJSON.quote(self.user, safe=''),
+                password=self.pprint(
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+            )
+        elif self.user:
+            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(
+            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 '/',
+            params=NotifyJSON.urlencode(params),
+        )
+
     @staticmethod
     def parse_url(url):
         """
diff --git a/libs/apprise/plugins/NotifyXML.py b/libs/apprise/plugins/custom_xml.py
similarity index 89%
rename from libs/apprise/plugins/NotifyXML.py
rename to libs/apprise/plugins/custom_xml.py
index 21ccb79d3..ba062f110 100644
--- a/libs/apprise/plugins/NotifyXML.py
+++ b/libs/apprise/plugins/custom_xml.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,13 +28,13 @@
 
 import re
 import requests
-import base64
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .. import exception
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class XMLPayloadField:
@@ -242,58 +242,6 @@ class NotifyXML(NotifyBase):
 
         return
 
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
-
-        # Define any URL parameters
-        params = {
-            '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()})
-
-        # Append our GET params into our parameters
-        params.update({'-{}'.format(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()})
-
-        # Determine Authentication
-        auth = ''
-        if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyXML.quote(self.user, safe=''),
-                password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-            )
-        elif self.user:
-            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(
-            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 '/',
-            params=NotifyXML.urlencode(params),
-        )
-
     def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
              **kwargs):
         """
@@ -339,35 +287,39 @@ class NotifyXML(NotifyBase):
 
         attachments = []
         if attach and self.attachment_support:
-            for attachment in attach:
+            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 {}.'.format(
+                        'Could not access Custom XML attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Prepare our Attachment in Base64
-                        entry = \
-                            '<Attachment filename="{}" mimetype="{}">'.format(
-                                NotifyXML.escape_html(
-                                    attachment.name, whitespace=False),
-                                NotifyXML.escape_html(
-                                    attachment.mimetype, whitespace=False))
-                        entry += base64.b64encode(f.read()).decode('utf-8')
-                        entry += '</Attachment>'
-                        attachments.append(entry)
+                    # 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.base64()
+                    entry += '</Attachment>'
+                    attachments.append(entry)
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access Custom XML attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending Custom XML attachment {}'.format(
+                        attachment.url(privacy=True)))
+
             # Update our xml_attachments record:
             xml_attachments = \
                 '<Attachments format="base64">' + \
@@ -467,6 +419,72 @@ class NotifyXML(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host,
+            self.port if self.port else (443 if self.secure else 80),
+            self.fullpath.rstrip('/'),
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            '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()})
+
+        # Append our GET params into our parameters
+        params.update({'-{}'.format(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()})
+
+        # Determine Authentication
+        auth = ''
+        if self.user and self.password:
+            auth = '{user}:{password}@'.format(
+                user=NotifyXML.quote(self.user, safe=''),
+                password=self.pprint(
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+            )
+        elif self.user:
+            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(
+            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 '/',
+            params=NotifyXML.urlencode(params),
+        )
+
     @staticmethod
     def parse_url(url):
         """
diff --git a/libs/apprise/plugins/NotifyD7Networks.py b/libs/apprise/plugins/d7networks.py
similarity index 96%
rename from libs/apprise/plugins/NotifyD7Networks.py
rename to libs/apprise/plugins/d7networks.py
index 906ec2fb9..cdc7e815e 100644
--- a/libs/apprise/plugins/NotifyD7Networks.py
+++ b/libs/apprise/plugins/d7networks.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -39,13 +39,11 @@ import requests
 from json import dumps
 from json import loads
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, validate_regex, parse_bool)
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 D7NETWORKS_HTTP_ERROR_MAP = {
@@ -354,6 +352,15 @@ class NotifyD7Networks(NotifyBase):
                 [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.
+        """
+        return (self.secure_protocol, self.token)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyDapnet.py b/libs/apprise/plugins/dapnet.py
similarity index 96%
rename from libs/apprise/plugins/NotifyDapnet.py
rename to libs/apprise/plugins/dapnet.py
index ae7199c94..f117095c8 100644
--- a/libs/apprise/plugins/NotifyDapnet.py
+++ b/libs/apprise/plugins/dapnet.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -51,14 +51,12 @@ from json import dumps
 import requests
 from requests.auth import HTTPBasicAuth
 
-from .NotifyBase import NotifyBase
-from ..AppriseLocale import gettext_lazy as _
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_call_sign
-from ..utils import parse_call_sign
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import (
+    is_call_sign, parse_call_sign, parse_list, parse_bool)
 
 
 class DapnetPriority:
@@ -346,6 +344,15 @@ class NotifyDapnet(NotifyBase):
             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.
+        """
+        return (self.secure_protocol, self.user, self.password)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyDBus.py b/libs/apprise/plugins/dbus.py
similarity index 97%
rename from libs/apprise/plugins/NotifyDBus.py
rename to libs/apprise/plugins/dbus.py
index 52e119813..31aa9210f 100644
--- a/libs/apprise/plugins/NotifyDBus.py
+++ b/libs/apprise/plugins/dbus.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -27,11 +27,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import sys
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_DBUS_SUPPORT_ENABLED = False
@@ -173,7 +173,6 @@ class NotifyDBus(NotifyBase):
     # object if we were to reference, we wouldn't be backwards compatible with
     # Python v2.  So converting the result set back into a list makes us
     # compatible
-    # TODO: Review after dropping support for Python 2.
     protocol = list(MAINLOOP_MAP.keys())
 
     # A URL that takes you to the setup/help of the specific protocol
@@ -196,6 +195,10 @@ class NotifyDBus(NotifyBase):
     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}://',
diff --git a/libs/apprise/plugins/NotifyDingTalk.py b/libs/apprise/plugins/dingtalk.py
similarity index 95%
rename from libs/apprise/plugins/NotifyDingTalk.py
rename to libs/apprise/plugins/dingtalk.py
index d4a492fc7..84de85db0 100644
--- a/libs/apprise/plugins/NotifyDingTalk.py
+++ b/libs/apprise/plugins/dingtalk.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,13 +34,12 @@ import base64
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 # Register at https://dingtalk.com
 #   - Download their PC based software as it is the only way you can create
@@ -310,6 +309,15 @@ class NotifyDingTalk(NotifyBase):
                 [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.
+        """
+        return (self.secure_protocol, self.secret, self.token)
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
diff --git a/libs/apprise/plugins/NotifyDiscord.py b/libs/apprise/plugins/discord.py
similarity index 95%
rename from libs/apprise/plugins/NotifyDiscord.py
rename to libs/apprise/plugins/discord.py
index 82d764f50..14974cb87 100644
--- a/libs/apprise/plugins/NotifyDiscord.py
+++ b/libs/apprise/plugins/discord.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -50,14 +50,13 @@ from datetime import timedelta
 from datetime import datetime
 from datetime import timezone
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+from ..utils.parse import parse_bool, validate_regex
+from ..locale import gettext_lazy as _
+from ..attachment.base import AttachBase
 
 
 # Used to detect user/role IDs
@@ -597,15 +596,30 @@ class NotifyDiscord(NotifyBase):
         if self.thread_id:
             params['thread'] = self.thread_id
 
+        # Ensure our botname is set
+        botname = f'{self.user}@' if self.user else ''
+
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{webhook_id}/{webhook_token}/?{params}'.format(
-            schema=self.secure_protocol,
-            webhook_id=self.pprint(self.webhook_id, privacy, safe=''),
-            webhook_token=self.pprint(self.webhook_token, privacy, safe=''),
-            params=NotifyDiscord.urlencode(params),
-        )
+        return '{schema}://{botname}{webhook_id}/{webhook_token}/?{params}' \
+            .format(
+                schema=self.secure_protocol,
+                botname=botname,
+                webhook_id=self.pprint(self.webhook_id, privacy, safe=''),
+                webhook_token=self.pprint(
+                    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.
+        """
+        return (self.secure_protocol, self.webhook_id, self.webhook_token)
 
     @staticmethod
     def parse_url(url):
@@ -660,6 +674,11 @@ class NotifyDiscord(NotifyBase):
         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'])
+
         # Extract avatar url if it was specified
         if 'avatar_url' in results['qsd']:
             results['avatar_url'] = \
diff --git a/libs/apprise/plugins/email/__init__.py b/libs/apprise/plugins/email/__init__.py
new file mode 100644
index 000000000..d2d7e6be7
--- /dev/null
+++ b/libs/apprise/plugins/email/__init__.py
@@ -0,0 +1,53 @@
+# -*- 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.
+
+from email import charset
+
+from .base import NotifyEmail
+from .common import (
+    AppriseEmailException, EmailMessage, SecureMailMode, SECURE_MODES,
+    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')
+
+__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',
+]
diff --git a/libs/apprise/plugins/NotifyEmail.py b/libs/apprise/plugins/email/base.py
similarity index 66%
rename from libs/apprise/plugins/NotifyEmail.py
rename to libs/apprise/plugins/email/base.py
index 80f88bf61..ce89cb3d7 100644
--- a/libs/apprise/plugins/NotifyEmail.py
+++ b/libs/apprise/plugins/email/base.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,312 +26,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import dataclasses
 import re
 import smtplib
-import typing as t
 from email.mime.text import MIMEText
 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 email import charset
 
 from socket import error as SocketError
 from datetime import datetime
 from datetime import timezone
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
-from ..common import NotifyFormat, NotifyType
-from ..conversion import convert_between
-from ..utils import is_email, parse_emails, is_hostname
-from ..AppriseLocale import gettext_lazy as _
-from ..logger import logger
-
-# Globally Default encoding mode set to Quoted Printable.
-charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8')
-
-
-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'
-
-    # User Login must UserID Based
-    USERID = 'UserID'
-
-
-# Secure Email Modes
-class SecureMailMode:
-    INSECURE = "insecure"
-    SSL = "ssl"
-    STARTTLS = "starttls"
-
-
-# Define all of the secure modes (used during validation)
-SECURE_MODES = {
-    SecureMailMode.STARTTLS: {
-        'default_port': 587,
-    },
-    SecureMailMode.SSL: {
-        'default_port': 465,
-    },
-    SecureMailMode.INSECURE: {
-        'default_port': 25,
-    },
-}
-
-# 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
-# aren't otherwise specified on the users input.
-EMAIL_TEMPLATES = (
-    # Google GMail
-    (
-        'Google Mail',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Yandex
-    (
-        'Yandex',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Microsoft Hotmail
-    (
-        'Microsoft Hotmail',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Microsoft Outlook
-    (
-        'Microsoft Outlook',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # 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),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.office365.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-        },
-    ),
-
-    # Yahoo Mail
-    (
-        'Yahoo Mail',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Fast Mail (Series 1)
-    (
-        '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),
-        {
-            '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',
-        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),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.fastmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Zoho Mail (Free)
-    (
-        'Zoho Mail',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # 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',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # 163.com
-    (
-        '163.com',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Foxmail.com
-    (
-        'Foxmail.com',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Comcast.net
-    (
-        'Comcast.net',
-        re.compile(
-            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, )
-        },
-    ),
-
-    # Catch All
-    (
-        'Custom',
-        re.compile(
-            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,
-        },
-    ),
-)
-
-
-@dataclasses.dataclass
-class EmailMessage:
-    recipient: str
-    to_addrs: t.List[str]
-    body: str
+from ..base import NotifyBase
+from ...url import PrivacyMode
+from ...common import NotifyFormat, NotifyType
+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 . import templates
 
 
 class NotifyEmail(NotifyBase):
@@ -451,6 +171,20 @@ class NotifyEmail(NotifyBase):
             '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
@@ -463,7 +197,7 @@ class NotifyEmail(NotifyBase):
 
     def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
                  targets=None, cc=None, bcc=None, reply_to=None, headers=None,
-                 **kwargs):
+                 use_pgp=None, pgp_key=None, **kwargs):
         """
         Initialize Email Object
 
@@ -564,7 +298,7 @@ class NotifyEmail(NotifyBase):
             )
 
         # Apply any defaults based on certain known configurations
-        self.NotifyEmailDefaults(secure_mode=secure_mode, **kwargs)
+        self.apply_email_defaults(secure_mode=secure_mode, **kwargs)
 
         if self.user:
             if self.host:
@@ -635,9 +369,25 @@ class NotifyEmail(NotifyBase):
         if not self.smtp_host:
             self.smtp_host = self.host
 
+        # 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)
+
+        # 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']
+
+        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')
+
         return
 
-    def NotifyEmailDefaults(self, secure_mode=None, port=None, **kwargs):
+    def apply_email_defaults(self, secure_mode=None, port=None, **kwargs):
         """
         A function that prefills defaults based on the email
         it was provided.
@@ -656,39 +406,40 @@ class NotifyEmail(NotifyBase):
             self.host,
         )
 
-        for i in range(len(EMAIL_TEMPLATES)):  # pragma: no branch
+        for i in range(len(templates.EMAIL_TEMPLATES)):  # pragma: no branch
             self.logger.trace('Scanning %s against %s' % (
-                from_addr, EMAIL_TEMPLATES[i][0]
+                from_addr, templates.EMAIL_TEMPLATES[i][0]
             ))
-            match = EMAIL_TEMPLATES[i][1].match(from_addr)
+            match = templates.EMAIL_TEMPLATES[i][1].match(from_addr)
             if match:
                 self.logger.info(
                     'Applying %s Defaults' %
-                    EMAIL_TEMPLATES[i][0],
+                    templates.EMAIL_TEMPLATES[i][0],
                 )
                 # the secure flag can not be altered if defined in the template
-                self.secure = EMAIL_TEMPLATES[i][2]\
+                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 = EMAIL_TEMPLATES[i][2]\
+                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 = EMAIL_TEMPLATES[i][2]\
+                    self.port = templates.EMAIL_TEMPLATES[i][2]\
                         .get('port', self.port)
                 if not secure_mode:
-                    self.secure_mode = EMAIL_TEMPLATES[i][2]\
+                    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 = 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.
@@ -709,153 +460,14 @@ class NotifyEmail(NotifyBase):
 
                 break
 
-    def _get_charset(self, input_string):
-        """
-        Get utf-8 charset if non ascii string only
-
-        Encode an ascii string to utf-8 is bad for email deliverability
-        because some anti-spam gives a bad score for that
-        like SUBJ_EXCESS_QP flag on Rspamd
-        """
-        if not input_string:
-            return None
-        return 'utf-8' if not all(ord(c) < 128 for c in input_string) else None
-
     def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
              **kwargs):
-        """
-        Perform Email Notification
-        """
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no Email recipients to notify')
+            logger.warning('There are no Email recipients to notify')
             return False
 
-        messages: t.List[EmailMessage] = []
-
-        # Create a copy of the targets list
-        emails = list(self.targets)
-        while len(emails):
-            # Get our email to notify
-            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]))
-
-            # Strip target out of bcc list if in To
-            bcc = (self.bcc - set([to_addr]))
-
-            # Strip target out of reply_to list if in To
-            reply_to = (self.reply_to - set([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]
-
-            # Format our bcc addresses to support the Name field
-            bcc = [formataddr(
-                (self.names.get(addr, False), addr), charset='utf-8')
-                for addr in bcc]
-
-            if reply_to:
-                # 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]
-
-            self.logger.debug(
-                'Email From: {}'.format(
-                    formataddr(self.from_addr, charset='utf-8')))
-
-            self.logger.debug('Email To: {}'.format(to_addr))
-            if cc:
-                self.logger.debug('Email Cc: {}'.format(', '.join(cc)))
-            if bcc:
-                self.logger.debug('Email Bcc: {}'.format(', '.join(bcc)))
-            if reply_to:
-                self.logger.debug(
-                    'Email Reply-To: {}'.format(', '.join(reply_to))
-                )
-            self.logger.debug('Login ID: {}'.format(self.user))
-            self.logger.debug(
-                'Delivery: {}:{}'.format(self.smtp_host, self.port))
-
-            # Prepare Email Message
-            if self.notify_format == NotifyFormat.HTML:
-                base = MIMEMultipart("alternative")
-                base.attach(MIMEText(
-                    convert_between(
-                        NotifyFormat.HTML, NotifyFormat.TEXT, body),
-                    'plain', 'utf-8')
-                )
-                base.attach(MIMEText(body, 'html', 'utf-8'))
-            else:
-                base = MIMEText(body, 'plain', 'utf-8')
-
-            if attach and self.attachment_support:
-                mixed = MIMEMultipart("mixed")
-                mixed.attach(base)
-                # Now store our attachments
-                for attachment in attach:
-                    if not attachment:
-                        # We could not load the attachment; take an early
-                        # exit since this isn't what the end user wanted
-
-                        # We could not access the attachment
-                        self.logger.error(
-                            'Could not access attachment {}.'.format(
-                                attachment.url(privacy=True)))
-
-                        return False
-
-                    self.logger.debug(
-                        'Preparing Email attachment {}'.format(
-                            attachment.url(privacy=True)))
-
-                    with open(attachment.path, "rb") as abody:
-                        app = MIMEApplication(abody.read())
-                        app.set_type(attachment.mimetype)
-
-                        app.add_header(
-                            'Content-Disposition',
-                            'attachment; filename="{}"'.format(
-                                Header(attachment.name, 'utf-8')),
-                        )
-                        mixed.attach(app)
-                base = mixed
-
-            # Apply any provided custom headers
-            for k, v in self.headers.items():
-                base[k] = Header(v, self._get_charset(v))
-
-            base['Subject'] = Header(title, self._get_charset(title))
-            base['From'] = formataddr(self.from_addr, charset='utf-8')
-            base['To'] = formataddr((to_name, to_addr), charset='utf-8')
-            base['Message-ID'] = make_msgid(domain=self.smtp_host)
-            base['Date'] = \
-                datetime.now(timezone.utc)\
-                .strftime("%a, %d %b %Y %H:%M:%S +0000")
-            base['X-Application'] = self.app_id
-
-            if cc:
-                base['Cc'] = ','.join(cc)
-
-            if reply_to:
-                base['Reply-To'] = ','.join(reply_to)
-
-            message = EmailMessage(
-                recipient=to_addr,
-                to_addrs=[to_addr] + list(cc) + list(bcc),
-                body=base.as_string())
-            messages.append(message)
-
-        return self.submit(messages)
-
-    def submit(self, messages: t.List[EmailMessage]):
-
         # error tracking (used for function return)
         has_error = False
 
@@ -884,42 +496,66 @@ class NotifyEmail(NotifyBase):
                 self.logger.debug('Securing connection with STARTTLS...')
                 socket.starttls()
 
+            self.logger.trace('Login ID: {}'.format(self.user))
             if self.user and self.password:
                 # Apply Login credetials
                 self.logger.debug('Applying user credentials...')
                 socket.login(self.user, self.password)
 
-            # Send the emails
-            for message in messages:
+            # Prepare our headers
+            headers = {
+                '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):
                 try:
                     socket.sendmail(
                         self.from_addr[1],
                         message.to_addrs,
                         message.body)
 
-                    self.logger.info(
-                        f'Sent Email notification to "{message.recipient}".')
+                    self.logger.info('Sent Email to %s', message.recipient)
+
                 except (SocketError, smtplib.SMTPException, RuntimeError) as e:
                     self.logger.warning(
-                        f'Sending email to "{message.recipient}" failed. '
-                        f'Reason: {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:
             self.logger.warning(
-                f'Connection error while submitting email to {self.smtp_host}.'
-                f' Reason: {e}')
+                'Connection error while submitting email to "%s"',
+                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}')
 
             # Mark as failure
             has_error = True
 
         finally:
             # Gracefully terminate the connection with the server
-            if socket is not None:  # pragma: no branch
+            if socket is not None:
                 socket.quit()
 
+        # Reduce our dictionary (eliminate expired keys if any)
+        self.pgp.prune()
+
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
@@ -928,7 +564,13 @@ class NotifyEmail(NotifyBase):
         """
 
         # Define an URL parameters
-        params = {}
+        params = {
+            '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=':\\/')
 
         # Append our headers into our parameters
         params.update({'+{}'.format(k): v for k, v in self.headers.items()})
@@ -961,7 +603,7 @@ class NotifyEmail(NotifyBase):
             params['from'] = \
                 formataddr((False, self.from_addr[1]), charset='utf-8')
 
-        if len(self.cc) > 0:
+        if self.cc:
             # Handle our Carbon Copy Addresses
             params['cc'] = ','.join([
                 formataddr(
@@ -971,7 +613,7 @@ class NotifyEmail(NotifyBase):
                     charset='utf-8').replace(',', '%2C')
                 for e in self.cc])
 
-        if len(self.bcc) > 0:
+        if self.bcc:
             # Handle our Blind Carbon Copy Addresses
             params['bcc'] = ','.join([
                 formataddr(
@@ -1031,12 +673,25 @@ class NotifyEmail(NotifyBase):
             params=NotifyEmail.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.
+        """
+        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'],
+        )
+
     def __len__(self):
         """
         Returns the number of targets associated with this notification
         """
-        targets = len(self.targets)
-        return targets if targets > 0 else 1
+        return len(self.targets) if self.targets else 1
 
     @staticmethod
     def parse_url(url):
@@ -1053,8 +708,12 @@ class NotifyEmail(NotifyBase):
         # Prepare our target lists
         results['targets'] = []
 
-        if not is_hostname(results['host'], ipv4=False, ipv6=False,
-                           underscore=False):
+        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):
 
             if is_email(NotifyEmail.unquote(results['host'])):
                 # Don't lose defined email addresses
@@ -1064,6 +723,16 @@ class NotifyEmail(NotifyBase):
             # value if invalid; we'll attempt to figure this out later on
             results['host'] = ''
 
+        # Get PGP Flag
+        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'])
+
         # 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.
@@ -1085,14 +754,9 @@ class NotifyEmail(NotifyBase):
             from_addr = NotifyEmail.unquote(results['qsd']['from'])
 
             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.
                 from_addr = formataddr(
                     (NotifyEmail.unquote(results['qsd']['name']), from_addr),
                     charset='utf-8')
-                logger.warning(
-                    'Email name= and from= are synonymous; '
-                    'use one or the other.')
 
         elif 'name' in results['qsd'] and len(results['qsd']['name']):
             # Extract from name to associate with from address
@@ -1128,3 +792,233 @@ class NotifyEmail(NotifyBase):
                               for x, y in results['qsd+'].items()}
 
         return results
+
+    @staticmethod
+    def _get_charset(input_string):
+        """
+        Get utf-8 charset if non ascii string only
+
+        Encode an ascii string to utf-8 is bad for email deliverability
+        because some anti-spam gives a bad score for that
+        like SUBJ_EXCESS_QP flag on Rspamd
+        """
+        if not input_string:
+            return 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):
+        """
+        Generator for emails
+            from_addr: must be in format: (from_name, from_addr)
+            to: must be in the format:
+                 [(to_name, to_addr), (to_name, to_addr)), ...]
+            cc: must be a set of email addresses
+            bcc: must be a set of email addresses
+            reply_to: must be either None, or an email address
+            smtp_host: This is used to generate the email's Message-ID. Set
+                       this correctly to avoid getting flagged as Spam
+            notify_format: can be either 'text' or 'html'
+            attach: must be of class AppriseAttachment
+            headers: Optionally provide a dictionary of additional headers you
+                     would like to include in the email payload
+            names: This is a dictionary of email addresses as keys and the
+                   Names to associate with them when sending the email.
+                   This is cross referenced for the cc and bcc lists
+            pgp:   Encrypting the message using Pretty Good Privacy support
+                   This requires that the pgp_path provided exists and
+                   keys can be referenced here to perform the encryption
+                   with. If a key isn't found, one will be generated.
+
+                   pgp support requires the 'PGPy' Python library to be
+                   available.
+
+                   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'
+            logger.warning(msg)
+            raise AppriseEmailException(msg)
+
+        elif pgp and not _pgp.PGP_SUPPORT:
+            msg = 'PGP Support unavailable; install PGPy library'
+            logger.warning(msg)
+            raise AppriseEmailException(msg)
+
+        if not names:
+            # Prepare a empty dictionary to prevent errors/warnings
+            names = {}
+
+        if not smtp_host:
+            # Generate a host identifier (used for Message-ID Creation)
+            smtp_host = from_addr[1].split('@')[1]
+
+        logger.debug('SMTP Host: {smtp_host}')
+
+        # Create a copy of the targets list
+        emails = list(to)
+        while len(emails):
+            # Get our email to notify
+            to_name, to_addr = emails.pop(0)
+
+            # Strip target out of cc list if in To or Bcc
+            _cc = (cc - bcc - set([to_addr]))
+
+            # Strip target out of bcc list if in To
+            _bcc = (bcc - set([to_addr]))
+
+            # Strip target out of reply_to list if in To
+            _reply_to = (reply_to - set([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]
+
+            # Format our bcc addresses to support the Name field
+            _bcc = [formataddr(
+                (names.get(addr, False), addr), charset='utf-8')
+                for addr in _bcc]
+
+            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]
+
+            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))
+                )
+
+            # 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(body, 'html', 'utf-8'))
+            else:
+                base = MIMEText(body, 'plain', 'utf-8')
+
+            if attach:
+                mixed = MIMEMultipart("mixed")
+                mixed.attach(base)
+                # Now store our attachments
+                for no, attachment in enumerate(attach, start=1):
+                    if not attachment:
+                        # We could not load the attachment; take an early
+                        # 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))
+                        logger.warning(msg)
+                        raise AppriseEmailException(msg)
+
+                    logger.debug(
+                        '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'
+
+                        app.add_header(
+                            'Content-Disposition',
+                            'attachment; filename="{}"'.format(
+                                Header(filename, 'utf-8')),
+                        )
+                        mixed.attach(app)
+                base = mixed
+
+            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))
+
+                # Apply our encryption
+                encrypted_content = \
+                    pgp.encrypt(base.as_string(), to_addr)
+
+                if not encrypted_content:
+                    # Unable to send notification
+                    msg = 'Unable to encrypt email via PGP'
+                    logger.warning(msg)
+                    raise AppriseEmailException(msg)
+
+                # prepare our messsage
+                base = MIMEMultipart(
+                    "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'))
+
+                # Set Encryption Info Part
+                enc_payload = MIMEText("Version: 1", "plain")
+                enc_payload.set_type("application/pgp-encrypted")
+                base.attach(enc_payload)
+
+                enc_payload = MIMEBase("application", "octet-stream")
+                enc_payload.set_payload(encrypted_content)
+                base.attach(enc_payload)
+
+            # Apply any provided custom headers
+            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")
+
+            if cc:
+                base['Cc'] = ','.join(_cc)
+
+            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())
diff --git a/libs/apprise/plugins/email/common.py b/libs/apprise/plugins/email/common.py
new file mode 100644
index 000000000..e6a29deb8
--- /dev/null
+++ b/libs/apprise/plugins/email/common.py
@@ -0,0 +1,84 @@
+# -*- 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.
+
+
+import dataclasses
+import typing as t
+
+from ...exception import ApprisePluginException
+
+
+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)
+
+
+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'
+
+    # User Login must UserID Based
+    USERID = 'UserID'
+
+
+# Secure Email Modes
+class SecureMailMode:
+    INSECURE = "insecure"
+    SSL = "ssl"
+    STARTTLS = "starttls"
+
+
+# Define all of the secure modes (used during validation)
+SECURE_MODES = {
+    SecureMailMode.STARTTLS: {
+        'default_port': 587,
+    },
+    SecureMailMode.SSL: {
+        'default_port': 465,
+    },
+    SecureMailMode.INSECURE: {
+        'default_port': 25,
+    },
+}
+
+
+@dataclasses.dataclass
+class EmailMessage:
+    """
+    Our message structure
+    """
+    recipient: str
+    to_addrs: t.List[str]
+    body: str
diff --git a/libs/apprise/plugins/email/templates.py b/libs/apprise/plugins/email/templates.py
new file mode 100644
index 000000000..ac3135736
--- /dev/null
+++ b/libs/apprise/plugins/email/templates.py
@@ -0,0 +1,272 @@
+# -*- 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.
+
+
+import re
+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
+# aren't otherwise specified on the users input.
+EMAIL_TEMPLATES = (
+    # Google GMail
+    (
+        'Google Mail',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Yandex
+    (
+        'Yandex',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Microsoft Hotmail
+    (
+        'Microsoft Hotmail',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Microsoft Outlook
+    (
+        'Microsoft Outlook',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # 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),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.office365.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+        },
+    ),
+
+    # Yahoo Mail
+    (
+        'Yahoo Mail',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Fast Mail (Series 1)
+    (
+        '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),
+        {
+            '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',
+        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),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.fastmail.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Zoho Mail (Free)
+    (
+        'Zoho Mail',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # 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',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # 163.com
+    (
+        '163.com',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Foxmail.com
+    (
+        'Foxmail.com',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Comcast.net
+    (
+        'Comcast.net',
+        re.compile(
+            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, )
+        },
+    ),
+
+    # Catch All
+    (
+        'Custom',
+        re.compile(
+            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,
+        },
+    ),
+)
diff --git a/libs/apprise/plugins/NotifyEmby.py b/libs/apprise/plugins/emby.py
similarity index 97%
rename from libs/apprise/plugins/NotifyEmby.py
rename to libs/apprise/plugins/emby.py
index ce96553a2..479eaf23f 100644
--- a/libs/apprise/plugins/NotifyEmby.py
+++ b/libs/apprise/plugins/emby.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,12 +34,12 @@ import hashlib
 from json import dumps
 from json import loads
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
-from ..utils import parse_bool
+from .base import NotifyBase
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool
 from ..common import NotifyType
 from .. import __version__ as VERSION
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class NotifyEmby(NotifyBase):
@@ -593,6 +593,18 @@ class NotifyEmby(NotifyBase):
 
         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.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.
diff --git a/libs/apprise/plugins/NotifyEnigma2.py b/libs/apprise/plugins/enigma2.py
similarity index 94%
rename from libs/apprise/plugins/NotifyEnigma2.py
rename to libs/apprise/plugins/enigma2.py
index 313149993..0c3df9874 100644
--- a/libs/apprise/plugins/NotifyEnigma2.py
+++ b/libs/apprise/plugins/enigma2.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -37,10 +37,10 @@
 import requests
 from json import loads
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class Enigma2MessageType:
@@ -181,6 +181,20 @@ class NotifyEnigma2(NotifyBase):
 
         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.user, self.password, self.host,
+            self.port if self.port else (443 if self.secure else 80),
+            self.fullpath.rstrip('/'),
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyFCM/__init__.py b/libs/apprise/plugins/fcm/__init__.py
similarity index 97%
rename from libs/apprise/plugins/NotifyFCM/__init__.py
rename to libs/apprise/plugins/fcm/__init__.py
index 54b6c9cc7..de6ede07a 100644
--- a/libs/apprise/plugins/NotifyFCM/__init__.py
+++ b/libs/apprise/plugins/fcm/__init__.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -50,15 +50,13 @@
 # You will need this in order to send an apprise messag
 import requests
 from json import dumps
-from ..NotifyBase import NotifyBase
+from ..base import NotifyBase
 from ...common import NotifyType
-from ...utils import validate_regex
-from ...utils import parse_list
-from ...utils import parse_bool
-from ...utils import dict_full_update
+from ...utils.parse import validate_regex, parse_list, parse_bool
+from ...utils.logic import dict_full_update
 from ...common import NotifyImageSize
-from ...AppriseAttachment import AppriseAttachment
-from ...AppriseLocale import gettext_lazy as _
+from ...apprise_attachment import AppriseAttachment
+from ...locale import gettext_lazy as _
 from .common import (FCMMode, FCM_MODES)
 from .priority import (FCM_PRIORITIES, FCMPriorityManager)
 from .color import FCMColorManager
@@ -507,6 +505,15 @@ class NotifyFCM(NotifyBase):
 
         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.apikey, self.project)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyFCM/color.py b/libs/apprise/plugins/fcm/color.py
similarity index 97%
rename from libs/apprise/plugins/NotifyFCM/color.py
rename to libs/apprise/plugins/fcm/color.py
index c7da209a7..1904330a2 100644
--- a/libs/apprise/plugins/NotifyFCM/color.py
+++ b/libs/apprise/plugins/fcm/color.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,9 +34,9 @@
 # https://firebase.google.com/docs/reference/fcm/rest/v1/\
 #       projects.messages#androidnotification
 import re
-from ...utils import parse_bool
+from ...utils.parse import parse_bool
 from ...common import NotifyType
-from ...AppriseAsset import AppriseAsset
+from ...asset import AppriseAsset
 
 
 class FCMColorManager:
diff --git a/libs/apprise/plugins/NotifyFCM/common.py b/libs/apprise/plugins/fcm/common.py
similarity index 96%
rename from libs/apprise/plugins/NotifyFCM/common.py
rename to libs/apprise/plugins/fcm/common.py
index 9f139226a..18560680d 100644
--- a/libs/apprise/plugins/NotifyFCM/common.py
+++ b/libs/apprise/plugins/fcm/common.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/plugins/NotifyFCM/oauth.py b/libs/apprise/plugins/fcm/oauth.py
similarity index 99%
rename from libs/apprise/plugins/NotifyFCM/oauth.py
rename to libs/apprise/plugins/fcm/oauth.py
index fbde3ccf7..444c7d237 100644
--- a/libs/apprise/plugins/NotifyFCM/oauth.py
+++ b/libs/apprise/plugins/fcm/oauth.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/plugins/NotifyFCM/priority.py b/libs/apprise/plugins/fcm/priority.py
similarity index 99%
rename from libs/apprise/plugins/NotifyFCM/priority.py
rename to libs/apprise/plugins/fcm/priority.py
index 8564d3460..2768d396f 100644
--- a/libs/apprise/plugins/NotifyFCM/priority.py
+++ b/libs/apprise/plugins/fcm/priority.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
diff --git a/libs/apprise/plugins/NotifyFeishu.py b/libs/apprise/plugins/feishu.py
similarity index 94%
rename from libs/apprise/plugins/NotifyFeishu.py
rename to libs/apprise/plugins/feishu.py
index e6988333c..0e75bec2c 100644
--- a/libs/apprise/plugins/NotifyFeishu.py
+++ b/libs/apprise/plugins/feishu.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,10 +36,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyFeishu(NotifyBase):
@@ -192,6 +192,15 @@ class NotifyFeishu(NotifyBase):
 
         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.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyFlock.py b/libs/apprise/plugins/flock.py
similarity index 96%
rename from libs/apprise/plugins/NotifyFlock.py
rename to libs/apprise/plugins/flock.py
index f1d12067e..223648e1d 100644
--- a/libs/apprise/plugins/NotifyFlock.py
+++ b/libs/apprise/plugins/flock.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -44,14 +44,12 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
 from ..common import NotifyImageSize
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..locale import gettext_lazy as _
 
 
 # Extend HTTP Error Messages
@@ -308,6 +306,15 @@ class NotifyFlock(NotifyBase):
 
         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.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyFreeMobile.py b/libs/apprise/plugins/freemobile.py
similarity index 93%
rename from libs/apprise/plugins/NotifyFreeMobile.py
rename to libs/apprise/plugins/freemobile.py
index 4aad8db3d..827c837fd 100644
--- a/libs/apprise/plugins/NotifyFreeMobile.py
+++ b/libs/apprise/plugins/freemobile.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,9 +36,9 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 
 class NotifyFreeMobile(NotifyBase):
@@ -103,6 +103,15 @@ class NotifyFreeMobile(NotifyBase):
 
         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.user, self.password)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -126,6 +135,7 @@ class NotifyFreeMobile(NotifyBase):
         # prepare our headers
         headers = {
             'User-Agent': self.app_id,
+            'Content-Type': 'application/json',
         }
 
         # Prepare our payload
diff --git a/libs/apprise/plugins/NotifyGnome.py b/libs/apprise/plugins/gnome.py
similarity index 96%
rename from libs/apprise/plugins/NotifyGnome.py
rename to libs/apprise/plugins/gnome.py
index 67129216d..ae148aefa 100644
--- a/libs/apprise/plugins/NotifyGnome.py
+++ b/libs/apprise/plugins/gnome.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,11 +26,11 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_GNOME_SUPPORT_ENABLED = False
@@ -132,6 +132,10 @@ class NotifyGnome(NotifyBase):
     # cause any title (if defined) to get placed into the message body.
     title_maxlen = 0
 
+    # 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}://',
diff --git a/libs/apprise/plugins/NotifyGoogleChat.py b/libs/apprise/plugins/google_chat.py
similarity index 95%
rename from libs/apprise/plugins/NotifyGoogleChat.py
rename to libs/apprise/plugins/google_chat.py
index d2a6cc8a8..013fa6839 100644
--- a/libs/apprise/plugins/NotifyGoogleChat.py
+++ b/libs/apprise/plugins/google_chat.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -58,11 +58,11 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyGoogleChat(NotifyBase):
@@ -265,6 +265,18 @@ class NotifyGoogleChat(NotifyBase):
 
         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.workspace, self.webhook_key,
+            self.webhook_token,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyGotify.py b/libs/apprise/plugins/gotify.py
similarity index 94%
rename from libs/apprise/plugins/NotifyGotify.py
rename to libs/apprise/plugins/gotify.py
index 3f4ce132d..c06333ffc 100644
--- a/libs/apprise/plugins/NotifyGotify.py
+++ b/libs/apprise/plugins/gotify.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,10 +34,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType, NotifyFormat
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 # Priorities
@@ -265,6 +265,20 @@ class NotifyGotify(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host,
+            self.port if self.port else (443 if self.secure else 80),
+            self.fullpath.rstrip('/'),
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyGrowl.py b/libs/apprise/plugins/growl.py
similarity index 95%
rename from libs/apprise/plugins/NotifyGrowl.py
rename to libs/apprise/plugins/growl.py
index 0b42e3bec..7cca60dc5 100644
--- a/libs/apprise/plugins/NotifyGrowl.py
+++ b/libs/apprise/plugins/growl.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,12 +26,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_GROWL_SUPPORT_ENABLED = False
@@ -338,6 +338,19 @@ class NotifyGrowl(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/NotifyGuilded.py b/libs/apprise/plugins/guilded.py
similarity index 94%
rename from libs/apprise/plugins/NotifyGuilded.py
rename to libs/apprise/plugins/guilded.py
index 0ea36d9f8..29cd492bf 100644
--- a/libs/apprise/plugins/NotifyGuilded.py
+++ b/libs/apprise/plugins/guilded.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -45,10 +45,11 @@
 #
 
 import re
-from .NotifyDiscord import NotifyDiscord
+# Import namespace so the class won't conflict with the actual Notify object
+from . import discord
 
 
-class NotifyGuilded(NotifyDiscord):
+class NotifyGuilded(discord.NotifyDiscord):
     """
     A wrapper to Guilded Notifications
 
diff --git a/libs/apprise/plugins/NotifyHomeAssistant.py b/libs/apprise/plugins/home_assistant.py
similarity index 91%
rename from libs/apprise/plugins/NotifyHomeAssistant.py
rename to libs/apprise/plugins/home_assistant.py
index 0829381b9..c580e04ed 100644
--- a/libs/apprise/plugins/NotifyHomeAssistant.py
+++ b/libs/apprise/plugins/home_assistant.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,11 +34,11 @@ from json import dumps
 
 from uuid import uuid4
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyHomeAssistant(NotifyBase):
@@ -179,8 +179,8 @@ class NotifyHomeAssistant(NotifyBase):
         if isinstance(self.port, int):
             url += ':%d' % self.port
 
-        url += '' if not self.fullpath else '/' + self.fullpath.strip('/')
-        url += '/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,
@@ -231,6 +231,22 @@ class NotifyHomeAssistant(NotifyBase):
 
         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 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.accesstoken,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -302,7 +318,7 @@ class NotifyHomeAssistant(NotifyBase):
             results['accesstoken'] = fullpath.pop() if fullpath else None
 
             # Re-assemble our full path
-            results['fullpath'] = '/'.join(fullpath)
+            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.
diff --git a/libs/apprise/plugins/NotifyHttpSMS.py b/libs/apprise/plugins/httpsms.py
similarity index 95%
rename from libs/apprise/plugins/NotifyHttpSMS.py
rename to libs/apprise/plugins/httpsms.py
index 647100949..959258027 100644
--- a/libs/apprise/plugins/NotifyHttpSMS.py
+++ b/libs/apprise/plugins/httpsms.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -31,12 +31,10 @@
 #     https://httpsms.com
 import requests
 import json
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyHttpSMS(NotifyBase):
@@ -253,6 +251,15 @@ class NotifyHttpSMS(NotifyBase):
 
         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.source, self.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyIFTTT.py b/libs/apprise/plugins/ifttt.py
similarity index 96%
rename from libs/apprise/plugins/NotifyIFTTT.py
rename to libs/apprise/plugins/ifttt.py
index 9174640d0..e169fb39e 100644
--- a/libs/apprise/plugins/NotifyIFTTT.py
+++ b/libs/apprise/plugins/ifttt.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -44,11 +44,10 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyIFTTT(NotifyBase):
@@ -287,6 +286,15 @@ class NotifyIFTTT(NotifyBase):
 
         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.webhook_id)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyJoin.py b/libs/apprise/plugins/join.py
similarity index 96%
rename from libs/apprise/plugins/NotifyJoin.py
rename to libs/apprise/plugins/join.py
index c6b0d91e9..35d851875 100644
--- a/libs/apprise/plugins/NotifyJoin.py
+++ b/libs/apprise/plugins/join.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -39,13 +39,11 @@
 import re
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 JOIN_HTTP_ERROR_MAP = {
@@ -345,6 +343,15 @@ class NotifyJoin(NotifyBase):
 
         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.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyKavenegar.py b/libs/apprise/plugins/kavenegar.py
similarity index 96%
rename from libs/apprise/plugins/NotifyKavenegar.py
rename to libs/apprise/plugins/kavenegar.py
index 2a9c169d7..bab3584f9 100644
--- a/libs/apprise/plugins/NotifyKavenegar.py
+++ b/libs/apprise/plugins/kavenegar.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -38,12 +38,10 @@
 import requests
 from json import loads
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 # Based on https://kavenegar.com/rest.html
@@ -304,6 +302,15 @@ class NotifyKavenegar(NotifyBase):
 
         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.source, self.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyKumulos.py b/libs/apprise/plugins/kumulos.py
similarity index 94%
rename from libs/apprise/plugins/NotifyKumulos.py
rename to libs/apprise/plugins/kumulos.py
index da372e773..8d50ecc17 100644
--- a/libs/apprise/plugins/NotifyKumulos.py
+++ b/libs/apprise/plugins/kumulos.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -39,10 +39,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 KUMULOS_HTTP_ERROR_MAP = {
@@ -198,6 +198,15 @@ class NotifyKumulos(NotifyBase):
             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.apikey, self.serverkey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyLametric.py b/libs/apprise/plugins/lametric.py
similarity index 96%
rename from libs/apprise/plugins/NotifyLametric.py
rename to libs/apprise/plugins/lametric.py
index 5825d9176..73888410d 100644
--- a/libs/apprise/plugins/NotifyLametric.py
+++ b/libs/apprise/plugins/lametric.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -90,12 +90,10 @@
 import re
 import requests
 from json import dumps
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..utils import is_hostname
-from ..utils import is_ipaddr
+from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex, is_hostname, is_ipaddr
 
 # A URL Parser to detect App ID
 LAMETRIC_APP_ID_DETECTOR_RE = re.compile(
@@ -783,6 +781,29 @@ class NotifyLametric(NotifyBase):
 
         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.
+        """
+        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']),
+            )
+
+        return (
+            self.protocol,
+            self.lametric_app_access_token,
+            self.lametric_app_id,
+            self.lametric_app_ver,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -871,6 +892,9 @@ class NotifyLametric(NotifyBase):
             results['password'] = results['user']
             results['user'] = None
 
+        # Get unquoted entries
+        entries = NotifyLametric.split_path(results['fullpath'])
+
         # Priority Handling
         if 'priority' in results['qsd'] and results['qsd']['priority']:
             results['priority'] = NotifyLametric.unquote(
@@ -913,6 +937,10 @@ class NotifyLametric(NotifyBase):
             results['app_ver'] = \
                 NotifyLametric.unquote(results['qsd']['app_ver'])
 
+        elif entries:
+            # Store our app id
+            results['app_ver'] = entries.pop(0)
+
         if 'token' in results['qsd'] and results['qsd']['token']:
             # Extract Application Access Token from an argument
             results['app_token'] = \
@@ -938,7 +966,7 @@ class NotifyLametric(NotifyBase):
                         LAMETRIC_IS_APP_TOKEN.match(results['password'])) and
 
                     # Scan for app_ flags
-                    next((f for f in results.keys() \
+                    next((f for f in results.keys()
                           if f.startswith('app_')), None) is None) \
                 else LametricMode.CLOUD
 
diff --git a/libs/apprise/plugins/NotifyLine.py b/libs/apprise/plugins/line.py
similarity index 95%
rename from libs/apprise/plugins/NotifyLine.py
rename to libs/apprise/plugins/line.py
index 61e4f3703..bcca3e13c 100644
--- a/libs/apprise/plugins/NotifyLine.py
+++ b/libs/apprise/plugins/line.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,14 +33,12 @@ import requests
 import re
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import validate_regex
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex, parse_list, parse_bool
+from ..locale import gettext_lazy as _
 
 
 # Used to break path apart into list of streams
@@ -241,6 +239,15 @@ class NotifyLine(NotifyBase):
 
         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.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyLunaSea.py b/libs/apprise/plugins/lunasea.py
similarity index 93%
rename from libs/apprise/plugins/NotifyLunaSea.py
rename to libs/apprise/plugins/lunasea.py
index 51d820915..09a7ab541 100644
--- a/libs/apprise/plugins/NotifyLunaSea.py
+++ b/libs/apprise/plugins/lunasea.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,15 +33,13 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import parse_list
-from ..utils import is_hostname
-from ..utils import is_ipaddr
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
-from ..URLBase import PrivacyMode
+from ..utils.parse import (
+    parse_list, is_hostname, is_ipaddr, parse_bool)
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
 
 
 class LunaSeaMode:
@@ -324,6 +322,24 @@ class NotifyLunaSea(NotifyBase):
 
         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.
diff --git a/libs/apprise/plugins/NotifyMacOSX.py b/libs/apprise/plugins/macosx.py
similarity index 96%
rename from libs/apprise/plugins/NotifyMacOSX.py
rename to libs/apprise/plugins/macosx.py
index dd53369fe..6107d33e7 100644
--- a/libs/apprise/plugins/NotifyMacOSX.py
+++ b/libs/apprise/plugins/macosx.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,11 +30,11 @@ import platform
 import subprocess
 import os
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_MACOSX_SUPPORT_ENABLED = False
@@ -92,6 +92,10 @@ class NotifyMacOSX(NotifyBase):
     # content to display
     body_max_line_count = 10
 
+    # 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
+
     # The possible paths to the terminal-notifier
     notify_paths = (
         '/opt/homebrew/bin/terminal-notifier',
diff --git a/libs/apprise/plugins/NotifyMailgun.py b/libs/apprise/plugins/mailgun.py
similarity index 96%
rename from libs/apprise/plugins/NotifyMailgun.py
rename to libs/apprise/plugins/mailgun.py
index 82cf970bf..a7d5258e3 100644
--- a/libs/apprise/plugins/NotifyMailgun.py
+++ b/libs/apprise/plugins/mailgun.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -56,15 +56,13 @@
 #
 import requests
 from email.utils import formataddr
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_emails
-from ..utils import parse_bool
-from ..utils import is_email
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_emails, parse_bool, is_email, validate_regex)
 from ..logger import logger
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 # Provide some known codes Mailgun uses and what they translate to:
 # Based on https://documentation.mailgun.com/en/latest/api-intro.html#errors
@@ -383,9 +381,15 @@ class NotifyMailgun(NotifyBase):
                 self.logger.debug(
                     'Preparing Mailgun attachment {}'.format(
                         attachment.url(privacy=True)))
+
+                # Prepare our filename
+                filename = attachment.name \
+                    if attachment.name \
+                    else 'file{no:03}.dat'.format(no=idx + 1)
+
                 try:
                     files['attachment[{}]'.format(idx)] = \
-                        (attachment.name, open(attachment.path, 'rb'))
+                        (filename, open(attachment.path, 'rb'))
 
                 except (OSError, IOError) as e:
                     self.logger.warning(
@@ -579,6 +583,17 @@ class NotifyMailgun(NotifyBase):
 
         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.host, self.apikey, self.region_name,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyMastodon.py b/libs/apprise/plugins/mastodon.py
similarity index 98%
rename from libs/apprise/plugins/NotifyMastodon.py
rename to libs/apprise/plugins/mastodon.py
index 0d2f27df3..5206fd371 100644
--- a/libs/apprise/plugins/NotifyMastodon.py
+++ b/libs/apprise/plugins/mastodon.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,16 +33,14 @@ from json import dumps, loads
 from datetime import datetime
 from datetime import timezone
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..locale import gettext_lazy as _
+from ..attachment.base import AttachBase
 
 # Accept:
 # - @username
@@ -336,6 +334,18 @@ class NotifyMastodon(NotifyBase):
 
         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[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.
diff --git a/libs/apprise/plugins/NotifyMatrix.py b/libs/apprise/plugins/matrix.py
similarity index 74%
rename from libs/apprise/plugins/NotifyMatrix.py
rename to libs/apprise/plugins/matrix.py
index 594274761..ffc4e3e9c 100644
--- a/libs/apprise/plugins/NotifyMatrix.py
+++ b/libs/apprise/plugins/matrix.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -32,21 +32,22 @@
 #
 import re
 import requests
+import uuid
 from markdown import markdown
 from json import dumps
 from json import loads
 from time import time
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
+from ..exception import AppriseException
 from ..common import NotifyType
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import is_hostname
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..common import PersistentStoreMode
+from ..utils.parse import (
+    parse_bool, parse_list, is_hostname, validate_regex)
+from ..locale import gettext_lazy as _
 
 # Define default path
 MATRIX_V1_WEBHOOK_PATH = '/api/v1/matrix/hook'
@@ -55,6 +56,13 @@ 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
+    """
+
+
 # Extend HTTP Error Messages
 MATRIX_HTTP_ERROR_MAP = {
     403: 'Unauthorized - Invalid Token.',
@@ -164,9 +172,6 @@ class NotifyMatrix(NotifyBase):
     # Throttle a wee-bit to avoid thrashing
     request_rate_per_sec = 0.5
 
-    # Our Matrix API Version
-    matrix_api_version = '3'
-
     # How many retry attempts we'll make in the event the server asks us to
     # throttle back.
     default_retries = 2
@@ -175,15 +180,31 @@ class NotifyMatrix(NotifyBase):
     # the server doesn't remind us how long we shoul wait for
     default_wait_ms = 1000
 
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
+    # Keep our cache for 20 days
+    default_cache_expiry_sec = 60 * 60 * 24 * 20
+
+    # Used for server discovery
+    discovery_base_key = '__discovery_base'
+    discovery_identity_key = '__discovery_identity'
+
+    # Defines how long we cache our discovery for
+    discovery_cache_length_sec = 86400
+
     # Define object templates
     templates = (
         # Targets are ignored when using t2bot mode; only a token is required
         '{schema}://{token}',
         '{schema}://{user}@{token}',
 
-        # Disabled webhook
+        # Matrix Server
         '{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}',
@@ -248,6 +269,11 @@ class NotifyMatrix(NotifyBase):
             'default': False,
             'map_to': 'include_image',
         },
+        'discovery': {
+            'name': _('Server Discovery'),
+            'type': 'bool',
+            'default': True,
+        },
         'mode': {
             'name': _('Webhook Mode'),
             'type': 'choice:string',
@@ -275,7 +301,7 @@ class NotifyMatrix(NotifyBase):
     })
 
     def __init__(self, targets=None, mode=None, msgtype=None, version=None,
-                 include_image=False, **kwargs):
+                 include_image=None, discovery=None, **kwargs):
         """
         Initialize Matrix Object
         """
@@ -293,12 +319,16 @@ class NotifyMatrix(NotifyBase):
         # This gets initialized after a login/registration
         self.access_token = None
 
-        # Place an image inline with the message body
-        self.include_image = include_image
+        # This gets incremented for each request made against the v3 API
+        self.transaction_id = 0
 
-        # maintain a lookup of room alias's we already paired with their id
-        # to speed up future requests
-        self._room_cache = {}
+        # Place an image inline with the message body
+        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
 
         # Setup our mode
         self.mode = self.template_args['mode']['default'] \
@@ -339,6 +369,7 @@ class NotifyMatrix(NotifyBase):
                   .format(self.host)
             self.logger.warning(msg)
             raise TypeError(msg)
+
         else:
             # Verify port if specified
             if self.port is not None and not (
@@ -350,6 +381,27 @@ class NotifyMatrix(NotifyBase):
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
+        if self.mode != MatrixWebhookMode.DISABLED:
+            # Discovery only works when we're not using webhooks
+            self.discovery = False
+
+        #
+        # Initialize from cache if present
+        #
+        if self.mode != MatrixWebhookMode.T2BOT:
+            # our home server gets populated after a login/registration
+            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')
+
+            # This gets initialized after a login/registration
+            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)
+
     def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         """
         Perform Matrix Notification
@@ -561,6 +613,10 @@ class NotifyMatrix(NotifyBase):
         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:
             # We need to register
             if not self._login():
@@ -612,8 +668,10 @@ class NotifyMatrix(NotifyBase):
 
             # Build our path
             if self.version == MatrixVersion.V3:
-                path = '/rooms/{}/send/m.room.message/0'.format(
-                    NotifyMatrix.quote(room_id))
+                path = '/rooms/{}/send/m.room.message/{}'.format(
+                    NotifyMatrix.quote(room_id),
+                    self.transaction_id,
+                )
 
             else:
                 path = '/rooms/{}/send/m.room.message'.format(
@@ -685,6 +743,16 @@ class NotifyMatrix(NotifyBase):
             method = 'PUT' if self.version == MatrixVersion.V3 else 'POST'
             postokay, response = 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:
+                self.transaction_id += 1
+                self.store.set(
+                    'transaction_id', self.transaction_id,
+                    expires=self.default_cache_expiry_sec)
+
             if not postokay:
                 # Notify our user
                 self.logger.warning(
@@ -800,7 +868,18 @@ class NotifyMatrix(NotifyBase):
         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)
+        self.store.set(
+            '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)
+
         if self.access_token is not None:
+            # Store our token into our store
             self.logger.debug(
                 'Registered successfully with Matrix server.')
             return True
@@ -817,32 +896,33 @@ class NotifyMatrix(NotifyBase):
             # Login not required; silently skip-over
             return True
 
-        if not (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,
+                    },
+                    'password': self.password,
+                }
+
+            else:
+                payload = {
+                    '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: '
-                'user/pass combo is missing.')
+                'token or user/pass combo is missing.')
             return False
 
-        # Prepare our Authentication Payload
-        if self.version == MatrixVersion.V3:
-            payload = {
-                'type': 'm.login.password',
-                'identifier': {
-                    'type': 'm.id.user',
-                    'user': self.user,
-                },
-                'password': self.password,
-            }
-
-        else:
-            payload = {
-                'type': 'm.login.password',
-                'user': self.user,
-                'password': self.password,
-            }
-
         # Build our URL
         postokay, response = self._fetch('/login', payload=payload)
         if not (postokay and isinstance(response, dict)):
@@ -859,6 +939,18 @@ class NotifyMatrix(NotifyBase):
 
         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)
+        self.store.set(
+            '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)
+
         return True
 
     def _logout(self):
@@ -896,8 +988,9 @@ class NotifyMatrix(NotifyBase):
         self.home_server = None
         self.user_id = None
 
-        # Clear our room cache
-        self._room_cache = {}
+        # clear our tokens
+        self.store.clear(
+            'access_token', 'home_server', 'user_id', 'transaction_id')
 
         self.logger.debug(
             'Unauthenticated successfully with Matrix server.')
@@ -937,9 +1030,13 @@ class NotifyMatrix(NotifyBase):
             )
 
             # Check our cache for speed:
-            if room_id in self._room_cache:
+            try:
                 # We're done as we've already joined the channel
-                return self._room_cache[room_id]['id']
+                return self.store[room_id]['id']
+
+            except KeyError:
+                # No worries, we'll try to acquire the info
+                pass
 
             # Build our URL
             path = '/join/{}'.format(NotifyMatrix.quote(room_id))
@@ -948,10 +1045,10 @@ class NotifyMatrix(NotifyBase):
             postokay, _ = self._fetch(path, payload=payload)
             if postokay:
                 # Cache our entry for fast access later
-                self._room_cache[room_id] = {
+                self.store.set(room_id, {
                     'id': room_id,
                     'home_server': home_server,
-                }
+                })
 
             return room_id if postokay else None
 
@@ -973,9 +1070,13 @@ class NotifyMatrix(NotifyBase):
         room = '#{}:{}'.format(result.group('room'), home_server)
 
         # Check our cache for speed:
-        if room in self._room_cache:
+        try:
             # We're done as we've already joined the channel
-            return self._room_cache[room]['id']
+            return self.store[room]['id']
+
+        except KeyError:
+            # No worries, we'll try to acquire the info
+            pass
 
         # If we reach here, we need to join the channel
 
@@ -986,11 +1087,12 @@ class NotifyMatrix(NotifyBase):
         postokay, response = self._fetch(path, payload=payload)
         if postokay:
             # Cache our entry for fast access later
-            self._room_cache[room] = {
+            self.store.set(room, {
                 'id': response.get('room_id'),
                 'home_server': home_server,
-            }
-            return self._room_cache[room]['id']
+            })
+
+            return response.get('room_id')
 
         # Try to create the channel
         return self._room_create(room)
@@ -1045,10 +1147,10 @@ class NotifyMatrix(NotifyBase):
             return None
 
         # Cache our entry for fast access later
-        self._room_cache[response.get('room_alias')] = {
+        self.store.set(response.get('room_alias'), {
             'id': response.get('room_id'),
             'home_server': home_server,
-        }
+        })
 
         return response.get('room_id')
 
@@ -1111,14 +1213,16 @@ class NotifyMatrix(NotifyBase):
 
         return None
 
-    def _fetch(self, path, payload=None, params=None, attachment=None,
-               method='POST'):
+    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
         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 the status code if url_override is used
         """
 
         # Define our headers
@@ -1131,14 +1235,20 @@ class NotifyMatrix(NotifyBase):
         if self.access_token is not None:
             headers["Authorization"] = 'Bearer %s' % self.access_token
 
-        default_port = 443 if self.secure else 80
+        # Server Discovery / Well-known URI
+        if url_override:
+            url = url_override
 
-        url = \
-            '{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}')
+        else:
+            try:
+                url = self.base_url
+
+            except MatrixDiscoveryException:
+                # Discovery failed; we're done
+                return (False, {})
+
+        # Default return status code
+        status_code = requests.codes.internal_server_error
 
         if path == '/upload':
             # FUTURE if self.version == MatrixVersion.V3:
@@ -1148,14 +1258,14 @@ class NotifyMatrix(NotifyBase):
             # FUTURE     url += MATRIX_V2_MEDIA_PATH + path
             url += MATRIX_V2_MEDIA_PATH + path
 
-            params = {'filename': attachment.name}
+            params.update({'filename': attachment.name})
             with open(attachment.path, 'rb') as fp:
                 payload = fp.read()
 
             # Update our content type
             headers['Content-Type'] = attachment.mimetype
 
-        else:
+        elif not url_override:
             if self.version == MatrixVersion.V3:
                 url += MATRIX_V3_API_PATH + path
 
@@ -1177,7 +1287,9 @@ class NotifyMatrix(NotifyBase):
             # Decrement our throttle retry count
             retries -= 1
 
-            self.logger.debug('Matrix POST URL: %s (cert_verify=%r)' % (
+            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))
@@ -1189,18 +1301,21 @@ class NotifyMatrix(NotifyBase):
                 r = fn(
                     url,
                     data=dumps(payload) if not attachment else payload,
-                    params=params,
+                    params=None if not params else params,
                     headers=headers,
                     verify=self.verify_certificate,
                     timeout=self.request_timeout,
                 )
 
+                # Store status code
+                status_code = r.status_code
+
                 self.logger.debug(
                     'Matrix Response: code=%d, %s' % (
                         r.status_code, str(r.content)))
                 response = loads(r.content)
 
-                if r.status_code == 429:
+                if r.status_code == requests.codes.too_many_requests:
                     wait = self.default_wait_ms / 1000
                     try:
                         wait = response['retry_after_ms'] / 1000
@@ -1241,7 +1356,8 @@ class NotifyMatrix(NotifyBase):
                         'Response Details:\r\n{}'.format(r.content))
 
                     # Return; we're done
-                    return (False, response)
+                    return (
+                        False if not url_override else status_code, response)
 
             except (AttributeError, TypeError, ValueError):
                 # This gets thrown if we can't parse our JSON Response
@@ -1251,27 +1367,27 @@ class NotifyMatrix(NotifyBase):
                 self.logger.warning('Invalid response from Matrix server.')
                 self.logger.debug(
                     'Response Details:\r\n{}'.format(r.content))
-                return (False, {})
+                return (False if not url_override else status_code, {})
 
-            except requests.RequestException as e:
+            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))
+                self.logger.debug('Socket Exception: %s', str(e))
                 # Return; we're done
-                return (False, response)
+                return (False if not url_override else status_code, response)
 
             except (OSError, IOError) 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, {})
+                self.logger.debug('I/O Exception: %s', str(e))
+                return (False if not url_override else status_code, {})
 
-            return (True, response)
+            return (True if not url_override else status_code, response)
 
         # If we get here, we ran out of retries
-        return (False, {})
+        return (False if not url_override else status_code, {})
 
     def __del__(self):
         """
@@ -1281,6 +1397,15 @@ class NotifyMatrix(NotifyBase):
             # nothing to do
             return
 
+        if self.store.mode != PersistentStoreMode.MEMORY:
+            # We no longer have to log out as we have persistant storage to
+            # re-use our credentials with
+            return
+
+        if self.access_token is not None \
+           and self.access_token == self.password and not self.user:
+            return
+
         try:
             self._logout()
 
@@ -1325,6 +1450,22 @@ class NotifyMatrix(NotifyBase):
             # the end user if we don't have to.
             pass
 
+    @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 if self.secure else self.protocol,
+            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.
@@ -1336,6 +1477,7 @@ class NotifyMatrix(NotifyBase):
             'mode': self.mode,
             'version': self.version,
             'msgtype': self.msgtype,
+            'discovery': 'yes' if self.discovery else 'no',
         }
 
         # Extend our parameters
@@ -1352,9 +1494,10 @@ class NotifyMatrix(NotifyBase):
                         safe=''),
                 )
 
-            elif self.user:
-                auth = '{user}@'.format(
-                    user=NotifyMatrix.quote(self.user, safe=''),
+            elif self.user or self.password:
+                auth = '{value}@'.format(
+                    value=NotifyMatrix.quote(
+                        self.user if self.user else self.password, safe=''),
                 )
 
         default_port = 443 if self.secure else 80
@@ -1405,6 +1548,10 @@ class NotifyMatrix(NotifyBase):
         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']))
+
         # Get our mode
         results['mode'] = results['qsd'].get('mode')
 
@@ -1432,6 +1579,11 @@ class NotifyMatrix(NotifyBase):
         if 'token' in results['qsd'] and len(results['qsd']['token']):
             results['password'] = NotifyMatrix.unquote(results['qsd']['token'])
 
+        elif not results['password'] and results['user']:
+            # swap
+            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'] = \
@@ -1464,3 +1616,200 @@ class NotifyMatrix(NotifyBase):
                     else '{}&{}'.format(result.group('params'), mode)))
 
         return None
+
+    def server_discovery(self):
+        """
+        Home Server Discovery as documented here:
+           https://spec.matrix.org/v1.11/client-server-api/#well-known-uri
+        """
+
+        if not (self.discovery and self.secure):
+            # Nothing further to do with insecure server setups
+            return ''
+
+        # Get our content from cache
+        base_url, identity_url = (
+            self.store.get(self.discovery_base_key),
+            self.store.get(self.discovery_identity_key),
+        )
+
+        if not (base_url is None and identity_url is None):
+            # 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)
+
+        # Output may look as follows:
+        # {
+        #     "m.homeserver": {
+        #         "base_url": "https://matrix.example.com"
+        #     },
+        #     "m.identity_server": {
+        #         "base_url": "https://nuxref.com"
+        #     }
+        # }
+
+        if 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)
+
+            # Set our keys out for fast recall later on
+            self.store.set(
+                self.discovery_base_key, '',
+                expires=self.discovery_cache_length_sec)
+            self.store.set(
+                self.discovery_identity_key, '',
+                expires=self.discovery_cache_length_sec)
+            return ''
+
+        elif code != requests.codes.ok:
+            # We're done early as we couldn't load the results
+            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)
+
+        if not wk_response:
+            # This is an acceptable response; we simply do nothing
+            self.logger.debug(
+                '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.store.set(
+                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('/')
+            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
+            results = None
+
+        if not results:
+            msg = 'Matrix Well-Known Base URI Discovery Failed'
+            self.logger.warning(
+                '%s - m.homeserver payload is missing or invalid: %s',
+                msg, str(wk_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'
+        # Post our content
+        code, response = self._fetch(
+            None, method='GET', url_override=verify_url)
+        if code != requests.codes.ok:
+            # We're done early as we couldn't load the results
+            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)
+
+        #
+        # Phase 2: Handle m.identity_server IF defined
+        #
+        if 'm.identity_server' in wk_response:
+            try:
+                identity_url = \
+                    wk_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
+                results = None
+
+            if not results:
+                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))
+                raise MatrixDiscoveryException(msg)
+
+            #
+            #  Verify identity server found
+            #
+            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:
+                # We're done early as we couldn't load the results
+                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)
+
+            # Update our cache
+            self.store.set(
+                self.discovery_identity_key, identity_url,
+                # Add 2 seconds to prevent this key from expiring before base
+                expires=self.discovery_cache_length_sec + 2)
+        else:
+            # No identity server
+            self.store.set(
+                self.discovery_identity_key, '',
+                # Add 2 seconds to prevent this key from expiring before base
+                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)
+
+        return base_url
+
+    @property
+    def base_url(self):
+        """
+        Returns the base_url if known
+        """
+        try:
+            base_url = self.server_discovery()
+            if base_url:
+                # We can use our cached value and return early
+                return base_url
+
+        except MatrixDiscoveryException:
+            self.store.clear(
+                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',
+            hostname=self.host,
+            port='' if self.port is None
+            or self.port == default_port else f':{self.port}')
+
+    @property
+    def identity_url(self):
+        """
+        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
diff --git a/libs/apprise/plugins/NotifyMattermost.py b/libs/apprise/plugins/mattermost.py
similarity index 80%
rename from libs/apprise/plugins/NotifyMattermost.py
rename to libs/apprise/plugins/mattermost.py
index dbb5f0dd3..bf2bd171d 100644
--- a/libs/apprise/plugins/NotifyMattermost.py
+++ b/libs/apprise/plugins/mattermost.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,16 +36,15 @@
 #  - swap http with mmost
 #  - drop /hooks/ reference
 
+import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 # Some Reference Locations:
 # - https://docs.mattermost.com/developer/webhooks-incoming.html
@@ -72,9 +71,6 @@ class NotifyMattermost(NotifyBase):
     # A URL that takes you to the setup/help of the specific protocol
     setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mattermost'
 
-    # The default Mattermost port
-    default_port = 8065
-
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
 
@@ -132,6 +128,9 @@ class NotifyMattermost(NotifyBase):
             'name': _('Channels'),
             'type': 'list:string',
         },
+        'channel': {
+            'alias_of': 'channels',
+        },
         'image': {
             'name': _('Include Image'),
             'type': 'bool',
@@ -171,9 +170,6 @@ class NotifyMattermost(NotifyBase):
         # Optional Channels (strip off any channel prefix entries if present)
         self.channels = [x.lstrip('#') for x in parse_list(channels)]
 
-        if not self.port:
-            self.port = self.default_port
-
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
 
@@ -220,8 +216,8 @@ class NotifyMattermost(NotifyBase):
                 payload['channel'] = channel
 
             url = '{}://{}:{}{}/hooks/{}'.format(
-                self.schema, self.host, self.port, self.fullpath,
-                self.token)
+                self.schema, self.host, self.port,
+                self.fullpath.rstrip('/'), self.token)
 
             self.logger.debug('Mattermost POST URL: %s (cert_verify=%r)' % (
                 url, self.verify_certificate,
@@ -283,6 +279,18 @@ class NotifyMattermost(NotifyBase):
         # Return our overall status
         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 if self.secure else self.protocol,
+            self.token, self.host, self.port, self.fullpath,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -303,7 +311,7 @@ class NotifyMattermost(NotifyBase):
             params['channel'] = ','.join(
                 [NotifyMattermost.quote(x, safe='') for x in self.channels])
 
-        default_port = 443 if self.secure else self.default_port
+        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
@@ -321,8 +329,8 @@ class NotifyMattermost(NotifyBase):
                 # 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 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=''),
@@ -357,16 +365,60 @@ class NotifyMattermost(NotifyBase):
         # Support both 'to' (for yaml configuration) and channel=
         if 'to' in results['qsd'] and len(results['qsd']['to']):
             # Allow the user to specify the channel to post to
-            results['channels'].append(
+            results['channels'].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'].append(
+            results['channels'].extend(
                 NotifyMattermost.parse_list(results['qsd']['channel']))
 
+        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']))
+
         # Image manipulation
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', False))
+        results['include_image'] = parse_bool(results['qsd'].get(
+            'image', NotifyMattermost.template_args['image']['default']))
 
         return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """
+        Support parsing the webhook straight from URL
+            https://HOST:443/workflows/WORKFLOWID/triggers/manual/paths/invoke
+            https://mattermost.HOST/hooks/TOKEN
+        """
+
+        # 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)
+
+        if result:
+            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
+
+            # Construct our URL
+            return NotifyMattermost.parse_url(
+                '{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')))
+        return None
diff --git a/libs/apprise/plugins/NotifyMessageBird.py b/libs/apprise/plugins/messagebird.py
similarity index 96%
rename from libs/apprise/plugins/NotifyMessageBird.py
rename to libs/apprise/plugins/messagebird.py
index 42d880acd..62be76aba 100644
--- a/libs/apprise/plugins/NotifyMessageBird.py
+++ b/libs/apprise/plugins/messagebird.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,12 +34,10 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyMessageBird(NotifyBase):
@@ -291,6 +289,15 @@ class NotifyMessageBird(NotifyBase):
 
         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.apikey, self.source)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyMisskey.py b/libs/apprise/plugins/misskey.py
similarity index 94%
rename from libs/apprise/plugins/NotifyMisskey.py
rename to libs/apprise/plugins/misskey.py
index 8965a0f7b..6a9090261 100644
--- a/libs/apprise/plugins/NotifyMisskey.py
+++ b/libs/apprise/plugins/misskey.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -47,10 +47,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class MisskeyVisibility:
@@ -64,8 +64,6 @@ class MisskeyVisibility:
 
     FOLLOWERS = 'followers'
 
-    PRIVATE = 'private'
-
     SPECIFIED = 'specified'
 
 
@@ -74,7 +72,6 @@ MISSKEY_VISIBILITIES = (
     MisskeyVisibility.PUBLIC,
     MisskeyVisibility.HOME,
     MisskeyVisibility.FOLLOWERS,
-    MisskeyVisibility.PRIVATE,
     MisskeyVisibility.SPECIFIED,
 )
 
@@ -191,6 +188,18 @@ class NotifyMisskey(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.token, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyMQTT.py b/libs/apprise/plugins/mqtt.py
similarity index 92%
rename from libs/apprise/plugins/NotifyMQTT.py
rename to libs/apprise/plugins/mqtt.py
index 49380d330..a48295f3a 100644
--- a/libs/apprise/plugins/NotifyMQTT.py
+++ b/libs/apprise/plugins/mqtt.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -38,12 +38,11 @@ import re
 from time import sleep
 from datetime import datetime
 from os.path import isfile
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_MQTT_SUPPORT_ENABLED = False
@@ -89,7 +88,7 @@ class NotifyMQTT(NotifyBase):
 
     requirements = {
         # Define our required packaging in order to work
-        'packages_required': 'paho-mqtt < 2.0.0'
+        'packages_required': 'paho-mqtt != 2.0.*'
     }
 
     # The default descriptive name associated with the Notification
@@ -204,10 +203,15 @@ class NotifyMQTT(NotifyBase):
             '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, **kwargs):
+                 client_id=None, session=None, retain=None, **kwargs):
         """
         Initialize MQTT Object
         """
@@ -230,6 +234,10 @@ class NotifyMQTT(NotifyBase):
             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)
+
         # Set up our Quality of Service (QoS)
         try:
             self.qos = self.template_args['qos']['default'] \
@@ -376,7 +384,7 @@ class NotifyMQTT(NotifyBase):
                 self.logger.debug('MQTT Payload: %s' % str(body))
 
                 result = self.client.publish(
-                    topic, payload=body, qos=self.qos, retain=False)
+                    topic, payload=body, qos=self.qos, retain=self.retain)
 
                 if result.rc != mqtt.MQTT_ERR_SUCCESS:
                     # Toggle our status
@@ -429,6 +437,23 @@ class NotifyMQTT(NotifyBase):
 
         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 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.client_id,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -439,6 +464,7 @@ class NotifyMQTT(NotifyBase):
             '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:
@@ -518,6 +544,10 @@ class NotifyMQTT(NotifyBase):
         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'])
+
         # The MQTT Quality of Service to use
         if 'qos' in results['qsd'] and len(results['qsd']['qos']):
             results['qos'] = \
diff --git a/libs/apprise/plugins/NotifyMSG91.py b/libs/apprise/plugins/msg91.py
similarity index 96%
rename from libs/apprise/plugins/NotifyMSG91.py
rename to libs/apprise/plugins/msg91.py
index a7bd9c473..5b3cc46bb 100644
--- a/libs/apprise/plugins/NotifyMSG91.py
+++ b/libs/apprise/plugins/msg91.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -38,12 +38,11 @@
 import re
 import requests
 from json import dumps
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no, parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
+from ..locale import gettext_lazy as _
 
 
 class MSG91PayloadField:
@@ -310,6 +309,15 @@ class NotifyMSG91(NotifyBase):
 
         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.template, self.authkey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyMSTeams.py b/libs/apprise/plugins/msteams.py
similarity index 82%
rename from libs/apprise/plugins/NotifyMSTeams.py
rename to libs/apprise/plugins/msteams.py
index 06572c3e6..ce3b90c46 100644
--- a/libs/apprise/plugins/NotifyMSTeams.py
+++ b/libs/apprise/plugins/msteams.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -81,16 +81,14 @@ import requests
 import json
 from json.decoder import JSONDecodeError
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..utils import apply_template
-from ..utils import TemplateType
-from ..AppriseAttachment import AppriseAttachment
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from ..utils.templates import apply_template, TemplateType
+from ..apprise_attachment import AppriseAttachment
+from ..locale import gettext_lazy as _
 
 
 class NotifyMSTeams(NotifyBase):
@@ -118,6 +116,9 @@ class NotifyMSTeams(NotifyBase):
     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}'
+
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
 
@@ -176,6 +177,15 @@ class NotifyMSTeams(NotifyBase):
             '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
@@ -189,7 +199,7 @@ class NotifyMSTeams(NotifyBase):
         'version': {
             'name': _('Version'),
             'type': 'choice:int',
-            'values': (1, 2),
+            'values': (1, 2, 3),
             'default': 2,
         },
         'template': {
@@ -207,8 +217,9 @@ class NotifyMSTeams(NotifyBase):
         },
     }
 
-    def __init__(self, token_a, token_b, token_c, team=None, version=None,
-                 include_image=True, template=None, tokens=None, **kwargs):
+    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
 
@@ -271,6 +282,9 @@ class NotifyMSTeams(NotifyBase):
             self.logger.warning(msg)
             raise TypeError(msg)
 
+        self.token_d = validate_regex(
+            token_d, *self.template_tokens['token_d']['regex'])
+
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
 
@@ -293,8 +307,12 @@ class NotifyMSTeams(NotifyBase):
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        # else:  NoneType - this is okay
-        return
+        self.logger.deprecate(
+            "Microsoft is deprecating their MSTeams webhooks on "
+            "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")
 
     def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
                     **kwargs):
@@ -398,17 +416,28 @@ class NotifyMSTeams(NotifyBase):
             'Content-Type': 'application/json',
         }
 
-        notify_url = self.notify_url_v2.format(
-            team=self.team,
-            token_a=self.token_a,
-            token_b=self.token_b,
-            token_c=self.token_c,
-        ) if self.version > 1 else \
-            self.notify_url_v1.format(
+        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)
 
+        if self.version == 2:
+            notify_url = self.notify_url_v2.format(
+                team=self.team,
+                token_a=self.token_a,
+                token_b=self.token_b,
+                token_c=self.token_c,
+            )
+        if self.version == 3:
+            notify_url = self.notify_url_v3.format(
+                team=self.team,
+                token_a=self.token_a,
+                token_b=self.token_b,
+                token_c=self.token_c,
+                token_d=self.token_d,
+            )
+
         # Generate our payload if it's possible
         payload = self.gen_payload(
             body=body, title=title, notify_type=notify_type, **kwargs)
@@ -463,6 +492,19 @@ class NotifyMSTeams(NotifyBase):
 
         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.team if self.version > 1 else None,
+            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.
@@ -485,8 +527,20 @@ class NotifyMSTeams(NotifyBase):
         # Store any template entries if specified
         params.update({':{}'.format(k): v for k, v in self.tokens.items()})
 
-        if self.version > 1:
-            return '{schema}://{team}/{token_a}/{token_b}/{token_c}/'\
+        result = None
+
+        if self.version == 1:
+            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=''),
+                    params=NotifyMSTeams.urlencode(params),
+                )
+
+        if self.version == 2:
+            result = '{schema}://{team}/{token_a}/{token_b}/{token_c}/'\
                 '?{params}'.format(
                     schema=self.secure_protocol,
                     team=NotifyMSTeams.quote(self.team, safe=''),
@@ -496,15 +550,18 @@ class NotifyMSTeams(NotifyBase):
                     params=NotifyMSTeams.urlencode(params),
                 )
 
-        else:  # Version 1
-            return '{schema}://{token_a}/{token_b}/{token_c}/'\
-                '?{params}'.format(
+        if self.version == 3:
+            result = '{schema}://{team}/{token_a}/{token_b}/{token_c}/'\
+                '{token_d}/?{params}'.format(
                     schema=self.secure_protocol,
-                    token_a=self.pprint(self.token_a, 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):
@@ -543,6 +600,8 @@ class NotifyMSTeams(NotifyBase):
             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'] = \
@@ -564,8 +623,13 @@ class NotifyMSTeams(NotifyBase):
                 NotifyMSTeams.unquote(results['qsd']['version'])
 
         else:
+            version = 1
+            if results.get('team'):
+                version = 2
+            if results.get('token_d'):
+                version = 3
             # Set our version if not otherwise set
-            results['version'] = 1 if not results.get('team') else 2
+            results['version'] = version
 
         # Store our tokens
         results['tokens'] = results['qsd:']
@@ -580,11 +644,38 @@ class NotifyMSTeams(NotifyBase):
 
         New Hook Support:
             https://team-name.office.com/webhook/ABCD/IncomingWebhook/DEFG/HIJK
+
+        Newer Hook Support:
+            https://team-name.office.com/webhook/ABCD/IncomingWebhook/DEFG/HIJK/V2LMNOP
         """
 
         # We don't need to do incredibly details token matching as the purpose
         # 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)
+
+        if result:
+            # Version 3 URL
+            return NotifyMSTeams.parse_url(
+                '{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')))
+
         result = re.match(
             r'^https?://(?P<team>[^.]+)(?P<v2a>\.webhook)?\.office\.com/'
             r'webhook(?P<v2b>b2)?/'
diff --git a/libs/apprise/plugins/NotifyNextcloud.py b/libs/apprise/plugins/nextcloud.py
similarity index 95%
rename from libs/apprise/plugins/NotifyNextcloud.py
rename to libs/apprise/plugins/nextcloud.py
index fd471d9eb..1e86585fe 100644
--- a/libs/apprise/plugins/NotifyNextcloud.py
+++ b/libs/apprise/plugins/nextcloud.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,11 +28,11 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list
+from ..locale import gettext_lazy as _
 
 
 class NotifyNextcloud(NotifyBase):
@@ -278,6 +278,18 @@ class NotifyNextcloud(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyNextcloudTalk.py b/libs/apprise/plugins/nextcloudtalk.py
similarity index 94%
rename from libs/apprise/plugins/NotifyNextcloudTalk.py
rename to libs/apprise/plugins/nextcloudtalk.py
index 4bfced282..3d5fc4d53 100644
--- a/libs/apprise/plugins/NotifyNextcloudTalk.py
+++ b/libs/apprise/plugins/nextcloudtalk.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,11 +29,11 @@
 import requests
 
 from json import dumps
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list
+from ..locale import gettext_lazy as _
 
 
 class NotifyNextcloudTalk(NotifyBase):
@@ -253,6 +253,18 @@ class NotifyNextcloudTalk(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.user, self.password, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyNotica.py b/libs/apprise/plugins/notica.py
similarity index 95%
rename from libs/apprise/plugins/NotifyNotica.py
rename to libs/apprise/plugins/notica.py
index 33a94fc96..7e860ca07 100644
--- a/libs/apprise/plugins/NotifyNotica.py
+++ b/libs/apprise/plugins/notica.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -43,11 +43,11 @@
 import re
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NoticaMode:
@@ -278,6 +278,19 @@ class NotifyNotica(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/NotifyNotifiarr.py b/libs/apprise/plugins/notifiarr.py
similarity index 86%
rename from libs/apprise/plugins/NotifyNotifiarr.py
rename to libs/apprise/plugins/notifiarr.py
index e195cbd32..cd01a53f2 100644
--- a/libs/apprise/plugins/NotifyNotifiarr.py
+++ b/libs/apprise/plugins/notifiarr.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -31,12 +31,12 @@ import requests
 from json import dumps
 from itertools import chain
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 from ..common import NotifyImageSize
-from ..utils import parse_list, parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
+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,#\\/]+')
@@ -118,14 +118,6 @@ class NotifyNotifiarr(NotifyBase):
         'apikey': {
             'alias_of': 'apikey',
         },
-        'discord_user': {
-            'name': _('Ping Discord User'),
-            'type': 'int',
-        },
-        'discord_role': {
-            'name': _('Ping Discord Role'),
-            'type': 'int',
-        },
         'event': {
             'name': _('Discord Event ID'),
             'type': 'int',
@@ -149,7 +141,6 @@ class NotifyNotifiarr(NotifyBase):
     })
 
     def __init__(self, apikey=None, include_image=None,
-                 discord_user=None, discord_role=None,
                  event=None, targets=None, source=None, **kwargs):
         """
         Initialize Notifiarr Object
@@ -172,30 +163,6 @@ class NotifyNotifiarr(NotifyBase):
             if isinstance(include_image, bool) \
             else self.template_args['image']['default']
 
-        # Set up our user if specified
-        self.discord_user = 0
-        if discord_user:
-            try:
-                self.discord_user = int(discord_user)
-
-            except (ValueError, TypeError):
-                msg = 'An invalid Notifiarr User ID ' \
-                      '({}) was specified.'.format(discord_user)
-                self.logger.warning(msg)
-                raise TypeError(msg)
-
-        # Set up our role if specified
-        self.discord_role = 0
-        if discord_role:
-            try:
-                self.discord_role = int(discord_role)
-
-            except (ValueError, TypeError):
-                msg = 'An invalid Notifiarr Role ID ' \
-                      '({}) was specified.'.format(discord_role)
-                self.logger.warning(msg)
-                raise TypeError(msg)
-
         # Prepare our source (if set)
         self.source = validate_regex(source)
 
@@ -231,6 +198,18 @@ class NotifyNotifiarr(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.apikey,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -244,12 +223,6 @@ class NotifyNotifiarr(NotifyBase):
         if self.source:
             params['source'] = self.source
 
-        if self.discord_user:
-            params['discord_user'] = self.discord_user
-
-        if self.discord_role:
-            params['discord_role'] = self.discord_role
-
         if self.event:
             params['event'] = self.event
 
@@ -287,6 +260,29 @@ class NotifyNotifiarr(NotifyBase):
         # Acquire image_url
         image_url = self.image_url(notify_type)
 
+        # Define our mentions
+        mentions = {
+            '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:
+                if value:
+                    # @everybody, @admin, etc - unsupported
+                    mentions['content'].append(f'@{value}')
+
+                elif is_role:
+                    mentions['pingRole'].append(no)
+                    mentions['content'].append(f'<@&{no}>')
+
+                else:  # is_user
+                    mentions['pingUser'].append(no)
+                    mentions['content'].append(f'<@{no}>')
+
         for idx, channel in enumerate(self.targets['channels']):
             # prepare Notifiarr Object
             payload = {
@@ -301,14 +297,17 @@ class NotifyNotifiarr(NotifyBase):
                 'discord': {
                     'color': self.color(notify_type),
                     'ping': {
-                        'pingUser': self.discord_user
-                        if not idx and self.discord_user else 0,
-                        'pingRole': self.discord_role
-                        if not idx and self.discord_role else 0,
+                        # Only 1 user is supported, so truncate the rest
+                        '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],
                     },
                     'text': {
                         'title': title,
-                        'content': '',
+                        'content': '' if not mentions['content']
+                        else '👉 ' + ' '.join(mentions['content']),
                         'description': body,
                         'footer': self.app_desc,
                     },
@@ -410,17 +409,6 @@ class NotifyNotifiarr(NotifyBase):
         # Get channels
         results['targets'] = NotifyNotifiarr.split_path(results['fullpath'])
 
-        if 'discord_user' in results['qsd'] and \
-                len(results['qsd']['discord_user']):
-            results['discord_user'] = \
-                NotifyNotifiarr.unquote(
-                    results['qsd']['discord_user'])
-
-        if 'discord_role' in results['qsd'] and \
-                len(results['qsd']['discord_role']):
-            results['discord_role'] = \
-                NotifyNotifiarr.unquote(results['qsd']['discord_role'])
-
         if 'event' in results['qsd'] and \
                 len(results['qsd']['event']):
             results['event'] = \
diff --git a/libs/apprise/plugins/NotifyNotifico.py b/libs/apprise/plugins/notifico.py
similarity index 96%
rename from libs/apprise/plugins/NotifyNotifico.py
rename to libs/apprise/plugins/notifico.py
index 27ce29a6e..df7088ce3 100644
--- a/libs/apprise/plugins/NotifyNotifico.py
+++ b/libs/apprise/plugins/notifico.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -44,11 +44,10 @@
 import re
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotificoFormat:
@@ -197,6 +196,15 @@ class NotifyNotifico(NotifyBase):
         )
         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.project_id, self.msghook)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyNtfy.py b/libs/apprise/plugins/ntfy.py
similarity index 91%
rename from libs/apprise/plugins/NotifyNtfy.py
rename to libs/apprise/plugins/ntfy.py
index 40834eece..58d8db6dc 100644
--- a/libs/apprise/plugins/NotifyNtfy.py
+++ b/libs/apprise/plugins/ntfy.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -41,18 +41,16 @@ from json import loads
 from json import dumps
 from os.path import basename
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyFormat
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..AppriseLocale import gettext_lazy as _
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import is_hostname
-from ..utils import is_ipaddr
-from ..utils import validate_regex
-from ..URLBase import PrivacyMode
-from ..attachment.AttachBase import AttachBase
+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
 
 
 class NtfyMode:
@@ -172,6 +170,20 @@ class NotifyNtfy(NotifyBase):
     # Support attachments
     attachment_support = True
 
+    # Maximum title length
+    title_maxlen = 200
+
+    # Maximum body length
+    body_maxlen = 7800
+
+    # Message size calculates title and body together
+    overflow_amalgamate_title = True
+
+    # Defines the number of bytes our JSON object can not exceed in size or we
+    # know the upstream server will reject it.  We convert these into
+    # attachments
+    ntfy_json_upstream_size_limit = 8000
+
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_256
 
@@ -504,7 +516,7 @@ class NotifyNtfy(NotifyBase):
             # Prepare our Header
             virt_payload['filename'] = attach.name
 
-            with open(attach.path, 'rb') as fp:
+            with attach as fp:
                 data = fp.read()
 
         if image_url:
@@ -538,18 +550,39 @@ class NotifyNtfy(NotifyBase):
         self.logger.debug('ntfy POST URL: %s (cert_verify=%r)' % (
             notify_url, self.verify_certificate,
         ))
-        self.logger.debug('ntfy Payload: %s' % str(virt_payload))
-        self.logger.debug('ntfy Headers: %s' % str(headers))
-
-        # Always call throttle before any remote server i/o is made
-        self.throttle()
 
         # Default response type
         response = None
 
         if not attach:
             data = dumps(data)
+            if len(data) > self.ntfy_json_upstream_size_limit:
+                # Convert to an attachment
 
+                if self.notify_format == NotifyFormat.MARKDOWN:
+                    mimetype = 'text/markdown'
+
+                elif self.notify_format == NotifyFormat.TEXT:
+                    mimetype = 'text/plain'
+
+                else:  # self.notify_format == NotifyFormat.HTML:
+                    mimetype = 'text/html'
+
+                attach = AttachMemory(
+                    mimetype=mimetype,
+                    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)
+
+        self.logger.debug('ntfy Payload: %s' % str(virt_payload))
+        self.logger.debug('ntfy Headers: %s' % str(headers))
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
         try:
             r = requests.post(
                 notify_url,
@@ -620,6 +653,34 @@ class NotifyNtfy(NotifyBase):
 
         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.
+        """
+
+        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)),
+        ]
+
+        if self.mode == NtfyMode.PRIVATE:
+            if self.auth == NtfyAuth.BASIC:
+                kwargs.extend([
+                    self.user if self.user else None,
+                    self.password if self.password else None,
+                ])
+
+            elif self.token:  # NtfyAuth.TOKEN also
+                kwargs.append(self.token)
+
+        return kwargs
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyOffice365.py b/libs/apprise/plugins/office365.py
similarity index 51%
rename from libs/apprise/plugins/NotifyOffice365.py
rename to libs/apprise/plugins/office365.py
index 0c62279f9..c0069f919 100644
--- a/libs/apprise/plugins/NotifyOffice365.py
+++ b/libs/apprise/plugins/office365.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,45 +33,25 @@
 # Information on sending an email:
 # https://docs.microsoft.com/en-us/graph/api/user-sendmail\
 #       ?view=graph-rest-1.0&tabs=http
-
-# Steps to get your Microsoft Client ID, Client Secret, and Tenant ID:
-# 1. You should have valid Microsoft personal account. Go to Azure Portal
-# 2. Go to -> Microsoft Active Directory --> App Registrations
-# 3. Click new -> give any name (your choice) in Name field -> select
-#     personal Microsoft accounts only --> Register
-# 4.  Now you have your client_id & Tenant id.
-# 5. To create client_secret , go to active directory ->
-#          Certificate & Tokens -> New client secret
-#               **This is auto-generated string which may have '@' and '?'
-#                 characters in it. You should encode these to prevent
-#                 from having any issues.**
-# 6. Now need to set permission Active directory -> API permissions ->
-#         Add permission (search mail) , add relevant permission.
-# 7. Set the redirect uri (Web) to:
-#        https://login.microsoftonline.com/common/oauth2/nativeclient
 #
-#     ...and click register.
+# Note: One must set up Application Permissions (not Delegated Permissions)
+#       - Scopes required: Mail.Send
+#       - For Large Attachments: Mail.ReadWrite
+#       - For Email Lookups: User.Read.All
 #
-#     This needs to be inserted into the "Redirect URI" text box as simply
-#     checking the check box next to this link seems to be insufficient.
-#     This is the default redirect uri used by this library, but you can use
-#     any other if you want.
-#
-# 8. Now you're good to go
-
 import requests
+import json
+from uuid import uuid4
 from datetime import datetime
 from datetime import timedelta
-from json import loads
-from json import dumps
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from .. import exception
+from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import is_email
-from ..utils import parse_emails
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_email, parse_emails, validate_regex
+from ..locale import gettext_lazy as _
+from ..common import PersistentStoreMode
 
 
 class NotifyOffice365(NotifyBase):
@@ -86,7 +66,7 @@ class NotifyOffice365(NotifyBase):
     service_url = 'https://office.com/'
 
     # The default protocol
-    secure_protocol = 'o365'
+    secure_protocol = ('azure', 'o365')
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
@@ -101,6 +81,20 @@ class NotifyOffice365(NotifyBase):
     # Authentication URL
     auth_url = 'https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token'
 
+    # Support attachments
+    attachment_support = True
+
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
+    # the maximum size an attachment can be for it to be allowed to be
+    # uploaded inline with the current email going out (one http post)
+    # Anything larger than this and a second PUT request is required to
+    # the outlook server to post the content through reference.
+    # Currently (as of 2025.10.06) this was documented to be 3MB
+    outlook_attachment_inline_max = 3145728
+
     # Use all the direct application permissions you have configured for your
     # app. The endpoint should issue a token for the ones associated with the
     # resource you want to use.
@@ -113,8 +107,9 @@ class NotifyOffice365(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{tenant}:{email}/{client_id}/{secret}',
-        '{schema}://{tenant}:{email}/{client_id}/{secret}/{targets}',
+        # Send as user (only supported method)
+        '{schema}://{source}/{tenant}/{client_id}/{secret}',
+        '{schema}://{source}/{tenant}/{client_id}/{secret}/{targets}',
     )
 
     # Define our template tokens
@@ -126,8 +121,8 @@ class NotifyOffice365(NotifyBase):
             'private': True,
             'regex': (r'^[a-z0-9-]+$', 'i'),
         },
-        'email': {
-            'name': _('Account Email'),
+        'source': {
+            'name': _('Account Email or Object ID'),
             'type': 'string',
             'required': True,
         },
@@ -176,7 +171,7 @@ class NotifyOffice365(NotifyBase):
         },
     })
 
-    def __init__(self, tenant, email, client_id, secret,
+    def __init__(self, tenant, client_id, secret, source=None,
                  targets=None, cc=None, bcc=None, **kwargs):
         """
         Initialize Office 365 Object
@@ -192,15 +187,8 @@ class NotifyOffice365(NotifyBase):
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        result = is_email(email)
-        if not result:
-            msg = 'An invalid Office 365 Email Account ID' \
-                  '({}) was specified.'.format(email)
-            self.logger.warning(msg)
-            raise TypeError(msg)
-
-        # Otherwise store our the email address
-        self.email = result['full_email']
+        # Store our email/ObjectID Source
+        self.source = source
 
         # Client Key (associated with generated OAuth2 Login)
         self.client_id = validate_regex(
@@ -247,8 +235,14 @@ class NotifyOffice365(NotifyBase):
                     .format(recipient))
 
         else:
-            # If our target email list is empty we want to add ourselves to it
-            self.targets.append((False, self.email))
+            result = is_email(self.source)
+            if not result:
+                self.logger.warning('No Target Office 365 Email Detected')
+
+            else:
+                # If our target email list is empty we want to add ourselves to
+                # it
+                self.targets.append((False, self.source))
 
         # Validate recipients (cc:) and drop bad ones:
         for recipient in parse_emails(cc):
@@ -288,9 +282,23 @@ class NotifyOffice365(NotifyBase):
         # Presume that our token has expired 'now'
         self.token_expiry = datetime.now()
 
+        # 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')
+        result = is_email(self.source)
+        if result:
+            self.from_email = result['full_email']
+            self.from_name = \
+                result['name'] or self.store.get('name')
+
+        else:
+            self.from_name = self.store.get('name')
+
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
+             **kwargs):
         """
         Perform Office 365 Notification
         """
@@ -304,31 +312,143 @@ class NotifyOffice365(NotifyBase):
                 'There are no Email recipients to notify')
             return False
 
+        if self.from_email is None:
+            if not self.authenticate():
+                # We could not authenticate ourselves; we're done
+                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')
+            if not postokay:
+                self.logger.warning(
+                    '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")
+                result = is_email(from_email)
+                if not result:
+                    self.logger.warning(
+                        'Could not get From email from the Azure endpoint.')
+
+                    # Prevent re-occuring upstream fetches for info that isn't
+                    # there
+                    self.from_email = False
+
+                else:
+                    # Store our email for future reference
+                    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)
+
         # Setup our Content Type
         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,
                 },
             },
-            'SaveToSentItems': 'false'
+            # Below takes a string (not bool) of either 'true' or 'false'
+            '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,
+                        }
+                    },
+                }
+            })
+
         # Create a copy of the email list
         emails = list(self.targets)
 
         # Define our URL to post to
-        url = '{graph_url}/v1.0/users/{email}/sendmail'.format(
-            email=self.email,
+        url = '{graph_url}/v1.0/users/{userid}/sendMail'.format(
             graph_url=self.graph_url,
+            userid=self.source,
         )
 
+        # Prepare our Draft URL
+        draft_url = \
+            '{graph_url}/v1.0/users/{userid}/messages' \
+            .format(
+                graph_url=self.graph_url,
+                userid=self.source,
+            )
+
+        small_attachments = []
+        large_attachments = []
+
+        # draft emails
+        drafts = []
+
+        if attach and self.attachment_support:
+            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 Office 365 attachment {}.'.format(
+                            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',
+                    })
+                    continue
+
+                try:
+                    # Prepare our Attachment in Base64
+                    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',
+                        # 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)))
+                    return False
+
+                self.logger.debug(
+                    'Appending Office 365 attachment {}'.format(
+                        attachment.url(privacy=True)))
+
+        if small_attachments:
+            # Store Attachments
+            payload['message']['attachments'] = small_attachments
+
         while len(emails):
             # authenticate ourselves if we aren't already; but this function
             # also tracks if our token we have is still valid and will
@@ -347,63 +467,197 @@ class NotifyOffice365(NotifyBase):
             bcc = (self.bcc - set([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'] \
+                payload['message']['toRecipients'][0]['emailAddress']['name'] \
                     = to_name
 
-            self.logger.debug('Email To: {}'.format(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(', '.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 '{}: '.format(
+                                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(', '.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 '{}: '.format(
+                                self.names[e]), e) for e in bcc])))
 
-            # Perform upstream fetch
+            # Perform upstream post
             postokay, response = self._fetch(
-                url=url, payload=dumps(payload),
-                content_type='application/json')
+                url=url if not large_attachments
+                else draft_url, payload=payload)
 
             # Test if we were okay
             if not postokay:
                 has_error = True
 
+            elif large_attachments:
+                # We have large attachments now to upload and associate with
+                # our message. We need to prepare a draft message; acquire
+                # the message-id associated with it and then attach the file
+                # via this means.
+
+                # Acquire our Draft ID to work with
+                message_id = response.get("id")
+                if not message_id:
+                    self.logger.warning(
+                        'Email Draft ID could not be retrieved')
+                    has_error = True
+                    continue
+
+                self.logger.debug('Email Draft ID: {}'.format(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']):
+                        self.logger.warning(
+                            'Could not prepare attachment session for %s',
+                            attachment['name'])
+
+                        has_error = True
+                        has_attach_error = True
+                        # Take early exit
+                        break
+
+                if has_attach_error:
+                    continue
+
+                # Send off our draft
+                attach_url = \
+                    "https://graph.microsoft.com/v1.0/users/" \
+                    "{}/messages/{}/send"
+
+                attach_url = attach_url.format(
+                    self.source,
+                    message_id,
+                )
+
+                # Trigger our send
+                postokay, response = self._fetch(url=url)
+                if not postokay:
+                    self.logger.warning(
+                        'Could not send drafted email id: {} ', message_id)
+                    has_error = True
+                    continue
+
+        # Memory management
+        del small_attachments
+        del large_attachments
+        del drafts
+
         return not has_error
 
+    def upload_attachment(self, attachment, message_id, name=None):
+        """
+        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)))
+            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'
+
+        file_size = len(attachment)
+
+        payload = {
+            "AttachmentItem": {
+                "attachmentType": "file",
+                "name": name if name else (
+                    attachment.name
+                    if attachment.name else '{}.dat'.format(str(uuid4()))),
+                # MIME type of the attachment
+                "contentType": attachment.mimetype,
+                "size": file_size,
+            }
+        }
+
+        if not self.authenticate():
+            # We could not authenticate ourselves; we're done
+            return False
+
+        # Get our Upload URL
+        postokay, response = self._fetch(url, payload)
+        if not postokay:
+            return False
+
+        upload_url = response.get('uploadUrl')
+        if not upload_url:
+            return False
+
+        start_byte = 0
+        postokay = False
+        response = None
+
+        for chunk in attachment.chunk():
+            end_byte = start_byte + len(chunk) - 1
+
+            # 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}'
+            }
+
+            # Upload the chunk
+            postokay, response = self._fetch(
+                upload_url, chunk, headers=headers, content_type=None,
+                method='PUT')
+            if not postokay:
+                return False
+
+        # Return our Upload URL
+        return postokay
+
     def authenticate(self):
         """
         Logs into and acquires us an authentication token to work with
@@ -420,12 +674,12 @@ class NotifyOffice365(NotifyBase):
 
         # 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',
         }
 
         # Prepare our URL
@@ -453,7 +707,9 @@ class NotifyOffice365(NotifyBase):
         #      "correlation_id": "fb3d2015-bc17-4bb9-bb85-30c5cf1aaaa7"
         #    }
 
-        postokay, response = self._fetch(url=url, payload=payload)
+        postokay, response = self._fetch(
+            url=url, payload=payload,
+            content_type='application/x-www-form-urlencoded')
         if not postokay:
             return False
 
@@ -480,18 +736,19 @@ class NotifyOffice365(NotifyBase):
         # We're authenticated
         return True if self.token else False
 
-    def _fetch(self, url, payload,
-               content_type='application/x-www-form-urlencoded'):
+    def _fetch(self, url, payload=None, headers=None,
+               content_type='application/json', method='POST'):
         """
         Wrapper to request object
 
         """
 
         # Prepare our headers:
-        headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': content_type,
-        }
+        if not headers:
+            headers = {
+                'User-Agent': self.app_id,
+                'Content-Type': content_type,
+            }
 
         if self.token:
             # Are we authenticated?
@@ -501,36 +758,84 @@ class NotifyOffice365(NotifyBase):
         content = {}
 
         # Some Debug Logging
-        self.logger.debug('Office 365 POST URL: {} (cert_verify={})'.format(
-            url, self.verify_certificate))
+        self.logger.debug('Office 365 %s URL: {} (cert_verify={})'.format(
+            url, self.verify_certificate), method)
         self.logger.debug('Office 365 Payload: {}' .format(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)
+
         try:
-            r = requests.post(
+            r = req(
                 url,
-                data=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.accepted):
+                    requests.codes.ok, requests.codes.created,
+                    requests.codes.accepted):
 
                 # We had a problem
                 status_str = \
                     NotifyOffice365.http_response_code_lookup(r.status_code)
 
                 self.logger.warning(
-                    'Failed to send Office 365 POST to {}: '
+                    'Failed to send Office 365 %s to {}: '
                     '{}error={}.'.format(
                         url,
                         ', ' if status_str else '',
-                        r.status_code))
+                        r.status_code), method)
+
+                # A Response could look like this if a Scope element was not
+                # found:
+                # {
+                #  "error": {
+                #     "code": "MissingClaimType",
+                #     "message":"The token is missing the claim type \'oid\'.",
+                #     "innerError": {
+                #       "oAuthEventOperationId":" 7abe20-339f-4659-9381-38f52",
+                #       "oAuthEventcV": "xsOSpAHSHVm3Tp4SNH5oIA.1.1",
+                #       "errorUrl": "https://url",
+                #       "requestId": "2328ea-ec9e-43a8-80f4-164c",
+                #       "date":"2024-12-01T02:03:13"
+                #  }}
+                # }
+
+                # Error 403; the below is returned if he User.Read.All
+                #           Application scope is not set and a lookup is
+                #           attempted.
+                # {
+                #   "error": {
+                #     "code": "Authorization_RequestDenied",
+                #     "message":
+                #        "Insufficient privileges to complete the operation.",
+                #     "innerError": {
+                #       "date": "2024-12-06T00:15:57",
+                #       "request-id":
+                #         "48fdb3e7-2f1a-4f45-a5a0-99b8b851278b",
+                #         "client-request-id": "48f-2f1a-4f45-a5a0-99b8"
+                #     }
+                #   }
+                # }
+
+                # Another response type (error 415):
+                # {
+                #  "error": {
+                #    "code": "RequestBodyRead",
+                #    "message": "A missing or empty content type header was \
+                #        found when trying to read a message. The content \
+                #        type header is required.",
+                #  }
+                # }
 
                 self.logger.debug(
                     'Response Details:\r\n{}'.format(r.content))
@@ -539,7 +844,7 @@ class NotifyOffice365(NotifyBase):
                 return (False, content)
 
             try:
-                content = loads(r.content)
+                content = json.loads(r.content)
 
             except (AttributeError, TypeError, ValueError):
                 # ValueError = r.content is Unparsable
@@ -549,8 +854,8 @@ class NotifyOffice365(NotifyBase):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Office 365 POST to {}: '.
-                format(url))
+                'Exception received when sending Office 365 %s to {}: '.
+                format(url), method)
             self.logger.debug('Socket Exception: %s' % str(e))
 
             # Mark our failure
@@ -558,12 +863,24 @@ class NotifyOffice365(NotifyBase):
 
         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.source, self.tenant, self.client_id,
+            self.secret,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
         """
 
-        # Our URL parameters
+        # Extend our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.cc:
@@ -580,13 +897,13 @@ class NotifyOffice365(NotifyBase):
                     '' if not self.names.get(e)
                     else '{}:'.format(self.names[e]), e) for e in self.bcc])
 
-        return '{schema}://{tenant}:{email}/{client_id}/{secret}' \
+        return '{schema}://{source}/{tenant}/{client_id}/{secret}' \
             '/{targets}/?{params}'.format(
-                schema=self.secure_protocol,
+                schema=self.secure_protocol[0],
                 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
-                email=self.email,
+                source=self.source,
                 client_id=self.pprint(self.client_id, privacy, safe=''),
                 secret=self.pprint(
                     self.secret, privacy, mode=PrivacyMode.Secret,
@@ -594,7 +911,7 @@ class NotifyOffice365(NotifyBase):
                 targets='/'.join(
                     [NotifyOffice365.quote('{}{}'.format(
                         '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                        safe='') for e in self.targets]),
+                        safe='@') for e in self.targets]),
                 params=NotifyOffice365.urlencode(params))
 
     def __len__(self):
@@ -623,16 +940,52 @@ class NotifyOffice365(NotifyBase):
         # of the secret key (since it can contain slashes in it)
         entries = NotifyOffice365.split_path(results['fullpath'])
 
-        try:
+        # Initialize our tenant
+        results['tenant'] = None
+
+        # Initialize our email
+        results['email'] = None
+
+        # From Email
+        if 'from' in results['qsd'] and \
+                len(results['qsd']['from']):
+            # Extract the sending account's information
+            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']),
+            )
+
+        else:
+            # Object ID instead of email
+            results['source'] = NotifyOffice365.unquote(results['host'])
+
+        # Tenant
+        if 'tenant' in results['qsd'] and len(results['qsd']['tenant']):
+            # Extract the Tenant from the argument
+            results['tenant'] = \
+                NotifyOffice365.unquote(results['qsd']['tenant'])
+
+        elif entries:
+            results['tenant'] = NotifyOffice365.unquote(entries.pop(0))
+
+        # OAuth2 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'])
+
+        elif entries:
             # Get our client_id is the first entry on the path
             results['client_id'] = NotifyOffice365.unquote(entries.pop(0))
 
-        except IndexError:
-            # no problem, we may get the client_id another way through
-            # arguments...
-            pass
-
+        #
         # Prepare our target listing
+        #
         results['targets'] = list()
         while entries:
             # Pop the last entry
@@ -650,36 +1003,6 @@ class NotifyOffice365(NotifyBase):
             # We're done
             break
 
-        # Initialize our tenant
-        results['tenant'] = None
-
-        # 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])
-
-        # Assemble our client id from the user@hostname
-        if results['password']:
-            results['email'] = '{}@{}'.format(
-                NotifyOffice365.unquote(results['password']),
-                NotifyOffice365.unquote(results['host']),
-            )
-            # Update our tenant
-            results['tenant'] = NotifyOffice365.unquote(results['user'])
-
-        else:
-            # No tenant specified..
-            results['email'] = '{}@{}'.format(
-                NotifyOffice365.unquote(results['user']),
-                NotifyOffice365.unquote(results['host']),
-            )
-
-        # OAuth2 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'])
-
         # OAuth2 Secret
         if 'oauth_secret' in results['qsd'] and \
                 len(results['qsd']['oauth_secret']):
@@ -687,19 +1010,12 @@ class NotifyOffice365(NotifyBase):
             results['secret'] = \
                 NotifyOffice365.unquote(results['qsd']['oauth_secret'])
 
-        # Tenant
-        if 'from' in results['qsd'] and \
-                len(results['qsd']['from']):
-            # Extract the sending account's information
-            results['email'] = \
-                NotifyOffice365.unquote(results['qsd']['from'])
-
-        # Tenant
-        if 'tenant' in results['qsd'] and \
-                len(results['qsd']['tenant']):
-            # Extract the Tenant from the argument
-            results['tenant'] = \
-                NotifyOffice365.unquote(results['qsd']['tenant'])
+        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])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
diff --git a/libs/apprise/plugins/NotifyOneSignal.py b/libs/apprise/plugins/one_signal.py
similarity index 78%
rename from libs/apprise/plugins/NotifyOneSignal.py
rename to libs/apprise/plugins/one_signal.py
index eb1e10f7a..b32899cec 100644
--- a/libs/apprise/plugins/NotifyOneSignal.py
+++ b/libs/apprise/plugins/one_signal.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -37,14 +37,12 @@ import requests
 from json import dumps
 from itertools import chain
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import validate_regex
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import is_email
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.base64 import decode_b64_dict, encode_b64_dict
+from ..utils.parse import validate_regex, parse_list, parse_bool, is_email
+from ..locale import gettext_lazy as _
 
 
 class OneSignalCategory:
@@ -82,7 +80,7 @@ class NotifyOneSignal(NotifyBase):
     setup_url = 'https://github.com/caronc/apprise/wiki/Notify_onesignal'
 
     # Notification
-    notify_url = "https://onesignal.com/api/v1/notifications"
+    notify_url = "https://api.onesignal.com/notifications"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -161,6 +159,18 @@ class NotifyOneSignal(NotifyBase):
             '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',
         },
@@ -175,9 +185,22 @@ class NotifyOneSignal(NotifyBase):
         },
     })
 
+    # Define our token control
+    template_kwargs = {
+        'custom': {
+            'name': _('Custom Data'),
+            'prefix': ':',
+        },
+        'postback': {
+            'name': _('Postback Data'),
+            'prefix': '+',
+        },
+    }
+
     def __init__(self, app, apikey, targets=None, include_image=True,
-                 template=None, subtitle=None, language=None, batch=False,
-                 **kwargs):
+                 template=None, subtitle=None, language=None, batch=None,
+                 use_contents=None, decode_tpl_args=None,
+                 custom=None, postback=None, **kwargs):
         """
         Initialize OneSignal
 
@@ -201,7 +224,19 @@ class NotifyOneSignal(NotifyBase):
             raise TypeError(msg)
 
         # Prepare Batch Mode Flag
-        self.batch_size = self.default_batch_size if batch 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
+
+        # 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
 
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
@@ -273,6 +308,30 @@ class NotifyOneSignal(NotifyBase):
                     'Detected OneSignal Player ID: %s' %
                     self.targets[OneSignalCategory.PLAYER][-1])
 
+        # Custom Data
+        self.custom_data = {}
+        if custom and isinstance(custom, dict):
+            if self.decode_tpl_args:
+                custom = decode_b64_dict(custom)
+
+            self.custom_data.update(custom)
+
+        elif custom:
+            msg = 'The specified OneSignal Custom Data ' \
+                  '({}) are not identified as a dictionary.'.format(custom)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Postback Data
+        self.postback_data = {}
+        if postback and isinstance(postback, dict):
+            self.postback_data.update(postback)
+
+        elif postback:
+            msg = 'The specified OneSignal Postback Data ' \
+                  '({}) are not identified as a dictionary.'.format(postback)
+            self.logger.warning(msg)
+            raise TypeError(msg)
         return
 
     def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
@@ -291,14 +350,9 @@ class NotifyOneSignal(NotifyBase):
 
         payload = {
             'app_id': self.app,
-
-            'headings': {
-                self.language: title if title else self.app_desc,
-            },
             'contents': {
                 self.language: body,
             },
-
             # Sending true wakes your app from background to run custom native
             # code (Apple interprets this as content-available=1).
             # Note: Not applicable if the app is in the "force-quit" state
@@ -307,6 +361,33 @@ class NotifyOneSignal(NotifyBase):
             'content_available': True,
         }
 
+        if self.template_id:
+            # Store template information
+            payload['template_id'] = self.template_id
+
+            if not self.use_contents:
+                # Only if a template is defined can contents be removed
+                del payload['contents']
+
+        # Set our data if defined
+        if self.custom_data:
+            payload.update({
+                'custom_data': self.custom_data,
+            })
+
+        # Set our postback data if defined
+        if self.postback_data:
+            payload.update({
+                'data': self.postback_data,
+            })
+
+        if title:
+            # Display our title if defined
+            payload.update({
+                'headings': {
+                    self.language: title,
+                }})
+
         if self.subtitle:
             payload.update({
                 'subtitle': {
@@ -314,9 +395,6 @@ class NotifyOneSignal(NotifyBase):
                 },
             })
 
-        if self.template_id:
-            payload['template_id'] = self.template_id
-
         # Acquire our large_icon image URL (if set)
         image_url = None if not self.include_image \
             else self.image_url(notify_type)
@@ -392,6 +470,17 @@ class NotifyOneSignal(NotifyBase):
 
         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.template_id, self.app, self.apikey,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -406,6 +495,25 @@ class NotifyOneSignal(NotifyBase):
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *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()}
+        )
+
+        # Save our postback data
+        params.update(
+            {'+{}'.format(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.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(
             schema=self.secure_protocol,
             tp_id='{}:'.format(
@@ -485,6 +593,20 @@ class NotifyOneSignal(NotifyBase):
                     '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']))
+
+        # Get Use Contents Boolean (if set)
+        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'])
 
@@ -516,4 +638,10 @@ class NotifyOneSignal(NotifyBase):
             results['language'] = \
                 NotifyOneSignal.unquote(results['qsd']['lang'])
 
+        # Store our custom data
+        results['custom'] = results['qsd:']
+
+        # Store our postback data
+        results['postback'] = results['qsd+']
+
         return results
diff --git a/libs/apprise/plugins/NotifyOpsgenie.py b/libs/apprise/plugins/opsgenie.py
similarity index 59%
rename from libs/apprise/plugins/NotifyOpsgenie.py
rename to libs/apprise/plugins/opsgenie.py
index c2dfed232..013c1ded5 100644
--- a/libs/apprise/plugins/NotifyOpsgenie.py
+++ b/libs/apprise/plugins/opsgenie.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -47,15 +47,14 @@
 # API Integration Docs: https://docs.opsgenie.com/docs/api-integration
 
 import requests
-from json import dumps
+from json import dumps, loads
+import hashlib
 
-from .NotifyBase import NotifyBase
-from ..common import NotifyType
-from ..utils import validate_regex
-from ..utils import is_uuid
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+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
+from ..locale import gettext_lazy as _
 
 
 class OpsgenieCategory(NotifyBase):
@@ -76,6 +75,47 @@ OPSGENIE_CATEGORIES = (
 )
 
 
+class OpsgenieAlertAction:
+    """
+    Defines the supported actions
+    """
+    # Use mapping (specify :key=arg to over-ride)
+    MAP = 'map'
+
+    # Create new alert (default)
+    NEW = 'new'
+
+    # Close Alert
+    CLOSE = 'close'
+
+    # Delete Alert
+    DELETE = 'delete'
+
+    # Acknowledge Alert
+    ACKNOWLEDGE = 'acknowledge'
+
+    # Add note to alert
+    NOTE = 'note'
+
+
+OPSGENIE_ACTIONS = (
+    OpsgenieAlertAction.MAP,
+    OpsgenieAlertAction.NEW,
+    OpsgenieAlertAction.CLOSE,
+    OpsgenieAlertAction.DELETE,
+    OpsgenieAlertAction.ACKNOWLEDGE,
+    OpsgenieAlertAction.NOTE,
+)
+
+# Map all support Apprise Categories to Opsgenie Categories
+OPSGENIE_ALERT_MAP = {
+    NotifyType.INFO: OpsgenieAlertAction.CLOSE,
+    NotifyType.SUCCESS: OpsgenieAlertAction.CLOSE,
+    NotifyType.WARNING: OpsgenieAlertAction.NEW,
+    NotifyType.FAILURE: OpsgenieAlertAction.NEW,
+}
+
+
 # Regions
 class OpsgenieRegion:
     US = 'us'
@@ -160,6 +200,10 @@ class NotifyOpsgenie(NotifyBase):
     # The maximum length of the body
     body_maxlen = 15000
 
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
     # If we don't have the specified min length, then we don't bother using
     # the body directive
     opsgenie_body_minlen = 130
@@ -170,10 +214,24 @@ class NotifyOpsgenie(NotifyBase):
     # The maximum allowable targets within a notification
     default_batch_size = 50
 
+    # Defines our default message mapping
+    opsgenie_message_map = {
+        # Add a note to existing alert
+        NotifyType.INFO: OpsgenieAlertAction.NOTE,
+        # Close existing alert
+        NotifyType.SUCCESS: OpsgenieAlertAction.CLOSE,
+        # Create notice
+        NotifyType.WARNING: OpsgenieAlertAction.NEW,
+        # Create notice
+        NotifyType.FAILURE: OpsgenieAlertAction.NEW,
+    }
+
     # Define object templates
     templates = (
         '{schema}://{apikey}',
+        '{schema}://{user}@{apikey}',
         '{schema}://{apikey}/{targets}',
+        '{schema}://{user}@{apikey}/{targets}',
     )
 
     # Define our template tokens
@@ -184,6 +242,10 @@ class NotifyOpsgenie(NotifyBase):
             'private': True,
             'required': True,
         },
+        'user': {
+            'name': _('Username'),
+            'type': 'string',
+        },
         'target_escalation': {
             'name': _('Target Escalation'),
             'prefix': '^',
@@ -249,6 +311,12 @@ class NotifyOpsgenie(NotifyBase):
         '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.
@@ -257,11 +325,15 @@ class NotifyOpsgenie(NotifyBase):
             'name': _('Details'),
             '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, **kwargs):
+                 tags=None, action=None, mapping=None, **kwargs):
         """
         Initialize Opsgenie Object
         """
@@ -298,6 +370,41 @@ class NotifyOpsgenie(NotifyBase):
             self.logger.warning(msg)
             raise TypeError(msg)
 
+        if action and isinstance(action, str):
+            self.action = next(
+                (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)
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            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():
+                # Get our mapping
+                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)
+                    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)
+                if not v:
+                    msg = 'The Opsgenie mapping value (assigned to {}) ' \
+                          'specified ({}) is invalid.'.format(k, _v)
+                    self.logger.warning(msg)
+                    raise TypeError(msg)
+
+                # Update our mapping
+                self.mapping[k] = v
+
         self.details = {}
         if details:
             # Store our extra details
@@ -367,115 +474,234 @@ class NotifyOpsgenie(NotifyBase):
                     if is_uuid(target) else
                     {'type': OpsgenieCategory.USER, 'username': target})
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+    def _fetch(self, method, url, payload, params=None):
         """
-        Perform Opsgenie Notification
+        Performs server retrieval/update and returns JSON Response
         """
-
         headers = {
             'User-Agent': self.app_id,
             'Content-Type': 'application/json',
             'Authorization': 'GenieKey {}'.format(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))
+
+        # Initialize our response object
+        content = {}
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+        try:
+            r = method(
+                url,
+                data=dumps(payload),
+                params=params,
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            # A Response might look like:
+            # {
+            #     "result": "Request will be processed",
+            #     "took": 0.302,
+            #     "requestId": "43a29c5c-3dbf-4fa4-9c26-f4f71023e120"
+            # }
+
+            try:
+                # Update our response object
+                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 not in (
+                    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))
+
+                self.logger.debug(
+                    'Response Details:\r\n{}'.format(r.content))
+
+                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))
+
+            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))
+
+        return (False, content.get('requestId'))
+
+    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
+
         # Prepare our URL as it's based on our hostname
         notify_url = OPSGENIE_API_LOOKUP[self.region_name]
 
         # Initialize our has_error flag
         has_error = False
 
-        # Use body if title not set
-        title_body = body if not title else title
+        # Default method is to post
+        method = requests.post
 
-        # Create a copy ouf our details object
-        details = self.details.copy()
-        if 'type' not in details:
-            details['type'] = notify_type
+        # 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]
 
-        # Prepare our payload
-        payload = {
-            'source': self.app_desc,
-            'message': title_body,
-            'description': body,
-            'details': details,
-            'priority': 'P{}'.format(self.priority),
-        }
+        # Get our Opsgenie Request IDs
+        request_ids = self.store.get(key, [])
+        if not isinstance(request_ids, list):
+            request_ids = []
 
-        # 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 action == OpsgenieAlertAction.NEW:
+            # Create a copy ouf our details object
+            details = self.details.copy()
+            if 'type' not in details:
+                details['type'] = notify_type
 
-        if self.__tags:
-            payload['tags'] = self.__tags
+            # Use body if title not set
+            title_body = body if not title else title
 
-        if self.entity:
-            payload['entity'] = self.entity
+            # Prepare our payload
+            payload = {
+                'source': self.app_desc,
+                'message': title_body,
+                'description': body,
+                'details': details,
+                'priority': 'P{}'.format(self.priority),
+            }
 
-        if self.alias:
-            payload['alias'] = self.alias
+            # 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])
 
-        length = len(self.targets) if self.targets else 1
-        for index in range(0, length, self.batch_size):
-            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]
+            if self.__tags:
+                payload['tags'] = self.__tags
 
-            # Some Debug Logging
-            self.logger.debug(
-                'Opsgenie POST URL: {} (cert_verify={})'.format(
-                    notify_url, self.verify_certificate))
-            self.logger.debug('Opsgenie Payload: {}' .format(payload))
+            if self.entity:
+                payload['entity'] = self.entity
 
-            # 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 self.alias:
+                payload['alias'] = self.alias
 
-                if r.status_code not in (
-                        requests.codes.accepted, requests.codes.ok):
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code)
+            if self.user:
+                payload['user'] = self.user
 
-                    self.logger.warning(
-                        'Failed to send Opsgenie notification:'
-                        '{}{}error={}.'.format(
-                            status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+            # reset our request IDs - we will re-populate them
+            request_ids = []
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+            length = len(self.targets) if self.targets else 1
+            for index in range(0, length, self.batch_size):
+                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]
 
-                    # Mark our failure
+                # Perform our post
+                success, request_id = self._fetch(
+                    method, notify_url, payload)
+
+                if success and request_id:
+                    # Save our response
+                    request_ids.append(request_id)
+
+                else:
                     has_error = True
-                    continue
 
-                # If we reach here; the message was sent
-                self.logger.info('Sent Opsgenie notification')
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+            # Store our entries for a maximum of 60 days
+            self.store.set(key, request_ids, expires=60 * 60 * 24 * 60)
 
-            except requests.RequestException as e:
-                self.logger.warning(
-                    'A Connection error occurred sending Opsgenie '
-                    'notification.')
-                self.logger.debug('Socket Exception: %s' % str(e))
-                # Mark our failure
-                has_error = True
+        elif request_ids:
+            # Prepare our payload
+            payload = {
+                'source': self.app_desc,
+                'note': body,
+            }
+
+            if self.user:
+                payload['user'] = self.user
+
+            # Prepare our Identifier type
+            params = {
+                'identifierType': 'id',
+            }
+
+            for request_id in request_ids:
+                if action == OpsgenieAlertAction.DELETE:
+                    # Update our URL
+                    url = f'{notify_url}/{request_id}'
+                    method = requests.delete
+
+                elif action == OpsgenieAlertAction.ACKNOWLEDGE:
+                    url = f'{notify_url}/{request_id}/acknowledge'
+
+                elif action == OpsgenieAlertAction.CLOSE:
+                    url = f'{notify_url}/{request_id}/close'
+
+                else:  # action == OpsgenieAlertAction.CLOSE:
+                    url = f'{notify_url}/{request_id}/notes'
+
+                # Perform our post
+                success, _ = self._fetch(method, url, payload, params)
+
+                if not success:
+                    has_error = True
+
+            if not has_error and action == OpsgenieAlertAction.DELETE:
+                # Remove cached entry
+                self.store.clear(key)
+
+        else:
+            self.logger.info(
+                '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.
+        """
+        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.
@@ -483,6 +709,7 @@ class NotifyOpsgenie(NotifyBase):
 
         # Define any URL parameters
         params = {
+            'action': self.action,
             'region': self.region_name,
             'priority':
                 OPSGENIE_PRIORITIES[self.template_args['priority']['default']]
@@ -506,6 +733,10 @@ class NotifyOpsgenie(NotifyBase):
         # Append our details into our parameters
         params.update({'+{}'.format(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()})
+
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
@@ -522,8 +753,9 @@ class NotifyOpsgenie(NotifyBase):
                 NotifyOpsgenie.template_tokens['target_team']['prefix'],
         }
 
-        return '{schema}://{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(
@@ -608,4 +840,14 @@ class NotifyOpsgenie(NotifyBase):
         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'])
+
+        # store any custom mapping defined
+        results['mapping'] = \
+            {NotifyOpsgenie.unquote(x): NotifyOpsgenie.unquote(y)
+             for x, y in results['qsd:'].items()}
+
         return results
diff --git a/libs/apprise/plugins/NotifyPagerDuty.py b/libs/apprise/plugins/pagerduty.py
similarity index 96%
rename from libs/apprise/plugins/NotifyPagerDuty.py
rename to libs/apprise/plugins/pagerduty.py
index 0896b41b1..054fab9c0 100644
--- a/libs/apprise/plugins/NotifyPagerDuty.py
+++ b/libs/apprise/plugins/pagerduty.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -34,13 +34,12 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import validate_regex
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex, parse_bool
+from ..locale import gettext_lazy as _
 
 
 class PagerDutySeverity:
@@ -412,6 +411,18 @@ class NotifyPagerDuty(NotifyBase):
 
         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.integration_key, self.apikey,
+            self.source,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPagerTree.py b/libs/apprise/plugins/pagertree.py
similarity index 96%
rename from libs/apprise/plugins/NotifyPagerTree.py
rename to libs/apprise/plugins/pagertree.py
index c9290f2f7..faca547da 100644
--- a/libs/apprise/plugins/NotifyPagerTree.py
+++ b/libs/apprise/plugins/pagertree.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -31,11 +31,10 @@ from json import dumps
 
 from uuid import uuid4
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 
 # Actions
@@ -299,6 +298,15 @@ class NotifyPagerTree(NotifyBase):
 
         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.integration)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyParsePlatform.py b/libs/apprise/plugins/parseplatform.py
similarity index 94%
rename from libs/apprise/plugins/NotifyParsePlatform.py
rename to libs/apprise/plugins/parseplatform.py
index 2a182ed31..d5f0b22b3 100644
--- a/libs/apprise/plugins/NotifyParsePlatform.py
+++ b/libs/apprise/plugins/parseplatform.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,10 +30,10 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 # Used to break path apart into list of targets
 TARGET_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
@@ -257,6 +257,19 @@ class NotifyParsePlatform(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/plivo.py b/libs/apprise/plugins/plivo.py
new file mode 100644
index 000000000..893c0e94b
--- /dev/null
+++ b/libs/apprise/plugins/plivo.py
@@ -0,0 +1,403 @@
+# -*- coding: utf-8 -*-
+# BSD 3-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2023, 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.
+#
+# 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.
+
+# Create an account https://messagebird.com if you don't already have one
+#
+# Get your auth_id and auth token from the dashboard here:
+#   - https://console.plivo.com/dashboard/
+#
+
+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 _
+
+
+class NotifyPlivo(NotifyBase):
+    """
+    A wrapper for Plivo Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = 'Plivo'
+
+    # The services URL
+    service_url = 'https://plivo.com'
+
+    # The default protocol
+    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'
+
+    # Plivo uses the http protocol with JSON requests
+    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
+
+    # The maximum length of the body
+    body_maxlen = 140
+
+    # 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}://{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'),
+        },
+        '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',
+        },
+        '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)
+
+        self.auth_id = validate_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)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.token = validate_regex(
+            token, *self.template_tokens['token']['regex'])
+        if not self.token:
+            msg = 'The Plivo authentication token specified ({}) is ' \
+                'invalid.'.format(token)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        result = is_phone_no(source)
+        if not result:
+            msg = 'The Plivo source specified ({}) is invalid.'\
+                .format(source)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Store our source; enforce E.164 format
+        self.source = f'+{result["full"]}'
+
+        # Parse our targets
+        self.targets = list()
+
+        if targets:
+            for target in parse_phone_no(targets):
+                # Validate targets and drop bad ones:
+                result = is_phone_no(target)
+                if result:
+                    # store valid phone number; enforce E.164 format
+                    self.targets.append(f'+{result["full"]}')
+                    continue
+
+                self.logger.warning(
+                    'Dropped invalid phone # '
+                    '({}) specified.'.format(target),
+                )
+        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']
+
+    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.')
+            return False
+
+        # Initialize our has_error flag
+        has_error = False
+
+        # Prepare our headers
+        headers = {
+            'User-Agent': self.app_id,
+            'Content-Type': 'application/json',
+        }
+
+        # Prepare our authentication
+        auth = (self.auth_id, self.token)
+
+        # Prepare our payload
+        payload = {
+            'src': self.source,
+            'dst': None,
+            'text': body,
+        }
+
+        # 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 phone no (< delimits more then one)
+            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))
+
+            # 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,
+                    auth=auth,
+                    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 = \
+                        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)',
+                            status_str,
+                            ', ' if status_str else '',
+                            r.status_code))
+
+                    self.logger.debug(
+                        'Response Details:\r\n{}'.format(r.content))
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                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)',
+                        ))
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    'A Connection error occured sending Plivo:%s ' % (
+                        self.targets) + 'notification.'
+                )
+                self.logger.debug('Socket Exception: %s' % str(e))
+
+                # 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 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,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any arguments set
+        params = {
+            '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(
+                schema=self.secure_protocol,
+                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))
+
+    def __len__(self):
+        """
+        Returns the number of targets associated with this notification
+        """
+        #
+        # Factor batch into calculation
+        #
+        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 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
+
+        # 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'])
+
+        else:
+            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']):
+            # Store 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']))
+
+        else:
+            # The hostname is our authentication key
+            results['token'] = NotifyPlivo.unquote(results['host'])
+
+        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)
+
+            except IndexError:
+                # No source specified...
+                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'])
+
+        # Get Batch Mode Flag
+        results['batch'] = \
+            parse_bool(results['qsd'].get(
+                'batch', NotifyPlivo.template_args['batch']['default']))
+
+        return results
diff --git a/libs/apprise/plugins/NotifyPopcornNotify.py b/libs/apprise/plugins/popcorn_notify.py
similarity index 95%
rename from libs/apprise/plugins/NotifyPopcornNotify.py
rename to libs/apprise/plugins/popcorn_notify.py
index 0ecd8af68..3318a554e 100644
--- a/libs/apprise/plugins/NotifyPopcornNotify.py
+++ b/libs/apprise/plugins/popcorn_notify.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,14 +28,11 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_email
-from ..utils import is_phone_no
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_email, is_phone_no, parse_list, parse_bool, validate_regex)
+from ..locale import gettext_lazy as _
 
 
 class NotifyPopcornNotify(NotifyBase):
@@ -242,6 +239,15 @@ class NotifyPopcornNotify(NotifyBase):
 
         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.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyProwl.py b/libs/apprise/plugins/prowl.py
similarity index 95%
rename from libs/apprise/plugins/NotifyProwl.py
rename to libs/apprise/plugins/prowl.py
index e5c07bf4e..358cdb3ee 100644
--- a/libs/apprise/plugins/NotifyProwl.py
+++ b/libs/apprise/plugins/prowl.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,10 +28,10 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 # Priorities
@@ -250,6 +250,15 @@ class NotifyProwl(NotifyBase):
 
         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.apikey, self.providerkey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushBullet.py b/libs/apprise/plugins/pushbullet.py
similarity index 95%
rename from libs/apprise/plugins/NotifyPushBullet.py
rename to libs/apprise/plugins/pushbullet.py
index 5e9c43fbf..ee0bcf7f7 100644
--- a/libs/apprise/plugins/NotifyPushBullet.py
+++ b/libs/apprise/plugins/pushbullet.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,13 +30,11 @@ import requests
 from json import dumps
 from json import loads
 
-from .NotifyBase import NotifyBase
-from ..utils import is_email
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+from ..utils.parse import is_email, parse_list, validate_regex
+from ..locale import gettext_lazy as _
+from ..attachment.base import AttachBase
 
 # Flag used as a placeholder to sending to all devices
 PUSHBULLET_SEND_TO_ALL = 'ALL_DEVICES'
@@ -152,7 +150,7 @@ class NotifyPushBullet(NotifyBase):
         if attach and self.attachment_support:
             # We need to upload our payload first so that we can source it
             # in remaining messages
-            for attachment in attach:
+            for no, attachment in enumerate(attach, start=1):
 
                 # Perform some simple error checking
                 if not attachment:
@@ -168,7 +166,8 @@ class NotifyPushBullet(NotifyBase):
 
                 # prepare payload
                 payload = {
-                    'file_name': attachment.name,
+                    '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
@@ -386,6 +385,15 @@ class NotifyPushBullet(NotifyBase):
             if files:
                 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.
+        """
+        return (self.secure_protocol, self.accesstoken)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushDeer.py b/libs/apprise/plugins/pushdeer.py
similarity index 92%
rename from libs/apprise/plugins/NotifyPushDeer.py
rename to libs/apprise/plugins/pushdeer.py
index 6766dc7ff..26bf9b881 100644
--- a/libs/apprise/plugins/NotifyPushDeer.py
+++ b/libs/apprise/plugins/pushdeer.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,9 +29,9 @@
 import requests
 
 from ..common import NotifyType
-from .NotifyBase import NotifyBase
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from .base import NotifyBase
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 # Syntax:
 #  schan://{key}/
@@ -180,6 +180,18 @@ class NotifyPushDeer(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.push_key, self.host, self.port,
+        )
+
     def url(self, privacy=False):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushed.py b/libs/apprise/plugins/pushed.py
similarity index 95%
rename from libs/apprise/plugins/NotifyPushed.py
rename to libs/apprise/plugins/pushed.py
index a50970f99..c7646a091 100644
--- a/libs/apprise/plugins/NotifyPushed.py
+++ b/libs/apprise/plugins/pushed.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -31,12 +31,11 @@ import requests
 from json import dumps
 from itertools import chain
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 # Used to detect and parse channels
 IS_CHANNEL = re.compile(r'^#?(?P<name>[A-Za-z0-9]+)$')
@@ -303,6 +302,15 @@ class NotifyPushed(NotifyBase):
 
         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.app_key, self.app_secret)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushjet.py b/libs/apprise/plugins/pushjet.py
similarity index 93%
rename from libs/apprise/plugins/NotifyPushjet.py
rename to libs/apprise/plugins/pushjet.py
index 253ac6818..54d381eee 100644
--- a/libs/apprise/plugins/NotifyPushjet.py
+++ b/libs/apprise/plugins/pushjet.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,11 +29,11 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyPushjet(NotifyBase):
@@ -117,6 +117,18 @@ class NotifyPushjet(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/NotifyPushMe.py b/libs/apprise/plugins/pushme.py
similarity index 93%
rename from libs/apprise/plugins/NotifyPushMe.py
rename to libs/apprise/plugins/pushme.py
index 30889f868..6799a2873 100644
--- a/libs/apprise/plugins/NotifyPushMe.py
+++ b/libs/apprise/plugins/pushme.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,12 +28,11 @@
 
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import validate_regex
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex, parse_bool
+from ..locale import gettext_lazy as _
 
 
 class NotifyPushMe(NotifyBase):
@@ -171,6 +170,15 @@ class NotifyPushMe(NotifyBase):
 
         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.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushover.py b/libs/apprise/plugins/pushover.py
similarity index 97%
rename from libs/apprise/plugins/NotifyPushover.py
rename to libs/apprise/plugins/pushover.py
index be6ada289..b51c506a5 100644
--- a/libs/apprise/plugins/NotifyPushover.py
+++ b/libs/apprise/plugins/pushover.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,14 +30,13 @@ import re
 import requests
 from itertools import chain
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
 from ..conversion import convert_between
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
+from ..attachment.base import AttachBase
 
 # Flag used as a placeholder to sending to all devices
 PUSHOVER_SEND_TO_ALL = 'ALL_DEVICES'
@@ -549,6 +548,15 @@ class NotifyPushover(NotifyBase):
 
         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.user_key, self.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushSafer.py b/libs/apprise/plugins/pushsafer.py
similarity index 94%
rename from libs/apprise/plugins/NotifyPushSafer.py
rename to libs/apprise/plugins/pushsafer.py
index 32cfa82fe..12717b662 100644
--- a/libs/apprise/plugins/NotifyPushSafer.py
+++ b/libs/apprise/plugins/pushsafer.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,15 +26,14 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import base64
 import requests
 from json import loads
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
+from .. import exception
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class PushSaferSound:
@@ -548,12 +547,12 @@ class NotifyPushSafer(NotifyBase):
         if attach and self.attachment_support:
             # We need to upload our payload first so that we can source it
             # in remaining messages
-            for attachment in attach:
+            for no, attachment in enumerate(attach, start=1):
                 # prepare payload
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
+                        'Could not access PushSafer attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
@@ -569,24 +568,27 @@ class NotifyPushSafer(NotifyBase):
                         attachment.url(privacy=True)))
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Output must be in a DataURL format (that's what
-                        # PushSafer calls it):
-                        attachment = (
-                            attachment.name,
-                            'data:{};base64,{}'.format(
-                                attachment.mimetype,
-                                base64.b64encode(f.read())))
+                    # 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(),
+                        )
+                    ))
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access PushSafer attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
-                # Save our pre-prepared payload for attachment posting
-                attachments.append(attachment)
+                self.logger.debug(
+                    'Appending PushSafer attachment {}'.format(
+                        attachment.url(privacy=True)))
 
         # Create a copy of the targets list
         targets = list(self.targets)
@@ -756,6 +758,18 @@ class NotifyPushSafer(NotifyBase):
 
             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.
+        """
+        return (
+            self.secure_protocol if self.secure else self.protocol,
+            self.privatekey,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyPushy.py b/libs/apprise/plugins/pushy.py
similarity index 96%
rename from libs/apprise/plugins/NotifyPushy.py
rename to libs/apprise/plugins/pushy.py
index 097017dac..21cc5e4bd 100644
--- a/libs/apprise/plugins/NotifyPushy.py
+++ b/libs/apprise/plugins/pushy.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -32,11 +32,10 @@ import requests
 from itertools import chain
 
 from json import dumps, loads
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 # Used to detect a Device and Topic
 VALIDATE_DEVICE = re.compile(r'^@(?P<device>[a-z0-9]+)$', re.I)
@@ -310,6 +309,15 @@ class NotifyPushy(NotifyBase):
 
         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.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyReddit.py b/libs/apprise/plugins/reddit.py
similarity index 97%
rename from libs/apprise/plugins/NotifyReddit.py
rename to libs/apprise/plugins/reddit.py
index 022a0a50d..213376132 100644
--- a/libs/apprise/plugins/NotifyReddit.py
+++ b/libs/apprise/plugins/reddit.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -53,14 +53,12 @@ from datetime import timedelta
 from datetime import datetime
 from datetime import timezone
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..locale import gettext_lazy as _
 from .. import __title__, __version__
 
 # Extend HTTP Error Messages
@@ -324,6 +322,18 @@ class NotifyReddit(NotifyBase):
 
         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,
+            self.user, self.password,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyRevolt.py b/libs/apprise/plugins/revolt.py
similarity index 96%
rename from libs/apprise/plugins/NotifyRevolt.py
rename to libs/apprise/plugins/revolt.py
index ae0a43b10..59836a38f 100644
--- a/libs/apprise/plugins/NotifyRevolt.py
+++ b/libs/apprise/plugins/revolt.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -42,13 +42,12 @@ from datetime import timedelta
 from datetime import datetime
 from datetime import timezone
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..utils import parse_list
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex, parse_list
+from ..locale import gettext_lazy as _
 
 
 class NotifyRevolt(NotifyBase):
@@ -354,6 +353,15 @@ class NotifyRevolt(NotifyBase):
 
         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, self.bot_token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyRocketChat.py b/libs/apprise/plugins/rocketchat.py
similarity index 97%
rename from libs/apprise/plugins/NotifyRocketChat.py
rename to libs/apprise/plugins/rocketchat.py
index 9011a5e71..35e167834 100644
--- a/libs/apprise/plugins/NotifyRocketChat.py
+++ b/libs/apprise/plugins/rocketchat.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -32,14 +32,13 @@ from json import loads
 from json import dumps
 from itertools import chain
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, parse_bool
+from ..locale import gettext_lazy as _
 
 IS_CHANNEL = re.compile(r'^#(?P<name>[A-Za-z0-9_-]+)$')
 IS_USER = re.compile(r'^@(?P<name>[A-Za-z0-9._-]+)$')
@@ -319,6 +318,23 @@ class NotifyRocketChat(NotifyBase):
 
         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 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,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyRSyslog.py b/libs/apprise/plugins/rsyslog.py
similarity index 95%
rename from libs/apprise/plugins/NotifyRSyslog.py
rename to libs/apprise/plugins/rsyslog.py
index e39744627..cadf11cc7 100644
--- a/libs/apprise/plugins/NotifyRSyslog.py
+++ b/libs/apprise/plugins/rsyslog.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,10 +29,10 @@
 import os
 import socket
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 
 class syslog:
@@ -300,6 +300,19 @@ class NotifyRSyslog(NotifyBase):
 
         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.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.
diff --git a/libs/apprise/plugins/NotifyRyver.py b/libs/apprise/plugins/ryver.py
similarity index 96%
rename from libs/apprise/plugins/NotifyRyver.py
rename to libs/apprise/plugins/ryver.py
index 0872f3e52..a23059b60 100644
--- a/libs/apprise/plugins/NotifyRyver.py
+++ b/libs/apprise/plugins/ryver.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -38,12 +38,11 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class RyverWebhookMode:
@@ -272,6 +271,15 @@ class NotifyRyver(NotifyBase):
 
         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.organization, self.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySendGrid.py b/libs/apprise/plugins/sendgrid.py
similarity index 88%
rename from libs/apprise/plugins/NotifySendGrid.py
rename to libs/apprise/plugins/sendgrid.py
index b82e3e60d..f02a326d8 100644
--- a/libs/apprise/plugins/NotifySendGrid.py
+++ b/libs/apprise/plugins/sendgrid.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -49,13 +49,13 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
+from .. import exception
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import is_email
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, is_email, validate_regex
+from ..locale import gettext_lazy as _
+
 
 # Extend HTTP Error Messages
 SENDGRID_HTTP_ERROR_MAP = {
@@ -90,6 +90,9 @@ class NotifySendGrid(NotifyBase):
     # The default Email API URL to use
     notify_url = 'https://api.sendgrid.com/v3/mail/send'
 
+    # Support attachments
+    attachment_support = True
+
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.2
@@ -243,6 +246,15 @@ class NotifySendGrid(NotifyBase):
 
         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.
@@ -288,7 +300,8 @@ class NotifySendGrid(NotifyBase):
         """
         return len(self.targets)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
+             **kwargs):
         """
         Perform SendGrid Notification
         """
@@ -322,6 +335,44 @@ class NotifySendGrid(NotifyBase):
             }],
         }
 
+        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 SendGrid attachment {}.'.format(
+                            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 SendGrid attachment {}.'.format(
+                            attachment.url(privacy=True)))
+                    return False
+
+                self.logger.debug(
+                    'Appending SendGrid attachment {}'.format(
+                        attachment.url(privacy=True)))
+
+            # Append our attachments to the payload
+            _payload.update({
+                'attachments': attachments,
+            })
+
         if self.template:
             _payload['template_id'] = self.template
 
diff --git a/libs/apprise/plugins/NotifyServerChan.py b/libs/apprise/plugins/serverchan.py
similarity index 91%
rename from libs/apprise/plugins/NotifyServerChan.py
rename to libs/apprise/plugins/serverchan.py
index cf250cf5b..252f58e7b 100644
--- a/libs/apprise/plugins/NotifyServerChan.py
+++ b/libs/apprise/plugins/serverchan.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,9 +30,9 @@ import re
 import requests
 
 from ..common import NotifyType
-from .NotifyBase import NotifyBase
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from .base import NotifyBase
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 # Register at https://sct.ftqq.com/
@@ -74,7 +74,7 @@ class NotifyServerChan(NotifyBase):
             'type': 'string',
             'private': True,
             'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
+            'regex': (r'^[a-z0-9-]+$', 'i'),
         },
     })
 
@@ -149,6 +149,15 @@ class NotifyServerChan(NotifyBase):
 
         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.token)
+
     def url(self, privacy=False):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySES.py b/libs/apprise/plugins/ses.py
similarity index 97%
rename from libs/apprise/plugins/NotifySES.py
rename to libs/apprise/plugins/ses.py
index b580b14d6..00c890c52 100644
--- a/libs/apprise/plugins/NotifySES.py
+++ b/libs/apprise/plugins/ses.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -95,14 +95,12 @@ from email.utils import formataddr
 from email.header import Header
 from urllib.parse import quote
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_emails
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..utils import is_email
+from ..utils.parse import parse_emails, validate_regex, is_email
+from ..locale import gettext_lazy as _
 
 # Our Regin Identifier
 # support us-gov-west-1 syntax as well
@@ -448,7 +446,7 @@ class NotifySES(NotifyBase):
                 base.attach(content)
 
                 # Now store our attachments
-                for attachment in attach:
+                for no, attachment in enumerate(attach, start=1):
                     if not attachment:
                         # We could not load the attachment; take an early
                         # exit since this isn't what the end user wanted
@@ -468,10 +466,13 @@ class NotifySES(NotifyBase):
                         app = MIMEApplication(abody.read())
                         app.set_type(attachment.mimetype)
 
+                        filename = attachment.name \
+                            if attachment.name else f'file{no:03}.dat'
+
                         app.add_header(
                             'Content-Disposition',
                             'attachment; filename="{}"'.format(
-                                Header(attachment.name, 'utf-8')),
+                                Header(filename, 'utf-8')),
                         )
 
                         base.attach(app)
@@ -770,6 +771,18 @@ class NotifySES(NotifyBase):
 
         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.
+        """
+        return (
+            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.
diff --git a/libs/apprise/plugins/seven.py b/libs/apprise/plugins/seven.py
new file mode 100644
index 000000000..2536647f4
--- /dev/null
+++ b/libs/apprise/plugins/seven.py
@@ -0,0 +1,290 @@
+# -*- 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.
+# Create an account https://www.seven.io if you don't already have one
+#
+# Get your (apikey) from here:
+#   - https://help.seven.io/en/api-key-access
+#
+import requests
+import json
+from .base import NotifyBase
+from ..common import NotifyType
+from ..utils.parse import is_phone_no, parse_phone_no
+from ..locale import gettext_lazy as _
+
+
+class NotifySeven(NotifyBase):
+    """
+    A wrapper for seven Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = 'seven'
+
+    # The services URL
+    service_url = 'https://www.seven.io'
+
+    # The default protocol
+    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'
+
+    # Seven uses the http protocol with JSON requests
+    notify_url = 'https://gateway.seven.io/api/sms'
+
+    # The maximum length of the body
+    body_maxlen = 160
+
+    # 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}://{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',
+        },
+        'targets': {
+            'name': _('Targets'),
+            'type': 'list:string',
+        }
+    })
+
+    # Define our template arguments
+    template_args = dict(NotifyBase.template_args, **{
+        'to': {
+            'alias_of': 'targets',
+        },
+    })
+
+    def __init__(self, apikey, targets=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)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Parse our targets
+        self.targets = list()
+
+        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),
+                )
+                continue
+            # store valid phone number
+            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.
+        """
+        return (self.secure_protocol, self.apikey)
+
+    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.')
+            return False
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # Prepare our headers
+        headers = {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+            'SentWith': 'Apprise',
+            'X-Api-Key': self.apikey,
+        }
+
+        # Prepare our payload
+        payload = {
+            'to': None,
+            'text': body,
+        }
+        # 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)
+            # 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))
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    data=json.dumps(payload),
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                # Sample output of a successful transmission
+                # {
+                #     "success": "100",
+                #     "total_price": 0.075,
+                #     "balance": 46.748,
+                #     "debug": "false",
+                #     "sms_type": "direct",
+                #     "messages": [
+                #         {
+                #             "id": "77229135982",
+                #             "sender": "492022839080",
+                #             "recipient": "4917661254799",
+                #             "text": "x",
+                #             "encoding": "gsm",
+                #             "label": null,
+                #             "parts": 1,
+                #             "udh": null,
+                #             "is_binary": false,
+                #             "price": 0.075,
+                #             "success": true,
+                #             "error": null,
+                #             "error_text": null
+                #         }
+                #     ]
+                # }
+                if r.status_code not in (
+                        requests.codes.ok, requests.codes.created):
+                    # We had a problem
+                    status_str = \
+                        NotifySeven.http_response_code_lookup(
+                            r.status_code)
+                    self.logger.warning(
+                        'Failed to send seven notification to {}: '
+                        '{}{}error={}.'.format(
+                            ','.join(target),
+                            status_str,
+                            ', ' if status_str else '',
+                            r.status_code))
+                    self.logger.debug(
+                        'Response Details:\r\n{}'.format(r.content))
+                    # Mark our failure
+                    has_error = True
+                    continue
+                else:
+                    self.logger.info(
+                        'Sent seven notification to {}.'.format(target))
+            except requests.RequestException as e:
+                self.logger.warning(
+                    'A Connection error occurred sending seven:%s ' % (
+                        target) + 'notification.'
+                )
+                self.logger.debug('Socket Exception: %s' % str(e))
+                # 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.
+        """
+
+        # Our URL parameters
+        params = 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(
+                [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
+        """
+        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.
+        """
+
+        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 our entries; split_path() looks after unquoting content for us
+        # by default
+        results['targets'] = NotifySeven.split_path(results['fullpath'])
+
+        # The hostname is our authentication key
+        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'])
+
+        return results
diff --git a/libs/apprise/plugins/sfr.py b/libs/apprise/plugins/sfr.py
new file mode 100644
index 000000000..2c8e7ece2
--- /dev/null
+++ b/libs/apprise/plugins/sfr.py
@@ -0,0 +1,442 @@
+# -*- 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.
+
+# For this to work correctly you need to have a valid SFR DMC service account
+# to whicthe API password can be generated. A "space" is also necessary
+# (space = a logical separation between clients), which will give you a
+# specific spaceId
+#
+# Expected credentials looks a little like this:
+# serviceId: 84920958892    - Random numbers
+# servicePassword: XxXXxXXx - Random characters
+# spaceId: 984348           - Random numbers
+#
+# 1. Visit https://www.sfr.fr/
+#
+# 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
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no
+from ..url import PrivacyMode
+
+
+class NotifySFR(NotifyBase):
+    """
+    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')
+
+    # The services URL
+    service_url = 'https://www.sfr.fr/'
+
+    # The default protocol
+    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'
+
+    # SFR api
+    notify_url = (
+        '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
+    body_maxlen = 160
+
+    # 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}://{user}:{password}@{space_id}/{targets}',
+    )
+
+    # Define our tokens
+    template_tokens = dict(
+        NotifyBase.template_tokens, **{
+            'user': {
+                'name': _('Service ID'),
+                'type': 'string',
+                'required': True,
+            },
+            'password': {
+                'name': _('Service Password'),
+                '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',
+            },
+            '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': '',
+            },
+            '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,
+            },
+            'voice': {
+                'name': _('TTS Voice'),
+                'type': 'string',
+                'default': 'claire08s',
+                'values': ['claire08s', 'laura8k'],
+                'required': False,
+            },
+            '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
+        """
+        super().__init__(**kwargs)
+
+        if not (self.user and self.password):
+            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.'
+            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']
+
+        # Set our Time to Live Flag
+        self.timeout = self.template_args['timeout']['default']
+        try:
+            self.timeout = int(timeout)
+
+        except (ValueError, TypeError):
+            # set default timeout
+            self.timeout = 2880
+            pass
+
+        # Parse our targets
+        self.targets = list()
+
+        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),
+                )
+                continue
+
+            # store valid phone number
+            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.')
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        return
+
+    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+        """
+        Perform the SFR notification
+        """
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # Create a copy of the targets list
+        targets = list(self.targets)
+
+        # Construct the authentication JSON
+        auth_payload = json.dumps({
+            '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,
+            # Content of the message
+            'textMsg': body,
+            # Receiver's phone number (set below)
+            'to': None,
+            # Optional, default to ''
+            'from': self.sender,
+            # Optional, default 2880 minutes
+            'timeout': self.timeout,
+            # Optional, default to French voice
+            'ttsVoice': self.voice,
+        }
+
+        while len(targets):
+            # Get our target to notify
+            target = targets.pop(0)
+
+            # Prepare our target phone no
+            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)
+            }
+
+            # 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))
+
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    params=payload,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+
+                try:
+                    content = json.loads(r.content)
+
+                except (AttributeError, TypeError, ValueError):
+                    # ValueError = r.content is Unparsable
+                    # TypeError = r.content is None
+                    # AttributeError = r is None
+                    content = {}
+
+                # Check if the request was successfull
+                if r.status_code not in (
+                        requests.codes.ok,
+                        requests.codes.no_content,
+                ):
+                    # We had a problem
+                    status_str = \
+                        NotifySFR.http_response_code_lookup(
+                            r.status_code)
+
+                    self.logger.warning(
+                        'Failed to send SFR notification to {}: '
+                        '{}{}error={}.'.format(
+                            target,
+                            status_str,
+                            ', ' if status_str else '',
+                            r.status_code))
+
+                    self.logger.debug(
+                        'Response Details:\r\n{}'.format(r.content))
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                # 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):
+                    self.logger.warning(
+                        'SFR Notification to {} was not sent by the server: '
+                        'server_error={}, fatal={}.'.format(
+                            target,
+                            content.get('errorCode', 'UNKNOWN'),
+                            content.get('fatal', 'True'),
+                        ))
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                self.logger.info(
+                    'Sent SFR notification to %s.' % target)
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    'A Connection error occurred sending SFR:%s '
+                    'notification.' % target
+                )
+                self.logger.debug('Socket Exception: %s' % str(e))
+
+                # 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 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,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        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,
+        }
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        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='',
+            ),
+            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
+        """
+        return len(self.targets)
+
+    @staticmethod
+    def parse_url(url):
+        """
+        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
+        # generate you're 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
+
+        # Extract user and password
+        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'))
+
+        # 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'])
+
+        return results
diff --git a/libs/apprise/plugins/NotifySignalAPI.py b/libs/apprise/plugins/signal_api.py
similarity index 92%
rename from libs/apprise/plugins/NotifySignalAPI.py
rename to libs/apprise/plugins/signal_api.py
index b35b4989e..92860d0d6 100644
--- a/libs/apprise/plugins/NotifySignalAPI.py
+++ b/libs/apprise/plugins/signal_api.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,15 +29,13 @@
 import re
 import requests
 from json import dumps
-import base64
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..URLBase import PrivacyMode
-from ..AppriseLocale import gettext_lazy as _
+from .. import exception
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
+from ..url import PrivacyMode
+from ..locale import gettext_lazy as _
 
 
 GROUP_REGEX = re.compile(
@@ -239,23 +237,24 @@ class NotifySignalAPI(NotifyBase):
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
+                        'Could not access Signal API attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Prepare our Attachment in Base64
-                        attachments.append(
-                            base64.b64encode(f.read()).decode('utf-8'))
+                    attachments.append(attachment.base64())
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access Signal API attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending Signal API attachment {}'.format(
+                        attachment.url(privacy=True)))
+
         # Prepare our headers
         headers = {
             'User-Agent': self.app_id,
@@ -372,6 +371,18 @@ class NotifySignalAPI(NotifyBase):
 
         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 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.
diff --git a/libs/apprise/plugins/NotifySimplePush.py b/libs/apprise/plugins/simplepush.py
similarity index 88%
rename from libs/apprise/plugins/NotifySimplePush.py
rename to libs/apprise/plugins/simplepush.py
index 3851e1e3c..343621841 100644
--- a/libs/apprise/plugins/NotifySimplePush.py
+++ b/libs/apprise/plugins/simplepush.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -30,11 +30,11 @@ from os import urandom
 from json import loads
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 from base64 import urlsafe_b64encode
 import hashlib
@@ -177,7 +177,25 @@ class NotifySimplePush(NotifyBase):
 
         padder = padding.PKCS7(algorithms.AES.block_size).padder()
         content = padder.update(content.encode()) + padder.finalize()
+        #
+        # Encryption Notice
+        #
 
+        # CBC mode doesn't provide integrity guarantees. Unless the message
+        # authentication for IV and the ciphertext are applied, it will be
+        # vulnerable to a padding oracle attack
+
+        # It is important to identify that both the Apprise package and team
+        # recognizes this AES-CBC-128 weakness but requires that it exists due
+        # to it being the SimplePush Requirement as documented on their
+        # website here https://simplepush.io/features.
+
+        # 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
+        #
         encryptor = Cipher(
             algorithms.AES(self._key),
             modes.CBC(self._iv),
@@ -283,6 +301,15 @@ class NotifySimplePush(NotifyBase):
 
         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.user, self.password, self.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySinch.py b/libs/apprise/plugins/sinch.py
similarity index 96%
rename from libs/apprise/plugins/NotifySinch.py
rename to libs/apprise/plugins/sinch.py
index 74b3c452a..6a07c0b40 100644
--- a/libs/apprise/plugins/NotifySinch.py
+++ b/libs/apprise/plugins/sinch.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -39,13 +39,11 @@
 import requests
 import json
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class SinchRegion:
@@ -381,6 +379,18 @@ class NotifySinch(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/NotifySlack.py b/libs/apprise/plugins/slack.py
similarity index 85%
rename from libs/apprise/plugins/NotifySlack.py
rename to libs/apprise/plugins/slack.py
index b66fe99f4..9fa6092e0 100644
--- a/libs/apprise/plugins/NotifySlack.py
+++ b/libs/apprise/plugins/slack.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -78,15 +78,13 @@ from json import dumps
 from json import loads
 from time import time
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import is_email
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_email, parse_bool, parse_list, validate_regex)
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 SLACK_HTTP_ERROR_MAP = {
@@ -280,6 +278,40 @@ class NotifySlack(NotifyBase):
         },
     })
 
+    # 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',
+        # Escape other special characters
+        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)
+
+    # 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)
+
+    # 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
+    _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):
@@ -292,6 +324,7 @@ class NotifySlack(NotifyBase):
         self.mode = SlackMode.BOT if access_token else SlackMode.WEBHOOK
 
         if self.mode is SlackMode.WEBHOOK:
+            self.access_token = None
             self.token_a = validate_regex(
                 token_a, *self.template_tokens['token_a']['regex'])
             if not self.token_a:
@@ -316,6 +349,9 @@ class NotifySlack(NotifyBase):
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
+            self.token_a = None
+            self.token_b = None
+            self.token_c = None
             self.access_token = validate_regex(
                 access_token, *self.template_tokens['access_token']['regex'])
             if not self.access_token:
@@ -344,39 +380,11 @@ class NotifySlack(NotifyBase):
                 None if self.mode is SlackMode.WEBHOOK
                 else self.default_notification_channel)
 
-        # Formatting requirements are defined here:
-        # https://api.slack.com/docs/message-formatting
-        self._re_formatting_map = {
-            # New lines must become the string version
-            r'\r\*\n': '\\n',
-            # Escape other special characters
-            r'&': '&amp;',
-            r'<': '&lt;',
-            r'>': '&gt;',
-        }
-
-        # To notify a channel, one uses <!channel|channel>
-        self._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)
-
-        # 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
-        self._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)
-
         # Iterate over above list and store content accordingly
         self._re_formatting_rules = re.compile(
             r'(' + '|'.join(self._re_formatting_map.keys()) + r')',
             re.IGNORECASE,
         )
-
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
 
@@ -478,6 +486,20 @@ class NotifySlack(NotifyBase):
                         body,
                         re.IGNORECASE)
 
+                # Support <@userid|desc>, <@channel> entries
+                for match in self._re_user_id_support.findall(body):
+                    # Swap back any ampersands previously updaated
+                    user = match[1].strip()
+                    desc = match[2].strip()
+
+                    # Update our string
+                    body = re.sub(
+                        re.escape(match[0]),
+                        '<@{user}|{desc}>'.format(user=user, desc=desc)
+                        if desc else '<@{user}>'.format(user=user),
+                        body,
+                        re.IGNORECASE)
+
                 # Support <url|desc>, <url> entries
                 for match in self._re_url_support.findall(body):
                     # Swap back any ampersands previously updaated
@@ -603,16 +625,17 @@ class NotifySlack(NotifyBase):
                             channel if channel[0] == '#' \
                             else '#{}'.format(channel)
 
-                # Store the valid and massaged payload that is recognizable by
-                # slack. This list is used for sending attachments later.
-                attach_channel_list.append(payload['channel'])
-
             response = self._send(url, payload)
             if not response:
                 # Handle any error
                 has_error = True
                 continue
 
+            # 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'))
+
             self.logger.info(
                 'Sent Slack notification{}.'.format(
                     ' to {}'.format(channel)
@@ -621,7 +644,7 @@ class NotifySlack(NotifyBase):
         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 attachment in attach:
+            for no, attachment in enumerate(attach, start=1):
 
                 # Perform some simple error checking
                 if not attachment:
@@ -635,21 +658,59 @@ class NotifySlack(NotifyBase):
                     'Posting Slack attachment {}'.format(
                         attachment.url(privacy=True)))
 
-                # Prepare API Upload Payload
-                _payload = {
-                    'filename': attachment.name,
-                    'channels': ','.join(attach_channel_list)
+                # 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),
                 }
-
-                # Our URL
-                _url = self.api_url.format('files.upload')
-
-                response = self._send(_url, _payload, attach=attachment)
-                if not (response and response.get('file') and
-                        response['file'].get('url_private')):
-                    # We failed to post our attachments, take an early exit
+                _url = self.api_url.format('files.getUploadURLExternal')
+                response = self._send(
+                    _url, {}, http_method='get', params=_params
+                )
+                if not (
+                    response and response.get('file_id')
+                    and response.get('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')
+
+                # Upload file
+                response = self._send(upload_url, {}, attach=attachment)
+
+                # Send file to channels
+                # https://api.slack.com/methods/files.completeUploadExternal
+                for channel_id in attach_channel_list:
+                    _payload = {
+                        'files': [{
+                            "id": file_id,
+                            "title": attachment.name,
+                        }],
+                        'channel_id': channel_id
+                    }
+                    _url = self.api_url.format('files.completeUploadExternal')
+                    response = self._send(_url, _payload)
+                    # Expected response
+                    # {
+                    #     "ok": true,
+                    #     "files": [
+                    #         {
+                    #             "id": "F123ABC456",
+                    #             "title": "slack-test"
+                    #         }
+                    #     ]
+                    # }
+                    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
+
         return not has_error
 
     def lookup_userid(self, email):
@@ -808,7 +869,8 @@ class NotifySlack(NotifyBase):
 
         return user_id
 
-    def _send(self, url, payload, attach=None, **kwargs):
+    def _send(self, url, payload, attach=None, http_method='post', params=None,
+              **kwargs):
         """
         Wrapper to the requests (post) object
         """
@@ -842,13 +904,15 @@ class NotifySlack(NotifyBase):
             if attach:
                 files = {'file': (attach.name, open(attach.path, 'rb'))}
 
-            r = requests.post(
+            r = requests.request(
+                http_method,
                 url,
                 data=payload if attach else dumps(payload),
                 headers=headers,
                 files=files,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
+                params=params if params else None,
             )
 
             # Posts return a JSON string
@@ -866,11 +930,22 @@ class NotifySlack(NotifyBase):
             #   'ok': False,
             #   'error': 'not_in_channel',
             # }
-            #
-            # The text 'ok' is returned if this is a Webhook request
-            # So the below captures that as well.
-            status_okay = (response and response.get('ok', False)) \
-                if self.mode is SlackMode.BOT else r.content == b'ok'
+            status_okay = False
+            if self.mode is SlackMode.BOT:
+                status_okay = (
+                    (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
+                    )
+                )
+            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
@@ -879,9 +954,9 @@ class NotifySlack(NotifyBase):
                         r.status_code, SLACK_HTTP_ERROR_MAP)
 
                 self.logger.warning(
-                    'Failed to send {}to Slack: '
+                    'Failed to send{} to Slack: '
                     '{}{}error={}.'.format(
-                        attach.name if attach else '',
+                        (' ' + attach.name) if attach else '',
                         status_str,
                         ', ' if status_str else '',
                         r.status_code))
@@ -913,53 +988,15 @@ class NotifySlack(NotifyBase):
             #   "username": "Apprise"
             # }
 
-            # File Attachment Responses look like this
+            # files.completeUploadExternal responses look like this:
             # {
-            #   "file": {
-            #     "channels": [],
-            #     "comments_count": 0,
-            #     "created": 1573617523,
-            #     "display_as_bot": false,
-            #     "editable": false,
-            #     "external_type": "",
-            #     "filetype": "png",
-            #     "groups": [],
-            #     "has_rich_preview": false,
-            #     "id": "FQJJLDAHM",
-            #     "image_exif_rotation": 1,
-            #     "ims": [],
-            #     "is_external": false,
-            #     "is_public": false,
-            #     "is_starred": false,
-            #     "mimetype": "image/png",
-            #     "mode": "hosted",
-            #     "name": "apprise-test.png",
-            #     "original_h": 640,
-            #     "original_w": 640,
-            #     "permalink": "https://{name}.slack.com/files/...
-            #     "permalink_public": "https://slack-files.com/...
-            #     "pretty_type": "PNG",
-            #     "public_url_shared": false,
-            #     "shares": {},
-            #     "size": 238810,
-            #     "thumb_160": "https://files.slack.com/files-tmb/...
-            #     "thumb_360": "https://files.slack.com/files-tmb/...
-            #     "thumb_360_h": 360,
-            #     "thumb_360_w": 360,
-            #     "thumb_480": "https://files.slack.com/files-tmb/...
-            #     "thumb_480_h": 480,
-            #     "thumb_480_w": 480,
-            #     "thumb_64": "https://files.slack.com/files-tmb/...
-            #     "thumb_80": "https://files.slack.com/files-tmb/...
-            #     "thumb_tiny": abcd...
-            #     "timestamp": 1573617523,
-            #     "title": "apprise-test",
-            #     "url_private": "https://files.slack.com/files-pri/...
-            #     "url_private_download": "https://files.slack.com/files-...
-            #     "user": "UADKLLMJT",
-            #     "username": ""
-            #   },
-            #   "ok": true
+            #     "ok": true,
+            #     "files": [
+            #         {
+            #             "id": "F123ABC456",
+            #             "title": "slack-test"
+            #         }
+            #     ]
             # }
         except requests.RequestException as e:
             self.logger.warning(
@@ -984,6 +1021,18 @@ class NotifySlack(NotifyBase):
         # 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.
+        """
+        return (
+            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.
diff --git a/libs/apprise/plugins/NotifySMSEagle.py b/libs/apprise/plugins/smseagle.py
similarity index 94%
rename from libs/apprise/plugins/NotifySMSEagle.py
rename to libs/apprise/plugins/smseagle.py
index 33b4af752..6c545674c 100644
--- a/libs/apprise/plugins/NotifySMSEagle.py
+++ b/libs/apprise/plugins/smseagle.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,17 +29,15 @@
 import re
 import requests
 from json import dumps, loads
-import base64
 from itertools import chain
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..URLBase import PrivacyMode
-from ..AppriseLocale import gettext_lazy as _
+from .. import exception
+from ..utils.parse import (
+    validate_regex, is_phone_no, parse_phone_no, parse_bool)
+from ..url import PrivacyMode
+from ..locale import gettext_lazy as _
 
 
 GROUP_REGEX = re.compile(
@@ -345,7 +343,7 @@ class NotifySMSEagle(NotifyBase):
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
+                        'Could not access SMSEagle attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
@@ -357,21 +355,23 @@ class NotifySMSEagle(NotifyBase):
                     continue
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Prepare our Attachment in Base64
-                        attachments.append({
-                            'content_type': attachment.mimetype,
-                            'content': base64.b64encode(
-                                f.read()).decode('utf-8'),
-                        })
+                    # Prepare our Attachment in Base64
+                    attachments.append({
+                        'content_type': attachment.mimetype,
+                        'content': attachment.base64(),
+                    })
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access SMSEagle attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending SMSEagle attachment {}'.format(
+                        attachment.url(privacy=True)))
+
         # Prepare our headers
         headers = {
             'User-Agent': self.app_id,
@@ -564,6 +564,18 @@ class NotifySMSEagle(NotifyBase):
 
         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 if self.secure else self.protocol,
+            self.token, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySMSManager.py b/libs/apprise/plugins/smsmanager.py
similarity index 96%
rename from libs/apprise/plugins/NotifySMSManager.py
rename to libs/apprise/plugins/smsmanager.py
index efc158b62..16bf130fc 100644
--- a/libs/apprise/plugins/NotifySMSManager.py
+++ b/libs/apprise/plugins/smsmanager.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -35,13 +35,11 @@
 #    2. Generate an API key in web administration.
 
 import requests
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
+from ..locale import gettext_lazy as _
 
 
 class SMSManagerGateway(object):
@@ -314,6 +312,15 @@ class NotifySMSManager(NotifyBase):
 
         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[0], self.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySMTP2Go.py b/libs/apprise/plugins/smtp2go.py
similarity index 92%
rename from libs/apprise/plugins/NotifySMTP2Go.py
rename to libs/apprise/plugins/smtp2go.py
index a34492d05..23b31bfd9 100644
--- a/libs/apprise/plugins/NotifySMTP2Go.py
+++ b/libs/apprise/plugins/smtp2go.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -45,18 +45,16 @@
 #  the email will be transmitted from.  If no email address is specified
 #  then it will also become the 'to' address as well.
 #
-import base64
 import requests
 from json import dumps
 from email.utils import formataddr
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
+from .. import exception
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_emails
-from ..utils import parse_bool
-from ..utils import is_email
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    parse_emails, parse_bool, is_email, validate_regex)
+from ..locale import gettext_lazy as _
 
 SMTP2GO_HTTP_ERROR_MAP = {
     429: 'To many requests.',
@@ -294,33 +292,35 @@ class NotifySMTP2Go(NotifyBase):
         attachments = []
 
         if attach and self.attachment_support:
-            for attachment in attach:
+            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 {}.'.format(
+                        'Could not access SMTP2Go attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 try:
-                    with open(attachment.path, 'rb') as f:
-                        # Output must be in a DataURL format (that's what
-                        # PushSafer calls it):
-                        attachments.append({
-                            'filename': attachment.name,
-                            'fileblob': base64.b64encode(f.read())
-                            .decode('utf-8'),
-                            'mimetype': attachment.mimetype,
-                        })
+                    # Format our attachment
+                    attachments.append({
+                        'filename': attachment.name
+                        if attachment.name else f'file{no:03}.dat',
+                        'fileblob': attachment.base64(),
+                        'mimetype': attachment.mimetype,
+                    })
 
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access SMTP2Go attachment {}.'.format(
+                            attachment.url(privacy=True)))
                     return False
 
+                self.logger.debug(
+                    'Appending SMTP2Go attachment {}'.format(
+                        attachment.url(privacy=True)))
+
         sender = formataddr(
             (self.from_name if self.from_name else False,
              self.from_addr), charset='utf-8')
@@ -464,6 +464,15 @@ class NotifySMTP2Go(NotifyBase):
 
         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.user, self.host, self.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySNS.py b/libs/apprise/plugins/sns.py
similarity index 97%
rename from libs/apprise/plugins/NotifySNS.py
rename to libs/apprise/plugins/sns.py
index 5a287e37e..bdea2b4df 100644
--- a/libs/apprise/plugins/NotifySNS.py
+++ b/libs/apprise/plugins/sns.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,13 +36,11 @@ from collections import OrderedDict
 from xml.etree import ElementTree
 from itertools import chain
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_list, validate_regex
+from ..locale import gettext_lazy as _
 
 # Topic Detection
 # Summary: 256 Characters max, only alpha/numeric plus underscore (_) and
@@ -573,6 +571,18 @@ class NotifySNS(NotifyBase):
 
         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.
+        """
+        return (
+            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.
diff --git a/libs/apprise/plugins/NotifySparkPost.py b/libs/apprise/plugins/sparkpost.py
similarity index 94%
rename from libs/apprise/plugins/NotifySparkPost.py
rename to libs/apprise/plugins/sparkpost.py
index 255db0709..039942fb9 100644
--- a/libs/apprise/plugins/NotifySparkPost.py
+++ b/libs/apprise/plugins/sparkpost.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -55,18 +55,16 @@
 # API Documentation: https://developers.sparkpost.com/api/
 # Specifically: https://developers.sparkpost.com/api/transmissions/
 import requests
-import base64
 from json import loads
 from json import dumps
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
+from .. import exception
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import is_email
 from email.utils import formataddr
-from ..utils import validate_regex
-from ..utils import parse_emails
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (
+    validate_regex, parse_emails, parse_bool, is_email)
+from ..locale import gettext_lazy as _
 
 # Provide some known codes SparkPost uses and what they translate to:
 # Based on https://www.sparkpost.com/docs/tech-resources/extended-error-codes/
@@ -500,7 +498,7 @@ class NotifySparkPost(NotifyBase):
         if not self.targets:
             # There is no one to email; we're done
             self.logger.warning(
-                'There are no Email recipients to notify')
+                'There are no SparkPost Email recipients to notify')
             return False
 
         # Initialize our has_error flag
@@ -546,35 +544,35 @@ class NotifySparkPost(NotifyBase):
             # Prepare ourselves an attachment object
             payload['content']['attachments'] = []
 
-            for attachment in attach:
+            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 {}.'.format(
+                        'Could not access SparkPost attachment {}.'.format(
+                            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(),
+                    })
+
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        'Could not access SparkPost attachment {}.'.format(
                             attachment.url(privacy=True)))
                     return False
 
                 self.logger.debug(
-                    'Preparing SparkPost attachment {}'.format(
+                    'Appending SparkPost attachment {}'.format(
                         attachment.url(privacy=True)))
 
-                try:
-                    with open(attachment.path, 'rb') as fp:
-                        # Prepare API Upload Payload
-                        payload['content']['attachments'].append({
-                            'name': attachment.name,
-                            'type': attachment.mimetype,
-                            'data': base64.b64encode(fp.read()).decode("ascii")
-                        })
-
-                except (OSError, IOError) as e:
-                    self.logger.warning(
-                        'An I/O error occurred while reading {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
-                    return False
-
         # Take a copy of our token dictionary
         tokens = self.tokens.copy()
 
@@ -670,6 +668,15 @@ class NotifySparkPost(NotifyBase):
 
         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.user, self.apikey, self.host)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/splunk.py b/libs/apprise/plugins/splunk.py
new file mode 100644
index 000000000..d9374255b
--- /dev/null
+++ b/libs/apprise/plugins/splunk.py
@@ -0,0 +1,500 @@
+# -*- 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.
+
+# Splunk On-Call
+# API: https://portal.victorops.com/public/api-docs.html
+# Main: https://www.splunk.com/en_us/products/on-call.html
+# Routing Keys https://help.victorops.com/knowledge-base/routing-keys/
+# Setup: https://help.victorops.com/knowledge-base/rest-endpoint-integration\
+#       -guide/
+
+
+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 ..locale import gettext_lazy as _
+
+
+class SplunkAction:
+    """
+    Tracks the actions supported by Apprise Splunk Plugin
+
+    """
+    # Use mapping (specify :key=arg to over-ride)
+    MAP = 'map'
+
+    # Creates a timeline event but does not trigger an incident
+    INFO = 'info'
+
+    # Triggers a warning (possibly causing incident) in all cases
+    WARNING = 'warning'
+
+    # Triggers an incident in all cases
+    CRITICAL = 'critical'
+
+    # Acknowldege entity_id provided in all cases
+    ACKNOWLEDGE = 'acknowledgement'
+
+    # Recovery entity_id provided in all cases
+    RECOVERY = 'recovery'
+
+    # Resolve (aliase of Recover)
+    RESOLVE = 'resolve'
+
+
+# Define our Splunk Actions
+SPLUNK_ACTIONS = (
+    SplunkAction.MAP,
+    SplunkAction.INFO,
+    SplunkAction.ACKNOWLEDGE,
+    SplunkAction.WARNING,
+    SplunkAction.RECOVERY,
+    SplunkAction.RESOLVE,
+    SplunkAction.CRITICAL,
+)
+
+
+class SplunkMessageType:
+    """
+    Defines the supported splunk message types
+    """
+    # Triggers an incident
+    CRITICAL = 'CRITICAL'
+
+    # May trigger an incident, depending on your settings
+    WARNING = 'WARNING'
+
+    # Acks an incident
+    ACKNOWLEDGEMENT = 'ACKNOWLEDGEMENT'
+
+    # Creates a timeline event but does not trigger an incident
+    INFO = 'INFO'
+
+    # Resolves an incident
+    RECOVERY = 'RECOVERY'
+
+
+# Defines our supported message types
+SPLUNK_MESSAGE_TYPES = (
+    SplunkMessageType.CRITICAL,
+    SplunkMessageType.WARNING,
+    SplunkMessageType.ACKNOWLEDGEMENT,
+    SplunkMessageType.INFO,
+    SplunkMessageType.RECOVERY,
+)
+
+
+class NotifySplunk(NotifyBase):
+    """
+    A wrapper for Splunk Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = _('Splunk On-Call')
+
+    # The services URL
+    service_url = 'https://www.splunk.com/en_us/products/on-call.html'
+
+    # The default secure protocol
+    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'
+
+    # Notification URL
+    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}',
+    )
+
+    # The title is not used
+    title_maxlen = 60
+
+    # body limit
+    body_maxlen = 400
+
+    # Defines our default message mapping
+    splunk_message_map = {
+        # Creates a timeline event but doesnot trigger an incident
+        NotifyType.INFO: SplunkMessageType.INFO,
+        # Resolves an incident
+        NotifyType.SUCCESS: SplunkMessageType.RECOVERY,
+        # May trigger an incident, depending on your settings
+        NotifyType.WARNING: SplunkMessageType.WARNING,
+        # Triggers an incident
+        NotifyType.FAILURE: SplunkMessageType.CRITICAL,
+    }
+
+    # 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',
+        },
+    })
+
+    # 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',
+        },
+        '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': ':',
+        },
+    }
+
+    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'])
+        if not self.apikey:
+            msg = 'The Splunk API Key specified ({}) is invalid.'\
+                .format(apikey)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.routing_key = validate_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)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        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/')
+
+        if action and isinstance(action, str):
+            self.action = next(
+                (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)
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            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():
+                # Get our mapping
+                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)
+                    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)
+                if not v:
+                    msg = 'The Splunk mapping value (assigned to {}) ' \
+                          'specified ({}) is invalid.'.format(k, _v)
+                    self.logger.warning(msg)
+                    raise TypeError(msg)
+
+                # Update our mapping
+                self.mapping[k] = v
+
+        return
+
+    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",
+        }
+
+        # Set up our message type
+        if self.action == SplunkAction.MAP:
+            # Use Mapping
+            message_type = self.mapping[notify_type]
+
+        elif self.action == SplunkAction.ACKNOWLEDGE:
+            # Always Acknowledge
+            message_type = SplunkMessageType.ACKNOWLEDGEMENT
+
+        elif self.action == SplunkAction.INFO:
+            # Creates a timeline event but does not trigger an incident
+            message_type = SplunkMessageType.INFO
+
+        elif self.action == SplunkAction.CRITICAL:
+            # Always create Incident
+            message_type = SplunkMessageType.CRITICAL
+
+        elif self.action == SplunkAction.WARNING:
+            # Always trigger warning (potentially creating incident)
+            message_type = SplunkMessageType.WARNING
+
+        else:  # self.action == SplunkAction.RECOVERY or SplunkAction.RESOLVE
+            # Always Recover
+            message_type = SplunkMessageType.RECOVERY
+
+        # Prepare our payload
+        payload = {
+            "entity_id": self.entity_id,
+            "message_type": message_type,
+            "entity_display_name": title if title else self.app_desc,
+            "state_message": body,
+            "monitoring_tool": self.app_id,
+        }
+
+        notify_url = self.notify_url.format(
+            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))
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            r = requests.post(
+                notify_url,
+                data=dumps(payload).encode('utf-8'),
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+            # Sample Response
+            # {
+            #   "result" : "success",
+            #   "entity_id" : "disk space/db01.mycompany.com"
+            # }
+
+            if r.status_code != requests.codes.ok:
+                # We had a problem
+                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))
+
+                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+
+                # Return; we're done
+                return False
+
+            else:
+                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))
+
+            # 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[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.
+        """
+
+        # Define any URL parameters
+        params = {
+            '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()})
+
+        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=''),
+            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.
+
+        """
+
+        # parse_url already handles getting the `user` and `password` fields
+        # populated.
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            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'])
+        else:
+            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'])
+
+        else:
+            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'])
+
+        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'])
+
+        # Store our action (if defined)
+        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()}
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """
+        Support https://alert.victorops.com/integrations/generic/20131114/ \
+                     alert/apikey/routing_key
+        """
+
+        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)
+
+        if result:
+            return NotifySplunk.parse_url(
+                '{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')))
+
+        return None
diff --git a/libs/apprise/plugins/NotifyStreamlabs.py b/libs/apprise/plugins/streamlabs.py
similarity index 96%
rename from libs/apprise/plugins/NotifyStreamlabs.py
rename to libs/apprise/plugins/streamlabs.py
index d1e4186a6..49bbb5b95 100644
--- a/libs/apprise/plugins/NotifyStreamlabs.py
+++ b/libs/apprise/plugins/streamlabs.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -38,10 +38,10 @@
 #
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 # calls
@@ -323,7 +323,7 @@ class NotifyStreamlabs(NotifyBase):
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occured sending Streamlabs '
+                    'A Connection error occurred sending Streamlabs '
                     'alert.'
                 )
                 self.logger.debug('Socket Exception: %s' % str(e))
@@ -368,7 +368,7 @@ class NotifyStreamlabs(NotifyBase):
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occured sending Streamlabs '
+                    'A Connection error occurred sending Streamlabs '
                     'donation.'
                 )
                 self.logger.debug('Socket Exception: %s' % str(e))
@@ -376,6 +376,15 @@ class NotifyStreamlabs(NotifyBase):
 
         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.access_token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifySynology.py b/libs/apprise/plugins/synology.py
similarity index 94%
rename from libs/apprise/plugins/NotifySynology.py
rename to libs/apprise/plugins/synology.py
index be58c0643..63161c52a 100644
--- a/libs/apprise/plugins/NotifySynology.py
+++ b/libs/apprise/plugins/synology.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,10 +29,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..AppriseLocale import gettext_lazy as _
+from ..locale import gettext_lazy as _
 
 # For API Details see:
 # https://kb.synology.com/en-au/DSM/help/Chat/chat_integration
@@ -156,6 +156,19 @@ class NotifySynology(NotifyBase):
 
         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 if self.secure else self.protocol,
+            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.
diff --git a/libs/apprise/plugins/NotifySyslog.py b/libs/apprise/plugins/syslog.py
similarity index 96%
rename from libs/apprise/plugins/NotifySyslog.py
rename to libs/apprise/plugins/syslog.py
index 5540fc758..fc6af06ae 100644
--- a/libs/apprise/plugins/NotifySyslog.py
+++ b/libs/apprise/plugins/syslog.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,10 +28,10 @@
 
 import syslog
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 
 class SyslogFacility:
@@ -126,6 +126,10 @@ class NotifySyslog(NotifyBase):
     # A URL that takes you to the setup/help of the specific protocol
     setup_url = 'https://github.com/caronc/apprise/wiki/Notify_syslog'
 
+    # 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
+
     # Disable throttle rate for Syslog requests since they are normally
     # local anyway
     request_rate_per_sec = 0
diff --git a/libs/apprise/plugins/NotifyTechulusPush.py b/libs/apprise/plugins/techuluspush.py
similarity index 94%
rename from libs/apprise/plugins/NotifyTechulusPush.py
rename to libs/apprise/plugins/techuluspush.py
index 4d0b99348..61b31105c 100644
--- a/libs/apprise/plugins/NotifyTechulusPush.py
+++ b/libs/apprise/plugins/techuluspush.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -53,10 +53,10 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 # Token required as part of the API request
 # Used to prepare our UUID regex matching
@@ -184,6 +184,15 @@ class NotifyTechulusPush(NotifyBase):
 
         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.apikey)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyTelegram.py b/libs/apprise/plugins/telegram.py
similarity index 95%
rename from libs/apprise/plugins/NotifyTelegram.py
rename to libs/apprise/plugins/telegram.py
index cce8af625..d6c29aeba 100644
--- a/libs/apprise/plugins/NotifyTelegram.py
+++ b/libs/apprise/plugins/telegram.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -59,15 +59,14 @@ import os
 from json import loads
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+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
 
 TELEGRAM_IMAGE_XY = NotifyImageSize.XY_256
 
@@ -164,6 +163,10 @@ class NotifyTelegram(NotifyBase):
     # Telegram is limited to sending a maximum of 100 requests per second.
     request_rate_per_sec = 0.001
 
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
     # Define object templates
     templates = (
         '{schema}://{bot_token}',
@@ -361,11 +364,14 @@ class NotifyTelegram(NotifyBase):
             'name': _('Topic Thread ID'),
             'type': 'int',
         },
+        'thread': {
+            'alias_of': 'topic',
+        },
         'mdv': {
             'name': _('Markdown Version'),
             'type': 'choice:string',
             'values': ('v1', 'v2'),
-            'default': 'v2',
+            'default': 'v1',
         },
         'to': {
             'alias_of': 'targets',
@@ -460,14 +466,13 @@ class NotifyTelegram(NotifyBase):
                 self.detect_owner = False
                 continue
 
-            try:
+            if results.group('topic'):
                 topic = int(
                     results.group('topic')
                     if results.group('topic') else self.topic)
-
-            except TypeError:
-                # No worries
-                topic = None
+            else:
+                # Default (if one set)
+                topic = self.topic
 
             if results.group('name') is not None:
                 # Name
@@ -713,6 +718,7 @@ class NotifyTelegram(NotifyBase):
                     self.logger.info(
                         'Detected Telegram user %s (userid=%d)' % (_user, _id))
                     # Return our detected userid
+                    self.store.set('bot_owner', _id)
                     return _id
 
         self.logger.warning(
@@ -727,10 +733,10 @@ class NotifyTelegram(NotifyBase):
         """
 
         if len(self.targets) == 0 and self.detect_owner:
-            _id = self.detect_bot_owner()
+            _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), None))
+                self.targets.append((str(_id), self.topic))
                 self.logger.info(
                     'Update your Telegram Apprise URL to read: '
                     '{}'.format(self.url(privacy=True)))
@@ -762,6 +768,16 @@ class NotifyTelegram(NotifyBase):
 
         # Prepare Message Body
         if self.notify_format == NotifyFormat.MARKDOWN:
+
+            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)
+
             _payload['parse_mode'] = self.markdown_ver
             _payload['text'] = body
 
@@ -918,6 +934,15 @@ class NotifyTelegram(NotifyBase):
 
         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.bot_token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -1043,6 +1068,9 @@ class NotifyTelegram(NotifyBase):
         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']
+
         # Silent (Sends the message Silently); users will receive
         # notification with no sound.
         results['silent'] = \
diff --git a/libs/apprise/plugins/NotifyThreema.py b/libs/apprise/plugins/threema.py
similarity index 95%
rename from libs/apprise/plugins/NotifyThreema.py
rename to libs/apprise/plugins/threema.py
index c2ad82e2e..9230ddb07 100644
--- a/libs/apprise/plugins/NotifyThreema.py
+++ b/libs/apprise/plugins/threema.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -35,14 +35,11 @@
 import requests
 from itertools import chain
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import validate_regex
-from ..utils import is_email
-from ..URLBase import PrivacyMode
-from ..utils import parse_list
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, validate_regex, is_email, parse_list
+from ..url import PrivacyMode
+from ..locale import gettext_lazy as _
 
 
 class ThreemaRecipientTypes:
@@ -302,6 +299,15 @@ class NotifyThreema(NotifyBase):
 
         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.user, self.secret)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyTwilio.py b/libs/apprise/plugins/twilio.py
similarity index 81%
rename from libs/apprise/plugins/NotifyTwilio.py
rename to libs/apprise/plugins/twilio.py
index 863b09a94..42daa1fba 100644
--- a/libs/apprise/plugins/NotifyTwilio.py
+++ b/libs/apprise/plugins/twilio.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -43,16 +43,31 @@
 # or consider purchasing a short-code from here:
 #    https://www.twilio.com/docs/glossary/what-is-a-short-code
 #
+import re
 import requests
 from json import loads
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
+
+
+# Twilio Mode Detection
+MODE_DETECT_RE = re.compile(
+    r'\s*((?P<mode>[^:]+)\s*:\s*)?(?P<phoneno>.+)$', re.I)
+
+
+class TwilioMessageMode:
+    """
+    Twilio Message Mode
+    """
+    # SMS/MMS
+    TEXT = 'T'
+
+    # via WhatsApp
+    WHATSAPP = 'W'
 
 
 class NotifyTwilio(NotifyBase):
@@ -117,14 +132,14 @@ class NotifyTwilio(NotifyBase):
             'name': _('From Phone No'),
             'type': 'string',
             'required': True,
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
+            'regex': (r'^([a-z]+:)?\+?[0-9\s)(+-]+$', 'i'),
             'map_to': 'source',
         },
         'target_phone': {
             'name': _('Target Phone No'),
             'type': 'string',
             'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
+            'regex': (r'^([a-z]+:)?[0-9\s)(+-]+$', 'i'),
             'map_to': 'targets',
         },
         'short_code': {
@@ -190,7 +205,22 @@ class NotifyTwilio(NotifyBase):
         self.apikey = validate_regex(
             apikey, *self.template_args['apikey']['regex'])
 
-        result = is_phone_no(source, min_len=5)
+        # Detect mode
+        result = MODE_DETECT_RE.match(source)
+        if not result:
+            msg = 'The Account (From) Phone # or Short-code specified ' \
+                  '({}) is invalid.'.format(source)
+            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' \
+            else TwilioMessageMode.TEXT
+
+        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)
@@ -220,18 +250,35 @@ class NotifyTwilio(NotifyBase):
         # Parse our targets
         self.targets = list()
 
-        for target in parse_phone_no(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
+
             # Validate targets and drop bad ones:
-            result = is_phone_no(target)
+            result = is_phone_no(result.group('phoneno'))
             if not result:
                 self.logger.warning(
                     'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    '({}) specified.'.format(entry),
+                )
+                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:
+                self.logger.warning(
+                    'Dropped WhatsApp phone # '
+                    '({}) because source provided was a short-code.'.format(
+                        entry),
                 )
                 continue
 
             # store valid phone number
-            self.targets.append('+{}'.format(result['full']))
+            self.targets.append((mode, '+{}'.format(result['full'])))
 
         return
 
@@ -260,9 +307,8 @@ class NotifyTwilio(NotifyBase):
         # Prepare our payload
         payload = {
             'Body': body,
-            'From': self.source,
-
-            # The To gets populated in the loop below
+            # The From and To gets populated in the loop below
+            'From': None,
             'To': None,
         }
 
@@ -277,14 +323,20 @@ class NotifyTwilio(NotifyBase):
 
         if len(targets) == 0:
             # No sources specified, use our own phone no
-            targets.append(self.source)
+            targets.append((self.default_mode, self.source))
 
         while len(targets):
             # Get our target to notify
-            target = targets.pop(0)
+            (mode, target) = targets.pop(0)
 
             # Prepare our user
-            payload['To'] = target
+            if mode is TwilioMessageMode.TEXT:
+                payload['From'] = self.source
+                payload['To'] = target
+
+            else:  # WhatsApp support (via Twilio)
+                payload['From'] = f'whatsapp:{self.source}'
+                payload['To'] = f'whatsapp:{target}'
 
             # Some Debug Logging
             self.logger.debug('Twilio POST URL: {} (cert_verify={})'.format(
@@ -359,6 +411,18 @@ class NotifyTwilio(NotifyBase):
 
         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.account_sid, self.auth_token,
+            self.source,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -376,9 +440,13 @@ class NotifyTwilio(NotifyBase):
             sid=self.pprint(
                 self.account_sid, privacy, mode=PrivacyMode.Tail, safe=''),
             token=self.pprint(self.auth_token, privacy, safe=''),
-            source=NotifyTwilio.quote(self.source, safe=''),
+            source=NotifyTwilio.quote(
+                self.source if self.default_mode is TwilioMessageMode.TEXT
+                else 'w:{}'.format(self.source), safe=''),
             targets='/'.join(
-                [NotifyTwilio.quote(x, safe='') for x in self.targets]),
+                [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))
 
     def __len__(self):
@@ -442,6 +510,6 @@ class NotifyTwilio(NotifyBase):
         # 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'])
+                NotifyTwilio.parse_phone_no(results['qsd']['to'], prefix=True)
 
         return results
diff --git a/libs/apprise/plugins/NotifyTwist.py b/libs/apprise/plugins/twist.py
similarity index 97%
rename from libs/apprise/plugins/NotifyTwist.py
rename to libs/apprise/plugins/twist.py
index fa26feb84..9e7512fcb 100644
--- a/libs/apprise/plugins/NotifyTwist.py
+++ b/libs/apprise/plugins/twist.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -35,13 +35,12 @@ import requests
 from json import loads
 from itertools import chain
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import is_email
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_list, is_email
+from ..locale import gettext_lazy as _
 
 
 # A workspace can also be interpreted as a team name too!
@@ -229,6 +228,18 @@ class NotifyTwist(NotifyBase):
                     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.
+        """
+        return (
+            self.secure_protocol if self.secure else self.protocol,
+            self.user, self.password, self.host, self.port,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyTwitter.py b/libs/apprise/plugins/twitter.py
similarity index 96%
rename from libs/apprise/plugins/NotifyTwitter.py
rename to libs/apprise/plugins/twitter.py
index 7a0813c1f..e16cedc1e 100644
--- a/libs/apprise/plugins/NotifyTwitter.py
+++ b/libs/apprise/plugins/twitter.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -36,14 +36,12 @@ from datetime import timezone
 from requests_oauthlib import OAuth1
 from json import dumps
 from json import loads
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
-from ..attachment.AttachBase import AttachBase
+from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..locale import gettext_lazy as _
+from ..attachment.base import AttachBase
 
 IS_USER = re.compile(r'^\s*@?(?P<user>[A-Z0-9_]+)$', re.I)
 
@@ -287,7 +285,7 @@ class NotifyTwitter(NotifyBase):
         if attach and self.attachment_support:
             # We need to upload our payload first so that we can source it
             # in remaining messages
-            for attachment in attach:
+            for no, attachment in enumerate(attach, start=1):
 
                 # Perform some simple error checking
                 if not attachment:
@@ -320,11 +318,15 @@ class NotifyTwitter(NotifyBase):
                     # 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('media_id')):
                     self.logger.debug(
                         'Could not attach the file to Twitter: %s (mime=%s)',
-                        attachment.name, attachment.mimetype)
+                        filename, attachment.mimetype)
                     continue
 
                 # If we get here, our output will look something like this:
@@ -344,7 +346,7 @@ class NotifyTwitter(NotifyBase):
                 response.update({
                     # Update our response to additionally include the
                     # attachment details
-                    'file_name': attachment.name,
+                    'file_name': filename,
                     'file_mime': attachment.mimetype,
                     'file_path': attachment.path,
                 })
@@ -780,6 +782,18 @@ class NotifyTwitter(NotifyBase):
         """
         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.
+        """
+        return (
+            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.
diff --git a/libs/apprise/plugins/NotifyVoipms.py b/libs/apprise/plugins/voipms.py
similarity index 84%
rename from libs/apprise/plugins/NotifyVoipms.py
rename to libs/apprise/plugins/voipms.py
index a023589a7..bf3ce8319 100644
--- a/libs/apprise/plugins/NotifyVoipms.py
+++ b/libs/apprise/plugins/voipms.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -37,17 +37,15 @@
 import requests
 from json import loads
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import is_email
-from ..utils import parse_phone_no
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, is_email, parse_phone_no
+from ..locale import gettext_lazy as _
 
 
 class NotifyVoipms(NotifyBase):
     """
-    A wrapper for Voipms Notifications
+    A wrapper for VoIPms Notifications
     """
 
     # The default descriptive name associated with the Notification
@@ -62,12 +60,15 @@ class NotifyVoipms(NotifyBase):
     # A URL that takes you to the setup/help of the specific protocol
     setup_url = 'https://github.com/caronc/apprise/wiki/Notify_voipms'
 
-    # Voipms uses the http protocol with JSON requests
+    # VoIPms uses the http protocol with JSON requests
     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'
+
     # 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
@@ -122,12 +123,11 @@ class NotifyVoipms(NotifyBase):
 
     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.'
             self.logger.warning(msg)
@@ -136,7 +136,7 @@ class NotifyVoipms(NotifyBase):
         # User is the email associated with the account
         result = is_email(email)
         if not result:
-            msg = 'An invalid Voipms user email: ' \
+            msg = 'An invalid VoIPms user email: ' \
                 '({}) was specified.'.format(email)
             self.logger.warning(msg)
             raise TypeError(msg)
@@ -145,15 +145,16 @@ class NotifyVoipms(NotifyBase):
         # Validate our source Phone #
         result = is_phone_no(source)
         if not result:
-            msg = 'An invalid Voipms source phone # ' \
+            msg = 'An invalid VoIPms source phone # ' \
                   '({}) was specified.'.format(source)
             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'] != '1':
-            msg = 'Voipms only supports +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)
             self.logger.warning(msg)
             raise TypeError(msg)
@@ -170,9 +171,10 @@ class NotifyVoipms(NotifyBase):
                 result = is_phone_no(target)
 
                 # Target Phone # only supports +1 country code
-                if result['country'] != '1':
+                if result['country'] \
+                        and result['country'] != self.voip_ms_country_code:
                     self.logger.warning(
-                        'Dropped invalid phone # '
+                        'Ignoring invalid phone # '
                         '({}) specified.'.format(target),
                     )
                     continue
@@ -188,12 +190,12 @@ class NotifyVoipms(NotifyBase):
 
     def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         """
-        Perform Voipms Notification
+        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)
@@ -228,9 +230,9 @@ class NotifyVoipms(NotifyBase):
             payload['dst'] = target
 
             # Some Debug Logging
-            self.logger.debug('Voipms GET URL: {} (cert_verify={})'.format(
+            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 Payload: {}' .format(payload))
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -262,7 +264,7 @@ class NotifyVoipms(NotifyBase):
                             r.status_code)
 
                     self.logger.warning(
-                        'Failed to send Voipms notification to {}: '
+                        'Failed to send VoIPms SMS notification to {}: '
                         '{}{}error={}.'.format(
                             target,
                             status_str,
@@ -276,12 +278,12 @@ class NotifyVoipms(NotifyBase):
                     has_error = True
                     continue
 
-                # Voipms sends 200 OK even if there is an error
+                # 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':
                     self.logger.warning(
-                        'Failed to send Voipms notification to {}: '
+                        'Failed to send VoIPms SMS notification to {}: '
                         'status: {}, message: {}'.format(
                             target, response['status'], response['message'])
                     )
@@ -291,12 +293,12 @@ class NotifyVoipms(NotifyBase):
                     continue
                 else:
                     self.logger.info(
-                        'Sent Voipms notification to %s' % target)
+                        'Sent VoIPms SMS notification to %s' % target)
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Voipms:%s '
-                    'notification.' % target
+                    'A Connection error occurred sending VoIPms:%s '
+                    'SMS notification.' % target
                 )
                 self.logger.debug('Socket Exception: %s' % str(e))
 
@@ -306,6 +308,17 @@ class NotifyVoipms(NotifyBase):
 
         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.email, self.password, self.source,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -320,9 +333,11 @@ class NotifyVoipms(NotifyBase):
             schema=self.secure_protocol,
             email=self.email,
             password=self.pprint(self.password, privacy, safe=''),
-            from_phone='1' + self.pprint(self.source, privacy, safe=''),
+            from_phone=self.voip_ms_country_code +
+            self.pprint(self.source, privacy, safe=''),
             targets='/'.join(
-                ['1' + NotifyVoipms.quote(x, safe='') for x in self.targets]),
+                [self.voip_ms_country_code + NotifyVoipms.quote(x, safe='')
+                 for x in self.targets]),
             params=NotifyVoipms.urlencode(params))
 
     def __len__(self):
diff --git a/libs/apprise/plugins/NotifyVonage.py b/libs/apprise/plugins/vonage.py
similarity index 96%
rename from libs/apprise/plugins/NotifyVonage.py
rename to libs/apprise/plugins/vonage.py
index e9b1422ad..58989280c 100644
--- a/libs/apprise/plugins/NotifyVonage.py
+++ b/libs/apprise/plugins/vonage.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -33,13 +33,11 @@
 #
 import requests
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyVonage(NotifyBase):
@@ -307,6 +305,15 @@ class NotifyVonage(NotifyBase):
 
         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[0], self.apikey, self.secret)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyWebexTeams.py b/libs/apprise/plugins/webexteams.py
similarity index 95%
rename from libs/apprise/plugins/NotifyWebexTeams.py
rename to libs/apprise/plugins/webexteams.py
index c91864bad..39d40262c 100644
--- a/libs/apprise/plugins/NotifyWebexTeams.py
+++ b/libs/apprise/plugins/webexteams.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -63,11 +63,11 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
 # Based on: https://developer.webex.com/docs/api/basics/rate-limiting
@@ -207,6 +207,15 @@ class NotifyWebexTeams(NotifyBase):
 
         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[0], self.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyWeComBot.py b/libs/apprise/plugins/wecombot.py
similarity index 95%
rename from libs/apprise/plugins/NotifyWeComBot.py
rename to libs/apprise/plugins/wecombot.py
index 4289b39e9..957cad155 100644
--- a/libs/apprise/plugins/NotifyWeComBot.py
+++ b/libs/apprise/plugins/wecombot.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -59,10 +59,10 @@ import re
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyWeComBot(NotifyBase):
@@ -134,6 +134,15 @@ class NotifyWeComBot(NotifyBase):
         )
         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.key)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyWhatsApp.py b/libs/apprise/plugins/whatsapp.py
similarity index 97%
rename from libs/apprise/plugins/NotifyWhatsApp.py
rename to libs/apprise/plugins/whatsapp.py
index 4ccbcbdaf..851ccb7d8 100644
--- a/libs/apprise/plugins/NotifyWhatsApp.py
+++ b/libs/apprise/plugins/whatsapp.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -44,12 +44,10 @@
 import re
 import requests
 from json import loads, dumps
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from ..locale import gettext_lazy as _
 
 
 class NotifyWhatsApp(NotifyBase):
@@ -446,6 +444,15 @@ class NotifyWhatsApp(NotifyBase):
 
         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.from_phone_id, self.token)
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyWindows.py b/libs/apprise/plugins/windows.py
similarity index 96%
rename from libs/apprise/plugins/NotifyWindows.py
rename to libs/apprise/plugins/windows.py
index 207e0f221..dae1a7d2f 100644
--- a/libs/apprise/plugins/NotifyWindows.py
+++ b/libs/apprise/plugins/windows.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -28,11 +28,11 @@
 
 from time import sleep
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 # Default our global support flag
 NOTIFY_WINDOWS_SUPPORT_ENABLED = False
@@ -87,6 +87,10 @@ class NotifyWindows(NotifyBase):
     # The number of seconds to display the popup for
     default_popup_duration_sec = 12
 
+    # 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}://',
diff --git a/libs/apprise/plugins/workflows.py b/libs/apprise/plugins/workflows.py
new file mode 100644
index 000000000..2ddc50e3b
--- /dev/null
+++ b/libs/apprise/plugins/workflows.py
@@ -0,0 +1,575 @@
+# -*- 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.
+
+# To use this plugin, you need to create a MS Teams Azure Webhook Workflow:
+#  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:
+# 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
+#
+# Yes... The URL is that big... But it looks like this (greatly simplified):
+# https://HOST:PORT/workflows/ABCD/triggers/manual/path/...sig=DEFG
+#          ^    ^                ^                              ^
+#          |    |                |                              |
+#  These are important <---------^------------------------------^
+#
+#
+# Apprise can support this webhook as is (directly passed into it)
+# Alternatively it can be shortend to:
+
+# These 3 tokens need to be placed in the URL after the Team
+#   workflows://HOST:PORT/ABCD/DEFG/
+#
+
+import re
+import requests
+import json
+from json.decoder import JSONDecodeError
+
+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 ..locale import gettext_lazy as _
+
+
+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)'
+
+    # The services URL
+    service_url = 'https://www.microsoft.com/power-platform/' \
+        'products/power-automate'
+
+    # The default secure protocol
+    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'
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_32
+
+    # The maximum allowable characters allowed in the body per message
+    body_maxlen = 1000
+
+    # Default Notification Format
+    notify_format = NotifyFormat.MARKDOWN
+
+    # There is no reason we should exceed 35KB when reading in a JSON file.
+    # If it is more than this, then it is not accepted
+    max_workflows_template_size = 35000
+
+    # Adaptive Card Version
+    adaptive_card_version = '1.4'
+
+    # Define object templates
+    templates = (
+        '{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'),
+        },
+    })
+
+    # 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',
+        },
+        'api-version': {
+            'alias_of': 'ver'
+        },
+    })
+
+    # Define our token control
+    template_kwargs = {
+        '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
+
+        """
+        super().__init__(**kwargs)
+
+        self.workflow = validate_regex(
+            workflow, *self.template_tokens['workflow']['regex'])
+        if not self.workflow:
+            msg = 'An invalid Workflows ID ' \
+                  '({}) was specified.'.format(workflow)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.signature = validate_regex(
+            signature, *self.template_tokens['signature']['regex'])
+        if not self.signature:
+            msg = 'An invalid Signature ' \
+                  '({}) was specified.'.format(signature)
+            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
+
+        # Wrap Text
+        self.wrap = True if (
+            wrap if wrap is not None else
+            self.template_args['wrap']['default']) else False
+
+        # Our template object is just an AppriseAttachment object
+        self.template = AppriseAttachment(asset=self.asset)
+        if template:
+            # Add our definition to our template
+            self.template.add(template)
+            # Enforce maximum file size
+            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']
+
+        # Template functionality
+        self.tokens = {}
+        if isinstance(tokens, dict):
+            self.tokens.update(tokens)
+
+        elif tokens:
+            msg = 'The specified Workflows Template Tokens ' \
+                  '({}) are not identified as a dictionary.'.format(tokens)
+            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.
+        """
+
+        # 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)
+
+        body_content = []
+        if image_url:
+            body_content.append({
+                "type": "Image",
+                "url": image_url,
+                "height": "32px",
+                "altText": notify_type,
+            })
+
+        if title:
+            body_content.append({
+                "type": "TextBlock",
+                "text": f'{title}',
+                "style": "heading",
+                "weight": "Bolder",
+                "size": "Large",
+                "id": "title",
+            })
+
+        body_content.append({
+            "type": "TextBlock",
+            "text": body,
+            "style": "default",
+            "wrap": self.wrap,
+            "id": "body",
+        })
+
+        if not self.template:
+            # By default we use a generic working payload if there was
+            # no template specified
+            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"},
+                        }
+                    }
+                ]
+            }
+
+            return payload
+
+        # If our code reaches here, then we generate ourselves the payload
+        template = self.template[0]
+        if not template:
+            # We could not access the attachment
+            self.logger.error(
+                'Could not access Workflow template {}.'.format(
+                    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
+
+        # Enforce Application mode
+        tokens['app_mode'] = TemplateType.JSON
+
+        try:
+            with open(template.path, 'r') as fp:
+                content = json.loads(apply_template(fp.read(), **tokens))
+
+        except (OSError, IOError):
+            self.logger.error(
+                'MSTeam template {} could not be read.'.format(
+                    template.url(privacy=True)))
+            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))
+            return None
+
+        return content
+
+    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+        """
+        Perform Microsoft Teams Notification
+        """
+
+        headers = {
+            '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,
+        }
+
+        notify_url = 'https://{host}{port}/workflows/{workflow}/' \
+            'triggers/manual/paths/invoke'.format(
+                host=self.host,
+                port='' if not self.port else f':{self.port}',
+                workflow=self.workflow)
+
+        # Generate our payload if it's possible
+        payload = self.gen_payload(
+            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))
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+        try:
+            r = requests.post(
+                notify_url,
+                params=params,
+                data=json.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 = \
+                    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))
+
+                self.logger.debug(
+                    'Response Details:\r\n{}'.format(r.content))
+
+                # We failed
+                return False
+
+            else:
+                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))
+
+            # We failed
+            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[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.
+        """
+
+        # Define any URL parameters
+        params = {
+            'image': 'yes' if self.include_image else 'no',
+            'wrap': 'yes' if self.wrap else 'no',
+        }
+
+        if self.template:
+            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
+
+        # 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()})
+
+        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=''),
+                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.
+
+        """
+
+        results = NotifyBase.parse_url(url)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # store values if provided
+        entries = NotifyWorkflows.split_path(results['fullpath'])
+
+        # Display image?
+        results['include_image'] = parse_bool(results['qsd'].get(
+            'image', NotifyWorkflows.template_args['image']['default']))
+
+        # Wrap Text?
+        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 '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'])
+
+        else:
+            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'])
+
+        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 \
+                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'])
+
+        elif 'ver' in results['qsd'] and results['qsd']['ver']:
+            results['version'] = \
+                NotifyWorkflows.unquote(results['qsd']['ver'])
+
+        # Store our tokens
+        results['tokens'] = results['qsd:']
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """
+        Support parsing the webhook straight out of workflows
+            https://HOST:443/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)
+
+        if result:
+            # Construct our URL
+            return NotifyWorkflows.parse_url(
+                '{schema}://{host}{port}/{workflow}'
+                '/{params}'.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')))
+        return None
diff --git a/libs/apprise/plugins/wxpusher.py b/libs/apprise/plugins/wxpusher.py
new file mode 100644
index 000000000..aca528f7e
--- /dev/null
+++ b/libs/apprise/plugins/wxpusher.py
@@ -0,0 +1,373 @@
+# -*- 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.
+#
+# Sign-up at https://wxpusher.zjiecode.com/
+#
+# Login and acquire your App Token
+#   - Open the backend of the application:
+#         https://wxpusher.zjiecode.com/admin/
+#   - 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
+import json
+import requests
+from itertools import chain
+from .base import NotifyBase
+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 _
+
+
+# Topics are always numerical
+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)
+
+
+WXPUSHER_RESPONSE_CODES = {
+    1000: "The request was processed successfully.",
+    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",
+    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",
+    1010: "The IP address making the request is not whitelisted.",
+}
+
+
+class WxPusherContentType:
+    """
+    Defines the different supported content types
+    """
+    TEXT = 1
+    HTML = 2
+    MARKDOWN = 3
+
+
+class SubscriptionType:
+    # Verify Subscription Time
+    UNVERIFIED = 0
+    PAID_USERS = 1
+    UNSUBSCRIBED = 2
+
+
+class NotifyWxPusher(NotifyBase):
+    """
+    A wrapper for WxPusher Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = 'WxPusher'
+
+    # The services URL
+    service_url = 'https://wxpusher.zjiecode.com/'
+
+    # The default protocol
+    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'
+
+    # WxPusher notification endpoint
+    notify_url = 'https://wxpusher.zjiecode.com/api/send/message'
+
+    # Define object templates
+    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,
+        },
+        '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',
+        },
+        'token': {
+            'alias_of': 'token',
+        },
+    })
+
+    # Used for mapping the content type to our output since Apprise supports
+    # The same formats that WxPusher does.
+    __content_type_map = {
+        NotifyFormat.MARKDOWN: WxPusherContentType.MARKDOWN,
+        NotifyFormat.TEXT: WxPusherContentType.TEXT,
+        NotifyFormat.HTML: WxPusherContentType.HTML,
+    }
+
+    def __init__(self, token, targets=None, **kwargs):
+        """
+        Initialize WxPusher Object
+        """
+        super().__init__(**kwargs)
+
+        # App Token (associated with WxPusher account)
+        self.token = validate_regex(
+            token, *self.template_tokens['token']['regex'])
+        if not self.token:
+            msg = 'An invalid WxPusher App Token ' \
+                  '({}) was specified.'.format(token)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Used for URL generation afterwards only
+        self._invalid_targets = list()
+
+        # For storing what is detected
+        self._users = list()
+        self._topics = list()
+
+        # Parse our targets
+        for target in parse_list(targets):
+            # Validate targets and drop bad ones:
+            result = IS_USER.match(target)
+            if result:
+                # store valid user
+                self._users.append(result['full'])
+                continue
+
+            result = IS_TOPIC.match(target)
+            if result:
+                # store valid topic
+                self._topics.append(int(result['topic']))
+                continue
+
+            self.logger.warning(
+                'Dropped invalid WxPusher user/topic '
+                '(%s) specified.' % target,
+            )
+            self._invalid_targets.append(target)
+
+        return
+
+    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')
+            return False
+
+        # Prepare our headers
+        headers = {
+            '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,
+
+            # unsupported at this time
+            # 'verifyPay': False,
+            # 'verifyPayType': 0,
+            '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))
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            r = requests.post(
+                self.notify_url,
+                data=json.dumps(payload).encode('utf-8'),
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            try:
+                content = json.loads(r.content)
+
+            except (AttributeError, TypeError, ValueError):
+                # ValueError = r.content is Unparsable
+                # TypeError = r.content is None
+                # AttributeError = r is None
+                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:
+
+                # We're good!
+                self.logger.info(
+                    '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."))
+
+                # We had a problem
+                status_str = \
+                    NotifyWxPusher.http_response_code_lookup(
+                        r.status_code) if not error_str else error_str
+
+                self.logger.warning(
+                    'Failed to send WxPusher notification, '
+                    'code={}/{}: {}'.format(
+                        r.status_code,
+                        'unk' if not content else content.get("code"),
+                        status_str))
+
+                self.logger.debug(
+                    'Response Details:\r\n{}'.format(
+                        content if content else r.content))
+
+                # Mark our failure
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                'A Connection error occurred sending WxPusher '
+                'notification.'
+            )
+            self.logger.debug('Socket Exception: %s' % str(e))
+
+            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.token)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        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(
+            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))
+
+    @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
+
+        # Get our entries; split_path() looks after unquoting content for us
+        # by default
+        results['targets'] = NotifyWxPusher.split_path(results['fullpath'])
+
+        # App 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'])
+            # 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']))
+
+        else:
+            # The hostname is our source number
+            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'])
+
+        return results
diff --git a/libs/apprise/plugins/NotifyXBMC.py b/libs/apprise/plugins/xbmc.py
similarity index 93%
rename from libs/apprise/plugins/NotifyXBMC.py
rename to libs/apprise/plugins/xbmc.py
index 7d4462e41..8325cccd1 100644
--- a/libs/apprise/plugins/NotifyXBMC.py
+++ b/libs/apprise/plugins/xbmc.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -29,12 +29,12 @@
 import requests
 from json import dumps
 
-from .NotifyBase import NotifyBase
-from ..URLBase import PrivacyMode
+from .base import NotifyBase
+from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import parse_bool
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from ..locale import gettext_lazy as _
 
 
 class NotifyXBMC(NotifyBase):
@@ -299,6 +299,25 @@ class NotifyXBMC(NotifyBase):
 
         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.
+        """
+        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'
+
+        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,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/plugins/NotifyZulip.py b/libs/apprise/plugins/zulip.py
similarity index 95%
rename from libs/apprise/plugins/NotifyZulip.py
rename to libs/apprise/plugins/zulip.py
index 54fe2d062..cff2886a1 100644
--- a/libs/apprise/plugins/NotifyZulip.py
+++ b/libs/apprise/plugins/zulip.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -61,13 +61,10 @@
 import re
 import requests
 
-from .NotifyBase import NotifyBase
+from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..utils import is_email
-from ..utils import remove_suffix
-from ..AppriseLocale import gettext_lazy as _
+from ..utils.parse import (parse_list, validate_regex, is_email)
+from ..locale import gettext_lazy as _
 
 # A Valid Bot Name
 VALIDATE_BOTNAME = re.compile(r'(?P<name>[A-Z0-9_-]{1,32})', re.I)
@@ -192,7 +189,10 @@ class NotifyZulip(NotifyBase):
 
             # The botname
             botname = match.group('name')
-            botname = remove_suffix(botname, '-bot')
+            suffix = '-bot'
+            # Eliminate suffix if found
+            botname = \
+                botname[:-len(suffix)] if botname.endswith(suffix) else botname
             self.botname = botname
 
         except (TypeError, AttributeError):
@@ -334,6 +334,18 @@ class NotifyZulip(NotifyBase):
 
         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.organization, self.hostname,
+            self.token,
+        )
+
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
diff --git a/libs/apprise/URLBase.py b/libs/apprise/url.py
similarity index 80%
rename from libs/apprise/URLBase.py
rename to libs/apprise/url.py
index 90ea85c66..f67af013e 100644
--- a/libs/apprise/URLBase.py
+++ b/libs/apprise/url.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -26,22 +26,21 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import sys
 import re
 from .logger import logger
 import time
+import hashlib
 from datetime import datetime
 from xml.sax.saxutils import escape as sax_escape
 
 from urllib.parse import unquote as _unquote
 from urllib.parse import quote as _quote
 
-from .AppriseLocale import gettext_lazy as _
-from .AppriseAsset import AppriseAsset
-from .utils import urlencode
-from .utils import parse_url
-from .utils import parse_bool
-from .utils import parse_list
-from .utils import parse_phone_no
+from .locale import gettext_lazy as _
+from .asset import AppriseAsset
+from .utils.parse import (
+    urlencode, parse_url, parse_bool, parse_list, parse_phone_no)
 
 # Used to break a path list into parts
 PATHSPLIT_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
@@ -103,6 +102,16 @@ class URLBase:
     # server to send a response.
     socket_read_timeout = 4.0
 
+    # provide the information required to allow for unique id generation when
+    # calling url_id().  Over-ride this in calling classes. Calling classes
+    # should set this to false if there can be no url_id generated
+    url_identifier = None
+
+    # Tracks the last generated url_id() to prevent regeneration; initializes
+    # to False and is set thereafter.  This is an internal value for this class
+    # only and should not be set to anything other then False below...
+    __cached_url_identifier = False
+
     # Handle
     # Maintain a set of tags to associate with this specific notification
     tags = set()
@@ -185,6 +194,8 @@ class URLBase:
 
     template_kwargs = {}
 
+    # Internal Values
+
     def __init__(self, asset=None, **kwargs):
         """
         Initialize some general logging and common server arguments that will
@@ -197,17 +208,17 @@ class URLBase:
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
 
         # Certificate Verification (for SSL calls); default to being enabled
-        self.verify_certificate = parse_bool(kwargs.get('verify', True))
+        self.verify_certificate = parse_bool(
+            kwargs.get('verify', URLBase.verify_certificate))
+
+        # Schema
+        self.schema = kwargs.get('schema', 'unknown').lower()
 
         # Secure Mode
         self.secure = kwargs.get('secure', None)
-        try:
-            if not isinstance(self.secure, bool):
-                # Attempt to detect
-                self.secure = kwargs.get('schema', '')[-1].lower() == 's'
-
-        except (TypeError, IndexError):
-            self.secure = False
+        if not isinstance(self.secure, bool):
+            # Attempt to detect
+            self.secure = self.schema[-1:] == 's'
 
         self.host = URLBase.unquote(kwargs.get('host'))
         self.port = kwargs.get('port')
@@ -334,7 +345,7 @@ class URLBase:
 
         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='https' if self.secure else 'http',
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
@@ -343,9 +354,117 @@ class URLBase:
                  else ':{}'.format(self.port),
             fullpath=URLBase.quote(self.fullpath, safe='/')
             if self.fullpath else '/',
-            params=URLBase.urlencode(params),
+            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.
+
+        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
+        (or else it's a bug) the following:
+          - any targets defined
+          - all GET parameters options unless they explicitly change the
+            complete function of the code.
+
+             For example: GET parameters like ?image=false&avatar=no should
+             have no bearing in the uniqueness of the Apprise URL Identifier.
+
+             Consider plugins where some get parameters completely change
+             how the entire upstream comunication works such as slack:// and
+             matrix:// which has a mode. In these circumstances, they should
+             be considered in he unique generation.
+
+        The intention of this function is to help align Apprise URLs that are
+        common with one another and therefore can share the same persistent
+        storage even when subtle changes are made to them.
+
+        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]
+
+        # Python v3.9 introduces usedforsecurity argument
+        kwargs = {'usedforsecurity': False} \
+            if sys.version_info >= (3, 9) else {}
+
+        if self.url_identifier is False:
+            # Disabled
+            self.__cached_url_identifier = None
+
+        elif self.url_identifier in (None, True):
+
+            # Prepare our object
+            engine = hash_engine(
+                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))
+            engine.update(
+                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))
+            engine.update(
+                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')
+
+            # 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()
+
+        elif isinstance(self.url_identifier, bytes):
+            self.__cached_url_identifier = hash_engine(
+                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()
+
+        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()
+
+        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]
+
     def __contains__(self, tags):
         """
         Returns true if the tag specified is associated with this notification.
@@ -577,7 +696,7 @@ class URLBase:
         return content
 
     @staticmethod
-    def parse_phone_no(content, unquote=True):
+    def parse_phone_no(content, unquote=True, prefix=False):
         """A wrapper to utils.parse_phone_no() with unquoting support
 
         Parses a specified set of data and breaks it into a list.
@@ -600,7 +719,7 @@ class URLBase:
                 # Nothing further to do
                 return []
 
-        content = parse_phone_no(content)
+        content = parse_phone_no(content, prefix=prefix)
 
         return content
 
@@ -660,14 +779,22 @@ class URLBase:
         this class.
         """
 
-        return {
-            # The socket read timeout
-            'rto': str(self.socket_read_timeout),
-            # The request/socket connect timeout
-            'cto': str(self.socket_connect_timeout),
-            # Certificate verification
-            'verify': 'yes' if self.verify_certificate else 'no',
-        }
+        # parameters are only provided on demand to keep the URL short
+        params = {}
+
+        # The socket read timeout
+        if self.socket_read_timeout != URLBase.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)
+
+        # Certificate verification
+        if self.verify_certificate != URLBase.verify_certificate:
+            params['verify'] = 'yes' if self.verify_certificate else 'no'
+
+        return params
 
     @staticmethod
     def post_process_parse_url_results(results):
@@ -744,7 +871,7 @@ class URLBase:
 
     @staticmethod
     def parse_url(url, verify_host=True, plus_to_space=False,
-                  strict_port=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.
@@ -765,7 +892,8 @@ class URLBase:
 
         results = parse_url(
             url, default_schema='unknown', verify_host=verify_host,
-            plus_to_space=plus_to_space, strict_port=strict_port)
+            plus_to_space=plus_to_space, strict_port=strict_port,
+            sanitize=sanitize)
 
         if not results:
             # We're done; we failed to parse our url
diff --git a/libs/apprise/URLBase.pyi b/libs/apprise/url.pyi
similarity index 100%
rename from libs/apprise/URLBase.pyi
rename to libs/apprise/url.pyi
diff --git a/libs/apprise/utils/__init__.py b/libs/apprise/utils/__init__.py
new file mode 100644
index 000000000..f176cbccc
--- /dev/null
+++ b/libs/apprise/utils/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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.
diff --git a/libs/apprise/utils/base64.py b/libs/apprise/utils/base64.py
new file mode 100644
index 000000000..e5a8a568a
--- /dev/null
+++ b/libs/apprise/utils/base64.py
@@ -0,0 +1,88 @@
+# -*- 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.
+import copy
+import json
+import binascii
+import typing
+import base64
+
+
+def decode_b64_dict(di: dict) -> dict:
+    """
+    decodes base64 dictionary previously encoded
+
+    string entries prefixed with `b64:` are targeted
+    """
+    di = copy.deepcopy(di)
+    for k, v in di.items():
+        if not isinstance(v, str) or not v.startswith("b64:"):
+            continue
+
+        try:
+            parsed_v = base64.b64decode(v[4:])
+            parsed_v = json.loads(parsed_v)
+
+        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)
+            # json.decoder.JSONDecodeError: Bad JSON object
+
+            parsed_v = v
+        di[k] = parsed_v
+    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
+
+    Final product is always string based values
+    """
+    di = copy.deepcopy(di)
+    needs_decoding = False
+    for k, v in di.items():
+        if isinstance(v, str):
+            continue
+
+        try:
+            encoded = base64.urlsafe_b64encode(json.dumps(v).encode(encoding))
+            encoded = "b64:{}".format(encoded.decode(encoding))
+            needs_decoding = True
+
+        except (ValueError, TypeError):
+            # ValueError:
+            #  - the length of altchars is not 2.
+            # TypeError:
+            #  - json not searializable or
+            #  - bytes object not passed into urlsafe_b64encode()
+            encoded = str(v)
+
+        di[k] = encoded
+    return di, needs_decoding
diff --git a/libs/apprise/utils/cwe312.py b/libs/apprise/utils/cwe312.py
new file mode 100644
index 000000000..25eb4b1b0
--- /dev/null
+++ b/libs/apprise/utils/cwe312.py
@@ -0,0 +1,197 @@
+# -*- 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.
+import re
+from .parse import (parse_url, is_hostname)
+
+
+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
+
+    For more detail see CWE-312 @
+       https://cwe.mitre.org/data/definitions/312.html
+
+    The `force` is an optional argument used to keep the string formatting
+    consistent and in one place. If set, the content passed in is presumed
+    to be containing secret information and will be updated accordingly.
+
+    If advanced is set to `True` then content is additionally checked for
+    upper/lower/ascii/numerical variances. If an obscurity threshold is
+    reached, then content is considered secret
+    """
+
+    class Variance:
+        """
+        A Simple List of Possible Character Variances
+        """
+        # An Upper Case Character (ABCDEF... etc)
+        ALPHA_UPPER = '+'
+        # An Lower Case Character (abcdef... etc)
+        ALPHA_LOWER = '-'
+        # A Special Character ($%^;... etc)
+        SPECIAL = 's'
+        # A Numerical Character (1234... etc)
+        NUMERIC = 'n'
+
+    if not (isinstance(word, str) and word.strip()):
+        # not a password if it's not something we even support
+        return word
+
+    # Formatting
+    word = word.strip()
+    if force:
+        # We're forcing the representation to be a secret
+        # We do this for consistency
+        return '{}...{}'.format(word[0:1], word[-1:])
+
+    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:])
+
+    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:])
+
+    if advanced:
+        #
+        # Mark word a secret based on it's obscurity
+        #
+
+        # Our variances will increase depending on these variables:
+        last_variance = None
+        obscurity = 0
+
+        for c in word:
+            # Detect our variance
+            if c.isdigit():
+                variance = Variance.NUMERIC
+            elif c.isalpha() and c.isupper():
+                variance = Variance.ALPHA_UPPER
+            elif c.isalpha() and c.islower():
+                variance = Variance.ALPHA_LOWER
+            else:
+                variance = Variance.SPECIAL
+
+            if last_variance != variance or variance == Variance.SPECIAL:
+                obscurity += 1
+
+                if obscurity >= threshold:
+                    return '{}...{}'.format(word[0:1], word[-1:])
+
+            last_variance = variance
+
+    # Otherwise we're good; return our word
+    return word
+
+
+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.
+
+    For more detail see CWE-312 @
+       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/
+
+    Since apprise allows you to put private information everywhere in it's
+    custom URLs, it uses this function to manipulate the content before
+    returning to any kind of logger.
+
+    The idea is that the URL can still be interpreted by the person who
+    constructed them, but not to an intruder.
+    """
+    # Parse our URL
+    results = parse_url(url)
+    if not results:
+        # Nothing was returned (invalid data was fed in); return our
+        # information as it was fed to us (without changing it)
+        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'])
+
+    else:
+        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 ''
+
+    #
+    # 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'],
+        )
+    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()]))
+
+    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 '',
+        params=params,
+    )
diff --git a/libs/apprise/utils/disk.py b/libs/apprise/utils/disk.py
new file mode 100644
index 000000000..fd8855811
--- /dev/null
+++ b/libs/apprise/utils/disk.py
@@ -0,0 +1,178 @@
+# -*- 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.
+import re
+import os
+import platform
+from os.path import expanduser
+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('/')
+
+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,
+    ),
+)
+TIDY_WIN_TRIM_RE = re.compile(
+    r'^(.+[^:][^%s])[\s%s]*$' % (
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+    ),
+)
+
+TIDY_NUX_PATH_RE = re.compile(
+    r'([%s])([%s]+)' % (
+        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
+
+
+def path_decode(path):
+    """
+    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
+    trailing slashes and correcting any formatting issues.
+
+    For example: ////absolute//path// becomes:
+        /absolute/path
+
+    """
+    # Windows
+    path = TIDY_WIN_PATH_RE.sub('\\1', path.strip())
+    # Linux
+    path = TIDY_NUX_PATH_RE.sub('\\1', path)
+
+    # Windows Based (final) Trim
+    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
+    """
+
+    if _errors is None:
+        _errors = set()
+
+    if _depth > max_depth:
+        _errors.add(path)
+        return (0, _errors)
+
+    total = 0
+    try:
+        with os.scandir(path) as it:
+            for entry in it:
+                try:
+                    if entry.is_file(follow_symlinks=False):
+                        total += entry.stat(follow_symlinks=False).st_size
+
+                    elif entry.is_dir(follow_symlinks=False):
+                        (totals, _) = dir_size(
+                            entry.path,
+                            max_depth=max_depth,
+                            _depth=_depth + 1,
+                            _errors=_errors)
+                        total += totals
+
+                except FileNotFoundError:
+                    # no worries; Nothing to do
+                    continue
+
+                except (OSError, IOError) 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))
+                    continue
+
+    except FileNotFoundError:
+        if not missing_okay:
+            # Conditional error situation
+            _errors.add(path)
+
+    except (OSError, IOError) 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))
+
+    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'
+    try:
+        value = float(value)
+
+    except (ValueError, TypeError):
+        return None
+
+    if value >= 1024.0:
+        value = value / 1024.0
+        unit = 'KB'
+        if value >= 1024.0:
+            value = value / 1024.0
+            unit = 'MB'
+            if value >= 1024.0:
+                value = value / 1024.0
+                unit = 'GB'
+                if value >= 1024.0:
+                    value = value / 1024.0
+                    unit = 'TB'
+
+    return '%.2f%s' % (round(value, 2), unit)
diff --git a/libs/apprise/utils/logic.py b/libs/apprise/utils/logic.py
new file mode 100644
index 000000000..0070cd3c2
--- /dev/null
+++ b/libs/apprise/utils/logic.py
@@ -0,0 +1,121 @@
+# -*- 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.
+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
+    be converted as such. These identify the tags themselves.
+
+    Our logic should be a list as well:
+      - top level entries are treated as an 'or'
+      - second level (or more) entries are treated as 'and'
+
+      examples:
+        logic="tagA, tagB"                = tagA or tagB
+        logic=['tagA', 'tagB']            = tagA or tagB
+        logic=[('tagA', 'tagC'), 'tagB']  = (tagA and tagC) or tagB
+        logic=[('tagB', 'tagC')]          = tagB and tagC
+
+    If `match_always` is not set to None, then its value is added as an 'or'
+    to all specified logic searches.
+    """
+
+    if isinstance(logic, str):
+        # Update our logic to support our delimiters
+        logic = set(parse_list(logic))
+
+    if not logic:
+        # If there is no logic to apply then we're done early; we only match
+        # if there is also no data to match against
+        return not data
+
+    if not isinstance(logic, (list, tuple, set)):
+        # garbage input
+        return False
+
+    if match_always:
+        # Add our match_always to our logic searching if secified
+        logic = chain(logic, [match_always])
+
+    # Track what we match against; but by default we do not match
+    # against anything
+    matched = False
+
+    # Every entry here will be or'ed with the next
+    for entry in logic:
+        if not isinstance(entry, (str, list, tuple, set)):
+            # Garbage entry in our logic found
+            return False
+
+        # treat these entries as though all elements found
+        # must exist in the notification service
+        entries = set(parse_list(entry))
+        if not entries:
+            # We got a bogus set of tags to parse
+            # If there is no logic to apply then we're done early; we only
+            # match if there is also no data to match against
+            return not data
+
+        if len(entries.intersection(data.union({match_all}))) == len(entries):
+            # our set contains all of the entries found
+            # in our notification data set
+            matched = True
+            break
+
+        # else: keep looking
+
+    # Return True if we matched against our logic (or simply none was
+    # specified).
+    return matched
+
+
+def dict_full_update(dict1, dict2):
+    """
+    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):
+                _merge(dict1[k], dict2[k])
+            else:
+                dict1[k] = dict2[k]
+
+    _merge(dict1, dict2)
+    return
diff --git a/libs/apprise/utils/module.py b/libs/apprise/utils/module.py
new file mode 100644
index 000000000..a09756bec
--- /dev/null
+++ b/libs/apprise/utils/module.py
@@ -0,0 +1,59 @@
+# -*- 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.
+import sys
+import importlib.util
+from ..logger import logger
+
+
+def import_module(path, name):
+    """
+    Load our module based on path
+    """
+    spec = importlib.util.spec_from_file_location(name, path)
+    try:
+        module = importlib.util.module_from_spec(spec)
+        sys.modules[name] = module
+
+        spec.loader.exec_module(module)
+
+    except Exception as e:
+        # module isn't loadable
+        try:
+            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))
+
+    return module
diff --git a/libs/apprise/utils.py b/libs/apprise/utils/parse.py
similarity index 71%
rename from libs/apprise/utils.py
rename to libs/apprise/utils/parse.py
index e1881f314..c1e612d66 100644
--- a/libs/apprise/utils.py
+++ b/libs/apprise/utils/parse.py
@@ -2,7 +2,7 @@
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+# 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:
@@ -25,53 +25,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 re
-import sys
-import json
-import contextlib
-import os
-import locale
-from itertools import chain
-from os.path import expanduser
 from functools import reduce
-from . import common
-from .logger import logger
 from urllib.parse import unquote
 from urllib.parse import quote
 from urllib.parse import urlparse
 from urllib.parse import urlencode as _urlencode
 
-import importlib.util
 
-
-def import_module(path, name):
-    """
-    Load our module based on path
-    """
-    spec = importlib.util.spec_from_file_location(name, path)
-    try:
-        module = importlib.util.module_from_spec(spec)
-        sys.modules[name] = module
-
-        spec.loader.exec_module(module)
-
-    except Exception as e:
-        # module isn't loadable
-        try:
-            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))
-
-    return module
+from .disk import tidy_path
 
 
 # URL Indexing Table for returns via parse_url()
@@ -93,41 +55,6 @@ STRING_DELIMITERS = r'[\[\]\;,\s]+'
 # String Delimiters without the whitespace
 STRING_DELIMITERS_NO_WS = r'[\[\]\;,]+'
 
-# 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('/')
-
-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,
-    ),
-)
-TIDY_WIN_TRIM_RE = re.compile(
-    r'^(.+[^:][^%s])[\s%s]*$' % (
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-    ),
-)
-
-TIDY_NUX_PATH_RE = re.compile(
-    r'([%s])([%s]+)' % (
-        ESCAPED_NUX_PATH_SEPARATOR,
-        ESCAPED_NUX_PATH_SEPARATOR,
-    ),
-)
-
-TIDY_NUX_TRIM_RE = re.compile(
-    r'([^%s])[\s%s]+$' % (
-        ESCAPED_NUX_PATH_SEPARATOR,
-        ESCAPED_NUX_PATH_SEPARATOR,
-    ),
-)
-
 # 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
@@ -174,6 +101,11 @@ IS_PHONE_NO = re.compile(r'^\+?(?P<phone>[0-9\s)(+-]+)\s*$')
 PHONE_NO_DETECTION_RE = re.compile(
     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)
+
 # A simple verification check to make sure the content specified
 # rougly conforms to a ham radio call sign before we parse it further
 IS_CALL_SIGN = re.compile(
@@ -208,35 +140,6 @@ VALID_PYTHON_FILE_RE = re.compile(r'.+\.py(o|c)?$', re.IGNORECASE)
 REGEX_VALIDATE_LOOKUP = {}
 
 
-class Singleton(type):
-    """
-    Our Singleton MetaClass
-    """
-    _instances = {}
-
-    def __call__(cls, *args, **kwargs):
-        """
-        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)
-        return cls._instances[cls]
-
-
-class TemplateType:
-    """
-    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'
-
-    # Data is presumed to be of type JSON and is therefore escaped
-    # if required to do so (such as single quotes)
-    JSON = 'json'
-
-
 def is_ipaddr(addr, ipv4=True, ipv6=True):
     """
     Validates against IPV4 and IPV6 IP Addresses
@@ -304,7 +207,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
@@ -523,25 +426,7 @@ def is_email(address):
     return False
 
 
-def tidy_path(path):
-    """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())
-    # Linux
-    path = TIDY_NUX_PATH_RE.sub('\\1', path)
-
-    # Windows Based (final) Trim
-    path = expanduser(TIDY_WIN_TRIM_RE.sub('\\1', path))
-    return path
-
-
-def parse_qsd(qs, simple=False, plus_to_space=False):
+def parse_qsd(qs, simple=False, plus_to_space=False, sanitize=True):
     """
     Query String Dictionary Builder
 
@@ -568,6 +453,8 @@ def parse_qsd(qs, simple=False, plus_to_space=False):
     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:
@@ -608,7 +495,7 @@ def parse_qsd(qs, simple=False, plus_to_space=False):
 
         # Always Query String Dictionary (qsd) for every entry we have
         # content is always made lowercase for easy indexing
-        result['qsd'][key.lower().strip()] = val
+        result['qsd'][key.lower().strip() if sanitize else key] = val
 
         if simple:
             # move along
@@ -636,7 +523,7 @@ def parse_qsd(qs, simple=False, plus_to_space=False):
 
 
 def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
-              simple=False, plus_to_space=False):
+              simple=False, plus_to_space=False, sanitize=True):
     """A function that greatly simplifies the parsing of a url
     specified by the end user.
 
@@ -691,6 +578,8 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
 
      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):
@@ -750,7 +639,8 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
     # while ensuring that all keys are lowercase
     if qsdata:
         result.update(parse_qsd(
-            qsdata, simple=simple, plus_to_space=plus_to_space))
+            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
@@ -934,7 +824,7 @@ def parse_bool(arg, default=False):
     return bool(arg)
 
 
-def parse_phone_no(*args, store_unparseable=True, **kwargs):
+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.
@@ -943,7 +833,8 @@ def parse_phone_no(*args, store_unparseable=True, **kwargs):
     result = []
     for arg in args:
         if isinstance(arg, str) and arg:
-            _result = PHONE_NO_DETECTION_RE.findall(arg)
+            _result = (PHONE_NO_DETECTION_RE if not prefix
+                       else PHONE_NO_WPREFIX_DETECTION_RE).findall(arg)
             if _result:
                 result += _result
 
@@ -961,7 +852,7 @@ def parse_phone_no(*args, store_unparseable=True, **kwargs):
         elif isinstance(arg, (set, list, tuple)):
             # Use recursion to handle the list of phone numbers
             result += parse_phone_no(
-                *arg, store_unparseable=store_unparseable)
+                *arg, store_unparseable=store_unparseable, prefix=prefix)
 
     return result
 
@@ -1029,56 +920,31 @@ def parse_emails(*args, store_unparseable=True, **kwargs):
     return result
 
 
-def parse_urls(*args, store_unparseable=True, **kwargs):
-    """
-    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
-
-            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
-                # keep it as part of our result set so that parsing done
-                # 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))]
-
-        elif isinstance(arg, (set, list, tuple)):
-            # Use recursion to handle the list of URLs
-            result += parse_urls(*arg, store_unparseable=store_unparseable)
-
-    return result
-
-
-def url_assembly(**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
 
     """
+    def _no_encode(content, *args, **kwargs):
+        # dummy function that does nothing to content
+        return content
+
+    _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 = '{user}:{password}@'.format(
-            user=quote(kwargs.get('user'), safe=''),
-            password=quote(kwargs.get('password'), safe=''),
+            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=''),
+            user=_quote(kwargs.get('user'), safe=''),
         )
 
     return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
@@ -1088,7 +954,7 @@ def url_assembly(**kwargs):
         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='/'),
+        fullpath=_quote(kwargs.get('fullpath', ''), safe='/'),
         params='' if not kwargs.get('qsd')
         else '?{}'.format(urlencode(kwargs.get('qsd'))),
     )
@@ -1129,6 +995,37 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
         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.
+    """
+
+    result = []
+    for arg in args:
+        if isinstance(arg, str) and arg:
+            _result = URL_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
+                # keep it as part of our result set so that parsing done
+                # 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))]
+
+        elif isinstance(arg, (set, list, tuple)):
+            # Use recursion to handle the list of URLs
+            result += parse_urls(*arg, store_unparseable=store_unparseable)
+
+    return result
+
+
 def parse_list(*args, cast=None, allow_whitespace=True):
     """
     Take a string list and break it into a delimited
@@ -1174,77 +1071,6 @@ def parse_list(*args, cast=None, allow_whitespace=True):
             [x.strip() for x in filter(bool, list(set(result))) if x.strip()])
 
 
-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:
-      - top level entries are treated as an 'or'
-      - second level (or more) entries are treated as 'and'
-
-      examples:
-        logic="tagA, tagB"                = tagA or tagB
-        logic=['tagA', 'tagB']            = tagA or tagB
-        logic=[('tagA', 'tagC'), 'tagB']  = (tagA and tagC) or tagB
-        logic=[('tagB', 'tagC')]          = tagB and tagC
-
-    If `match_always` is not set to None, then its value is added as an 'or'
-    to all specified logic searches.
-    """
-
-    if isinstance(logic, str):
-        # Update our logic to support our delimiters
-        logic = set(parse_list(logic))
-
-    if not logic:
-        # If there is no logic to apply then we're done early; we only match
-        # if there is also no data to match against
-        return not data
-
-    if not isinstance(logic, (list, tuple, set)):
-        # garbage input
-        return False
-
-    if match_always:
-        # Add our match_always to our logic searching if secified
-        logic = chain(logic, [match_always])
-
-    # Track what we match against; but by default we do not match
-    # against anything
-    matched = False
-
-    # Every entry here will be or'ed with the next
-    for entry in logic:
-        if not isinstance(entry, (str, list, tuple, set)):
-            # Garbage entry in our logic found
-            return False
-
-        # treat these entries as though all elements found
-        # must exist in the notification service
-        entries = set(parse_list(entry))
-        if not entries:
-            # We got a bogus set of tags to parse
-            # If there is no logic to apply then we're done early; we only
-            # match if there is also no data to match against
-            return not data
-
-        if len(entries.intersection(data.union({match_all}))) == len(entries):
-            # our set contains all of the entries found
-            # in our notification data set
-            matched = True
-            break
-
-        # else: keep looking
-
-    # Return True if we matched against our logic (or simply none was
-    # specified).
-    return matched
-
-
 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
@@ -1319,273 +1145,3 @@ def validate_regex(value, regex=r'[^\s]+', flags=re.I, strip=True, fmt=None):
 
     # Return our response
     return value.strip() if strip else value
-
-
-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
-
-    For more detail see CWE-312 @
-       https://cwe.mitre.org/data/definitions/312.html
-
-    The `force` is an optional argument used to keep the string formatting
-    consistent and in one place. If set, the content passed in is presumed
-    to be containing secret information and will be updated accordingly.
-
-    If advanced is set to `True` then content is additionally checked for
-    upper/lower/ascii/numerical variances. If an obscurity threshold is
-    reached, then content is considered secret
-    """
-
-    class Variance:
-        """
-        A Simple List of Possible Character Variances
-        """
-        # An Upper Case Character (ABCDEF... etc)
-        ALPHA_UPPER = '+'
-        # An Lower Case Character (abcdef... etc)
-        ALPHA_LOWER = '-'
-        # A Special Character ($%^;... etc)
-        SPECIAL = 's'
-        # A Numerical Character (1234... etc)
-        NUMERIC = 'n'
-
-    if not (isinstance(word, str) and word.strip()):
-        # not a password if it's not something we even support
-        return word
-
-    # Formatting
-    word = word.strip()
-    if force:
-        # We're forcing the representation to be a secret
-        # We do this for consistency
-        return '{}...{}'.format(word[0:1], word[-1:])
-
-    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:])
-
-    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:])
-
-    if advanced:
-        #
-        # Mark word a secret based on it's obscurity
-        #
-
-        # Our variances will increase depending on these variables:
-        last_variance = None
-        obscurity = 0
-
-        for c in word:
-            # Detect our variance
-            if c.isdigit():
-                variance = Variance.NUMERIC
-            elif c.isalpha() and c.isupper():
-                variance = Variance.ALPHA_UPPER
-            elif c.isalpha() and c.islower():
-                variance = Variance.ALPHA_LOWER
-            else:
-                variance = Variance.SPECIAL
-
-            if last_variance != variance or variance == Variance.SPECIAL:
-                obscurity += 1
-
-                if obscurity >= threshold:
-                    return '{}...{}'.format(word[0:1], word[-1:])
-
-            last_variance = variance
-
-    # Otherwise we're good; return our word
-    return word
-
-
-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.
-
-    For more detail see CWE-312 @
-       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/
-
-    Since apprise allows you to put private information everywhere in it's
-    custom URLs, it uses this function to manipulate the content before
-    returning to any kind of logger.
-
-    The idea is that the URL can still be interpreted by the person who
-    constructed them, but not to an intruder.
-    """
-    # Parse our URL
-    results = parse_url(url)
-    if not results:
-        # Nothing was returned (invalid data was fed in); return our
-        # information as it was fed to us (without changing it)
-        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'])
-
-    else:
-        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 ''
-
-    #
-    # 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'],
-        )
-    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()]))
-
-    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 '',
-        params=params,
-    )
-
-
-@contextlib.contextmanager
-def environ(*remove, **update):
-    """
-    Temporarily updates the ``os.environ`` dictionary in-place.
-
-    The ``os.environ`` dictionary is updated in-place so that the modification
-    is sure to work in all situations.
-
-    :param remove: Environment variable(s) to remove.
-    :param update: Dictionary of environment variables and values to
-                   add/update.
-    """
-
-    # Create a backup of our environment for restoration purposes
-    env_orig = os.environ.copy()
-    loc_orig = locale.getlocale()
-    try:
-        os.environ.update(update)
-        [os.environ.pop(k, None) for k in remove]
-        yield
-
-    finally:
-        # Restore our snapshot
-        os.environ = env_orig.copy()
-        try:
-            # Restore locale
-            locale.setlocale(locale.LC_ALL, loc_orig)
-
-        except locale.Error:
-            # Thrown in py3.6
-            pass
-
-
-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.
-
-    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.
-
-    If there is no match found, content is not swapped.
-
-    """
-
-    def _escape_raw(content):
-        # No escaping necessary
-        return content
-
-    def _escape_json(content):
-        # remove surounding quotes
-        return json.dumps(content)[1:-1]
-
-    # Our escape function
-    fn = _escape_json if app_mode == TemplateType.JSON else _escape_raw
-
-    lookup = [re.escape(x) for x in kwargs.keys()]
-
-    # Compile this into a list
-    mask_r = re.compile(
-        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
-    # re-index it back into our list
-    return mask_r.sub(lambda x: fn(kwargs[x.group()[2:-2].strip()]), template)
-
-
-def remove_suffix(value, suffix):
-    """
-    Removes a suffix from the end of a string.
-    """
-    return value[:-len(suffix)] if value.endswith(suffix) else value
-
-
-def dict_full_update(dict1, dict2):
-    """
-    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):
-                _merge(dict1[k], dict2[k])
-            else:
-                dict1[k] = dict2[k]
-
-    _merge(dict1, dict2)
-    return
diff --git a/libs/apprise/utils/pgp.py b/libs/apprise/utils/pgp.py
new file mode 100644
index 000000000..5a2088172
--- /dev/null
+++ b/libs/apprise/utils/pgp.py
@@ -0,0 +1,354 @@
+# -*- 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.
+
+import os
+import hashlib
+from datetime import datetime
+from datetime import timedelta
+from datetime import timezone
+
+from ..apprise_attachment import AppriseAttachment
+from ..asset import AppriseAsset
+from ..logger import logger
+from ..exception import ApprisePluginException
+
+try:
+    import pgpy
+    # Pretty Good Privacy (PGP) Support enabled
+    PGP_SUPPORT = True
+
+except ImportError:
+    # Pretty Good Privacy (PGP) Support disabled
+    PGP_SUPPORT = False
+
+
+class ApprisePGPException(ApprisePluginException):
+    """
+    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
+    """
+
+    # 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
+
+            Optionally additionally specify a keyfile to explicitly open
+        """
+
+        # PGP hash
+        self.__key_lookup = {}
+
+        # Directory we can work with
+        self.path = path
+
+        # Our email
+        self.email = email
+
+        # Prepare our Asset Object
+        self.asset = \
+            asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+
+        if pub_keyfile:
+            # 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 pgp_key reference
+            self._pub_keyfile.add(pub_keyfile)
+
+            # Enforce maximum file size
+            self._pub_keyfile[0].max_file_size = self.max_pgp_public_key_size
+
+        else:
+            self._pub_keyfile = None
+
+    def keygen(self, email=None, name=None, force=False):
+        """
+        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)
+
+        except NameError:
+            # PGPy not installed
+            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')
+            return False
+
+        if not name:
+            name = self.asset.app_id
+
+        if not email:
+            email = self.email
+
+        # Prepare our UID
+        uid = pgpy.PGPUID.new(name, email=email)
+
+        # Filenames
+        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')
+
+        if os.path.isfile(pub_path) and not force:
+            logger.debug(
+                '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()
+        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},
+            hashes=[pgpy.constants.HashAlgorithm.SHA256],
+            ciphers=[pgpy.constants.SymmetricKeyAlgorithm.AES256],
+            compression=[pgpy.constants.CompressionAlgorithm.ZLIB])
+
+        try:
+            # Write our keys to disk
+            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}')
+
+            # Cleanup
+            try:
+                os.unlink(pub_path)
+                logger.trace('Removed %s', pub_path)
+
+            except OSError:
+                pass
+
+        try:
+            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}')
+
+            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
+
+        logger.info(
+            'Wrote PGP Keys for %s/%s',
+            os.path.dirname(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
+        """
+
+        if not PGP_SUPPORT:
+            msg = 'PGP Support unavailable; install PGPy library'
+            logger.warning(msg)
+            raise ApprisePGPException(msg)
+
+        if self._pub_keyfile is not None:
+            # If our code reaches here, then we fetch our public key
+            pgp_key = self._pub_keyfile[0]
+            if not pgp_key:
+                # We could not access the attachment
+                logger.error(
+                    'Could not access PGP Public Key {}.'.format(
+                        pgp_key.url(privacy=True)))
+                return False
+
+            return pgp_key.path
+
+        elif not self.path:
+            # No path
+            return None
+
+        fnames = [
+            'pgp-public.asc',
+            'pgp-pub.asc',
+            'public.asc',
+            'pub.asc',
+        ]
+
+        if self.email:
+            # Include our email in the list
+            emails = [self.email] + [*emails]
+
+        for email in emails:
+            _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')
+
+        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, *emails, autogen=None):
+        """
+        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):
+                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')
+            return None
+
+        # Persistent Storage Key
+        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']
+
+        try:
+            with open(path, 'r') 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)
+            return None
+
+        except FileNotFoundError:
+            # Generate keys
+            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}')
+            return None
+
+        self.__key_lookup[key] = {
+            '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
+        """
+
+        # Acquire our key
+        public_key = self.public_key(*emails)
+        if not public_key:
+            # Encryption not possible
+            return False
+
+        try:
+            message_object = pgpy.PGPMessage.new(message)
+            encrypted_message = public_key.encrypt(message_object)
+            return str(encrypted_message)
+
+        except pgpy.errors.PGPError:
+            # 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')
+
+        return None
+
+    def prune(self):
+        """
+        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)}
+
+    @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)
diff --git a/libs/apprise/utils/singleton.py b/libs/apprise/utils/singleton.py
new file mode 100644
index 000000000..d3d6ee26b
--- /dev/null
+++ b/libs/apprise/utils/singleton.py
@@ -0,0 +1,43 @@
+# -*- 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.
+
+
+class Singleton(type):
+    """
+    Our Singleton MetaClass
+    """
+    _instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        """
+        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)
+        return cls._instances[cls]
diff --git a/libs/apprise/utils/templates.py b/libs/apprise/utils/templates.py
new file mode 100644
index 000000000..8a630f491
--- /dev/null
+++ b/libs/apprise/utils/templates.py
@@ -0,0 +1,84 @@
+# -*- 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.
+import re
+import json
+
+
+class TemplateType:
+    """
+    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'
+
+    # Data is presumed to be of type JSON and is therefore escaped
+    # if required to do so (such as single quotes)
+    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.
+
+    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.
+
+    If there is no match found, content is not swapped.
+
+    """
+
+    def _escape_raw(content):
+        # No escaping necessary
+        return content
+
+    def _escape_json(content):
+        # remove surounding quotes
+        return json.dumps(content)[1:-1]
+
+    # Our escape function
+    fn = _escape_json if app_mode == TemplateType.JSON else _escape_raw
+
+    lookup = [re.escape(x) for x in kwargs.keys()]
+
+    # Compile this into a list
+    mask_r = re.compile(
+        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
+    # re-index it back into our list
+    return mask_r.sub(lambda x: fn(kwargs[x.group()[2:-2].strip()]), template)
diff --git a/libs/attr/__init__.py b/libs/attr/__init__.py
index 9226258a2..5c6e0650b 100644
--- a/libs/attr/__init__.py
+++ b/libs/attr/__init__.py
@@ -5,19 +5,21 @@ Classes Without Boilerplate
 """
 
 from functools import partial
-from typing import Callable
+from typing import Callable, Literal, Protocol
 
 from . import converters, exceptions, filters, setters, validators
 from ._cmp import cmp_using
-from ._compat import Protocol
 from ._config import get_run_validators, set_run_validators
-from ._funcs import asdict, assoc, astuple, evolve, has, resolve_types
+from ._funcs import asdict, assoc, astuple, has, resolve_types
 from ._make import (
     NOTHING,
     Attribute,
+    Converter,
     Factory,
+    _Nothing,
     attrib,
     attrs,
+    evolve,
     fields,
     fields_dict,
     make_class,
@@ -36,11 +38,15 @@ class AttrsInstance(Protocol):
     pass
 
 
+NothingType = Literal[_Nothing.NOTHING]
+
 __all__ = [
+    "NOTHING",
     "Attribute",
     "AttrsInstance",
+    "Converter",
     "Factory",
-    "NOTHING",
+    "NothingType",
     "asdict",
     "assoc",
     "astuple",
@@ -79,54 +85,18 @@ def _make_getattr(mod_name: str) -> Callable:
     """
 
     def __getattr__(name: str) -> str:
-        dunder_to_metadata = {
-            "__title__": "Name",
-            "__copyright__": "",
-            "__version__": "version",
-            "__version_info__": "version",
-            "__description__": "summary",
-            "__uri__": "",
-            "__url__": "",
-            "__author__": "",
-            "__email__": "",
-            "__license__": "license",
-        }
-        if name not in dunder_to_metadata:
+        if name not in ("__version__", "__version_info__"):
             msg = f"module {mod_name} has no attribute {name}"
             raise AttributeError(msg)
 
-        import sys
-        import warnings
-
-        if sys.version_info < (3, 8):
-            from importlib_metadata import metadata
-        else:
-            from importlib.metadata import metadata
-
-        if name not in ("__version__", "__version_info__"):
-            warnings.warn(
-                f"Accessing {mod_name}.{name} is deprecated and will be "
-                "removed in a future release. Use importlib.metadata directly "
-                "to query for attrs's packaging metadata.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
+        from importlib.metadata import metadata
 
         meta = metadata("attrs")
-        if name == "__license__":
-            return "MIT"
-        if name == "__copyright__":
-            return "Copyright (c) 2015 Hynek Schlawack"
-        if name in ("__uri__", "__url__"):
-            return meta["Project-URL"].split(" ", 1)[-1]
+
         if name == "__version_info__":
             return VersionInfo._from_version_string(meta["version"])
-        if name == "__author__":
-            return meta["Author-email"].rsplit(" ", 1)[0]
-        if name == "__email__":
-            return meta["Author-email"].rsplit("<", 1)[1][:-1]
 
-        return meta[dunder_to_metadata[name]]
+        return meta["version"]
 
     return __getattr__
 
diff --git a/libs/attr/__init__.pyi b/libs/attr/__init__.pyi
index 37a208732..133e50105 100644
--- a/libs/attr/__init__.pyi
+++ b/libs/attr/__init__.pyi
@@ -4,17 +4,12 @@ import sys
 from typing import (
     Any,
     Callable,
-    Dict,
     Generic,
-    List,
+    Literal,
     Mapping,
-    Optional,
     Protocol,
     Sequence,
-    Tuple,
-    Type,
     TypeVar,
-    Union,
     overload,
 )
 
@@ -27,11 +22,25 @@ from . import validators as validators
 from ._cmp import cmp_using as cmp_using
 from ._typing_compat import AttrsInstance_
 from ._version_info import VersionInfo
+from attrs import (
+    define as define,
+    field as field,
+    mutable as mutable,
+    frozen as frozen,
+    _EqOrderType,
+    _ValidatorType,
+    _ConverterType,
+    _ReprArgType,
+    _OnSetAttrType,
+    _OnSetAttrArgType,
+    _FieldTransformer,
+    _ValidatorArgType,
+)
 
 if sys.version_info >= (3, 10):
-    from typing import TypeGuard
+    from typing import TypeGuard, TypeAlias
 else:
-    from typing_extensions import TypeGuard
+    from typing_extensions import TypeGuard, TypeAlias
 
 if sys.version_info >= (3, 11):
     from typing import dataclass_transform
@@ -52,23 +61,7 @@ __copyright__: str
 _T = TypeVar("_T")
 _C = TypeVar("_C", bound=type)
 
-_EqOrderType = Union[bool, Callable[[Any], Any]]
-_ValidatorType = Callable[[Any, "Attribute[_T]", _T], Any]
-_ConverterType = Callable[[Any], Any]
 _FilterType = Callable[["Attribute[_T]", _T], bool]
-_ReprType = Callable[[Any], str]
-_ReprArgType = Union[bool, _ReprType]
-_OnSetAttrType = Callable[[Any, "Attribute[Any]", Any], Any]
-_OnSetAttrArgType = Union[
-    _OnSetAttrType, List[_OnSetAttrType], setters._NoOpType
-]
-_FieldTransformer = Callable[
-    [type, List["Attribute[Any]"]], List["Attribute[Any]"]
-]
-# FIXME: in reality, if multiple validators are passed they must be in a list
-# or tuple, but those are invariant and so would prevent subtypes of
-# _ValidatorType from working when passed in a list or tuple.
-_ValidatorArgType = Union[_ValidatorType[_T], Sequence[_ValidatorType[_T]]]
 
 # We subclass this here to keep the protocol's qualified name clean.
 class AttrsInstance(AttrsInstance_, Protocol):
@@ -80,50 +73,70 @@ class _Nothing(enum.Enum):
     NOTHING = enum.auto()
 
 NOTHING = _Nothing.NOTHING
+NothingType: TypeAlias = Literal[_Nothing.NOTHING]
 
 # NOTE: Factory lies about its return type to make this possible:
 # `x: List[int] # = Factory(list)`
 # Work around mypy issue #4554 in the common case by using an overload.
-if sys.version_info >= (3, 8):
-    from typing import Literal
-    @overload
-    def Factory(factory: Callable[[], _T]) -> _T: ...
-    @overload
-    def Factory(
-        factory: Callable[[Any], _T],
-        takes_self: Literal[True],
-    ) -> _T: ...
-    @overload
-    def Factory(
-        factory: Callable[[], _T],
-        takes_self: Literal[False],
-    ) -> _T: ...
 
-else:
+@overload
+def Factory(factory: Callable[[], _T]) -> _T: ...
+@overload
+def Factory(
+    factory: Callable[[Any], _T],
+    takes_self: Literal[True],
+) -> _T: ...
+@overload
+def Factory(
+    factory: Callable[[], _T],
+    takes_self: Literal[False],
+) -> _T: ...
+
+In = TypeVar("In")
+Out = TypeVar("Out")
+
+class Converter(Generic[In, Out]):
     @overload
-    def Factory(factory: Callable[[], _T]) -> _T: ...
+    def __init__(self, converter: Callable[[In], Out]) -> None: ...
     @overload
-    def Factory(
-        factory: Union[Callable[[Any], _T], Callable[[], _T]],
-        takes_self: bool = ...,
-    ) -> _T: ...
+    def __init__(
+        self,
+        converter: Callable[[In, AttrsInstance, Attribute], Out],
+        *,
+        takes_self: Literal[True],
+        takes_field: Literal[True],
+    ) -> None: ...
+    @overload
+    def __init__(
+        self,
+        converter: Callable[[In, Attribute], Out],
+        *,
+        takes_field: Literal[True],
+    ) -> None: ...
+    @overload
+    def __init__(
+        self,
+        converter: Callable[[In, AttrsInstance], Out],
+        *,
+        takes_self: Literal[True],
+    ) -> None: ...
 
 class Attribute(Generic[_T]):
     name: str
-    default: Optional[_T]
-    validator: Optional[_ValidatorType[_T]]
+    default: _T | None
+    validator: _ValidatorType[_T] | None
     repr: _ReprArgType
     cmp: _EqOrderType
     eq: _EqOrderType
     order: _EqOrderType
-    hash: Optional[bool]
+    hash: bool | None
     init: bool
-    converter: Optional[_ConverterType]
-    metadata: Dict[Any, Any]
-    type: Optional[Type[_T]]
+    converter: Converter | None
+    metadata: dict[Any, Any]
+    type: type[_T] | None
     kw_only: bool
     on_setattr: _OnSetAttrType
-    alias: Optional[str]
+    alias: str | None
 
     def evolve(self, **changes: Any) -> "Attribute[Any]": ...
 
@@ -156,18 +169,18 @@ def attrib(
     default: None = ...,
     validator: None = ...,
     repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
+    metadata: Mapping[Any, Any] | None = ...,
     type: None = ...,
     converter: None = ...,
     factory: None = ...,
     kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
 ) -> Any: ...
 
 # This form catches an explicit None or no default and infers the type from the
@@ -175,149 +188,79 @@ def attrib(
 @overload
 def attrib(
     default: None = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
+    validator: _ValidatorArgType[_T] | None = ...,
     repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: Optional[Type[_T]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    type: type[_T] | None = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
     kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
 ) -> _T: ...
 
 # This form catches an explicit default argument.
 @overload
 def attrib(
     default: _T,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
+    validator: _ValidatorArgType[_T] | None = ...,
     repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    type: Optional[Type[_T]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    type: type[_T] | None = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
     kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
 ) -> _T: ...
 
 # This form covers type=non-Type: e.g. forward references (str), Any
 @overload
 def attrib(
-    default: Optional[_T] = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
+    default: _T | None = ...,
+    validator: _ValidatorArgType[_T] | None = ...,
     repr: _ReprArgType = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
+    metadata: Mapping[Any, Any] | None = ...,
     type: object = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
     kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-) -> Any: ...
-@overload
-def field(
-    *,
-    default: None = ...,
-    validator: None = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: None = ...,
-    factory: None = ...,
-    kw_only: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> Any: ...
-
-# This form catches an explicit None or no default and infers the type from the
-# other arguments.
-@overload
-def field(
-    *,
-    default: None = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> _T: ...
-
-# This form catches an explicit default argument.
-@overload
-def field(
-    *,
-    default: _T,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
-) -> _T: ...
-
-# This form covers type=non-Type: e.g. forward references (str), Any
-@overload
-def field(
-    *,
-    default: Optional[_T] = ...,
-    validator: Optional[_ValidatorArgType[_T]] = ...,
-    repr: _ReprArgType = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    metadata: Optional[Mapping[Any, Any]] = ...,
-    converter: Optional[_ConverterType] = ...,
-    factory: Optional[Callable[[], _T]] = ...,
-    kw_only: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    alias: Optional[str] = ...,
-    type: Optional[type] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
 ) -> Any: ...
 @overload
 @dataclass_transform(order_default=True, field_specifiers=(attrib, field))
 def attrs(
     maybe_cls: _C,
-    these: Optional[Dict[str, Any]] = ...,
-    repr_ns: Optional[str] = ...,
+    these: dict[str, Any] | None = ...,
+    repr_ns: str | None = ...,
     repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
     slots: bool = ...,
     frozen: bool = ...,
@@ -327,25 +270,25 @@ def attrs(
     kw_only: bool = ...,
     cache_hash: bool = ...,
     auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
     auto_detect: bool = ...,
     collect_by_mro: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
     match_args: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
+    unsafe_hash: bool | None = ...,
 ) -> _C: ...
 @overload
 @dataclass_transform(order_default=True, field_specifiers=(attrib, field))
 def attrs(
     maybe_cls: None = ...,
-    these: Optional[Dict[str, Any]] = ...,
-    repr_ns: Optional[str] = ...,
+    these: dict[str, Any] | None = ...,
+    repr_ns: str | None = ...,
     repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
     slots: bool = ...,
     frozen: bool = ...,
@@ -355,131 +298,24 @@ def attrs(
     kw_only: bool = ...,
     cache_hash: bool = ...,
     auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
     auto_detect: bool = ...,
     collect_by_mro: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
     match_args: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
+    unsafe_hash: bool | None = ...,
 ) -> Callable[[_C], _C]: ...
-@overload
-@dataclass_transform(field_specifiers=(attrib, field))
-def define(
-    maybe_cls: _C,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> _C: ...
-@overload
-@dataclass_transform(field_specifiers=(attrib, field))
-def define(
-    maybe_cls: None = ...,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> Callable[[_C], _C]: ...
-
-mutable = define
-
-@overload
-@dataclass_transform(frozen_default=True, field_specifiers=(attrib, field))
-def frozen(
-    maybe_cls: _C,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> _C: ...
-@overload
-@dataclass_transform(frozen_default=True, field_specifiers=(attrib, field))
-def frozen(
-    maybe_cls: None = ...,
-    *,
-    these: Optional[Dict[str, Any]] = ...,
-    repr: bool = ...,
-    unsafe_hash: Optional[bool] = ...,
-    hash: Optional[bool] = ...,
-    init: bool = ...,
-    slots: bool = ...,
-    frozen: bool = ...,
-    weakref_slot: bool = ...,
-    str: bool = ...,
-    auto_attribs: bool = ...,
-    kw_only: bool = ...,
-    cache_hash: bool = ...,
-    auto_exc: bool = ...,
-    eq: Optional[bool] = ...,
-    order: Optional[bool] = ...,
-    auto_detect: bool = ...,
-    getstate_setstate: Optional[bool] = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
-    match_args: bool = ...,
-) -> Callable[[_C], _C]: ...
-def fields(cls: Type[AttrsInstance]) -> Any: ...
-def fields_dict(cls: Type[AttrsInstance]) -> Dict[str, Attribute[Any]]: ...
+def fields(cls: type[AttrsInstance]) -> Any: ...
+def fields_dict(cls: type[AttrsInstance]) -> dict[str, Attribute[Any]]: ...
 def validate(inst: AttrsInstance) -> None: ...
 def resolve_types(
     cls: _A,
-    globalns: Optional[Dict[str, Any]] = ...,
-    localns: Optional[Dict[str, Any]] = ...,
-    attribs: Optional[List[Attribute[Any]]] = ...,
+    globalns: dict[str, Any] | None = ...,
+    localns: dict[str, Any] | None = ...,
+    attribs: list[Attribute[Any]] | None = ...,
     include_extras: bool = ...,
 ) -> _A: ...
 
@@ -488,13 +324,13 @@ def resolve_types(
 # [attr.ib()])` is valid
 def make_class(
     name: str,
-    attrs: Union[List[str], Tuple[str, ...], Dict[str, Any]],
-    bases: Tuple[type, ...] = ...,
-    class_body: Optional[Dict[str, Any]] = ...,
-    repr_ns: Optional[str] = ...,
+    attrs: list[str] | tuple[str, ...] | dict[str, Any],
+    bases: tuple[type, ...] = ...,
+    class_body: dict[str, Any] | None = ...,
+    repr_ns: str | None = ...,
     repr: bool = ...,
-    cmp: Optional[_EqOrderType] = ...,
-    hash: Optional[bool] = ...,
+    cmp: _EqOrderType | None = ...,
+    hash: bool | None = ...,
     init: bool = ...,
     slots: bool = ...,
     frozen: bool = ...,
@@ -504,11 +340,11 @@ def make_class(
     kw_only: bool = ...,
     cache_hash: bool = ...,
     auto_exc: bool = ...,
-    eq: Optional[_EqOrderType] = ...,
-    order: Optional[_EqOrderType] = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
     collect_by_mro: bool = ...,
-    on_setattr: Optional[_OnSetAttrArgType] = ...,
-    field_transformer: Optional[_FieldTransformer] = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
 ) -> type: ...
 
 # _funcs --
@@ -522,24 +358,22 @@ def make_class(
 def asdict(
     inst: AttrsInstance,
     recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    dict_factory: Type[Mapping[Any, Any]] = ...,
+    filter: _FilterType[Any] | None = ...,
+    dict_factory: type[Mapping[Any, Any]] = ...,
     retain_collection_types: bool = ...,
-    value_serializer: Optional[
-        Callable[[type, Attribute[Any], Any], Any]
-    ] = ...,
-    tuple_keys: Optional[bool] = ...,
-) -> Dict[str, Any]: ...
+    value_serializer: Callable[[type, Attribute[Any], Any], Any] | None = ...,
+    tuple_keys: bool | None = ...,
+) -> dict[str, Any]: ...
 
 # TODO: add support for returning NamedTuple from the mypy plugin
 def astuple(
     inst: AttrsInstance,
     recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    tuple_factory: Type[Sequence[Any]] = ...,
+    filter: _FilterType[Any] | None = ...,
+    tuple_factory: type[Sequence[Any]] = ...,
     retain_collection_types: bool = ...,
-) -> Tuple[Any, ...]: ...
-def has(cls: type) -> TypeGuard[Type[AttrsInstance]]: ...
+) -> tuple[Any, ...]: ...
+def has(cls: type) -> TypeGuard[type[AttrsInstance]]: ...
 def assoc(inst: _T, **changes: Any) -> _T: ...
 def evolve(inst: _T, **changes: Any) -> _T: ...
 
diff --git a/libs/attr/_cmp.py b/libs/attr/_cmp.py
index a4a35e08f..f367bb3a7 100644
--- a/libs/attr/_cmp.py
+++ b/libs/attr/_cmp.py
@@ -26,21 +26,31 @@ def cmp_using(
     The resulting class will have a full set of ordering methods if at least
     one of ``{lt, le, gt, ge}`` and ``eq``  are provided.
 
-    :param Optional[callable] eq: `callable` used to evaluate equality of two
-        objects.
-    :param Optional[callable] lt: `callable` used to evaluate whether one
-        object is less than another object.
-    :param Optional[callable] le: `callable` used to evaluate whether one
-        object is less than or equal to another object.
-    :param Optional[callable] gt: `callable` used to evaluate whether one
-        object is greater than another object.
-    :param Optional[callable] ge: `callable` used to evaluate whether one
-        object is greater than or equal to another object.
+    Args:
+        eq (typing.Callable | None):
+            Callable used to evaluate equality of two objects.
 
-    :param bool require_same_type: When `True`, equality and ordering methods
-        will return `NotImplemented` if objects are not of the same type.
+        lt (typing.Callable | None):
+            Callable used to evaluate whether one object is less than another
+            object.
 
-    :param Optional[str] class_name: Name of class. Defaults to 'Comparable'.
+        le (typing.Callable | None):
+            Callable used to evaluate whether one object is less than or equal
+            to another object.
+
+        gt (typing.Callable | None):
+            Callable used to evaluate whether one object is greater than
+            another object.
+
+        ge (typing.Callable | None):
+            Callable used to evaluate whether one object is greater than or
+            equal to another object.
+
+        require_same_type (bool):
+            When `True`, equality and ordering methods will return
+            `NotImplemented` if objects are not of the same type.
+
+        class_name (str | None): Name of class. Defaults to "Comparable".
 
     See `comparison` for more details.
 
diff --git a/libs/attr/_cmp.pyi b/libs/attr/_cmp.pyi
index f3dcdc1a7..cc7893b04 100644
--- a/libs/attr/_cmp.pyi
+++ b/libs/attr/_cmp.pyi
@@ -1,13 +1,13 @@
-from typing import Any, Callable, Optional, Type
+from typing import Any, Callable
 
 _CompareWithType = Callable[[Any, Any], bool]
 
 def cmp_using(
-    eq: Optional[_CompareWithType] = ...,
-    lt: Optional[_CompareWithType] = ...,
-    le: Optional[_CompareWithType] = ...,
-    gt: Optional[_CompareWithType] = ...,
-    ge: Optional[_CompareWithType] = ...,
+    eq: _CompareWithType | None = ...,
+    lt: _CompareWithType | None = ...,
+    le: _CompareWithType | None = ...,
+    gt: _CompareWithType | None = ...,
+    ge: _CompareWithType | None = ...,
     require_same_type: bool = ...,
     class_name: str = ...,
-) -> Type: ...
+) -> type: ...
diff --git a/libs/attr/_compat.py b/libs/attr/_compat.py
index 46b05ca45..22fcd7838 100644
--- a/libs/attr/_compat.py
+++ b/libs/attr/_compat.py
@@ -10,19 +10,26 @@ from typing import _GenericAlias
 
 
 PYPY = platform.python_implementation() == "PyPy"
-PY_3_8_PLUS = sys.version_info[:2] >= (3, 8)
 PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
-PY310 = sys.version_info[:2] >= (3, 10)
+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)
+PY_3_13_PLUS = sys.version_info[:2] >= (3, 13)
+PY_3_14_PLUS = sys.version_info[:2] >= (3, 14)
 
 
-if sys.version_info < (3, 8):
-    try:
-        from typing_extensions import Protocol
-    except ImportError:  # pragma: no cover
-        Protocol = object
+if PY_3_14_PLUS:  # pragma: no cover
+    import annotationlib
+
+    _get_annotations = annotationlib.get_annotations
+
 else:
-    from typing import Protocol  # noqa: F401
+
+    def _get_annotations(cls):
+        """
+        Get annotations for *cls*.
+        """
+        return cls.__dict__.get("__annotations__", {})
 
 
 class _AnnotationExtractor:
diff --git a/libs/attr/_config.py b/libs/attr/_config.py
index 9c245b146..4b257726f 100644
--- a/libs/attr/_config.py
+++ b/libs/attr/_config.py
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 
-__all__ = ["set_run_validators", "get_run_validators"]
+__all__ = ["get_run_validators", "set_run_validators"]
 
 _run_validators = True
 
diff --git a/libs/attr/_funcs.py b/libs/attr/_funcs.py
index a888991d9..c39fb8aa5 100644
--- a/libs/attr/_funcs.py
+++ b/libs/attr/_funcs.py
@@ -4,7 +4,7 @@
 import copy
 
 from ._compat import PY_3_9_PLUS, get_generic_base
-from ._make import NOTHING, _obj_setattr, fields
+from ._make import _OBJ_SETATTR, NOTHING, fields
 from .exceptions import AttrsAttributeNotFoundError
 
 
@@ -21,34 +21,44 @@ def asdict(
 
     Optionally recurse into other *attrs*-decorated classes.
 
-    :param inst: Instance of an *attrs*-decorated class.
-    :param bool recurse: Recurse into classes that are also
-        *attrs*-decorated.
-    :param callable filter: A callable whose return code determines whether an
-        attribute or element is included (``True``) or dropped (``False``).  Is
-        called with the `attrs.Attribute` as the first argument and the
-        value as the second argument.
-    :param callable dict_factory: A callable to produce dictionaries from.  For
-        example, to produce ordered dictionaries instead of normal Python
-        dictionaries, pass in ``collections.OrderedDict``.
-    :param bool retain_collection_types: Do not convert to ``list`` when
-        encountering an attribute whose type is ``tuple`` or ``set``.  Only
-        meaningful if ``recurse`` is ``True``.
-    :param Optional[callable] value_serializer: A hook that is called for every
-        attribute or dict key/value.  It receives the current instance, field
-        and value and must return the (updated) value.  The hook is run *after*
-        the optional *filter* has been applied.
+    Args:
+        inst: Instance of an *attrs*-decorated class.
 
-    :rtype: return type of *dict_factory*
+        recurse (bool): Recurse into classes that are also *attrs*-decorated.
 
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
+        filter (~typing.Callable):
+            A callable whose return code determines whether an attribute or
+            element is included (`True`) or dropped (`False`).  Is called with
+            the `attrs.Attribute` as the first argument and the value as the
+            second argument.
+
+        dict_factory (~typing.Callable):
+            A callable to produce dictionaries from.  For example, to produce
+            ordered dictionaries instead of normal Python dictionaries, pass in
+            ``collections.OrderedDict``.
+
+        retain_collection_types (bool):
+            Do not convert to `list` when encountering an attribute whose type
+            is `tuple` or `set`.  Only meaningful if *recurse* is `True`.
+
+        value_serializer (typing.Callable | None):
+            A hook that is called for every attribute or dict key/value.  It
+            receives the current instance, field and value and must return the
+            (updated) value.  The hook is run *after* the optional *filter* has
+            been applied.
+
+    Returns:
+        Return type of *dict_factory*.
+
+    Raises:
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
 
     ..  versionadded:: 16.0.0 *dict_factory*
     ..  versionadded:: 16.1.0 *retain_collection_types*
     ..  versionadded:: 20.3.0 *value_serializer*
-    ..  versionadded:: 21.3.0 If a dict has a collection for a key, it is
-        serialized as a tuple.
+    ..  versionadded:: 21.3.0
+        If a dict has a collection for a key, it is serialized as a tuple.
     """
     attrs = fields(inst.__class__)
     rv = dict_factory()
@@ -206,24 +216,33 @@ def astuple(
 
     Optionally recurse into other *attrs*-decorated classes.
 
-    :param inst: Instance of an *attrs*-decorated class.
-    :param bool recurse: Recurse into classes that are also
-        *attrs*-decorated.
-    :param callable filter: A callable whose return code determines whether an
-        attribute or element is included (``True``) or dropped (``False``).  Is
-        called with the `attrs.Attribute` as the first argument and the
-        value as the second argument.
-    :param callable tuple_factory: A callable to produce tuples from.  For
-        example, to produce lists instead of tuples.
-    :param bool retain_collection_types: Do not convert to ``list``
-        or ``dict`` when encountering an attribute which type is
-        ``tuple``, ``dict`` or ``set``.  Only meaningful if ``recurse`` is
-        ``True``.
+    Args:
+        inst: Instance of an *attrs*-decorated class.
 
-    :rtype: return type of *tuple_factory*
+        recurse (bool):
+            Recurse into classes that are also *attrs*-decorated.
 
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
+        filter (~typing.Callable):
+            A callable whose return code determines whether an attribute or
+            element is included (`True`) or dropped (`False`).  Is called with
+            the `attrs.Attribute` as the first argument and the value as the
+            second argument.
+
+        tuple_factory (~typing.Callable):
+            A callable to produce tuples from. For example, to produce lists
+            instead of tuples.
+
+        retain_collection_types (bool):
+            Do not convert to `list` or `dict` when encountering an attribute
+            which type is `tuple`, `dict` or `set`. Only meaningful if
+            *recurse* is `True`.
+
+    Returns:
+        Return type of *tuple_factory*
+
+    Raises:
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
 
     ..  versionadded:: 16.2.0
     """
@@ -248,15 +267,17 @@ def astuple(
             elif isinstance(v, (tuple, list, set, frozenset)):
                 cf = v.__class__ if retain is True else list
                 items = [
-                    astuple(
-                        j,
-                        recurse=True,
-                        filter=filter,
-                        tuple_factory=tuple_factory,
-                        retain_collection_types=retain,
+                    (
+                        astuple(
+                            j,
+                            recurse=True,
+                            filter=filter,
+                            tuple_factory=tuple_factory,
+                            retain_collection_types=retain,
+                        )
+                        if has(j.__class__)
+                        else j
                     )
-                    if has(j.__class__)
-                    else j
                     for j in v
                 ]
                 try:
@@ -272,20 +293,24 @@ def astuple(
                 rv.append(
                     df(
                         (
-                            astuple(
-                                kk,
-                                tuple_factory=tuple_factory,
-                                retain_collection_types=retain,
-                            )
-                            if has(kk.__class__)
-                            else kk,
-                            astuple(
-                                vv,
-                                tuple_factory=tuple_factory,
-                                retain_collection_types=retain,
-                            )
-                            if has(vv.__class__)
-                            else vv,
+                            (
+                                astuple(
+                                    kk,
+                                    tuple_factory=tuple_factory,
+                                    retain_collection_types=retain,
+                                )
+                                if has(kk.__class__)
+                                else kk
+                            ),
+                            (
+                                astuple(
+                                    vv,
+                                    tuple_factory=tuple_factory,
+                                    retain_collection_types=retain,
+                                )
+                                if has(vv.__class__)
+                                else vv
+                            ),
                         )
                         for kk, vv in v.items()
                     )
@@ -302,10 +327,14 @@ def has(cls):
     """
     Check whether *cls* is a class with *attrs* attributes.
 
-    :param type cls: Class to introspect.
-    :raise TypeError: If *cls* is not a class.
+    Args:
+        cls (type): Class to introspect.
 
-    :rtype: bool
+    Raises:
+        TypeError: If *cls* is not a class.
+
+    Returns:
+        bool:
     """
     attrs = getattr(cls, "__attrs_attrs__", None)
     if attrs is not None:
@@ -334,20 +363,25 @@ def assoc(inst, **changes):
 
     .. _`edge cases`: https://github.com/python-attrs/attrs/issues/251
 
-    :param inst: Instance of a class with *attrs* attributes.
-    :param changes: Keyword changes in the new copy.
+    Args:
+        inst: Instance of a class with *attrs* attributes.
 
-    :return: A copy of inst with *changes* incorporated.
+        changes: Keyword changes in the new copy.
 
-    :raise attrs.exceptions.AttrsAttributeNotFoundError: If *attr_name*
-        couldn't be found on *cls*.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
+    Returns:
+        A copy of inst with *changes* incorporated.
+
+    Raises:
+        attrs.exceptions.AttrsAttributeNotFoundError:
+            If *attr_name* couldn't be found on *cls*.
+
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
 
     ..  deprecated:: 17.1.0
-        Use `attrs.evolve` instead if you can.
-        This function will not be removed du to the slightly different approach
-        compared to `attrs.evolve`.
+        Use `attrs.evolve` instead if you can. This function will not be
+        removed du to the slightly different approach compared to
+        `attrs.evolve`, though.
     """
     new = copy.copy(inst)
     attrs = fields(inst.__class__)
@@ -356,109 +390,60 @@ def assoc(inst, **changes):
         if a is NOTHING:
             msg = f"{k} is not an attrs attribute on {new.__class__}."
             raise AttrsAttributeNotFoundError(msg)
-        _obj_setattr(new, k, v)
+        _OBJ_SETATTR(new, k, v)
     return new
 
 
-def evolve(*args, **changes):
-    """
-    Create a new instance, based on the first positional argument with
-    *changes* applied.
-
-    :param inst: Instance of a class with *attrs* attributes.
-    :param changes: Keyword changes in the new copy.
-
-    :return: A copy of inst with *changes* incorporated.
-
-    :raise TypeError: If *attr_name* couldn't be found in the class
-        ``__init__``.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
-
-    .. versionadded:: 17.1.0
-    .. deprecated:: 23.1.0
-       It is now deprecated to pass the instance using the keyword argument
-       *inst*. It will raise a warning until at least April 2024, after which
-       it will become an error. Always pass the instance as a positional
-       argument.
-    """
-    # Try to get instance by positional argument first.
-    # Use changes otherwise and warn it'll break.
-    if args:
-        try:
-            (inst,) = args
-        except ValueError:
-            msg = f"evolve() takes 1 positional argument, but {len(args)} were given"
-            raise TypeError(msg) from None
-    else:
-        try:
-            inst = changes.pop("inst")
-        except KeyError:
-            msg = "evolve() missing 1 required positional argument: 'inst'"
-            raise TypeError(msg) from None
-
-        import warnings
-
-        warnings.warn(
-            "Passing the instance per keyword argument is deprecated and "
-            "will stop working in, or after, April 2024.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-    cls = inst.__class__
-    attrs = fields(cls)
-    for a in attrs:
-        if not a.init:
-            continue
-        attr_name = a.name  # To deal with private attributes.
-        init_name = a.alias
-        if init_name not in changes:
-            changes[init_name] = getattr(inst, attr_name)
-
-    return cls(**changes)
-
-
 def resolve_types(
     cls, globalns=None, localns=None, attribs=None, include_extras=True
 ):
     """
     Resolve any strings and forward annotations in type annotations.
 
-    This is only required if you need concrete types in `Attribute`'s *type*
-    field. In other words, you don't need to resolve your types if you only
-    use them for static type checking.
+    This is only required if you need concrete types in :class:`Attribute`'s
+    *type* field. In other words, you don't need to resolve your types if you
+    only use them for static type checking.
 
     With no arguments, names will be looked up in the module in which the class
-    was created. If this is not what you want, e.g. if the name only exists
-    inside a method, you may pass *globalns* or *localns* to specify other
-    dictionaries in which to look up these names. See the docs of
+    was created. If this is not what you want, for example, if the name only
+    exists inside a method, you may pass *globalns* or *localns* to specify
+    other dictionaries in which to look up these names. See the docs of
     `typing.get_type_hints` for more details.
 
-    :param type cls: Class to resolve.
-    :param Optional[dict] globalns: Dictionary containing global variables.
-    :param Optional[dict] localns: Dictionary containing local variables.
-    :param Optional[list] attribs: List of attribs for the given class.
-        This is necessary when calling from inside a ``field_transformer``
-        since *cls* is not an *attrs* class yet.
-    :param bool include_extras: Resolve more accurately, if possible.
-        Pass ``include_extras`` to ``typing.get_hints``, if supported by the
-        typing module. On supported Python versions (3.9+), this resolves the
-        types more accurately.
+    Args:
+        cls (type): Class to resolve.
 
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class and you didn't pass any attribs.
-    :raise NameError: If types cannot be resolved because of missing variables.
+        globalns (dict | None): Dictionary containing global variables.
 
-    :returns: *cls* so you can use this function also as a class decorator.
-        Please note that you have to apply it **after** `attrs.define`. That
-        means the decorator has to come in the line **before** `attrs.define`.
+        localns (dict | None): Dictionary containing local variables.
+
+        attribs (list | None):
+            List of attribs for the given class. This is necessary when calling
+            from inside a ``field_transformer`` since *cls* is not an *attrs*
+            class yet.
+
+        include_extras (bool):
+            Resolve more accurately, if possible. Pass ``include_extras`` to
+            ``typing.get_hints``, if supported by the typing module. On
+            supported Python versions (3.9+), this resolves the types more
+            accurately.
+
+    Raises:
+        TypeError: If *cls* is not a class.
+
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class and you didn't pass any attribs.
+
+        NameError: If types cannot be resolved because of missing variables.
+
+    Returns:
+        *cls* so you can use this function also as a class decorator. Please
+        note that you have to apply it **after** `attrs.define`. That means the
+        decorator has to come in the line **before** `attrs.define`.
 
     ..  versionadded:: 20.1.0
     ..  versionadded:: 21.1.0 *attribs*
     ..  versionadded:: 23.1.0 *include_extras*
-
     """
     # Since calling get_type_hints is expensive we cache whether we've
     # done it already.
@@ -474,7 +459,7 @@ def resolve_types(
         for field in fields(cls) if attribs is None else attribs:
             if field.name in hints:
                 # Since fields have been frozen we must work around it.
-                _obj_setattr(field, "type", hints[field.name])
+                _OBJ_SETATTR(field, "type", hints[field.name])
         # We store the class we resolved so that subclasses know they haven't
         # been resolved.
         cls.__attrs_types_resolved__ = cls
diff --git a/libs/attr/_make.py b/libs/attr/_make.py
index 10b4eca77..f00fec48c 100644
--- a/libs/attr/_make.py
+++ b/libs/attr/_make.py
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: MIT
 
+from __future__ import annotations
+
+import abc
 import contextlib
 import copy
 import enum
@@ -17,9 +20,11 @@ from operator import itemgetter
 # having the thread-local in the globals here.
 from . import _compat, _config, setters
 from ._compat import (
-    PY310,
-    PY_3_8_PLUS,
+    PY_3_10_PLUS,
+    PY_3_11_PLUS,
+    PY_3_13_PLUS,
     _AnnotationExtractor,
+    _get_annotations,
     get_generic_base,
 )
 from .exceptions import (
@@ -31,10 +36,9 @@ from .exceptions import (
 
 
 # This is used at least twice, so cache it here.
-_obj_setattr = object.__setattr__
-_init_converter_pat = "__attr_converter_%s"
-_init_factory_pat = "__attr_factory_%s"
-_classvar_prefixes = (
+_OBJ_SETATTR = object.__setattr__
+_INIT_FACTORY_PAT = "__attr_factory_%s"
+_CLASSVAR_PREFIXES = (
     "typing.ClassVar",
     "t.ClassVar",
     "ClassVar",
@@ -43,19 +47,19 @@ _classvar_prefixes = (
 # we don't use a double-underscore prefix because that triggers
 # name mangling when trying to create a slot for the field
 # (when slots=True)
-_hash_cache_field = "_attrs_cached_hash"
+_HASH_CACHE_FIELD = "_attrs_cached_hash"
 
-_empty_metadata_singleton = types.MappingProxyType({})
+_EMPTY_METADATA_SINGLETON = types.MappingProxyType({})
 
 # Unique object for unequivocal getattr() defaults.
-_sentinel = object()
+_SENTINEL = object()
 
-_ng_default_on_setattr = setters.pipe(setters.convert, setters.validate)
+_DEFAULT_ON_SETATTR = setters.pipe(setters.convert, setters.validate)
 
 
 class _Nothing(enum.Enum):
     """
-    Sentinel to indicate the lack of a value when ``None`` is ambiguous.
+    Sentinel to indicate the lack of a value when `None` is ambiguous.
 
     If extending attrs, you can use ``typing.Literal[NOTHING]`` to show
     that a value may be ``NOTHING``.
@@ -75,7 +79,9 @@ class _Nothing(enum.Enum):
 
 NOTHING = _Nothing.NOTHING
 """
-Sentinel to indicate the lack of a value when ``None`` is ambiguous.
+Sentinel to indicate the lack of a value when `None` is ambiguous.
+
+When using in 3rd party code, use `attrs.NothingType` for type annotations.
 """
 
 
@@ -84,7 +90,7 @@ class _CacheHashWrapper(int):
     An integer subclass that pickles / copies as None
 
     This is used for non-slots classes with ``cache_hash=True``, to avoid
-    serializing a potentially (even likely) invalid hash value. Since ``None``
+    serializing a potentially (even likely) invalid hash value. Since `None`
     is the default value for uncalculated hashes, whenever this is copied,
     the copy's value for the hash should automatically reset.
 
@@ -113,137 +119,29 @@ def attrib(
     alias=None,
 ):
     """
-    Create a new attribute on a class.
+    Create a new field / attribute on a class.
+
+    Identical to `attrs.field`, except it's not keyword-only.
+
+    Consider using `attrs.field` in new code (``attr.ib`` will *never* go away,
+    though).
 
     ..  warning::
 
-        Does *not* do anything unless the class is also decorated with `attr.s`
-        / `attrs.define` / and so on!
+        Does **nothing** unless the class is also decorated with
+        `attr.s` (or similar)!
 
-    Please consider using `attrs.field` in new code (``attr.ib`` will *never*
-    go away, though).
-
-    :param default: A value that is used if an *attrs*-generated ``__init__``
-        is used and no value is passed while instantiating or the attribute is
-        excluded using ``init=False``.
-
-        If the value is an instance of `attrs.Factory`, its callable will be
-        used to construct a new value (useful for mutable data types like lists
-        or dicts).
-
-        If a default is not set (or set manually to `attrs.NOTHING`), a value
-        *must* be supplied when instantiating; otherwise a `TypeError` will be
-        raised.
-
-        The default can also be set using decorator notation as shown below.
-
-        .. seealso:: `defaults`
-
-    :param callable factory: Syntactic sugar for
-        ``default=attr.Factory(factory)``.
-
-    :param validator: `callable` that is called by *attrs*-generated
-        ``__init__`` methods after the instance has been initialized.  They
-        receive the initialized instance, the :func:`~attrs.Attribute`, and the
-        passed value.
-
-        The return value is *not* inspected so the validator has to throw an
-        exception itself.
-
-        If a `list` is passed, its items are treated as validators and must all
-        pass.
-
-        Validators can be globally disabled and re-enabled using
-        `attrs.validators.get_disabled` / `attrs.validators.set_disabled`.
-
-        The validator can also be set using decorator notation as shown below.
-
-        .. seealso:: :ref:`validators`
-
-    :type validator: `callable` or a `list` of `callable`\\ s.
-
-    :param repr: Include this attribute in the generated ``__repr__`` method.
-        If ``True``, include the attribute; if ``False``, omit it. By default,
-        the built-in ``repr()`` function is used. To override how the attribute
-        value is formatted, pass a ``callable`` that takes a single value and
-        returns a string. Note that the resulting string is used as-is, i.e. it
-        will be used directly *instead* of calling ``repr()`` (the default).
-    :type repr: a `bool` or a `callable` to use a custom function.
-
-    :param eq: If ``True`` (default), include this attribute in the generated
-        ``__eq__`` and ``__ne__`` methods that check two instances for
-        equality. To override how the attribute value is compared, pass a
-        ``callable`` that takes a single value and returns the value to be
-        compared.
-
-        .. seealso:: `comparison`
-    :type eq: a `bool` or a `callable`.
-
-    :param order: If ``True`` (default), include this attributes in the
-        generated ``__lt__``, ``__le__``, ``__gt__`` and ``__ge__`` methods. To
-        override how the attribute value is ordered, pass a ``callable`` that
-        takes a single value and returns the value to be ordered.
-
-        .. seealso:: `comparison`
-    :type order: a `bool` or a `callable`.
-
-    :param cmp: Setting *cmp* is equivalent to setting *eq* and *order* to the
-        same value. Must not be mixed with *eq* or *order*.
-
-        .. seealso:: `comparison`
-    :type cmp: a `bool` or a `callable`.
-
-    :param bool | None hash: Include this attribute in the generated
-        ``__hash__`` method.  If ``None`` (default), mirror *eq*'s value.  This
-        is the correct behavior according the Python spec.  Setting this value
-        to anything else than ``None`` is *discouraged*.
-
-        .. seealso:: `hashing`
-    :param bool init: Include this attribute in the generated ``__init__``
-        method.  It is possible to set this to ``False`` and set a default
-        value.  In that case this attributed is unconditionally initialized
-        with the specified default value or factory.
-
-        .. seealso:: `init`
-    :param callable converter: `callable` that is called by *attrs*-generated
-        ``__init__`` methods to convert attribute's value to the desired
-        format.  It is given the passed-in value, and the returned value will
-        be used as the new value of the attribute.  The value is converted
-        before being passed to the validator, if any.
-
-        .. seealso:: :ref:`converters`
-    :param dict | None metadata: An arbitrary mapping, to be used by
-        third-party components.  See `extending-metadata`.
-
-    :param type: The type of the attribute. Nowadays, the preferred method to
-        specify the type is using a variable annotation (see :pep:`526`). This
-        argument is provided for backward compatibility. Regardless of the
-        approach used, the type will be stored on ``Attribute.type``.
-
-        Please note that *attrs* doesn't do anything with this metadata by
-        itself. You can use it as part of your own code or for `static type
-        checking <types>`.
-    :param bool kw_only: Make this attribute keyword-only in the generated
-        ``__init__`` (if ``init`` is ``False``, this parameter is ignored).
-    :param on_setattr: Allows to overwrite the *on_setattr* setting from
-        `attr.s`. If left `None`, the *on_setattr* value from `attr.s` is used.
-        Set to `attrs.setters.NO_OP` to run **no** `setattr` hooks for this
-        attribute -- regardless of the setting in `attr.s`.
-    :type on_setattr: `callable`, or a list of callables, or `None`, or
-        `attrs.setters.NO_OP`
-    :param str | None alias: Override this attribute's parameter name in the
-        generated ``__init__`` method. If left `None`, default to ``name``
-        stripped of leading underscores. See `private-attributes`.
 
     .. versionadded:: 15.2.0 *convert*
     .. versionadded:: 16.3.0 *metadata*
     .. versionchanged:: 17.1.0 *validator* can be a ``list`` now.
     .. versionchanged:: 17.1.0
-       *hash* is ``None`` and therefore mirrors *eq* by default.
+       *hash* is `None` and therefore mirrors *eq* by default.
     .. versionadded:: 17.3.0 *type*
     .. deprecated:: 17.4.0 *convert*
-    .. versionadded:: 17.4.0 *converter* as a replacement for the deprecated
-       *convert* to achieve consistency with other noun-based arguments.
+    .. versionadded:: 17.4.0
+       *converter* as a replacement for the deprecated *convert* to achieve
+       consistency with other noun-based arguments.
     .. versionadded:: 18.1.0
        ``factory=f`` is syntactic sugar for ``default=attr.Factory(f)``.
     .. versionadded:: 18.2.0 *kw_only*
@@ -312,17 +210,18 @@ def attrib(
 
 def _compile_and_eval(script, globs, locs=None, filename=""):
     """
-    "Exec" the script with the given global (globs) and local (locs) variables.
+    Evaluate the script with the given global (globs) and local (locs)
+    variables.
     """
     bytecode = compile(script, filename, "exec")
     eval(bytecode, globs, locs)
 
 
-def _make_method(name, script, filename, globs):
+def _make_method(name, script, filename, globs, locals=None):
     """
     Create the method with the script given and return the method object.
     """
-    locs = {}
+    locs = {} if locals is None else locals
 
     # In order of debuggers like PDB being able to step through the code,
     # we add a fake linecache entry.
@@ -403,33 +302,14 @@ def _is_class_var(annot):
     if annot.startswith(("'", '"')) and annot.endswith(("'", '"')):
         annot = annot[1:-1]
 
-    return annot.startswith(_classvar_prefixes)
+    return annot.startswith(_CLASSVAR_PREFIXES)
 
 
 def _has_own_attribute(cls, attrib_name):
     """
     Check whether *cls* defines *attrib_name* (and doesn't just inherit it).
     """
-    attr = getattr(cls, attrib_name, _sentinel)
-    if attr is _sentinel:
-        return False
-
-    for base_cls in cls.__mro__[1:]:
-        a = getattr(base_cls, attrib_name, None)
-        if attr is a:
-            return False
-
-    return True
-
-
-def _get_annotations(cls):
-    """
-    Get annotations for *cls*.
-    """
-    if _has_own_attribute(cls, "__annotations__"):
-        return cls.__annotations__
-
-    return {}
+    return attrib_name in cls.__dict__
 
 
 def _collect_base_attrs(cls, taken_attr_names):
@@ -499,8 +379,8 @@ def _transform_attrs(
 
     If *these* is passed, use that and don't look for them on the class.
 
-    *collect_by_mro* is True, collect them in the correct MRO order, otherwise
-    use the old -- incorrect -- order.  See #428.
+    If *collect_by_mro* is True, collect them in the correct MRO order,
+    otherwise use the old -- incorrect -- order.  See #428.
 
     Return an `_Attributes`.
     """
@@ -600,15 +480,11 @@ def _transform_attrs(
     return _Attributes((AttrsClass(attrs), base_attrs, base_attr_map))
 
 
-def _make_cached_property_getattr(
-    cached_properties,
-    original_getattr,
-    cls,
-):
+def _make_cached_property_getattr(cached_properties, original_getattr, cls):
     lines = [
         # Wrapped to get `__class__` into closure cell for super()
         # (It will be replaced with the newly constructed class after construction).
-        "def wrapper():",
+        "def wrapper(_cls):",
         "    __class__ = _cls",
         "    def __getattr__(self, item, cached_properties=cached_properties, original_getattr=original_getattr, _cached_setattr_get=_cached_setattr_get):",
         "         func = cached_properties.get(item)",
@@ -625,8 +501,12 @@ def _make_cached_property_getattr(
     else:
         lines.extend(
             [
-                "         if hasattr(super(), '__getattr__'):",
-                "              return super().__getattr__(item)",
+                "         try:",
+                "             return super().__getattribute__(item)",
+                "         except AttributeError:",
+                "             if not hasattr(super(), '__getattr__'):",
+                "                 raise",
+                "             return super().__getattr__(item)",
                 "         original_error = f\"'{self.__class__.__name__}' object has no attribute '{item}'\"",
                 "         raise AttributeError(original_error)",
             ]
@@ -635,7 +515,7 @@ def _make_cached_property_getattr(
     lines.extend(
         [
             "    return __getattr__",
-            "__getattr__ = wrapper()",
+            "__getattr__ = wrapper(_cls)",
         ]
     )
 
@@ -643,8 +523,7 @@ def _make_cached_property_getattr(
 
     glob = {
         "cached_properties": cached_properties,
-        "_cached_setattr_get": _obj_setattr.__get__,
-        "_cls": cls,
+        "_cached_setattr_get": _OBJ_SETATTR.__get__,
         "original_getattr": original_getattr,
     }
 
@@ -653,6 +532,9 @@ def _make_cached_property_getattr(
         "\n".join(lines),
         unique_filename,
         glob,
+        locals={
+            "_cls": cls,
+        },
     )
 
 
@@ -664,18 +546,82 @@ def _frozen_setattrs(self, name, value):
         "__cause__",
         "__context__",
         "__traceback__",
+        "__suppress_context__",
+        "__notes__",
     ):
         BaseException.__setattr__(self, name, value)
         return
 
-    raise FrozenInstanceError()
+    raise FrozenInstanceError
 
 
 def _frozen_delattrs(self, name):
     """
     Attached to frozen classes as __delattr__.
     """
-    raise FrozenInstanceError()
+    if isinstance(self, BaseException) and name in ("__notes__",):
+        BaseException.__delattr__(self, name)
+        return
+
+    raise FrozenInstanceError
+
+
+def evolve(*args, **changes):
+    """
+    Create a new instance, based on the first positional argument with
+    *changes* applied.
+
+    .. tip::
+
+       On Python 3.13 and later, you can also use `copy.replace` instead.
+
+    Args:
+
+        inst:
+            Instance of a class with *attrs* attributes. *inst* must be passed
+            as a positional argument.
+
+        changes:
+            Keyword changes in the new copy.
+
+    Returns:
+        A copy of inst with *changes* incorporated.
+
+    Raises:
+        TypeError:
+            If *attr_name* couldn't be found in the class ``__init__``.
+
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
+
+    .. versionadded:: 17.1.0
+    .. deprecated:: 23.1.0
+       It is now deprecated to pass the instance using the keyword argument
+       *inst*. It will raise a warning until at least April 2024, after which
+       it will become an error. Always pass the instance as a positional
+       argument.
+    .. versionchanged:: 24.1.0
+       *inst* can't be passed as a keyword argument anymore.
+    """
+    try:
+        (inst,) = args
+    except ValueError:
+        msg = (
+            f"evolve() takes 1 positional argument, but {len(args)} were given"
+        )
+        raise TypeError(msg) from None
+
+    cls = inst.__class__
+    attrs = fields(cls)
+    for a in attrs:
+        if not a.init:
+            continue
+        attr_name = a.name  # To deal with private attributes.
+        init_name = a.alias
+        if init_name not in changes:
+            changes[init_name] = getattr(inst, attr_name)
+
+    return cls(**changes)
 
 
 class _ClassBuilder:
@@ -693,15 +639,15 @@ class _ClassBuilder:
         "_cls_dict",
         "_delete_attribs",
         "_frozen",
-        "_has_pre_init",
-        "_pre_init_has_args",
+        "_has_custom_setattr",
         "_has_post_init",
+        "_has_pre_init",
         "_is_exc",
         "_on_setattr",
+        "_pre_init_has_args",
         "_slots",
         "_weakref_slot",
         "_wrote_own_setattr",
-        "_has_custom_setattr",
     )
 
     def __init__(
@@ -764,7 +710,7 @@ class _ClassBuilder:
 
             self._wrote_own_setattr = True
         elif on_setattr in (
-            _ng_default_on_setattr,
+            _DEFAULT_ON_SETATTR,
             setters.validate,
             setters.convert,
         ):
@@ -779,7 +725,7 @@ class _ClassBuilder:
                     break
             if (
                 (
-                    on_setattr == _ng_default_on_setattr
+                    on_setattr == _DEFAULT_ON_SETATTR
                     and not (has_validator or has_converter)
                 )
                 or (on_setattr == setters.validate and not has_validator)
@@ -799,34 +745,28 @@ class _ClassBuilder:
     def __repr__(self):
         return f"<_ClassBuilder(cls={self._cls.__name__})>"
 
-    if PY310:
-        import abc
+    def build_class(self):
+        """
+        Finalize class based on the accumulated configuration.
 
-        def build_class(self):
-            """
-            Finalize class based on the accumulated configuration.
+        Builder cannot be used after calling this method.
+        """
+        if self._slots is True:
+            cls = self._create_slots_class()
+        else:
+            cls = self._patch_original_class()
+            if PY_3_10_PLUS:
+                cls = abc.update_abstractmethods(cls)
 
-            Builder cannot be used after calling this method.
-            """
-            if self._slots is True:
-                return self._create_slots_class()
+        # The method gets only called if it's not inherited from a base class.
+        # _has_own_attribute does NOT work properly for classmethods.
+        if (
+            getattr(cls, "__attrs_init_subclass__", None)
+            and "__attrs_init_subclass__" not in cls.__dict__
+        ):
+            cls.__attrs_init_subclass__()
 
-            return self.abc.update_abstractmethods(
-                self._patch_original_class()
-            )
-
-    else:
-
-        def build_class(self):
-            """
-            Finalize class based on the accumulated configuration.
-
-            Builder cannot be used after calling this method.
-            """
-            if self._slots is True:
-                return self._create_slots_class()
-
-            return self._patch_original_class()
+        return cls
 
     def _patch_original_class(self):
         """
@@ -840,7 +780,7 @@ class _ClassBuilder:
             for name in self._attr_names:
                 if (
                     name not in base_names
-                    and getattr(cls, name, _sentinel) is not _sentinel
+                    and getattr(cls, name, _SENTINEL) is not _SENTINEL
                 ):
                     # An AttributeError can happen if a base class defines a
                     # class variable and we want to set an attribute with the
@@ -860,7 +800,7 @@ class _ClassBuilder:
             cls.__attrs_own_setattr__ = False
 
             if not self._has_custom_setattr:
-                cls.__setattr__ = _obj_setattr
+                cls.__setattr__ = _OBJ_SETATTR
 
         return cls
 
@@ -888,7 +828,7 @@ class _ClassBuilder:
             if not self._has_custom_setattr:
                 for base_cls in self._cls.__bases__:
                     if base_cls.__dict__.get("__attrs_own_setattr__", False):
-                        cd["__setattr__"] = _obj_setattr
+                        cd["__setattr__"] = _OBJ_SETATTR
                         break
 
         # Traverse the MRO to collect existing slots
@@ -916,30 +856,23 @@ class _ClassBuilder:
         ):
             names += ("__weakref__",)
 
-        if PY_3_8_PLUS:
-            cached_properties = {
-                name: cached_property.func
-                for name, cached_property in cd.items()
-                if isinstance(cached_property, functools.cached_property)
-            }
-        else:
-            # `functools.cached_property` was introduced in 3.8.
-            # So can't be used before this.
-            cached_properties = {}
+        cached_properties = {
+            name: cached_property.func
+            for name, cached_property in cd.items()
+            if isinstance(cached_property, functools.cached_property)
+        }
 
         # Collect methods with a `__class__` reference that are shadowed in the new class.
         # To know to update them.
         additional_closure_functions_to_update = []
         if cached_properties:
-            # Add cached properties to names for slotting.
-            names += tuple(cached_properties.keys())
-
-            for name in cached_properties:
-                # Clear out function from class to avoid clashing.
-                del cd[name]
-
             class_annotations = _get_annotations(self._cls)
             for name, func in cached_properties.items():
+                # Add cached properties to names for slotting.
+                names += (name,)
+                # Clear out function from class to avoid clashing.
+                del cd[name]
+                additional_closure_functions_to_update.append(func)
                 annotation = inspect.signature(func).return_annotation
                 if annotation is not inspect.Parameter.empty:
                     class_annotations[name] = annotation
@@ -968,7 +901,7 @@ class _ClassBuilder:
         slot_names = [name for name in slot_names if name not in reused_slots]
         cd.update(reused_slots)
         if self._cache_hash:
-            slot_names.append(_hash_cache_field)
+            slot_names.append(_HASH_CACHE_FIELD)
 
         cd["__slots__"] = tuple(slot_names)
 
@@ -1049,7 +982,7 @@ class _ClassBuilder:
             """
             Automatically created by attrs.
             """
-            __bound_setattr = _obj_setattr.__get__(self)
+            __bound_setattr = _OBJ_SETATTR.__get__(self)
             if isinstance(state, tuple):
                 # Backward compatibility with attrs instances pickled with
                 # attrs versions before v22.2.0 which stored tuples.
@@ -1065,7 +998,7 @@ class _ClassBuilder:
             # indicate that the first call to __hash__ should be a cache
             # miss.
             if hash_caching_enabled:
-                __bound_setattr(_hash_cache_field, None)
+                __bound_setattr(_HASH_CACHE_FIELD, None)
 
         return slots_getstate, slots_setstate
 
@@ -1105,6 +1038,12 @@ class _ClassBuilder:
 
         return self
 
+    def add_replace(self):
+        self._cls_dict["__replace__"] = self._add_method_dunders(
+            lambda self, **changes: evolve(self, **changes)
+        )
+        return self
+
     def add_match_args(self):
         self._cls_dict["__match_args__"] = tuple(
             field.name
@@ -1179,7 +1118,7 @@ class _ClassBuilder:
             else:
                 nval = hook(self, a, val)
 
-            _obj_setattr(self, name, nval)
+            _OBJ_SETATTR(self, name, nval)
 
         self._cls_dict["__attrs_own_setattr__"] = True
         self._cls_dict["__setattr__"] = self._add_method_dunders(__setattr__)
@@ -1333,238 +1272,28 @@ def attrs(
     A class decorator that adds :term:`dunder methods` according to the
     specified attributes using `attr.ib` or the *these* argument.
 
-    Please consider using `attrs.define` / `attrs.frozen` in new code
-    (``attr.s`` will *never* go away, though).
+    Consider using `attrs.define` / `attrs.frozen` in new code (``attr.s`` will
+    *never* go away, though).
 
-    :param these: A dictionary of name to `attr.ib` mappings.  This is useful
-        to avoid the definition of your attributes within the class body
-        because you can't (e.g. if you want to add ``__repr__`` methods to
-        Django models) or don't want to.
+    Args:
+        repr_ns (str):
+            When using nested classes, there was no way in Python 2 to
+            automatically detect that.  This argument allows to set a custom
+            name for a more meaningful ``repr`` output.  This argument is
+            pointless in Python 3 and is therefore deprecated.
 
-        If *these* is not ``None``, *attrs* will *not* search the class body
-        for attributes and will *not* remove any attributes from it.
+    .. caution::
+        Refer to `attrs.define` for the rest of the parameters, but note that they
+        can have different defaults.
 
-        The order is deduced from the order of the attributes inside *these*.
-
-    :type these: `dict` of `str` to `attr.ib`
-
-    :param str repr_ns: When using nested classes, there's no way in Python 2
-        to automatically detect that.  Therefore it's possible to set the
-        namespace explicitly for a more meaningful ``repr`` output.
-    :param bool auto_detect: Instead of setting the *init*, *repr*, *eq*,
-        *order*, and *hash* arguments explicitly, assume they are set to
-        ``True`` **unless any** of the involved methods for one of the
-        arguments is implemented in the *current* class (i.e. it is *not*
-        inherited from some base class).
-
-        So for example by implementing ``__eq__`` on a class yourself, *attrs*
-        will deduce ``eq=False`` and will create *neither* ``__eq__`` *nor*
-        ``__ne__`` (but Python classes come with a sensible ``__ne__`` by
-        default, so it *should* be enough to only implement ``__eq__`` in most
-        cases).
-
-        .. warning::
-
-           If you prevent *attrs* from creating the ordering methods for you
-           (``order=False``, e.g. by implementing ``__le__``), it becomes
-           *your* responsibility to make sure its ordering is sound. The best
-           way is to use the `functools.total_ordering` decorator.
-
-
-        Passing ``True`` or ``False`` to *init*, *repr*, *eq*, *order*, *cmp*,
-        or *hash* overrides whatever *auto_detect* would determine.
-
-    :param bool repr: Create a ``__repr__`` method with a human readable
-        representation of *attrs* attributes..
-    :param bool str: Create a ``__str__`` method that is identical to
-        ``__repr__``.  This is usually not necessary except for `Exception`\ s.
-    :param bool | None eq: If ``True`` or ``None`` (default), add ``__eq__``
-        and ``__ne__`` methods that check two instances for equality.
-
-        They compare the instances as if they were tuples of their *attrs*
-        attributes if and only if the types of both classes are *identical*!
-
-        .. seealso:: `comparison`
-    :param bool | None order: If ``True``, add ``__lt__``, ``__le__``,
-        ``__gt__``, and ``__ge__`` methods that behave like *eq* above and
-        allow instances to be ordered. If ``None`` (default) mirror value of
-        *eq*.
-
-        .. seealso:: `comparison`
-    :param bool | None cmp: Setting *cmp* is equivalent to setting *eq* and
-        *order* to the same value. Must not be mixed with *eq* or *order*.
-
-        .. seealso:: `comparison`
-    :param bool | None unsafe_hash: If ``None`` (default), the ``__hash__``
-        method is generated according how *eq* and *frozen* are set.
-
-        1. If *both* are True, *attrs* will generate a ``__hash__`` for you.
-        2. If *eq* is True and *frozen* is False, ``__hash__`` will be set to
-           None, marking it unhashable (which it is).
-        3. If *eq* is False, ``__hash__`` will be left untouched meaning the
-           ``__hash__`` method of the base class will be used (if base class is
-           ``object``, this means it will fall back to id-based hashing.).
-
-        Although not recommended, you can decide for yourself and force *attrs*
-        to create one (e.g. if the class is immutable even though you didn't
-        freeze it programmatically) by passing ``True`` or not.  Both of these
-        cases are rather special and should be used carefully.
-
-        .. seealso::
-
-           - Our documentation on `hashing`,
-           - Python's documentation on `object.__hash__`,
-           - and the `GitHub issue that led to the default \
-             behavior <https://github.com/python-attrs/attrs/issues/136>`_ for
-             more details.
-
-    :param bool | None hash: Alias for *unsafe_hash*. *unsafe_hash* takes
-        precedence.
-    :param bool init: Create a ``__init__`` method that initializes the *attrs*
-        attributes. Leading underscores are stripped for the argument name. If
-        a ``__attrs_pre_init__`` method exists on the class, it will be called
-        before the class is initialized. If a ``__attrs_post_init__`` method
-        exists on the class, it will be called after the class is fully
-        initialized.
-
-        If ``init`` is ``False``, an ``__attrs_init__`` method will be injected
-        instead. This allows you to define a custom ``__init__`` method that
-        can do pre-init work such as ``super().__init__()``, and then call
-        ``__attrs_init__()`` and ``__attrs_post_init__()``.
-
-        .. seealso:: `init`
-    :param bool slots: Create a :term:`slotted class <slotted classes>` that's
-        more memory-efficient. Slotted classes are generally superior to the
-        default dict classes, but have some gotchas you should know about, so
-        we encourage you to read the :term:`glossary entry <slotted classes>`.
-    :param bool frozen: Make instances immutable after initialization.  If
-        someone attempts to modify a frozen instance,
-        `attrs.exceptions.FrozenInstanceError` is raised.
-
-        .. note::
-
-            1. This is achieved by installing a custom ``__setattr__`` method
-               on your class, so you can't implement your own.
-
-            2. True immutability is impossible in Python.
-
-            3. This *does* have a minor a runtime performance `impact
-               <how-frozen>` when initializing new instances.  In other words:
-               ``__init__`` is slightly slower with ``frozen=True``.
-
-            4. If a class is frozen, you cannot modify ``self`` in
-               ``__attrs_post_init__`` or a self-written ``__init__``. You can
-               circumvent that limitation by using ``object.__setattr__(self,
-               "attribute_name", value)``.
-
-            5. Subclasses of a frozen class are frozen too.
-
-    :param bool weakref_slot: Make instances weak-referenceable.  This has no
-        effect unless ``slots`` is also enabled.
-    :param bool auto_attribs: If ``True``, collect :pep:`526`-annotated
-        attributes from the class body.
-
-        In this case, you **must** annotate every field.  If *attrs* encounters
-        a field that is set to an `attr.ib` but lacks a type annotation, an
-        `attr.exceptions.UnannotatedAttributeError` is raised.  Use
-        ``field_name: typing.Any = attr.ib(...)`` if you don't want to set a
-        type.
-
-        If you assign a value to those attributes (e.g. ``x: int = 42``), that
-        value becomes the default value like if it were passed using
-        ``attr.ib(default=42)``.  Passing an instance of `attrs.Factory` also
-        works as expected in most cases (see warning below).
-
-        Attributes annotated as `typing.ClassVar`, and attributes that are
-        neither annotated nor set to an `attr.ib` are **ignored**.
-
-        .. warning::
-           For features that use the attribute name to create decorators (e.g.
-           :ref:`validators <validators>`), you still *must* assign `attr.ib`
-           to them. Otherwise Python will either not find the name or try to
-           use the default value to call e.g. ``validator`` on it.
-
-           These errors can be quite confusing and probably the most common bug
-           report on our bug tracker.
-
-    :param bool kw_only: Make all attributes keyword-only in the generated
-        ``__init__`` (if ``init`` is ``False``, this parameter is ignored).
-    :param bool cache_hash: Ensure that the object's hash code is computed only
-        once and stored on the object.  If this is set to ``True``, hashing
-        must be either explicitly or implicitly enabled for this class.  If the
-        hash code is cached, avoid any reassignments of fields involved in hash
-        code computation or mutations of the objects those fields point to
-        after object creation.  If such changes occur, the behavior of the
-        object's hash code is undefined.
-    :param bool auto_exc: If the class subclasses `BaseException` (which
-        implicitly includes any subclass of any exception), the following
-        happens to behave like a well-behaved Python exceptions class:
-
-        - the values for *eq*, *order*, and *hash* are ignored and the
-          instances compare and hash by the instance's ids (N.B. *attrs* will
-          *not* remove existing implementations of ``__hash__`` or the equality
-          methods. It just won't add own ones.),
-        - all attributes that are either passed into ``__init__`` or have a
-          default value are additionally available as a tuple in the ``args``
-          attribute,
-        - the value of *str* is ignored leaving ``__str__`` to base classes.
-    :param bool collect_by_mro: Setting this to `True` fixes the way *attrs*
-       collects attributes from base classes.  The default behavior is
-       incorrect in certain cases of multiple inheritance.  It should be on by
-       default but is kept off for backward-compatibility.
-
-       .. seealso::
-          Issue `#428 <https://github.com/python-attrs/attrs/issues/428>`_
-
-    :param bool | None getstate_setstate:
-       .. note::
-          This is usually only interesting for slotted classes and you should
-          probably just set *auto_detect* to `True`.
-
-       If `True`, ``__getstate__`` and ``__setstate__`` are generated and
-       attached to the class. This is necessary for slotted classes to be
-       pickleable. If left `None`, it's `True` by default for slotted classes
-       and ``False`` for dict classes.
-
-       If *auto_detect* is `True`, and *getstate_setstate* is left `None`, and
-       **either** ``__getstate__`` or ``__setstate__`` is detected directly on
-       the class (i.e. not inherited), it is set to `False` (this is usually
-       what you want).
-
-    :param on_setattr: A callable that is run whenever the user attempts to set
-        an attribute (either by assignment like ``i.x = 42`` or by using
-        `setattr` like ``setattr(i, "x", 42)``). It receives the same arguments
-        as validators: the instance, the attribute that is being modified, and
-        the new value.
-
-        If no exception is raised, the attribute is set to the return value of
-        the callable.
-
-        If a list of callables is passed, they're automatically wrapped in an
-        `attrs.setters.pipe`.
-    :type on_setattr: `callable`, or a list of callables, or `None`, or
-        `attrs.setters.NO_OP`
-
-    :param callable | None field_transformer:
-        A function that is called with the original class object and all fields
-        right before *attrs* finalizes the class.  You can use this, e.g., to
-        automatically add converters or validators to fields based on their
-        types.
-
-        .. seealso:: `transform-fields`
-
-    :param bool match_args:
-        If `True` (default), set ``__match_args__`` on the class to support
-        :pep:`634` (Structural Pattern Matching). It is a tuple of all
-        non-keyword-only ``__init__`` parameter names on Python 3.10 and later.
-        Ignored on older Python versions.
+        Notably, leaving *on_setattr* as `None` will **not** add any hooks.
 
     .. versionadded:: 16.0.0 *slots*
     .. versionadded:: 16.1.0 *frozen*
     .. versionadded:: 16.3.0 *str*
     .. versionadded:: 16.3.0 Support for ``__attrs_post_init__``.
     .. versionchanged:: 17.1.0
-       *hash* supports ``None`` as value which is also the default now.
+       *hash* supports `None` as value which is also the default now.
     .. versionadded:: 17.3.0 *auto_attribs*
     .. versionchanged:: 18.1.0
        If *these* is passed, no attributes are deleted from the class body.
@@ -1595,10 +1324,29 @@ def attrs(
     .. versionadded:: 21.3.0 *match_args*
     .. versionadded:: 22.2.0
        *unsafe_hash* as an alias for *hash* (for :pep:`681` compliance).
+    .. deprecated:: 24.1.0 *repr_ns*
+    .. versionchanged:: 24.1.0
+       Instances are not compared as tuples of attributes anymore, but using a
+       big ``and`` condition. This is faster and has more correct behavior for
+       uncomparable values like `math.nan`.
+    .. versionadded:: 24.1.0
+       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*.
     """
+    if repr_ns is not None:
+        import warnings
+
+        warnings.warn(
+            DeprecationWarning(
+                "The `repr_ns` argument is deprecated and will be removed in or after August 2025."
+            ),
+            stacklevel=2,
+        )
+
     eq_, order_ = _determine_attrs_eq_order(cmp, eq, order, None)
 
-    # unsafe_hash takes precedence due to PEP 681.
+    #  unsafe_hash takes precedence due to PEP 681.
     if unsafe_hash is not None:
         hash = unsafe_hash
 
@@ -1698,8 +1446,11 @@ def attrs(
                 msg = "Invalid value for cache_hash.  To use hash caching, init must be True."
                 raise TypeError(msg)
 
+        if PY_3_13_PLUS and not _has_own_attribute(cls, "__replace__"):
+            builder.add_replace()
+
         if (
-            PY310
+            PY_3_10_PLUS
             and match_args
             and not _has_own_attribute(cls, "__match_args__")
         ):
@@ -1708,7 +1459,7 @@ def attrs(
         return builder.build_class()
 
     # maybe_cls's type depends on the usage of the decorator.  It's a class
-    # if it's used as `@attrs` but ``None`` if used as `@attrs()`.
+    # if it's used as `@attrs` but `None` if used as `@attrs()`.
     if maybe_cls is None:
         return wrap
 
@@ -1793,17 +1544,17 @@ def _make_hash(cls, attrs, frozen, cache_hash):
         method_lines.append(indent + "    " + closing_braces)
 
     if cache_hash:
-        method_lines.append(tab + f"if self.{_hash_cache_field} is None:")
+        method_lines.append(tab + f"if self.{_HASH_CACHE_FIELD} is None:")
         if frozen:
             append_hash_computation_lines(
-                f"object.__setattr__(self, '{_hash_cache_field}', ", tab * 2
+                f"object.__setattr__(self, '{_HASH_CACHE_FIELD}', ", tab * 2
             )
             method_lines.append(tab * 2 + ")")  # close __setattr__
         else:
             append_hash_computation_lines(
-                f"self.{_hash_cache_field} = ", tab * 2
+                f"self.{_HASH_CACHE_FIELD} = ", tab * 2
             )
-        method_lines.append(tab + f"return self.{_hash_cache_field}")
+        method_lines.append(tab + f"return self.{_HASH_CACHE_FIELD}")
     else:
         append_hash_computation_lines("return ", tab)
 
@@ -1851,25 +1602,23 @@ def _make_eq(cls, attrs):
         "        return NotImplemented",
     ]
 
-    # We can't just do a big self.x = other.x and... clause due to
-    # irregularities like nan == nan is false but (nan,) == (nan,) is true.
     globs = {}
     if attrs:
         lines.append("    return  (")
-        others = ["    ) == ("]
         for a in attrs:
             if a.eq_key:
                 cmp_name = f"_{a.name}_key"
                 # Add the key function to the global namespace
                 # of the evaluated function.
                 globs[cmp_name] = a.eq_key
-                lines.append(f"        {cmp_name}(self.{a.name}),")
-                others.append(f"        {cmp_name}(other.{a.name}),")
+                lines.append(
+                    f"        {cmp_name}(self.{a.name}) == {cmp_name}(other.{a.name})"
+                )
             else:
-                lines.append(f"        self.{a.name},")
-                others.append(f"        other.{a.name},")
-
-        lines += [*others, "    )"]
+                lines.append(f"        self.{a.name} == other.{a.name}")
+            if a is not attrs[-1]:
+                lines[-1] = f"{lines[-1]} and"
+        lines.append("    )")
     else:
         lines.append("    return True")
 
@@ -2022,13 +1771,17 @@ def fields(cls):
     The tuple also allows accessing the fields by their names (see below for
     examples).
 
-    :param type cls: Class to introspect.
+    Args:
+        cls (type): Class to introspect.
 
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
+    Raises:
+        TypeError: If *cls* is not a class.
 
-    :rtype: tuple (with name accessors) of `attrs.Attribute`
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
+
+    Returns:
+        tuple (with name accessors) of `attrs.Attribute`
 
     .. versionchanged:: 16.2.0 Returned tuple allows accessing the fields
        by name.
@@ -2059,16 +1812,20 @@ def fields(cls):
 
 def fields_dict(cls):
     """
-    Return an ordered dictionary of *attrs* attributes for a class, whose
-    keys are the attribute names.
+    Return an ordered dictionary of *attrs* attributes for a class, whose keys
+    are the attribute names.
 
-    :param type cls: Class to introspect.
+    Args:
+        cls (type): Class to introspect.
 
-    :raise TypeError: If *cls* is not a class.
-    :raise attrs.exceptions.NotAnAttrsClassError: If *cls* is not an *attrs*
-        class.
+    Raises:
+        TypeError: If *cls* is not a class.
 
-    :rtype: dict
+        attrs.exceptions.NotAnAttrsClassError:
+            If *cls* is not an *attrs* class.
+
+    Returns:
+        dict[str, attrs.Attribute]: Dict of attribute name to definition
 
     .. versionadded:: 18.1.0
     """
@@ -2088,7 +1845,8 @@ def validate(inst):
 
     Leaves all exceptions through.
 
-    :param inst: Instance of a class with *attrs* attributes.
+    Args:
+        inst: Instance of a class with *attrs* attributes.
     """
     if _config._run_validators is False:
         return
@@ -2099,15 +1857,12 @@ def validate(inst):
             v(inst, a, getattr(inst, a.name))
 
 
-def _is_slot_cls(cls):
-    return "__slots__" in cls.__dict__
-
-
 def _is_slot_attr(a_name, base_attr_map):
     """
     Check if the attribute name comes from a slot class.
     """
-    return a_name in base_attr_map and _is_slot_cls(base_attr_map[a_name])
+    cls = base_attr_map.get(a_name)
+    return cls and "__slots__" in cls.__dict__
 
 
 def _make_init(
@@ -2165,7 +1920,7 @@ def _make_init(
         is_exc,
         needs_cached_setattr,
         has_cls_on_setattr,
-        attrs_init,
+        "__attrs_init__" if attrs_init else "__init__",
     )
     if cls.__module__ in sys.modules:
         # This makes typing.get_type_hints(CLS.__init__) resolve string types.
@@ -2176,7 +1931,7 @@ def _make_init(
     if needs_cached_setattr:
         # Save the lookup overhead in __init__ if we need to circumvent
         # setattr hooks.
-        globs["_cached_setattr_get"] = _obj_setattr.__get__
+        globs["_cached_setattr_get"] = _OBJ_SETATTR.__get__
 
     init = _make_method(
         "__attrs_init__" if attrs_init else "__init__",
@@ -2189,26 +1944,24 @@ def _make_init(
     return init
 
 
-def _setattr(attr_name, value_var, has_on_setattr):
+def _setattr(attr_name: str, value_var: str, has_on_setattr: bool) -> str:
     """
     Use the cached object.setattr to set *attr_name* to *value_var*.
     """
     return f"_setattr('{attr_name}', {value_var})"
 
 
-def _setattr_with_converter(attr_name, value_var, has_on_setattr):
+def _setattr_with_converter(
+    attr_name: str, value_var: str, has_on_setattr: bool, converter: Converter
+) -> str:
     """
     Use the cached object.setattr to set *attr_name* to *value_var*, but run
     its converter first.
     """
-    return "_setattr('%s', %s(%s))" % (
-        attr_name,
-        _init_converter_pat % (attr_name,),
-        value_var,
-    )
+    return f"_setattr('{attr_name}', {converter._fmt_converter_call(attr_name, value_var)})"
 
 
-def _assign(attr_name, value, has_on_setattr):
+def _assign(attr_name: str, value: str, has_on_setattr: bool) -> str:
     """
     Unless *attr_name* has an on_setattr hook, use normal assignment. Otherwise
     relegate to _setattr.
@@ -2219,90 +1972,100 @@ def _assign(attr_name, value, has_on_setattr):
     return f"self.{attr_name} = {value}"
 
 
-def _assign_with_converter(attr_name, value_var, has_on_setattr):
+def _assign_with_converter(
+    attr_name: str, value_var: str, has_on_setattr: bool, converter: Converter
+) -> str:
     """
     Unless *attr_name* has an on_setattr hook, use normal assignment after
     conversion. Otherwise relegate to _setattr_with_converter.
     """
     if has_on_setattr:
-        return _setattr_with_converter(attr_name, value_var, True)
+        return _setattr_with_converter(attr_name, value_var, True, converter)
 
-    return "self.%s = %s(%s)" % (
-        attr_name,
-        _init_converter_pat % (attr_name,),
-        value_var,
-    )
+    return f"self.{attr_name} = {converter._fmt_converter_call(attr_name, value_var)}"
+
+
+def _determine_setters(
+    frozen: bool, slots: bool, base_attr_map: dict[str, type]
+):
+    """
+    Determine the correct setter functions based on whether a class is frozen
+    and/or slotted.
+    """
+    if frozen is True:
+        if slots is True:
+            return (), _setattr, _setattr_with_converter
+
+        # Dict frozen classes assign directly to __dict__.
+        # But only if the attribute doesn't come from an ancestor slot
+        # class.
+        # Note _inst_dict will be used again below if cache_hash is True
+
+        def fmt_setter(
+            attr_name: str, value_var: str, has_on_setattr: bool
+        ) -> str:
+            if _is_slot_attr(attr_name, base_attr_map):
+                return _setattr(attr_name, value_var, has_on_setattr)
+
+            return f"_inst_dict['{attr_name}'] = {value_var}"
+
+        def fmt_setter_with_converter(
+            attr_name: str,
+            value_var: str,
+            has_on_setattr: bool,
+            converter: Converter,
+        ) -> str:
+            if has_on_setattr or _is_slot_attr(attr_name, base_attr_map):
+                return _setattr_with_converter(
+                    attr_name, value_var, has_on_setattr, converter
+                )
+
+            return f"_inst_dict['{attr_name}'] = {converter._fmt_converter_call(attr_name, value_var)}"
+
+        return (
+            ("_inst_dict = self.__dict__",),
+            fmt_setter,
+            fmt_setter_with_converter,
+        )
+
+    # Not frozen -- we can just assign directly.
+    return (), _assign, _assign_with_converter
 
 
 def _attrs_to_init_script(
-    attrs,
-    frozen,
-    slots,
-    pre_init,
-    pre_init_has_args,
-    post_init,
-    cache_hash,
-    base_attr_map,
-    is_exc,
-    needs_cached_setattr,
-    has_cls_on_setattr,
-    attrs_init,
-):
+    attrs: list[Attribute],
+    is_frozen: bool,
+    is_slotted: bool,
+    call_pre_init: bool,
+    pre_init_has_args: bool,
+    call_post_init: bool,
+    does_cache_hash: bool,
+    base_attr_map: dict[str, type],
+    is_exc: bool,
+    needs_cached_setattr: bool,
+    has_cls_on_setattr: bool,
+    method_name: str,
+) -> tuple[str, dict, dict]:
     """
-    Return a script of an initializer for *attrs* and a dict of globals.
+    Return a script of an initializer for *attrs*, a dict of globals, and
+    annotations for the initializer.
 
-    The globals are expected by the generated script.
-
-    If *frozen* is True, we cannot set the attributes directly so we use
-    a cached ``object.__setattr__``.
+    The globals are required by the generated script.
     """
-    lines = []
-    if pre_init:
-        lines.append("self.__attrs_pre_init__()")
+    lines = ["self.__attrs_pre_init__()"] if call_pre_init else []
 
     if needs_cached_setattr:
         lines.append(
             # Circumvent the __setattr__ descriptor to save one lookup per
-            # assignment.
-            # Note _setattr will be used again below if cache_hash is True
+            # assignment. Note _setattr will be used again below if
+            # does_cache_hash is True.
             "_setattr = _cached_setattr_get(self)"
         )
 
-    if frozen is True:
-        if slots is True:
-            fmt_setter = _setattr
-            fmt_setter_with_converter = _setattr_with_converter
-        else:
-            # Dict frozen classes assign directly to __dict__.
-            # But only if the attribute doesn't come from an ancestor slot
-            # class.
-            # Note _inst_dict will be used again below if cache_hash is True
-            lines.append("_inst_dict = self.__dict__")
-
-            def fmt_setter(attr_name, value_var, has_on_setattr):
-                if _is_slot_attr(attr_name, base_attr_map):
-                    return _setattr(attr_name, value_var, has_on_setattr)
-
-                return f"_inst_dict['{attr_name}'] = {value_var}"
-
-            def fmt_setter_with_converter(
-                attr_name, value_var, has_on_setattr
-            ):
-                if has_on_setattr or _is_slot_attr(attr_name, base_attr_map):
-                    return _setattr_with_converter(
-                        attr_name, value_var, has_on_setattr
-                    )
-
-                return "_inst_dict['%s'] = %s(%s)" % (
-                    attr_name,
-                    _init_converter_pat % (attr_name,),
-                    value_var,
-                )
-
-    else:
-        # Not frozen.
-        fmt_setter = _assign
-        fmt_setter_with_converter = _assign_with_converter
+    extra_lines, fmt_setter, fmt_setter_with_converter = _determine_setters(
+        is_frozen, is_slotted, base_attr_map
+    )
+    lines.extend(extra_lines)
 
     args = []
     kw_only_args = []
@@ -2328,19 +2091,26 @@ def _attrs_to_init_script(
         has_factory = isinstance(a.default, Factory)
         maybe_self = "self" if has_factory and a.default.takes_self else ""
 
+        if a.converter is not None and not isinstance(a.converter, Converter):
+            converter = Converter(a.converter)
+        else:
+            converter = a.converter
+
         if a.init is False:
             if has_factory:
-                init_factory_name = _init_factory_pat % (a.name,)
-                if a.converter is not None:
+                init_factory_name = _INIT_FACTORY_PAT % (a.name,)
+                if converter is not None:
                     lines.append(
                         fmt_setter_with_converter(
                             attr_name,
                             init_factory_name + f"({maybe_self})",
                             has_on_setattr,
+                            converter,
                         )
                     )
-                    conv_name = _init_converter_pat % (a.name,)
-                    names_for_globals[conv_name] = a.converter
+                    names_for_globals[converter._get_global_name(a.name)] = (
+                        converter.converter
+                    )
                 else:
                     lines.append(
                         fmt_setter(
@@ -2350,16 +2120,18 @@ def _attrs_to_init_script(
                         )
                     )
                 names_for_globals[init_factory_name] = a.default.factory
-            elif a.converter is not None:
+            elif converter is not None:
                 lines.append(
                     fmt_setter_with_converter(
                         attr_name,
                         f"attr_dict['{attr_name}'].default",
                         has_on_setattr,
+                        converter,
                     )
                 )
-                conv_name = _init_converter_pat % (a.name,)
-                names_for_globals[conv_name] = a.converter
+                names_for_globals[converter._get_global_name(a.name)] = (
+                    converter.converter
+                )
             else:
                 lines.append(
                     fmt_setter(
@@ -2375,15 +2147,15 @@ def _attrs_to_init_script(
             else:
                 args.append(arg)
 
-            if a.converter is not None:
+            if converter is not None:
                 lines.append(
                     fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
+                        attr_name, arg_name, has_on_setattr, converter
                     )
                 )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
+                names_for_globals[converter._get_global_name(a.name)] = (
+                    converter.converter
+                )
             else:
                 lines.append(fmt_setter(attr_name, arg_name, has_on_setattr))
 
@@ -2395,12 +2167,12 @@ def _attrs_to_init_script(
                 args.append(arg)
             lines.append(f"if {arg_name} is not NOTHING:")
 
-            init_factory_name = _init_factory_pat % (a.name,)
-            if a.converter is not None:
+            init_factory_name = _INIT_FACTORY_PAT % (a.name,)
+            if converter is not None:
                 lines.append(
                     "    "
                     + fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
+                        attr_name, arg_name, has_on_setattr, converter
                     )
                 )
                 lines.append("else:")
@@ -2410,11 +2182,12 @@ def _attrs_to_init_script(
                         attr_name,
                         init_factory_name + "(" + maybe_self + ")",
                         has_on_setattr,
+                        converter,
                     )
                 )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
+                names_for_globals[converter._get_global_name(a.name)] = (
+                    converter.converter
+                )
             else:
                 lines.append(
                     "    " + fmt_setter(attr_name, arg_name, has_on_setattr)
@@ -2435,26 +2208,24 @@ def _attrs_to_init_script(
             else:
                 args.append(arg_name)
 
-            if a.converter is not None:
+            if converter is not None:
                 lines.append(
                     fmt_setter_with_converter(
-                        attr_name, arg_name, has_on_setattr
+                        attr_name, arg_name, has_on_setattr, converter
                     )
                 )
-                names_for_globals[
-                    _init_converter_pat % (a.name,)
-                ] = a.converter
+                names_for_globals[converter._get_global_name(a.name)] = (
+                    converter.converter
+                )
             else:
                 lines.append(fmt_setter(attr_name, arg_name, has_on_setattr))
 
         if a.init is True:
-            if a.type is not None and a.converter is None:
+            if a.type is not None and converter is None:
                 annotations[arg_name] = a.type
-            elif a.converter is not None:
-                # Try to get the type from the converter.
-                t = _AnnotationExtractor(a.converter).get_first_param_type()
-                if t:
-                    annotations[arg_name] = t
+            elif converter is not None and converter._first_param_type:
+                # Use the type from the converter if present.
+                annotations[arg_name] = converter._first_param_type
 
     if attrs_to_validate:  # we can skip this if there are no validators.
         names_for_globals["_config"] = _config
@@ -2466,25 +2237,23 @@ def _attrs_to_init_script(
             names_for_globals[val_name] = a.validator
             names_for_globals[attr_name] = a
 
-    if post_init:
+    if call_post_init:
         lines.append("self.__attrs_post_init__()")
 
-    # because this is set only after __attrs_post_init__ is called, a crash
+    # Because this is set only after __attrs_post_init__ is called, a crash
     # will result if post-init tries to access the hash code.  This seemed
-    # preferable to setting this beforehand, in which case alteration to
-    # field values during post-init combined with post-init accessing the
-    # hash code would result in silent bugs.
-    if cache_hash:
-        if frozen:
-            if slots:  # noqa: SIM108
-                # if frozen and slots, then _setattr defined above
-                init_hash_cache = "_setattr('%s', %s)"
+    # preferable to setting this beforehand, in which case alteration to field
+    # values during post-init combined with post-init accessing the hash code
+    # would result in silent bugs.
+    if does_cache_hash:
+        if is_frozen:
+            if is_slotted:
+                init_hash_cache = f"_setattr('{_HASH_CACHE_FIELD}', None)"
             else:
-                # if frozen and not slots, then _inst_dict defined above
-                init_hash_cache = "_inst_dict['%s'] = %s"
+                init_hash_cache = f"_inst_dict['{_HASH_CACHE_FIELD}'] = None"
         else:
-            init_hash_cache = "self.%s = %s"
-        lines.append(init_hash_cache % (_hash_cache_field, "None"))
+            init_hash_cache = f"self.{_HASH_CACHE_FIELD} = None"
+        lines.append(init_hash_cache)
 
     # For exceptions we rely on BaseException.__init__ for proper
     # initialization.
@@ -2496,29 +2265,28 @@ def _attrs_to_init_script(
     args = ", ".join(args)
     pre_init_args = args
     if kw_only_args:
-        args += "%s*, %s" % (
-            ", " if args else "",  # leading comma
-            ", ".join(kw_only_args),  # kw_only args
-        )
+        # leading comma & kw_only args
+        args += f"{', ' if args else ''}*, {', '.join(kw_only_args)}"
         pre_init_kw_only_args = ", ".join(
-            ["%s=%s" % (kw_arg, kw_arg) for kw_arg in kw_only_args]
+            [
+                f"{kw_arg_name}={kw_arg_name}"
+                # We need to remove the defaults from the kw_only_args.
+                for kw_arg_name in (kwa.split("=")[0] for kwa in kw_only_args)
+            ]
         )
-        pre_init_args += (
-            ", " if pre_init_args else ""
-        )  # handle only kwargs and no regular args
+        pre_init_args += ", " if pre_init_args else ""
         pre_init_args += pre_init_kw_only_args
 
-    if pre_init and pre_init_has_args:
-        # If pre init method has arguments, pass same arguments as `__init__`
-        lines[0] = "self.__attrs_pre_init__(%s)" % pre_init_args
+    if call_pre_init and pre_init_has_args:
+        # If pre init method has arguments, pass same arguments as `__init__`.
+        lines[0] = f"self.__attrs_pre_init__({pre_init_args})"
 
+    # Python <3.12 doesn't allow backslashes in f-strings.
+    NL = "\n    "
     return (
-        "def %s(self, %s):\n    %s\n"
-        % (
-            ("__attrs_init__" if attrs_init else "__init__"),
-            args,
-            "\n    ".join(lines) if lines else "pass",
-        ),
+        f"""def {method_name}(self, {args}):
+    {NL.join(lines) if lines else 'pass'}
+""",
         names_for_globals,
         annotations,
     )
@@ -2543,20 +2311,19 @@ class Attribute:
 
        You should never instantiate this class yourself.
 
-    The class has *all* arguments of `attr.ib` (except for ``factory``
-    which is only syntactic sugar for ``default=Factory(...)`` plus the
-    following:
+    The class has *all* arguments of `attr.ib` (except for ``factory`` which is
+    only syntactic sugar for ``default=Factory(...)`` plus the following:
 
     - ``name`` (`str`): The name of the attribute.
     - ``alias`` (`str`): The __init__ parameter name of the attribute, after
       any explicit overrides and default private-attribute-name handling.
     - ``inherited`` (`bool`): Whether or not that attribute has been inherited
       from a base class.
-    - ``eq_key`` and ``order_key`` (`typing.Callable` or `None`): The callables
-      that are used for comparing and ordering objects by this attribute,
-      respectively. These are set by passing a callable to `attr.ib`'s ``eq``,
-      ``order``, or ``cmp`` arguments. See also :ref:`comparison customization
-      <custom-comparison>`.
+    - ``eq_key`` and ``order_key`` (`typing.Callable` or `None`): The
+      callables that are used for comparing and ordering objects by this
+      attribute, respectively. These are set by passing a callable to
+      `attr.ib`'s ``eq``, ``order``, or ``cmp`` arguments. See also
+      :ref:`comparison customization <custom-comparison>`.
 
     Instances of this class are frequently used for introspection purposes
     like:
@@ -2579,7 +2346,9 @@ class Attribute:
     For the full version history of the fields, see `attr.ib`.
     """
 
-    __slots__ = (
+    # These slots must NOT be reordered because we use them later for
+    # instantiation.
+    __slots__ = (  # noqa: RUF023
         "name",
         "default",
         "validator",
@@ -2625,7 +2394,7 @@ class Attribute:
         )
 
         # Cache this descriptor here to speed things up later.
-        bound_setattr = _obj_setattr.__get__(self)
+        bound_setattr = _OBJ_SETATTR.__get__(self)
 
         # Despite the big red warning, people *do* instantiate `Attribute`
         # themselves.
@@ -2645,7 +2414,7 @@ class Attribute:
             (
                 types.MappingProxyType(dict(metadata))  # Shallow copy
                 if metadata
-                else _empty_metadata_singleton
+                else _EMPTY_METADATA_SINGLETON
             ),
         )
         bound_setattr("type", type)
@@ -2655,7 +2424,7 @@ class Attribute:
         bound_setattr("alias", alias)
 
     def __setattr__(self, name, value):
-        raise FrozenInstanceError()
+        raise FrozenInstanceError
 
     @classmethod
     def from_counting_attr(cls, name, ca, type=None):
@@ -2693,7 +2462,7 @@ class Attribute:
         Copy *self* and apply *changes*.
 
         This works similarly to `attrs.evolve` but that function does not work
-        with `Attribute`.
+        with :class:`attrs.Attribute`.
 
         It is mainly meant to be used for `transform-fields`.
 
@@ -2722,16 +2491,18 @@ class Attribute:
         self._setattrs(zip(self.__slots__, state))
 
     def _setattrs(self, name_values_pairs):
-        bound_setattr = _obj_setattr.__get__(self)
+        bound_setattr = _OBJ_SETATTR.__get__(self)
         for name, value in name_values_pairs:
             if name != "metadata":
                 bound_setattr(name, value)
             else:
                 bound_setattr(
                     name,
-                    types.MappingProxyType(dict(value))
-                    if value
-                    else _empty_metadata_singleton,
+                    (
+                        types.MappingProxyType(dict(value))
+                        if value
+                        else _EMPTY_METADATA_SINGLETON
+                    ),
                 )
 
 
@@ -2771,22 +2542,22 @@ class _CountingAttr:
     """
 
     __slots__ = (
-        "counter",
         "_default",
-        "repr",
+        "_validator",
+        "alias",
+        "converter",
+        "counter",
         "eq",
         "eq_key",
-        "order",
-        "order_key",
         "hash",
         "init",
-        "metadata",
-        "_validator",
-        "converter",
-        "type",
         "kw_only",
+        "metadata",
         "on_setattr",
-        "alias",
+        "order",
+        "order_key",
+        "repr",
+        "type",
     )
     __attrs_attrs__ = (
         *tuple(
@@ -2896,12 +2667,13 @@ class _CountingAttr:
 
         Returns *meth* unchanged.
 
-        :raises DefaultAlreadySetError: If default has been set before.
+        Raises:
+            DefaultAlreadySetError: If default has been set before.
 
         .. versionadded:: 17.1.0
         """
         if self._default is not NOTHING:
-            raise DefaultAlreadySetError()
+            raise DefaultAlreadySetError
 
         self._default = Factory(meth, takes_self=True)
 
@@ -2918,10 +2690,14 @@ class Factory:
     If passed as the default value to `attrs.field`, the factory is used to
     generate a new value.
 
-    :param callable factory: A callable that takes either none or exactly one
-        mandatory positional argument depending on *takes_self*.
-    :param bool takes_self: Pass the partially initialized instance that is
-        being initialized as a positional argument.
+    Args:
+        factory (typing.Callable):
+            A callable that takes either none or exactly one mandatory
+            positional argument depending on *takes_self*.
+
+        takes_self (bool):
+            Pass the partially initialized instance that is being initialized
+            as a positional argument.
 
     .. versionadded:: 17.1.0  *takes_self*
     """
@@ -2965,30 +2741,162 @@ _f = [
 Factory = _add_hash(_add_eq(_add_repr(Factory, attrs=_f), attrs=_f), attrs=_f)
 
 
+class Converter:
+    """
+    Stores a converter callable.
+
+    Allows for the wrapped converter to take additional arguments. The
+    arguments are passed in the order they are documented.
+
+    Args:
+        converter (Callable): A callable that converts the passed value.
+
+        takes_self (bool):
+            Pass the partially initialized instance that is being initialized
+            as a positional argument. (default: `False`)
+
+        takes_field (bool):
+            Pass the field definition (an :class:`Attribute`) into the
+            converter as a positional argument. (default: `False`)
+
+    .. versionadded:: 24.1.0
+    """
+
+    __slots__ = (
+        "__call__",
+        "_first_param_type",
+        "_global_name",
+        "converter",
+        "takes_field",
+        "takes_self",
+    )
+
+    def __init__(self, converter, *, takes_self=False, takes_field=False):
+        self.converter = converter
+        self.takes_self = takes_self
+        self.takes_field = takes_field
+
+        ex = _AnnotationExtractor(converter)
+        self._first_param_type = ex.get_first_param_type()
+
+        if not (self.takes_self or self.takes_field):
+            self.__call__ = lambda value, _, __: self.converter(value)
+        elif self.takes_self and not self.takes_field:
+            self.__call__ = lambda value, instance, __: self.converter(
+                value, instance
+            )
+        elif not self.takes_self and self.takes_field:
+            self.__call__ = lambda value, __, field: self.converter(
+                value, field
+            )
+        else:
+            self.__call__ = lambda value, instance, field: self.converter(
+                value, instance, field
+            )
+
+        rt = ex.get_return_type()
+        if rt is not None:
+            self.__call__.__annotations__["return"] = rt
+
+    @staticmethod
+    def _get_global_name(attr_name: str) -> str:
+        """
+        Return the name that a converter for an attribute name *attr_name*
+        would have.
+        """
+        return f"__attr_converter_{attr_name}"
+
+    def _fmt_converter_call(self, attr_name: str, value_var: str) -> str:
+        """
+        Return a string that calls the converter for an attribute name
+        *attr_name* and the value in variable named *value_var* according to
+        `self.takes_self` and `self.takes_field`.
+        """
+        if not (self.takes_self or self.takes_field):
+            return f"{self._get_global_name(attr_name)}({value_var})"
+
+        if self.takes_self and self.takes_field:
+            return f"{self._get_global_name(attr_name)}({value_var}, self, attr_dict['{attr_name}'])"
+
+        if self.takes_self:
+            return f"{self._get_global_name(attr_name)}({value_var}, self)"
+
+        return f"{self._get_global_name(attr_name)}({value_var}, attr_dict['{attr_name}'])"
+
+    def __getstate__(self):
+        """
+        Return a dict containing only converter and takes_self -- the rest gets
+        computed when loading.
+        """
+        return {
+            "converter": self.converter,
+            "takes_self": self.takes_self,
+            "takes_field": self.takes_field,
+        }
+
+    def __setstate__(self, state):
+        """
+        Load instance from state.
+        """
+        self.__init__(**state)
+
+
+_f = [
+    Attribute(
+        name=name,
+        default=NOTHING,
+        validator=None,
+        repr=True,
+        cmp=None,
+        eq=True,
+        order=False,
+        hash=True,
+        init=True,
+        inherited=False,
+    )
+    for name in ("converter", "takes_self", "takes_field")
+]
+
+Converter = _add_hash(
+    _add_eq(_add_repr(Converter, attrs=_f), attrs=_f), attrs=_f
+)
+
+
 def make_class(
     name, attrs, bases=(object,), class_body=None, **attributes_arguments
 ):
     r"""
     A quick way to create a new class called *name* with *attrs*.
 
-    :param str name: The name for the new class.
+    .. note::
 
-    :param attrs: A list of names or a dictionary of mappings of names to
-        `attr.ib`\ s / `attrs.field`\ s.
+        ``make_class()`` is a thin wrapper around `attr.s`, not `attrs.define`
+        which means that it doesn't come with some of the improved defaults.
 
-        The order is deduced from the order of the names or attributes inside
-        *attrs*.  Otherwise the order of the definition of the attributes is
-        used.
-    :type attrs: `list` or `dict`
+        For example, if you want the same ``on_setattr`` behavior as in
+        `attrs.define`, you have to pass the hooks yourself: ``make_class(...,
+        on_setattr=setters.pipe(setters.convert, setters.validate)``
 
-    :param tuple bases: Classes that the new class will subclass.
+    Args:
+        name (str): The name for the new class.
 
-    :param dict class_body: An optional dictionary of class attributes for the new class.
+        attrs (list | dict):
+            A list of names or a dictionary of mappings of names to `attr.ib`\
+            s / `attrs.field`\ s.
 
-    :param attributes_arguments: Passed unmodified to `attr.s`.
+            The order is deduced from the order of the names or attributes
+            inside *attrs*.  Otherwise the order of the definition of the
+            attributes is used.
 
-    :return: A new class with *attrs*.
-    :rtype: type
+        bases (tuple[type, ...]): Classes that the new class will subclass.
+
+        class_body (dict):
+            An optional dictionary of class attributes for the new class.
+
+        attributes_arguments: Passed unmodified to `attr.s`.
+
+    Returns:
+        type: A new class with *attrs*.
 
     .. versionadded:: 17.1.0 *bases*
     .. versionchanged:: 18.1.0 If *attrs* is ordered, the order is retained.
@@ -3039,14 +2947,19 @@ def make_class(
         True,
     )
 
-    return _attrs(these=cls_dict, **attributes_arguments)(type_)
+    cls = _attrs(these=cls_dict, **attributes_arguments)(type_)
+    # Only add type annotations now or "_attrs()" will complain:
+    cls.__annotations__ = {
+        k: v.type for k, v in cls_dict.items() if v.type is not None
+    }
+    return cls
 
 
 # These are required by within this module so we define them here and merely
 # import into .validators / .converters.
 
 
-@attrs(slots=True, hash=True)
+@attrs(slots=True, unsafe_hash=True)
 class _AndValidator:
     """
     Compose many validators to a single one.
@@ -3065,7 +2978,9 @@ def and_(*validators):
 
     When called on a value, it runs all wrapped validators.
 
-    :param callables validators: Arbitrary number of validators.
+    Args:
+        validators (~collections.abc.Iterable[typing.Callable]):
+            Arbitrary number of validators.
 
     .. versionadded:: 17.1.0
     """
@@ -3087,33 +3002,54 @@ def pipe(*converters):
     When called on a value, it runs all wrapped converters, returning the
     *last* value.
 
-    Type annotations will be inferred from the wrapped converters', if
-    they have any.
+    Type annotations will be inferred from the wrapped converters', if they
+    have any.
 
-    :param callables converters: Arbitrary number of converters.
+        converters (~collections.abc.Iterable[typing.Callable]):
+            Arbitrary number of converters.
 
     .. versionadded:: 20.1.0
     """
 
-    def pipe_converter(val):
-        for converter in converters:
-            val = converter(val)
+    return_instance = any(isinstance(c, Converter) for c in converters)
 
-        return val
+    if return_instance:
+
+        def pipe_converter(val, inst, field):
+            for c in converters:
+                val = (
+                    c(val, inst, field) if isinstance(c, Converter) else c(val)
+                )
+
+            return val
+
+    else:
+
+        def pipe_converter(val):
+            for c in converters:
+                val = c(val)
+
+            return val
 
     if not converters:
         # If the converter list is empty, pipe_converter is the identity.
         A = typing.TypeVar("A")
-        pipe_converter.__annotations__ = {"val": A, "return": A}
+        pipe_converter.__annotations__.update({"val": A, "return": A})
     else:
         # Get parameter type from first converter.
         t = _AnnotationExtractor(converters[0]).get_first_param_type()
         if t:
             pipe_converter.__annotations__["val"] = t
 
+        last = converters[-1]
+        if not PY_3_11_PLUS and isinstance(last, Converter):
+            last = last.__call__
+
         # Get return type from last converter.
-        rt = _AnnotationExtractor(converters[-1]).get_return_type()
+        rt = _AnnotationExtractor(last).get_return_type()
         if rt:
             pipe_converter.__annotations__["return"] = rt
 
+    if return_instance:
+        return Converter(pipe_converter, takes_self=True, takes_field=True)
     return pipe_converter
diff --git a/libs/attr/_next_gen.py b/libs/attr/_next_gen.py
index 1fb9f259b..9290664b2 100644
--- a/libs/attr/_next_gen.py
+++ b/libs/attr/_next_gen.py
@@ -5,16 +5,15 @@ These are keyword-only APIs that call `attr.s` and `attr.ib` with different
 default values.
 """
 
-
 from functools import partial
 
 from . import setters
 from ._funcs import asdict as _asdict
 from ._funcs import astuple as _astuple
 from ._make import (
+    _DEFAULT_ON_SETATTR,
     NOTHING,
     _frozen_setattrs,
-    _ng_default_on_setattr,
     attrib,
     attrs,
 )
@@ -46,44 +45,301 @@ def define(
     match_args=True,
 ):
     r"""
-    Define an *attrs* class.
+    A class decorator that adds :term:`dunder methods` according to
+    :term:`fields <field>` specified using :doc:`type annotations <types>`,
+    `field()` calls, or the *these* argument.
 
-    Differences to the classic `attr.s` that it uses underneath:
+    Since *attrs* patches or replaces an existing class, you cannot use
+    `object.__init_subclass__` with *attrs* classes, because it runs too early.
+    As a replacement, you can define ``__attrs_init_subclass__`` on your class.
+    It will be called by *attrs* classes that subclass it after they're
+    created. See also :ref:`init-subclass`.
 
-    - Automatically detect whether or not *auto_attribs* should be `True` (c.f.
-      *auto_attribs* parameter).
-    - Converters and validators run when attributes are set by default -- if
-      *frozen* is `False`.
-    - *slots=True*
+    Args:
+        slots (bool):
+            Create a :term:`slotted class <slotted classes>` that's more
+            memory-efficient. Slotted classes are generally superior to the
+            default dict classes, but have some gotchas you should know about,
+            so we encourage you to read the :term:`glossary entry <slotted
+            classes>`.
 
-      .. caution::
+        auto_detect (bool):
+            Instead of setting the *init*, *repr*, *eq*, and *hash* arguments
+            explicitly, assume they are set to True **unless any** of the
+            involved methods for one of the arguments is implemented in the
+            *current* class (meaning, it is *not* inherited from some base
+            class).
 
-         Usually this has only upsides and few visible effects in everyday
-         programming. But it *can* lead to some surprising behaviors, so please
-         make sure to read :term:`slotted classes`.
-    - *auto_exc=True*
-    - *auto_detect=True*
-    - *order=False*
-    - Some options that were only relevant on Python 2 or were kept around for
-      backwards-compatibility have been removed.
+            So, for example by implementing ``__eq__`` on a class yourself,
+            *attrs* will deduce ``eq=False`` and will create *neither*
+            ``__eq__`` *nor* ``__ne__`` (but Python classes come with a
+            sensible ``__ne__`` by default, so it *should* be enough to only
+            implement ``__eq__`` in most cases).
 
-    Please note that these are all defaults and you can change them as you
-    wish.
+            Passing True or False` to *init*, *repr*, *eq*, or *hash*
+            overrides whatever *auto_detect* would determine.
 
-    :param Optional[bool] auto_attribs: If set to `True` or `False`, it behaves
-       exactly like `attr.s`. If left `None`, `attr.s` will try to guess:
+        auto_exc (bool):
+            If the class subclasses `BaseException` (which implicitly includes
+            any subclass of any exception), the following happens to behave
+            like a well-behaved Python exception class:
 
-       1. If any attributes are annotated and no unannotated `attrs.fields`\ s
-          are found, it assumes *auto_attribs=True*.
-       2. Otherwise it assumes *auto_attribs=False* and tries to collect
-          `attrs.fields`\ s.
+            - the values for *eq*, *order*, and *hash* are ignored and the
+              instances compare and hash by the instance's ids [#]_ ,
+            - all attributes that are either passed into ``__init__`` or have a
+              default value are additionally available as a tuple in the
+              ``args`` attribute,
+            - the value of *str* is ignored leaving ``__str__`` to base
+              classes.
 
-    For now, please refer to `attr.s` for the rest of the parameters.
+            .. [#]
+               Note that *attrs* will *not* remove existing implementations of
+               ``__hash__`` or the equality methods. It just won't add own
+               ones.
+
+        on_setattr (~typing.Callable | list[~typing.Callable] | None | ~typing.Literal[attrs.setters.NO_OP]):
+            A callable that is run whenever the user attempts to set an
+            attribute (either by assignment like ``i.x = 42`` or by using
+            `setattr` like ``setattr(i, "x", 42)``). It receives the same
+            arguments as validators: the instance, the attribute that is being
+            modified, and the new value.
+
+            If no exception is raised, the attribute is set to the return value
+            of the callable.
+
+            If a list of callables is passed, they're automatically wrapped in
+            an `attrs.setters.pipe`.
+
+            If left None, the default behavior is to run converters and
+            validators whenever an attribute is set.
+
+        init (bool):
+            Create a ``__init__`` method that initializes the *attrs*
+            attributes. Leading underscores are stripped for the argument name,
+            unless an alias is set on the attribute.
+
+            .. seealso::
+                `init` shows advanced ways to customize the generated
+                ``__init__`` method, including executing code before and after.
+
+        repr(bool):
+            Create a ``__repr__`` method with a human readable representation
+            of *attrs* attributes.
+
+        str (bool):
+            Create a ``__str__`` method that is identical to ``__repr__``. This
+            is usually not necessary except for `Exception`\ s.
+
+        eq (bool | None):
+            If True or None (default), add ``__eq__`` and ``__ne__`` methods
+            that check two instances for equality.
+
+            .. seealso::
+                `comparison` describes how to customize the comparison behavior
+                going as far comparing NumPy arrays.
+
+        order (bool | None):
+            If True, add ``__lt__``, ``__le__``, ``__gt__``, and ``__ge__``
+            methods that behave like *eq* above and allow instances to be
+            ordered.
+
+            They compare the instances as if they were tuples of their *attrs*
+            attributes if and only if the types of both classes are
+            *identical*.
+
+            If `None` mirror value of *eq*.
+
+            .. seealso:: `comparison`
+
+        unsafe_hash (bool | None):
+            If None (default), the ``__hash__`` method is generated according
+            how *eq* and *frozen* are set.
+
+            1. If *both* are True, *attrs* will generate a ``__hash__`` for
+               you.
+            2. If *eq* is True and *frozen* is False, ``__hash__`` will be set
+               to None, marking it unhashable (which it is).
+            3. If *eq* is False, ``__hash__`` will be left untouched meaning
+               the ``__hash__`` method of the base class will be used. If the
+               base class is `object`, this means it will fall back to id-based
+               hashing.
+
+            Although not recommended, you can decide for yourself and force
+            *attrs* to create one (for example, if the class is immutable even
+            though you didn't freeze it programmatically) by passing True or
+            not.  Both of these cases are rather special and should be used
+            carefully.
+
+            .. seealso::
+
+                - Our documentation on `hashing`,
+                - Python's documentation on `object.__hash__`,
+                - and the `GitHub issue that led to the default \ behavior
+                  <https://github.com/python-attrs/attrs/issues/136>`_ for more
+                  details.
+
+        hash (bool | None):
+            Deprecated alias for *unsafe_hash*. *unsafe_hash* takes precedence.
+
+        cache_hash (bool):
+            Ensure that the object's hash code is computed only once and stored
+            on the object.  If this is set to True, hashing must be either
+            explicitly or implicitly enabled for this class.  If the hash code
+            is cached, avoid any reassignments of fields involved in hash code
+            computation or mutations of the objects those fields point to after
+            object creation.  If such changes occur, the behavior of the
+            object's hash code is undefined.
+
+        frozen (bool):
+            Make instances immutable after initialization.  If someone attempts
+            to modify a frozen instance, `attrs.exceptions.FrozenInstanceError`
+            is raised.
+
+            .. note::
+
+                1. This is achieved by installing a custom ``__setattr__``
+                   method on your class, so you can't implement your own.
+
+                2. True immutability is impossible in Python.
+
+                3. This *does* have a minor a runtime performance `impact
+                   <how-frozen>` when initializing new instances.  In other
+                   words: ``__init__`` is slightly slower with ``frozen=True``.
+
+                4. If a class is frozen, you cannot modify ``self`` in
+                   ``__attrs_post_init__`` or a self-written ``__init__``. You
+                   can circumvent that limitation by using
+                   ``object.__setattr__(self, "attribute_name", value)``.
+
+                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).
+
+        weakref_slot (bool):
+            Make instances weak-referenceable.  This has no effect unless
+            *slots* is True.
+
+        field_transformer (~typing.Callable | None):
+            A function that is called with the original class object and all
+            fields right before *attrs* finalizes the class.  You can use this,
+            for example, to automatically add converters or validators to
+            fields based on their types.
+
+            .. seealso:: `transform-fields`
+
+        match_args (bool):
+            If True (default), set ``__match_args__`` on the class to support
+            :pep:`634` (*Structural Pattern Matching*). It is a tuple of all
+            non-keyword-only ``__init__`` parameter names on Python 3.10 and
+            later. Ignored on older Python versions.
+
+        collect_by_mro (bool):
+            If True, *attrs* collects attributes from base classes correctly
+            according to the `method resolution order
+            <https://docs.python.org/3/howto/mro.html>`_. If False, *attrs*
+            will mimic the (wrong) behavior of `dataclasses` and :pep:`681`.
+
+            See also `issue #428
+            <https://github.com/python-attrs/attrs/issues/428>`_.
+
+        getstate_setstate (bool | None):
+            .. note::
+
+                This is usually only interesting for slotted classes and you
+                should probably just set *auto_detect* to True.
+
+            If True, ``__getstate__`` and ``__setstate__`` are generated and
+            attached to the class. This is necessary for slotted classes to be
+            pickleable. If left None, it's True by default for slotted classes
+            and False for dict classes.
+
+            If *auto_detect* is True, and *getstate_setstate* is left None, and
+            **either** ``__getstate__`` or ``__setstate__`` is detected
+            directly on the class (meaning: not inherited), it is set to False
+            (this is usually what you want).
+
+        auto_attribs (bool | None):
+            If True, look at type annotations to determine which attributes to
+            use, like `dataclasses`. If False, it will only look for explicit
+            :func:`field` class attributes, like classic *attrs*.
+
+            If left None, it will guess:
+
+            1. If any attributes are annotated and no unannotated
+               `attrs.field`\ s are found, it assumes *auto_attribs=True*.
+            2. Otherwise it assumes *auto_attribs=False* and tries to collect
+               `attrs.field`\ s.
+
+            If *attrs* decides to look at type annotations, **all** fields
+            **must** be annotated. If *attrs* encounters a field that is set to
+            a :func:`field` / `attr.ib` but lacks a type annotation, an
+            `attrs.exceptions.UnannotatedAttributeError` is raised.  Use
+            ``field_name: typing.Any = field(...)`` if you don't want to set a
+            type.
+
+            .. warning::
+
+                For features that use the attribute name to create decorators
+                (for example, :ref:`validators <validators>`), you still *must*
+                assign :func:`field` / `attr.ib` to them. Otherwise Python will
+                either not find the name or try to use the default value to
+                call, for example, ``validator`` on it.
+
+            Attributes annotated as `typing.ClassVar`, and attributes that are
+            neither annotated nor set to an `field()` are **ignored**.
+
+        these (dict[str, object]):
+            A dictionary of name to the (private) return value of `field()`
+            mappings. This is useful to avoid the definition of your attributes
+            within the class body because you can't (for example, if you want
+            to add ``__repr__`` methods to Django models) or don't want to.
+
+            If *these* is not `None`, *attrs* will *not* search the class body
+            for attributes and will *not* remove any attributes from it.
+
+            The order is deduced from the order of the attributes inside
+            *these*.
+
+            Arguably, this is a rather obscure feature.
 
     .. versionadded:: 20.1.0
     .. versionchanged:: 21.3.0 Converters are also run ``on_setattr``.
     .. versionadded:: 22.2.0
        *unsafe_hash* as an alias for *hash* (for :pep:`681` compliance).
+    .. versionchanged:: 24.1.0
+       Instances are not compared as tuples of attributes anymore, but using a
+       big ``and`` condition. This is faster and has more correct behavior for
+       uncomparable values like `math.nan`.
+    .. versionadded:: 24.1.0
+       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*.
+    .. versionadded:: 24.3.0
+       Unless already present, a ``__replace__`` method is automatically
+       created for `copy.replace` (Python 3.13+ only).
+
+    .. note::
+
+        The main differences to the classic `attr.s` are:
+
+        - Automatically detect whether or not *auto_attribs* should be `True`
+          (c.f. *auto_attribs* parameter).
+        - Converters and validators run when attributes are set by default --
+          if *frozen* is `False`.
+        - *slots=True*
+
+          Usually, this has only upsides and few visible effects in everyday
+          programming. But it *can* lead to some surprising behaviors, so
+          please make sure to read :term:`slotted classes`.
+
+        - *auto_exc=True*
+        - *auto_detect=True*
+        - *order=False*
+        - Some options that were only relevant on Python 2 or were kept around
+          for backwards-compatibility have been removed.
+
     """
 
     def do_it(cls, auto_attribs):
@@ -124,7 +380,7 @@ def define(
 
         # By default, mutable classes convert & validate on setattr.
         if frozen is False and on_setattr is None:
-            on_setattr = _ng_default_on_setattr
+            on_setattr = _DEFAULT_ON_SETATTR
 
         # However, if we subclass a frozen class, we inherit the immutability
         # and disable on_setattr.
@@ -146,7 +402,7 @@ def define(
             return do_it(cls, False)
 
     # maybe_cls's type depends on the usage of the decorator.  It's a class
-    # if it's used as `@attrs` but ``None`` if used as `@attrs()`.
+    # if it's used as `@attrs` but `None` if used as `@attrs()`.
     if maybe_cls is None:
         return wrap
 
@@ -175,13 +431,151 @@ def field(
     alias=None,
 ):
     """
-    Identical to `attr.ib`, except keyword-only and with some arguments
-    removed.
+    Create a new :term:`field` / :term:`attribute` on a class.
 
+    ..  warning::
+
+        Does **nothing** unless the class is also decorated with
+        `attrs.define` (or similar)!
+
+    Args:
+        default:
+            A value that is used if an *attrs*-generated ``__init__`` is used
+            and no value is passed while instantiating or the attribute is
+            excluded using ``init=False``.
+
+            If the value is an instance of `attrs.Factory`, its callable will
+            be used to construct a new value (useful for mutable data types
+            like lists or dicts).
+
+            If a default is not set (or set manually to `attrs.NOTHING`), a
+            value *must* be supplied when instantiating; otherwise a
+            `TypeError` will be raised.
+
+            .. seealso:: `defaults`
+
+        factory (~typing.Callable):
+            Syntactic sugar for ``default=attr.Factory(factory)``.
+
+        validator (~typing.Callable | list[~typing.Callable]):
+            Callable that is called by *attrs*-generated ``__init__`` methods
+            after the instance has been initialized.  They receive the
+            initialized instance, the :func:`~attrs.Attribute`, and the passed
+            value.
+
+            The return value is *not* inspected so the validator has to throw
+            an exception itself.
+
+            If a `list` is passed, its items are treated as validators and must
+            all pass.
+
+            Validators can be globally disabled and re-enabled using
+            `attrs.validators.get_disabled` / `attrs.validators.set_disabled`.
+
+            The validator can also be set using decorator notation as shown
+            below.
+
+            .. seealso:: :ref:`validators`
+
+        repr (bool | ~typing.Callable):
+            Include this attribute in the generated ``__repr__`` method. If
+            True, include the attribute; if False, omit it. By default, the
+            built-in ``repr()`` function is used. To override how the attribute
+            value is formatted, pass a ``callable`` that takes a single value
+            and returns a string. Note that the resulting string is used as-is,
+            which means it will be used directly *instead* of calling
+            ``repr()`` (the default).
+
+        eq (bool | ~typing.Callable):
+            If True (default), include this attribute in the generated
+            ``__eq__`` and ``__ne__`` methods that check two instances for
+            equality. To override how the attribute value is compared, pass a
+            callable that takes a single value and returns the value to be
+            compared.
+
+            .. seealso:: `comparison`
+
+        order (bool | ~typing.Callable):
+            If True (default), include this attributes in the generated
+            ``__lt__``, ``__le__``, ``__gt__`` and ``__ge__`` methods. To
+            override how the attribute value is ordered, pass a callable that
+            takes a single value and returns the value to be ordered.
+
+            .. seealso:: `comparison`
+
+        hash (bool | None):
+            Include this attribute in the generated ``__hash__`` method.  If
+            None (default), mirror *eq*'s value.  This is the correct behavior
+            according the Python spec.  Setting this value to anything else
+            than None is *discouraged*.
+
+            .. seealso:: `hashing`
+
+        init (bool):
+            Include this attribute in the generated ``__init__`` method.
+
+            It is possible to set this to False and set a default value. In
+            that case this attributed is unconditionally initialized with the
+            specified default value or factory.
+
+            .. seealso:: `init`
+
+        converter (typing.Callable | Converter):
+            A callable that is called by *attrs*-generated ``__init__`` methods
+            to convert attribute's value to the desired format.
+
+            If a vanilla callable is passed, it is given the passed-in value as
+            the only positional argument. It is possible to receive additional
+            arguments by wrapping the callable in a `Converter`.
+
+            Either way, the returned value will be used as the new value of the
+            attribute.  The value is converted before being passed to the
+            validator, if any.
+
+            .. seealso:: :ref:`converters`
+
+        metadata (dict | None):
+            An arbitrary mapping, to be used by third-party code.
+
+            .. seealso:: `extending-metadata`.
+
+        type (type):
+            The type of the attribute. Nowadays, the preferred method to
+            specify the type is using a variable annotation (see :pep:`526`).
+            This argument is provided for backwards-compatibility and for usage
+            with `make_class`. Regardless of the approach used, the type will
+            be stored on ``Attribute.type``.
+
+            Please note that *attrs* doesn't do anything with this metadata by
+            itself. You can use it as part of your own code or for `static type
+            checking <types>`.
+
+        kw_only (bool):
+            Make this attribute keyword-only in the generated ``__init__`` (if
+            ``init`` is False, this parameter is ignored).
+
+        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
+            None, the *on_setattr* value from `attr.s` is used. Set to
+            `attrs.setters.NO_OP` to run **no** `setattr` hooks for this
+            attribute -- regardless of the setting in `define()`.
+
+        alias (str | None):
+            Override this attribute's parameter name in the generated
+            ``__init__`` method. If left None, default to ``name`` stripped
+            of leading underscores. See `private-attributes`.
+
+    .. versionadded:: 20.1.0
+    .. versionchanged:: 21.1.0
+       *eq*, *order*, and *cmp* also accept a custom callable
+    .. versionadded:: 22.2.0 *alias*
     .. versionadded:: 23.1.0
        The *type* parameter has been re-added; mostly for `attrs.make_class`.
        Please note that type checkers ignore this metadata.
-    .. versionadded:: 20.1.0
+
+    .. seealso::
+
+       `attr.ib`
     """
     return attrib(
         default=default,
diff --git a/libs/attr/converters.py b/libs/attr/converters.py
index 2bf4c902a..0a79deef0 100644
--- a/libs/attr/converters.py
+++ b/libs/attr/converters.py
@@ -4,11 +4,10 @@
 Commonly useful converters.
 """
 
-
 import typing
 
 from ._compat import _AnnotationExtractor
-from ._make import NOTHING, Factory, pipe
+from ._make import NOTHING, Converter, Factory, pipe
 
 
 __all__ = [
@@ -22,21 +21,31 @@ __all__ = [
 def optional(converter):
     """
     A converter that allows an attribute to be optional. An optional attribute
-    is one which can be set to ``None``.
+    is one which can be set to `None`.
 
-    Type annotations will be inferred from the wrapped converter's, if it
-    has any.
+    Type annotations will be inferred from the wrapped converter's, if it has
+    any.
 
-    :param callable converter: the converter that is used for non-``None``
-        values.
+    Args:
+        converter (typing.Callable):
+            the converter that is used for non-`None` values.
 
     .. versionadded:: 17.1.0
     """
 
-    def optional_converter(val):
-        if val is None:
-            return None
-        return converter(val)
+    if isinstance(converter, Converter):
+
+        def optional_converter(val, inst, field):
+            if val is None:
+                return None
+            return converter(val, inst, field)
+
+    else:
+
+        def optional_converter(val):
+            if val is None:
+                return None
+            return converter(val)
 
     xtr = _AnnotationExtractor(converter)
 
@@ -48,24 +57,35 @@ def optional(converter):
     if rt:
         optional_converter.__annotations__["return"] = typing.Optional[rt]
 
+    if isinstance(converter, Converter):
+        return Converter(optional_converter, takes_self=True, takes_field=True)
+
     return optional_converter
 
 
 def default_if_none(default=NOTHING, factory=None):
     """
-    A converter that allows to replace ``None`` values by *default* or the
-    result of *factory*.
+    A converter that allows to replace `None` values by *default* or the result
+    of *factory*.
 
-    :param default: Value to be used if ``None`` is passed. Passing an instance
-       of `attrs.Factory` is supported, however the ``takes_self`` option
-       is *not*.
-    :param callable factory: A callable that takes no parameters whose result
-       is used if ``None`` is passed.
+    Args:
+        default:
+            Value to be used if `None` is passed. Passing an instance of
+            `attrs.Factory` is supported, however the ``takes_self`` option is
+            *not*.
 
-    :raises TypeError: If **neither** *default* or *factory* is passed.
-    :raises TypeError: If **both** *default* and *factory* are passed.
-    :raises ValueError: If an instance of `attrs.Factory` is passed with
-       ``takes_self=True``.
+        factory (typing.Callable):
+            A callable that takes no parameters whose result is used if `None`
+            is passed.
+
+    Raises:
+        TypeError: If **neither** *default* or *factory* is passed.
+
+        TypeError: If **both** *default* and *factory* are passed.
+
+        ValueError:
+            If an instance of `attrs.Factory` is passed with
+            ``takes_self=True``.
 
     .. versionadded:: 18.2.0
     """
@@ -104,41 +124,39 @@ def default_if_none(default=NOTHING, factory=None):
 
 def to_bool(val):
     """
-    Convert "boolean" strings (e.g., from env. vars.) to real booleans.
+    Convert "boolean" strings (for example, from environment variables) to real
+    booleans.
 
-    Values mapping to :code:`True`:
+    Values mapping to `True`:
 
-    - :code:`True`
-    - :code:`"true"` / :code:`"t"`
-    - :code:`"yes"` / :code:`"y"`
-    - :code:`"on"`
-    - :code:`"1"`
-    - :code:`1`
+    - ``True``
+    - ``"true"`` / ``"t"``
+    - ``"yes"`` / ``"y"``
+    - ``"on"``
+    - ``"1"``
+    - ``1``
 
-    Values mapping to :code:`False`:
+    Values mapping to `False`:
 
-    - :code:`False`
-    - :code:`"false"` / :code:`"f"`
-    - :code:`"no"` / :code:`"n"`
-    - :code:`"off"`
-    - :code:`"0"`
-    - :code:`0`
+    - ``False``
+    - ``"false"`` / ``"f"``
+    - ``"no"`` / ``"n"``
+    - ``"off"``
+    - ``"0"``
+    - ``0``
 
-    :raises ValueError: for any other value.
+    Raises:
+        ValueError: For any other value.
 
     .. versionadded:: 21.3.0
     """
     if isinstance(val, str):
         val = val.lower()
-    truthy = {True, "true", "t", "yes", "y", "on", "1", 1}
-    falsy = {False, "false", "f", "no", "n", "off", "0", 0}
-    try:
-        if val in truthy:
-            return True
-        if val in falsy:
-            return False
-    except TypeError:
-        # Raised when "val" is not hashable (e.g., lists)
-        pass
-    msg = f"Cannot convert value to bool: {val}"
+
+    if val in (True, "true", "t", "yes", "y", "on", "1", 1):
+        return True
+    if val in (False, "false", "f", "no", "n", "off", "0", 0):
+        return False
+
+    msg = f"Cannot convert value to bool: {val!r}"
     raise ValueError(msg)
diff --git a/libs/attr/converters.pyi b/libs/attr/converters.pyi
index 5abb49f6d..12bd0c4f1 100644
--- a/libs/attr/converters.pyi
+++ b/libs/attr/converters.pyi
@@ -1,13 +1,19 @@
-from typing import Callable, TypeVar, overload
+from typing import Callable, Any, overload
 
-from . import _ConverterType
-
-_T = TypeVar("_T")
+from attrs import _ConverterType, _CallableConverterType
 
+@overload
+def pipe(*validators: _CallableConverterType) -> _CallableConverterType: ...
+@overload
 def pipe(*validators: _ConverterType) -> _ConverterType: ...
+@overload
+def optional(converter: _CallableConverterType) -> _CallableConverterType: ...
+@overload
 def optional(converter: _ConverterType) -> _ConverterType: ...
 @overload
-def default_if_none(default: _T) -> _ConverterType: ...
+def default_if_none(default: Any) -> _CallableConverterType: ...
 @overload
-def default_if_none(*, factory: Callable[[], _T]) -> _ConverterType: ...
-def to_bool(val: str) -> bool: ...
+def default_if_none(
+    *, factory: Callable[[], Any]
+) -> _CallableConverterType: ...
+def to_bool(val: str | int | bool) -> bool: ...
diff --git a/libs/attr/filters.py b/libs/attr/filters.py
index a1e40c98d..689b1705a 100644
--- a/libs/attr/filters.py
+++ b/libs/attr/filters.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 
 """
-Commonly useful filters for `attr.asdict`.
+Commonly useful filters for `attrs.asdict` and `attrs.astuple`.
 """
 
 from ._make import Attribute
@@ -20,13 +20,16 @@ def _split_what(what):
 
 def include(*what):
     """
-    Include *what*.
+    Create a filter that only allows *what*.
 
-    :param what: What to include.
-    :type what: `list` of classes `type`, field names `str` or
-        `attrs.Attribute`\\ s
+    Args:
+        what (list[type, str, attrs.Attribute]):
+            What to include. Can be a type, a name, or an attribute.
 
-    :rtype: `callable`
+    Returns:
+        Callable:
+            A callable that can be passed to `attrs.asdict`'s and
+            `attrs.astuple`'s *filter* argument.
 
     .. versionchanged:: 23.1.0 Accept strings with field names.
     """
@@ -44,13 +47,16 @@ def include(*what):
 
 def exclude(*what):
     """
-    Exclude *what*.
+    Create a filter that does **not** allow *what*.
 
-    :param what: What to exclude.
-    :type what: `list` of classes `type`, field names `str` or
-        `attrs.Attribute`\\ s.
+    Args:
+        what (list[type, str, attrs.Attribute]):
+            What to exclude. Can be a type, a name, or an attribute.
 
-    :rtype: `callable`
+    Returns:
+        Callable:
+            A callable that can be passed to `attrs.asdict`'s and
+            `attrs.astuple`'s *filter* argument.
 
     .. versionchanged:: 23.3.0 Accept field name string as input argument
     """
diff --git a/libs/attr/filters.pyi b/libs/attr/filters.pyi
index 8a02fa0fc..974abdcdb 100644
--- a/libs/attr/filters.pyi
+++ b/libs/attr/filters.pyi
@@ -1,6 +1,6 @@
-from typing import Any, Union
+from typing import Any
 
 from . import Attribute, _FilterType
 
-def include(*what: Union[type, str, Attribute[Any]]) -> _FilterType[Any]: ...
-def exclude(*what: Union[type, str, Attribute[Any]]) -> _FilterType[Any]: ...
+def include(*what: type | str | Attribute[Any]) -> _FilterType[Any]: ...
+def exclude(*what: type | str | Attribute[Any]) -> _FilterType[Any]: ...
diff --git a/libs/attr/setters.py b/libs/attr/setters.py
index 12ed6750d..78b08398a 100644
--- a/libs/attr/setters.py
+++ b/libs/attr/setters.py
@@ -4,7 +4,6 @@
 Commonly used hooks for on_setattr.
 """
 
-
 from . import _config
 from .exceptions import FrozenAttributeError
 
@@ -33,7 +32,7 @@ def frozen(_, __, ___):
 
     .. versionadded:: 20.1.0
     """
-    raise FrozenAttributeError()
+    raise FrozenAttributeError
 
 
 def validate(instance, attrib, new_value):
@@ -56,18 +55,25 @@ def validate(instance, attrib, new_value):
 
 def convert(instance, attrib, new_value):
     """
-    Run *attrib*'s converter -- if it has one --  on *new_value* and return the
+    Run *attrib*'s converter -- if it has one -- on *new_value* and return the
     result.
 
     .. versionadded:: 20.1.0
     """
     c = attrib.converter
     if c:
-        return c(new_value)
+        # This can be removed once we drop 3.8 and use attrs.Converter instead.
+        from ._make import Converter
+
+        if not isinstance(c, Converter):
+            return c(new_value)
+
+        return c(new_value, instance, attrib)
 
     return new_value
 
 
 # Sentinel for disabling class-wide *on_setattr* hooks for certain attributes.
-# autodata stopped working, so the docstring is inlined in the API docs.
+# Sphinx's autodata stopped working, so the docstring is inlined in the API
+# docs.
 NO_OP = object()
diff --git a/libs/attr/setters.pyi b/libs/attr/setters.pyi
index 72f7ce476..73abf36e7 100644
--- a/libs/attr/setters.pyi
+++ b/libs/attr/setters.pyi
@@ -1,6 +1,7 @@
 from typing import Any, NewType, NoReturn, TypeVar
 
-from . import Attribute, _OnSetAttrType
+from . import Attribute
+from attrs import _OnSetAttrType
 
 _T = TypeVar("_T")
 
diff --git a/libs/attr/validators.py b/libs/attr/validators.py
index 34d6b761d..e7b755250 100644
--- a/libs/attr/validators.py
+++ b/libs/attr/validators.py
@@ -4,7 +4,6 @@
 Commonly useful validators.
 """
 
-
 import operator
 import re
 
@@ -35,7 +34,7 @@ __all__ = [
     "min_len",
     "not_",
     "optional",
-    "provides",
+    "or_",
     "set_disabled",
 ]
 
@@ -46,8 +45,8 @@ def set_disabled(disabled):
 
     By default, they are run.
 
-    :param disabled: If ``True``, disable running all validators.
-    :type disabled: bool
+    Args:
+        disabled (bool): If `True`, disable running all validators.
 
     .. warning::
 
@@ -62,8 +61,8 @@ def get_disabled():
     """
     Return a bool indicating whether validators are currently disabled or not.
 
-    :return: ``True`` if validators are currently disabled.
-    :rtype: bool
+    Returns:
+        bool:`True` if validators are currently disabled.
 
     .. versionadded:: 21.3.0
     """
@@ -88,7 +87,7 @@ def disabled():
         set_run_validators(True)
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _InstanceOfValidator:
     type = attrib()
 
@@ -97,12 +96,7 @@ class _InstanceOfValidator:
         We use a callable class to be able to change the ``__repr__``.
         """
         if not isinstance(value, self.type):
-            msg = "'{name}' must be {type!r} (got {value!r} that is a {actual!r}).".format(
-                name=attr.name,
-                type=self.type,
-                actual=value.__class__,
-                value=value,
-            )
+            msg = f"'{attr.name}' must be {self.type!r} (got {value!r} that is a {value.__class__!r})."
             raise TypeError(
                 msg,
                 attr,
@@ -116,16 +110,17 @@ class _InstanceOfValidator:
 
 def instance_of(type):
     """
-    A validator that raises a `TypeError` if the initializer is called
-    with a wrong type for this particular attribute (checks are performed using
+    A validator that raises a `TypeError` if the initializer is called with a
+    wrong type for this particular attribute (checks are performed using
     `isinstance` therefore it's also valid to pass a tuple of types).
 
-    :param type: The type to check for.
-    :type type: type or tuple of type
+    Args:
+        type (type | tuple[type]): The type to check for.
 
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected type, and the value it
-        got.
+    Raises:
+        TypeError:
+            With a human readable error message, the attribute (of type
+            `attrs.Attribute`), the expected type, and the value it got.
     """
     return _InstanceOfValidator(type)
 
@@ -140,9 +135,7 @@ class _MatchesReValidator:
         We use a callable class to be able to change the ``__repr__``.
         """
         if not self.match_func(value):
-            msg = "'{name}' must match regex {pattern!r} ({value!r} doesn't)".format(
-                name=attr.name, pattern=self.pattern.pattern, value=value
-            )
+            msg = f"'{attr.name}' must match regex {self.pattern.pattern!r} ({value!r} doesn't)"
             raise ValueError(
                 msg,
                 attr,
@@ -156,16 +149,21 @@ class _MatchesReValidator:
 
 def matches_re(regex, flags=0, func=None):
     r"""
-    A validator that raises `ValueError` if the initializer is called
-    with a string that doesn't match *regex*.
+    A validator that raises `ValueError` if the initializer is called with a
+    string that doesn't match *regex*.
 
-    :param regex: a regex string or precompiled pattern to match against
-    :param int flags: flags that will be passed to the underlying re function
-        (default 0)
-    :param callable func: which underlying `re` function to call. Valid options
-        are `re.fullmatch`, `re.search`, and `re.match`; the default ``None``
-        means `re.fullmatch`. For performance reasons, the pattern is always
-        precompiled using `re.compile`.
+    Args:
+        regex (str, re.Pattern):
+            A regex string or precompiled pattern to match against
+
+        flags (int):
+            Flags that will be passed to the underlying re function (default 0)
+
+        func (typing.Callable):
+            Which underlying `re` function to call. Valid options are
+            `re.fullmatch`, `re.search`, and `re.match`; the default `None`
+            means `re.fullmatch`. For performance reasons, the pattern is
+            always precompiled using `re.compile`.
 
     .. versionadded:: 19.2.0
     .. versionchanged:: 21.3.0 *regex* can be a pre-compiled pattern.
@@ -174,7 +172,7 @@ def matches_re(regex, flags=0, func=None):
     if func not in valid_funcs:
         msg = "'func' must be one of {}.".format(
             ", ".join(
-                sorted(e and e.__name__ or "None" for e in set(valid_funcs))
+                sorted((e and e.__name__) or "None" for e in set(valid_funcs))
             )
         )
         raise ValueError(msg)
@@ -197,57 +195,7 @@ def matches_re(regex, flags=0, func=None):
     return _MatchesReValidator(pattern, match_func)
 
 
-@attrs(repr=False, slots=True, hash=True)
-class _ProvidesValidator:
-    interface = attrib()
-
-    def __call__(self, inst, attr, value):
-        """
-        We use a callable class to be able to change the ``__repr__``.
-        """
-        if not self.interface.providedBy(value):
-            msg = "'{name}' must provide {interface!r} which {value!r} doesn't.".format(
-                name=attr.name, interface=self.interface, value=value
-            )
-            raise TypeError(
-                msg,
-                attr,
-                self.interface,
-                value,
-            )
-
-    def __repr__(self):
-        return f"<provides validator for interface {self.interface!r}>"
-
-
-def provides(interface):
-    """
-    A validator that raises a `TypeError` if the initializer is called
-    with an object that does not provide the requested *interface* (checks are
-    performed using ``interface.providedBy(value)`` (see `zope.interface
-    <https://zopeinterface.readthedocs.io/en/latest/>`_).
-
-    :param interface: The interface to check for.
-    :type interface: ``zope.interface.Interface``
-
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected interface, and the
-        value it got.
-
-    .. deprecated:: 23.1.0
-    """
-    import warnings
-
-    warnings.warn(
-        "attrs's zope-interface support is deprecated and will be removed in, "
-        "or after, April 2024.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return _ProvidesValidator(interface)
-
-
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _OptionalValidator:
     validator = attrib()
 
@@ -264,11 +212,13 @@ class _OptionalValidator:
 def optional(validator):
     """
     A validator that makes an attribute optional.  An optional attribute is one
-    which can be set to ``None`` in addition to satisfying the requirements of
+    which can be set to `None` in addition to satisfying the requirements of
     the sub-validator.
 
-    :param Callable | tuple[Callable] | list[Callable] validator: A validator
-        (or validators) that is used for non-``None`` values.
+    Args:
+        validator
+            (typing.Callable | tuple[typing.Callable] | list[typing.Callable]):
+            A validator (or validators) that is used for non-`None` values.
 
     .. versionadded:: 15.1.0
     .. versionchanged:: 17.1.0 *validator* can be a list of validators.
@@ -280,9 +230,10 @@ def optional(validator):
     return _OptionalValidator(validator)
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _InValidator:
     options = attrib()
+    _original_options = attrib(hash=False)
 
     def __call__(self, inst, attr, value):
         try:
@@ -291,41 +242,54 @@ class _InValidator:
             in_options = False
 
         if not in_options:
-            msg = f"'{attr.name}' must be in {self.options!r} (got {value!r})"
+            msg = f"'{attr.name}' must be in {self._original_options!r} (got {value!r})"
             raise ValueError(
                 msg,
                 attr,
-                self.options,
+                self._original_options,
                 value,
             )
 
     def __repr__(self):
-        return f"<in_ validator with options {self.options!r}>"
+        return f"<in_ validator with options {self._original_options!r}>"
 
 
 def in_(options):
     """
-    A validator that raises a `ValueError` if the initializer is called
-    with a value that does not belong in the options provided.  The check is
-    performed using ``value in options``.
+    A validator that raises a `ValueError` if the initializer is called with a
+    value that does not belong in the *options* provided.
 
-    :param options: Allowed options.
-    :type options: list, tuple, `enum.Enum`, ...
+    The check is performed using ``value in options``, so *options* has to
+    support that operation.
 
-    :raises ValueError: With a human readable error message, the attribute (of
-       type `attrs.Attribute`), the expected options, and the value it
-       got.
+    To keep the validator hashable, dicts, lists, and sets are transparently
+    transformed into a `tuple`.
+
+    Args:
+        options: Allowed options.
+
+    Raises:
+        ValueError:
+            With a human readable error message, the attribute (of type
+            `attrs.Attribute`), the expected options, and the value it got.
 
     .. versionadded:: 17.1.0
     .. versionchanged:: 22.1.0
        The ValueError was incomplete until now and only contained the human
        readable error message. Now it contains all the information that has
        been promised since 17.1.0.
+    .. versionchanged:: 24.1.0
+       *options* that are a list, dict, or a set are now transformed into a
+       tuple to keep the validator hashable.
     """
-    return _InValidator(options)
+    repr_options = options
+    if isinstance(options, (list, dict, set)):
+        options = tuple(options)
+
+    return _InValidator(options, repr_options)
 
 
-@attrs(repr=False, slots=False, hash=True)
+@attrs(repr=False, slots=False, unsafe_hash=True)
 class _IsCallableValidator:
     def __call__(self, inst, attr, value):
         """
@@ -350,19 +314,20 @@ class _IsCallableValidator:
 def is_callable():
     """
     A validator that raises a `attrs.exceptions.NotCallableError` if the
-    initializer is called with a value for this particular attribute
-    that is not callable.
+    initializer is called with a value for this particular attribute that is
+    not callable.
 
     .. versionadded:: 19.1.0
 
-    :raises attrs.exceptions.NotCallableError: With a human readable error
-        message containing the attribute (`attrs.Attribute`) name,
-        and the value it got.
+    Raises:
+        attrs.exceptions.NotCallableError:
+            With a human readable error message containing the attribute
+            (`attrs.Attribute`) name, and the value it got.
     """
     return _IsCallableValidator()
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _DeepIterable:
     member_validator = attrib(validator=is_callable())
     iterable_validator = attrib(
@@ -395,20 +360,23 @@ def deep_iterable(member_validator, iterable_validator=None):
     """
     A validator that performs deep validation of an iterable.
 
-    :param member_validator: Validator(s) to apply to iterable members
-    :param iterable_validator: Validator to apply to iterable itself
-        (optional)
+    Args:
+        member_validator: Validator to apply to iterable members.
+
+        iterable_validator:
+            Validator to apply to iterable itself (optional).
+
+    Raises
+        TypeError: if any sub-validators fail
 
     .. versionadded:: 19.1.0
-
-    :raises TypeError: if any sub-validators fail
     """
     if isinstance(member_validator, (list, tuple)):
         member_validator = and_(*member_validator)
     return _DeepIterable(member_validator, iterable_validator)
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _DeepMapping:
     key_validator = attrib(validator=is_callable())
     value_validator = attrib(validator=is_callable())
@@ -426,23 +394,25 @@ class _DeepMapping:
             self.value_validator(inst, attr, value[key])
 
     def __repr__(self):
-        return (
-            "<deep_mapping validator for objects mapping {key!r} to {value!r}>"
-        ).format(key=self.key_validator, value=self.value_validator)
+        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):
     """
     A validator that performs deep validation of a dictionary.
 
-    :param key_validator: Validator to apply to dictionary keys
-    :param value_validator: Validator to apply to dictionary values
-    :param mapping_validator: Validator to apply to top-level mapping
-        attribute (optional)
+    Args:
+        key_validator: Validator to apply to dictionary keys.
+
+        value_validator: Validator to apply to dictionary values.
+
+        mapping_validator:
+            Validator to apply to top-level mapping attribute (optional).
 
     .. versionadded:: 19.1.0
 
-    :raises TypeError: if any sub-validators fail
+    Raises:
+        TypeError: if any sub-validators fail
     """
     return _DeepMapping(key_validator, value_validator, mapping_validator)
 
@@ -467,10 +437,13 @@ class _NumberValidator:
 
 def lt(val):
     """
-    A validator that raises `ValueError` if the initializer is called
-    with a number larger or equal to *val*.
+    A validator that raises `ValueError` if the initializer is called with a
+    number larger or equal to *val*.
 
-    :param val: Exclusive upper bound for values
+    The validator uses `operator.lt` to compare the values.
+
+    Args:
+        val: Exclusive upper bound for values.
 
     .. versionadded:: 21.3.0
     """
@@ -479,10 +452,13 @@ def lt(val):
 
 def le(val):
     """
-    A validator that raises `ValueError` if the initializer is called
-    with a number greater than *val*.
+    A validator that raises `ValueError` if the initializer is called with a
+    number greater than *val*.
 
-    :param val: Inclusive upper bound for values
+    The validator uses `operator.le` to compare the values.
+
+    Args:
+        val: Inclusive upper bound for values.
 
     .. versionadded:: 21.3.0
     """
@@ -491,10 +467,13 @@ def le(val):
 
 def ge(val):
     """
-    A validator that raises `ValueError` if the initializer is called
-    with a number smaller than *val*.
+    A validator that raises `ValueError` if the initializer is called with a
+    number smaller than *val*.
 
-    :param val: Inclusive lower bound for values
+    The validator uses `operator.ge` to compare the values.
+
+    Args:
+        val: Inclusive lower bound for values
 
     .. versionadded:: 21.3.0
     """
@@ -503,10 +482,13 @@ def ge(val):
 
 def gt(val):
     """
-    A validator that raises `ValueError` if the initializer is called
-    with a number smaller or equal to *val*.
+    A validator that raises `ValueError` if the initializer is called with a
+    number smaller or equal to *val*.
 
-    :param val: Exclusive lower bound for values
+    The validator uses `operator.ge` to compare the values.
+
+    Args:
+       val: Exclusive lower bound for values
 
     .. versionadded:: 21.3.0
     """
@@ -534,7 +516,8 @@ def max_len(length):
     A validator that raises `ValueError` if the initializer is called
     with a string or iterable that is longer than *length*.
 
-    :param int length: Maximum length of the string or iterable
+    Args:
+        length (int): Maximum length of the string or iterable
 
     .. versionadded:: 21.3.0
     """
@@ -562,14 +545,15 @@ def min_len(length):
     A validator that raises `ValueError` if the initializer is called
     with a string or iterable that is shorter than *length*.
 
-    :param int length: Minimum length of the string or iterable
+    Args:
+        length (int): Minimum length of the string or iterable
 
     .. versionadded:: 22.1.0
     """
     return _MinLengthValidator(length)
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _SubclassOfValidator:
     type = attrib()
 
@@ -592,21 +576,22 @@ class _SubclassOfValidator:
 
 def _subclass_of(type):
     """
-    A validator that raises a `TypeError` if the initializer is called
-    with a wrong type for this particular attribute (checks are performed using
+    A validator that raises a `TypeError` if the initializer is called with a
+    wrong type for this particular attribute (checks are performed using
     `issubclass` therefore it's also valid to pass a tuple of types).
 
-    :param type: The type to check for.
-    :type type: type or tuple of types
+    Args:
+        type (type | tuple[type, ...]): The type(s) to check for.
 
-    :raises TypeError: With a human readable error message, the attribute
-        (of type `attrs.Attribute`), the expected type, and the value it
-        got.
+    Raises:
+        TypeError:
+            With a human readable error message, the attribute (of type
+            `attrs.Attribute`), the expected type, and the value it got.
     """
     return _SubclassOfValidator(type)
 
 
-@attrs(repr=False, slots=True, hash=True)
+@attrs(repr=False, slots=True, unsafe_hash=True)
 class _NotValidator:
     validator = attrib()
     msg = attrib(
@@ -640,12 +625,7 @@ class _NotValidator:
             )
 
     def __repr__(self):
-        return (
-            "<not_ validator wrapping {what!r}, capturing {exc_types!r}>"
-        ).format(
-            what=self.validator,
-            exc_types=self.exc_types,
-        )
+        return f"<not_ validator wrapping {self.validator!r}, capturing {self.exc_types!r}>"
 
 
 def not_(validator, *, msg=None, exc_types=(ValueError, TypeError)):
@@ -658,19 +638,22 @@ def not_(validator, *, msg=None, exc_types=(ValueError, TypeError)):
     Intended to be used with existing validators to compose logic without
     needing to create inverted variants, for example, ``not_(in_(...))``.
 
-    :param validator: A validator to be logically inverted.
-    :param msg: Message to raise if validator fails.
-        Formatted with keys ``exc_types`` and ``validator``.
-    :type msg: str
-    :param exc_types: Exception type(s) to capture.
-        Other types raised by child validators will not be intercepted and
-        pass through.
+    Args:
+        validator: A validator to be logically inverted.
 
-    :raises ValueError: With a human readable error message,
-        the attribute (of type `attrs.Attribute`),
-        the validator that failed to raise an exception,
-        the value it got,
-        and the expected exception types.
+        msg (str):
+            Message to raise if validator fails. Formatted with keys
+            ``exc_types`` and ``validator``.
+
+        exc_types (tuple[type, ...]):
+            Exception type(s) to capture. Other types raised by child
+            validators will not be intercepted and pass through.
+
+    Raises:
+        ValueError:
+            With a human readable error message, the attribute (of type
+            `attrs.Attribute`), the validator that failed to raise an
+            exception, the value it got, and the expected exception types.
 
     .. versionadded:: 22.2.0
     """
@@ -679,3 +662,49 @@ def not_(validator, *, msg=None, exc_types=(ValueError, TypeError)):
     except TypeError:
         exc_types = (exc_types,)
     return _NotValidator(validator, msg, exc_types)
+
+
+@attrs(repr=False, slots=True, unsafe_hash=True)
+class _OrValidator:
+    validators = attrib()
+
+    def __call__(self, inst, attr, value):
+        for v in self.validators:
+            try:
+                v(inst, attr, value)
+            except Exception:  # noqa: BLE001, PERF203, S112
+                continue
+            else:
+                return
+
+        msg = f"None of {self.validators!r} satisfied for value {value!r}"
+        raise ValueError(msg)
+
+    def __repr__(self):
+        return f"<or validator wrapping {self.validators!r}>"
+
+
+def or_(*validators):
+    """
+    A validator that composes multiple validators into one.
+
+    When called on a value, it runs all wrapped validators until one of them is
+    satisfied.
+
+    Args:
+        validators (~collections.abc.Iterable[typing.Callable]):
+            Arbitrary number of validators.
+
+    Raises:
+        ValueError:
+            If no validator is satisfied. Raised with a human-readable error
+            message listing all the wrapped validators and the value that
+            failed all of them.
+
+    .. versionadded:: 24.1.0
+    """
+    vals = []
+    for v in validators:
+        vals.extend(v.validators if isinstance(v, _OrValidator) else [v])
+
+    return _OrValidator(tuple(vals))
diff --git a/libs/attr/validators.pyi b/libs/attr/validators.pyi
index d194a75ab..a0fdda7c8 100644
--- a/libs/attr/validators.pyi
+++ b/libs/attr/validators.pyi
@@ -1,3 +1,4 @@
+from types import UnionType
 from typing import (
     Any,
     AnyStr,
@@ -5,20 +6,15 @@ from typing import (
     Container,
     ContextManager,
     Iterable,
-    List,
     Mapping,
     Match,
-    Optional,
     Pattern,
-    Tuple,
-    Type,
     TypeVar,
-    Union,
     overload,
 )
 
-from . import _ValidatorType
-from . import _ValidatorArgType
+from attrs import _ValidatorType
+from attrs import _ValidatorArgType
 
 _T = TypeVar("_T")
 _T1 = TypeVar("_T1")
@@ -36,42 +32,43 @@ def disabled() -> ContextManager[None]: ...
 # To be more precise on instance_of use some overloads.
 # If there are more than 3 items in the tuple then we fall back to Any
 @overload
-def instance_of(type: Type[_T]) -> _ValidatorType[_T]: ...
+def instance_of(type: type[_T]) -> _ValidatorType[_T]: ...
 @overload
-def instance_of(type: Tuple[Type[_T]]) -> _ValidatorType[_T]: ...
+def instance_of(type: tuple[type[_T]]) -> _ValidatorType[_T]: ...
 @overload
 def instance_of(
-    type: Tuple[Type[_T1], Type[_T2]]
-) -> _ValidatorType[Union[_T1, _T2]]: ...
+    type: tuple[type[_T1], type[_T2]],
+) -> _ValidatorType[_T1 | _T2]: ...
 @overload
 def instance_of(
-    type: Tuple[Type[_T1], Type[_T2], Type[_T3]]
-) -> _ValidatorType[Union[_T1, _T2, _T3]]: ...
+    type: tuple[type[_T1], type[_T2], type[_T3]],
+) -> _ValidatorType[_T1 | _T2 | _T3]: ...
 @overload
-def instance_of(type: Tuple[type, ...]) -> _ValidatorType[Any]: ...
-def provides(interface: Any) -> _ValidatorType[Any]: ...
+def instance_of(type: tuple[type, ...]) -> _ValidatorType[Any]: ...
+@overload
+def instance_of(type: UnionType) -> _ValidatorType[Any]: ...
 def optional(
-    validator: Union[
-        _ValidatorType[_T], List[_ValidatorType[_T]], Tuple[_ValidatorType[_T]]
-    ]
-) -> _ValidatorType[Optional[_T]]: ...
+    validator: (
+        _ValidatorType[_T]
+        | list[_ValidatorType[_T]]
+        | tuple[_ValidatorType[_T]]
+    ),
+) -> _ValidatorType[_T | None]: ...
 def in_(options: Container[_T]) -> _ValidatorType[_T]: ...
 def and_(*validators: _ValidatorType[_T]) -> _ValidatorType[_T]: ...
 def matches_re(
-    regex: Union[Pattern[AnyStr], AnyStr],
+    regex: Pattern[AnyStr] | AnyStr,
     flags: int = ...,
-    func: Optional[
-        Callable[[AnyStr, AnyStr, int], Optional[Match[AnyStr]]]
-    ] = ...,
+    func: Callable[[AnyStr, AnyStr, int], Match[AnyStr] | None] | None = ...,
 ) -> _ValidatorType[AnyStr]: ...
 def deep_iterable(
     member_validator: _ValidatorArgType[_T],
-    iterable_validator: Optional[_ValidatorType[_I]] = ...,
+    iterable_validator: _ValidatorType[_I] | None = ...,
 ) -> _ValidatorType[_I]: ...
 def deep_mapping(
     key_validator: _ValidatorType[_K],
     value_validator: _ValidatorType[_V],
-    mapping_validator: Optional[_ValidatorType[_M]] = ...,
+    mapping_validator: _ValidatorType[_M] | None = ...,
 ) -> _ValidatorType[_M]: ...
 def is_callable() -> _ValidatorType[_T]: ...
 def lt(val: _T) -> _ValidatorType[_T]: ...
@@ -83,6 +80,7 @@ def min_len(length: int) -> _ValidatorType[_T]: ...
 def not_(
     validator: _ValidatorType[_T],
     *,
-    msg: Optional[str] = None,
-    exc_types: Union[Type[Exception], Iterable[Type[Exception]]] = ...,
+    msg: str | None = None,
+    exc_types: type[Exception] | Iterable[type[Exception]] = ...,
 ) -> _ValidatorType[_T]: ...
+def or_(*validators: _ValidatorType[_T]) -> _ValidatorType[_T]: ...
diff --git a/libs/attrs-23.2.0.dist-info/METADATA b/libs/attrs-23.2.0.dist-info/METADATA
deleted file mode 100644
index c20be76c7..000000000
--- a/libs/attrs-23.2.0.dist-info/METADATA
+++ /dev/null
@@ -1,202 +0,0 @@
-Metadata-Version: 2.1
-Name: attrs
-Version: 23.2.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: License :: OSI Approved :: MIT License
-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: Typing :: Typed
-Requires-Python: >=3.7
-Requires-Dist: importlib-metadata; python_version < '3.8'
-Provides-Extra: cov
-Requires-Dist: attrs[tests]; extra == 'cov'
-Requires-Dist: coverage[toml]>=5.3; extra == 'cov'
-Provides-Extra: dev
-Requires-Dist: attrs[tests]; extra == 'dev'
-Requires-Dist: pre-commit; extra == 'dev'
-Provides-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; extra == 'docs'
-Requires-Dist: zope-interface; extra == 'docs'
-Provides-Extra: tests
-Requires-Dist: attrs[tests-no-zope]; extra == 'tests'
-Requires-Dist: zope-interface; extra == 'tests'
-Provides-Extra: tests-mypy
-Requires-Dist: mypy>=1.6; (platform_python_implementation == 'CPython' and python_version >= '3.8') and extra == 'tests-mypy'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.8') and extra == 'tests-mypy'
-Provides-Extra: tests-no-zope
-Requires-Dist: attrs[tests-mypy]; extra == 'tests-no-zope'
-Requires-Dist: cloudpickle; (platform_python_implementation == 'CPython') and extra == 'tests-no-zope'
-Requires-Dist: hypothesis; extra == 'tests-no-zope'
-Requires-Dist: pympler; extra == 'tests-no-zope'
-Requires-Dist: pytest-xdist[psutil]; extra == 'tests-no-zope'
-Requires-Dist: pytest>=4.3.0; extra == 'tests-no-zope'
-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:
-
-<p align="center">
-   <a href="https://www.variomedia.de/"><img src="https://www.attrs.org/en/23.2.0/_static/sponsors/Variomedia.svg" width="200" height="60" /></a>
-   <a href="https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=referral&utm_campaign=enterprise&utm_term=repo"><img src="https://www.attrs.org/en/23.2.0/_static/sponsors/Tidelift.svg" width="200" height="60" /></a>
-   <a href="https://filepreviews.io/"><img src="https://www.attrs.org/en/23.2.0/_static/sponsors/FilePreviews.svg" width="200" height="60"/></a>
-</p>
-
-<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.
-
-**Hate type annotations**!?
-No problem!
-Types are entirely **optional** with *attrs*.
-Simply assign `attrs.field()` to the attributes instead of annotating them with types.
-
----
-
-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**.
-
-Please check out [*On The Core API Names*](https://www.attrs.org/en/latest/names.html) for a more in-depth explanation.
-
-
-## 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), 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).
-
-
-## 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**: please use the `python-attrs` tag on [StackOverflow](https://stackoverflow.com/questions/tagged/python-attrs)
-
-
-### *attrs* for Enterprise
-
-Available as part of the Tidelift Subscription.
-
-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.
-[Learn more.](https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
-
-## Release Information
-
-### Changes
-
-- The type annotation for `attrs.resolve_types()` is now correct.
-  [#1141](https://github.com/python-attrs/attrs/issues/1141)
-- Type stubs now use `typing.dataclass_transform` to decorate dataclass-like decorators, instead of the non-standard `__dataclass_transform__` special form, which is only supported by Pyright.
-  [#1158](https://github.com/python-attrs/attrs/issues/1158)
-- Fixed serialization of namedtuple fields using `attrs.asdict/astuple()` with `retain_collection_types=True`.
-  [#1165](https://github.com/python-attrs/attrs/issues/1165)
-- `attrs.AttrsInstance` is now a `typing.Protocol` in both type hints and code.
-  This allows you to subclass it along with another `Protocol`.
-  [#1172](https://github.com/python-attrs/attrs/issues/1172)
-- If *attrs* detects that `__attrs_pre_init__` accepts more than just `self`, it will call it with the same arguments as `__init__` was called.
-  This allows you to, for example, pass arguments to `super().__init__()`.
-  [#1187](https://github.com/python-attrs/attrs/issues/1187)
-- Slotted classes now transform `functools.cached_property` decorated methods to support equivalent semantics.
-  [#1200](https://github.com/python-attrs/attrs/issues/1200)
-- Added *class_body* argument to `attrs.make_class()` to provide additional attributes for newly created classes.
-  It is, for example, now possible to attach methods.
-  [#1203](https://github.com/python-attrs/attrs/issues/1203)
-
-
----
-
-[Full changelog](https://www.attrs.org/en/stable/changelog.html)
diff --git a/libs/attrs-23.2.0.dist-info/RECORD b/libs/attrs-23.2.0.dist-info/RECORD
deleted file mode 100644
index 92edee9ee..000000000
--- a/libs/attrs-23.2.0.dist-info/RECORD
+++ /dev/null
@@ -1,37 +0,0 @@
-attr/__init__.py,sha256=WlXJN6ICB0Y_HZ0lmuTUgia0kuSdn2p67d4N6cYxNZM,3307
-attr/__init__.pyi,sha256=u08EujYHy_rSyebNn-I9Xv2S_cXmtA9xWGc0cBsyl18,16976
-attr/_cmp.py,sha256=OQZlWdFX74z18adGEUp40Ojqm0NNu1Flqnv2JE8B2ng,4025
-attr/_cmp.pyi,sha256=sGQmOM0w3_K4-X8cTXR7g0Hqr290E8PTObA9JQxWQqc,399
-attr/_compat.py,sha256=QmRyxii295wcQfaugWqxuIumAPsNQ2-RUF82QZPqMKw,2540
-attr/_config.py,sha256=z81Vt-GeT_2taxs1XZfmHx9TWlSxjPb6eZH1LTGsS54,843
-attr/_funcs.py,sha256=VBTUFKLklsmqxys3qWSTK_Ac9Z4s0mAJWwgW9nA7Llk,17173
-attr/_make.py,sha256=LnVy2e0HygoqaZknhC19z7JmOt7qGkAadf2LZgWVJWI,101923
-attr/_next_gen.py,sha256=as1voi8siAI_o2OQG8YIiZvmn0G7-S3_j_774rnoZ_g,6203
-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=Kyw5MY0yfnUR_RwN1Vydf0EiE---htDxOgSc_-NYL6A,3622
-attr/converters.pyi,sha256=jKlpHBEt6HVKJvgrMFJRrHq8p61GXg4-Nd5RZWKJX7M,406
-attr/exceptions.py,sha256=HRFq4iybmv7-DcZwyjl6M1euM2YeJVK_hFxuaBGAngI,1977
-attr/exceptions.pyi,sha256=zZq8bCUnKAy9mDtBEw42ZhPhAUIHoTKedDQInJD883M,539
-attr/filters.py,sha256=9pYvXqdg6mtLvKIIb56oALRMoHFnQTcGCO4EXTc1qyM,1470
-attr/filters.pyi,sha256=0mRCjLKxdcvAo0vD-Cr81HfRXXCp9j_cAXjOoAHtPGM,225
-attr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-attr/setters.py,sha256=pbCZQ-pE6ZxjDqZfWWUhUFefXtpekIU4qS_YDMLPQ50,1400
-attr/setters.pyi,sha256=pyY8TVNBu8TWhOldv_RxHzmGvdgFQH981db70r0fn5I,567
-attr/validators.py,sha256=LGVpbiNg_KGzYrKUD5JPiZkx8TMfynDZGoQoLJNCIMo,19676
-attr/validators.pyi,sha256=167Dl9nt7NUhE9wht1I-buo039qyUT1nEUT_nKjSWr4,2580
-attrs-23.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-attrs-23.2.0.dist-info/METADATA,sha256=WwvG7OHyKjEPpyFUZCCYt1n0E_CcqdRb7bliGEdcm-A,9531
-attrs-23.2.0.dist-info/RECORD,,
-attrs-23.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-attrs-23.2.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-attrs-23.2.0.dist-info/licenses/LICENSE,sha256=iCEVyV38KvHutnFPjsbVy8q_Znyv-HKfQkINpj9xTp8,1109
-attrs/__init__.py,sha256=9_5waVbFs7rLqtXZ73tNDrxhezyZ8VZeX4BbvQ3EeJw,1039
-attrs/__init__.pyi,sha256=s_ajQ_U14DOsOz0JbmAKDOi46B3v2PcdO0UAV1MY6Ek,2168
-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-23.2.0.dist-info/INSTALLER b/libs/attrs-24.3.0.dist-info/INSTALLER
similarity index 100%
rename from libs/attrs-23.2.0.dist-info/INSTALLER
rename to libs/attrs-24.3.0.dist-info/INSTALLER
diff --git a/libs/attrs-24.3.0.dist-info/METADATA b/libs/attrs-24.3.0.dist-info/METADATA
new file mode 100644
index 000000000..e994a6cae
--- /dev/null
+++ b/libs/attrs-24.3.0.dist-info/METADATA
@@ -0,0 +1,246 @@
+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
new file mode 100644
index 000000000..6d302303f
--- /dev/null
+++ b/libs/attrs-24.3.0.dist-info/RECORD
@@ -0,0 +1,37 @@
+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-23.2.0.dist-info/REQUESTED b/libs/attrs-24.3.0.dist-info/REQUESTED
similarity index 100%
rename from libs/attrs-23.2.0.dist-info/REQUESTED
rename to libs/attrs-24.3.0.dist-info/REQUESTED
diff --git a/libs/attrs-23.2.0.dist-info/WHEEL b/libs/attrs-24.3.0.dist-info/WHEEL
similarity index 67%
rename from libs/attrs-23.2.0.dist-info/WHEEL
rename to libs/attrs-24.3.0.dist-info/WHEEL
index 5998f3aab..12228d414 100644
--- a/libs/attrs-23.2.0.dist-info/WHEEL
+++ b/libs/attrs-24.3.0.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/attrs-23.2.0.dist-info/licenses/LICENSE b/libs/attrs-24.3.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/attrs-23.2.0.dist-info/licenses/LICENSE
rename to libs/attrs-24.3.0.dist-info/licenses/LICENSE
diff --git a/libs/attrs/__init__.py b/libs/attrs/__init__.py
index 0c2481561..e8023ff6c 100644
--- a/libs/attrs/__init__.py
+++ b/libs/attrs/__init__.py
@@ -4,7 +4,9 @@ from attr import (
     NOTHING,
     Attribute,
     AttrsInstance,
+    Converter,
     Factory,
+    NothingType,
     _make_getattr,
     assoc,
     cmp_using,
@@ -26,6 +28,12 @@ from . import converters, exceptions, filters, setters, validators
 
 
 __all__ = [
+    "NOTHING",
+    "Attribute",
+    "AttrsInstance",
+    "Converter",
+    "Factory",
+    "NothingType",
     "__author__",
     "__copyright__",
     "__description__",
@@ -39,23 +47,19 @@ __all__ = [
     "asdict",
     "assoc",
     "astuple",
-    "Attribute",
-    "AttrsInstance",
     "cmp_using",
     "converters",
     "define",
     "evolve",
     "exceptions",
-    "Factory",
     "field",
-    "fields_dict",
     "fields",
+    "fields_dict",
     "filters",
     "frozen",
     "has",
     "make_class",
     "mutable",
-    "NOTHING",
     "resolve_types",
     "setters",
     "validate",
diff --git a/libs/attrs/__init__.pyi b/libs/attrs/__init__.pyi
index 9372cfea1..648fa7a34 100644
--- a/libs/attrs/__init__.pyi
+++ b/libs/attrs/__init__.pyi
@@ -1,12 +1,12 @@
+import sys
+
 from typing import (
     Any,
     Callable,
-    Dict,
     Mapping,
-    Optional,
     Sequence,
-    Tuple,
-    Type,
+    overload,
+    TypeVar,
 )
 
 # Because we need to type our own stuff, we have to make everything from
@@ -20,48 +20,244 @@ from attr import __title__ as __title__
 from attr import __url__ as __url__
 from attr import __version__ as __version__
 from attr import __version_info__ as __version_info__
-from attr import _FilterType
 from attr import assoc as assoc
 from attr import Attribute as Attribute
 from attr import AttrsInstance as AttrsInstance
 from attr import cmp_using as cmp_using
 from attr import converters as converters
-from attr import define as define
+from attr import Converter as Converter
 from attr import evolve as evolve
 from attr import exceptions as exceptions
 from attr import Factory as Factory
-from attr import field as field
 from attr import fields as fields
 from attr import fields_dict as fields_dict
 from attr import filters as filters
-from attr import frozen as frozen
 from attr import has as has
 from attr import make_class as make_class
-from attr import mutable as mutable
 from attr import NOTHING as NOTHING
 from attr import resolve_types as resolve_types
 from attr import setters as setters
 from attr import validate as validate
 from attr import validators as validators
+from attr import attrib, asdict as asdict, astuple as astuple
+from attr import NothingType as NothingType
 
-# TODO: see definition of attr.asdict/astuple
-def asdict(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    dict_factory: Type[Mapping[Any, Any]] = ...,
-    retain_collection_types: bool = ...,
-    value_serializer: Optional[
-        Callable[[type, Attribute[Any], Any], Any]
-    ] = ...,
-    tuple_keys: bool = ...,
-) -> Dict[str, Any]: ...
+if sys.version_info >= (3, 11):
+    from typing import dataclass_transform
+else:
+    from typing_extensions import dataclass_transform
 
-# TODO: add support for returning NamedTuple from the mypy plugin
-def astuple(
-    inst: AttrsInstance,
-    recurse: bool = ...,
-    filter: Optional[_FilterType[Any]] = ...,
-    tuple_factory: Type[Sequence[Any]] = ...,
-    retain_collection_types: bool = ...,
-) -> Tuple[Any, ...]: ...
+_T = TypeVar("_T")
+_C = TypeVar("_C", bound=type)
+
+_EqOrderType = bool | Callable[[Any], Any]
+_ValidatorType = Callable[[Any, "Attribute[_T]", _T], Any]
+_CallableConverterType = Callable[[Any], Any]
+_ConverterType = _CallableConverterType | Converter[Any, Any]
+_ReprType = Callable[[Any], str]
+_ReprArgType = bool | _ReprType
+_OnSetAttrType = Callable[[Any, "Attribute[Any]", Any], Any]
+_OnSetAttrArgType = _OnSetAttrType | list[_OnSetAttrType] | setters._NoOpType
+_FieldTransformer = Callable[
+    [type, list["Attribute[Any]"]], list["Attribute[Any]"]
+]
+# FIXME: in reality, if multiple validators are passed they must be in a list
+# or tuple, but those are invariant and so would prevent subtypes of
+# _ValidatorType from working when passed in a list or tuple.
+_ValidatorArgType = _ValidatorType[_T] | Sequence[_ValidatorType[_T]]
+
+@overload
+def field(
+    *,
+    default: None = ...,
+    validator: None = ...,
+    repr: _ReprArgType = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    converter: None = ...,
+    factory: None = ...,
+    kw_only: bool = ...,
+    eq: bool | None = ...,
+    order: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
+    type: type | None = ...,
+) -> Any: ...
+
+# This form catches an explicit None or no default and infers the type from the
+# other arguments.
+@overload
+def field(
+    *,
+    default: None = ...,
+    validator: _ValidatorArgType[_T] | None = ...,
+    repr: _ReprArgType = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
+    kw_only: bool = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
+    type: type | None = ...,
+) -> _T: ...
+
+# This form catches an explicit default argument.
+@overload
+def field(
+    *,
+    default: _T,
+    validator: _ValidatorArgType[_T] | None = ...,
+    repr: _ReprArgType = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
+    kw_only: bool = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
+    type: type | None = ...,
+) -> _T: ...
+
+# This form covers type=non-Type: e.g. forward references (str), Any
+@overload
+def field(
+    *,
+    default: _T | None = ...,
+    validator: _ValidatorArgType[_T] | None = ...,
+    repr: _ReprArgType = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    metadata: Mapping[Any, Any] | None = ...,
+    converter: _ConverterType
+    | list[_ConverterType]
+    | tuple[_ConverterType]
+    | None = ...,
+    factory: Callable[[], _T] | None = ...,
+    kw_only: bool = ...,
+    eq: _EqOrderType | None = ...,
+    order: _EqOrderType | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    alias: str | None = ...,
+    type: type | None = ...,
+) -> Any: ...
+@overload
+@dataclass_transform(field_specifiers=(attrib, field))
+def define(
+    maybe_cls: _C,
+    *,
+    these: dict[str, Any] | None = ...,
+    repr: bool = ...,
+    unsafe_hash: bool | None = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    slots: bool = ...,
+    frozen: bool = ...,
+    weakref_slot: bool = ...,
+    str: bool = ...,
+    auto_attribs: bool = ...,
+    kw_only: bool = ...,
+    cache_hash: bool = ...,
+    auto_exc: bool = ...,
+    eq: bool | None = ...,
+    order: bool | None = ...,
+    auto_detect: bool = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
+    match_args: bool = ...,
+) -> _C: ...
+@overload
+@dataclass_transform(field_specifiers=(attrib, field))
+def define(
+    maybe_cls: None = ...,
+    *,
+    these: dict[str, Any] | None = ...,
+    repr: bool = ...,
+    unsafe_hash: bool | None = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    slots: bool = ...,
+    frozen: bool = ...,
+    weakref_slot: bool = ...,
+    str: bool = ...,
+    auto_attribs: bool = ...,
+    kw_only: bool = ...,
+    cache_hash: bool = ...,
+    auto_exc: bool = ...,
+    eq: bool | None = ...,
+    order: bool | None = ...,
+    auto_detect: bool = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
+    match_args: bool = ...,
+) -> Callable[[_C], _C]: ...
+
+mutable = define
+
+@overload
+@dataclass_transform(frozen_default=True, field_specifiers=(attrib, field))
+def frozen(
+    maybe_cls: _C,
+    *,
+    these: dict[str, Any] | None = ...,
+    repr: bool = ...,
+    unsafe_hash: bool | None = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    slots: bool = ...,
+    frozen: bool = ...,
+    weakref_slot: bool = ...,
+    str: bool = ...,
+    auto_attribs: bool = ...,
+    kw_only: bool = ...,
+    cache_hash: bool = ...,
+    auto_exc: bool = ...,
+    eq: bool | None = ...,
+    order: bool | None = ...,
+    auto_detect: bool = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
+    match_args: bool = ...,
+) -> _C: ...
+@overload
+@dataclass_transform(frozen_default=True, field_specifiers=(attrib, field))
+def frozen(
+    maybe_cls: None = ...,
+    *,
+    these: dict[str, Any] | None = ...,
+    repr: bool = ...,
+    unsafe_hash: bool | None = ...,
+    hash: bool | None = ...,
+    init: bool = ...,
+    slots: bool = ...,
+    frozen: bool = ...,
+    weakref_slot: bool = ...,
+    str: bool = ...,
+    auto_attribs: bool = ...,
+    kw_only: bool = ...,
+    cache_hash: bool = ...,
+    auto_exc: bool = ...,
+    eq: bool | None = ...,
+    order: bool | None = ...,
+    auto_detect: bool = ...,
+    getstate_setstate: bool | None = ...,
+    on_setattr: _OnSetAttrArgType | None = ...,
+    field_transformer: _FieldTransformer | None = ...,
+    match_args: bool = ...,
+) -> Callable[[_C], _C]: ...
diff --git a/libs/babelfish-0.6.0.dist-info/INSTALLER b/libs/babelfish-0.6.1.dist-info/INSTALLER
similarity index 100%
rename from libs/babelfish-0.6.0.dist-info/INSTALLER
rename to libs/babelfish-0.6.1.dist-info/INSTALLER
diff --git a/libs/babelfish-0.6.0.dist-info/LICENSE b/libs/babelfish-0.6.1.dist-info/LICENSE
similarity index 100%
rename from libs/babelfish-0.6.0.dist-info/LICENSE
rename to libs/babelfish-0.6.1.dist-info/LICENSE
diff --git a/libs/babelfish-0.6.0.dist-info/METADATA b/libs/babelfish-0.6.1.dist-info/METADATA
similarity index 89%
rename from libs/babelfish-0.6.0.dist-info/METADATA
rename to libs/babelfish-0.6.1.dist-info/METADATA
index 5ed0d4c5c..ef3d36c55 100644
--- a/libs/babelfish-0.6.0.dist-info/METADATA
+++ b/libs/babelfish-0.6.1.dist-info/METADATA
@@ -1,29 +1,30 @@
 Metadata-Version: 2.1
 Name: babelfish
-Version: 0.6.0
+Version: 0.6.1
 Summary: A module to work with countries and languages
 Home-page: https://github.com/Diaoul/babelfish
 License: BSD-3-Clause
 Keywords: language,country,locale
 Author: Antoine Bertin
 Author-email: ant.bertin@gmail.com
-Requires-Python: >=3.6,<4.0
+Requires-Python: >=3.8,<4.0
 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 :: 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: Topic :: Software Development :: Internationalization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Dist: importlib-metadata (>=4.6,<5.0) ; python_version < "3.10"
+Requires-Dist: importlib-resources (>=5.0,<6.0) ; python_version < "3.9"
 Project-URL: Repository, https://github.com/Diaoul/babelfish
 Description-Content-Type: text/markdown
 
@@ -55,7 +56,7 @@ Country representation from 2-letter code (ISO-3166):
 
 Built-in country converters (name):
 ```python
->>> country = babelfish.Country('GB')
+>>> country = babelfish.Country.fromname('United Kingdom')
 >>> country
 <Country [GB]>
 ```
@@ -88,6 +89,8 @@ Built-in language converters (alpha2, alpha3b, alpha3t, name, scope, type and op
 >>> language = babelfish.Language('por', 'BR')
 >>> language.alpha2
 'pt'
+>>> language.name
+'Portuguese'
 >>> language.scope
 'individual'
 >>> language.type
diff --git a/libs/babelfish-0.6.0.dist-info/RECORD b/libs/babelfish-0.6.1.dist-info/RECORD
similarity index 61%
rename from libs/babelfish-0.6.0.dist-info/RECORD
rename to libs/babelfish-0.6.1.dist-info/RECORD
index d880fa869..24e923f69 100644
--- a/libs/babelfish-0.6.0.dist-info/RECORD
+++ b/libs/babelfish-0.6.1.dist-info/RECORD
@@ -1,11 +1,12 @@
-babelfish-0.6.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-babelfish-0.6.0.dist-info/LICENSE,sha256=Oks1Oz6Ct0po2CM5dQD3S8oXrnJOJ1jMNj28Y5yXpao,1529
-babelfish-0.6.0.dist-info/METADATA,sha256=8jYo3WO5AI6-SQfqvix3zYsPwqPVo__07TBgLlKT12A,3003
-babelfish-0.6.0.dist-info/RECORD,,
-babelfish-0.6.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-babelfish-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+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/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/__init__.py,sha256=acwjM_qKby8EzOkPVT-R1Usakhba0s7mO-Q4QXFPZgs,761
-babelfish/converters/__init__.py,sha256=T4lfWFLaCXEHGhS86k4v9PWGhn4Hbf0I2LvFs-M3tCs,9366
+babelfish/compat.py,sha256=nobpsm7Iv2QLBBg1af4OxgzcNAwRJP642Juyai_6UMg,976
+babelfish/converters/__init__.py,sha256=N2z65eoHo0_9ZHgipi-9cVpd2lMX3Dk8ro2YEStbETA,9361
 babelfish/converters/alpha2.py,sha256=4eeZPb4tDZ7pF2D9AUvk4UAUupYAOnjJFHGScn_UWeM,556
 babelfish/converters/alpha3b.py,sha256=1PAhxBeWurFGct1LqA-nx5nW9WezbsfM-Zxkm5Iy2ns,559
 babelfish/converters/alpha3t.py,sha256=kC-UfDRHQSKLAdgMJ2vFTE9PabSJewHyTBsSXXnNfqM,559
@@ -14,11 +15,11 @@ babelfish/converters/name.py,sha256=GO23olijoeer60dWfvIdCl3LK_FaMIwktlt10XMiGq8,
 babelfish/converters/opensubtitles.py,sha256=Y6b7eusAuOeqC8YoFIRZNGfzWfr8V9fxvbjIsDu7Vak,1774
 babelfish/converters/scope.py,sha256=IHGigVNrytzebKkgEZIdHxjCPid8LIUnQXTbnHQ2uGE,847
 babelfish/converters/type.py,sha256=RoiSQalynx8aoGYInHBZJL1YkHiMeVvrOK3WYLP0w0A,898
-babelfish/country.py,sha256=jZplgI8JwhMb2b4RO0HK30LMpmq3Fl1uoygA0D0_s_8,3242
+babelfish/country.py,sha256=aUX4_QBhEosYcukpUqYYynC56OsKh9I4wI96w_zbRHw,3215
 babelfish/data/iso-3166-1.txt,sha256=CxUAGynPLTb8dpzrpvhp2e9unItP-2WmBuHnPKYXajI,4113
 babelfish/data/iso-639-3.tab,sha256=CI7Kbv498zK2uAcZLVFAMVQitBOlOTjVq7f_7OXekAI,184527
 babelfish/data/iso15924-utf8-20131012.txt,sha256=fthbRClXJbbXIIDS7hXyhQUOXopfHQSWlrFf0rQNEc4,9872
 babelfish/data/opensubtitles_languages.txt,sha256=qLfynAWhzWqTHU8D4A6aWSXcN10UDl7Ekw1lVJgllJw,9582
 babelfish/exceptions.py,sha256=G1oSC4BkZZakJPIgnkNZrLsTFam_eT9jYiER4naTdYs,2332
-babelfish/language.py,sha256=z7rCd8ERzFs07_w7ZTIepo-0-dJ2KEz9AV1bSgXGozQ,6874
-babelfish/script.py,sha256=wX9JZRYqgnx9vaB7KW2KAmAZMlenUFSy2M-J__M4xpM,2054
+babelfish/language.py,sha256=XIBWQwNVeRHhYllCauHSVrc8So6eV6cr7ZINndbm-tQ,6847
+babelfish/script.py,sha256=A_D1T7n1KVl8U2HwSuIbgksZj-LU7EQZMdY1nKVe2pU,2027
diff --git a/libs/babelfish-0.6.0.dist-info/REQUESTED b/libs/babelfish-0.6.1.dist-info/REQUESTED
similarity index 100%
rename from libs/babelfish-0.6.0.dist-info/REQUESTED
rename to libs/babelfish-0.6.1.dist-info/REQUESTED
diff --git a/libs/babelfish-0.6.0.dist-info/WHEEL b/libs/babelfish-0.6.1.dist-info/WHEEL
similarity index 67%
rename from libs/babelfish-0.6.0.dist-info/WHEEL
rename to libs/babelfish-0.6.1.dist-info/WHEEL
index d73ccaae8..8b9b3a1bf 100644
--- a/libs/babelfish-0.6.0.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.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/babelfish/compat.py b/libs/babelfish/compat.py
new file mode 100644
index 000000000..a546b983f
--- /dev/null
+++ b/libs/babelfish/compat.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2013 the BabelFish authors. All rights reserved.
+# Use of this source code is governed by the 3-clause BSD license
+# that can be found in the LICENSE file.
+#
+from sys import version_info as _python
+
+if _python >= (3, 9):
+    # introduced in python 3.9
+    from importlib.resources import files
+else:
+    from importlib_resources import files
+
+
+if _python >= (3, 10):
+    # .select() was introduced in 3.10
+    from importlib.metadata import entry_points, EntryPoint as _EntryPoint
+else:
+    from importlib_metadata import entry_points, EntryPoint as _EntryPoint
+
+
+def resource_stream(pkg, path):
+    return files(pkg).joinpath(f'{path}').open('rb')
+
+
+def iter_entry_points(group, **kwargs):
+    return entry_points().select(group=group, **kwargs)
+
+
+class EntryPoint(_EntryPoint):
+    @staticmethod
+    def parse(eps):
+        return EntryPoint(*map(str.strip, eps.split('=')), None)
+
+    def resolve(self):
+        return self.load()
diff --git a/libs/babelfish/converters/__init__.py b/libs/babelfish/converters/__init__.py
index d27f84900..13c0aa0d7 100644
--- a/libs/babelfish/converters/__init__.py
+++ b/libs/babelfish/converters/__init__.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by the 3-clause BSD license
 # that can be found in the LICENSE file.
 #
-from pkg_resources import iter_entry_points, EntryPoint
+from ..compat import iter_entry_points, EntryPoint
 from ..exceptions import LanguageConvertError, LanguageReverseError
 
 try:
diff --git a/libs/babelfish/country.py b/libs/babelfish/country.py
index 4c24b52b2..618585676 100644
--- a/libs/babelfish/country.py
+++ b/libs/babelfish/country.py
@@ -7,9 +7,9 @@
 from __future__ import unicode_literals
 from collections import namedtuple
 from functools import partial
-from pkg_resources import resource_stream  # @UnresolvedImport
 from .converters import ConverterManager
 from . import basestr
+from .compat import resource_stream
 
 
 COUNTRIES = {}
diff --git a/libs/babelfish/language.py b/libs/babelfish/language.py
index b4b251937..fe5bfb69a 100644
--- a/libs/babelfish/language.py
+++ b/libs/babelfish/language.py
@@ -7,12 +7,12 @@
 from __future__ import unicode_literals
 from collections import namedtuple
 from functools import partial
-from pkg_resources import resource_stream  # @UnresolvedImport
 from .converters import ConverterManager
 from .country import Country
 from .exceptions import LanguageConvertError
 from .script import Script
 from . import basestr
+from .compat import resource_stream
 
 
 LANGUAGES = set()
diff --git a/libs/babelfish/script.py b/libs/babelfish/script.py
index 4b59ce016..f073e95e2 100644
--- a/libs/babelfish/script.py
+++ b/libs/babelfish/script.py
@@ -6,8 +6,8 @@
 #
 from __future__ import unicode_literals
 from collections import namedtuple
-from pkg_resources import resource_stream  # @UnresolvedImport
 from . import basestr
+from .compat import resource_stream
 
 #: Script code to script name mapping
 SCRIPTS = {}
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
index 66475a126..23cc977d3 100644
--- a/libs/backports.functools_lru_cache-2.0.0.dist-info/RECORD
+++ b/libs/backports.functools_lru_cache-2.0.0.dist-info/RECORD
@@ -3,7 +3,7 @@ backports.functools_lru_cache-2.0.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZX
 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=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+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
index 4724c4573..17c0299e4 100644
--- a/libs/backports.functools_lru_cache-2.0.0.dist-info/WHEEL
+++ b/libs/backports.functools_lru_cache-2.0.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.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
index 7b525d1a1..d8835ccf6 100644
--- a/libs/backports.zoneinfo-0.2.1.dist-info/METADATA
+++ b/libs/backports.zoneinfo-0.2.1.dist-info/METADATA
@@ -21,9 +21,9 @@ 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"
+Requires-Dist: importlib-resources; python_version < "3.7"
 Provides-Extra: tzdata
-Requires-Dist: tzdata ; extra == 'tzdata'
+Requires-Dist: tzdata; extra == "tzdata"
 
 # `backports.zoneinfo`: Backport of the standard library module `zoneinfo`
 
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/RECORD b/libs/backports.zoneinfo-0.2.1.dist-info/RECORD
index 03fdbec2f..f470c9c96 100644
--- a/libs/backports.zoneinfo-0.2.1.dist-info/RECORD
+++ b/libs/backports.zoneinfo-0.2.1.dist-info/RECORD
@@ -1,16 +1,16 @@
 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=S7c5jZ1GkrxjGZYinAJC-hHrwKVky2Fjr9x92y1rQXg,4761
+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=UkJU7GAEhyIKVwGX1j1L5OGjUFT--MirwyCseqfCpZU,109
+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=9MZ7hR2rFXStRKAy7qnL1NQIDTK98U_5w3TBbifnDHs,74480
+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
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL b/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL
index 844cf17ca..be75fa70d 100644
--- a/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL
+++ b/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_12_0_x86_64
 
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/METADATA b/libs/beautifulsoup4-4.12.3.dist-info/METADATA
index a2681d725..13acac383 100644
--- a/libs/beautifulsoup4-4.12.3.dist-info/METADATA
+++ b/libs/beautifulsoup4-4.12.3.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: beautifulsoup4
 Version: 4.12.3
 Summary: Screen-scraping library
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/RECORD b/libs/beautifulsoup4-4.12.3.dist-info/RECORD
index 9f7024d2d..78a653b9f 100644
--- a/libs/beautifulsoup4-4.12.3.dist-info/RECORD
+++ b/libs/beautifulsoup4-4.12.3.dist-info/RECORD
@@ -1,8 +1,8 @@
 beautifulsoup4-4.12.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-beautifulsoup4-4.12.3.dist-info/METADATA,sha256=UkOS1koIjlakIy9Q1u2yCNwDEFOUZSrLcsbV-mTInz4,3790
+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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+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
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/WHEEL b/libs/beautifulsoup4-4.12.3.dist-info/WHEEL
index 5998f3aab..cdd68a497 100644
--- a/libs/beautifulsoup4-4.12.3.dist-info/WHEEL
+++ b/libs/beautifulsoup4-4.12.3.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/bidict-0.23.1.dist-info/RECORD b/libs/bidict-0.23.1.dist-info/RECORD
index db89d0582..4f4482ad2 100644
--- a/libs/bidict-0.23.1.dist-info/RECORD
+++ b/libs/bidict-0.23.1.dist-info/RECORD
@@ -3,7 +3,7 @@ bidict-0.23.1.dist-info/LICENSE,sha256=8_U63OyqSNc6ZuI4-lupBstBh2eDtF0ooTRrMULuv
 bidict-0.23.1.dist-info/METADATA,sha256=2ovIRm6Df8gdwAMekGqkeBSF5TWj2mv1jpmh4W4ks7o,8704
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+bidict-0.23.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
 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 98c0d20b7..da25d7b42 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: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/bin/filetype b/libs/bin/filetype
new file mode 100755
index 000000000..b59f6be9e
--- /dev/null
+++ b/libs/bin/filetype
@@ -0,0 +1,8 @@
+#!/usr/local/opt/python@3.8/bin/python3.8
+# -*- coding: utf-8 -*-
+import re
+import sys
+from filetype.__main__ import main
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())
diff --git a/libs/blinker-1.7.0.dist-info/METADATA b/libs/blinker-1.7.0.dist-info/METADATA
deleted file mode 100644
index f96613c4b..000000000
--- a/libs/blinker-1.7.0.dist-info/METADATA
+++ /dev/null
@@ -1,62 +0,0 @@
-Metadata-Version: 2.1
-Name: blinker
-Version: 1.7.0
-Summary: Fast, simple object-to-object and broadcast signaling
-Keywords: signal,emit,events,broadcast
-Author-email: Jason Kirtland <jek@discorporate.us>
-Maintainer-email: Pallets Ecosystem <contact@palletsprojects.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-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: Topic :: Software Development :: Libraries
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://blinker.readthedocs.io
-Project-URL: Homepage, https://blinker.readthedocs.io
-Project-URL: Issue Tracker, https://github.com/pallets-eco/blinker/issues/
-Project-URL: Source Code, 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".
-
-Signal receivers can subscribe to specific senders or receive signals
-sent by any sender.
-
-.. code-block:: 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!
-
-
-Links
------
-
--   Documentation: https://blinker.readthedocs.io/
--   Changes: https://blinker.readthedocs.io/#changes
--   PyPI Releases: https://pypi.org/project/blinker/
--   Source Code: https://github.com/pallets-eco/blinker/
--   Issue Tracker: https://github.com/pallets-eco/blinker/issues/
-
diff --git a/libs/blinker-1.7.0.dist-info/RECORD b/libs/blinker-1.7.0.dist-info/RECORD
deleted file mode 100644
index c7ee02670..000000000
--- a/libs/blinker-1.7.0.dist-info/RECORD
+++ /dev/null
@@ -1,11 +0,0 @@
-blinker-1.7.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-blinker-1.7.0.dist-info/LICENSE.rst,sha256=nrc6HzhZekqhcCXSrhvjg5Ykx5XphdTw6Xac4p-spGc,1054
-blinker-1.7.0.dist-info/METADATA,sha256=kDgzPgrw4he78pEX88bSAqwYMVWrfUMk8QmNjekjg_U,1918
-blinker-1.7.0.dist-info/RECORD,,
-blinker-1.7.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-blinker-1.7.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-blinker/__init__.py,sha256=s75XaRDHwSDzZ21BZUOEkQDQIcQEyT8hT7vk3EhYFQU,408
-blinker/_saferef.py,sha256=kWOTIWnCY3kOb8lZP74Rbx7bR_BLVg4TjwzNCRLhKHs,9096
-blinker/_utilities.py,sha256=S2njKDmlBpK_yCK4RT8hq98hEj30I0TQCC5mNhtY22I,2856
-blinker/base.py,sha256=FqZmAI5YzuRrvRmye1Jb-utyVOjXtF5vUVP3-1u-HtU,20544
-blinker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/blinker-1.7.0.dist-info/INSTALLER b/libs/blinker-1.8.2.dist-info/INSTALLER
similarity index 100%
rename from libs/blinker-1.7.0.dist-info/INSTALLER
rename to libs/blinker-1.8.2.dist-info/INSTALLER
diff --git a/libs/blinker-1.7.0.dist-info/LICENSE.rst b/libs/blinker-1.8.2.dist-info/LICENSE.txt
similarity index 100%
rename from libs/blinker-1.7.0.dist-info/LICENSE.rst
rename to libs/blinker-1.8.2.dist-info/LICENSE.txt
diff --git a/libs/blinker-1.8.2.dist-info/METADATA b/libs/blinker-1.8.2.dist-info/METADATA
new file mode 100644
index 000000000..265a62023
--- /dev/null
+++ b/libs/blinker-1.8.2.dist-info/METADATA
@@ -0,0 +1,60 @@
+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
new file mode 100644
index 000000000..d847313ba
--- /dev/null
+++ b/libs/blinker-1.8.2.dist-info/RECORD
@@ -0,0 +1,10 @@
+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.7.0.dist-info/REQUESTED b/libs/blinker-1.8.2.dist-info/REQUESTED
similarity index 100%
rename from libs/blinker-1.7.0.dist-info/REQUESTED
rename to libs/blinker-1.8.2.dist-info/REQUESTED
diff --git a/libs/werkzeug-3.0.1.dist-info/WHEEL b/libs/blinker-1.8.2.dist-info/WHEEL
similarity index 71%
rename from libs/werkzeug-3.0.1.dist-info/WHEEL
rename to libs/blinker-1.8.2.dist-info/WHEEL
index 3b5e64b5e..e3c6feefa 100644
--- a/libs/werkzeug-3.0.1.dist-info/WHEEL
+++ b/libs/blinker-1.8.2.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/blinker/__init__.py b/libs/blinker/__init__.py
index d014caa0f..c93527eca 100644
--- a/libs/blinker/__init__.py
+++ b/libs/blinker/__init__.py
@@ -1,19 +1,60 @@
-from blinker.base import ANY
-from blinker.base import NamedSignal
-from blinker.base import Namespace
-from blinker.base import receiver_connected
-from blinker.base import Signal
-from blinker.base import signal
-from blinker.base import WeakNamespace
+from __future__ import annotations
+
+import typing as t
+
+from .base import ANY
+from .base import default_namespace
+from .base import NamedSignal
+from .base import Namespace
+from .base import Signal
+from .base import signal
 
 __all__ = [
     "ANY",
+    "default_namespace",
     "NamedSignal",
     "Namespace",
     "Signal",
-    "WeakNamespace",
-    "receiver_connected",
     "signal",
 ]
 
-__version__ = "1.7.0"
+
+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/_saferef.py b/libs/blinker/_saferef.py
deleted file mode 100644
index dcb70c189..000000000
--- a/libs/blinker/_saferef.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# extracted from Louie, http://pylouie.org/
-# updated for Python 3
-#
-# Copyright (c) 2006 Patrick K. O'Brien, Mike C. Fletcher,
-#                    Matthew R. Scott
-#
-# 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
-# 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.
-#
-"""Refactored 'safe reference from dispatcher.py"""
-import operator
-import sys
-import traceback
-import weakref
-
-
-get_self = operator.attrgetter("__self__")
-get_func = operator.attrgetter("__func__")
-
-
-def safe_ref(target, on_delete=None):
-    """Return a *safe* weak reference to a callable target.
-
-    - ``target``: The object to be weakly referenced, if it's a bound
-      method reference, will create a BoundMethodWeakref, otherwise
-      creates a simple weakref.
-
-    - ``on_delete``: If provided, will have a hard reference stored to
-      the callable to be called after the safe reference goes out of
-      scope with the reference object, (either a weakref or a
-      BoundMethodWeakref) as argument.
-    """
-    try:
-        im_self = get_self(target)
-    except AttributeError:
-        if callable(on_delete):
-            return weakref.ref(target, on_delete)
-        else:
-            return weakref.ref(target)
-    else:
-        if im_self is not None:
-            # Turn a bound method into a BoundMethodWeakref instance.
-            # Keep track of these instances for lookup by disconnect().
-            assert hasattr(target, "im_func") or hasattr(target, "__func__"), (
-                f"safe_ref target {target!r} has im_self, but no im_func, "
-                "don't know how to create reference"
-            )
-            reference = BoundMethodWeakref(target=target, on_delete=on_delete)
-            return reference
-
-
-class BoundMethodWeakref:
-    """'Safe' and reusable weak references to instance methods.
-
-    BoundMethodWeakref objects provide a mechanism for referencing a
-    bound method without requiring that the method object itself
-    (which is normally a transient object) is kept alive.  Instead,
-    the BoundMethodWeakref object keeps weak references to both the
-    object and the function which together define the instance method.
-
-    Attributes:
-
-    - ``key``: The identity key for the reference, calculated by the
-      class's calculate_key method applied to the target instance method.
-
-    - ``deletion_methods``: Sequence of callable objects taking single
-      argument, a reference to this object which will be called when
-      *either* the target object or target function is garbage
-      collected (i.e. when this object becomes invalid).  These are
-      specified as the on_delete parameters of safe_ref calls.
-
-    - ``weak_self``: Weak reference to the target object.
-
-    - ``weak_func``: Weak reference to the target function.
-
-    Class Attributes:
-
-    - ``_all_instances``: Class attribute pointing to all live
-      BoundMethodWeakref objects indexed by the class's
-      calculate_key(target) method applied to the target objects.
-      This weak value dictionary is used to short-circuit creation so
-      that multiple references to the same (object, function) pair
-      produce the same BoundMethodWeakref instance.
-    """
-
-    _all_instances = weakref.WeakValueDictionary()  # type: ignore[var-annotated]
-
-    def __new__(cls, target, on_delete=None, *arguments, **named):
-        """Create new instance or return current instance.
-
-        Basically this method of construction allows us to
-        short-circuit creation of references to already-referenced
-        instance methods.  The key corresponding to the target is
-        calculated, and if there is already an existing reference,
-        that is returned, with its deletion_methods attribute updated.
-        Otherwise the new instance is created and registered in the
-        table of already-referenced methods.
-        """
-        key = cls.calculate_key(target)
-        current = cls._all_instances.get(key)
-        if current is not None:
-            current.deletion_methods.append(on_delete)
-            return current
-        else:
-            base = super().__new__(cls)
-            cls._all_instances[key] = base
-            base.__init__(target, on_delete, *arguments, **named)
-            return base
-
-    def __init__(self, target, on_delete=None):
-        """Return a weak-reference-like instance for a bound method.
-
-        - ``target``: The instance-method target for the weak reference,
-          must have im_self and im_func attributes and be
-          reconstructable via the following, which is true of built-in
-          instance methods::
-
-            target.im_func.__get__( target.im_self )
-
-        - ``on_delete``: Optional callback which will be called when
-          this weak reference ceases to be valid (i.e. either the
-          object or the function is garbage collected).  Should take a
-          single argument, which will be passed a pointer to this
-          object.
-        """
-
-        def remove(weak, self=self):
-            """Set self.isDead to True when method or instance is destroyed."""
-            methods = self.deletion_methods[:]
-            del self.deletion_methods[:]
-            try:
-                del self.__class__._all_instances[self.key]
-            except KeyError:
-                pass
-            for function in methods:
-                try:
-                    if callable(function):
-                        function(self)
-                except Exception:
-                    try:
-                        traceback.print_exc()
-                    except AttributeError:
-                        e = sys.exc_info()[1]
-                        print(
-                            f"Exception during saferef {self} "
-                            f"cleanup function {function}: {e}"
-                        )
-
-        self.deletion_methods = [on_delete]
-        self.key = self.calculate_key(target)
-        im_self = get_self(target)
-        im_func = get_func(target)
-        self.weak_self = weakref.ref(im_self, remove)
-        self.weak_func = weakref.ref(im_func, remove)
-        self.self_name = str(im_self)
-        self.func_name = str(im_func.__name__)
-
-    @classmethod
-    def calculate_key(cls, target):
-        """Calculate the reference key for this reference.
-
-        Currently this is a two-tuple of the id()'s of the target
-        object and the target function respectively.
-        """
-        return (id(get_self(target)), id(get_func(target)))
-
-    def __str__(self):
-        """Give a friendly representation of the object."""
-        return "{}({}.{})".format(
-            self.__class__.__name__,
-            self.self_name,
-            self.func_name,
-        )
-
-    __repr__ = __str__
-
-    def __hash__(self):
-        return hash((self.self_name, self.key))
-
-    def __nonzero__(self):
-        """Whether we are still a valid reference."""
-        return self() is not None
-
-    def __eq__(self, other):
-        """Compare with another reference."""
-        if not isinstance(other, self.__class__):
-            return operator.eq(self.__class__, type(other))
-        return operator.eq(self.key, other.key)
-
-    def __call__(self):
-        """Return a strong reference to the bound method.
-
-        If the target cannot be retrieved, then will return None,
-        otherwise returns a bound instance method for our object and
-        function.
-
-        Note: You may call this method any number of times, as it does
-        not invalidate the reference.
-        """
-        target = self.weak_self()
-        if target is not None:
-            function = self.weak_func()
-            if function is not None:
-                return function.__get__(target)
-        return None
diff --git a/libs/blinker/_utilities.py b/libs/blinker/_utilities.py
index 4b711c67d..000c902a2 100644
--- a/libs/blinker/_utilities.py
+++ b/libs/blinker/_utilities.py
@@ -1,105 +1,64 @@
 from __future__ import annotations
 
+import collections.abc as c
+import inspect
 import typing as t
 from weakref import ref
+from weakref import WeakMethod
 
-from blinker._saferef import BoundMethodWeakref
-
-IdentityType = t.Union[t.Tuple[int, int], str, int]
+T = t.TypeVar("T")
 
 
-class _symbol:
-    def __init__(self, name):
-        """Construct a new named symbol."""
-        self.__name__ = self.name = name
+class Symbol:
+    """A constant symbol, nicer than ``object()``. Repeated calls return the
+    same instance.
 
-    def __reduce__(self):
-        return symbol, (self.name,)
-
-    def __repr__(self):
-        return self.name
-
-
-_symbol.__name__ = "symbol"
-
-
-class symbol:
-    """A constant symbol.
-
-    >>> symbol('foo') is symbol('foo')
+    >>> Symbol('foo') is Symbol('foo')
     True
-    >>> symbol('foo')
+    >>> Symbol('foo')
     foo
-
-    A slight refinement of the MAGICCOOKIE=object() pattern.  The primary
-    advantage of symbol() is its repr().  They are also singletons.
-
-    Repeated calls of symbol('name') will all return the same instance.
-
     """
 
-    symbols = {}  # type: ignore[var-annotated]
+    symbols: t.ClassVar[dict[str, Symbol]] = {}
 
-    def __new__(cls, name):
-        try:
+    def __new__(cls, name: str) -> Symbol:
+        if name in cls.symbols:
             return cls.symbols[name]
-        except KeyError:
-            return cls.symbols.setdefault(name, _symbol(name))
 
-
-def hashable_identity(obj: object) -> IdentityType:
-    if hasattr(obj, "__func__"):
-        return (id(obj.__func__), id(obj.__self__))  # type: ignore[attr-defined]
-    elif hasattr(obj, "im_func"):
-        return (id(obj.im_func), id(obj.im_self))  # type: ignore[attr-defined]
-    elif isinstance(obj, (int, str)):
+        obj = super().__new__(cls)
+        cls.symbols[name] = obj
         return obj
-    else:
-        return id(obj)
+
+    def __init__(self, name: str) -> None:
+        self.name = name
+
+    def __repr__(self) -> str:
+        return self.name
+
+    def __getnewargs__(self) -> tuple[t.Any, ...]:
+        return (self.name,)
 
 
-WeakTypes = (ref, BoundMethodWeakref)
+def make_id(obj: object) -> c.Hashable:
+    """Get a stable identifier for a receiver or sender, to be used as a dict
+    key or in a set.
+    """
+    if inspect.ismethod(obj):
+        # The id of a bound method is not stable, but the id of the unbound
+        # function and instance are.
+        return id(obj.__func__), id(obj.__self__)
+
+    if isinstance(obj, (str, int)):
+        # Instances with the same value always compare equal and have the same
+        # hash, even if the id may change.
+        return obj
+
+    # Assume other types are not hashable but will always be the same instance.
+    return id(obj)
 
 
-class annotatable_weakref(ref):
-    """A weakref.ref that supports custom instance attributes."""
+def make_ref(obj: T, callback: c.Callable[[ref[T]], None] | None = None) -> ref[T]:
+    if inspect.ismethod(obj):
+        return WeakMethod(obj, callback)  # type: ignore[arg-type, return-value]
 
-    receiver_id: t.Optional[IdentityType]
-    sender_id: t.Optional[IdentityType]
-
-
-def reference(  # type: ignore[no-untyped-def]
-    object, callback=None, **annotations
-) -> annotatable_weakref:
-    """Return an annotated weak ref."""
-    if callable(object):
-        weak = callable_reference(object, callback)
-    else:
-        weak = annotatable_weakref(object, callback)
-    for key, value in annotations.items():
-        setattr(weak, key, value)
-    return weak  # type: ignore[no-any-return]
-
-
-def callable_reference(object, callback=None):
-    """Return an annotated weak ref, supporting bound instance methods."""
-    if hasattr(object, "im_self") and object.im_self is not None:
-        return BoundMethodWeakref(target=object, on_delete=callback)
-    elif hasattr(object, "__self__") and object.__self__ is not None:
-        return BoundMethodWeakref(target=object, on_delete=callback)
-    return annotatable_weakref(object, callback)
-
-
-class lazy_property:
-    """A @property that is only evaluated once."""
-
-    def __init__(self, deferred):
-        self._deferred = deferred
-        self.__doc__ = deferred.__doc__
-
-    def __get__(self, obj, cls):
-        if obj is None:
-            return self
-        value = self._deferred(obj)
-        setattr(obj, self._deferred.__name__, value)
-        return value
+    return ref(obj, callback)
diff --git a/libs/blinker/base.py b/libs/blinker/base.py
index b9d703586..ec494b141 100644
--- a/libs/blinker/base.py
+++ b/libs/blinker/base.py
@@ -1,213 +1,176 @@
-"""Signals and events.
-
-A small implementation of signals, inspired by a snippet of Django signal
-API client code seen in a blog post.  Signals are first-class objects and
-each manages its own receivers and message emission.
-
-The :func:`signal` function provides singleton behavior for named signals.
-
-"""
 from __future__ import annotations
 
+import collections.abc as c
 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 warnings import warn
 from weakref import WeakValueDictionary
 
-from blinker._utilities import annotatable_weakref
-from blinker._utilities import hashable_identity
-from blinker._utilities import IdentityType
-from blinker._utilities import lazy_property
-from blinker._utilities import reference
-from blinker._utilities import symbol
-from blinker._utilities import WeakTypes
+from ._utilities import make_id
+from ._utilities import make_ref
+from ._utilities import Symbol
 
 if t.TYPE_CHECKING:
-    import typing_extensions as te
+    F = t.TypeVar("F", bound=c.Callable[..., t.Any])
 
-    T_callable = t.TypeVar("T_callable", bound=t.Callable[..., t.Any])
+ANY = Symbol("ANY")
+"""Symbol for "any sender"."""
 
-    T = t.TypeVar("T")
-    P = te.ParamSpec("P")
-
-    AsyncWrapperType = t.Callable[[t.Callable[P, t.Awaitable[T]]], t.Callable[P, T]]
-    SyncWrapperType = t.Callable[[t.Callable[P, T]], t.Callable[P, t.Awaitable[T]]]
-
-ANY = symbol("ANY")
-ANY.__doc__ = 'Token for "any sender".'
 ANY_ID = 0
 
-# NOTE: We need a reference to cast for use in weakref callbacks otherwise
-#       t.cast may have already been set to None during finalization.
-cast = t.cast
-
 
 class Signal:
-    """A notification emitter."""
+    """A notification emitter.
+
+    :param doc: The docstring for the signal.
+    """
 
-    #: An :obj:`ANY` convenience synonym, allows ``Signal.ANY``
-    #: without an additional import.
     ANY = ANY
+    """An alias for the :data:`~blinker.ANY` sender symbol."""
 
-    set_class: type[set] = set
+    set_class: type[set[t.Any]] = set
+    """The set class to use for tracking connected receivers and senders.
+    Python's ``set`` is unordered. If receivers must be dispatched in the order
+    they were connected, an ordered set implementation can be used.
 
-    @lazy_property
+    .. versionadded:: 1.7
+    """
+
+    @cached_property
     def receiver_connected(self) -> Signal:
-        """Emitted after each :meth:`connect`.
+        """Emitted at the end of each :meth:`connect` call.
 
         The signal sender is the signal instance, and the :meth:`connect`
-        arguments are passed through: *receiver*, *sender*, and *weak*.
+        arguments are passed through: ``receiver``, ``sender``, and ``weak``.
 
         .. versionadded:: 1.2
-
         """
         return Signal(doc="Emitted after a receiver connects.")
 
-    @lazy_property
+    @cached_property
     def receiver_disconnected(self) -> Signal:
-        """Emitted after :meth:`disconnect`.
+        """Emitted at the end of each :meth:`disconnect` call.
 
         The sender is the signal instance, and the :meth:`disconnect` arguments
-        are passed through: *receiver* and *sender*.
+        are passed through: ``receiver`` and ``sender``.
 
-        Note, this signal is emitted **only** when :meth:`disconnect` is
-        called explicitly.
-
-        The disconnect signal can not be emitted by an automatic disconnect
-        (due to a weakly referenced receiver or sender going out of scope),
-        as the receiver and/or sender instances are no longer available for
-        use at the time this signal would be emitted.
+        This signal is emitted **only** when :meth:`disconnect` is called
+        explicitly. This signal cannot be emitted by an automatic disconnect
+        when a weakly referenced receiver or sender goes out of scope, as the
+        instance is no longer be available to be used as the sender for this
+        signal.
 
         An alternative approach is available by subscribing to
         :attr:`receiver_connected` and setting up a custom weakref cleanup
         callback on weak receivers and senders.
 
         .. versionadded:: 1.2
-
         """
         return Signal(doc="Emitted after a receiver disconnects.")
 
     def __init__(self, doc: str | None = None) -> None:
-        """
-        :param doc: optional.  If provided, will be assigned to the signal's
-          __doc__ attribute.
-
-        """
         if doc:
             self.__doc__ = doc
-        #: A mapping of connected receivers.
-        #:
-        #: The values of this mapping are not meaningful outside of the
-        #: internal :class:`Signal` implementation, however the boolean value
-        #: of the mapping is useful as an extremely efficient check to see if
-        #: any receivers are connected to the signal.
-        self.receivers: dict[IdentityType, t.Callable | annotatable_weakref] = {}
-        self.is_muted = False
-        self._by_receiver: dict[IdentityType, set[IdentityType]] = defaultdict(
-            self.set_class
-        )
-        self._by_sender: dict[IdentityType, set[IdentityType]] = defaultdict(
-            self.set_class
-        )
-        self._weak_senders: dict[IdentityType, annotatable_weakref] = {}
-
-    def connect(
-        self, receiver: T_callable, sender: t.Any = ANY, weak: bool = True
-    ) -> T_callable:
-        """Connect *receiver* to signal events sent by *sender*.
-
-        :param receiver: A callable.  Will be invoked by :meth:`send` with
-          `sender=` as a single positional argument and any ``kwargs`` that
-          were provided to a call to :meth:`send`.
-
-        :param sender: Any object or :obj:`ANY`, defaults to ``ANY``.
-          Restricts notifications delivered to *receiver* to only those
-          :meth:`send` emissions sent by *sender*.  If ``ANY``, the receiver
-          will always be notified.  A *receiver* may be connected to
-          multiple *sender* values on the same Signal through multiple calls
-          to :meth:`connect`.
-
-        :param weak: If true, the Signal will hold a weakref to *receiver*
-          and automatically disconnect when *receiver* goes out of scope or
-          is garbage collected.  Defaults to True.
 
+        self.receivers: dict[
+            t.Any, weakref.ref[c.Callable[..., t.Any]] | c.Callable[..., t.Any]
+        ] = {}
+        """The map of connected receivers. Useful to quickly check if any
+        receivers are connected to the signal: ``if s.receivers:``. The
+        structure and data is not part of the public API, but checking its
+        boolean value is.
         """
-        receiver_id = hashable_identity(receiver)
-        receiver_ref: T_callable | annotatable_weakref
+
+        self.is_muted: bool = False
+        self._by_receiver: dict[t.Any, set[t.Any]] = defaultdict(self.set_class)
+        self._by_sender: dict[t.Any, set[t.Any]] = defaultdict(self.set_class)
+        self._weak_senders: dict[t.Any, weakref.ref[t.Any]] = {}
+
+    def connect(self, receiver: F, sender: t.Any = ANY, weak: bool = True) -> F:
+        """Connect ``receiver`` to be called when the signal is sent by
+        ``sender``.
+
+        :param receiver: The callable to call when :meth:`send` is called with
+            the given ``sender``, passing ``sender`` as a positional argument
+            along with any extra keyword arguments.
+        :param sender: Any object or :data:`ANY`. ``receiver`` will only be
+            called when :meth:`send` is called with this sender. If ``ANY``, the
+            receiver will be called for any sender. A receiver may be connected
+            to multiple senders by calling :meth:`connect` multiple times.
+        :param weak: Track the receiver with a :mod:`weakref`. The receiver will
+            be automatically disconnected when it is garbage collected. When
+            connecting a receiver defined within a function, set to ``False``,
+            otherwise it will be disconnected when the function scope ends.
+        """
+        receiver_id = make_id(receiver)
+        sender_id = ANY_ID if sender is ANY else make_id(sender)
 
         if weak:
-            receiver_ref = reference(receiver, self._cleanup_receiver)
-            receiver_ref.receiver_id = receiver_id
+            self.receivers[receiver_id] = make_ref(
+                receiver, self._make_cleanup_receiver(receiver_id)
+            )
         else:
-            receiver_ref = receiver
-        sender_id: IdentityType
-        if sender is ANY:
-            sender_id = ANY_ID
-        else:
-            sender_id = hashable_identity(sender)
+            self.receivers[receiver_id] = receiver
 
-        self.receivers.setdefault(receiver_id, receiver_ref)
         self._by_sender[sender_id].add(receiver_id)
         self._by_receiver[receiver_id].add(sender_id)
-        del receiver_ref
 
         if sender is not ANY and sender_id not in self._weak_senders:
-            # wire together a cleanup for weakref-able senders
+            # store a cleanup for weakref-able senders
             try:
-                sender_ref = reference(sender, self._cleanup_sender)
-                sender_ref.sender_id = sender_id
+                self._weak_senders[sender_id] = make_ref(
+                    sender, self._make_cleanup_sender(sender_id)
+                )
             except TypeError:
                 pass
-            else:
-                self._weak_senders.setdefault(sender_id, sender_ref)
-                del sender_ref
 
-        # broadcast this connection.  if receivers raise, disconnect.
         if "receiver_connected" in self.__dict__ and self.receiver_connected.receivers:
             try:
                 self.receiver_connected.send(
                     self, receiver=receiver, sender=sender, weak=weak
                 )
-            except TypeError as e:
+            except TypeError:
+                # TODO no explanation or test for this
                 self.disconnect(receiver, sender)
-                raise e
-        if receiver_connected.receivers and self is not receiver_connected:
+                raise
+
+        if _receiver_connected.receivers and self is not _receiver_connected:
             try:
-                receiver_connected.send(
+                _receiver_connected.send(
                     self, receiver_arg=receiver, sender_arg=sender, weak_arg=weak
                 )
-            except TypeError as e:
+            except TypeError:
                 self.disconnect(receiver, sender)
-                raise e
+                raise
+
         return receiver
 
-    def connect_via(
-        self, sender: t.Any, weak: bool = False
-    ) -> t.Callable[[T_callable], T_callable]:
-        """Connect the decorated function as a receiver for *sender*.
+    def connect_via(self, sender: t.Any, weak: bool = False) -> c.Callable[[F], F]:
+        """Connect the decorated function to be called when the signal is sent
+        by ``sender``.
 
-        :param sender: Any object or :obj:`ANY`.  The decorated function
-          will only receive :meth:`send` emissions sent by *sender*.  If
-          ``ANY``, the receiver will always be notified.  A function may be
-          decorated multiple times with differing *sender* values.
-
-        :param weak: If true, the Signal will hold a weakref to the
-          decorated function and automatically disconnect when *receiver*
-          goes out of scope or is garbage collected.  Unlike
-          :meth:`connect`, this defaults to False.
-
-        The decorated function will be invoked by :meth:`send` with
-          `sender=` as a single positional argument and any ``kwargs`` that
-          were provided to the call to :meth:`send`.
+        The decorated function will be called when :meth:`send` is called with
+        the given ``sender``, passing ``sender`` as a positional argument along
+        with any extra keyword arguments.
 
+        :param sender: Any object or :data:`ANY`. ``receiver`` will only be
+            called when :meth:`send` is called with this sender. If ``ANY``, the
+            receiver will be called for any sender. A receiver may be connected
+            to multiple senders by calling :meth:`connect` multiple times.
+        :param weak: Track the receiver with a :mod:`weakref`. The receiver will
+            be automatically disconnected when it is garbage collected. When
+            connecting a receiver defined within a function, set to ``False``,
+            otherwise it will be disconnected when the function scope ends.=
 
         .. versionadded:: 1.1
-
         """
 
-        def decorator(fn: T_callable) -> T_callable:
+        def decorator(fn: F) -> F:
             self.connect(fn, sender, weak)
             return fn
 
@@ -215,208 +178,235 @@ class Signal:
 
     @contextmanager
     def connected_to(
-        self, receiver: t.Callable, sender: t.Any = ANY
-    ) -> t.Generator[None, None, None]:
-        """Execute a block with the signal temporarily connected to *receiver*.
+        self, receiver: c.Callable[..., t.Any], sender: t.Any = ANY
+    ) -> c.Generator[None, None, None]:
+        """A context manager that temporarily connects ``receiver`` to the
+        signal while a ``with`` block executes. When the block exits, the
+        receiver is disconnected. Useful for tests.
 
-        :param receiver: a receiver callable
-        :param sender: optional, a sender to filter on
-
-        This is a context manager for use in the ``with`` statement.  It can
-        be useful in unit tests.  *receiver* is connected to the signal for
-        the duration of the ``with`` block, and will be disconnected
-        automatically when exiting the block:
-
-        .. code-block:: python
-
-          with on_ready.connected_to(receiver):
-             # do stuff
-             on_ready.send(123)
+        :param receiver: The callable to call when :meth:`send` is called with
+            the given ``sender``, passing ``sender`` as a positional argument
+            along with any extra keyword arguments.
+        :param sender: Any object or :data:`ANY`. ``receiver`` will only be
+            called when :meth:`send` is called with this sender. If ``ANY``, the
+            receiver will be called for any sender.
 
         .. versionadded:: 1.1
-
         """
         self.connect(receiver, sender=sender, weak=False)
+
         try:
             yield None
         finally:
             self.disconnect(receiver)
 
     @contextmanager
-    def muted(self) -> t.Generator[None, None, None]:
-        """Context manager for temporarily disabling signal.
-        Useful for test purposes.
+    def muted(self) -> c.Generator[None, None, None]:
+        """A context manager that temporarily disables the signal. No receivers
+        will be called if the signal is sent, until the ``with`` block exits.
+        Useful for tests.
         """
         self.is_muted = True
+
         try:
             yield None
-        except Exception as e:
-            raise e
         finally:
             self.is_muted = False
 
     def temporarily_connected_to(
-        self, receiver: t.Callable, sender: t.Any = ANY
-    ) -> t.ContextManager[None]:
-        """An alias for :meth:`connected_to`.
+        self, receiver: c.Callable[..., t.Any], sender: t.Any = ANY
+    ) -> AbstractContextManager[None]:
+        """Deprecated alias for :meth:`connected_to`.
 
-        :param receiver: a receiver callable
-        :param sender: optional, a sender to filter on
+        .. deprecated:: 1.1
+            Renamed to ``connected_to``. Will be removed in Blinker 1.9.
 
         .. versionadded:: 0.9
-
-        .. versionchanged:: 1.1
-          Renamed to :meth:`connected_to`.  ``temporarily_connected_to`` was
-          deprecated in 1.2 and will be removed in a subsequent version.
-
         """
-        warn(
-            "temporarily_connected_to is deprecated; use connected_to instead.",
+        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,
-        _async_wrapper: AsyncWrapperType | None = None,
+        sender: t.Any | None = None,
+        /,
+        *,
+        _async_wrapper: c.Callable[
+            [c.Callable[..., c.Coroutine[t.Any, t.Any, t.Any]]], c.Callable[..., t.Any]
+        ]
+        | None = None,
         **kwargs: t.Any,
-    ) -> list[tuple[t.Callable, t.Any]]:
-        """Emit this signal on behalf of *sender*, passing on ``kwargs``.
+    ) -> list[tuple[c.Callable[..., t.Any], t.Any]]:
+        """Call all receivers that are connected to the given ``sender``
+        or :data:`ANY`. Each receiver is called with ``sender`` as a positional
+        argument along with any extra keyword arguments. Return a list of
+        ``(receiver, return value)`` tuples.
 
-        Returns a list of 2-tuples, pairing receivers with their return
-        value. The ordering of receiver notification is undefined.
+        The order receivers are called is undefined, but can be influenced by
+        setting :attr:`set_class`.
 
-        :param sender: Any object or ``None``.  If omitted, synonymous
-          with ``None``.  Only accepts one positional argument.
-        :param _async_wrapper: A callable that should wrap a coroutine
-          receiver and run it when called synchronously.
+        If a receiver raises an exception, that exception will propagate up.
+        This makes debugging straightforward, with an assumption that correctly
+        implemented receivers will not raise.
 
-        :param kwargs: Data to be sent to receivers.
+        :param sender: Call receivers connected to this sender, in addition to
+            those connected to :data:`ANY`.
+        :param _async_wrapper: Will be called on any receivers that are async
+            coroutines to turn them into sync callables. For example, could run
+            the receiver with an event loop.
+        :param kwargs: Extra keyword arguments to pass to each receiver.
+
+        .. versionchanged:: 1.7
+            Added the ``_async_wrapper`` argument.
         """
         if self.is_muted:
             return []
 
-        sender = self._extract_sender(sender)
         results = []
+
         for receiver in self.receivers_for(sender):
             if iscoroutinefunction(receiver):
                 if _async_wrapper is None:
-                    raise RuntimeError("Cannot send to a coroutine function")
-                receiver = _async_wrapper(receiver)
-            result = receiver(sender, **kwargs)
+                    raise RuntimeError("Cannot send to a coroutine function.")
+
+                result = _async_wrapper(receiver)(sender, **kwargs)
+            else:
+                result = receiver(sender, **kwargs)
+
             results.append((receiver, result))
+
         return results
 
     async def send_async(
         self,
-        *sender: t.Any,
-        _sync_wrapper: SyncWrapperType | None = None,
+        sender: t.Any | None = None,
+        /,
+        *,
+        _sync_wrapper: c.Callable[
+            [c.Callable[..., t.Any]], c.Callable[..., c.Coroutine[t.Any, t.Any, t.Any]]
+        ]
+        | None = None,
         **kwargs: t.Any,
-    ) -> list[tuple[t.Callable, t.Any]]:
-        """Emit this signal on behalf of *sender*, passing on ``kwargs``.
+    ) -> list[tuple[c.Callable[..., t.Any], t.Any]]:
+        """Await all receivers that are connected to the given ``sender``
+        or :data:`ANY`. Each receiver is called with ``sender`` as a positional
+        argument along with any extra keyword arguments. Return a list of
+        ``(receiver, return value)`` tuples.
 
-        Returns a list of 2-tuples, pairing receivers with their return
-        value. The ordering of receiver notification is undefined.
+        The order receivers are called is undefined, but can be influenced by
+        setting :attr:`set_class`.
 
-        :param sender: Any object or ``None``.  If omitted, synonymous
-          with ``None``. Only accepts one positional argument.
-        :param _sync_wrapper: A callable that should wrap a synchronous
-          receiver and run it when awaited.
+        If a receiver raises an exception, that exception will propagate up.
+        This makes debugging straightforward, with an assumption that correctly
+        implemented receivers will not raise.
 
-        :param kwargs: Data to be sent to receivers.
+        :param sender: Call receivers connected to this sender, in addition to
+            those connected to :data:`ANY`.
+        :param _sync_wrapper: Will be called on any receivers that are sync
+            callables to turn them into async coroutines. For example,
+            could call the receiver in a thread.
+        :param kwargs: Extra keyword arguments to pass to each receiver.
+
+        .. versionadded:: 1.7
         """
         if self.is_muted:
             return []
 
-        sender = self._extract_sender(sender)
         results = []
+
         for receiver in self.receivers_for(sender):
             if not iscoroutinefunction(receiver):
                 if _sync_wrapper is None:
-                    raise RuntimeError("Cannot send to a non-coroutine function")
-                receiver = _sync_wrapper(receiver)
-            result = await receiver(sender, **kwargs)
+                    raise RuntimeError("Cannot send to a non-coroutine function.")
+
+                result = await _sync_wrapper(receiver)(sender, **kwargs)
+            else:
+                result = await receiver(sender, **kwargs)
+
             results.append((receiver, result))
+
         return results
 
-    def _extract_sender(self, sender: t.Any) -> t.Any:
-        if not self.receivers:
-            # Ensure correct signature even on no-op sends, disable with -O
-            # for lowest possible cost.
-            if __debug__ and sender and len(sender) > 1:
-                raise TypeError(
-                    f"send() accepts only one positional argument, {len(sender)} given"
-                )
-            return []
-
-        # Using '*sender' rather than 'sender=None' allows 'sender' to be
-        # used as a keyword argument- i.e. it's an invisible name in the
-        # function signature.
-        if len(sender) == 0:
-            sender = None
-        elif len(sender) > 1:
-            raise TypeError(
-                f"send() accepts only one positional argument, {len(sender)} given"
-            )
-        else:
-            sender = sender[0]
-        return sender
-
     def has_receivers_for(self, sender: t.Any) -> bool:
-        """True if there is probably a receiver for *sender*.
-
-        Performs an optimistic check only.  Does not guarantee that all
-        weakly referenced receivers are still alive.  See
-        :meth:`receivers_for` for a stronger search.
+        """Check if there is at least one receiver that will be called with the
+        given ``sender``. A receiver connected to :data:`ANY` will always be
+        called, regardless of sender. Does not check if weakly referenced
+        receivers are still live. See :meth:`receivers_for` for a stronger
+        search.
 
+        :param sender: Check for receivers connected to this sender, in addition
+            to those connected to :data:`ANY`.
         """
         if not self.receivers:
             return False
+
         if self._by_sender[ANY_ID]:
             return True
+
         if sender is ANY:
             return False
-        return hashable_identity(sender) in self._by_sender
+
+        return make_id(sender) in self._by_sender
 
     def receivers_for(
         self, sender: t.Any
-    ) -> t.Generator[t.Callable[[t.Any], t.Any], None, None]:
-        """Iterate all live receivers listening for *sender*."""
-        # TODO: test receivers_for(ANY)
-        if self.receivers:
-            sender_id = hashable_identity(sender)
-            if sender_id in self._by_sender:
-                ids = self._by_sender[ANY_ID] | self._by_sender[sender_id]
-            else:
-                ids = self._by_sender[ANY_ID].copy()
-            for receiver_id in ids:
-                receiver = self.receivers.get(receiver_id)
-                if receiver is None:
-                    continue
-                if isinstance(receiver, WeakTypes):
-                    strong = receiver()
-                    if strong is None:
-                        self._disconnect(receiver_id, ANY_ID)
-                        continue
-                    receiver = strong
-                yield receiver  # type: ignore[misc]
-
-    def disconnect(self, receiver: t.Callable, sender: t.Any = ANY) -> None:
-        """Disconnect *receiver* from this signal's events.
-
-        :param receiver: a previously :meth:`connected<connect>` callable
-
-        :param sender: a specific sender to disconnect from, or :obj:`ANY`
-          to disconnect from all senders.  Defaults to ``ANY``.
+    ) -> c.Generator[c.Callable[..., t.Any], None, None]:
+        """Yield each receiver to be called for ``sender``, in addition to those
+        to be called for :data:`ANY`. Weakly referenced receivers that are not
+        live will be disconnected and skipped.
 
+        :param sender: Yield receivers connected to this sender, in addition
+            to those connected to :data:`ANY`.
         """
-        sender_id: IdentityType
+        # TODO: test receivers_for(ANY)
+        if not self.receivers:
+            return
+
+        sender_id = make_id(sender)
+
+        if sender_id in self._by_sender:
+            ids = self._by_sender[ANY_ID] | self._by_sender[sender_id]
+        else:
+            ids = self._by_sender[ANY_ID].copy()
+
+        for receiver_id in ids:
+            receiver = self.receivers.get(receiver_id)
+
+            if receiver is None:
+                continue
+
+            if isinstance(receiver, weakref.ref):
+                strong = receiver()
+
+                if strong is None:
+                    self._disconnect(receiver_id, ANY_ID)
+                    continue
+
+                yield strong
+            else:
+                yield receiver
+
+    def disconnect(self, receiver: c.Callable[..., t.Any], sender: t.Any = ANY) -> None:
+        """Disconnect ``receiver`` from being called when the signal is sent by
+        ``sender``.
+
+        :param receiver: A connected receiver callable.
+        :param sender: Disconnect from only this sender. By default, disconnect
+            from all senders.
+        """
+        sender_id: c.Hashable
+
         if sender is ANY:
             sender_id = ANY_ID
         else:
-            sender_id = hashable_identity(sender)
-        receiver_id = hashable_identity(receiver)
+            sender_id = make_id(sender)
+
+        receiver_id = make_id(receiver)
         self._disconnect(receiver_id, sender_id)
 
         if (
@@ -425,63 +415,80 @@ class Signal:
         ):
             self.receiver_disconnected.send(self, receiver=receiver, sender=sender)
 
-    def _disconnect(self, receiver_id: IdentityType, sender_id: IdentityType) -> None:
+    def _disconnect(self, receiver_id: c.Hashable, sender_id: c.Hashable) -> None:
         if sender_id == ANY_ID:
-            if self._by_receiver.pop(receiver_id, False):
+            if self._by_receiver.pop(receiver_id, None) is not None:
                 for bucket in self._by_sender.values():
                     bucket.discard(receiver_id)
+
             self.receivers.pop(receiver_id, None)
         else:
             self._by_sender[sender_id].discard(receiver_id)
             self._by_receiver[receiver_id].discard(sender_id)
 
-    def _cleanup_receiver(self, receiver_ref: annotatable_weakref) -> None:
-        """Disconnect a receiver from all senders."""
-        self._disconnect(cast(IdentityType, receiver_ref.receiver_id), ANY_ID)
+    def _make_cleanup_receiver(
+        self, receiver_id: c.Hashable
+    ) -> c.Callable[[weakref.ref[c.Callable[..., t.Any]]], None]:
+        """Create a callback function to disconnect a weakly referenced
+        receiver when it is garbage collected.
+        """
 
-    def _cleanup_sender(self, sender_ref: annotatable_weakref) -> None:
-        """Disconnect all receivers from a sender."""
-        sender_id = cast(IdentityType, sender_ref.sender_id)
+        def cleanup(ref: weakref.ref[c.Callable[..., t.Any]]) -> None:
+            self._disconnect(receiver_id, ANY_ID)
+
+        return cleanup
+
+    def _make_cleanup_sender(
+        self, sender_id: c.Hashable
+    ) -> c.Callable[[weakref.ref[t.Any]], None]:
+        """Create a callback function to disconnect all receivers for a weakly
+        referenced sender when it is garbage collected.
+        """
         assert sender_id != ANY_ID
-        self._weak_senders.pop(sender_id, None)
-        for receiver_id in self._by_sender.pop(sender_id, ()):
-            self._by_receiver[receiver_id].discard(sender_id)
+
+        def cleanup(ref: weakref.ref[t.Any]) -> None:
+            self._weak_senders.pop(sender_id, None)
+
+            for receiver_id in self._by_sender.pop(sender_id, ()):
+                self._by_receiver[receiver_id].discard(sender_id)
+
+        return cleanup
 
     def _cleanup_bookkeeping(self) -> None:
         """Prune unused sender/receiver bookkeeping. Not threadsafe.
 
-        Connecting & disconnecting leave behind a small amount of bookkeeping
-        for the receiver and sender values. Typical workloads using Blinker,
-        for example in most web apps, Flask, CLI scripts, etc., are not
-        adversely affected by this bookkeeping.
+        Connecting & disconnecting leaves behind a small amount of bookkeeping
+        data. Typical workloads using Blinker, for example in most web apps,
+        Flask, CLI scripts, etc., are not adversely affected by this
+        bookkeeping.
 
-        With a long-running Python process performing dynamic signal routing
-        with high volume- e.g. connecting to function closures, "senders" are
-        all unique object instances, and doing all of this over and over- you
-        may see memory usage will grow due to extraneous bookkeeping. (An empty
-        set() for each stale sender/receiver pair.)
+        With a long-running process performing dynamic signal routing with high
+        volume, e.g. connecting to function closures, senders are all unique
+        object instances. Doing all of this over and over may cause memory usage
+        to grow due to extraneous bookkeeping. (An empty ``set`` for each stale
+        sender/receiver pair.)
 
         This method will prune that bookkeeping away, with the caveat that such
         pruning is not threadsafe. The risk is that cleanup of a fully
         disconnected receiver/sender pair occurs while another thread is
         connecting that same pair. If you are in the highly dynamic, unique
-        receiver/sender situation that has lead you to this method, that
-        failure mode is perhaps not a big deal for you.
+        receiver/sender situation that has lead you to this method, that failure
+        mode is perhaps not a big deal for you.
         """
         for mapping in (self._by_sender, self._by_receiver):
-            for _id, bucket in list(mapping.items()):
+            for ident, bucket in list(mapping.items()):
                 if not bucket:
-                    mapping.pop(_id, None)
+                    mapping.pop(ident, None)
 
     def _clear_state(self) -> None:
-        """Throw away all signal state.  Useful for unit tests."""
+        """Disconnect all receivers and senders. Useful for tests."""
         self._weak_senders.clear()
         self.receivers.clear()
         self._by_sender.clear()
         self._by_receiver.clear()
 
 
-receiver_connected = Signal(
+_receiver_connected = Signal(
     """\
 Sent by a :class:`Signal` after a receiver connects.
 
@@ -491,68 +498,124 @@ Sent by a :class:`Signal` after a receiver connects.
 :keyword weak_arg: true if the connection to receiver_arg is a weak reference
 
 .. deprecated:: 1.2
-
-As of 1.2, individual signals have their own private
-:attr:`~Signal.receiver_connected` and
-:attr:`~Signal.receiver_disconnected` signals with a slightly simplified
-call signature.  This global signal is planned to be removed in 1.6.
-
+    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."""
+    """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.
+
+    :param name: The name of the signal within the namespace.
+    :param doc: The docstring for the signal.
+    """
 
     def __init__(self, name: str, doc: str | None = None) -> None:
-        Signal.__init__(self, doc)
+        super().__init__(doc)
 
         #: The name of this signal.
-        self.name = name
+        self.name: str = name
 
     def __repr__(self) -> str:
-        base = Signal.__repr__(self)
+        base = super().__repr__()
         return f"{base[:-1]}; {self.name!r}>"  # noqa: E702
 
 
-class Namespace(dict):
-    """A mapping of signal names to signals."""
+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):
+    """A dict mapping names to signals."""
 
     def signal(self, name: str, doc: str | None = None) -> NamedSignal:
-        """Return the :class:`NamedSignal` *name*, creating it if required.
-
-        Repeated calls to this function will return the same signal object.
+        """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.
         """
-        try:
-            return self[name]  # type: ignore[no-any-return]
-        except KeyError:
-            result = self.setdefault(name, NamedSignal(name, doc))
-            return result  # type: ignore[no-any-return]
+        if name not in self:
+            self[name] = NamedSignal(name, doc)
+
+        return self[name]
 
 
-class WeakNamespace(WeakValueDictionary):
-    """A weak mapping of signal names to signals.
+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 exists for a measure of legacy
-    compatibility with Blinker <= 1.2, and may be dropped in the future.
+    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` *name*, creating it if required.
-
-        Repeated calls to this function will return the same signal object.
+        """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.
         """
-        try:
-            return self[name]  # type: ignore[no-any-return]
-        except KeyError:
-            result = self.setdefault(name, NamedSignal(name, doc))
-            return result  # type: ignore[no-any-return]
+        if name not in self:
+            self[name] = NamedSignal(name, doc)
+
+        return self[name]  # type: ignore[no-any-return]
 
 
-signal = Namespace().signal
+default_namespace: Namespace = Namespace()
+"""A default :class:`Namespace` for creating named signals. :func:`signal`
+creates a :class:`NamedSignal` in this namespace.
+"""
+
+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/certifi-2024.2.2.dist-info/INSTALLER b/libs/certifi-2024.12.14.dist-info/INSTALLER
similarity index 100%
rename from libs/certifi-2024.2.2.dist-info/INSTALLER
rename to libs/certifi-2024.12.14.dist-info/INSTALLER
diff --git a/libs/certifi-2024.2.2.dist-info/LICENSE b/libs/certifi-2024.12.14.dist-info/LICENSE
similarity index 100%
rename from libs/certifi-2024.2.2.dist-info/LICENSE
rename to libs/certifi-2024.12.14.dist-info/LICENSE
diff --git a/libs/certifi-2024.2.2.dist-info/METADATA b/libs/certifi-2024.12.14.dist-info/METADATA
similarity index 94%
rename from libs/certifi-2024.2.2.dist-info/METADATA
rename to libs/certifi-2024.12.14.dist-info/METADATA
index c688a6284..c4809863b 100644
--- a/libs/certifi-2024.2.2.dist-info/METADATA
+++ b/libs/certifi-2024.12.14.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certifi
-Version: 2024.2.2
+Version: 2024.12.14
 Summary: Python package for providing Mozilla's CA Bundle.
 Home-page: https://github.com/certifi/python-certifi
 Author: Kenneth Reitz
@@ -20,6 +20,8 @@ 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
 
diff --git a/libs/certifi-2024.12.14.dist-info/RECORD b/libs/certifi-2024.12.14.dist-info/RECORD
new file mode 100644
index 000000000..e783f377c
--- /dev/null
+++ b/libs/certifi-2024.12.14.dist-info/RECORD
@@ -0,0 +1,12 @@
+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.2.2.dist-info/REQUESTED b/libs/certifi-2024.12.14.dist-info/REQUESTED
similarity index 100%
rename from libs/certifi-2024.2.2.dist-info/REQUESTED
rename to libs/certifi-2024.12.14.dist-info/REQUESTED
diff --git a/libs/apprise-1.7.6.dist-info/WHEEL b/libs/certifi-2024.12.14.dist-info/WHEEL
similarity index 100%
rename from libs/apprise-1.7.6.dist-info/WHEEL
rename to libs/certifi-2024.12.14.dist-info/WHEEL
diff --git a/libs/certifi-2024.2.2.dist-info/top_level.txt b/libs/certifi-2024.12.14.dist-info/top_level.txt
similarity index 100%
rename from libs/certifi-2024.2.2.dist-info/top_level.txt
rename to libs/certifi-2024.12.14.dist-info/top_level.txt
diff --git a/libs/certifi-2024.2.2.dist-info/RECORD b/libs/certifi-2024.2.2.dist-info/RECORD
deleted file mode 100644
index 6b9028bec..000000000
--- a/libs/certifi-2024.2.2.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-certifi-2024.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-certifi-2024.2.2.dist-info/LICENSE,sha256=6TcW2mucDVpKHfYP5pWzcPBpVgPSH2-D8FPkLPwQyvc,989
-certifi-2024.2.2.dist-info/METADATA,sha256=1noreLRChpOgeSj0uJT1mehiBl8ngh33Guc7KdvzYYM,2170
-certifi-2024.2.2.dist-info/RECORD,,
-certifi-2024.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certifi-2024.2.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-certifi-2024.2.2.dist-info/top_level.txt,sha256=KMu4vUCfsjLrkPbSNdgdekS-pVJzBAJFO__nI8NF6-U,8
-certifi/__init__.py,sha256=ljtEx-EmmPpTe2SOd5Kzsujm_lUD0fKJVnE9gzce320,94
-certifi/__main__.py,sha256=xBBoj905TUWBLRGANOcf7oi6e-3dMP4cEoG9OyMs11g,243
-certifi/cacert.pem,sha256=ejR8qP724p-CtuR4U1WmY1wX-nVeCUD2XxWqj8e9f5I,292541
-certifi/core.py,sha256=qRDDFyXVJwTB_EmoGppaXU_R9qCZvhl-EzxPMuV3nTA,4426
-certifi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/certifi/__init__.py b/libs/certifi/__init__.py
index 1c91f3ec9..ee8686bec 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.02.02"
+__version__ = "2024.12.14"
diff --git a/libs/certifi/cacert.pem b/libs/certifi/cacert.pem
index fac3c3190..f2d66010a 100644
--- a/libs/certifi/cacert.pem
+++ b/libs/certifi/cacert.pem
@@ -763,35 +763,6 @@ uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
 XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
 -----END CERTIFICATE-----
 
-# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Label: "SecureSign RootCA11"
-# Serial: 1
-# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
-# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
-# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
 # Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
 # Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
 # Label: "Microsec e-Szigno Root CA 2009"
@@ -3100,50 +3071,6 @@ LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG
 mpv0
 -----END CERTIFICATE-----
 
-# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - G4"
-# Serial: 289383649854506086828220374796556676440
-# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88
-# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01
-# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
-gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
-Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
-MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
-BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
-MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
-c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
-bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
-2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
-T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
-5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
-C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
-DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
-wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
-2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
-nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
-dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
-N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
-c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
-5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
-Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
-hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
-B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
-AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
-H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
-b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
-2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
-IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
-5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
-n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
------END CERTIFICATE-----
-
 # Issuer: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
 # Subject: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
 # Label: "Microsoft ECC Root Certificate Authority 2017"
@@ -4254,46 +4181,6 @@ ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG
 BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
 -----END CERTIFICATE-----
 
-# Issuer: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD.
-# Subject: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD.
-# Label: "Security Communication RootCA3"
-# Serial: 16247922307909811815
-# MD5 Fingerprint: 1c:9a:16:ff:9e:5c:e0:4d:8a:14:01:f4:35:5d:29:26
-# SHA1 Fingerprint: c3:03:c8:22:74:92:e5:61:a2:9c:5f:79:91:2b:1e:44:13:91:30:3a
-# SHA256 Fingerprint: 24:a5:5c:2a:b0:51:44:2d:06:17:76:65:41:23:9a:4a:d0:32:d7:c5:51:75:aa:34:ff:de:2f:bc:4f:5c:52:94
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScw
-JQYDVQQDEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2
-MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UEAxMeU2VjdXJpdHkg
-Q29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4r
-CmDvu20rhvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzA
-lrenfna84xtSGc4RHwsENPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MG
-TfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF7
-9+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGmnpjKIG58u4iFW/vAEGK7
-8vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtYXLVqAvO4
-g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3we
-GVPKp7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst
-+3A7caoreyYn8xrC3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M
-0V9hvqG8OmpI6iZVIhZdXw3/JzOfGAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQ
-T9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0VcwCBEF/VfR2ccCAwEAAaNCMEAw
-HQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
-YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PA
-FNr0Y/Dq9HHuTofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd
-9XbXv8S2gVj/yP9kaWJ5rW4OH3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQI
-UYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASxYfQAW0q3nHE3GYV5v4GwxxMOdnE+
-OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZXSEIx2C/pHF7uNke
-gr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml+LLf
-iAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUV
-nuiZIesnKwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD
-2NCcnWXL0CsnMQMeNuE9dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//
-1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm6Vwdp6POXiUyK+OVrCoHzrQoeIY8Laad
-TdJ0MN1kURXbg4NR16/9M51NZg==
------END CERTIFICATE-----
-
 # Issuer: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
 # Subject: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
 # Label: "Security Communication ECC RootCA1"
@@ -4812,3 +4699,158 @@ X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q
 ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm
 dTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
 -----END CERTIFICATE-----
+
+# Issuer: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
+# Subject: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
+# Label: "FIRMAPROFESIONAL CA ROOT-A WEB"
+# Serial: 65916896770016886708751106294915943533
+# MD5 Fingerprint: 82:b2:ad:45:00:82:b0:66:63:f8:5f:c3:67:4e:ce:a3
+# SHA1 Fingerprint: a8:31:11:74:a6:14:15:0d:ca:77:dd:0e:e4:0c:5d:58:fc:a0:72:a5
+# SHA256 Fingerprint: be:f2:56:da:f2:6e:9c:69:bd:ec:16:02:35:97:98:f3:ca:f7:18:21:a0:3e:01:82:57:c5:3c:65:61:7f:3d:4a
+-----BEGIN CERTIFICATE-----
+MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw
+CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
+YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
+IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw
+CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
+YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
+IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf
+e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C
+cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O
+BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
+PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw
+hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG
+XSaQpYXFuXqUPoeovQA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
+# Label: "TWCA CYBER Root CA"
+# Serial: 85076849864375384482682434040119489222
+# MD5 Fingerprint: 0b:33:a0:97:52:95:d4:a9:fd:bb:db:6e:a3:55:5b:51
+# SHA1 Fingerprint: f6:b1:1c:1a:83:38:e9:7b:db:b3:a8:c8:33:24:e0:2d:9c:7f:26:66
+# SHA256 Fingerprint: 3f:63:bb:28:14:be:17:4e:c8:b6:43:9c:f0:8d:6d:56:f0:b7:c4:05:88:3a:56:48:a3:34:42:4d:6b:3e:c5:58
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQ
+MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290
+IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5
+WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FO
+LUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1sTs6P
+40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxF
+avcokPFhV8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/
+34bKS1PE2Y2yHer43CdTo0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684i
+JkXXYJndzk834H/nY62wuFm40AZoNWDTNq5xQwTxaWV4fPMf88oon1oglWa0zbfu
+j3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK/c/WMw+f+5eesRycnupf
+Xtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkHIuNZW0CP
+2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDA
+S9TMfAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDA
+oS/xUgXJP+92ZuJF2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzC
+kHDXShi8fgGwsOsVHkQGzaRP6AzRwyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW
+5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83QOGt4A1WNzAd
+BgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB
+AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0t
+tGlTITVX1olNc79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn
+68xDiBaiA9a5F/gZbG0jAn/xX9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNn
+TKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDRIG4kqIQnoVesqlVYL9zZyvpoBJ7t
+RCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq/p1hvIbZv97Tujqx
+f36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0RFxbI
+Qh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz
+8ppy6rBePm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4
+NxKfKjLji7gh7MMrZQzvIt6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzX
+xeSDwWrruoBa3lwtcHb4yOWHh8qgnaHlIhInD0Q9HWzq1MKLL295q39QpsQZp6F6
+t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA12"
+# Serial: 587887345431707215246142177076162061960426065942
+# MD5 Fingerprint: c6:89:ca:64:42:9b:62:08:49:0b:1e:7f:e9:07:3d:e8
+# SHA1 Fingerprint: 7a:22:1e:3d:de:1b:06:ac:9e:c8:47:70:16:8e:3c:e5:f7:6b:06:f4
+# SHA256 Fingerprint: 3f:03:4b:b5:70:4d:44:b2:d0:85:45:a0:20:57:de:93:eb:f3:90:5f:ce:72:1a:cb:c7:30:c0:6d:da:ee:90:4e
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQEL
+BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
+LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgw
+NTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
+eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
+b290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3emhF
+KxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mt
+p7JIKwccJ/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zd
+J1M3s6oYwlkm7Fsf0uZlfO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gur
+FzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBFEaCeVESE99g2zvVQR9wsMJvuwPWW0v4J
+hscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1UefNzFJM3IFTQy2VYzxV4+K
+h9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsF
+AAOCAQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6Ld
+mmQOmFxv3Y67ilQiLUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJ
+mBClnW8Zt7vPemVV2zfrPIpyMpcemik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA
+8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPSvWKErI4cqc1avTc7bgoitPQV
+55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhgaaaI5gdka9at/
+yOPiZwud9AzqVN/Ssq+xIvEg37xEHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA14"
+# Serial: 575790784512929437950770173562378038616896959179
+# MD5 Fingerprint: 71:0d:72:fa:92:19:65:5e:89:04:ac:16:33:f0:bc:d5
+# SHA1 Fingerprint: dd:50:c0:f7:79:b3:64:2e:74:a2:b8:9d:9f:d3:40:dd:bb:f0:f2:4f
+# SHA256 Fingerprint: 4b:00:9c:10:34:49:4f:9a:b5:6b:ba:3b:a1:d6:27:31:fc:4d:20:d8:95:5a:dc:ec:10:a9:25:60:72:61:e3:38
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEM
+BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
+LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgw
+NzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
+eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
+b290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh1oq/
+FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOg
+vlIfX8xnbacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy
+6pJxaeQp8E+BgQQ8sqVb1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo
+/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9J
+kdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOEkJTRX45zGRBdAuVwpcAQ
+0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSxjVIHvXib
+y8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac
+18izju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs
+0Wq2XSqypWa9a4X0dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIAB
+SMbHdPTGrMNASRZhdCyvjG817XsYAFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVL
+ApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeqYR3r6/wtbyPk
+86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E
+rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ib
+ed87hwriZLoAymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopT
+zfFP7ELyk+OZpDc8h7hi2/DsHzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHS
+DCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPGFrojutzdfhrGe0K22VoF3Jpf1d+4
+2kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6qnsb58Nn4DSEC5MUo
+FlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/OfVy
+K4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6
+dB7h7sxaOgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtl
+Lor6CZpO2oYofaphNdgOpygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB
+365jJ6UeTo3cKXhZ+PmhIIynJkBugnLNeLLIjzwec+fBH7/PzqUqm9tEZDKgu39c
+JRNItX+S
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA15"
+# Serial: 126083514594751269499665114766174399806381178503
+# MD5 Fingerprint: 13:30:fc:c4:62:a6:a9:de:b5:c1:68:af:b5:d2:31:47
+# SHA1 Fingerprint: cb:ba:83:c8:c1:5a:5d:f1:f9:73:6f:ca:d7:ef:28:13:06:4a:07:7d
+# SHA256 Fingerprint: e7:78:f0:f0:95:fe:84:37:29:cd:1a:00:82:17:9e:53:14:a9:c2:91:44:28:05:e1:fb:1d:8f:b6:b8:88:6c:3a
+-----BEGIN CERTIFICATE-----
+MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMw
+UTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBM
+dGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMy
+NTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJl
+cnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBSb290
+IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5GdCx4
+wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSR
+ZHX+AezB2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMB
+Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT
+9DAKBggqhkjOPQQDAwNoADBlAjEA2S6Jfl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp
+4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6
+bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
+-----END CERTIFICATE-----
diff --git a/libs/chardet-5.2.0.dist-info/RECORD b/libs/chardet-5.2.0.dist-info/RECORD
index 44d209b0e..34638cb2e 100644
--- a/libs/chardet-5.2.0.dist-info/RECORD
+++ b/libs/chardet-5.2.0.dist-info/RECORD
@@ -4,7 +4,7 @@ chardet-5.2.0.dist-info/LICENSE,sha256=3GJlINzVOiL3J68-5Cx3DlbJemT-OtsGN5nYqwMv5
 chardet-5.2.0.dist-info/METADATA,sha256=PAr2NQ6hQWpjyFnwlI7MoxHt2S_6oRiUsucOKMNhzGw,3418
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+chardet-5.2.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
 chardet-5.2.0.dist-info/entry_points.txt,sha256=_cdvYc4jyY68GYfsQAAthNMxO-yodcGkvNC1xOEsLmI,59
 chardet-5.2.0.dist-info/top_level.txt,sha256=AowzBbZy4x8EirABDdJSLJZMkJ_53iIag8xfKR6D7kI,8
 chardet/__init__.py,sha256=57R-HSxj0PWmILMN0GFmUNqEMfrEVSamXyjD-W6_fbs,4797
diff --git a/libs/chardet-5.2.0.dist-info/WHEEL b/libs/chardet-5.2.0.dist-info/WHEEL
index 98c0d20b7..da25d7b42 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: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/charset_normalizer-3.3.2.dist-info/RECORD b/libs/charset_normalizer-3.3.2.dist-info/RECORD
deleted file mode 100644
index 2ae6a4762..000000000
--- a/libs/charset_normalizer-3.3.2.dist-info/RECORD
+++ /dev/null
@@ -1,22 +0,0 @@
-../../bin/normalizer,sha256=DGK3Yd9Fs5jr7E7dCqKi353EqQgSyiH9aYN4XCZJnjk,256
-charset_normalizer-3.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-charset_normalizer-3.3.2.dist-info/LICENSE,sha256=6zGgxaT7Cbik4yBV0lweX5w1iidS_vPNcgIT0cz-4kE,1070
-charset_normalizer-3.3.2.dist-info/METADATA,sha256=cfLhl5A6SI-F0oclm8w8ux9wshL1nipdeCdVnYb4AaA,33550
-charset_normalizer-3.3.2.dist-info/RECORD,,
-charset_normalizer-3.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-charset_normalizer-3.3.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-charset_normalizer-3.3.2.dist-info/entry_points.txt,sha256=ADSTKrkXZ3hhdOVFi6DcUEHQRS0xfxDIE_pEz4wLIXA,65
-charset_normalizer-3.3.2.dist-info/top_level.txt,sha256=7ASyzePr8_xuZWJsnqJjIBtyV8vhEo0wBCv1MPRRi3Q,19
-charset_normalizer/__init__.py,sha256=UzI3xC8PhmcLRMzSgPb6minTmRq0kWznnCBJ8ZCc2XI,1577
-charset_normalizer/__main__.py,sha256=JxY8bleaENOFlLRb9HfoeZCzAMnn2A1oGR5Xm2eyqg0,73
-charset_normalizer/api.py,sha256=WOlWjy6wT8SeMYFpaGbXZFN1TMXa-s8vZYfkL4G29iQ,21097
-charset_normalizer/cd.py,sha256=xwZliZcTQFA3jU0c00PRiu9MNxXTFxQkFLWmMW24ZzI,12560
-charset_normalizer/cli/__init__.py,sha256=D5ERp8P62llm2FuoMzydZ7d9rs8cvvLXqE-1_6oViPc,100
-charset_normalizer/cli/__main__.py,sha256=2F-xURZJzo063Ye-2RLJ2wcmURpbKeAzKwpiws65dAs,9744
-charset_normalizer/constant.py,sha256=p0IsOVcEbPWYPOdWhnhRbjK1YVBy6fs05C5vKC-zoxU,40481
-charset_normalizer/legacy.py,sha256=T-QuVMsMeDiQEk8WSszMrzVJg_14AMeSkmHdRYhdl1k,2071
-charset_normalizer/md.py,sha256=NkSuVLK13_a8c7BxZ4cGIQ5vOtGIWOdh22WZEvjp-7U,19624
-charset_normalizer/models.py,sha256=I5i0s4aKCCgLPY2tUY3pwkgFA-BUbbNxQ7hVkVTt62s,11624
-charset_normalizer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-charset_normalizer/utils.py,sha256=teiosMqzKjXyAHXnGdjSBOgnBZwx-SkBbCLrx0UXy8M,11894
-charset_normalizer/version.py,sha256=iHKUfHD3kDRSyrh_BN2ojh43TA5-UZQjvbVIEFfpHDs,79
diff --git a/libs/charset_normalizer-3.3.2.dist-info/entry_points.txt b/libs/charset_normalizer-3.3.2.dist-info/entry_points.txt
deleted file mode 100644
index 65619e73e..000000000
--- a/libs/charset_normalizer-3.3.2.dist-info/entry_points.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[console_scripts]
-normalizer = charset_normalizer.cli:cli_detect
diff --git a/libs/charset_normalizer-3.3.2.dist-info/INSTALLER b/libs/charset_normalizer-3.4.1.dist-info/INSTALLER
similarity index 100%
rename from libs/charset_normalizer-3.3.2.dist-info/INSTALLER
rename to libs/charset_normalizer-3.4.1.dist-info/INSTALLER
diff --git a/libs/charset_normalizer-3.3.2.dist-info/LICENSE b/libs/charset_normalizer-3.4.1.dist-info/LICENSE
similarity index 95%
rename from libs/charset_normalizer-3.3.2.dist-info/LICENSE
rename to libs/charset_normalizer-3.4.1.dist-info/LICENSE
index ad82355b8..9725772c7 100644
--- a/libs/charset_normalizer-3.3.2.dist-info/LICENSE
+++ b/libs/charset_normalizer-3.4.1.dist-info/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 TAHRI Ahmed R.
+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
@@ -18,4 +18,4 @@ 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
+SOFTWARE.
diff --git a/libs/charset_normalizer-3.3.2.dist-info/METADATA b/libs/charset_normalizer-3.4.1.dist-info/METADATA
similarity index 91%
rename from libs/charset_normalizer-3.3.2.dist-info/METADATA
rename to libs/charset_normalizer-3.4.1.dist-info/METADATA
index 822550e36..634e1d662 100644
--- a/libs/charset_normalizer-3.3.2.dist-info/METADATA
+++ b/libs/charset_normalizer-3.4.1.dist-info/METADATA
@@ -1,18 +1,18 @@
 Metadata-Version: 2.1
 Name: charset-normalizer
-Version: 3.3.2
+Version: 3.4.1
 Summary: The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.
-Home-page: https://github.com/Ousret/charset_normalizer
-Author: Ahmed TAHRI
-Author-email: ahmed.tahri@cloudnursery.dev
+Author-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
+Maintainer-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
 License: MIT
-Project-URL: Bug Reports, https://github.com/Ousret/charset_normalizer/issues
-Project-URL: Documentation, https://charset-normalizer.readthedocs.io/en/latest
+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: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -22,11 +22,14 @@ 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.0
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: unicode_backport
@@ -48,7 +51,7 @@ Provides-Extra: unicode_backport
 <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-HTTP_1.1%2C%202%2C_and_3_Client-cyan">
+   <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">
@@ -88,8 +91,7 @@ This project offers you an alternative to **Universal Charset Encoding Detector*
 <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> 
-Did you got there because of the logs? See [https://charset-normalizer.readthedocs.io/en/latest/user/miscellaneous.html](https://charset-normalizer.readthedocs.io/en/latest/user/miscellaneous.html)
+*\*\* : They are clearly using specific code for a specific encoding even if covering most of used one*<br>
 
 ## ⚡ Performance
 
@@ -97,21 +99,23 @@ This package offer better performance than its counterpart Chardet. Here are som
 
 | Package                                       | Accuracy | Mean per file (ms) | File per sec (est) |
 |-----------------------------------------------|:--------:|:------------------:|:------------------:|
-| [chardet](https://github.com/chardet/chardet) |   86 %   |       200 ms       |     5 file/sec     |
+| [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) |     1200 ms     |     287 ms      |      23 ms      |
+| [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
-> (eg. Supported Encoding) Challenge-them if you want.
+> (e.g. Supported Encoding) Challenge-them if you want.
 
 ## ✨ Installation
 
@@ -228,11 +232,11 @@ reliable alternative using a completely different method. Also! I never back dow
 
 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. 
+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.
+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
 
@@ -244,7 +248,7 @@ Don't confuse package **ftfy** with charset-normalizer or chardet. ftfy goal is
 **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.
+**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.
 
@@ -289,10 +293,44 @@ 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
@@ -461,7 +499,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [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) 
+- 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)
 
@@ -493,7 +531,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 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) 
+- 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)
@@ -566,7 +604,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [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) 
+- 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)
@@ -662,7 +700,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 MIT License
 
-Copyright (c) 2019 TAHRI Ahmed R.
+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
diff --git a/libs/charset_normalizer-3.4.1.dist-info/RECORD b/libs/charset_normalizer-3.4.1.dist-info/RECORD
new file mode 100644
index 000000000..ae16f9d4d
--- /dev/null
+++ b/libs/charset_normalizer-3.4.1.dist-info/RECORD
@@ -0,0 +1,22 @@
+../../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.3.2.dist-info/REQUESTED b/libs/charset_normalizer-3.4.1.dist-info/REQUESTED
similarity index 100%
rename from libs/charset_normalizer-3.3.2.dist-info/REQUESTED
rename to libs/charset_normalizer-3.4.1.dist-info/REQUESTED
diff --git a/libs/charset_normalizer-3.4.1.dist-info/WHEEL b/libs/charset_normalizer-3.4.1.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/charset_normalizer-3.4.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..ec9201252
--- /dev/null
+++ b/libs/charset_normalizer-3.4.1.dist-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+normalizer = charset_normalizer:cli.cli_detect
diff --git a/libs/charset_normalizer-3.3.2.dist-info/top_level.txt b/libs/charset_normalizer-3.4.1.dist-info/top_level.txt
similarity index 100%
rename from libs/charset_normalizer-3.3.2.dist-info/top_level.txt
rename to libs/charset_normalizer-3.4.1.dist-info/top_level.txt
diff --git a/libs/charset_normalizer/__init__.py b/libs/charset_normalizer/__init__.py
index 55991fc38..0d3a37990 100644
--- a/libs/charset_normalizer/__init__.py
+++ b/libs/charset_normalizer/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Charset-Normalizer
 ~~~~~~~~~~~~~~
@@ -19,6 +18,9 @@ at <https://github.com/Ousret/charset_normalizer>.
 :copyright: (c) 2021 by Ahmed TAHRI
 :license: MIT, see LICENSE for more details.
 """
+
+from __future__ import annotations
+
 import logging
 
 from .api import from_bytes, from_fp, from_path, is_binary
diff --git a/libs/charset_normalizer/__main__.py b/libs/charset_normalizer/__main__.py
index beae2ef77..e0e76f7bf 100644
--- a/libs/charset_normalizer/__main__.py
+++ b/libs/charset_normalizer/__main__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .cli import cli_detect
 
 if __name__ == "__main__":
diff --git a/libs/charset_normalizer/api.py b/libs/charset_normalizer/api.py
index 0ba08e3a5..2c8c0618c 100644
--- a/libs/charset_normalizer/api.py
+++ b/libs/charset_normalizer/api.py
@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import logging
 from os import PathLike
-from typing import BinaryIO, List, Optional, Set, Union
+from typing import BinaryIO
 
 from .cd import (
     coherence_ratio,
@@ -21,8 +23,6 @@ from .utils import (
     should_strip_sig_or_bom,
 )
 
-# Will most likely be controversial
-# logging.addLevelName(TRACE, "TRACE")
 logger = logging.getLogger("charset_normalizer")
 explain_handler = logging.StreamHandler()
 explain_handler.setFormatter(
@@ -31,12 +31,12 @@ explain_handler.setFormatter(
 
 
 def from_bytes(
-    sequences: Union[bytes, bytearray],
+    sequences: bytes | bytearray,
     steps: int = 5,
     chunk_size: int = 512,
     threshold: float = 0.2,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
+    cp_isolation: list[str] | None = None,
+    cp_exclusion: list[str] | None = None,
     preemptive_behaviour: bool = True,
     explain: bool = False,
     language_threshold: float = 0.1,
@@ -62,7 +62,7 @@ def from_bytes(
 
     if not isinstance(sequences, (bytearray, bytes)):
         raise TypeError(
-            "Expected object of type bytes or bytearray, got: {0}".format(
+            "Expected object of type bytes or bytearray, got: {}".format(
                 type(sequences)
             )
         )
@@ -76,7 +76,7 @@ def from_bytes(
 
     if length == 0:
         logger.debug("Encoding detection on empty bytes, assuming utf_8 intention.")
-        if explain:
+        if explain:  # Defensive: ensure exit path clean handler
             logger.removeHandler(explain_handler)
             logger.setLevel(previous_logger_level or logging.WARNING)
         return CharsetMatches([CharsetMatch(sequences, "utf_8", 0.0, False, [], "")])
@@ -135,9 +135,9 @@ def from_bytes(
             ),
         )
 
-    prioritized_encodings: List[str] = []
+    prioritized_encodings: list[str] = []
 
-    specified_encoding: Optional[str] = (
+    specified_encoding: str | None = (
         any_specified_encoding(sequences) if preemptive_behaviour else None
     )
 
@@ -149,16 +149,18 @@ def from_bytes(
             specified_encoding,
         )
 
-    tested: Set[str] = set()
-    tested_but_hard_failure: List[str] = []
-    tested_but_soft_failure: List[str] = []
+    tested: set[str] = set()
+    tested_but_hard_failure: list[str] = []
+    tested_but_soft_failure: list[str] = []
 
-    fallback_ascii: Optional[CharsetMatch] = None
-    fallback_u8: Optional[CharsetMatch] = None
-    fallback_specified: Optional[CharsetMatch] = None
+    fallback_ascii: CharsetMatch | None = None
+    fallback_u8: CharsetMatch | None = None
+    fallback_specified: CharsetMatch | None = None
 
     results: CharsetMatches = CharsetMatches()
 
+    early_stop_results: CharsetMatches = CharsetMatches()
+
     sig_encoding, sig_payload = identify_sig_or_bom(sequences)
 
     if sig_encoding is not None:
@@ -187,7 +189,7 @@ def from_bytes(
 
         tested.add(encoding_iana)
 
-        decoded_payload: Optional[str] = None
+        decoded_payload: str | None = None
         bom_or_sig_available: bool = sig_encoding == encoding_iana
         strip_sig_or_bom: bool = bom_or_sig_available and should_strip_sig_or_bom(
             encoding_iana
@@ -221,16 +223,20 @@ def from_bytes(
         try:
             if is_too_large_sequence and is_multi_byte_decoder is False:
                 str(
-                    sequences[: int(50e4)]
-                    if strip_sig_or_bom is False
-                    else sequences[len(sig_payload) : int(50e4)],
+                    (
+                        sequences[: int(50e4)]
+                        if strip_sig_or_bom is False
+                        else sequences[len(sig_payload) : int(50e4)]
+                    ),
                     encoding=encoding_iana,
                 )
             else:
                 decoded_payload = str(
-                    sequences
-                    if strip_sig_or_bom is False
-                    else sequences[len(sig_payload) :],
+                    (
+                        sequences
+                        if strip_sig_or_bom is False
+                        else sequences[len(sig_payload) :]
+                    ),
                     encoding=encoding_iana,
                 )
         except (UnicodeDecodeError, LookupError) as e:
@@ -286,7 +292,7 @@ def from_bytes(
         early_stop_count: int = 0
         lazy_str_hard_failure = False
 
-        md_chunks: List[str] = []
+        md_chunks: list[str] = []
         md_ratios = []
 
         try:
@@ -367,7 +373,13 @@ def from_bytes(
                 and not lazy_str_hard_failure
             ):
                 fallback_entry = CharsetMatch(
-                    sequences, encoding_iana, threshold, False, [], decoded_payload
+                    sequences,
+                    encoding_iana,
+                    threshold,
+                    False,
+                    [],
+                    decoded_payload,
+                    preemptive_declaration=specified_encoding,
                 )
                 if encoding_iana == specified_encoding:
                     fallback_specified = fallback_entry
@@ -385,7 +397,7 @@ def from_bytes(
         )
 
         if not is_multi_byte_decoder:
-            target_languages: List[str] = encoding_languages(encoding_iana)
+            target_languages: list[str] = encoding_languages(encoding_iana)
         else:
             target_languages = mb_encoding_languages(encoding_iana)
 
@@ -421,28 +433,58 @@ def from_bytes(
                 ),
             )
 
-        results.append(
-            CharsetMatch(
-                sequences,
-                encoding_iana,
-                mean_mess_ratio,
-                bom_or_sig_available,
-                cd_ratios_merged,
-                decoded_payload,
-            )
+        current_match = CharsetMatch(
+            sequences,
+            encoding_iana,
+            mean_mess_ratio,
+            bom_or_sig_available,
+            cd_ratios_merged,
+            (
+                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(current_match)
+
         if (
             encoding_iana in [specified_encoding, "ascii", "utf_8"]
             and mean_mess_ratio < 0.1
         ):
+            # If md says nothing to worry about, then... stop immediately!
+            if mean_mess_ratio == 0.0:
+                logger.debug(
+                    "Encoding detection: %s is most likely the one.",
+                    current_match.encoding,
+                )
+                if explain:  # Defensive: ensure exit path clean handler
+                    logger.removeHandler(explain_handler)
+                    logger.setLevel(previous_logger_level)
+                return CharsetMatches([current_match])
+
+            early_stop_results.append(current_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.", encoding_iana
+                "Encoding detection: %s is most likely the one.",
+                probable_result.encoding,
             )
-            if explain:
+            if explain:  # Defensive: ensure exit path clean handler
                 logger.removeHandler(explain_handler)
                 logger.setLevel(previous_logger_level)
-            return CharsetMatches([results[encoding_iana]])
+
+            return CharsetMatches([probable_result])
 
         if encoding_iana == sig_encoding:
             logger.debug(
@@ -450,7 +492,7 @@ def from_bytes(
                 "the beginning of the sequence.",
                 encoding_iana,
             )
-            if explain:
+            if explain:  # Defensive: ensure exit path clean handler
                 logger.removeHandler(explain_handler)
                 logger.setLevel(previous_logger_level)
             return CharsetMatches([results[encoding_iana]])
@@ -504,8 +546,8 @@ def from_fp(
     steps: int = 5,
     chunk_size: int = 512,
     threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
+    cp_isolation: list[str] | None = None,
+    cp_exclusion: list[str] | None = None,
     preemptive_behaviour: bool = True,
     explain: bool = False,
     language_threshold: float = 0.1,
@@ -530,12 +572,12 @@ def from_fp(
 
 
 def from_path(
-    path: Union[str, bytes, PathLike],  # type: ignore[type-arg]
+    path: str | bytes | PathLike,  # type: ignore[type-arg]
     steps: int = 5,
     chunk_size: int = 512,
     threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
+    cp_isolation: list[str] | None = None,
+    cp_exclusion: list[str] | None = None,
     preemptive_behaviour: bool = True,
     explain: bool = False,
     language_threshold: float = 0.1,
@@ -561,12 +603,12 @@ def from_path(
 
 
 def is_binary(
-    fp_or_path_or_payload: Union[PathLike, str, BinaryIO, bytes],  # type: ignore[type-arg]
+    fp_or_path_or_payload: PathLike | str | BinaryIO | bytes,  # type: ignore[type-arg]
     steps: int = 5,
     chunk_size: int = 512,
     threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
+    cp_isolation: list[str] | None = None,
+    cp_exclusion: list[str] | None = None,
     preemptive_behaviour: bool = True,
     explain: bool = False,
     language_threshold: float = 0.1,
diff --git a/libs/charset_normalizer/cd.py b/libs/charset_normalizer/cd.py
index 4ea6760c4..71a3ed519 100644
--- a/libs/charset_normalizer/cd.py
+++ b/libs/charset_normalizer/cd.py
@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 import importlib
 from codecs import IncrementalDecoder
 from collections import Counter
 from functools import lru_cache
-from typing import Counter as TypeCounter, Dict, List, Optional, Tuple
+from typing import Counter as TypeCounter
 
 from .constant import (
     FREQUENCIES,
@@ -22,26 +24,24 @@ from .utils import (
 )
 
 
-def encoding_unicode_range(iana_name: str) -> List[str]:
+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 IOError("Function not supported on multi-byte code page")
+        raise OSError("Function not supported on multi-byte code page")
 
-    decoder = importlib.import_module(
-        "encodings.{}".format(iana_name)
-    ).IncrementalDecoder
+    decoder = importlib.import_module(f"encodings.{iana_name}").IncrementalDecoder
 
     p: IncrementalDecoder = decoder(errors="ignore")
-    seen_ranges: Dict[str, int] = {}
+    seen_ranges: dict[str, int] = {}
     character_count: int = 0
 
     for i in range(0x40, 0xFF):
         chunk: str = p.decode(bytes([i]))
 
         if chunk:
-            character_range: Optional[str] = unicode_range(chunk)
+            character_range: str | None = unicode_range(chunk)
 
             if character_range is None:
                 continue
@@ -61,11 +61,11 @@ def encoding_unicode_range(iana_name: str) -> List[str]:
     )
 
 
-def unicode_range_languages(primary_range: str) -> List[str]:
+def unicode_range_languages(primary_range: str) -> list[str]:
     """
     Return inferred languages used with a unicode range.
     """
-    languages: List[str] = []
+    languages: list[str] = []
 
     for language, characters in FREQUENCIES.items():
         for character in characters:
@@ -77,13 +77,13 @@ def unicode_range_languages(primary_range: str) -> List[str]:
 
 
 @lru_cache()
-def encoding_languages(iana_name: str) -> List[str]:
+def encoding_languages(iana_name: str) -> list[str]:
     """
     Single-byte encoding language association. Some code page are heavily linked to particular language(s).
     This function does the correspondence.
     """
-    unicode_ranges: List[str] = encoding_unicode_range(iana_name)
-    primary_range: Optional[str] = None
+    unicode_ranges: list[str] = encoding_unicode_range(iana_name)
+    primary_range: str | None = None
 
     for specified_range in unicode_ranges:
         if "Latin" not in specified_range:
@@ -97,7 +97,7 @@ def encoding_languages(iana_name: str) -> List[str]:
 
 
 @lru_cache()
-def mb_encoding_languages(iana_name: str) -> List[str]:
+def mb_encoding_languages(iana_name: str) -> list[str]:
     """
     Multi-byte encoding language association. Some code page are heavily linked to particular language(s).
     This function does the correspondence.
@@ -118,7 +118,7 @@ def mb_encoding_languages(iana_name: str) -> List[str]:
 
 
 @lru_cache(maxsize=LANGUAGE_SUPPORTED_COUNT)
-def get_target_features(language: str) -> Tuple[bool, bool]:
+def get_target_features(language: str) -> tuple[bool, bool]:
     """
     Determine main aspects from a supported language if it contains accents and if is pure Latin.
     """
@@ -135,12 +135,12 @@ def get_target_features(language: str) -> Tuple[bool, bool]:
 
 
 def alphabet_languages(
-    characters: List[str], ignore_non_latin: bool = False
-) -> List[str]:
+    characters: list[str], ignore_non_latin: bool = False
+) -> list[str]:
     """
     Return associated languages associated to given characters.
     """
-    languages: List[Tuple[str, float]] = []
+    languages: list[tuple[str, float]] = []
 
     source_have_accents = any(is_accentuated(character) for character in characters)
 
@@ -170,7 +170,7 @@ def alphabet_languages(
 
 
 def characters_popularity_compare(
-    language: str, ordered_characters: List[str]
+    language: str, ordered_characters: list[str]
 ) -> float:
     """
     Determine if a ordered characters list (by occurrence from most appearance to rarest) match a particular language.
@@ -178,7 +178,7 @@ 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("{} not available".format(language))
+        raise ValueError(f"{language} not available")
 
     character_approved_count: int = 0
     FREQUENCIES_language_set = set(FREQUENCIES[language])
@@ -214,14 +214,14 @@ def characters_popularity_compare(
             character_approved_count += 1
             continue
 
-        characters_before_source: List[str] = FREQUENCIES[language][
+        characters_before_source: list[str] = FREQUENCIES[language][
             0:character_rank_in_language
         ]
-        characters_after_source: List[str] = FREQUENCIES[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:]
+        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)
@@ -249,24 +249,24 @@ def characters_popularity_compare(
     return character_approved_count / len(ordered_characters)
 
 
-def alpha_unicode_split(decoded_sequence: str) -> List[str]:
+def alpha_unicode_split(decoded_sequence: str) -> list[str]:
     """
     Given a decoded text sequence, return a list of str. Unicode range / alphabet separation.
     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, str] = {}
 
     for character in decoded_sequence:
         if character.isalpha() is False:
             continue
 
-        character_range: Optional[str] = unicode_range(character)
+        character_range: str | None = unicode_range(character)
 
         if character_range is None:
             continue
 
-        layer_target_range: Optional[str] = None
+        layer_target_range: str | None = None
 
         for discovered_range in layers:
             if (
@@ -288,12 +288,12 @@ def alpha_unicode_split(decoded_sequence: str) -> List[str]:
     return list(layers.values())
 
 
-def merge_coherence_ratios(results: List[CoherenceMatches]) -> CoherenceMatches:
+def merge_coherence_ratios(results: list[CoherenceMatches]) -> CoherenceMatches:
     """
     This function merge results previously given by the function coherence_ratio.
     The return type is the same as coherence_ratio.
     """
-    per_language_ratios: Dict[str, List[float]] = {}
+    per_language_ratios: dict[str, list[float]] = {}
     for result in results:
         for sub_result in result:
             language, ratio = sub_result
@@ -321,7 +321,7 @@ def filter_alt_coherence_matches(results: CoherenceMatches) -> CoherenceMatches:
     We shall NOT return "English—" in CoherenceMatches because it is an alternative
     of "English". This function only keeps the best match and remove the em-dash in it.
     """
-    index_results: Dict[str, List[float]] = dict()
+    index_results: dict[str, list[float]] = dict()
 
     for result in results:
         language, ratio = result
@@ -345,14 +345,14 @@ def filter_alt_coherence_matches(results: CoherenceMatches) -> CoherenceMatches:
 
 @lru_cache(maxsize=2048)
 def coherence_ratio(
-    decoded_sequence: str, threshold: float = 0.1, lg_inclusion: Optional[str] = None
+    decoded_sequence: str, threshold: float = 0.1, lg_inclusion: str | None = None
 ) -> CoherenceMatches:
     """
     Detect ANY language that can be identified in given sequence. The sequence will be analysed by layers.
     A layer = Character extraction by alphabets/ranges.
     """
 
-    results: List[Tuple[str, float]] = []
+    results: list[tuple[str, float]] = []
     ignore_non_latin: bool = False
 
     sufficient_match_count: int = 0
@@ -371,7 +371,7 @@ def coherence_ratio(
         if character_count <= TOO_SMALL_SEQUENCE:
             continue
 
-        popular_character_ordered: List[str] = [c for c, o in most_common]
+        popular_character_ordered: list[str] = [c for c, o in most_common]
 
         for language in lg_inclusion_list or alphabet_languages(
             popular_character_ordered, ignore_non_latin
diff --git a/libs/charset_normalizer/cli/__init__.py b/libs/charset_normalizer/cli/__init__.py
index d95fedfe5..543a5a4de 100644
--- a/libs/charset_normalizer/cli/__init__.py
+++ b/libs/charset_normalizer/cli/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .__main__ import cli_detect, query_yes_no
 
 __all__ = (
diff --git a/libs/charset_normalizer/cli/__main__.py b/libs/charset_normalizer/cli/__main__.py
index f4bcbaac0..64a290f2f 100644
--- a/libs/charset_normalizer/cli/__main__.py
+++ b/libs/charset_normalizer/cli/__main__.py
@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import argparse
 import sys
 from json import dumps
 from os.path import abspath, basename, dirname, join, realpath
 from platform import python_version
-from typing import List, Optional
 from unicodedata import unidata_version
 
 import charset_normalizer.md as md_module
@@ -45,7 +46,7 @@ def query_yes_no(question: str, default: str = "yes") -> bool:
             sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
 
 
-def cli_detect(argv: Optional[List[str]] = None) -> int:
+def cli_detect(argv: list[str] | None = None) -> int:
     """
     CLI assistant using ARGV and ArgumentParser
     :param argv:
@@ -109,6 +110,14 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
         dest="force",
         help="Replace file without asking if you are sure, use this flag with caution.",
     )
+    parser.add_argument(
+        "-i",
+        "--no-preemptive",
+        action="store_true",
+        default=False,
+        dest="no_preemptive",
+        help="Disable looking at a charset declaration to hint the detector.",
+    )
     parser.add_argument(
         "-t",
         "--threshold",
@@ -116,7 +125,7 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
         default=0.2,
         type=float,
         dest="threshold",
-        help="Define a custom maximum amount of chaos allowed in decoded content. 0. <= chaos <= 1.",
+        help="Define a custom maximum amount of noise allowed in decoded content. 0. <= noise <= 1.",
     )
     parser.add_argument(
         "--version",
@@ -133,21 +142,35 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
     args = parser.parse_args(argv)
 
     if args.replace is True and args.normalize is False:
+        if args.files:
+            for my_file in args.files:
+                my_file.close()
         print("Use --replace in addition of --normalize only.", file=sys.stderr)
         return 1
 
     if args.force is True and args.replace is False:
+        if args.files:
+            for my_file in args.files:
+                my_file.close()
         print("Use --force in addition of --replace only.", file=sys.stderr)
         return 1
 
     if args.threshold < 0.0 or args.threshold > 1.0:
+        if args.files:
+            for my_file in args.files:
+                my_file.close()
         print("--threshold VALUE should be between 0. AND 1.", file=sys.stderr)
         return 1
 
     x_ = []
 
     for my_file in args.files:
-        matches = from_fp(my_file, threshold=args.threshold, explain=args.verbose)
+        matches = from_fp(
+            my_file,
+            threshold=args.threshold,
+            explain=args.verbose,
+            preemptive_behaviour=args.no_preemptive is False,
+        )
 
         best_guess = matches.best()
 
@@ -155,9 +178,11 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
             print(
                 'Unable to identify originating encoding for "{}". {}'.format(
                     my_file.name,
-                    "Maybe try increasing maximum amount of chaos."
-                    if args.threshold < 1.0
-                    else "",
+                    (
+                        "Maybe try increasing maximum amount of chaos."
+                        if args.threshold < 1.0
+                        else ""
+                    ),
                 ),
                 file=sys.stderr,
             )
@@ -235,7 +260,7 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
                 dir_path = dirname(realpath(my_file.name))
                 file_name = basename(realpath(my_file.name))
 
-                o_: List[str] = file_name.split(".")
+                o_: list[str] = file_name.split(".")
 
                 if args.replace is False:
                     o_.insert(-1, best_guess.encoding)
@@ -258,9 +283,9 @@ def cli_detect(argv: Optional[List[str]] = None) -> int:
                 try:
                     x_[0].unicode_path = join(dir_path, ".".join(o_))
 
-                    with open(x_[0].unicode_path, "w", encoding="utf-8") as fp:
-                        fp.write(str(best_guess))
-                except IOError as e:
+                    with open(x_[0].unicode_path, "wb") as fp:
+                        fp.write(best_guess.output())
+                except OSError as e:
                     print(str(e), file=sys.stderr)
                     if my_file.closed is False:
                         my_file.close()
diff --git a/libs/charset_normalizer/constant.py b/libs/charset_normalizer/constant.py
index 863490461..1fb9508d2 100644
--- a/libs/charset_normalizer/constant.py
+++ b/libs/charset_normalizer/constant.py
@@ -1,11 +1,12 @@
-# -*- coding: utf-8 -*-
+from __future__ import annotations
+
 from codecs import BOM_UTF8, BOM_UTF16_BE, BOM_UTF16_LE, BOM_UTF32_BE, BOM_UTF32_LE
 from encodings.aliases import aliases
-from re import IGNORECASE, compile as re_compile
-from typing import Dict, List, Set, Union
+from re import IGNORECASE
+from re import compile as re_compile
 
 # Contain for each eligible encoding a list of/item bytes SIG/BOM
-ENCODING_MARKS: Dict[str, Union[bytes, List[bytes]]] = {
+ENCODING_MARKS: dict[str, bytes | list[bytes]] = {
     "utf_8": BOM_UTF8,
     "utf_7": [
         b"\x2b\x2f\x76\x38",
@@ -25,7 +26,7 @@ TOO_BIG_SEQUENCE: int = int(10e6)
 UTF8_MAXIMAL_ALLOCATION: int = 1_112_064
 
 # Up-to-date Unicode ucd/15.0.0
-UNICODE_RANGES_COMBINED: Dict[str, range] = {
+UNICODE_RANGES_COMBINED: dict[str, range] = {
     "Control character": range(32),
     "Basic Latin": range(32, 128),
     "Latin-1 Supplement": range(128, 256),
@@ -357,7 +358,7 @@ UNICODE_RANGES_COMBINED: Dict[str, range] = {
 }
 
 
-UNICODE_SECONDARY_RANGE_KEYWORD: List[str] = [
+UNICODE_SECONDARY_RANGE_KEYWORD: list[str] = [
     "Supplement",
     "Extended",
     "Extensions",
@@ -392,7 +393,7 @@ IANA_NO_ALIASES = [
     "koi8_u",
 ]
 
-IANA_SUPPORTED: List[str] = sorted(
+IANA_SUPPORTED: list[str] = sorted(
     filter(
         lambda x: x.endswith("_codec") is False
         and x not in {"rot_13", "tactis", "mbcs"},
@@ -403,7 +404,7 @@ IANA_SUPPORTED: List[str] = sorted(
 IANA_SUPPORTED_COUNT: int = len(IANA_SUPPORTED)
 
 # pre-computed code page that are similar using the function cp_similarity.
-IANA_SUPPORTED_SIMILAR: Dict[str, List[str]] = {
+IANA_SUPPORTED_SIMILAR: dict[str, list[str]] = {
     "cp037": ["cp1026", "cp1140", "cp273", "cp500"],
     "cp1026": ["cp037", "cp1140", "cp273", "cp500"],
     "cp1125": ["cp866"],
@@ -492,7 +493,7 @@ IANA_SUPPORTED_SIMILAR: Dict[str, List[str]] = {
 }
 
 
-CHARDET_CORRESPONDENCE: Dict[str, str] = {
+CHARDET_CORRESPONDENCE: dict[str, str] = {
     "iso2022_kr": "ISO-2022-KR",
     "iso2022_jp": "ISO-2022-JP",
     "euc_kr": "EUC-KR",
@@ -528,7 +529,7 @@ CHARDET_CORRESPONDENCE: Dict[str, str] = {
 }
 
 
-COMMON_SAFE_ASCII_CHARACTERS: Set[str] = {
+COMMON_SAFE_ASCII_CHARACTERS: set[str] = {
     "<",
     ">",
     "=",
@@ -544,11 +545,13 @@ COMMON_SAFE_ASCII_CHARACTERS: Set[str] = {
     "|",
     '"',
     "-",
+    "(",
+    ")",
 }
 
 
-KO_NAMES: Set[str] = {"johab", "cp949", "euc_kr"}
-ZH_NAMES: Set[str] = {"big5", "cp950", "big5hkscs", "hz"}
+KO_NAMES: set[str] = {"johab", "cp949", "euc_kr"}
+ZH_NAMES: set[str] = {"big5", "cp950", "big5hkscs", "hz"}
 
 # Logging LEVEL below DEBUG
 TRACE: int = 5
@@ -556,7 +559,7 @@ TRACE: int = 5
 
 # Language label that contain the em dash "—"
 # character are to be considered alternative seq to origin
-FREQUENCIES: Dict[str, List[str]] = {
+FREQUENCIES: dict[str, list[str]] = {
     "English": [
         "e",
         "a",
diff --git a/libs/charset_normalizer/legacy.py b/libs/charset_normalizer/legacy.py
index 43aad21a9..a2f534514 100644
--- a/libs/charset_normalizer/legacy.py
+++ b/libs/charset_normalizer/legacy.py
@@ -1,13 +1,24 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
 from warnings import warn
 
 from .api import from_bytes
 from .constant import CHARDET_CORRESPONDENCE
 
+# TODO: remove this check when dropping Python 3.7 support
+if TYPE_CHECKING:
+    from typing_extensions import TypedDict
+
+    class ResultDict(TypedDict):
+        encoding: str | None
+        language: str
+        confidence: float | None
+
 
 def detect(
     byte_str: bytes, should_rename_legacy: bool = False, **kwargs: Any
-) -> Dict[str, Optional[Union[str, float]]]:
+) -> ResultDict:
     """
     chardet legacy method
     Detect the encoding of the given byte string. It should be mostly backward-compatible.
@@ -26,8 +37,9 @@ def detect(
 
     if not isinstance(byte_str, (bytearray, bytes)):
         raise TypeError(  # pragma: nocover
-            "Expected object of type bytes or bytearray, got: "
-            "{0}".format(type(byte_str))
+            "Expected object of type bytes or bytearray, got: " "{}".format(
+                type(byte_str)
+            )
         )
 
     if isinstance(byte_str, bytearray):
diff --git a/libs/charset_normalizer/md.py b/libs/charset_normalizer/md.py
index 77897aae4..9ed59a868 100644
--- a/libs/charset_normalizer/md.py
+++ b/libs/charset_normalizer/md.py
@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from functools import lru_cache
 from logging import getLogger
-from typing import List, Optional
 
 from .constant import (
     COMMON_SAFE_ASCII_CHARACTERS,
@@ -68,7 +69,7 @@ class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
         self._symbol_count: int = 0
         self._character_count: int = 0
 
-        self._last_printable_char: Optional[str] = None
+        self._last_printable_char: str | None = None
         self._frenzy_symbol_in_word: bool = False
 
     def eligible(self, character: str) -> bool:
@@ -92,7 +93,7 @@ class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
 
         self._last_printable_char = character
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._punctuation_count = 0
         self._character_count = 0
         self._symbol_count = 0
@@ -123,7 +124,7 @@ class TooManyAccentuatedPlugin(MessDetectorPlugin):
         if is_accentuated(character):
             self._accentuated_count += 1
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._accentuated_count = 0
 
@@ -149,7 +150,7 @@ class UnprintablePlugin(MessDetectorPlugin):
             self._unprintable_count += 1
         self._character_count += 1
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._unprintable_count = 0
 
     @property
@@ -165,7 +166,7 @@ class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
         self._successive_count: int = 0
         self._character_count: int = 0
 
-        self._last_latin_character: Optional[str] = None
+        self._last_latin_character: str | None = None
 
     def eligible(self, character: str) -> bool:
         return character.isalpha() and is_latin(character)
@@ -184,7 +185,7 @@ class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
                 self._successive_count += 1
         self._last_latin_character = character
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._successive_count = 0
         self._character_count = 0
         self._last_latin_character = None
@@ -201,7 +202,7 @@ class SuspiciousRange(MessDetectorPlugin):
     def __init__(self) -> None:
         self._suspicious_successive_range_count: int = 0
         self._character_count: int = 0
-        self._last_printable_seen: Optional[str] = None
+        self._last_printable_seen: str | None = None
 
     def eligible(self, character: str) -> bool:
         return character.isprintable()
@@ -221,22 +222,22 @@ class SuspiciousRange(MessDetectorPlugin):
             self._last_printable_seen = character
             return
 
-        unicode_range_a: Optional[str] = unicode_range(self._last_printable_seen)
-        unicode_range_b: Optional[str] = unicode_range(character)
+        unicode_range_a: str | None = unicode_range(self._last_printable_seen)
+        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
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._suspicious_successive_range_count = 0
         self._last_printable_seen = None
 
     @property
     def ratio(self) -> float:
-        if self._character_count <= 24:
+        if self._character_count <= 13:
             return 0.0
 
         ratio_of_suspicious_range_usage: float = (
@@ -260,6 +261,7 @@ class SuperWeirdWordPlugin(MessDetectorPlugin):
 
         self._buffer: str = ""
         self._buffer_accent_count: int = 0
+        self._buffer_glyph_count: int = 0
 
     def eligible(self, character: str) -> bool:
         return True
@@ -279,6 +281,14 @@ class SuperWeirdWordPlugin(MessDetectorPlugin):
                 and is_thai(character) is False
             ):
                 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)
+            ):
+                self._buffer_glyph_count += 1
             return
         if not self._buffer:
             return
@@ -291,17 +301,20 @@ class SuperWeirdWordPlugin(MessDetectorPlugin):
             self._character_count += buffer_length
 
             if buffer_length >= 4:
-                if self._buffer_accent_count / buffer_length > 0.34:
+                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.
-                if (
+                elif (
                     is_accentuated(self._buffer[-1])
                     and self._buffer[-1].isupper()
                     and all(_.isupper() for _ in self._buffer) is False
                 ):
                     self._foreign_long_count += 1
                     self._is_current_word_bad = True
+                elif self._buffer_glyph_count == 1:
+                    self._is_current_word_bad = True
+                    self._foreign_long_count += 1
             if buffer_length >= 24 and self._foreign_long_watch:
                 camel_case_dst = [
                     i
@@ -325,6 +338,7 @@ class SuperWeirdWordPlugin(MessDetectorPlugin):
             self._foreign_long_watch = False
             self._buffer = ""
             self._buffer_accent_count = 0
+            self._buffer_glyph_count = 0
         elif (
             character not in {"<", ">", "-", "=", "~", "|", "_"}
             and character.isdigit() is False
@@ -333,7 +347,7 @@ class SuperWeirdWordPlugin(MessDetectorPlugin):
             self._is_current_word_bad = True
             self._buffer += character
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._buffer = ""
         self._is_current_word_bad = False
         self._foreign_long_watch = False
@@ -371,7 +385,7 @@ class CjkInvalidStopPlugin(MessDetectorPlugin):
         if is_cjk(character):
             self._cjk_character_count += 1
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._wrong_stop_count = 0
         self._cjk_character_count = 0
 
@@ -393,7 +407,7 @@ class ArchaicUpperLowerPlugin(MessDetectorPlugin):
 
         self._character_count: int = 0
 
-        self._last_alpha_seen: Optional[str] = None
+        self._last_alpha_seen: str | None = None
         self._current_ascii_only: bool = True
 
     def eligible(self, character: str) -> bool:
@@ -441,7 +455,7 @@ class ArchaicUpperLowerPlugin(MessDetectorPlugin):
         self._character_count_since_last_sep += 1
         self._last_alpha_seen = character
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._character_count_since_last_sep = 0
         self._successive_upper_lower_count = 0
@@ -463,7 +477,7 @@ class ArabicIsolatedFormPlugin(MessDetectorPlugin):
         self._character_count: int = 0
         self._isolated_form_count: int = 0
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._isolated_form_count = 0
 
@@ -488,7 +502,7 @@ class ArabicIsolatedFormPlugin(MessDetectorPlugin):
 
 @lru_cache(maxsize=1024)
 def is_suspiciously_successive_range(
-    unicode_range_a: Optional[str], unicode_range_b: Optional[str]
+    unicode_range_a: str | None, unicode_range_b: str | None
 ) -> bool:
     """
     Determine if two Unicode range seen next to each other can be considered as suspicious.
@@ -512,9 +526,10 @@ def is_suspiciously_successive_range(
     ):
         return False
 
-    keywords_range_a, keywords_range_b = unicode_range_a.split(
-        " "
-    ), unicode_range_b.split(" ")
+    keywords_range_a, keywords_range_b = (
+        unicode_range_a.split(" "),
+        unicode_range_b.split(" "),
+    )
 
     for el in keywords_range_a:
         if el in UNICODE_SECONDARY_RANGE_KEYWORD:
@@ -567,7 +582,7 @@ def mess_ratio(
     Compute a mess ratio given a decoded bytes sequence. The maximum threshold does stop the computation earlier.
     """
 
-    detectors: List[MessDetectorPlugin] = [
+    detectors: list[MessDetectorPlugin] = [
         md_class() for md_class in MessDetectorPlugin.__subclasses__()
     ]
 
@@ -609,7 +624,7 @@ def mess_ratio(
             logger.log(TRACE, f"Starting with: {decoded_sequence[:16]}")
             logger.log(TRACE, f"Ending with: {decoded_sequence[-16::]}")
 
-        for dt in detectors:  # pragma: nocover
+        for dt in detectors:
             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 a760b9c55..1042758f8 100644
--- a/libs/charset_normalizer/models.py
+++ b/libs/charset_normalizer/models.py
@@ -1,9 +1,12 @@
+from __future__ import annotations
+
 from encodings.aliases import aliases
 from hashlib import sha256
 from json import dumps
-from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
+from re import sub
+from typing import Any, Iterator, List, Tuple
 
-from .constant import TOO_BIG_SEQUENCE
+from .constant import RE_POSSIBLE_ENCODING_INDICATION, TOO_BIG_SEQUENCE
 from .utils import iana_name, is_multi_byte_encoding, unicode_range
 
 
@@ -14,8 +17,9 @@ class CharsetMatch:
         guessed_encoding: str,
         mean_mess_ratio: float,
         has_sig_or_bom: bool,
-        languages: "CoherenceMatches",
-        decoded_payload: Optional[str] = None,
+        languages: CoherenceMatches,
+        decoded_payload: str | None = None,
+        preemptive_declaration: str | None = None,
     ):
         self._payload: bytes = payload
 
@@ -23,23 +27,23 @@ class CharsetMatch:
         self._mean_mess_ratio: float = mean_mess_ratio
         self._languages: CoherenceMatches = languages
         self._has_sig_or_bom: bool = has_sig_or_bom
-        self._unicode_ranges: Optional[List[str]] = None
+        self._unicode_ranges: list[str] | None = None
 
-        self._leaves: List[CharsetMatch] = []
+        self._leaves: list[CharsetMatch] = []
         self._mean_coherence_ratio: float = 0.0
 
-        self._output_payload: Optional[bytes] = None
-        self._output_encoding: Optional[str] = None
+        self._output_payload: bytes | None = None
+        self._output_encoding: str | None = None
 
-        self._string: Optional[str] = decoded_payload
+        self._string: str | None = decoded_payload
+
+        self._preemptive_declaration: str | None = preemptive_declaration
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, CharsetMatch):
-            raise TypeError(
-                "__eq__ cannot be invoked on {} and {}.".format(
-                    str(other.__class__), str(self.__class__)
-                )
-            )
+            if isinstance(other, str):
+                return iana_name(other) == self.encoding
+            return False
         return self.encoding == other.encoding and self.fingerprint == other.fingerprint
 
     def __lt__(self, other: object) -> bool:
@@ -75,9 +79,9 @@ class CharsetMatch:
         return self._string
 
     def __repr__(self) -> str:
-        return "<CharsetMatch '{}' bytes({})>".format(self.encoding, self.fingerprint)
+        return f"<CharsetMatch '{self.encoding}' bytes({self.fingerprint})>"
 
-    def add_submatch(self, other: "CharsetMatch") -> None:
+    def add_submatch(self, other: CharsetMatch) -> None:
         if not isinstance(other, CharsetMatch) or other == self:
             raise ValueError(
                 "Unable to add instance <{}> as a submatch of a CharsetMatch".format(
@@ -93,11 +97,11 @@ class CharsetMatch:
         return self._encoding
 
     @property
-    def encoding_aliases(self) -> List[str]:
+    def encoding_aliases(self) -> list[str]:
         """
         Encoding name are known by many name, using this could help when searching for IBM855 when it's listed as CP855.
         """
-        also_known_as: List[str] = []
+        also_known_as: list[str] = []
         for u, p in aliases.items():
             if self.encoding == u:
                 also_known_as.append(p)
@@ -114,7 +118,7 @@ class CharsetMatch:
         return self._has_sig_or_bom
 
     @property
-    def languages(self) -> List[str]:
+    def languages(self) -> list[str]:
         """
         Return the complete list of possible languages found in decoded sequence.
         Usually not really useful. Returned list may be empty even if 'language' property return something != 'Unknown'.
@@ -175,7 +179,7 @@ class CharsetMatch:
         return self._payload
 
     @property
-    def submatch(self) -> List["CharsetMatch"]:
+    def submatch(self) -> list[CharsetMatch]:
         return self._leaves
 
     @property
@@ -183,19 +187,17 @@ class CharsetMatch:
         return len(self._leaves) > 0
 
     @property
-    def alphabets(self) -> List[str]:
+    def alphabets(self) -> list[str]:
         if self._unicode_ranges is not None:
             return self._unicode_ranges
         # list detected ranges
-        detected_ranges: List[Optional[str]] = [
-            unicode_range(char) for char in str(self)
-        ]
+        detected_ranges: list[str | None] = [unicode_range(char) for char in str(self)]
         # filter and sort
         self._unicode_ranges = sorted(list({r for r in detected_ranges if r}))
         return self._unicode_ranges
 
     @property
-    def could_be_from_charset(self) -> List[str]:
+    def could_be_from_charset(self) -> list[str]:
         """
         The complete list of encoding that output the exact SAME str result and therefore could be the originating
         encoding.
@@ -210,7 +212,25 @@ class CharsetMatch:
         """
         if self._output_encoding is None or self._output_encoding != encoding:
             self._output_encoding = encoding
-            self._output_payload = str(self).encode(encoding, "replace")
+            decoded_string = str(self)
+            if (
+                self._preemptive_declaration is not None
+                and self._preemptive_declaration.lower()
+                not in ["utf-8", "utf8", "utf_8"]
+            ):
+                patched_header = sub(
+                    RE_POSSIBLE_ENCODING_INDICATION,
+                    lambda m: m.string[m.span()[0] : m.span()[1]].replace(
+                        m.groups()[0],
+                        iana_name(self._output_encoding).replace("_", "-"),  # type: ignore[arg-type]
+                    ),
+                    decoded_string[:8192],
+                    count=1,
+                )
+
+                decoded_string = patched_header + decoded_string[8192:]
+
+            self._output_payload = decoded_string.encode(encoding, "replace")
 
         return self._output_payload  # type: ignore
 
@@ -228,13 +248,13 @@ class CharsetMatches:
     Act like a list(iterable) but does not implements all related methods.
     """
 
-    def __init__(self, results: Optional[List[CharsetMatch]] = None):
-        self._results: List[CharsetMatch] = sorted(results) if results else []
+    def __init__(self, results: list[CharsetMatch] | None = None):
+        self._results: list[CharsetMatch] = sorted(results) if results else []
 
     def __iter__(self) -> Iterator[CharsetMatch]:
         yield from self._results
 
-    def __getitem__(self, item: Union[int, str]) -> CharsetMatch:
+    def __getitem__(self, item: int | str) -> CharsetMatch:
         """
         Retrieve a single item either by its position or encoding name (alias may be used here).
         Raise KeyError upon invalid index or encoding not present in results.
@@ -266,7 +286,7 @@ class CharsetMatches:
                 )
             )
         # We should disable the submatch factoring when the input file is too heavy (conserve RAM usage)
-        if len(item.raw) <= TOO_BIG_SEQUENCE:
+        if len(item.raw) < TOO_BIG_SEQUENCE:
             for match in self._results:
                 if match.fingerprint == item.fingerprint and match.chaos == item.chaos:
                     match.add_submatch(item)
@@ -274,7 +294,7 @@ class CharsetMatches:
         self._results.append(item)
         self._results = sorted(self._results)
 
-    def best(self) -> Optional["CharsetMatch"]:
+    def best(self) -> CharsetMatch | None:
         """
         Simply return the first match. Strict equivalent to matches[0].
         """
@@ -282,7 +302,7 @@ class CharsetMatches:
             return None
         return self._results[0]
 
-    def first(self) -> Optional["CharsetMatch"]:
+    def first(self) -> CharsetMatch | None:
         """
         Redundant method, call the method best(). Kept for BC reasons.
         """
@@ -297,31 +317,31 @@ class CliDetectionResult:
     def __init__(
         self,
         path: str,
-        encoding: Optional[str],
-        encoding_aliases: List[str],
-        alternative_encodings: List[str],
+        encoding: str | None,
+        encoding_aliases: list[str],
+        alternative_encodings: list[str],
         language: str,
-        alphabets: List[str],
+        alphabets: list[str],
         has_sig_or_bom: bool,
         chaos: float,
         coherence: float,
-        unicode_path: Optional[str],
+        unicode_path: str | None,
         is_preferred: bool,
     ):
         self.path: str = path
-        self.unicode_path: Optional[str] = unicode_path
-        self.encoding: Optional[str] = encoding
-        self.encoding_aliases: List[str] = encoding_aliases
-        self.alternative_encodings: List[str] = alternative_encodings
+        self.unicode_path: str | None = unicode_path
+        self.encoding: str | None = encoding
+        self.encoding_aliases: list[str] = encoding_aliases
+        self.alternative_encodings: list[str] = alternative_encodings
         self.language: str = language
-        self.alphabets: List[str] = alphabets
+        self.alphabets: list[str] = alphabets
         self.has_sig_or_bom: bool = has_sig_or_bom
         self.chaos: float = chaos
         self.coherence: float = coherence
         self.is_preferred: bool = is_preferred
 
     @property
-    def __dict__(self) -> Dict[str, Any]:  # type: ignore
+    def __dict__(self) -> dict[str, Any]:  # type: ignore
         return {
             "path": self.path,
             "encoding": self.encoding,
diff --git a/libs/charset_normalizer/utils.py b/libs/charset_normalizer/utils.py
index e5cbbf4c0..0175e0a96 100644
--- a/libs/charset_normalizer/utils.py
+++ b/libs/charset_normalizer/utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import importlib
 import logging
 import unicodedata
@@ -5,9 +7,11 @@ from codecs import IncrementalDecoder
 from encodings.aliases import aliases
 from functools import lru_cache
 from re import findall
-from typing import Generator, List, Optional, Set, Tuple, Union
+from typing import Generator
 
-from _multibytecodec import MultibyteIncrementalDecoder
+from _multibytecodec import (  # type: ignore[import-not-found,import]
+    MultibyteIncrementalDecoder,
+)
 
 from .constant import (
     ENCODING_MARKS,
@@ -23,7 +27,7 @@ from .constant import (
 def is_accentuated(character: str) -> bool:
     try:
         description: str = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
     return (
         "WITH GRAVE" in description
@@ -43,13 +47,13 @@ def remove_accent(character: str) -> str:
     if not decomposed:
         return character
 
-    codes: List[str] = decomposed.split(" ")
+    codes: list[str] = decomposed.split(" ")
 
     return chr(int(codes[0], 16))
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def unicode_range(character: str) -> Optional[str]:
+def unicode_range(character: str) -> str | None:
     """
     Retrieve the Unicode range official name from a single character.
     """
@@ -66,7 +70,7 @@ def unicode_range(character: str) -> Optional[str]:
 def is_latin(character: str) -> bool:
     try:
         description: str = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
     return "LATIN" in description
 
@@ -78,7 +82,7 @@ def is_punctuation(character: str) -> bool:
     if "P" in character_category:
         return True
 
-    character_range: Optional[str] = unicode_range(character)
+    character_range: str | None = unicode_range(character)
 
     if character_range is None:
         return False
@@ -93,7 +97,7 @@ def is_symbol(character: str) -> bool:
     if "S" in character_category or "N" in character_category:
         return True
 
-    character_range: Optional[str] = unicode_range(character)
+    character_range: str | None = unicode_range(character)
 
     if character_range is None:
         return False
@@ -103,7 +107,7 @@ def is_symbol(character: str) -> bool:
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_emoticon(character: str) -> bool:
-    character_range: Optional[str] = unicode_range(character)
+    character_range: str | None = unicode_range(character)
 
     if character_range is None:
         return False
@@ -130,7 +134,7 @@ def is_case_variable(character: str) -> bool:
 def is_cjk(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "CJK" in character_name
@@ -140,7 +144,7 @@ def is_cjk(character: str) -> bool:
 def is_hiragana(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "HIRAGANA" in character_name
@@ -150,7 +154,7 @@ def is_hiragana(character: str) -> bool:
 def is_katakana(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "KATAKANA" in character_name
@@ -160,7 +164,7 @@ def is_katakana(character: str) -> bool:
 def is_hangul(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "HANGUL" in character_name
@@ -170,7 +174,7 @@ def is_hangul(character: str) -> bool:
 def is_thai(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "THAI" in character_name
@@ -180,7 +184,7 @@ def is_thai(character: str) -> bool:
 def is_arabic(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "ARABIC" in character_name
@@ -190,7 +194,7 @@ def is_arabic(character: str) -> bool:
 def is_arabic_isolated_form(character: str) -> bool:
     try:
         character_name = unicodedata.name(character)
-    except ValueError:
+    except ValueError:  # Defensive: unicode database outdated?
         return False
 
     return "ARABIC" in character_name and "ISOLATED FORM" in character_name
@@ -206,13 +210,13 @@ def is_unprintable(character: str) -> bool:
     return (
         character.isspace() is False  # includes \n \t \r \v
         and character.isprintable() is False
-        and character != "\x1A"  # Why? Its the ASCII substitute character.
+        and character != "\x1a"  # Why? Its the ASCII substitute character.
         and character != "\ufeff"  # bug discovered in Python,
         # Zero Width No-Break Space located in 	Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space.
     )
 
 
-def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> Optional[str]:
+def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> str | None:
     """
     Extract using ASCII-only decoder any specified encoding in the first n-bytes.
     """
@@ -221,7 +225,7 @@ def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> Optional
 
     seq_len: int = len(sequence)
 
-    results: List[str] = findall(
+    results: list[str] = findall(
         RE_POSSIBLE_ENCODING_INDICATION,
         sequence[: min(seq_len, search_zone)].decode("ascii", errors="ignore"),
     )
@@ -260,18 +264,18 @@ def is_multi_byte_encoding(name: str) -> bool:
         "utf_32_be",
         "utf_7",
     } or issubclass(
-        importlib.import_module("encodings.{}".format(name)).IncrementalDecoder,
+        importlib.import_module(f"encodings.{name}").IncrementalDecoder,
         MultibyteIncrementalDecoder,
     )
 
 
-def identify_sig_or_bom(sequence: bytes) -> Tuple[Optional[str], bytes]:
+def identify_sig_or_bom(sequence: bytes) -> tuple[str | None, bytes]:
     """
     Identify and extract SIG/BOM in given sequence.
     """
 
     for iana_encoding in ENCODING_MARKS:
-        marks: Union[bytes, List[bytes]] = ENCODING_MARKS[iana_encoding]
+        marks: bytes | list[bytes] = ENCODING_MARKS[iana_encoding]
 
         if isinstance(marks, bytes):
             marks = [marks]
@@ -288,6 +292,7 @@ def should_strip_sig_or_bom(iana_encoding: str) -> bool:
 
 
 def iana_name(cp_name: str, strict: bool = True) -> str:
+    """Returns the Python normalized encoding name (Not the IANA official name)."""
     cp_name = cp_name.lower().replace("-", "_")
 
     encoding_alias: str
@@ -298,35 +303,17 @@ def iana_name(cp_name: str, strict: bool = True) -> str:
             return encoding_iana
 
     if strict:
-        raise ValueError("Unable to retrieve IANA for '{}'".format(cp_name))
+        raise ValueError(f"Unable to retrieve IANA for '{cp_name}'")
 
     return cp_name
 
 
-def range_scan(decoded_sequence: str) -> List[str]:
-    ranges: Set[str] = set()
-
-    for character in decoded_sequence:
-        character_range: Optional[str] = unicode_range(character)
-
-        if character_range is None:
-            continue
-
-        ranges.add(character_range)
-
-    return list(ranges)
-
-
 def cp_similarity(iana_name_a: str, iana_name_b: str) -> float:
     if is_multi_byte_encoding(iana_name_a) or is_multi_byte_encoding(iana_name_b):
         return 0.0
 
-    decoder_a = importlib.import_module(
-        "encodings.{}".format(iana_name_a)
-    ).IncrementalDecoder
-    decoder_b = importlib.import_module(
-        "encodings.{}".format(iana_name_b)
-    ).IncrementalDecoder
+    decoder_a = importlib.import_module(f"encodings.{iana_name_a}").IncrementalDecoder
+    decoder_b = importlib.import_module(f"encodings.{iana_name_b}").IncrementalDecoder
 
     id_a: IncrementalDecoder = decoder_a(errors="ignore")
     id_b: IncrementalDecoder = decoder_b(errors="ignore")
@@ -374,7 +361,7 @@ def cut_sequence_chunks(
     strip_sig_or_bom: bool,
     sig_payload: bytes,
     is_multi_byte_decoder: bool,
-    decoded_payload: Optional[str] = None,
+    decoded_payload: str | None = None,
 ) -> Generator[str, None, None]:
     if decoded_payload and is_multi_byte_decoder is False:
         for i in offsets:
diff --git a/libs/charset_normalizer/version.py b/libs/charset_normalizer/version.py
index 5a4da4ff4..f85e8929e 100644
--- a/libs/charset_normalizer/version.py
+++ b/libs/charset_normalizer/version.py
@@ -2,5 +2,7 @@
 Expose version
 """
 
-__version__ = "3.3.2"
+from __future__ import annotations
+
+__version__ = "3.4.1"
 VERSION = __version__.split(".")
diff --git a/libs/click-8.1.7.dist-info/METADATA b/libs/click-8.1.7.dist-info/METADATA
deleted file mode 100644
index 7a6bbb24b..000000000
--- a/libs/click-8.1.7.dist-info/METADATA
+++ /dev/null
@@ -1,103 +0,0 @@
-Metadata-Version: 2.1
-Name: click
-Version: 8.1.7
-Summary: Composable command line interface toolkit
-Home-page: https://palletsprojects.com/p/click/
-Maintainer: Pallets
-Maintainer-email: contact@palletsprojects.com
-License: BSD-3-Clause
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Documentation, https://click.palletsprojects.com/
-Project-URL: Changes, https://click.palletsprojects.com/changes/
-Project-URL: Source Code, https://github.com/pallets/click/
-Project-URL: Issue Tracker, https://github.com/pallets/click/issues/
-Project-URL: Chat, https://discord.gg/pallets
-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
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE.rst
-Requires-Dist: colorama ; platform_system == "Windows"
-Requires-Dist: importlib-metadata ; python_version < "3.8"
-
-\$ 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
-
-
-Installing
-----------
-
-Install and update using `pip`_:
-
-.. code-block:: text
-
-    $ pip install -U click
-
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
-
-
-A Simple Example
-----------------
-
-.. code-block:: 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()
-
-.. code-block:: text
-
-    $ 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
-
-
-Links
------
-
--   Documentation: https://click.palletsprojects.com/
--   Changes: https://click.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/click/
--   Source Code: https://github.com/pallets/click
--   Issue Tracker: https://github.com/pallets/click/issues
--   Chat: https://discord.gg/pallets
diff --git a/libs/click-8.1.7.dist-info/RECORD b/libs/click-8.1.7.dist-info/RECORD
deleted file mode 100644
index d7da66e33..000000000
--- a/libs/click-8.1.7.dist-info/RECORD
+++ /dev/null
@@ -1,24 +0,0 @@
-click-8.1.7.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-click-8.1.7.dist-info/LICENSE.rst,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
-click-8.1.7.dist-info/METADATA,sha256=qIMevCxGA9yEmJOM_4WHuUJCwWpsIEVbCPOhs45YPN4,3014
-click-8.1.7.dist-info/RECORD,,
-click-8.1.7.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-click-8.1.7.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-click-8.1.7.dist-info/top_level.txt,sha256=J1ZQogalYS4pphY_lPECoNMfw0HzTSrZglC4Yfwo4xA,6
-click/__init__.py,sha256=YDDbjm406dTOA0V8bTtdGnhN7zj5j-_dFRewZF_pLvw,3138
-click/_compat.py,sha256=5318agQpbt4kroKsbqDOYpTSWzL_YCZVUQiTT04yXmc,18744
-click/_termui_impl.py,sha256=3dFYv4445Nw-rFvZOTBMBPYwB1bxnmNk9Du6Dm_oBSU,24069
-click/_textwrap.py,sha256=10fQ64OcBUMuK7mFvh8363_uoOxPlRItZBmKzRJDgoY,1353
-click/_winconsole.py,sha256=5ju3jQkcZD0W27WEMGqmEP4y_crUVzPCqsX_FYb7BO0,7860
-click/core.py,sha256=j6oEWtGgGna8JarD6WxhXmNnxLnfRjwXglbBc-8jr7U,114086
-click/decorators.py,sha256=-ZlbGYgV-oI8jr_oH4RpuL1PFS-5QmeuEAsLDAYgxtw,18719
-click/exceptions.py,sha256=fyROO-47HWFDjt2qupo7A3J32VlpM-ovJnfowu92K3s,9273
-click/formatting.py,sha256=Frf0-5W33-loyY_i9qrwXR8-STnW3m5gvyxLVUdyxyk,9706
-click/globals.py,sha256=TP-qM88STzc7f127h35TD_v920FgfOD2EwzqA0oE8XU,1961
-click/parser.py,sha256=LKyYQE9ZLj5KgIDXkrcTHQRXIggfoivX14_UVIn56YA,19067
-click/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-click/shell_completion.py,sha256=Ty3VM_ts0sQhj6u7eFTiLwHPoTgcXTGEAUg2OpLqYKw,18460
-click/termui.py,sha256=H7Q8FpmPelhJ2ovOhfCRhjMtCpNyjFXryAMLZODqsdc,28324
-click/testing.py,sha256=1Qd4kS5bucn1hsNIRryd0WtTMuCpkA93grkWxT8POsU,16084
-click/types.py,sha256=TZvz3hKvBztf-Hpa2enOmP4eznSPLzijjig5b_0XMxE,36391
-click/utils.py,sha256=1476UduUNY6UePGU4m18uzVHLt1sKM2PP3yWsQhbItM,20298
diff --git a/libs/click-8.1.7.dist-info/top_level.txt b/libs/click-8.1.7.dist-info/top_level.txt
deleted file mode 100644
index dca9a9096..000000000
--- a/libs/click-8.1.7.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-click
diff --git a/libs/click-8.1.7.dist-info/INSTALLER b/libs/click-8.1.8.dist-info/INSTALLER
similarity index 100%
rename from libs/click-8.1.7.dist-info/INSTALLER
rename to libs/click-8.1.8.dist-info/INSTALLER
diff --git a/libs/click-8.1.7.dist-info/LICENSE.rst b/libs/click-8.1.8.dist-info/LICENSE.txt
similarity index 100%
rename from libs/click-8.1.7.dist-info/LICENSE.rst
rename to libs/click-8.1.8.dist-info/LICENSE.txt
diff --git a/libs/click-8.1.8.dist-info/METADATA b/libs/click-8.1.8.dist-info/METADATA
new file mode 100644
index 000000000..366d1a7e4
--- /dev/null
+++ b/libs/click-8.1.8.dist-info/METADATA
@@ -0,0 +1,74 @@
+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
new file mode 100644
index 000000000..6989c69d5
--- /dev/null
+++ b/libs/click-8.1.8.dist-info/RECORD
@@ -0,0 +1,23 @@
+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.7.dist-info/REQUESTED b/libs/click-8.1.8.dist-info/REQUESTED
similarity index 100%
rename from libs/click-8.1.7.dist-info/REQUESTED
rename to libs/click-8.1.8.dist-info/REQUESTED
diff --git a/libs/typing_extensions-4.10.0.dist-info/WHEEL b/libs/click-8.1.8.dist-info/WHEEL
similarity index 71%
rename from libs/typing_extensions-4.10.0.dist-info/WHEEL
rename to libs/click-8.1.8.dist-info/WHEEL
index 3b5e64b5e..e3c6feefa 100644
--- a/libs/typing_extensions-4.10.0.dist-info/WHEEL
+++ b/libs/click-8.1.8.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/click/__init__.py b/libs/click/__init__.py
index 9a1dab048..2610d0e14 100644
--- a/libs/click/__init__.py
+++ b/libs/click/__init__.py
@@ -4,6 +4,7 @@ writing command line scripts fun. Unlike other modules, it's based
 around a simple API that does not come with too much magic and is
 composable.
 """
+
 from .core import Argument as Argument
 from .core import BaseCommand as BaseCommand
 from .core import Command as Command
@@ -18,6 +19,7 @@ from .decorators import command as command
 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
@@ -70,4 +72,4 @@ from .utils import get_binary_stream as get_binary_stream
 from .utils import get_text_stream as get_text_stream
 from .utils import open_file as open_file
 
-__version__ = "8.1.7"
+__version__ = "8.1.8"
diff --git a/libs/click/_compat.py b/libs/click/_compat.py
index 23f886659..9153d150c 100644
--- a/libs/click/_compat.py
+++ b/libs/click/_compat.py
@@ -516,7 +516,7 @@ if sys.platform.startswith("win") and WIN:
 
     _ansi_stream_wrappers: t.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
 
-    def auto_wrap_for_ansi(  # noqa: F811
+    def auto_wrap_for_ansi(
         stream: t.TextIO, color: t.Optional[bool] = None
     ) -> t.TextIO:
         """Support ANSI color and style codes on Windows by wrapping a
diff --git a/libs/click/_termui_impl.py b/libs/click/_termui_impl.py
index f74465775..ad9f8f6c9 100644
--- a/libs/click/_termui_impl.py
+++ b/libs/click/_termui_impl.py
@@ -3,6 +3,7 @@ This module contains implementations for the termui module. To keep the
 import time of Click down, some infrequently used functionality is
 placed in this module and only imported as needed.
 """
+
 import contextlib
 import math
 import os
@@ -11,6 +12,7 @@ import time
 import typing as t
 from gettext import gettext as _
 from io import StringIO
+from shutil import which
 from types import TracebackType
 
 from ._compat import _default_text_stdout
@@ -371,31 +373,42 @@ def pager(generator: t.Iterable[str], color: t.Optional[bool] = None) -> None:
     pager_cmd = (os.environ.get("PAGER", None) or "").strip()
     if pager_cmd:
         if WIN:
-            return _tempfilepager(generator, pager_cmd, color)
-        return _pipepager(generator, pager_cmd, color)
+            if _tempfilepager(generator, pager_cmd, color):
+                return
+        elif _pipepager(generator, pager_cmd, color):
+            return
     if os.environ.get("TERM") in ("dumb", "emacs"):
         return _nullpager(stdout, generator, color)
-    if WIN or sys.platform.startswith("os2"):
-        return _tempfilepager(generator, "more <", color)
-    if hasattr(os, "system") and os.system("(less) 2>/dev/null") == 0:
-        return _pipepager(generator, "less", color)
+    if (WIN or sys.platform.startswith("os2")) and _tempfilepager(
+        generator, "more", color
+    ):
+        return
+    if _pipepager(generator, "less", color):
+        return
 
     import tempfile
 
     fd, filename = tempfile.mkstemp()
     os.close(fd)
     try:
-        if hasattr(os, "system") and os.system(f'more "{filename}"') == 0:
-            return _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]) -> None:
+def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) -> 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
+    pager should be attempted.
     """
+    cmd_absolute = which(cmd)
+    if cmd_absolute is None:
+        return False
+
     import subprocess
 
     env = dict(os.environ)
@@ -411,19 +424,25 @@ def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) ->
         elif "r" in less_flags or "R" in less_flags:
             color = True
 
-    c = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, env=env)
-    stdin = t.cast(t.BinaryIO, c.stdin)
-    encoding = get_best_encoding(stdin)
+    c = subprocess.Popen(
+        [cmd_absolute],
+        shell=True,
+        stdin=subprocess.PIPE,
+        env=env,
+        errors="replace",
+        text=True,
+    )
+    assert c.stdin is not None
     try:
         for text in generator:
             if not color:
                 text = strip_ansi(text)
 
-            stdin.write(text.encode(encoding, "replace"))
+            c.stdin.write(text)
     except (OSError, KeyboardInterrupt):
         pass
     else:
-        stdin.close()
+        c.stdin.close()
 
     # Less doesn't respect ^C, but catches it for its own UI purposes (aborting
     # search or other commands inside less).
@@ -441,11 +460,25 @@ def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) ->
         else:
             break
 
+    return True
+
 
 def _tempfilepager(
-    generator: t.Iterable[str], cmd: str, color: t.Optional[bool]
-) -> None:
-    """Page through text by invoking a program on a temporary file."""
+    generator: t.Iterable[str],
+    cmd: str,
+    color: t.Optional[bool],
+) -> bool:
+    """Page through text by invoking a program on a temporary file.
+
+    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:
+        return False
+
+    import subprocess
     import tempfile
 
     fd, filename = tempfile.mkstemp()
@@ -457,11 +490,16 @@ def _tempfilepager(
     with open_stream(filename, "wb")[0] as f:
         f.write(text.encode(encoding))
     try:
-        os.system(f'{cmd} "{filename}"')
+        subprocess.call([cmd_absolute, filename])
+    except OSError:
+        # Command not found
+        pass
     finally:
         os.close(fd)
         os.unlink(filename)
 
+    return True
+
 
 def _nullpager(
     stream: t.TextIO, generator: t.Iterable[str], color: t.Optional[bool]
@@ -496,7 +534,7 @@ class Editor:
         if WIN:
             return "notepad"
         for editor in "sensible-editor", "vim", "nano":
-            if os.system(f"which {editor} >/dev/null 2>&1") == 0:
+            if which(editor) is not None:
                 return editor
         return "vi"
 
@@ -595,22 +633,33 @@ def open_url(url: str, wait: bool = False, locate: bool = False) -> int:
             null.close()
     elif WIN:
         if locate:
-            url = _unquote_file(url.replace('"', ""))
-            args = f'explorer /select,"{url}"'
+            url = _unquote_file(url)
+            args = ["explorer", f"/select,{url}"]
         else:
-            url = url.replace('"', "")
-            wait_str = "/WAIT" if wait else ""
-            args = f'start {wait_str} "" "{url}"'
-        return os.system(args)
+            args = ["start"]
+            if wait:
+                args.append("/WAIT")
+            args.append("")
+            args.append(url)
+        try:
+            return subprocess.call(args)
+        except OSError:
+            # Command not found
+            return 127
     elif CYGWIN:
         if locate:
-            url = os.path.dirname(_unquote_file(url).replace('"', ""))
-            args = f'cygstart "{url}"'
+            url = _unquote_file(url)
+            args = ["cygstart", os.path.dirname(url)]
         else:
-            url = url.replace('"', "")
-            wait_str = "-w" if wait else ""
-            args = f'cygstart {wait_str} "{url}"'
-        return os.system(args)
+            args = ["cygstart"]
+            if wait:
+                args.append("-w")
+            args.append(url)
+        try:
+            return subprocess.call(args)
+        except OSError:
+            # Command not found
+            return 127
 
     try:
         if locate:
@@ -698,8 +747,8 @@ if WIN:
         return rv
 
 else:
-    import tty
     import termios
+    import tty
 
     @contextlib.contextmanager
     def raw_terminal() -> t.Iterator[int]:
diff --git a/libs/click/core.py b/libs/click/core.py
index cc65e896b..e6305011a 100644
--- a/libs/click/core.py
+++ b/libs/click/core.py
@@ -39,6 +39,8 @@ 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])
@@ -115,9 +117,16 @@ def iter_params_for_processing(
     invocation_order: t.Sequence["Parameter"],
     declaration_order: t.Sequence["Parameter"],
 ) -> t.List["Parameter"]:
-    """Given a sequence of parameters in the order as should be considered
-    for processing and an iterable of parameters that exist, this returns
-    a list in the correct order as they should be processed.
+    """Returns all declared parameters in the order they should be processed.
+
+    The declared parameters are re-shuffled depending on the order in which
+    they were invoked, as well as the eagerness of each parameters.
+
+    The invocation order takes precedence over the declaration order. I.e. the
+    order in which the user provided them to the CLI is respected.
+
+    This behavior and its effect on callback evaluation is detailed at:
+    https://click.palletsprojects.com/en/stable/advanced/#callback-evaluation-order
     """
 
     def sort_key(item: "Parameter") -> t.Tuple[bool, float]:
@@ -383,9 +392,9 @@ class Context:
 
         #: 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.Optional[t.Callable[[str], str]] = (
+            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
@@ -624,7 +633,7 @@ class Context:
 
     def find_object(self, object_type: t.Type[V]) -> t.Optional[V]:
         """Finds the closest object of a given type."""
-        node: t.Optional["Context"] = self
+        node: t.Optional[Context] = self
 
         while node is not None:
             if isinstance(node.obj, object_type):
@@ -646,14 +655,12 @@ class Context:
     @t.overload
     def lookup_default(
         self, name: str, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]:
-        ...
+    ) -> t.Optional[t.Any]: ...
 
     @t.overload
     def lookup_default(
         self, name: str, call: "te.Literal[False]" = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]:
-        ...
+    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
 
     def lookup_default(self, name: str, call: bool = True) -> t.Optional[t.Any]:
         """Get the default for a parameter from :attr:`default_map`.
@@ -713,24 +720,22 @@ class Context:
 
     @t.overload
     def invoke(
-        __self,  # noqa: B902
+        __self,
         __callback: "t.Callable[..., V]",
         *args: t.Any,
         **kwargs: t.Any,
-    ) -> V:
-        ...
+    ) -> V: ...
 
     @t.overload
     def invoke(
-        __self,  # noqa: B902
+        __self,
         __callback: "Command",
         *args: t.Any,
         **kwargs: t.Any,
-    ) -> t.Any:
-        ...
+    ) -> t.Any: ...
 
     def invoke(
-        __self,  # noqa: B902
+        __self,
         __callback: t.Union["Command", "t.Callable[..., V]"],
         *args: t.Any,
         **kwargs: t.Any,
@@ -782,9 +787,7 @@ class Context:
             with ctx:
                 return __callback(*args, **kwargs)
 
-    def forward(
-        __self, __cmd: "Command", *args: t.Any, **kwargs: t.Any  # noqa: B902
-    ) -> 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.
@@ -936,7 +939,10 @@ class BaseCommand:
                 extra[key] = value
 
         ctx = self.context_class(
-            self, info_name=info_name, parent=parent, **extra  # type: ignore
+            self,  # type: ignore[arg-type]
+            info_name=info_name,
+            parent=parent,
+            **extra,
         )
 
         with ctx.scope(cleanup=False):
@@ -971,7 +977,7 @@ class BaseCommand:
         """
         from click.shell_completion import CompletionItem
 
-        results: t.List["CompletionItem"] = []
+        results: t.List[CompletionItem] = []
 
         while ctx.parent is not None:
             ctx = ctx.parent
@@ -993,8 +999,7 @@ class BaseCommand:
         complete_var: t.Optional[str] = None,
         standalone_mode: "te.Literal[True]" = True,
         **extra: t.Any,
-    ) -> "te.NoReturn":
-        ...
+    ) -> "te.NoReturn": ...
 
     @t.overload
     def main(
@@ -1004,8 +1009,7 @@ class BaseCommand:
         complete_var: t.Optional[str] = None,
         standalone_mode: bool = ...,
         **extra: t.Any,
-    ) -> t.Any:
-        ...
+    ) -> t.Any: ...
 
     def main(
         self,
@@ -1221,12 +1225,13 @@ class Command(BaseCommand):
         #: 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.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
@@ -1289,25 +1294,29 @@ class Command(BaseCommand):
         return list(all_names)
 
     def get_help_option(self, ctx: Context) -> t.Optional["Option"]:
-        """Returns the help option object."""
+        """Returns the help option object.
+
+        Unless ``add_help_option`` is ``False``.
+
+        .. versionchanged:: 8.1.8
+            The help option is now cached to avoid creating it multiple times.
+        """
         help_options = self.get_help_option_names(ctx)
 
         if not help_options or not self.add_help_option:
             return None
 
-        def show_help(ctx: Context, param: "Parameter", value: str) -> None:
-            if value and not ctx.resilient_parsing:
-                echo(ctx.get_help(), color=ctx.color)
-                ctx.exit()
+        # 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
 
-        return Option(
-            help_options,
-            is_flag=True,
-            is_eager=True,
-            expose_value=False,
-            callback=show_help,
-            help=_("Show this message and exit."),
-        )
+            self._help_option = HelpOption(help_options)
+
+        return self._help_option
 
     def make_parser(self, ctx: Context) -> OptionParser:
         """Creates the underlying option parser for this command."""
@@ -1444,7 +1453,7 @@ class Command(BaseCommand):
         """
         from click.shell_completion import CompletionItem
 
-        results: t.List["CompletionItem"] = []
+        results: t.List[CompletionItem] = []
 
         if incomplete and not incomplete[0].isalnum():
             for param in self.get_params(ctx):
@@ -1604,7 +1613,7 @@ class MultiCommand(Command):
                 return f(inner, *args, **kwargs)
 
             self._result_callback = rv = update_wrapper(t.cast(F, function), f)
-            return rv
+            return rv  # type: ignore[return-value]
 
         return decorator
 
@@ -1843,14 +1852,12 @@ class Group(MultiCommand):
         self.commands[name] = cmd
 
     @t.overload
-    def command(self, __func: t.Callable[..., t.Any]) -> Command:
-        ...
+    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]:
-        ...
+    ) -> t.Callable[[t.Callable[..., t.Any]], Command]: ...
 
     def command(
         self, *args: t.Any, **kwargs: t.Any
@@ -1894,14 +1901,12 @@ class Group(MultiCommand):
         return decorator
 
     @t.overload
-    def group(self, __func: t.Callable[..., t.Any]) -> "Group":
-        ...
+    def group(self, __func: t.Callable[..., t.Any]) -> "Group": ...
 
     @t.overload
     def group(
         self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Callable[[t.Callable[..., t.Any]], "Group"]:
-        ...
+    ) -> t.Callable[[t.Callable[..., t.Any]], "Group"]: ...
 
     def group(
         self, *args: t.Any, **kwargs: t.Any
@@ -2227,14 +2232,12 @@ class Parameter:
     @t.overload
     def get_default(
         self, ctx: Context, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]:
-        ...
+    ) -> t.Optional[t.Any]: ...
 
     @t.overload
     def get_default(
         self, ctx: Context, call: bool = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]:
-        ...
+    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
 
     def get_default(
         self, ctx: Context, call: bool = True
@@ -2681,7 +2684,9 @@ class Option(Parameter):
         if name is None:
             if not expose_value:
                 return None, opts, secondary_opts
-            raise TypeError("Could not determine name for option")
+            raise TypeError(
+                f"Could not determine name for option with declarations {decls!r}"
+            )
 
         if not opts and not secondary_opts:
             raise TypeError(
@@ -2810,10 +2815,12 @@ class Option(Parameter):
                 # For boolean flags that have distinct True/False opts,
                 # use the opt without prefix instead of the value.
                 default_string = split_opt(
-                    (self.opts if self.default else self.secondary_opts)[0]
+                    (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:
                 default_string = ""
+            elif default_value == "":
+                default_string = '""'
             else:
                 default_string = str(default_value)
 
@@ -2842,14 +2849,12 @@ class Option(Parameter):
     @t.overload
     def get_default(
         self, ctx: Context, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]:
-        ...
+    ) -> t.Optional[t.Any]: ...
 
     @t.overload
     def get_default(
         self, ctx: Context, call: bool = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]:
-        ...
+    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
 
     def get_default(
         self, ctx: Context, call: bool = True
@@ -3021,7 +3026,7 @@ class Argument(Parameter):
         if not decls:
             if not expose_value:
                 return None, [], []
-            raise TypeError("Could not determine name for argument")
+            raise TypeError("Argument is marked as exposed, but does not have a name.")
         if len(decls) == 1:
             name = arg = decls[0]
             name = name.replace("-", "_").lower()
diff --git a/libs/click/decorators.py b/libs/click/decorators.py
index d9bba9502..bcf8906e7 100644
--- a/libs/click/decorators.py
+++ b/libs/click/decorators.py
@@ -93,7 +93,7 @@ def make_pass_decorator(
 
         return update_wrapper(new_func, f)
 
-    return decorator  # type: ignore[return-value]
+    return decorator
 
 
 def pass_meta_key(
@@ -126,7 +126,7 @@ def pass_meta_key(
         f"Decorator that passes {doc_description} as the first argument"
         " to the decorated function."
     )
-    return decorator  # type: ignore[return-value]
+    return decorator
 
 
 CmdType = t.TypeVar("CmdType", bound=Command)
@@ -134,8 +134,7 @@ CmdType = t.TypeVar("CmdType", bound=Command)
 
 # variant: no call, directly as decorator for a function.
 @t.overload
-def command(name: _AnyCallable) -> Command:
-    ...
+def command(name: _AnyCallable) -> Command: ...
 
 
 # variant: with positional name and with positional or keyword cls argument:
@@ -145,8 +144,7 @@ def command(
     name: t.Optional[str],
     cls: t.Type[CmdType],
     **attrs: t.Any,
-) -> t.Callable[[_AnyCallable], CmdType]:
-    ...
+) -> t.Callable[[_AnyCallable], CmdType]: ...
 
 
 # variant: name omitted, cls _must_ be a keyword argument, @command(cls=CommandCls, ...)
@@ -156,16 +154,14 @@ def command(
     *,
     cls: t.Type[CmdType],
     **attrs: t.Any,
-) -> t.Callable[[_AnyCallable], CmdType]:
-    ...
+) -> t.Callable[[_AnyCallable], CmdType]: ...
 
 
 # variant: with optional string name, no cls argument provided.
 @t.overload
 def command(
     name: t.Optional[str] = ..., cls: None = None, **attrs: t.Any
-) -> t.Callable[[_AnyCallable], Command]:
-    ...
+) -> t.Callable[[_AnyCallable], Command]: ...
 
 
 def command(
@@ -255,8 +251,7 @@ GrpType = t.TypeVar("GrpType", bound=Group)
 
 # variant: no call, directly as decorator for a function.
 @t.overload
-def group(name: _AnyCallable) -> Group:
-    ...
+def group(name: _AnyCallable) -> Group: ...
 
 
 # variant: with positional name and with positional or keyword cls argument:
@@ -266,8 +261,7 @@ def group(
     name: t.Optional[str],
     cls: t.Type[GrpType],
     **attrs: t.Any,
-) -> t.Callable[[_AnyCallable], GrpType]:
-    ...
+) -> t.Callable[[_AnyCallable], GrpType]: ...
 
 
 # variant: name omitted, cls _must_ be a keyword argument, @group(cmd=GroupCls, ...)
@@ -277,16 +271,14 @@ def group(
     *,
     cls: t.Type[GrpType],
     **attrs: t.Any,
-) -> t.Callable[[_AnyCallable], GrpType]:
-    ...
+) -> t.Callable[[_AnyCallable], GrpType]: ...
 
 
 # variant: with optional string name, no cls argument provided.
 @t.overload
 def group(
     name: t.Optional[str] = ..., cls: None = None, **attrs: t.Any
-) -> t.Callable[[_AnyCallable], Group]:
-    ...
+) -> t.Callable[[_AnyCallable], Group]: ...
 
 
 def group(
@@ -495,7 +487,7 @@ def version_option(
             metadata: t.Optional[types.ModuleType]
 
             try:
-                from importlib import metadata  # type: ignore
+                from importlib import metadata
             except ImportError:
                 # Python < 3.8
                 import importlib_metadata as metadata  # type: ignore
@@ -530,32 +522,41 @@ def version_option(
     return option(*param_decls, **kwargs)
 
 
-def help_option(*param_decls: str, **kwargs: t.Any) -> t.Callable[[FC], FC]:
-    """Add a ``--help`` option which immediately prints the help page
+class HelpOption(Option):
+    """Pre-configured ``--help`` option which immediately prints the help page
     and exits the program.
+    """
 
-    This is usually unnecessary, as the ``--help`` option is added to
-    each command automatically unless ``add_help_option=False`` is
-    passed.
+    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)
+
+    @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()
+
+
+def help_option(*param_decls: str, **kwargs: t.Any) -> t.Callable[[FC], FC]:
+    """Decorator for the pre-configured ``--help`` option defined above.
 
     :param param_decls: One or more option names. Defaults to the single
         value ``"--help"``.
     :param kwargs: Extra arguments are passed to :func:`option`.
     """
-
-    def callback(ctx: Context, param: Parameter, value: bool) -> None:
-        if not value or ctx.resilient_parsing:
-            return
-
-        echo(ctx.get_help(), color=ctx.color)
-        ctx.exit()
-
-    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["callback"] = callback
+    kwargs.setdefault("cls", HelpOption)
     return option(*param_decls, **kwargs)
diff --git a/libs/click/exceptions.py b/libs/click/exceptions.py
index fe68a3613..0b8315166 100644
--- a/libs/click/exceptions.py
+++ b/libs/click/exceptions.py
@@ -3,6 +3,7 @@ from gettext import gettext as _
 from gettext import ngettext
 
 from ._compat import get_text_stderr
+from .globals import resolve_color_default
 from .utils import echo
 from .utils import format_filename
 
@@ -13,7 +14,7 @@ if t.TYPE_CHECKING:
 
 
 def _join_param_hints(
-    param_hint: t.Optional[t.Union[t.Sequence[str], str]]
+    param_hint: t.Optional[t.Union[t.Sequence[str], str]],
 ) -> t.Optional[str]:
     if param_hint is not None and not isinstance(param_hint, str):
         return " / ".join(repr(x) for x in param_hint)
@@ -29,6 +30,9 @@ class ClickException(Exception):
 
     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.message = message
 
     def format_message(self) -> str:
@@ -41,7 +45,11 @@ class ClickException(Exception):
         if file is None:
             file = get_text_stderr()
 
-        echo(_("Error: {message}").format(message=self.format_message()), file=file)
+        echo(
+            _("Error: {message}").format(message=self.format_message()),
+            file=file,
+            color=self.show_color,
+        )
 
 
 class UsageError(ClickException):
@@ -58,7 +66,7 @@ class UsageError(ClickException):
     def __init__(self, message: str, ctx: t.Optional["Context"] = None) -> None:
         super().__init__(message)
         self.ctx = ctx
-        self.cmd: t.Optional["Command"] = self.ctx.command if self.ctx else None
+        self.cmd: t.Optional[Command] = self.ctx.command if self.ctx else None
 
     def show(self, file: t.Optional[t.IO[t.Any]] = None) -> None:
         if file is None:
diff --git a/libs/click/globals.py b/libs/click/globals.py
index 480058f10..191e712db 100644
--- a/libs/click/globals.py
+++ b/libs/click/globals.py
@@ -3,19 +3,18 @@ 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: "te.Literal[False]" = False) -> "Context": ...
 
 
 @t.overload
-def get_current_context(silent: bool = ...) -> t.Optional["Context"]:
-    ...
+def get_current_context(silent: bool = ...) -> t.Optional["Context"]: ...
 
 
 def get_current_context(silent: bool = False) -> t.Optional["Context"]:
diff --git a/libs/click/parser.py b/libs/click/parser.py
index 5fa7adfac..600b8436d 100644
--- a/libs/click/parser.py
+++ b/libs/click/parser.py
@@ -17,6 +17,7 @@ by the Python Software Foundation. This is limited to code in parser.py.
 Copyright 2001-2006 Gregory P. Ward. All rights reserved.
 Copyright 2002-2006 Python Software Foundation. All rights reserved.
 """
+
 # This code uses parts of optparse written by Gregory P. Ward and
 # maintained by the Python Software Foundation.
 # Copyright 2001-2006 Gregory P. Ward
@@ -33,6 +34,7 @@ from .exceptions import UsageError
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .core import Argument as CoreArgument
     from .core import Context
     from .core import Option as CoreOption
@@ -247,7 +249,7 @@ class ParsingState:
         self.opts: t.Dict[str, t.Any] = {}
         self.largs: t.List[str] = []
         self.rargs = rargs
-        self.order: t.List["CoreParameter"] = []
+        self.order: t.List[CoreParameter] = []
 
 
 class OptionParser:
diff --git a/libs/click/shell_completion.py b/libs/click/shell_completion.py
index dc9e00b9b..07d0f09ba 100644
--- a/libs/click/shell_completion.py
+++ b/libs/click/shell_completion.py
@@ -303,12 +303,19 @@ class BashComplete(ShellComplete):
 
     @staticmethod
     def _check_version() -> None:
+        import shutil
         import subprocess
 
-        output = subprocess.run(
-            ["bash", "-c", 'echo "${BASH_VERSION}"'], stdout=subprocess.PIPE
-        )
-        match = re.search(r"^(\d+)\.(\d+)\.\d+", output.stdout.decode())
+        bash_exe = shutil.which("bash")
+
+        if bash_exe is None:
+            match = None
+        else:
+            output = subprocess.run(
+                [bash_exe, "--norc", "-c", 'echo "${BASH_VERSION}"'],
+                stdout=subprocess.PIPE,
+            )
+            match = re.search(r"^(\d+)\.(\d+)\.\d+", output.stdout.decode())
 
         if match is not None:
             major, minor = match.groups()
diff --git a/libs/click/termui.py b/libs/click/termui.py
index db7a4b286..c084f1965 100644
--- a/libs/click/termui.py
+++ b/libs/click/termui.py
@@ -173,7 +173,7 @@ def prompt(
             if hide_input:
                 echo(_("Error: The value you entered was invalid."), err=err)
             else:
-                echo(_("Error: {e.message}").format(e=e), err=err)  # noqa: B306
+                echo(_("Error: {e.message}").format(e=e), err=err)
             continue
         if not confirmation_prompt:
             return result
diff --git a/libs/click/testing.py b/libs/click/testing.py
index e0df0d2a6..772b2159c 100644
--- a/libs/click/testing.py
+++ b/libs/click/testing.py
@@ -8,6 +8,7 @@ import tempfile
 import typing as t
 from types import TracebackType
 
+from . import _compat
 from . import formatting
 from . import termui
 from . import utils
@@ -311,10 +312,12 @@ class CliRunner:
         old_hidden_prompt_func = termui.hidden_prompt_func
         old__getchar_func = termui._getchar
         old_should_strip_ansi = utils.should_strip_ansi  # type: ignore
+        old__compat_should_strip_ansi = _compat.should_strip_ansi
         termui.visible_prompt_func = visible_input
         termui.hidden_prompt_func = hidden_input
         termui._getchar = _getchar
         utils.should_strip_ansi = should_strip_ansi  # type: ignore
+        _compat.should_strip_ansi = should_strip_ansi
 
         old_env = {}
         try:
@@ -344,6 +347,7 @@ class CliRunner:
             termui.hidden_prompt_func = old_hidden_prompt_func
             termui._getchar = old__getchar_func
             utils.should_strip_ansi = old_should_strip_ansi  # type: ignore
+            _compat.should_strip_ansi = old__compat_should_strip_ansi
             formatting.FORCED_WIDTH = old_forced_width
 
     def invoke(
@@ -475,5 +479,5 @@ class CliRunner:
             if temp_dir is None:
                 try:
                     shutil.rmtree(dt)
-                except OSError:  # noqa: B014
+                except OSError:
                     pass
diff --git a/libs/click/types.py b/libs/click/types.py
index 2b1d1797f..a70fd58ce 100644
--- a/libs/click/types.py
+++ b/libs/click/types.py
@@ -15,6 +15,7 @@ from .utils import safecall
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .core import Context
     from .core import Parameter
     from .shell_completion import CompletionItem
@@ -658,12 +659,15 @@ class File(ParamType):
     will not be held open until first IO. lazy is mainly useful when opening
     for writing to avoid creating the file until it is needed.
 
-    Starting with Click 2.0, files can also be opened atomically in which
-    case all writes go into a separate file in the same folder and upon
-    completion the file will be moved over to the original location.  This
-    is useful if a file regularly read by other users is modified.
+    Files can also be opened atomically in which case all writes go into a
+    separate file in the same folder and upon completion the file will
+    be moved over to the original location.  This is useful if a file
+    regularly read by other users is modified.
 
     See :ref:`file-args` for more information.
+
+    .. versionchanged:: 2.0
+        Added the ``atomic`` parameter.
     """
 
     name = "filename"
@@ -737,7 +741,7 @@ class File(ParamType):
                     ctx.call_on_close(safecall(f.flush))
 
             return f
-        except OSError as e:  # noqa: B014
+        except OSError as e:
             self.fail(f"'{format_filename(value)}': {e.strerror}", param, ctx)
 
     def shell_complete(
@@ -891,7 +895,7 @@ class Path(ParamType):
                 )
             if not self.dir_okay and stat.S_ISDIR(st.st_mode):
                 self.fail(
-                    _("{name} '{filename}' is a directory.").format(
+                    _("{name} {filename!r} is a directory.").format(
                         name=self.name.title(), filename=format_filename(value)
                     ),
                     param,
diff --git a/libs/click/utils.py b/libs/click/utils.py
index d536434f0..836c6f21a 100644
--- a/libs/click/utils.py
+++ b/libs/click/utils.py
@@ -156,7 +156,7 @@ class LazyFile:
             rv, self.should_close = open_stream(
                 self.name, self.mode, self.encoding, self.errors, atomic=self.atomic
             )
-        except OSError as e:  # noqa: E402
+        except OSError as e:
             from .exceptions import FileError
 
             raise FileError(self.name, hint=e.strerror) from e
@@ -311,7 +311,7 @@ def echo(
             out = strip_ansi(out)
         elif WIN:
             if auto_wrap_for_ansi is not None:
-                file = auto_wrap_for_ansi(file)  # type: ignore
+                file = auto_wrap_for_ansi(file, color)  # type: ignore
             elif not color:
                 out = strip_ansi(out)
 
@@ -353,7 +353,7 @@ def get_text_stream(
 
 
 def open_file(
-    filename: str,
+    filename: t.Union[str, "os.PathLike[str]"],
     mode: str = "r",
     encoding: t.Optional[str] = None,
     errors: t.Optional[str] = "strict",
@@ -374,7 +374,7 @@ def open_file(
         with open_file(filename) as f:
             ...
 
-    :param filename: The name of the file to open, or ``'-'`` for
+    :param filename: The name or Path of the file to open, or ``'-'`` for
         ``stdin``/``stdout``.
     :param mode: The mode in which to open the file.
     :param encoding: The encoding to decode or encode a file opened in
@@ -410,7 +410,7 @@ def format_filename(
     with the replacement character ``�``.
 
     Invalid bytes or surrogate escapes will raise an error when written to a
-    stream with ``errors="strict". This will typically happen with ``stdout``
+    stream with ``errors="strict"``. This will typically happen with ``stdout``
     when the locale is something like ``en_GB.UTF-8``.
 
     Many scenarios *are* safe to write surrogates though, due to PEP 538 and
diff --git a/libs/colorama-0.4.6.dist-info/METADATA b/libs/colorama-0.4.6.dist-info/METADATA
index 1578fb858..da6978d09 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.1
+Metadata-Version: 2.3
 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 6322d5289..609081b0d 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=ubxV5cANysw4jk90b-M6Lce_srsXfiORXZbYR5TcZpY,17191
+colorama-0.4.6.dist-info/METADATA,sha256=xqjWR7jNwuay0CWKzleP1SyyTj78i_e2mdgXlnqrJcA,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=ccEkY-EGGllEs7ySpwBlD8G4u70wR77CNej8Q6tzIqA,105
+colorama-0.4.6.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,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 b57fd92ff..24a7087ee 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.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/dateutil/__init__.py b/libs/dateutil/__init__.py
index 0defb82e2..a2c19c06f 100644
--- a/libs/dateutil/__init__.py
+++ b/libs/dateutil/__init__.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import sys
+
 try:
     from ._version import version as __version__
 except ImportError:
@@ -6,3 +8,17 @@ except ImportError:
 
 __all__ = ['easter', 'parser', 'relativedelta', 'rrule', 'tz',
            'utils', 'zoneinfo']
+
+def __getattr__(name):
+    import importlib
+
+    if name in __all__:
+        return importlib.import_module("." + name, __name__)
+    raise AttributeError(
+        "module {!r} has not attribute {!r}".format(__name__, name)
+    )
+
+
+def __dir__():
+    # __dir__ should include all the lazy-importable modules as well.
+    return [x for x in globals() if x not in sys.modules] + __all__
diff --git a/libs/dateutil/_version.py b/libs/dateutil/_version.py
index f6e010501..a229152e8 100644
--- a/libs/dateutil/_version.py
+++ b/libs/dateutil/_version.py
@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.8.2'
-__version_tuple__ = version_tuple = (2, 8, 2)
+__version__ = version = '2.9.0'
+__version_tuple__ = version_tuple = (2, 9, 0)
diff --git a/libs/dateutil/parser/isoparser.py b/libs/dateutil/parser/isoparser.py
index 5d7bee380..7060087df 100644
--- a/libs/dateutil/parser/isoparser.py
+++ b/libs/dateutil/parser/isoparser.py
@@ -72,7 +72,7 @@ class isoparser(object):
         Common:
 
         - ``YYYY``
-        - ``YYYY-MM`` or ``YYYYMM``
+        - ``YYYY-MM``
         - ``YYYY-MM-DD`` or ``YYYYMMDD``
 
         Uncommon:
diff --git a/libs/dateutil/relativedelta.py b/libs/dateutil/relativedelta.py
index a9e85f7e6..cd323a549 100644
--- a/libs/dateutil/relativedelta.py
+++ b/libs/dateutil/relativedelta.py
@@ -48,7 +48,7 @@ class relativedelta(object):
             the corresponding arithmetic operation on the original datetime value
             with the information in the relativedelta.
 
-        weekday: 
+        weekday:
             One of the weekday instances (MO, TU, etc) available in the
             relativedelta module. These instances may receive a parameter N,
             specifying the Nth weekday, which could be positive or negative
diff --git a/libs/dateutil/rrule.py b/libs/dateutil/rrule.py
index b3203393c..571a0d2bc 100644
--- a/libs/dateutil/rrule.py
+++ b/libs/dateutil/rrule.py
@@ -182,7 +182,7 @@ class rrulebase(object):
     # __len__() introduces a large performance penalty.
     def count(self):
         """ Returns the number of recurrences in this set. It will have go
-            trough the whole recurrence, if this hasn't been done before. """
+            through the whole recurrence, if this hasn't been done before. """
         if self._len is None:
             for x in self:
                 pass
diff --git a/libs/dateutil/tz/tz.py b/libs/dateutil/tz/tz.py
index c67f56d46..617591446 100644
--- a/libs/dateutil/tz/tz.py
+++ b/libs/dateutil/tz/tz.py
@@ -34,7 +34,7 @@ except ImportError:
 from warnings import warn
 
 ZERO = datetime.timedelta(0)
-EPOCH = datetime.datetime.utcfromtimestamp(0)
+EPOCH = datetime.datetime(1970, 1, 1, 0, 0)
 EPOCHORDINAL = EPOCH.toordinal()
 
 
diff --git a/libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz b/libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
index 524c48e12..c2c4c1a04 100644
Binary files a/libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz and b/libs/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz differ
diff --git a/libs/deep_translator-1.11.4.dist-info/METADATA b/libs/deep_translator-1.11.4.dist-info/METADATA
index 4515e6413..68c3e45c1 100644
--- a/libs/deep_translator-1.11.4.dist-info/METADATA
+++ b/libs/deep_translator-1.11.4.dist-info/METADATA
@@ -23,6 +23,7 @@ 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 :: Communications
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development
diff --git a/libs/deep_translator-1.11.4.dist-info/RECORD b/libs/deep_translator-1.11.4.dist-info/RECORD
index 0039c60b2..e75e45706 100644
--- a/libs/deep_translator-1.11.4.dist-info/RECORD
+++ b/libs/deep_translator-1.11.4.dist-info/RECORD
@@ -2,10 +2,10 @@
 ../../bin/dt,sha256=U3_p8MJCCWdWmVZnfGHdUuFlTz1aG4rLmb48o7_T49Y,246
 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=eqaO4nvbDgoE7PcUmKxCx02wC7zfOS_Y9BQIa7iLFjg,30471
+deep_translator-1.11.4.dist-info/METADATA,sha256=ef-qfaz9mwg_50OH2ZvZGl5ONHip_EgiVMNFh1Uyfx8,30522
 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=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+deep_translator-1.11.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
 deep_translator-1.11.4.dist-info/entry_points.txt,sha256=qQAStn9mriwaW7GNz-W_55eFUrym6XwBHSyf3oXv_lQ,98
 deep_translator/__init__.py,sha256=3zy0Ux3TVne-Al8QdCr_mtDtGHQiQCwpvxk6qsnPmi0,1238
 deep_translator/__main__.py,sha256=MkNnzbdqvk5qx_rgErLMjhe1Gp3Rsvl8At66JnQ8CZk,161
diff --git a/libs/deep_translator-1.11.4.dist-info/WHEEL b/libs/deep_translator-1.11.4.dist-info/WHEEL
index d73ccaae8..8b9b3a1bf 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.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/dnspython-2.6.1.dist-info/METADATA b/libs/dnspython-2.6.1.dist-info/METADATA
index 129184e39..596853b3a 100644
--- a/libs/dnspython-2.6.1.dist-info/METADATA
+++ b/libs/dnspython-2.6.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: dnspython
 Version: 2.6.1
 Summary: DNS toolkit
diff --git a/libs/dnspython-2.6.1.dist-info/RECORD b/libs/dnspython-2.6.1.dist-info/RECORD
index eae42c5b0..00515e496 100644
--- a/libs/dnspython-2.6.1.dist-info/RECORD
+++ b/libs/dnspython-2.6.1.dist-info/RECORD
@@ -142,8 +142,8 @@ 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=2GJFv-NqkwIytog5VQe0wPtZKoS016uyYfG76lqftto,5808
+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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+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
index 5998f3aab..cdd68a497 100644
--- a/libs/dnspython-2.6.1.dist-info/WHEEL
+++ b/libs/dnspython-2.6.1.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/dogpile.cache-1.3.2.dist-info/WHEEL b/libs/dogpile.cache-1.3.2.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/dogpile.cache-1.3.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/dogpile.cache-1.3.2.dist-info/INSTALLER b/libs/dogpile.cache-1.3.3.dist-info/INSTALLER
similarity index 100%
rename from libs/dogpile.cache-1.3.2.dist-info/INSTALLER
rename to libs/dogpile.cache-1.3.3.dist-info/INSTALLER
diff --git a/libs/dogpile.cache-1.3.2.dist-info/LICENSE b/libs/dogpile.cache-1.3.3.dist-info/LICENSE
similarity index 100%
rename from libs/dogpile.cache-1.3.2.dist-info/LICENSE
rename to libs/dogpile.cache-1.3.3.dist-info/LICENSE
diff --git a/libs/dogpile.cache-1.3.2.dist-info/METADATA b/libs/dogpile.cache-1.3.3.dist-info/METADATA
similarity index 99%
rename from libs/dogpile.cache-1.3.2.dist-info/METADATA
rename to libs/dogpile.cache-1.3.3.dist-info/METADATA
index 5aea9da52..e466816f2 100644
--- a/libs/dogpile.cache-1.3.2.dist-info/METADATA
+++ b/libs/dogpile.cache-1.3.3.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dogpile.cache
-Version: 1.3.2
+Version: 1.3.3
 Summary: A caching front-end based on the Dogpile lock.
 Author-email: Mike Bayer <mike_mp@zzzcomputing.com>
 License: MIT
diff --git a/libs/dogpile.cache-1.3.2.dist-info/RECORD b/libs/dogpile.cache-1.3.3.dist-info/RECORD
similarity index 70%
rename from libs/dogpile.cache-1.3.2.dist-info/RECORD
rename to libs/dogpile.cache-1.3.3.dist-info/RECORD
index 473894070..e287ce20e 100644
--- a/libs/dogpile.cache-1.3.2.dist-info/RECORD
+++ b/libs/dogpile.cache-1.3.3.dist-info/RECORD
@@ -1,17 +1,17 @@
-dogpile.cache-1.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-dogpile.cache-1.3.2.dist-info/LICENSE,sha256=6mI3atkmgsiipPJp3i526pyP_NVuNSKAGA7jbB1dAyo,1059
-dogpile.cache-1.3.2.dist-info/METADATA,sha256=MAITj98iAYY1j6LaAIQTuigPu74tsEe5ayETsbLUPlg,5184
-dogpile.cache-1.3.2.dist-info/RECORD,,
-dogpile.cache-1.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dogpile.cache-1.3.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dogpile.cache-1.3.2.dist-info/entry_points.txt,sha256=9_62qgwpYf1Kp06LazdG2FNgaJQiUTUGBn-Fl0URfq4,73
-dogpile.cache-1.3.2.dist-info/top_level.txt,sha256=XGYQHt1p8HLN4sRU6sGpQBA2GMTZQbPwHX5A1PUENgk,8
-dogpile/__init__.py,sha256=YmBy0wZDJOrEnW9iRt4frDuPUhJxlDp6WSZC2l7g-7s,106
+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=Kaz1ktKZEDEa44QkIbnmsFGe5RKBDTpuF_nUQguC3AE,17864
+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=jOXU-lIGIS3M59Va8n-yhwr5v1w4XZjnv2X_IqDx0t8,20887
+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
@@ -19,7 +19,7 @@ dogpile/cache/exception.py,sha256=8XDELddxVqj0fthUYpPaX85QfEQqdsP23e_7bQFC0Us,60
 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=pSYinh9s9K8u9qaxyvYYVKtC98I1oyBMtVUF1lZD6wI,69882
+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
diff --git a/libs/dogpile.cache-1.3.2.dist-info/REQUESTED b/libs/dogpile.cache-1.3.3.dist-info/REQUESTED
similarity index 100%
rename from libs/dogpile.cache-1.3.2.dist-info/REQUESTED
rename to libs/dogpile.cache-1.3.3.dist-info/REQUESTED
diff --git a/libs/dogpile.cache-1.3.3.dist-info/WHEEL b/libs/dogpile.cache-1.3.3.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/dogpile.cache-1.3.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/dogpile.cache-1.3.2.dist-info/entry_points.txt b/libs/dogpile.cache-1.3.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/dogpile.cache-1.3.2.dist-info/entry_points.txt
rename to libs/dogpile.cache-1.3.3.dist-info/entry_points.txt
diff --git a/libs/dogpile.cache-1.3.2.dist-info/top_level.txt b/libs/dogpile.cache-1.3.3.dist-info/top_level.txt
similarity index 100%
rename from libs/dogpile.cache-1.3.2.dist-info/top_level.txt
rename to libs/dogpile.cache-1.3.3.dist-info/top_level.txt
diff --git a/libs/dogpile/__init__.py b/libs/dogpile/__init__.py
index 3b095b02a..4168f8935 100644
--- a/libs/dogpile/__init__.py
+++ b/libs/dogpile/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.3.2"
+__version__ = "1.3.3"
 
 from .lock import Lock  # noqa
 from .lock import NeedRegenerationException  # noqa
diff --git a/libs/dogpile/cache/api.py b/libs/dogpile/cache/api.py
index 394a09340..6fbe84279 100644
--- a/libs/dogpile/cache/api.py
+++ b/libs/dogpile/cache/api.py
@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import abc
+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
@@ -15,7 +17,7 @@ from typing import Union
 from ..util.typing import Self
 
 
-class NoValue:
+class NoValue(enum.Enum):
     """Describe a missing cache value.
 
     The :data:`.NO_VALUE` constant should be used.
@@ -33,12 +35,16 @@ class NoValue:
         """
         return "<dogpile.cache.api.NoValue object>"
 
-    def __bool__(self):  # pragma NO COVERAGE
+    def __bool__(self) -> Literal[False]:  # pragma NO COVERAGE
         return False
 
+    NO_VALUE = "NoValue"
 
-NO_VALUE = NoValue()
-"""Value returned from ``get()`` that describes
+
+NoValueType = Literal[NoValue.NO_VALUE]
+
+NO_VALUE = NoValue.NO_VALUE
+"""Value returned from :meth:`.CacheRegion.get` that describes
 a  key not present."""
 
 MetaDataType = Mapping[str, Any]
@@ -160,13 +166,13 @@ class CachedValue(NamedTuple):
         return time.time() - self.cached_time
 
 
-CacheReturnType = Union[CachedValue, NoValue]
+CacheReturnType = Union[CachedValue, NoValueType]
 """The non-serialized form of what may be returned from a backend
 get method.
 
 """
 
-SerializedReturnType = Union[bytes, NoValue]
+SerializedReturnType = Union[bytes, NoValueType]
 """the serialized form of what may be returned from a backend get method."""
 
 BackendFormatted = Union[CacheReturnType, SerializedReturnType]
diff --git a/libs/dogpile/cache/backends/memcached.py b/libs/dogpile/cache/backends/memcached.py
index 1bad85664..eee344838 100644
--- a/libs/dogpile/cache/backends/memcached.py
+++ b/libs/dogpile/cache/backends/memcached.py
@@ -95,26 +95,6 @@ class GenericMemcachedBackend(CacheBackend):
 
      .. versionadded:: 0.5.7
 
-    :param memcached_expire_time: integer, when present will
-     be passed as the ``time`` parameter to ``pylibmc.Client.set``.
-     This is used to set the memcached expiry time for a value.
-
-     .. note::
-
-         This parameter is **different** from Dogpile's own
-         ``expiration_time``, which is the number of seconds after
-         which Dogpile will consider the value to be expired.
-         When Dogpile considers a value to be expired,
-         it **continues to use the value** until generation
-         of a new value is complete, when using
-         :meth:`.CacheRegion.get_or_create`.
-         Therefore, if you are setting ``memcached_expire_time``, you'll
-         want to make sure it is greater than ``expiration_time``
-         by at least enough seconds for new values to be generated,
-         else the value won't be available during a regeneration,
-         forcing all threads to wait for a regeneration each time
-         a value expires.
-
     The :class:`.GenericMemachedBackend` uses a ``threading.local()``
     object to store individual client objects per thread,
     as most modern memcached clients do not appear to be inherently
@@ -147,7 +127,6 @@ class GenericMemcachedBackend(CacheBackend):
         self.url = util.to_list(arguments["url"])
         self.distributed_lock = arguments.get("distributed_lock", False)
         self.lock_timeout = arguments.get("lock_timeout", 0)
-        self.memcached_expire_time = arguments.get("memcached_expire_time", 0)
 
     def has_lock_timeout(self):
         return self.lock_timeout != 0
@@ -222,6 +201,29 @@ class GenericMemcachedBackend(CacheBackend):
 class MemcacheArgs(GenericMemcachedBackend):
     """Mixin which provides support for the 'time' argument to set(),
     'min_compress_len' to other methods.
+
+    :param memcached_expire_time: integer, when present will
+     be passed as the ``time`` parameter to the ``set`` method.
+     This is used to set the memcached expiry time for a value.
+
+     .. note::
+
+         This parameter is **different** from Dogpile's own
+         ``expiration_time``, which is the number of seconds after
+         which Dogpile will consider the value to be expired.
+         When Dogpile considers a value to be expired,
+         it **continues to use the value** until generation
+         of a new value is complete, when using
+         :meth:`.CacheRegion.get_or_create`.
+         Therefore, if you are setting ``memcached_expire_time``, you'll
+         want to make sure it is greater than ``expiration_time``
+         by at least enough seconds for new values to be generated,
+         else the value won't be available during a regeneration,
+         forcing all threads to wait for a regeneration each time
+         a value expires.
+
+    :param min_compress_len: Threshold length to kick in auto-compression
+     of the value using the compressor
     """
 
     def __init__(self, arguments):
@@ -408,25 +410,8 @@ class BMemcachedBackend(GenericMemcachedBackend):
         global bmemcached
         import bmemcached
 
-        class RepairBMemcachedAPI(bmemcached.Client):
-            """Repairs BMemcached's non-standard method
-            signatures, which was fixed in BMemcached
-            ef206ed4473fec3b639e.
-
-            """
-
-            def add(self, key, value, timeout=0):
-                try:
-                    return super(RepairBMemcachedAPI, self).add(
-                        key, value, timeout
-                    )
-                except ValueError:
-                    return False
-
-        self.Client = RepairBMemcachedAPI
-
     def _create_client(self):
-        return self.Client(
+        return bmemcached.Client(
             self.url,
             username=self.username,
             password=self.password,
@@ -580,6 +565,28 @@ class PyMemcacheBackend(GenericMemcachedBackend):
 
      .. versionadded:: 1.1.5
 
+    :param memcached_expire_time: integer, when present will
+     be passed as the ``time`` parameter to the ``set`` method.
+     This is used to set the memcached expiry time for a value.
+
+     .. note::
+
+         This parameter is **different** from Dogpile's own
+         ``expiration_time``, which is the number of seconds after
+         which Dogpile will consider the value to be expired.
+         When Dogpile considers a value to be expired,
+         it **continues to use the value** until generation
+         of a new value is complete, when using
+         :meth:`.CacheRegion.get_or_create`.
+         Therefore, if you are setting ``memcached_expire_time``, you'll
+         want to make sure it is greater than ``expiration_time``
+         by at least enough seconds for new values to be generated,
+         else the value won't be available during a regeneration,
+         forcing all threads to wait for a regeneration each time
+         a value expires.
+
+     .. versionadded:: 1.3.3
+
     """  # noqa E501
 
     def __init__(self, arguments):
@@ -611,6 +618,9 @@ class PyMemcacheBackend(GenericMemcachedBackend):
                 "enable_retry_client is not set; retry options "
                 "will be ignored"
             )
+        self.set_arguments = {}
+        if "memcached_expire_time" in arguments:
+            self.set_arguments["expire"] = arguments["memcached_expire_time"]
 
     def _imports(self):
         global pymemcache
diff --git a/libs/dogpile/cache/region.py b/libs/dogpile/cache/region.py
index 4cd14b642..a446e4c9c 100644
--- a/libs/dogpile/cache/region.py
+++ b/libs/dogpile/cache/region.py
@@ -32,6 +32,7 @@ from .api import CantDeserializeException
 from .api import KeyType
 from .api import MetaDataType
 from .api import NO_VALUE
+from .api import NoValueType
 from .api import SerializedReturnType
 from .api import Serializer
 from .api import ValuePayload
@@ -706,19 +707,20 @@ class CacheRegion:
         key: KeyType,
         expiration_time: Optional[float] = None,
         ignore_expiration: bool = False,
-    ) -> CacheReturnType:
+    ) -> Union[ValuePayload, NoValueType]:
         """Return a value from the cache, based on the given key.
 
         If the value is not present, the method returns the token
-        ``NO_VALUE``. ``NO_VALUE`` evaluates to False, but is separate from
-        ``None`` to distinguish between a cached value of ``None``.
+        :data:`.api.NO_VALUE`. :data:`.api.NO_VALUE` evaluates to False, but is
+        separate from ``None`` to distinguish between a cached value of
+        ``None``.
 
         By default, the configured expiration time of the
         :class:`.CacheRegion`, or alternatively the expiration
         time supplied by the ``expiration_time`` argument,
         is tested against the creation time of the retrieved
         value versus the current time (as reported by ``time.time()``).
-        If stale, the cached value is ignored and the ``NO_VALUE``
+        If stale, the cached value is ignored and the :data:`.api.NO_VALUE`
         token is returned.  Passing the flag ``ignore_expiration=True``
         bypasses the expiration time check.
 
@@ -731,7 +733,7 @@ class CacheRegion:
         of the current "invalidation" time as set by
         the :meth:`.invalidate` method.   If a value is present,
         but its creation time is older than the current
-        invalidation time, the ``NO_VALUE`` token is returned.
+        invalidation time, the :data:`.api.NO_VALUE` token is returned.
         Passing the flag ``ignore_expiration=True`` bypasses
         the invalidation time check.
 
@@ -1083,7 +1085,7 @@ class CacheRegion:
                         return creator(*ca[0], **ca[1])
 
                 else:
-                    go = creator
+                    go = creator  # type: ignore
                 return acr(self, orig_key, go, mutex)
 
         else:
diff --git a/libs/dynaconf-3.2.4.dist-info/INSTALLER b/libs/dynaconf-3.2.6.dist-info/INSTALLER
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/INSTALLER
rename to libs/dynaconf-3.2.6.dist-info/INSTALLER
diff --git a/libs/dynaconf-3.2.4.dist-info/LICENSE b/libs/dynaconf-3.2.6.dist-info/LICENSE
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/LICENSE
rename to libs/dynaconf-3.2.6.dist-info/LICENSE
diff --git a/libs/dynaconf-3.2.4.dist-info/METADATA b/libs/dynaconf-3.2.6.dist-info/METADATA
similarity index 97%
rename from libs/dynaconf-3.2.4.dist-info/METADATA
rename to libs/dynaconf-3.2.6.dist-info/METADATA
index 98b2c2408..bf4e9f796 100644
--- a/libs/dynaconf-3.2.4.dist-info/METADATA
+++ b/libs/dynaconf-3.2.6.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dynaconf
-Version: 3.2.4
+Version: 3.2.6
 Summary: The dynamic configurator for your Python Project
 Home-page: https://github.com/dynaconf/dynaconf
 Author: Bruno Rocha
@@ -51,11 +51,6 @@ 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: flake8 ; extra == 'test'
-Requires-Dist: pep8-naming ; extra == 'test'
-Requires-Dist: flake8-debugger ; extra == 'test'
-Requires-Dist: flake8-print ; extra == 'test'
-Requires-Dist: flake8-todo ; extra == 'test'
 Requires-Dist: radon ; extra == 'test'
 Requires-Dist: flask >=0.12 ; extra == 'test'
 Requires-Dist: django ; extra == 'test'
diff --git a/libs/dynaconf-3.2.4.dist-info/RECORD b/libs/dynaconf-3.2.6.dist-info/RECORD
similarity index 72%
rename from libs/dynaconf-3.2.4.dist-info/RECORD
rename to libs/dynaconf-3.2.6.dist-info/RECORD
index 07e614acb..eb96de575 100644
--- a/libs/dynaconf-3.2.4.dist-info/RECORD
+++ b/libs/dynaconf-3.2.6.dist-info/RECORD
@@ -1,51 +1,51 @@
 ../../bin/dynaconf,sha256=3EDP6hZ2u78FIaQ-Nqua_TvwQyyacEGh8qF8dN1hNfI,234
-dynaconf-3.2.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-dynaconf-3.2.4.dist-info/LICENSE,sha256=VXHf05Hz7uwTdLkQEFy4s7L4cb3mJ6Jc6yvoRPCg65c,1078
-dynaconf-3.2.4.dist-info/METADATA,sha256=86MSjAl4TFTIMXw_vU91bfTizCtJYqk8P5PRIqi3xyI,9308
-dynaconf-3.2.4.dist-info/RECORD,,
-dynaconf-3.2.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dynaconf-3.2.4.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-dynaconf-3.2.4.dist-info/box-LICENSE.txt,sha256=OA9QtZRAYGpaFevuHWrHckHw0fQT4yhurfH56sJYDqw,1076
-dynaconf-3.2.4.dist-info/click-LICENSE.rst,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
-dynaconf-3.2.4.dist-info/entry_points.txt,sha256=olhFwb2rJswbRmjY97fTrkNfqPQhMv1Pxjez4mSxMSg,47
-dynaconf-3.2.4.dist-info/licenses.sh,sha256=9eID6RHwv82Obub4D4G--lIbRZya65Fa9EwgYNWXvFU,769
-dynaconf-3.2.4.dist-info/python-dotenv-LICENSE.txt,sha256=0nIJqz0WJ4Ko-OOHK5s1PEngksmqRnpkUiiDQH2NEDA,4600
-dynaconf-3.2.4.dist-info/ruamel.yaml-LICENSE.txt,sha256=QYxdb3JocDuWY6zvk3rVKcVO47J-9miiolkf4w6hH_8,1121
-dynaconf-3.2.4.dist-info/toml-LICENSE.txt,sha256=QitPoBx3Vs5N5go556B0Zf3Mz4YGxWeUiRYa9C1EGMg,1253
-dynaconf-3.2.4.dist-info/tomli-LICENSE.txt,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072
-dynaconf-3.2.4.dist-info/top_level.txt,sha256=y9G5RO-Ts5h0yOx6qVr8r_TBCSFA8wBxEWcvMZJq66c,9
-dynaconf-3.2.4.dist-info/vendor_versions.txt,sha256=QD2pB7JBhr6oIGaPCXFVhhFfs2uQibsJXBT9cUYlgHQ,100
-dynaconf/VERSION,sha256=2je2KyNPwIw6vhMXSljoDaDRxM_F3PQ3jpMX6B1PXD0,6
-dynaconf/__init__.py,sha256=z05mUwi_mk6UlKL4GgROQ6WyHwxVDCrAMlk2VF_Erm4,1285
-dynaconf/base.py,sha256=_IQT270mZ0qMCEWy_MrG_veNizozG7m96-fHz_bmpQo,51288
-dynaconf/cli.py,sha256=WxILwS9rVnGEsmVDrpsXUAkOCU1iey6evUg7_FTCwvU,26266
+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=gy_7wuth_6Gw_CcF7WO2Xd7mfuRZR6LryNLlBwl3QnA,240
-dynaconf/contrib/django_dynaconf_v2.py,sha256=bWyuWFl0sTpW_43HCXrLNmk6INOigbfFffLWlMijAOc,4699
-dynaconf/contrib/flask_dynaconf.py,sha256=0pLlFGY4ywCkNmCb2SnfjZmCtQc0bHYoivPJnD6s_YE,7566
-dynaconf/default_settings.py,sha256=qokrQ2mrxDKz4m1JcNJv5ihGKQZGN3uJDI9LI62IFi4,9764
-dynaconf/hooking.py,sha256=cUG5XHB7w1mv_Je6rIkH8sp2_KWsxnhNNTz7eh7v45M,8796
-dynaconf/loaders/__init__.py,sha256=RE4NrUrmQW2OZByrHgCiJstGO-ebUrW6KJY3FfYG024,11944
-dynaconf/loaders/base.py,sha256=W-5H0kBa_jdniqgcbE3WGxRSHq5YK702mtWry2Rh6u8,8266
+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=F91FCWjR7J95PiKDqDl9-KmRxQJb73oJFl3WC9nVmfk,1943
-dynaconf/loaders/json_loader.py,sha256=MSb8VWCHyyS6GdTa3c2O3IGyL2rGXrrkVEWKarSOuU4,2407
-dynaconf/loaders/py_loader.py,sha256=nKfspZbbCyCCZYKTypZHvlsafXs_15ugmG8miLTI3C4,5770
+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=9m_oYtlw07Fw8SzdNTtXI3rgZJx0maGPG8ahw-nO5jA,7336
-dynaconf/loaders/yaml_loader.py,sha256=P_FSpxKoYVjBUaqwSzAt4BqrnXykgkNCvclEiaFHQlk,4336
+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=tPIun1kX-F-U16VKA8RWhfgPlJ2FTeSQ74dBbkAnbNM,560
+dynaconf/strategies/filtering.py,sha256=2Ezpg7azrEKWFpaCTWS_KytY_NEviySkuVmBv3WgkXg,851
 dynaconf/test_settings.py,sha256=lVkCYSe2yEmCgM_rtB56NibLn1oWrX_8FPaXIdr4JDU,170
-dynaconf/utils/__init__.py,sha256=AyOawTDPlfP0JYPzzndDmay68ZpOAqDneS8oFUCfhNs,15675
-dynaconf/utils/boxing.py,sha256=0mttwEhnjKyrXZGFSC44Ss57ROF7wSU7nUPSSVV_CR0,3031
+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=Bd7bJd_e9HreQkW8atPegwNMNyVkzPMU-9CDBdz6QhI,9952
-dynaconf/utils/parse_conf.py,sha256=ETsYvLqE4rSTylCxPDL9DorehVRstLWF5uJCHSRCpkI,14058
-dynaconf/validator.py,sha256=77LQa7N3twOvh1qMThZaCHTBDFZFCcRHgOiW-T3-M5M,17795
-dynaconf/validator_conditions.py,sha256=kaYjxraGmhM_vUQODmEN8HxbEhLD1aoHzhYDfbQ3AMw,1526
+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
diff --git a/libs/dynaconf-3.2.4.dist-info/REQUESTED b/libs/dynaconf-3.2.6.dist-info/REQUESTED
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/REQUESTED
rename to libs/dynaconf-3.2.6.dist-info/REQUESTED
diff --git a/libs/dynaconf-3.2.4.dist-info/WHEEL b/libs/dynaconf-3.2.6.dist-info/WHEEL
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/WHEEL
rename to libs/dynaconf-3.2.6.dist-info/WHEEL
diff --git a/libs/dynaconf-3.2.4.dist-info/box-LICENSE.txt b/libs/dynaconf-3.2.6.dist-info/box-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/box-LICENSE.txt
rename to libs/dynaconf-3.2.6.dist-info/box-LICENSE.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/click-LICENSE.rst b/libs/dynaconf-3.2.6.dist-info/click-LICENSE.rst
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/click-LICENSE.rst
rename to libs/dynaconf-3.2.6.dist-info/click-LICENSE.rst
diff --git a/libs/dynaconf-3.2.4.dist-info/entry_points.txt b/libs/dynaconf-3.2.6.dist-info/entry_points.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/entry_points.txt
rename to libs/dynaconf-3.2.6.dist-info/entry_points.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/licenses.sh b/libs/dynaconf-3.2.6.dist-info/licenses.sh
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/licenses.sh
rename to libs/dynaconf-3.2.6.dist-info/licenses.sh
diff --git a/libs/dynaconf-3.2.4.dist-info/python-dotenv-LICENSE.txt b/libs/dynaconf-3.2.6.dist-info/python-dotenv-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/python-dotenv-LICENSE.txt
rename to libs/dynaconf-3.2.6.dist-info/python-dotenv-LICENSE.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/ruamel.yaml-LICENSE.txt b/libs/dynaconf-3.2.6.dist-info/ruamel.yaml-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/ruamel.yaml-LICENSE.txt
rename to libs/dynaconf-3.2.6.dist-info/ruamel.yaml-LICENSE.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/toml-LICENSE.txt b/libs/dynaconf-3.2.6.dist-info/toml-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/toml-LICENSE.txt
rename to libs/dynaconf-3.2.6.dist-info/toml-LICENSE.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/tomli-LICENSE.txt b/libs/dynaconf-3.2.6.dist-info/tomli-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/tomli-LICENSE.txt
rename to libs/dynaconf-3.2.6.dist-info/tomli-LICENSE.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/top_level.txt b/libs/dynaconf-3.2.6.dist-info/top_level.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/top_level.txt
rename to libs/dynaconf-3.2.6.dist-info/top_level.txt
diff --git a/libs/dynaconf-3.2.4.dist-info/vendor_versions.txt b/libs/dynaconf-3.2.6.dist-info/vendor_versions.txt
similarity index 100%
rename from libs/dynaconf-3.2.4.dist-info/vendor_versions.txt
rename to libs/dynaconf-3.2.6.dist-info/vendor_versions.txt
diff --git a/libs/dynaconf/__init__.py b/libs/dynaconf/__init__.py
index a40baf70b..d59d40580 100644
--- a/libs/dynaconf/__init__.py
+++ b/libs/dynaconf/__init__.py
@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from dynaconf.base import LazySettings  # noqa
+from dynaconf.base import LazySettings
 from dynaconf.constants import DEFAULT_SETTINGS_FILES
-from dynaconf.contrib import DjangoDynaconf  # noqa
-from dynaconf.contrib import FlaskDynaconf  # noqa
+from dynaconf.contrib import DjangoDynaconf
+from dynaconf.contrib import FlaskDynaconf
 from dynaconf.utils.inspect import get_history
 from dynaconf.utils.inspect import inspect_settings
-from dynaconf.utils.parse_conf import add_converter  # noqa
-from dynaconf.utils.parse_conf import DynaconfFormatError  # noqa
-from dynaconf.utils.parse_conf import DynaconfParseError  # noqa
-from dynaconf.validator import ValidationError  # noqa
-from dynaconf.validator import Validator  # noqa
+from dynaconf.utils.parse_conf import add_converter
+from dynaconf.utils.parse_conf import DynaconfFormatError
+from dynaconf.utils.parse_conf import DynaconfParseError
+from dynaconf.validator import ValidationError
+from dynaconf.validator import Validator
 
 settings = LazySettings(
     # This global `settings` is deprecated from v3.0.0+
diff --git a/libs/dynaconf/base.py b/libs/dynaconf/base.py
index 8d713a29c..3e57ba6d8 100644
--- a/libs/dynaconf/base.py
+++ b/libs/dynaconf/base.py
@@ -90,13 +90,13 @@ class LazySettings(LazyObject):
         e.g: ROOT_PATH='/' is transformed into `ROOT_PATH_FOR_DYNACONF`
         """
 
-        mispells = {
+        misspells = {
             "settings_files": "settings_file",
             "SETTINGS_FILES": "SETTINGS_FILE",
             "environment": "environments",
             "ENVIRONMENT": "ENVIRONMENTS",
         }
-        for misspell, correct in mispells.items():
+        for misspell, correct in misspells.items():
             if misspell in kwargs:
                 kwargs[correct] = kwargs.pop(misspell)
 
@@ -229,7 +229,7 @@ class Settings:
         self._loaded_py_modules = []
         self._loaded_files = []
         self._deleted = set()
-        self._store = DynaBox(box_settings=self)
+        self._store = kwargs.pop("_store", DynaBox(box_settings=self))
         self._env_cache = {}
         self._loaded_by_loaders: dict[SourceMetadata | str, Any] = {}
         self._loaders = []
@@ -432,6 +432,12 @@ class Settings:
         :param default: In case of not found it will be returned
         :param parent: Is there a pre-loaded parent in a nested data?
         """
+        # if parent is not traverseable raise error
+        if parent and not hasattr(parent, "get"):
+            raise AttributeError(
+                f"cannot lookup {dotted_key!r} from {type(parent).__name__!r}"
+            )
+
         split_key = dotted_key.split(".")
         name, keys = split_key[0], split_key[1:]
         result = self.get(name, default=default, parent=parent, **kwargs)
@@ -918,7 +924,7 @@ class Settings:
         :param key: The key to store. Can be of any type.
         :param value: The raw value to parse and store
         :param loader_identifier: Optional loader name e.g: toml, yaml etc.
-                                  Or isntance of SourceMetadata
+                                  Or instance of SourceMetadata
         :param tomlfy: Bool define if value is parsed by toml (defaults False)
         :param merge: Bool define if existing nested data will be merged.
         :param validate: Bool define if validation will be triggered
@@ -1179,14 +1185,11 @@ class Settings:
             core_loader.load(self, env, silent=silent, key=key)
 
         self.load_includes(env, silent=silent, key=key)
-        self._store._box_config["_bypass_evaluation"] = True
 
         # execute hooks
         execute_module_hooks("post", self, env, silent=silent, key=key)
         execute_instance_hooks(self, "post", self._post_hooks)
 
-        self._store._box_config.pop("_bypass_evaluation", None)
-
     def pre_load(self, env, silent, key):
         """Do we have any file to pre-load before main settings file?"""
         preloads = self.get("PRELOAD_FOR_DYNACONF", [])
@@ -1228,7 +1231,6 @@ class Settings:
         if files:
             already_loaded = set()
             for _filename in files:
-
                 # load_file() will handle validation later
                 with suppress(ValidationError):
                     if py_loader.try_to_load_from_py_module_name(
@@ -1250,14 +1252,10 @@ class Settings:
                     filepath = os.path.join(root_dir, str(_filename))
 
                 paths = [
-                    p
-                    for p in sorted(glob(filepath, root_dir=self._root_path))
-                    if ".local." not in p
+                    p for p in sorted(glob(filepath)) if ".local." not in p
                 ]
                 local_paths = [
-                    p
-                    for p in sorted(glob(filepath, root_dir=self._root_path))
-                    if ".local." in p
+                    p for p in sorted(glob(filepath)) if ".local." in p
                 ]
 
                 # Handle possible *.globs sorted alphanumeric
diff --git a/libs/dynaconf/cli.py b/libs/dynaconf/cli.py
index c0fd48957..108464d44 100644
--- a/libs/dynaconf/cli.py
+++ b/libs/dynaconf/cli.py
@@ -20,6 +20,11 @@ from dynaconf.loaders.py_loader import get_module
 from dynaconf.utils import upperfy
 from dynaconf.utils.files import read_file
 from dynaconf.utils.functional import empty
+from dynaconf.utils.inspect import builtin_dumpers
+from dynaconf.utils.inspect import EnvNotFoundError
+from dynaconf.utils.inspect import inspect_settings
+from dynaconf.utils.inspect import KeyNotFoundError
+from dynaconf.utils.inspect import OutputFormatError
 from dynaconf.utils.parse_conf import parse_conf_data
 from dynaconf.utils.parse_conf import unparse_conf_data
 from dynaconf.validator import ValidationError
@@ -28,9 +33,8 @@ from dynaconf.vendor import click
 from dynaconf.vendor import toml
 from dynaconf.vendor import tomllib
 
-
 if TYPE_CHECKING:  # pragma: no cover
-    from dynaconf.base import Settings
+    from dynaconf.base import Settings  # noqa: F401
 
 os.environ["PYTHONIOENCODING"] = "utf-8"
 
@@ -78,7 +82,7 @@ def set_settings(ctx, instance=None):
         try:
             # Django extension v2
             from django.conf import settings  # noqa
-            import dynaconf
+            import dynaconf  # noqa: F401
             import django
 
             # see https://docs.djangoproject.com/en/4.2/ref/applications/
@@ -97,7 +101,6 @@ def set_settings(ctx, instance=None):
             )
 
     if settings is None:
-
         if instance is None and "--help" not in click.get_os_args():
             if ctx.invoked_subcommand and ctx.invoked_subcommand not in [
                 "init",
@@ -394,9 +397,7 @@ def init(ctx, fileformat, path, env, _vars, _secrets, wg, y, django):
 
     if settings_path:
         loader.write(settings_path, settings_data, merge=True)
-        click.echo(
-            f"🎛️  {settings_path.name} created to hold your settings.\n"
-        )
+        click.echo(f"🎛️  {settings_path.name} created to hold your settings.\n")
 
     if secrets_path:
         loader.write(secrets_path, secrets_data, merge=True)
@@ -461,7 +462,7 @@ def init(ctx, fileformat, path, env, _vars, _secrets, wg, y, django):
 def get(key, default, env, unparse):
     """Returns the raw value for a settings key.
 
-    If result is a dict, list or tuple it is printes as a valid json string.
+    If result is a dict, list or tuple it is printed as a valid json string.
     """
     if env:
         env = env.strip()
@@ -622,7 +623,7 @@ def _list(env, key, more, loader, _all=False, output=None, flat=False):
     default=None,
     help=(
         "key values to be written "
-        "e.g: `dynaconf write toml -e NAME=foo -e X=2"
+        "e.g: `dynaconf write toml -e NAME=foo -e X=2`"
     ),
 )
 @click.option(
@@ -633,7 +634,7 @@ def _list(env, key, more, loader, _all=False, output=None, flat=False):
     default=None,
     help=(
         "secret key values to be written in .secrets "
-        "e.g: `dynaconf write toml -s TOKEN=kdslmflds -s X=2"
+        "e.g: `dynaconf write toml -s TOKEN=kdslmflds -s X=2`"
     ),
 )
 @click.option(
@@ -661,7 +662,6 @@ def write(to, _vars, _secrets, path, env, y):
     loader = importlib.import_module(f"dynaconf.loaders.{to}_loader")
 
     if to in EXTS:
-
         # Lets write to a file
         path = Path(path)
 
@@ -807,14 +807,6 @@ def validate(path):  # pragma: no cover
         sys.exit(1)
 
 
-from dynaconf.utils.inspect import (
-    KeyNotFoundError,
-    builtin_dumpers,
-    inspect_settings,
-    EnvNotFoundError,
-    OutputFormatError,
-)
-
 INSPECT_FORMATS = list(builtin_dumpers.keys())
 
 
@@ -860,7 +852,7 @@ def inspect(
     """
     Inspect the loading history of the given settings instance.
 
-    Filters by key and environement, otherwise shows all.
+    Filters by key and environment, otherwise shows all.
     """
     try:
         inspect_settings(
diff --git a/libs/dynaconf/contrib/__init__.py b/libs/dynaconf/contrib/__init__.py
index 2c0279a49..de6034c9e 100644
--- a/libs/dynaconf/contrib/__init__.py
+++ b/libs/dynaconf/contrib/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
 
-from dynaconf.contrib.django_dynaconf_v2 import DjangoDynaconf  # noqa
-from dynaconf.contrib.flask_dynaconf import DynaconfConfig  # noqa
-from dynaconf.contrib.flask_dynaconf import FlaskDynaconf  # noqa
+from dynaconf.contrib.django_dynaconf_v2 import DjangoDynaconf
+from dynaconf.contrib.flask_dynaconf import DynaconfConfig
+from dynaconf.contrib.flask_dynaconf import FlaskDynaconf
diff --git a/libs/dynaconf/contrib/django_dynaconf_v2.py b/libs/dynaconf/contrib/django_dynaconf_v2.py
index accdabddb..2d201a099 100644
--- a/libs/dynaconf/contrib/django_dynaconf_v2.py
+++ b/libs/dynaconf/contrib/django_dynaconf_v2.py
@@ -20,6 +20,7 @@ On your projects root folder now you can start as::
     DJANGO_ALLOWED_HOSTS='["localhost"]' \
     python manage.py runserver
 """
+
 from __future__ import annotations
 
 import inspect
@@ -114,7 +115,6 @@ def load(django_settings_module_name=None, **kwargs):  # pragma: no cover
 
     # 5) Patch django.conf.settings
     class Wrapper:
-
         # lazy_settings = conf.settings.lazy_settings
 
         def __getattribute__(self, name):
diff --git a/libs/dynaconf/contrib/flask_dynaconf.py b/libs/dynaconf/contrib/flask_dynaconf.py
index c51351a49..5d9ba7a6f 100644
--- a/libs/dynaconf/contrib/flask_dynaconf.py
+++ b/libs/dynaconf/contrib/flask_dynaconf.py
@@ -13,9 +13,10 @@ except ImportError:  # pragma: no cover
     Config = object
 
 
-import dynaconf
 from importlib.metadata import EntryPoint
 
+import dynaconf
+
 
 class FlaskDynaconf:
     """The arguments are.
diff --git a/libs/dynaconf/default_settings.py b/libs/dynaconf/default_settings.py
index 7e8c22298..8b864694c 100644
--- a/libs/dynaconf/default_settings.py
+++ b/libs/dynaconf/default_settings.py
@@ -78,10 +78,10 @@ ROOT_PATH_FOR_DYNACONF = get("ROOT_PATH_FOR_DYNACONF", None)
 # Default settings file
 SETTINGS_FILE_FOR_DYNACONF = get("SETTINGS_FILE_FOR_DYNACONF", [])
 
-# MISPELLS `FILES` when/if it happens
-mispelled_files = get("SETTINGS_FILES_FOR_DYNACONF", None)
-if not SETTINGS_FILE_FOR_DYNACONF and mispelled_files is not None:
-    SETTINGS_FILE_FOR_DYNACONF = mispelled_files
+# MISSPELLS `FILES` when/if it happens
+misspelled_files = get("SETTINGS_FILES_FOR_DYNACONF", None)
+if not SETTINGS_FILE_FOR_DYNACONF and misspelled_files is not None:
+    SETTINGS_FILE_FOR_DYNACONF = misspelled_files
 
 # # ENV SETTINGS
 # # In dynaconf 1.0.0 `NAMESPACE` got renamed to `ENV`
diff --git a/libs/dynaconf/hooking.py b/libs/dynaconf/hooking.py
index f47fea682..092deb46e 100644
--- a/libs/dynaconf/hooking.py
+++ b/libs/dynaconf/hooking.py
@@ -5,14 +5,10 @@ from enum import Enum
 from functools import wraps
 from typing import Any
 from typing import Callable
-from typing import Dict
-from typing import List
 
-from dynaconf.base import RESERVED_ATTRS
 from dynaconf.base import Settings
 from dynaconf.loaders.base import SourceMetadata
 
-
 __all__ = [
     "hookable",
     "EMPTY_VALUE",
@@ -25,8 +21,7 @@ __all__ = [
 ]
 
 
-class Empty:
-    ...
+class Empty: ...
 
 
 EMPTY_VALUE = Empty()
@@ -81,17 +76,9 @@ def hookable(function=None, name=None):
         ):
             return fun(self, *args, **kwargs)
 
-        # Create an unhookable (to avoid recursion)
+        # Create an unhook-able (to avoid recursion)
         # temporary settings to pass to the hooked function
-        temp_settings = Settings(
-            dynaconf_skip_loaders=True,
-            dynaconf_skip_validators=True,
-        )
-        allowed_keys = self.__dict__.keys() - set(RESERVED_ATTRS)
-        temp_data = {
-            k: v for k, v in self.__dict__.items() if k in allowed_keys
-        }
-        temp_settings._store.update(temp_data)
+        temp_settings = TempSettingsHolder(self)
 
         def _hook(action: str, value: HookValue) -> HookValue:
             """executes the hooks for the given action"""
@@ -308,3 +295,49 @@ class HookableSettings(Settings):
     @hookable
     def get(self, *args, **kwargs):
         return Settings.get(self, *args, **kwargs)
+
+
+class TempSettingsHolder:
+    """Holds settings to be passed down to hooks.
+    To save runtime resources initialize a copy of it only if accessed.
+    """
+
+    _settings = None
+
+    def __init__(self, settings):
+        self._original_settings = settings
+
+    def _initialize(self):
+        if self._settings is None:
+            self._settings = Settings(
+                dynaconf_skip_loaders=True,
+                dynaconf_skip_validators=True,
+                _store=self._original_settings._store._safe_copy(),
+            )
+
+    def __getattr__(self, attr):
+        self._initialize()
+        return getattr(self._settings, attr)
+
+    def __getitem__(self, item):
+        self._initialize()
+        return self._settings[item]
+
+    def __setitem__(self, item, value):
+        self._initialize()
+        self._settings[item] = value
+
+    def __iter__(self):
+        self._initialize()
+        return iter(self._settings)
+
+    def __contains__(self, item):
+        self._initialize()
+        return item in self._settings
+
+    def __setattr__(self, attr, value):
+        if attr in ["_original_settings", "_settings"]:
+            super().__setattr__(attr, value)
+        else:
+            self._initialize()
+            setattr(self._settings, attr, value)
diff --git a/libs/dynaconf/loaders/__init__.py b/libs/dynaconf/loaders/__init__.py
index b1a46e0a3..153b64d5c 100644
--- a/libs/dynaconf/loaders/__init__.py
+++ b/libs/dynaconf/loaders/__init__.py
@@ -28,7 +28,7 @@ def default_loader(obj, defaults=None):
     """Initial loader for the initialization process.
 
     Steps:
-    - Load default settings (from static module) + kwargs overrides (togheter)
+    - Load default settings (from static module) + kwargs overrides (together)
     - Load envvar overrides
     """
     # LOAD DEFAULT STATIC + KWARGS OVERRIDES
@@ -126,12 +126,13 @@ def execute_module_hooks(
         hook_file = os.path.join(
             os.path.dirname(loaded_file), "dynaconf_hooks.py"
         )
+        if not os.path.exists(hook_file):
+            # Return early if file doesn't exist.
+            # Faster than attempting to import.
+            continue
         hook_module = py_loader.import_from_filename(
             obj, hook_file, silent=silent
         )
-        if not hook_module:
-            # There was no hook on the same path as a python file
-            continue
         _run_hook_module(
             hook_type=hook,
             hook_module=hook_module,
diff --git a/libs/dynaconf/loaders/base.py b/libs/dynaconf/loaders/base.py
index 5c46891b7..e0ea23bf8 100644
--- a/libs/dynaconf/loaders/base.py
+++ b/libs/dynaconf/loaders/base.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 import warnings
 from typing import NamedTuple
 
@@ -227,7 +226,7 @@ class BaseLoader:
 
 class SourceMetadata(NamedTuple):
     """
-    Usefull metadata about some loaded source (file, envvar, etc).
+    Useful metadata about some loaded source (file, envvar, etc).
 
     Serve as a unique identifier for data from a specific env
     and a specific source (file, envvar, validationd default, etc)
diff --git a/libs/dynaconf/loaders/ini_loader.py b/libs/dynaconf/loaders/ini_loader.py
index 0156fc64c..bf92d2a82 100644
--- a/libs/dynaconf/loaders/ini_loader.py
+++ b/libs/dynaconf/loaders/ini_loader.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 from pathlib import Path
 
 from dynaconf import default_settings
diff --git a/libs/dynaconf/loaders/json_loader.py b/libs/dynaconf/loaders/json_loader.py
index 69b5a4865..7bf9961be 100644
--- a/libs/dynaconf/loaders/json_loader.py
+++ b/libs/dynaconf/loaders/json_loader.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import io
 import json
 from pathlib import Path
 
diff --git a/libs/dynaconf/loaders/py_loader.py b/libs/dynaconf/loaders/py_loader.py
index 6367fd642..f8f575505 100644
--- a/libs/dynaconf/loaders/py_loader.py
+++ b/libs/dynaconf/loaders/py_loader.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 import errno
 import importlib
 import inspect
-import io
 import types
 from contextlib import suppress
 from pathlib import Path
diff --git a/libs/dynaconf/loaders/vault_loader.py b/libs/dynaconf/loaders/vault_loader.py
index b1a9091f3..79d757475 100644
--- a/libs/dynaconf/loaders/vault_loader.py
+++ b/libs/dynaconf/loaders/vault_loader.py
@@ -13,7 +13,8 @@ except ImportError:
 
 try:
     from hvac import Client
-    from hvac.exceptions import InvalidPath, Forbidden
+    from hvac.exceptions import Forbidden
+    from hvac.exceptions import InvalidPath
 except ImportError:
     raise ImportError(
         "vault package is not installed in your environment. "
diff --git a/libs/dynaconf/loaders/yaml_loader.py b/libs/dynaconf/loaders/yaml_loader.py
index 57216810c..af0629838 100644
--- a/libs/dynaconf/loaders/yaml_loader.py
+++ b/libs/dynaconf/loaders/yaml_loader.py
@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-import sys
 from pathlib import Path
-from typing import TextIO
 from warnings import warn
 
 from dynaconf import default_settings
@@ -13,10 +11,10 @@ from dynaconf.utils.parse_conf import try_to_encode
 from dynaconf.vendor.ruamel import yaml
 
 # Add support for Dynaconf Lazy values to YAML dumper
-yaml.SafeDumper.yaml_representers[
-    None
-] = lambda self, data: yaml.representer.SafeRepresenter.represent_str(
-    self, try_to_encode(data)
+yaml.SafeDumper.yaml_representers[None] = (
+    lambda self, data: yaml.representer.SafeRepresenter.represent_str(
+        self, try_to_encode(data)
+    )
 )
 
 
diff --git a/libs/dynaconf/strategies/filtering.py b/libs/dynaconf/strategies/filtering.py
index ef1f51ff9..c3a864349 100644
--- a/libs/dynaconf/strategies/filtering.py
+++ b/libs/dynaconf/strategies/filtering.py
@@ -4,13 +4,25 @@ from dynaconf.utils import upperfy
 
 
 class PrefixFilter:
-    def __init__(self, prefix):
+    """Filter environment variables by prefix.
+
+    Examples:
+        Please see [Prefix filtering][prefix-filtering] in the advanced usage
+        section.
+    """
+
+    def __init__(self, prefix: str):
+        """Initialises the PrefixFilter class.
+
+        Args:
+            prefix: The prefix to filter on.
+        """
         if not isinstance(prefix, str):
             raise TypeError("`SETTINGS_FILE_PREFIX` must be str")
         self.prefix = f"{upperfy(prefix)}_"
 
     def __call__(self, data):
-        """Filter incoming data by prefix"""
+        """Filter incoming data by prefix."""
         len_prefix = len(self.prefix)
         return {
             upperfy(key[len_prefix:]): value
diff --git a/libs/dynaconf/utils/__init__.py b/libs/dynaconf/utils/__init__.py
index 9db51e150..339a4ef29 100644
--- a/libs/dynaconf/utils/__init__.py
+++ b/libs/dynaconf/utils/__init__.py
@@ -9,10 +9,10 @@ from typing import Iterator
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
-
 if TYPE_CHECKING:  # pragma: no cover
+    from dynaconf.base import LazySettings
+    from dynaconf.base import Settings
     from dynaconf.utils.boxing import DynaBox
-    from dynaconf.base import LazySettings, Settings
 
 
 BANNER = """
@@ -47,7 +47,6 @@ def object_merge(
         return new
 
     if isinstance(old, list) and isinstance(new, list):
-
         # 726: allow local_merge to override global merge on lists
         if "dynaconf_merge_unique" in new:
             new.remove("dynaconf_merge_unique")
@@ -83,7 +82,6 @@ def object_merge(
         should_merge = new.pop("dynaconf_merge", True)
         if should_merge:
             for old_key, value in safe_items(old):
-
                 # This is for when the dict exists internally
                 # but the new value on the end of full path is the same
                 if (
@@ -131,7 +129,6 @@ def handle_metavalues(
     """Cleanup of MetaValues on new dict"""
 
     for key in list(new.keys()):
-
         # MetaValue instances
         if getattr(new[key], "_dynaconf_reset", False):  # pragma: no cover
             # a Reset on `new` triggers reasign of existing data
@@ -300,7 +297,7 @@ def trimmed_split(
             continue
         data = [item.strip() for item in s.strip().split(sep)]
         return data
-    return [s]  # raw un-splitted
+    return [s]  # raw un-split
 
 
 T = TypeVar("T")
diff --git a/libs/dynaconf/utils/boxing.py b/libs/dynaconf/utils/boxing.py
index 3c6f32311..1fc9a342f 100644
--- a/libs/dynaconf/utils/boxing.py
+++ b/libs/dynaconf/utils/boxing.py
@@ -15,16 +15,13 @@ def evaluate_lazy_format(f):
 
     @wraps(f)
     def evaluate(dynabox, item, *args, **kwargs):
-        if dynabox._box_config.get("_bypass_evaluation") is True:
-            return f(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}"
+            dynabox._box_config[f"raw_{item.lower()}"] = (
+                f"@{value.formatter.token} {value.value}"
+            )
 
         return recursively_evaluate_lazy_format(value, settings)
 
@@ -59,6 +56,13 @@ class DynaBox(Box):
             n_item = find_the_correct_casing(item, self) 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 __copy__(self):
         return self.__class__(
             super(Box, self).copy(),
diff --git a/libs/dynaconf/utils/inspect.py b/libs/dynaconf/utils/inspect.py
index 21d724e7c..eee06f0de 100644
--- a/libs/dynaconf/utils/inspect.py
+++ b/libs/dynaconf/utils/inspect.py
@@ -1,4 +1,5 @@
 """Inspecting module"""
+
 from __future__ import annotations
 
 import json
@@ -8,7 +9,6 @@ from pathlib import PosixPath
 from typing import Any
 from typing import Callable
 from typing import Literal
-from typing import Optional
 from typing import Protocol
 from typing import TextIO
 from typing import TYPE_CHECKING
@@ -21,7 +21,8 @@ from dynaconf.vendor.box.box_list import BoxList
 from dynaconf.vendor.ruamel.yaml import YAML
 
 if TYPE_CHECKING:  # pragma: no cover
-    from dynaconf.base import LazySettings, Settings
+    from dynaconf.base import LazySettings
+    from dynaconf.base import Settings
 
 
 # Dumpers config
@@ -298,7 +299,8 @@ def _ensure_serializable(data: BoxList | DynaBox) -> dict | list:
         return [_ensure_serializable(v) for v in data]
     elif isinstance(data, (DynaBox, dict)):
         return {
-            k: _ensure_serializable(v) for k, v in data.items()  # type: ignore
+            k: _ensure_serializable(v)
+            for k, v in data.items()  # type: ignore
         }
     else:
         return data if isinstance(data, (int, bool, float)) else str(data)
diff --git a/libs/dynaconf/utils/parse_conf.py b/libs/dynaconf/utils/parse_conf.py
index 882110e50..74036208a 100644
--- a/libs/dynaconf/utils/parse_conf.py
+++ b/libs/dynaconf/utils/parse_conf.py
@@ -168,11 +168,46 @@ def _jinja_formatter(value, **context):
     return jinja_env.from_string(value).render(**context)
 
 
+def _get_formatter(value, **context):
+    """
+    Invokes settings.get from the annotation in value.
+
+    value can be one of the following:
+
+    @get KEY
+    @get KEY @int
+    @get KEY default_value
+    @get KEY @int default_value
+
+    @marker KEY_TO_LOOKUP @OPTIONAL_CAST OPTIONAL_DEFAULT_VALUE
+
+    key group will match the key
+    cast group will match anything provided after @
+    the default group will match anything between single or double quotes
+    """
+    pattern = re.compile(
+        r"(?P<key>\w+(?:\.\w+)?)\s*"
+        r"(?:(?P<cast>@\w+)\s*)?"
+        r'(?P<quote>["\']?)'
+        r'\s*(?P<default>[^"\']*)\s*(?P=quote)?'
+    )
+    if match := pattern.match(value.strip()):
+        data = match.groupdict()
+        return context["this"].get(
+            key=data["key"],
+            default=data["default"],
+            cast=data["cast"],
+        )
+    else:
+        raise DynaconfFormatError(f"Error parsing {value} malformed syntax.")
+
+
 class Formatters:
     """Dynaconf builtin formatters"""
 
     python_formatter = BaseFormatter(str.format, "format")
     jinja_formatter = BaseFormatter(_jinja_formatter, "jinja")
+    get_formatter = BaseFormatter(_get_formatter, "get")
 
 
 class Lazy:
@@ -268,6 +303,7 @@ converters = {
     "@merge_unique": lambda value, box_settings: Merge(
         value, box_settings, unique=True
     ),
+    "@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
     "@note": lambda value: None,
@@ -405,21 +441,21 @@ def parse_conf_data(data, tomlfy=False, box_settings=None):
 
     if isinstance(data, DynaBox):
         # recursively parse inner dict items
-        _parsed = DynaBox({}, box_settings=box_settings)
+        # It is important to keep the same object id because
+        # of mutability
         for k, v in data._safe_items():
-            _parsed[k] = parse_conf_data(
+            data[k] = parse_conf_data(
                 v, tomlfy=tomlfy, box_settings=box_settings
             )
-        return _parsed
+        return data
 
     if isinstance(data, dict):
         # recursively parse inner dict items
-        _parsed = {}
         for k, v in data.items():
-            _parsed[k] = parse_conf_data(
+            data[k] = parse_conf_data(
                 v, tomlfy=tomlfy, box_settings=box_settings
             )
-        return _parsed
+        return data
 
     # return parsed string value
     return _parse_conf_data(data, tomlfy=tomlfy, box_settings=box_settings)
@@ -451,7 +487,7 @@ def boolean_fix(value: str | None):
     """Gets a value like `True/False` and turns to `true/false`
     This function exists because of issue #976
     Toml parser casts booleans from true/false lower case
-    however envvars are usually exportes as True/False capitalized
+    however envvars are usually exported as True/False capitalized
     by mistake, this helper fixes it for envvars only.
 
     Assume envvars are always str.
diff --git a/libs/dynaconf/validator.py b/libs/dynaconf/validator.py
index 6107fff81..37e2f7f78 100644
--- a/libs/dynaconf/validator.py
+++ b/libs/dynaconf/validator.py
@@ -13,7 +13,8 @@ from dynaconf.utils import ensure_a_list
 from dynaconf.utils.functional import empty
 
 if TYPE_CHECKING:
-    from dynaconf.base import LazySettings, Settings
+    from dynaconf.base import LazySettings  # noqa: F401
+    from dynaconf.base import Settings
 
 EQUALITY_ATTRS = (
     "names",
@@ -464,7 +465,6 @@ class ValidatorList(list):
                 self.append(validator)
 
     def descriptions(self, flat: bool = False) -> dict[str, str | list[str]]:
-
         if flat:
             descriptions: dict[str, str | list[str]] = {}
         else:
diff --git a/libs/dynaconf/validator_conditions.py b/libs/dynaconf/validator_conditions.py
index 96d151011..039dede32 100644
--- a/libs/dynaconf/validator_conditions.py
+++ b/libs/dynaconf/validator_conditions.py
@@ -2,6 +2,7 @@
 """
 Implement basic assertions to be used in assertion action
 """
+
 from __future__ import annotations
 
 
diff --git a/libs/engineio/async_client.py b/libs/engineio/async_client.py
index 72cd80058..7db3879e7 100644
--- a/libs/engineio/async_client.py
+++ b/libs/engineio/async_client.py
@@ -37,7 +37,7 @@ def async_signal_handler():
         for task in tasks:
             task.cancel()
         await asyncio.gather(*tasks, return_exceptions=True)
-        asyncio.get_event_loop().stop()
+        asyncio.get_running_loop().stop()
 
     asyncio.ensure_future(_handler())
 
@@ -62,7 +62,7 @@ class AsyncClient(base_client.BaseClient):
     :param http_session: an initialized ``aiohttp.ClientSession`` object to be
                          used when sending requests to the server. Use it if
                          you need to add special client options such as proxy
-                         servers, SSL certificates, etc.
+                         servers, SSL certificates, custom CA bundle, etc.
     :param ssl_verify: ``True`` to verify SSL certificates, or ``False`` to
                        skip SSL certificate verification, allowing
                        connections to servers with self signed certificates.
@@ -75,6 +75,9 @@ class AsyncClient(base_client.BaseClient):
     :param websocket_extra_options: Dictionary containing additional keyword
                                     arguments passed to
                                     ``aiohttp.ws_connect()``.
+    :param timestamp_requests: If ``True`` a timestamp is added to the query
+                               string of Socket.IO requests as a cache-busting
+                               measure. Set to ``False`` to disable.
     """
     def is_asyncio_based(self):
         return True
@@ -106,7 +109,7 @@ class AsyncClient(base_client.BaseClient):
         if self.handle_sigint and not async_signal_handler_set and \
                 threading.current_thread() == threading.main_thread():
             try:
-                asyncio.get_event_loop().add_signal_handler(
+                asyncio.get_running_loop().add_signal_handler(
                     signal.SIGINT, async_signal_handler)
             except NotImplementedError:  # pragma: no cover
                 self.logger.warning('Signal handler is unsupported')
@@ -149,7 +152,7 @@ class AsyncClient(base_client.BaseClient):
         """
         await self._send_packet(packet.Packet(packet.MESSAGE, data=data))
 
-    async def disconnect(self, abort=False):
+    async def disconnect(self, abort=False, reason=None):
         """Disconnect from the server.
 
         :param abort: If set to ``True``, do not wait for background tasks
@@ -161,7 +164,9 @@ class AsyncClient(base_client.BaseClient):
             await self._send_packet(packet.Packet(packet.CLOSE))
             await self.queue.put(None)
             self.state = 'disconnecting'
-            await self._trigger_event('disconnect', run_async=False)
+            await self._trigger_event('disconnect',
+                                      reason or self.reason.CLIENT_DISCONNECT,
+                                      run_async=False)
             if self.current_transport == 'websocket':
                 await self.ws.close()
             if not abort:
@@ -409,7 +414,8 @@ class AsyncClient(base_client.BaseClient):
         elif pkt.packet_type == packet.PING:
             await self._send_packet(packet.Packet(packet.PONG, pkt.data))
         elif pkt.packet_type == packet.CLOSE:
-            await self.disconnect(abort=True)
+            await self.disconnect(abort=True,
+                                  reason=self.reason.SERVER_DISCONNECT)
         elif pkt.packet_type == packet.NOOP:
             pass
         else:
@@ -462,7 +468,16 @@ class AsyncClient(base_client.BaseClient):
                     return task
                 else:
                     try:
-                        ret = await self.handlers[event](*args)
+                        try:
+                            ret = await self.handlers[event](*args)
+                        except TypeError:
+                            if event == 'disconnect' and \
+                                    len(args) == 1:  # pragma: no branch
+                                # legacy disconnect events do not have a reason
+                                # argument
+                                return await self.handlers[event]()
+                            else:  # pragma: no cover
+                                raise
                     except asyncio.CancelledError:  # pragma: no cover
                         pass
                     except:
@@ -482,7 +497,16 @@ class AsyncClient(base_client.BaseClient):
                     return task
                 else:
                     try:
-                        ret = self.handlers[event](*args)
+                        try:
+                            ret = self.handlers[event](*args)
+                        except TypeError:
+                            if event == 'disconnect' and \
+                                    len(args) == 1:  # pragma: no branch
+                                # legacy disconnect events do not have a reason
+                                # argument
+                                ret = self.handlers[event]()
+                            else:  # pragma: no cover
+                                raise
                     except:
                         self.logger.exception(event + ' handler error')
                         if event == 'connect':
@@ -524,7 +548,8 @@ class AsyncClient(base_client.BaseClient):
             self.logger.info('Waiting for write loop task to end')
             await self.write_loop_task
         if self.state == 'connected':
-            await self._trigger_event('disconnect', run_async=False)
+            await self._trigger_event(
+                'disconnect', self.reason.TRANSPORT_ERROR, run_async=False)
             try:
                 base_client.connected_clients.remove(self)
             except ValueError:  # pragma: no cover
@@ -578,7 +603,8 @@ class AsyncClient(base_client.BaseClient):
             self.logger.info('Waiting for write loop task to end')
             await self.write_loop_task
         if self.state == 'connected':
-            await self._trigger_event('disconnect', run_async=False)
+            await self._trigger_event(
+                'disconnect', self.reason.TRANSPORT_ERROR, run_async=False)
             try:
                 base_client.connected_clients.remove(self)
             except ValueError:  # pragma: no cover
diff --git a/libs/engineio/async_drivers/_websocket_wsgi.py b/libs/engineio/async_drivers/_websocket_wsgi.py
index f30f8cae9..aca30dcf7 100644
--- a/libs/engineio/async_drivers/_websocket_wsgi.py
+++ b/libs/engineio/async_drivers/_websocket_wsgi.py
@@ -25,7 +25,7 @@ class SimpleWebSocketWSGI:  # pragma: no cover
         try:
             return self.ws.send(message)
         except simple_websocket.ConnectionClosed:
-            raise IOError()
+            raise OSError()
 
     def wait(self):
         try:
diff --git a/libs/engineio/async_drivers/aiohttp.py b/libs/engineio/async_drivers/aiohttp.py
index a68d3094c..7c3440f03 100644
--- a/libs/engineio/async_drivers/aiohttp.py
+++ b/libs/engineio/async_drivers/aiohttp.py
@@ -57,7 +57,7 @@ def translate_request(request):
 
         key = 'HTTP_%s' % hdr_name.replace('-', '_')
         if key in environ:
-            hdr_value = '%s,%s' % (environ[key], hdr_value)
+            hdr_value = f'{environ[key]},{hdr_value}'
 
         environ[key] = hdr_value
 
@@ -79,7 +79,7 @@ def make_response(status, headers, payload, environ):
                     headers=headers)
 
 
-class WebSocket(object):  # pragma: no cover
+class WebSocket:  # pragma: no cover
     """
     This wrapper class provides a aiohttp WebSocket interface that is
     somewhat compatible with eventlet's implementation.
@@ -114,7 +114,7 @@ class WebSocket(object):  # pragma: no cover
         msg = await self._sock.receive()
         if not isinstance(msg.data, bytes) and \
                 not isinstance(msg.data, str):
-            raise IOError()
+            raise OSError()
         return msg.data
 
 
diff --git a/libs/engineio/async_drivers/asgi.py b/libs/engineio/async_drivers/asgi.py
index 57267037e..866033bba 100644
--- a/libs/engineio/async_drivers/asgi.py
+++ b/libs/engineio/async_drivers/asgi.py
@@ -19,7 +19,12 @@ class ASGIApp:
     :param other_asgi_app: A separate ASGI app that receives all other traffic.
     :param engineio_path: The endpoint where the Engine.IO application should
                           be installed. The default value is appropriate for
-                          most cases.
+                          most cases. With a value of ``None``, all incoming
+                          traffic is directed to the Engine.IO server, with the
+                          assumption that routing, if necessary, is handled by
+                          a different layer. When this option is set to
+                          ``None``, ``static_files`` and ``other_asgi_app`` are
+                          ignored.
     :param on_startup: function to be called on application startup; can be
                        coroutine
     :param on_shutdown: function to be called on application shutdown; can be
@@ -44,24 +49,27 @@ class ASGIApp:
         self.engineio_server = engineio_server
         self.other_asgi_app = other_asgi_app
         self.engineio_path = engineio_path
-        if not self.engineio_path.startswith('/'):
-            self.engineio_path = '/' + self.engineio_path
-        if not self.engineio_path.endswith('/'):
-            self.engineio_path += '/'
+        if self.engineio_path is not None:
+            if not self.engineio_path.startswith('/'):
+                self.engineio_path = '/' + self.engineio_path
+            if not self.engineio_path.endswith('/'):
+                self.engineio_path += '/'
         self.static_files = static_files or {}
         self.on_startup = on_startup
         self.on_shutdown = on_shutdown
 
     async def __call__(self, scope, receive, send):
-        if scope['type'] in ['http', 'websocket'] and \
-                scope['path'].startswith(self.engineio_path):
+        if scope['type'] == 'lifespan':
+            await self.lifespan(scope, receive, send)
+        elif scope['type'] in ['http', 'websocket'] and (
+                self.engineio_path is None
+                or self._ensure_trailing_slash(scope['path']).startswith(
+                    self.engineio_path)):
             await self.engineio_server.handle_request(scope, receive, send)
         else:
             static_file = get_static_file(scope['path'], self.static_files) \
                 if scope['type'] == 'http' and self.static_files else None
-            if scope['type'] == 'lifespan':
-                await self.lifespan(scope, receive, send)
-            elif static_file and os.path.exists(static_file['filename']):
+            if static_file and os.path.exists(static_file['filename']):
                 await self.serve_static_file(static_file, receive, send)
             elif self.other_asgi_app is not None:
                 await self.other_asgi_app(scope, receive, send)
@@ -120,9 +128,14 @@ class ASGIApp:
         await send({'type': 'http.response.body',
                     'body': b'Not Found'})
 
+    def _ensure_trailing_slash(self, path):
+        if not path.endswith('/'):
+            path += '/'
+        return path
+
 
 async def translate_request(scope, receive, send):
-    class AwaitablePayload(object):  # pragma: no cover
+    class AwaitablePayload:  # pragma: no cover
         def __init__(self, payload):
             self.payload = payload or b''
 
@@ -148,9 +161,15 @@ async def translate_request(scope, receive, send):
     else:
         return {}
 
-    raw_uri = scope['path'].encode('utf-8')
+    raw_uri = scope['path']
+    query_string = ''
     if 'query_string' in scope and scope['query_string']:
-        raw_uri += b'?' + scope['query_string']
+        try:
+            query_string = scope['query_string'].decode('utf-8')
+        except UnicodeDecodeError:
+            pass
+        else:
+            raw_uri += '?' + query_string
     environ = {
         'wsgi.input': AwaitablePayload(payload),
         'wsgi.errors': sys.stderr,
@@ -162,8 +181,8 @@ async def translate_request(scope, receive, send):
         'SERVER_SOFTWARE': 'asgi',
         'REQUEST_METHOD': scope.get('method', 'GET'),
         'PATH_INFO': scope['path'],
-        'QUERY_STRING': scope.get('query_string', b'').decode('utf-8'),
-        'RAW_URI': raw_uri.decode('utf-8'),
+        'QUERY_STRING': query_string,
+        'RAW_URI': raw_uri,
         'SCRIPT_NAME': '',
         'SERVER_PROTOCOL': 'HTTP/1.1',
         'REMOTE_ADDR': '127.0.0.1',
@@ -176,8 +195,12 @@ async def translate_request(scope, receive, send):
     }
 
     for hdr_name, hdr_value in scope['headers']:
-        hdr_name = hdr_name.upper().decode('utf-8')
-        hdr_value = hdr_value.decode('utf-8')
+        try:
+            hdr_name = hdr_name.upper().decode('utf-8')
+            hdr_value = hdr_value.decode('utf-8')
+        except UnicodeDecodeError:
+            # skip header if it cannot be decoded
+            continue
         if hdr_name == 'CONTENT-TYPE':
             environ['CONTENT_TYPE'] = hdr_value
             continue
@@ -187,7 +210,7 @@ async def translate_request(scope, receive, send):
 
         key = 'HTTP_%s' % hdr_name.replace('-', '_')
         if key in environ:
-            hdr_value = '%s,%s' % (environ[key], hdr_value)
+            hdr_value = f'{environ[key]},{hdr_value}'
 
         environ[key] = hdr_value
 
@@ -218,7 +241,7 @@ async def make_response(status, headers, payload, environ):
                                 'body': payload})
 
 
-class WebSocket(object):  # pragma: no cover
+class WebSocket:  # pragma: no cover
     """
     This wrapper class provides an asgi WebSocket interface that is
     somewhat compatible with eventlet's implementation.
@@ -256,7 +279,7 @@ class WebSocket(object):  # pragma: no cover
     async def wait(self):
         event = await self.asgi_receive()
         if event['type'] != 'websocket.receive':
-            raise IOError()
+            raise OSError()
         return event.get('bytes') or event.get('text')
 
 
diff --git a/libs/engineio/async_drivers/eventlet.py b/libs/engineio/async_drivers/eventlet.py
index 4dfdc1eff..6361c4de0 100644
--- a/libs/engineio/async_drivers/eventlet.py
+++ b/libs/engineio/async_drivers/eventlet.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from eventlet.green.threading import Event
 from eventlet import queue, sleep, spawn
 from eventlet.websocket import WebSocketWSGI as _WebSocketWSGI
@@ -25,7 +23,7 @@ class EventletThread:  # pragma: no cover
             return self.g.wait()
 
 
-class WebSocketWSGI(_WebSocketWSGI):
+class WebSocketWSGI(_WebSocketWSGI):  # pragma: no cover
     def __init__(self, handler, server):
         try:
             super().__init__(
diff --git a/libs/engineio/async_drivers/gevent_uwsgi.py b/libs/engineio/async_drivers/gevent_uwsgi.py
index 34683edfb..b5ccefc84 100644
--- a/libs/engineio/async_drivers/gevent_uwsgi.py
+++ b/libs/engineio/async_drivers/gevent_uwsgi.py
@@ -18,7 +18,7 @@ class Thread(gevent.Greenlet):  # pragma: no cover
         return self.run()
 
 
-class uWSGIWebSocket(object):  # pragma: no cover
+class uWSGIWebSocket:  # pragma: no cover
     """
     This wrapper class provides a uWSGI WebSocket interface that is
     compatible with eventlet's implementation.
@@ -115,7 +115,7 @@ class uWSGIWebSocket(object):  # pragma: no cover
             if self._req_ctx is not None:
                 try:
                     msg = uwsgi.websocket_recv(request_context=self._req_ctx)
-                except IOError:  # connection closed
+                except OSError:  # connection closed
                     self.close()
                     return None
                 return self._decode_received(msg)
@@ -138,7 +138,7 @@ class uWSGIWebSocket(object):  # pragma: no cover
                     for msg in msgs:
                         try:
                             self._send(msg)
-                        except IOError:
+                        except OSError:
                             self.close()
                             return None
                 # maybe there is something to receive, if not, at least
@@ -146,7 +146,7 @@ class uWSGIWebSocket(object):  # pragma: no cover
                 while True:
                     try:
                         msg = uwsgi.websocket_recv_nb()
-                    except IOError:  # connection closed
+                    except OSError:  # connection closed
                         self.close()
                         return None
                     if msg:  # message available
diff --git a/libs/engineio/async_drivers/sanic.py b/libs/engineio/async_drivers/sanic.py
index fe351aead..4d6a5b8e1 100644
--- a/libs/engineio/async_drivers/sanic.py
+++ b/libs/engineio/async_drivers/sanic.py
@@ -6,7 +6,6 @@ try:  # pragma: no cover
     try:
         from sanic.server.protocols.websocket_protocol import WebSocketProtocol
     except ImportError:
-        print('yay')
         from sanic.websocket import WebSocketProtocol
 except ImportError:
     HTTPResponse = None
@@ -33,7 +32,7 @@ def translate_request(request):  # pragma: no cover
     """This function takes the arguments passed to the request handler and
     uses them to generate a WSGI compatible environ dictionary.
     """
-    class AwaitablePayload(object):
+    class AwaitablePayload:
         def __init__(self, payload):
             self.payload = payload or b''
 
@@ -78,7 +77,7 @@ def translate_request(request):  # pragma: no cover
 
         key = 'HTTP_%s' % hdr_name.replace('-', '_')
         if key in environ:
-            hdr_value = '%s,%s' % (environ[key], hdr_value)
+            hdr_value = f'{environ[key]},{hdr_value}'
 
         environ[key] = hdr_value
 
@@ -107,7 +106,7 @@ def make_response(status, headers, payload, environ):  # pragma: no cover
                         status=int(status.split()[0]), headers=headers_dict)
 
 
-class WebSocket(object):  # pragma: no cover
+class WebSocket:  # pragma: no cover
     """
     This wrapper class provides a sanic WebSocket interface that is
     somewhat compatible with eventlet's implementation.
@@ -136,7 +135,7 @@ class WebSocket(object):  # pragma: no cover
         data = await self._sock.recv()
         if not isinstance(data, bytes) and \
                 not isinstance(data, str):
-            raise IOError()
+            raise OSError()
         return data
 
 
diff --git a/libs/engineio/async_drivers/tornado.py b/libs/engineio/async_drivers/tornado.py
index 2c70135af..abb1e2b54 100644
--- a/libs/engineio/async_drivers/tornado.py
+++ b/libs/engineio/async_drivers/tornado.py
@@ -64,7 +64,7 @@ def translate_request(handler):
     """This function takes the arguments passed to the request handler and
     uses them to generate a WSGI compatible environ dictionary.
     """
-    class AwaitablePayload(object):
+    class AwaitablePayload:
         def __init__(self, payload):
             self.payload = payload or b''
 
@@ -142,7 +142,7 @@ def make_response(status, headers, payload, environ):
     tornado_handler.finish()
 
 
-class WebSocket(object):  # pragma: no cover
+class WebSocket:  # pragma: no cover
     """
     This wrapper class provides a tornado WebSocket interface that is
     somewhat compatible with eventlet's implementation.
@@ -170,7 +170,7 @@ class WebSocket(object):  # pragma: no cover
         msg = await self.tornado_handler.get_next_message()
         if not isinstance(msg, bytes) and \
                 not isinstance(msg, str):
-            raise IOError()
+            raise OSError()
         return msg
 
 
diff --git a/libs/engineio/async_server.py b/libs/engineio/async_server.py
index a7763830c..4bf28f23d 100644
--- a/libs/engineio/async_server.py
+++ b/libs/engineio/async_server.py
@@ -70,6 +70,10 @@ class AsyncServer(base_server.BaseServer):
     :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``.
+    :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']``.
@@ -85,7 +89,7 @@ class AsyncServer(base_server.BaseServer):
     def attach(self, app, engineio_path='engine.io'):
         """Attach the Engine.IO server to an application."""
         engineio_path = engineio_path.strip('/')
-        self._async['create_route'](app, self, '/{}/'.format(engineio_path))
+        self._async['create_route'](app, self, f'/{engineio_path}/')
 
     async def send(self, sid, data):
         """Send a message to a client.
@@ -158,7 +162,7 @@ class AsyncServer(base_server.BaseServer):
                 async with eio.session(sid) as session:
                     print('received message from ', session['username'])
         """
-        class _session_context_manager(object):
+        class _session_context_manager:
             def __init__(self, server, sid):
                 self.server = server
                 self.sid = sid
@@ -188,12 +192,15 @@ class AsyncServer(base_server.BaseServer):
                 # the socket was already closed or gone
                 pass
             else:
-                await socket.close()
+                await socket.close(reason=self.reason.SERVER_DISCONNECT)
                 if sid in self.sockets:  # pragma: no cover
                     del self.sockets[sid]
         else:
-            await asyncio.wait([asyncio.create_task(client.close())
-                                for client in self.sockets.values()])
+            await asyncio.wait([
+                asyncio.create_task(client.close(
+                    reason=self.reason.SERVER_DISCONNECT))
+                for client in self.sockets.values()
+            ])
             self.sockets = {}
 
     async def handle_request(self, *args, **kwargs):
@@ -265,11 +272,11 @@ class AsyncServer(base_server.BaseServer):
                                  'bad-jsonp-index')
             r = self._bad_request('Invalid JSONP index number')
         elif method == 'GET':
+            upgrade_header = environ.get('HTTP_UPGRADE').lower() \
+                if 'HTTP_UPGRADE' in environ else None
             if sid is None:
                 # transport must be one of 'polling' or 'websocket'.
                 # if 'websocket', the HTTP_UPGRADE header must match.
-                upgrade_header = environ.get('HTTP_UPGRADE').lower() \
-                    if 'HTTP_UPGRADE' in environ else None
                 if transport == 'polling' \
                         or transport == upgrade_header == 'websocket':
                     r = await self._handle_connect(environ, transport,
@@ -280,26 +287,41 @@ class AsyncServer(base_server.BaseServer):
                     r = self._bad_request('Invalid websocket upgrade')
             else:
                 if sid not in self.sockets:
-                    self._log_error_once('Invalid session ' + sid, 'bad-sid')
-                    r = self._bad_request('Invalid session ' + sid)
+                    self._log_error_once(f'Invalid session {sid}', 'bad-sid')
+                    r = self._bad_request(f'Invalid session {sid}')
                 else:
-                    socket = self._get_socket(sid)
                     try:
-                        packets = await socket.handle_get_request(environ)
-                        if isinstance(packets, list):
-                            r = self._ok(packets, jsonp_index=jsonp_index)
+                        socket = self._get_socket(sid)
+                    except KeyError as e:  # pragma: no cover
+                        self._log_error_once(f'{e} {sid}', 'bad-sid')
+                        r = self._bad_request(f'{e} {sid}')
+                    else:
+                        if self.transport(sid) != transport and \
+                                transport != upgrade_header:
+                            self._log_error_once(
+                                f'Invalid transport for session {sid}',
+                                'bad-transport')
+                            r = self._bad_request('Invalid transport')
                         else:
-                            r = packets
-                    except exceptions.EngineIOError:
-                        if sid in self.sockets:  # pragma: no cover
-                            await self.disconnect(sid)
-                        r = self._bad_request()
-                    if sid in self.sockets and self.sockets[sid].closed:
-                        del self.sockets[sid]
+                            try:
+                                packets = await socket.handle_get_request(
+                                    environ)
+                                if isinstance(packets, list):
+                                    r = self._ok(packets,
+                                                 jsonp_index=jsonp_index)
+                                else:
+                                    r = packets
+                            except exceptions.EngineIOError:
+                                if sid in self.sockets:  # pragma: no cover
+                                    await self.disconnect(sid)
+                                r = self._bad_request()
+                            if sid in self.sockets and \
+                                    self.sockets[sid].closed:
+                                del self.sockets[sid]
         elif method == 'POST':
             if sid is None or sid not in self.sockets:
-                self._log_error_once('Invalid session ' + sid, 'bad-sid')
-                r = self._bad_request('Invalid session ' + sid)
+                self._log_error_once(f'Invalid session {sid}', 'bad-sid')
+                r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
                 try:
@@ -429,11 +451,14 @@ class AsyncServer(base_server.BaseServer):
         s = async_socket.AsyncSocket(self, sid)
         self.sockets[sid] = s
 
-        pkt = packet.Packet(
-            packet.OPEN, {'sid': sid,
-                          'upgrades': self._upgrades(sid, transport),
-                          'pingTimeout': int(self.ping_timeout * 1000),
-                          'pingInterval': int(self.ping_interval * 1000)})
+        pkt = packet.Packet(packet.OPEN, {
+            'sid': sid,
+            'upgrades': self._upgrades(sid, transport),
+            'pingTimeout': int(self.ping_timeout * 1000),
+            'pingInterval': int(
+                self.ping_interval + self.ping_interval_grace_period) * 1000,
+            'maxPayload': self.max_http_buffer_size,
+        })
         await s.send(pkt)
         s.schedule_ping()
 
@@ -480,7 +505,16 @@ class AsyncServer(base_server.BaseServer):
             if asyncio.iscoroutinefunction(self.handlers[event]):
                 async def run_async_handler():
                     try:
-                        return await self.handlers[event](*args)
+                        try:
+                            return await self.handlers[event](*args)
+                        except TypeError:
+                            if event == 'disconnect' and \
+                                    len(args) == 2:  # pragma: no branch
+                                # legacy disconnect events do not have a reason
+                                # argument
+                                return await self.handlers[event](args[0])
+                            else:  # pragma: no cover
+                                raise
                     except asyncio.CancelledError:  # pragma: no cover
                         pass
                     except:
@@ -499,7 +533,16 @@ class AsyncServer(base_server.BaseServer):
             else:
                 async def run_sync_handler():
                     try:
-                        return self.handlers[event](*args)
+                        try:
+                            return self.handlers[event](*args)
+                        except TypeError:
+                            if event == 'disconnect' and \
+                                    len(args) == 2:  # pragma: no branch
+                                # legacy disconnect events do not have a reason
+                                # argument
+                                return self.handlers[event](args[0])
+                            else:  # pragma: no cover
+                                raise
                     except:
                         self.logger.exception(event + ' handler error')
                         if event == 'connect':
@@ -517,6 +560,7 @@ class AsyncServer(base_server.BaseServer):
 
     async def _service_task(self):  # pragma: no cover
         """Monitor connected clients and clean up those that time out."""
+        loop = asyncio.get_running_loop()
         self.service_task_event = self.create_event()
         while not self.service_task_event.is_set():
             if len(self.sockets) == 0:
@@ -524,9 +568,9 @@ class AsyncServer(base_server.BaseServer):
                 try:
                     await asyncio.wait_for(self.service_task_event.wait(),
                                            timeout=self.ping_timeout)
-                except asyncio.TimeoutError:
                     break
-                continue
+                except asyncio.TimeoutError:
+                    continue
 
             # go through the entire client list in a ping interval cycle
             sleep_interval = self.ping_timeout / len(self.sockets)
@@ -546,8 +590,9 @@ class AsyncServer(base_server.BaseServer):
                     try:
                         await asyncio.wait_for(self.service_task_event.wait(),
                                                timeout=sleep_interval)
-                    except asyncio.TimeoutError:
                         raise KeyboardInterrupt()
+                    except asyncio.TimeoutError:
+                        continue
             except (
                 SystemExit,
                 KeyboardInterrupt,
@@ -557,7 +602,7 @@ class AsyncServer(base_server.BaseServer):
                 self.logger.info('service task canceled')
                 break
             except:
-                if asyncio.get_event_loop().is_closed():
+                if loop.is_closed():
                     self.logger.info('event loop is closed, exiting service '
                                      'task')
                     break
diff --git a/libs/engineio/async_socket.py b/libs/engineio/async_socket.py
index 75776ef67..cfdbe1a2d 100644
--- a/libs/engineio/async_socket.py
+++ b/libs/engineio/async_socket.py
@@ -47,7 +47,8 @@ class AsyncSocket(base_socket.BaseSocket):
         elif pkt.packet_type == packet.UPGRADE:
             await self.send(packet.Packet(packet.NOOP))
         elif pkt.packet_type == packet.CLOSE:
-            await self.close(wait=False, abort=True)
+            await self.close(wait=False, abort=True,
+                             reason=self.server.reason.CLIENT_DISCONNECT)
         else:
             raise exceptions.UnknownPacketError()
 
@@ -62,7 +63,8 @@ class AsyncSocket(base_socket.BaseSocket):
             # Passing abort=False here will cause close() to write a
             # CLOSE packet. This has the effect of updating half-open sockets
             # to their correct state of disconnected
-            await self.close(wait=False, abort=False)
+            await self.close(wait=False, abort=False,
+                             reason=self.server.reason.PING_TIMEOUT)
             return False
         return True
 
@@ -95,7 +97,8 @@ class AsyncSocket(base_socket.BaseSocket):
             packets = await self.poll()
         except exceptions.QueueEmpty:
             exc = sys.exc_info()
-            await self.close(wait=False)
+            await self.close(wait=False,
+                             reason=self.server.reason.TRANSPORT_ERROR)
             raise exc[1].with_traceback(exc[2])
         return packets
 
@@ -110,11 +113,14 @@ class AsyncSocket(base_socket.BaseSocket):
             for pkt in p.packets:
                 await self.receive(pkt)
 
-    async def close(self, wait=True, abort=False):
+    async def close(self, wait=True, abort=False, reason=None):
         """Close the socket connection."""
         if not self.closed and not self.closing:
             self.closing = True
-            await self.server._trigger_event('disconnect', self.sid)
+            await self.server._trigger_event(
+                'disconnect', self.sid,
+                reason or self.server.reason.SERVER_DISCONNECT,
+                run_async=False)
             if not abort:
                 await self.send(packet.Packet(packet.CLOSE))
             self.closed = True
@@ -134,7 +140,7 @@ class AsyncSocket(base_socket.BaseSocket):
     async def _upgrade_websocket(self, environ):
         """Upgrade the connection from polling to websocket."""
         if self.upgraded:
-            raise IOError('Socket has been upgraded already')
+            raise OSError('Socket has been upgraded already')
         if self.server._async['websocket'] is None:
             # the selected async mode does not support websocket
             return self.server._bad_request()
@@ -156,7 +162,7 @@ class AsyncSocket(base_socket.BaseSocket):
 
             try:
                 pkt = await websocket_wait()
-            except IOError:  # pragma: no cover
+            except OSError:  # pragma: no cover
                 return
             decoded_pkt = packet.Packet(encoded_packet=pkt)
             if decoded_pkt.packet_type != packet.PING or \
@@ -170,7 +176,7 @@ class AsyncSocket(base_socket.BaseSocket):
 
             try:
                 pkt = await websocket_wait()
-            except IOError:  # pragma: no cover
+            except OSError:  # pragma: no cover
                 self.upgrading = False
                 return
             decoded_pkt = packet.Packet(encoded_packet=pkt)
@@ -251,4 +257,5 @@ class AsyncSocket(base_socket.BaseSocket):
 
         await self.queue.put(None)  # unlock the writer task so it can exit
         await asyncio.wait_for(writer_task, timeout=None)
-        await self.close(wait=False, abort=True)
+        await self.close(wait=False, abort=True,
+                         reason=self.server.reason.TRANSPORT_CLOSE)
diff --git a/libs/engineio/base_client.py b/libs/engineio/base_client.py
index 6381be20c..912baf720 100644
--- a/libs/engineio/base_client.py
+++ b/libs/engineio/base_client.py
@@ -30,9 +30,18 @@ original_signal_handler = None
 class BaseClient:
     event_names = ['connect', 'disconnect', 'message']
 
+    class reason:
+        """Disconnection reasons."""
+        #: Client-initiated disconnection.
+        CLIENT_DISCONNECT = 'client disconnect'
+        #: Server-initiated disconnection.
+        SERVER_DISCONNECT = 'server disconnect'
+        #: Transport error.
+        TRANSPORT_ERROR = 'transport error'
+
     def __init__(self, logger=False, json=None, request_timeout=5,
                  http_session=None, ssl_verify=True, handle_sigint=True,
-                 websocket_extra_options=None):
+                 websocket_extra_options=None, timestamp_requests=True):
         global original_signal_handler
         if handle_sigint and original_signal_handler is None and \
                 threading.current_thread() == threading.main_thread():
@@ -56,6 +65,7 @@ class BaseClient:
         self.state = 'disconnected'
         self.ssl_verify = ssl_verify
         self.websocket_extra_options = websocket_extra_options or {}
+        self.timestamp_requests = timestamp_requests
 
         if json is not None:
             packet.Packet.json = json
@@ -143,4 +153,6 @@ class BaseClient:
 
     def _get_url_timestamp(self):
         """Generate the Engine.IO query string timestamp."""
+        if not self.timestamp_requests:
+            return ''
         return '&t=' + str(time.time())
diff --git a/libs/engineio/base_server.py b/libs/engineio/base_server.py
index c32cb1416..bfb4165be 100644
--- a/libs/engineio/base_server.py
+++ b/libs/engineio/base_server.py
@@ -19,6 +19,19 @@ class BaseServer:
     _default_monitor_clients = True
     sequence_number = 0
 
+    class reason:
+        """Disconnection reasons."""
+        #: Server-initiated disconnection.
+        SERVER_DISCONNECT = 'server disconnect'
+        #: Client-initiated disconnection.
+        CLIENT_DISCONNECT = 'client disconnect'
+        #: Ping timeout.
+        PING_TIMEOUT = 'ping timeout'
+        #: Transport close.
+        TRANSPORT_CLOSE = 'transport close'
+        #: Transport error.
+        TRANSPORT_ERROR = 'transport error'
+
     def __init__(self, async_mode=None, ping_interval=25, ping_timeout=20,
                  max_http_buffer_size=1000000, allow_upgrades=True,
                  http_compression=True, compression_threshold=1024,
diff --git a/libs/engineio/base_socket.py b/libs/engineio/base_socket.py
index 6d42bfec5..6b5d7dc8a 100644
--- a/libs/engineio/base_socket.py
+++ b/libs/engineio/base_socket.py
@@ -1,4 +1,3 @@
-
 class BaseSocket:
     upgrade_protocols = ['websocket']
 
diff --git a/libs/engineio/client.py b/libs/engineio/client.py
index 8775179dc..987c3998d 100644
--- a/libs/engineio/client.py
+++ b/libs/engineio/client.py
@@ -55,6 +55,9 @@ class Client(base_client.BaseClient):
     :param websocket_extra_options: Dictionary containing additional keyword
                                     arguments passed to
                                     ``websocket.create_connection()``.
+    :param timestamp_requests: If ``True`` a timestamp is added to the query
+                               string of Socket.IO requests as a cache-busting
+                               measure. Set to ``False`` to disable.
     """
     def connect(self, url, headers=None, transports=None,
                 engineio_path='engine.io'):
@@ -110,7 +113,7 @@ class Client(base_client.BaseClient):
         """
         self._send_packet(packet.Packet(packet.MESSAGE, data=data))
 
-    def disconnect(self, abort=False):
+    def disconnect(self, abort=False, reason=None):
         """Disconnect from the server.
 
         :param abort: If set to ``True``, do not wait for background tasks
@@ -120,7 +123,9 @@ class Client(base_client.BaseClient):
             self._send_packet(packet.Packet(packet.CLOSE))
             self.queue.put(None)
             self.state = 'disconnecting'
-            self._trigger_event('disconnect', run_async=False)
+            self._trigger_event('disconnect',
+                                reason or self.reason.CLIENT_DISCONNECT,
+                                run_async=False)
             if self.current_transport == 'websocket':
                 self.ws.close()
             if not abort:
@@ -251,7 +256,7 @@ class Client(base_client.BaseClient):
         extra_options = {}
         if self.http:
             # cookies
-            cookies = '; '.join(["{}={}".format(cookie.name, cookie.value)
+            cookies = '; '.join([f"{cookie.name}={cookie.value}"
                                  for cookie in self.http.cookies])
             for header, value in headers.items():
                 if header.lower() == 'cookie':
@@ -325,7 +330,7 @@ class Client(base_client.BaseClient):
         try:
             ws = websocket.create_connection(
                 websocket_url + self._get_url_timestamp(), **extra_options)
-        except (ConnectionError, IOError, websocket.WebSocketException):
+        except (ConnectionError, OSError, websocket.WebSocketException):
             if upgrade:
                 self.logger.warning(
                     'WebSocket upgrade failed: connection error')
@@ -404,7 +409,7 @@ class Client(base_client.BaseClient):
         elif pkt.packet_type == packet.PING:
             self._send_packet(packet.Packet(packet.PONG, pkt.data))
         elif pkt.packet_type == packet.CLOSE:
-            self.disconnect(abort=True)
+            self.disconnect(abort=True, reason=self.reason.SERVER_DISCONNECT)
         elif pkt.packet_type == packet.NOOP:
             pass
         else:
@@ -444,7 +449,16 @@ class Client(base_client.BaseClient):
                 return self.start_background_task(self.handlers[event], *args)
             else:
                 try:
-                    return self.handlers[event](*args)
+                    try:
+                        return self.handlers[event](*args)
+                    except TypeError:
+                        if event == 'disconnect' and \
+                                len(args) == 1:  # pragma: no branch
+                            # legacy disconnect events do  not have a reason
+                            # argument
+                            return self.handlers[event]()
+                        else:  # pragma: no cover
+                            raise
                 except:
                     self.logger.exception(event + ' handler error')
 
@@ -480,7 +494,8 @@ class Client(base_client.BaseClient):
             self.logger.info('Waiting for write loop task to end')
             self.write_loop_task.join()
         if self.state == 'connected':
-            self._trigger_event('disconnect', run_async=False)
+            self._trigger_event('disconnect', self.reason.TRANSPORT_ERROR,
+                                run_async=False)
             try:
                 base_client.connected_clients.remove(self)
             except ValueError:  # pragma: no cover
@@ -494,7 +509,7 @@ class Client(base_client.BaseClient):
             p = None
             try:
                 p = self.ws.recv()
-                if len(p) == 0:  # pragma: no cover
+                if len(p) == 0 and not self.ws.connected:  # pragma: no cover
                     # websocket client can return an empty string after close
                     raise websocket.WebSocketConnectionClosedException()
             except websocket.WebSocketTimeoutException:
@@ -510,8 +525,7 @@ class Client(base_client.BaseClient):
             except Exception as e:  # pragma: no cover
                 if type(e) is OSError and e.errno == 9:
                     self.logger.info(
-                        'WebSocket connection is closing, aborting',
-                        str(e))
+                        'WebSocket connection is closing, aborting')
                 else:
                     self.logger.info(
                         'Unexpected error receiving packet: "%s", aborting',
@@ -531,7 +545,8 @@ class Client(base_client.BaseClient):
             self.logger.info('Waiting for write loop task to end')
             self.write_loop_task.join()
         if self.state == 'connected':
-            self._trigger_event('disconnect', run_async=False)
+            self._trigger_event('disconnect', self.reason.TRANSPORT_ERROR,
+                                run_async=False)
             try:
                 base_client.connected_clients.remove(self)
             except ValueError:  # pragma: no cover
diff --git a/libs/engineio/middleware.py b/libs/engineio/middleware.py
index e198737f5..0e34fb04b 100644
--- a/libs/engineio/middleware.py
+++ b/libs/engineio/middleware.py
@@ -2,7 +2,7 @@ import os
 from engineio.static_files import get_static_file
 
 
-class WSGIApp(object):
+class WSGIApp:
     """WSGI application middleware for Engine.IO.
 
     This middleware dispatches traffic to an Engine.IO application. It can
@@ -50,7 +50,7 @@ class WSGIApp(object):
             # directly into the environment. To give eventlet's WebSocket
             # module access to this socket when running under gunicorn, here we
             # copy the socket to the eventlet format.
-            class Input(object):
+            class Input:
                 def __init__(self, socket):
                     self.socket = socket
 
diff --git a/libs/engineio/packet.py b/libs/engineio/packet.py
index 8e8135ccf..7edc7a332 100644
--- a/libs/engineio/packet.py
+++ b/libs/engineio/packet.py
@@ -7,7 +7,7 @@ packet_names = ['OPEN', 'CLOSE', 'PING', 'PONG', 'MESSAGE', 'UPGRADE', 'NOOP']
 binary_types = (bytes, bytearray)
 
 
-class Packet(object):
+class Packet:
     """Engine.IO packet."""
 
     json = _json
diff --git a/libs/engineio/payload.py b/libs/engineio/payload.py
index f0e9e343d..775241ba7 100644
--- a/libs/engineio/payload.py
+++ b/libs/engineio/payload.py
@@ -3,7 +3,7 @@ import urllib
 from . import packet
 
 
-class Payload(object):
+class Payload:
     """Engine.IO payload."""
     max_decode_packets = 16
 
diff --git a/libs/engineio/server.py b/libs/engineio/server.py
index 3926b226a..f1b136713 100644
--- a/libs/engineio/server.py
+++ b/libs/engineio/server.py
@@ -148,7 +148,7 @@ class Server(base_server.BaseServer):
                 with eio.session(sid) as session:
                     print('received message from ', session['username'])
         """
-        class _session_context_manager(object):
+        class _session_context_manager:
             def __init__(self, server, sid):
                 self.server = server
                 self.sid = sid
@@ -176,12 +176,12 @@ class Server(base_server.BaseServer):
                 # the socket was already closed or gone
                 pass
             else:
-                socket.close()
+                socket.close(reason=self.reason.SERVER_DISCONNECT)
                 if sid in self.sockets:  # pragma: no cover
                     del self.sockets[sid]
         else:
-            for client in self.sockets.values():
-                client.close()
+            for client in self.sockets.copy().values():
+                client.close(reason=self.reason.SERVER_DISCONNECT)
             self.sockets = {}
 
     def handle_request(self, environ, start_response):
@@ -251,11 +251,11 @@ class Server(base_server.BaseServer):
                                  'bad-jsonp-index')
             r = self._bad_request('Invalid JSONP index number')
         elif method == 'GET':
+            upgrade_header = environ.get('HTTP_UPGRADE').lower() \
+                if 'HTTP_UPGRADE' in environ else None
             if sid is None:
                 # transport must be one of 'polling' or 'websocket'.
                 # if 'websocket', the HTTP_UPGRADE header must match.
-                upgrade_header = environ.get('HTTP_UPGRADE').lower() \
-                    if 'HTTP_UPGRADE' in environ else None
                 if transport == 'polling' \
                         or transport == upgrade_header == 'websocket':
                     r = self._handle_connect(environ, start_response,
@@ -266,28 +266,41 @@ class Server(base_server.BaseServer):
                     r = self._bad_request('Invalid websocket upgrade')
             else:
                 if sid not in self.sockets:
-                    self._log_error_once('Invalid session ' + sid, 'bad-sid')
-                    r = self._bad_request('Invalid session')
+                    self._log_error_once(f'Invalid session {sid}', 'bad-sid')
+                    r = self._bad_request(f'Invalid session {sid}')
                 else:
-                    socket = self._get_socket(sid)
                     try:
-                        packets = socket.handle_get_request(
-                            environ, start_response)
-                        if isinstance(packets, list):
-                            r = self._ok(packets, jsonp_index=jsonp_index)
+                        socket = self._get_socket(sid)
+                    except KeyError as e:  # pragma: no cover
+                        self._log_error_once(f'{e} {sid}', 'bad-sid')
+                        r = self._bad_request(f'{e} {sid}')
+                    else:
+                        if self.transport(sid) != transport and \
+                                transport != upgrade_header:
+                            self._log_error_once(
+                                f'Invalid transport for session {sid}',
+                                'bad-transport')
+                            r = self._bad_request('Invalid transport')
                         else:
-                            r = packets
-                    except exceptions.EngineIOError:
-                        if sid in self.sockets:  # pragma: no cover
-                            self.disconnect(sid)
-                        r = self._bad_request()
-                    if sid in self.sockets and self.sockets[sid].closed:
-                        del self.sockets[sid]
+                            try:
+                                packets = socket.handle_get_request(
+                                    environ, start_response)
+                                if isinstance(packets, list):
+                                    r = self._ok(packets,
+                                                 jsonp_index=jsonp_index)
+                                else:
+                                    r = packets
+                            except exceptions.EngineIOError:
+                                if sid in self.sockets:  # pragma: no cover
+                                    self.disconnect(sid)
+                                r = self._bad_request()
+                            if sid in self.sockets and \
+                                    self.sockets[sid].closed:
+                                del self.sockets[sid]
         elif method == 'POST':
             if sid is None or sid not in self.sockets:
-                self._log_error_once(
-                    'Invalid session ' + (sid or 'None'), 'bad-sid')
-                r = self._bad_request('Invalid session')
+                self._log_error_once(f'Invalid session {sid}', 'bad-sid')
+                r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
                 try:
@@ -383,7 +396,9 @@ class Server(base_server.BaseServer):
             'upgrades': self._upgrades(sid, transport),
             'pingTimeout': int(self.ping_timeout * 1000),
             'pingInterval': int(
-                self.ping_interval + self.ping_interval_grace_period) * 1000})
+                self.ping_interval + self.ping_interval_grace_period) * 1000,
+            'maxPayload': self.max_http_buffer_size,
+        })
         s.send(pkt)
         s.schedule_ping()
 
@@ -431,7 +446,16 @@ class Server(base_server.BaseServer):
         if event in self.handlers:
             def run_handler():
                 try:
-                    return self.handlers[event](*args)
+                    try:
+                        return self.handlers[event](*args)
+                    except TypeError:
+                        if event == 'disconnect' and \
+                                len(args) == 2:  # pragma: no branch
+                            # legacy disconnect events do not have a reason
+                            # argument
+                            return self.handlers[event](args[0])
+                        else:  # pragma: no cover
+                            raise
                 except:
                     self.logger.exception(event + ' handler error')
                     if event == 'connect':
diff --git a/libs/engineio/socket.py b/libs/engineio/socket.py
index de8fd354d..26bb94b51 100644
--- a/libs/engineio/socket.py
+++ b/libs/engineio/socket.py
@@ -48,7 +48,8 @@ class Socket(base_socket.BaseSocket):
         elif pkt.packet_type == packet.UPGRADE:
             self.send(packet.Packet(packet.NOOP))
         elif pkt.packet_type == packet.CLOSE:
-            self.close(wait=False, abort=True)
+            self.close(wait=False, abort=True,
+                       reason=self.server.reason.CLIENT_DISCONNECT)
         else:
             raise exceptions.UnknownPacketError()
 
@@ -63,7 +64,8 @@ class Socket(base_socket.BaseSocket):
             # Passing abort=False here will cause close() to write a
             # CLOSE packet. This has the effect of updating half-open sockets
             # to their correct state of disconnected
-            self.close(wait=False, abort=False)
+            self.close(wait=False, abort=False,
+                       reason=self.server.reason.PING_TIMEOUT)
             return False
         return True
 
@@ -97,7 +99,7 @@ class Socket(base_socket.BaseSocket):
             packets = self.poll()
         except exceptions.QueueEmpty:
             exc = sys.exc_info()
-            self.close(wait=False)
+            self.close(wait=False, reason=self.server.reason.TRANSPORT_ERROR)
             raise exc[1].with_traceback(exc[2])
         return packets
 
@@ -112,11 +114,14 @@ class Socket(base_socket.BaseSocket):
             for pkt in p.packets:
                 self.receive(pkt)
 
-    def close(self, wait=True, abort=False):
+    def close(self, wait=True, abort=False, reason=None):
         """Close the socket connection."""
         if not self.closed and not self.closing:
             self.closing = True
-            self.server._trigger_event('disconnect', self.sid, run_async=False)
+            self.server._trigger_event(
+                'disconnect', self.sid,
+                reason or self.server.reason.SERVER_DISCONNECT,
+                run_async=False)
             if not abort:
                 self.send(packet.Packet(packet.CLOSE))
             self.closed = True
@@ -137,7 +142,7 @@ class Socket(base_socket.BaseSocket):
     def _upgrade_websocket(self, environ, start_response):
         """Upgrade the connection from polling to websocket."""
         if self.upgraded:
-            raise IOError('Socket has been upgraded already')
+            raise OSError('Socket has been upgraded already')
         if self.server._async['websocket'] is None:
             # the selected async mode does not support websocket
             return self.server._bad_request()
@@ -245,6 +250,7 @@ class Socket(base_socket.BaseSocket):
 
         self.queue.put(None)  # unlock the writer task so that it can exit
         writer_task.join()
-        self.close(wait=False, abort=True)
+        self.close(wait=False, abort=True,
+                   reason=self.server.reason.TRANSPORT_CLOSE)
 
         return []
diff --git a/libs/enzyme-0.4.1.dist-info/LICENSE b/libs/enzyme-0.4.1.dist-info/LICENSE
deleted file mode 100644
index 32c6448c1..000000000
--- a/libs/enzyme-0.4.1.dist-info/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2013 Antoine Bertin
-
-   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/enzyme-0.4.1.dist-info/METADATA b/libs/enzyme-0.4.1.dist-info/METADATA
deleted file mode 100644
index 9b25f08d6..000000000
--- a/libs/enzyme-0.4.1.dist-info/METADATA
+++ /dev/null
@@ -1,84 +0,0 @@
-Metadata-Version: 2.1
-Name: enzyme
-Version: 0.4.1
-Summary: Python video metadata parser
-Home-page: https://github.com/Diaoul/enzyme
-Author: Antoine Bertin
-Author-email: diaoulael@gmail.com
-License: Apache 2.0
-Keywords: parser video metadata mkv
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software 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.3
-Classifier: Topic :: Multimedia :: Video
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-License-File: LICENSE
-
-Enzyme
-======
-
-Enzyme is a Python module to parse video metadata.
-
-.. image:: https://travis-ci.org/Diaoul/enzyme.png?branch=master
-    :target: https://travis-ci.org/Diaoul/enzyme
-
-
-Usage
------
-Parse a MKV file::
-
-    >>> with open('How.I.Met.Your.Mother.S08E21.720p.HDTV.X264-DIMENSION.mkv', 'rb') as f:
-    ...    mkv = enzyme.MKV(f)
-    ... 
-    >>> mkv.info
-    <Info [title=None, duration=0:20:56.005000, date=2013-04-15 14:06:50]>
-    >>> mkv.video_tracks
-    [<VideoTrack [1, 1280x720, V_MPEG4/ISO/AVC, name=None, language=eng]>]
-    >>> mkv.audio_tracks
-    [<AudioTrack [2, 6 channel(s), 48000Hz, A_AC3, name=None, language=und]>]
-
-
-License
--------
-Apache2
-
-
-Changelog
-=========
-
-0.4.1
------
-**release date:** 2013-11-05
-
-* Fix parsing nested SeekHead elements
-* Make parsing nested SeekHead elements optional
-
-
-0.4.0
------
-**release date:** 2013-10-30
-
-* Import exceptions under enzyme namespace
-* Change repr format
-* Rename base exception
-* Remove test file
-
-
-0.3.1
------
-**release date:** 2013-10-20
-
-* Fix package distribution
-
-
-0.3
----
-**release date:** 2013-05-18
-
-* Complete refactoring, for the old enzyme see https://github.com/Diaoul/enzyme-old
diff --git a/libs/enzyme-0.4.1.dist-info/RECORD b/libs/enzyme-0.4.1.dist-info/RECORD
deleted file mode 100644
index 49c974853..000000000
--- a/libs/enzyme-0.4.1.dist-info/RECORD
+++ /dev/null
@@ -1,20 +0,0 @@
-enzyme-0.4.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-enzyme-0.4.1.dist-info/LICENSE,sha256=e-Z5UoOAO42i94CJeEIdGivqSSmsdwR-3oZCfb8AEuc,580
-enzyme-0.4.1.dist-info/METADATA,sha256=6YCurGi7B_dAlefGG5Jx1nW4Mkh0qDiuoSn7TGHtSfc,1997
-enzyme-0.4.1.dist-info/RECORD,,
-enzyme-0.4.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enzyme-0.4.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-enzyme-0.4.1.dist-info/top_level.txt,sha256=ZnBG41c0gHbSzWViydQBVrwPW1GOY1yM8gJ4dykf98A,7
-enzyme/__init__.py,sha256=Bxt7MSfXw8VjbpmajC1OH7te6Xqj2GX9V7vlDqSQo4g,297
-enzyme/compat.py,sha256=RaScoNq3JzqME2tJG7p3V6LNT8mI7BC8bOBTNl82pvo,227
-enzyme/exceptions.py,sha256=y-sSDZ070RCmpBNqWXXQ91CwPlbXitkYbRhVuRMXRY4,547
-enzyme/mkv.py,sha256=YgESoKgFKGkmLmHkr-yZpLB-_RW6roQJ5AdsFP1_Sd0,15877
-enzyme/parsers/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
-enzyme/parsers/ebml/__init__.py,sha256=H1cI6PdN63O3nKu10qyKgY0SXQFN8mclH0gTozIo3YI,67
-enzyme/parsers/ebml/core.py,sha256=kq3OPCmOhSwfWCuG8jG_IFE4M8WhzhzUNjEKwmzBMpg,9965
-enzyme/parsers/ebml/readers.py,sha256=IIBwXiAhi8bPhjGj0-opLKXVFCQZABPaCefthpkEs2U,7341
-enzyme/parsers/ebml/specs/matroska.xml,sha256=T6pV24Sz_5cHUr3VMt1Zj1Hzr9K4YqjOyS3alZK9xic,51240
-enzyme/tests/__init__.py,sha256=fBPyZdilFRWxA4CnUxzoMLhvpf7EYkssv_rMSRmC4Yc,218
-enzyme/tests/parsers/ebml/test1.mkv.yml,sha256=yAktCo6wXlJMrV9n0QEzSwJcliYHUqXmNamD0njFNr0,156640
-enzyme/tests/test_mkv.py,sha256=SWPzNAdJzn_Ohd8dsNxrcjOcaQl_u90yrpC25qU1Oms,36801
-enzyme/tests/test_parsers.py,sha256=nCgV9TsefwzMvolDGVze0taPUf3icuU3ysr1LlOeFFM,6118
diff --git a/libs/enzyme-0.4.1.dist-info/INSTALLER b/libs/enzyme-0.5.2.dist-info/INSTALLER
similarity index 100%
rename from libs/enzyme-0.4.1.dist-info/INSTALLER
rename to libs/enzyme-0.5.2.dist-info/INSTALLER
diff --git a/libs/enzyme-0.5.2.dist-info/LICENSE b/libs/enzyme-0.5.2.dist-info/LICENSE
new file mode 100644
index 000000000..da9dca7b4
--- /dev/null
+++ b/libs/enzyme-0.5.2.dist-info/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2021 Antoine Bertin
+
+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/enzyme-0.5.2.dist-info/METADATA b/libs/enzyme-0.5.2.dist-info/METADATA
new file mode 100644
index 000000000..abe3ac08b
--- /dev/null
+++ b/libs/enzyme-0.5.2.dist-info/METADATA
@@ -0,0 +1,70 @@
+Metadata-Version: 2.1
+Name: enzyme
+Version: 0.5.2
+Summary: Video metadata parser
+Author-email: Antoine Bertin <ant.bertin@gmail.com>
+Maintainer-email: Antoine Bertin <ant.bertin@gmail.com>
+License: MIT
+Project-URL: homepage, https://github.com/Diaoul/enzyme
+Project-URL: repository, https://github.com/Diaoul/enzyme
+Project-URL: documentation, https://enzyme.readthedocs.org
+Keywords: video,metadata,parser,mkv,matroska,ebml
+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.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
+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'
+Provides-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'
+
+# Enzyme
+
+Enzyme is a Python module to parse video metadata.
+
+## Usage
+
+Parse a MKV file metadata:
+
+```python
+>>> import enzyme
+>>> with open('example.mkv', 'rb') as f:
+...     mkv = enzyme.MKV(f)
+...
+>>> mkv.info
+<Info [title=None, duration=0:00:01.440000, date=2015-03-14 08:40:16]>
+>>> mkv.video_tracks
+[<VideoTrack [2, 720x576, V_DIRAC, name=u'Video\x00', language=None]>]
+>>> mkv.audio_tracks
+[<AudioTrack [1, 2 channel(s), 44100Hz, A_MS/ACM, name=u'Audio\x00', language=None]>]
+```
+
+## License
+
+Enzyme is licensed under the MIT license.
diff --git a/libs/enzyme-0.5.2.dist-info/RECORD b/libs/enzyme-0.5.2.dist-info/RECORD
new file mode 100644
index 000000000..2b02eed08
--- /dev/null
+++ b/libs/enzyme-0.5.2.dist-info/RECORD
@@ -0,0 +1,15 @@
+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/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/top_level.txt,sha256=ZnBG41c0gHbSzWViydQBVrwPW1GOY1yM8gJ4dykf98A,7
+enzyme/__init__.py,sha256=rfY7cJy1R3VIwVczd-GBNIWY2EQeldE-FEybuuDIkOU,266
+enzyme/exceptions.py,sha256=FrxTjGmic1OsDVFORgD-Grj2lgyFXYW-EagU3MiJWhg,528
+enzyme/mkv.py,sha256=p3MkwBEuGnDf2agyJL3ULmQV8eUYnhwN4acM-GCwNwA,16977
+enzyme/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+enzyme/parsers/ebml/__init__.py,sha256=aj4Yd1HNy3fV0zVrZV4VPWIYT1320jTW4jR9ALDECJo,43
+enzyme/parsers/ebml/core.py,sha256=6Jv9no2MVArK1FTOGTtrS4LFUU8ou0HdpumvbzoxyNA,10503
+enzyme/parsers/ebml/readers.py,sha256=Ynystq5Ci9Hya_Tk5sdwkw6M0zQr8rAsw9bRTv77jUU,7274
+enzyme/parsers/ebml/specs/matroska.xml,sha256=T6pV24Sz_5cHUr3VMt1Zj1Hzr9K4YqjOyS3alZK9xic,51240
diff --git a/libs/enzyme-0.4.1.dist-info/REQUESTED b/libs/enzyme-0.5.2.dist-info/REQUESTED
similarity index 100%
rename from libs/enzyme-0.4.1.dist-info/REQUESTED
rename to libs/enzyme-0.5.2.dist-info/REQUESTED
diff --git a/libs/enzyme-0.5.2.dist-info/WHEEL b/libs/enzyme-0.5.2.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/enzyme-0.5.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/enzyme-0.4.1.dist-info/top_level.txt b/libs/enzyme-0.5.2.dist-info/top_level.txt
similarity index 100%
rename from libs/enzyme-0.4.1.dist-info/top_level.txt
rename to libs/enzyme-0.5.2.dist-info/top_level.txt
diff --git a/libs/enzyme/__init__.py b/libs/enzyme/__init__.py
index 3bd89f336..09c5bbcdd 100644
--- a/libs/enzyme/__init__.py
+++ b/libs/enzyme/__init__.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
-__title__ = 'enzyme'
-__version__ = '0.4.1'
-__author__ = 'Antoine Bertin'
-__license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2013 Antoine Bertin'
+__title__ = "enzyme"
+__version__ = "0.5.2"
+__author__ = "Antoine Bertin"
+__license__ = "MIT"
+__copyright__ = "Copyright 2013 Antoine Bertin"
 
 import logging
 from .exceptions import *
diff --git a/libs/enzyme/compat.py b/libs/enzyme/compat.py
deleted file mode 100644
index 81e3a4c9d..000000000
--- a/libs/enzyme/compat.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-
-_ver = sys.version_info
-is_py3 = _ver[0] == 3
-is_py2 = _ver[0] == 2
-
-
-if is_py2:
-    bytes = lambda x: chr(x[0])  # @ReservedAssignment
-elif is_py3:
-    bytes = bytes  # @ReservedAssignment
diff --git a/libs/enzyme/exceptions.py b/libs/enzyme/exceptions.py
index b2252aa47..e7f62a07a 100644
--- a/libs/enzyme/exceptions.py
+++ b/libs/enzyme/exceptions.py
@@ -1,27 +1,31 @@
-# -*- coding: utf-8 -*-
-__all__ = ['Error', 'MalformedMKVError', 'ParserError', 'ReadError', 'SizeError']
+__all__ = ["Error", "MalformedMKVError", "ParserError", "ReadError", "SizeError"]
 
 
 class Error(Exception):
     """Base class for enzyme exceptions"""
+
     pass
 
 
 class MalformedMKVError(Error):
     """Wrong or malformed element found"""
+
     pass
 
 
 class ParserError(Error):
     """Base class for exceptions in parsers"""
+
     pass
 
 
 class ReadError(ParserError):
     """Unable to correctly read"""
+
     pass
 
 
 class SizeError(ParserError):
     """Mismatch between the type of the element and the size of its data"""
+
     pass
diff --git a/libs/enzyme/mkv.py b/libs/enzyme/mkv.py
index 9dbce9bce..88c1a37ae 100644
--- a/libs/enzyme/mkv.py
+++ b/libs/enzyme/mkv.py
@@ -1,12 +1,23 @@
-# -*- coding: utf-8 -*-
 from .exceptions import ParserError, MalformedMKVError
 from .parsers import ebml
 from datetime import timedelta
 import logging
 
 
-__all__ = ['VIDEO_TRACK', 'AUDIO_TRACK', 'SUBTITLE_TRACK', 'MKV', 'Info', 'Track', 'VideoTrack',
-           'AudioTrack', 'SubtitleTrack', 'Tag', 'SimpleTag', 'Chapter']
+__all__ = [
+    "VIDEO_TRACK",
+    "AUDIO_TRACK",
+    "SUBTITLE_TRACK",
+    "MKV",
+    "Info",
+    "Track",
+    "VideoTrack",
+    "AudioTrack",
+    "SubtitleTrack",
+    "Tag",
+    "SimpleTag",
+    "Chapter",
+]
 logger = logging.getLogger(__name__)
 
 
@@ -14,12 +25,13 @@ logger = logging.getLogger(__name__)
 VIDEO_TRACK, AUDIO_TRACK, SUBTITLE_TRACK = 0x01, 0x02, 0x11
 
 
-class MKV(object):
+class MKV:
     """Matroska Video file
 
     :param stream: seekable file-like object
 
     """
+
     def __init__(self, stream, recurse_seek_head=False):
         # default attributes
         self.info = None
@@ -35,73 +47,111 @@ class MKV(object):
 
         try:
             # get the Segment element
-            logger.info('Reading Segment element')
+            logger.info("Reading Segment element")
             specs = ebml.get_matroska_specs()
-            segments = ebml.parse(stream, specs, ignore_element_names=['EBML'], max_level=0)
+            segments = ebml.parse(stream, specs, ignore_element_names=["EBML"], max_level=0)
             if not segments:
-                raise MalformedMKVError('No Segment found')
+                raise MalformedMKVError("No Segment found")
             if len(segments) > 1:
-                logger.warning('%d segments found, using the first one', len(segments))
+                logger.warning("%d segments found, using the first one", len(segments))
             segment = segments[0]
 
             # get and recursively parse the SeekHead element
-            logger.info('Reading SeekHead element')
+            logger.info("Reading SeekHead element")
             stream.seek(segment.position)
             seek_head = ebml.parse_element(stream, specs)
-            if seek_head.name != 'SeekHead':
-                raise MalformedMKVError('No SeekHead found')
-            seek_head.load(stream, specs, ignore_element_names=['Void', 'CRC-32'])
+            if seek_head.name != "SeekHead":
+                raise MalformedMKVError("No SeekHead found")
+            seek_head.load(stream, specs, ignore_element_names=["Void", "CRC-32"])
             self._parse_seekhead(seek_head, segment, stream, specs)
         except ParserError as e:
-            raise MalformedMKVError('Parsing error: %s' % e)
+            raise MalformedMKVError("Parsing error: %s" % e)
 
     def _parse_seekhead(self, seek_head, segment, stream, specs):
         for seek in seek_head:
-            element_id = ebml.read_element_id(seek['SeekID'].data)
+            element_id = ebml.read_element_id(seek["SeekID"].data)
             element_name = specs[element_id][1]
-            element_position = seek['SeekPosition'].data + segment.position
+            element_position = seek["SeekPosition"].data + segment.position
             if element_position in self._parsed_positions:
-                logger.warning('Skipping already parsed %s element at position %d', element_name, element_position)
+                logger.warning("Skipping already parsed %s element at position %d", element_name, element_position)
                 continue
-            if element_name == 'Info':
-                logger.info('Processing element %s from SeekHead at position %d', element_name, element_position)
+            if element_name == "Info":
+                logger.info("Processing element %s from SeekHead at position %d", element_name, element_position)
                 stream.seek(element_position)
-                self.info = Info.fromelement(ebml.parse_element(stream, specs, True, ignore_element_names=['Void', 'CRC-32']))
-            elif element_name == 'Tracks':
-                logger.info('Processing element %s from SeekHead at position %d', element_name, element_position)
+                self.info = Info.fromelement(
+                    ebml.parse_element(stream, specs, True, ignore_element_names=["Void", "CRC-32"])
+                )
+            elif element_name == "Tracks":
+                logger.info("Processing element %s from SeekHead at position %d", element_name, element_position)
                 stream.seek(element_position)
-                tracks = ebml.parse_element(stream, specs, True, ignore_element_names=['Void', 'CRC-32'])
-                self.video_tracks.extend([VideoTrack.fromelement(t) for t in tracks if t['TrackType'].data == VIDEO_TRACK])
-                self.audio_tracks.extend([AudioTrack.fromelement(t) for t in tracks if t['TrackType'].data == AUDIO_TRACK])
-                self.subtitle_tracks.extend([SubtitleTrack.fromelement(t) for t in tracks if t['TrackType'].data == SUBTITLE_TRACK])
-            elif element_name == 'Chapters':
-                logger.info('Processing element %s from SeekHead at position %d', element_name, element_position)
+                tracks = ebml.parse_element(stream, specs, True, ignore_element_names=["Void", "CRC-32"])
+                self.video_tracks.extend(
+                    [VideoTrack.fromelement(t) for t in tracks if t["TrackType"].data == VIDEO_TRACK]
+                )
+                self.audio_tracks.extend(
+                    [AudioTrack.fromelement(t) for t in tracks if t["TrackType"].data == AUDIO_TRACK]
+                )
+                self.subtitle_tracks.extend(
+                    [SubtitleTrack.fromelement(t) for t in tracks if t["TrackType"].data == SUBTITLE_TRACK]
+                )
+            elif element_name == "Chapters":
+                logger.info("Processing element %s from SeekHead at position %d", element_name, element_position)
                 stream.seek(element_position)
-                self.chapters.extend([Chapter.fromelement(c) for c in ebml.parse_element(stream, specs, True, ignore_element_names=['Void', 'CRC-32'])[0] if c.name == 'ChapterAtom'])
-            elif element_name == 'Tags':
-                logger.info('Processing element %s from SeekHead at position %d', element_name, element_position)
+                self.chapters.extend(
+                    [
+                        Chapter.fromelement(c)
+                        for c in ebml.parse_element(stream, specs, True, ignore_element_names=["Void", "CRC-32"])[0]
+                        if c.name == "ChapterAtom"
+                    ]
+                )
+            elif element_name == "Tags":
+                logger.info("Processing element %s from SeekHead at position %d", element_name, element_position)
                 stream.seek(element_position)
-                self.tags.extend([Tag.fromelement(t) for t in ebml.parse_element(stream, specs, True, ignore_element_names=['Void', 'CRC-32'])])
-            elif element_name == 'SeekHead' and self.recurse_seek_head:
-                logger.info('Processing element %s from SeekHead at position %d', element_name, element_position)
+                self.tags.extend(
+                    [
+                        Tag.fromelement(t)
+                        for t in ebml.parse_element(stream, specs, True, ignore_element_names=["Void", "CRC-32"])
+                    ]
+                )
+            elif element_name == "SeekHead" and self.recurse_seek_head:
+                logger.info("Processing element %s from SeekHead at position %d", element_name, element_position)
                 stream.seek(element_position)
-                self._parse_seekhead(ebml.parse_element(stream, specs, True, ignore_element_names=['Void', 'CRC-32']), segment, stream, specs)
+                self._parse_seekhead(
+                    ebml.parse_element(stream, specs, True, ignore_element_names=["Void", "CRC-32"]),
+                    segment,
+                    stream,
+                    specs,
+                )
             else:
-                logger.debug('Element %s ignored', element_name)
+                logger.debug("Element %s ignored", element_name)
             self._parsed_positions.add(element_position)
 
     def to_dict(self):
-        return {'info': self.info.__dict__, 'video_tracks': [t.__dict__ for t in self.video_tracks],
-                'audio_tracks': [t.__dict__ for t in self.audio_tracks], 'subtitle_tracks': [t.__dict__ for t in self.subtitle_tracks],
-                'chapters': [c.__dict__ for c in self.chapters], 'tags': [t.__dict__ for t in self.tags]}
+        return {
+            "info": self.info.__dict__,
+            "video_tracks": [t.__dict__ for t in self.video_tracks],
+            "audio_tracks": [t.__dict__ for t in self.audio_tracks],
+            "subtitle_tracks": [t.__dict__ for t in self.subtitle_tracks],
+            "chapters": [c.__dict__ for c in self.chapters],
+            "tags": [t.__dict__ for t in self.tags],
+        }
 
     def __repr__(self):
-        return '<%s [%r, %r, %r, %r]>' % (self.__class__.__name__, self.info, self.video_tracks, self.audio_tracks, self.subtitle_tracks)
+        return "<%s [%r, %r, %r, %r]>" % (
+            self.__class__.__name__,
+            self.info,
+            self.video_tracks,
+            self.audio_tracks,
+            self.subtitle_tracks,
+        )
 
 
-class Info(object):
+class Info:
     """Object for the Info EBML element"""
-    def __init__(self, title=None, duration=None, date_utc=None, timecode_scale=None, muxing_app=None, writing_app=None):
+
+    def __init__(
+        self, title=None, duration=None, date_utc=None, timecode_scale=None, muxing_app=None, writing_app=None
+    ):
         self.title = title
         self.duration = timedelta(microseconds=duration * (timecode_scale or 1000000) // 1000) if duration else None
         self.date_utc = date_utc
@@ -116,25 +166,42 @@ class Info(object):
         :type element: :class:`~enzyme.parsers.ebml.Element`
 
         """
-        title = element.get('Title')
-        duration = element.get('Duration')
-        date_utc = element.get('DateUTC')
-        timecode_scale = element.get('TimecodeScale')
-        muxing_app = element.get('MuxingApp')
-        writing_app = element.get('WritingApp')
+        title = element.get("Title")
+        duration = element.get("Duration")
+        date_utc = element.get("DateUTC")
+        timecode_scale = element.get("TimecodeScale")
+        muxing_app = element.get("MuxingApp")
+        writing_app = element.get("WritingApp")
         return cls(title, duration, date_utc, timecode_scale, muxing_app, writing_app)
 
     def __repr__(self):
-        return '<%s [title=%r, duration=%s, date=%s]>' % (self.__class__.__name__, self.title, self.duration, self.date_utc)
+        return "<%s [title=%r, duration=%s, date=%s]>" % (
+            self.__class__.__name__,
+            self.title,
+            self.duration,
+            self.date_utc,
+        )
 
     def __str__(self):
         return repr(self.__dict__)
 
 
-class Track(object):
+class Track:
     """Base object for the Tracks EBML element"""
-    def __init__(self, type=None, number=None, name=None, language=None, enabled=None, default=None, forced=None, lacing=None,  # @ReservedAssignment
-                 codec_id=None, codec_name=None):
+
+    def __init__(
+        self,
+        type=None,
+        number=None,
+        name=None,
+        language=None,
+        enabled=None,
+        default=None,
+        forced=None,
+        lacing=None,  # @ReservedAssignment
+        codec_id=None,
+        codec_name=None,
+    ):
         self.type = type
         self.number = number
         self.name = name
@@ -154,21 +221,31 @@ class Track(object):
         :type element: :class:`~enzyme.parsers.ebml.Element`
 
         """
-        type = element.get('TrackType')  # @ReservedAssignment
-        number = element.get('TrackNumber', 0)
-        name = element.get('Name')
-        language = element.get('Language')
-        enabled = bool(element.get('FlagEnabled', 1))
-        default = bool(element.get('FlagDefault', 1))
-        forced = bool(element.get('FlagForced', 0))
-        lacing = bool(element.get('FlagLacing', 1))
-        codec_id = element.get('CodecID')
-        codec_name = element.get('CodecName')
-        return cls(type=type, number=number, name=name, language=language, enabled=enabled, default=default,
-                   forced=forced, lacing=lacing, codec_id=codec_id, codec_name=codec_name)
+        type = element.get("TrackType")  # @ReservedAssignment
+        number = element.get("TrackNumber", 0)
+        name = element.get("Name")
+        language = element.get("Language")
+        enabled = bool(element.get("FlagEnabled", 1))
+        default = bool(element.get("FlagDefault", 1))
+        forced = bool(element.get("FlagForced", 0))
+        lacing = bool(element.get("FlagLacing", 1))
+        codec_id = element.get("CodecID")
+        codec_name = element.get("CodecName")
+        return cls(
+            type=type,
+            number=number,
+            name=name,
+            language=language,
+            enabled=enabled,
+            default=default,
+            forced=forced,
+            lacing=lacing,
+            codec_id=codec_id,
+            codec_name=codec_name,
+        )
 
     def __repr__(self):
-        return '<%s [%d, name=%r, language=%s]>' % (self.__class__.__name__, self.number, self.name, self.language)
+        return "<%s [%d, name=%r, language=%s]>" % (self.__class__.__name__, self.number, self.name, self.language)
 
     def __str__(self):
         return str(self.__dict__)
@@ -176,8 +253,20 @@ class Track(object):
 
 class VideoTrack(Track):
     """Object for the Tracks EBML element with :data:`VIDEO_TRACK` TrackType"""
-    def __init__(self, width=0, height=0, interlaced=False, stereo_mode=None, crop=None,
-                 display_width=None, display_height=None, display_unit=None, aspect_ratio_type=None, **kwargs):
+
+    def __init__(
+        self,
+        width=0,
+        height=0,
+        interlaced=False,
+        stereo_mode=None,
+        crop=None,
+        display_width=None,
+        display_height=None,
+        display_unit=None,
+        aspect_ratio_type=None,
+        **kwargs,
+    ):
         super(VideoTrack, self).__init__(**kwargs)
         self.width = width
         self.height = height
@@ -198,28 +287,35 @@ class VideoTrack(Track):
 
         """
         videotrack = super(VideoTrack, cls).fromelement(element)
-        videotrack.width = element['Video'].get('PixelWidth', 0)
-        videotrack.height = element['Video'].get('PixelHeight', 0)
-        videotrack.interlaced = bool(element['Video'].get('FlagInterlaced', False))
-        videotrack.stereo_mode = element['Video'].get('StereoMode')
+        videotrack.width = element["Video"].get("PixelWidth", 0)
+        videotrack.height = element["Video"].get("PixelHeight", 0)
+        videotrack.interlaced = bool(element["Video"].get("FlagInterlaced", False))
+        videotrack.stereo_mode = element["Video"].get("StereoMode")
         videotrack.crop = {}
-        if 'PixelCropTop' in element['Video']:
-            videotrack.crop['top'] = element['Video']['PixelCropTop']
-        if 'PixelCropBottom' in element['Video']:
-            videotrack.crop['bottom'] = element['Video']['PixelCropBottom']
-        if 'PixelCropLeft' in element['Video']:
-            videotrack.crop['left'] = element['Video']['PixelCropLeft']
-        if 'PixelCropRight' in element['Video']:
-            videotrack.crop['right'] = element['Video']['PixelCropRight']
-        videotrack.display_width = element['Video'].get('DisplayWidth')
-        videotrack.display_height = element['Video'].get('DisplayHeight')
-        videotrack.display_unit = element['Video'].get('DisplayUnit')
-        videotrack.aspect_ratio_type = element['Video'].get('AspectRatioType')
+        if "PixelCropTop" in element["Video"]:
+            videotrack.crop["top"] = element["Video"]["PixelCropTop"]
+        if "PixelCropBottom" in element["Video"]:
+            videotrack.crop["bottom"] = element["Video"]["PixelCropBottom"]
+        if "PixelCropLeft" in element["Video"]:
+            videotrack.crop["left"] = element["Video"]["PixelCropLeft"]
+        if "PixelCropRight" in element["Video"]:
+            videotrack.crop["right"] = element["Video"]["PixelCropRight"]
+        videotrack.display_width = element["Video"].get("DisplayWidth")
+        videotrack.display_height = element["Video"].get("DisplayHeight")
+        videotrack.display_unit = element["Video"].get("DisplayUnit")
+        videotrack.aspect_ratio_type = element["Video"].get("AspectRatioType")
         return videotrack
 
     def __repr__(self):
-        return '<%s [%d, %dx%d, %s, name=%r, language=%s]>' % (self.__class__.__name__, self.number, self.width, self.height,
-                                                            self.codec_id, self.name, self.language)
+        return "<%s [%d, %dx%d, %s, name=%r, language=%s]>" % (
+            self.__class__.__name__,
+            self.number,
+            self.width,
+            self.height,
+            self.codec_id,
+            self.name,
+            self.language,
+        )
 
     def __str__(self):
         return str(self.__dict__)
@@ -227,7 +323,10 @@ class VideoTrack(Track):
 
 class AudioTrack(Track):
     """Object for the Tracks EBML element with :data:`AUDIO_TRACK` TrackType"""
-    def __init__(self, sampling_frequency=None, channels=None, output_sampling_frequency=None, bit_depth=None, **kwargs):
+
+    def __init__(
+        self, sampling_frequency=None, channels=None, output_sampling_frequency=None, bit_depth=None, **kwargs
+    ):
         super(AudioTrack, self).__init__(**kwargs)
         self.sampling_frequency = sampling_frequency
         self.channels = channels
@@ -243,24 +342,33 @@ class AudioTrack(Track):
 
         """
         audiotrack = super(AudioTrack, cls).fromelement(element)
-        audiotrack.sampling_frequency = element['Audio'].get('SamplingFrequency', 8000.0)
-        audiotrack.channels = element['Audio'].get('Channels', 1)
-        audiotrack.output_sampling_frequency = element['Audio'].get('OutputSamplingFrequency')
-        audiotrack.bit_depth = element['Audio'].get('BitDepth')
+        audiotrack.sampling_frequency = element["Audio"].get("SamplingFrequency", 8000.0)
+        audiotrack.channels = element["Audio"].get("Channels", 1)
+        audiotrack.output_sampling_frequency = element["Audio"].get("OutputSamplingFrequency")
+        audiotrack.bit_depth = element["Audio"].get("BitDepth")
         return audiotrack
 
     def __repr__(self):
-        return '<%s [%d, %d channel(s), %.0fHz, %s, name=%r, language=%s]>' % (self.__class__.__name__, self.number, self.channels,
-                                                                            self.sampling_frequency, self.codec_id, self.name, self.language)
+        return "<%s [%d, %d channel(s), %.0fHz, %s, name=%r, language=%s]>" % (
+            self.__class__.__name__,
+            self.number,
+            self.channels,
+            self.sampling_frequency,
+            self.codec_id,
+            self.name,
+            self.language,
+        )
 
 
 class SubtitleTrack(Track):
     """Object for the Tracks EBML element with :data:`SUBTITLE_TRACK` TrackType"""
+
     pass
 
 
-class Tag(object):
+class Tag:
     """Object for the Tag EBML element"""
+
     def __init__(self, targets=None, simpletags=None):
         self.targets = targets if targets is not None else []
         self.simpletags = simpletags if simpletags is not None else []
@@ -273,17 +381,18 @@ class Tag(object):
         :type element: :class:`~enzyme.parsers.ebml.Element`
 
         """
-        targets = element['Targets'] if 'Targets' in element else []
-        simpletags = [SimpleTag.fromelement(s) for s in element if s.name == 'SimpleTag']
+        targets = element["Targets"] if "Targets" in element else []
+        simpletags = [SimpleTag.fromelement(s) for s in element if s.name == "SimpleTag"]
         return cls(targets, simpletags)
 
     def __repr__(self):
-        return '<%s [targets=%r, simpletags=%r]>' % (self.__class__.__name__, self.targets, self.simpletags)
+        return "<%s [targets=%r, simpletags=%r]>" % (self.__class__.__name__, self.targets, self.simpletags)
 
 
-class SimpleTag(object):
+class SimpleTag:
     """Object for the SimpleTag EBML element"""
-    def __init__(self, name, language='und', default=True, string=None, binary=None):
+
+    def __init__(self, name, language="und", default=True, string=None, binary=None):
         self.name = name
         self.language = language
         self.default = default
@@ -298,18 +407,24 @@ class SimpleTag(object):
         :type element: :class:`~enzyme.parsers.ebml.Element`
 
         """
-        name = element.get('TagName')
-        language = element.get('TagLanguage', 'und')
-        default = element.get('TagDefault', True)
-        string = element.get('TagString')
-        binary = element.get('TagBinary')
+        name = element.get("TagName")
+        language = element.get("TagLanguage", "und")
+        default = element.get("TagDefault", True)
+        string = element.get("TagString")
+        binary = element.get("TagBinary")
         return cls(name, language, default, string, binary)
 
     def __repr__(self):
-        return '<%s [%s, language=%s, default=%s, string=%s]>' % (self.__class__.__name__, self.name, self.language, self.default, self.string)
+        return "<%s [%s, language=%s, default=%s, string=%s]>" % (
+            self.__class__.__name__,
+            self.name,
+            self.language,
+            self.default,
+            self.string,
+        )
 
 
-class Chapter(object):
+class Chapter:
     """Object for the ChapterAtom and ChapterDisplay EBML element
 
     .. note::
@@ -318,6 +433,7 @@ class Chapter(object):
         are merged into the :class:`Chapter`
 
     """
+
     def __init__(self, start, hidden=False, enabled=False, end=None, string=None, language=None):
         self.start = start
         self.hidden = hidden
@@ -334,18 +450,20 @@ class Chapter(object):
         :type element: :class:`~enzyme.parsers.ebml.Element`
 
         """
-        start = timedelta(microseconds=element.get('ChapterTimeStart') // 1000)
-        hidden = element.get('ChapterFlagHidden', False)
-        enabled = element.get('ChapterFlagEnabled', True)
-        end = element.get('ChapterTimeEnd')
-        chapterdisplays = [c for c in element if c.name == 'ChapterDisplay']
+        start = timedelta(microseconds=element.get("ChapterTimeStart") // 1000)
+        hidden = element.get("ChapterFlagHidden", False)
+        enabled = element.get("ChapterFlagEnabled", True)
+        end = element.get("ChapterTimeEnd")
+        chapterdisplays = [c for c in element if c.name == "ChapterDisplay"]
         if len(chapterdisplays) > 1:
-            logger.warning('More than 1 (%d) ChapterDisplay element in the ChapterAtom, using the first one', len(chapterdisplays))
+            logger.warning(
+                "More than 1 (%d) ChapterDisplay element in the ChapterAtom, using the first one", len(chapterdisplays)
+            )
         if chapterdisplays:
-            string = chapterdisplays[0].get('ChapString')
-            language = chapterdisplays[0].get('ChapLanguage')
+            string = chapterdisplays[0].get("ChapString")
+            language = chapterdisplays[0].get("ChapLanguage")
             return cls(start, hidden, enabled, end, string, language)
         return cls(start, hidden, enabled, end)
 
     def __repr__(self):
-        return '<%s [%s, enabled=%s]>' % (self.__class__.__name__, self.start, self.enabled)
+        return "<%s [%s, enabled=%s]>" % (self.__class__.__name__, self.start, self.enabled)
diff --git a/libs/enzyme/parsers/__init__.py b/libs/enzyme/parsers/__init__.py
index 40a96afc6..e69de29bb 100644
--- a/libs/enzyme/parsers/__init__.py
+++ b/libs/enzyme/parsers/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/libs/enzyme/parsers/ebml/__init__.py b/libs/enzyme/parsers/ebml/__init__.py
index 04219f8c3..1097fabbb 100644
--- a/libs/enzyme/parsers/ebml/__init__.py
+++ b/libs/enzyme/parsers/ebml/__init__.py
@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 from .core import *
 from .readers import *
diff --git a/libs/enzyme/parsers/ebml/core.py b/libs/enzyme/parsers/ebml/core.py
index ae025ac73..9c25abe42 100644
--- a/libs/enzyme/parsers/ebml/core.py
+++ b/libs/enzyme/parsers/ebml/core.py
@@ -1,14 +1,30 @@
-# -*- coding: utf-8 -*-
 from ...exceptions import ReadError
 from .readers import *
-from pkg_resources import resource_stream  # @UnresolvedImport
 from xml.dom import minidom
 import logging
 
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files  # type: ignore[assignment,no-redef,import-not-found]
 
-__all__ = ['INTEGER', 'UINTEGER', 'FLOAT', 'STRING', 'UNICODE', 'DATE', 'MASTER', 'BINARY',
-           'SPEC_TYPES', 'READERS', 'Element', 'MasterElement', 'parse', 'parse_element',
-           'get_matroska_specs']
+__all__ = [
+    "INTEGER",
+    "UINTEGER",
+    "FLOAT",
+    "STRING",
+    "UNICODE",
+    "DATE",
+    "MASTER",
+    "BINARY",
+    "SPEC_TYPES",
+    "READERS",
+    "Element",
+    "MasterElement",
+    "parse",
+    "parse_element",
+    "get_matroska_specs",
+]
 logger = logging.getLogger(__name__)
 
 
@@ -17,14 +33,14 @@ INTEGER, UINTEGER, FLOAT, STRING, UNICODE, DATE, MASTER, BINARY = range(8)
 
 # Spec types to EBML types mapping
 SPEC_TYPES = {
-    'integer': INTEGER,
-    'uinteger': UINTEGER,
-    'float': FLOAT,
-    'string': STRING,
-    'utf-8': UNICODE,
-    'date': DATE,
-    'master': MASTER,
-    'binary': BINARY
+    "integer": INTEGER,
+    "uinteger": UINTEGER,
+    "float": FLOAT,
+    "string": STRING,
+    "utf-8": UNICODE,
+    "date": DATE,
+    "master": MASTER,
+    "binary": BINARY,
 }
 
 # Readers to use per EBML type
@@ -35,11 +51,11 @@ READERS = {
     STRING: read_element_string,
     UNICODE: read_element_unicode,
     DATE: read_element_date,
-    BINARY: read_element_binary
+    BINARY: read_element_binary,
 }
 
 
-class Element(object):
+class Element:
     """Base object of EBML
 
     :param int id: id of the element, best represented as hexadecimal (0x18538067 for Matroska Segment element)
@@ -52,7 +68,10 @@ class Element(object):
     :param data: data as read by the corresponding :data:`READERS`
 
     """
-    def __init__(self, id=None, type=None, name=None, level=None, position=None, size=None, data=None):  # @ReservedAssignment
+
+    def __init__(
+        self, id=None, type=None, name=None, level=None, position=None, size=None, data=None
+    ):  # @ReservedAssignment
         self.id = id
         self.type = type
         self.name = name
@@ -62,7 +81,7 @@ class Element(object):
         self.data = data
 
     def __repr__(self):
-        return '<%s [%s, %r]>' % (self.__class__.__name__, self.name, self.data)
+        return "<%s [%s, %r]>" % (self.__class__.__name__, self.name, self.data)
 
 
 class MasterElement(Element):
@@ -89,6 +108,7 @@ class MasterElement(Element):
         Element(DocType, u'matroska')
 
     """
+
     def __init__(self, id=None, name=None, level=None, position=None, size=None, data=None):  # @ReservedAssignment
         super(MasterElement, self).__init__(id, MASTER, name, level, position, size, data)
 
@@ -118,7 +138,7 @@ class MasterElement(Element):
             return default
         element = self[name]
         if element.type == MASTER:
-            raise ValueError('%s is a MasterElement' % name)
+            raise ValueError("%s is a MasterElement" % name)
         return element.data
 
     def __getitem__(self, key):
@@ -128,7 +148,7 @@ class MasterElement(Element):
         if not children:
             raise KeyError(key)
         if len(children) > 1:
-            raise KeyError('More than 1 child with key %s (%d)' % (key, len(children)))
+            raise KeyError("More than 1 child with key %s (%d)" % (key, len(children)))
         return children[0]
 
     def __contains__(self, item):
@@ -165,19 +185,31 @@ def parse(stream, specs, size=None, ignore_element_types=None, ignore_element_na
             element = parse_element(stream, specs)
             if element is None:
                 continue
-            logger.debug('%s %s parsed', element.__class__.__name__, element.name)
+            logger.debug("%s %s parsed", element.__class__.__name__, element.name)
             if element.type in ignore_element_types or element.name in ignore_element_names:
-                logger.info('%s %s ignored', element.__class__.__name__, element.name)
+                logger.info("%s %s ignored", element.__class__.__name__, element.name)
                 if element.type == MASTER:
                     stream.seek(element.size, 1)
                 continue
             if element.type == MASTER:
                 if max_level is not None and element.level >= max_level:
-                    logger.info('Maximum level %d reached for children of %s %s', max_level, element.__class__.__name__, element.name)
+                    logger.info(
+                        "Maximum level %d reached for children of %s %s",
+                        max_level,
+                        element.__class__.__name__,
+                        element.name,
+                    )
                     stream.seek(element.size, 1)
                 else:
-                    logger.debug('Loading child elements for %s %s with size %d', element.__class__.__name__, element.name, element.size)
-                    element.data = parse(stream, specs, element.size, ignore_element_types, ignore_element_names, max_level)
+                    logger.debug(
+                        "Loading child elements for %s %s with size %d",
+                        element.__class__.__name__,
+                        element.name,
+                        element.size,
+                    )
+                    element.data = parse(
+                        stream, specs, element.size, ignore_element_types, ignore_element_names, max_level
+                    )
             elements.append(element)
         except ReadError:
             if size is not None:
@@ -186,7 +218,9 @@ def parse(stream, specs, size=None, ignore_element_types=None, ignore_element_na
     return elements
 
 
-def parse_element(stream, specs, load_children=False, ignore_element_types=None, ignore_element_names=None, max_level=None):
+def parse_element(
+    stream, specs, load_children=False, ignore_element_types=None, ignore_element_names=None, max_level=None
+):
     """Extract a single :class:`Element` from the `stream` according to the `specs`
 
     :param stream: file-like object from which to read
@@ -203,12 +237,12 @@ def parse_element(stream, specs, load_children=False, ignore_element_types=None,
     ignore_element_names = ignore_element_names if ignore_element_names is not None else []
     element_id = read_element_id(stream)
     if element_id is None:
-        raise ReadError('Cannot read element id')
+        raise ReadError("Cannot read element id")
     element_size = read_element_size(stream)
     if element_size is None:
-        raise ReadError('Cannot read element size')
+        raise ReadError("Cannot read element size")
     if element_id not in specs:
-        logger.error('Element with id 0x%x is not in the specs' % element_id)
+        logger.error("Element with id 0x%x is not in the specs" % element_id)
         stream.seek(element_size, 1)
         return None
     element_type, element_name, element_level = specs[element_id]
@@ -231,9 +265,14 @@ def get_matroska_specs(webm_only=False):
 
     """
     specs = {}
-    with resource_stream(__name__, 'specs/matroska.xml') as resource:
+    spec_file = files(__package__).joinpath("specs", "matroska.xml")
+    with spec_file.open("rb") as resource:
         xmldoc = minidom.parse(resource)
-        for element in xmldoc.getElementsByTagName('element'):
-            if not webm_only or element.hasAttribute('webm') and element.getAttribute('webm') == '1':
-                specs[int(element.getAttribute('id'), 16)] = (SPEC_TYPES[element.getAttribute('type')], element.getAttribute('name'), int(element.getAttribute('level')))
+        for element in xmldoc.getElementsByTagName("element"):
+            if not webm_only or element.hasAttribute("webm") and element.getAttribute("webm") == "1":
+                specs[int(element.getAttribute("id"), 16)] = (
+                    SPEC_TYPES[element.getAttribute("type")],
+                    element.getAttribute("name"),
+                    int(element.getAttribute("level")),
+                )
     return specs
diff --git a/libs/enzyme/parsers/ebml/readers.py b/libs/enzyme/parsers/ebml/readers.py
index 3c9709b77..c4153805b 100644
--- a/libs/enzyme/parsers/ebml/readers.py
+++ b/libs/enzyme/parsers/ebml/readers.py
@@ -1,14 +1,20 @@
-# -*- coding: utf-8 -*-
-from ...compat import bytes
 from ...exceptions import ReadError, SizeError
 from datetime import datetime, timedelta
 from io import BytesIO
 from struct import unpack
 
 
-__all__ = ['read_element_id', 'read_element_size', 'read_element_integer', 'read_element_uinteger',
-           'read_element_float', 'read_element_string', 'read_element_unicode', 'read_element_date',
-           'read_element_binary']
+__all__ = [
+    "read_element_id",
+    "read_element_size",
+    "read_element_integer",
+    "read_element_uinteger",
+    "read_element_float",
+    "read_element_string",
+    "read_element_unicode",
+    "read_element_date",
+    "read_element_binary",
+]
 
 
 def _read(stream, size):
@@ -24,7 +30,7 @@ def _read(stream, size):
     """
     data = stream.read(size)
     if len(data) < size:
-        raise ReadError('Less than %d bytes read (%d)' % (size, len(data)))
+        raise ReadError("Less than %d bytes read (%d)" % (size, len(data)))
     return data
 
 
@@ -42,14 +48,14 @@ def read_element_id(stream):
     if byte & 0x80:
         return byte
     elif byte & 0x40:
-        return unpack('>H', char + _read(stream, 1))[0]
+        return unpack(">H", char + _read(stream, 1))[0]
     elif byte & 0x20:
-        b, h = unpack('>BH', char + _read(stream, 2))
-        return b * 2 ** 16 + h
+        b, h = unpack(">BH", char + _read(stream, 2))
+        return b * 2**16 + h
     elif byte & 0x10:
-        return unpack('>L', char + _read(stream, 3))[0]
+        return unpack(">L", char + _read(stream, 3))[0]
     else:
-        ValueError('Not an Element ID')
+        ValueError("Not an Element ID")
 
 
 def read_element_size(stream):
@@ -64,27 +70,27 @@ def read_element_size(stream):
     char = _read(stream, 1)
     byte = ord(char)
     if byte & 0x80:
-        return unpack('>B', bytes((byte ^ 0x80,)))[0]
+        return unpack(">B", bytes((byte ^ 0x80,)))[0]
     elif byte & 0x40:
-        return unpack('>H', bytes((byte ^ 0x40,)) + _read(stream, 1))[0]
+        return unpack(">H", bytes((byte ^ 0x40,)) + _read(stream, 1))[0]
     elif byte & 0x20:
-        b, h = unpack('>BH', bytes((byte ^ 0x20,)) + _read(stream, 2))
-        return b * 2 ** 16 + h
+        b, h = unpack(">BH", bytes((byte ^ 0x20,)) + _read(stream, 2))
+        return b * 2**16 + h
     elif byte & 0x10:
-        return unpack('>L', bytes((byte ^ 0x10,)) + _read(stream, 3))[0]
+        return unpack(">L", bytes((byte ^ 0x10,)) + _read(stream, 3))[0]
     elif byte & 0x08:
-        b, l = unpack('>BL', bytes((byte ^ 0x08,)) + _read(stream, 4))
-        return b * 2 ** 32 + l
+        b, l = unpack(">BL", bytes((byte ^ 0x08,)) + _read(stream, 4))
+        return b * 2**32 + l
     elif byte & 0x04:
-        h, l = unpack('>HL', bytes((byte ^ 0x04,)) + _read(stream, 5))
-        return h * 2 ** 32 + l
+        h, l = unpack(">HL", bytes((byte ^ 0x04,)) + _read(stream, 5))
+        return h * 2**32 + l
     elif byte & 0x02:
-        b, h, l = unpack('>BHL', bytes((byte ^ 0x02,)) + _read(stream, 6))
-        return b * 2 ** 48 + h * 2 ** 32 + l
+        b, h, l = unpack(">BHL", bytes((byte ^ 0x02,)) + _read(stream, 6))
+        return b * 2**48 + h * 2**32 + l
     elif byte & 0x01:
-        return unpack('>Q', bytes((byte ^ 0x01,)) + _read(stream, 7))[0]
+        return unpack(">Q", bytes((byte ^ 0x01,)) + _read(stream, 7))[0]
     else:
-        ValueError('Not an Element Size')
+        ValueError("Not an Element Size")
 
 
 def read_element_integer(stream, size):
@@ -99,25 +105,25 @@ def read_element_integer(stream, size):
 
     """
     if size == 1:
-        return unpack('>b', _read(stream, 1))[0]
+        return unpack(">b", _read(stream, 1))[0]
     elif size == 2:
-        return unpack('>h', _read(stream, 2))[0]
+        return unpack(">h", _read(stream, 2))[0]
     elif size == 3:
-        b, h = unpack('>bH', _read(stream, 3))
-        return b * 2 ** 16 + h
+        b, h = unpack(">bH", _read(stream, 3))
+        return b * 2**16 + h
     elif size == 4:
-        return unpack('>l', _read(stream, 4))[0]
+        return unpack(">l", _read(stream, 4))[0]
     elif size == 5:
-        b, l = unpack('>bL', _read(stream, 5))
-        return b * 2 ** 32 + l
+        b, l = unpack(">bL", _read(stream, 5))
+        return b * 2**32 + l
     elif size == 6:
-        h, l = unpack('>hL', _read(stream, 6))
-        return h * 2 ** 32 + l
+        h, l = unpack(">hL", _read(stream, 6))
+        return h * 2**32 + l
     elif size == 7:
-        b, h, l = unpack('>bHL', _read(stream, 7))
-        return b * 2 ** 48 + h * 2 ** 32 + l
+        b, h, l = unpack(">bHL", _read(stream, 7))
+        return b * 2**48 + h * 2**32 + l
     elif size == 8:
-        return unpack('>q', _read(stream, 8))[0]
+        return unpack(">q", _read(stream, 8))[0]
     else:
         raise SizeError(size)
 
@@ -134,25 +140,25 @@ def read_element_uinteger(stream, size):
 
     """
     if size == 1:
-        return unpack('>B', _read(stream, 1))[0]
+        return unpack(">B", _read(stream, 1))[0]
     elif size == 2:
-        return unpack('>H', _read(stream, 2))[0]
+        return unpack(">H", _read(stream, 2))[0]
     elif size == 3:
-        b, h = unpack('>BH', _read(stream, 3))
-        return b * 2 ** 16 + h
+        b, h = unpack(">BH", _read(stream, 3))
+        return b * 2**16 + h
     elif size == 4:
-        return unpack('>L', _read(stream, 4))[0]
+        return unpack(">L", _read(stream, 4))[0]
     elif size == 5:
-        b, l = unpack('>BL', _read(stream, 5))
-        return b * 2 ** 32 + l
+        b, l = unpack(">BL", _read(stream, 5))
+        return b * 2**32 + l
     elif size == 6:
-        h, l = unpack('>HL', _read(stream, 6))
-        return h * 2 ** 32 + l
+        h, l = unpack(">HL", _read(stream, 6))
+        return h * 2**32 + l
     elif size == 7:
-        b, h, l = unpack('>BHL', _read(stream, 7))
-        return b * 2 ** 48 + h * 2 ** 32 + l
+        b, h, l = unpack(">BHL", _read(stream, 7))
+        return b * 2**48 + h * 2**32 + l
     elif size == 8:
-        return unpack('>Q', _read(stream, 8))[0]
+        return unpack(">Q", _read(stream, 8))[0]
     else:
         raise SizeError(size)
 
@@ -169,9 +175,9 @@ def read_element_float(stream, size):
 
     """
     if size == 4:
-        return unpack('>f', _read(stream, 4))[0]
+        return unpack(">f", _read(stream, 4))[0]
     elif size == 8:
-        return unpack('>d', _read(stream, 8))[0]
+        return unpack(">d", _read(stream, 8))[0]
     else:
         raise SizeError(size)
 
@@ -187,7 +193,7 @@ def read_element_string(stream, size):
     :rtype: unicode
 
     """
-    return _read(stream, size).decode('ascii')
+    return _read(stream, size).decode("ascii")
 
 
 def read_element_unicode(stream, size):
@@ -201,7 +207,7 @@ def read_element_unicode(stream, size):
     :rtype: unicode
 
     """
-    return _read(stream, size).decode('utf-8')
+    return _read(stream, size).decode("utf-8")
 
 
 def read_element_date(stream, size):
@@ -217,7 +223,7 @@ def read_element_date(stream, size):
     """
     if size != 8:
         raise SizeError(size)
-    nanoseconds = unpack('>q', _read(stream, 8))[0]
+    nanoseconds = unpack(">q", _read(stream, 8))[0]
     return datetime(2001, 1, 1, 0, 0, 0, 0, None) + timedelta(microseconds=nanoseconds // 1000)
 
 
diff --git a/libs/enzyme/tests/__init__.py b/libs/enzyme/tests/__init__.py
deleted file mode 100644
index 426d3598f..000000000
--- a/libs/enzyme/tests/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import test_mkv, test_parsers
-import unittest
-
-
-suite = unittest.TestSuite([test_mkv.suite(), test_parsers.suite()])
-
-
-if __name__ == '__main__':
-    unittest.TextTestRunner().run(suite)
diff --git a/libs/enzyme/tests/parsers/ebml/test1.mkv.yml b/libs/enzyme/tests/parsers/ebml/test1.mkv.yml
deleted file mode 100644
index 92642ec5d..000000000
--- a/libs/enzyme/tests/parsers/ebml/test1.mkv.yml
+++ /dev/null
@@ -1,2974 +0,0 @@
-- - 440786851
-  - 6
-  - EBML
-  - 0
-  - 5
-  - 19
-  - - [17026, 3, DocType, 1, 8, 8, matroska]
-    - [17031, 1, DocTypeVersion, 1, 19, 1, 2]
-    - [17029, 1, DocTypeReadVersion, 1, 23, 1, 2]
-- - 408125543
-  - 6
-  - Segment
-  - 0
-  - 32
-  - 23339305
-  - - - 290298740
-      - 6
-      - SeekHead
-      - 1
-      - 37
-      - 59
-      - - - 19899
-          - 6
-          - Seek
-          - 2
-          - 40
-          - 11
-          - - [21419, 7, SeekID, 3, 43, 4, null]
-            - [21420, 1, SeekPosition, 3, 50, 1, 64]
-        - - 19899
-          - 6
-          - Seek
-          - 2
-          - 54
-          - 12
-          - - [21419, 7, SeekID, 3, 57, 4, null]
-            - [21420, 1, SeekPosition, 3, 64, 2, 275]
-        - - 19899
-          - 6
-          - Seek
-          - 2
-          - 69
-          - 12
-          - - [21419, 7, SeekID, 3, 72, 4, null]
-            - [21420, 1, SeekPosition, 3, 79, 2, 440]
-        - - 19899
-          - 6
-          - Seek
-          - 2
-          - 84
-          - 12
-          - - [21419, 7, SeekID, 3, 87, 4, null]
-            - [21420, 1, SeekPosition, 3, 94, 2, 602]
-    - - 357149030
-      - 6
-      - Info
-      - 1
-      - 102
-      - 205
-      - - [17545, 2, Duration, 2, 105, 4, 87336.0]
-        - [19840, 4, MuxingApp, 2, 112, 39, libebml2 v0.10.0 + libmatroska2 v0.10.1]
-        - [22337, 4, WritingApp, 2, 154, 123, 'mkclean 0.5.5 ru from libebml v1.0.0
-            + libmatroska v1.0.0 + mkvmerge v4.1.1 (''Bouncin'' Back'') built on Jul  3
-            2010 22:54:08']
-        - [17505, 5, DateUTC, 2, 280, 8, !!timestamp '2010-08-21 07:23:03']
-        - [29604, 7, SegmentUID, 2, 291, 16, null]
-    - - 374648427
-      - 6
-      - Tracks
-      - 1
-      - 313
-      - 159
-      - - - 174
-          - 6
-          - TrackEntry
-          - 2
-          - 315
-          - 105
-          - - [215, 1, TrackNumber, 3, 317, 1, 1]
-            - [131, 1, TrackType, 3, 320, 1, 1]
-            - [134, 3, CodecID, 3, 323, 15, V_MS/VFW/FOURCC]
-            - [29637, 1, TrackUID, 3, 341, 4, 2422994868]
-            - [156, 1, FlagLacing, 3, 347, 1, 0]
-            - [28135, 1, MinCache, 3, 351, 1, 1]
-            - [25506, 7, CodecPrivate, 3, 355, 40, null]
-            - [2352003, 1, DefaultDuration, 3, 399, 4, 41666666]
-            - [2274716, 3, Language, 3, 407, 3, und]
-            - - 224
-              - 6
-              - Video
-              - 3
-              - 412
-              - 8
-              - - [176, 1, PixelWidth, 4, 414, 2, 854]
-                - [186, 1, PixelHeight, 4, 418, 2, 480]
-        - - 174
-          - 6
-          - TrackEntry
-          - 2
-          - 422
-          - 50
-          - - [215, 1, TrackNumber, 3, 424, 1, 2]
-            - [131, 1, TrackType, 3, 427, 1, 2]
-            - [134, 3, CodecID, 3, 430, 9, A_MPEG/L3]
-            - [29637, 1, TrackUID, 3, 442, 4, 3653291187]
-            - [2352003, 1, DefaultDuration, 3, 450, 4, 24000000]
-            - [2274716, 3, Language, 3, 458, 3, und]
-            - - 225
-              - 6
-              - Audio
-              - 3
-              - 463
-              - 9
-              - - [181, 2, SamplingFrequency, 4, 465, 4, 48000.0]
-                - [159, 1, Channels, 4, 471, 1, 2]
-    - - 307544935
-      - 6
-      - Tags
-      - 1
-      - 478
-      - 156
-      - - - 29555
-          - 6
-          - Tag
-          - 2
-          - 482
-          - 152
-          - - - 25536
-              - 6
-              - Targets
-              - 3
-              - 485
-              - 0
-              - []
-            - - 26568
-              - 6
-              - SimpleTag
-              - 3
-              - 488
-              - 34
-              - - [17827, 4, TagName, 4, 491, 5, TITLE]
-                - [17543, 4, TagString, 4, 499, 23, Big Buck Bunny - test 1]
-            - - 26568
-              - 6
-              - SimpleTag
-              - 3
-              - 525
-              - 23
-              - - [17827, 4, TagName, 4, 528, 13, DATE_RELEASED]
-                - [17543, 4, TagString, 4, 544, 4, '2010']
-            - - 26568
-              - 6
-              - SimpleTag
-              - 3
-              - 551
-              - 83
-              - - [17827, 4, TagName, 4, 554, 7, COMMENT]
-                - [17543, 4, TagString, 4, 564, 70, 'Matroska Validation File1, basic
-                    MPEG4.2 and MP3 with only SimpleBlock']
-    - - 475249515
-      - 6
-      - Cues
-      - 1
-      - 640
-      - 163
-      - - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 642
-          - 12
-          - - [179, 1, CueTime, 3, 644, 1, 0]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 647
-              - 7
-              - - [247, 1, CueTrack, 4, 649, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 652, 2, 771]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 656
-          - 14
-          - - [179, 1, CueTime, 3, 658, 2, 1042]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 662
-              - 8
-              - - [247, 1, CueTrack, 4, 664, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 667, 3, 145582]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 672
-          - 14
-          - - [179, 1, CueTime, 3, 674, 2, 11667]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 678
-              - 8
-              - - [247, 1, CueTrack, 4, 680, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 683, 3, 3131552]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 688
-          - 14
-          - - [179, 1, CueTime, 3, 690, 2, 22083]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 694
-              - 8
-              - - [247, 1, CueTrack, 4, 696, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 699, 3, 5654336]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 704
-          - 14
-          - - [179, 1, CueTime, 3, 706, 2, 32500]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 710
-              - 8
-              - - [247, 1, CueTrack, 4, 712, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 715, 3, 9696374]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 720
-          - 14
-          - - [179, 1, CueTime, 3, 722, 2, 42917]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 726
-              - 8
-              - - [247, 1, CueTrack, 4, 728, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 731, 3, 13440514]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 736
-          - 14
-          - - [179, 1, CueTime, 3, 738, 2, 53333]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 742
-              - 8
-              - - [247, 1, CueTrack, 4, 744, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 747, 3, 16690071]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 752
-          - 15
-          - - [179, 1, CueTime, 3, 754, 2, 56083]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 758
-              - 9
-              - - [247, 1, CueTrack, 4, 760, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 763, 4, 17468879]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 769
-          - 16
-          - - [179, 1, CueTime, 3, 771, 3, 66500]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 776
-              - 9
-              - - [247, 1, CueTrack, 4, 778, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 781, 4, 18628759]
-        - - 187
-          - 6
-          - CuePoint
-          - 2
-          - 787
-          - 16
-          - - [179, 1, CueTime, 3, 789, 3, 76917]
-            - - 183
-              - 6
-              - CueTrackPositions
-              - 3
-              - 794
-              - 9
-              - - [247, 1, CueTrack, 4, 796, 1, 1]
-                - [241, 1, CueClusterPosition, 4, 799, 4, 20732433]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 810
-      - 144804
-      - - [231, 1, Timecode, 2, 812, 1, 0]
-        - [163, 7, SimpleBlock, 2, 816, 5008, null]
-        - [163, 7, SimpleBlock, 2, 5827, 4464, null]
-        - [163, 7, SimpleBlock, 2, 10294, 303, null]
-        - [163, 7, SimpleBlock, 2, 10600, 303, null]
-        - [163, 7, SimpleBlock, 2, 10906, 208, null]
-        - [163, 7, SimpleBlock, 2, 11117, 676, null]
-        - [163, 7, SimpleBlock, 2, 11796, 2465, null]
-        - [163, 7, SimpleBlock, 2, 14264, 2794, null]
-        - [163, 7, SimpleBlock, 2, 17061, 4486, null]
-        - [163, 7, SimpleBlock, 2, 21550, 4966, null]
-        - [163, 7, SimpleBlock, 2, 26519, 580, null]
-        - [163, 7, SimpleBlock, 2, 27102, 4476, null]
-        - [163, 7, SimpleBlock, 2, 31581, 3077, null]
-        - [163, 7, SimpleBlock, 2, 34661, 4485, null]
-        - [163, 7, SimpleBlock, 2, 39149, 5117, null]
-        - [163, 7, SimpleBlock, 2, 44269, 1639, null]
-        - [163, 7, SimpleBlock, 2, 45911, 4521, null]
-        - [163, 7, SimpleBlock, 2, 50435, 772, null]
-        - [163, 7, SimpleBlock, 2, 51210, 4543, null]
-        - [163, 7, SimpleBlock, 2, 55756, 3371, null]
-        - [163, 7, SimpleBlock, 2, 59130, 4602, null]
-        - [163, 7, SimpleBlock, 2, 63735, 5427, null]
-        - [163, 7, SimpleBlock, 2, 69165, 1735, null]
-        - [163, 7, SimpleBlock, 2, 70903, 4790, null]
-        - [163, 7, SimpleBlock, 2, 75696, 772, null]
-        - [163, 7, SimpleBlock, 2, 76471, 4905, null]
-        - [163, 7, SimpleBlock, 2, 81379, 1639, null]
-        - [163, 7, SimpleBlock, 2, 83021, 5052, null]
-        - [163, 7, SimpleBlock, 2, 88076, 2697, null]
-        - [163, 7, SimpleBlock, 2, 90776, 5215, null]
-        - [163, 7, SimpleBlock, 2, 95994, 3371, null]
-        - [163, 7, SimpleBlock, 2, 99368, 5630, null]
-        - [163, 7, SimpleBlock, 2, 105001, 5582, null]
-        - [163, 7, SimpleBlock, 2, 110586, 5696, null]
-        - [163, 7, SimpleBlock, 2, 116285, 2505, null]
-        - [163, 7, SimpleBlock, 2, 118793, 6002, null]
-        - [163, 7, SimpleBlock, 2, 124798, 5794, null]
-        - [163, 7, SimpleBlock, 2, 130595, 2601, null]
-        - [163, 7, SimpleBlock, 2, 133199, 6520, null]
-        - [163, 7, SimpleBlock, 2, 139722, 5892, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 145621
-      - 41405
-      - - [231, 1, Timecode, 2, 145623, 2, 1042]
-        - [163, 7, SimpleBlock, 2, 145628, 964, null]
-        - [163, 7, SimpleBlock, 2, 146595, 2504, null]
-        - [163, 7, SimpleBlock, 2, 149102, 7082, null]
-        - [163, 7, SimpleBlock, 2, 156187, 6024, null]
-        - [163, 7, SimpleBlock, 2, 162214, 4237, null]
-        - [163, 7, SimpleBlock, 2, 166454, 7739, null]
-        - [163, 7, SimpleBlock, 2, 174196, 6210, null]
-        - [163, 7, SimpleBlock, 2, 180409, 6617, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 187034
-      - 2944550
-      - - [231, 1, Timecode, 2, 187036, 2, 1250]
-        - [163, 7, SimpleBlock, 2, 187041, 772, null]
-        - [163, 7, SimpleBlock, 2, 187816, 6736, null]
-        - [163, 7, SimpleBlock, 2, 194555, 8731, null]
-        - [163, 7, SimpleBlock, 2, 203289, 6522, null]
-        - [163, 7, SimpleBlock, 2, 209814, 7087, null]
-        - [163, 7, SimpleBlock, 2, 216904, 7323, null]
-        - [163, 7, SimpleBlock, 2, 224230, 7629, null]
-        - [163, 7, SimpleBlock, 2, 231862, 6546, null]
-        - [163, 7, SimpleBlock, 2, 238411, 7860, null]
-        - [163, 7, SimpleBlock, 2, 246274, 7989, null]
-        - [163, 7, SimpleBlock, 2, 254266, 8281, null]
-        - [163, 7, SimpleBlock, 2, 262550, 8399, null]
-        - [163, 7, SimpleBlock, 2, 270952, 5967, null]
-        - [163, 7, SimpleBlock, 2, 276922, 8557, null]
-        - [163, 7, SimpleBlock, 2, 285482, 8820, null]
-        - [163, 7, SimpleBlock, 2, 294305, 8886, null]
-        - [163, 7, SimpleBlock, 2, 303194, 8997, null]
-        - [163, 7, SimpleBlock, 2, 312194, 9160, null]
-        - [163, 7, SimpleBlock, 2, 321357, 6643, null]
-        - [163, 7, SimpleBlock, 2, 328003, 9359, null]
-        - [163, 7, SimpleBlock, 2, 337365, 9630, null]
-        - [163, 7, SimpleBlock, 2, 346998, 10035, null]
-        - [163, 7, SimpleBlock, 2, 357036, 10450, null]
-        - [163, 7, SimpleBlock, 2, 367489, 6641, null]
-        - [163, 7, SimpleBlock, 2, 374133, 11054, null]
-        - [163, 7, SimpleBlock, 2, 385190, 11571, null]
-        - [163, 7, SimpleBlock, 2, 396764, 11910, null]
-        - [163, 7, SimpleBlock, 2, 408677, 4492, null]
-        - [163, 7, SimpleBlock, 2, 413172, 4513, null]
-        - [163, 7, SimpleBlock, 2, 417688, 6931, null]
-        - [163, 7, SimpleBlock, 2, 424622, 5450, null]
-        - [163, 7, SimpleBlock, 2, 430075, 5226, null]
-        - [163, 7, SimpleBlock, 2, 435304, 5387, null]
-        - [163, 7, SimpleBlock, 2, 440694, 5433, null]
-        - [163, 7, SimpleBlock, 2, 446130, 5557, null]
-        - [163, 7, SimpleBlock, 2, 451690, 6163, null]
-        - [163, 7, SimpleBlock, 2, 457856, 5576, null]
-        - [163, 7, SimpleBlock, 2, 463435, 5832, null]
-        - [163, 7, SimpleBlock, 2, 469270, 5718, null]
-        - [163, 7, SimpleBlock, 2, 474991, 5658, null]
-        - [163, 7, SimpleBlock, 2, 480652, 6161, null]
-        - [163, 7, SimpleBlock, 2, 486816, 5455, null]
-        - [163, 7, SimpleBlock, 2, 492274, 5361, null]
-        - [163, 7, SimpleBlock, 2, 497638, 5391, null]
-        - [163, 7, SimpleBlock, 2, 503032, 5249, null]
-        - [163, 7, SimpleBlock, 2, 508284, 5241, null]
-        - [163, 7, SimpleBlock, 2, 513528, 6161, null]
-        - [163, 7, SimpleBlock, 2, 519692, 5189, null]
-        - [163, 7, SimpleBlock, 2, 524884, 5186, null]
-        - [163, 7, SimpleBlock, 2, 530073, 5185, null]
-        - [163, 7, SimpleBlock, 2, 535261, 5443, null]
-        - [163, 7, SimpleBlock, 2, 540707, 5587, null]
-        - [163, 7, SimpleBlock, 2, 546297, 5559, null]
-        - [163, 7, SimpleBlock, 2, 551859, 5899, null]
-        - [163, 7, SimpleBlock, 2, 557761, 6247, null]
-        - [163, 7, SimpleBlock, 2, 564011, 6210, null]
-        - [163, 7, SimpleBlock, 2, 570224, 6362, null]
-        - [163, 7, SimpleBlock, 2, 576589, 5776, null]
-        - [163, 7, SimpleBlock, 2, 582368, 6608, null]
-        - [163, 7, SimpleBlock, 2, 588979, 6560, null]
-        - [163, 7, SimpleBlock, 2, 595542, 6658, null]
-        - [163, 7, SimpleBlock, 2, 602203, 7020, null]
-        - [163, 7, SimpleBlock, 2, 609226, 7107, null]
-        - [163, 7, SimpleBlock, 2, 616336, 6063, null]
-        - [163, 7, SimpleBlock, 2, 622402, 7022, null]
-        - [163, 7, SimpleBlock, 2, 629427, 7149, null]
-        - [163, 7, SimpleBlock, 2, 636579, 7180, null]
-        - [163, 7, SimpleBlock, 2, 643762, 7213, null]
-        - [163, 7, SimpleBlock, 2, 650978, 5967, null]
-        - [163, 7, SimpleBlock, 2, 656948, 7189, null]
-        - [163, 7, SimpleBlock, 2, 664140, 7478, null]
-        - [163, 7, SimpleBlock, 2, 671621, 7488, null]
-        - [163, 7, SimpleBlock, 2, 679112, 7491, null]
-        - [163, 7, SimpleBlock, 2, 686606, 7515, null]
-        - [163, 7, SimpleBlock, 2, 694124, 5873, null]
-        - [163, 7, SimpleBlock, 2, 700000, 7718, null]
-        - [163, 7, SimpleBlock, 2, 707721, 7485, null]
-        - [163, 7, SimpleBlock, 2, 715209, 7448, null]
-        - [163, 7, SimpleBlock, 2, 722660, 7483, null]
-        - [163, 7, SimpleBlock, 2, 730146, 7497, null]
-        - [163, 7, SimpleBlock, 2, 737646, 5682, null]
-        - [163, 7, SimpleBlock, 2, 743331, 7583, null]
-        - [163, 7, SimpleBlock, 2, 750917, 7666, null]
-        - [163, 7, SimpleBlock, 2, 758586, 7792, null]
-        - [163, 7, SimpleBlock, 2, 766381, 7810, null]
-        - [163, 7, SimpleBlock, 2, 774194, 5778, null]
-        - [163, 7, SimpleBlock, 2, 779975, 7823, null]
-        - [163, 7, SimpleBlock, 2, 787801, 7962, null]
-        - [163, 7, SimpleBlock, 2, 795766, 8032, null]
-        - [163, 7, SimpleBlock, 2, 803801, 8119, null]
-        - [163, 7, SimpleBlock, 2, 811923, 8142, null]
-        - [163, 7, SimpleBlock, 2, 820068, 5874, null]
-        - [163, 7, SimpleBlock, 2, 825945, 8045, null]
-        - [163, 7, SimpleBlock, 2, 833993, 8247, null]
-        - [163, 7, SimpleBlock, 2, 842243, 8393, null]
-        - [163, 7, SimpleBlock, 2, 850639, 8264, null]
-        - [163, 7, SimpleBlock, 2, 858906, 6062, null]
-        - [163, 7, SimpleBlock, 2, 864971, 8456, null]
-        - [163, 7, SimpleBlock, 2, 873430, 8595, null]
-        - [163, 7, SimpleBlock, 2, 882028, 8604, null]
-        - [163, 7, SimpleBlock, 2, 890635, 8690, null]
-        - [163, 7, SimpleBlock, 2, 899328, 8682, null]
-        - [163, 7, SimpleBlock, 2, 908013, 5874, null]
-        - [163, 7, SimpleBlock, 2, 913890, 8927, null]
-        - [163, 7, SimpleBlock, 2, 922820, 8768, null]
-        - [163, 7, SimpleBlock, 2, 931591, 9073, null]
-        - [163, 7, SimpleBlock, 2, 940667, 9001, null]
-        - [163, 7, SimpleBlock, 2, 949671, 8907, null]
-        - [163, 7, SimpleBlock, 2, 958581, 5873, null]
-        - [163, 7, SimpleBlock, 2, 964457, 8930, null]
-        - [163, 7, SimpleBlock, 2, 973390, 8900, null]
-        - [163, 7, SimpleBlock, 2, 982293, 9019, null]
-        - [163, 7, SimpleBlock, 2, 991315, 9005, null]
-        - [163, 7, SimpleBlock, 2, 1000323, 5873, null]
-        - [163, 7, SimpleBlock, 2, 1006199, 9000, null]
-        - [163, 7, SimpleBlock, 2, 1015202, 9075, null]
-        - [163, 7, SimpleBlock, 2, 1024280, 9002, null]
-        - [163, 7, SimpleBlock, 2, 1033285, 9161, null]
-        - [163, 7, SimpleBlock, 2, 1042449, 9136, null]
-        - [163, 7, SimpleBlock, 2, 1051588, 5682, null]
-        - [163, 7, SimpleBlock, 2, 1057273, 9178, null]
-        - [163, 7, SimpleBlock, 2, 1066454, 9207, null]
-        - [163, 7, SimpleBlock, 2, 1075664, 9305, null]
-        - [163, 7, SimpleBlock, 2, 1084972, 9626, null]
-        - [163, 7, SimpleBlock, 2, 1094601, 5873, null]
-        - [163, 7, SimpleBlock, 2, 1100477, 9755, null]
-        - [163, 7, SimpleBlock, 2, 1110235, 9724, null]
-        - [163, 7, SimpleBlock, 2, 1119962, 9933, null]
-        - [163, 7, SimpleBlock, 2, 1129898, 9880, null]
-        - [163, 7, SimpleBlock, 2, 1139781, 10249, null]
-        - [163, 7, SimpleBlock, 2, 1150033, 6350, null]
-        - [163, 7, SimpleBlock, 2, 1156386, 10265, null]
-        - [163, 7, SimpleBlock, 2, 1166654, 10385, null]
-        - [163, 7, SimpleBlock, 2, 1177042, 10350, null]
-        - [163, 7, SimpleBlock, 2, 1187395, 10340, null]
-        - [163, 7, SimpleBlock, 2, 1197738, 10483, null]
-        - [163, 7, SimpleBlock, 2, 1208224, 6739, null]
-        - [163, 7, SimpleBlock, 2, 1214966, 10579, null]
-        - [163, 7, SimpleBlock, 2, 1225548, 10512, null]
-        - [163, 7, SimpleBlock, 2, 1236063, 10449, null]
-        - [163, 7, SimpleBlock, 2, 1246515, 10633, null]
-        - [163, 7, SimpleBlock, 2, 1257151, 6642, null]
-        - [163, 7, SimpleBlock, 2, 1263796, 10454, null]
-        - [163, 7, SimpleBlock, 2, 1274253, 10695, null]
-        - [163, 7, SimpleBlock, 2, 1284951, 10452, null]
-        - [163, 7, SimpleBlock, 2, 1295406, 10663, null]
-        - [163, 7, SimpleBlock, 2, 1306072, 10309, null]
-        - [163, 7, SimpleBlock, 2, 1316384, 6547, null]
-        - [163, 7, SimpleBlock, 2, 1322934, 10359, null]
-        - [163, 7, SimpleBlock, 2, 1333296, 10337, null]
-        - [163, 7, SimpleBlock, 2, 1343636, 10027, null]
-        - [163, 7, SimpleBlock, 2, 1353666, 9883, null]
-        - [163, 7, SimpleBlock, 2, 1363552, 6451, null]
-        - [163, 7, SimpleBlock, 2, 1370006, 9643, null]
-        - [163, 7, SimpleBlock, 2, 1379652, 9148, null]
-        - [163, 7, SimpleBlock, 2, 1388803, 8794, null]
-        - [163, 7, SimpleBlock, 2, 1397600, 8468, null]
-        - [163, 7, SimpleBlock, 2, 1406071, 8372, null]
-        - [163, 7, SimpleBlock, 2, 1414446, 6835, null]
-        - [163, 7, SimpleBlock, 2, 1421284, 8121, null]
-        - [163, 7, SimpleBlock, 2, 1429408, 8022, null]
-        - [163, 7, SimpleBlock, 2, 1437433, 8096, null]
-        - [163, 7, SimpleBlock, 2, 1445532, 7920, null]
-        - [163, 7, SimpleBlock, 2, 1453455, 7699, null]
-        - [163, 7, SimpleBlock, 2, 1461157, 6545, null]
-        - [163, 7, SimpleBlock, 2, 1467705, 7707, null]
-        - [163, 7, SimpleBlock, 2, 1475415, 7821, null]
-        - [163, 7, SimpleBlock, 2, 1483239, 7978, null]
-        - [163, 7, SimpleBlock, 2, 1491220, 8241, null]
-        - [163, 7, SimpleBlock, 2, 1499464, 5778, null]
-        - [163, 7, SimpleBlock, 2, 1505245, 8282, null]
-        - [163, 7, SimpleBlock, 2, 1513530, 8598, null]
-        - [163, 7, SimpleBlock, 2, 1522131, 9098, null]
-        - [163, 7, SimpleBlock, 2, 1531232, 9644, null]
-        - [163, 7, SimpleBlock, 2, 1540879, 10086, null]
-        - [163, 7, SimpleBlock, 2, 1550968, 5779, null]
-        - [163, 7, SimpleBlock, 2, 1556750, 10191, null]
-        - [163, 7, SimpleBlock, 2, 1566944, 10458, null]
-        - [163, 7, SimpleBlock, 2, 1577405, 10570, null]
-        - [163, 7, SimpleBlock, 2, 1587978, 11074, null]
-        - [163, 7, SimpleBlock, 2, 1599055, 6158, null]
-        - [163, 7, SimpleBlock, 2, 1605216, 11120, null]
-        - [163, 7, SimpleBlock, 2, 1616339, 11421, null]
-        - [163, 7, SimpleBlock, 2, 1627763, 11589, null]
-        - [163, 7, SimpleBlock, 2, 1639355, 11727, null]
-        - [163, 7, SimpleBlock, 2, 1651085, 11990, null]
-        - [163, 7, SimpleBlock, 2, 1663078, 6352, null]
-        - [163, 7, SimpleBlock, 2, 1669433, 12178, null]
-        - [163, 7, SimpleBlock, 2, 1681614, 12242, null]
-        - [163, 7, SimpleBlock, 2, 1693859, 12403, null]
-        - [163, 7, SimpleBlock, 2, 1706265, 12268, null]
-        - [163, 7, SimpleBlock, 2, 1718536, 12507, null]
-        - [163, 7, SimpleBlock, 2, 1731046, 6450, null]
-        - [163, 7, SimpleBlock, 2, 1737499, 12548, null]
-        - [163, 7, SimpleBlock, 2, 1750050, 12540, null]
-        - [163, 7, SimpleBlock, 2, 1762593, 12616, null]
-        - [163, 7, SimpleBlock, 2, 1775212, 12497, null]
-        - [163, 7, SimpleBlock, 2, 1787712, 5586, null]
-        - [163, 7, SimpleBlock, 2, 1793301, 12619, null]
-        - [163, 7, SimpleBlock, 2, 1805923, 12645, null]
-        - [163, 7, SimpleBlock, 2, 1818571, 12819, null]
-        - [163, 7, SimpleBlock, 2, 1831393, 12553, null]
-        - [163, 7, SimpleBlock, 2, 1843949, 12186, null]
-        - [163, 7, SimpleBlock, 2, 1856138, 6349, null]
-        - [163, 7, SimpleBlock, 2, 1862490, 12232, null]
-        - [163, 7, SimpleBlock, 2, 1874725, 11787, null]
-        - [163, 7, SimpleBlock, 2, 1886515, 12022, null]
-        - [163, 7, SimpleBlock, 2, 1898540, 11715, null]
-        - [163, 7, SimpleBlock, 2, 1910258, 11778, null]
-        - [163, 7, SimpleBlock, 2, 1922039, 6258, null]
-        - [163, 7, SimpleBlock, 2, 1928300, 11504, null]
-        - [163, 7, SimpleBlock, 2, 1939807, 11427, null]
-        - [163, 7, SimpleBlock, 2, 1951237, 11323, null]
-        - [163, 7, SimpleBlock, 2, 1962563, 10800, null]
-        - [163, 7, SimpleBlock, 2, 1973366, 6258, null]
-        - [163, 7, SimpleBlock, 2, 1979627, 10602, null]
-        - [163, 7, SimpleBlock, 2, 1990232, 10219, null]
-        - [163, 7, SimpleBlock, 2, 2000454, 9952, null]
-        - [163, 7, SimpleBlock, 2, 2010409, 10054, null]
-        - [163, 7, SimpleBlock, 2, 2020466, 10129, null]
-        - [163, 7, SimpleBlock, 2, 2030598, 6065, null]
-        - [163, 7, SimpleBlock, 2, 2036666, 10124, null]
-        - [163, 7, SimpleBlock, 2, 2046793, 10209, null]
-        - [163, 7, SimpleBlock, 2, 2057005, 10584, null]
-        - [163, 7, SimpleBlock, 2, 2067592, 10618, null]
-        - [163, 7, SimpleBlock, 2, 2078213, 5970, null]
-        - [163, 7, SimpleBlock, 2, 2084186, 11182, null]
-        - [163, 7, SimpleBlock, 2, 2095371, 11631, null]
-        - [163, 7, SimpleBlock, 2, 2107005, 12268, null]
-        - [163, 7, SimpleBlock, 2, 2119276, 13038, null]
-        - [163, 7, SimpleBlock, 2, 2132317, 13455, null]
-        - [163, 7, SimpleBlock, 2, 2145775, 5970, null]
-        - [163, 7, SimpleBlock, 2, 2151748, 13833, null]
-        - [163, 7, SimpleBlock, 2, 2165584, 13984, null]
-        - [163, 7, SimpleBlock, 2, 2179571, 13708, null]
-        - [163, 7, SimpleBlock, 2, 2193282, 13782, null]
-        - [163, 7, SimpleBlock, 2, 2207067, 14245, null]
-        - [163, 7, SimpleBlock, 2, 2221315, 5680, null]
-        - [163, 7, SimpleBlock, 2, 2226998, 14394, null]
-        - [163, 7, SimpleBlock, 2, 2241395, 14877, null]
-        - [163, 7, SimpleBlock, 2, 2256275, 15072, null]
-        - [163, 7, SimpleBlock, 2, 2271350, 15391, null]
-        - [163, 7, SimpleBlock, 2, 2286744, 5680, null]
-        - [163, 7, SimpleBlock, 2, 2292427, 15642, null]
-        - [163, 7, SimpleBlock, 2, 2308072, 15860, null]
-        - [163, 7, SimpleBlock, 2, 2323935, 16213, null]
-        - [163, 7, SimpleBlock, 2, 2340152, 16528, null]
-        - [163, 7, SimpleBlock, 2, 2356684, 16926, null]
-        - [163, 7, SimpleBlock, 2, 2373613, 5585, null]
-        - [163, 7, SimpleBlock, 2, 2379202, 16873, null]
-        - [163, 7, SimpleBlock, 2, 2396079, 17018, null]
-        - [163, 7, SimpleBlock, 2, 2413101, 16919, null]
-        - [163, 7, SimpleBlock, 2, 2430024, 17045, null]
-        - [163, 7, SimpleBlock, 2, 2447072, 5392, null]
-        - [163, 7, SimpleBlock, 2, 2452468, 16885, null]
-        - [163, 7, SimpleBlock, 2, 2469357, 16916, null]
-        - [163, 7, SimpleBlock, 2, 2486277, 16981, null]
-        - [163, 7, SimpleBlock, 2, 2503262, 16714, null]
-        - [163, 7, SimpleBlock, 2, 2519980, 16876, null]
-        - [163, 7, SimpleBlock, 2, 2536859, 5583, null]
-        - [163, 7, SimpleBlock, 2, 2542446, 16975, null]
-        - [163, 7, SimpleBlock, 2, 2559425, 17112, null]
-        - [163, 7, SimpleBlock, 2, 2576541, 17040, null]
-        - [163, 7, SimpleBlock, 2, 2593585, 17198, null]
-        - [163, 7, SimpleBlock, 2, 2610787, 17325, null]
-        - [163, 7, SimpleBlock, 2, 2628115, 5967, null]
-        - [163, 7, SimpleBlock, 2, 2634086, 17301, null]
-        - [163, 7, SimpleBlock, 2, 2651391, 17363, null]
-        - [163, 7, SimpleBlock, 2, 2668758, 17444, null]
-        - [163, 7, SimpleBlock, 2, 2686206, 17214, null]
-        - [163, 7, SimpleBlock, 2, 2703423, 5968, null]
-        - [163, 7, SimpleBlock, 2, 2709395, 16998, null]
-        - [163, 7, SimpleBlock, 2, 2726397, 16808, null]
-        - [163, 7, SimpleBlock, 2, 2743208, 16300, null]
-        - [163, 7, SimpleBlock, 2, 2759511, 16046, null]
-        - [163, 7, SimpleBlock, 2, 2775560, 15219, null]
-        - [163, 7, SimpleBlock, 2, 2790782, 2313, null]
-        - [163, 7, SimpleBlock, 2, 2793098, 15047, null]
-        - [163, 7, SimpleBlock, 2, 2808148, 14767, null]
-        - [163, 7, SimpleBlock, 2, 2822918, 6352, null]
-        - [163, 7, SimpleBlock, 2, 2829273, 14386, null]
-        - [163, 7, SimpleBlock, 2, 2843662, 14226, null]
-        - [163, 7, SimpleBlock, 2, 2857891, 14208, null]
-        - [163, 7, SimpleBlock, 2, 2872102, 14241, null]
-        - [163, 7, SimpleBlock, 2, 2886346, 5970, null]
-        - [163, 7, SimpleBlock, 2, 2892319, 13992, null]
-        - [163, 7, SimpleBlock, 2, 2906314, 14075, null]
-        - [163, 7, SimpleBlock, 2, 2920392, 13939, null]
-        - [163, 7, SimpleBlock, 2, 2934334, 13791, null]
-        - [163, 7, SimpleBlock, 2, 2948128, 13671, null]
-        - [163, 7, SimpleBlock, 2, 2961802, 5874, null]
-        - [163, 7, SimpleBlock, 2, 2967679, 13547, null]
-        - [163, 7, SimpleBlock, 2, 2981229, 13453, null]
-        - [163, 7, SimpleBlock, 2, 2994685, 13272, null]
-        - [163, 7, SimpleBlock, 2, 3007960, 12962, null]
-        - [163, 7, SimpleBlock, 2, 3020925, 5777, null]
-        - [163, 7, SimpleBlock, 2, 3026705, 12709, null]
-        - [163, 7, SimpleBlock, 2, 3039417, 12244, null]
-        - [163, 7, SimpleBlock, 2, 3051664, 12266, null]
-        - [163, 7, SimpleBlock, 2, 3063933, 12052, null]
-        - [163, 7, SimpleBlock, 2, 3075988, 11674, null]
-        - [163, 7, SimpleBlock, 2, 3087665, 4334, null]
-        - [163, 7, SimpleBlock, 2, 3092002, 10707, null]
-        - [163, 7, SimpleBlock, 2, 3102712, 10379, null]
-        - [163, 7, SimpleBlock, 2, 3113094, 9656, null]
-        - [163, 7, SimpleBlock, 2, 3122753, 8831, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 3131592
-      - 2522776
-      - - [231, 1, Timecode, 2, 3131594, 2, 11667]
-        - [163, 7, SimpleBlock, 2, 3131599, 676, null]
-        - [163, 7, SimpleBlock, 2, 3132278, 6066, null]
-        - [163, 7, SimpleBlock, 2, 3138348, 76018, null]
-        - [163, 7, SimpleBlock, 2, 3214369, 1660, null]
-        - [163, 7, SimpleBlock, 2, 3216032, 2664, null]
-        - [163, 7, SimpleBlock, 2, 3218699, 2864, null]
-        - [163, 7, SimpleBlock, 2, 3221566, 2369, null]
-        - [163, 7, SimpleBlock, 2, 3223938, 6547, null]
-        - [163, 7, SimpleBlock, 2, 3230489, 91368, null]
-        - [163, 7, SimpleBlock, 2, 3321860, 8748, null]
-        - [163, 7, SimpleBlock, 2, 3330611, 13105, null]
-        - [163, 7, SimpleBlock, 2, 3343719, 13051, null]
-        - [163, 7, SimpleBlock, 2, 3356773, 6641, null]
-        - [163, 7, SimpleBlock, 2, 3363417, 13474, null]
-        - [163, 7, SimpleBlock, 2, 3376894, 14246, null]
-        - [163, 7, SimpleBlock, 2, 3391143, 14613, null]
-        - [163, 7, SimpleBlock, 2, 3405759, 15195, null]
-        - [163, 7, SimpleBlock, 2, 3420957, 15310, null]
-        - [163, 7, SimpleBlock, 2, 3436270, 6546, null]
-        - [163, 7, SimpleBlock, 2, 3442819, 15441, null]
-        - [163, 7, SimpleBlock, 2, 3458263, 15653, null]
-        - [163, 7, SimpleBlock, 2, 3473919, 15680, null]
-        - [163, 7, SimpleBlock, 2, 3489602, 15627, null]
-        - [163, 7, SimpleBlock, 2, 3505232, 6547, null]
-        - [163, 7, SimpleBlock, 2, 3511782, 15376, null]
-        - [163, 7, SimpleBlock, 2, 3527161, 15431, null]
-        - [163, 7, SimpleBlock, 2, 3542595, 15411, null]
-        - [163, 7, SimpleBlock, 2, 3558009, 15211, null]
-        - [163, 7, SimpleBlock, 2, 3573223, 15589, null]
-        - [163, 7, SimpleBlock, 2, 3588815, 6353, null]
-        - [163, 7, SimpleBlock, 2, 3595171, 15450, null]
-        - [163, 7, SimpleBlock, 2, 3610624, 15443, null]
-        - [163, 7, SimpleBlock, 2, 3626070, 15422, null]
-        - [163, 7, SimpleBlock, 2, 3641495, 15484, null]
-        - [163, 7, SimpleBlock, 2, 3656982, 15369, null]
-        - [163, 7, SimpleBlock, 2, 3672354, 6543, null]
-        - [163, 7, SimpleBlock, 2, 3678900, 15472, null]
-        - [163, 7, SimpleBlock, 2, 3694375, 15538, null]
-        - [163, 7, SimpleBlock, 2, 3709916, 15403, null]
-        - [163, 7, SimpleBlock, 2, 3725322, 15527, null]
-        - [163, 7, SimpleBlock, 2, 3740852, 6353, null]
-        - [163, 7, SimpleBlock, 2, 3747208, 15560, null]
-        - [163, 7, SimpleBlock, 2, 3762771, 15725, null]
-        - [163, 7, SimpleBlock, 2, 3778499, 15805, null]
-        - [163, 7, SimpleBlock, 2, 3794307, 16012, null]
-        - [163, 7, SimpleBlock, 2, 3810322, 15586, null]
-        - [163, 7, SimpleBlock, 2, 3825911, 6355, null]
-        - [163, 7, SimpleBlock, 2, 3832269, 15751, null]
-        - [163, 7, SimpleBlock, 2, 3848023, 15878, null]
-        - [163, 7, SimpleBlock, 2, 3863904, 16069, null]
-        - [163, 7, SimpleBlock, 2, 3879976, 16014, null]
-        - [163, 7, SimpleBlock, 2, 3895993, 6641, null]
-        - [163, 7, SimpleBlock, 2, 3902637, 15962, null]
-        - [163, 7, SimpleBlock, 2, 3918602, 16056, null]
-        - [163, 7, SimpleBlock, 2, 3934661, 16113, null]
-        - [163, 7, SimpleBlock, 2, 3950777, 15808, null]
-        - [163, 7, SimpleBlock, 2, 3966588, 15957, null]
-        - [163, 7, SimpleBlock, 2, 3982548, 5872, null]
-        - [163, 7, SimpleBlock, 2, 3988423, 16047, null]
-        - [163, 7, SimpleBlock, 2, 4004473, 15885, null]
-        - [163, 7, SimpleBlock, 2, 4020361, 15939, null]
-        - [163, 7, SimpleBlock, 2, 4036303, 16219, null]
-        - [163, 7, SimpleBlock, 2, 4052525, 16099, null]
-        - [163, 7, SimpleBlock, 2, 4068627, 5969, null]
-        - [163, 7, SimpleBlock, 2, 4074599, 16044, null]
-        - [163, 7, SimpleBlock, 2, 4090646, 15843, null]
-        - [163, 7, SimpleBlock, 2, 4106492, 15565, null]
-        - [163, 7, SimpleBlock, 2, 4122060, 15513, null]
-        - [163, 7, SimpleBlock, 2, 4137576, 5969, null]
-        - [163, 7, SimpleBlock, 2, 4143548, 15671, null]
-        - [163, 7, SimpleBlock, 2, 4159222, 15472, null]
-        - [163, 7, SimpleBlock, 2, 4174697, 15694, null]
-        - [163, 7, SimpleBlock, 2, 4190394, 15367, null]
-        - [163, 7, SimpleBlock, 2, 4205764, 15550, null]
-        - [163, 7, SimpleBlock, 2, 4221317, 5874, null]
-        - [163, 7, SimpleBlock, 2, 4227194, 15799, null]
-        - [163, 7, SimpleBlock, 2, 4242996, 15468, null]
-        - [163, 7, SimpleBlock, 2, 4258467, 15683, null]
-        - [163, 7, SimpleBlock, 2, 4274153, 15831, null]
-        - [163, 7, SimpleBlock, 2, 4289987, 15649, null]
-        - [163, 7, SimpleBlock, 2, 4305639, 6161, null]
-        - [163, 7, SimpleBlock, 2, 4311803, 15674, null]
-        - [163, 7, SimpleBlock, 2, 4327480, 15947, null]
-        - [163, 7, SimpleBlock, 2, 4343430, 15950, null]
-        - [163, 7, SimpleBlock, 2, 4359383, 16024, null]
-        - [163, 7, SimpleBlock, 2, 4375410, 6546, null]
-        - [163, 7, SimpleBlock, 2, 4381959, 15905, null]
-        - [163, 7, SimpleBlock, 2, 4397867, 15804, null]
-        - [163, 7, SimpleBlock, 2, 4413674, 15923, null]
-        - [163, 7, SimpleBlock, 2, 4429600, 16016, null]
-        - [163, 7, SimpleBlock, 2, 4445619, 15976, null]
-        - [163, 7, SimpleBlock, 2, 4461598, 6161, null]
-        - [163, 7, SimpleBlock, 2, 4467762, 15653, null]
-        - [163, 7, SimpleBlock, 2, 4483418, 15624, null]
-        - [163, 7, SimpleBlock, 2, 4499045, 15816, null]
-        - [163, 7, SimpleBlock, 2, 4514864, 15789, null]
-        - [163, 7, SimpleBlock, 2, 4530656, 6065, null]
-        - [163, 7, SimpleBlock, 2, 4536724, 15807, null]
-        - [163, 7, SimpleBlock, 2, 4552534, 15778, null]
-        - [163, 7, SimpleBlock, 2, 4568315, 16016, null]
-        - [163, 7, SimpleBlock, 2, 4584335, 16391, null]
-        - [163, 7, SimpleBlock, 2, 4600729, 16213, null]
-        - [163, 7, SimpleBlock, 2, 4616945, 5968, null]
-        - [163, 7, SimpleBlock, 2, 4622917, 16515, null]
-        - [163, 7, SimpleBlock, 2, 4639436, 16489, null]
-        - [163, 7, SimpleBlock, 2, 4655928, 16261, null]
-        - [163, 7, SimpleBlock, 2, 4672193, 16569, null]
-        - [163, 7, SimpleBlock, 2, 4688766, 16611, null]
-        - [163, 7, SimpleBlock, 2, 4705380, 6162, null]
-        - [163, 7, SimpleBlock, 2, 4711545, 16272, null]
-        - [163, 7, SimpleBlock, 2, 4727821, 16456, null]
-        - [163, 7, SimpleBlock, 2, 4744281, 16625, null]
-        - [163, 7, SimpleBlock, 2, 4760909, 16309, null]
-        - [163, 7, SimpleBlock, 2, 4777221, 6257, null]
-        - [163, 7, SimpleBlock, 2, 4783481, 16124, null]
-        - [163, 7, SimpleBlock, 2, 4799608, 16054, null]
-        - [163, 7, SimpleBlock, 2, 4815665, 16133, null]
-        - [163, 7, SimpleBlock, 2, 4831801, 16104, null]
-        - [163, 7, SimpleBlock, 2, 4847908, 16074, null]
-        - [163, 7, SimpleBlock, 2, 4863985, 6257, null]
-        - [163, 7, SimpleBlock, 2, 4870245, 15985, null]
-        - [163, 7, SimpleBlock, 2, 4886234, 30557, null]
-        - [163, 7, SimpleBlock, 2, 4916794, 1070, null]
-        - [163, 7, SimpleBlock, 2, 4917867, 1018, null]
-        - [163, 7, SimpleBlock, 2, 4918888, 6547, null]
-        - [163, 7, SimpleBlock, 2, 4925438, 999, null]
-        - [163, 7, SimpleBlock, 2, 4926440, 978, null]
-        - [163, 7, SimpleBlock, 2, 4927421, 1346, null]
-        - [163, 7, SimpleBlock, 2, 4928770, 961, null]
-        - [163, 7, SimpleBlock, 2, 4929734, 2286, null]
-        - [163, 7, SimpleBlock, 2, 4932023, 6739, null]
-        - [163, 7, SimpleBlock, 2, 4938765, 4122, null]
-        - [163, 7, SimpleBlock, 2, 4942890, 4871, null]
-        - [163, 7, SimpleBlock, 2, 4947764, 4809, null]
-        - [163, 7, SimpleBlock, 2, 4952576, 3777, null]
-        - [163, 7, SimpleBlock, 2, 4956356, 4788, null]
-        - [163, 7, SimpleBlock, 2, 4961147, 6451, null]
-        - [163, 7, SimpleBlock, 2, 4967601, 5463, null]
-        - [163, 7, SimpleBlock, 2, 4973067, 6989, null]
-        - [163, 7, SimpleBlock, 2, 4980059, 8594, null]
-        - [163, 7, SimpleBlock, 2, 4988656, 8170, null]
-        - [163, 7, SimpleBlock, 2, 4996829, 6545, null]
-        - [163, 7, SimpleBlock, 2, 5003377, 3838, null]
-        - [163, 7, SimpleBlock, 2, 5007218, 3437, null]
-        - [163, 7, SimpleBlock, 2, 5010658, 2846, null]
-        - [163, 7, SimpleBlock, 2, 5013507, 2664, null]
-        - [163, 7, SimpleBlock, 2, 5016174, 2312, null]
-        - [163, 7, SimpleBlock, 2, 5018489, 6449, null]
-        - [163, 7, SimpleBlock, 2, 5024941, 2172, null]
-        - [163, 7, SimpleBlock, 2, 5027116, 2268, null]
-        - [163, 7, SimpleBlock, 2, 5029387, 2394, null]
-        - [163, 7, SimpleBlock, 2, 5031784, 2501, null]
-        - [163, 7, SimpleBlock, 2, 5034288, 6450, null]
-        - [163, 7, SimpleBlock, 2, 5040741, 2616, null]
-        - [163, 7, SimpleBlock, 2, 5043360, 2571, null]
-        - [163, 7, SimpleBlock, 2, 5045934, 2547, null]
-        - [163, 7, SimpleBlock, 2, 5048484, 2487, null]
-        - [163, 7, SimpleBlock, 2, 5050974, 2602, null]
-        - [163, 7, SimpleBlock, 2, 5053579, 6354, null]
-        - [163, 7, SimpleBlock, 2, 5059936, 2173, null]
-        - [163, 7, SimpleBlock, 2, 5062112, 2151, null]
-        - [163, 7, SimpleBlock, 2, 5064266, 2176, null]
-        - [163, 7, SimpleBlock, 2, 5066445, 2030, null]
-        - [163, 7, SimpleBlock, 2, 5068478, 1997, null]
-        - [163, 7, SimpleBlock, 2, 5070478, 6257, null]
-        - [163, 7, SimpleBlock, 2, 5076738, 1716, null]
-        - [163, 7, SimpleBlock, 2, 5078457, 3963, null]
-        - [163, 7, SimpleBlock, 2, 5082423, 6863, null]
-        - [163, 7, SimpleBlock, 2, 5089289, 5119, null]
-        - [163, 7, SimpleBlock, 2, 5094411, 5199, null]
-        - [163, 7, SimpleBlock, 2, 5099613, 3255, null]
-        - [163, 7, SimpleBlock, 2, 5102871, 4286, null]
-        - [163, 7, SimpleBlock, 2, 5107160, 5759, null]
-        - [163, 7, SimpleBlock, 2, 5112922, 6331, null]
-        - [163, 7, SimpleBlock, 2, 5119256, 6585, null]
-        - [163, 7, SimpleBlock, 2, 5125844, 5201, null]
-        - [163, 7, SimpleBlock, 2, 5131048, 5612, null]
-        - [163, 7, SimpleBlock, 2, 5136663, 4421, null]
-        - [163, 7, SimpleBlock, 2, 5141087, 4525, null]
-        - [163, 7, SimpleBlock, 2, 5145615, 4141, null]
-        - [163, 7, SimpleBlock, 2, 5149759, 5490, null]
-        - [163, 7, SimpleBlock, 2, 5155252, 3473, null]
-        - [163, 7, SimpleBlock, 2, 5158728, 2837, null]
-        - [163, 7, SimpleBlock, 2, 5161568, 3132, null]
-        - [163, 7, SimpleBlock, 2, 5164703, 3646, null]
-        - [163, 7, SimpleBlock, 2, 5168352, 5469, null]
-        - [163, 7, SimpleBlock, 2, 5173824, 5873, null]
-        - [163, 7, SimpleBlock, 2, 5179700, 8756, null]
-        - [163, 7, SimpleBlock, 2, 5188459, 9327, null]
-        - [163, 7, SimpleBlock, 2, 5197789, 8557, null]
-        - [163, 7, SimpleBlock, 2, 5206349, 6774, null]
-        - [163, 7, SimpleBlock, 2, 5213126, 2800, null]
-        - [163, 7, SimpleBlock, 2, 5215929, 6159, null]
-        - [163, 7, SimpleBlock, 2, 5222091, 2426, null]
-        - [163, 7, SimpleBlock, 2, 5224520, 2308, null]
-        - [163, 7, SimpleBlock, 2, 5226831, 2065, null]
-        - [163, 7, SimpleBlock, 2, 5228899, 1848, null]
-        - [163, 7, SimpleBlock, 2, 5230750, 5969, null]
-        - [163, 7, SimpleBlock, 2, 5236722, 1791, null]
-        - [163, 7, SimpleBlock, 2, 5238516, 1759, null]
-        - [163, 7, SimpleBlock, 2, 5240278, 2394, null]
-        - [163, 7, SimpleBlock, 2, 5242675, 2589, null]
-        - [163, 7, SimpleBlock, 2, 5245267, 2474, null]
-        - [163, 7, SimpleBlock, 2, 5247744, 6062, null]
-        - [163, 7, SimpleBlock, 2, 5253809, 2594, null]
-        - [163, 7, SimpleBlock, 2, 5256406, 2693, null]
-        - [163, 7, SimpleBlock, 2, 5259102, 2275, null]
-        - [163, 7, SimpleBlock, 2, 5261380, 1749, null]
-        - [163, 7, SimpleBlock, 2, 5263132, 5968, null]
-        - [163, 7, SimpleBlock, 2, 5269103, 1866, null]
-        - [163, 7, SimpleBlock, 2, 5270972, 1849, null]
-        - [163, 7, SimpleBlock, 2, 5272824, 1718, null]
-        - [163, 7, SimpleBlock, 2, 5274545, 2034, null]
-        - [163, 7, SimpleBlock, 2, 5276582, 1945, null]
-        - [163, 7, SimpleBlock, 2, 5278530, 5969, null]
-        - [163, 7, SimpleBlock, 2, 5284502, 1836, null]
-        - [163, 7, SimpleBlock, 2, 5286341, 2041, null]
-        - [163, 7, SimpleBlock, 2, 5288385, 2254, null]
-        - [163, 7, SimpleBlock, 2, 5290642, 1765, null]
-        - [163, 7, SimpleBlock, 2, 5292410, 1135, null]
-        - [163, 7, SimpleBlock, 2, 5293548, 5872, null]
-        - [163, 7, SimpleBlock, 2, 5299423, 1202, null]
-        - [163, 7, SimpleBlock, 2, 5300628, 1294, null]
-        - [163, 7, SimpleBlock, 2, 5301925, 1459, null]
-        - [163, 7, SimpleBlock, 2, 5303387, 1521, null]
-        - [163, 7, SimpleBlock, 2, 5304911, 6066, null]
-        - [163, 7, SimpleBlock, 2, 5310980, 1531, null]
-        - [163, 7, SimpleBlock, 2, 5312514, 1475, null]
-        - [163, 7, SimpleBlock, 2, 5313992, 1411, null]
-        - [163, 7, SimpleBlock, 2, 5315406, 1211, null]
-        - [163, 7, SimpleBlock, 2, 5316620, 2324, null]
-        - [163, 7, SimpleBlock, 2, 5318947, 6257, null]
-        - [163, 7, SimpleBlock, 2, 5325207, 2000, null]
-        - [163, 7, SimpleBlock, 2, 5327210, 1445, null]
-        - [163, 7, SimpleBlock, 2, 5328658, 1469, null]
-        - [163, 7, SimpleBlock, 2, 5330130, 1727, null]
-        - [163, 7, SimpleBlock, 2, 5331860, 1755, null]
-        - [163, 7, SimpleBlock, 2, 5333618, 6162, null]
-        - [163, 7, SimpleBlock, 2, 5339783, 1839, null]
-        - [163, 7, SimpleBlock, 2, 5341625, 1878, null]
-        - [163, 7, SimpleBlock, 2, 5343506, 4785, null]
-        - [163, 7, SimpleBlock, 2, 5348294, 7508, null]
-        - [163, 7, SimpleBlock, 2, 5355805, 5489, null]
-        - [163, 7, SimpleBlock, 2, 5361297, 9645, null]
-        - [163, 7, SimpleBlock, 2, 5370945, 7838, null]
-        - [163, 7, SimpleBlock, 2, 5378786, 5736, null]
-        - [163, 7, SimpleBlock, 2, 5384525, 5252, null]
-        - [163, 7, SimpleBlock, 2, 5389780, 4668, null]
-        - [163, 7, SimpleBlock, 2, 5394451, 676, null]
-        - [163, 7, SimpleBlock, 2, 5395130, 6160, null]
-        - [163, 7, SimpleBlock, 2, 5401293, 5740, null]
-        - [163, 7, SimpleBlock, 2, 5407036, 5130, null]
-        - [163, 7, SimpleBlock, 2, 5412169, 4879, null]
-        - [163, 7, SimpleBlock, 2, 5417051, 4866, null]
-        - [163, 7, SimpleBlock, 2, 5421920, 6009, null]
-        - [163, 7, SimpleBlock, 2, 5427932, 5490, null]
-        - [163, 7, SimpleBlock, 2, 5433425, 6863, null]
-        - [163, 7, SimpleBlock, 2, 5440291, 7796, null]
-        - [163, 7, SimpleBlock, 2, 5448090, 11253, null]
-        - [163, 7, SimpleBlock, 2, 5459346, 15567, null]
-        - [163, 7, SimpleBlock, 2, 5474916, 12076, null]
-        - [163, 7, SimpleBlock, 2, 5486995, 4531, null]
-        - [163, 7, SimpleBlock, 2, 5491529, 13816, null]
-        - [163, 7, SimpleBlock, 2, 5505348, 11914, null]
-        - [163, 7, SimpleBlock, 2, 5517265, 10621, null]
-        - [163, 7, SimpleBlock, 2, 5527889, 9203, null]
-        - [163, 7, SimpleBlock, 2, 5537095, 4432, null]
-        - [163, 7, SimpleBlock, 2, 5541530, 11010, null]
-        - [163, 7, SimpleBlock, 2, 5552543, 10400, null]
-        - [163, 7, SimpleBlock, 2, 5562946, 10182, null]
-        - [163, 7, SimpleBlock, 2, 5573131, 10107, null]
-        - [163, 7, SimpleBlock, 2, 5583241, 7515, null]
-        - [163, 7, SimpleBlock, 2, 5590759, 4613, null]
-        - [163, 7, SimpleBlock, 2, 5595375, 2891, null]
-        - [163, 7, SimpleBlock, 2, 5598269, 2262, null]
-        - [163, 7, SimpleBlock, 2, 5600534, 2210, null]
-        - [163, 7, SimpleBlock, 2, 5602747, 1779, null]
-        - [163, 7, SimpleBlock, 2, 5604529, 5009, null]
-        - [163, 7, SimpleBlock, 2, 5609541, 1401, null]
-        - [163, 7, SimpleBlock, 2, 5610945, 1046, null]
-        - [163, 7, SimpleBlock, 2, 5611994, 882, null]
-        - [163, 7, SimpleBlock, 2, 5612879, 877, null]
-        - [163, 7, SimpleBlock, 2, 5613759, 984, null]
-        - [163, 7, SimpleBlock, 2, 5614746, 5104, null]
-        - [163, 7, SimpleBlock, 2, 5619853, 1173, null]
-        - [163, 7, SimpleBlock, 2, 5621029, 1175, null]
-        - [163, 7, SimpleBlock, 2, 5622207, 1082, null]
-        - [163, 7, SimpleBlock, 2, 5623292, 1103, null]
-        - [163, 7, SimpleBlock, 2, 5624398, 864, null]
-        - [163, 7, SimpleBlock, 2, 5625265, 5586, null]
-        - [163, 7, SimpleBlock, 2, 5630854, 766, null]
-        - [163, 7, SimpleBlock, 2, 5631623, 867, null]
-        - [163, 7, SimpleBlock, 2, 5632493, 866, null]
-        - [163, 7, SimpleBlock, 2, 5633362, 826, null]
-        - [163, 7, SimpleBlock, 2, 5634191, 5104, null]
-        - [163, 7, SimpleBlock, 2, 5639298, 929, null]
-        - [163, 7, SimpleBlock, 2, 5640230, 984, null]
-        - [163, 7, SimpleBlock, 2, 5641217, 893, null]
-        - [163, 7, SimpleBlock, 2, 5642113, 849, null]
-        - [163, 7, SimpleBlock, 2, 5642965, 751, null]
-        - [163, 7, SimpleBlock, 2, 5643719, 5874, null]
-        - [163, 7, SimpleBlock, 2, 5649596, 664, null]
-        - [163, 7, SimpleBlock, 2, 5650263, 704, null]
-        - [163, 7, SimpleBlock, 2, 5650970, 866, null]
-        - [163, 7, SimpleBlock, 2, 5651839, 932, null]
-        - [163, 7, SimpleBlock, 2, 5652774, 580, null]
-        - [163, 7, SimpleBlock, 2, 5653357, 1011, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 5654376
-      - 4042030
-      - - [231, 1, Timecode, 2, 5654378, 2, 22083]
-        - [163, 7, SimpleBlock, 2, 5654383, 5487, null]
-        - [163, 7, SimpleBlock, 2, 5659874, 25991, null]
-        - [163, 7, SimpleBlock, 2, 5685868, 1412, null]
-        - [163, 7, SimpleBlock, 2, 5687283, 875, null]
-        - [163, 7, SimpleBlock, 2, 5688161, 752, null]
-        - [163, 7, SimpleBlock, 2, 5688916, 652, null]
-        - [163, 7, SimpleBlock, 2, 5689571, 4816, null]
-        - [163, 7, SimpleBlock, 2, 5694390, 631, null]
-        - [163, 7, SimpleBlock, 2, 5695024, 780, null]
-        - [163, 7, SimpleBlock, 2, 5695807, 795, null]
-        - [163, 7, SimpleBlock, 2, 5696605, 832, null]
-        - [163, 7, SimpleBlock, 2, 5697440, 5491, null]
-        - [163, 7, SimpleBlock, 2, 5702934, 816, null]
-        - [163, 7, SimpleBlock, 2, 5703753, 840, null]
-        - [163, 7, SimpleBlock, 2, 5704596, 781, null]
-        - [163, 7, SimpleBlock, 2, 5705380, 678, null]
-        - [163, 7, SimpleBlock, 2, 5706061, 624, null]
-        - [163, 7, SimpleBlock, 2, 5706688, 5585, null]
-        - [163, 7, SimpleBlock, 2, 5712276, 496, null]
-        - [163, 7, SimpleBlock, 2, 5712775, 531, null]
-        - [163, 7, SimpleBlock, 2, 5713309, 559, null]
-        - [163, 7, SimpleBlock, 2, 5713871, 566, null]
-        - [163, 7, SimpleBlock, 2, 5714440, 6450, null]
-        - [163, 7, SimpleBlock, 2, 5720893, 513, null]
-        - [163, 7, SimpleBlock, 2, 5721409, 429, null]
-        - [163, 7, SimpleBlock, 2, 5721841, 485, null]
-        - [163, 7, SimpleBlock, 2, 5722329, 554, null]
-        - [163, 7, SimpleBlock, 2, 5722886, 512, null]
-        - [163, 7, SimpleBlock, 2, 5723401, 6450, null]
-        - [163, 7, SimpleBlock, 2, 5729855, 85844, null]
-        - [163, 7, SimpleBlock, 2, 5815702, 9241, null]
-        - [163, 7, SimpleBlock, 2, 5824946, 13021, null]
-        - [163, 7, SimpleBlock, 2, 5837970, 13020, null]
-        - [163, 7, SimpleBlock, 2, 5850993, 14475, null]
-        - [163, 7, SimpleBlock, 2, 5865471, 6835, null]
-        - [163, 7, SimpleBlock, 2, 5872309, 14579, null]
-        - [163, 7, SimpleBlock, 2, 5886891, 15342, null]
-        - [163, 7, SimpleBlock, 2, 5902236, 15053, null]
-        - [163, 7, SimpleBlock, 2, 5917292, 15560, null]
-        - [163, 7, SimpleBlock, 2, 5932855, 6642, null]
-        - [163, 7, SimpleBlock, 2, 5939500, 15399, null]
-        - [163, 7, SimpleBlock, 2, 5954902, 15560, null]
-        - [163, 7, SimpleBlock, 2, 5970465, 15577, null]
-        - [163, 7, SimpleBlock, 2, 5986045, 15647, null]
-        - [163, 7, SimpleBlock, 2, 6001695, 15358, null]
-        - [163, 7, SimpleBlock, 2, 6017056, 6835, null]
-        - [163, 7, SimpleBlock, 2, 6023894, 15537, null]
-        - [163, 7, SimpleBlock, 2, 6039434, 15598, null]
-        - [163, 7, SimpleBlock, 2, 6055035, 15730, null]
-        - [163, 7, SimpleBlock, 2, 6070768, 15582, null]
-        - [163, 7, SimpleBlock, 2, 6086353, 6351, null]
-        - [163, 7, SimpleBlock, 2, 6092707, 15441, null]
-        - [163, 7, SimpleBlock, 2, 6108151, 15429, null]
-        - [163, 7, SimpleBlock, 2, 6123583, 15534, null]
-        - [163, 7, SimpleBlock, 2, 6139120, 15550, null]
-        - [163, 7, SimpleBlock, 2, 6154673, 15537, null]
-        - [163, 7, SimpleBlock, 2, 6170213, 6546, null]
-        - [163, 7, SimpleBlock, 2, 6176762, 15619, null]
-        - [163, 7, SimpleBlock, 2, 6192384, 15707, null]
-        - [163, 7, SimpleBlock, 2, 6208094, 15679, null]
-        - [163, 7, SimpleBlock, 2, 6223776, 15407, null]
-        - [163, 7, SimpleBlock, 2, 6239186, 15554, null]
-        - [163, 7, SimpleBlock, 2, 6254743, 6448, null]
-        - [163, 7, SimpleBlock, 2, 6261194, 15613, null]
-        - [163, 7, SimpleBlock, 2, 6276810, 15697, null]
-        - [163, 7, SimpleBlock, 2, 6292510, 15583, null]
-        - [163, 7, SimpleBlock, 2, 6308096, 15663, null]
-        - [163, 7, SimpleBlock, 2, 6323762, 5971, null]
-        - [163, 7, SimpleBlock, 2, 6329736, 15636, null]
-        - [163, 7, SimpleBlock, 2, 6345375, 15711, null]
-        - [163, 7, SimpleBlock, 2, 6361089, 15877, null]
-        - [163, 7, SimpleBlock, 2, 6376969, 15632, null]
-        - [163, 7, SimpleBlock, 2, 6392604, 15880, null]
-        - [163, 7, SimpleBlock, 2, 6408487, 5299, null]
-        - [163, 7, SimpleBlock, 2, 6413789, 15875, null]
-        - [163, 7, SimpleBlock, 2, 6429667, 15671, null]
-        - [163, 7, SimpleBlock, 2, 6445341, 15803, null]
-        - [163, 7, SimpleBlock, 2, 6461147, 15793, null]
-        - [163, 7, SimpleBlock, 2, 6476943, 5872, null]
-        - [163, 7, SimpleBlock, 2, 6482818, 16039, null]
-        - [163, 7, SimpleBlock, 2, 6498860, 16305, null]
-        - [163, 7, SimpleBlock, 2, 6515169, 16465, null]
-        - [163, 7, SimpleBlock, 2, 6531638, 16499, null]
-        - [163, 7, SimpleBlock, 2, 6548141, 16741, null]
-        - [163, 7, SimpleBlock, 2, 6564885, 5584, null]
-        - [163, 7, SimpleBlock, 2, 6570473, 17095, null]
-        - [163, 7, SimpleBlock, 2, 6587572, 17131, null]
-        - [163, 7, SimpleBlock, 2, 6604707, 17304, null]
-        - [163, 7, SimpleBlock, 2, 6622015, 17294, null]
-        - [163, 7, SimpleBlock, 2, 6639313, 17485, null]
-        - [163, 7, SimpleBlock, 2, 6656801, 5490, null]
-        - [163, 7, SimpleBlock, 2, 6662295, 17982, null]
-        - [163, 7, SimpleBlock, 2, 6680281, 18072, null]
-        - [163, 7, SimpleBlock, 2, 6698357, 17845, null]
-        - [163, 7, SimpleBlock, 2, 6716206, 18220, null]
-        - [163, 7, SimpleBlock, 2, 6734429, 4914, null]
-        - [163, 7, SimpleBlock, 2, 6739347, 18198, null]
-        - [163, 7, SimpleBlock, 2, 6757549, 18229, null]
-        - [163, 7, SimpleBlock, 2, 6775782, 18246, null]
-        - [163, 7, SimpleBlock, 2, 6794032, 18232, null]
-        - [163, 7, SimpleBlock, 2, 6812268, 18081, null]
-        - [163, 7, SimpleBlock, 2, 6830352, 5586, null]
-        - [163, 7, SimpleBlock, 2, 6835942, 17839, null]
-        - [163, 7, SimpleBlock, 2, 6853785, 18150, null]
-        - [163, 7, SimpleBlock, 2, 6871939, 17811, null]
-        - [163, 7, SimpleBlock, 2, 6889754, 17733, null]
-        - [163, 7, SimpleBlock, 2, 6907491, 17342, null]
-        - [163, 7, SimpleBlock, 2, 6924836, 5393, null]
-        - [163, 7, SimpleBlock, 2, 6930233, 17401, null]
-        - [163, 7, SimpleBlock, 2, 6947638, 17334, null]
-        - [163, 7, SimpleBlock, 2, 6964976, 17208, null]
-        - [163, 7, SimpleBlock, 2, 6982188, 16806, null]
-        - [163, 7, SimpleBlock, 2, 6998997, 5199, null]
-        - [163, 7, SimpleBlock, 2, 7004200, 16683, null]
-        - [163, 7, SimpleBlock, 2, 7020887, 16765, null]
-        - [163, 7, SimpleBlock, 2, 7037656, 16489, null]
-        - [163, 7, SimpleBlock, 2, 7054149, 16415, null]
-        - [163, 7, SimpleBlock, 2, 7070567, 16272, null]
-        - [163, 7, SimpleBlock, 2, 7086842, 4910, null]
-        - [163, 7, SimpleBlock, 2, 7091755, 16065, null]
-        - [163, 7, SimpleBlock, 2, 7107823, 15683, null]
-        - [163, 7, SimpleBlock, 2, 7123509, 15669, null]
-        - [163, 7, SimpleBlock, 2, 7139181, 15353, null]
-        - [163, 7, SimpleBlock, 2, 7154537, 5395, null]
-        - [163, 7, SimpleBlock, 2, 7159935, 15367, null]
-        - [163, 7, SimpleBlock, 2, 7175305, 14998, null]
-        - [163, 7, SimpleBlock, 2, 7190306, 14862, null]
-        - [163, 7, SimpleBlock, 2, 7205171, 15044, null]
-        - [163, 7, SimpleBlock, 2, 7220218, 5872, null]
-        - [163, 7, SimpleBlock, 2, 7226093, 15078, null]
-        - [163, 7, SimpleBlock, 2, 7241174, 14735, null]
-        - [163, 7, SimpleBlock, 2, 7255912, 14895, null]
-        - [163, 7, SimpleBlock, 2, 7270810, 15001, null]
-        - [163, 7, SimpleBlock, 2, 7285814, 14921, null]
-        - [163, 7, SimpleBlock, 2, 7300738, 5778, null]
-        - [163, 7, SimpleBlock, 2, 7306519, 14923, null]
-        - [163, 7, SimpleBlock, 2, 7321445, 14971, null]
-        - [163, 7, SimpleBlock, 2, 7336419, 14927, null]
-        - [163, 7, SimpleBlock, 2, 7351349, 14900, null]
-        - [163, 7, SimpleBlock, 2, 7366252, 15092, null]
-        - [163, 7, SimpleBlock, 2, 7381347, 5485, null]
-        - [163, 7, SimpleBlock, 2, 7386835, 14913, null]
-        - [163, 7, SimpleBlock, 2, 7401751, 14865, null]
-        - [163, 7, SimpleBlock, 2, 7416619, 15019, null]
-        - [163, 7, SimpleBlock, 2, 7431641, 14883, null]
-        - [163, 7, SimpleBlock, 2, 7446527, 5682, null]
-        - [163, 7, SimpleBlock, 2, 7452212, 15002, null]
-        - [163, 7, SimpleBlock, 2, 7467217, 14870, null]
-        - [163, 7, SimpleBlock, 2, 7482090, 14810, null]
-        - [163, 7, SimpleBlock, 2, 7496903, 14940, null]
-        - [163, 7, SimpleBlock, 2, 7511846, 15141, null]
-        - [163, 7, SimpleBlock, 2, 7526990, 5874, null]
-        - [163, 7, SimpleBlock, 2, 7532867, 15044, null]
-        - [163, 7, SimpleBlock, 2, 7547914, 14799, null]
-        - [163, 7, SimpleBlock, 2, 7562716, 14863, null]
-        - [163, 7, SimpleBlock, 2, 7577582, 14982, null]
-        - [163, 7, SimpleBlock, 2, 7592567, 5873, null]
-        - [163, 7, SimpleBlock, 2, 7598443, 14843, null]
-        - [163, 7, SimpleBlock, 2, 7613289, 14979, null]
-        - [163, 7, SimpleBlock, 2, 7628271, 14680, null]
-        - [163, 7, SimpleBlock, 2, 7642954, 14874, null]
-        - [163, 7, SimpleBlock, 2, 7657831, 14871, null]
-        - [163, 7, SimpleBlock, 2, 7672705, 5491, null]
-        - [163, 7, SimpleBlock, 2, 7678199, 14981, null]
-        - [163, 7, SimpleBlock, 2, 7693183, 14699, null]
-        - [163, 7, SimpleBlock, 2, 7707885, 15065, null]
-        - [163, 7, SimpleBlock, 2, 7722953, 14820, null]
-        - [163, 7, SimpleBlock, 2, 7737776, 14760, null]
-        - [163, 7, SimpleBlock, 2, 7752539, 5584, null]
-        - [163, 7, SimpleBlock, 2, 7758126, 14847, null]
-        - [163, 7, SimpleBlock, 2, 7772976, 14937, null]
-        - [163, 7, SimpleBlock, 2, 7787916, 14800, null]
-        - [163, 7, SimpleBlock, 2, 7802719, 15108, null]
-        - [163, 7, SimpleBlock, 2, 7817830, 5107, null]
-        - [163, 7, SimpleBlock, 2, 7822940, 14980, null]
-        - [163, 7, SimpleBlock, 2, 7837923, 15035, null]
-        - [163, 7, SimpleBlock, 2, 7852961, 14959, null]
-        - [163, 7, SimpleBlock, 2, 7867923, 14964, null]
-        - [163, 7, SimpleBlock, 2, 7882890, 14914, null]
-        - [163, 7, SimpleBlock, 2, 7897807, 5490, null]
-        - [163, 7, SimpleBlock, 2, 7903300, 15071, null]
-        - [163, 7, SimpleBlock, 2, 7918374, 14910, null]
-        - [163, 7, SimpleBlock, 2, 7933287, 15206, null]
-        - [163, 7, SimpleBlock, 2, 7948496, 14820, null]
-        - [163, 7, SimpleBlock, 2, 7963319, 5583, null]
-        - [163, 7, SimpleBlock, 2, 7968905, 15074, null]
-        - [163, 7, SimpleBlock, 2, 7983982, 14970, null]
-        - [163, 7, SimpleBlock, 2, 7998955, 15396, null]
-        - [163, 7, SimpleBlock, 2, 8014354, 15402, null]
-        - [163, 7, SimpleBlock, 2, 8029759, 15417, null]
-        - [163, 7, SimpleBlock, 2, 8045179, 5873, null]
-        - [163, 7, SimpleBlock, 2, 8051055, 15643, null]
-        - [163, 7, SimpleBlock, 2, 8066701, 15741, null]
-        - [163, 7, SimpleBlock, 2, 8082445, 15823, null]
-        - [163, 7, SimpleBlock, 2, 8098271, 15968, null]
-        - [163, 7, SimpleBlock, 2, 8114242, 16024, null]
-        - [163, 7, SimpleBlock, 2, 8130269, 5681, null]
-        - [163, 7, SimpleBlock, 2, 8135953, 16190, null]
-        - [163, 7, SimpleBlock, 2, 8152146, 16229, null]
-        - [163, 7, SimpleBlock, 2, 8168378, 16320, null]
-        - [163, 7, SimpleBlock, 2, 8184702, 16427, null]
-        - [163, 7, SimpleBlock, 2, 8201132, 5487, null]
-        - [163, 7, SimpleBlock, 2, 8206623, 16674, null]
-        - [163, 7, SimpleBlock, 2, 8223301, 16862, null]
-        - [163, 7, SimpleBlock, 2, 8240167, 16715, null]
-        - [163, 7, SimpleBlock, 2, 8256886, 17261, null]
-        - [163, 7, SimpleBlock, 2, 8274151, 17477, null]
-        - [163, 7, SimpleBlock, 2, 8291631, 5778, null]
-        - [163, 7, SimpleBlock, 2, 8297413, 17112, null]
-        - [163, 7, SimpleBlock, 2, 8314529, 17366, null]
-        - [163, 7, SimpleBlock, 2, 8331899, 17553, null]
-        - [163, 7, SimpleBlock, 2, 8349456, 17762, null]
-        - [163, 7, SimpleBlock, 2, 8367222, 17629, null]
-        - [163, 7, SimpleBlock, 2, 8384854, 5778, null]
-        - [163, 7, SimpleBlock, 2, 8390636, 17749, null]
-        - [163, 7, SimpleBlock, 2, 8408389, 18009, null]
-        - [163, 7, SimpleBlock, 2, 8426402, 17943, null]
-        - [163, 7, SimpleBlock, 2, 8444349, 17886, null]
-        - [163, 7, SimpleBlock, 2, 8462238, 5777, null]
-        - [163, 7, SimpleBlock, 2, 8468019, 18051, null]
-        - [163, 7, SimpleBlock, 2, 8486074, 17991, null]
-        - [163, 7, SimpleBlock, 2, 8504069, 17883, null]
-        - [163, 7, SimpleBlock, 2, 8521956, 17835, null]
-        - [163, 7, SimpleBlock, 2, 8539795, 17949, null]
-        - [163, 7, SimpleBlock, 2, 8557747, 5775, null]
-        - [163, 7, SimpleBlock, 2, 8563526, 17955, null]
-        - [163, 7, SimpleBlock, 2, 8581485, 17740, null]
-        - [163, 7, SimpleBlock, 2, 8599229, 17608, null]
-        - [163, 7, SimpleBlock, 2, 8616841, 17646, null]
-        - [163, 7, SimpleBlock, 2, 8634490, 1541, null]
-        - [163, 7, SimpleBlock, 2, 8636035, 17615, null]
-        - [163, 7, SimpleBlock, 2, 8653653, 6065, null]
-        - [163, 7, SimpleBlock, 2, 8659722, 17519, null]
-        - [163, 7, SimpleBlock, 2, 8677245, 17265, null]
-        - [163, 7, SimpleBlock, 2, 8694514, 17299, null]
-        - [163, 7, SimpleBlock, 2, 8711817, 17000, null]
-        - [163, 7, SimpleBlock, 2, 8728821, 17199, null]
-        - [163, 7, SimpleBlock, 2, 8746023, 5776, null]
-        - [163, 7, SimpleBlock, 2, 8751803, 16948, null]
-        - [163, 7, SimpleBlock, 2, 8768755, 16961, null]
-        - [163, 7, SimpleBlock, 2, 8785720, 16941, null]
-        - [163, 7, SimpleBlock, 2, 8802665, 16778, null]
-        - [163, 7, SimpleBlock, 2, 8819447, 16807, null]
-        - [163, 7, SimpleBlock, 2, 8836257, 5488, null]
-        - [163, 7, SimpleBlock, 2, 8841749, 16640, null]
-        - [163, 7, SimpleBlock, 2, 8858393, 16528, null]
-        - [163, 7, SimpleBlock, 2, 8874925, 16728, null]
-        - [163, 7, SimpleBlock, 2, 8891656, 16326, null]
-        - [163, 7, SimpleBlock, 2, 8907985, 5489, null]
-        - [163, 7, SimpleBlock, 2, 8913478, 16478, null]
-        - [163, 7, SimpleBlock, 2, 8929959, 16373, null]
-        - [163, 7, SimpleBlock, 2, 8946336, 16728, null]
-        - [163, 7, SimpleBlock, 2, 8963068, 16548, null]
-        - [163, 7, SimpleBlock, 2, 8979620, 16730, null]
-        - [163, 7, SimpleBlock, 2, 8996353, 5779, null]
-        - [163, 7, SimpleBlock, 2, 9002136, 16702, null]
-        - [163, 7, SimpleBlock, 2, 9018842, 16695, null]
-        - [163, 7, SimpleBlock, 2, 9035541, 16575, null]
-        - [163, 7, SimpleBlock, 2, 9052120, 16558, null]
-        - [163, 7, SimpleBlock, 2, 9068682, 16576, null]
-        - [163, 7, SimpleBlock, 2, 9085261, 5585, null]
-        - [163, 7, SimpleBlock, 2, 9090850, 16410, null]
-        - [163, 7, SimpleBlock, 2, 9107264, 16615, null]
-        - [163, 7, SimpleBlock, 2, 9123883, 16629, null]
-        - [163, 7, SimpleBlock, 2, 9140516, 16572, null]
-        - [163, 7, SimpleBlock, 2, 9157091, 5487, null]
-        - [163, 7, SimpleBlock, 2, 9162582, 16740, null]
-        - [163, 7, SimpleBlock, 2, 9179326, 16688, null]
-        - [163, 7, SimpleBlock, 2, 9196018, 16625, null]
-        - [163, 7, SimpleBlock, 2, 9212647, 17417, null]
-        - [163, 7, SimpleBlock, 2, 9230068, 17527, null]
-        - [163, 7, SimpleBlock, 2, 9247598, 5487, null]
-        - [163, 7, SimpleBlock, 2, 9253089, 17348, null]
-        - [163, 7, SimpleBlock, 2, 9270441, 17060, null]
-        - [163, 7, SimpleBlock, 2, 9287505, 16552, null]
-        - [163, 7, SimpleBlock, 2, 9304060, 16344, null]
-        - [163, 7, SimpleBlock, 2, 9320407, 5296, null]
-        - [163, 7, SimpleBlock, 2, 9325706, 16256, null]
-        - [163, 7, SimpleBlock, 2, 9341965, 15758, null]
-        - [163, 7, SimpleBlock, 2, 9357726, 15896, null]
-        - [163, 7, SimpleBlock, 2, 9373625, 15296, null]
-        - [163, 7, SimpleBlock, 2, 9388924, 15339, null]
-        - [163, 7, SimpleBlock, 2, 9404266, 5489, null]
-        - [163, 7, SimpleBlock, 2, 9409758, 14934, null]
-        - [163, 7, SimpleBlock, 2, 9424695, 14798, null]
-        - [163, 7, SimpleBlock, 2, 9439496, 14636, null]
-        - [163, 7, SimpleBlock, 2, 9454135, 14532, null]
-        - [163, 7, SimpleBlock, 2, 9468670, 14366, null]
-        - [163, 7, SimpleBlock, 2, 9483039, 5583, null]
-        - [163, 7, SimpleBlock, 2, 9488625, 14350, null]
-        - [163, 7, SimpleBlock, 2, 9502978, 14273, null]
-        - [163, 7, SimpleBlock, 2, 9517254, 14005, null]
-        - [163, 7, SimpleBlock, 2, 9531262, 14068, null]
-        - [163, 7, SimpleBlock, 2, 9545333, 5583, null]
-        - [163, 7, SimpleBlock, 2, 9550919, 14134, null]
-        - [163, 7, SimpleBlock, 2, 9565056, 13834, null]
-        - [163, 7, SimpleBlock, 2, 9578893, 13920, null]
-        - [163, 7, SimpleBlock, 2, 9592816, 13837, null]
-        - [163, 7, SimpleBlock, 2, 9606656, 13788, null]
-        - [163, 7, SimpleBlock, 2, 9620447, 5487, null]
-        - [163, 7, SimpleBlock, 2, 9625937, 13746, null]
-        - [163, 7, SimpleBlock, 2, 9639686, 13819, null]
-        - [163, 7, SimpleBlock, 2, 9653508, 13907, null]
-        - [163, 7, SimpleBlock, 2, 9667418, 13995, null]
-        - [163, 7, SimpleBlock, 2, 9681416, 964, null]
-        - [163, 7, SimpleBlock, 2, 9682383, 14023, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 9696414
-      - 3744132
-      - - [231, 1, Timecode, 2, 9696416, 2, 32500]
-        - [163, 7, SimpleBlock, 2, 9696421, 5584, null]
-        - [163, 7, SimpleBlock, 2, 9702009, 58285, null]
-        - [163, 7, SimpleBlock, 2, 9760297, 8074, null]
-        - [163, 7, SimpleBlock, 2, 9768374, 11664, null]
-        - [163, 7, SimpleBlock, 2, 9780041, 12436, null]
-        - [163, 7, SimpleBlock, 2, 9792480, 13719, null]
-        - [163, 7, SimpleBlock, 2, 9806202, 5679, null]
-        - [163, 7, SimpleBlock, 2, 9811884, 14117, null]
-        - [163, 7, SimpleBlock, 2, 9826004, 14219, null]
-        - [163, 7, SimpleBlock, 2, 9840226, 14317, null]
-        - [163, 7, SimpleBlock, 2, 9854546, 14481, null]
-        - [163, 7, SimpleBlock, 2, 9869030, 5490, null]
-        - [163, 7, SimpleBlock, 2, 9874523, 14660, null]
-        - [163, 7, SimpleBlock, 2, 9889186, 14854, null]
-        - [163, 7, SimpleBlock, 2, 9904043, 14980, null]
-        - [163, 7, SimpleBlock, 2, 9919026, 15380, null]
-        - [163, 7, SimpleBlock, 2, 9934409, 15522, null]
-        - [163, 7, SimpleBlock, 2, 9949934, 5779, null]
-        - [163, 7, SimpleBlock, 2, 9955716, 15621, null]
-        - [163, 7, SimpleBlock, 2, 9971340, 15669, null]
-        - [163, 7, SimpleBlock, 2, 9987012, 15890, null]
-        - [163, 7, SimpleBlock, 2, 10002905, 16299, null]
-        - [163, 7, SimpleBlock, 2, 10019207, 5969, null]
-        - [163, 7, SimpleBlock, 2, 10025179, 16299, null]
-        - [163, 7, SimpleBlock, 2, 10041482, 16612, null]
-        - [163, 7, SimpleBlock, 2, 10058098, 17028, null]
-        - [163, 7, SimpleBlock, 2, 10075130, 17286, null]
-        - [163, 7, SimpleBlock, 2, 10092420, 17238, null]
-        - [163, 7, SimpleBlock, 2, 10109661, 5585, null]
-        - [163, 7, SimpleBlock, 2, 10115250, 17673, null]
-        - [163, 7, SimpleBlock, 2, 10132927, 17702, null]
-        - [163, 7, SimpleBlock, 2, 10150633, 18215, null]
-        - [163, 7, SimpleBlock, 2, 10168852, 18454, null]
-        - [163, 7, SimpleBlock, 2, 10187310, 18997, null]
-        - [163, 7, SimpleBlock, 2, 10206310, 5969, null]
-        - [163, 7, SimpleBlock, 2, 10212283, 19148, null]
-        - [163, 7, SimpleBlock, 2, 10231435, 19526, null]
-        - [163, 7, SimpleBlock, 2, 10250965, 16685, null]
-        - [163, 7, SimpleBlock, 2, 10267654, 16395, null]
-        - [163, 7, SimpleBlock, 2, 10284052, 5778, null]
-        - [163, 7, SimpleBlock, 2, 10289833, 16114, null]
-        - [163, 7, SimpleBlock, 2, 10305950, 16376, null]
-        - [163, 7, SimpleBlock, 2, 10322329, 16074, null]
-        - [163, 7, SimpleBlock, 2, 10338406, 16202, null]
-        - [163, 7, SimpleBlock, 2, 10354611, 16277, null]
-        - [163, 7, SimpleBlock, 2, 10370891, 5873, null]
-        - [163, 7, SimpleBlock, 2, 10376767, 16211, null]
-        - [163, 7, SimpleBlock, 2, 10392981, 16342, null]
-        - [163, 7, SimpleBlock, 2, 10409326, 16294, null]
-        - [163, 7, SimpleBlock, 2, 10425623, 16227, null]
-        - [163, 7, SimpleBlock, 2, 10441853, 5969, null]
-        - [163, 7, SimpleBlock, 2, 10447825, 16131, null]
-        - [163, 7, SimpleBlock, 2, 10463959, 16256, null]
-        - [163, 7, SimpleBlock, 2, 10480219, 16528, null]
-        - [163, 7, SimpleBlock, 2, 10496750, 16212, null]
-        - [163, 7, SimpleBlock, 2, 10512965, 16157, null]
-        - [163, 7, SimpleBlock, 2, 10529125, 5872, null]
-        - [163, 7, SimpleBlock, 2, 10535000, 16235, null]
-        - [163, 7, SimpleBlock, 2, 10551238, 15984, null]
-        - [163, 7, SimpleBlock, 2, 10567225, 16158, null]
-        - [163, 7, SimpleBlock, 2, 10583386, 16233, null]
-        - [163, 7, SimpleBlock, 2, 10599622, 16083, null]
-        - [163, 7, SimpleBlock, 2, 10615708, 6162, null]
-        - [163, 7, SimpleBlock, 2, 10621873, 16186, null]
-        - [163, 7, SimpleBlock, 2, 10638062, 16047, null]
-        - [163, 7, SimpleBlock, 2, 10654112, 15948, null]
-        - [163, 7, SimpleBlock, 2, 10670063, 16103, null]
-        - [163, 7, SimpleBlock, 2, 10686169, 6065, null]
-        - [163, 7, SimpleBlock, 2, 10692237, 16048, null]
-        - [163, 7, SimpleBlock, 2, 10708288, 16064, null]
-        - [163, 7, SimpleBlock, 2, 10724355, 15899, null]
-        - [163, 7, SimpleBlock, 2, 10740257, 15995, null]
-        - [163, 7, SimpleBlock, 2, 10756255, 16002, null]
-        - [163, 7, SimpleBlock, 2, 10772260, 6065, null]
-        - [163, 7, SimpleBlock, 2, 10778328, 16105, null]
-        - [163, 7, SimpleBlock, 2, 10794436, 15916, null]
-        - [163, 7, SimpleBlock, 2, 10810355, 16022, null]
-        - [163, 7, SimpleBlock, 2, 10826380, 15944, null]
-        - [163, 7, SimpleBlock, 2, 10842327, 6066, null]
-        - [163, 7, SimpleBlock, 2, 10848396, 15894, null]
-        - [163, 7, SimpleBlock, 2, 10864293, 15821, null]
-        - [163, 7, SimpleBlock, 2, 10880117, 15998, null]
-        - [163, 7, SimpleBlock, 2, 10896118, 15774, null]
-        - [163, 7, SimpleBlock, 2, 10911895, 15840, null]
-        - [163, 7, SimpleBlock, 2, 10927738, 6546, null]
-        - [163, 7, SimpleBlock, 2, 10934287, 15857, null]
-        - [163, 7, SimpleBlock, 2, 10950147, 15871, null]
-        - [163, 7, SimpleBlock, 2, 10966021, 15709, null]
-        - [163, 7, SimpleBlock, 2, 10981733, 15836, null]
-        - [163, 7, SimpleBlock, 2, 10997572, 15847, null]
-        - [163, 7, SimpleBlock, 2, 11013422, 6162, null]
-        - [163, 7, SimpleBlock, 2, 11019587, 15943, null]
-        - [163, 7, SimpleBlock, 2, 11035533, 15875, null]
-        - [163, 7, SimpleBlock, 2, 11051411, 15777, null]
-        - [163, 7, SimpleBlock, 2, 11067191, 15896, null]
-        - [163, 7, SimpleBlock, 2, 11083090, 6255, null]
-        - [163, 7, SimpleBlock, 2, 11089348, 15755, null]
-        - [163, 7, SimpleBlock, 2, 11105106, 15815, null]
-        - [163, 7, SimpleBlock, 2, 11120924, 15742, null]
-        - [163, 7, SimpleBlock, 2, 11136669, 15718, null]
-        - [163, 7, SimpleBlock, 2, 11152390, 15628, null]
-        - [163, 7, SimpleBlock, 2, 11168021, 964, null]
-        - [163, 7, SimpleBlock, 2, 11168988, 6161, null]
-        - [163, 7, SimpleBlock, 2, 11175152, 15743, null]
-        - [163, 7, SimpleBlock, 2, 11190898, 15651, null]
-        - [163, 7, SimpleBlock, 2, 11206552, 15646, null]
-        - [163, 7, SimpleBlock, 2, 11222201, 15666, null]
-        - [163, 7, SimpleBlock, 2, 11237870, 15600, null]
-        - [163, 7, SimpleBlock, 2, 11253473, 6354, null]
-        - [163, 7, SimpleBlock, 2, 11259830, 15472, null]
-        - [163, 7, SimpleBlock, 2, 11275305, 15276, null]
-        - [163, 7, SimpleBlock, 2, 11290584, 15429, null]
-        - [163, 7, SimpleBlock, 2, 11306016, 15363, null]
-        - [163, 7, SimpleBlock, 2, 11321382, 15264, null]
-        - [163, 7, SimpleBlock, 2, 11336649, 6256, null]
-        - [163, 7, SimpleBlock, 2, 11342908, 15189, null]
-        - [163, 7, SimpleBlock, 2, 11358100, 15429, null]
-        - [163, 7, SimpleBlock, 2, 11373532, 15182, null]
-        - [163, 7, SimpleBlock, 2, 11388717, 15176, null]
-        - [163, 7, SimpleBlock, 2, 11403896, 6258, null]
-        - [163, 7, SimpleBlock, 2, 11410157, 15160, null]
-        - [163, 7, SimpleBlock, 2, 11425320, 15084, null]
-        - [163, 7, SimpleBlock, 2, 11440407, 15027, null]
-        - [163, 7, SimpleBlock, 2, 11455437, 15087, null]
-        - [163, 7, SimpleBlock, 2, 11470527, 15308, null]
-        - [163, 7, SimpleBlock, 2, 11485838, 6643, null]
-        - [163, 7, SimpleBlock, 2, 11492484, 14960, null]
-        - [163, 7, SimpleBlock, 2, 11507447, 15005, null]
-        - [163, 7, SimpleBlock, 2, 11522455, 15128, null]
-        - [163, 7, SimpleBlock, 2, 11537586, 15124, null]
-        - [163, 7, SimpleBlock, 2, 11552713, 15103, null]
-        - [163, 7, SimpleBlock, 2, 11567819, 6354, null]
-        - [163, 7, SimpleBlock, 2, 11574176, 15080, null]
-        - [163, 7, SimpleBlock, 2, 11589259, 15014, null]
-        - [163, 7, SimpleBlock, 2, 11604276, 14951, null]
-        - [163, 7, SimpleBlock, 2, 11619230, 14915, null]
-        - [163, 7, SimpleBlock, 2, 11634148, 6256, null]
-        - [163, 7, SimpleBlock, 2, 11640407, 14819, null]
-        - [163, 7, SimpleBlock, 2, 11655229, 14729, null]
-        - [163, 7, SimpleBlock, 2, 11669961, 14715, null]
-        - [163, 7, SimpleBlock, 2, 11684679, 14801, null]
-        - [163, 7, SimpleBlock, 2, 11699483, 14828, null]
-        - [163, 7, SimpleBlock, 2, 11714314, 6258, null]
-        - [163, 7, SimpleBlock, 2, 11720575, 14604, null]
-        - [163, 7, SimpleBlock, 2, 11735182, 14649, null]
-        - [163, 7, SimpleBlock, 2, 11749834, 14712, null]
-        - [163, 7, SimpleBlock, 2, 11764549, 14456, null]
-        - [163, 7, SimpleBlock, 2, 11779008, 6162, null]
-        - [163, 7, SimpleBlock, 2, 11785173, 14612, null]
-        - [163, 7, SimpleBlock, 2, 11799788, 14464, null]
-        - [163, 7, SimpleBlock, 2, 11814255, 14548, null]
-        - [163, 7, SimpleBlock, 2, 11828806, 14477, null]
-        - [163, 7, SimpleBlock, 2, 11843286, 14547, null]
-        - [163, 7, SimpleBlock, 2, 11857836, 6162, null]
-        - [163, 7, SimpleBlock, 2, 11864001, 14432, null]
-        - [163, 7, SimpleBlock, 2, 11878436, 14322, null]
-        - [163, 7, SimpleBlock, 2, 11892761, 14270, null]
-        - [163, 7, SimpleBlock, 2, 11907034, 14174, null]
-        - [163, 7, SimpleBlock, 2, 11921211, 14244, null]
-        - [163, 7, SimpleBlock, 2, 11935458, 5968, null]
-        - [163, 7, SimpleBlock, 2, 11941429, 14147, null]
-        - [163, 7, SimpleBlock, 2, 11955579, 14105, null]
-        - [163, 7, SimpleBlock, 2, 11969687, 14050, null]
-        - [163, 7, SimpleBlock, 2, 11983740, 14133, null]
-        - [163, 7, SimpleBlock, 2, 11997876, 5966, null]
-        - [163, 7, SimpleBlock, 2, 12003845, 14114, null]
-        - [163, 7, SimpleBlock, 2, 12017962, 13853, null]
-        - [163, 7, SimpleBlock, 2, 12031818, 14074, null]
-        - [163, 7, SimpleBlock, 2, 12045895, 13788, null]
-        - [163, 7, SimpleBlock, 2, 12059686, 13645, null]
-        - [163, 7, SimpleBlock, 2, 12073334, 5872, null]
-        - [163, 7, SimpleBlock, 2, 12079209, 13645, null]
-        - [163, 7, SimpleBlock, 2, 12092857, 13742, null]
-        - [163, 7, SimpleBlock, 2, 12106602, 13511, null]
-        - [163, 7, SimpleBlock, 2, 12120116, 13642, null]
-        - [163, 7, SimpleBlock, 2, 12133761, 5871, null]
-        - [163, 7, SimpleBlock, 2, 12139635, 13525, null]
-        - [163, 7, SimpleBlock, 2, 12153163, 13417, null]
-        - [163, 7, SimpleBlock, 2, 12166583, 13399, null]
-        - [163, 7, SimpleBlock, 2, 12179985, 13388, null]
-        - [163, 7, SimpleBlock, 2, 12193376, 13531, null]
-        - [163, 7, SimpleBlock, 2, 12206910, 5776, null]
-        - [163, 7, SimpleBlock, 2, 12212689, 13370, null]
-        - [163, 7, SimpleBlock, 2, 12226062, 13288, null]
-        - [163, 7, SimpleBlock, 2, 12239353, 13187, null]
-        - [163, 7, SimpleBlock, 2, 12252543, 13400, null]
-        - [163, 7, SimpleBlock, 2, 12265946, 13324, null]
-        - [163, 7, SimpleBlock, 2, 12279273, 5776, null]
-        - [163, 7, SimpleBlock, 2, 12285052, 13383, null]
-        - [163, 7, SimpleBlock, 2, 12298438, 13326, null]
-        - [163, 7, SimpleBlock, 2, 12311767, 13233, null]
-        - [163, 7, SimpleBlock, 2, 12325003, 13224, null]
-        - [163, 7, SimpleBlock, 2, 12338230, 5393, null]
-        - [163, 7, SimpleBlock, 2, 12343626, 13395, null]
-        - [163, 7, SimpleBlock, 2, 12357024, 13150, null]
-        - [163, 7, SimpleBlock, 2, 12370177, 13085, null]
-        - [163, 7, SimpleBlock, 2, 12383265, 13142, null]
-        - [163, 7, SimpleBlock, 2, 12396410, 12979, null]
-        - [163, 7, SimpleBlock, 2, 12409392, 5391, null]
-        - [163, 7, SimpleBlock, 2, 12414786, 13151, null]
-        - [163, 7, SimpleBlock, 2, 12427940, 12982, null]
-        - [163, 7, SimpleBlock, 2, 12440925, 12778, null]
-        - [163, 7, SimpleBlock, 2, 12453706, 12569, null]
-        - [163, 7, SimpleBlock, 2, 12466278, 5681, null]
-        - [163, 7, SimpleBlock, 2, 12471962, 12672, null]
-        - [163, 7, SimpleBlock, 2, 12484637, 12435, null]
-        - [163, 7, SimpleBlock, 2, 12497075, 12408, null]
-        - [163, 7, SimpleBlock, 2, 12509486, 12258, null]
-        - [163, 7, SimpleBlock, 2, 12521747, 12327, null]
-        - [163, 7, SimpleBlock, 2, 12534077, 5970, null]
-        - [163, 7, SimpleBlock, 2, 12540050, 12242, null]
-        - [163, 7, SimpleBlock, 2, 12552295, 12099, null]
-        - [163, 7, SimpleBlock, 2, 12564397, 12248, null]
-        - [163, 7, SimpleBlock, 2, 12576648, 11962, null]
-        - [163, 7, SimpleBlock, 2, 12588613, 11927, null]
-        - [163, 7, SimpleBlock, 2, 12600543, 5874, null]
-        - [163, 7, SimpleBlock, 2, 12606420, 11981, null]
-        - [163, 7, SimpleBlock, 2, 12618404, 11902, null]
-        - [163, 7, SimpleBlock, 2, 12630309, 11921, null]
-        - [163, 7, SimpleBlock, 2, 12642233, 11689, null]
-        - [163, 7, SimpleBlock, 2, 12653925, 2794, null]
-        - [163, 7, SimpleBlock, 2, 12656722, 11864, null]
-        - [163, 7, SimpleBlock, 2, 12668589, 11531, null]
-        - [163, 7, SimpleBlock, 2, 12680123, 11632, null]
-        - [163, 7, SimpleBlock, 2, 12691758, 5777, null]
-        - [163, 7, SimpleBlock, 2, 12697538, 11429, null]
-        - [163, 7, SimpleBlock, 2, 12708970, 11526, null]
-        - [163, 7, SimpleBlock, 2, 12720499, 11214, null]
-        - [163, 7, SimpleBlock, 2, 12731716, 11362, null]
-        - [163, 7, SimpleBlock, 2, 12743081, 5585, null]
-        - [163, 7, SimpleBlock, 2, 12748669, 11338, null]
-        - [163, 7, SimpleBlock, 2, 12760010, 11249, null]
-        - [163, 7, SimpleBlock, 2, 12771262, 11295, null]
-        - [163, 7, SimpleBlock, 2, 12782560, 11137, null]
-        - [163, 7, SimpleBlock, 2, 12793700, 11203, null]
-        - [163, 7, SimpleBlock, 2, 12804906, 5395, null]
-        - [163, 7, SimpleBlock, 2, 12810304, 11042, null]
-        - [163, 7, SimpleBlock, 2, 12821349, 11145, null]
-        - [163, 7, SimpleBlock, 2, 12832497, 10864, null]
-        - [163, 7, SimpleBlock, 2, 12843364, 10885, null]
-        - [163, 7, SimpleBlock, 2, 12854252, 5680, null]
-        - [163, 7, SimpleBlock, 2, 12859935, 10829, null]
-        - [163, 7, SimpleBlock, 2, 12870767, 10656, null]
-        - [163, 7, SimpleBlock, 2, 12881426, 10698, null]
-        - [163, 7, SimpleBlock, 2, 12892127, 10718, null]
-        - [163, 7, SimpleBlock, 2, 12902848, 10663, null]
-        - [163, 7, SimpleBlock, 2, 12913514, 5393, null]
-        - [163, 7, SimpleBlock, 2, 12918910, 10615, null]
-        - [163, 7, SimpleBlock, 2, 12929528, 10614, null]
-        - [163, 7, SimpleBlock, 2, 12940145, 10528, null]
-        - [163, 7, SimpleBlock, 2, 12950676, 10479, null]
-        - [163, 7, SimpleBlock, 2, 12961158, 10358, null]
-        - [163, 7, SimpleBlock, 2, 12971519, 5487, null]
-        - [163, 7, SimpleBlock, 2, 12977009, 10405, null]
-        - [163, 7, SimpleBlock, 2, 12987417, 10152, null]
-        - [163, 7, SimpleBlock, 2, 12997572, 10226, null]
-        - [163, 7, SimpleBlock, 2, 13007801, 10300, null]
-        - [163, 7, SimpleBlock, 2, 13018104, 5104, null]
-        - [163, 7, SimpleBlock, 2, 13023211, 10268, null]
-        - [163, 7, SimpleBlock, 2, 13033482, 10148, null]
-        - [163, 7, SimpleBlock, 2, 13043633, 10309, null]
-        - [163, 7, SimpleBlock, 2, 13053945, 10178, null]
-        - [163, 7, SimpleBlock, 2, 13064126, 10096, null]
-        - [163, 7, SimpleBlock, 2, 13074225, 5201, null]
-        - [163, 7, SimpleBlock, 2, 13079429, 10085, null]
-        - [163, 7, SimpleBlock, 2, 13089517, 10239, null]
-        - [163, 7, SimpleBlock, 2, 13099759, 10113, null]
-        - [163, 7, SimpleBlock, 2, 13109875, 10129, null]
-        - [163, 7, SimpleBlock, 2, 13120007, 5008, null]
-        - [163, 7, SimpleBlock, 2, 13125018, 10090, null]
-        - [163, 7, SimpleBlock, 2, 13135111, 10152, null]
-        - [163, 7, SimpleBlock, 2, 13145266, 10211, null]
-        - [163, 7, SimpleBlock, 2, 13155480, 9935, null]
-        - [163, 7, SimpleBlock, 2, 13165418, 10088, null]
-        - [163, 7, SimpleBlock, 2, 13175509, 5202, null]
-        - [163, 7, SimpleBlock, 2, 13180714, 9887, null]
-        - [163, 7, SimpleBlock, 2, 13190604, 9798, null]
-        - [163, 7, SimpleBlock, 2, 13200405, 9855, null]
-        - [163, 7, SimpleBlock, 2, 13210263, 9677, null]
-        - [163, 7, SimpleBlock, 2, 13219943, 9497, null]
-        - [163, 7, SimpleBlock, 2, 13229443, 5585, null]
-        - [163, 7, SimpleBlock, 2, 13235031, 9425, null]
-        - [163, 7, SimpleBlock, 2, 13244459, 9598, null]
-        - [163, 7, SimpleBlock, 2, 13254060, 9206, null]
-        - [163, 7, SimpleBlock, 2, 13263269, 9294, null]
-        - [163, 7, SimpleBlock, 2, 13272566, 6354, null]
-        - [163, 7, SimpleBlock, 2, 13278923, 9149, null]
-        - [163, 7, SimpleBlock, 2, 13288075, 9011, null]
-        - [163, 7, SimpleBlock, 2, 13297089, 8892, null]
-        - [163, 7, SimpleBlock, 2, 13305984, 8677, null]
-        - [163, 7, SimpleBlock, 2, 13314664, 8752, null]
-        - [163, 7, SimpleBlock, 2, 13323419, 6547, null]
-        - [163, 7, SimpleBlock, 2, 13329969, 8803, null]
-        - [163, 7, SimpleBlock, 2, 13338775, 8670, null]
-        - [163, 7, SimpleBlock, 2, 13347448, 8642, null]
-        - [163, 7, SimpleBlock, 2, 13356093, 8631, null]
-        - [163, 7, SimpleBlock, 2, 13364727, 5682, null]
-        - [163, 7, SimpleBlock, 2, 13370412, 8570, null]
-        - [163, 7, SimpleBlock, 2, 13378985, 8420, null]
-        - [163, 7, SimpleBlock, 2, 13387408, 8489, null]
-        - [163, 7, SimpleBlock, 2, 13395900, 8492, null]
-        - [163, 7, SimpleBlock, 2, 13404395, 8290, null]
-        - [163, 7, SimpleBlock, 2, 13412688, 2793, null]
-        - [163, 7, SimpleBlock, 2, 13415484, 8296, null]
-        - [163, 7, SimpleBlock, 2, 13423783, 8405, null]
-        - [163, 7, SimpleBlock, 2, 13432191, 8355, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 13440554
-      - 3249549
-      - - [231, 1, Timecode, 2, 13440556, 2, 42917]
-        - [163, 7, SimpleBlock, 2, 13440561, 676, null]
-        - [163, 7, SimpleBlock, 2, 13441240, 5489, null]
-        - [163, 7, SimpleBlock, 2, 13446733, 51446, null]
-        - [163, 7, SimpleBlock, 2, 13498182, 4220, null]
-        - [163, 7, SimpleBlock, 2, 13502405, 6526, null]
-        - [163, 7, SimpleBlock, 2, 13508934, 6389, null]
-        - [163, 7, SimpleBlock, 2, 13515326, 7048, null]
-        - [163, 7, SimpleBlock, 2, 13522377, 5490, null]
-        - [163, 7, SimpleBlock, 2, 13527870, 6914, null]
-        - [163, 7, SimpleBlock, 2, 13534787, 7116, null]
-        - [163, 7, SimpleBlock, 2, 13541906, 7356, null]
-        - [163, 7, SimpleBlock, 2, 13549265, 7645, null]
-        - [163, 7, SimpleBlock, 2, 13556913, 5585, null]
-        - [163, 7, SimpleBlock, 2, 13562501, 7360, null]
-        - [163, 7, SimpleBlock, 2, 13569864, 7213, null]
-        - [163, 7, SimpleBlock, 2, 13577080, 7193, null]
-        - [163, 7, SimpleBlock, 2, 13584276, 7232, null]
-        - [163, 7, SimpleBlock, 2, 13591511, 7281, null]
-        - [163, 7, SimpleBlock, 2, 13598795, 5680, null]
-        - [163, 7, SimpleBlock, 2, 13604478, 7357, null]
-        - [163, 7, SimpleBlock, 2, 13611838, 7403, null]
-        - [163, 7, SimpleBlock, 2, 13619244, 7427, null]
-        - [163, 7, SimpleBlock, 2, 13626674, 7673, null]
-        - [163, 7, SimpleBlock, 2, 13634350, 5489, null]
-        - [163, 7, SimpleBlock, 2, 13639842, 7819, null]
-        - [163, 7, SimpleBlock, 2, 13647664, 8057, null]
-        - [163, 7, SimpleBlock, 2, 13655724, 8240, null]
-        - [163, 7, SimpleBlock, 2, 13663967, 8555, null]
-        - [163, 7, SimpleBlock, 2, 13672525, 8858, null]
-        - [163, 7, SimpleBlock, 2, 13681386, 5381, null]
-        - [163, 7, SimpleBlock, 2, 13686770, 9423, null]
-        - [163, 7, SimpleBlock, 2, 13696196, 9727, null]
-        - [163, 7, SimpleBlock, 2, 13705926, 10330, null]
-        - [163, 7, SimpleBlock, 2, 13716259, 10596, null]
-        - [163, 7, SimpleBlock, 2, 13726858, 10571, null]
-        - [163, 7, SimpleBlock, 2, 13737432, 5683, null]
-        - [163, 7, SimpleBlock, 2, 13743118, 10613, null]
-        - [163, 7, SimpleBlock, 2, 13753734, 10893, null]
-        - [163, 7, SimpleBlock, 2, 13764630, 11063, null]
-        - [163, 7, SimpleBlock, 2, 13775696, 10909, null]
-        - [163, 7, SimpleBlock, 2, 13786608, 5486, null]
-        - [163, 7, SimpleBlock, 2, 13792097, 10803, null]
-        - [163, 7, SimpleBlock, 2, 13802903, 10949, null]
-        - [163, 7, SimpleBlock, 2, 13813855, 10796, null]
-        - [163, 7, SimpleBlock, 2, 13824654, 10855, null]
-        - [163, 7, SimpleBlock, 2, 13835512, 10674, null]
-        - [163, 7, SimpleBlock, 2, 13846189, 5200, null]
-        - [163, 7, SimpleBlock, 2, 13851392, 10485, null]
-        - [163, 7, SimpleBlock, 2, 13861880, 10737, null]
-        - [163, 7, SimpleBlock, 2, 13872620, 10837, null]
-        - [163, 7, SimpleBlock, 2, 13883460, 11119, null]
-        - [163, 7, SimpleBlock, 2, 13894582, 6161, null]
-        - [163, 7, SimpleBlock, 2, 13900746, 11117, null]
-        - [163, 7, SimpleBlock, 2, 13911866, 11056, null]
-        - [163, 7, SimpleBlock, 2, 13922925, 11181, null]
-        - [163, 7, SimpleBlock, 2, 13934109, 11216, null]
-        - [163, 7, SimpleBlock, 2, 13945328, 11249, null]
-        - [163, 7, SimpleBlock, 2, 13956580, 6161, null]
-        - [163, 7, SimpleBlock, 2, 13962744, 11095, null]
-        - [163, 7, SimpleBlock, 2, 13973842, 11220, null]
-        - [163, 7, SimpleBlock, 2, 13985065, 11147, null]
-        - [163, 7, SimpleBlock, 2, 13996215, 11224, null]
-        - [163, 7, SimpleBlock, 2, 14007442, 11201, null]
-        - [163, 7, SimpleBlock, 2, 14018646, 5491, null]
-        - [163, 7, SimpleBlock, 2, 14024140, 11272, null]
-        - [163, 7, SimpleBlock, 2, 14035415, 11123, null]
-        - [163, 7, SimpleBlock, 2, 14046541, 11354, null]
-        - [163, 7, SimpleBlock, 2, 14057898, 11251, null]
-        - [163, 7, SimpleBlock, 2, 14069152, 5873, null]
-        - [163, 7, SimpleBlock, 2, 14075028, 11219, null]
-        - [163, 7, SimpleBlock, 2, 14086250, 11150, null]
-        - [163, 7, SimpleBlock, 2, 14097403, 11010, null]
-        - [163, 7, SimpleBlock, 2, 14108416, 11187, null]
-        - [163, 7, SimpleBlock, 2, 14119606, 11061, null]
-        - [163, 7, SimpleBlock, 2, 14130670, 5680, null]
-        - [163, 7, SimpleBlock, 2, 14136353, 10999, null]
-        - [163, 7, SimpleBlock, 2, 14147355, 10922, null]
-        - [163, 7, SimpleBlock, 2, 14158280, 10778, null]
-        - [163, 7, SimpleBlock, 2, 14169061, 10831, null]
-        - [163, 7, SimpleBlock, 2, 14179895, 5969, null]
-        - [163, 7, SimpleBlock, 2, 14185867, 10646, null]
-        - [163, 7, SimpleBlock, 2, 14196516, 10783, null]
-        - [163, 7, SimpleBlock, 2, 14207302, 10694, null]
-        - [163, 7, SimpleBlock, 2, 14217999, 10551, null]
-        - [163, 7, SimpleBlock, 2, 14228553, 10232, null]
-        - [163, 7, SimpleBlock, 2, 14238788, 5488, null]
-        - [163, 7, SimpleBlock, 2, 14244279, 10166, null]
-        - [163, 7, SimpleBlock, 2, 14254448, 10369, null]
-        - [163, 7, SimpleBlock, 2, 14264820, 10309, null]
-        - [163, 7, SimpleBlock, 2, 14275132, 10050, null]
-        - [163, 7, SimpleBlock, 2, 14285185, 9831, null]
-        - [163, 7, SimpleBlock, 2, 14295019, 5381, null]
-        - [163, 7, SimpleBlock, 2, 14300403, 9790, null]
-        - [163, 7, SimpleBlock, 2, 14310196, 9781, null]
-        - [163, 7, SimpleBlock, 2, 14319980, 9691, null]
-        - [163, 7, SimpleBlock, 2, 14329674, 9640, null]
-        - [163, 7, SimpleBlock, 2, 14339317, 5968, null]
-        - [163, 7, SimpleBlock, 2, 14345288, 9567, null]
-        - [163, 7, SimpleBlock, 2, 14354858, 9593, null]
-        - [163, 7, SimpleBlock, 2, 14364454, 9481, null]
-        - [163, 7, SimpleBlock, 2, 14373938, 9196, null]
-        - [163, 7, SimpleBlock, 2, 14383137, 9329, null]
-        - [163, 7, SimpleBlock, 2, 14392469, 5970, null]
-        - [163, 7, SimpleBlock, 2, 14398442, 9824, null]
-        - [163, 7, SimpleBlock, 2, 14408269, 10746, null]
-        - [163, 7, SimpleBlock, 2, 14419018, 11335, null]
-        - [163, 7, SimpleBlock, 2, 14430356, 10367, null]
-        - [163, 7, SimpleBlock, 2, 14440726, 12364, null]
-        - [163, 7, SimpleBlock, 2, 14453093, 5489, null]
-        - [163, 7, SimpleBlock, 2, 14458585, 12120, null]
-        - [163, 7, SimpleBlock, 2, 14470708, 12407, null]
-        - [163, 7, SimpleBlock, 2, 14483118, 11822, null]
-        - [163, 7, SimpleBlock, 2, 14494943, 9897, null]
-        - [163, 7, SimpleBlock, 2, 14504843, 5873, null]
-        - [163, 7, SimpleBlock, 2, 14510719, 9439, null]
-        - [163, 7, SimpleBlock, 2, 14520161, 8651, null]
-        - [163, 7, SimpleBlock, 2, 14528815, 7775, null]
-        - [163, 7, SimpleBlock, 2, 14536593, 6840, null]
-        - [163, 7, SimpleBlock, 2, 14543436, 6619, null]
-        - [163, 7, SimpleBlock, 2, 14550058, 5583, null]
-        - [163, 7, SimpleBlock, 2, 14555644, 6141, null]
-        - [163, 7, SimpleBlock, 2, 14561788, 6076, null]
-        - [163, 7, SimpleBlock, 2, 14567867, 6044, null]
-        - [163, 7, SimpleBlock, 2, 14573914, 5676, null]
-        - [163, 7, SimpleBlock, 2, 14579593, 5490, null]
-        - [163, 7, SimpleBlock, 2, 14585086, 5501, null]
-        - [163, 7, SimpleBlock, 2, 14590590, 5301, null]
-        - [163, 7, SimpleBlock, 2, 14595894, 5021, null]
-        - [163, 7, SimpleBlock, 2, 14600918, 4890, null]
-        - [163, 7, SimpleBlock, 2, 14605811, 4454, null]
-        - [163, 7, SimpleBlock, 2, 14610268, 5295, null]
-        - [163, 7, SimpleBlock, 2, 14615566, 4043, null]
-        - [163, 7, SimpleBlock, 2, 14619612, 3760, null]
-        - [163, 7, SimpleBlock, 2, 14623375, 3239, null]
-        - [163, 7, SimpleBlock, 2, 14626617, 3786, null]
-        - [163, 7, SimpleBlock, 2, 14630406, 6048, null]
-        - [163, 7, SimpleBlock, 2, 14636457, 5393, null]
-        - [163, 7, SimpleBlock, 2, 14641853, 7637, null]
-        - [163, 7, SimpleBlock, 2, 14649493, 9427, null]
-        - [163, 7, SimpleBlock, 2, 14658923, 10261, null]
-        - [163, 7, SimpleBlock, 2, 14669187, 10309, null]
-        - [163, 7, SimpleBlock, 2, 14679499, 5485, null]
-        - [163, 7, SimpleBlock, 2, 14684988, 81128, null]
-        - [163, 7, SimpleBlock, 2, 14766119, 2985, null]
-        - [163, 7, SimpleBlock, 2, 14769107, 4541, null]
-        - [163, 7, SimpleBlock, 2, 14773651, 5172, null]
-        - [163, 7, SimpleBlock, 2, 14778826, 7922, null]
-        - [163, 7, SimpleBlock, 2, 14786751, 5392, null]
-        - [163, 7, SimpleBlock, 2, 14792146, 9646, null]
-        - [163, 7, SimpleBlock, 2, 14801795, 12038, null]
-        - [163, 7, SimpleBlock, 2, 14813836, 13795, null]
-        - [163, 7, SimpleBlock, 2, 14827634, 14528, null]
-        - [163, 7, SimpleBlock, 2, 14842165, 5681, null]
-        - [163, 7, SimpleBlock, 2, 14847849, 15597, null]
-        - [163, 7, SimpleBlock, 2, 14863450, 16822, null]
-        - [163, 7, SimpleBlock, 2, 14880276, 18050, null]
-        - [163, 7, SimpleBlock, 2, 14898330, 18837, null]
-        - [163, 7, SimpleBlock, 2, 14917171, 19247, null]
-        - [163, 7, SimpleBlock, 2, 14936421, 5392, null]
-        - [163, 7, SimpleBlock, 2, 14941817, 19069, null]
-        - [163, 7, SimpleBlock, 2, 14960890, 19463, null]
-        - [163, 7, SimpleBlock, 2, 14980357, 19931, null]
-        - [163, 7, SimpleBlock, 2, 15000292, 20799, null]
-        - [163, 7, SimpleBlock, 2, 15021095, 21176, null]
-        - [163, 7, SimpleBlock, 2, 15042274, 5487, null]
-        - [163, 7, SimpleBlock, 2, 15047765, 21537, null]
-        - [163, 7, SimpleBlock, 2, 15069306, 22280, null]
-        - [163, 7, SimpleBlock, 2, 15091590, 22732, null]
-        - [163, 7, SimpleBlock, 2, 15114326, 23371, null]
-        - [163, 7, SimpleBlock, 2, 15137700, 5678, null]
-        - [163, 7, SimpleBlock, 2, 15143382, 23440, null]
-        - [163, 7, SimpleBlock, 2, 15166826, 22016, null]
-        - [163, 7, SimpleBlock, 2, 15188846, 21824, null]
-        - [163, 7, SimpleBlock, 2, 15210674, 21546, null]
-        - [163, 7, SimpleBlock, 2, 15232224, 21501, null]
-        - [163, 7, SimpleBlock, 2, 15253728, 5585, null]
-        - [163, 7, SimpleBlock, 2, 15259317, 22122, null]
-        - [163, 7, SimpleBlock, 2, 15281443, 21956, null]
-        - [163, 7, SimpleBlock, 2, 15303403, 22514, null]
-        - [163, 7, SimpleBlock, 2, 15325921, 22574, null]
-        - [163, 7, SimpleBlock, 2, 15348498, 5489, null]
-        - [163, 7, SimpleBlock, 2, 15353991, 22991, null]
-        - [163, 7, SimpleBlock, 2, 15376986, 23508, null]
-        - [163, 7, SimpleBlock, 2, 15400498, 23870, null]
-        - [163, 7, SimpleBlock, 2, 15424372, 24440, null]
-        - [163, 7, SimpleBlock, 2, 15448816, 25013, null]
-        - [163, 7, SimpleBlock, 2, 15473832, 5199, null]
-        - [163, 7, SimpleBlock, 2, 15479035, 25337, null]
-        - [163, 7, SimpleBlock, 2, 15504376, 24717, null]
-        - [163, 7, SimpleBlock, 2, 15529097, 24623, null]
-        - [163, 7, SimpleBlock, 2, 15553724, 24344, null]
-        - [163, 7, SimpleBlock, 2, 15578072, 23717, null]
-        - [163, 7, SimpleBlock, 2, 15601792, 5680, null]
-        - [163, 7, SimpleBlock, 2, 15607476, 23417, null]
-        - [163, 7, SimpleBlock, 2, 15630897, 23226, null]
-        - [163, 7, SimpleBlock, 2, 15654127, 22676, null]
-        - [163, 7, SimpleBlock, 2, 15676807, 21990, null]
-        - [163, 7, SimpleBlock, 2, 15698800, 5776, null]
-        - [163, 7, SimpleBlock, 2, 15704580, 21261, null]
-        - [163, 7, SimpleBlock, 2, 15725845, 20986, null]
-        - [163, 7, SimpleBlock, 2, 15746835, 20141, null]
-        - [163, 7, SimpleBlock, 2, 15766980, 19845, null]
-        - [163, 7, SimpleBlock, 2, 15786829, 19632, null]
-        - [163, 7, SimpleBlock, 2, 15806464, 5875, null]
-        - [163, 7, SimpleBlock, 2, 15812343, 19280, null]
-        - [163, 7, SimpleBlock, 2, 15831627, 19167, null]
-        - [163, 7, SimpleBlock, 2, 15850798, 19204, null]
-        - [163, 7, SimpleBlock, 2, 15870006, 18863, null]
-        - [163, 7, SimpleBlock, 2, 15888872, 5682, null]
-        - [163, 7, SimpleBlock, 2, 15894558, 18701, null]
-        - [163, 7, SimpleBlock, 2, 15913263, 18677, null]
-        - [163, 7, SimpleBlock, 2, 15931944, 18223, null]
-        - [163, 7, SimpleBlock, 2, 15950171, 18362, null]
-        - [163, 7, SimpleBlock, 2, 15968537, 17943, null]
-        - [163, 7, SimpleBlock, 2, 15986483, 5681, null]
-        - [163, 7, SimpleBlock, 2, 15992168, 17666, null]
-        - [163, 7, SimpleBlock, 2, 16009838, 17249, null]
-        - [163, 7, SimpleBlock, 2, 16027091, 16713, null]
-        - [163, 7, SimpleBlock, 2, 16043807, 16212, null]
-        - [163, 7, SimpleBlock, 2, 16060022, 15866, null]
-        - [163, 7, SimpleBlock, 2, 16075891, 5779, null]
-        - [163, 7, SimpleBlock, 2, 16081673, 15394, null]
-        - [163, 7, SimpleBlock, 2, 16097070, 15150, null]
-        - [163, 7, SimpleBlock, 2, 16112223, 14891, null]
-        - [163, 7, SimpleBlock, 2, 16127117, 14570, null]
-        - [163, 7, SimpleBlock, 2, 16141690, 5777, null]
-        - [163, 7, SimpleBlock, 2, 16147470, 14314, null]
-        - [163, 7, SimpleBlock, 2, 16161787, 13823, null]
-        - [163, 7, SimpleBlock, 2, 16175613, 13404, null]
-        - [163, 7, SimpleBlock, 2, 16189020, 12774, null]
-        - [163, 7, SimpleBlock, 2, 16201797, 12584, null]
-        - [163, 7, SimpleBlock, 2, 16214384, 5584, null]
-        - [163, 7, SimpleBlock, 2, 16219971, 12212, null]
-        - [163, 7, SimpleBlock, 2, 16232186, 11618, null]
-        - [163, 7, SimpleBlock, 2, 16243807, 11021, null]
-        - [163, 7, SimpleBlock, 2, 16254831, 10348, null]
-        - [163, 7, SimpleBlock, 2, 16265182, 2602, null]
-        - [163, 7, SimpleBlock, 2, 16267787, 9776, null]
-        - [163, 7, SimpleBlock, 2, 16277566, 9134, null]
-        - [163, 7, SimpleBlock, 2, 16286703, 8473, null]
-        - [163, 7, SimpleBlock, 2, 16295179, 5872, null]
-        - [163, 7, SimpleBlock, 2, 16301054, 8042, null]
-        - [163, 7, SimpleBlock, 2, 16309099, 6886, null]
-        - [163, 7, SimpleBlock, 2, 16315988, 6278, null]
-        - [163, 7, SimpleBlock, 2, 16322269, 5524, null]
-        - [163, 7, SimpleBlock, 2, 16327796, 5777, null]
-        - [163, 7, SimpleBlock, 2, 16333576, 4813, null]
-        - [163, 7, SimpleBlock, 2, 16338392, 4026, null]
-        - [163, 7, SimpleBlock, 2, 16342421, 3079, null]
-        - [163, 7, SimpleBlock, 2, 16345503, 2908, null]
-        - [163, 7, SimpleBlock, 2, 16348414, 2809, null]
-        - [163, 7, SimpleBlock, 2, 16351226, 5585, null]
-        - [163, 7, SimpleBlock, 2, 16356814, 2952, null]
-        - [163, 7, SimpleBlock, 2, 16359769, 2981, null]
-        - [163, 7, SimpleBlock, 2, 16362753, 3155, null]
-        - [163, 7, SimpleBlock, 2, 16365911, 3321, null]
-        - [163, 7, SimpleBlock, 2, 16369235, 3586, null]
-        - [163, 7, SimpleBlock, 2, 16372824, 5779, null]
-        - [163, 7, SimpleBlock, 2, 16378606, 3776, null]
-        - [163, 7, SimpleBlock, 2, 16382385, 4020, null]
-        - [163, 7, SimpleBlock, 2, 16386408, 4418, null]
-        - [163, 7, SimpleBlock, 2, 16390829, 5383, null]
-        - [163, 7, SimpleBlock, 2, 16396215, 5295, null]
-        - [163, 7, SimpleBlock, 2, 16401513, 6085, null]
-        - [163, 7, SimpleBlock, 2, 16407601, 6943, null]
-        - [163, 7, SimpleBlock, 2, 16414547, 7869, null]
-        - [163, 7, SimpleBlock, 2, 16422419, 8274, null]
-        - [163, 7, SimpleBlock, 2, 16430696, 7703, null]
-        - [163, 7, SimpleBlock, 2, 16438402, 5969, null]
-        - [163, 7, SimpleBlock, 2, 16444374, 7035, null]
-        - [163, 7, SimpleBlock, 2, 16451412, 7128, null]
-        - [163, 7, SimpleBlock, 2, 16458543, 6985, null]
-        - [163, 7, SimpleBlock, 2, 16465531, 6926, null]
-        - [163, 7, SimpleBlock, 2, 16472460, 5872, null]
-        - [163, 7, SimpleBlock, 2, 16478335, 6447, null]
-        - [163, 7, SimpleBlock, 2, 16484785, 5798, null]
-        - [163, 7, SimpleBlock, 2, 16490586, 5291, null]
-        - [163, 7, SimpleBlock, 2, 16495880, 5001, null]
-        - [163, 7, SimpleBlock, 2, 16500884, 4734, null]
-        - [163, 7, SimpleBlock, 2, 16505621, 7311, null]
-        - [163, 7, SimpleBlock, 2, 16512935, 4435, null]
-        - [163, 7, SimpleBlock, 2, 16517373, 6151, null]
-        - [163, 7, SimpleBlock, 2, 16523527, 5456, null]
-        - [163, 7, SimpleBlock, 2, 16528986, 4818, null]
-        - [163, 7, SimpleBlock, 2, 16533807, 5462, null]
-        - [163, 7, SimpleBlock, 2, 16539272, 6159, null]
-        - [163, 7, SimpleBlock, 2, 16545434, 5465, null]
-        - [163, 7, SimpleBlock, 2, 16550902, 5201, null]
-        - [163, 7, SimpleBlock, 2, 16556106, 5002, null]
-        - [163, 7, SimpleBlock, 2, 16561111, 5430, null]
-        - [163, 7, SimpleBlock, 2, 16566544, 5970, null]
-        - [163, 7, SimpleBlock, 2, 16572517, 6146, null]
-        - [163, 7, SimpleBlock, 2, 16578666, 6690, null]
-        - [163, 7, SimpleBlock, 2, 16585359, 7086, null]
-        - [163, 7, SimpleBlock, 2, 16592448, 8078, null]
-        - [163, 7, SimpleBlock, 2, 16600529, 8723, null]
-        - [163, 7, SimpleBlock, 2, 16609255, 6067, null]
-        - [163, 7, SimpleBlock, 2, 16615325, 9113, null]
-        - [163, 7, SimpleBlock, 2, 16624441, 9253, null]
-        - [163, 7, SimpleBlock, 2, 16633697, 10193, null]
-        - [163, 7, SimpleBlock, 2, 16643893, 9354, null]
-        - [163, 7, SimpleBlock, 2, 16653250, 3948, null]
-        - [163, 7, SimpleBlock, 2, 16657201, 9131, null]
-        - [163, 7, SimpleBlock, 2, 16666335, 8881, null]
-        - [163, 7, SimpleBlock, 2, 16675219, 7845, null]
-        - [163, 7, SimpleBlock, 2, 16683067, 7036, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 16690110
-      - 778801
-      - - [231, 1, Timecode, 2, 16690112, 2, 53333]
-        - [163, 7, SimpleBlock, 2, 16690117, 772, null]
-        - [163, 7, SimpleBlock, 2, 16690892, 6162, null]
-        - [163, 7, SimpleBlock, 2, 16697058, 73939, null]
-        - [163, 7, SimpleBlock, 2, 16771000, 2203, null]
-        - [163, 7, SimpleBlock, 2, 16773206, 2982, null]
-        - [163, 7, SimpleBlock, 2, 16776191, 3662, null]
-        - [163, 7, SimpleBlock, 2, 16779856, 4237, null]
-        - [163, 7, SimpleBlock, 2, 16784096, 5968, null]
-        - [163, 7, SimpleBlock, 2, 16790067, 4508, null]
-        - [163, 7, SimpleBlock, 2, 16794578, 4745, null]
-        - [163, 7, SimpleBlock, 2, 16799326, 4972, null]
-        - [163, 7, SimpleBlock, 2, 16804301, 5076, null]
-        - [163, 7, SimpleBlock, 2, 16809380, 6063, null]
-        - [163, 7, SimpleBlock, 2, 16815446, 5439, null]
-        - [163, 7, SimpleBlock, 2, 16820888, 5560, null]
-        - [163, 7, SimpleBlock, 2, 16826451, 5676, null]
-        - [163, 7, SimpleBlock, 2, 16832130, 5844, null]
-        - [163, 7, SimpleBlock, 2, 16837977, 6061, null]
-        - [163, 7, SimpleBlock, 2, 16844041, 5969, null]
-        - [163, 7, SimpleBlock, 2, 16850013, 6557, null]
-        - [163, 7, SimpleBlock, 2, 16856573, 7227, null]
-        - [163, 7, SimpleBlock, 2, 16863803, 7725, null]
-        - [163, 7, SimpleBlock, 2, 16871531, 8407, null]
-        - [163, 7, SimpleBlock, 2, 16879941, 5582, null]
-        - [163, 7, SimpleBlock, 2, 16885526, 8767, null]
-        - [163, 7, SimpleBlock, 2, 16894296, 9382, null]
-        - [163, 7, SimpleBlock, 2, 16903681, 9861, null]
-        - [163, 7, SimpleBlock, 2, 16913545, 10355, null]
-        - [163, 7, SimpleBlock, 2, 16923903, 9733, null]
-        - [163, 7, SimpleBlock, 2, 16933639, 5873, null]
-        - [163, 7, SimpleBlock, 2, 16939515, 9873, null]
-        - [163, 7, SimpleBlock, 2, 16949391, 9813, null]
-        - [163, 7, SimpleBlock, 2, 16959207, 9508, null]
-        - [163, 7, SimpleBlock, 2, 16968718, 11810, null]
-        - [163, 7, SimpleBlock, 2, 16980531, 12852, null]
-        - [163, 7, SimpleBlock, 2, 16993386, 5393, null]
-        - [163, 7, SimpleBlock, 2, 16998782, 11068, null]
-        - [163, 7, SimpleBlock, 2, 17009853, 10499, null]
-        - [163, 7, SimpleBlock, 2, 17020355, 10353, null]
-        - [163, 7, SimpleBlock, 2, 17030711, 9915, null]
-        - [163, 7, SimpleBlock, 2, 17040629, 5873, null]
-        - [163, 7, SimpleBlock, 2, 17046505, 9921, null]
-        - [163, 7, SimpleBlock, 2, 17056429, 9995, null]
-        - [163, 7, SimpleBlock, 2, 17066427, 10146, null]
-        - [163, 7, SimpleBlock, 2, 17076576, 10535, null]
-        - [163, 7, SimpleBlock, 2, 17087114, 10775, null]
-        - [163, 7, SimpleBlock, 2, 17097892, 5873, null]
-        - [163, 7, SimpleBlock, 2, 17103768, 11200, null]
-        - [163, 7, SimpleBlock, 2, 17114971, 12237, null]
-        - [163, 7, SimpleBlock, 2, 17127211, 12523, null]
-        - [163, 7, SimpleBlock, 2, 17139737, 12799, null]
-        - [163, 7, SimpleBlock, 2, 17152539, 6353, null]
-        - [163, 7, SimpleBlock, 2, 17158895, 12844, null]
-        - [163, 7, SimpleBlock, 2, 17171742, 13331, null]
-        - [163, 7, SimpleBlock, 2, 17185076, 13494, null]
-        - [163, 7, SimpleBlock, 2, 17198573, 13391, null]
-        - [163, 7, SimpleBlock, 2, 17211967, 13210, null]
-        - [163, 7, SimpleBlock, 2, 17225180, 5776, null]
-        - [163, 7, SimpleBlock, 2, 17230959, 12707, null]
-        - [163, 7, SimpleBlock, 2, 17243669, 12771, null]
-        - [163, 7, SimpleBlock, 2, 17256443, 12524, null]
-        - [163, 7, SimpleBlock, 2, 17268970, 12340, null]
-        - [163, 7, SimpleBlock, 2, 17281313, 12283, null]
-        - [163, 7, SimpleBlock, 2, 17293599, 5297, null]
-        - [163, 7, SimpleBlock, 2, 17298899, 12150, null]
-        - [163, 7, SimpleBlock, 2, 17311052, 12123, null]
-        - [163, 7, SimpleBlock, 2, 17323178, 11543, null]
-        - [163, 7, SimpleBlock, 2, 17334724, 10955, null]
-        - [163, 7, SimpleBlock, 2, 17345682, 5487, null]
-        - [163, 7, SimpleBlock, 2, 17351172, 10655, null]
-        - [163, 7, SimpleBlock, 2, 17361830, 10831, null]
-        - [163, 7, SimpleBlock, 2, 17372664, 11824, null]
-        - [163, 7, SimpleBlock, 2, 17384491, 12199, null]
-        - [163, 7, SimpleBlock, 2, 17396693, 10612, null]
-        - [163, 7, SimpleBlock, 2, 17407308, 6162, null]
-        - [163, 7, SimpleBlock, 2, 17413473, 10118, null]
-        - [163, 7, SimpleBlock, 2, 17423594, 9704, null]
-        - [163, 7, SimpleBlock, 2, 17433301, 8930, null]
-        - [163, 7, SimpleBlock, 2, 17442234, 8418, null]
-        - [163, 7, SimpleBlock, 2, 17450655, 676, null]
-        - [163, 7, SimpleBlock, 2, 17451334, 8595, null]
-        - [163, 7, SimpleBlock, 2, 17459932, 8979, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 17468918
-      - 1159873
-      - - [231, 1, Timecode, 2, 17468920, 2, 56083]
-        - [163, 7, SimpleBlock, 2, 17468925, 676, null]
-        - [163, 7, SimpleBlock, 2, 17469604, 5777, null]
-        - [163, 7, SimpleBlock, 2, 17475385, 22461, null]
-        - [163, 7, SimpleBlock, 2, 17497849, 2509, null]
-        - [163, 7, SimpleBlock, 2, 17500361, 1485, null]
-        - [163, 7, SimpleBlock, 2, 17501849, 320, null]
-        - [163, 7, SimpleBlock, 2, 17502172, 6258, null]
-        - [163, 7, SimpleBlock, 2, 17508433, 245, null]
-        - [163, 7, SimpleBlock, 2, 17508681, 248, null]
-        - [163, 7, SimpleBlock, 2, 17508932, 233, null]
-        - [163, 7, SimpleBlock, 2, 17509168, 218, null]
-        - [163, 7, SimpleBlock, 2, 17509389, 238, null]
-        - [163, 7, SimpleBlock, 2, 17509630, 6353, null]
-        - [163, 7, SimpleBlock, 2, 17515986, 232, null]
-        - [163, 7, SimpleBlock, 2, 17516221, 224, null]
-        - [163, 7, SimpleBlock, 2, 17516448, 235, null]
-        - [163, 7, SimpleBlock, 2, 17516686, 330, null]
-        - [163, 7, SimpleBlock, 2, 17517019, 6545, null]
-        - [163, 7, SimpleBlock, 2, 17523567, 414, null]
-        - [163, 7, SimpleBlock, 2, 17523984, 499, null]
-        - [163, 7, SimpleBlock, 2, 17524486, 554, null]
-        - [163, 7, SimpleBlock, 2, 17525043, 614, null]
-        - [163, 7, SimpleBlock, 2, 17525660, 598, null]
-        - [163, 7, SimpleBlock, 2, 17526261, 5487, null]
-        - [163, 7, SimpleBlock, 2, 17531751, 640, null]
-        - [163, 7, SimpleBlock, 2, 17532394, 771, null]
-        - [163, 7, SimpleBlock, 2, 17533168, 715, null]
-        - [163, 7, SimpleBlock, 2, 17533886, 643, null]
-        - [163, 7, SimpleBlock, 2, 17534532, 686, null]
-        - [163, 7, SimpleBlock, 2, 17535221, 5779, null]
-        - [163, 7, SimpleBlock, 2, 17541003, 763, null]
-        - [163, 7, SimpleBlock, 2, 17541769, 1464, null]
-        - [163, 7, SimpleBlock, 2, 17543236, 1514, null]
-        - [163, 7, SimpleBlock, 2, 17544753, 1618, null]
-        - [163, 7, SimpleBlock, 2, 17546374, 5969, null]
-        - [163, 7, SimpleBlock, 2, 17552346, 1804, null]
-        - [163, 7, SimpleBlock, 2, 17554153, 1848, null]
-        - [163, 7, SimpleBlock, 2, 17556004, 1926, null]
-        - [163, 7, SimpleBlock, 2, 17557933, 1630, null]
-        - [163, 7, SimpleBlock, 2, 17559566, 1113, null]
-        - [163, 7, SimpleBlock, 2, 17560682, 5295, null]
-        - [163, 7, SimpleBlock, 2, 17565980, 1004, null]
-        - [163, 7, SimpleBlock, 2, 17566987, 1093, null]
-        - [163, 7, SimpleBlock, 2, 17568083, 1153, null]
-        - [163, 7, SimpleBlock, 2, 17569239, 1172, null]
-        - [163, 7, SimpleBlock, 2, 17570414, 6354, null]
-        - [163, 7, SimpleBlock, 2, 17576771, 1405, null]
-        - [163, 7, SimpleBlock, 2, 17578179, 2397, null]
-        - [163, 7, SimpleBlock, 2, 17580579, 2799, null]
-        - [163, 7, SimpleBlock, 2, 17583381, 3471, null]
-        - [163, 7, SimpleBlock, 2, 17586855, 3841, null]
-        - [163, 7, SimpleBlock, 2, 17590699, 5779, null]
-        - [163, 7, SimpleBlock, 2, 17596481, 4169, null]
-        - [163, 7, SimpleBlock, 2, 17600653, 4518, null]
-        - [163, 7, SimpleBlock, 2, 17605174, 4830, null]
-        - [163, 7, SimpleBlock, 2, 17610007, 5034, null]
-        - [163, 7, SimpleBlock, 2, 17615044, 4699, null]
-        - [163, 7, SimpleBlock, 2, 17619746, 5776, null]
-        - [163, 7, SimpleBlock, 2, 17625525, 3001, null]
-        - [163, 7, SimpleBlock, 2, 17628529, 2180, null]
-        - [163, 7, SimpleBlock, 2, 17630712, 2302, null]
-        - [163, 7, SimpleBlock, 2, 17633017, 2170, null]
-        - [163, 7, SimpleBlock, 2, 17635190, 6062, null]
-        - [163, 7, SimpleBlock, 2, 17641255, 2343, null]
-        - [163, 7, SimpleBlock, 2, 17643601, 2435, null]
-        - [163, 7, SimpleBlock, 2, 17646039, 2472, null]
-        - [163, 7, SimpleBlock, 2, 17648514, 2495, null]
-        - [163, 7, SimpleBlock, 2, 17651012, 2687, null]
-        - [163, 7, SimpleBlock, 2, 17653702, 5393, null]
-        - [163, 7, SimpleBlock, 2, 17659098, 2627, null]
-        - [163, 7, SimpleBlock, 2, 17661728, 2740, null]
-        - [163, 7, SimpleBlock, 2, 17664471, 2819, null]
-        - [163, 7, SimpleBlock, 2, 17667293, 2973, null]
-        - [163, 7, SimpleBlock, 2, 17670269, 3204, null]
-        - [163, 7, SimpleBlock, 2, 17673476, 6255, null]
-        - [163, 7, SimpleBlock, 2, 17679734, 3227, null]
-        - [163, 7, SimpleBlock, 2, 17682964, 3096, null]
-        - [163, 7, SimpleBlock, 2, 17686063, 2755, null]
-        - [163, 7, SimpleBlock, 2, 17688821, 2414, null]
-        - [163, 7, SimpleBlock, 2, 17691238, 5966, null]
-        - [163, 7, SimpleBlock, 2, 17697207, 2199, null]
-        - [163, 7, SimpleBlock, 2, 17699409, 1988, null]
-        - [163, 7, SimpleBlock, 2, 17701400, 1875, null]
-        - [163, 7, SimpleBlock, 2, 17703278, 1877, null]
-        - [163, 7, SimpleBlock, 2, 17705158, 1855, null]
-        - [163, 7, SimpleBlock, 2, 17707016, 5872, null]
-        - [163, 7, SimpleBlock, 2, 17712891, 1753, null]
-        - [163, 7, SimpleBlock, 2, 17714647, 1698, null]
-        - [163, 7, SimpleBlock, 2, 17716348, 1681, null]
-        - [163, 7, SimpleBlock, 2, 17718032, 1668, null]
-        - [163, 7, SimpleBlock, 2, 17719703, 6449, null]
-        - [163, 7, SimpleBlock, 2, 17726155, 1643, null]
-        - [163, 7, SimpleBlock, 2, 17727801, 1573, null]
-        - [163, 7, SimpleBlock, 2, 17729377, 1510, null]
-        - [163, 7, SimpleBlock, 2, 17730890, 1414, null]
-        - [163, 7, SimpleBlock, 2, 17732307, 1290, null]
-        - [163, 7, SimpleBlock, 2, 17733600, 6066, null]
-        - [163, 7, SimpleBlock, 2, 17739669, 1199, null]
-        - [163, 7, SimpleBlock, 2, 17740871, 1170, null]
-        - [163, 7, SimpleBlock, 2, 17742044, 1056, null]
-        - [163, 7, SimpleBlock, 2, 17743103, 914, null]
-        - [163, 7, SimpleBlock, 2, 17744020, 895, null]
-        - [163, 7, SimpleBlock, 2, 17744918, 6256, null]
-        - [163, 7, SimpleBlock, 2, 17751177, 772, null]
-        - [163, 7, SimpleBlock, 2, 17751952, 686, null]
-        - [163, 7, SimpleBlock, 2, 17752641, 801, null]
-        - [163, 7, SimpleBlock, 2, 17753445, 810, null]
-        - [163, 7, SimpleBlock, 2, 17754258, 5201, null]
-        - [163, 7, SimpleBlock, 2, 17759462, 816, null]
-        - [163, 7, SimpleBlock, 2, 17760281, 773, null]
-        - [163, 7, SimpleBlock, 2, 17761057, 767, null]
-        - [163, 7, SimpleBlock, 2, 17761827, 819, null]
-        - [163, 7, SimpleBlock, 2, 17762649, 878, null]
-        - [163, 7, SimpleBlock, 2, 17763530, 5777, null]
-        - [163, 7, SimpleBlock, 2, 17769310, 1042, null]
-        - [163, 7, SimpleBlock, 2, 17770355, 1207, null]
-        - [163, 7, SimpleBlock, 2, 17771565, 1260, null]
-        - [163, 7, SimpleBlock, 2, 17772828, 1224, null]
-        - [163, 7, SimpleBlock, 2, 17774055, 5679, null]
-        - [163, 7, SimpleBlock, 2, 17779737, 1156, null]
-        - [163, 7, SimpleBlock, 2, 17780896, 1212, null]
-        - [163, 7, SimpleBlock, 2, 17782111, 1231, null]
-        - [163, 7, SimpleBlock, 2, 17783345, 1228, null]
-        - [163, 7, SimpleBlock, 2, 17784576, 1295, null]
-        - [163, 7, SimpleBlock, 2, 17785874, 5010, null]
-        - [163, 7, SimpleBlock, 2, 17790887, 1319, null]
-        - [163, 7, SimpleBlock, 2, 17792209, 1331, null]
-        - [163, 7, SimpleBlock, 2, 17793543, 1360, null]
-        - [163, 7, SimpleBlock, 2, 17794906, 1380, null]
-        - [163, 7, SimpleBlock, 2, 17796289, 1470, null]
-        - [163, 7, SimpleBlock, 2, 17797762, 5968, null]
-        - [163, 7, SimpleBlock, 2, 17803733, 1471, null]
-        - [163, 7, SimpleBlock, 2, 17805207, 1209, null]
-        - [163, 7, SimpleBlock, 2, 17806419, 1172, null]
-        - [163, 7, SimpleBlock, 2, 17807594, 1246, null]
-        - [163, 7, SimpleBlock, 2, 17808843, 5874, null]
-        - [163, 7, SimpleBlock, 2, 17814721, 29320, null]
-        - [163, 7, SimpleBlock, 2, 17844044, 4031, null]
-        - [163, 7, SimpleBlock, 2, 17848078, 3115, null]
-        - [163, 7, SimpleBlock, 2, 17851196, 2426, null]
-        - [163, 7, SimpleBlock, 2, 17853625, 3597, null]
-        - [163, 7, SimpleBlock, 2, 17857225, 5586, null]
-        - [163, 7, SimpleBlock, 2, 17862814, 4146, null]
-        - [163, 7, SimpleBlock, 2, 17866963, 4167, null]
-        - [163, 7, SimpleBlock, 2, 17871133, 3878, null]
-        - [163, 7, SimpleBlock, 2, 17875014, 2803, null]
-        - [163, 7, SimpleBlock, 2, 17877820, 772, null]
-        - [163, 7, SimpleBlock, 2, 17878595, 2519, null]
-        - [163, 7, SimpleBlock, 2, 17881117, 5586, null]
-        - [163, 7, SimpleBlock, 2, 17886706, 3475, null]
-        - [163, 7, SimpleBlock, 2, 17890184, 3964, null]
-        - [163, 7, SimpleBlock, 2, 17894151, 3802, null]
-        - [163, 7, SimpleBlock, 2, 17897956, 3434, null]
-        - [163, 7, SimpleBlock, 2, 17901393, 2679, null]
-        - [163, 7, SimpleBlock, 2, 17904075, 5489, null]
-        - [163, 7, SimpleBlock, 2, 17909567, 2362, null]
-        - [163, 7, SimpleBlock, 2, 17911932, 2821, null]
-        - [163, 7, SimpleBlock, 2, 17914756, 3440, null]
-        - [163, 7, SimpleBlock, 2, 17918199, 3659, null]
-        - [163, 7, SimpleBlock, 2, 17921861, 6737, null]
-        - [163, 7, SimpleBlock, 2, 17928601, 3649, null]
-        - [163, 7, SimpleBlock, 2, 17932253, 2521, null]
-        - [163, 7, SimpleBlock, 2, 17934777, 1893, null]
-        - [163, 7, SimpleBlock, 2, 17936673, 2836, null]
-        - [163, 7, SimpleBlock, 2, 17939512, 3377, null]
-        - [163, 7, SimpleBlock, 2, 17942892, 5392, null]
-        - [163, 7, SimpleBlock, 2, 17948287, 3391, null]
-        - [163, 7, SimpleBlock, 2, 17951681, 3300, null]
-        - [163, 7, SimpleBlock, 2, 17954984, 2321, null]
-        - [163, 7, SimpleBlock, 2, 17957308, 1850, null]
-        - [163, 7, SimpleBlock, 2, 17959161, 5585, null]
-        - [163, 7, SimpleBlock, 2, 17964749, 2256, null]
-        - [163, 7, SimpleBlock, 2, 17967008, 2635, null]
-        - [163, 7, SimpleBlock, 2, 17969646, 2856, null]
-        - [163, 7, SimpleBlock, 2, 17972505, 2837, null]
-        - [163, 7, SimpleBlock, 2, 17975345, 2829, null]
-        - [163, 7, SimpleBlock, 2, 17978177, 6256, null]
-        - [163, 7, SimpleBlock, 2, 17984436, 2566, null]
-        - [163, 7, SimpleBlock, 2, 17987005, 2308, null]
-        - [163, 7, SimpleBlock, 2, 17989316, 2064, null]
-        - [163, 7, SimpleBlock, 2, 17991383, 2007, null]
-        - [163, 7, SimpleBlock, 2, 17993393, 2166, null]
-        - [163, 7, SimpleBlock, 2, 17995562, 5393, null]
-        - [163, 7, SimpleBlock, 2, 18000958, 1772, null]
-        - [163, 7, SimpleBlock, 2, 18002733, 1579, null]
-        - [163, 7, SimpleBlock, 2, 18004315, 1467, null]
-        - [163, 7, SimpleBlock, 2, 18005785, 1362, null]
-        - [163, 7, SimpleBlock, 2, 18007150, 5776, null]
-        - [163, 7, SimpleBlock, 2, 18012929, 1411, null]
-        - [163, 7, SimpleBlock, 2, 18014343, 1553, null]
-        - [163, 7, SimpleBlock, 2, 18015899, 1874, null]
-        - [163, 7, SimpleBlock, 2, 18017776, 2222, null]
-        - [163, 7, SimpleBlock, 2, 18020001, 2455, null]
-        - [163, 7, SimpleBlock, 2, 18022459, 5298, null]
-        - [163, 7, SimpleBlock, 2, 18027760, 2969, null]
-        - [163, 7, SimpleBlock, 2, 18030732, 2986, null]
-        - [163, 7, SimpleBlock, 2, 18033721, 2874, null]
-        - [163, 7, SimpleBlock, 2, 18036598, 3500, null]
-        - [163, 7, SimpleBlock, 2, 18040101, 5299, null]
-        - [163, 7, SimpleBlock, 2, 18045403, 5436, null]
-        - [163, 7, SimpleBlock, 2, 18050842, 5687, null]
-        - [163, 7, SimpleBlock, 2, 18056532, 4865, null]
-        - [163, 7, SimpleBlock, 2, 18061400, 4047, null]
-        - [163, 7, SimpleBlock, 2, 18065450, 4424, null]
-        - [163, 7, SimpleBlock, 2, 18069877, 5776, null]
-        - [163, 7, SimpleBlock, 2, 18075656, 4828, null]
-        - [163, 7, SimpleBlock, 2, 18080487, 5030, null]
-        - [163, 7, SimpleBlock, 2, 18085520, 4587, null]
-        - [163, 7, SimpleBlock, 2, 18090110, 3823, null]
-        - [163, 7, SimpleBlock, 2, 18093936, 3266, null]
-        - [163, 7, SimpleBlock, 2, 18097205, 5969, null]
-        - [163, 7, SimpleBlock, 2, 18103177, 2943, null]
-        - [163, 7, SimpleBlock, 2, 18106123, 2733, null]
-        - [163, 7, SimpleBlock, 2, 18108859, 2523, null]
-        - [163, 7, SimpleBlock, 2, 18111385, 2499, null]
-        - [163, 7, SimpleBlock, 2, 18113887, 6162, null]
-        - [163, 7, SimpleBlock, 2, 18120052, 2530, null]
-        - [163, 7, SimpleBlock, 2, 18122585, 2361, null]
-        - [163, 7, SimpleBlock, 2, 18124949, 2255, null]
-        - [163, 7, SimpleBlock, 2, 18127207, 2069, null]
-        - [163, 7, SimpleBlock, 2, 18129279, 1886, null]
-        - [163, 7, SimpleBlock, 2, 18131168, 5874, null]
-        - [163, 7, SimpleBlock, 2, 18137045, 1818, null]
-        - [163, 7, SimpleBlock, 2, 18138866, 1694, null]
-        - [163, 7, SimpleBlock, 2, 18140563, 1791, null]
-        - [163, 7, SimpleBlock, 2, 18142357, 1640, null]
-        - [163, 7, SimpleBlock, 2, 18144000, 5679, null]
-        - [163, 7, SimpleBlock, 2, 18149682, 1477, null]
-        - [163, 7, SimpleBlock, 2, 18151163, 60499, null]
-        - [163, 7, SimpleBlock, 2, 18211665, 2228, null]
-        - [163, 7, SimpleBlock, 2, 18213896, 2038, null]
-        - [163, 7, SimpleBlock, 2, 18215937, 1445, null]
-        - [163, 7, SimpleBlock, 2, 18217385, 5871, null]
-        - [163, 7, SimpleBlock, 2, 18223259, 1144, null]
-        - [163, 7, SimpleBlock, 2, 18224406, 966, null]
-        - [163, 7, SimpleBlock, 2, 18225375, 1554, null]
-        - [163, 7, SimpleBlock, 2, 18226932, 2149, null]
-        - [163, 7, SimpleBlock, 2, 18229084, 2465, null]
-        - [163, 7, SimpleBlock, 2, 18231552, 5872, null]
-        - [163, 7, SimpleBlock, 2, 18237427, 2573, null]
-        - [163, 7, SimpleBlock, 2, 18240003, 2777, null]
-        - [163, 7, SimpleBlock, 2, 18242783, 2284, null]
-        - [163, 7, SimpleBlock, 2, 18245070, 1929, null]
-        - [163, 7, SimpleBlock, 2, 18247002, 6066, null]
-        - [163, 7, SimpleBlock, 2, 18253071, 1909, null]
-        - [163, 7, SimpleBlock, 2, 18254983, 1855, null]
-        - [163, 7, SimpleBlock, 2, 18256841, 1852, null]
-        - [163, 7, SimpleBlock, 2, 18258696, 1983, null]
-        - [163, 7, SimpleBlock, 2, 18260682, 1894, null]
-        - [163, 7, SimpleBlock, 2, 18262579, 5583, null]
-        - [163, 7, SimpleBlock, 2, 18268165, 2739, null]
-        - [163, 7, SimpleBlock, 2, 18270907, 3644, null]
-        - [163, 7, SimpleBlock, 2, 18274554, 4230, null]
-        - [163, 7, SimpleBlock, 2, 18278787, 3657, null]
-        - [163, 7, SimpleBlock, 2, 18282447, 3713, null]
-        - [163, 7, SimpleBlock, 2, 18286163, 5680, null]
-        - [163, 7, SimpleBlock, 2, 18291846, 4481, null]
-        - [163, 7, SimpleBlock, 2, 18296330, 4123, null]
-        - [163, 7, SimpleBlock, 2, 18300456, 3651, null]
-        - [163, 7, SimpleBlock, 2, 18304110, 3533, null]
-        - [163, 7, SimpleBlock, 2, 18307646, 5681, null]
-        - [163, 7, SimpleBlock, 2, 18313330, 4339, null]
-        - [163, 7, SimpleBlock, 2, 18317672, 5237, null]
-        - [163, 7, SimpleBlock, 2, 18322912, 5918, null]
-        - [163, 7, SimpleBlock, 2, 18328833, 5993, null]
-        - [163, 7, SimpleBlock, 2, 18334829, 4395, null]
-        - [163, 7, SimpleBlock, 2, 18339227, 6066, null]
-        - [163, 7, SimpleBlock, 2, 18345296, 4935, null]
-        - [163, 7, SimpleBlock, 2, 18350234, 6037, null]
-        - [163, 7, SimpleBlock, 2, 18356274, 6409, null]
-        - [163, 7, SimpleBlock, 2, 18362686, 6297, null]
-        - [163, 7, SimpleBlock, 2, 18368986, 5585, null]
-        - [163, 7, SimpleBlock, 2, 18374574, 5557, null]
-        - [163, 7, SimpleBlock, 2, 18380134, 3974, null]
-        - [163, 7, SimpleBlock, 2, 18384111, 3783, null]
-        - [163, 7, SimpleBlock, 2, 18387897, 5331, null]
-        - [163, 7, SimpleBlock, 2, 18393231, 6651, null]
-        - [163, 7, SimpleBlock, 2, 18399885, 6256, null]
-        - [163, 7, SimpleBlock, 2, 18406144, 7153, null]
-        - [163, 7, SimpleBlock, 2, 18413300, 6988, null]
-        - [163, 7, SimpleBlock, 2, 18420291, 5408, null]
-        - [163, 7, SimpleBlock, 2, 18425702, 5607, null]
-        - [163, 7, SimpleBlock, 2, 18431312, 6685, null]
-        - [163, 7, SimpleBlock, 2, 18438000, 5585, null]
-        - [163, 7, SimpleBlock, 2, 18443588, 6995, null]
-        - [163, 7, SimpleBlock, 2, 18450586, 7063, null]
-        - [163, 7, SimpleBlock, 2, 18457652, 7432, null]
-        - [163, 7, SimpleBlock, 2, 18465087, 6784, null]
-        - [163, 7, SimpleBlock, 2, 18471874, 6257, null]
-        - [163, 7, SimpleBlock, 2, 18478134, 5355, null]
-        - [163, 7, SimpleBlock, 2, 18483492, 7557, null]
-        - [163, 7, SimpleBlock, 2, 18491052, 8650, null]
-        - [163, 7, SimpleBlock, 2, 18499705, 8923, null]
-        - [163, 7, SimpleBlock, 2, 18508631, 8857, null]
-        - [163, 7, SimpleBlock, 2, 18517491, 772, null]
-        - [163, 7, SimpleBlock, 2, 18518266, 5487, null]
-        - [163, 7, SimpleBlock, 2, 18523756, 7441, null]
-        - [163, 7, SimpleBlock, 2, 18531200, 8855, null]
-        - [163, 7, SimpleBlock, 2, 18540058, 9921, null]
-        - [163, 7, SimpleBlock, 2, 18549982, 10005, null]
-        - [163, 7, SimpleBlock, 2, 18559990, 10304, null]
-        - [163, 7, SimpleBlock, 2, 18570297, 5199, null]
-        - [163, 7, SimpleBlock, 2, 18575499, 10952, null]
-        - [163, 7, SimpleBlock, 2, 18586454, 11010, null]
-        - [163, 7, SimpleBlock, 2, 18597467, 9866, null]
-        - [163, 7, SimpleBlock, 2, 18607336, 10617, null]
-        - [163, 7, SimpleBlock, 2, 18617956, 10835, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 18628799
-      - 2103666
-      - - [231, 1, Timecode, 2, 18628801, 3, 66500]
-        - [163, 7, SimpleBlock, 2, 18628807, 772, null]
-        - [163, 7, SimpleBlock, 2, 18629582, 5776, null]
-        - [163, 7, SimpleBlock, 2, 18635362, 36579, null]
-        - [163, 7, SimpleBlock, 2, 18671944, 10731, null]
-        - [163, 7, SimpleBlock, 2, 18682678, 10066, null]
-        - [163, 7, SimpleBlock, 2, 18692747, 10462, null]
-        - [163, 7, SimpleBlock, 2, 18703212, 5680, null]
-        - [163, 7, SimpleBlock, 2, 18708895, 10053, null]
-        - [163, 7, SimpleBlock, 2, 18718951, 9561, null]
-        - [163, 7, SimpleBlock, 2, 18728515, 9702, null]
-        - [163, 7, SimpleBlock, 2, 18738220, 9853, null]
-        - [163, 7, SimpleBlock, 2, 18748076, 10160, null]
-        - [163, 7, SimpleBlock, 2, 18758239, 5777, null]
-        - [163, 7, SimpleBlock, 2, 18764019, 10507, null]
-        - [163, 7, SimpleBlock, 2, 18774529, 9258, null]
-        - [163, 7, SimpleBlock, 2, 18783790, 9531, null]
-        - [163, 7, SimpleBlock, 2, 18793324, 9334, null]
-        - [163, 7, SimpleBlock, 2, 18802661, 5971, null]
-        - [163, 7, SimpleBlock, 2, 18808635, 9543, null]
-        - [163, 7, SimpleBlock, 2, 18818181, 9583, null]
-        - [163, 7, SimpleBlock, 2, 18827767, 9467, null]
-        - [163, 7, SimpleBlock, 2, 18837237, 8785, null]
-        - [163, 7, SimpleBlock, 2, 18846025, 8852, null]
-        - [163, 7, SimpleBlock, 2, 18854880, 5585, null]
-        - [163, 7, SimpleBlock, 2, 18860468, 8937, null]
-        - [163, 7, SimpleBlock, 2, 18869408, 9268, null]
-        - [163, 7, SimpleBlock, 2, 18878679, 9540, null]
-        - [163, 7, SimpleBlock, 2, 18888222, 9647, null]
-        - [163, 7, SimpleBlock, 2, 18897872, 10183, null]
-        - [163, 7, SimpleBlock, 2, 18908058, 6063, null]
-        - [163, 7, SimpleBlock, 2, 18914124, 10189, null]
-        - [163, 7, SimpleBlock, 2, 18924316, 10411, null]
-        - [163, 7, SimpleBlock, 2, 18934730, 10327, null]
-        - [163, 7, SimpleBlock, 2, 18945060, 8746, null]
-        - [163, 7, SimpleBlock, 2, 18953809, 5778, null]
-        - [163, 7, SimpleBlock, 2, 18959590, 6640, null]
-        - [163, 7, SimpleBlock, 2, 18966233, 4282, null]
-        - [163, 7, SimpleBlock, 2, 18970518, 4188, null]
-        - [163, 7, SimpleBlock, 2, 18974709, 4033, null]
-        - [163, 7, SimpleBlock, 2, 18978745, 3879, null]
-        - [163, 7, SimpleBlock, 2, 18982627, 6161, null]
-        - [163, 7, SimpleBlock, 2, 18988791, 3886, null]
-        - [163, 7, SimpleBlock, 2, 18992680, 3964, null]
-        - [163, 7, SimpleBlock, 2, 18996647, 4541, null]
-        - [163, 7, SimpleBlock, 2, 19001191, 6260, null]
-        - [163, 7, SimpleBlock, 2, 19007454, 6063, null]
-        - [163, 7, SimpleBlock, 2, 19013520, 6518, null]
-        - [163, 7, SimpleBlock, 2, 19020041, 7033, null]
-        - [163, 7, SimpleBlock, 2, 19027077, 7616, null]
-        - [163, 7, SimpleBlock, 2, 19034696, 8183, null]
-        - [163, 7, SimpleBlock, 2, 19042882, 8734, null]
-        - [163, 7, SimpleBlock, 2, 19051619, 6067, null]
-        - [163, 7, SimpleBlock, 2, 19057689, 9116, null]
-        - [163, 7, SimpleBlock, 2, 19066808, 9011, null]
-        - [163, 7, SimpleBlock, 2, 19075822, 8607, null]
-        - [163, 7, SimpleBlock, 2, 19084432, 6087, null]
-        - [163, 7, SimpleBlock, 2, 19090522, 4136, null]
-        - [163, 7, SimpleBlock, 2, 19094661, 6061, null]
-        - [163, 7, SimpleBlock, 2, 19100725, 4215, null]
-        - [163, 7, SimpleBlock, 2, 19104943, 8273, null]
-        - [163, 7, SimpleBlock, 2, 19113219, 8929, null]
-        - [163, 7, SimpleBlock, 2, 19122151, 8522, null]
-        - [163, 7, SimpleBlock, 2, 19130676, 5682, null]
-        - [163, 7, SimpleBlock, 2, 19136361, 8505, null]
-        - [163, 7, SimpleBlock, 2, 19144869, 8264, null]
-        - [163, 7, SimpleBlock, 2, 19153136, 8036, null]
-        - [163, 7, SimpleBlock, 2, 19161175, 8376, null]
-        - [163, 7, SimpleBlock, 2, 19169554, 7908, null]
-        - [163, 7, SimpleBlock, 2, 19177465, 6255, null]
-        - [163, 7, SimpleBlock, 2, 19183723, 8350, null]
-        - [163, 7, SimpleBlock, 2, 19192076, 10471, null]
-        - [163, 7, SimpleBlock, 2, 19202550, 12007, null]
-        - [163, 7, SimpleBlock, 2, 19214560, 12700, null]
-        - [163, 7, SimpleBlock, 2, 19227263, 6449, null]
-        - [163, 7, SimpleBlock, 2, 19233715, 13211, null]
-        - [163, 7, SimpleBlock, 2, 19246929, 13350, null]
-        - [163, 7, SimpleBlock, 2, 19260282, 12895, null]
-        - [163, 7, SimpleBlock, 2, 19273180, 11656, null]
-        - [163, 7, SimpleBlock, 2, 19284839, 10411, null]
-        - [163, 7, SimpleBlock, 2, 19295253, 6451, null]
-        - [163, 7, SimpleBlock, 2, 19301707, 9994, null]
-        - [163, 7, SimpleBlock, 2, 19311704, 9523, null]
-        - [163, 7, SimpleBlock, 2, 19321230, 9295, null]
-        - [163, 7, SimpleBlock, 2, 19330528, 8371, null]
-        - [163, 7, SimpleBlock, 2, 19338902, 7294, null]
-        - [163, 7, SimpleBlock, 2, 19346199, 6161, null]
-        - [163, 7, SimpleBlock, 2, 19352363, 6261, null]
-        - [163, 7, SimpleBlock, 2, 19358628, 36475, null]
-        - [163, 7, SimpleBlock, 2, 19395106, 1597, null]
-        - [163, 7, SimpleBlock, 2, 19396706, 1054, null]
-        - [163, 7, SimpleBlock, 2, 19397763, 5967, null]
-        - [163, 7, SimpleBlock, 2, 19403733, 639, null]
-        - [163, 7, SimpleBlock, 2, 19404375, 654, null]
-        - [163, 7, SimpleBlock, 2, 19405032, 649, null]
-        - [163, 7, SimpleBlock, 2, 19405684, 671, null]
-        - [163, 7, SimpleBlock, 2, 19406358, 546, null]
-        - [163, 7, SimpleBlock, 2, 19406907, 6257, null]
-        - [163, 7, SimpleBlock, 2, 19413167, 564, null]
-        - [163, 7, SimpleBlock, 2, 19413734, 551, null]
-        - [163, 7, SimpleBlock, 2, 19414288, 644, null]
-        - [163, 7, SimpleBlock, 2, 19414935, 691, null]
-        - [163, 7, SimpleBlock, 2, 19415629, 559, null]
-        - [163, 7, SimpleBlock, 2, 19416191, 5872, null]
-        - [163, 7, SimpleBlock, 2, 19422066, 619, null]
-        - [163, 7, SimpleBlock, 2, 19422688, 773, null]
-        - [163, 7, SimpleBlock, 2, 19423464, 853, null]
-        - [163, 7, SimpleBlock, 2, 19424320, 816, null]
-        - [163, 7, SimpleBlock, 2, 19425139, 5488, null]
-        - [163, 7, SimpleBlock, 2, 19430630, 760, null]
-        - [163, 7, SimpleBlock, 2, 19431393, 977, null]
-        - [163, 7, SimpleBlock, 2, 19432373, 729, null]
-        - [163, 7, SimpleBlock, 2, 19433105, 915, null]
-        - [163, 7, SimpleBlock, 2, 19434023, 803, null]
-        - [163, 7, SimpleBlock, 2, 19434829, 5967, null]
-        - [163, 7, SimpleBlock, 2, 19440799, 629, null]
-        - [163, 7, SimpleBlock, 2, 19441431, 971, null]
-        - [163, 7, SimpleBlock, 2, 19442405, 704, null]
-        - [163, 7, SimpleBlock, 2, 19443112, 899, null]
-        - [163, 7, SimpleBlock, 2, 19444014, 5584, null]
-        - [163, 7, SimpleBlock, 2, 19449601, 814, null]
-        - [163, 7, SimpleBlock, 2, 19450418, 724, null]
-        - [163, 7, SimpleBlock, 2, 19451145, 950, null]
-        - [163, 7, SimpleBlock, 2, 19452098, 770, null]
-        - [163, 7, SimpleBlock, 2, 19452871, 973, null]
-        - [163, 7, SimpleBlock, 2, 19453847, 5776, null]
-        - [163, 7, SimpleBlock, 2, 19459626, 901, null]
-        - [163, 7, SimpleBlock, 2, 19460530, 719, null]
-        - [163, 7, SimpleBlock, 2, 19461252, 947, null]
-        - [163, 7, SimpleBlock, 2, 19462202, 662, null]
-        - [163, 7, SimpleBlock, 2, 19462867, 836, null]
-        - [163, 7, SimpleBlock, 2, 19463706, 6160, null]
-        - [163, 7, SimpleBlock, 2, 19469869, 723, null]
-        - [163, 7, SimpleBlock, 2, 19470595, 592, null]
-        - [163, 7, SimpleBlock, 2, 19471190, 837, null]
-        - [163, 7, SimpleBlock, 2, 19472030, 607, null]
-        - [163, 7, SimpleBlock, 2, 19472640, 5681, null]
-        - [163, 7, SimpleBlock, 2, 19478324, 784, null]
-        - [163, 7, SimpleBlock, 2, 19479111, 699, null]
-        - [163, 7, SimpleBlock, 2, 19479813, 517, null]
-        - [163, 7, SimpleBlock, 2, 19480333, 787, null]
-        - [163, 7, SimpleBlock, 2, 19481123, 554, null]
-        - [163, 7, SimpleBlock, 2, 19481680, 6065, null]
-        - [163, 7, SimpleBlock, 2, 19487749, 48229, null]
-        - [163, 7, SimpleBlock, 2, 19535981, 1795, null]
-        - [163, 7, SimpleBlock, 2, 19537779, 1433, null]
-        - [163, 7, SimpleBlock, 2, 19539215, 829, null]
-        - [163, 7, SimpleBlock, 2, 19540047, 772, null]
-        - [163, 7, SimpleBlock, 2, 19540822, 647, null]
-        - [163, 7, SimpleBlock, 2, 19541472, 5680, null]
-        - [163, 7, SimpleBlock, 2, 19547155, 757, null]
-        - [163, 7, SimpleBlock, 2, 19547915, 771, null]
-        - [163, 7, SimpleBlock, 2, 19548689, 699, null]
-        - [163, 7, SimpleBlock, 2, 19549391, 793, null]
-        - [163, 7, SimpleBlock, 2, 19550187, 904, null]
-        - [163, 7, SimpleBlock, 2, 19551094, 5872, null]
-        - [163, 7, SimpleBlock, 2, 19556969, 862, null]
-        - [163, 7, SimpleBlock, 2, 19557834, 1178, null]
-        - [163, 7, SimpleBlock, 2, 19559015, 1055, null]
-        - [163, 7, SimpleBlock, 2, 19560073, 1098, null]
-        - [163, 7, SimpleBlock, 2, 19561174, 5774, null]
-        - [163, 7, SimpleBlock, 2, 19566951, 1242, null]
-        - [163, 7, SimpleBlock, 2, 19568196, 1272, null]
-        - [163, 7, SimpleBlock, 2, 19569471, 1209, null]
-        - [163, 7, SimpleBlock, 2, 19570683, 1540, null]
-        - [163, 7, SimpleBlock, 2, 19572226, 1541, null]
-        - [163, 7, SimpleBlock, 2, 19573770, 5680, null]
-        - [163, 7, SimpleBlock, 2, 19579453, 1583, null]
-        - [163, 7, SimpleBlock, 2, 19581039, 1724, null]
-        - [163, 7, SimpleBlock, 2, 19582766, 1947, null]
-        - [163, 7, SimpleBlock, 2, 19584716, 1810, null]
-        - [163, 7, SimpleBlock, 2, 19586529, 5394, null]
-        - [163, 7, SimpleBlock, 2, 19591926, 1931, null]
-        - [163, 7, SimpleBlock, 2, 19593860, 1872, null]
-        - [163, 7, SimpleBlock, 2, 19595735, 1897, null]
-        - [163, 7, SimpleBlock, 2, 19597635, 1731, null]
-        - [163, 7, SimpleBlock, 2, 19599369, 1852, null]
-        - [163, 7, SimpleBlock, 2, 19601224, 5393, null]
-        - [163, 7, SimpleBlock, 2, 19606620, 1761, null]
-        - [163, 7, SimpleBlock, 2, 19608384, 1845, null]
-        - [163, 7, SimpleBlock, 2, 19610232, 1851, null]
-        - [163, 7, SimpleBlock, 2, 19612086, 1824, null]
-        - [163, 7, SimpleBlock, 2, 19613913, 1842, null]
-        - [163, 7, SimpleBlock, 2, 19615758, 5295, null]
-        - [163, 7, SimpleBlock, 2, 19621056, 1767, null]
-        - [163, 7, SimpleBlock, 2, 19622826, 1774, null]
-        - [163, 7, SimpleBlock, 2, 19624603, 1688, null]
-        - [163, 7, SimpleBlock, 2, 19626294, 1683, null]
-        - [163, 7, SimpleBlock, 2, 19627980, 5584, null]
-        - [163, 7, SimpleBlock, 2, 19633567, 1458, null]
-        - [163, 7, SimpleBlock, 2, 19635028, 1661, null]
-        - [163, 7, SimpleBlock, 2, 19636692, 1559, null]
-        - [163, 7, SimpleBlock, 2, 19638254, 1429, null]
-        - [163, 7, SimpleBlock, 2, 19639686, 1566, null]
-        - [163, 7, SimpleBlock, 2, 19641255, 5294, null]
-        - [163, 7, SimpleBlock, 2, 19646552, 1519, null]
-        - [163, 7, SimpleBlock, 2, 19648074, 1356, null]
-        - [163, 7, SimpleBlock, 2, 19649433, 1292, null]
-        - [163, 7, SimpleBlock, 2, 19650728, 1177, null]
-        - [163, 7, SimpleBlock, 2, 19651908, 5488, null]
-        - [163, 7, SimpleBlock, 2, 19657399, 1208, null]
-        - [163, 7, SimpleBlock, 2, 19658610, 1022, null]
-        - [163, 7, SimpleBlock, 2, 19659635, 943, null]
-        - [163, 7, SimpleBlock, 2, 19660581, 804, null]
-        - [163, 7, SimpleBlock, 2, 19661388, 783, null]
-        - [163, 7, SimpleBlock, 2, 19662174, 5393, null]
-        - [163, 7, SimpleBlock, 2, 19667570, 856, null]
-        - [163, 7, SimpleBlock, 2, 19668430, 28957, null]
-        - [163, 7, SimpleBlock, 2, 19697390, 3375, null]
-        - [163, 7, SimpleBlock, 2, 19700768, 3741, null]
-        - [163, 7, SimpleBlock, 2, 19704512, 3590, null]
-        - [163, 7, SimpleBlock, 2, 19708105, 6545, null]
-        - [163, 7, SimpleBlock, 2, 19714653, 3476, null]
-        - [163, 7, SimpleBlock, 2, 19718132, 3331, null]
-        - [163, 7, SimpleBlock, 2, 19721466, 3305, null]
-        - [163, 7, SimpleBlock, 2, 19724774, 3474, null]
-        - [163, 7, SimpleBlock, 2, 19728251, 6063, null]
-        - [163, 7, SimpleBlock, 2, 19734317, 3784, null]
-        - [163, 7, SimpleBlock, 2, 19738104, 3987, null]
-        - [163, 7, SimpleBlock, 2, 19742094, 4201, null]
-        - [163, 7, SimpleBlock, 2, 19746298, 3595, null]
-        - [163, 7, SimpleBlock, 2, 19749896, 3209, null]
-        - [163, 7, SimpleBlock, 2, 19753108, 6256, null]
-        - [163, 7, SimpleBlock, 2, 19759367, 3317, null]
-        - [163, 7, SimpleBlock, 2, 19762687, 3767, null]
-        - [163, 7, SimpleBlock, 2, 19766457, 3811, null]
-        - [163, 7, SimpleBlock, 2, 19770271, 3951, null]
-        - [163, 7, SimpleBlock, 2, 19774225, 6546, null]
-        - [163, 7, SimpleBlock, 2, 19780774, 3884, null]
-        - [163, 7, SimpleBlock, 2, 19784661, 3807, null]
-        - [163, 7, SimpleBlock, 2, 19788471, 4301, null]
-        - [163, 7, SimpleBlock, 2, 19792775, 5472, null]
-        - [163, 7, SimpleBlock, 2, 19798250, 6931, null]
-        - [163, 7, SimpleBlock, 2, 19805184, 5968, null]
-        - [163, 7, SimpleBlock, 2, 19811155, 8261, null]
-        - [163, 7, SimpleBlock, 2, 19819419, 9448, null]
-        - [163, 7, SimpleBlock, 2, 19828870, 9747, null]
-        - [163, 7, SimpleBlock, 2, 19838620, 10939, null]
-        - [163, 7, SimpleBlock, 2, 19849562, 11581, null]
-        - [163, 7, SimpleBlock, 2, 19861146, 6257, null]
-        - [163, 7, SimpleBlock, 2, 19867406, 12226, null]
-        - [163, 7, SimpleBlock, 2, 19879635, 12386, null]
-        - [163, 7, SimpleBlock, 2, 19892024, 12288, null]
-        - [163, 7, SimpleBlock, 2, 19904315, 12342, null]
-        - [163, 7, SimpleBlock, 2, 19916660, 6066, null]
-        - [163, 7, SimpleBlock, 2, 19922729, 12606, null]
-        - [163, 7, SimpleBlock, 2, 19935338, 12670, null]
-        - [163, 7, SimpleBlock, 2, 19948011, 14314, null]
-        - [163, 7, SimpleBlock, 2, 19962328, 14351, null]
-        - [163, 7, SimpleBlock, 2, 19976682, 14816, null]
-        - [163, 7, SimpleBlock, 2, 19991501, 6065, null]
-        - [163, 7, SimpleBlock, 2, 19997569, 14730, null]
-        - [163, 7, SimpleBlock, 2, 20012302, 14115, null]
-        - [163, 7, SimpleBlock, 2, 20026420, 12301, null]
-        - [163, 7, SimpleBlock, 2, 20038724, 9600, null]
-        - [163, 7, SimpleBlock, 2, 20048327, 7875, null]
-        - [163, 7, SimpleBlock, 2, 20056205, 6258, null]
-        - [163, 7, SimpleBlock, 2, 20062466, 7045, null]
-        - [163, 7, SimpleBlock, 2, 20069514, 5980, null]
-        - [163, 7, SimpleBlock, 2, 20075497, 5767, null]
-        - [163, 7, SimpleBlock, 2, 20081267, 5984, null]
-        - [163, 7, SimpleBlock, 2, 20087254, 5874, null]
-        - [163, 7, SimpleBlock, 2, 20093131, 6340, null]
-        - [163, 7, SimpleBlock, 2, 20099474, 6302, null]
-        - [163, 7, SimpleBlock, 2, 20105779, 6276, null]
-        - [163, 7, SimpleBlock, 2, 20112058, 6033, null]
-        - [163, 7, SimpleBlock, 2, 20118094, 5439, null]
-        - [163, 7, SimpleBlock, 2, 20123536, 5873, null]
-        - [163, 7, SimpleBlock, 2, 20129413, 60579, null]
-        - [163, 7, SimpleBlock, 2, 20189995, 7029, null]
-        - [163, 7, SimpleBlock, 2, 20197027, 9336, null]
-        - [163, 7, SimpleBlock, 2, 20206366, 10592, null]
-        - [163, 7, SimpleBlock, 2, 20216961, 5490, null]
-        - [163, 7, SimpleBlock, 2, 20222454, 12788, null]
-        - [163, 7, SimpleBlock, 2, 20235245, 13783, null]
-        - [163, 7, SimpleBlock, 2, 20249031, 14231, null]
-        - [163, 7, SimpleBlock, 2, 20263265, 15363, null]
-        - [163, 7, SimpleBlock, 2, 20278632, 17133, null]
-        - [163, 7, SimpleBlock, 2, 20295768, 5296, null]
-        - [163, 7, SimpleBlock, 2, 20301068, 17470, null]
-        - [163, 7, SimpleBlock, 2, 20318541, 14994, null]
-        - [163, 7, SimpleBlock, 2, 20333538, 14941, null]
-        - [163, 7, SimpleBlock, 2, 20348482, 14520, null]
-        - [163, 7, SimpleBlock, 2, 20363005, 15205, null]
-        - [163, 7, SimpleBlock, 2, 20378213, 5201, null]
-        - [163, 7, SimpleBlock, 2, 20383417, 15907, null]
-        - [163, 7, SimpleBlock, 2, 20399328, 16652, null]
-        - [163, 7, SimpleBlock, 2, 20415984, 17361, null]
-        - [163, 7, SimpleBlock, 2, 20433349, 17414, null]
-        - [163, 7, SimpleBlock, 2, 20450766, 5296, null]
-        - [163, 7, SimpleBlock, 2, 20456066, 17770, null]
-        - [163, 7, SimpleBlock, 2, 20473840, 17844, null]
-        - [163, 7, SimpleBlock, 2, 20491688, 16842, null]
-        - [163, 7, SimpleBlock, 2, 20508534, 16488, null]
-        - [163, 7, SimpleBlock, 2, 20525026, 16936, null]
-        - [163, 7, SimpleBlock, 2, 20541965, 676, null]
-        - [163, 7, SimpleBlock, 2, 20542644, 5870, null]
-        - [163, 7, SimpleBlock, 2, 20548518, 17904, null]
-        - [163, 7, SimpleBlock, 2, 20566426, 17748, null]
-        - [163, 7, SimpleBlock, 2, 20584178, 17327, null]
-        - [163, 7, SimpleBlock, 2, 20601509, 16804, null]
-        - [163, 7, SimpleBlock, 2, 20618317, 16609, null]
-        - [163, 7, SimpleBlock, 2, 20634929, 4620, null]
-        - [163, 7, SimpleBlock, 2, 20639553, 17718, null]
-        - [163, 7, SimpleBlock, 2, 20657275, 19234, null]
-        - [163, 7, SimpleBlock, 2, 20676513, 18749, null]
-        - [163, 7, SimpleBlock, 2, 20695266, 18574, null]
-        - [163, 7, SimpleBlock, 2, 20713844, 18621, null]
-    - - 524531317
-      - 6
-      - Cluster
-      - 1
-      - 20732473
-      - 2606864
-      - - [231, 1, Timecode, 2, 20732475, 3, 76917]
-        - [163, 7, SimpleBlock, 2, 20732481, 676, null]
-        - [163, 7, SimpleBlock, 2, 20733160, 5296, null]
-        - [163, 7, SimpleBlock, 2, 20738460, 57870, null]
-        - [163, 7, SimpleBlock, 2, 20796333, 14161, null]
-        - [163, 7, SimpleBlock, 2, 20810497, 16283, null]
-        - [163, 7, SimpleBlock, 2, 20826784, 18643, null]
-        - [163, 7, SimpleBlock, 2, 20845430, 5584, null]
-        - [163, 7, SimpleBlock, 2, 20851018, 20094, null]
-        - [163, 7, SimpleBlock, 2, 20871116, 20936, null]
-        - [163, 7, SimpleBlock, 2, 20892056, 21547, null]
-        - [163, 7, SimpleBlock, 2, 20913607, 21831, null]
-        - [163, 7, SimpleBlock, 2, 20935442, 21619, null]
-        - [163, 7, SimpleBlock, 2, 20957064, 5967, null]
-        - [163, 7, SimpleBlock, 2, 20963035, 21935, null]
-        - [163, 7, SimpleBlock, 2, 20984974, 21975, null]
-        - [163, 7, SimpleBlock, 2, 21006953, 21595, null]
-        - [163, 7, SimpleBlock, 2, 21028552, 22352, null]
-        - [163, 7, SimpleBlock, 2, 21050907, 5971, null]
-        - [163, 7, SimpleBlock, 2, 21056882, 21241, null]
-        - [163, 7, SimpleBlock, 2, 21078127, 20004, null]
-        - [163, 7, SimpleBlock, 2, 21098135, 18589, null]
-        - [163, 7, SimpleBlock, 2, 21116728, 18088, null]
-        - [163, 7, SimpleBlock, 2, 21134820, 18065, null]
-        - [163, 7, SimpleBlock, 2, 21152888, 5680, null]
-        - [163, 7, SimpleBlock, 2, 21158572, 18783, null]
-        - [163, 7, SimpleBlock, 2, 21177359, 19388, null]
-        - [163, 7, SimpleBlock, 2, 21196751, 19874, null]
-        - [163, 7, SimpleBlock, 2, 21216629, 20500, null]
-        - [163, 7, SimpleBlock, 2, 21237133, 20363, null]
-        - [163, 7, SimpleBlock, 2, 21257499, 5683, null]
-        - [163, 7, SimpleBlock, 2, 21263186, 20383, null]
-        - [163, 7, SimpleBlock, 2, 21283573, 19364, null]
-        - [163, 7, SimpleBlock, 2, 21302941, 19084, null]
-        - [163, 7, SimpleBlock, 2, 21322029, 19510, null]
-        - [163, 7, SimpleBlock, 2, 21341542, 5779, null]
-        - [163, 7, SimpleBlock, 2, 21347325, 19655, null]
-        - [163, 7, SimpleBlock, 2, 21366984, 19150, null]
-        - [163, 7, SimpleBlock, 2, 21386138, 18882, null]
-        - [163, 7, SimpleBlock, 2, 21405024, 18431, null]
-        - [163, 7, SimpleBlock, 2, 21423459, 18037, null]
-        - [163, 7, SimpleBlock, 2, 21441499, 5393, null]
-        - [163, 7, SimpleBlock, 2, 21446896, 18017, null]
-        - [163, 7, SimpleBlock, 2, 21464917, 17810, null]
-        - [163, 7, SimpleBlock, 2, 21482731, 17480, null]
-        - [163, 7, SimpleBlock, 2, 21500215, 17218, null]
-        - [163, 7, SimpleBlock, 2, 21517436, 5968, null]
-        - [163, 7, SimpleBlock, 2, 21523408, 16822, null]
-        - [163, 7, SimpleBlock, 2, 21540234, 16542, null]
-        - [163, 7, SimpleBlock, 2, 21556779, 16000, null]
-        - [163, 7, SimpleBlock, 2, 21572783, 17251, null]
-        - [163, 7, SimpleBlock, 2, 21590038, 18254, null]
-        - [163, 7, SimpleBlock, 2, 21608295, 6451, null]
-        - [163, 7, SimpleBlock, 2, 21614750, 19178, null]
-        - [163, 7, SimpleBlock, 2, 21633932, 19684, null]
-        - [163, 7, SimpleBlock, 2, 21653620, 20370, null]
-        - [163, 7, SimpleBlock, 2, 21673994, 21172, null]
-        - [163, 7, SimpleBlock, 2, 21695170, 21607, null]
-        - [163, 7, SimpleBlock, 2, 21716780, 6162, null]
-        - [163, 7, SimpleBlock, 2, 21722946, 21284, null]
-        - [163, 7, SimpleBlock, 2, 21744234, 19858, null]
-        - [163, 7, SimpleBlock, 2, 21764096, 20103, null]
-        - [163, 7, SimpleBlock, 2, 21784203, 20348, null]
-        - [163, 7, SimpleBlock, 2, 21804554, 5775, null]
-        - [163, 7, SimpleBlock, 2, 21810333, 20136, null]
-        - [163, 7, SimpleBlock, 2, 21830473, 18094, null]
-        - [163, 7, SimpleBlock, 2, 21848571, 17128, null]
-        - [163, 7, SimpleBlock, 2, 21865703, 16497, null]
-        - [163, 7, SimpleBlock, 2, 21882204, 16452, null]
-        - [163, 7, SimpleBlock, 2, 21898659, 6161, null]
-        - [163, 7, SimpleBlock, 2, 21904824, 17164, null]
-        - [163, 7, SimpleBlock, 2, 21921992, 17846, null]
-        - [163, 7, SimpleBlock, 2, 21939842, 18903, null]
-        - [163, 7, SimpleBlock, 2, 21958749, 19244, null]
-        - [163, 7, SimpleBlock, 2, 21977996, 5874, null]
-        - [163, 7, SimpleBlock, 2, 21983874, 18813, null]
-        - [163, 7, SimpleBlock, 2, 22002691, 18540, null]
-        - [163, 7, SimpleBlock, 2, 22021235, 17596, null]
-        - [163, 7, SimpleBlock, 2, 22038835, 17222, null]
-        - [163, 7, SimpleBlock, 2, 22056061, 17986, null]
-        - [163, 7, SimpleBlock, 2, 22074050, 5871, null]
-        - [163, 7, SimpleBlock, 2, 22079925, 19782, null]
-        - [163, 7, SimpleBlock, 2, 22099711, 20933, null]
-        - [163, 7, SimpleBlock, 2, 22120648, 20789, null]
-        - [163, 7, SimpleBlock, 2, 22141441, 19381, null]
-        - [163, 7, SimpleBlock, 2, 22160826, 17254, null]
-        - [163, 7, SimpleBlock, 2, 22178083, 3660, null]
-        - [163, 7, SimpleBlock, 2, 22181746, 15440, null]
-        - [163, 7, SimpleBlock, 2, 22197189, 14453, null]
-        - [163, 7, SimpleBlock, 2, 22211645, 13030, null]
-        - [163, 7, SimpleBlock, 2, 22224678, 5682, null]
-        - [163, 7, SimpleBlock, 2, 22230363, 11253, null]
-        - [163, 7, SimpleBlock, 2, 22241620, 32873, null]
-        - [163, 7, SimpleBlock, 2, 22274496, 6159, null]
-        - [163, 7, SimpleBlock, 2, 22280658, 7281, null]
-        - [163, 7, SimpleBlock, 2, 22287942, 5585, null]
-        - [163, 7, SimpleBlock, 2, 22293530, 7922, null]
-        - [163, 7, SimpleBlock, 2, 22301455, 7943, null]
-        - [163, 7, SimpleBlock, 2, 22309401, 7994, null]
-        - [163, 7, SimpleBlock, 2, 22317398, 7958, null]
-        - [163, 7, SimpleBlock, 2, 22325359, 8355, null]
-        - [163, 7, SimpleBlock, 2, 22333717, 5777, null]
-        - [163, 7, SimpleBlock, 2, 22339497, 8199, null]
-        - [163, 7, SimpleBlock, 2, 22347699, 8535, null]
-        - [163, 7, SimpleBlock, 2, 22356237, 8831, null]
-        - [163, 7, SimpleBlock, 2, 22365071, 9248, null]
-        - [163, 7, SimpleBlock, 2, 22374322, 5680, null]
-        - [163, 7, SimpleBlock, 2, 22380005, 9220, null]
-        - [163, 7, SimpleBlock, 2, 22389228, 9075, null]
-        - [163, 7, SimpleBlock, 2, 22398306, 9125, null]
-        - [163, 7, SimpleBlock, 2, 22407434, 9290, null]
-        - [163, 7, SimpleBlock, 2, 22416727, 9547, null]
-        - [163, 7, SimpleBlock, 2, 22426277, 5969, null]
-        - [163, 7, SimpleBlock, 2, 22432249, 9837, null]
-        - [163, 7, SimpleBlock, 2, 22442089, 10391, null]
-        - [163, 7, SimpleBlock, 2, 22452483, 10332, null]
-        - [163, 7, SimpleBlock, 2, 22462818, 10531, null]
-        - [163, 7, SimpleBlock, 2, 22473352, 10458, null]
-        - [163, 7, SimpleBlock, 2, 22483813, 5872, null]
-        - [163, 7, SimpleBlock, 2, 22489688, 10067, null]
-        - [163, 7, SimpleBlock, 2, 22499758, 10130, null]
-        - [163, 7, SimpleBlock, 2, 22509891, 9976, null]
-        - [163, 7, SimpleBlock, 2, 22519870, 10480, null]
-        - [163, 7, SimpleBlock, 2, 22530353, 6162, null]
-        - [163, 7, SimpleBlock, 2, 22536518, 11192, null]
-        - [163, 7, SimpleBlock, 2, 22547713, 10621, null]
-        - [163, 7, SimpleBlock, 2, 22558337, 10069, null]
-        - [163, 7, SimpleBlock, 2, 22568409, 10229, null]
-        - [163, 7, SimpleBlock, 2, 22578641, 10237, null]
-        - [163, 7, SimpleBlock, 2, 22588881, 6162, null]
-        - [163, 7, SimpleBlock, 2, 22595046, 10671, null]
-        - [163, 7, SimpleBlock, 2, 22605720, 10010, null]
-        - [163, 7, SimpleBlock, 2, 22615733, 9164, null]
-        - [163, 7, SimpleBlock, 2, 22624900, 8803, null]
-        - [163, 7, SimpleBlock, 2, 22633706, 6255, null]
-        - [163, 7, SimpleBlock, 2, 22639964, 8877, null]
-        - [163, 7, SimpleBlock, 2, 22648844, 8534, null]
-        - [163, 7, SimpleBlock, 2, 22657381, 7929, null]
-        - [163, 7, SimpleBlock, 2, 22665313, 8015, null]
-        - [163, 7, SimpleBlock, 2, 22673331, 8173, null]
-        - [163, 7, SimpleBlock, 2, 22681507, 6065, null]
-        - [163, 7, SimpleBlock, 2, 22687575, 7984, null]
-        - [163, 7, SimpleBlock, 2, 22695562, 7944, null]
-        - [163, 7, SimpleBlock, 2, 22703509, 8216, null]
-        - [163, 7, SimpleBlock, 2, 22711728, 8112, null]
-        - [163, 7, SimpleBlock, 2, 22719843, 7928, null]
-        - [163, 7, SimpleBlock, 2, 22727774, 6354, null]
-        - [163, 7, SimpleBlock, 2, 22734131, 7622, null]
-        - [163, 7, SimpleBlock, 2, 22741756, 8231, null]
-        - [163, 7, SimpleBlock, 2, 22749990, 8319, null]
-        - [163, 7, SimpleBlock, 2, 22758312, 7903, null]
-        - [163, 7, SimpleBlock, 2, 22766218, 6063, null]
-        - [163, 7, SimpleBlock, 2, 22772284, 8053, null]
-        - [163, 7, SimpleBlock, 2, 22780340, 8385, null]
-        - [163, 7, SimpleBlock, 2, 22788728, 8056, null]
-        - [163, 7, SimpleBlock, 2, 22796787, 8148, null]
-        - [163, 7, SimpleBlock, 2, 22804938, 8115, null]
-        - [163, 7, SimpleBlock, 2, 22813056, 6065, null]
-        - [163, 7, SimpleBlock, 2, 22819124, 8290, null]
-        - [163, 7, SimpleBlock, 2, 22827417, 7985, null]
-        - [163, 7, SimpleBlock, 2, 22835405, 8685, null]
-        - [163, 7, SimpleBlock, 2, 22844093, 9660, null]
-        - [163, 7, SimpleBlock, 2, 22853756, 5874, null]
-        - [163, 7, SimpleBlock, 2, 22859633, 10373, null]
-        - [163, 7, SimpleBlock, 2, 22870009, 9892, null]
-        - [163, 7, SimpleBlock, 2, 22879904, 9637, null]
-        - [163, 7, SimpleBlock, 2, 22889544, 9721, null]
-        - [163, 7, SimpleBlock, 2, 22899268, 9824, null]
-        - [163, 7, SimpleBlock, 2, 22909095, 5874, null]
-        - [163, 7, SimpleBlock, 2, 22914972, 9921, null]
-        - [163, 7, SimpleBlock, 2, 22924896, 8744, null]
-        - [163, 7, SimpleBlock, 2, 22933643, 7978, null]
-        - [163, 7, SimpleBlock, 2, 22941624, 7648, null]
-        - [163, 7, SimpleBlock, 2, 22949275, 7314, null]
-        - [163, 7, SimpleBlock, 2, 22956592, 5969, null]
-        - [163, 7, SimpleBlock, 2, 22962564, 7531, null]
-        - [163, 7, SimpleBlock, 2, 22970098, 7095, null]
-        - [163, 7, SimpleBlock, 2, 22977196, 6685, null]
-        - [163, 7, SimpleBlock, 2, 22983884, 6591, null]
-        - [163, 7, SimpleBlock, 2, 22990478, 5776, null]
-        - [163, 7, SimpleBlock, 2, 22996257, 6599, null]
-        - [163, 7, SimpleBlock, 2, 23002859, 5858, null]
-        - [163, 7, SimpleBlock, 2, 23008720, 5549, null]
-        - [163, 7, SimpleBlock, 2, 23014272, 4881, null]
-        - [163, 7, SimpleBlock, 2, 23019156, 4488, null]
-        - [163, 7, SimpleBlock, 2, 23023647, 5968, null]
-        - [163, 7, SimpleBlock, 2, 23029618, 4335, null]
-        - [163, 7, SimpleBlock, 2, 23033956, 4173, null]
-        - [163, 7, SimpleBlock, 2, 23038132, 3829, null]
-        - [163, 7, SimpleBlock, 2, 23041964, 3577, null]
-        - [163, 7, SimpleBlock, 2, 23045544, 3307, null]
-        - [163, 7, SimpleBlock, 2, 23048854, 5969, null]
-        - [163, 7, SimpleBlock, 2, 23054826, 3053, null]
-        - [163, 7, SimpleBlock, 2, 23057882, 2805, null]
-        - [163, 7, SimpleBlock, 2, 23060690, 2487, null]
-        - [163, 7, SimpleBlock, 2, 23063180, 2142, null]
-        - [163, 7, SimpleBlock, 2, 23065325, 6257, null]
-        - [163, 7, SimpleBlock, 2, 23071585, 1832, null]
-        - [163, 7, SimpleBlock, 2, 23073420, 1453, null]
-        - [163, 7, SimpleBlock, 2, 23074876, 1818, null]
-        - [163, 7, SimpleBlock, 2, 23076697, 1981, null]
-        - [163, 7, SimpleBlock, 2, 23078681, 3420, null]
-        - [163, 7, SimpleBlock, 2, 23082104, 5587, null]
-        - [163, 7, SimpleBlock, 2, 23087694, 3332, null]
-        - [163, 7, SimpleBlock, 2, 23091029, 2137, null]
-        - [163, 7, SimpleBlock, 2, 23093169, 2342, null]
-        - [163, 7, SimpleBlock, 2, 23095514, 3714, null]
-        - [163, 7, SimpleBlock, 2, 23099231, 4914, null]
-        - [163, 7, SimpleBlock, 2, 23104148, 2562, null]
-        - [163, 7, SimpleBlock, 2, 23106713, 3019, null]
-        - [163, 7, SimpleBlock, 2, 23109735, 2231, null]
-        - [163, 7, SimpleBlock, 2, 23111969, 1798, null]
-        - [163, 7, SimpleBlock, 2, 23113770, 1799, null]
-        - [163, 7, SimpleBlock, 2, 23115572, 5775, null]
-        - [163, 7, SimpleBlock, 2, 23121350, 1502, null]
-        - [163, 7, SimpleBlock, 2, 23122855, 1437, null]
-        - [163, 7, SimpleBlock, 2, 23124295, 1266, null]
-        - [163, 7, SimpleBlock, 2, 23125564, 1279, null]
-        - [163, 7, SimpleBlock, 2, 23126846, 1276, null]
-        - [163, 7, SimpleBlock, 2, 23128125, 4816, null]
-        - [163, 7, SimpleBlock, 2, 23132944, 1198, null]
-        - [163, 7, SimpleBlock, 2, 23134145, 1034, null]
-        - [163, 7, SimpleBlock, 2, 23135182, 876, null]
-        - [163, 7, SimpleBlock, 2, 23136061, 721, null]
-        - [163, 7, SimpleBlock, 2, 23136785, 4719, null]
-        - [163, 7, SimpleBlock, 2, 23141507, 541, null]
-        - [163, 7, SimpleBlock, 2, 23142051, 616, null]
-        - [163, 7, SimpleBlock, 2, 23142670, 618, null]
-        - [163, 7, SimpleBlock, 2, 23143291, 597, null]
-        - [163, 7, SimpleBlock, 2, 23143891, 440, null]
-        - [163, 7, SimpleBlock, 2, 23144334, 4527, null]
-        - [163, 7, SimpleBlock, 2, 23148864, 435, null]
-        - [163, 7, SimpleBlock, 2, 23149302, 424, null]
-        - [163, 7, SimpleBlock, 2, 23149729, 432, null]
-        - [163, 7, SimpleBlock, 2, 23150164, 417, null]
-        - [163, 7, SimpleBlock, 2, 23150584, 580, null]
-        - [163, 7, SimpleBlock, 2, 23151167, 405, null]
-        - [163, 7, SimpleBlock, 2, 23151575, 4525, null]
-        - [163, 7, SimpleBlock, 2, 23156103, 413, null]
-        - [163, 7, SimpleBlock, 2, 23156519, 411, null]
-        - [163, 7, SimpleBlock, 2, 23156933, 437, null]
-        - [163, 7, SimpleBlock, 2, 23157373, 422, null]
-        - [163, 7, SimpleBlock, 2, 23157798, 437, null]
-        - [163, 7, SimpleBlock, 2, 23158238, 4613, null]
-        - [163, 7, SimpleBlock, 2, 23162854, 458, null]
-        - [163, 7, SimpleBlock, 2, 23163315, 479, null]
-        - [163, 7, SimpleBlock, 2, 23163797, 478, null]
-        - [163, 7, SimpleBlock, 2, 23164278, 477, null]
-        - [163, 7, SimpleBlock, 2, 23164758, 4613, null]
-        - [163, 7, SimpleBlock, 2, 23169374, 489, null]
-        - [163, 7, SimpleBlock, 2, 23169866, 550, null]
-        - [163, 7, SimpleBlock, 2, 23170419, 541, null]
-        - [163, 7, SimpleBlock, 2, 23170963, 549, null]
-        - [163, 7, SimpleBlock, 2, 23171515, 583, null]
-        - [163, 7, SimpleBlock, 2, 23172101, 4613, null]
-        - [163, 7, SimpleBlock, 2, 23176717, 629, null]
-        - [163, 7, SimpleBlock, 2, 23177349, 728, null]
-        - [163, 7, SimpleBlock, 2, 23178080, 756, null]
-        - [163, 7, SimpleBlock, 2, 23178839, 1142, null]
-        - [163, 7, SimpleBlock, 2, 23179984, 5009, null]
-        - [163, 7, SimpleBlock, 2, 23184996, 1271, null]
-        - [163, 7, SimpleBlock, 2, 23186270, 1824, null]
-        - [163, 7, SimpleBlock, 2, 23188097, 3163, null]
-        - [163, 7, SimpleBlock, 2, 23191263, 3939, null]
-        - [163, 7, SimpleBlock, 2, 23195205, 4206, null]
-        - [163, 7, SimpleBlock, 2, 23199414, 5106, null]
-        - [163, 7, SimpleBlock, 2, 23204523, 4020, null]
-        - [163, 7, SimpleBlock, 2, 23208546, 4034, null]
-        - [163, 7, SimpleBlock, 2, 23212583, 4006, null]
-        - [163, 7, SimpleBlock, 2, 23216592, 3598, null]
-        - [163, 7, SimpleBlock, 2, 23220193, 3320, null]
-        - [163, 7, SimpleBlock, 2, 23223516, 5011, null]
-        - [163, 7, SimpleBlock, 2, 23228530, 2597, null]
-        - [163, 7, SimpleBlock, 2, 23231130, 2306, null]
-        - [163, 7, SimpleBlock, 2, 23233439, 1768, null]
-        - [163, 7, SimpleBlock, 2, 23235210, 1621, null]
-        - [163, 7, SimpleBlock, 2, 23236834, 4913, null]
-        - [163, 7, SimpleBlock, 2, 23241750, 1419, null]
-        - [163, 7, SimpleBlock, 2, 23243172, 1361, null]
-        - [163, 7, SimpleBlock, 2, 23244536, 1402, null]
-        - [163, 7, SimpleBlock, 2, 23245941, 1566, null]
-        - [163, 7, SimpleBlock, 2, 23247510, 1694, null]
-        - [163, 7, SimpleBlock, 2, 23249207, 4914, null]
-        - [163, 7, SimpleBlock, 2, 23254124, 2301, null]
-        - [163, 7, SimpleBlock, 2, 23256428, 2605, null]
-        - [163, 7, SimpleBlock, 2, 23259036, 2604, null]
-        - [163, 7, SimpleBlock, 2, 23261643, 2765, null]
-        - [163, 7, SimpleBlock, 2, 23264411, 4816, null]
-        - [163, 7, SimpleBlock, 2, 23269230, 2631, null]
-        - [163, 7, SimpleBlock, 2, 23271864, 2608, null]
-        - [163, 7, SimpleBlock, 2, 23274475, 2650, null]
-        - [163, 7, SimpleBlock, 2, 23277128, 3690, null]
-        - [163, 7, SimpleBlock, 2, 23280821, 4659, null]
-        - [163, 7, SimpleBlock, 2, 23285483, 5586, null]
-        - [163, 7, SimpleBlock, 2, 23291072, 5402, null]
-        - [163, 7, SimpleBlock, 2, 23296477, 5586, null]
-        - [163, 7, SimpleBlock, 2, 23302066, 4918, null]
-        - [163, 7, SimpleBlock, 2, 23306987, 3245, null]
-        - [163, 7, SimpleBlock, 2, 23310235, 3349, null]
-        - [163, 7, SimpleBlock, 2, 23313587, 5393, null]
-        - [163, 7, SimpleBlock, 2, 23318983, 3421, null]
-        - [163, 7, SimpleBlock, 2, 23322407, 3249, null]
-        - [163, 7, SimpleBlock, 2, 23325659, 2877, null]
-        - [163, 7, SimpleBlock, 2, 23328539, 2659, null]
-        - [163, 7, SimpleBlock, 2, 23331201, 2410, null]
-        - [163, 7, SimpleBlock, 2, 23333614, 2300, null]
-        - [163, 7, SimpleBlock, 2, 23335917, 1891, null]
-        - [163, 7, SimpleBlock, 2, 23337811, 1526, null]
diff --git a/libs/enzyme/tests/test_mkv.py b/libs/enzyme/tests/test_mkv.py
deleted file mode 100644
index 1bfa0456b..000000000
--- a/libs/enzyme/tests/test_mkv.py
+++ /dev/null
@@ -1,607 +0,0 @@
-# -*- coding: utf-8 -*-
-from datetime import timedelta, datetime
-from enzyme.mkv import MKV, VIDEO_TRACK, AUDIO_TRACK, SUBTITLE_TRACK
-import io
-import os.path
-import requests
-import unittest
-import zipfile
-
-
-# Test directory
-TEST_DIR = os.path.join(os.path.dirname(__file__), os.path.splitext(__file__)[0])
-
-
-def setUpModule():
-    if not os.path.exists(TEST_DIR):
-        r = requests.get('http://downloads.sourceforge.net/project/matroska/test_files/matroska_test_w1_1.zip')
-        with zipfile.ZipFile(io.BytesIO(r.content), 'r') as f:
-            f.extractall(TEST_DIR)
-
-
-class MKVTestCase(unittest.TestCase):
-    def test_test1(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test1.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(minutes=1, seconds=27, milliseconds=336))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 7, 23, 3))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.10.0 + libmatroska2 v0.10.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.5.5 ru from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.1.1 (\'Bouncin\' Back\') built on Jul  3 2010 22:54:08')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == True)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MS/VFW/FOURCC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 854)
-        self.assertTrue(mkv.video_tracks[0].height == 480)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width is None)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == True)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_MPEG/L3')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Big Buck Bunny - test 1')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File1, basic MPEG4.2 and MP3 with only SimpleBlock')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test2(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test2.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=47, milliseconds=509))
-        self.assertTrue(mkv.info.date_utc == datetime(2011, 6, 2, 12, 45, 20))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.21.0 + libmatroska2 v0.22.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.8.3 ru from libebml2 v0.10.0 + libmatroska2 v0.10.1 + mkclean 0.5.5 ru from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.1.1 (\'Bouncin\' Back\') built on Jul  3 2010 22:54:08')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == True)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MPEG4/ISO/AVC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 1024)
-        self.assertTrue(mkv.video_tracks[0].height == 576)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width == 1354)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == True)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_AAC')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Elephant Dream - test 2')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 2, 100,000 timecode scale, odd aspect ratio, and CRC-32. Codecs are AVC and AAC')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test3(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test3.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=49, milliseconds=64))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 21, 43, 25))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.11.0 + libmatroska2 v0.10.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.5.5 ro from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.1.1 (\'Bouncin\' Back\') built on Jul  3 2010 22:54:08')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == True)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MPEG4/ISO/AVC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 1024)
-        self.assertTrue(mkv.video_tracks[0].height == 576)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width is None)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language is None)
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == True)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_MPEG/L3')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Elephant Dream - test 3')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 3, header stripping on the video track and no SimpleBlock')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test5(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test5.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=46, milliseconds=665))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 18, 6, 43))
-        self.assertTrue(mkv.info.muxing_app == 'libebml v1.0.0 + libmatroska v1.0.0')
-        self.assertTrue(mkv.info.writing_app == 'mkvmerge v4.0.0 (\'The Stars were mine\') built on Jun  6 2010 16:18:42')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == True)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MPEG4/ISO/AVC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 1024)
-        self.assertTrue(mkv.video_tracks[0].height == 576)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width == 1024)
-        self.assertTrue(mkv.video_tracks[0].display_height == 576)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio tracks
-        self.assertTrue(len(mkv.audio_tracks) == 2)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == True)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_AAC')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        self.assertTrue(mkv.audio_tracks[1].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[1].number == 10)
-        self.assertTrue(mkv.audio_tracks[1].name == 'Commentary')
-        self.assertTrue(mkv.audio_tracks[1].language is None)
-        self.assertTrue(mkv.audio_tracks[1].enabled == True)
-        self.assertTrue(mkv.audio_tracks[1].default == False)
-        self.assertTrue(mkv.audio_tracks[1].forced == False)
-        self.assertTrue(mkv.audio_tracks[1].lacing == True)
-        self.assertTrue(mkv.audio_tracks[1].codec_id == 'A_AAC')
-        self.assertTrue(mkv.audio_tracks[1].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[1].sampling_frequency == 22050.0)
-        self.assertTrue(mkv.audio_tracks[1].channels == 1)
-        self.assertTrue(mkv.audio_tracks[1].output_sampling_frequency == 44100.0)
-        self.assertTrue(mkv.audio_tracks[1].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 8)
-        self.assertTrue(mkv.subtitle_tracks[0].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[0].number == 3)
-        self.assertTrue(mkv.subtitle_tracks[0].name is None)
-        self.assertTrue(mkv.subtitle_tracks[0].language is None)
-        self.assertTrue(mkv.subtitle_tracks[0].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[0].default == True)
-        self.assertTrue(mkv.subtitle_tracks[0].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[0].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[0].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[0].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[1].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[1].number == 4)
-        self.assertTrue(mkv.subtitle_tracks[1].name is None)
-        self.assertTrue(mkv.subtitle_tracks[1].language == 'hun')
-        self.assertTrue(mkv.subtitle_tracks[1].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[1].default == False)
-        self.assertTrue(mkv.subtitle_tracks[1].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[1].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[1].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[1].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[2].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[2].number == 5)
-        self.assertTrue(mkv.subtitle_tracks[2].name is None)
-        self.assertTrue(mkv.subtitle_tracks[2].language == 'ger')
-        self.assertTrue(mkv.subtitle_tracks[2].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[2].default == False)
-        self.assertTrue(mkv.subtitle_tracks[2].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[2].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[2].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[2].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[3].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[3].number == 6)
-        self.assertTrue(mkv.subtitle_tracks[3].name is None)
-        self.assertTrue(mkv.subtitle_tracks[3].language == 'fre')
-        self.assertTrue(mkv.subtitle_tracks[3].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[3].default == False)
-        self.assertTrue(mkv.subtitle_tracks[3].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[3].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[3].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[3].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[4].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[4].number == 8)
-        self.assertTrue(mkv.subtitle_tracks[4].name is None)
-        self.assertTrue(mkv.subtitle_tracks[4].language == 'spa')
-        self.assertTrue(mkv.subtitle_tracks[4].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[4].default == False)
-        self.assertTrue(mkv.subtitle_tracks[4].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[4].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[4].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[4].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[5].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[5].number == 9)
-        self.assertTrue(mkv.subtitle_tracks[5].name is None)
-        self.assertTrue(mkv.subtitle_tracks[5].language == 'ita')
-        self.assertTrue(mkv.subtitle_tracks[5].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[5].default == False)
-        self.assertTrue(mkv.subtitle_tracks[5].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[5].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[5].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[5].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[6].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[6].number == 11)
-        self.assertTrue(mkv.subtitle_tracks[6].name is None)
-        self.assertTrue(mkv.subtitle_tracks[6].language == 'jpn')
-        self.assertTrue(mkv.subtitle_tracks[6].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[6].default == False)
-        self.assertTrue(mkv.subtitle_tracks[6].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[6].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[6].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[6].codec_name is None)
-        self.assertTrue(mkv.subtitle_tracks[7].type == SUBTITLE_TRACK)
-        self.assertTrue(mkv.subtitle_tracks[7].number == 7)
-        self.assertTrue(mkv.subtitle_tracks[7].name is None)
-        self.assertTrue(mkv.subtitle_tracks[7].language == 'und')
-        self.assertTrue(mkv.subtitle_tracks[7].enabled == True)
-        self.assertTrue(mkv.subtitle_tracks[7].default == False)
-        self.assertTrue(mkv.subtitle_tracks[7].forced == False)
-        self.assertTrue(mkv.subtitle_tracks[7].lacing == False)
-        self.assertTrue(mkv.subtitle_tracks[7].codec_id == 'S_TEXT/UTF8')
-        self.assertTrue(mkv.subtitle_tracks[7].codec_name is None)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Big Buck Bunny - test 8')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 8, secondary audio commentary track, misc subtitle tracks')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test6(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test6.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=87, milliseconds=336))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 16, 31, 55))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.10.1 + libmatroska2 v0.10.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.5.5 r from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.0.0 (\'The Stars were mine\') built on Jun  6 2010 16:18:42')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == False)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MS/VFW/FOURCC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 854)
-        self.assertTrue(mkv.video_tracks[0].height == 480)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width is None)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == False)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_MPEG/L3')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Big Buck Bunny - test 6')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 6, random length to code the size of Clusters and Blocks, no Cues for seeking')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test7(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test7.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=37, milliseconds=43))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 17, 0, 23))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.10.1 + libmatroska2 v0.10.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.5.5 r from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.0.0 (\'The Stars were mine\') built on Jun  6 2010 16:18:42')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == False)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MPEG4/ISO/AVC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 1024)
-        self.assertTrue(mkv.video_tracks[0].height == 576)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width is None)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == False)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_AAC')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Big Buck Bunny - test 7')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 7, junk elements are present at the beggining or end of clusters, the parser should skip it. There is also a damaged element at 451418')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-    def test_test8(self):
-        stream = io.open(os.path.join(TEST_DIR, 'test8.mkv'), 'rb')
-        mkv = MKV(stream)
-        # info
-        self.assertTrue(mkv.info.title is None)
-        self.assertTrue(mkv.info.duration == timedelta(seconds=47, milliseconds=341))
-        self.assertTrue(mkv.info.date_utc == datetime(2010, 8, 21, 17, 22, 14))
-        self.assertTrue(mkv.info.muxing_app == 'libebml2 v0.10.1 + libmatroska2 v0.10.1')
-        self.assertTrue(mkv.info.writing_app == 'mkclean 0.5.5 r from libebml v1.0.0 + libmatroska v1.0.0 + mkvmerge v4.0.0 (\'The Stars were mine\') built on Jun  6 2010 16:18:42')
-        # video track
-        self.assertTrue(len(mkv.video_tracks) == 1)
-        self.assertTrue(mkv.video_tracks[0].type == VIDEO_TRACK)
-        self.assertTrue(mkv.video_tracks[0].number == 1)
-        self.assertTrue(mkv.video_tracks[0].name is None)
-        self.assertTrue(mkv.video_tracks[0].language == 'und')
-        self.assertTrue(mkv.video_tracks[0].enabled == True)
-        self.assertTrue(mkv.video_tracks[0].default == False)
-        self.assertTrue(mkv.video_tracks[0].forced == False)
-        self.assertTrue(mkv.video_tracks[0].lacing == False)
-        self.assertTrue(mkv.video_tracks[0].codec_id == 'V_MPEG4/ISO/AVC')
-        self.assertTrue(mkv.video_tracks[0].codec_name is None)
-        self.assertTrue(mkv.video_tracks[0].width == 1024)
-        self.assertTrue(mkv.video_tracks[0].height == 576)
-        self.assertTrue(mkv.video_tracks[0].interlaced == False)
-        self.assertTrue(mkv.video_tracks[0].stereo_mode is None)
-        self.assertTrue(mkv.video_tracks[0].crop == {})
-        self.assertTrue(mkv.video_tracks[0].display_width is None)
-        self.assertTrue(mkv.video_tracks[0].display_height is None)
-        self.assertTrue(mkv.video_tracks[0].display_unit is None)
-        self.assertTrue(mkv.video_tracks[0].aspect_ratio_type is None)
-        # audio track
-        self.assertTrue(len(mkv.audio_tracks) == 1)
-        self.assertTrue(mkv.audio_tracks[0].type == AUDIO_TRACK)
-        self.assertTrue(mkv.audio_tracks[0].number == 2)
-        self.assertTrue(mkv.audio_tracks[0].name is None)
-        self.assertTrue(mkv.audio_tracks[0].language == 'und')
-        self.assertTrue(mkv.audio_tracks[0].enabled == True)
-        self.assertTrue(mkv.audio_tracks[0].default == False)
-        self.assertTrue(mkv.audio_tracks[0].forced == False)
-        self.assertTrue(mkv.audio_tracks[0].lacing == True)
-        self.assertTrue(mkv.audio_tracks[0].codec_id == 'A_AAC')
-        self.assertTrue(mkv.audio_tracks[0].codec_name is None)
-        self.assertTrue(mkv.audio_tracks[0].sampling_frequency == 48000.0)
-        self.assertTrue(mkv.audio_tracks[0].channels == 2)
-        self.assertTrue(mkv.audio_tracks[0].output_sampling_frequency is None)
-        self.assertTrue(mkv.audio_tracks[0].bit_depth is None)
-        # subtitle track
-        self.assertTrue(len(mkv.subtitle_tracks) == 0)
-        # chapters
-        self.assertTrue(len(mkv.chapters) == 0)
-        # tags
-        self.assertTrue(len(mkv.tags) == 1)
-        self.assertTrue(len(mkv.tags[0].simpletags) == 3)
-        self.assertTrue(mkv.tags[0].simpletags[0].name == 'TITLE')
-        self.assertTrue(mkv.tags[0].simpletags[0].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[0].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[0].string == 'Big Buck Bunny - test 8')
-        self.assertTrue(mkv.tags[0].simpletags[0].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[1].name == 'DATE_RELEASED')
-        self.assertTrue(mkv.tags[0].simpletags[1].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[1].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[1].string == '2010')
-        self.assertTrue(mkv.tags[0].simpletags[1].binary is None)
-        self.assertTrue(mkv.tags[0].simpletags[2].name == 'COMMENT')
-        self.assertTrue(mkv.tags[0].simpletags[2].default == True)
-        self.assertTrue(mkv.tags[0].simpletags[2].language == 'und')
-        self.assertTrue(mkv.tags[0].simpletags[2].string == 'Matroska Validation File 8, audio missing between timecodes 6.019s and 6.360s')
-        self.assertTrue(mkv.tags[0].simpletags[2].binary is None)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(MKVTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner().run(suite())
diff --git a/libs/enzyme/tests/test_parsers.py b/libs/enzyme/tests/test_parsers.py
deleted file mode 100644
index 0fa320ce0..000000000
--- a/libs/enzyme/tests/test_parsers.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-from enzyme.parsers import ebml
-import io
-import os.path
-import requests
-import unittest
-import yaml
-import zipfile
-
-
-# Test directory
-TEST_DIR = os.path.join(os.path.dirname(__file__), os.path.splitext(__file__)[0])
-
-# EBML validation directory
-EBML_VALIDATION_DIR = os.path.join(os.path.dirname(__file__), 'parsers', 'ebml')
-
-
-def setUpModule():
-    if not os.path.exists(TEST_DIR):
-        r = requests.get('http://downloads.sourceforge.net/project/matroska/test_files/matroska_test_w1_1.zip')
-        with zipfile.ZipFile(io.BytesIO(r.content), 'r') as f:
-            f.extractall(TEST_DIR)
-
-
-class EBMLTestCase(unittest.TestCase):
-    def setUp(self):
-        self.stream = io.open(os.path.join(TEST_DIR, 'test1.mkv'), 'rb')
-        with io.open(os.path.join(EBML_VALIDATION_DIR, 'test1.mkv.yml'), 'r') as yml:
-            self.validation = yaml.safe_load(yml)
-        self.specs = ebml.get_matroska_specs()
-
-    def tearDown(self):
-        self.stream.close()
-
-    def check_element(self, element_id, element_type, element_name, element_level, element_position, element_size, element_data, element,
-                      ignore_element_types=None, ignore_element_names=None, max_level=None):
-        """Recursively check an element"""
-        # base
-        self.assertTrue(element.id == element_id)
-        self.assertTrue(element.type == element_type)
-        self.assertTrue(element.name == element_name)
-        self.assertTrue(element.level == element_level)
-        self.assertTrue(element.position == element_position)
-        self.assertTrue(element.size == element_size)
-        # Element
-        if not isinstance(element_data, list):
-            self.assertTrue(type(element) == ebml.Element)
-            if element_type != ebml.BINARY:
-                self.assertTrue(element.data == element_data)
-            return
-        # MasterElement
-        if ignore_element_types is not None:  # filter validation on element types
-            element_data = [e for e in element_data if e[1] not in ignore_element_types]
-        if ignore_element_names is not None:  # filter validation on element names
-            element_data = [e for e in element_data if e[2] not in ignore_element_names]
-        if element.level == max_level:  # special check when maximum level is reached
-            self.assertTrue(element.data is None)
-            return
-        self.assertTrue(len(element.data) == len(element_data))
-        for i in range(len(element.data)):
-            self.check_element(element_data[i][0], element_data[i][1], element_data[i][2], element_data[i][3],
-                               element_data[i][4], element_data[i][5], element_data[i][6], element.data[i], ignore_element_types,
-                               ignore_element_names, max_level)
-
-    def test_parse_full(self):
-        result = ebml.parse(self.stream, self.specs)
-        self.assertTrue(len(result) == len(self.validation))
-        for i in range(len(self.validation)):
-            self.check_element(self.validation[i][0], self.validation[i][1], self.validation[i][2], self.validation[i][3],
-                               self.validation[i][4], self.validation[i][5], self.validation[i][6], result[i])
-
-    def test_parse_ignore_element_types(self):
-        ignore_element_types = [ebml.INTEGER, ebml.BINARY]
-        result = ebml.parse(self.stream, self.specs, ignore_element_types=ignore_element_types)
-        self.validation = [e for e in self.validation if e[1] not in ignore_element_types]
-        self.assertTrue(len(result) == len(self.validation))
-        for i in range(len(self.validation)):
-            self.check_element(self.validation[i][0], self.validation[i][1], self.validation[i][2], self.validation[i][3],
-                               self.validation[i][4], self.validation[i][5], self.validation[i][6], result[i], ignore_element_types=ignore_element_types)
-
-    def test_parse_ignore_element_names(self):
-        ignore_element_names = ['EBML', 'SimpleBlock']
-        result = ebml.parse(self.stream, self.specs, ignore_element_names=ignore_element_names)
-        self.validation = [e for e in self.validation if e[2] not in ignore_element_names]
-        self.assertTrue(len(result) == len(self.validation))
-        for i in range(len(self.validation)):
-            self.check_element(self.validation[i][0], self.validation[i][1], self.validation[i][2], self.validation[i][3],
-                               self.validation[i][4], self.validation[i][5], self.validation[i][6], result[i], ignore_element_names=ignore_element_names)
-
-    def test_parse_max_level(self):
-        max_level = 3
-        result = ebml.parse(self.stream, self.specs, max_level=max_level)
-        self.validation = [e for e in self.validation if e[3] <= max_level]
-        self.assertTrue(len(result) == len(self.validation))
-        for i in range(len(self.validation)):
-            self.check_element(self.validation[i][0], self.validation[i][1], self.validation[i][2], self.validation[i][3],
-                               self.validation[i][4], self.validation[i][5], self.validation[i][6], result[i], max_level=max_level)
-
-
-def generate_yml(filename, specs):
-    """Generate  a validation file for the test video"""
-    def _to_builtin(elements):
-        """Recursively convert elements to built-in types"""
-        result = []
-        for e in elements:
-            if isinstance(e, ebml.MasterElement):
-                result.append((e.id, e.type, e.name, e.level, e.position, e.size, _to_builtin(e.data)))
-            else:
-                result.append((e.id, e.type, e.name, e.level, e.position, e.size, None if isinstance(e.data, io.BytesIO) else e.data))
-        return result
-    video = io.open(os.path.join(TEST_DIR, filename), 'rb')
-    yml = io.open(os.path.join(EBML_VALIDATION_DIR, filename + '.yml'), 'w')
-    yaml.safe_dump(_to_builtin(ebml.parse(video, specs)), yml)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(EBMLTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner().run(suite())
diff --git a/libs/fcache-0.5.2.dist-info/METADATA b/libs/fcache-0.5.2.dist-info/METADATA
index 9bb847fad..62a0a761b 100644
--- a/libs/fcache-0.5.2.dist-info/METADATA
+++ b/libs/fcache-0.5.2.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fcache
 Version: 0.5.2
 Summary: a dictionary-like, file-based cache module for Python
diff --git a/libs/fcache-0.5.2.dist-info/RECORD b/libs/fcache-0.5.2.dist-info/RECORD
index f8a9f193c..aef3b9395 100644
--- a/libs/fcache-0.5.2.dist-info/RECORD
+++ b/libs/fcache-0.5.2.dist-info/RECORD
@@ -1,8 +1,8 @@
 fcache-0.5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-fcache-0.5.2.dist-info/METADATA,sha256=AeNVGA3snoxzxr5OF1C624C1xnd19egyaZ0-P4uwPsg,2840
+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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+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
diff --git a/libs/fcache-0.5.2.dist-info/WHEEL b/libs/fcache-0.5.2.dist-info/WHEEL
index 5998f3aab..12228d414 100644
--- a/libs/fcache-0.5.2.dist-info/WHEEL
+++ b/libs/fcache-0.5.2.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/fese-0.3.0.dist-info/RECORD b/libs/fese-0.3.0.dist-info/RECORD
index 55deffc5a..29825b430 100644
--- a/libs/fese-0.3.0.dist-info/RECORD
+++ b/libs/fese-0.3.0.dist-info/RECORD
@@ -3,7 +3,7 @@ fese-0.3.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,
 fese-0.3.0.dist-info/METADATA,sha256=Y6rn3cPjHc2ySJrSnUAuXxahgSFs2YoAivSIgJqi40M,655
 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=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+fese-0.3.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
 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 5bea5450d..da25d7b42 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 (70.3.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/fese/tags.py b/libs/fese/tags.py
index 3c4625eb1..46c8f440c 100644
--- a/libs/fese/tags.py
+++ b/libs/fese/tags.py
@@ -196,4 +196,8 @@ _extra_languages = {
         "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/ffsubsync-0.4.25.dist-info/INSTALLER b/libs/ffsubsync-0.4.27.dist-info/INSTALLER
similarity index 100%
rename from libs/ffsubsync-0.4.25.dist-info/INSTALLER
rename to libs/ffsubsync-0.4.27.dist-info/INSTALLER
diff --git a/libs/ffsubsync-0.4.25.dist-info/LICENSE b/libs/ffsubsync-0.4.27.dist-info/LICENSE
similarity index 100%
rename from libs/ffsubsync-0.4.25.dist-info/LICENSE
rename to libs/ffsubsync-0.4.27.dist-info/LICENSE
diff --git a/libs/ffsubsync-0.4.25.dist-info/METADATA b/libs/ffsubsync-0.4.27.dist-info/METADATA
similarity index 99%
rename from libs/ffsubsync-0.4.25.dist-info/METADATA
rename to libs/ffsubsync-0.4.27.dist-info/METADATA
index 7bf28f7d2..b1437b481 100644
--- a/libs/ffsubsync-0.4.25.dist-info/METADATA
+++ b/libs/ffsubsync-0.4.27.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ffsubsync
-Version: 0.4.25
+Version: 0.4.27
 Summary: Language-agnostic synchronization of subtitles with video.
 Home-page: https://github.com/smacke/ffsubsync
 Author: Stephen Macke
@@ -16,6 +16,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
@@ -27,6 +28,7 @@ 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
diff --git a/libs/ffsubsync-0.4.25.dist-info/RECORD b/libs/ffsubsync-0.4.27.dist-info/RECORD
similarity index 51%
rename from libs/ffsubsync-0.4.25.dist-info/RECORD
rename to libs/ffsubsync-0.4.27.dist-info/RECORD
index dcaa007b6..c4e5060e5 100644
--- a/libs/ffsubsync-0.4.25.dist-info/RECORD
+++ b/libs/ffsubsync-0.4.27.dist-info/RECORD
@@ -1,26 +1,26 @@
 ../../bin/ffs,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
 ../../bin/ffsubsync,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
 ../../bin/subsync,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
-ffsubsync-0.4.25.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-ffsubsync-0.4.25.dist-info/LICENSE,sha256=DojZETNKKMCxh_kvQYZwyPFvuoM9pkllyQDqVdT9Ja4,1053
-ffsubsync-0.4.25.dist-info/METADATA,sha256=7JGrV9X4BxuRX8Dc0yv5-dADVPD5S4I6iUl9wvYOSe4,10075
-ffsubsync-0.4.25.dist-info/RECORD,,
-ffsubsync-0.4.25.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ffsubsync-0.4.25.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-ffsubsync-0.4.25.dist-info/entry_points.txt,sha256=x5tYAy_9mGKvB6HtyypAE7bMClVIVPxcxcTozISatsg,91
-ffsubsync-0.4.25.dist-info/top_level.txt,sha256=rD4Pc_QfEQZsZ-i6QXAdnbhVWanzT9edNbD7htPRjWs,10
+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=ZAcDEXOak9gtRiRqLXOW4cVz0fwpCab6U3HJ8EZgqHA,498
+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=oI-wmdyfrpctrJBTIeR8zdMQ7XGuz1PzodG0xy1InO0,2934
-ffsubsync/ffsubsync.py,sha256=x8WCR5Yp0qauUfYEBAMFEQDCIr0icg-hOT25tX2mXcw,26116
+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=5w27NE6PP1i6EihWG70VdMIP0EmK_dYXd3dCwtpkFBs,6204
+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=K6VV05ImzdkmKsWknjXEXoVuaCV-GDKa5nCCvS7alWU,19207
-ffsubsync/subtitle_parser.py,sha256=Fttx6Qg_jpA33mbcRoYCp1RxpxEMPGfPWMx_HEPCN2c,6476
+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.25.dist-info/REQUESTED b/libs/ffsubsync-0.4.27.dist-info/REQUESTED
similarity index 100%
rename from libs/ffsubsync-0.4.25.dist-info/REQUESTED
rename to libs/ffsubsync-0.4.27.dist-info/REQUESTED
diff --git a/libs/ffsubsync-0.4.25.dist-info/WHEEL b/libs/ffsubsync-0.4.27.dist-info/WHEEL
similarity index 70%
rename from libs/ffsubsync-0.4.25.dist-info/WHEEL
rename to libs/ffsubsync-0.4.27.dist-info/WHEEL
index 0b18a2811..f771c29b8 100644
--- a/libs/ffsubsync-0.4.25.dist-info/WHEEL
+++ b/libs/ffsubsync-0.4.27.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/ffsubsync-0.4.25.dist-info/entry_points.txt b/libs/ffsubsync-0.4.27.dist-info/entry_points.txt
similarity index 100%
rename from libs/ffsubsync-0.4.25.dist-info/entry_points.txt
rename to libs/ffsubsync-0.4.27.dist-info/entry_points.txt
diff --git a/libs/ffsubsync-0.4.25.dist-info/top_level.txt b/libs/ffsubsync-0.4.27.dist-info/top_level.txt
similarity index 100%
rename from libs/ffsubsync-0.4.25.dist-info/top_level.txt
rename to libs/ffsubsync-0.4.27.dist-info/top_level.txt
diff --git a/libs/ffsubsync/_version.py b/libs/ffsubsync/_version.py
index a39e32836..4b43a6da3 100644
--- a/libs/ffsubsync/_version.py
+++ b/libs/ffsubsync/_version.py
@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.18) from
+# This file was generated by 'versioneer.py' (0.22) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-04-20T11:25:58+0100",
+ "date": "2024-12-23T23:09:43-0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "0953aa240101a7aa235438496f796ef5f8d69d5b",
- "version": "0.4.25"
+ "full-revisionid": "70ab16ffce283c86a1b66d8e35db351fbfbf2d19",
+ "version": "0.4.27"
 }
 '''  # END VERSION_JSON
 
diff --git a/libs/ffsubsync/ffmpeg_utils.py b/libs/ffsubsync/ffmpeg_utils.py
index 7f5733404..d8bf47459 100644
--- a/libs/ffsubsync/ffmpeg_utils.py
+++ b/libs/ffsubsync/ffmpeg_utils.py
@@ -70,6 +70,10 @@ def ffmpeg_bin_path(bin_name, gui_mode, ffmpeg_resources_path=None):
     if platform.system() == "Windows":
         bin_name = "{}.exe".format(bin_name)
     if ffmpeg_resources_path is not None:
+        if not os.path.isdir(ffmpeg_resources_path):
+            if bin_name.lower().startswith("ffmpeg"):
+                return ffmpeg_resources_path
+            ffmpeg_resources_path = os.path.dirname(ffmpeg_resources_path)
         return os.path.join(ffmpeg_resources_path, bin_name)
     try:
         resource_path = os.environ[SUBSYNC_RESOURCES_ENV_MAGIC]
diff --git a/libs/ffsubsync/ffsubsync.py b/libs/ffsubsync/ffsubsync.py
index 9a808a29b..b0114cc89 100644
--- a/libs/ffsubsync/ffsubsync.py
+++ b/libs/ffsubsync/ffsubsync.py
@@ -11,11 +11,7 @@ from typing import cast, Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
 
-from ffsubsync.aligners import (
-    FFTAligner,
-    MaxScoreAligner,
-    FailedToFindAlignmentException,
-)
+from ffsubsync.aligners import FFTAligner, MaxScoreAligner
 from ffsubsync.constants import (
     DEFAULT_APPLY_OFFSET_SECONDS,
     DEFAULT_FRAME_RATE,
@@ -128,16 +124,16 @@ def get_framerate_ratios_to_try(args: argparse.Namespace) -> List[Optional[float
 def try_sync(
     args: argparse.Namespace, reference_pipe: Optional[Pipeline], result: Dict[str, Any]
 ) -> bool:
+    result["sync_was_successful"] = False
     sync_was_successful = True
-    exc = None
-    try:
-        logger.info(
-            "extracting speech segments from %s...",
-            "stdin" if not args.srtin else "subtitles file(s) {}".format(args.srtin),
-        )
-        if not args.srtin:
-            args.srtin = [None]
-        for srtin in args.srtin:
+    logger.info(
+        "extracting speech segments from %s...",
+        "stdin" if not args.srtin else "subtitles file(s) {}".format(args.srtin),
+    )
+    if not args.srtin:
+        args.srtin = [None]
+    for srtin in args.srtin:
+        try:
             skip_sync = args.skip_sync or reference_pipe is None
             skip_infer_framerate_ratio = (
                 args.skip_infer_framerate_ratio or reference_pipe is None
@@ -182,6 +178,8 @@ def try_sync(
                     reference_pipe.transform(args.reference),
                     srt_pipes,
                 )
+            if best_score < 0:
+                sync_was_successful = False
             logger.info("...done")
             offset_seconds = (
                 offset_samples / float(SAMPLE_RATE) + args.apply_offset_seconds
@@ -211,20 +209,14 @@ def try_sync(
                     offset_seconds,
                     args.suppress_output_if_offset_less_than,
                 )
-    except FailedToFindAlignmentException as e:
-        sync_was_successful = False
-        logger.error(str(e))
-    except Exception as e:
-        exc = e
-        sync_was_successful = False
-    else:
-        result["offset_seconds"] = offset_seconds
-        result["framerate_scale_factor"] = scale_step.scale_factor
-    finally:
-        if exc is not None:
-            raise exc
-        result["sync_was_successful"] = sync_was_successful
-        return sync_was_successful
+        except Exception:
+            sync_was_successful = False
+            logger.exception("failed to sync %s", srtin)
+        else:
+            result["offset_seconds"] = offset_seconds
+            result["framerate_scale_factor"] = scale_step.scale_factor
+    result["sync_was_successful"] = sync_was_successful
+    return sync_was_successful
 
 
 def make_reference_pipe(args: argparse.Namespace) -> Pipeline:
diff --git a/libs/ffsubsync/generic_subtitles.py b/libs/ffsubsync/generic_subtitles.py
index 3e4b1ed0f..2dcf433ae 100644
--- a/libs/ffsubsync/generic_subtitles.py
+++ b/libs/ffsubsync/generic_subtitles.py
@@ -139,7 +139,7 @@ class GenericSubtitlesFile:
         else:
             out_format = os.path.splitext(fname)[-1][1:]
         subs = list(self.gen_raw_resolved_subs())
-        if self._sub_format in ("ssa", "ass"):
+        if self._sub_format in ("ssa", "ass", "vtt"):
             ssaf = pysubs2.SSAFile()
             ssaf.events = subs
             if self._styles is not None:
@@ -149,7 +149,7 @@ class GenericSubtitlesFile:
             if self._fonts_opaque is not None:
                 ssaf.fonts_opaque = self._fonts_opaque
             to_write = ssaf.to_string(out_format)
-        elif self._sub_format == "srt" and out_format in ("ssa", "ass"):
+        elif self._sub_format == "srt" and out_format in ("ssa", "ass", "vtt"):
             to_write = pysubs2.SSAFile.from_string(srt.compose(subs)).to_string(
                 out_format
             )
diff --git a/libs/ffsubsync/speech_transformers.py b/libs/ffsubsync/speech_transformers.py
index 72ca23e30..38883d14b 100644
--- a/libs/ffsubsync/speech_transformers.py
+++ b/libs/ffsubsync/speech_transformers.py
@@ -367,6 +367,8 @@ class VideoSpeechTransformer(TransformerMixin):
                 "1",
                 "-acodec",
                 "pcm_s16le",
+                "-af",
+                "aresample=async=1",
                 "-ar",
                 str(self.frame_rate),
                 "-",
diff --git a/libs/ffsubsync/subtitle_parser.py b/libs/ffsubsync/subtitle_parser.py
index b42d9bb9e..677bc184f 100644
--- a/libs/ffsubsync/subtitle_parser.py
+++ b/libs/ffsubsync/subtitle_parser.py
@@ -116,7 +116,7 @@ class GenericSubtitleParser(SubsMixin, TransformerMixin):
                     parsed_subs = srt.parse(
                         decoded_subs, ignore_errors=not self._strict
                     )
-                elif self.sub_format in ("ass", "ssa", "sub"):
+                elif self.sub_format in ("ass", "ssa", "sub", "vtt"):
                     parsed_subs = pysubs2.SSAFile.from_string(decoded_subs)
                 else:
                     raise NotImplementedError(
diff --git a/libs/flask-3.0.2.dist-info/INSTALLER b/libs/filetype-1.2.0.dist-info/INSTALLER
similarity index 100%
rename from libs/flask-3.0.2.dist-info/INSTALLER
rename to libs/filetype-1.2.0.dist-info/INSTALLER
diff --git a/libs/filetype-1.2.0.dist-info/LICENSE b/libs/filetype-1.2.0.dist-info/LICENSE
new file mode 100644
index 000000000..d5dbb7e34
--- /dev/null
+++ b/libs/filetype-1.2.0.dist-info/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Tomás Aparicio
+
+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/filetype-1.2.0.dist-info/METADATA b/libs/filetype-1.2.0.dist-info/METADATA
new file mode 100644
index 000000000..2ebcc45da
--- /dev/null
+++ b/libs/filetype-1.2.0.dist-info/METADATA
@@ -0,0 +1,212 @@
+Metadata-Version: 2.1
+Name: filetype
+Version: 1.2.0
+Summary: Infer file type and MIME type of any file/buffer. No external dependencies.
+Home-page: https://github.com/h2non/filetype.py
+Download-URL: https://github.com/h2non/filetype.py/tarball/master
+Author: Tomas Aparicio
+Author-email: tomas@aparicio.me
+License: MIT
+Keywords: file libmagic magic infer numbers magicnumbers discovery mime type kind
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+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: Topic :: System
+Classifier: Topic :: System :: Filesystems
+Classifier: Topic :: Utilities
+License-File: LICENSE
+
+filetype.py |Build Status| |PyPI| |Pyversions| |API|
+====================================================
+
+Small and dependency free `Python`_ package to infer file type and MIME
+type checking the `magic numbers`_ signature of a file or buffer.
+
+This is a Python port from `filetype`_ Go package.
+
+Features
+--------
+
+-  Simple and friendly API
+-  Supports a `wide range`_ of file types
+-  Provides file extension and MIME type inference
+-  File discovery by extension or MIME type
+-  File discovery by kind (image, video, audio…)
+-  `Pluggable`_: add new custom type matchers
+-  `Fast`_, even processing large files
+-  Only first 261 bytes representing the max file header is required, so
+   you can just `pass a list of bytes`_
+-  Dependency free (just Python code, no C extensions, no libmagic
+   bindings)
+-  Cross-platform file recognition
+
+Installation
+------------
+
+::
+
+    pip install filetype
+
+API
+---
+
+See `annotated API reference`_.
+
+Examples
+--------
+
+Simple file type checking
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+
+    import filetype
+
+    def main():
+        kind = filetype.guess('tests/fixtures/sample.jpg')
+        if kind is None:
+            print('Cannot guess file type!')
+            return
+
+        print('File extension: %s' % kind.extension)
+        print('File MIME type: %s' % kind.mime)
+
+    if __name__ == '__main__':
+        main()
+
+Supported types
+---------------
+
+Image
+^^^^^
+
+-  **dwg** - ``image/vnd.dwg``
+-  **xcf** - ``image/x-xcf``
+-  **jpg** - ``image/jpeg``
+-  **jpx** - ``image/jpx``
+-  **png** - ``image/png``
+-  **apng** - ``image/apng``
+-  **gif** - ``image/gif``
+-  **webp** - ``image/webp``
+-  **cr2** - ``image/x-canon-cr2``
+-  **tif** - ``image/tiff``
+-  **bmp** - ``image/bmp``
+-  **jxr** - ``image/vnd.ms-photo``
+-  **psd** - ``image/vnd.adobe.photoshop``
+-  **ico** - ``image/x-icon``
+-  **heic** - ``image/heic``
+-  **avif** - ``image/avif``
+
+Video
+^^^^^
+
+-  **3gp** - ``video/3gpp``
+-  **mp4** - ``video/mp4``
+-  **m4v** - ``video/x-m4v``
+-  **mkv** - ``video/x-matroska``
+-  **webm** - ``video/webm``
+-  **mov** - ``video/quicktime``
+-  **avi** - ``video/x-msvideo``
+-  **wmv** - ``video/x-ms-wmv``
+-  **mpg** - ``video/mpeg``
+-  **flv** - ``video/x-flv``
+
+Audio
+^^^^^
+
+-  **aac** - ``audio/aac``
+-  **mid** - ``audio/midi``
+-  **mp3** - ``audio/mpeg``
+-  **m4a** - ``audio/mp4``
+-  **ogg** - ``audio/ogg``
+-  **flac** - ``audio/x-flac``
+-  **wav** - ``audio/x-wav``
+-  **amr** - ``audio/amr``
+-  **aiff** - ``audio/x-aiff``
+
+Archive
+^^^^^^^
+
+-  **br** - ``application/x-brotli``
+-  **rpm** - ``application/x-rpm``
+-  **dcm** - ``application/dicom``
+-  **epub** - ``application/epub+zip``
+-  **zip** - ``application/zip``
+-  **tar** - ``application/x-tar``
+-  **rar** - ``application/x-rar-compressed``
+-  **gz** - ``application/gzip``
+-  **bz2** - ``application/x-bzip2``
+-  **7z** - ``application/x-7z-compressed``
+-  **xz** - ``application/x-xz``
+-  **pdf** - ``application/pdf``
+-  **exe** - ``application/x-msdownload``
+-  **swf** - ``application/x-shockwave-flash``
+-  **rtf** - ``application/rtf``
+-  **eot** - ``application/octet-stream``
+-  **ps** - ``application/postscript``
+-  **sqlite** - ``application/x-sqlite3``
+-  **nes** - ``application/x-nintendo-nes-rom``
+-  **crx** - ``application/x-google-chrome-extension``
+-  **cab** - ``application/vnd.ms-cab-compressed``
+-  **deb** - ``application/x-deb``
+-  **ar** - ``application/x-unix-archive``
+-  **Z** - ``application/x-compress``
+-  **lzo** - ``application/x-lzop``
+-  **lz** - ``application/x-lzip``
+-  **lz4** - ``application/x-lz4``
+-  **zstd** - ``application/zstd``
+
+Document
+^^^^^^^^
+
+-  **doc** - ``application/msword``
+-  **docx** - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document``
+-  **odt** - ``application/vnd.oasis.opendocument.text``
+-  **xls** - ``application/vnd.ms-excel``
+-  **xlsx** - ``application/vnd.openxmlformats-officedocument.spreadsheetml.sheet``
+-  **ods** - ``application/vnd.oasis.opendocument.spreadsheet``
+-  **ppt** - ``application/vnd.ms-powerpoint``
+-  **pptx** - ``application/vnd.openxmlformats-officedocument.presentationml.presentation``
+-  **odp** - ``application/vnd.oasis.opendocument.presentation``
+
+Font
+^^^^
+
+-  **woff** - ``application/font-woff``
+-  **woff2** - ``application/font-woff``
+-  **ttf** - ``application/font-sfnt``
+-  **otf** - ``application/font-sfnt``
+
+Application
+^^^^^^^^^^^ 
+
+-  **wasm** - ``application/wasm``
+
+.. _Python: http://python.org
+.. _magic numbers: https://en.wikipedia.org/wiki/Magic_number_(programming)#Magic_numbers_in_files
+.. _filetype: https://github.com/h2non/filetype
+.. _wide range: #supported-types
+.. _Pluggable: #add-additional-file-type-matchers
+.. _Fast: #benchmarks
+.. _pass a list of bytes: #file-header
+.. _annotated API reference: https://h2non.github.io/filetype.py/
+
+.. |Build Status| image:: https://travis-ci.org/h2non/filetype.py.svg?branch=master
+   :target: https://travis-ci.org/h2non/filetype.py
+.. |PyPI| image:: https://img.shields.io/pypi/v/filetype.svg?maxAge=2592000?style=flat-square
+   :target: https://pypi.python.org/pypi/filetype
+.. |Pyversions| image:: https://img.shields.io/pypi/pyversions/filetype.svg?style=flat-square
+    :target: https://pypi.python.org/pypi/filetype
+.. |API| image:: https://img.shields.io/badge/api-docs-green.svg
+   :target: https://h2non.github.io/filetype.py
diff --git a/libs/filetype-1.2.0.dist-info/RECORD b/libs/filetype-1.2.0.dist-info/RECORD
new file mode 100644
index 000000000..1a5229fd6
--- /dev/null
+++ b/libs/filetype-1.2.0.dist-info/RECORD
@@ -0,0 +1,26 @@
+../../bin/filetype,sha256=qhZzWIjpierkU7BFhcUqdo8jpXcpw4t1BOBkR_UK1fY,239
+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/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/entry_points.txt,sha256=FW9vQKv-y3mEcT51mUaPeIu3vixzcr6WdLfjD4SFUVM,52
+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
+filetype/__main__.py,sha256=4-2VK-0hB2mLL_HukB8cOa0jsQKLq95gG4UhCPqF0rg,803
+filetype/filetype.py,sha256=SBYUBugfBQSO9z7zyWaXOak6UpLUlmZZ--5FpN0fybM,2122
+filetype/helpers.py,sha256=O0hofWlmG8J_X81IuQ8KszvjgnUb-O6BzO-wUJRTLV0,2947
+filetype/match.py,sha256=XUHst4XDmYlJtfYAMlGuySl2IWia2UoCb8NIDYiCRgI,3288
+filetype/types/__init__.py,sha256=baH8xCYyatykxtCUccgGGIwNdit6x5jGsXxWTvpo4t8,2085
+filetype/types/application.py,sha256=6Knc4Y38GbfuoSjdPl29vIsusjNIPjLWVk22nxCnS9I,498
+filetype/types/archive.py,sha256=kZWEHJmJ1NmQT0Hm-JmEHI1TXg5NrzxJ4YCbfV-6y8c,17006
+filetype/types/audio.py,sha256=oOAS-cdA175rELcK_17w-gylJkmSh8FTrAoVAOwsfUA,4960
+filetype/types/base.py,sha256=dvvqVjuSqwtbh2qyP7QnmeWUWUsfrHwJ_rOEgJmDQZ8,647
+filetype/types/document.py,sha256=mxOhuymNIpsqMWCgy-Fm8vkSgDoSeCXYADxmO1JPx6Q,7513
+filetype/types/font.py,sha256=nP5Ey-EcKMU4phGYtIlQ08I5cecWnr5vzDLVbiPOiyY,2924
+filetype/types/image.py,sha256=r8pINANPJZbCEmZKn8F74fFffk4INtDin_GtQtQImZs,9130
+filetype/types/isobmff.py,sha256=zLXCbTET6wp_9yq8jE3bhBRTaCdSAKma5ElyHVGd2Sk,958
+filetype/types/video.py,sha256=DfkFd5ofnEK25r_n71LxjX3nAAgO8xJ7Op_lL9uEbNc,5371
+filetype/utils.py,sha256=sjZCMfYawZ6RWN1Dr3jDmsqIjLSEBFubNgi8HROjaPQ,2089
diff --git a/libs/flask-3.0.2.dist-info/REQUESTED b/libs/filetype-1.2.0.dist-info/REQUESTED
similarity index 100%
rename from libs/flask-3.0.2.dist-info/REQUESTED
rename to libs/filetype-1.2.0.dist-info/REQUESTED
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/WHEEL b/libs/filetype-1.2.0.dist-info/WHEEL
similarity index 100%
rename from libs/requests_oauthlib-1.3.1.dist-info/WHEEL
rename to libs/filetype-1.2.0.dist-info/WHEEL
diff --git a/libs/filetype-1.2.0.dist-info/entry_points.txt b/libs/filetype-1.2.0.dist-info/entry_points.txt
new file mode 100644
index 000000000..b21413d7e
--- /dev/null
+++ b/libs/filetype-1.2.0.dist-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+filetype = filetype.__main__:main
diff --git a/libs/filetype-1.2.0.dist-info/top_level.txt b/libs/filetype-1.2.0.dist-info/top_level.txt
new file mode 100644
index 000000000..fb14e2f61
--- /dev/null
+++ b/libs/filetype-1.2.0.dist-info/top_level.txt
@@ -0,0 +1 @@
+filetype
diff --git a/libs/python_dateutil-2.8.2.dist-info/zip-safe b/libs/filetype-1.2.0.dist-info/zip-safe
similarity index 100%
rename from libs/python_dateutil-2.8.2.dist-info/zip-safe
rename to libs/filetype-1.2.0.dist-info/zip-safe
diff --git a/libs/filetype/__init__.py b/libs/filetype/__init__.py
new file mode 100644
index 000000000..3d0610ea2
--- /dev/null
+++ b/libs/filetype/__init__.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .filetype import *  # noqa
+from .helpers import *  # noqa
+from .match import *  # noqa
+
+# Current package semver version
+__version__ = version = '1.2.0'
diff --git a/libs/filetype/__main__.py b/libs/filetype/__main__.py
new file mode 100644
index 000000000..7df5c4fc6
--- /dev/null
+++ b/libs/filetype/__main__.py
@@ -0,0 +1,37 @@
+import sys
+
+import filetype
+
+
+def guess(path):
+    kind = filetype.guess(path)
+    if kind is None:
+        print('{}: File type determination failure.'.format(path))
+    else:
+        print('{}: {} ({})'.format(path, kind.extension, kind.mime))
+
+
+def main():
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        prog='filetype', description='Determine type of FILEs.'
+    )
+    parser.add_argument('-f', '--file', nargs='+')
+    parser.add_argument(
+        '-v', '--version', action='version',
+        version='%(prog)s ' + filetype.version,
+        help='output version information and exit'
+    )
+
+    args = parser.parse_args()
+    if len(sys.argv) < 2:
+        parser.print_help()
+        sys.exit(1)
+
+    for i in args.file:
+        guess(i)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/libs/filetype/filetype.py b/libs/filetype/filetype.py
new file mode 100644
index 000000000..457152efd
--- /dev/null
+++ b/libs/filetype/filetype.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .match import match
+from .types import TYPES, Type
+
+# Expose supported matchers types
+types = TYPES
+
+
+def guess(obj):
+    """
+    Infers the type of the given input.
+
+    Function is overloaded to accept multiple types in input
+    and peform the needed type inference based on it.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        The matched type instance. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj) if obj else None
+
+
+def guess_mime(obj):
+    """
+    Infers the file type of the given input
+    and returns its MIME type.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        The matched MIME type as string. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    kind = guess(obj)
+    return kind.mime if kind else kind
+
+
+def guess_extension(obj):
+    """
+    Infers the file type of the given input
+    and returns its RFC file extension.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        The matched file extension as string. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    kind = guess(obj)
+    return kind.extension if kind else kind
+
+
+def get_type(mime=None, ext=None):
+    """
+    Returns the file type instance searching by
+    MIME type or file extension.
+
+    Args:
+        ext: file extension string. E.g: jpg, png, mp4, mp3
+        mime: MIME string. E.g: image/jpeg, video/mpeg
+
+    Returns:
+        The matched file type instance. Otherwise None.
+    """
+    for kind in types:
+        if kind.extension == ext or kind.mime == mime:
+            return kind
+    return None
+
+
+def add_type(instance):
+    """
+    Adds a new type matcher instance to the supported types.
+
+    Args:
+        instance: Type inherited instance.
+
+    Returns:
+        None
+    """
+    if not isinstance(instance, Type):
+        raise TypeError('instance must inherit from filetype.types.Type')
+
+    types.insert(0, instance)
diff --git a/libs/filetype/helpers.py b/libs/filetype/helpers.py
new file mode 100644
index 000000000..afe4e6841
--- /dev/null
+++ b/libs/filetype/helpers.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+from .types import TYPES
+from .match import (
+    image_match, font_match, document_match,
+    video_match, audio_match, archive_match
+)
+
+
+def is_extension_supported(ext):
+    """
+    Checks if the given extension string is
+    one of the supported by the file matchers.
+
+    Args:
+        ext (str): file extension string. E.g: jpg, png, mp4, mp3
+
+    Returns:
+        True if the file extension is supported.
+        Otherwise False.
+    """
+    for kind in TYPES:
+        if kind.extension == ext:
+            return True
+    return False
+
+
+def is_mime_supported(mime):
+    """
+    Checks if the given MIME type string is
+    one of the supported by the file matchers.
+
+    Args:
+        mime (str): MIME string. E.g: image/jpeg, video/mpeg
+
+    Returns:
+        True if the MIME type is supported.
+        Otherwise False.
+    """
+    for kind in TYPES:
+        if kind.mime == mime:
+            return True
+    return False
+
+
+def is_image(obj):
+    """
+    Checks if a given input is a supported type image.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid image. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return image_match(obj) is not None
+
+
+def is_archive(obj):
+    """
+    Checks if a given input is a supported type archive.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid archive. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return archive_match(obj) is not None
+
+
+def is_audio(obj):
+    """
+    Checks if a given input is a supported type audio.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid audio. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return audio_match(obj) is not None
+
+
+def is_video(obj):
+    """
+    Checks if a given input is a supported type video.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid video. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return video_match(obj) is not None
+
+
+def is_font(obj):
+    """
+    Checks if a given input is a supported type font.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid font. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return font_match(obj) is not None
+
+
+def is_document(obj):
+    """
+    Checks if a given input is a supported type document.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        True if obj is a valid document. Otherwise False.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return document_match(obj) is not None
diff --git a/libs/filetype/match.py b/libs/filetype/match.py
new file mode 100644
index 000000000..8b6f11b7e
--- /dev/null
+++ b/libs/filetype/match.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .types import ARCHIVE as archive_matchers
+from .types import AUDIO as audio_matchers
+from .types import APPLICATION as application_matchers
+from .types import DOCUMENT as document_matchers
+from .types import FONT as font_matchers
+from .types import IMAGE as image_matchers
+from .types import VIDEO as video_matchers
+from .types import TYPES
+from .utils import get_bytes
+
+
+def match(obj, matchers=TYPES):
+    """
+    Matches the given input against the available
+    file type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if type matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    buf = get_bytes(obj)
+
+    for matcher in matchers:
+        if matcher.match(buf):
+            return matcher
+
+    return None
+
+
+def image_match(obj):
+    """
+    Matches the given input against the available
+    image type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, image_matchers)
+
+
+def font_match(obj):
+    """
+    Matches the given input against the available
+    font type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, font_matchers)
+
+
+def video_match(obj):
+    """
+    Matches the given input against the available
+    video type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, video_matchers)
+
+
+def audio_match(obj):
+    """
+    Matches the given input against the available
+    autio type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, audio_matchers)
+
+
+def archive_match(obj):
+    """
+    Matches the given input against the available
+    archive type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, archive_matchers)
+
+
+def application_match(obj):
+    """
+    Matches the given input against the available
+    application type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, application_matchers)
+
+
+def document_match(obj):
+    """
+    Matches the given input against the available
+    document type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, document_matchers)
diff --git a/libs/filetype/types/__init__.py b/libs/filetype/types/__init__.py
new file mode 100644
index 000000000..7d4daed08
--- /dev/null
+++ b/libs/filetype/types/__init__.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from . import archive
+from . import audio
+from . import application
+from . import document
+from . import font
+from . import image
+from . import video
+from .base import Type  # noqa
+
+# Supported image types
+IMAGE = (
+    image.Dwg(),
+    image.Xcf(),
+    image.Jpeg(),
+    image.Jpx(),
+    image.Apng(),
+    image.Png(),
+    image.Gif(),
+    image.Webp(),
+    image.Tiff(),
+    image.Cr2(),
+    image.Bmp(),
+    image.Jxr(),
+    image.Psd(),
+    image.Ico(),
+    image.Heic(),
+    image.Dcm(),
+    image.Avif(),
+)
+
+# Supported video types
+VIDEO = (
+    video.M3gp(),
+    video.Mp4(),
+    video.M4v(),
+    video.Mkv(),
+    video.Mov(),
+    video.Avi(),
+    video.Wmv(),
+    video.Mpeg(),
+    video.Webm(),
+    video.Flv(),
+)
+
+# Supported audio types
+AUDIO = (
+    audio.Aac(),
+    audio.Midi(),
+    audio.Mp3(),
+    audio.M4a(),
+    audio.Ogg(),
+    audio.Flac(),
+    audio.Wav(),
+    audio.Amr(),
+    audio.Aiff(),
+)
+
+# Supported font types
+FONT = (font.Woff(), font.Woff2(), font.Ttf(), font.Otf())
+
+# Supported archive container types
+ARCHIVE = (
+    archive.Br(),
+    archive.Rpm(),
+    archive.Dcm(),
+    archive.Epub(),
+    archive.Zip(),
+    archive.Tar(),
+    archive.Rar(),
+    archive.Gz(),
+    archive.Bz2(),
+    archive.SevenZ(),
+    archive.Pdf(),
+    archive.Exe(),
+    archive.Swf(),
+    archive.Rtf(),
+    archive.Nes(),
+    archive.Crx(),
+    archive.Cab(),
+    archive.Eot(),
+    archive.Ps(),
+    archive.Xz(),
+    archive.Sqlite(),
+    archive.Deb(),
+    archive.Ar(),
+    archive.Z(),
+    archive.Lzop(),
+    archive.Lz(),
+    archive.Elf(),
+    archive.Lz4(),
+    archive.Zstd(),
+)
+
+# Supported archive container types
+APPLICATION = (
+    application.Wasm(),
+)
+
+# Supported document types
+DOCUMENT = (
+    document.Doc(),
+    document.Docx(),
+    document.Odt(),
+    document.Xls(),
+    document.Xlsx(),
+    document.Ods(),
+    document.Ppt(),
+    document.Pptx(),
+    document.Odp(),
+)
+
+
+# Expose supported type matchers
+TYPES = list(IMAGE + AUDIO + VIDEO + FONT + DOCUMENT + ARCHIVE + APPLICATION)
diff --git a/libs/filetype/types/application.py b/libs/filetype/types/application.py
new file mode 100644
index 000000000..6f02370c3
--- /dev/null
+++ b/libs/filetype/types/application.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+
+
+class Wasm(Type):
+    """Implements the Wasm image type matcher."""
+
+    MIME = 'application/wasm'
+    EXTENSION = 'wasm'
+
+    def __init__(self):
+        super(Wasm, self).__init__(
+            mime=Wasm.MIME,
+            extension=Wasm.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:8] == bytearray([0x00, 0x61, 0x73, 0x6d,
+                                     0x01, 0x00, 0x00, 0x00])
diff --git a/libs/filetype/types/archive.py b/libs/filetype/types/archive.py
new file mode 100644
index 000000000..b942ef70b
--- /dev/null
+++ b/libs/filetype/types/archive.py
@@ -0,0 +1,687 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+import struct
+
+from .base import Type
+
+
+class Epub(Type):
+    """
+    Implements the EPUB archive type matcher.
+    """
+    MIME = 'application/epub+zip'
+    EXTENSION = 'epub'
+
+    def __init__(self):
+        super(Epub, self).__init__(
+            mime=Epub.MIME,
+            extension=Epub.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 57 and
+                buf[0] == 0x50 and buf[1] == 0x4B and
+                buf[2] == 0x3 and buf[3] == 0x4 and
+                buf[30] == 0x6D and buf[31] == 0x69 and
+                buf[32] == 0x6D and buf[33] == 0x65 and
+                buf[34] == 0x74 and buf[35] == 0x79 and
+                buf[36] == 0x70 and buf[37] == 0x65 and
+                buf[38] == 0x61 and buf[39] == 0x70 and
+                buf[40] == 0x70 and buf[41] == 0x6C and
+                buf[42] == 0x69 and buf[43] == 0x63 and
+                buf[44] == 0x61 and buf[45] == 0x74 and
+                buf[46] == 0x69 and buf[47] == 0x6F and
+                buf[48] == 0x6E and buf[49] == 0x2F and
+                buf[50] == 0x65 and buf[51] == 0x70 and
+                buf[52] == 0x75 and buf[53] == 0x62 and
+                buf[54] == 0x2B and buf[55] == 0x7A and
+                buf[56] == 0x69 and buf[57] == 0x70)
+
+
+class Zip(Type):
+    """
+    Implements the Zip archive type matcher.
+    """
+    MIME = 'application/zip'
+    EXTENSION = 'zip'
+
+    def __init__(self):
+        super(Zip, self).__init__(
+            mime=Zip.MIME,
+            extension=Zip.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x50 and buf[1] == 0x4B and
+                (buf[2] == 0x3 or buf[2] == 0x5 or
+                    buf[2] == 0x7) and
+                (buf[3] == 0x4 or buf[3] == 0x6 or
+                    buf[3] == 0x8))
+
+
+class Tar(Type):
+    """
+    Implements the Tar archive type matcher.
+    """
+    MIME = 'application/x-tar'
+    EXTENSION = 'tar'
+
+    def __init__(self):
+        super(Tar, self).__init__(
+            mime=Tar.MIME,
+            extension=Tar.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 261 and
+                buf[257] == 0x75 and
+                buf[258] == 0x73 and
+                buf[259] == 0x74 and
+                buf[260] == 0x61 and
+                buf[261] == 0x72)
+
+
+class Rar(Type):
+    """
+    Implements the RAR archive type matcher.
+    """
+    MIME = 'application/x-rar-compressed'
+    EXTENSION = 'rar'
+
+    def __init__(self):
+        super(Rar, self).__init__(
+            mime=Rar.MIME,
+            extension=Rar.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 6 and
+                buf[0] == 0x52 and
+                buf[1] == 0x61 and
+                buf[2] == 0x72 and
+                buf[3] == 0x21 and
+                buf[4] == 0x1A and
+                buf[5] == 0x7 and
+                (buf[6] == 0x0 or
+                    buf[6] == 0x1))
+
+
+class Gz(Type):
+    """
+    Implements the GZ archive type matcher.
+    """
+    MIME = 'application/gzip'
+    EXTENSION = 'gz'
+
+    def __init__(self):
+        super(Gz, self).__init__(
+            mime=Gz.MIME,
+            extension=Gz.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                buf[0] == 0x1F and
+                buf[1] == 0x8B and
+                buf[2] == 0x8)
+
+
+class Bz2(Type):
+    """
+    Implements the BZ2 archive type matcher.
+    """
+    MIME = 'application/x-bzip2'
+    EXTENSION = 'bz2'
+
+    def __init__(self):
+        super(Bz2, self).__init__(
+            mime=Bz2.MIME,
+            extension=Bz2.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                buf[0] == 0x42 and
+                buf[1] == 0x5A and
+                buf[2] == 0x68)
+
+
+class SevenZ(Type):
+    """
+    Implements the SevenZ (7z) archive type matcher.
+    """
+    MIME = 'application/x-7z-compressed'
+    EXTENSION = '7z'
+
+    def __init__(self):
+        super(SevenZ, self).__init__(
+            mime=SevenZ.MIME,
+            extension=SevenZ.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 5 and
+                buf[0] == 0x37 and
+                buf[1] == 0x7A and
+                buf[2] == 0xBC and
+                buf[3] == 0xAF and
+                buf[4] == 0x27 and
+                buf[5] == 0x1C)
+
+
+class Pdf(Type):
+    """
+    Implements the PDF archive type matcher.
+    """
+    MIME = 'application/pdf'
+    EXTENSION = 'pdf'
+
+    def __init__(self):
+        super(Pdf, self).__init__(
+            mime=Pdf.MIME,
+            extension=Pdf.EXTENSION
+        )
+
+    def match(self, buf):
+        # Detect BOM and skip first 3 bytes
+        if (len(buf) > 3 and
+            buf[0] == 0xEF and
+            buf[1] == 0xBB and
+            buf[2] == 0xBF):  # noqa E129
+            buf = buf[3:]
+
+        return (len(buf) > 3 and
+                buf[0] == 0x25 and
+                buf[1] == 0x50 and
+                buf[2] == 0x44 and
+                buf[3] == 0x46)
+
+
+class Exe(Type):
+    """
+    Implements the EXE archive type matcher.
+    """
+    MIME = 'application/x-msdownload'
+    EXTENSION = 'exe'
+
+    def __init__(self):
+        super(Exe, self).__init__(
+            mime=Exe.MIME,
+            extension=Exe.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 1 and
+                buf[0] == 0x4D and
+                buf[1] == 0x5A)
+
+
+class Swf(Type):
+    """
+    Implements the SWF archive type matcher.
+    """
+    MIME = 'application/x-shockwave-flash'
+    EXTENSION = 'swf'
+
+    def __init__(self):
+        super(Swf, self).__init__(
+            mime=Swf.MIME,
+            extension=Swf.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                (buf[0] == 0x43 or
+                    buf[0] == 0x46) and
+                buf[1] == 0x57 and
+                buf[2] == 0x53)
+
+
+class Rtf(Type):
+    """
+    Implements the RTF archive type matcher.
+    """
+    MIME = 'application/rtf'
+    EXTENSION = 'rtf'
+
+    def __init__(self):
+        super(Rtf, self).__init__(
+            mime=Rtf.MIME,
+            extension=Rtf.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 4 and
+                buf[0] == 0x7B and
+                buf[1] == 0x5C and
+                buf[2] == 0x72 and
+                buf[3] == 0x74 and
+                buf[4] == 0x66)
+
+
+class Nes(Type):
+    """
+    Implements the NES archive type matcher.
+    """
+    MIME = 'application/x-nintendo-nes-rom'
+    EXTENSION = 'nes'
+
+    def __init__(self):
+        super(Nes, self).__init__(
+            mime=Nes.MIME,
+            extension=Nes.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x4E and
+                buf[1] == 0x45 and
+                buf[2] == 0x53 and
+                buf[3] == 0x1A)
+
+
+class Crx(Type):
+    """
+    Implements the CRX archive type matcher.
+    """
+    MIME = 'application/x-google-chrome-extension'
+    EXTENSION = 'crx'
+
+    def __init__(self):
+        super(Crx, self).__init__(
+            mime=Crx.MIME,
+            extension=Crx.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x43 and
+                buf[1] == 0x72 and
+                buf[2] == 0x32 and
+                buf[3] == 0x34)
+
+
+class Cab(Type):
+    """
+    Implements the CAB archive type matcher.
+    """
+    MIME = 'application/vnd.ms-cab-compressed'
+    EXTENSION = 'cab'
+
+    def __init__(self):
+        super(Cab, self).__init__(
+            mime=Cab.MIME,
+            extension=Cab.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                ((buf[0] == 0x4D and
+                    buf[1] == 0x53 and
+                    buf[2] == 0x43 and
+                    buf[3] == 0x46) or
+                    (buf[0] == 0x49 and
+                        buf[1] == 0x53 and
+                        buf[2] == 0x63 and
+                        buf[3] == 0x28)))
+
+
+class Eot(Type):
+    """
+    Implements the EOT archive type matcher.
+    """
+    MIME = 'application/octet-stream'
+    EXTENSION = 'eot'
+
+    def __init__(self):
+        super(Eot, self).__init__(
+            mime=Eot.MIME,
+            extension=Eot.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 35 and
+                buf[34] == 0x4C and
+                buf[35] == 0x50 and
+                ((buf[8] == 0x02 and
+                    buf[9] == 0x00 and
+                    buf[10] == 0x01) or
+                (buf[8] == 0x01 and
+                    buf[9] == 0x00 and
+                    buf[10] == 0x00) or
+                    (buf[8] == 0x02 and
+                        buf[9] == 0x00 and
+                        buf[10] == 0x02)))
+
+
+class Ps(Type):
+    """
+    Implements the PS archive type matcher.
+    """
+    MIME = 'application/postscript'
+    EXTENSION = 'ps'
+
+    def __init__(self):
+        super(Ps, self).__init__(
+            mime=Ps.MIME,
+            extension=Ps.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 1 and
+                buf[0] == 0x25 and
+                buf[1] == 0x21)
+
+
+class Xz(Type):
+    """
+    Implements the XS archive type matcher.
+    """
+    MIME = 'application/x-xz'
+    EXTENSION = 'xz'
+
+    def __init__(self):
+        super(Xz, self).__init__(
+            mime=Xz.MIME,
+            extension=Xz.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 5 and
+                buf[0] == 0xFD and
+                buf[1] == 0x37 and
+                buf[2] == 0x7A and
+                buf[3] == 0x58 and
+                buf[4] == 0x5A and
+                buf[5] == 0x00)
+
+
+class Sqlite(Type):
+    """
+    Implements the Sqlite DB archive type matcher.
+    """
+    MIME = 'application/x-sqlite3'
+    EXTENSION = 'sqlite'
+
+    def __init__(self):
+        super(Sqlite, self).__init__(
+            mime=Sqlite.MIME,
+            extension=Sqlite.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x53 and
+                buf[1] == 0x51 and
+                buf[2] == 0x4C and
+                buf[3] == 0x69)
+
+
+class Deb(Type):
+    """
+    Implements the DEB archive type matcher.
+    """
+    MIME = 'application/x-deb'
+    EXTENSION = 'deb'
+
+    def __init__(self):
+        super(Deb, self).__init__(
+            mime=Deb.MIME,
+            extension=Deb.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 20 and
+                buf[0] == 0x21 and
+                buf[1] == 0x3C and
+                buf[2] == 0x61 and
+                buf[3] == 0x72 and
+                buf[4] == 0x63 and
+                buf[5] == 0x68 and
+                buf[6] == 0x3E and
+                buf[7] == 0x0A and
+                buf[8] == 0x64 and
+                buf[9] == 0x65 and
+                buf[10] == 0x62 and
+                buf[11] == 0x69 and
+                buf[12] == 0x61 and
+                buf[13] == 0x6E and
+                buf[14] == 0x2D and
+                buf[15] == 0x62 and
+                buf[16] == 0x69 and
+                buf[17] == 0x6E and
+                buf[18] == 0x61 and
+                buf[19] == 0x72 and
+                buf[20] == 0x79)
+
+
+class Ar(Type):
+    """
+    Implements the AR archive type matcher.
+    """
+    MIME = 'application/x-unix-archive'
+    EXTENSION = 'ar'
+
+    def __init__(self):
+        super(Ar, self).__init__(
+            mime=Ar.MIME,
+            extension=Ar.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 6 and
+                buf[0] == 0x21 and
+                buf[1] == 0x3C and
+                buf[2] == 0x61 and
+                buf[3] == 0x72 and
+                buf[4] == 0x63 and
+                buf[5] == 0x68 and
+                buf[6] == 0x3E)
+
+
+class Z(Type):
+    """
+    Implements the Z archive type matcher.
+    """
+    MIME = 'application/x-compress'
+    EXTENSION = 'Z'
+
+    def __init__(self):
+        super(Z, self).__init__(
+            mime=Z.MIME,
+            extension=Z.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 1 and
+                ((buf[0] == 0x1F and
+                    buf[1] == 0xA0) or
+                (buf[0] == 0x1F and
+                    buf[1] == 0x9D)))
+
+
+class Lzop(Type):
+    """
+    Implements the Lzop archive type matcher.
+    """
+    MIME = 'application/x-lzop'
+    EXTENSION = 'lzo'
+
+    def __init__(self):
+        super(Lzop, self).__init__(
+            mime=Lzop.MIME,
+            extension=Lzop.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 7 and
+                buf[0] == 0x89 and
+                buf[1] == 0x4C and
+                buf[2] == 0x5A and
+                buf[3] == 0x4F and
+                buf[4] == 0x00 and
+                buf[5] == 0x0D and
+                buf[6] == 0x0A and
+                buf[7] == 0x1A)
+
+
+class Lz(Type):
+    """
+    Implements the Lz archive type matcher.
+    """
+    MIME = 'application/x-lzip'
+    EXTENSION = 'lz'
+
+    def __init__(self):
+        super(Lz, self).__init__(
+            mime=Lz.MIME,
+            extension=Lz.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x4C and
+                buf[1] == 0x5A and
+                buf[2] == 0x49 and
+                buf[3] == 0x50)
+
+
+class Elf(Type):
+    """
+    Implements the Elf archive type matcher
+    """
+    MIME = 'application/x-executable'
+    EXTENSION = 'elf'
+
+    def __init__(self):
+        super(Elf, self).__init__(
+            mime=Elf.MIME,
+            extension=Elf.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 52 and
+                buf[0] == 0x7F and
+                buf[1] == 0x45 and
+                buf[2] == 0x4C and
+                buf[3] == 0x46)
+
+
+class Lz4(Type):
+    """
+    Implements the Lz4 archive type matcher.
+    """
+    MIME = 'application/x-lz4'
+    EXTENSION = 'lz4'
+
+    def __init__(self):
+        super(Lz4, self).__init__(
+            mime=Lz4.MIME,
+            extension=Lz4.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x04 and
+                buf[1] == 0x22 and
+                buf[2] == 0x4D and
+                buf[3] == 0x18)
+
+
+class Br(Type):
+    """Implements the Br image type matcher."""
+
+    MIME = 'application/x-brotli'
+    EXTENSION = 'br'
+
+    def __init__(self):
+        super(Br, self).__init__(
+            mime=Br.MIME,
+            extension=Br.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:4] == bytearray([0xce, 0xb2, 0xcf, 0x81])
+
+
+class Dcm(Type):
+    """Implements the Dcm image type matcher."""
+
+    MIME = 'application/dicom'
+    EXTENSION = 'dcm'
+
+    def __init__(self):
+        super(Dcm, self).__init__(
+            mime=Dcm.MIME,
+            extension=Dcm.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[128:131] == bytearray([0x44, 0x49, 0x43, 0x4d])
+
+
+class Rpm(Type):
+    """Implements the Rpm image type matcher."""
+
+    MIME = 'application/x-rpm'
+    EXTENSION = 'rpm'
+
+    def __init__(self):
+        super(Rpm, self).__init__(
+            mime=Rpm.MIME,
+            extension=Rpm.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:4] == bytearray([0xed, 0xab, 0xee, 0xdb])
+
+
+class Zstd(Type):
+    """
+    Implements the Zstd archive type matcher.
+    https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md
+    """
+    MIME = 'application/zstd'
+    EXTENSION = 'zst'
+    MAGIC_SKIPPABLE_START = 0x184D2A50
+    MAGIC_SKIPPABLE_MASK = 0xFFFFFFF0
+
+    def __init__(self):
+        super(Zstd, self).__init__(
+            mime=Zstd.MIME,
+            extension=Zstd.EXTENSION
+        )
+
+    @staticmethod
+    def _to_little_endian_int(buf):
+        # return int.from_bytes(buf, byteorder='little')
+        return struct.unpack('<L', buf)[0]
+
+    def match(self, buf):
+        # Zstandard compressed data is made of one or more frames.
+        # There are two frame formats defined by Zstandard:
+        # Zstandard frames and Skippable frames.
+        # See more details from
+        # https://tools.ietf.org/id/draft-kucherawy-dispatch-zstd-00.html#rfc.section.2
+        is_zstd = (
+            len(buf) > 3 and
+            buf[0] in (0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28) and
+            buf[1] == 0xb5 and
+            buf[2] == 0x2f and
+            buf[3] == 0xfd)
+        if is_zstd:
+            return True
+        # skippable frames
+        if len(buf) < 8:
+            return False
+        magic = self._to_little_endian_int(buf[:4]) & Zstd.MAGIC_SKIPPABLE_MASK
+        if magic == Zstd.MAGIC_SKIPPABLE_START:
+            user_data_len = self._to_little_endian_int(buf[4:8])
+            if len(buf) < 8 + user_data_len:
+                return False
+            next_frame = buf[8 + user_data_len:]
+            return self.match(next_frame)
+        return False
diff --git a/libs/filetype/types/audio.py b/libs/filetype/types/audio.py
new file mode 100644
index 000000000..3d1f20c3b
--- /dev/null
+++ b/libs/filetype/types/audio.py
@@ -0,0 +1,212 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+
+
+class Midi(Type):
+    """
+    Implements the Midi audio type matcher.
+    """
+    MIME = 'audio/midi'
+    EXTENSION = 'midi'
+
+    def __init__(self):
+        super(Midi, self).__init__(
+            mime=Midi.MIME,
+            extension=Midi.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x4D and
+                buf[1] == 0x54 and
+                buf[2] == 0x68 and
+                buf[3] == 0x64)
+
+
+class Mp3(Type):
+    """
+    Implements the MP3 audio type matcher.
+    """
+    MIME = 'audio/mpeg'
+    EXTENSION = 'mp3'
+
+    def __init__(self):
+        super(Mp3, self).__init__(
+            mime=Mp3.MIME,
+            extension=Mp3.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                ((buf[0] == 0x49 and
+                  buf[1] == 0x44 and
+                  buf[2] == 0x33) or
+                 (buf[0] == 0xFF and
+                  buf[1] == 0xF2) or
+                 (buf[0] == 0xFF and
+                  buf[1] == 0xF3) or
+                 (buf[0] == 0xFF and
+                  buf[1] == 0xFB)))
+
+
+class M4a(Type):
+    """
+    Implements the M4A audio type matcher.
+    """
+    MIME = 'audio/mp4'
+    EXTENSION = 'm4a'
+
+    def __init__(self):
+        super(M4a, self).__init__(
+            mime=M4a.MIME,
+            extension=M4a.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 10 and
+                ((buf[4] == 0x66 and
+                    buf[5] == 0x74 and
+                    buf[6] == 0x79 and
+                    buf[7] == 0x70 and
+                    buf[8] == 0x4D and
+                    buf[9] == 0x34 and
+                    buf[10] == 0x41) or
+                (buf[0] == 0x4D and
+                    buf[1] == 0x34 and
+                    buf[2] == 0x41 and
+                    buf[3] == 0x20)))
+
+
+class Ogg(Type):
+    """
+    Implements the OGG audio type matcher.
+    """
+    MIME = 'audio/ogg'
+    EXTENSION = 'ogg'
+
+    def __init__(self):
+        super(Ogg, self).__init__(
+            mime=Ogg.MIME,
+            extension=Ogg.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x4F and
+                buf[1] == 0x67 and
+                buf[2] == 0x67 and
+                buf[3] == 0x53)
+
+
+class Flac(Type):
+    """
+    Implements the FLAC audio type matcher.
+    """
+    MIME = 'audio/x-flac'
+    EXTENSION = 'flac'
+
+    def __init__(self):
+        super(Flac, self).__init__(
+            mime=Flac.MIME,
+            extension=Flac.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x66 and
+                buf[1] == 0x4C and
+                buf[2] == 0x61 and
+                buf[3] == 0x43)
+
+
+class Wav(Type):
+    """
+    Implements the WAV audio type matcher.
+    """
+    MIME = 'audio/x-wav'
+    EXTENSION = 'wav'
+
+    def __init__(self):
+        super(Wav, self).__init__(
+            mime=Wav.MIME,
+            extension=Wav.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 11 and
+                buf[0] == 0x52 and
+                buf[1] == 0x49 and
+                buf[2] == 0x46 and
+                buf[3] == 0x46 and
+                buf[8] == 0x57 and
+                buf[9] == 0x41 and
+                buf[10] == 0x56 and
+                buf[11] == 0x45)
+
+
+class Amr(Type):
+    """
+    Implements the AMR audio type matcher.
+    """
+    MIME = 'audio/amr'
+    EXTENSION = 'amr'
+
+    def __init__(self):
+        super(Amr, self).__init__(
+            mime=Amr.MIME,
+            extension=Amr.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 11 and
+                buf[0] == 0x23 and
+                buf[1] == 0x21 and
+                buf[2] == 0x41 and
+                buf[3] == 0x4D and
+                buf[4] == 0x52 and
+                buf[5] == 0x0A)
+
+
+class Aac(Type):
+    """Implements the Aac audio type matcher."""
+
+    MIME = 'audio/aac'
+    EXTENSION = 'aac'
+
+    def __init__(self):
+        super(Aac, self).__init__(
+            mime=Aac.MIME,
+            extension=Aac.EXTENSION
+        )
+
+    def match(self, buf):
+        return (buf[:2] == bytearray([0xff, 0xf1]) or
+                buf[:2] == bytearray([0xff, 0xf9]))
+
+
+class Aiff(Type):
+    """
+    Implements the AIFF audio type matcher.
+    """
+    MIME = 'audio/x-aiff'
+    EXTENSION = 'aiff'
+
+    def __init__(self):
+        super(Aiff, self).__init__(
+            mime=Aiff.MIME,
+            extension=Aiff.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 11 and
+                buf[0] == 0x46 and
+                buf[1] == 0x4F and
+                buf[2] == 0x52 and
+                buf[3] == 0x4D and
+                buf[8] == 0x41 and
+                buf[9] == 0x49 and
+                buf[10] == 0x46 and
+                buf[11] == 0x46)
diff --git a/libs/filetype/types/base.py b/libs/filetype/types/base.py
new file mode 100644
index 000000000..7c0c0d26d
--- /dev/null
+++ b/libs/filetype/types/base.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+
+class Type(object):
+    """
+    Represents the file type object inherited by
+    specific file type matchers.
+    Provides convenient accessor and helper methods.
+    """
+    def __init__(self, mime, extension):
+        self.__mime = mime
+        self.__extension = extension
+
+    @property
+    def mime(self):
+        return self.__mime
+
+    @property
+    def extension(self):
+        return self.__extension
+
+    def is_extension(self, extension):
+        return self.__extension is extension
+
+    def is_mime(self, mime):
+        return self.__mime is mime
+
+    def match(self, buf):
+        raise NotImplementedError
diff --git a/libs/filetype/types/document.py b/libs/filetype/types/document.py
new file mode 100644
index 000000000..9f57e98c4
--- /dev/null
+++ b/libs/filetype/types/document.py
@@ -0,0 +1,256 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+
+
+class ZippedDocumentBase(Type):
+    def match(self, buf):
+        # start by checking for ZIP local file header signature
+        idx = self.search_signature(buf, 0, 6000)
+        if idx != 0:
+            return
+
+        return self.match_document(buf)
+
+    def match_document(self, buf):
+        raise NotImplementedError
+
+    def compare_bytes(self, buf, subslice, start_offset):
+        sl = len(subslice)
+
+        if start_offset + sl > len(buf):
+            return False
+
+        return buf[start_offset:start_offset + sl] == subslice
+
+    def search_signature(self, buf, start, rangeNum):
+        signature = b"PK\x03\x04"
+        length = len(buf)
+
+        end = start + rangeNum
+        end = length if end > length else end
+
+        if start >= end:
+            return -1
+
+        try:
+            return buf.index(signature, start, end)
+        except ValueError:
+            return -1
+
+
+class OpenDocument(ZippedDocumentBase):
+    def match_document(self, buf):
+        # Check if first file in archive is the identifying file
+        if not self.compare_bytes(buf, b"mimetype", 0x1E):
+            return
+
+        # Check content of mimetype file if it matches current mime
+        return self.compare_bytes(buf, bytes(self.mime, "ASCII"), 0x26)
+
+
+class OfficeOpenXml(ZippedDocumentBase):
+    def match_document(self, buf):
+        # Check if first file in archive is the identifying file
+        ft = self.match_filename(buf, 0x1E)
+        if ft:
+            return ft
+
+        # Otherwise check that the fist file is one of these
+        if (
+            not self.compare_bytes(buf, b"[Content_Types].xml", 0x1E)
+            and not self.compare_bytes(buf, b"_rels/.rels", 0x1E)
+            and not self.compare_bytes(buf, b"docProps", 0x1E)
+        ):
+            return
+
+        # Loop through next 3 files and check if they match
+        # NOTE: OpenOffice/Libreoffice orders ZIP entry differently, so check the 4th file
+        # https://github.com/h2non/filetype/blob/d730d98ad5c990883148485b6fd5adbdd378364a/matchers/document.go#L134
+        idx = 0
+        for i in range(4):
+            # Search for next file header
+            idx = self.search_signature(buf, idx + 4, 6000)
+            if idx == -1:
+                return
+
+            # Filename is at file header + 30
+            ft = self.match_filename(buf, idx + 30)
+            if ft:
+                return ft
+
+    def match_filename(self, buf, offset):
+        if self.compare_bytes(buf, b"word/", offset):
+            return (
+                self.mime
+                == "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            )
+        if self.compare_bytes(buf, b"ppt/", offset):
+            return (
+                self.mime
+                == "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+            )
+        if self.compare_bytes(buf, b"xl/", offset):
+            return (
+                self.mime
+                == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+            )
+
+
+class Doc(Type):
+    """
+    Implements the Microsoft Word (Office 97-2003) document type matcher.
+    """
+
+    MIME = "application/msword"
+    EXTENSION = "doc"
+
+    def __init__(self):
+        super(Doc, self).__init__(mime=Doc.MIME, extension=Doc.EXTENSION)
+
+    def match(self, buf):
+        if len(buf) > 515 and buf[0:8] == b"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1":
+            if buf[512:516] == b"\xEC\xA5\xC1\x00":
+                return True
+            if (
+                len(buf) > 2142
+                and b"\x00\x0A\x00\x00\x00MSWordDoc\x00\x10\x00\x00\x00Word.Document.8\x00\xF49\xB2q"
+                in buf[2075:2142]
+            ):
+                return True
+
+        return False
+
+
+class Docx(OfficeOpenXml):
+    """
+    Implements the Microsoft Word OOXML (Office 2007+) document type matcher.
+    """
+
+    MIME = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+    EXTENSION = "docx"
+
+    def __init__(self):
+        super(Docx, self).__init__(mime=Docx.MIME, extension=Docx.EXTENSION)
+
+
+class Odt(OpenDocument):
+    """
+    Implements the OpenDocument Text document type matcher.
+    """
+
+    MIME = "application/vnd.oasis.opendocument.text"
+    EXTENSION = "odt"
+
+    def __init__(self):
+        super(Odt, self).__init__(mime=Odt.MIME, extension=Odt.EXTENSION)
+
+
+class Xls(Type):
+    """
+    Implements the Microsoft Excel (Office 97-2003) document type matcher.
+    """
+
+    MIME = "application/vnd.ms-excel"
+    EXTENSION = "xls"
+
+    def __init__(self):
+        super(Xls, self).__init__(mime=Xls.MIME, extension=Xls.EXTENSION)
+
+    def match(self, buf):
+        if len(buf) > 520 and buf[0:8] == b"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1":
+            if buf[512:516] == b"\xFD\xFF\xFF\xFF" and (
+                buf[518] == 0x00 or buf[518] == 0x02
+            ):
+                return True
+            if buf[512:520] == b"\x09\x08\x10\x00\x00\x06\x05\x00":
+                return True
+            if (
+                len(buf) > 2095
+                and b"\xE2\x00\x00\x00\x5C\x00\x70\x00\x04\x00\x00Calc"
+                in buf[1568:2095]
+            ):
+                return True
+
+        return False
+
+
+class Xlsx(OfficeOpenXml):
+    """
+    Implements the Microsoft Excel OOXML (Office 2007+) document type matcher.
+    """
+
+    MIME = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    EXTENSION = "xlsx"
+
+    def __init__(self):
+        super(Xlsx, self).__init__(mime=Xlsx.MIME, extension=Xlsx.EXTENSION)
+
+
+class Ods(OpenDocument):
+    """
+    Implements the OpenDocument Spreadsheet document type matcher.
+    """
+
+    MIME = "application/vnd.oasis.opendocument.spreadsheet"
+    EXTENSION = "ods"
+
+    def __init__(self):
+        super(Ods, self).__init__(mime=Ods.MIME, extension=Ods.EXTENSION)
+
+
+class Ppt(Type):
+    """
+    Implements the Microsoft PowerPoint (Office 97-2003) document type matcher.
+    """
+
+    MIME = "application/vnd.ms-powerpoint"
+    EXTENSION = "ppt"
+
+    def __init__(self):
+        super(Ppt, self).__init__(mime=Ppt.MIME, extension=Ppt.EXTENSION)
+
+    def match(self, buf):
+        if len(buf) > 524 and buf[0:8] == b"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1":
+            if buf[512:516] == b"\xA0\x46\x1D\xF0":
+                return True
+            if buf[512:516] == b"\x00\x6E\x1E\xF0":
+                return True
+            if buf[512:516] == b"\x0F\x00\xE8\x03":
+                return True
+            if buf[512:516] == b"\xFD\xFF\xFF\xFF" and buf[522:524] == b"\x00\x00":
+                return True
+            if (
+                len(buf) > 2096
+                and buf[2072:2096]
+                == b"\x00\xB9\x29\xE8\x11\x00\x00\x00MS PowerPoint 97"
+            ):
+                return True
+
+        return False
+
+
+class Pptx(OfficeOpenXml):
+    """
+    Implements the Microsoft PowerPoint OOXML (Office 2007+) document type matcher.
+    """
+
+    MIME = "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+    EXTENSION = "pptx"
+
+    def __init__(self):
+        super(Pptx, self).__init__(mime=Pptx.MIME, extension=Pptx.EXTENSION)
+
+
+class Odp(OpenDocument):
+    """
+    Implements the OpenDocument Presentation document type matcher.
+    """
+
+    MIME = "application/vnd.oasis.opendocument.presentation"
+    EXTENSION = "odp"
+
+    def __init__(self):
+        super(Odp, self).__init__(mime=Odp.MIME, extension=Odp.EXTENSION)
diff --git a/libs/filetype/types/font.py b/libs/filetype/types/font.py
new file mode 100644
index 000000000..461f5c44c
--- /dev/null
+++ b/libs/filetype/types/font.py
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+
+
+class Woff(Type):
+    """
+    Implements the WOFF font type matcher.
+    """
+    MIME = 'application/font-woff'
+    EXTENSION = 'woff'
+
+    def __init__(self):
+        super(Woff, self).__init__(
+            mime=Woff.MIME,
+            extension=Woff.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 7 and
+                buf[0] == 0x77 and
+                buf[1] == 0x4F and
+                buf[2] == 0x46 and
+                buf[3] == 0x46 and
+                ((buf[4] == 0x00 and
+                  buf[5] == 0x01 and
+                  buf[6] == 0x00 and
+                  buf[7] == 0x00) or
+                 (buf[4] == 0x4F and
+                  buf[5] == 0x54 and
+                  buf[6] == 0x54 and
+                  buf[7] == 0x4F) or
+                 (buf[4] == 0x74 and
+                  buf[5] == 0x72 and
+                  buf[6] == 0x75 and
+                  buf[7] == 0x65)))
+
+
+class Woff2(Type):
+    """
+    Implements the WOFF2 font type matcher.
+    """
+    MIME = 'application/font-woff'
+    EXTENSION = 'woff2'
+
+    def __init__(self):
+        super(Woff2, self).__init__(
+            mime=Woff2.MIME,
+            extension=Woff2.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 7 and
+                buf[0] == 0x77 and
+                buf[1] == 0x4F and
+                buf[2] == 0x46 and
+                buf[3] == 0x32 and
+                ((buf[4] == 0x00 and
+                  buf[5] == 0x01 and
+                  buf[6] == 0x00 and
+                  buf[7] == 0x00) or
+                 (buf[4] == 0x4F and
+                  buf[5] == 0x54 and
+                  buf[6] == 0x54 and
+                  buf[7] == 0x4F) or
+                 (buf[4] == 0x74 and
+                  buf[5] == 0x72 and
+                  buf[6] == 0x75 and
+                  buf[7] == 0x65)))
+
+
+class Ttf(Type):
+    """
+    Implements the TTF font type matcher.
+    """
+    MIME = 'application/font-sfnt'
+    EXTENSION = 'ttf'
+
+    def __init__(self):
+        super(Ttf, self).__init__(
+            mime=Ttf.MIME,
+            extension=Ttf.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 4 and
+                buf[0] == 0x00 and
+                buf[1] == 0x01 and
+                buf[2] == 0x00 and
+                buf[3] == 0x00 and
+                buf[4] == 0x00)
+
+
+class Otf(Type):
+    """
+    Implements the OTF font type matcher.
+    """
+    MIME = 'application/font-sfnt'
+    EXTENSION = 'otf'
+
+    def __init__(self):
+        super(Otf, self).__init__(
+            mime=Otf.MIME,
+            extension=Otf.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 4 and
+                buf[0] == 0x4F and
+                buf[1] == 0x54 and
+                buf[2] == 0x54 and
+                buf[3] == 0x4F and
+                buf[4] == 0x00)
diff --git a/libs/filetype/types/image.py b/libs/filetype/types/image.py
new file mode 100644
index 000000000..2d4d269e1
--- /dev/null
+++ b/libs/filetype/types/image.py
@@ -0,0 +1,383 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+from .isobmff import IsoBmff
+
+
+class Jpeg(Type):
+    """
+    Implements the JPEG image type matcher.
+    """
+    MIME = 'image/jpeg'
+    EXTENSION = 'jpg'
+
+    def __init__(self):
+        super(Jpeg, self).__init__(
+            mime=Jpeg.MIME,
+            extension=Jpeg.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                buf[0] == 0xFF and
+                buf[1] == 0xD8 and
+                buf[2] == 0xFF)
+
+
+class Jpx(Type):
+    """
+    Implements the JPEG2000 image type matcher.
+    """
+
+    MIME = "image/jpx"
+    EXTENSION = "jpx"
+
+    def __init__(self):
+        super(Jpx, self).__init__(mime=Jpx.MIME, extension=Jpx.EXTENSION)
+
+    def match(self, buf):
+        return (
+            len(buf) > 50
+            and buf[0] == 0x00
+            and buf[1] == 0x00
+            and buf[2] == 0x00
+            and buf[3] == 0x0C
+            and buf[16:24] == b"ftypjp2 "
+        )
+
+
+class Apng(Type):
+    """
+    Implements the APNG image type matcher.
+    """
+    MIME = 'image/apng'
+    EXTENSION = 'apng'
+
+    def __init__(self):
+        super(Apng, self).__init__(
+            mime=Apng.MIME,
+            extension=Apng.EXTENSION
+        )
+
+    def match(self, buf):
+        if (len(buf) > 8 and
+           buf[:8] == bytearray([0x89, 0x50, 0x4e, 0x47,
+                                 0x0d, 0x0a, 0x1a, 0x0a])):
+            # cursor in buf, skip already readed 8 bytes
+            i = 8
+            while len(buf) > i:
+                data_length = int.from_bytes(buf[i:i+4], byteorder="big")
+                i += 4
+
+                chunk_type = buf[i:i+4].decode("ascii", errors='ignore')
+                i += 4
+
+                # acTL chunk in APNG should appears first than IDAT
+                # IEND is end of PNG
+                if (chunk_type == "IDAT" or chunk_type == "IEND"):
+                    return False
+                elif (chunk_type == "acTL"):
+                    return True
+
+                # move to the next chunk by skipping data and crc (4 bytes)
+                i += data_length + 4
+
+        return False
+
+
+class Png(Type):
+    """
+    Implements the PNG image type matcher.
+    """
+    MIME = 'image/png'
+    EXTENSION = 'png'
+
+    def __init__(self):
+        super(Png, self).__init__(
+            mime=Png.MIME,
+            extension=Png.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x89 and
+                buf[1] == 0x50 and
+                buf[2] == 0x4E and
+                buf[3] == 0x47)
+
+
+class Gif(Type):
+    """
+    Implements the GIF image type matcher.
+    """
+    MIME = 'image/gif'
+    EXTENSION = 'gif'
+
+    def __init__(self):
+        super(Gif, self).__init__(
+            mime=Gif.MIME,
+            extension=Gif.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                buf[0] == 0x47 and
+                buf[1] == 0x49 and
+                buf[2] == 0x46)
+
+
+class Webp(Type):
+    """
+    Implements the WEBP image type matcher.
+    """
+    MIME = 'image/webp'
+    EXTENSION = 'webp'
+
+    def __init__(self):
+        super(Webp, self).__init__(
+            mime=Webp.MIME,
+            extension=Webp.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 13 and
+                buf[0] == 0x52 and
+                buf[1] == 0x49 and
+                buf[2] == 0x46 and
+                buf[3] == 0x46 and
+                buf[8] == 0x57 and
+                buf[9] == 0x45 and
+                buf[10] == 0x42 and
+                buf[11] == 0x50 and
+                buf[12] == 0x56 and
+                buf[13] == 0x50)
+
+
+class Cr2(Type):
+    """
+    Implements the CR2 image type matcher.
+    """
+    MIME = 'image/x-canon-cr2'
+    EXTENSION = 'cr2'
+
+    def __init__(self):
+        super(Cr2, self).__init__(
+            mime=Cr2.MIME,
+            extension=Cr2.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 9 and
+                ((buf[0] == 0x49 and buf[1] == 0x49 and
+                    buf[2] == 0x2A and buf[3] == 0x0) or
+                (buf[0] == 0x4D and buf[1] == 0x4D and
+                    buf[2] == 0x0 and buf[3] == 0x2A)) and
+                buf[8] == 0x43 and buf[9] == 0x52)
+
+
+class Tiff(Type):
+    """
+    Implements the TIFF image type matcher.
+    """
+    MIME = 'image/tiff'
+    EXTENSION = 'tif'
+
+    def __init__(self):
+        super(Tiff, self).__init__(
+            mime=Tiff.MIME,
+            extension=Tiff.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 9 and
+                ((buf[0] == 0x49 and buf[1] == 0x49 and
+                    buf[2] == 0x2A and buf[3] == 0x0) or
+                (buf[0] == 0x4D and buf[1] == 0x4D and
+                    buf[2] == 0x0 and buf[3] == 0x2A))
+                and not (buf[8] == 0x43 and buf[9] == 0x52))
+
+
+class Bmp(Type):
+    """
+    Implements the BMP image type matcher.
+    """
+    MIME = 'image/bmp'
+    EXTENSION = 'bmp'
+
+    def __init__(self):
+        super(Bmp, self).__init__(
+            mime=Bmp.MIME,
+            extension=Bmp.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 1 and
+                buf[0] == 0x42 and
+                buf[1] == 0x4D)
+
+
+class Jxr(Type):
+    """
+    Implements the JXR image type matcher.
+    """
+    MIME = 'image/vnd.ms-photo'
+    EXTENSION = 'jxr'
+
+    def __init__(self):
+        super(Jxr, self).__init__(
+            mime=Jxr.MIME,
+            extension=Jxr.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 2 and
+                buf[0] == 0x49 and
+                buf[1] == 0x49 and
+                buf[2] == 0xBC)
+
+
+class Psd(Type):
+    """
+    Implements the PSD image type matcher.
+    """
+    MIME = 'image/vnd.adobe.photoshop'
+    EXTENSION = 'psd'
+
+    def __init__(self):
+        super(Psd, self).__init__(
+            mime=Psd.MIME,
+            extension=Psd.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x38 and
+                buf[1] == 0x42 and
+                buf[2] == 0x50 and
+                buf[3] == 0x53)
+
+
+class Ico(Type):
+    """
+    Implements the ICO image type matcher.
+    """
+    MIME = 'image/x-icon'
+    EXTENSION = 'ico'
+
+    def __init__(self):
+        super(Ico, self).__init__(
+            mime=Ico.MIME,
+            extension=Ico.EXTENSION,
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x00 and
+                buf[1] == 0x00 and
+                buf[2] == 0x01 and
+                buf[3] == 0x00)
+
+
+class Heic(IsoBmff):
+    """
+    Implements the HEIC image type matcher.
+    """
+    MIME = 'image/heic'
+    EXTENSION = 'heic'
+
+    def __init__(self):
+        super(Heic, self).__init__(
+            mime=Heic.MIME,
+            extension=Heic.EXTENSION
+        )
+
+    def match(self, buf):
+        if not self._is_isobmff(buf):
+            return False
+
+        major_brand, minor_version, compatible_brands = self._get_ftyp(buf)
+        if major_brand == 'heic':
+            return True
+        if major_brand in ['mif1', 'msf1'] and 'heic' in compatible_brands:
+            return True
+        return False
+
+
+class Dcm(Type):
+
+    MIME = 'application/dicom'
+    EXTENSION = 'dcm'
+    OFFSET = 128
+
+    def __init__(self):
+        super(Dcm, self).__init__(
+            mime=Dcm.MIME,
+            extension=Dcm.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > Dcm.OFFSET + 4 and
+                buf[Dcm.OFFSET + 0] == 0x44 and
+                buf[Dcm.OFFSET + 1] == 0x49 and
+                buf[Dcm.OFFSET + 2] == 0x43 and
+                buf[Dcm.OFFSET + 3] == 0x4D)
+
+
+class Dwg(Type):
+    """Implements the Dwg image type matcher."""
+
+    MIME = 'image/vnd.dwg'
+    EXTENSION = 'dwg'
+
+    def __init__(self):
+        super(Dwg, self).__init__(
+            mime=Dwg.MIME,
+            extension=Dwg.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:4] == bytearray([0x41, 0x43, 0x31, 0x30])
+
+
+class Xcf(Type):
+    """Implements the Xcf image type matcher."""
+
+    MIME = 'image/x-xcf'
+    EXTENSION = 'xcf'
+
+    def __init__(self):
+        super(Xcf, self).__init__(
+            mime=Xcf.MIME,
+            extension=Xcf.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:10] == bytearray([0x67, 0x69, 0x6d, 0x70, 0x20,
+                                      0x78, 0x63, 0x66, 0x20, 0x76])
+
+
+class Avif(IsoBmff):
+    """
+    Implements the AVIF image type matcher.
+    """
+    MIME = 'image/avif'
+    EXTENSION = 'avif'
+
+    def __init__(self):
+        super(Avif, self).__init__(
+            mime=Avif.MIME,
+            extension=Avif.EXTENSION
+        )
+
+    def match(self, buf):
+        if not self._is_isobmff(buf):
+            return False
+
+        major_brand, minor_version, compatible_brands = self._get_ftyp(buf)
+        if major_brand == 'avif':
+            return True
+        if major_brand in ['mif1', 'msf1'] and 'avif' in compatible_brands:
+            return True
+        return False
diff --git a/libs/filetype/types/isobmff.py b/libs/filetype/types/isobmff.py
new file mode 100644
index 000000000..2ac0ffe87
--- /dev/null
+++ b/libs/filetype/types/isobmff.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+import codecs
+
+from .base import Type
+
+
+class IsoBmff(Type):
+    """
+    Implements the ISO-BMFF base type.
+    """
+    def __init__(self, mime, extension):
+        super(IsoBmff, self).__init__(
+            mime=mime,
+            extension=extension
+        )
+
+    def _is_isobmff(self, buf):
+        if len(buf) < 16 or buf[4:8] != b'ftyp':
+            return False
+        if len(buf) < int(codecs.encode(buf[0:4], 'hex'), 16):
+            return False
+        return True
+
+    def _get_ftyp(self, buf):
+        ftyp_len = int(codecs.encode(buf[0:4], 'hex'), 16)
+        major_brand = buf[8:12].decode(errors='ignore')
+        minor_version = int(codecs.encode(buf[12:16], 'hex'), 16)
+        compatible_brands = []
+        for i in range(16, ftyp_len, 4):
+            compatible_brands.append(buf[i:i+4].decode(errors='ignore'))
+
+        return major_brand, minor_version, compatible_brands
diff --git a/libs/filetype/types/video.py b/libs/filetype/types/video.py
new file mode 100644
index 000000000..336b25264
--- /dev/null
+++ b/libs/filetype/types/video.py
@@ -0,0 +1,223 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import
+
+from .base import Type
+from .isobmff import IsoBmff
+
+
+class Mp4(IsoBmff):
+    """
+    Implements the MP4 video type matcher.
+    """
+    MIME = 'video/mp4'
+    EXTENSION = 'mp4'
+
+    def __init__(self):
+        super(Mp4, self).__init__(
+            mime=Mp4.MIME,
+            extension=Mp4.EXTENSION
+        )
+
+    def match(self, buf):
+        if not self._is_isobmff(buf):
+            return False
+
+        major_brand, minor_version, compatible_brands = self._get_ftyp(buf)
+        for brand in compatible_brands:
+            if brand in ['mp41', 'mp42', 'isom']:
+                return True
+        return major_brand in ['mp41', 'mp42', 'isom']
+
+
+class M4v(Type):
+    """
+    Implements the M4V video type matcher.
+    """
+    MIME = 'video/x-m4v'
+    EXTENSION = 'm4v'
+
+    def __init__(self):
+        super(M4v, self).__init__(
+            mime=M4v.MIME,
+            extension=M4v.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 10 and
+                buf[0] == 0x0 and buf[1] == 0x0 and
+                buf[2] == 0x0 and buf[3] == 0x1C and
+                buf[4] == 0x66 and buf[5] == 0x74 and
+                buf[6] == 0x79 and buf[7] == 0x70 and
+                buf[8] == 0x4D and buf[9] == 0x34 and
+                buf[10] == 0x56)
+
+
+class Mkv(Type):
+    """
+    Implements the MKV video type matcher.
+    """
+    MIME = 'video/x-matroska'
+    EXTENSION = 'mkv'
+
+    def __init__(self):
+        super(Mkv, self).__init__(
+            mime=Mkv.MIME,
+            extension=Mkv.EXTENSION
+        )
+
+    def match(self, buf):
+        contains_ebml_element = buf.startswith(b'\x1A\x45\xDF\xA3')
+        contains_doctype_element = buf.find(b'\x42\x82\x88matroska') > -1
+        return contains_ebml_element and contains_doctype_element
+
+
+class Webm(Type):
+    """
+    Implements the WebM video type matcher.
+    """
+    MIME = 'video/webm'
+    EXTENSION = 'webm'
+
+    def __init__(self):
+        super(Webm, self).__init__(
+            mime=Webm.MIME,
+            extension=Webm.EXTENSION
+        )
+
+    def match(self, buf):
+        contains_ebml_element = buf.startswith(b'\x1A\x45\xDF\xA3')
+        contains_doctype_element = buf.find(b'\x42\x82\x84webm') > -1
+        return contains_ebml_element and contains_doctype_element
+
+
+class Mov(IsoBmff):
+    """
+    Implements the MOV video type matcher.
+    """
+    MIME = 'video/quicktime'
+    EXTENSION = 'mov'
+
+    def __init__(self):
+        super(Mov, self).__init__(
+            mime=Mov.MIME,
+            extension=Mov.EXTENSION
+        )
+
+    def match(self, buf):
+        if not self._is_isobmff(buf):
+            return False
+
+        major_brand, minor_version, compatible_brands = self._get_ftyp(buf)
+        return major_brand == 'qt  '
+
+
+class Avi(Type):
+    """
+    Implements the AVI video type matcher.
+    """
+    MIME = 'video/x-msvideo'
+    EXTENSION = 'avi'
+
+    def __init__(self):
+        super(Avi, self).__init__(
+            mime=Avi.MIME,
+            extension=Avi.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 11 and
+                buf[0] == 0x52 and
+                buf[1] == 0x49 and
+                buf[2] == 0x46 and
+                buf[3] == 0x46 and
+                buf[8] == 0x41 and
+                buf[9] == 0x56 and
+                buf[10] == 0x49 and
+                buf[11] == 0x20)
+
+
+class Wmv(Type):
+    """
+    Implements the WMV video type matcher.
+    """
+    MIME = 'video/x-ms-wmv'
+    EXTENSION = 'wmv'
+
+    def __init__(self):
+        super(Wmv, self).__init__(
+            mime=Wmv.MIME,
+            extension=Wmv.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 9 and
+                buf[0] == 0x30 and
+                buf[1] == 0x26 and
+                buf[2] == 0xB2 and
+                buf[3] == 0x75 and
+                buf[4] == 0x8E and
+                buf[5] == 0x66 and
+                buf[6] == 0xCF and
+                buf[7] == 0x11 and
+                buf[8] == 0xA6 and
+                buf[9] == 0xD9)
+
+
+class Flv(Type):
+    """
+    Implements the FLV video type matcher.
+    """
+    MIME = 'video/x-flv'
+    EXTENSION = 'flv'
+
+    def __init__(self):
+        super(Flv, self).__init__(
+            mime=Flv.MIME,
+            extension=Flv.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x46 and
+                buf[1] == 0x4C and
+                buf[2] == 0x56 and
+                buf[3] == 0x01)
+
+
+class Mpeg(Type):
+    """
+    Implements the MPEG video type matcher.
+    """
+    MIME = 'video/mpeg'
+    EXTENSION = 'mpg'
+
+    def __init__(self):
+        super(Mpeg, self).__init__(
+            mime=Mpeg.MIME,
+            extension=Mpeg.EXTENSION
+        )
+
+    def match(self, buf):
+        return (len(buf) > 3 and
+                buf[0] == 0x0 and
+                buf[1] == 0x0 and
+                buf[2] == 0x1 and
+                buf[3] >= 0xb0 and
+                buf[3] <= 0xbf)
+
+
+class M3gp(Type):
+    """Implements the 3gp image type matcher."""
+
+    MIME = 'video/3gpp'
+    EXTENSION = '3gp'
+
+    def __init__(self):
+        super(M3gp, self).__init__(
+            mime=M3gp.MIME,
+            extension=M3gp.EXTENSION
+        )
+
+    def match(self, buf):
+        return buf[:7] == bytearray([0x66, 0x74, 0x79, 0x70, 0x33, 0x67, 0x70])
diff --git a/libs/filetype/utils.py b/libs/filetype/utils.py
new file mode 100644
index 000000000..c954876a3
--- /dev/null
+++ b/libs/filetype/utils.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+# Python 2.7 workaround
+try:
+    import pathlib
+except ImportError:
+    pass
+
+
+_NUM_SIGNATURE_BYTES = 8192
+
+
+def get_signature_bytes(path):
+    """
+    Reads file from disk and returns the first 8192 bytes
+    of data representing the magic number header signature.
+
+    Args:
+        path: path string to file.
+
+    Returns:
+        First 8192 bytes of the file content as bytearray type.
+    """
+    with open(path, 'rb') as fp:
+        return bytearray(fp.read(_NUM_SIGNATURE_BYTES))
+
+
+def signature(array):
+    """
+    Returns the first 8192 bytes of the given bytearray
+    as part of the file header signature.
+
+    Args:
+        array: bytearray to extract the header signature.
+
+    Returns:
+        First 8192 bytes of the file content as bytearray type.
+    """
+    length = len(array)
+    index = _NUM_SIGNATURE_BYTES if length > _NUM_SIGNATURE_BYTES else length
+
+    return array[:index]
+
+
+def get_bytes(obj):
+    """
+    Infers the input type and reads the first 8192 bytes,
+    returning a sliced bytearray.
+
+    Args:
+        obj: path to readable, file-like object(with read() method), bytes,
+        bytearray or memoryview
+
+    Returns:
+        First 8192 bytes of the file content as bytearray type.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    if isinstance(obj, bytearray):
+        return signature(obj)
+
+    if isinstance(obj, str):
+        return get_signature_bytes(obj)
+
+    if isinstance(obj, bytes):
+        return signature(obj)
+
+    if isinstance(obj, memoryview):
+        return bytearray(signature(obj).tolist())
+
+    if isinstance(obj, pathlib.PurePath):
+        return get_signature_bytes(obj)
+
+    if hasattr(obj, 'read'):
+        if hasattr(obj, 'tell') and hasattr(obj, 'seek'):
+            start_pos = obj.tell()
+            obj.seek(0)
+            magic_bytes = obj.read(_NUM_SIGNATURE_BYTES)
+            obj.seek(start_pos)
+            return get_bytes(magic_bytes)
+        return get_bytes(obj.read(_NUM_SIGNATURE_BYTES))
+
+    raise TypeError('Unsupported type as file input: %s' % type(obj))
diff --git a/libs/ftfy-6.1.3.dist-info/INSTALLER b/libs/flask-3.0.3.dist-info/INSTALLER
similarity index 100%
rename from libs/ftfy-6.1.3.dist-info/INSTALLER
rename to libs/flask-3.0.3.dist-info/INSTALLER
diff --git a/libs/flask-3.0.2.dist-info/LICENSE.rst b/libs/flask-3.0.3.dist-info/LICENSE.txt
similarity index 100%
rename from libs/flask-3.0.2.dist-info/LICENSE.rst
rename to libs/flask-3.0.3.dist-info/LICENSE.txt
diff --git a/libs/flask-3.0.2.dist-info/METADATA b/libs/flask-3.0.3.dist-info/METADATA
similarity index 53%
rename from libs/flask-3.0.2.dist-info/METADATA
rename to libs/flask-3.0.3.dist-info/METADATA
index 71551b9ba..f6c57113c 100644
--- a/libs/flask-3.0.2.dist-info/METADATA
+++ b/libs/flask-3.0.3.dist-info/METADATA
@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: Flask
-Version: 3.0.2
+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/x-rst
+Description-Content-Type: text/markdown
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Flask
@@ -16,6 +16,7 @@ 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
@@ -28,18 +29,16 @@ 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: Issue Tracker, https://github.com/pallets/flask/issues/
-Project-URL: Source Code, https://github.com/pallets/flask/
+Project-URL: Source, https://github.com/pallets/flask/
 Provides-Extra: async
 Provides-Extra: dotenv
 
-Flask
-=====
+# Flask
 
-Flask is a lightweight `WSGI`_ web application framework. It is designed
+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
+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
@@ -47,70 +46,56 @@ 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/
+[WSGI]: https://wsgi.readthedocs.io/
+[Werkzeug]: https://werkzeug.palletsprojects.com/
+[Jinja]: https://jinja.palletsprojects.com/
 
 
-Installing
-----------
+## Installing
 
-Install and update using `pip`_:
+Install and update from [PyPI][] using an installer such as [pip][]:
 
-.. code-block:: text
+```
+$ pip install -U Flask
+```
 
-    $ pip install -U Flask
-
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
+[PyPI]: https://pypi.org/project/Flask/
+[pip]: https://pip.pypa.io/en/stable/getting-started/
 
 
-A Simple Example
-----------------
+## A Simple Example
 
-.. code-block:: python
+```python
+# save this as app.py
+from flask import Flask
 
-    # save this as app.py
-    from flask import Flask
+app = Flask(__name__)
 
-    app = Flask(__name__)
+@app.route("/")
+def hello():
+    return "Hello, World!"
+```
 
-    @app.route("/")
-    def hello():
-        return "Hello, World!"
-
-.. code-block:: text
-
-    $ flask run
-      * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+```
+$ flask run
+  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+```
 
 
-Contributing
-------------
+## Contributing
 
 For guidance on setting up a development environment and how to make a
-contribution to Flask, see the `contributing guidelines`_.
+contribution to Flask, see the [contributing guidelines][].
 
-.. _contributing guidelines: https://github.com/pallets/flask/blob/main/CONTRIBUTING.rst
+[contributing guidelines]: https://github.com/pallets/flask/blob/main/CONTRIBUTING.rst
 
 
-Donate
-------
+## 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`_.
+allow the maintainers to devote more time to the projects, [please
+donate today][].
 
-.. _please donate today: https://palletsprojects.com/donate
-
-
-Links
------
-
--   Documentation: https://flask.palletsprojects.com/
--   Changes: https://flask.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/Flask/
--   Source Code: https://github.com/pallets/flask/
--   Issue Tracker: https://github.com/pallets/flask/issues/
--   Chat: https://discord.gg/pallets
+[please donate today]: https://palletsprojects.com/donate
 
diff --git a/libs/flask-3.0.2.dist-info/RECORD b/libs/flask-3.0.3.dist-info/RECORD
similarity index 58%
rename from libs/flask-3.0.2.dist-info/RECORD
rename to libs/flask-3.0.3.dist-info/RECORD
index 4091f230c..3d0eb0680 100644
--- a/libs/flask-3.0.2.dist-info/RECORD
+++ b/libs/flask-3.0.3.dist-info/RECORD
@@ -1,31 +1,31 @@
 ../../bin/flask,sha256=mkfqP1bdu7Q1Kux98Y6YmUcCGO8FyMAkRMD3_v5My8s,231
-flask-3.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-flask-3.0.2.dist-info/LICENSE.rst,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
-flask-3.0.2.dist-info/METADATA,sha256=5SsBudAoun3E_3ZSRXJLB2V3NAdALovsQMKUvzqcJfM,3588
-flask-3.0.2.dist-info/RECORD,,
-flask-3.0.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask-3.0.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-flask-3.0.2.dist-info/entry_points.txt,sha256=bBP7hTOS5fz9zLtC7sPofBZAlMkEvBxu7KqS6l5lvc4,40
+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=TQfhvSlv1QpaPHeeRz_Ke7JmiSFMMHT-rJR4tqsEHdc,59706
-flask/blueprints.py,sha256=H7u4HzNn--riGMTt5GkxUHpYRzCav-WDGSKNnBSEMcU,3160
-flask/cli.py,sha256=eegT_64cSOqaKOwI_Am3XwaCSJPZ9UEJ6EmSL0qg8xg,35833
-flask/config.py,sha256=QiL9KkQT8RWc0HU2AE26Yw5mdOkNsKv8TEFEbXkqhJk,13328
+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=aXslvQyO4QpxviWJqxhyOj0CCQKlYXq1r0H9DKqiEY8,9280
+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=ZF0Yy610NKSpdJ1d6qtG4L2RkCmzngu0G9FFXZf4O_M,38209
+flask/sansio/app.py,sha256=YG5Gf7JVf1c0yccWDZ86q5VSfJUidOVp27HFxFNxC7U,38053
 flask/sansio/blueprints.py,sha256=Tqe-7EkZ-tbWchm8iDoCfD848f0_3nLv6NNjeIPvHwM,24637
-flask/sansio/scaffold.py,sha256=9SSSC6A_zzXhcEVYf9wkrKx2r4uDqfIWsnRNYSvDclU,30879
-flask/sessions.py,sha256=bIpZRwiTfnYJn3ikVnCPcF2kNtyRz0dfpsuMADIpSJc,14518
+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
diff --git a/libs/ftfy-6.1.3.dist-info/REQUESTED b/libs/flask-3.0.3.dist-info/REQUESTED
similarity index 100%
rename from libs/ftfy-6.1.3.dist-info/REQUESTED
rename to libs/flask-3.0.3.dist-info/REQUESTED
diff --git a/libs/pygments-2.17.2.dist-info/WHEEL b/libs/flask-3.0.3.dist-info/WHEEL
similarity index 67%
rename from libs/pygments-2.17.2.dist-info/WHEEL
rename to libs/flask-3.0.3.dist-info/WHEEL
index 5998f3aab..e3c6feefa 100644
--- a/libs/pygments-2.17.2.dist-info/WHEEL
+++ b/libs/flask-3.0.3.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/flask-3.0.2.dist-info/entry_points.txt b/libs/flask-3.0.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/flask-3.0.2.dist-info/entry_points.txt
rename to libs/flask-3.0.3.dist-info/entry_points.txt
diff --git a/libs/flask/app.py b/libs/flask/app.py
index 12ac50d49..7622b5e83 100644
--- a/libs/flask/app.py
+++ b/libs/flask/app.py
@@ -241,6 +241,16 @@ class Flask(App):
             root_path=root_path,
         )
 
+        #: The Click command group for registering CLI commands for this
+        #: object. The commands are available from the ``flask`` command
+        #: once the application has been discovered and blueprints have
+        #: been registered.
+        self.cli = cli.AppGroup()
+
+        # Set the name of the Click group in case someone wants to add
+        # the app's commands to another CLI tool.
+        self.cli.name = self.name
+
         # Add a static route using the provided static_url_path, static_host,
         # and static_folder if there is a configured static_folder.
         # Note we do this without checking if static_folder exists.
diff --git a/libs/flask/blueprints.py b/libs/flask/blueprints.py
index 52859b855..aa9eacf21 100644
--- a/libs/flask/blueprints.py
+++ b/libs/flask/blueprints.py
@@ -4,16 +4,54 @@ import os
 import typing as t
 from datetime import timedelta
 
+from .cli import AppGroup
 from .globals import current_app
 from .helpers import send_from_directory
 from .sansio.blueprints import Blueprint as SansioBlueprint
 from .sansio.blueprints import BlueprintSetupState as BlueprintSetupState  # noqa
+from .sansio.scaffold import _sentinel
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from .wrappers import Response
 
 
 class Blueprint(SansioBlueprint):
+    def __init__(
+        self,
+        name: str,
+        import_name: str,
+        static_folder: str | os.PathLike[str] | None = None,
+        static_url_path: str | None = None,
+        template_folder: str | os.PathLike[str] | None = None,
+        url_prefix: str | None = None,
+        subdomain: str | None = None,
+        url_defaults: dict[str, t.Any] | None = None,
+        root_path: str | None = None,
+        cli_group: str | None = _sentinel,  # type: ignore
+    ) -> None:
+        super().__init__(
+            name,
+            import_name,
+            static_folder,
+            static_url_path,
+            template_folder,
+            url_prefix,
+            subdomain,
+            url_defaults,
+            root_path,
+            cli_group,
+        )
+
+        #: The Click command group for registering CLI commands for this
+        #: object. The commands are available from the ``flask`` command
+        #: once the application has been discovered and blueprints have
+        #: been registered.
+        self.cli = AppGroup()
+
+        # Set the name of the Click group in case someone wants to add
+        # the app's commands to another CLI tool.
+        self.cli.name = self.name
+
     def get_send_file_max_age(self, filename: str | None) -> int | None:
         """Used by :func:`send_file` to determine the ``max_age`` cache
         value for a given file path if it wasn't passed.
diff --git a/libs/flask/cli.py b/libs/flask/cli.py
index d4df2802b..ecb292a01 100644
--- a/libs/flask/cli.py
+++ b/libs/flask/cli.py
@@ -229,15 +229,13 @@ def prepare_import(path: str) -> str:
 @t.overload
 def locate_app(
     module_name: str, app_name: str | None, raise_if_not_found: t.Literal[True] = True
-) -> Flask:
-    ...
+) -> Flask: ...
 
 
 @t.overload
 def locate_app(
     module_name: str, app_name: str | None, raise_if_not_found: t.Literal[False] = ...
-) -> Flask | None:
-    ...
+) -> Flask | None: ...
 
 
 def locate_app(
diff --git a/libs/flask/config.py b/libs/flask/config.py
index f2f414780..7e3ba1790 100644
--- a/libs/flask/config.py
+++ b/libs/flask/config.py
@@ -27,12 +27,10 @@ class ConfigAttribute(t.Generic[T]):
         self.get_converter = get_converter
 
     @t.overload
-    def __get__(self, obj: None, owner: None) -> te.Self:
-        ...
+    def __get__(self, obj: None, owner: None) -> te.Self: ...
 
     @t.overload
-    def __get__(self, obj: App, owner: type[App]) -> T:
-        ...
+    def __get__(self, obj: App, owner: type[App]) -> T: ...
 
     def __get__(self, obj: App | None, owner: type[App] | None = None) -> T | te.Self:
         if obj is None:
diff --git a/libs/flask/json/tag.py b/libs/flask/json/tag.py
index 2bb986bc8..8dc3629bf 100644
--- a/libs/flask/json/tag.py
+++ b/libs/flask/json/tag.py
@@ -40,6 +40,7 @@ be processed before ``dict``.
 
     app.session_interface.serializer.register(TagOrderedDict, index=0)
 """
+
 from __future__ import annotations
 
 import typing as t
diff --git a/libs/flask/sansio/app.py b/libs/flask/sansio/app.py
index 21a79ba46..01fd5dbfa 100644
--- a/libs/flask/sansio/app.py
+++ b/libs/flask/sansio/app.py
@@ -410,10 +410,6 @@ class App(Scaffold):
         # request.
         self._got_first_request = False
 
-        # Set the name of the Click group in case someone wants to add
-        # the app's commands to another CLI tool.
-        self.cli.name = self.name
-
     def _check_setup_finished(self, f_name: str) -> None:
         if self._got_first_request:
             raise AssertionError(
diff --git a/libs/flask/sansio/scaffold.py b/libs/flask/sansio/scaffold.py
index 535570089..69e33a095 100644
--- a/libs/flask/sansio/scaffold.py
+++ b/libs/flask/sansio/scaffold.py
@@ -8,7 +8,6 @@ import typing as t
 from collections import defaultdict
 from functools import update_wrapper
 
-import click
 from jinja2 import BaseLoader
 from jinja2 import FileSystemLoader
 from werkzeug.exceptions import default_exceptions
@@ -16,10 +15,12 @@ from werkzeug.exceptions import HTTPException
 from werkzeug.utils import cached_property
 
 from .. import typing as ft
-from ..cli import AppGroup
 from ..helpers import get_root_path
 from ..templating import _default_template_ctx_processor
 
+if t.TYPE_CHECKING:  # pragma: no cover
+    from click import Group
+
 # a singleton sentinel value for parameter defaults
 _sentinel = object()
 
@@ -66,6 +67,7 @@ class Scaffold:
     .. versionadded:: 2.0
     """
 
+    cli: Group
     name: str
     _static_folder: str | None = None
     _static_url_path: str | None = None
@@ -97,12 +99,6 @@ class Scaffold:
         #: up resources contained in the package.
         self.root_path = root_path
 
-        #: The Click command group for registering CLI commands for this
-        #: object. The commands are available from the ``flask`` command
-        #: once the application has been discovered and blueprints have
-        #: been registered.
-        self.cli: click.Group = AppGroup()
-
         #: A dictionary mapping endpoint names to view functions.
         #:
         #: To register a view function, use the :meth:`route` decorator.
diff --git a/libs/flask/sessions.py b/libs/flask/sessions.py
index bb753eb81..ee19ad638 100644
--- a/libs/flask/sessions.py
+++ b/libs/flask/sessions.py
@@ -277,6 +277,14 @@ class SessionInterface:
 session_json_serializer = TaggedJSONSerializer()
 
 
+def _lazy_sha1(string: bytes = b"") -> t.Any:
+    """Don't access ``hashlib.sha1`` until runtime. FIPS builds may not include
+    SHA-1, in which case the import and use as a default would fail before the
+    developer can configure something else.
+    """
+    return hashlib.sha1(string)
+
+
 class SecureCookieSessionInterface(SessionInterface):
     """The default session interface that stores sessions in signed cookies
     through the :mod:`itsdangerous` module.
@@ -286,7 +294,7 @@ class SecureCookieSessionInterface(SessionInterface):
     #: signing of cookie based sessions.
     salt = "cookie-session"
     #: the hash function to use for the signature.  The default is sha1
-    digest_method = staticmethod(hashlib.sha1)
+    digest_method = staticmethod(_lazy_sha1)
     #: the name of the itsdangerous supported key derivation.  The default
     #: is hmac.
     key_derivation = "hmac"
diff --git a/libs/flask_cors/core.py b/libs/flask_cors/core.py
index 5358036c2..3fcc4d346 100644
--- a/libs/flask_cors/core.py
+++ b/libs/flask_cors/core.py
@@ -36,7 +36,7 @@ CONFIG_OPTIONS = ['CORS_ORIGINS', 'CORS_METHODS', 'CORS_ALLOW_HEADERS',
                   'CORS_MAX_AGE', 'CORS_SEND_WILDCARD',
                   'CORS_AUTOMATIC_OPTIONS', 'CORS_VARY_HEADER',
                   'CORS_RESOURCES', 'CORS_INTERCEPT_EXCEPTIONS',
-                  'CORS_ALWAYS_SEND']
+                  '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.
@@ -56,7 +56,8 @@ DEFAULT_OPTIONS = dict(origins='*',
                        vary_header=True,
                        resources=r'/*',
                        intercept_exceptions=True,
-                       always_send=True)
+                       always_send=True,
+                       allow_private_network=False)
 
 
 def parse_resources(resources):
@@ -186,7 +187,8 @@ def get_cors_headers(options, request_headers, request_method):
 
     if ACL_REQUEST_HEADER_PRIVATE_NETWORK in request_headers \
             and request_headers.get(ACL_REQUEST_HEADER_PRIVATE_NETWORK) == 'true':
-        headers[ACL_RESPONSE_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
diff --git a/libs/flask_cors/extension.py b/libs/flask_cors/extension.py
index c00cbfff9..abf5cafe9 100644
--- a/libs/flask_cors/extension.py
+++ b/libs/flask_cors/extension.py
@@ -70,9 +70,11 @@ class CORS(object):
         The origin(s) may be regular expressions, case-sensitive strings,
         or else an asterisk.
 
-        :note: origins must include the schema and the port (if not port 80),
-        e.g.,
-        `CORS(app, origins=["http://localhost:8000", "https://example.com"])`.
+        ..  note::
+
+            origins must include the schema and the port (if not port 80),
+            e.g.,
+            `CORS(app, origins=["http://localhost:8000", "https://example.com"])`.
 
         Default : '*'
     :type origins: list, string or regex
@@ -136,6 +138,22 @@ class CORS(object):
 
         Default : True
     :type vary_header: bool
+
+    :param allow_private_network:
+        If True, the response header `Access-Control-Allow-Private-Network`
+        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`
+        will be set with the value 'false' whenever the request header
+        `Access-Control-Request-Private-Network` has a value of 'true'.
+
+        If the request header `Access-Control-Request-Private-Network` is
+        not present or has a value other than 'true', the response header
+        `Access-Control-Allow-Private-Network` will not be set.
+
+        Default : True
+    :type allow_private_network: bool
     """
 
     def __init__(self, app=None, **kwargs):
@@ -191,7 +209,7 @@ def make_after_request_function(resources):
         normalized_path = unquote_plus(request.path)
         for res_regex, res_options in resources:
             if try_match(normalized_path, res_regex):
-                LOG.debug("Request to '%s' matches CORS resource '%s'. Using options: %s",
+                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
diff --git a/libs/flask_cors/version.py b/libs/flask_cors/version.py
index d6497a814..a0f66580c 100644
--- a/libs/flask_cors/version.py
+++ b/libs/flask_cors/version.py
@@ -1 +1 @@
-__version__ = '4.0.0'
+__version__ = '5.0.0'
diff --git a/libs/flask_migrate/__init__.py b/libs/flask_migrate/__init__.py
index c61b7f5eb..197f17bda 100644
--- a/libs/flask_migrate/__init__.py
+++ b/libs/flask_migrate/__init__.py
@@ -3,7 +3,7 @@ from functools import wraps
 import logging
 import os
 import sys
-from flask import current_app
+from flask import current_app, g
 from alembic import __version__ as __alembic_version__
 from alembic.config import Config as AlembicConfig
 from alembic import command
@@ -92,15 +92,15 @@ class Migrate(object):
         for opt in opts or []:
             setattr(config.cmd_opts, opt, True)
         if not hasattr(config.cmd_opts, 'x'):
+            setattr(config.cmd_opts, 'x', [])
+            for x in getattr(g, 'x_arg', []):
+                config.cmd_opts.x.append(x)
             if x_arg is not None:
-                setattr(config.cmd_opts, 'x', [])
                 if isinstance(x_arg, list) or isinstance(x_arg, tuple):
                     for x in x_arg:
                         config.cmd_opts.x.append(x)
                 else:
                     config.cmd_opts.x.append(x_arg)
-            else:
-                setattr(config.cmd_opts, 'x', None)
         return self.call_configure_callbacks(config)
 
 
@@ -252,11 +252,11 @@ def current(directory=None, verbose=False):
 
 
 @catch_errors
-def stamp(directory=None, revision='head', sql=False, tag=None):
+def stamp(directory=None, revision='head', sql=False, tag=None, purge=False):
     """'stamp' the revision table with the given revision; don't run any
     migrations"""
     config = current_app.extensions['migrate'].migrate.get_config(directory)
-    command.stamp(config, revision, sql=sql, tag=tag)
+    command.stamp(config, revision, sql=sql, tag=tag, purge=purge)
 
 
 @catch_errors
diff --git a/libs/flask_migrate/cli.py b/libs/flask_migrate/cli.py
index 176672c58..4fabece25 100644
--- a/libs/flask_migrate/cli.py
+++ b/libs/flask_migrate/cli.py
@@ -1,4 +1,5 @@
 import click
+from flask import g
 from flask.cli import with_appcontext
 from flask_migrate import list_templates as _list_templates
 from flask_migrate import init as _init
@@ -18,9 +19,15 @@ from flask_migrate import check as _check
 
 
 @click.group()
-def db():
+@click.option('-d', '--directory', default=None,
+              help=('Migration script directory (default is "migrations")'))
+@click.option('-x', '--x-arg', multiple=True,
+              help='Additional arguments consumed by custom env.py scripts')
+@with_appcontext
+def db(directory, x_arg):
     """Perform database migrations."""
-    pass
+    g.directory = directory
+    g.x_arg = x_arg  # these will be picked up by Migrate.get_config()
 
 
 @db.command()
@@ -43,7 +50,7 @@ def list_templates():
 @with_appcontext
 def init(directory, multidb, template, package):
     """Creates a new migration repository."""
-    _init(directory, multidb, template, package)
+    _init(directory or g.directory, multidb, template, package)
 
 
 @db.command()
@@ -72,8 +79,8 @@ def init(directory, multidb, template, package):
 def revision(directory, message, autogenerate, sql, head, splice, branch_label,
              version_path, rev_id):
     """Create a new revision file."""
-    _revision(directory, message, autogenerate, sql, head, splice,
-              branch_label, version_path, rev_id)
+    _revision(directory or g.directory, message, autogenerate, sql, head,
+              splice, branch_label, version_path, rev_id)
 
 
 @db.command()
@@ -102,8 +109,8 @@ def migrate(directory, message, sql, head, splice, branch_label, version_path,
             rev_id, x_arg):
     """Autogenerate a new revision file (Alias for
     'revision --autogenerate')"""
-    _migrate(directory, message, sql, head, splice, branch_label, version_path,
-             rev_id, x_arg)
+    _migrate(directory or g.directory, message, sql, head, splice,
+             branch_label, version_path, rev_id, x_arg or g.x_arg)
 
 
 @db.command()
@@ -113,7 +120,7 @@ def migrate(directory, message, sql, head, splice, branch_label, version_path,
 @with_appcontext
 def edit(directory, revision):
     """Edit a revision file"""
-    _edit(directory, revision)
+    _edit(directory or g.directory, revision)
 
 
 @db.command()
@@ -129,7 +136,7 @@ def edit(directory, revision):
 @with_appcontext
 def merge(directory, message, branch_label, rev_id, revisions):
     """Merge two revisions together, creating a new revision file"""
-    _merge(directory, revisions, message, branch_label, rev_id)
+    _merge(directory or g.directory, revisions, message, branch_label, rev_id)
 
 
 @db.command()
@@ -147,7 +154,7 @@ def merge(directory, message, branch_label, rev_id, revisions):
 @with_appcontext
 def upgrade(directory, sql, tag, x_arg, revision):
     """Upgrade to a later version"""
-    _upgrade(directory, revision, sql, tag, x_arg)
+    _upgrade(directory or g.directory, revision, sql, tag, x_arg or g.x_arg)
 
 
 @db.command()
@@ -165,7 +172,7 @@ def upgrade(directory, sql, tag, x_arg, revision):
 @with_appcontext
 def downgrade(directory, sql, tag, x_arg, revision):
     """Revert to a previous version"""
-    _downgrade(directory, revision, sql, tag, x_arg)
+    _downgrade(directory or g.directory, revision, sql, tag, x_arg or g.x_arg)
 
 
 @db.command()
@@ -175,7 +182,7 @@ def downgrade(directory, sql, tag, x_arg, revision):
 @with_appcontext
 def show(directory, revision):
     """Show the revision denoted by the given symbol."""
-    _show(directory, revision)
+    _show(directory or g.directory, revision)
 
 
 @db.command()
@@ -190,7 +197,7 @@ def show(directory, revision):
 @with_appcontext
 def history(directory, rev_range, verbose, indicate_current):
     """List changeset scripts in chronological order."""
-    _history(directory, rev_range, verbose, indicate_current)
+    _history(directory or g.directory, rev_range, verbose, indicate_current)
 
 
 @db.command()
@@ -202,7 +209,7 @@ def history(directory, rev_range, verbose, indicate_current):
 @with_appcontext
 def heads(directory, verbose, resolve_dependencies):
     """Show current available heads in the script directory"""
-    _heads(directory, verbose, resolve_dependencies)
+    _heads(directory or g.directory, verbose, resolve_dependencies)
 
 
 @db.command()
@@ -212,7 +219,7 @@ def heads(directory, verbose, resolve_dependencies):
 @with_appcontext
 def branches(directory, verbose):
     """Show current branch points"""
-    _branches(directory, verbose)
+    _branches(directory or g.directory, verbose)
 
 
 @db.command()
@@ -222,7 +229,7 @@ def branches(directory, verbose):
 @with_appcontext
 def current(directory, verbose):
     """Display the current revision for each database."""
-    _current(directory, verbose)
+    _current(directory or g.directory, verbose)
 
 
 @db.command()
@@ -234,12 +241,15 @@ def current(directory, verbose):
 @click.option('--tag', default=None,
               help=('Arbitrary "tag" name - can be used by custom env.py '
                     'scripts'))
+@click.option('--purge', is_flag=True,
+              help=('Delete the version in the alembic_version table before '
+                    'stamping'))
 @click.argument('revision', default='head')
 @with_appcontext
-def stamp(directory, sql, tag, revision):
+def stamp(directory, sql, tag, revision, purge):
     """'stamp' the revision table with the given revision; don't run any
     migrations"""
-    _stamp(directory, revision, sql, tag)
+    _stamp(directory or g.directory, revision, sql, tag, purge)
 
 
 @db.command()
@@ -248,4 +258,4 @@ def stamp(directory, sql, tag, revision):
 @with_appcontext
 def check(directory):
     """Check if there are any new operations to migrate"""
-    _check(directory)
+    _check(directory or g.directory)
diff --git a/libs/flask_socketio/__init__.py b/libs/flask_socketio/__init__.py
index c065ae372..219f30cd6 100644
--- a/libs/flask_socketio/__init__.py
+++ b/libs/flask_socketio/__init__.py
@@ -33,15 +33,13 @@ class _SocketIOMiddleware(socketio.WSGIApp):
     """
     def __init__(self, socketio_app, flask_app, socketio_path='socket.io'):
         self.flask_app = flask_app
-        super(_SocketIOMiddleware, self).__init__(socketio_app,
-                                                  flask_app.wsgi_app,
-                                                  socketio_path=socketio_path)
+        super().__init__(socketio_app, flask_app.wsgi_app,
+                         socketio_path=socketio_path)
 
     def __call__(self, environ, start_response):
         environ = environ.copy()
         environ['flask.app'] = self.flask_app
-        return super(_SocketIOMiddleware, self).__call__(environ,
-                                                         start_response)
+        return super().__call__(environ, start_response)
 
 
 class _ManagedSession(dict, SessionMixin):
@@ -51,7 +49,7 @@ class _ManagedSession(dict, SessionMixin):
     pass
 
 
-class SocketIO(object):
+class SocketIO:
     """Create a Flask-SocketIO server.
 
     :param app: The flask application instance. If the application instance
@@ -167,6 +165,7 @@ class SocketIO(object):
                             fatal errors are logged even when
                             ``engineio_logger`` is ``False``.
     """
+    reason = socketio.Server.reason
 
     def __init__(self, app=None, **kwargs):
         self.server = None
@@ -204,7 +203,7 @@ class SocketIO(object):
             if url:
                 if url.startswith(('redis://', "rediss://")):
                     queue_class = socketio.RedisManager
-                elif url.startswith(('kafka://')):
+                elif url.startswith('kafka://'):
                     queue_class = socketio.KafkaManager
                 elif url.startswith('zmq'):
                     queue_class = socketio.ZmqManager
@@ -220,7 +219,7 @@ class SocketIO(object):
             # changes when it is invoked inside or outside the app context
             # so here to prevent any ambiguities we replace it with wrappers
             # that ensure that the app context is always present
-            class FlaskSafeJSON(object):
+            class FlaskSafeJSON:
                 @staticmethod
                 def dumps(*args, **kwargs):
                     with app.app_context():
@@ -279,7 +278,18 @@ class SocketIO(object):
         def decorator(handler):
             @wraps(handler)
             def _handler(sid, *args):
-                return self._handle_event(handler, message, namespace, sid,
+                nonlocal namespace
+                real_ns = namespace
+                if namespace == '*':
+                    real_ns = sid
+                    sid = args[0]
+                    args = args[1:]
+                real_msg = message
+                if message == '*':
+                    real_msg = sid
+                    sid = args[0]
+                    args = [real_msg] + list(args[1:])
+                return self._handle_event(handler, message, real_ns, sid,
                                           *args)
 
             if self.server:
@@ -686,17 +696,15 @@ class SocketIO(object):
             from gevent import pywsgi
             try:
                 from geventwebsocket.handler import WebSocketHandler
-                websocket = True
+                gevent_websocket = True
             except ImportError:
-                app.logger.warning(
-                    'WebSocket transport not available. Install '
-                    'gevent-websocket for improved performance.')
-                websocket = False
+                # WebSocket support will come from the simple-websocket package
+                gevent_websocket = False
 
             log = 'default'
             if not log_output:
                 log = None
-            if websocket:
+            if gevent_websocket:
                 self.wsgi_server = pywsgi.WSGIServer(
                     (host, port), app, handler_class=WebSocketHandler,
                     log=log, **kwargs)
diff --git a/libs/flask_socketio/namespace.py b/libs/flask_socketio/namespace.py
index 43833a9bd..541fa793e 100644
--- a/libs/flask_socketio/namespace.py
+++ b/libs/flask_socketio/namespace.py
@@ -3,7 +3,7 @@ from socketio import Namespace as _Namespace
 
 class Namespace(_Namespace):
     def __init__(self, namespace=None):
-        super(Namespace, self).__init__(namespace)
+        super().__init__(namespace)
         self.socketio = None
 
     def _set_socketio(self, socketio):
@@ -17,13 +17,21 @@ class Namespace(_Namespace):
         method can be overridden if special dispatching rules are needed, or if
         having a single method that catches all events is desired.
         """
-        handler_name = 'on_' + event
+        handler_name = 'on_' + (event or '')
         if not hasattr(self, handler_name):
             # there is no handler for this event, so we ignore it
             return
         handler = getattr(self, handler_name)
-        return self.socketio._handle_event(handler, event, self.namespace,
-                                           *args)
+        try:
+            return self.socketio._handle_event(handler, event, self.namespace,
+                                               *args)
+        except TypeError:
+            if event == 'disconnect':
+                # legacy disconnect events do not have the reason argument
+                return self.socketio._handle_event(
+                    handler, event, self.namespace, *args[:-1])
+            else:
+                raise
 
     def emit(self, event, data=None, room=None, include_self=True,
              namespace=None, callback=None):
diff --git a/libs/flask_socketio/test_client.py b/libs/flask_socketio/test_client.py
index 0603d77c7..312bac1d3 100644
--- a/libs/flask_socketio/test_client.py
+++ b/libs/flask_socketio/test_client.py
@@ -5,7 +5,7 @@ from socketio.pubsub_manager import PubSubManager
 from werkzeug.test import EnvironBuilder
 
 
-class SocketIOTestClient(object):
+class SocketIOTestClient:
     """
     This class is useful for testing a Flask-SocketIO server. It works in a
     similar way to the Flask Test Client, but adapted to the Socket.IO server.
diff --git a/libs/ftfy-6.1.3.dist-info/RECORD b/libs/ftfy-6.1.3.dist-info/RECORD
deleted file mode 100644
index c241f118e..000000000
--- a/libs/ftfy-6.1.3.dist-info/RECORD
+++ /dev/null
@@ -1,20 +0,0 @@
-../../bin/ftfy,sha256=RiqPO-DVZ0PjvYA-L6_heE5XGXpqCUH_cuFkg3x_Nro,230
-CHANGELOG.md,sha256=N3lqel77VL-IYoCBaaV5wPeKTqjFB5ij4VN1o1LVnYw,21931
-README.md,sha256=tq7rGBdhuzaySgb__1FESwOKJjO_xQEa0CYT9gr3mgM,5559
-ftfy-6.1.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-ftfy-6.1.3.dist-info/LICENSE.txt,sha256=oL_FAgvC4eggVRoGJccMlfqomMFec3EA_0iAqhAZeFc,552
-ftfy-6.1.3.dist-info/METADATA,sha256=WGR7WPYS2N1u6a4oO3SJnAo6Bj6IWnsDes7LrLtK_h0,6227
-ftfy-6.1.3.dist-info/RECORD,,
-ftfy-6.1.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ftfy-6.1.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ftfy-6.1.3.dist-info/entry_points.txt,sha256=N8flv0M3Cdg0X56vlUPd7R_CdvTG76C8pKhrDS9Ysug,38
-ftfy/__init__.py,sha256=XuwZPFzyvp4DfkBK5iAUQvWzHBgT09mCWj1xEBq_4Lw,29222
-ftfy/bad_codecs/__init__.py,sha256=kNDJXrT7ZZgk5WZG4zIWgkinI27UTXLrubOGfrFk3dc,3234
-ftfy/bad_codecs/sloppy.py,sha256=1YkVYn8x99FxNDBAZlojlzDV7wprZgtmJzPdpsMQ23s,6761
-ftfy/bad_codecs/utf8_variants.py,sha256=Tspd3prlZKQAFoW_PcE7sDK5pMsTcJSUuO0IBOCBvxs,9590
-ftfy/badness.py,sha256=Pa7pqan89Ixk__OWlEpQgtxzpZZiQKnpyVdNSOVfj6A,14494
-ftfy/chardata.py,sha256=HQV9r3IZCIbuO5-Eqb8HOFSWnNmMg__jH67P339cjUM,11900
-ftfy/cli.py,sha256=9rddOrxYcsjjyGfc3p79hPKdfa9xqnIY__c7vz97t7M,4146
-ftfy/fixes.py,sha256=sM4gGHB33B9rDuF6cCVo-ezjX6Hdgzg9z99B56QniTM,17755
-ftfy/formatting.py,sha256=MpF6Y-hEjf1BvtcI5mZjodeSu7iAA-b3af49V_0EmI8,5808
-ftfy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/idna-3.6.dist-info/INSTALLER b/libs/ftfy-6.2.3.dist-info/INSTALLER
similarity index 100%
rename from libs/idna-3.6.dist-info/INSTALLER
rename to libs/ftfy-6.2.3.dist-info/INSTALLER
diff --git a/libs/ftfy-6.1.3.dist-info/LICENSE.txt b/libs/ftfy-6.2.3.dist-info/LICENSE.txt
similarity index 100%
rename from libs/ftfy-6.1.3.dist-info/LICENSE.txt
rename to libs/ftfy-6.2.3.dist-info/LICENSE.txt
diff --git a/libs/ftfy-6.1.3.dist-info/METADATA b/libs/ftfy-6.2.3.dist-info/METADATA
similarity index 74%
rename from libs/ftfy-6.1.3.dist-info/METADATA
rename to libs/ftfy-6.2.3.dist-info/METADATA
index 93187261a..013f2c36c 100644
--- a/libs/ftfy-6.1.3.dist-info/METADATA
+++ b/libs/ftfy-6.2.3.dist-info/METADATA
@@ -1,19 +1,25 @@
 Metadata-Version: 2.1
 Name: ftfy
-Version: 6.1.3
+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,<4
+Requires-Python: >=3.8.1,<4
 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: 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
@@ -105,13 +111,13 @@ 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.)
+(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.
+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.
 
@@ -124,10 +130,7 @@ I'm Robyn Speer, also known as Elia Robyn Lake. You can find me
 
 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.
+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:
@@ -147,3 +150,16 @@ In BibTeX format, the citation is::
       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
new file mode 100644
index 000000000..991af898c
--- /dev/null
+++ b/libs/ftfy-6.2.3.dist-info/RECORD
@@ -0,0 +1,18 @@
+../../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/idna-3.6.dist-info/REQUESTED b/libs/ftfy-6.2.3.dist-info/REQUESTED
similarity index 100%
rename from libs/idna-3.6.dist-info/REQUESTED
rename to libs/ftfy-6.2.3.dist-info/REQUESTED
diff --git a/libs/ftfy-6.1.3.dist-info/WHEEL b/libs/ftfy-6.2.3.dist-info/WHEEL
similarity index 67%
rename from libs/ftfy-6.1.3.dist-info/WHEEL
rename to libs/ftfy-6.2.3.dist-info/WHEEL
index d73ccaae8..8b9b3a1bf 100644
--- a/libs/ftfy-6.1.3.dist-info/WHEEL
+++ b/libs/ftfy-6.2.3.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/ftfy-6.1.3.dist-info/entry_points.txt b/libs/ftfy-6.2.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/ftfy-6.1.3.dist-info/entry_points.txt
rename to libs/ftfy-6.2.3.dist-info/entry_points.txt
diff --git a/libs/ftfy/__init__.py b/libs/ftfy/__init__.py
index 95564d733..6b97b5859 100644
--- a/libs/ftfy/__init__.py
+++ b/libs/ftfy/__init__.py
@@ -4,30 +4,32 @@ ftfy: fixes text for you
 This is a module for making text less broken. See the `fix_text` function
 for more information.
 """
+
 from __future__ import annotations
+
 import unicodedata
 import warnings
 from typing import (
     Any,
     BinaryIO,
+    Callable,
     Dict,
     Iterator,
     List,
+    Literal,
     NamedTuple,
     Optional,
     TextIO,
     Tuple,
     Union,
     cast,
-    no_type_check,
 )
 
-from ftfy import bad_codecs
-from ftfy import chardata, fixes
+from ftfy import bad_codecs, chardata, fixes
 from ftfy.badness import is_bad
 from ftfy.formatting import display_ljust
 
-__version__ = "6.1.2"
+__version__ = "6.2.3"
 
 
 # Though this function does nothing, it lets linters know that we're using
@@ -75,7 +77,7 @@ class ExplainedText(NamedTuple):
 
 
 # Functions that can be applied using `apply_plan`.
-FIXERS = {
+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,
@@ -211,6 +213,7 @@ class TextFixerConfig(NamedTuple):
       Functions that accept TextFixerConfig and don't return an explanation
       will automatically set `explain` to False.
     """
+
     unescape_html: Union[str, bool] = "auto"
     remove_terminal_escapes: bool = True
     fix_encoding: bool = True
@@ -224,7 +227,7 @@ class TextFixerConfig(NamedTuple):
     fix_line_breaks: bool = True
     fix_surrogates: bool = True
     remove_control_chars: bool = True
-    normalization: Optional[str] = "NFC"
+    normalization: Optional[Literal["NFC", "NFD", "NFKC", "NFKD"]] = "NFC"
     max_decode_length: int = 1000000
     explain: bool = True
 
@@ -238,7 +241,9 @@ def _config_from_kwargs(
     """
     if "fix_entities" in kwargs:
         warnings.warn(
-            "`fix_entities` has been renamed to `unescape_html`", DeprecationWarning
+            "`fix_entities` has been renamed to `unescape_html`",
+            DeprecationWarning,
+            stacklevel=2,
         )
         kwargs = kwargs.copy()
         kwargs["unescape_html"] = kwargs["fix_entities"]
@@ -287,7 +292,7 @@ def _try_fix(
     return text
 
 
-def fix_text(text: str, config: Optional[TextFixerConfig] = None, **kwargs) -> str:
+def fix_text(text: str, config: Optional[TextFixerConfig] = 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).
@@ -362,7 +367,7 @@ def fix_text(text: str, config: Optional[TextFixerConfig] = None, **kwargs) -> s
 
 
 def fix_and_explain(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs
+    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
 ) -> ExplainedText:
     """
     Fix text as a single segment, returning the fixed text and an explanation
@@ -422,7 +427,7 @@ def fix_and_explain(
 
 
 def fix_encoding_and_explain(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs
+    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
 ) -> ExplainedText:
     """
     Apply the steps of ftfy that detect mojibake and fix it. Returns the fixed
@@ -503,8 +508,13 @@ def _fix_encoding_one_step_and_explain(
                 decoding = "utf-8"
                 # Check encoded_bytes for sequences that would be UTF-8,
                 # except they have b' ' where b'\xa0' would belong.
-                if config.restore_byte_a0 and chardata.ALTERED_UTF8_RE.search(
-                    encoded_bytes
+                #
+                # Don't do this in the macroman encoding, where it would match
+                # an en dash followed by a space, leading to false positives.
+                if (
+                    config.restore_byte_a0
+                    and encoding != "macroman"
+                    and chardata.ALTERED_UTF8_RE.search(encoded_bytes)
                 ):
                     replaced_bytes = fixes.restore_byte_a0(encoded_bytes)
                     if replaced_bytes != encoded_bytes:
@@ -578,7 +588,9 @@ def _fix_encoding_one_step_and_explain(
     return ExplainedText(text, [])
 
 
-def fix_encoding(text: str, config: Optional[TextFixerConfig] = None, **kwargs):
+def fix_encoding(
+    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+) -> str:
     """
     Apply just the encoding-fixing steps of ftfy to this text. Returns the
     fixed text, discarding the explanation.
@@ -599,7 +611,9 @@ def fix_encoding(text: str, config: Optional[TextFixerConfig] = None, **kwargs):
 ftfy = fix_text
 
 
-def fix_text_segment(text: str, config: Optional[TextFixerConfig] = None, **kwargs):
+def fix_text_segment(
+    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+) -> str:
     """
     Fix text as a single segment, with a consistent sequence of steps that
     are applied to fix the text. Discard the explanation.
@@ -615,7 +629,7 @@ def fix_file(
     input_file: TextIO | BinaryIO,
     encoding: Optional[str] = None,
     config: Optional[TextFixerConfig] = None,
-    **kwargs,
+    **kwargs: Any,
 ) -> Iterator[str]:
     """
     Fix text that is found in a file.
@@ -715,8 +729,7 @@ def guess_bytes(bstring: bytes) -> Tuple[str, str]:
     return bstring.decode("sloppy-windows-1252"), "sloppy-windows-1252"
 
 
-@no_type_check
-def apply_plan(text: str, plan: List[Tuple[str, str]]):
+def apply_plan(text: str, plan: List[Tuple[str, str]]) -> str:
     """
     Apply a plan for fixing the encoding of text.
 
@@ -743,9 +756,9 @@ def apply_plan(text: str, plan: List[Tuple[str, str]]):
     obj = text
     for operation, encoding in plan:
         if operation == "encode":
-            obj = obj.encode(encoding)
+            obj = obj.encode(encoding)  # type: ignore
         elif operation == "decode":
-            obj = obj.decode(encoding)
+            obj = obj.decode(encoding)  # type: ignore
         elif operation in ("transcode", "apply"):
             if encoding in FIXERS:
                 obj = FIXERS[encoding](obj)
@@ -757,7 +770,7 @@ def apply_plan(text: str, plan: List[Tuple[str, str]]):
     return obj
 
 
-def explain_unicode(text: str):
+def explain_unicode(text: str) -> None:
     """
     A utility method that's useful for debugging mysterious Unicode.
 
diff --git a/libs/ftfy/bad_codecs/__init__.py b/libs/ftfy/bad_codecs/__init__.py
index b1433a3a6..bb71136ab 100644
--- a/libs/ftfy/bad_codecs/__init__.py
+++ b/libs/ftfy/bad_codecs/__init__.py
@@ -29,9 +29,10 @@ A quick example of decoding text that's encoded in CESU-8:
     >>> print(b'\xed\xa0\xbd\xed\xb8\x8d'.decode('utf-8-variants'))
     😍
 """
-from encodings import normalize_encoding
+
 import codecs
-from typing import Dict
+from encodings import normalize_encoding
+from typing import Dict, Optional
 
 _CACHE: Dict[str, codecs.CodecInfo] = {}
 
@@ -51,7 +52,7 @@ UTF8_VAR_NAMES = (
 )
 
 
-def search_function(encoding):
+def search_function(encoding: str) -> Optional[codecs.CodecInfo]:
     """
     Register our "bad codecs" with Python's codecs API. This involves adding
     a search function that takes in an encoding name, and returns a codec
@@ -85,7 +86,7 @@ def search_function(encoding):
     return codec
 
 
-def ok():
+def ok() -> None:
     """
     A feel-good function that gives you something to call after importing
     this package.
diff --git a/libs/ftfy/bad_codecs/sloppy.py b/libs/ftfy/bad_codecs/sloppy.py
index bf051ff8d..6f63b1e8d 100644
--- a/libs/ftfy/bad_codecs/sloppy.py
+++ b/libs/ftfy/bad_codecs/sloppy.py
@@ -71,16 +71,17 @@ sloppy-windows-1252 merges Windows-1252 with Latin-1:
     U+0081  \x81    [Cc] <unknown>
     U+201A  ‚       [Ps] SINGLE LOW-9 QUOTATION MARK
 """
+
 from __future__ import annotations
+
 import codecs
 from encodings import normalize_encoding
-import sys
+from typing import Optional, Tuple
 
 REPLACEMENT_CHAR = "\ufffd"
-PY26 = sys.version_info[:2] == (2, 6)
 
 
-def make_sloppy_codec(encoding):
+def make_sloppy_codec(encoding: str) -> codecs.CodecInfo:
     """
     Take a codec name, and return a 'sloppy' version of that codec that can
     encode and decode the unassigned bytes in that encoding.
@@ -98,10 +99,7 @@ def make_sloppy_codec(encoding):
 
     # Get a list of what they decode to in the given encoding. Use the
     # replacement character for unassigned bytes.
-    if PY26:
-        decoded_chars = all_bytes.decode(encoding, "replace")
-    else:
-        decoded_chars = all_bytes.decode(encoding, errors="replace")
+    decoded_chars = all_bytes.decode(encoding, errors="replace")
 
     # Update the sloppy_chars list. Each byte that was successfully decoded
     # gets its decoded value in the list. The unassigned bytes are left as
@@ -123,19 +121,23 @@ def make_sloppy_codec(encoding):
     # `encodings.cp1252` for comparison; this is almost exactly the same,
     # except I made it follow pep8.
     class Codec(codecs.Codec):
-        def encode(self, input, errors="strict"):
+        def encode(
+            self, input: str, errors: Optional[str] = "strict"
+        ) -> Tuple[bytes, int]:
             return codecs.charmap_encode(input, errors, encoding_table)
 
-        def decode(self, input, errors="strict"):
-            return codecs.charmap_decode(input, errors, decoding_table)  # type: ignore
+        def decode(
+            self, input: bytes, errors: Optional[str] = "strict"
+        ) -> Tuple[str, int]:
+            return codecs.charmap_decode(input, errors, decoding_table)  # type: ignore[arg-type]
 
     class IncrementalEncoder(codecs.IncrementalEncoder):
-        def encode(self, input, final=False):
+        def encode(self, input: str, final: bool = False) -> bytes:
             return codecs.charmap_encode(input, self.errors, encoding_table)[0]
 
     class IncrementalDecoder(codecs.IncrementalDecoder):
-        def decode(self, input, final=False):
-            return codecs.charmap_decode(input, self.errors, decoding_table)[0]  # type: ignore
+        def decode(self, input: bytes, final: bool = False) -> str:  # type: ignore[override]
+            return codecs.charmap_decode(input, self.errors, decoding_table)[0]  # type: ignore[arg-type]
 
     class StreamWriter(Codec, codecs.StreamWriter):
         pass
diff --git a/libs/ftfy/bad_codecs/utf8_variants.py b/libs/ftfy/bad_codecs/utf8_variants.py
index 7dce8c0d5..28366a548 100644
--- a/libs/ftfy/bad_codecs/utf8_variants.py
+++ b/libs/ftfy/bad_codecs/utf8_variants.py
@@ -39,13 +39,15 @@ never.
    ftfy instead.
 """
 
-import re
 import codecs
-from typing import Tuple
+import re
 from encodings.utf_8 import (
     IncrementalDecoder as UTF8IncrementalDecoder,
+)
+from encodings.utf_8 import (
     IncrementalEncoder as UTF8IncrementalEncoder,
 )
+from typing import Callable, Optional, Tuple
 
 NAME = "utf-8-variants"
 
@@ -90,7 +92,10 @@ class IncrementalDecoder(UTF8IncrementalDecoder):
     we define here for the cases the real encoder isn't expecting.
     """
 
-    def _buffer_decode(self, input, errors, final):
+    @staticmethod
+    def _buffer_decode(  # type: ignore[override]
+        input: bytes, errors: Optional[str], final: bool
+    ) -> Tuple[str, int]:
         """
         Decode bytes that may be arriving in a stream, following the Codecs
         API.
@@ -112,7 +117,7 @@ class IncrementalDecoder(UTF8IncrementalDecoder):
         position = 0
         while True:
             # Use _buffer_decode_step to decode a segment of text.
-            decoded, consumed = self._buffer_decode_step(
+            decoded, consumed = IncrementalDecoder._buffer_decode_step(
                 input[position:], errors, final
             )
             if consumed == 0:
@@ -131,7 +136,10 @@ class IncrementalDecoder(UTF8IncrementalDecoder):
 
         return "".join(decoded_segments), position
 
-    def _buffer_decode_step(self, input, errors, final):
+    @staticmethod
+    def _buffer_decode_step(
+        input: bytes, errors: Optional[str], final: bool
+    ) -> Tuple[str, int]:
         """
         There are three possibilities for each decoding step:
 
@@ -170,10 +178,17 @@ class IncrementalDecoder(UTF8IncrementalDecoder):
                     return "", 0
         else:
             # Decode a possible six-byte sequence starting with 0xed.
-            return self._buffer_decode_surrogates(sup, input, errors, final)
+            return IncrementalDecoder._buffer_decode_surrogates(
+                sup, input, errors, final
+            )
 
     @staticmethod
-    def _buffer_decode_surrogates(sup, input, errors, final):
+    def _buffer_decode_surrogates(
+        sup: Callable[[bytes, Optional[str], bool], Tuple[str, int]],
+        input: bytes,
+        errors: Optional[str],
+        final: bool,
+    ) -> Tuple[str, int]:
         """
         When we have improperly encoded surrogates, we can still see the
         bits that they were meant to represent.
diff --git a/libs/ftfy/badness.py b/libs/ftfy/badness.py
index 7b6cce546..81c52744d 100644
--- a/libs/ftfy/badness.py
+++ b/libs/ftfy/badness.py
@@ -263,8 +263,6 @@ BADNESS_RE = re.compile(
     |
     [{box}{end_punctuation}{currency}{numeric}] [{lower_accented}]
     |
-    # leave out [upper_accented][currency] without further info, because it's used in some
-    # fancy leetspeak-esque writing
     [{lower_accented}{box}{end_punctuation}] [{currency}]
     |
     \s [{upper_accented}] [{currency}]
@@ -352,9 +350,7 @@ BADNESS_RE = re.compile(
 
     # Windows-1253 mojibake of Latin-1 characters and/or the Greek alphabet
     [ΒΓΞΟ][{c1}{bad}{start_punctuation}{end_punctuation}{currency}°][ΒΓΞΟ]
-""".format(
-        **MOJIBAKE_CATEGORIES
-    ),
+""".format(**MOJIBAKE_CATEGORIES),
     re.VERBOSE,
 )
 
diff --git a/libs/ftfy/chardata.py b/libs/ftfy/chardata.py
index 0ff75a63d..2e0e82a81 100644
--- a/libs/ftfy/chardata.py
+++ b/libs/ftfy/chardata.py
@@ -2,12 +2,14 @@
 This gives other modules access to the gritty details about characters and the
 encodings that use them.
 """
+
 from __future__ import annotations
+
 import html
 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.
@@ -27,7 +29,7 @@ SINGLE_QUOTE_RE = re.compile("[\u02bc\u2018-\u201b]")
 DOUBLE_QUOTE_RE = re.compile("[\u201c-\u201f]")
 
 
-def _build_regexes():
+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
@@ -57,7 +59,7 @@ def _build_regexes():
 ENCODING_REGEXES = _build_regexes()
 
 
-def _build_html_entities():
+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
@@ -81,7 +83,7 @@ HTML_ENTITY_RE = re.compile(r"&#?[0-9A-Za-z]{1,24};")
 HTML_ENTITIES = _build_html_entities()
 
 
-def possible_encoding(text, encoding):
+def possible_encoding(text: str, encoding: str) -> bool:
     """
     Given text and a single-byte encoding, check whether that text could have
     been decoded from that single-byte encoding.
@@ -92,13 +94,13 @@ def possible_encoding(text, encoding):
     return bool(ENCODING_REGEXES[encoding].match(text))
 
 
-def _build_control_char_mapping():
+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),
@@ -228,7 +230,7 @@ LIGATURES = {
 }
 
 
-def _build_width_map():
+def _build_width_map() -> Dict[int, str]:
     """
     Build a translate mapping that replaces halfwidth and fullwidth forms
     with their standard-width forms.
diff --git a/libs/ftfy/cli.py b/libs/ftfy/cli.py
index 338cba8da..dfb2e9350 100644
--- a/libs/ftfy/cli.py
+++ b/libs/ftfy/cli.py
@@ -1,10 +1,12 @@
 """
 A command-line utility for fixing text found in a file.
 """
+
 import os
 import sys
+from typing import Union
 
-from ftfy import __version__, fix_file, TextFixerConfig
+from ftfy import TextFixerConfig, __version__, fix_file
 
 ENCODE_ERROR_TEXT_UNIX = """ftfy error:
 Unfortunately, this output stream does not support Unicode.
@@ -39,7 +41,7 @@ Can't read and write the same file. Please output to a new file instead.
 """
 
 
-def main():
+def main() -> None:
     """
     Run ftfy as a command-line utility.
     """
@@ -117,7 +119,7 @@ def main():
     if normalization.lower() == "none":
         normalization = None
 
-    unescape_html: str | bool
+    unescape_html: Union[str, bool]
     if args.preserve_entities:
         unescape_html = False
     else:
diff --git a/libs/ftfy/fixes.py b/libs/ftfy/fixes.py
index d93cbebbf..a248bc833 100644
--- a/libs/ftfy/fixes.py
+++ b/libs/ftfy/fixes.py
@@ -14,8 +14,10 @@ import codecs
 import html
 import re
 import warnings
+from typing import Any, List, Match, Tuple
 
 import ftfy
+from ftfy.badness import is_bad
 from ftfy.chardata import (
     ALTERED_UTF8_RE,
     C1_CONTROL_RE,
@@ -30,41 +32,44 @@ from ftfy.chardata import (
     WIDTH_MAP,
 )
 
-from ftfy.badness import is_bad
 
-
-def fix_encoding_and_explain(text):
+def fix_encoding_and_explain(text: str) -> Any:
     """
     Deprecated copy of `ftfy.fix_encoding_and_explain()`.
     """
     warnings.warn(
         "`fix_encoding_and_explain()` has moved to the main module of ftfy.",
         DeprecationWarning,
+        stacklevel=2,
     )
     return ftfy.fix_encoding_and_explain(text)
 
 
-def fix_encoding(text):
+def fix_encoding(text: str) -> str:
     """
     Deprecated copy of `ftfy.fix_encoding()`.
     """
     warnings.warn(
-        "`fix_encoding()` has moved to the main module of ftfy.", DeprecationWarning
+        "`fix_encoding()` has moved to the main module of ftfy.",
+        DeprecationWarning,
+        stacklevel=2,
     )
     return ftfy.fix_encoding(text)
 
 
-def apply_plan(text, plan):
+def apply_plan(text: str, plan: List[Tuple[str, str]]) -> str:
     """
     Deprecated copy of `ftfy.apply_plan()`.
     """
     warnings.warn(
-        "`apply_plan()` has moved to the main module of ftfy.", DeprecationWarning
+        "`apply_plan()` has moved to the main module of ftfy.",
+        DeprecationWarning,
+        stacklevel=2,
     )
     return ftfy.apply_plan(text, plan)
 
 
-def _unescape_fixup(match):
+def _unescape_fixup(match: Match[str]) -> str:
     """
     Replace one matched HTML entity with the character it represents,
     if possible.
@@ -73,7 +78,7 @@ def _unescape_fixup(match):
     if text in HTML_ENTITIES:
         return HTML_ENTITIES[text]
     elif text.startswith("&#"):
-        unescaped = html.unescape(text)
+        unescaped: str = html.unescape(text)
 
         # If html.unescape only decoded part of the string, that's not what
         # we want. The semicolon should be consumed.
@@ -85,7 +90,7 @@ def _unescape_fixup(match):
         return text
 
 
-def unescape_html(text):
+def unescape_html(text: str) -> str:
     """
     Decode HTML entities and character references, including some nonstandard
     ones written in all-caps.
@@ -136,7 +141,7 @@ def unescape_html(text):
 ANSI_RE = re.compile("\033\\[((?:\\d|;)*)([a-zA-Z])")
 
 
-def remove_terminal_escapes(text):
+def remove_terminal_escapes(text: str) -> str:
     r"""
     Strip out "ANSI" terminal escape sequences, such as those that produce
     colored text on Unix.
@@ -149,7 +154,7 @@ def remove_terminal_escapes(text):
     return ANSI_RE.sub("", text)
 
 
-def uncurl_quotes(text):
+def uncurl_quotes(text: str) -> str:
     r"""
     Replace curly quotation marks with straight equivalents.
 
@@ -159,7 +164,7 @@ def uncurl_quotes(text):
     return SINGLE_QUOTE_RE.sub("'", DOUBLE_QUOTE_RE.sub('"', text))
 
 
-def fix_latin_ligatures(text):
+def fix_latin_ligatures(text: str) -> str:
     """
     Replace single-character ligatures of Latin letters, such as 'fi', with the
     characters that they contain, as in 'fi'. Latin ligatures are usually not
@@ -177,7 +182,7 @@ def fix_latin_ligatures(text):
     return text.translate(LIGATURES)
 
 
-def fix_character_width(text):
+def fix_character_width(text: str) -> str:
     """
     The ASCII characters, katakana, and Hangul characters have alternate
     "halfwidth" or "fullwidth" forms that help text line up in a grid.
@@ -197,7 +202,7 @@ def fix_character_width(text):
     return text.translate(WIDTH_MAP)
 
 
-def fix_line_breaks(text):
+def fix_line_breaks(text: str) -> str:
     r"""
     Convert all line breaks to Unix style.
 
@@ -253,7 +258,7 @@ SURROGATE_RE = re.compile("[\ud800-\udfff]")
 SURROGATE_PAIR_RE = re.compile("[\ud800-\udbff][\udc00-\udfff]")
 
 
-def convert_surrogate_pair(match):
+def convert_surrogate_pair(match: Match[str]) -> str:
     """
     Convert a surrogate pair to the single codepoint it represents.
 
@@ -265,7 +270,7 @@ def convert_surrogate_pair(match):
     return chr(codept)
 
 
-def fix_surrogates(text):
+def fix_surrogates(text: str) -> str:
     """
     Replace 16-bit surrogate codepoints with the characters they represent
     (when properly paired), or with \ufffd otherwise.
@@ -288,7 +293,7 @@ def fix_surrogates(text):
     return text
 
 
-def remove_control_chars(text):
+def remove_control_chars(text: str) -> str:
     """
     Remove various control characters that you probably didn't intend to be in
     your text. Many of these characters appear in the table of "Characters not
@@ -321,7 +326,7 @@ def remove_control_chars(text):
     return text.translate(CONTROL_CHARS)
 
 
-def remove_bom(text):
+def remove_bom(text: str) -> str:
     r"""
     Remove a byte-order mark that was accidentally decoded as if it were part
     of the text.
@@ -346,7 +351,7 @@ ESCAPE_SEQUENCE_RE = re.compile(
 )
 
 
-def decode_escapes(text):
+def decode_escapes(text: str) -> str:
     r"""
     Decode backslashed escape sequences, including \\x, \\u, and \\U character
     references, even in the presence of other Unicode.
@@ -377,7 +382,7 @@ def decode_escapes(text):
     "unicode-escape" to work correctly.
     """
 
-    def decode_match(match):
+    def decode_match(match: Match[str]) -> str:
         "Given a regex match, decode the escape sequence it contains."
         return codecs.decode(match.group(0), "unicode-escape")
 
@@ -410,7 +415,7 @@ def decode_escapes(text):
 A_GRAVE_WORD_RE = re.compile(b"\xc3 (?! |quele|quela|quilo|s )")
 
 
-def restore_byte_a0(byts):
+def restore_byte_a0(byts: bytes) -> bytes:
     """
     Some mojibake has been additionally altered by a process that said "hmm,
     byte A0, that's basically a space!" and replaced it with an ASCII space.
@@ -426,14 +431,14 @@ def restore_byte_a0(byts):
     """
     byts = A_GRAVE_WORD_RE.sub(b"\xc3\xa0 ", byts)
 
-    def replacement(match):
+    def replacement(match: Match[bytes]) -> bytes:
         "The function to apply when this regex matches."
         return match.group(0).replace(b"\x20", b"\xa0")
 
     return ALTERED_UTF8_RE.sub(replacement, byts)
 
 
-def replace_lossy_sequences(byts):
+def replace_lossy_sequences(byts: bytes) -> bytes:
     """
     This function identifies sequences where information has been lost in
     a "sloppy" codec, indicated by byte 1A, and if they would otherwise look
@@ -472,7 +477,7 @@ def replace_lossy_sequences(byts):
     return LOSSY_UTF8_RE.sub("\ufffd".encode("utf-8"), byts)
 
 
-def decode_inconsistent_utf8(text):
+def decode_inconsistent_utf8(text: str) -> str:
     """
     Sometimes, text from one encoding ends up embedded within text from a
     different one. This is common enough that we need to be able to fix it.
@@ -480,7 +485,7 @@ def decode_inconsistent_utf8(text):
     This is used as a transcoder within `fix_encoding`.
     """
 
-    def fix_embedded_mojibake(match):
+    def fix_embedded_mojibake(match: Match[str]) -> str:
         substr = match.group(0)
 
         # Require the match to be shorter, so that this doesn't recurse infinitely
@@ -492,11 +497,11 @@ def decode_inconsistent_utf8(text):
     return UTF8_DETECTOR_RE.sub(fix_embedded_mojibake, text)
 
 
-def _c1_fixer(match):
+def _c1_fixer(match: Match[str]) -> str:
     return match.group(0).encode("latin-1").decode("sloppy-windows-1252")
 
 
-def fix_c1_controls(text):
+def fix_c1_controls(text: str) -> str:
     """
     If text still contains C1 control characters, treat them as their
     Windows-1252 equivalents. This matches what Web browsers do.
diff --git a/libs/ftfy/formatting.py b/libs/ftfy/formatting.py
index 5856f2940..18df64b08 100644
--- a/libs/ftfy/formatting.py
+++ b/libs/ftfy/formatting.py
@@ -5,9 +5,11 @@ display such as a terminal.
 We used to have our own implementation here, but now we mostly rely on
 the 'wcwidth' library.
 """
+
 from unicodedata import normalize
 
 from wcwidth import wcswidth, wcwidth
+
 from ftfy.fixes import remove_terminal_escapes
 
 
@@ -74,7 +76,7 @@ def monospaced_width(text: str) -> int:
     return int(wcswidth(remove_terminal_escapes(normalize("NFC", text))))
 
 
-def display_ljust(text, width, fillchar=" "):
+def display_ljust(text: str, width: int, fillchar: str = " ") -> str:
     """
     Return `text` left-justified in a Unicode string whose display width,
     in a monospaced terminal, should be at least `width` character cells.
@@ -108,7 +110,7 @@ def display_ljust(text, width, fillchar=" "):
     return text + fillchar * padding
 
 
-def display_rjust(text, width, fillchar=" "):
+def display_rjust(text: str, width: int, fillchar: str = " ") -> str:
     """
     Return `text` right-justified in a Unicode string whose display width,
     in a monospaced terminal, should be at least `width` character cells.
@@ -137,7 +139,7 @@ def display_rjust(text, width, fillchar=" "):
     return fillchar * padding + text
 
 
-def display_center(text, width, fillchar=" "):
+def display_center(text: str, width: int, fillchar: str = " ") -> str:
     """
     Return `text` centered in a Unicode string whose display width, in a
     monospaced terminal, should be at least `width` character cells. The rest
diff --git a/libs/ga4mp-2.0.4.dist-info/METADATA b/libs/ga4mp-2.0.4.dist-info/METADATA
index 9e525483d..fd94df244 100644
--- a/libs/ga4mp-2.0.4.dist-info/METADATA
+++ b/libs/ga4mp-2.0.4.dist-info/METADATA
@@ -16,6 +16,7 @@ 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
 Project-URL: Repository, https://github.com/adswerve/GA4-Measurement-Protocol-Python
 Description-Content-Type: text/markdown
 
diff --git a/libs/ga4mp-2.0.4.dist-info/RECORD b/libs/ga4mp-2.0.4.dist-info/RECORD
index 56327dfcd..0a53ed4ef 100644
--- a/libs/ga4mp-2.0.4.dist-info/RECORD
+++ b/libs/ga4mp-2.0.4.dist-info/RECORD
@@ -1,9 +1,9 @@
 ga4mp-2.0.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
 ga4mp-2.0.4.dist-info/LICENSE,sha256=DM06JXbtuaVXvujV9lz_AavWd29d7hAQHGyqKztt84U,1521
-ga4mp-2.0.4.dist-info/METADATA,sha256=gdOlcNMQD_u19hJfu5WnTMGNUxNU9zh5FklRu0qUqjc,14523
+ga4mp-2.0.4.dist-info/METADATA,sha256=FIB_rdxhosEcBtajmqy4U4mKQs3ojhJVtYsoI3Ia5_s,14574
 ga4mp-2.0.4.dist-info/RECORD,,
 ga4mp-2.0.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ga4mp-2.0.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ga4mp-2.0.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
 ga4mp/__init__.py,sha256=HtxNKOcZsblw0U8yAKbOh8o5gzyfFFSnd8omf9THTmI,77
 ga4mp/event.py,sha256=7titLeg3n0Ovfz0s4jSCny3IivtjQc9tXU-F3ADMfyQ,1897
 ga4mp/ga4mp.py,sha256=eKbeGKbEzVAihp-TiXokUWgNsnooGOq44lI-xE08KZg,17235
diff --git a/libs/ga4mp-2.0.4.dist-info/WHEEL b/libs/ga4mp-2.0.4.dist-info/WHEEL
index d73ccaae8..8b9b3a1bf 100644
--- a/libs/ga4mp-2.0.4.dist-info/WHEEL
+++ b/libs/ga4mp-2.0.4.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 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 672c0e7d6..c2d5a2fb5 100644
--- a/libs/guessit-3.8.0.dist-info/METADATA
+++ b/libs/guessit-3.8.0.dist-info/METADATA
@@ -23,25 +23,25 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.md
-Requires-Dist: rebulk >=3.2.0
-Requires-Dist: babelfish >=0.6.0
+Requires-Dist: rebulk>=3.2.0
+Requires-Dist: babelfish>=0.6.0
 Requires-Dist: python-dateutil
-Requires-Dist: importlib-resources ; python_version < "3.9"
+Requires-Dist: importlib-resources; python_version < "3.9"
 Provides-Extra: dev
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: mkdocs ; extra == 'dev'
-Requires-Dist: mkdocs-material ; extra == 'dev'
-Requires-Dist: pyinstaller ; extra == 'dev'
-Requires-Dist: wheel ; extra == 'dev'
-Requires-Dist: python-semantic-release ; extra == 'dev'
-Requires-Dist: twine ; extra == 'dev'
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: mkdocs; extra == "dev"
+Requires-Dist: mkdocs-material; extra == "dev"
+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'
+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"
 
 GuessIt
 
diff --git a/libs/guessit-3.8.0.dist-info/RECORD b/libs/guessit-3.8.0.dist-info/RECORD
index 3cf6a0634..aee9c2f8b 100644
--- a/libs/guessit-3.8.0.dist-info/RECORD
+++ b/libs/guessit-3.8.0.dist-info/RECORD
@@ -2,10 +2,10 @@
 guessit-3.8.0.dist-info/AUTHORS.md,sha256=8UKCF10oLsrPtPLJPqw05bfJ5eyc0g91VmYcLEzi2f0,565
 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=WFcO_I__1nC8Dwk73NsGZb3GCX8Ko2vFOR9hs2ewsdM,140739
+guessit-3.8.0.dist-info/METADATA,sha256=VUhjbKLAYqbDxZQqt4uabvRd_Pp-9TBOGZZZ8wav87E,140723
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+guessit-3.8.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
 guessit-3.8.0.dist-info/entry_points.txt,sha256=E03zXaeYI3YX6zekg8Gg3MO6reVOnJqH5G-Uh27QBsw,50
 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
diff --git a/libs/guessit-3.8.0.dist-info/WHEEL b/libs/guessit-3.8.0.dist-info/WHEEL
index 98c0d20b7..da25d7b42 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: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/h11-0.14.0.dist-info/METADATA b/libs/h11-0.14.0.dist-info/METADATA
index cf12a82f1..b2b8a5db4 100644
--- a/libs/h11-0.14.0.dist-info/METADATA
+++ b/libs/h11-0.14.0.dist-info/METADATA
@@ -21,7 +21,7 @@ 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"
+Requires-Dist: typing-extensions; python_version < "3.8"
 
 h11
 ===
diff --git a/libs/h11-0.14.0.dist-info/RECORD b/libs/h11-0.14.0.dist-info/RECORD
index feaa3be52..1a31701c6 100644
--- a/libs/h11-0.14.0.dist-info/RECORD
+++ b/libs/h11-0.14.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 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=B7pZ0m7WBXNs17vl6hUH9bJTL9s37DaGvY31w7jNxSg,8175
+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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+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
diff --git a/libs/h11-0.14.0.dist-info/WHEEL b/libs/h11-0.14.0.dist-info/WHEEL
index 98c0d20b7..da25d7b42 100644
--- a/libs/h11-0.14.0.dist-info/WHEEL
+++ b/libs/h11-0.14.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/importlib_metadata-7.0.1.dist-info/INSTALLER b/libs/idna-3.10.dist-info/INSTALLER
similarity index 100%
rename from libs/importlib_metadata-7.0.1.dist-info/INSTALLER
rename to libs/idna-3.10.dist-info/INSTALLER
diff --git a/libs/idna-3.6.dist-info/LICENSE.md b/libs/idna-3.10.dist-info/LICENSE.md
similarity index 96%
rename from libs/idna-3.6.dist-info/LICENSE.md
rename to libs/idna-3.10.dist-info/LICENSE.md
index ce3670186..19b6b4524 100644
--- a/libs/idna-3.6.dist-info/LICENSE.md
+++ b/libs/idna-3.10.dist-info/LICENSE.md
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2013-2023, Kim Davies and contributors.
+Copyright (c) 2013-2024, Kim Davies and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/libs/idna-3.6.dist-info/METADATA b/libs/idna-3.10.dist-info/METADATA
similarity index 93%
rename from libs/idna-3.6.dist-info/METADATA
rename to libs/idna-3.10.dist-info/METADATA
index 9be806093..c42623e94 100644
--- a/libs/idna-3.6.dist-info/METADATA
+++ b/libs/idna-3.10.dist-info/METADATA
@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: idna
-Version: 3.6
+Version: 3.10
 Summary: Internationalized Domain Names in Applications (IDNA)
 Author-email: Kim Davies <kim+pypi@gumleaf.org>
-Requires-Python: >=3.5
+Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -13,7 +13,6 @@ 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.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
@@ -21,14 +20,20 @@ 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)
 =====================================================
@@ -115,7 +120,9 @@ 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.
+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).
@@ -215,7 +222,7 @@ 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.5 and higher.
+* **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.
@@ -223,9 +230,9 @@ Additional Notes
   maintenance burden has become too high.
 
 * **Python 2**. Python 2 is supported by version 2.x of this library.
-  While active development of the version 2.x series has ended, notable
-  issues being corrected may be backported to 2.x. Use "idna<3" in your
-  requirements file if you need this library for a Python 2 application.
+  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
diff --git a/libs/idna-3.10.dist-info/RECORD b/libs/idna-3.10.dist-info/RECORD
new file mode 100644
index 000000000..9a78b9871
--- /dev/null
+++ b/libs/idna-3.10.dist-info/RECORD
@@ -0,0 +1,15 @@
+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/importlib_metadata-7.0.1.dist-info/REQUESTED b/libs/idna-3.10.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_metadata-7.0.1.dist-info/REQUESTED
rename to libs/idna-3.10.dist-info/REQUESTED
diff --git a/libs/blinker-1.7.0.dist-info/WHEEL b/libs/idna-3.10.dist-info/WHEEL
similarity index 100%
rename from libs/blinker-1.7.0.dist-info/WHEEL
rename to libs/idna-3.10.dist-info/WHEEL
diff --git a/libs/idna-3.6.dist-info/RECORD b/libs/idna-3.6.dist-info/RECORD
deleted file mode 100644
index 335c17aef..000000000
--- a/libs/idna-3.6.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-idna-3.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-idna-3.6.dist-info/LICENSE.md,sha256=yy-vDKGMbTh-x8tm8yGTn7puZ-nawJ0xR3y52NP-aJk,1541
-idna-3.6.dist-info/METADATA,sha256=N93B509dkvvkd_Y0E_VxCHPkVkrD6InxoyfXvX4egds,9888
-idna-3.6.dist-info/RECORD,,
-idna-3.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-idna-3.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-idna/__init__.py,sha256=KJQN1eQBr8iIK5SKrJ47lXvxG0BJ7Lm38W4zT0v_8lk,849
-idna/codec.py,sha256=PS6m-XmdST7Wj7J7ulRMakPDt5EBJyYrT3CPtjh-7t4,3426
-idna/compat.py,sha256=0_sOEUMT4CVw9doD3vyRhX80X19PwqFoUBs7gWsFME4,321
-idna/core.py,sha256=Bxz9L1rH0N5U-yukGfPuDRTxR2jDUl96NCq1ql3YAUw,12908
-idna/idnadata.py,sha256=9u3Ec_GRrhlcbs7QM3pAZ2ObEQzPIOm99FaVOm91UGg,44351
-idna/intranges.py,sha256=YBr4fRYuWH7kTKS2tXlFjM24ZF1Pdvcir-aywniInqg,1881
-idna/package_data.py,sha256=y-iv-qJdmHsWVR5FszYwsMo1AQg8qpdU2aU5nT-S2oQ,21
-idna/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-idna/uts46data.py,sha256=1KuksWqLuccPXm2uyRVkhfiFLNIhM_H2m4azCcnOqEU,206503
diff --git a/libs/idna/__init__.py b/libs/idna/__init__.py
index a40eeafcc..cfdc030a7 100644
--- a/libs/idna/__init__.py
+++ b/libs/idna/__init__.py
@@ -1,4 +1,3 @@
-from .package_data import __version__
 from .core import (
     IDNABidiError,
     IDNAError,
@@ -20,8 +19,10 @@ from .core import (
     valid_string_length,
 )
 from .intranges import intranges_contain
+from .package_data import __version__
 
 __all__ = [
+    "__version__",
     "IDNABidiError",
     "IDNAError",
     "InvalidCodepoint",
diff --git a/libs/idna/codec.py b/libs/idna/codec.py
index c855a4de6..913abfd6a 100644
--- a/libs/idna/codec.py
+++ b/libs/idna/codec.py
@@ -1,49 +1,51 @@
-from .core import encode, decode, alabel, ulabel, IDNAError
 import codecs
 import re
-from typing import Any, Tuple, Optional
+from typing import Any, Optional, Tuple
+
+from .core import IDNAError, alabel, decode, encode, ulabel
+
+_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
 
-_unicode_dots_re = re.compile('[\u002e\u3002\uff0e\uff61]')
 
 class Codec(codecs.Codec):
-
-    def encode(self, data: str, errors: str = 'strict') -> Tuple[bytes, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+    def encode(self, data: str, errors: str = "strict") -> Tuple[bytes, int]:
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
             return b"", 0
 
         return encode(data), len(data)
 
-    def decode(self, data: bytes, errors: str = 'strict') -> Tuple[str, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+    def decode(self, data: bytes, errors: str = "strict") -> Tuple[str, int]:
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return '', 0
+            return "", 0
 
         return decode(data), len(data)
 
+
 class IncrementalEncoder(codecs.BufferedIncrementalEncoder):
     def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[bytes, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return b'', 0
+            return b"", 0
 
         labels = _unicode_dots_re.split(data)
-        trailing_dot = b''
+        trailing_dot = b""
         if labels:
             if not labels[-1]:
-                trailing_dot = b'.'
+                trailing_dot = b"."
                 del labels[-1]
             elif not final:
                 # Keep potentially unfinished label until the next call
                 del labels[-1]
                 if labels:
-                    trailing_dot = b'.'
+                    trailing_dot = b"."
 
         result = []
         size = 0
@@ -54,32 +56,33 @@ class IncrementalEncoder(codecs.BufferedIncrementalEncoder):
             size += len(label)
 
         # Join with U+002E
-        result_bytes = b'.'.join(result) + trailing_dot
+        result_bytes = b".".join(result) + trailing_dot
         size += len(trailing_dot)
         return result_bytes, size
 
+
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
     def _buffer_decode(self, data: Any, errors: str, final: bool) -> Tuple[str, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return ('', 0)
+            return ("", 0)
 
         if not isinstance(data, str):
-            data = str(data, 'ascii')
+            data = str(data, "ascii")
 
         labels = _unicode_dots_re.split(data)
-        trailing_dot = ''
+        trailing_dot = ""
         if labels:
             if not labels[-1]:
-                trailing_dot = '.'
+                trailing_dot = "."
                 del labels[-1]
             elif not final:
                 # Keep potentially unfinished label until the next call
                 del labels[-1]
                 if labels:
-                    trailing_dot = '.'
+                    trailing_dot = "."
 
         result = []
         size = 0
@@ -89,7 +92,7 @@ class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
                 size += 1
             size += len(label)
 
-        result_str = '.'.join(result) + trailing_dot
+        result_str = ".".join(result) + trailing_dot
         size += len(trailing_dot)
         return (result_str, size)
 
@@ -103,7 +106,7 @@ class StreamReader(Codec, codecs.StreamReader):
 
 
 def search_function(name: str) -> Optional[codecs.CodecInfo]:
-    if name != 'idna2008':
+    if name != "idna2008":
         return None
     return codecs.CodecInfo(
         name=name,
@@ -115,4 +118,5 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
         streamreader=StreamReader,
     )
 
+
 codecs.register(search_function)
diff --git a/libs/idna/compat.py b/libs/idna/compat.py
index 786e6bda6..1df9f2a70 100644
--- a/libs/idna/compat.py
+++ b/libs/idna/compat.py
@@ -1,13 +1,15 @@
-from .core import *
-from .codec import *
 from typing import Any, Union
 
+from .core import decode, encode
+
+
 def ToASCII(label: str) -> bytes:
     return encode(label)
 
+
 def ToUnicode(label: Union[bytes, bytearray]) -> str:
     return decode(label)
 
-def nameprep(s: Any) -> None:
-    raise NotImplementedError('IDNA 2008 does not utilise nameprep protocol')
 
+def nameprep(s: Any) -> None:
+    raise NotImplementedError("IDNA 2008 does not utilise nameprep protocol")
diff --git a/libs/idna/core.py b/libs/idna/core.py
index aaf7d658b..9115f123f 100644
--- a/libs/idna/core.py
+++ b/libs/idna/core.py
@@ -1,31 +1,37 @@
-from . import idnadata
 import bisect
-import unicodedata
 import re
-from typing import Union, Optional
+import unicodedata
+from typing import Optional, Union
+
+from . import idnadata
 from .intranges import intranges_contain
 
 _virama_combining_class = 9
-_alabel_prefix = b'xn--'
-_unicode_dots_re = re.compile('[\u002e\u3002\uff0e\uff61]')
+_alabel_prefix = b"xn--"
+_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
+
 
 class IDNAError(UnicodeError):
-    """ Base exception for all IDNA-encoding related problems """
+    """Base exception for all IDNA-encoding related problems"""
+
     pass
 
 
 class IDNABidiError(IDNAError):
-    """ Exception when bidirectional requirements are not satisfied """
+    """Exception when bidirectional requirements are not satisfied"""
+
     pass
 
 
 class InvalidCodepoint(IDNAError):
-    """ Exception when a disallowed or unallocated codepoint is used """
+    """Exception when a disallowed or unallocated codepoint is used"""
+
     pass
 
 
 class InvalidCodepointContext(IDNAError):
-    """ Exception when the codepoint is not valid in the context it is used """
+    """Exception when the codepoint is not valid in the context it is used"""
+
     pass
 
 
@@ -33,17 +39,20 @@ def _combining_class(cp: int) -> int:
     v = unicodedata.combining(chr(cp))
     if v == 0:
         if not unicodedata.name(chr(cp)):
-            raise ValueError('Unknown character in unicodedata')
+            raise ValueError("Unknown character in unicodedata")
     return v
 
+
 def _is_script(cp: str, script: str) -> bool:
     return intranges_contain(ord(cp), idnadata.scripts[script])
 
+
 def _punycode(s: str) -> bytes:
-    return s.encode('punycode')
+    return s.encode("punycode")
+
 
 def _unot(s: int) -> str:
-    return 'U+{:04X}'.format(s)
+    return "U+{:04X}".format(s)
 
 
 def valid_label_length(label: Union[bytes, str]) -> bool:
@@ -61,158 +70,170 @@ def valid_string_length(label: Union[bytes, str], trailing_dot: bool) -> bool:
 def check_bidi(label: str, check_ltr: bool = False) -> bool:
     # Bidi rules should only be applied if string contains RTL characters
     bidi_label = False
-    for (idx, cp) in enumerate(label, 1):
+    for idx, cp in enumerate(label, 1):
         direction = unicodedata.bidirectional(cp)
-        if direction == '':
+        if direction == "":
             # String likely comes from a newer version of Unicode
-            raise IDNABidiError('Unknown directionality in label {} at position {}'.format(repr(label), idx))
-        if direction in ['R', 'AL', 'AN']:
+            raise IDNABidiError("Unknown directionality in label {} at position {}".format(repr(label), idx))
+        if direction in ["R", "AL", "AN"]:
             bidi_label = True
     if not bidi_label and not check_ltr:
         return True
 
     # Bidi rule 1
     direction = unicodedata.bidirectional(label[0])
-    if direction in ['R', 'AL']:
+    if direction in ["R", "AL"]:
         rtl = True
-    elif direction == 'L':
+    elif direction == "L":
         rtl = False
     else:
-        raise IDNABidiError('First codepoint in label {} must be directionality L, R or AL'.format(repr(label)))
+        raise IDNABidiError("First codepoint in label {} must be directionality L, R or AL".format(repr(label)))
 
     valid_ending = False
-    number_type = None  # type: Optional[str]
-    for (idx, cp) in enumerate(label, 1):
+    number_type: Optional[str] = None
+    for idx, cp in enumerate(label, 1):
         direction = unicodedata.bidirectional(cp)
 
         if rtl:
             # Bidi rule 2
-            if not direction in ['R', 'AL', 'AN', 'EN', 'ES', 'CS', 'ET', 'ON', 'BN', 'NSM']:
-                raise IDNABidiError('Invalid direction for codepoint at position {} in a right-to-left label'.format(idx))
+            if direction not in [
+                "R",
+                "AL",
+                "AN",
+                "EN",
+                "ES",
+                "CS",
+                "ET",
+                "ON",
+                "BN",
+                "NSM",
+            ]:
+                raise IDNABidiError("Invalid direction for codepoint at position {} in a right-to-left label".format(idx))
             # Bidi rule 3
-            if direction in ['R', 'AL', 'EN', 'AN']:
+            if direction in ["R", "AL", "EN", "AN"]:
                 valid_ending = True
-            elif direction != 'NSM':
+            elif direction != "NSM":
                 valid_ending = False
             # Bidi rule 4
-            if direction in ['AN', 'EN']:
+            if direction in ["AN", "EN"]:
                 if not number_type:
                     number_type = direction
                 else:
                     if number_type != direction:
-                        raise IDNABidiError('Can not mix numeral types in a right-to-left label')
+                        raise IDNABidiError("Can not mix numeral types in a right-to-left label")
         else:
             # Bidi rule 5
-            if not direction in ['L', 'EN', 'ES', 'CS', 'ET', 'ON', 'BN', 'NSM']:
-                raise IDNABidiError('Invalid direction for codepoint at position {} in a left-to-right label'.format(idx))
+            if direction not in ["L", "EN", "ES", "CS", "ET", "ON", "BN", "NSM"]:
+                raise IDNABidiError("Invalid direction for codepoint at position {} in a left-to-right label".format(idx))
             # Bidi rule 6
-            if direction in ['L', 'EN']:
+            if direction in ["L", "EN"]:
                 valid_ending = True
-            elif direction != 'NSM':
+            elif direction != "NSM":
                 valid_ending = False
 
     if not valid_ending:
-        raise IDNABidiError('Label ends with illegal codepoint directionality')
+        raise IDNABidiError("Label ends with illegal codepoint directionality")
 
     return True
 
 
 def check_initial_combiner(label: str) -> bool:
-    if unicodedata.category(label[0])[0] == 'M':
-        raise IDNAError('Label begins with an illegal combining character')
+    if unicodedata.category(label[0])[0] == "M":
+        raise IDNAError("Label begins with an illegal combining character")
     return True
 
 
 def check_hyphen_ok(label: str) -> bool:
-    if label[2:4] == '--':
-        raise IDNAError('Label has disallowed hyphens in 3rd and 4th position')
-    if label[0] == '-' or label[-1] == '-':
-        raise IDNAError('Label must not start or end with a hyphen')
+    if label[2:4] == "--":
+        raise IDNAError("Label has disallowed hyphens in 3rd and 4th position")
+    if label[0] == "-" or label[-1] == "-":
+        raise IDNAError("Label must not start or end with a hyphen")
     return True
 
 
 def check_nfc(label: str) -> None:
-    if unicodedata.normalize('NFC', label) != label:
-        raise IDNAError('Label must be in Normalization Form C')
+    if unicodedata.normalize("NFC", label) != label:
+        raise IDNAError("Label must be in Normalization Form C")
 
 
 def valid_contextj(label: str, pos: int) -> bool:
     cp_value = ord(label[pos])
 
-    if cp_value == 0x200c:
-
+    if cp_value == 0x200C:
         if pos > 0:
             if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
                 return True
 
         ok = False
-        for i in range(pos-1, -1, -1):
+        for i in range(pos - 1, -1, -1):
             joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord('T'):
+            if joining_type == ord("T"):
                 continue
-            if joining_type in [ord('L'), ord('D')]:
+            elif joining_type in [ord("L"), ord("D")]:
                 ok = True
                 break
+            else:
+                break
 
         if not ok:
             return False
 
         ok = False
-        for i in range(pos+1, len(label)):
+        for i in range(pos + 1, len(label)):
             joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord('T'):
+            if joining_type == ord("T"):
                 continue
-            if joining_type in [ord('R'), ord('D')]:
+            elif joining_type in [ord("R"), ord("D")]:
                 ok = True
                 break
+            else:
+                break
         return ok
 
-    if cp_value == 0x200d:
-
+    if cp_value == 0x200D:
         if pos > 0:
             if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
                 return True
         return False
 
     else:
-
         return False
 
 
 def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
     cp_value = ord(label[pos])
 
-    if cp_value == 0x00b7:
-        if 0 < pos < len(label)-1:
-            if ord(label[pos - 1]) == 0x006c and ord(label[pos + 1]) == 0x006c:
+    if cp_value == 0x00B7:
+        if 0 < pos < len(label) - 1:
+            if ord(label[pos - 1]) == 0x006C and ord(label[pos + 1]) == 0x006C:
                 return True
         return False
 
     elif cp_value == 0x0375:
-        if pos < len(label)-1 and len(label) > 1:
-            return _is_script(label[pos + 1], 'Greek')
+        if pos < len(label) - 1 and len(label) > 1:
+            return _is_script(label[pos + 1], "Greek")
         return False
 
-    elif cp_value == 0x05f3 or cp_value == 0x05f4:
+    elif cp_value == 0x05F3 or cp_value == 0x05F4:
         if pos > 0:
-            return _is_script(label[pos - 1], 'Hebrew')
+            return _is_script(label[pos - 1], "Hebrew")
         return False
 
-    elif cp_value == 0x30fb:
+    elif cp_value == 0x30FB:
         for cp in label:
-            if cp == '\u30fb':
+            if cp == "\u30fb":
                 continue
-            if _is_script(cp, 'Hiragana') or _is_script(cp, 'Katakana') or _is_script(cp, 'Han'):
+            if _is_script(cp, "Hiragana") or _is_script(cp, "Katakana") or _is_script(cp, "Han"):
                 return True
         return False
 
     elif 0x660 <= cp_value <= 0x669:
         for cp in label:
-            if 0x6f0 <= ord(cp) <= 0x06f9:
+            if 0x6F0 <= ord(cp) <= 0x06F9:
                 return False
         return True
 
-    elif 0x6f0 <= cp_value <= 0x6f9:
+    elif 0x6F0 <= cp_value <= 0x6F9:
         for cp in label:
             if 0x660 <= ord(cp) <= 0x0669:
                 return False
@@ -223,55 +244,58 @@ def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
 
 def check_label(label: Union[str, bytes, bytearray]) -> None:
     if isinstance(label, (bytes, bytearray)):
-        label = label.decode('utf-8')
+        label = label.decode("utf-8")
     if len(label) == 0:
-        raise IDNAError('Empty Label')
+        raise IDNAError("Empty Label")
 
     check_nfc(label)
     check_hyphen_ok(label)
     check_initial_combiner(label)
 
-    for (pos, cp) in enumerate(label):
+    for pos, cp in enumerate(label):
         cp_value = ord(cp)
-        if intranges_contain(cp_value, idnadata.codepoint_classes['PVALID']):
+        if intranges_contain(cp_value, idnadata.codepoint_classes["PVALID"]):
             continue
-        elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTJ']):
+        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTJ"]):
             try:
                 if not valid_contextj(label, pos):
-                    raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
-                        _unot(cp_value), pos+1, repr(label)))
+                    raise InvalidCodepointContext(
+                        "Joiner {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
+                    )
             except ValueError:
-                raise IDNAError('Unknown codepoint adjacent to joiner {} at position {} in {}'.format(
-                    _unot(cp_value), pos+1, repr(label)))
-        elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTO']):
+                raise IDNAError(
+                    "Unknown codepoint adjacent to joiner {} at position {} in {}".format(
+                        _unot(cp_value), pos + 1, repr(label)
+                    )
+                )
+        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTO"]):
             if not valid_contexto(label, pos):
-                raise InvalidCodepointContext('Codepoint {} not allowed at position {} in {}'.format(_unot(cp_value), pos+1, repr(label)))
+                raise InvalidCodepointContext(
+                    "Codepoint {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
+                )
         else:
-            raise InvalidCodepoint('Codepoint {} at position {} of {} not allowed'.format(_unot(cp_value), pos+1, repr(label)))
+            raise InvalidCodepoint(
+                "Codepoint {} at position {} of {} not allowed".format(_unot(cp_value), pos + 1, repr(label))
+            )
 
     check_bidi(label)
 
 
 def alabel(label: str) -> bytes:
     try:
-        label_bytes = label.encode('ascii')
+        label_bytes = label.encode("ascii")
         ulabel(label_bytes)
         if not valid_label_length(label_bytes):
-            raise IDNAError('Label too long')
+            raise IDNAError("Label too long")
         return label_bytes
     except UnicodeEncodeError:
         pass
 
-    if not label:
-        raise IDNAError('No Input')
-
-    label = str(label)
     check_label(label)
-    label_bytes = _punycode(label)
-    label_bytes = _alabel_prefix + label_bytes
+    label_bytes = _alabel_prefix + _punycode(label)
 
     if not valid_label_length(label_bytes):
-        raise IDNAError('Label too long')
+        raise IDNAError("Label too long")
 
     return label_bytes
 
@@ -279,7 +303,7 @@ def alabel(label: str) -> bytes:
 def ulabel(label: Union[str, bytes, bytearray]) -> str:
     if not isinstance(label, (bytes, bytearray)):
         try:
-            label_bytes = label.encode('ascii')
+            label_bytes = label.encode("ascii")
         except UnicodeEncodeError:
             check_label(label)
             return label
@@ -288,19 +312,19 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
 
     label_bytes = label_bytes.lower()
     if label_bytes.startswith(_alabel_prefix):
-        label_bytes = label_bytes[len(_alabel_prefix):]
+        label_bytes = label_bytes[len(_alabel_prefix) :]
         if not label_bytes:
-            raise IDNAError('Malformed A-label, no Punycode eligible content found')
-        if label_bytes.decode('ascii')[-1] == '-':
-            raise IDNAError('A-label must not end with a hyphen')
+            raise IDNAError("Malformed A-label, no Punycode eligible content found")
+        if label_bytes.decode("ascii")[-1] == "-":
+            raise IDNAError("A-label must not end with a hyphen")
     else:
         check_label(label_bytes)
-        return label_bytes.decode('ascii')
+        return label_bytes.decode("ascii")
 
     try:
-        label = label_bytes.decode('punycode')
+        label = label_bytes.decode("punycode")
     except UnicodeError:
-        raise IDNAError('Invalid A-label')
+        raise IDNAError("Invalid A-label")
     check_label(label)
     return label
 
@@ -308,52 +332,60 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
 def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False) -> str:
     """Re-map the characters in the string according to UTS46 processing."""
     from .uts46data import uts46data
-    output = ''
+
+    output = ""
 
     for pos, char in enumerate(domain):
         code_point = ord(char)
         try:
-            uts46row = uts46data[code_point if code_point < 256 else
-                bisect.bisect_left(uts46data, (code_point, 'Z')) - 1]
+            uts46row = uts46data[code_point if code_point < 256 else bisect.bisect_left(uts46data, (code_point, "Z")) - 1]
             status = uts46row[1]
-            replacement = None  # type: Optional[str]
+            replacement: Optional[str] = None
             if len(uts46row) == 3:
                 replacement = uts46row[2]
-            if (status == 'V' or
-                    (status == 'D' and not transitional) or
-                    (status == '3' and not std3_rules and replacement is None)):
+            if (
+                status == "V"
+                or (status == "D" and not transitional)
+                or (status == "3" and not std3_rules and replacement is None)
+            ):
                 output += char
-            elif replacement is not None and (status == 'M' or
-                    (status == '3' and not std3_rules) or
-                    (status == 'D' and transitional)):
+            elif replacement is not None and (
+                status == "M" or (status == "3" and not std3_rules) or (status == "D" and transitional)
+            ):
                 output += replacement
-            elif status != 'I':
+            elif status != "I":
                 raise IndexError()
         except IndexError:
             raise InvalidCodepoint(
-                'Codepoint {} not allowed at position {} in {}'.format(
-                _unot(code_point), pos + 1, repr(domain)))
+                "Codepoint {} not allowed at position {} in {}".format(_unot(code_point), pos + 1, repr(domain))
+            )
 
-    return unicodedata.normalize('NFC', output)
+    return unicodedata.normalize("NFC", output)
 
 
-def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False, transitional: bool = False) -> bytes:
+def encode(
+    s: Union[str, bytes, bytearray],
+    strict: bool = False,
+    uts46: bool = False,
+    std3_rules: bool = False,
+    transitional: bool = False,
+) -> bytes:
     if not isinstance(s, str):
         try:
-            s = str(s, 'ascii')
+            s = str(s, "ascii")
         except UnicodeDecodeError:
-            raise IDNAError('should pass a unicode string to the function rather than a byte string.')
+            raise IDNAError("should pass a unicode string to the function rather than a byte string.")
     if uts46:
         s = uts46_remap(s, std3_rules, transitional)
     trailing_dot = False
     result = []
     if strict:
-        labels = s.split('.')
+        labels = s.split(".")
     else:
         labels = _unicode_dots_re.split(s)
-    if not labels or labels == ['']:
-        raise IDNAError('Empty domain')
-    if labels[-1] == '':
+    if not labels or labels == [""]:
+        raise IDNAError("Empty domain")
+    if labels[-1] == "":
         del labels[-1]
         trailing_dot = True
     for label in labels:
@@ -361,21 +393,26 @@ def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
         if s:
             result.append(s)
         else:
-            raise IDNAError('Empty label')
+            raise IDNAError("Empty label")
     if trailing_dot:
-        result.append(b'')
-    s = b'.'.join(result)
+        result.append(b"")
+    s = b".".join(result)
     if not valid_string_length(s, trailing_dot):
-        raise IDNAError('Domain too long')
+        raise IDNAError("Domain too long")
     return s
 
 
-def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False) -> str:
+def decode(
+    s: Union[str, bytes, bytearray],
+    strict: bool = False,
+    uts46: bool = False,
+    std3_rules: bool = False,
+) -> str:
     try:
         if not isinstance(s, str):
-            s = str(s, 'ascii')
+            s = str(s, "ascii")
     except UnicodeDecodeError:
-        raise IDNAError('Invalid ASCII in A-label')
+        raise IDNAError("Invalid ASCII in A-label")
     if uts46:
         s = uts46_remap(s, std3_rules, False)
     trailing_dot = False
@@ -383,9 +420,9 @@ def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
     if not strict:
         labels = _unicode_dots_re.split(s)
     else:
-        labels = s.split('.')
-    if not labels or labels == ['']:
-        raise IDNAError('Empty domain')
+        labels = s.split(".")
+    if not labels or labels == [""]:
+        raise IDNAError("Empty domain")
     if not labels[-1]:
         del labels[-1]
         trailing_dot = True
@@ -394,7 +431,7 @@ def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
         if s:
             result.append(s)
         else:
-            raise IDNAError('Empty label')
+            raise IDNAError("Empty label")
     if trailing_dot:
-        result.append('')
-    return '.'.join(result)
+        result.append("")
+    return ".".join(result)
diff --git a/libs/idna/idnadata.py b/libs/idna/idnadata.py
index 5cd05d905..4be600462 100644
--- a/libs/idna/idnadata.py
+++ b/libs/idna/idnadata.py
@@ -1,116 +1,290 @@
 # This file is automatically generated by tools/idna-data
 
-__version__ = '15.1.0'
+__version__ = "15.1.0"
 scripts = {
-    'Greek': (
+    "Greek": (
         0x37000000374,
         0x37500000378,
-        0x37a0000037e,
-        0x37f00000380,
+        0x37A0000037E,
+        0x37F00000380,
         0x38400000385,
         0x38600000387,
-        0x3880000038b,
-        0x38c0000038d,
-        0x38e000003a2,
-        0x3a3000003e2,
-        0x3f000000400,
-        0x1d2600001d2b,
-        0x1d5d00001d62,
-        0x1d6600001d6b,
-        0x1dbf00001dc0,
-        0x1f0000001f16,
-        0x1f1800001f1e,
-        0x1f2000001f46,
-        0x1f4800001f4e,
-        0x1f5000001f58,
-        0x1f5900001f5a,
-        0x1f5b00001f5c,
-        0x1f5d00001f5e,
-        0x1f5f00001f7e,
-        0x1f8000001fb5,
-        0x1fb600001fc5,
-        0x1fc600001fd4,
-        0x1fd600001fdc,
-        0x1fdd00001ff0,
-        0x1ff200001ff5,
-        0x1ff600001fff,
+        0x3880000038B,
+        0x38C0000038D,
+        0x38E000003A2,
+        0x3A3000003E2,
+        0x3F000000400,
+        0x1D2600001D2B,
+        0x1D5D00001D62,
+        0x1D6600001D6B,
+        0x1DBF00001DC0,
+        0x1F0000001F16,
+        0x1F1800001F1E,
+        0x1F2000001F46,
+        0x1F4800001F4E,
+        0x1F5000001F58,
+        0x1F5900001F5A,
+        0x1F5B00001F5C,
+        0x1F5D00001F5E,
+        0x1F5F00001F7E,
+        0x1F8000001FB5,
+        0x1FB600001FC5,
+        0x1FC600001FD4,
+        0x1FD600001FDC,
+        0x1FDD00001FF0,
+        0x1FF200001FF5,
+        0x1FF600001FFF,
         0x212600002127,
-        0xab650000ab66,
-        0x101400001018f,
-        0x101a0000101a1,
-        0x1d2000001d246,
+        0xAB650000AB66,
+        0x101400001018F,
+        0x101A0000101A1,
+        0x1D2000001D246,
     ),
-    'Han': (
-        0x2e8000002e9a,
-        0x2e9b00002ef4,
-        0x2f0000002fd6,
+    "Han": (
+        0x2E8000002E9A,
+        0x2E9B00002EF4,
+        0x2F0000002FD6,
         0x300500003006,
         0x300700003008,
-        0x30210000302a,
-        0x30380000303c,
-        0x340000004dc0,
-        0x4e000000a000,
-        0xf9000000fa6e,
-        0xfa700000fada,
-        0x16fe200016fe4,
-        0x16ff000016ff2,
-        0x200000002a6e0,
-        0x2a7000002b73a,
-        0x2b7400002b81e,
-        0x2b8200002cea2,
-        0x2ceb00002ebe1,
-        0x2ebf00002ee5e,
-        0x2f8000002fa1e,
-        0x300000003134b,
-        0x31350000323b0,
+        0x30210000302A,
+        0x30380000303C,
+        0x340000004DC0,
+        0x4E000000A000,
+        0xF9000000FA6E,
+        0xFA700000FADA,
+        0x16FE200016FE4,
+        0x16FF000016FF2,
+        0x200000002A6E0,
+        0x2A7000002B73A,
+        0x2B7400002B81E,
+        0x2B8200002CEA2,
+        0x2CEB00002EBE1,
+        0x2EBF00002EE5E,
+        0x2F8000002FA1E,
+        0x300000003134B,
+        0x31350000323B0,
     ),
-    'Hebrew': (
-        0x591000005c8,
-        0x5d0000005eb,
-        0x5ef000005f5,
-        0xfb1d0000fb37,
-        0xfb380000fb3d,
-        0xfb3e0000fb3f,
-        0xfb400000fb42,
-        0xfb430000fb45,
-        0xfb460000fb50,
+    "Hebrew": (
+        0x591000005C8,
+        0x5D0000005EB,
+        0x5EF000005F5,
+        0xFB1D0000FB37,
+        0xFB380000FB3D,
+        0xFB3E0000FB3F,
+        0xFB400000FB42,
+        0xFB430000FB45,
+        0xFB460000FB50,
     ),
-    'Hiragana': (
+    "Hiragana": (
         0x304100003097,
-        0x309d000030a0,
-        0x1b0010001b120,
-        0x1b1320001b133,
-        0x1b1500001b153,
-        0x1f2000001f201,
+        0x309D000030A0,
+        0x1B0010001B120,
+        0x1B1320001B133,
+        0x1B1500001B153,
+        0x1F2000001F201,
     ),
-    'Katakana': (
-        0x30a1000030fb,
-        0x30fd00003100,
-        0x31f000003200,
-        0x32d0000032ff,
+    "Katakana": (
+        0x30A1000030FB,
+        0x30FD00003100,
+        0x31F000003200,
+        0x32D0000032FF,
         0x330000003358,
-        0xff660000ff70,
-        0xff710000ff9e,
-        0x1aff00001aff4,
-        0x1aff50001affc,
-        0x1affd0001afff,
-        0x1b0000001b001,
-        0x1b1200001b123,
-        0x1b1550001b156,
-        0x1b1640001b168,
+        0xFF660000FF70,
+        0xFF710000FF9E,
+        0x1AFF00001AFF4,
+        0x1AFF50001AFFC,
+        0x1AFFD0001AFFF,
+        0x1B0000001B001,
+        0x1B1200001B123,
+        0x1B1550001B156,
+        0x1B1640001B168,
     ),
 }
 joining_types = {
-    0x600: 85,
-    0x601: 85,
-    0x602: 85,
-    0x603: 85,
-    0x604: 85,
-    0x605: 85,
-    0x608: 85,
-    0x60b: 85,
+    0xAD: 84,
+    0x300: 84,
+    0x301: 84,
+    0x302: 84,
+    0x303: 84,
+    0x304: 84,
+    0x305: 84,
+    0x306: 84,
+    0x307: 84,
+    0x308: 84,
+    0x309: 84,
+    0x30A: 84,
+    0x30B: 84,
+    0x30C: 84,
+    0x30D: 84,
+    0x30E: 84,
+    0x30F: 84,
+    0x310: 84,
+    0x311: 84,
+    0x312: 84,
+    0x313: 84,
+    0x314: 84,
+    0x315: 84,
+    0x316: 84,
+    0x317: 84,
+    0x318: 84,
+    0x319: 84,
+    0x31A: 84,
+    0x31B: 84,
+    0x31C: 84,
+    0x31D: 84,
+    0x31E: 84,
+    0x31F: 84,
+    0x320: 84,
+    0x321: 84,
+    0x322: 84,
+    0x323: 84,
+    0x324: 84,
+    0x325: 84,
+    0x326: 84,
+    0x327: 84,
+    0x328: 84,
+    0x329: 84,
+    0x32A: 84,
+    0x32B: 84,
+    0x32C: 84,
+    0x32D: 84,
+    0x32E: 84,
+    0x32F: 84,
+    0x330: 84,
+    0x331: 84,
+    0x332: 84,
+    0x333: 84,
+    0x334: 84,
+    0x335: 84,
+    0x336: 84,
+    0x337: 84,
+    0x338: 84,
+    0x339: 84,
+    0x33A: 84,
+    0x33B: 84,
+    0x33C: 84,
+    0x33D: 84,
+    0x33E: 84,
+    0x33F: 84,
+    0x340: 84,
+    0x341: 84,
+    0x342: 84,
+    0x343: 84,
+    0x344: 84,
+    0x345: 84,
+    0x346: 84,
+    0x347: 84,
+    0x348: 84,
+    0x349: 84,
+    0x34A: 84,
+    0x34B: 84,
+    0x34C: 84,
+    0x34D: 84,
+    0x34E: 84,
+    0x34F: 84,
+    0x350: 84,
+    0x351: 84,
+    0x352: 84,
+    0x353: 84,
+    0x354: 84,
+    0x355: 84,
+    0x356: 84,
+    0x357: 84,
+    0x358: 84,
+    0x359: 84,
+    0x35A: 84,
+    0x35B: 84,
+    0x35C: 84,
+    0x35D: 84,
+    0x35E: 84,
+    0x35F: 84,
+    0x360: 84,
+    0x361: 84,
+    0x362: 84,
+    0x363: 84,
+    0x364: 84,
+    0x365: 84,
+    0x366: 84,
+    0x367: 84,
+    0x368: 84,
+    0x369: 84,
+    0x36A: 84,
+    0x36B: 84,
+    0x36C: 84,
+    0x36D: 84,
+    0x36E: 84,
+    0x36F: 84,
+    0x483: 84,
+    0x484: 84,
+    0x485: 84,
+    0x486: 84,
+    0x487: 84,
+    0x488: 84,
+    0x489: 84,
+    0x591: 84,
+    0x592: 84,
+    0x593: 84,
+    0x594: 84,
+    0x595: 84,
+    0x596: 84,
+    0x597: 84,
+    0x598: 84,
+    0x599: 84,
+    0x59A: 84,
+    0x59B: 84,
+    0x59C: 84,
+    0x59D: 84,
+    0x59E: 84,
+    0x59F: 84,
+    0x5A0: 84,
+    0x5A1: 84,
+    0x5A2: 84,
+    0x5A3: 84,
+    0x5A4: 84,
+    0x5A5: 84,
+    0x5A6: 84,
+    0x5A7: 84,
+    0x5A8: 84,
+    0x5A9: 84,
+    0x5AA: 84,
+    0x5AB: 84,
+    0x5AC: 84,
+    0x5AD: 84,
+    0x5AE: 84,
+    0x5AF: 84,
+    0x5B0: 84,
+    0x5B1: 84,
+    0x5B2: 84,
+    0x5B3: 84,
+    0x5B4: 84,
+    0x5B5: 84,
+    0x5B6: 84,
+    0x5B7: 84,
+    0x5B8: 84,
+    0x5B9: 84,
+    0x5BA: 84,
+    0x5BB: 84,
+    0x5BC: 84,
+    0x5BD: 84,
+    0x5BF: 84,
+    0x5C1: 84,
+    0x5C2: 84,
+    0x5C4: 84,
+    0x5C5: 84,
+    0x5C7: 84,
+    0x610: 84,
+    0x611: 84,
+    0x612: 84,
+    0x613: 84,
+    0x614: 84,
+    0x615: 84,
+    0x616: 84,
+    0x617: 84,
+    0x618: 84,
+    0x619: 84,
+    0x61A: 84,
+    0x61C: 84,
     0x620: 68,
-    0x621: 85,
     0x622: 82,
     0x623: 82,
     0x624: 82,
@@ -119,12 +293,12 @@ joining_types = {
     0x627: 82,
     0x628: 68,
     0x629: 82,
-    0x62a: 68,
-    0x62b: 68,
-    0x62c: 68,
-    0x62d: 68,
-    0x62e: 68,
-    0x62f: 82,
+    0x62A: 68,
+    0x62B: 68,
+    0x62C: 68,
+    0x62D: 68,
+    0x62E: 68,
+    0x62F: 82,
     0x630: 82,
     0x631: 82,
     0x632: 82,
@@ -135,12 +309,12 @@ joining_types = {
     0x637: 68,
     0x638: 68,
     0x639: 68,
-    0x63a: 68,
-    0x63b: 68,
-    0x63c: 68,
-    0x63d: 68,
-    0x63e: 68,
-    0x63f: 68,
+    0x63A: 68,
+    0x63B: 68,
+    0x63C: 68,
+    0x63D: 68,
+    0x63E: 68,
+    0x63F: 68,
     0x640: 67,
     0x641: 68,
     0x642: 68,
@@ -151,24 +325,45 @@ joining_types = {
     0x647: 68,
     0x648: 82,
     0x649: 68,
-    0x64a: 68,
-    0x66e: 68,
-    0x66f: 68,
+    0x64A: 68,
+    0x64B: 84,
+    0x64C: 84,
+    0x64D: 84,
+    0x64E: 84,
+    0x64F: 84,
+    0x650: 84,
+    0x651: 84,
+    0x652: 84,
+    0x653: 84,
+    0x654: 84,
+    0x655: 84,
+    0x656: 84,
+    0x657: 84,
+    0x658: 84,
+    0x659: 84,
+    0x65A: 84,
+    0x65B: 84,
+    0x65C: 84,
+    0x65D: 84,
+    0x65E: 84,
+    0x65F: 84,
+    0x66E: 68,
+    0x66F: 68,
+    0x670: 84,
     0x671: 82,
     0x672: 82,
     0x673: 82,
-    0x674: 85,
     0x675: 82,
     0x676: 82,
     0x677: 82,
     0x678: 68,
     0x679: 68,
-    0x67a: 68,
-    0x67b: 68,
-    0x67c: 68,
-    0x67d: 68,
-    0x67e: 68,
-    0x67f: 68,
+    0x67A: 68,
+    0x67B: 68,
+    0x67C: 68,
+    0x67D: 68,
+    0x67E: 68,
+    0x67F: 68,
     0x680: 68,
     0x681: 68,
     0x682: 68,
@@ -179,12 +374,12 @@ joining_types = {
     0x687: 68,
     0x688: 82,
     0x689: 82,
-    0x68a: 82,
-    0x68b: 82,
-    0x68c: 82,
-    0x68d: 82,
-    0x68e: 82,
-    0x68f: 82,
+    0x68A: 82,
+    0x68B: 82,
+    0x68C: 82,
+    0x68D: 82,
+    0x68E: 82,
+    0x68F: 82,
     0x690: 82,
     0x691: 82,
     0x692: 82,
@@ -195,74 +390,93 @@ joining_types = {
     0x697: 82,
     0x698: 82,
     0x699: 82,
-    0x69a: 68,
-    0x69b: 68,
-    0x69c: 68,
-    0x69d: 68,
-    0x69e: 68,
-    0x69f: 68,
-    0x6a0: 68,
-    0x6a1: 68,
-    0x6a2: 68,
-    0x6a3: 68,
-    0x6a4: 68,
-    0x6a5: 68,
-    0x6a6: 68,
-    0x6a7: 68,
-    0x6a8: 68,
-    0x6a9: 68,
-    0x6aa: 68,
-    0x6ab: 68,
-    0x6ac: 68,
-    0x6ad: 68,
-    0x6ae: 68,
-    0x6af: 68,
-    0x6b0: 68,
-    0x6b1: 68,
-    0x6b2: 68,
-    0x6b3: 68,
-    0x6b4: 68,
-    0x6b5: 68,
-    0x6b6: 68,
-    0x6b7: 68,
-    0x6b8: 68,
-    0x6b9: 68,
-    0x6ba: 68,
-    0x6bb: 68,
-    0x6bc: 68,
-    0x6bd: 68,
-    0x6be: 68,
-    0x6bf: 68,
-    0x6c0: 82,
-    0x6c1: 68,
-    0x6c2: 68,
-    0x6c3: 82,
-    0x6c4: 82,
-    0x6c5: 82,
-    0x6c6: 82,
-    0x6c7: 82,
-    0x6c8: 82,
-    0x6c9: 82,
-    0x6ca: 82,
-    0x6cb: 82,
-    0x6cc: 68,
-    0x6cd: 82,
-    0x6ce: 68,
-    0x6cf: 82,
-    0x6d0: 68,
-    0x6d1: 68,
-    0x6d2: 82,
-    0x6d3: 82,
-    0x6d5: 82,
-    0x6dd: 85,
-    0x6ee: 82,
-    0x6ef: 82,
-    0x6fa: 68,
-    0x6fb: 68,
-    0x6fc: 68,
-    0x6ff: 68,
-    0x70f: 84,
+    0x69A: 68,
+    0x69B: 68,
+    0x69C: 68,
+    0x69D: 68,
+    0x69E: 68,
+    0x69F: 68,
+    0x6A0: 68,
+    0x6A1: 68,
+    0x6A2: 68,
+    0x6A3: 68,
+    0x6A4: 68,
+    0x6A5: 68,
+    0x6A6: 68,
+    0x6A7: 68,
+    0x6A8: 68,
+    0x6A9: 68,
+    0x6AA: 68,
+    0x6AB: 68,
+    0x6AC: 68,
+    0x6AD: 68,
+    0x6AE: 68,
+    0x6AF: 68,
+    0x6B0: 68,
+    0x6B1: 68,
+    0x6B2: 68,
+    0x6B3: 68,
+    0x6B4: 68,
+    0x6B5: 68,
+    0x6B6: 68,
+    0x6B7: 68,
+    0x6B8: 68,
+    0x6B9: 68,
+    0x6BA: 68,
+    0x6BB: 68,
+    0x6BC: 68,
+    0x6BD: 68,
+    0x6BE: 68,
+    0x6BF: 68,
+    0x6C0: 82,
+    0x6C1: 68,
+    0x6C2: 68,
+    0x6C3: 82,
+    0x6C4: 82,
+    0x6C5: 82,
+    0x6C6: 82,
+    0x6C7: 82,
+    0x6C8: 82,
+    0x6C9: 82,
+    0x6CA: 82,
+    0x6CB: 82,
+    0x6CC: 68,
+    0x6CD: 82,
+    0x6CE: 68,
+    0x6CF: 82,
+    0x6D0: 68,
+    0x6D1: 68,
+    0x6D2: 82,
+    0x6D3: 82,
+    0x6D5: 82,
+    0x6D6: 84,
+    0x6D7: 84,
+    0x6D8: 84,
+    0x6D9: 84,
+    0x6DA: 84,
+    0x6DB: 84,
+    0x6DC: 84,
+    0x6DF: 84,
+    0x6E0: 84,
+    0x6E1: 84,
+    0x6E2: 84,
+    0x6E3: 84,
+    0x6E4: 84,
+    0x6E7: 84,
+    0x6E8: 84,
+    0x6EA: 84,
+    0x6EB: 84,
+    0x6EC: 84,
+    0x6ED: 84,
+    0x6EE: 82,
+    0x6EF: 82,
+    0x6FA: 68,
+    0x6FB: 68,
+    0x6FC: 68,
+    0x6FF: 68,
+    0x70F: 84,
     0x710: 82,
+    0x711: 84,
     0x712: 68,
     0x713: 68,
     0x714: 68,
@@ -271,12 +485,12 @@ joining_types = {
     0x717: 82,
     0x718: 82,
     0x719: 82,
-    0x71a: 68,
-    0x71b: 68,
-    0x71c: 68,
-    0x71d: 68,
-    0x71e: 82,
-    0x71f: 68,
+    0x71A: 68,
+    0x71B: 68,
+    0x71C: 68,
+    0x71D: 68,
+    0x71E: 82,
+    0x71F: 68,
     0x720: 68,
     0x721: 68,
     0x722: 68,
@@ -287,15 +501,42 @@ joining_types = {
     0x727: 68,
     0x728: 82,
     0x729: 68,
-    0x72a: 82,
-    0x72b: 68,
-    0x72c: 82,
-    0x72d: 68,
-    0x72e: 68,
-    0x72f: 82,
-    0x74d: 82,
-    0x74e: 68,
-    0x74f: 68,
+    0x72A: 82,
+    0x72B: 68,
+    0x72C: 82,
+    0x72D: 68,
+    0x72E: 68,
+    0x72F: 82,
+    0x730: 84,
+    0x731: 84,
+    0x732: 84,
+    0x733: 84,
+    0x734: 84,
+    0x735: 84,
+    0x736: 84,
+    0x737: 84,
+    0x738: 84,
+    0x739: 84,
+    0x73A: 84,
+    0x73B: 84,
+    0x73C: 84,
+    0x73D: 84,
+    0x73E: 84,
+    0x73F: 84,
+    0x740: 84,
+    0x741: 84,
+    0x742: 84,
+    0x743: 84,
+    0x744: 84,
+    0x745: 84,
+    0x746: 84,
+    0x747: 84,
+    0x748: 84,
+    0x749: 84,
+    0x74A: 84,
+    0x74D: 82,
+    0x74E: 68,
+    0x74F: 68,
     0x750: 68,
     0x751: 68,
     0x752: 68,
@@ -306,12 +547,12 @@ joining_types = {
     0x757: 68,
     0x758: 68,
     0x759: 82,
-    0x75a: 82,
-    0x75b: 82,
-    0x75c: 68,
-    0x75d: 68,
-    0x75e: 68,
-    0x75f: 68,
+    0x75A: 82,
+    0x75B: 82,
+    0x75C: 68,
+    0x75D: 68,
+    0x75E: 68,
+    0x75F: 68,
     0x760: 68,
     0x761: 68,
     0x762: 68,
@@ -322,12 +563,12 @@ joining_types = {
     0x767: 68,
     0x768: 68,
     0x769: 68,
-    0x76a: 68,
-    0x76b: 82,
-    0x76c: 82,
-    0x76d: 68,
-    0x76e: 68,
-    0x76f: 68,
+    0x76A: 68,
+    0x76B: 82,
+    0x76C: 82,
+    0x76D: 68,
+    0x76E: 68,
+    0x76F: 68,
     0x770: 68,
     0x771: 82,
     0x772: 68,
@@ -338,46 +579,88 @@ joining_types = {
     0x777: 68,
     0x778: 82,
     0x779: 82,
-    0x77a: 68,
-    0x77b: 68,
-    0x77c: 68,
-    0x77d: 68,
-    0x77e: 68,
-    0x77f: 68,
-    0x7ca: 68,
-    0x7cb: 68,
-    0x7cc: 68,
-    0x7cd: 68,
-    0x7ce: 68,
-    0x7cf: 68,
-    0x7d0: 68,
-    0x7d1: 68,
-    0x7d2: 68,
-    0x7d3: 68,
-    0x7d4: 68,
-    0x7d5: 68,
-    0x7d6: 68,
-    0x7d7: 68,
-    0x7d8: 68,
-    0x7d9: 68,
-    0x7da: 68,
-    0x7db: 68,
-    0x7dc: 68,
-    0x7dd: 68,
-    0x7de: 68,
-    0x7df: 68,
-    0x7e0: 68,
-    0x7e1: 68,
-    0x7e2: 68,
-    0x7e3: 68,
-    0x7e4: 68,
-    0x7e5: 68,
-    0x7e6: 68,
-    0x7e7: 68,
-    0x7e8: 68,
-    0x7e9: 68,
-    0x7ea: 68,
-    0x7fa: 67,
+    0x77A: 68,
+    0x77B: 68,
+    0x77C: 68,
+    0x77D: 68,
+    0x77E: 68,
+    0x77F: 68,
+    0x7A6: 84,
+    0x7A7: 84,
+    0x7A8: 84,
+    0x7A9: 84,
+    0x7AA: 84,
+    0x7AB: 84,
+    0x7AC: 84,
+    0x7AD: 84,
+    0x7AE: 84,
+    0x7AF: 84,
+    0x7B0: 84,
+    0x7CA: 68,
+    0x7CB: 68,
+    0x7CC: 68,
+    0x7CD: 68,
+    0x7CE: 68,
+    0x7CF: 68,
+    0x7D0: 68,
+    0x7D1: 68,
+    0x7D2: 68,
+    0x7D3: 68,
+    0x7D4: 68,
+    0x7D5: 68,
+    0x7D6: 68,
+    0x7D7: 68,
+    0x7D8: 68,
+    0x7D9: 68,
+    0x7DA: 68,
+    0x7DB: 68,
+    0x7DC: 68,
+    0x7DD: 68,
+    0x7DE: 68,
+    0x7DF: 68,
+    0x7E0: 68,
+    0x7E1: 68,
+    0x7E2: 68,
+    0x7E3: 68,
+    0x7E4: 68,
+    0x7E5: 68,
+    0x7E6: 68,
+    0x7E7: 68,
+    0x7E8: 68,
+    0x7E9: 68,
+    0x7EA: 68,
+    0x7EB: 84,
+    0x7EC: 84,
+    0x7ED: 84,
+    0x7EE: 84,
+    0x7EF: 84,
+    0x7F0: 84,
+    0x7F1: 84,
+    0x7F2: 84,
+    0x7F3: 84,
+    0x7FA: 67,
+    0x7FD: 84,
+    0x816: 84,
+    0x817: 84,
+    0x818: 84,
+    0x819: 84,
+    0x81B: 84,
+    0x81C: 84,
+    0x81D: 84,
+    0x81E: 84,
+    0x81F: 84,
+    0x820: 84,
+    0x821: 84,
+    0x822: 84,
+    0x823: 84,
+    0x825: 84,
+    0x826: 84,
+    0x827: 84,
+    0x829: 84,
+    0x82A: 84,
+    0x82B: 84,
+    0x82C: 84,
+    0x82D: 84,
     0x840: 82,
     0x841: 68,
     0x842: 68,
@@ -388,12 +671,12 @@ joining_types = {
     0x847: 82,
     0x848: 68,
     0x849: 82,
-    0x84a: 68,
-    0x84b: 68,
-    0x84c: 68,
-    0x84d: 68,
-    0x84e: 68,
-    0x84f: 68,
+    0x84A: 68,
+    0x84B: 68,
+    0x84C: 68,
+    0x84D: 68,
+    0x84E: 68,
+    0x84F: 68,
     0x850: 68,
     0x851: 68,
     0x852: 68,
@@ -403,17 +686,18 @@ joining_types = {
     0x856: 82,
     0x857: 82,
     0x858: 82,
+    0x859: 84,
+    0x85A: 84,
+    0x85B: 84,
     0x860: 68,
-    0x861: 85,
     0x862: 68,
     0x863: 68,
     0x864: 68,
     0x865: 68,
-    0x866: 85,
     0x867: 82,
     0x868: 68,
     0x869: 82,
-    0x86a: 82,
+    0x86A: 82,
     0x870: 82,
     0x871: 82,
     0x872: 82,
@@ -424,12 +708,12 @@ joining_types = {
     0x877: 82,
     0x878: 82,
     0x879: 82,
-    0x87a: 82,
-    0x87b: 82,
-    0x87c: 82,
-    0x87d: 82,
-    0x87e: 82,
-    0x87f: 82,
+    0x87A: 82,
+    0x87B: 82,
+    0x87C: 82,
+    0x87D: 82,
+    0x87E: 82,
+    0x87F: 82,
     0x880: 82,
     0x881: 82,
     0x882: 82,
@@ -437,62 +721,411 @@ joining_types = {
     0x884: 67,
     0x885: 67,
     0x886: 68,
-    0x887: 85,
-    0x888: 85,
     0x889: 68,
-    0x88a: 68,
-    0x88b: 68,
-    0x88c: 68,
-    0x88d: 68,
-    0x88e: 82,
-    0x890: 85,
-    0x891: 85,
-    0x8a0: 68,
-    0x8a1: 68,
-    0x8a2: 68,
-    0x8a3: 68,
-    0x8a4: 68,
-    0x8a5: 68,
-    0x8a6: 68,
-    0x8a7: 68,
-    0x8a8: 68,
-    0x8a9: 68,
-    0x8aa: 82,
-    0x8ab: 82,
-    0x8ac: 82,
-    0x8ad: 85,
-    0x8ae: 82,
-    0x8af: 68,
-    0x8b0: 68,
-    0x8b1: 82,
-    0x8b2: 82,
-    0x8b3: 68,
-    0x8b4: 68,
-    0x8b5: 68,
-    0x8b6: 68,
-    0x8b7: 68,
-    0x8b8: 68,
-    0x8b9: 82,
-    0x8ba: 68,
-    0x8bb: 68,
-    0x8bc: 68,
-    0x8bd: 68,
-    0x8be: 68,
-    0x8bf: 68,
-    0x8c0: 68,
-    0x8c1: 68,
-    0x8c2: 68,
-    0x8c3: 68,
-    0x8c4: 68,
-    0x8c5: 68,
-    0x8c6: 68,
-    0x8c7: 68,
-    0x8c8: 68,
-    0x8e2: 85,
-    0x1806: 85,
+    0x88A: 68,
+    0x88B: 68,
+    0x88C: 68,
+    0x88D: 68,
+    0x88E: 82,
+    0x898: 84,
+    0x899: 84,
+    0x89A: 84,
+    0x89B: 84,
+    0x89C: 84,
+    0x89D: 84,
+    0x89E: 84,
+    0x89F: 84,
+    0x8A0: 68,
+    0x8A1: 68,
+    0x8A2: 68,
+    0x8A3: 68,
+    0x8A4: 68,
+    0x8A5: 68,
+    0x8A6: 68,
+    0x8A7: 68,
+    0x8A8: 68,
+    0x8A9: 68,
+    0x8AA: 82,
+    0x8AB: 82,
+    0x8AC: 82,
+    0x8AE: 82,
+    0x8AF: 68,
+    0x8B0: 68,
+    0x8B1: 82,
+    0x8B2: 82,
+    0x8B3: 68,
+    0x8B4: 68,
+    0x8B5: 68,
+    0x8B6: 68,
+    0x8B7: 68,
+    0x8B8: 68,
+    0x8B9: 82,
+    0x8BA: 68,
+    0x8BB: 68,
+    0x8BC: 68,
+    0x8BD: 68,
+    0x8BE: 68,
+    0x8BF: 68,
+    0x8C0: 68,
+    0x8C1: 68,
+    0x8C2: 68,
+    0x8C3: 68,
+    0x8C4: 68,
+    0x8C5: 68,
+    0x8C6: 68,
+    0x8C7: 68,
+    0x8C8: 68,
+    0x8CA: 84,
+    0x8CB: 84,
+    0x8CC: 84,
+    0x8CD: 84,
+    0x8CE: 84,
+    0x8CF: 84,
+    0x8D0: 84,
+    0x8D1: 84,
+    0x8D2: 84,
+    0x8D3: 84,
+    0x8D4: 84,
+    0x8D5: 84,
+    0x8D6: 84,
+    0x8D7: 84,
+    0x8D8: 84,
+    0x8D9: 84,
+    0x8DA: 84,
+    0x8DB: 84,
+    0x8DC: 84,
+    0x8DD: 84,
+    0x8DE: 84,
+    0x8DF: 84,
+    0x8E0: 84,
+    0x8E1: 84,
+    0x8E3: 84,
+    0x8E4: 84,
+    0x8E5: 84,
+    0x8E6: 84,
+    0x8E7: 84,
+    0x8E8: 84,
+    0x8E9: 84,
+    0x8EA: 84,
+    0x8EB: 84,
+    0x8EC: 84,
+    0x8ED: 84,
+    0x8EE: 84,
+    0x8EF: 84,
+    0x8F0: 84,
+    0x8F1: 84,
+    0x8F2: 84,
+    0x8F3: 84,
+    0x8F4: 84,
+    0x8F5: 84,
+    0x8F6: 84,
+    0x8F7: 84,
+    0x8F8: 84,
+    0x8F9: 84,
+    0x8FA: 84,
+    0x8FB: 84,
+    0x8FC: 84,
+    0x8FD: 84,
+    0x8FE: 84,
+    0x8FF: 84,
+    0x900: 84,
+    0x901: 84,
+    0x902: 84,
+    0x93A: 84,
+    0x93C: 84,
+    0x941: 84,
+    0x942: 84,
+    0x943: 84,
+    0x944: 84,
+    0x945: 84,
+    0x946: 84,
+    0x947: 84,
+    0x948: 84,
+    0x94D: 84,
+    0x951: 84,
+    0x952: 84,
+    0x953: 84,
+    0x954: 84,
+    0x955: 84,
+    0x956: 84,
+    0x957: 84,
+    0x962: 84,
+    0x963: 84,
+    0x981: 84,
+    0x9BC: 84,
+    0x9C1: 84,
+    0x9C2: 84,
+    0x9C3: 84,
+    0x9C4: 84,
+    0x9CD: 84,
+    0x9E2: 84,
+    0x9E3: 84,
+    0x9FE: 84,
+    0xA01: 84,
+    0xA02: 84,
+    0xA3C: 84,
+    0xA41: 84,
+    0xA42: 84,
+    0xA47: 84,
+    0xA48: 84,
+    0xA4B: 84,
+    0xA4C: 84,
+    0xA4D: 84,
+    0xA51: 84,
+    0xA70: 84,
+    0xA71: 84,
+    0xA75: 84,
+    0xA81: 84,
+    0xA82: 84,
+    0xABC: 84,
+    0xAC1: 84,
+    0xAC2: 84,
+    0xAC3: 84,
+    0xAC4: 84,
+    0xAC5: 84,
+    0xAC7: 84,
+    0xAC8: 84,
+    0xACD: 84,
+    0xAE2: 84,
+    0xAE3: 84,
+    0xAFA: 84,
+    0xAFB: 84,
+    0xAFC: 84,
+    0xAFD: 84,
+    0xAFE: 84,
+    0xAFF: 84,
+    0xB01: 84,
+    0xB3C: 84,
+    0xB3F: 84,
+    0xB41: 84,
+    0xB42: 84,
+    0xB43: 84,
+    0xB44: 84,
+    0xB4D: 84,
+    0xB55: 84,
+    0xB56: 84,
+    0xB62: 84,
+    0xB63: 84,
+    0xB82: 84,
+    0xBC0: 84,
+    0xBCD: 84,
+    0xC00: 84,
+    0xC04: 84,
+    0xC3C: 84,
+    0xC3E: 84,
+    0xC3F: 84,
+    0xC40: 84,
+    0xC46: 84,
+    0xC47: 84,
+    0xC48: 84,
+    0xC4A: 84,
+    0xC4B: 84,
+    0xC4C: 84,
+    0xC4D: 84,
+    0xC55: 84,
+    0xC56: 84,
+    0xC62: 84,
+    0xC63: 84,
+    0xC81: 84,
+    0xCBC: 84,
+    0xCBF: 84,
+    0xCC6: 84,
+    0xCCC: 84,
+    0xCCD: 84,
+    0xCE2: 84,
+    0xCE3: 84,
+    0xD00: 84,
+    0xD01: 84,
+    0xD3B: 84,
+    0xD3C: 84,
+    0xD41: 84,
+    0xD42: 84,
+    0xD43: 84,
+    0xD44: 84,
+    0xD4D: 84,
+    0xD62: 84,
+    0xD63: 84,
+    0xD81: 84,
+    0xDCA: 84,
+    0xDD2: 84,
+    0xDD3: 84,
+    0xDD4: 84,
+    0xDD6: 84,
+    0xE31: 84,
+    0xE34: 84,
+    0xE35: 84,
+    0xE36: 84,
+    0xE37: 84,
+    0xE38: 84,
+    0xE39: 84,
+    0xE3A: 84,
+    0xE47: 84,
+    0xE48: 84,
+    0xE49: 84,
+    0xE4A: 84,
+    0xE4B: 84,
+    0xE4C: 84,
+    0xE4D: 84,
+    0xE4E: 84,
+    0xEB1: 84,
+    0xEB4: 84,
+    0xEB5: 84,
+    0xEB6: 84,
+    0xEB7: 84,
+    0xEB8: 84,
+    0xEB9: 84,
+    0xEBA: 84,
+    0xEBB: 84,
+    0xEBC: 84,
+    0xEC8: 84,
+    0xEC9: 84,
+    0xECA: 84,
+    0xECB: 84,
+    0xECC: 84,
+    0xECD: 84,
+    0xECE: 84,
+    0xF18: 84,
+    0xF19: 84,
+    0xF35: 84,
+    0xF37: 84,
+    0xF39: 84,
+    0xF71: 84,
+    0xF72: 84,
+    0xF73: 84,
+    0xF74: 84,
+    0xF75: 84,
+    0xF76: 84,
+    0xF77: 84,
+    0xF78: 84,
+    0xF79: 84,
+    0xF7A: 84,
+    0xF7B: 84,
+    0xF7C: 84,
+    0xF7D: 84,
+    0xF7E: 84,
+    0xF80: 84,
+    0xF81: 84,
+    0xF82: 84,
+    0xF83: 84,
+    0xF84: 84,
+    0xF86: 84,
+    0xF87: 84,
+    0xF8D: 84,
+    0xF8E: 84,
+    0xF8F: 84,
+    0xF90: 84,
+    0xF91: 84,
+    0xF92: 84,
+    0xF93: 84,
+    0xF94: 84,
+    0xF95: 84,
+    0xF96: 84,
+    0xF97: 84,
+    0xF99: 84,
+    0xF9A: 84,
+    0xF9B: 84,
+    0xF9C: 84,
+    0xF9D: 84,
+    0xF9E: 84,
+    0xF9F: 84,
+    0xFA0: 84,
+    0xFA1: 84,
+    0xFA2: 84,
+    0xFA3: 84,
+    0xFA4: 84,
+    0xFA5: 84,
+    0xFA6: 84,
+    0xFA7: 84,
+    0xFA8: 84,
+    0xFA9: 84,
+    0xFAA: 84,
+    0xFAB: 84,
+    0xFAC: 84,
+    0xFAD: 84,
+    0xFAE: 84,
+    0xFAF: 84,
+    0xFB0: 84,
+    0xFB1: 84,
+    0xFB2: 84,
+    0xFB3: 84,
+    0xFB4: 84,
+    0xFB5: 84,
+    0xFB6: 84,
+    0xFB7: 84,
+    0xFB8: 84,
+    0xFB9: 84,
+    0xFBA: 84,
+    0xFBB: 84,
+    0xFBC: 84,
+    0xFC6: 84,
+    0x102D: 84,
+    0x102E: 84,
+    0x102F: 84,
+    0x1030: 84,
+    0x1032: 84,
+    0x1033: 84,
+    0x1034: 84,
+    0x1035: 84,
+    0x1036: 84,
+    0x1037: 84,
+    0x1039: 84,
+    0x103A: 84,
+    0x103D: 84,
+    0x103E: 84,
+    0x1058: 84,
+    0x1059: 84,
+    0x105E: 84,
+    0x105F: 84,
+    0x1060: 84,
+    0x1071: 84,
+    0x1072: 84,
+    0x1073: 84,
+    0x1074: 84,
+    0x1082: 84,
+    0x1085: 84,
+    0x1086: 84,
+    0x108D: 84,
+    0x109D: 84,
+    0x135D: 84,
+    0x135E: 84,
+    0x135F: 84,
+    0x1712: 84,
+    0x1713: 84,
+    0x1714: 84,
+    0x1732: 84,
+    0x1733: 84,
+    0x1752: 84,
+    0x1753: 84,
+    0x1772: 84,
+    0x1773: 84,
+    0x17B4: 84,
+    0x17B5: 84,
+    0x17B7: 84,
+    0x17B8: 84,
+    0x17B9: 84,
+    0x17BA: 84,
+    0x17BB: 84,
+    0x17BC: 84,
+    0x17BD: 84,
+    0x17C6: 84,
+    0x17C9: 84,
+    0x17CA: 84,
+    0x17CB: 84,
+    0x17CC: 84,
+    0x17CD: 84,
+    0x17CE: 84,
+    0x17CF: 84,
+    0x17D0: 84,
+    0x17D1: 84,
+    0x17D2: 84,
+    0x17D3: 84,
+    0x17DD: 84,
     0x1807: 68,
-    0x180a: 67,
-    0x180e: 85,
+    0x180A: 67,
+    0x180B: 84,
+    0x180C: 84,
+    0x180D: 84,
+    0x180F: 84,
     0x1820: 68,
     0x1821: 68,
     0x1822: 68,
@@ -503,12 +1136,12 @@ joining_types = {
     0x1827: 68,
     0x1828: 68,
     0x1829: 68,
-    0x182a: 68,
-    0x182b: 68,
-    0x182c: 68,
-    0x182d: 68,
-    0x182e: 68,
-    0x182f: 68,
+    0x182A: 68,
+    0x182B: 68,
+    0x182C: 68,
+    0x182D: 68,
+    0x182E: 68,
+    0x182F: 68,
     0x1830: 68,
     0x1831: 68,
     0x1832: 68,
@@ -519,12 +1152,12 @@ joining_types = {
     0x1837: 68,
     0x1838: 68,
     0x1839: 68,
-    0x183a: 68,
-    0x183b: 68,
-    0x183c: 68,
-    0x183d: 68,
-    0x183e: 68,
-    0x183f: 68,
+    0x183A: 68,
+    0x183B: 68,
+    0x183C: 68,
+    0x183D: 68,
+    0x183E: 68,
+    0x183F: 68,
     0x1840: 68,
     0x1841: 68,
     0x1842: 68,
@@ -535,12 +1168,12 @@ joining_types = {
     0x1847: 68,
     0x1848: 68,
     0x1849: 68,
-    0x184a: 68,
-    0x184b: 68,
-    0x184c: 68,
-    0x184d: 68,
-    0x184e: 68,
-    0x184f: 68,
+    0x184A: 68,
+    0x184B: 68,
+    0x184C: 68,
+    0x184D: 68,
+    0x184E: 68,
+    0x184F: 68,
     0x1850: 68,
     0x1851: 68,
     0x1852: 68,
@@ -551,12 +1184,12 @@ joining_types = {
     0x1857: 68,
     0x1858: 68,
     0x1859: 68,
-    0x185a: 68,
-    0x185b: 68,
-    0x185c: 68,
-    0x185d: 68,
-    0x185e: 68,
-    0x185f: 68,
+    0x185A: 68,
+    0x185B: 68,
+    0x185C: 68,
+    0x185D: 68,
+    0x185E: 68,
+    0x185F: 68,
     0x1860: 68,
     0x1861: 68,
     0x1862: 68,
@@ -567,12 +1200,12 @@ joining_types = {
     0x1867: 68,
     0x1868: 68,
     0x1869: 68,
-    0x186a: 68,
-    0x186b: 68,
-    0x186c: 68,
-    0x186d: 68,
-    0x186e: 68,
-    0x186f: 68,
+    0x186A: 68,
+    0x186B: 68,
+    0x186C: 68,
+    0x186D: 68,
+    0x186E: 68,
+    0x186F: 68,
     0x1870: 68,
     0x1871: 68,
     0x1872: 68,
@@ -582,22 +1215,17 @@ joining_types = {
     0x1876: 68,
     0x1877: 68,
     0x1878: 68,
-    0x1880: 85,
-    0x1881: 85,
-    0x1882: 85,
-    0x1883: 85,
-    0x1884: 85,
     0x1885: 84,
     0x1886: 84,
     0x1887: 68,
     0x1888: 68,
     0x1889: 68,
-    0x188a: 68,
-    0x188b: 68,
-    0x188c: 68,
-    0x188d: 68,
-    0x188e: 68,
-    0x188f: 68,
+    0x188A: 68,
+    0x188B: 68,
+    0x188C: 68,
+    0x188D: 68,
+    0x188E: 68,
+    0x188F: 68,
     0x1890: 68,
     0x1891: 68,
     0x1892: 68,
@@ -608,1543 +1236,3008 @@ joining_types = {
     0x1897: 68,
     0x1898: 68,
     0x1899: 68,
-    0x189a: 68,
-    0x189b: 68,
-    0x189c: 68,
-    0x189d: 68,
-    0x189e: 68,
-    0x189f: 68,
-    0x18a0: 68,
-    0x18a1: 68,
-    0x18a2: 68,
-    0x18a3: 68,
-    0x18a4: 68,
-    0x18a5: 68,
-    0x18a6: 68,
-    0x18a7: 68,
-    0x18a8: 68,
-    0x18aa: 68,
-    0x200c: 85,
-    0x200d: 67,
-    0x202f: 85,
-    0x2066: 85,
-    0x2067: 85,
-    0x2068: 85,
-    0x2069: 85,
-    0xa840: 68,
-    0xa841: 68,
-    0xa842: 68,
-    0xa843: 68,
-    0xa844: 68,
-    0xa845: 68,
-    0xa846: 68,
-    0xa847: 68,
-    0xa848: 68,
-    0xa849: 68,
-    0xa84a: 68,
-    0xa84b: 68,
-    0xa84c: 68,
-    0xa84d: 68,
-    0xa84e: 68,
-    0xa84f: 68,
-    0xa850: 68,
-    0xa851: 68,
-    0xa852: 68,
-    0xa853: 68,
-    0xa854: 68,
-    0xa855: 68,
-    0xa856: 68,
-    0xa857: 68,
-    0xa858: 68,
-    0xa859: 68,
-    0xa85a: 68,
-    0xa85b: 68,
-    0xa85c: 68,
-    0xa85d: 68,
-    0xa85e: 68,
-    0xa85f: 68,
-    0xa860: 68,
-    0xa861: 68,
-    0xa862: 68,
-    0xa863: 68,
-    0xa864: 68,
-    0xa865: 68,
-    0xa866: 68,
-    0xa867: 68,
-    0xa868: 68,
-    0xa869: 68,
-    0xa86a: 68,
-    0xa86b: 68,
-    0xa86c: 68,
-    0xa86d: 68,
-    0xa86e: 68,
-    0xa86f: 68,
-    0xa870: 68,
-    0xa871: 68,
-    0xa872: 76,
-    0xa873: 85,
-    0x10ac0: 68,
-    0x10ac1: 68,
-    0x10ac2: 68,
-    0x10ac3: 68,
-    0x10ac4: 68,
-    0x10ac5: 82,
-    0x10ac6: 85,
-    0x10ac7: 82,
-    0x10ac8: 85,
-    0x10ac9: 82,
-    0x10aca: 82,
-    0x10acb: 85,
-    0x10acc: 85,
-    0x10acd: 76,
-    0x10ace: 82,
-    0x10acf: 82,
-    0x10ad0: 82,
-    0x10ad1: 82,
-    0x10ad2: 82,
-    0x10ad3: 68,
-    0x10ad4: 68,
-    0x10ad5: 68,
-    0x10ad6: 68,
-    0x10ad7: 76,
-    0x10ad8: 68,
-    0x10ad9: 68,
-    0x10ada: 68,
-    0x10adb: 68,
-    0x10adc: 68,
-    0x10add: 82,
-    0x10ade: 68,
-    0x10adf: 68,
-    0x10ae0: 68,
-    0x10ae1: 82,
-    0x10ae2: 85,
-    0x10ae3: 85,
-    0x10ae4: 82,
-    0x10aeb: 68,
-    0x10aec: 68,
-    0x10aed: 68,
-    0x10aee: 68,
-    0x10aef: 82,
-    0x10b80: 68,
-    0x10b81: 82,
-    0x10b82: 68,
-    0x10b83: 82,
-    0x10b84: 82,
-    0x10b85: 82,
-    0x10b86: 68,
-    0x10b87: 68,
-    0x10b88: 68,
-    0x10b89: 82,
-    0x10b8a: 68,
-    0x10b8b: 68,
-    0x10b8c: 82,
-    0x10b8d: 68,
-    0x10b8e: 82,
-    0x10b8f: 82,
-    0x10b90: 68,
-    0x10b91: 82,
-    0x10ba9: 82,
-    0x10baa: 82,
-    0x10bab: 82,
-    0x10bac: 82,
-    0x10bad: 68,
-    0x10bae: 68,
-    0x10baf: 85,
-    0x10d00: 76,
-    0x10d01: 68,
-    0x10d02: 68,
-    0x10d03: 68,
-    0x10d04: 68,
-    0x10d05: 68,
-    0x10d06: 68,
-    0x10d07: 68,
-    0x10d08: 68,
-    0x10d09: 68,
-    0x10d0a: 68,
-    0x10d0b: 68,
-    0x10d0c: 68,
-    0x10d0d: 68,
-    0x10d0e: 68,
-    0x10d0f: 68,
-    0x10d10: 68,
-    0x10d11: 68,
-    0x10d12: 68,
-    0x10d13: 68,
-    0x10d14: 68,
-    0x10d15: 68,
-    0x10d16: 68,
-    0x10d17: 68,
-    0x10d18: 68,
-    0x10d19: 68,
-    0x10d1a: 68,
-    0x10d1b: 68,
-    0x10d1c: 68,
-    0x10d1d: 68,
-    0x10d1e: 68,
-    0x10d1f: 68,
-    0x10d20: 68,
-    0x10d21: 68,
-    0x10d22: 82,
-    0x10d23: 68,
-    0x10f30: 68,
-    0x10f31: 68,
-    0x10f32: 68,
-    0x10f33: 82,
-    0x10f34: 68,
-    0x10f35: 68,
-    0x10f36: 68,
-    0x10f37: 68,
-    0x10f38: 68,
-    0x10f39: 68,
-    0x10f3a: 68,
-    0x10f3b: 68,
-    0x10f3c: 68,
-    0x10f3d: 68,
-    0x10f3e: 68,
-    0x10f3f: 68,
-    0x10f40: 68,
-    0x10f41: 68,
-    0x10f42: 68,
-    0x10f43: 68,
-    0x10f44: 68,
-    0x10f45: 85,
-    0x10f51: 68,
-    0x10f52: 68,
-    0x10f53: 68,
-    0x10f54: 82,
-    0x10f70: 68,
-    0x10f71: 68,
-    0x10f72: 68,
-    0x10f73: 68,
-    0x10f74: 82,
-    0x10f75: 82,
-    0x10f76: 68,
-    0x10f77: 68,
-    0x10f78: 68,
-    0x10f79: 68,
-    0x10f7a: 68,
-    0x10f7b: 68,
-    0x10f7c: 68,
-    0x10f7d: 68,
-    0x10f7e: 68,
-    0x10f7f: 68,
-    0x10f80: 68,
-    0x10f81: 68,
-    0x10fb0: 68,
-    0x10fb1: 85,
-    0x10fb2: 68,
-    0x10fb3: 68,
-    0x10fb4: 82,
-    0x10fb5: 82,
-    0x10fb6: 82,
-    0x10fb7: 85,
-    0x10fb8: 68,
-    0x10fb9: 82,
-    0x10fba: 82,
-    0x10fbb: 68,
-    0x10fbc: 68,
-    0x10fbd: 82,
-    0x10fbe: 68,
-    0x10fbf: 68,
-    0x10fc0: 85,
-    0x10fc1: 68,
-    0x10fc2: 82,
-    0x10fc3: 82,
-    0x10fc4: 68,
-    0x10fc5: 85,
-    0x10fc6: 85,
-    0x10fc7: 85,
-    0x10fc8: 85,
-    0x10fc9: 82,
-    0x10fca: 68,
-    0x10fcb: 76,
-    0x110bd: 85,
-    0x110cd: 85,
-    0x1e900: 68,
-    0x1e901: 68,
-    0x1e902: 68,
-    0x1e903: 68,
-    0x1e904: 68,
-    0x1e905: 68,
-    0x1e906: 68,
-    0x1e907: 68,
-    0x1e908: 68,
-    0x1e909: 68,
-    0x1e90a: 68,
-    0x1e90b: 68,
-    0x1e90c: 68,
-    0x1e90d: 68,
-    0x1e90e: 68,
-    0x1e90f: 68,
-    0x1e910: 68,
-    0x1e911: 68,
-    0x1e912: 68,
-    0x1e913: 68,
-    0x1e914: 68,
-    0x1e915: 68,
-    0x1e916: 68,
-    0x1e917: 68,
-    0x1e918: 68,
-    0x1e919: 68,
-    0x1e91a: 68,
-    0x1e91b: 68,
-    0x1e91c: 68,
-    0x1e91d: 68,
-    0x1e91e: 68,
-    0x1e91f: 68,
-    0x1e920: 68,
-    0x1e921: 68,
-    0x1e922: 68,
-    0x1e923: 68,
-    0x1e924: 68,
-    0x1e925: 68,
-    0x1e926: 68,
-    0x1e927: 68,
-    0x1e928: 68,
-    0x1e929: 68,
-    0x1e92a: 68,
-    0x1e92b: 68,
-    0x1e92c: 68,
-    0x1e92d: 68,
-    0x1e92e: 68,
-    0x1e92f: 68,
-    0x1e930: 68,
-    0x1e931: 68,
-    0x1e932: 68,
-    0x1e933: 68,
-    0x1e934: 68,
-    0x1e935: 68,
-    0x1e936: 68,
-    0x1e937: 68,
-    0x1e938: 68,
-    0x1e939: 68,
-    0x1e93a: 68,
-    0x1e93b: 68,
-    0x1e93c: 68,
-    0x1e93d: 68,
-    0x1e93e: 68,
-    0x1e93f: 68,
-    0x1e940: 68,
-    0x1e941: 68,
-    0x1e942: 68,
-    0x1e943: 68,
-    0x1e94b: 84,
+    0x189A: 68,
+    0x189B: 68,
+    0x189C: 68,
+    0x189D: 68,
+    0x189E: 68,
+    0x189F: 68,
+    0x18A0: 68,
+    0x18A1: 68,
+    0x18A2: 68,
+    0x18A3: 68,
+    0x18A4: 68,
+    0x18A5: 68,
+    0x18A6: 68,
+    0x18A7: 68,
+    0x18A8: 68,
+    0x18A9: 84,
+    0x18AA: 68,
+    0x1920: 84,
+    0x1921: 84,
+    0x1922: 84,
+    0x1927: 84,
+    0x1928: 84,
+    0x1932: 84,
+    0x1939: 84,
+    0x193A: 84,
+    0x193B: 84,
+    0x1A17: 84,
+    0x1A18: 84,
+    0x1A1B: 84,
+    0x1A56: 84,
+    0x1A58: 84,
+    0x1A59: 84,
+    0x1A5A: 84,
+    0x1A5B: 84,
+    0x1A5C: 84,
+    0x1A5D: 84,
+    0x1A5E: 84,
+    0x1A60: 84,
+    0x1A62: 84,
+    0x1A65: 84,
+    0x1A66: 84,
+    0x1A67: 84,
+    0x1A68: 84,
+    0x1A69: 84,
+    0x1A6A: 84,
+    0x1A6B: 84,
+    0x1A6C: 84,
+    0x1A73: 84,
+    0x1A74: 84,
+    0x1A75: 84,
+    0x1A76: 84,
+    0x1A77: 84,
+    0x1A78: 84,
+    0x1A79: 84,
+    0x1A7A: 84,
+    0x1A7B: 84,
+    0x1A7C: 84,
+    0x1A7F: 84,
+    0x1AB0: 84,
+    0x1AB1: 84,
+    0x1AB2: 84,
+    0x1AB3: 84,
+    0x1AB4: 84,
+    0x1AB5: 84,
+    0x1AB6: 84,
+    0x1AB7: 84,
+    0x1AB8: 84,
+    0x1AB9: 84,
+    0x1ABA: 84,
+    0x1ABB: 84,
+    0x1ABC: 84,
+    0x1ABD: 84,
+    0x1ABE: 84,
+    0x1ABF: 84,
+    0x1AC0: 84,
+    0x1AC1: 84,
+    0x1AC2: 84,
+    0x1AC3: 84,
+    0x1AC4: 84,
+    0x1AC5: 84,
+    0x1AC6: 84,
+    0x1AC7: 84,
+    0x1AC8: 84,
+    0x1AC9: 84,
+    0x1ACA: 84,
+    0x1ACB: 84,
+    0x1ACC: 84,
+    0x1ACD: 84,
+    0x1ACE: 84,
+    0x1B00: 84,
+    0x1B01: 84,
+    0x1B02: 84,
+    0x1B03: 84,
+    0x1B34: 84,
+    0x1B36: 84,
+    0x1B37: 84,
+    0x1B38: 84,
+    0x1B39: 84,
+    0x1B3A: 84,
+    0x1B3C: 84,
+    0x1B42: 84,
+    0x1B6B: 84,
+    0x1B6C: 84,
+    0x1B6D: 84,
+    0x1B6E: 84,
+    0x1B6F: 84,
+    0x1B70: 84,
+    0x1B71: 84,
+    0x1B72: 84,
+    0x1B73: 84,
+    0x1B80: 84,
+    0x1B81: 84,
+    0x1BA2: 84,
+    0x1BA3: 84,
+    0x1BA4: 84,
+    0x1BA5: 84,
+    0x1BA8: 84,
+    0x1BA9: 84,
+    0x1BAB: 84,
+    0x1BAC: 84,
+    0x1BAD: 84,
+    0x1BE6: 84,
+    0x1BE8: 84,
+    0x1BE9: 84,
+    0x1BED: 84,
+    0x1BEF: 84,
+    0x1BF0: 84,
+    0x1BF1: 84,
+    0x1C2C: 84,
+    0x1C2D: 84,
+    0x1C2E: 84,
+    0x1C2F: 84,
+    0x1C30: 84,
+    0x1C31: 84,
+    0x1C32: 84,
+    0x1C33: 84,
+    0x1C36: 84,
+    0x1C37: 84,
+    0x1CD0: 84,
+    0x1CD1: 84,
+    0x1CD2: 84,
+    0x1CD4: 84,
+    0x1CD5: 84,
+    0x1CD6: 84,
+    0x1CD7: 84,
+    0x1CD8: 84,
+    0x1CD9: 84,
+    0x1CDA: 84,
+    0x1CDB: 84,
+    0x1CDC: 84,
+    0x1CDD: 84,
+    0x1CDE: 84,
+    0x1CDF: 84,
+    0x1CE0: 84,
+    0x1CE2: 84,
+    0x1CE3: 84,
+    0x1CE4: 84,
+    0x1CE5: 84,
+    0x1CE6: 84,
+    0x1CE7: 84,
+    0x1CE8: 84,
+    0x1CED: 84,
+    0x1CF4: 84,
+    0x1CF8: 84,
+    0x1CF9: 84,
+    0x1DC0: 84,
+    0x1DC1: 84,
+    0x1DC2: 84,
+    0x1DC3: 84,
+    0x1DC4: 84,
+    0x1DC5: 84,
+    0x1DC6: 84,
+    0x1DC7: 84,
+    0x1DC8: 84,
+    0x1DC9: 84,
+    0x1DCA: 84,
+    0x1DCB: 84,
+    0x1DCC: 84,
+    0x1DCD: 84,
+    0x1DCE: 84,
+    0x1DCF: 84,
+    0x1DD0: 84,
+    0x1DD1: 84,
+    0x1DD2: 84,
+    0x1DD3: 84,
+    0x1DD4: 84,
+    0x1DD5: 84,
+    0x1DD6: 84,
+    0x1DD7: 84,
+    0x1DD8: 84,
+    0x1DD9: 84,
+    0x1DDA: 84,
+    0x1DDB: 84,
+    0x1DDC: 84,
+    0x1DDD: 84,
+    0x1DDE: 84,
+    0x1DDF: 84,
+    0x1DE0: 84,
+    0x1DE1: 84,
+    0x1DE2: 84,
+    0x1DE3: 84,
+    0x1DE4: 84,
+    0x1DE5: 84,
+    0x1DE6: 84,
+    0x1DE7: 84,
+    0x1DE8: 84,
+    0x1DE9: 84,
+    0x1DEA: 84,
+    0x1DEB: 84,
+    0x1DEC: 84,
+    0x1DED: 84,
+    0x1DEE: 84,
+    0x1DEF: 84,
+    0x1DF0: 84,
+    0x1DF1: 84,
+    0x1DF2: 84,
+    0x1DF3: 84,
+    0x1DF4: 84,
+    0x1DF5: 84,
+    0x1DF6: 84,
+    0x1DF7: 84,
+    0x1DF8: 84,
+    0x1DF9: 84,
+    0x1DFA: 84,
+    0x1DFB: 84,
+    0x1DFC: 84,
+    0x1DFD: 84,
+    0x1DFE: 84,
+    0x1DFF: 84,
+    0x200B: 84,
+    0x200D: 67,
+    0x200E: 84,
+    0x200F: 84,
+    0x202A: 84,
+    0x202B: 84,
+    0x202C: 84,
+    0x202D: 84,
+    0x202E: 84,
+    0x2060: 84,
+    0x2061: 84,
+    0x2062: 84,
+    0x2063: 84,
+    0x2064: 84,
+    0x206A: 84,
+    0x206B: 84,
+    0x206C: 84,
+    0x206D: 84,
+    0x206E: 84,
+    0x206F: 84,
+    0x20D0: 84,
+    0x20D1: 84,
+    0x20D2: 84,
+    0x20D3: 84,
+    0x20D4: 84,
+    0x20D5: 84,
+    0x20D6: 84,
+    0x20D7: 84,
+    0x20D8: 84,
+    0x20D9: 84,
+    0x20DA: 84,
+    0x20DB: 84,
+    0x20DC: 84,
+    0x20DD: 84,
+    0x20DE: 84,
+    0x20DF: 84,
+    0x20E0: 84,
+    0x20E1: 84,
+    0x20E2: 84,
+    0x20E3: 84,
+    0x20E4: 84,
+    0x20E5: 84,
+    0x20E6: 84,
+    0x20E7: 84,
+    0x20E8: 84,
+    0x20E9: 84,
+    0x20EA: 84,
+    0x20EB: 84,
+    0x20EC: 84,
+    0x20ED: 84,
+    0x20EE: 84,
+    0x20EF: 84,
+    0x20F0: 84,
+    0x2CEF: 84,
+    0x2CF0: 84,
+    0x2CF1: 84,
+    0x2D7F: 84,
+    0x2DE0: 84,
+    0x2DE1: 84,
+    0x2DE2: 84,
+    0x2DE3: 84,
+    0x2DE4: 84,
+    0x2DE5: 84,
+    0x2DE6: 84,
+    0x2DE7: 84,
+    0x2DE8: 84,
+    0x2DE9: 84,
+    0x2DEA: 84,
+    0x2DEB: 84,
+    0x2DEC: 84,
+    0x2DED: 84,
+    0x2DEE: 84,
+    0x2DEF: 84,
+    0x2DF0: 84,
+    0x2DF1: 84,
+    0x2DF2: 84,
+    0x2DF3: 84,
+    0x2DF4: 84,
+    0x2DF5: 84,
+    0x2DF6: 84,
+    0x2DF7: 84,
+    0x2DF8: 84,
+    0x2DF9: 84,
+    0x2DFA: 84,
+    0x2DFB: 84,
+    0x2DFC: 84,
+    0x2DFD: 84,
+    0x2DFE: 84,
+    0x2DFF: 84,
+    0x302A: 84,
+    0x302B: 84,
+    0x302C: 84,
+    0x302D: 84,
+    0x3099: 84,
+    0x309A: 84,
+    0xA66F: 84,
+    0xA670: 84,
+    0xA671: 84,
+    0xA672: 84,
+    0xA674: 84,
+    0xA675: 84,
+    0xA676: 84,
+    0xA677: 84,
+    0xA678: 84,
+    0xA679: 84,
+    0xA67A: 84,
+    0xA67B: 84,
+    0xA67C: 84,
+    0xA67D: 84,
+    0xA69E: 84,
+    0xA69F: 84,
+    0xA6F0: 84,
+    0xA6F1: 84,
+    0xA802: 84,
+    0xA806: 84,
+    0xA80B: 84,
+    0xA825: 84,
+    0xA826: 84,
+    0xA82C: 84,
+    0xA840: 68,
+    0xA841: 68,
+    0xA842: 68,
+    0xA843: 68,
+    0xA844: 68,
+    0xA845: 68,
+    0xA846: 68,
+    0xA847: 68,
+    0xA848: 68,
+    0xA849: 68,
+    0xA84A: 68,
+    0xA84B: 68,
+    0xA84C: 68,
+    0xA84D: 68,
+    0xA84E: 68,
+    0xA84F: 68,
+    0xA850: 68,
+    0xA851: 68,
+    0xA852: 68,
+    0xA853: 68,
+    0xA854: 68,
+    0xA855: 68,
+    0xA856: 68,
+    0xA857: 68,
+    0xA858: 68,
+    0xA859: 68,
+    0xA85A: 68,
+    0xA85B: 68,
+    0xA85C: 68,
+    0xA85D: 68,
+    0xA85E: 68,
+    0xA85F: 68,
+    0xA860: 68,
+    0xA861: 68,
+    0xA862: 68,
+    0xA863: 68,
+    0xA864: 68,
+    0xA865: 68,
+    0xA866: 68,
+    0xA867: 68,
+    0xA868: 68,
+    0xA869: 68,
+    0xA86A: 68,
+    0xA86B: 68,
+    0xA86C: 68,
+    0xA86D: 68,
+    0xA86E: 68,
+    0xA86F: 68,
+    0xA870: 68,
+    0xA871: 68,
+    0xA872: 76,
+    0xA8C4: 84,
+    0xA8C5: 84,
+    0xA8E0: 84,
+    0xA8E1: 84,
+    0xA8E2: 84,
+    0xA8E3: 84,
+    0xA8E4: 84,
+    0xA8E5: 84,
+    0xA8E6: 84,
+    0xA8E7: 84,
+    0xA8E8: 84,
+    0xA8E9: 84,
+    0xA8EA: 84,
+    0xA8EB: 84,
+    0xA8EC: 84,
+    0xA8ED: 84,
+    0xA8EE: 84,
+    0xA8EF: 84,
+    0xA8F0: 84,
+    0xA8F1: 84,
+    0xA8FF: 84,
+    0xA926: 84,
+    0xA927: 84,
+    0xA928: 84,
+    0xA929: 84,
+    0xA92A: 84,
+    0xA92B: 84,
+    0xA92C: 84,
+    0xA92D: 84,
+    0xA947: 84,
+    0xA948: 84,
+    0xA949: 84,
+    0xA94A: 84,
+    0xA94B: 84,
+    0xA94C: 84,
+    0xA94D: 84,
+    0xA94E: 84,
+    0xA94F: 84,
+    0xA950: 84,
+    0xA951: 84,
+    0xA980: 84,
+    0xA981: 84,
+    0xA982: 84,
+    0xA9B3: 84,
+    0xA9B6: 84,
+    0xA9B7: 84,
+    0xA9B8: 84,
+    0xA9B9: 84,
+    0xA9BC: 84,
+    0xA9BD: 84,
+    0xA9E5: 84,
+    0xAA29: 84,
+    0xAA2A: 84,
+    0xAA2B: 84,
+    0xAA2C: 84,
+    0xAA2D: 84,
+    0xAA2E: 84,
+    0xAA31: 84,
+    0xAA32: 84,
+    0xAA35: 84,
+    0xAA36: 84,
+    0xAA43: 84,
+    0xAA4C: 84,
+    0xAA7C: 84,
+    0xAAB0: 84,
+    0xAAB2: 84,
+    0xAAB3: 84,
+    0xAAB4: 84,
+    0xAAB7: 84,
+    0xAAB8: 84,
+    0xAABE: 84,
+    0xAABF: 84,
+    0xAAC1: 84,
+    0xAAEC: 84,
+    0xAAED: 84,
+    0xAAF6: 84,
+    0xABE5: 84,
+    0xABE8: 84,
+    0xABED: 84,
+    0xFB1E: 84,
+    0xFE00: 84,
+    0xFE01: 84,
+    0xFE02: 84,
+    0xFE03: 84,
+    0xFE04: 84,
+    0xFE05: 84,
+    0xFE06: 84,
+    0xFE07: 84,
+    0xFE08: 84,
+    0xFE09: 84,
+    0xFE0A: 84,
+    0xFE0B: 84,
+    0xFE0C: 84,
+    0xFE0D: 84,
+    0xFE0E: 84,
+    0xFE0F: 84,
+    0xFE20: 84,
+    0xFE21: 84,
+    0xFE22: 84,
+    0xFE23: 84,
+    0xFE24: 84,
+    0xFE25: 84,
+    0xFE26: 84,
+    0xFE27: 84,
+    0xFE28: 84,
+    0xFE29: 84,
+    0xFE2A: 84,
+    0xFE2B: 84,
+    0xFE2C: 84,
+    0xFE2D: 84,
+    0xFE2E: 84,
+    0xFE2F: 84,
+    0xFEFF: 84,
+    0xFFF9: 84,
+    0xFFFA: 84,
+    0xFFFB: 84,
+    0x101FD: 84,
+    0x102E0: 84,
+    0x10376: 84,
+    0x10377: 84,
+    0x10378: 84,
+    0x10379: 84,
+    0x1037A: 84,
+    0x10A01: 84,
+    0x10A02: 84,
+    0x10A03: 84,
+    0x10A05: 84,
+    0x10A06: 84,
+    0x10A0C: 84,
+    0x10A0D: 84,
+    0x10A0E: 84,
+    0x10A0F: 84,
+    0x10A38: 84,
+    0x10A39: 84,
+    0x10A3A: 84,
+    0x10A3F: 84,
+    0x10AC0: 68,
+    0x10AC1: 68,
+    0x10AC2: 68,
+    0x10AC3: 68,
+    0x10AC4: 68,
+    0x10AC5: 82,
+    0x10AC7: 82,
+    0x10AC9: 82,
+    0x10ACA: 82,
+    0x10ACD: 76,
+    0x10ACE: 82,
+    0x10ACF: 82,
+    0x10AD0: 82,
+    0x10AD1: 82,
+    0x10AD2: 82,
+    0x10AD3: 68,
+    0x10AD4: 68,
+    0x10AD5: 68,
+    0x10AD6: 68,
+    0x10AD7: 76,
+    0x10AD8: 68,
+    0x10AD9: 68,
+    0x10ADA: 68,
+    0x10ADB: 68,
+    0x10ADC: 68,
+    0x10ADD: 82,
+    0x10ADE: 68,
+    0x10ADF: 68,
+    0x10AE0: 68,
+    0x10AE1: 82,
+    0x10AE4: 82,
+    0x10AE5: 84,
+    0x10AE6: 84,
+    0x10AEB: 68,
+    0x10AEC: 68,
+    0x10AED: 68,
+    0x10AEE: 68,
+    0x10AEF: 82,
+    0x10B80: 68,
+    0x10B81: 82,
+    0x10B82: 68,
+    0x10B83: 82,
+    0x10B84: 82,
+    0x10B85: 82,
+    0x10B86: 68,
+    0x10B87: 68,
+    0x10B88: 68,
+    0x10B89: 82,
+    0x10B8A: 68,
+    0x10B8B: 68,
+    0x10B8C: 82,
+    0x10B8D: 68,
+    0x10B8E: 82,
+    0x10B8F: 82,
+    0x10B90: 68,
+    0x10B91: 82,
+    0x10BA9: 82,
+    0x10BAA: 82,
+    0x10BAB: 82,
+    0x10BAC: 82,
+    0x10BAD: 68,
+    0x10BAE: 68,
+    0x10D00: 76,
+    0x10D01: 68,
+    0x10D02: 68,
+    0x10D03: 68,
+    0x10D04: 68,
+    0x10D05: 68,
+    0x10D06: 68,
+    0x10D07: 68,
+    0x10D08: 68,
+    0x10D09: 68,
+    0x10D0A: 68,
+    0x10D0B: 68,
+    0x10D0C: 68,
+    0x10D0D: 68,
+    0x10D0E: 68,
+    0x10D0F: 68,
+    0x10D10: 68,
+    0x10D11: 68,
+    0x10D12: 68,
+    0x10D13: 68,
+    0x10D14: 68,
+    0x10D15: 68,
+    0x10D16: 68,
+    0x10D17: 68,
+    0x10D18: 68,
+    0x10D19: 68,
+    0x10D1A: 68,
+    0x10D1B: 68,
+    0x10D1C: 68,
+    0x10D1D: 68,
+    0x10D1E: 68,
+    0x10D1F: 68,
+    0x10D20: 68,
+    0x10D21: 68,
+    0x10D22: 82,
+    0x10D23: 68,
+    0x10D24: 84,
+    0x10D25: 84,
+    0x10D26: 84,
+    0x10D27: 84,
+    0x10EAB: 84,
+    0x10EAC: 84,
+    0x10EFD: 84,
+    0x10EFE: 84,
+    0x10EFF: 84,
+    0x10F30: 68,
+    0x10F31: 68,
+    0x10F32: 68,
+    0x10F33: 82,
+    0x10F34: 68,
+    0x10F35: 68,
+    0x10F36: 68,
+    0x10F37: 68,
+    0x10F38: 68,
+    0x10F39: 68,
+    0x10F3A: 68,
+    0x10F3B: 68,
+    0x10F3C: 68,
+    0x10F3D: 68,
+    0x10F3E: 68,
+    0x10F3F: 68,
+    0x10F40: 68,
+    0x10F41: 68,
+    0x10F42: 68,
+    0x10F43: 68,
+    0x10F44: 68,
+    0x10F46: 84,
+    0x10F47: 84,
+    0x10F48: 84,
+    0x10F49: 84,
+    0x10F4A: 84,
+    0x10F4B: 84,
+    0x10F4C: 84,
+    0x10F4D: 84,
+    0x10F4E: 84,
+    0x10F4F: 84,
+    0x10F50: 84,
+    0x10F51: 68,
+    0x10F52: 68,
+    0x10F53: 68,
+    0x10F54: 82,
+    0x10F70: 68,
+    0x10F71: 68,
+    0x10F72: 68,
+    0x10F73: 68,
+    0x10F74: 82,
+    0x10F75: 82,
+    0x10F76: 68,
+    0x10F77: 68,
+    0x10F78: 68,
+    0x10F79: 68,
+    0x10F7A: 68,
+    0x10F7B: 68,
+    0x10F7C: 68,
+    0x10F7D: 68,
+    0x10F7E: 68,
+    0x10F7F: 68,
+    0x10F80: 68,
+    0x10F81: 68,
+    0x10F82: 84,
+    0x10F83: 84,
+    0x10F84: 84,
+    0x10F85: 84,
+    0x10FB0: 68,
+    0x10FB2: 68,
+    0x10FB3: 68,
+    0x10FB4: 82,
+    0x10FB5: 82,
+    0x10FB6: 82,
+    0x10FB8: 68,
+    0x10FB9: 82,
+    0x10FBA: 82,
+    0x10FBB: 68,
+    0x10FBC: 68,
+    0x10FBD: 82,
+    0x10FBE: 68,
+    0x10FBF: 68,
+    0x10FC1: 68,
+    0x10FC2: 82,
+    0x10FC3: 82,
+    0x10FC4: 68,
+    0x10FC9: 82,
+    0x10FCA: 68,
+    0x10FCB: 76,
+    0x11001: 84,
+    0x11038: 84,
+    0x11039: 84,
+    0x1103A: 84,
+    0x1103B: 84,
+    0x1103C: 84,
+    0x1103D: 84,
+    0x1103E: 84,
+    0x1103F: 84,
+    0x11040: 84,
+    0x11041: 84,
+    0x11042: 84,
+    0x11043: 84,
+    0x11044: 84,
+    0x11045: 84,
+    0x11046: 84,
+    0x11070: 84,
+    0x11073: 84,
+    0x11074: 84,
+    0x1107F: 84,
+    0x11080: 84,
+    0x11081: 84,
+    0x110B3: 84,
+    0x110B4: 84,
+    0x110B5: 84,
+    0x110B6: 84,
+    0x110B9: 84,
+    0x110BA: 84,
+    0x110C2: 84,
+    0x11100: 84,
+    0x11101: 84,
+    0x11102: 84,
+    0x11127: 84,
+    0x11128: 84,
+    0x11129: 84,
+    0x1112A: 84,
+    0x1112B: 84,
+    0x1112D: 84,
+    0x1112E: 84,
+    0x1112F: 84,
+    0x11130: 84,
+    0x11131: 84,
+    0x11132: 84,
+    0x11133: 84,
+    0x11134: 84,
+    0x11173: 84,
+    0x11180: 84,
+    0x11181: 84,
+    0x111B6: 84,
+    0x111B7: 84,
+    0x111B8: 84,
+    0x111B9: 84,
+    0x111BA: 84,
+    0x111BB: 84,
+    0x111BC: 84,
+    0x111BD: 84,
+    0x111BE: 84,
+    0x111C9: 84,
+    0x111CA: 84,
+    0x111CB: 84,
+    0x111CC: 84,
+    0x111CF: 84,
+    0x1122F: 84,
+    0x11230: 84,
+    0x11231: 84,
+    0x11234: 84,
+    0x11236: 84,
+    0x11237: 84,
+    0x1123E: 84,
+    0x11241: 84,
+    0x112DF: 84,
+    0x112E3: 84,
+    0x112E4: 84,
+    0x112E5: 84,
+    0x112E6: 84,
+    0x112E7: 84,
+    0x112E8: 84,
+    0x112E9: 84,
+    0x112EA: 84,
+    0x11300: 84,
+    0x11301: 84,
+    0x1133B: 84,
+    0x1133C: 84,
+    0x11340: 84,
+    0x11366: 84,
+    0x11367: 84,
+    0x11368: 84,
+    0x11369: 84,
+    0x1136A: 84,
+    0x1136B: 84,
+    0x1136C: 84,
+    0x11370: 84,
+    0x11371: 84,
+    0x11372: 84,
+    0x11373: 84,
+    0x11374: 84,
+    0x11438: 84,
+    0x11439: 84,
+    0x1143A: 84,
+    0x1143B: 84,
+    0x1143C: 84,
+    0x1143D: 84,
+    0x1143E: 84,
+    0x1143F: 84,
+    0x11442: 84,
+    0x11443: 84,
+    0x11444: 84,
+    0x11446: 84,
+    0x1145E: 84,
+    0x114B3: 84,
+    0x114B4: 84,
+    0x114B5: 84,
+    0x114B6: 84,
+    0x114B7: 84,
+    0x114B8: 84,
+    0x114BA: 84,
+    0x114BF: 84,
+    0x114C0: 84,
+    0x114C2: 84,
+    0x114C3: 84,
+    0x115B2: 84,
+    0x115B3: 84,
+    0x115B4: 84,
+    0x115B5: 84,
+    0x115BC: 84,
+    0x115BD: 84,
+    0x115BF: 84,
+    0x115C0: 84,
+    0x115DC: 84,
+    0x115DD: 84,
+    0x11633: 84,
+    0x11634: 84,
+    0x11635: 84,
+    0x11636: 84,
+    0x11637: 84,
+    0x11638: 84,
+    0x11639: 84,
+    0x1163A: 84,
+    0x1163D: 84,
+    0x1163F: 84,
+    0x11640: 84,
+    0x116AB: 84,
+    0x116AD: 84,
+    0x116B0: 84,
+    0x116B1: 84,
+    0x116B2: 84,
+    0x116B3: 84,
+    0x116B4: 84,
+    0x116B5: 84,
+    0x116B7: 84,
+    0x1171D: 84,
+    0x1171E: 84,
+    0x1171F: 84,
+    0x11722: 84,
+    0x11723: 84,
+    0x11724: 84,
+    0x11725: 84,
+    0x11727: 84,
+    0x11728: 84,
+    0x11729: 84,
+    0x1172A: 84,
+    0x1172B: 84,
+    0x1182F: 84,
+    0x11830: 84,
+    0x11831: 84,
+    0x11832: 84,
+    0x11833: 84,
+    0x11834: 84,
+    0x11835: 84,
+    0x11836: 84,
+    0x11837: 84,
+    0x11839: 84,
+    0x1183A: 84,
+    0x1193B: 84,
+    0x1193C: 84,
+    0x1193E: 84,
+    0x11943: 84,
+    0x119D4: 84,
+    0x119D5: 84,
+    0x119D6: 84,
+    0x119D7: 84,
+    0x119DA: 84,
+    0x119DB: 84,
+    0x119E0: 84,
+    0x11A01: 84,
+    0x11A02: 84,
+    0x11A03: 84,
+    0x11A04: 84,
+    0x11A05: 84,
+    0x11A06: 84,
+    0x11A07: 84,
+    0x11A08: 84,
+    0x11A09: 84,
+    0x11A0A: 84,
+    0x11A33: 84,
+    0x11A34: 84,
+    0x11A35: 84,
+    0x11A36: 84,
+    0x11A37: 84,
+    0x11A38: 84,
+    0x11A3B: 84,
+    0x11A3C: 84,
+    0x11A3D: 84,
+    0x11A3E: 84,
+    0x11A47: 84,
+    0x11A51: 84,
+    0x11A52: 84,
+    0x11A53: 84,
+    0x11A54: 84,
+    0x11A55: 84,
+    0x11A56: 84,
+    0x11A59: 84,
+    0x11A5A: 84,
+    0x11A5B: 84,
+    0x11A8A: 84,
+    0x11A8B: 84,
+    0x11A8C: 84,
+    0x11A8D: 84,
+    0x11A8E: 84,
+    0x11A8F: 84,
+    0x11A90: 84,
+    0x11A91: 84,
+    0x11A92: 84,
+    0x11A93: 84,
+    0x11A94: 84,
+    0x11A95: 84,
+    0x11A96: 84,
+    0x11A98: 84,
+    0x11A99: 84,
+    0x11C30: 84,
+    0x11C31: 84,
+    0x11C32: 84,
+    0x11C33: 84,
+    0x11C34: 84,
+    0x11C35: 84,
+    0x11C36: 84,
+    0x11C38: 84,
+    0x11C39: 84,
+    0x11C3A: 84,
+    0x11C3B: 84,
+    0x11C3C: 84,
+    0x11C3D: 84,
+    0x11C3F: 84,
+    0x11C92: 84,
+    0x11C93: 84,
+    0x11C94: 84,
+    0x11C95: 84,
+    0x11C96: 84,
+    0x11C97: 84,
+    0x11C98: 84,
+    0x11C99: 84,
+    0x11C9A: 84,
+    0x11C9B: 84,
+    0x11C9C: 84,
+    0x11C9D: 84,
+    0x11C9E: 84,
+    0x11C9F: 84,
+    0x11CA0: 84,
+    0x11CA1: 84,
+    0x11CA2: 84,
+    0x11CA3: 84,
+    0x11CA4: 84,
+    0x11CA5: 84,
+    0x11CA6: 84,
+    0x11CA7: 84,
+    0x11CAA: 84,
+    0x11CAB: 84,
+    0x11CAC: 84,
+    0x11CAD: 84,
+    0x11CAE: 84,
+    0x11CAF: 84,
+    0x11CB0: 84,
+    0x11CB2: 84,
+    0x11CB3: 84,
+    0x11CB5: 84,
+    0x11CB6: 84,
+    0x11D31: 84,
+    0x11D32: 84,
+    0x11D33: 84,
+    0x11D34: 84,
+    0x11D35: 84,
+    0x11D36: 84,
+    0x11D3A: 84,
+    0x11D3C: 84,
+    0x11D3D: 84,
+    0x11D3F: 84,
+    0x11D40: 84,
+    0x11D41: 84,
+    0x11D42: 84,
+    0x11D43: 84,
+    0x11D44: 84,
+    0x11D45: 84,
+    0x11D47: 84,
+    0x11D90: 84,
+    0x11D91: 84,
+    0x11D95: 84,
+    0x11D97: 84,
+    0x11EF3: 84,
+    0x11EF4: 84,
+    0x11F00: 84,
+    0x11F01: 84,
+    0x11F36: 84,
+    0x11F37: 84,
+    0x11F38: 84,
+    0x11F39: 84,
+    0x11F3A: 84,
+    0x11F40: 84,
+    0x11F42: 84,
+    0x13430: 84,
+    0x13431: 84,
+    0x13432: 84,
+    0x13433: 84,
+    0x13434: 84,
+    0x13435: 84,
+    0x13436: 84,
+    0x13437: 84,
+    0x13438: 84,
+    0x13439: 84,
+    0x1343A: 84,
+    0x1343B: 84,
+    0x1343C: 84,
+    0x1343D: 84,
+    0x1343E: 84,
+    0x1343F: 84,
+    0x13440: 84,
+    0x13447: 84,
+    0x13448: 84,
+    0x13449: 84,
+    0x1344A: 84,
+    0x1344B: 84,
+    0x1344C: 84,
+    0x1344D: 84,
+    0x1344E: 84,
+    0x1344F: 84,
+    0x13450: 84,
+    0x13451: 84,
+    0x13452: 84,
+    0x13453: 84,
+    0x13454: 84,
+    0x13455: 84,
+    0x16AF0: 84,
+    0x16AF1: 84,
+    0x16AF2: 84,
+    0x16AF3: 84,
+    0x16AF4: 84,
+    0x16B30: 84,
+    0x16B31: 84,
+    0x16B32: 84,
+    0x16B33: 84,
+    0x16B34: 84,
+    0x16B35: 84,
+    0x16B36: 84,
+    0x16F4F: 84,
+    0x16F8F: 84,
+    0x16F90: 84,
+    0x16F91: 84,
+    0x16F92: 84,
+    0x16FE4: 84,
+    0x1BC9D: 84,
+    0x1BC9E: 84,
+    0x1BCA0: 84,
+    0x1BCA1: 84,
+    0x1BCA2: 84,
+    0x1BCA3: 84,
+    0x1CF00: 84,
+    0x1CF01: 84,
+    0x1CF02: 84,
+    0x1CF03: 84,
+    0x1CF04: 84,
+    0x1CF05: 84,
+    0x1CF06: 84,
+    0x1CF07: 84,
+    0x1CF08: 84,
+    0x1CF09: 84,
+    0x1CF0A: 84,
+    0x1CF0B: 84,
+    0x1CF0C: 84,
+    0x1CF0D: 84,
+    0x1CF0E: 84,
+    0x1CF0F: 84,
+    0x1CF10: 84,
+    0x1CF11: 84,
+    0x1CF12: 84,
+    0x1CF13: 84,
+    0x1CF14: 84,
+    0x1CF15: 84,
+    0x1CF16: 84,
+    0x1CF17: 84,
+    0x1CF18: 84,
+    0x1CF19: 84,
+    0x1CF1A: 84,
+    0x1CF1B: 84,
+    0x1CF1C: 84,
+    0x1CF1D: 84,
+    0x1CF1E: 84,
+    0x1CF1F: 84,
+    0x1CF20: 84,
+    0x1CF21: 84,
+    0x1CF22: 84,
+    0x1CF23: 84,
+    0x1CF24: 84,
+    0x1CF25: 84,
+    0x1CF26: 84,
+    0x1CF27: 84,
+    0x1CF28: 84,
+    0x1CF29: 84,
+    0x1CF2A: 84,
+    0x1CF2B: 84,
+    0x1CF2C: 84,
+    0x1CF2D: 84,
+    0x1CF30: 84,
+    0x1CF31: 84,
+    0x1CF32: 84,
+    0x1CF33: 84,
+    0x1CF34: 84,
+    0x1CF35: 84,
+    0x1CF36: 84,
+    0x1CF37: 84,
+    0x1CF38: 84,
+    0x1CF39: 84,
+    0x1CF3A: 84,
+    0x1CF3B: 84,
+    0x1CF3C: 84,
+    0x1CF3D: 84,
+    0x1CF3E: 84,
+    0x1CF3F: 84,
+    0x1CF40: 84,
+    0x1CF41: 84,
+    0x1CF42: 84,
+    0x1CF43: 84,
+    0x1CF44: 84,
+    0x1CF45: 84,
+    0x1CF46: 84,
+    0x1D167: 84,
+    0x1D168: 84,
+    0x1D169: 84,
+    0x1D173: 84,
+    0x1D174: 84,
+    0x1D175: 84,
+    0x1D176: 84,
+    0x1D177: 84,
+    0x1D178: 84,
+    0x1D179: 84,
+    0x1D17A: 84,
+    0x1D17B: 84,
+    0x1D17C: 84,
+    0x1D17D: 84,
+    0x1D17E: 84,
+    0x1D17F: 84,
+    0x1D180: 84,
+    0x1D181: 84,
+    0x1D182: 84,
+    0x1D185: 84,
+    0x1D186: 84,
+    0x1D187: 84,
+    0x1D188: 84,
+    0x1D189: 84,
+    0x1D18A: 84,
+    0x1D18B: 84,
+    0x1D1AA: 84,
+    0x1D1AB: 84,
+    0x1D1AC: 84,
+    0x1D1AD: 84,
+    0x1D242: 84,
+    0x1D243: 84,
+    0x1D244: 84,
+    0x1DA00: 84,
+    0x1DA01: 84,
+    0x1DA02: 84,
+    0x1DA03: 84,
+    0x1DA04: 84,
+    0x1DA05: 84,
+    0x1DA06: 84,
+    0x1DA07: 84,
+    0x1DA08: 84,
+    0x1DA09: 84,
+    0x1DA0A: 84,
+    0x1DA0B: 84,
+    0x1DA0C: 84,
+    0x1DA0D: 84,
+    0x1DA0E: 84,
+    0x1DA0F: 84,
+    0x1DA10: 84,
+    0x1DA11: 84,
+    0x1DA12: 84,
+    0x1DA13: 84,
+    0x1DA14: 84,
+    0x1DA15: 84,
+    0x1DA16: 84,
+    0x1DA17: 84,
+    0x1DA18: 84,
+    0x1DA19: 84,
+    0x1DA1A: 84,
+    0x1DA1B: 84,
+    0x1DA1C: 84,
+    0x1DA1D: 84,
+    0x1DA1E: 84,
+    0x1DA1F: 84,
+    0x1DA20: 84,
+    0x1DA21: 84,
+    0x1DA22: 84,
+    0x1DA23: 84,
+    0x1DA24: 84,
+    0x1DA25: 84,
+    0x1DA26: 84,
+    0x1DA27: 84,
+    0x1DA28: 84,
+    0x1DA29: 84,
+    0x1DA2A: 84,
+    0x1DA2B: 84,
+    0x1DA2C: 84,
+    0x1DA2D: 84,
+    0x1DA2E: 84,
+    0x1DA2F: 84,
+    0x1DA30: 84,
+    0x1DA31: 84,
+    0x1DA32: 84,
+    0x1DA33: 84,
+    0x1DA34: 84,
+    0x1DA35: 84,
+    0x1DA36: 84,
+    0x1DA3B: 84,
+    0x1DA3C: 84,
+    0x1DA3D: 84,
+    0x1DA3E: 84,
+    0x1DA3F: 84,
+    0x1DA40: 84,
+    0x1DA41: 84,
+    0x1DA42: 84,
+    0x1DA43: 84,
+    0x1DA44: 84,
+    0x1DA45: 84,
+    0x1DA46: 84,
+    0x1DA47: 84,
+    0x1DA48: 84,
+    0x1DA49: 84,
+    0x1DA4A: 84,
+    0x1DA4B: 84,
+    0x1DA4C: 84,
+    0x1DA4D: 84,
+    0x1DA4E: 84,
+    0x1DA4F: 84,
+    0x1DA50: 84,
+    0x1DA51: 84,
+    0x1DA52: 84,
+    0x1DA53: 84,
+    0x1DA54: 84,
+    0x1DA55: 84,
+    0x1DA56: 84,
+    0x1DA57: 84,
+    0x1DA58: 84,
+    0x1DA59: 84,
+    0x1DA5A: 84,
+    0x1DA5B: 84,
+    0x1DA5C: 84,
+    0x1DA5D: 84,
+    0x1DA5E: 84,
+    0x1DA5F: 84,
+    0x1DA60: 84,
+    0x1DA61: 84,
+    0x1DA62: 84,
+    0x1DA63: 84,
+    0x1DA64: 84,
+    0x1DA65: 84,
+    0x1DA66: 84,
+    0x1DA67: 84,
+    0x1DA68: 84,
+    0x1DA69: 84,
+    0x1DA6A: 84,
+    0x1DA6B: 84,
+    0x1DA6C: 84,
+    0x1DA75: 84,
+    0x1DA84: 84,
+    0x1DA9B: 84,
+    0x1DA9C: 84,
+    0x1DA9D: 84,
+    0x1DA9E: 84,
+    0x1DA9F: 84,
+    0x1DAA1: 84,
+    0x1DAA2: 84,
+    0x1DAA3: 84,
+    0x1DAA4: 84,
+    0x1DAA5: 84,
+    0x1DAA6: 84,
+    0x1DAA7: 84,
+    0x1DAA8: 84,
+    0x1DAA9: 84,
+    0x1DAAA: 84,
+    0x1DAAB: 84,
+    0x1DAAC: 84,
+    0x1DAAD: 84,
+    0x1DAAE: 84,
+    0x1DAAF: 84,
+    0x1E000: 84,
+    0x1E001: 84,
+    0x1E002: 84,
+    0x1E003: 84,
+    0x1E004: 84,
+    0x1E005: 84,
+    0x1E006: 84,
+    0x1E008: 84,
+    0x1E009: 84,
+    0x1E00A: 84,
+    0x1E00B: 84,
+    0x1E00C: 84,
+    0x1E00D: 84,
+    0x1E00E: 84,
+    0x1E00F: 84,
+    0x1E010: 84,
+    0x1E011: 84,
+    0x1E012: 84,
+    0x1E013: 84,
+    0x1E014: 84,
+    0x1E015: 84,
+    0x1E016: 84,
+    0x1E017: 84,
+    0x1E018: 84,
+    0x1E01B: 84,
+    0x1E01C: 84,
+    0x1E01D: 84,
+    0x1E01E: 84,
+    0x1E01F: 84,
+    0x1E020: 84,
+    0x1E021: 84,
+    0x1E023: 84,
+    0x1E024: 84,
+    0x1E026: 84,
+    0x1E027: 84,
+    0x1E028: 84,
+    0x1E029: 84,
+    0x1E02A: 84,
+    0x1E08F: 84,
+    0x1E130: 84,
+    0x1E131: 84,
+    0x1E132: 84,
+    0x1E133: 84,
+    0x1E134: 84,
+    0x1E135: 84,
+    0x1E136: 84,
+    0x1E2AE: 84,
+    0x1E2EC: 84,
+    0x1E2ED: 84,
+    0x1E2EE: 84,
+    0x1E2EF: 84,
+    0x1E4EC: 84,
+    0x1E4ED: 84,
+    0x1E4EE: 84,
+    0x1E4EF: 84,
+    0x1E8D0: 84,
+    0x1E8D1: 84,
+    0x1E8D2: 84,
+    0x1E8D3: 84,
+    0x1E8D4: 84,
+    0x1E8D5: 84,
+    0x1E8D6: 84,
+    0x1E900: 68,
+    0x1E901: 68,
+    0x1E902: 68,
+    0x1E903: 68,
+    0x1E904: 68,
+    0x1E905: 68,
+    0x1E906: 68,
+    0x1E907: 68,
+    0x1E908: 68,
+    0x1E909: 68,
+    0x1E90A: 68,
+    0x1E90B: 68,
+    0x1E90C: 68,
+    0x1E90D: 68,
+    0x1E90E: 68,
+    0x1E90F: 68,
+    0x1E910: 68,
+    0x1E911: 68,
+    0x1E912: 68,
+    0x1E913: 68,
+    0x1E914: 68,
+    0x1E915: 68,
+    0x1E916: 68,
+    0x1E917: 68,
+    0x1E918: 68,
+    0x1E919: 68,
+    0x1E91A: 68,
+    0x1E91B: 68,
+    0x1E91C: 68,
+    0x1E91D: 68,
+    0x1E91E: 68,
+    0x1E91F: 68,
+    0x1E920: 68,
+    0x1E921: 68,
+    0x1E922: 68,
+    0x1E923: 68,
+    0x1E924: 68,
+    0x1E925: 68,
+    0x1E926: 68,
+    0x1E927: 68,
+    0x1E928: 68,
+    0x1E929: 68,
+    0x1E92A: 68,
+    0x1E92B: 68,
+    0x1E92C: 68,
+    0x1E92D: 68,
+    0x1E92E: 68,
+    0x1E92F: 68,
+    0x1E930: 68,
+    0x1E931: 68,
+    0x1E932: 68,
+    0x1E933: 68,
+    0x1E934: 68,
+    0x1E935: 68,
+    0x1E936: 68,
+    0x1E937: 68,
+    0x1E938: 68,
+    0x1E939: 68,
+    0x1E93A: 68,
+    0x1E93B: 68,
+    0x1E93C: 68,
+    0x1E93D: 68,
+    0x1E93E: 68,
+    0x1E93F: 68,
+    0x1E940: 68,
+    0x1E941: 68,
+    0x1E942: 68,
+    0x1E943: 68,
+    0x1E944: 84,
+    0x1E945: 84,
+    0x1E946: 84,
+    0x1E947: 84,
+    0x1E948: 84,
+    0x1E949: 84,
+    0x1E94A: 84,
+    0x1E94B: 84,
+    0xE0001: 84,
+    0xE0020: 84,
+    0xE0021: 84,
+    0xE0022: 84,
+    0xE0023: 84,
+    0xE0024: 84,
+    0xE0025: 84,
+    0xE0026: 84,
+    0xE0027: 84,
+    0xE0028: 84,
+    0xE0029: 84,
+    0xE002A: 84,
+    0xE002B: 84,
+    0xE002C: 84,
+    0xE002D: 84,
+    0xE002E: 84,
+    0xE002F: 84,
+    0xE0030: 84,
+    0xE0031: 84,
+    0xE0032: 84,
+    0xE0033: 84,
+    0xE0034: 84,
+    0xE0035: 84,
+    0xE0036: 84,
+    0xE0037: 84,
+    0xE0038: 84,
+    0xE0039: 84,
+    0xE003A: 84,
+    0xE003B: 84,
+    0xE003C: 84,
+    0xE003D: 84,
+    0xE003E: 84,
+    0xE003F: 84,
+    0xE0040: 84,
+    0xE0041: 84,
+    0xE0042: 84,
+    0xE0043: 84,
+    0xE0044: 84,
+    0xE0045: 84,
+    0xE0046: 84,
+    0xE0047: 84,
+    0xE0048: 84,
+    0xE0049: 84,
+    0xE004A: 84,
+    0xE004B: 84,
+    0xE004C: 84,
+    0xE004D: 84,
+    0xE004E: 84,
+    0xE004F: 84,
+    0xE0050: 84,
+    0xE0051: 84,
+    0xE0052: 84,
+    0xE0053: 84,
+    0xE0054: 84,
+    0xE0055: 84,
+    0xE0056: 84,
+    0xE0057: 84,
+    0xE0058: 84,
+    0xE0059: 84,
+    0xE005A: 84,
+    0xE005B: 84,
+    0xE005C: 84,
+    0xE005D: 84,
+    0xE005E: 84,
+    0xE005F: 84,
+    0xE0060: 84,
+    0xE0061: 84,
+    0xE0062: 84,
+    0xE0063: 84,
+    0xE0064: 84,
+    0xE0065: 84,
+    0xE0066: 84,
+    0xE0067: 84,
+    0xE0068: 84,
+    0xE0069: 84,
+    0xE006A: 84,
+    0xE006B: 84,
+    0xE006C: 84,
+    0xE006D: 84,
+    0xE006E: 84,
+    0xE006F: 84,
+    0xE0070: 84,
+    0xE0071: 84,
+    0xE0072: 84,
+    0xE0073: 84,
+    0xE0074: 84,
+    0xE0075: 84,
+    0xE0076: 84,
+    0xE0077: 84,
+    0xE0078: 84,
+    0xE0079: 84,
+    0xE007A: 84,
+    0xE007B: 84,
+    0xE007C: 84,
+    0xE007D: 84,
+    0xE007E: 84,
+    0xE007F: 84,
+    0xE0100: 84,
+    0xE0101: 84,
+    0xE0102: 84,
+    0xE0103: 84,
+    0xE0104: 84,
+    0xE0105: 84,
+    0xE0106: 84,
+    0xE0107: 84,
+    0xE0108: 84,
+    0xE0109: 84,
+    0xE010A: 84,
+    0xE010B: 84,
+    0xE010C: 84,
+    0xE010D: 84,
+    0xE010E: 84,
+    0xE010F: 84,
+    0xE0110: 84,
+    0xE0111: 84,
+    0xE0112: 84,
+    0xE0113: 84,
+    0xE0114: 84,
+    0xE0115: 84,
+    0xE0116: 84,
+    0xE0117: 84,
+    0xE0118: 84,
+    0xE0119: 84,
+    0xE011A: 84,
+    0xE011B: 84,
+    0xE011C: 84,
+    0xE011D: 84,
+    0xE011E: 84,
+    0xE011F: 84,
+    0xE0120: 84,
+    0xE0121: 84,
+    0xE0122: 84,
+    0xE0123: 84,
+    0xE0124: 84,
+    0xE0125: 84,
+    0xE0126: 84,
+    0xE0127: 84,
+    0xE0128: 84,
+    0xE0129: 84,
+    0xE012A: 84,
+    0xE012B: 84,
+    0xE012C: 84,
+    0xE012D: 84,
+    0xE012E: 84,
+    0xE012F: 84,
+    0xE0130: 84,
+    0xE0131: 84,
+    0xE0132: 84,
+    0xE0133: 84,
+    0xE0134: 84,
+    0xE0135: 84,
+    0xE0136: 84,
+    0xE0137: 84,
+    0xE0138: 84,
+    0xE0139: 84,
+    0xE013A: 84,
+    0xE013B: 84,
+    0xE013C: 84,
+    0xE013D: 84,
+    0xE013E: 84,
+    0xE013F: 84,
+    0xE0140: 84,
+    0xE0141: 84,
+    0xE0142: 84,
+    0xE0143: 84,
+    0xE0144: 84,
+    0xE0145: 84,
+    0xE0146: 84,
+    0xE0147: 84,
+    0xE0148: 84,
+    0xE0149: 84,
+    0xE014A: 84,
+    0xE014B: 84,
+    0xE014C: 84,
+    0xE014D: 84,
+    0xE014E: 84,
+    0xE014F: 84,
+    0xE0150: 84,
+    0xE0151: 84,
+    0xE0152: 84,
+    0xE0153: 84,
+    0xE0154: 84,
+    0xE0155: 84,
+    0xE0156: 84,
+    0xE0157: 84,
+    0xE0158: 84,
+    0xE0159: 84,
+    0xE015A: 84,
+    0xE015B: 84,
+    0xE015C: 84,
+    0xE015D: 84,
+    0xE015E: 84,
+    0xE015F: 84,
+    0xE0160: 84,
+    0xE0161: 84,
+    0xE0162: 84,
+    0xE0163: 84,
+    0xE0164: 84,
+    0xE0165: 84,
+    0xE0166: 84,
+    0xE0167: 84,
+    0xE0168: 84,
+    0xE0169: 84,
+    0xE016A: 84,
+    0xE016B: 84,
+    0xE016C: 84,
+    0xE016D: 84,
+    0xE016E: 84,
+    0xE016F: 84,
+    0xE0170: 84,
+    0xE0171: 84,
+    0xE0172: 84,
+    0xE0173: 84,
+    0xE0174: 84,
+    0xE0175: 84,
+    0xE0176: 84,
+    0xE0177: 84,
+    0xE0178: 84,
+    0xE0179: 84,
+    0xE017A: 84,
+    0xE017B: 84,
+    0xE017C: 84,
+    0xE017D: 84,
+    0xE017E: 84,
+    0xE017F: 84,
+    0xE0180: 84,
+    0xE0181: 84,
+    0xE0182: 84,
+    0xE0183: 84,
+    0xE0184: 84,
+    0xE0185: 84,
+    0xE0186: 84,
+    0xE0187: 84,
+    0xE0188: 84,
+    0xE0189: 84,
+    0xE018A: 84,
+    0xE018B: 84,
+    0xE018C: 84,
+    0xE018D: 84,
+    0xE018E: 84,
+    0xE018F: 84,
+    0xE0190: 84,
+    0xE0191: 84,
+    0xE0192: 84,
+    0xE0193: 84,
+    0xE0194: 84,
+    0xE0195: 84,
+    0xE0196: 84,
+    0xE0197: 84,
+    0xE0198: 84,
+    0xE0199: 84,
+    0xE019A: 84,
+    0xE019B: 84,
+    0xE019C: 84,
+    0xE019D: 84,
+    0xE019E: 84,
+    0xE019F: 84,
+    0xE01A0: 84,
+    0xE01A1: 84,
+    0xE01A2: 84,
+    0xE01A3: 84,
+    0xE01A4: 84,
+    0xE01A5: 84,
+    0xE01A6: 84,
+    0xE01A7: 84,
+    0xE01A8: 84,
+    0xE01A9: 84,
+    0xE01AA: 84,
+    0xE01AB: 84,
+    0xE01AC: 84,
+    0xE01AD: 84,
+    0xE01AE: 84,
+    0xE01AF: 84,
+    0xE01B0: 84,
+    0xE01B1: 84,
+    0xE01B2: 84,
+    0xE01B3: 84,
+    0xE01B4: 84,
+    0xE01B5: 84,
+    0xE01B6: 84,
+    0xE01B7: 84,
+    0xE01B8: 84,
+    0xE01B9: 84,
+    0xE01BA: 84,
+    0xE01BB: 84,
+    0xE01BC: 84,
+    0xE01BD: 84,
+    0xE01BE: 84,
+    0xE01BF: 84,
+    0xE01C0: 84,
+    0xE01C1: 84,
+    0xE01C2: 84,
+    0xE01C3: 84,
+    0xE01C4: 84,
+    0xE01C5: 84,
+    0xE01C6: 84,
+    0xE01C7: 84,
+    0xE01C8: 84,
+    0xE01C9: 84,
+    0xE01CA: 84,
+    0xE01CB: 84,
+    0xE01CC: 84,
+    0xE01CD: 84,
+    0xE01CE: 84,
+    0xE01CF: 84,
+    0xE01D0: 84,
+    0xE01D1: 84,
+    0xE01D2: 84,
+    0xE01D3: 84,
+    0xE01D4: 84,
+    0xE01D5: 84,
+    0xE01D6: 84,
+    0xE01D7: 84,
+    0xE01D8: 84,
+    0xE01D9: 84,
+    0xE01DA: 84,
+    0xE01DB: 84,
+    0xE01DC: 84,
+    0xE01DD: 84,
+    0xE01DE: 84,
+    0xE01DF: 84,
+    0xE01E0: 84,
+    0xE01E1: 84,
+    0xE01E2: 84,
+    0xE01E3: 84,
+    0xE01E4: 84,
+    0xE01E5: 84,
+    0xE01E6: 84,
+    0xE01E7: 84,
+    0xE01E8: 84,
+    0xE01E9: 84,
+    0xE01EA: 84,
+    0xE01EB: 84,
+    0xE01EC: 84,
+    0xE01ED: 84,
+    0xE01EE: 84,
+    0xE01EF: 84,
 }
 codepoint_classes = {
-    'PVALID': (
-        0x2d0000002e,
-        0x300000003a,
-        0x610000007b,
-        0xdf000000f7,
-        0xf800000100,
+    "PVALID": (
+        0x2D0000002E,
+        0x300000003A,
+        0x610000007B,
+        0xDF000000F7,
+        0xF800000100,
         0x10100000102,
         0x10300000104,
         0x10500000106,
         0x10700000108,
-        0x1090000010a,
-        0x10b0000010c,
-        0x10d0000010e,
-        0x10f00000110,
+        0x1090000010A,
+        0x10B0000010C,
+        0x10D0000010E,
+        0x10F00000110,
         0x11100000112,
         0x11300000114,
         0x11500000116,
         0x11700000118,
-        0x1190000011a,
-        0x11b0000011c,
-        0x11d0000011e,
-        0x11f00000120,
+        0x1190000011A,
+        0x11B0000011C,
+        0x11D0000011E,
+        0x11F00000120,
         0x12100000122,
         0x12300000124,
         0x12500000126,
         0x12700000128,
-        0x1290000012a,
-        0x12b0000012c,
-        0x12d0000012e,
-        0x12f00000130,
+        0x1290000012A,
+        0x12B0000012C,
+        0x12D0000012E,
+        0x12F00000130,
         0x13100000132,
         0x13500000136,
         0x13700000139,
-        0x13a0000013b,
-        0x13c0000013d,
-        0x13e0000013f,
+        0x13A0000013B,
+        0x13C0000013D,
+        0x13E0000013F,
         0x14200000143,
         0x14400000145,
         0x14600000147,
         0x14800000149,
-        0x14b0000014c,
-        0x14d0000014e,
-        0x14f00000150,
+        0x14B0000014C,
+        0x14D0000014E,
+        0x14F00000150,
         0x15100000152,
         0x15300000154,
         0x15500000156,
         0x15700000158,
-        0x1590000015a,
-        0x15b0000015c,
-        0x15d0000015e,
-        0x15f00000160,
+        0x1590000015A,
+        0x15B0000015C,
+        0x15D0000015E,
+        0x15F00000160,
         0x16100000162,
         0x16300000164,
         0x16500000166,
         0x16700000168,
-        0x1690000016a,
-        0x16b0000016c,
-        0x16d0000016e,
-        0x16f00000170,
+        0x1690000016A,
+        0x16B0000016C,
+        0x16D0000016E,
+        0x16F00000170,
         0x17100000172,
         0x17300000174,
         0x17500000176,
         0x17700000178,
-        0x17a0000017b,
-        0x17c0000017d,
-        0x17e0000017f,
+        0x17A0000017B,
+        0x17C0000017D,
+        0x17E0000017F,
         0x18000000181,
         0x18300000184,
         0x18500000186,
         0x18800000189,
-        0x18c0000018e,
+        0x18C0000018E,
         0x19200000193,
         0x19500000196,
-        0x1990000019c,
-        0x19e0000019f,
-        0x1a1000001a2,
-        0x1a3000001a4,
-        0x1a5000001a6,
-        0x1a8000001a9,
-        0x1aa000001ac,
-        0x1ad000001ae,
-        0x1b0000001b1,
-        0x1b4000001b5,
-        0x1b6000001b7,
-        0x1b9000001bc,
-        0x1bd000001c4,
-        0x1ce000001cf,
-        0x1d0000001d1,
-        0x1d2000001d3,
-        0x1d4000001d5,
-        0x1d6000001d7,
-        0x1d8000001d9,
-        0x1da000001db,
-        0x1dc000001de,
-        0x1df000001e0,
-        0x1e1000001e2,
-        0x1e3000001e4,
-        0x1e5000001e6,
-        0x1e7000001e8,
-        0x1e9000001ea,
-        0x1eb000001ec,
-        0x1ed000001ee,
-        0x1ef000001f1,
-        0x1f5000001f6,
-        0x1f9000001fa,
-        0x1fb000001fc,
-        0x1fd000001fe,
-        0x1ff00000200,
+        0x1990000019C,
+        0x19E0000019F,
+        0x1A1000001A2,
+        0x1A3000001A4,
+        0x1A5000001A6,
+        0x1A8000001A9,
+        0x1AA000001AC,
+        0x1AD000001AE,
+        0x1B0000001B1,
+        0x1B4000001B5,
+        0x1B6000001B7,
+        0x1B9000001BC,
+        0x1BD000001C4,
+        0x1CE000001CF,
+        0x1D0000001D1,
+        0x1D2000001D3,
+        0x1D4000001D5,
+        0x1D6000001D7,
+        0x1D8000001D9,
+        0x1DA000001DB,
+        0x1DC000001DE,
+        0x1DF000001E0,
+        0x1E1000001E2,
+        0x1E3000001E4,
+        0x1E5000001E6,
+        0x1E7000001E8,
+        0x1E9000001EA,
+        0x1EB000001EC,
+        0x1ED000001EE,
+        0x1EF000001F1,
+        0x1F5000001F6,
+        0x1F9000001FA,
+        0x1FB000001FC,
+        0x1FD000001FE,
+        0x1FF00000200,
         0x20100000202,
         0x20300000204,
         0x20500000206,
         0x20700000208,
-        0x2090000020a,
-        0x20b0000020c,
-        0x20d0000020e,
-        0x20f00000210,
+        0x2090000020A,
+        0x20B0000020C,
+        0x20D0000020E,
+        0x20F00000210,
         0x21100000212,
         0x21300000214,
         0x21500000216,
         0x21700000218,
-        0x2190000021a,
-        0x21b0000021c,
-        0x21d0000021e,
-        0x21f00000220,
+        0x2190000021A,
+        0x21B0000021C,
+        0x21D0000021E,
+        0x21F00000220,
         0x22100000222,
         0x22300000224,
         0x22500000226,
         0x22700000228,
-        0x2290000022a,
-        0x22b0000022c,
-        0x22d0000022e,
-        0x22f00000230,
+        0x2290000022A,
+        0x22B0000022C,
+        0x22D0000022E,
+        0x22F00000230,
         0x23100000232,
-        0x2330000023a,
-        0x23c0000023d,
-        0x23f00000241,
+        0x2330000023A,
+        0x23C0000023D,
+        0x23F00000241,
         0x24200000243,
         0x24700000248,
-        0x2490000024a,
-        0x24b0000024c,
-        0x24d0000024e,
-        0x24f000002b0,
-        0x2b9000002c2,
-        0x2c6000002d2,
-        0x2ec000002ed,
-        0x2ee000002ef,
+        0x2490000024A,
+        0x24B0000024C,
+        0x24D0000024E,
+        0x24F000002B0,
+        0x2B9000002C2,
+        0x2C6000002D2,
+        0x2EC000002ED,
+        0x2EE000002EF,
         0x30000000340,
         0x34200000343,
-        0x3460000034f,
+        0x3460000034F,
         0x35000000370,
         0x37100000372,
         0x37300000374,
         0x37700000378,
-        0x37b0000037e,
+        0x37B0000037E,
         0x39000000391,
-        0x3ac000003cf,
-        0x3d7000003d8,
-        0x3d9000003da,
-        0x3db000003dc,
-        0x3dd000003de,
-        0x3df000003e0,
-        0x3e1000003e2,
-        0x3e3000003e4,
-        0x3e5000003e6,
-        0x3e7000003e8,
-        0x3e9000003ea,
-        0x3eb000003ec,
-        0x3ed000003ee,
-        0x3ef000003f0,
-        0x3f3000003f4,
-        0x3f8000003f9,
-        0x3fb000003fd,
+        0x3AC000003CF,
+        0x3D7000003D8,
+        0x3D9000003DA,
+        0x3DB000003DC,
+        0x3DD000003DE,
+        0x3DF000003E0,
+        0x3E1000003E2,
+        0x3E3000003E4,
+        0x3E5000003E6,
+        0x3E7000003E8,
+        0x3E9000003EA,
+        0x3EB000003EC,
+        0x3ED000003EE,
+        0x3EF000003F0,
+        0x3F3000003F4,
+        0x3F8000003F9,
+        0x3FB000003FD,
         0x43000000460,
         0x46100000462,
         0x46300000464,
         0x46500000466,
         0x46700000468,
-        0x4690000046a,
-        0x46b0000046c,
-        0x46d0000046e,
-        0x46f00000470,
+        0x4690000046A,
+        0x46B0000046C,
+        0x46D0000046E,
+        0x46F00000470,
         0x47100000472,
         0x47300000474,
         0x47500000476,
         0x47700000478,
-        0x4790000047a,
-        0x47b0000047c,
-        0x47d0000047e,
-        0x47f00000480,
+        0x4790000047A,
+        0x47B0000047C,
+        0x47D0000047E,
+        0x47F00000480,
         0x48100000482,
         0x48300000488,
-        0x48b0000048c,
-        0x48d0000048e,
-        0x48f00000490,
+        0x48B0000048C,
+        0x48D0000048E,
+        0x48F00000490,
         0x49100000492,
         0x49300000494,
         0x49500000496,
         0x49700000498,
-        0x4990000049a,
-        0x49b0000049c,
-        0x49d0000049e,
-        0x49f000004a0,
-        0x4a1000004a2,
-        0x4a3000004a4,
-        0x4a5000004a6,
-        0x4a7000004a8,
-        0x4a9000004aa,
-        0x4ab000004ac,
-        0x4ad000004ae,
-        0x4af000004b0,
-        0x4b1000004b2,
-        0x4b3000004b4,
-        0x4b5000004b6,
-        0x4b7000004b8,
-        0x4b9000004ba,
-        0x4bb000004bc,
-        0x4bd000004be,
-        0x4bf000004c0,
-        0x4c2000004c3,
-        0x4c4000004c5,
-        0x4c6000004c7,
-        0x4c8000004c9,
-        0x4ca000004cb,
-        0x4cc000004cd,
-        0x4ce000004d0,
-        0x4d1000004d2,
-        0x4d3000004d4,
-        0x4d5000004d6,
-        0x4d7000004d8,
-        0x4d9000004da,
-        0x4db000004dc,
-        0x4dd000004de,
-        0x4df000004e0,
-        0x4e1000004e2,
-        0x4e3000004e4,
-        0x4e5000004e6,
-        0x4e7000004e8,
-        0x4e9000004ea,
-        0x4eb000004ec,
-        0x4ed000004ee,
-        0x4ef000004f0,
-        0x4f1000004f2,
-        0x4f3000004f4,
-        0x4f5000004f6,
-        0x4f7000004f8,
-        0x4f9000004fa,
-        0x4fb000004fc,
-        0x4fd000004fe,
-        0x4ff00000500,
+        0x4990000049A,
+        0x49B0000049C,
+        0x49D0000049E,
+        0x49F000004A0,
+        0x4A1000004A2,
+        0x4A3000004A4,
+        0x4A5000004A6,
+        0x4A7000004A8,
+        0x4A9000004AA,
+        0x4AB000004AC,
+        0x4AD000004AE,
+        0x4AF000004B0,
+        0x4B1000004B2,
+        0x4B3000004B4,
+        0x4B5000004B6,
+        0x4B7000004B8,
+        0x4B9000004BA,
+        0x4BB000004BC,
+        0x4BD000004BE,
+        0x4BF000004C0,
+        0x4C2000004C3,
+        0x4C4000004C5,
+        0x4C6000004C7,
+        0x4C8000004C9,
+        0x4CA000004CB,
+        0x4CC000004CD,
+        0x4CE000004D0,
+        0x4D1000004D2,
+        0x4D3000004D4,
+        0x4D5000004D6,
+        0x4D7000004D8,
+        0x4D9000004DA,
+        0x4DB000004DC,
+        0x4DD000004DE,
+        0x4DF000004E0,
+        0x4E1000004E2,
+        0x4E3000004E4,
+        0x4E5000004E6,
+        0x4E7000004E8,
+        0x4E9000004EA,
+        0x4EB000004EC,
+        0x4ED000004EE,
+        0x4EF000004F0,
+        0x4F1000004F2,
+        0x4F3000004F4,
+        0x4F5000004F6,
+        0x4F7000004F8,
+        0x4F9000004FA,
+        0x4FB000004FC,
+        0x4FD000004FE,
+        0x4FF00000500,
         0x50100000502,
         0x50300000504,
         0x50500000506,
         0x50700000508,
-        0x5090000050a,
-        0x50b0000050c,
-        0x50d0000050e,
-        0x50f00000510,
+        0x5090000050A,
+        0x50B0000050C,
+        0x50D0000050E,
+        0x50F00000510,
         0x51100000512,
         0x51300000514,
         0x51500000516,
         0x51700000518,
-        0x5190000051a,
-        0x51b0000051c,
-        0x51d0000051e,
-        0x51f00000520,
+        0x5190000051A,
+        0x51B0000051C,
+        0x51D0000051E,
+        0x51F00000520,
         0x52100000522,
         0x52300000524,
         0x52500000526,
         0x52700000528,
-        0x5290000052a,
-        0x52b0000052c,
-        0x52d0000052e,
-        0x52f00000530,
-        0x5590000055a,
+        0x5290000052A,
+        0x52B0000052C,
+        0x52D0000052E,
+        0x52F00000530,
+        0x5590000055A,
         0x56000000587,
         0x58800000589,
-        0x591000005be,
-        0x5bf000005c0,
-        0x5c1000005c3,
-        0x5c4000005c6,
-        0x5c7000005c8,
-        0x5d0000005eb,
-        0x5ef000005f3,
-        0x6100000061b,
+        0x591000005BE,
+        0x5BF000005C0,
+        0x5C1000005C3,
+        0x5C4000005C6,
+        0x5C7000005C8,
+        0x5D0000005EB,
+        0x5EF000005F3,
+        0x6100000061B,
         0x62000000640,
         0x64100000660,
-        0x66e00000675,
-        0x679000006d4,
-        0x6d5000006dd,
-        0x6df000006e9,
-        0x6ea000006f0,
-        0x6fa00000700,
-        0x7100000074b,
-        0x74d000007b2,
-        0x7c0000007f6,
-        0x7fd000007fe,
-        0x8000000082e,
-        0x8400000085c,
-        0x8600000086b,
+        0x66E00000675,
+        0x679000006D4,
+        0x6D5000006DD,
+        0x6DF000006E9,
+        0x6EA000006F0,
+        0x6FA00000700,
+        0x7100000074B,
+        0x74D000007B2,
+        0x7C0000007F6,
+        0x7FD000007FE,
+        0x8000000082E,
+        0x8400000085C,
+        0x8600000086B,
         0x87000000888,
-        0x8890000088f,
-        0x898000008e2,
-        0x8e300000958,
+        0x8890000088F,
+        0x898000008E2,
+        0x8E300000958,
         0x96000000964,
         0x96600000970,
         0x97100000984,
-        0x9850000098d,
-        0x98f00000991,
-        0x993000009a9,
-        0x9aa000009b1,
-        0x9b2000009b3,
-        0x9b6000009ba,
-        0x9bc000009c5,
-        0x9c7000009c9,
-        0x9cb000009cf,
-        0x9d7000009d8,
-        0x9e0000009e4,
-        0x9e6000009f2,
-        0x9fc000009fd,
-        0x9fe000009ff,
-        0xa0100000a04,
-        0xa0500000a0b,
-        0xa0f00000a11,
-        0xa1300000a29,
-        0xa2a00000a31,
-        0xa3200000a33,
-        0xa3500000a36,
-        0xa3800000a3a,
-        0xa3c00000a3d,
-        0xa3e00000a43,
-        0xa4700000a49,
-        0xa4b00000a4e,
-        0xa5100000a52,
-        0xa5c00000a5d,
-        0xa6600000a76,
-        0xa8100000a84,
-        0xa8500000a8e,
-        0xa8f00000a92,
-        0xa9300000aa9,
-        0xaaa00000ab1,
-        0xab200000ab4,
-        0xab500000aba,
-        0xabc00000ac6,
-        0xac700000aca,
-        0xacb00000ace,
-        0xad000000ad1,
-        0xae000000ae4,
-        0xae600000af0,
-        0xaf900000b00,
-        0xb0100000b04,
-        0xb0500000b0d,
-        0xb0f00000b11,
-        0xb1300000b29,
-        0xb2a00000b31,
-        0xb3200000b34,
-        0xb3500000b3a,
-        0xb3c00000b45,
-        0xb4700000b49,
-        0xb4b00000b4e,
-        0xb5500000b58,
-        0xb5f00000b64,
-        0xb6600000b70,
-        0xb7100000b72,
-        0xb8200000b84,
-        0xb8500000b8b,
-        0xb8e00000b91,
-        0xb9200000b96,
-        0xb9900000b9b,
-        0xb9c00000b9d,
-        0xb9e00000ba0,
-        0xba300000ba5,
-        0xba800000bab,
-        0xbae00000bba,
-        0xbbe00000bc3,
-        0xbc600000bc9,
-        0xbca00000bce,
-        0xbd000000bd1,
-        0xbd700000bd8,
-        0xbe600000bf0,
-        0xc0000000c0d,
-        0xc0e00000c11,
-        0xc1200000c29,
-        0xc2a00000c3a,
-        0xc3c00000c45,
-        0xc4600000c49,
-        0xc4a00000c4e,
-        0xc5500000c57,
-        0xc5800000c5b,
-        0xc5d00000c5e,
-        0xc6000000c64,
-        0xc6600000c70,
-        0xc8000000c84,
-        0xc8500000c8d,
-        0xc8e00000c91,
-        0xc9200000ca9,
-        0xcaa00000cb4,
-        0xcb500000cba,
-        0xcbc00000cc5,
-        0xcc600000cc9,
-        0xcca00000cce,
-        0xcd500000cd7,
-        0xcdd00000cdf,
-        0xce000000ce4,
-        0xce600000cf0,
-        0xcf100000cf4,
-        0xd0000000d0d,
-        0xd0e00000d11,
-        0xd1200000d45,
-        0xd4600000d49,
-        0xd4a00000d4f,
-        0xd5400000d58,
-        0xd5f00000d64,
-        0xd6600000d70,
-        0xd7a00000d80,
-        0xd8100000d84,
-        0xd8500000d97,
-        0xd9a00000db2,
-        0xdb300000dbc,
-        0xdbd00000dbe,
-        0xdc000000dc7,
-        0xdca00000dcb,
-        0xdcf00000dd5,
-        0xdd600000dd7,
-        0xdd800000de0,
-        0xde600000df0,
-        0xdf200000df4,
-        0xe0100000e33,
-        0xe3400000e3b,
-        0xe4000000e4f,
-        0xe5000000e5a,
-        0xe8100000e83,
-        0xe8400000e85,
-        0xe8600000e8b,
-        0xe8c00000ea4,
-        0xea500000ea6,
-        0xea700000eb3,
-        0xeb400000ebe,
-        0xec000000ec5,
-        0xec600000ec7,
-        0xec800000ecf,
-        0xed000000eda,
-        0xede00000ee0,
-        0xf0000000f01,
-        0xf0b00000f0c,
-        0xf1800000f1a,
-        0xf2000000f2a,
-        0xf3500000f36,
-        0xf3700000f38,
-        0xf3900000f3a,
-        0xf3e00000f43,
-        0xf4400000f48,
-        0xf4900000f4d,
-        0xf4e00000f52,
-        0xf5300000f57,
-        0xf5800000f5c,
-        0xf5d00000f69,
-        0xf6a00000f6d,
-        0xf7100000f73,
-        0xf7400000f75,
-        0xf7a00000f81,
-        0xf8200000f85,
-        0xf8600000f93,
-        0xf9400000f98,
-        0xf9900000f9d,
-        0xf9e00000fa2,
-        0xfa300000fa7,
-        0xfa800000fac,
-        0xfad00000fb9,
-        0xfba00000fbd,
-        0xfc600000fc7,
-        0x10000000104a,
-        0x10500000109e,
-        0x10d0000010fb,
-        0x10fd00001100,
+        0x9850000098D,
+        0x98F00000991,
+        0x993000009A9,
+        0x9AA000009B1,
+        0x9B2000009B3,
+        0x9B6000009BA,
+        0x9BC000009C5,
+        0x9C7000009C9,
+        0x9CB000009CF,
+        0x9D7000009D8,
+        0x9E0000009E4,
+        0x9E6000009F2,
+        0x9FC000009FD,
+        0x9FE000009FF,
+        0xA0100000A04,
+        0xA0500000A0B,
+        0xA0F00000A11,
+        0xA1300000A29,
+        0xA2A00000A31,
+        0xA3200000A33,
+        0xA3500000A36,
+        0xA3800000A3A,
+        0xA3C00000A3D,
+        0xA3E00000A43,
+        0xA4700000A49,
+        0xA4B00000A4E,
+        0xA5100000A52,
+        0xA5C00000A5D,
+        0xA6600000A76,
+        0xA8100000A84,
+        0xA8500000A8E,
+        0xA8F00000A92,
+        0xA9300000AA9,
+        0xAAA00000AB1,
+        0xAB200000AB4,
+        0xAB500000ABA,
+        0xABC00000AC6,
+        0xAC700000ACA,
+        0xACB00000ACE,
+        0xAD000000AD1,
+        0xAE000000AE4,
+        0xAE600000AF0,
+        0xAF900000B00,
+        0xB0100000B04,
+        0xB0500000B0D,
+        0xB0F00000B11,
+        0xB1300000B29,
+        0xB2A00000B31,
+        0xB3200000B34,
+        0xB3500000B3A,
+        0xB3C00000B45,
+        0xB4700000B49,
+        0xB4B00000B4E,
+        0xB5500000B58,
+        0xB5F00000B64,
+        0xB6600000B70,
+        0xB7100000B72,
+        0xB8200000B84,
+        0xB8500000B8B,
+        0xB8E00000B91,
+        0xB9200000B96,
+        0xB9900000B9B,
+        0xB9C00000B9D,
+        0xB9E00000BA0,
+        0xBA300000BA5,
+        0xBA800000BAB,
+        0xBAE00000BBA,
+        0xBBE00000BC3,
+        0xBC600000BC9,
+        0xBCA00000BCE,
+        0xBD000000BD1,
+        0xBD700000BD8,
+        0xBE600000BF0,
+        0xC0000000C0D,
+        0xC0E00000C11,
+        0xC1200000C29,
+        0xC2A00000C3A,
+        0xC3C00000C45,
+        0xC4600000C49,
+        0xC4A00000C4E,
+        0xC5500000C57,
+        0xC5800000C5B,
+        0xC5D00000C5E,
+        0xC6000000C64,
+        0xC6600000C70,
+        0xC8000000C84,
+        0xC8500000C8D,
+        0xC8E00000C91,
+        0xC9200000CA9,
+        0xCAA00000CB4,
+        0xCB500000CBA,
+        0xCBC00000CC5,
+        0xCC600000CC9,
+        0xCCA00000CCE,
+        0xCD500000CD7,
+        0xCDD00000CDF,
+        0xCE000000CE4,
+        0xCE600000CF0,
+        0xCF100000CF4,
+        0xD0000000D0D,
+        0xD0E00000D11,
+        0xD1200000D45,
+        0xD4600000D49,
+        0xD4A00000D4F,
+        0xD5400000D58,
+        0xD5F00000D64,
+        0xD6600000D70,
+        0xD7A00000D80,
+        0xD8100000D84,
+        0xD8500000D97,
+        0xD9A00000DB2,
+        0xDB300000DBC,
+        0xDBD00000DBE,
+        0xDC000000DC7,
+        0xDCA00000DCB,
+        0xDCF00000DD5,
+        0xDD600000DD7,
+        0xDD800000DE0,
+        0xDE600000DF0,
+        0xDF200000DF4,
+        0xE0100000E33,
+        0xE3400000E3B,
+        0xE4000000E4F,
+        0xE5000000E5A,
+        0xE8100000E83,
+        0xE8400000E85,
+        0xE8600000E8B,
+        0xE8C00000EA4,
+        0xEA500000EA6,
+        0xEA700000EB3,
+        0xEB400000EBE,
+        0xEC000000EC5,
+        0xEC600000EC7,
+        0xEC800000ECF,
+        0xED000000EDA,
+        0xEDE00000EE0,
+        0xF0000000F01,
+        0xF0B00000F0C,
+        0xF1800000F1A,
+        0xF2000000F2A,
+        0xF3500000F36,
+        0xF3700000F38,
+        0xF3900000F3A,
+        0xF3E00000F43,
+        0xF4400000F48,
+        0xF4900000F4D,
+        0xF4E00000F52,
+        0xF5300000F57,
+        0xF5800000F5C,
+        0xF5D00000F69,
+        0xF6A00000F6D,
+        0xF7100000F73,
+        0xF7400000F75,
+        0xF7A00000F81,
+        0xF8200000F85,
+        0xF8600000F93,
+        0xF9400000F98,
+        0xF9900000F9D,
+        0xF9E00000FA2,
+        0xFA300000FA7,
+        0xFA800000FAC,
+        0xFAD00000FB9,
+        0xFBA00000FBD,
+        0xFC600000FC7,
+        0x10000000104A,
+        0x10500000109E,
+        0x10D0000010FB,
+        0x10FD00001100,
         0x120000001249,
-        0x124a0000124e,
+        0x124A0000124E,
         0x125000001257,
         0x125800001259,
-        0x125a0000125e,
+        0x125A0000125E,
         0x126000001289,
-        0x128a0000128e,
-        0x1290000012b1,
-        0x12b2000012b6,
-        0x12b8000012bf,
-        0x12c0000012c1,
-        0x12c2000012c6,
-        0x12c8000012d7,
-        0x12d800001311,
+        0x128A0000128E,
+        0x1290000012B1,
+        0x12B2000012B6,
+        0x12B8000012BF,
+        0x12C0000012C1,
+        0x12C2000012C6,
+        0x12C8000012D7,
+        0x12D800001311,
         0x131200001316,
-        0x13180000135b,
-        0x135d00001360,
+        0x13180000135B,
+        0x135D00001360,
         0x138000001390,
-        0x13a0000013f6,
-        0x14010000166d,
-        0x166f00001680,
-        0x16810000169b,
-        0x16a0000016eb,
-        0x16f1000016f9,
+        0x13A0000013F6,
+        0x14010000166D,
+        0x166F00001680,
+        0x16810000169B,
+        0x16A0000016EB,
+        0x16F1000016F9,
         0x170000001716,
-        0x171f00001735,
+        0x171F00001735,
         0x174000001754,
-        0x17600000176d,
-        0x176e00001771,
+        0x17600000176D,
+        0x176E00001771,
         0x177200001774,
-        0x1780000017b4,
-        0x17b6000017d4,
-        0x17d7000017d8,
-        0x17dc000017de,
-        0x17e0000017ea,
-        0x18100000181a,
+        0x1780000017B4,
+        0x17B6000017D4,
+        0x17D7000017D8,
+        0x17DC000017DE,
+        0x17E0000017EA,
+        0x18100000181A,
         0x182000001879,
-        0x1880000018ab,
-        0x18b0000018f6,
-        0x19000000191f,
-        0x19200000192c,
-        0x19300000193c,
-        0x19460000196e,
+        0x1880000018AB,
+        0x18B0000018F6,
+        0x19000000191F,
+        0x19200000192C,
+        0x19300000193C,
+        0x19460000196E,
         0x197000001975,
-        0x1980000019ac,
-        0x19b0000019ca,
-        0x19d0000019da,
-        0x1a0000001a1c,
-        0x1a2000001a5f,
-        0x1a6000001a7d,
-        0x1a7f00001a8a,
-        0x1a9000001a9a,
-        0x1aa700001aa8,
-        0x1ab000001abe,
-        0x1abf00001acf,
-        0x1b0000001b4d,
-        0x1b5000001b5a,
-        0x1b6b00001b74,
-        0x1b8000001bf4,
-        0x1c0000001c38,
-        0x1c4000001c4a,
-        0x1c4d00001c7e,
-        0x1cd000001cd3,
-        0x1cd400001cfb,
-        0x1d0000001d2c,
-        0x1d2f00001d30,
-        0x1d3b00001d3c,
-        0x1d4e00001d4f,
-        0x1d6b00001d78,
-        0x1d7900001d9b,
-        0x1dc000001e00,
-        0x1e0100001e02,
-        0x1e0300001e04,
-        0x1e0500001e06,
-        0x1e0700001e08,
-        0x1e0900001e0a,
-        0x1e0b00001e0c,
-        0x1e0d00001e0e,
-        0x1e0f00001e10,
-        0x1e1100001e12,
-        0x1e1300001e14,
-        0x1e1500001e16,
-        0x1e1700001e18,
-        0x1e1900001e1a,
-        0x1e1b00001e1c,
-        0x1e1d00001e1e,
-        0x1e1f00001e20,
-        0x1e2100001e22,
-        0x1e2300001e24,
-        0x1e2500001e26,
-        0x1e2700001e28,
-        0x1e2900001e2a,
-        0x1e2b00001e2c,
-        0x1e2d00001e2e,
-        0x1e2f00001e30,
-        0x1e3100001e32,
-        0x1e3300001e34,
-        0x1e3500001e36,
-        0x1e3700001e38,
-        0x1e3900001e3a,
-        0x1e3b00001e3c,
-        0x1e3d00001e3e,
-        0x1e3f00001e40,
-        0x1e4100001e42,
-        0x1e4300001e44,
-        0x1e4500001e46,
-        0x1e4700001e48,
-        0x1e4900001e4a,
-        0x1e4b00001e4c,
-        0x1e4d00001e4e,
-        0x1e4f00001e50,
-        0x1e5100001e52,
-        0x1e5300001e54,
-        0x1e5500001e56,
-        0x1e5700001e58,
-        0x1e5900001e5a,
-        0x1e5b00001e5c,
-        0x1e5d00001e5e,
-        0x1e5f00001e60,
-        0x1e6100001e62,
-        0x1e6300001e64,
-        0x1e6500001e66,
-        0x1e6700001e68,
-        0x1e6900001e6a,
-        0x1e6b00001e6c,
-        0x1e6d00001e6e,
-        0x1e6f00001e70,
-        0x1e7100001e72,
-        0x1e7300001e74,
-        0x1e7500001e76,
-        0x1e7700001e78,
-        0x1e7900001e7a,
-        0x1e7b00001e7c,
-        0x1e7d00001e7e,
-        0x1e7f00001e80,
-        0x1e8100001e82,
-        0x1e8300001e84,
-        0x1e8500001e86,
-        0x1e8700001e88,
-        0x1e8900001e8a,
-        0x1e8b00001e8c,
-        0x1e8d00001e8e,
-        0x1e8f00001e90,
-        0x1e9100001e92,
-        0x1e9300001e94,
-        0x1e9500001e9a,
-        0x1e9c00001e9e,
-        0x1e9f00001ea0,
-        0x1ea100001ea2,
-        0x1ea300001ea4,
-        0x1ea500001ea6,
-        0x1ea700001ea8,
-        0x1ea900001eaa,
-        0x1eab00001eac,
-        0x1ead00001eae,
-        0x1eaf00001eb0,
-        0x1eb100001eb2,
-        0x1eb300001eb4,
-        0x1eb500001eb6,
-        0x1eb700001eb8,
-        0x1eb900001eba,
-        0x1ebb00001ebc,
-        0x1ebd00001ebe,
-        0x1ebf00001ec0,
-        0x1ec100001ec2,
-        0x1ec300001ec4,
-        0x1ec500001ec6,
-        0x1ec700001ec8,
-        0x1ec900001eca,
-        0x1ecb00001ecc,
-        0x1ecd00001ece,
-        0x1ecf00001ed0,
-        0x1ed100001ed2,
-        0x1ed300001ed4,
-        0x1ed500001ed6,
-        0x1ed700001ed8,
-        0x1ed900001eda,
-        0x1edb00001edc,
-        0x1edd00001ede,
-        0x1edf00001ee0,
-        0x1ee100001ee2,
-        0x1ee300001ee4,
-        0x1ee500001ee6,
-        0x1ee700001ee8,
-        0x1ee900001eea,
-        0x1eeb00001eec,
-        0x1eed00001eee,
-        0x1eef00001ef0,
-        0x1ef100001ef2,
-        0x1ef300001ef4,
-        0x1ef500001ef6,
-        0x1ef700001ef8,
-        0x1ef900001efa,
-        0x1efb00001efc,
-        0x1efd00001efe,
-        0x1eff00001f08,
-        0x1f1000001f16,
-        0x1f2000001f28,
-        0x1f3000001f38,
-        0x1f4000001f46,
-        0x1f5000001f58,
-        0x1f6000001f68,
-        0x1f7000001f71,
-        0x1f7200001f73,
-        0x1f7400001f75,
-        0x1f7600001f77,
-        0x1f7800001f79,
-        0x1f7a00001f7b,
-        0x1f7c00001f7d,
-        0x1fb000001fb2,
-        0x1fb600001fb7,
-        0x1fc600001fc7,
-        0x1fd000001fd3,
-        0x1fd600001fd8,
-        0x1fe000001fe3,
-        0x1fe400001fe8,
-        0x1ff600001ff7,
-        0x214e0000214f,
+        0x1980000019AC,
+        0x19B0000019CA,
+        0x19D0000019DA,
+        0x1A0000001A1C,
+        0x1A2000001A5F,
+        0x1A6000001A7D,
+        0x1A7F00001A8A,
+        0x1A9000001A9A,
+        0x1AA700001AA8,
+        0x1AB000001ABE,
+        0x1ABF00001ACF,
+        0x1B0000001B4D,
+        0x1B5000001B5A,
+        0x1B6B00001B74,
+        0x1B8000001BF4,
+        0x1C0000001C38,
+        0x1C4000001C4A,
+        0x1C4D00001C7E,
+        0x1CD000001CD3,
+        0x1CD400001CFB,
+        0x1D0000001D2C,
+        0x1D2F00001D30,
+        0x1D3B00001D3C,
+        0x1D4E00001D4F,
+        0x1D6B00001D78,
+        0x1D7900001D9B,
+        0x1DC000001E00,
+        0x1E0100001E02,
+        0x1E0300001E04,
+        0x1E0500001E06,
+        0x1E0700001E08,
+        0x1E0900001E0A,
+        0x1E0B00001E0C,
+        0x1E0D00001E0E,
+        0x1E0F00001E10,
+        0x1E1100001E12,
+        0x1E1300001E14,
+        0x1E1500001E16,
+        0x1E1700001E18,
+        0x1E1900001E1A,
+        0x1E1B00001E1C,
+        0x1E1D00001E1E,
+        0x1E1F00001E20,
+        0x1E2100001E22,
+        0x1E2300001E24,
+        0x1E2500001E26,
+        0x1E2700001E28,
+        0x1E2900001E2A,
+        0x1E2B00001E2C,
+        0x1E2D00001E2E,
+        0x1E2F00001E30,
+        0x1E3100001E32,
+        0x1E3300001E34,
+        0x1E3500001E36,
+        0x1E3700001E38,
+        0x1E3900001E3A,
+        0x1E3B00001E3C,
+        0x1E3D00001E3E,
+        0x1E3F00001E40,
+        0x1E4100001E42,
+        0x1E4300001E44,
+        0x1E4500001E46,
+        0x1E4700001E48,
+        0x1E4900001E4A,
+        0x1E4B00001E4C,
+        0x1E4D00001E4E,
+        0x1E4F00001E50,
+        0x1E5100001E52,
+        0x1E5300001E54,
+        0x1E5500001E56,
+        0x1E5700001E58,
+        0x1E5900001E5A,
+        0x1E5B00001E5C,
+        0x1E5D00001E5E,
+        0x1E5F00001E60,
+        0x1E6100001E62,
+        0x1E6300001E64,
+        0x1E6500001E66,
+        0x1E6700001E68,
+        0x1E6900001E6A,
+        0x1E6B00001E6C,
+        0x1E6D00001E6E,
+        0x1E6F00001E70,
+        0x1E7100001E72,
+        0x1E7300001E74,
+        0x1E7500001E76,
+        0x1E7700001E78,
+        0x1E7900001E7A,
+        0x1E7B00001E7C,
+        0x1E7D00001E7E,
+        0x1E7F00001E80,
+        0x1E8100001E82,
+        0x1E8300001E84,
+        0x1E8500001E86,
+        0x1E8700001E88,
+        0x1E8900001E8A,
+        0x1E8B00001E8C,
+        0x1E8D00001E8E,
+        0x1E8F00001E90,
+        0x1E9100001E92,
+        0x1E9300001E94,
+        0x1E9500001E9A,
+        0x1E9C00001E9E,
+        0x1E9F00001EA0,
+        0x1EA100001EA2,
+        0x1EA300001EA4,
+        0x1EA500001EA6,
+        0x1EA700001EA8,
+        0x1EA900001EAA,
+        0x1EAB00001EAC,
+        0x1EAD00001EAE,
+        0x1EAF00001EB0,
+        0x1EB100001EB2,
+        0x1EB300001EB4,
+        0x1EB500001EB6,
+        0x1EB700001EB8,
+        0x1EB900001EBA,
+        0x1EBB00001EBC,
+        0x1EBD00001EBE,
+        0x1EBF00001EC0,
+        0x1EC100001EC2,
+        0x1EC300001EC4,
+        0x1EC500001EC6,
+        0x1EC700001EC8,
+        0x1EC900001ECA,
+        0x1ECB00001ECC,
+        0x1ECD00001ECE,
+        0x1ECF00001ED0,
+        0x1ED100001ED2,
+        0x1ED300001ED4,
+        0x1ED500001ED6,
+        0x1ED700001ED8,
+        0x1ED900001EDA,
+        0x1EDB00001EDC,
+        0x1EDD00001EDE,
+        0x1EDF00001EE0,
+        0x1EE100001EE2,
+        0x1EE300001EE4,
+        0x1EE500001EE6,
+        0x1EE700001EE8,
+        0x1EE900001EEA,
+        0x1EEB00001EEC,
+        0x1EED00001EEE,
+        0x1EEF00001EF0,
+        0x1EF100001EF2,
+        0x1EF300001EF4,
+        0x1EF500001EF6,
+        0x1EF700001EF8,
+        0x1EF900001EFA,
+        0x1EFB00001EFC,
+        0x1EFD00001EFE,
+        0x1EFF00001F08,
+        0x1F1000001F16,
+        0x1F2000001F28,
+        0x1F3000001F38,
+        0x1F4000001F46,
+        0x1F5000001F58,
+        0x1F6000001F68,
+        0x1F7000001F71,
+        0x1F7200001F73,
+        0x1F7400001F75,
+        0x1F7600001F77,
+        0x1F7800001F79,
+        0x1F7A00001F7B,
+        0x1F7C00001F7D,
+        0x1FB000001FB2,
+        0x1FB600001FB7,
+        0x1FC600001FC7,
+        0x1FD000001FD3,
+        0x1FD600001FD8,
+        0x1FE000001FE3,
+        0x1FE400001FE8,
+        0x1FF600001FF7,
+        0x214E0000214F,
         0x218400002185,
-        0x2c3000002c60,
-        0x2c6100002c62,
-        0x2c6500002c67,
-        0x2c6800002c69,
-        0x2c6a00002c6b,
-        0x2c6c00002c6d,
-        0x2c7100002c72,
-        0x2c7300002c75,
-        0x2c7600002c7c,
-        0x2c8100002c82,
-        0x2c8300002c84,
-        0x2c8500002c86,
-        0x2c8700002c88,
-        0x2c8900002c8a,
-        0x2c8b00002c8c,
-        0x2c8d00002c8e,
-        0x2c8f00002c90,
-        0x2c9100002c92,
-        0x2c9300002c94,
-        0x2c9500002c96,
-        0x2c9700002c98,
-        0x2c9900002c9a,
-        0x2c9b00002c9c,
-        0x2c9d00002c9e,
-        0x2c9f00002ca0,
-        0x2ca100002ca2,
-        0x2ca300002ca4,
-        0x2ca500002ca6,
-        0x2ca700002ca8,
-        0x2ca900002caa,
-        0x2cab00002cac,
-        0x2cad00002cae,
-        0x2caf00002cb0,
-        0x2cb100002cb2,
-        0x2cb300002cb4,
-        0x2cb500002cb6,
-        0x2cb700002cb8,
-        0x2cb900002cba,
-        0x2cbb00002cbc,
-        0x2cbd00002cbe,
-        0x2cbf00002cc0,
-        0x2cc100002cc2,
-        0x2cc300002cc4,
-        0x2cc500002cc6,
-        0x2cc700002cc8,
-        0x2cc900002cca,
-        0x2ccb00002ccc,
-        0x2ccd00002cce,
-        0x2ccf00002cd0,
-        0x2cd100002cd2,
-        0x2cd300002cd4,
-        0x2cd500002cd6,
-        0x2cd700002cd8,
-        0x2cd900002cda,
-        0x2cdb00002cdc,
-        0x2cdd00002cde,
-        0x2cdf00002ce0,
-        0x2ce100002ce2,
-        0x2ce300002ce5,
-        0x2cec00002ced,
-        0x2cee00002cf2,
-        0x2cf300002cf4,
-        0x2d0000002d26,
-        0x2d2700002d28,
-        0x2d2d00002d2e,
-        0x2d3000002d68,
-        0x2d7f00002d97,
-        0x2da000002da7,
-        0x2da800002daf,
-        0x2db000002db7,
-        0x2db800002dbf,
-        0x2dc000002dc7,
-        0x2dc800002dcf,
-        0x2dd000002dd7,
-        0x2dd800002ddf,
-        0x2de000002e00,
-        0x2e2f00002e30,
+        0x2C3000002C60,
+        0x2C6100002C62,
+        0x2C6500002C67,
+        0x2C6800002C69,
+        0x2C6A00002C6B,
+        0x2C6C00002C6D,
+        0x2C7100002C72,
+        0x2C7300002C75,
+        0x2C7600002C7C,
+        0x2C8100002C82,
+        0x2C8300002C84,
+        0x2C8500002C86,
+        0x2C8700002C88,
+        0x2C8900002C8A,
+        0x2C8B00002C8C,
+        0x2C8D00002C8E,
+        0x2C8F00002C90,
+        0x2C9100002C92,
+        0x2C9300002C94,
+        0x2C9500002C96,
+        0x2C9700002C98,
+        0x2C9900002C9A,
+        0x2C9B00002C9C,
+        0x2C9D00002C9E,
+        0x2C9F00002CA0,
+        0x2CA100002CA2,
+        0x2CA300002CA4,
+        0x2CA500002CA6,
+        0x2CA700002CA8,
+        0x2CA900002CAA,
+        0x2CAB00002CAC,
+        0x2CAD00002CAE,
+        0x2CAF00002CB0,
+        0x2CB100002CB2,
+        0x2CB300002CB4,
+        0x2CB500002CB6,
+        0x2CB700002CB8,
+        0x2CB900002CBA,
+        0x2CBB00002CBC,
+        0x2CBD00002CBE,
+        0x2CBF00002CC0,
+        0x2CC100002CC2,
+        0x2CC300002CC4,
+        0x2CC500002CC6,
+        0x2CC700002CC8,
+        0x2CC900002CCA,
+        0x2CCB00002CCC,
+        0x2CCD00002CCE,
+        0x2CCF00002CD0,
+        0x2CD100002CD2,
+        0x2CD300002CD4,
+        0x2CD500002CD6,
+        0x2CD700002CD8,
+        0x2CD900002CDA,
+        0x2CDB00002CDC,
+        0x2CDD00002CDE,
+        0x2CDF00002CE0,
+        0x2CE100002CE2,
+        0x2CE300002CE5,
+        0x2CEC00002CED,
+        0x2CEE00002CF2,
+        0x2CF300002CF4,
+        0x2D0000002D26,
+        0x2D2700002D28,
+        0x2D2D00002D2E,
+        0x2D3000002D68,
+        0x2D7F00002D97,
+        0x2DA000002DA7,
+        0x2DA800002DAF,
+        0x2DB000002DB7,
+        0x2DB800002DBF,
+        0x2DC000002DC7,
+        0x2DC800002DCF,
+        0x2DD000002DD7,
+        0x2DD800002DDF,
+        0x2DE000002E00,
+        0x2E2F00002E30,
         0x300500003008,
-        0x302a0000302e,
-        0x303c0000303d,
+        0x302A0000302E,
+        0x303C0000303D,
         0x304100003097,
-        0x30990000309b,
-        0x309d0000309f,
-        0x30a1000030fb,
-        0x30fc000030ff,
+        0x30990000309B,
+        0x309D0000309F,
+        0x30A1000030FB,
+        0x30FC000030FF,
         0x310500003130,
-        0x31a0000031c0,
-        0x31f000003200,
-        0x340000004dc0,
-        0x4e000000a48d,
-        0xa4d00000a4fe,
-        0xa5000000a60d,
-        0xa6100000a62c,
-        0xa6410000a642,
-        0xa6430000a644,
-        0xa6450000a646,
-        0xa6470000a648,
-        0xa6490000a64a,
-        0xa64b0000a64c,
-        0xa64d0000a64e,
-        0xa64f0000a650,
-        0xa6510000a652,
-        0xa6530000a654,
-        0xa6550000a656,
-        0xa6570000a658,
-        0xa6590000a65a,
-        0xa65b0000a65c,
-        0xa65d0000a65e,
-        0xa65f0000a660,
-        0xa6610000a662,
-        0xa6630000a664,
-        0xa6650000a666,
-        0xa6670000a668,
-        0xa6690000a66a,
-        0xa66b0000a66c,
-        0xa66d0000a670,
-        0xa6740000a67e,
-        0xa67f0000a680,
-        0xa6810000a682,
-        0xa6830000a684,
-        0xa6850000a686,
-        0xa6870000a688,
-        0xa6890000a68a,
-        0xa68b0000a68c,
-        0xa68d0000a68e,
-        0xa68f0000a690,
-        0xa6910000a692,
-        0xa6930000a694,
-        0xa6950000a696,
-        0xa6970000a698,
-        0xa6990000a69a,
-        0xa69b0000a69c,
-        0xa69e0000a6e6,
-        0xa6f00000a6f2,
-        0xa7170000a720,
-        0xa7230000a724,
-        0xa7250000a726,
-        0xa7270000a728,
-        0xa7290000a72a,
-        0xa72b0000a72c,
-        0xa72d0000a72e,
-        0xa72f0000a732,
-        0xa7330000a734,
-        0xa7350000a736,
-        0xa7370000a738,
-        0xa7390000a73a,
-        0xa73b0000a73c,
-        0xa73d0000a73e,
-        0xa73f0000a740,
-        0xa7410000a742,
-        0xa7430000a744,
-        0xa7450000a746,
-        0xa7470000a748,
-        0xa7490000a74a,
-        0xa74b0000a74c,
-        0xa74d0000a74e,
-        0xa74f0000a750,
-        0xa7510000a752,
-        0xa7530000a754,
-        0xa7550000a756,
-        0xa7570000a758,
-        0xa7590000a75a,
-        0xa75b0000a75c,
-        0xa75d0000a75e,
-        0xa75f0000a760,
-        0xa7610000a762,
-        0xa7630000a764,
-        0xa7650000a766,
-        0xa7670000a768,
-        0xa7690000a76a,
-        0xa76b0000a76c,
-        0xa76d0000a76e,
-        0xa76f0000a770,
-        0xa7710000a779,
-        0xa77a0000a77b,
-        0xa77c0000a77d,
-        0xa77f0000a780,
-        0xa7810000a782,
-        0xa7830000a784,
-        0xa7850000a786,
-        0xa7870000a789,
-        0xa78c0000a78d,
-        0xa78e0000a790,
-        0xa7910000a792,
-        0xa7930000a796,
-        0xa7970000a798,
-        0xa7990000a79a,
-        0xa79b0000a79c,
-        0xa79d0000a79e,
-        0xa79f0000a7a0,
-        0xa7a10000a7a2,
-        0xa7a30000a7a4,
-        0xa7a50000a7a6,
-        0xa7a70000a7a8,
-        0xa7a90000a7aa,
-        0xa7af0000a7b0,
-        0xa7b50000a7b6,
-        0xa7b70000a7b8,
-        0xa7b90000a7ba,
-        0xa7bb0000a7bc,
-        0xa7bd0000a7be,
-        0xa7bf0000a7c0,
-        0xa7c10000a7c2,
-        0xa7c30000a7c4,
-        0xa7c80000a7c9,
-        0xa7ca0000a7cb,
-        0xa7d10000a7d2,
-        0xa7d30000a7d4,
-        0xa7d50000a7d6,
-        0xa7d70000a7d8,
-        0xa7d90000a7da,
-        0xa7f60000a7f8,
-        0xa7fa0000a828,
-        0xa82c0000a82d,
-        0xa8400000a874,
-        0xa8800000a8c6,
-        0xa8d00000a8da,
-        0xa8e00000a8f8,
-        0xa8fb0000a8fc,
-        0xa8fd0000a92e,
-        0xa9300000a954,
-        0xa9800000a9c1,
-        0xa9cf0000a9da,
-        0xa9e00000a9ff,
-        0xaa000000aa37,
-        0xaa400000aa4e,
-        0xaa500000aa5a,
-        0xaa600000aa77,
-        0xaa7a0000aac3,
-        0xaadb0000aade,
-        0xaae00000aaf0,
-        0xaaf20000aaf7,
-        0xab010000ab07,
-        0xab090000ab0f,
-        0xab110000ab17,
-        0xab200000ab27,
-        0xab280000ab2f,
-        0xab300000ab5b,
-        0xab600000ab69,
-        0xabc00000abeb,
-        0xabec0000abee,
-        0xabf00000abfa,
-        0xac000000d7a4,
-        0xfa0e0000fa10,
-        0xfa110000fa12,
-        0xfa130000fa15,
-        0xfa1f0000fa20,
-        0xfa210000fa22,
-        0xfa230000fa25,
-        0xfa270000fa2a,
-        0xfb1e0000fb1f,
-        0xfe200000fe30,
-        0xfe730000fe74,
-        0x100000001000c,
-        0x1000d00010027,
-        0x100280001003b,
-        0x1003c0001003e,
-        0x1003f0001004e,
-        0x100500001005e,
-        0x10080000100fb,
-        0x101fd000101fe,
-        0x102800001029d,
-        0x102a0000102d1,
-        0x102e0000102e1,
+        0x31A0000031C0,
+        0x31F000003200,
+        0x340000004DC0,
+        0x4E000000A48D,
+        0xA4D00000A4FE,
+        0xA5000000A60D,
+        0xA6100000A62C,
+        0xA6410000A642,
+        0xA6430000A644,
+        0xA6450000A646,
+        0xA6470000A648,
+        0xA6490000A64A,
+        0xA64B0000A64C,
+        0xA64D0000A64E,
+        0xA64F0000A650,
+        0xA6510000A652,
+        0xA6530000A654,
+        0xA6550000A656,
+        0xA6570000A658,
+        0xA6590000A65A,
+        0xA65B0000A65C,
+        0xA65D0000A65E,
+        0xA65F0000A660,
+        0xA6610000A662,
+        0xA6630000A664,
+        0xA6650000A666,
+        0xA6670000A668,
+        0xA6690000A66A,
+        0xA66B0000A66C,
+        0xA66D0000A670,
+        0xA6740000A67E,
+        0xA67F0000A680,
+        0xA6810000A682,
+        0xA6830000A684,
+        0xA6850000A686,
+        0xA6870000A688,
+        0xA6890000A68A,
+        0xA68B0000A68C,
+        0xA68D0000A68E,
+        0xA68F0000A690,
+        0xA6910000A692,
+        0xA6930000A694,
+        0xA6950000A696,
+        0xA6970000A698,
+        0xA6990000A69A,
+        0xA69B0000A69C,
+        0xA69E0000A6E6,
+        0xA6F00000A6F2,
+        0xA7170000A720,
+        0xA7230000A724,
+        0xA7250000A726,
+        0xA7270000A728,
+        0xA7290000A72A,
+        0xA72B0000A72C,
+        0xA72D0000A72E,
+        0xA72F0000A732,
+        0xA7330000A734,
+        0xA7350000A736,
+        0xA7370000A738,
+        0xA7390000A73A,
+        0xA73B0000A73C,
+        0xA73D0000A73E,
+        0xA73F0000A740,
+        0xA7410000A742,
+        0xA7430000A744,
+        0xA7450000A746,
+        0xA7470000A748,
+        0xA7490000A74A,
+        0xA74B0000A74C,
+        0xA74D0000A74E,
+        0xA74F0000A750,
+        0xA7510000A752,
+        0xA7530000A754,
+        0xA7550000A756,
+        0xA7570000A758,
+        0xA7590000A75A,
+        0xA75B0000A75C,
+        0xA75D0000A75E,
+        0xA75F0000A760,
+        0xA7610000A762,
+        0xA7630000A764,
+        0xA7650000A766,
+        0xA7670000A768,
+        0xA7690000A76A,
+        0xA76B0000A76C,
+        0xA76D0000A76E,
+        0xA76F0000A770,
+        0xA7710000A779,
+        0xA77A0000A77B,
+        0xA77C0000A77D,
+        0xA77F0000A780,
+        0xA7810000A782,
+        0xA7830000A784,
+        0xA7850000A786,
+        0xA7870000A789,
+        0xA78C0000A78D,
+        0xA78E0000A790,
+        0xA7910000A792,
+        0xA7930000A796,
+        0xA7970000A798,
+        0xA7990000A79A,
+        0xA79B0000A79C,
+        0xA79D0000A79E,
+        0xA79F0000A7A0,
+        0xA7A10000A7A2,
+        0xA7A30000A7A4,
+        0xA7A50000A7A6,
+        0xA7A70000A7A8,
+        0xA7A90000A7AA,
+        0xA7AF0000A7B0,
+        0xA7B50000A7B6,
+        0xA7B70000A7B8,
+        0xA7B90000A7BA,
+        0xA7BB0000A7BC,
+        0xA7BD0000A7BE,
+        0xA7BF0000A7C0,
+        0xA7C10000A7C2,
+        0xA7C30000A7C4,
+        0xA7C80000A7C9,
+        0xA7CA0000A7CB,
+        0xA7D10000A7D2,
+        0xA7D30000A7D4,
+        0xA7D50000A7D6,
+        0xA7D70000A7D8,
+        0xA7D90000A7DA,
+        0xA7F60000A7F8,
+        0xA7FA0000A828,
+        0xA82C0000A82D,
+        0xA8400000A874,
+        0xA8800000A8C6,
+        0xA8D00000A8DA,
+        0xA8E00000A8F8,
+        0xA8FB0000A8FC,
+        0xA8FD0000A92E,
+        0xA9300000A954,
+        0xA9800000A9C1,
+        0xA9CF0000A9DA,
+        0xA9E00000A9FF,
+        0xAA000000AA37,
+        0xAA400000AA4E,
+        0xAA500000AA5A,
+        0xAA600000AA77,
+        0xAA7A0000AAC3,
+        0xAADB0000AADE,
+        0xAAE00000AAF0,
+        0xAAF20000AAF7,
+        0xAB010000AB07,
+        0xAB090000AB0F,
+        0xAB110000AB17,
+        0xAB200000AB27,
+        0xAB280000AB2F,
+        0xAB300000AB5B,
+        0xAB600000AB69,
+        0xABC00000ABEB,
+        0xABEC0000ABEE,
+        0xABF00000ABFA,
+        0xAC000000D7A4,
+        0xFA0E0000FA10,
+        0xFA110000FA12,
+        0xFA130000FA15,
+        0xFA1F0000FA20,
+        0xFA210000FA22,
+        0xFA230000FA25,
+        0xFA270000FA2A,
+        0xFB1E0000FB1F,
+        0xFE200000FE30,
+        0xFE730000FE74,
+        0x100000001000C,
+        0x1000D00010027,
+        0x100280001003B,
+        0x1003C0001003E,
+        0x1003F0001004E,
+        0x100500001005E,
+        0x10080000100FB,
+        0x101FD000101FE,
+        0x102800001029D,
+        0x102A0000102D1,
+        0x102E0000102E1,
         0x1030000010320,
-        0x1032d00010341,
-        0x103420001034a,
-        0x103500001037b,
-        0x103800001039e,
-        0x103a0000103c4,
-        0x103c8000103d0,
-        0x104280001049e,
-        0x104a0000104aa,
-        0x104d8000104fc,
+        0x1032D00010341,
+        0x103420001034A,
+        0x103500001037B,
+        0x103800001039E,
+        0x103A0000103C4,
+        0x103C8000103D0,
+        0x104280001049E,
+        0x104A0000104AA,
+        0x104D8000104FC,
         0x1050000010528,
         0x1053000010564,
-        0x10597000105a2,
-        0x105a3000105b2,
-        0x105b3000105ba,
-        0x105bb000105bd,
+        0x10597000105A2,
+        0x105A3000105B2,
+        0x105B3000105BA,
+        0x105BB000105BD,
         0x1060000010737,
         0x1074000010756,
         0x1076000010768,
         0x1078000010781,
         0x1080000010806,
         0x1080800010809,
-        0x1080a00010836,
+        0x1080A00010836,
         0x1083700010839,
-        0x1083c0001083d,
-        0x1083f00010856,
+        0x1083C0001083D,
+        0x1083F00010856,
         0x1086000010877,
-        0x108800001089f,
-        0x108e0000108f3,
-        0x108f4000108f6,
+        0x108800001089F,
+        0x108E0000108F3,
+        0x108F4000108F6,
         0x1090000010916,
-        0x109200001093a,
-        0x10980000109b8,
-        0x109be000109c0,
-        0x10a0000010a04,
-        0x10a0500010a07,
-        0x10a0c00010a14,
-        0x10a1500010a18,
-        0x10a1900010a36,
-        0x10a3800010a3b,
-        0x10a3f00010a40,
-        0x10a6000010a7d,
-        0x10a8000010a9d,
-        0x10ac000010ac8,
-        0x10ac900010ae7,
-        0x10b0000010b36,
-        0x10b4000010b56,
-        0x10b6000010b73,
-        0x10b8000010b92,
-        0x10c0000010c49,
-        0x10cc000010cf3,
-        0x10d0000010d28,
-        0x10d3000010d3a,
-        0x10e8000010eaa,
-        0x10eab00010ead,
-        0x10eb000010eb2,
-        0x10efd00010f1d,
-        0x10f2700010f28,
-        0x10f3000010f51,
-        0x10f7000010f86,
-        0x10fb000010fc5,
-        0x10fe000010ff7,
+        0x109200001093A,
+        0x10980000109B8,
+        0x109BE000109C0,
+        0x10A0000010A04,
+        0x10A0500010A07,
+        0x10A0C00010A14,
+        0x10A1500010A18,
+        0x10A1900010A36,
+        0x10A3800010A3B,
+        0x10A3F00010A40,
+        0x10A6000010A7D,
+        0x10A8000010A9D,
+        0x10AC000010AC8,
+        0x10AC900010AE7,
+        0x10B0000010B36,
+        0x10B4000010B56,
+        0x10B6000010B73,
+        0x10B8000010B92,
+        0x10C0000010C49,
+        0x10CC000010CF3,
+        0x10D0000010D28,
+        0x10D3000010D3A,
+        0x10E8000010EAA,
+        0x10EAB00010EAD,
+        0x10EB000010EB2,
+        0x10EFD00010F1D,
+        0x10F2700010F28,
+        0x10F3000010F51,
+        0x10F7000010F86,
+        0x10FB000010FC5,
+        0x10FE000010FF7,
         0x1100000011047,
         0x1106600011076,
-        0x1107f000110bb,
-        0x110c2000110c3,
-        0x110d0000110e9,
-        0x110f0000110fa,
+        0x1107F000110BB,
+        0x110C2000110C3,
+        0x110D0000110E9,
+        0x110F0000110FA,
         0x1110000011135,
         0x1113600011140,
         0x1114400011148,
         0x1115000011174,
         0x1117600011177,
-        0x11180000111c5,
-        0x111c9000111cd,
-        0x111ce000111db,
-        0x111dc000111dd,
+        0x11180000111C5,
+        0x111C9000111CD,
+        0x111CE000111DB,
+        0x111DC000111DD,
         0x1120000011212,
         0x1121300011238,
-        0x1123e00011242,
+        0x1123E00011242,
         0x1128000011287,
         0x1128800011289,
-        0x1128a0001128e,
-        0x1128f0001129e,
-        0x1129f000112a9,
-        0x112b0000112eb,
-        0x112f0000112fa,
+        0x1128A0001128E,
+        0x1128F0001129E,
+        0x1129F000112A9,
+        0x112B0000112EB,
+        0x112F0000112FA,
         0x1130000011304,
-        0x113050001130d,
-        0x1130f00011311,
+        0x113050001130D,
+        0x1130F00011311,
         0x1131300011329,
-        0x1132a00011331,
+        0x1132A00011331,
         0x1133200011334,
-        0x113350001133a,
-        0x1133b00011345,
+        0x113350001133A,
+        0x1133B00011345,
         0x1134700011349,
-        0x1134b0001134e,
+        0x1134B0001134E,
         0x1135000011351,
         0x1135700011358,
-        0x1135d00011364,
-        0x113660001136d,
+        0x1135D00011364,
+        0x113660001136D,
         0x1137000011375,
-        0x114000001144b,
-        0x114500001145a,
-        0x1145e00011462,
-        0x11480000114c6,
-        0x114c7000114c8,
-        0x114d0000114da,
-        0x11580000115b6,
-        0x115b8000115c1,
-        0x115d8000115de,
+        0x114000001144B,
+        0x114500001145A,
+        0x1145E00011462,
+        0x11480000114C6,
+        0x114C7000114C8,
+        0x114D0000114DA,
+        0x11580000115B6,
+        0x115B8000115C1,
+        0x115D8000115DE,
         0x1160000011641,
         0x1164400011645,
-        0x116500001165a,
-        0x11680000116b9,
-        0x116c0000116ca,
-        0x117000001171b,
-        0x1171d0001172c,
-        0x117300001173a,
+        0x116500001165A,
+        0x11680000116B9,
+        0x116C0000116CA,
+        0x117000001171B,
+        0x1171D0001172C,
+        0x117300001173A,
         0x1174000011747,
-        0x118000001183b,
-        0x118c0000118ea,
-        0x118ff00011907,
-        0x119090001190a,
-        0x1190c00011914,
+        0x118000001183B,
+        0x118C0000118EA,
+        0x118FF00011907,
+        0x119090001190A,
+        0x1190C00011914,
         0x1191500011917,
         0x1191800011936,
         0x1193700011939,
-        0x1193b00011944,
-        0x119500001195a,
-        0x119a0000119a8,
-        0x119aa000119d8,
-        0x119da000119e2,
-        0x119e3000119e5,
-        0x11a0000011a3f,
-        0x11a4700011a48,
-        0x11a5000011a9a,
-        0x11a9d00011a9e,
-        0x11ab000011af9,
-        0x11c0000011c09,
-        0x11c0a00011c37,
-        0x11c3800011c41,
-        0x11c5000011c5a,
-        0x11c7200011c90,
-        0x11c9200011ca8,
-        0x11ca900011cb7,
-        0x11d0000011d07,
-        0x11d0800011d0a,
-        0x11d0b00011d37,
-        0x11d3a00011d3b,
-        0x11d3c00011d3e,
-        0x11d3f00011d48,
-        0x11d5000011d5a,
-        0x11d6000011d66,
-        0x11d6700011d69,
-        0x11d6a00011d8f,
-        0x11d9000011d92,
-        0x11d9300011d99,
-        0x11da000011daa,
-        0x11ee000011ef7,
-        0x11f0000011f11,
-        0x11f1200011f3b,
-        0x11f3e00011f43,
-        0x11f5000011f5a,
-        0x11fb000011fb1,
-        0x120000001239a,
+        0x1193B00011944,
+        0x119500001195A,
+        0x119A0000119A8,
+        0x119AA000119D8,
+        0x119DA000119E2,
+        0x119E3000119E5,
+        0x11A0000011A3F,
+        0x11A4700011A48,
+        0x11A5000011A9A,
+        0x11A9D00011A9E,
+        0x11AB000011AF9,
+        0x11C0000011C09,
+        0x11C0A00011C37,
+        0x11C3800011C41,
+        0x11C5000011C5A,
+        0x11C7200011C90,
+        0x11C9200011CA8,
+        0x11CA900011CB7,
+        0x11D0000011D07,
+        0x11D0800011D0A,
+        0x11D0B00011D37,
+        0x11D3A00011D3B,
+        0x11D3C00011D3E,
+        0x11D3F00011D48,
+        0x11D5000011D5A,
+        0x11D6000011D66,
+        0x11D6700011D69,
+        0x11D6A00011D8F,
+        0x11D9000011D92,
+        0x11D9300011D99,
+        0x11DA000011DAA,
+        0x11EE000011EF7,
+        0x11F0000011F11,
+        0x11F1200011F3B,
+        0x11F3E00011F43,
+        0x11F5000011F5A,
+        0x11FB000011FB1,
+        0x120000001239A,
         0x1248000012544,
-        0x12f9000012ff1,
+        0x12F9000012FF1,
         0x1300000013430,
         0x1344000013456,
         0x1440000014647,
-        0x1680000016a39,
-        0x16a4000016a5f,
-        0x16a6000016a6a,
-        0x16a7000016abf,
-        0x16ac000016aca,
-        0x16ad000016aee,
-        0x16af000016af5,
-        0x16b0000016b37,
-        0x16b4000016b44,
-        0x16b5000016b5a,
-        0x16b6300016b78,
-        0x16b7d00016b90,
-        0x16e6000016e80,
-        0x16f0000016f4b,
-        0x16f4f00016f88,
-        0x16f8f00016fa0,
-        0x16fe000016fe2,
-        0x16fe300016fe5,
-        0x16ff000016ff2,
-        0x17000000187f8,
-        0x1880000018cd6,
-        0x18d0000018d09,
-        0x1aff00001aff4,
-        0x1aff50001affc,
-        0x1affd0001afff,
-        0x1b0000001b123,
-        0x1b1320001b133,
-        0x1b1500001b153,
-        0x1b1550001b156,
-        0x1b1640001b168,
-        0x1b1700001b2fc,
-        0x1bc000001bc6b,
-        0x1bc700001bc7d,
-        0x1bc800001bc89,
-        0x1bc900001bc9a,
-        0x1bc9d0001bc9f,
-        0x1cf000001cf2e,
-        0x1cf300001cf47,
-        0x1da000001da37,
-        0x1da3b0001da6d,
-        0x1da750001da76,
-        0x1da840001da85,
-        0x1da9b0001daa0,
-        0x1daa10001dab0,
-        0x1df000001df1f,
-        0x1df250001df2b,
-        0x1e0000001e007,
-        0x1e0080001e019,
-        0x1e01b0001e022,
-        0x1e0230001e025,
-        0x1e0260001e02b,
-        0x1e0300001e06e,
-        0x1e08f0001e090,
-        0x1e1000001e12d,
-        0x1e1300001e13e,
-        0x1e1400001e14a,
-        0x1e14e0001e14f,
-        0x1e2900001e2af,
-        0x1e2c00001e2fa,
-        0x1e4d00001e4fa,
-        0x1e7e00001e7e7,
-        0x1e7e80001e7ec,
-        0x1e7ed0001e7ef,
-        0x1e7f00001e7ff,
-        0x1e8000001e8c5,
-        0x1e8d00001e8d7,
-        0x1e9220001e94c,
-        0x1e9500001e95a,
-        0x200000002a6e0,
-        0x2a7000002b73a,
-        0x2b7400002b81e,
-        0x2b8200002cea2,
-        0x2ceb00002ebe1,
-        0x2ebf00002ee5e,
-        0x300000003134b,
-        0x31350000323b0,
+        0x1680000016A39,
+        0x16A4000016A5F,
+        0x16A6000016A6A,
+        0x16A7000016ABF,
+        0x16AC000016ACA,
+        0x16AD000016AEE,
+        0x16AF000016AF5,
+        0x16B0000016B37,
+        0x16B4000016B44,
+        0x16B5000016B5A,
+        0x16B6300016B78,
+        0x16B7D00016B90,
+        0x16E6000016E80,
+        0x16F0000016F4B,
+        0x16F4F00016F88,
+        0x16F8F00016FA0,
+        0x16FE000016FE2,
+        0x16FE300016FE5,
+        0x16FF000016FF2,
+        0x17000000187F8,
+        0x1880000018CD6,
+        0x18D0000018D09,
+        0x1AFF00001AFF4,
+        0x1AFF50001AFFC,
+        0x1AFFD0001AFFF,
+        0x1B0000001B123,
+        0x1B1320001B133,
+        0x1B1500001B153,
+        0x1B1550001B156,
+        0x1B1640001B168,
+        0x1B1700001B2FC,
+        0x1BC000001BC6B,
+        0x1BC700001BC7D,
+        0x1BC800001BC89,
+        0x1BC900001BC9A,
+        0x1BC9D0001BC9F,
+        0x1CF000001CF2E,
+        0x1CF300001CF47,
+        0x1DA000001DA37,
+        0x1DA3B0001DA6D,
+        0x1DA750001DA76,
+        0x1DA840001DA85,
+        0x1DA9B0001DAA0,
+        0x1DAA10001DAB0,
+        0x1DF000001DF1F,
+        0x1DF250001DF2B,
+        0x1E0000001E007,
+        0x1E0080001E019,
+        0x1E01B0001E022,
+        0x1E0230001E025,
+        0x1E0260001E02B,
+        0x1E08F0001E090,
+        0x1E1000001E12D,
+        0x1E1300001E13E,
+        0x1E1400001E14A,
+        0x1E14E0001E14F,
+        0x1E2900001E2AF,
+        0x1E2C00001E2FA,
+        0x1E4D00001E4FA,
+        0x1E7E00001E7E7,
+        0x1E7E80001E7EC,
+        0x1E7ED0001E7EF,
+        0x1E7F00001E7FF,
+        0x1E8000001E8C5,
+        0x1E8D00001E8D7,
+        0x1E9220001E94C,
+        0x1E9500001E95A,
+        0x200000002A6E0,
+        0x2A7000002B73A,
+        0x2B7400002B81E,
+        0x2B8200002CEA2,
+        0x2CEB00002EBE1,
+        0x2EBF00002EE5E,
+        0x300000003134B,
+        0x31350000323B0,
     ),
-    'CONTEXTJ': (
-        0x200c0000200e,
-    ),
-    'CONTEXTO': (
-        0xb7000000b8,
+    "CONTEXTJ": (0x200C0000200E,),
+    "CONTEXTO": (
+        0xB7000000B8,
         0x37500000376,
-        0x5f3000005f5,
-        0x6600000066a,
-        0x6f0000006fa,
-        0x30fb000030fc,
+        0x5F3000005F5,
+        0x6600000066A,
+        0x6F0000006FA,
+        0x30FB000030FC,
     ),
 }
diff --git a/libs/idna/intranges.py b/libs/idna/intranges.py
index 6a43b0475..7bfaa8d80 100644
--- a/libs/idna/intranges.py
+++ b/libs/idna/intranges.py
@@ -8,6 +8,7 @@ in the original list?" in time O(log(# runs)).
 import bisect
 from typing import List, Tuple
 
+
 def intranges_from_list(list_: List[int]) -> Tuple[int, ...]:
     """Represent a list of integers as a sequence of ranges:
     ((start_0, end_0), (start_1, end_1), ...), such that the original
@@ -20,18 +21,20 @@ def intranges_from_list(list_: List[int]) -> Tuple[int, ...]:
     ranges = []
     last_write = -1
     for i in range(len(sorted_list)):
-        if i+1 < len(sorted_list):
-            if sorted_list[i] == sorted_list[i+1]-1:
+        if i + 1 < len(sorted_list):
+            if sorted_list[i] == sorted_list[i + 1] - 1:
                 continue
-        current_range = sorted_list[last_write+1:i+1]
+        current_range = sorted_list[last_write + 1 : i + 1]
         ranges.append(_encode_range(current_range[0], current_range[-1] + 1))
         last_write = i
 
     return tuple(ranges)
 
+
 def _encode_range(start: int, end: int) -> int:
     return (start << 32) | end
 
+
 def _decode_range(r: int) -> Tuple[int, int]:
     return (r >> 32), (r & ((1 << 32) - 1))
 
@@ -43,7 +46,7 @@ def intranges_contain(int_: int, ranges: Tuple[int, ...]) -> bool:
     # we could be immediately ahead of a tuple (start, end)
     # with start < int_ <= end
     if pos > 0:
-        left, right = _decode_range(ranges[pos-1])
+        left, right = _decode_range(ranges[pos - 1])
         if left <= int_ < right:
             return True
     # or we could be immediately behind a tuple (int_, end)
diff --git a/libs/idna/package_data.py b/libs/idna/package_data.py
index c5b7220c9..514ff7e2e 100644
--- a/libs/idna/package_data.py
+++ b/libs/idna/package_data.py
@@ -1,2 +1 @@
-__version__ = '3.6'
-
+__version__ = "3.10"
diff --git a/libs/idna/uts46data.py b/libs/idna/uts46data.py
index 6a1eddbfd..eb8943274 100644
--- a/libs/idna/uts46data.py
+++ b/libs/idna/uts46data.py
@@ -3,8515 +3,8598 @@
 
 from typing import List, Tuple, Union
 
-
 """IDNA Mapping Table from UTS46."""
 
 
-__version__ = '15.1.0'
+__version__ = "15.1.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'),
-    (0x2D, 'V'),
-    (0x2E, 'V'),
-    (0x2F, '3'),
-    (0x30, 'V'),
-    (0x31, 'V'),
-    (0x32, 'V'),
-    (0x33, 'V'),
-    (0x34, 'V'),
-    (0x35, 'V'),
-    (0x36, 'V'),
-    (0x37, 'V'),
-    (0x38, 'V'),
-    (0x39, 'V'),
-    (0x3A, '3'),
-    (0x3B, '3'),
-    (0x3C, '3'),
-    (0x3D, '3'),
-    (0x3E, '3'),
-    (0x3F, '3'),
-    (0x40, '3'),
-    (0x41, 'M', 'a'),
-    (0x42, 'M', 'b'),
-    (0x43, 'M', 'c'),
-    (0x44, 'M', 'd'),
-    (0x45, 'M', 'e'),
-    (0x46, 'M', 'f'),
-    (0x47, 'M', 'g'),
-    (0x48, 'M', 'h'),
-    (0x49, 'M', 'i'),
-    (0x4A, 'M', 'j'),
-    (0x4B, 'M', 'k'),
-    (0x4C, 'M', 'l'),
-    (0x4D, 'M', 'm'),
-    (0x4E, 'M', 'n'),
-    (0x4F, 'M', 'o'),
-    (0x50, 'M', 'p'),
-    (0x51, 'M', 'q'),
-    (0x52, 'M', 'r'),
-    (0x53, 'M', 's'),
-    (0x54, 'M', 't'),
-    (0x55, 'M', 'u'),
-    (0x56, 'M', 'v'),
-    (0x57, 'M', 'w'),
-    (0x58, 'M', 'x'),
-    (0x59, 'M', 'y'),
-    (0x5A, 'M', 'z'),
-    (0x5B, '3'),
-    (0x5C, '3'),
-    (0x5D, '3'),
-    (0x5E, '3'),
-    (0x5F, '3'),
-    (0x60, '3'),
-    (0x61, 'V'),
-    (0x62, 'V'),
-    (0x63, 'V'),
+        (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"),
+        (0x2D, "V"),
+        (0x2E, "V"),
+        (0x2F, "3"),
+        (0x30, "V"),
+        (0x31, "V"),
+        (0x32, "V"),
+        (0x33, "V"),
+        (0x34, "V"),
+        (0x35, "V"),
+        (0x36, "V"),
+        (0x37, "V"),
+        (0x38, "V"),
+        (0x39, "V"),
+        (0x3A, "3"),
+        (0x3B, "3"),
+        (0x3C, "3"),
+        (0x3D, "3"),
+        (0x3E, "3"),
+        (0x3F, "3"),
+        (0x40, "3"),
+        (0x41, "M", "a"),
+        (0x42, "M", "b"),
+        (0x43, "M", "c"),
+        (0x44, "M", "d"),
+        (0x45, "M", "e"),
+        (0x46, "M", "f"),
+        (0x47, "M", "g"),
+        (0x48, "M", "h"),
+        (0x49, "M", "i"),
+        (0x4A, "M", "j"),
+        (0x4B, "M", "k"),
+        (0x4C, "M", "l"),
+        (0x4D, "M", "m"),
+        (0x4E, "M", "n"),
+        (0x4F, "M", "o"),
+        (0x50, "M", "p"),
+        (0x51, "M", "q"),
+        (0x52, "M", "r"),
+        (0x53, "M", "s"),
+        (0x54, "M", "t"),
+        (0x55, "M", "u"),
+        (0x56, "M", "v"),
+        (0x57, "M", "w"),
+        (0x58, "M", "x"),
+        (0x59, "M", "y"),
+        (0x5A, "M", "z"),
+        (0x5B, "3"),
+        (0x5C, "3"),
+        (0x5D, "3"),
+        (0x5E, "3"),
+        (0x5F, "3"),
+        (0x60, "3"),
+        (0x61, "V"),
+        (0x62, "V"),
+        (0x63, "V"),
     ]
 
+
 def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x64, 'V'),
-    (0x65, 'V'),
-    (0x66, 'V'),
-    (0x67, 'V'),
-    (0x68, 'V'),
-    (0x69, 'V'),
-    (0x6A, 'V'),
-    (0x6B, 'V'),
-    (0x6C, 'V'),
-    (0x6D, 'V'),
-    (0x6E, 'V'),
-    (0x6F, 'V'),
-    (0x70, 'V'),
-    (0x71, 'V'),
-    (0x72, 'V'),
-    (0x73, 'V'),
-    (0x74, 'V'),
-    (0x75, 'V'),
-    (0x76, 'V'),
-    (0x77, 'V'),
-    (0x78, 'V'),
-    (0x79, 'V'),
-    (0x7A, 'V'),
-    (0x7B, '3'),
-    (0x7C, '3'),
-    (0x7D, '3'),
-    (0x7E, '3'),
-    (0x7F, '3'),
-    (0x80, 'X'),
-    (0x81, 'X'),
-    (0x82, 'X'),
-    (0x83, 'X'),
-    (0x84, 'X'),
-    (0x85, 'X'),
-    (0x86, 'X'),
-    (0x87, 'X'),
-    (0x88, 'X'),
-    (0x89, 'X'),
-    (0x8A, 'X'),
-    (0x8B, 'X'),
-    (0x8C, 'X'),
-    (0x8D, 'X'),
-    (0x8E, 'X'),
-    (0x8F, 'X'),
-    (0x90, 'X'),
-    (0x91, 'X'),
-    (0x92, 'X'),
-    (0x93, 'X'),
-    (0x94, 'X'),
-    (0x95, 'X'),
-    (0x96, 'X'),
-    (0x97, 'X'),
-    (0x98, 'X'),
-    (0x99, 'X'),
-    (0x9A, 'X'),
-    (0x9B, 'X'),
-    (0x9C, 'X'),
-    (0x9D, 'X'),
-    (0x9E, 'X'),
-    (0x9F, 'X'),
-    (0xA0, '3', ' '),
-    (0xA1, 'V'),
-    (0xA2, 'V'),
-    (0xA3, 'V'),
-    (0xA4, 'V'),
-    (0xA5, 'V'),
-    (0xA6, 'V'),
-    (0xA7, 'V'),
-    (0xA8, '3', ' ̈'),
-    (0xA9, 'V'),
-    (0xAA, 'M', 'a'),
-    (0xAB, 'V'),
-    (0xAC, 'V'),
-    (0xAD, 'I'),
-    (0xAE, 'V'),
-    (0xAF, '3', ' ̄'),
-    (0xB0, 'V'),
-    (0xB1, 'V'),
-    (0xB2, 'M', '2'),
-    (0xB3, 'M', '3'),
-    (0xB4, '3', ' ́'),
-    (0xB5, 'M', 'μ'),
-    (0xB6, 'V'),
-    (0xB7, 'V'),
-    (0xB8, '3', ' ̧'),
-    (0xB9, 'M', '1'),
-    (0xBA, 'M', 'o'),
-    (0xBB, 'V'),
-    (0xBC, 'M', '1⁄4'),
-    (0xBD, 'M', '1⁄2'),
-    (0xBE, 'M', '3⁄4'),
-    (0xBF, 'V'),
-    (0xC0, 'M', 'à'),
-    (0xC1, 'M', 'á'),
-    (0xC2, 'M', 'â'),
-    (0xC3, 'M', 'ã'),
-    (0xC4, 'M', 'ä'),
-    (0xC5, 'M', 'å'),
-    (0xC6, 'M', 'æ'),
-    (0xC7, 'M', 'ç'),
+        (0x64, "V"),
+        (0x65, "V"),
+        (0x66, "V"),
+        (0x67, "V"),
+        (0x68, "V"),
+        (0x69, "V"),
+        (0x6A, "V"),
+        (0x6B, "V"),
+        (0x6C, "V"),
+        (0x6D, "V"),
+        (0x6E, "V"),
+        (0x6F, "V"),
+        (0x70, "V"),
+        (0x71, "V"),
+        (0x72, "V"),
+        (0x73, "V"),
+        (0x74, "V"),
+        (0x75, "V"),
+        (0x76, "V"),
+        (0x77, "V"),
+        (0x78, "V"),
+        (0x79, "V"),
+        (0x7A, "V"),
+        (0x7B, "3"),
+        (0x7C, "3"),
+        (0x7D, "3"),
+        (0x7E, "3"),
+        (0x7F, "3"),
+        (0x80, "X"),
+        (0x81, "X"),
+        (0x82, "X"),
+        (0x83, "X"),
+        (0x84, "X"),
+        (0x85, "X"),
+        (0x86, "X"),
+        (0x87, "X"),
+        (0x88, "X"),
+        (0x89, "X"),
+        (0x8A, "X"),
+        (0x8B, "X"),
+        (0x8C, "X"),
+        (0x8D, "X"),
+        (0x8E, "X"),
+        (0x8F, "X"),
+        (0x90, "X"),
+        (0x91, "X"),
+        (0x92, "X"),
+        (0x93, "X"),
+        (0x94, "X"),
+        (0x95, "X"),
+        (0x96, "X"),
+        (0x97, "X"),
+        (0x98, "X"),
+        (0x99, "X"),
+        (0x9A, "X"),
+        (0x9B, "X"),
+        (0x9C, "X"),
+        (0x9D, "X"),
+        (0x9E, "X"),
+        (0x9F, "X"),
+        (0xA0, "3", " "),
+        (0xA1, "V"),
+        (0xA2, "V"),
+        (0xA3, "V"),
+        (0xA4, "V"),
+        (0xA5, "V"),
+        (0xA6, "V"),
+        (0xA7, "V"),
+        (0xA8, "3", " ̈"),
+        (0xA9, "V"),
+        (0xAA, "M", "a"),
+        (0xAB, "V"),
+        (0xAC, "V"),
+        (0xAD, "I"),
+        (0xAE, "V"),
+        (0xAF, "3", " ̄"),
+        (0xB0, "V"),
+        (0xB1, "V"),
+        (0xB2, "M", "2"),
+        (0xB3, "M", "3"),
+        (0xB4, "3", " ́"),
+        (0xB5, "M", "μ"),
+        (0xB6, "V"),
+        (0xB7, "V"),
+        (0xB8, "3", " ̧"),
+        (0xB9, "M", "1"),
+        (0xBA, "M", "o"),
+        (0xBB, "V"),
+        (0xBC, "M", "1⁄4"),
+        (0xBD, "M", "1⁄2"),
+        (0xBE, "M", "3⁄4"),
+        (0xBF, "V"),
+        (0xC0, "M", "à"),
+        (0xC1, "M", "á"),
+        (0xC2, "M", "â"),
+        (0xC3, "M", "ã"),
+        (0xC4, "M", "ä"),
+        (0xC5, "M", "å"),
+        (0xC6, "M", "æ"),
+        (0xC7, "M", "ç"),
     ]
 
+
 def _seg_2() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xC8, 'M', 'è'),
-    (0xC9, 'M', 'é'),
-    (0xCA, 'M', 'ê'),
-    (0xCB, 'M', 'ë'),
-    (0xCC, 'M', 'ì'),
-    (0xCD, 'M', 'í'),
-    (0xCE, 'M', 'î'),
-    (0xCF, 'M', 'ï'),
-    (0xD0, 'M', 'ð'),
-    (0xD1, 'M', 'ñ'),
-    (0xD2, 'M', 'ò'),
-    (0xD3, 'M', 'ó'),
-    (0xD4, 'M', 'ô'),
-    (0xD5, 'M', 'õ'),
-    (0xD6, 'M', 'ö'),
-    (0xD7, 'V'),
-    (0xD8, 'M', 'ø'),
-    (0xD9, 'M', 'ù'),
-    (0xDA, 'M', 'ú'),
-    (0xDB, 'M', 'û'),
-    (0xDC, 'M', 'ü'),
-    (0xDD, 'M', 'ý'),
-    (0xDE, 'M', 'þ'),
-    (0xDF, 'D', 'ss'),
-    (0xE0, 'V'),
-    (0xE1, 'V'),
-    (0xE2, 'V'),
-    (0xE3, 'V'),
-    (0xE4, 'V'),
-    (0xE5, 'V'),
-    (0xE6, 'V'),
-    (0xE7, 'V'),
-    (0xE8, 'V'),
-    (0xE9, 'V'),
-    (0xEA, 'V'),
-    (0xEB, 'V'),
-    (0xEC, 'V'),
-    (0xED, 'V'),
-    (0xEE, 'V'),
-    (0xEF, 'V'),
-    (0xF0, 'V'),
-    (0xF1, 'V'),
-    (0xF2, 'V'),
-    (0xF3, 'V'),
-    (0xF4, 'V'),
-    (0xF5, 'V'),
-    (0xF6, 'V'),
-    (0xF7, 'V'),
-    (0xF8, 'V'),
-    (0xF9, 'V'),
-    (0xFA, 'V'),
-    (0xFB, 'V'),
-    (0xFC, 'V'),
-    (0xFD, 'V'),
-    (0xFE, 'V'),
-    (0xFF, 'V'),
-    (0x100, 'M', 'ā'),
-    (0x101, 'V'),
-    (0x102, 'M', 'ă'),
-    (0x103, 'V'),
-    (0x104, 'M', 'ą'),
-    (0x105, 'V'),
-    (0x106, 'M', 'ć'),
-    (0x107, 'V'),
-    (0x108, 'M', 'ĉ'),
-    (0x109, 'V'),
-    (0x10A, 'M', 'ċ'),
-    (0x10B, 'V'),
-    (0x10C, 'M', 'č'),
-    (0x10D, 'V'),
-    (0x10E, 'M', 'ď'),
-    (0x10F, 'V'),
-    (0x110, 'M', 'đ'),
-    (0x111, 'V'),
-    (0x112, 'M', 'ē'),
-    (0x113, 'V'),
-    (0x114, 'M', 'ĕ'),
-    (0x115, 'V'),
-    (0x116, 'M', 'ė'),
-    (0x117, 'V'),
-    (0x118, 'M', 'ę'),
-    (0x119, 'V'),
-    (0x11A, 'M', 'ě'),
-    (0x11B, 'V'),
-    (0x11C, 'M', 'ĝ'),
-    (0x11D, 'V'),
-    (0x11E, 'M', 'ğ'),
-    (0x11F, 'V'),
-    (0x120, 'M', 'ġ'),
-    (0x121, 'V'),
-    (0x122, 'M', 'ģ'),
-    (0x123, 'V'),
-    (0x124, 'M', 'ĥ'),
-    (0x125, 'V'),
-    (0x126, 'M', 'ħ'),
-    (0x127, 'V'),
-    (0x128, 'M', 'ĩ'),
-    (0x129, 'V'),
-    (0x12A, 'M', 'ī'),
-    (0x12B, 'V'),
+        (0xC8, "M", "è"),
+        (0xC9, "M", "é"),
+        (0xCA, "M", "ê"),
+        (0xCB, "M", "ë"),
+        (0xCC, "M", "ì"),
+        (0xCD, "M", "í"),
+        (0xCE, "M", "î"),
+        (0xCF, "M", "ï"),
+        (0xD0, "M", "ð"),
+        (0xD1, "M", "ñ"),
+        (0xD2, "M", "ò"),
+        (0xD3, "M", "ó"),
+        (0xD4, "M", "ô"),
+        (0xD5, "M", "õ"),
+        (0xD6, "M", "ö"),
+        (0xD7, "V"),
+        (0xD8, "M", "ø"),
+        (0xD9, "M", "ù"),
+        (0xDA, "M", "ú"),
+        (0xDB, "M", "û"),
+        (0xDC, "M", "ü"),
+        (0xDD, "M", "ý"),
+        (0xDE, "M", "þ"),
+        (0xDF, "D", "ss"),
+        (0xE0, "V"),
+        (0xE1, "V"),
+        (0xE2, "V"),
+        (0xE3, "V"),
+        (0xE4, "V"),
+        (0xE5, "V"),
+        (0xE6, "V"),
+        (0xE7, "V"),
+        (0xE8, "V"),
+        (0xE9, "V"),
+        (0xEA, "V"),
+        (0xEB, "V"),
+        (0xEC, "V"),
+        (0xED, "V"),
+        (0xEE, "V"),
+        (0xEF, "V"),
+        (0xF0, "V"),
+        (0xF1, "V"),
+        (0xF2, "V"),
+        (0xF3, "V"),
+        (0xF4, "V"),
+        (0xF5, "V"),
+        (0xF6, "V"),
+        (0xF7, "V"),
+        (0xF8, "V"),
+        (0xF9, "V"),
+        (0xFA, "V"),
+        (0xFB, "V"),
+        (0xFC, "V"),
+        (0xFD, "V"),
+        (0xFE, "V"),
+        (0xFF, "V"),
+        (0x100, "M", "ā"),
+        (0x101, "V"),
+        (0x102, "M", "ă"),
+        (0x103, "V"),
+        (0x104, "M", "ą"),
+        (0x105, "V"),
+        (0x106, "M", "ć"),
+        (0x107, "V"),
+        (0x108, "M", "ĉ"),
+        (0x109, "V"),
+        (0x10A, "M", "ċ"),
+        (0x10B, "V"),
+        (0x10C, "M", "č"),
+        (0x10D, "V"),
+        (0x10E, "M", "ď"),
+        (0x10F, "V"),
+        (0x110, "M", "đ"),
+        (0x111, "V"),
+        (0x112, "M", "ē"),
+        (0x113, "V"),
+        (0x114, "M", "ĕ"),
+        (0x115, "V"),
+        (0x116, "M", "ė"),
+        (0x117, "V"),
+        (0x118, "M", "ę"),
+        (0x119, "V"),
+        (0x11A, "M", "ě"),
+        (0x11B, "V"),
+        (0x11C, "M", "ĝ"),
+        (0x11D, "V"),
+        (0x11E, "M", "ğ"),
+        (0x11F, "V"),
+        (0x120, "M", "ġ"),
+        (0x121, "V"),
+        (0x122, "M", "ģ"),
+        (0x123, "V"),
+        (0x124, "M", "ĥ"),
+        (0x125, "V"),
+        (0x126, "M", "ħ"),
+        (0x127, "V"),
+        (0x128, "M", "ĩ"),
+        (0x129, "V"),
+        (0x12A, "M", "ī"),
+        (0x12B, "V"),
     ]
 
+
 def _seg_3() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x12C, 'M', 'ĭ'),
-    (0x12D, 'V'),
-    (0x12E, 'M', 'į'),
-    (0x12F, 'V'),
-    (0x130, 'M', 'i̇'),
-    (0x131, 'V'),
-    (0x132, 'M', 'ij'),
-    (0x134, 'M', 'ĵ'),
-    (0x135, 'V'),
-    (0x136, 'M', 'ķ'),
-    (0x137, 'V'),
-    (0x139, 'M', 'ĺ'),
-    (0x13A, 'V'),
-    (0x13B, 'M', 'ļ'),
-    (0x13C, 'V'),
-    (0x13D, 'M', 'ľ'),
-    (0x13E, 'V'),
-    (0x13F, 'M', 'l·'),
-    (0x141, 'M', 'ł'),
-    (0x142, 'V'),
-    (0x143, 'M', 'ń'),
-    (0x144, 'V'),
-    (0x145, 'M', 'ņ'),
-    (0x146, 'V'),
-    (0x147, 'M', 'ň'),
-    (0x148, 'V'),
-    (0x149, 'M', 'ʼn'),
-    (0x14A, 'M', 'ŋ'),
-    (0x14B, 'V'),
-    (0x14C, 'M', 'ō'),
-    (0x14D, 'V'),
-    (0x14E, 'M', 'ŏ'),
-    (0x14F, 'V'),
-    (0x150, 'M', 'ő'),
-    (0x151, 'V'),
-    (0x152, 'M', 'œ'),
-    (0x153, 'V'),
-    (0x154, 'M', 'ŕ'),
-    (0x155, 'V'),
-    (0x156, 'M', 'ŗ'),
-    (0x157, 'V'),
-    (0x158, 'M', 'ř'),
-    (0x159, 'V'),
-    (0x15A, 'M', 'ś'),
-    (0x15B, 'V'),
-    (0x15C, 'M', 'ŝ'),
-    (0x15D, 'V'),
-    (0x15E, 'M', 'ş'),
-    (0x15F, 'V'),
-    (0x160, 'M', 'š'),
-    (0x161, 'V'),
-    (0x162, 'M', 'ţ'),
-    (0x163, 'V'),
-    (0x164, 'M', 'ť'),
-    (0x165, 'V'),
-    (0x166, 'M', 'ŧ'),
-    (0x167, 'V'),
-    (0x168, 'M', 'ũ'),
-    (0x169, 'V'),
-    (0x16A, 'M', 'ū'),
-    (0x16B, 'V'),
-    (0x16C, 'M', 'ŭ'),
-    (0x16D, 'V'),
-    (0x16E, 'M', 'ů'),
-    (0x16F, 'V'),
-    (0x170, 'M', 'ű'),
-    (0x171, 'V'),
-    (0x172, 'M', 'ų'),
-    (0x173, 'V'),
-    (0x174, 'M', 'ŵ'),
-    (0x175, 'V'),
-    (0x176, 'M', 'ŷ'),
-    (0x177, 'V'),
-    (0x178, 'M', 'ÿ'),
-    (0x179, 'M', 'ź'),
-    (0x17A, 'V'),
-    (0x17B, 'M', 'ż'),
-    (0x17C, 'V'),
-    (0x17D, 'M', 'ž'),
-    (0x17E, 'V'),
-    (0x17F, 'M', 's'),
-    (0x180, 'V'),
-    (0x181, 'M', 'ɓ'),
-    (0x182, 'M', 'ƃ'),
-    (0x183, 'V'),
-    (0x184, 'M', 'ƅ'),
-    (0x185, 'V'),
-    (0x186, 'M', 'ɔ'),
-    (0x187, 'M', 'ƈ'),
-    (0x188, 'V'),
-    (0x189, 'M', 'ɖ'),
-    (0x18A, 'M', 'ɗ'),
-    (0x18B, 'M', 'ƌ'),
-    (0x18C, 'V'),
-    (0x18E, 'M', 'ǝ'),
-    (0x18F, 'M', 'ə'),
-    (0x190, 'M', 'ɛ'),
-    (0x191, 'M', 'ƒ'),
-    (0x192, 'V'),
-    (0x193, 'M', 'ɠ'),
+        (0x12C, "M", "ĭ"),
+        (0x12D, "V"),
+        (0x12E, "M", "į"),
+        (0x12F, "V"),
+        (0x130, "M", "i̇"),
+        (0x131, "V"),
+        (0x132, "M", "ij"),
+        (0x134, "M", "ĵ"),
+        (0x135, "V"),
+        (0x136, "M", "ķ"),
+        (0x137, "V"),
+        (0x139, "M", "ĺ"),
+        (0x13A, "V"),
+        (0x13B, "M", "ļ"),
+        (0x13C, "V"),
+        (0x13D, "M", "ľ"),
+        (0x13E, "V"),
+        (0x13F, "M", "l·"),
+        (0x141, "M", "ł"),
+        (0x142, "V"),
+        (0x143, "M", "ń"),
+        (0x144, "V"),
+        (0x145, "M", "ņ"),
+        (0x146, "V"),
+        (0x147, "M", "ň"),
+        (0x148, "V"),
+        (0x149, "M", "ʼn"),
+        (0x14A, "M", "ŋ"),
+        (0x14B, "V"),
+        (0x14C, "M", "ō"),
+        (0x14D, "V"),
+        (0x14E, "M", "ŏ"),
+        (0x14F, "V"),
+        (0x150, "M", "ő"),
+        (0x151, "V"),
+        (0x152, "M", "œ"),
+        (0x153, "V"),
+        (0x154, "M", "ŕ"),
+        (0x155, "V"),
+        (0x156, "M", "ŗ"),
+        (0x157, "V"),
+        (0x158, "M", "ř"),
+        (0x159, "V"),
+        (0x15A, "M", "ś"),
+        (0x15B, "V"),
+        (0x15C, "M", "ŝ"),
+        (0x15D, "V"),
+        (0x15E, "M", "ş"),
+        (0x15F, "V"),
+        (0x160, "M", "š"),
+        (0x161, "V"),
+        (0x162, "M", "ţ"),
+        (0x163, "V"),
+        (0x164, "M", "ť"),
+        (0x165, "V"),
+        (0x166, "M", "ŧ"),
+        (0x167, "V"),
+        (0x168, "M", "ũ"),
+        (0x169, "V"),
+        (0x16A, "M", "ū"),
+        (0x16B, "V"),
+        (0x16C, "M", "ŭ"),
+        (0x16D, "V"),
+        (0x16E, "M", "ů"),
+        (0x16F, "V"),
+        (0x170, "M", "ű"),
+        (0x171, "V"),
+        (0x172, "M", "ų"),
+        (0x173, "V"),
+        (0x174, "M", "ŵ"),
+        (0x175, "V"),
+        (0x176, "M", "ŷ"),
+        (0x177, "V"),
+        (0x178, "M", "ÿ"),
+        (0x179, "M", "ź"),
+        (0x17A, "V"),
+        (0x17B, "M", "ż"),
+        (0x17C, "V"),
+        (0x17D, "M", "ž"),
+        (0x17E, "V"),
+        (0x17F, "M", "s"),
+        (0x180, "V"),
+        (0x181, "M", "ɓ"),
+        (0x182, "M", "ƃ"),
+        (0x183, "V"),
+        (0x184, "M", "ƅ"),
+        (0x185, "V"),
+        (0x186, "M", "ɔ"),
+        (0x187, "M", "ƈ"),
+        (0x188, "V"),
+        (0x189, "M", "ɖ"),
+        (0x18A, "M", "ɗ"),
+        (0x18B, "M", "ƌ"),
+        (0x18C, "V"),
+        (0x18E, "M", "ǝ"),
+        (0x18F, "M", "ə"),
+        (0x190, "M", "ɛ"),
+        (0x191, "M", "ƒ"),
+        (0x192, "V"),
+        (0x193, "M", "ɠ"),
     ]
 
+
 def _seg_4() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x194, 'M', 'ɣ'),
-    (0x195, 'V'),
-    (0x196, 'M', 'ɩ'),
-    (0x197, 'M', 'ɨ'),
-    (0x198, 'M', 'ƙ'),
-    (0x199, 'V'),
-    (0x19C, 'M', 'ɯ'),
-    (0x19D, 'M', 'ɲ'),
-    (0x19E, 'V'),
-    (0x19F, 'M', 'ɵ'),
-    (0x1A0, 'M', 'ơ'),
-    (0x1A1, 'V'),
-    (0x1A2, 'M', 'ƣ'),
-    (0x1A3, 'V'),
-    (0x1A4, 'M', 'ƥ'),
-    (0x1A5, 'V'),
-    (0x1A6, 'M', 'ʀ'),
-    (0x1A7, 'M', 'ƨ'),
-    (0x1A8, 'V'),
-    (0x1A9, 'M', 'ʃ'),
-    (0x1AA, 'V'),
-    (0x1AC, 'M', 'ƭ'),
-    (0x1AD, 'V'),
-    (0x1AE, 'M', 'ʈ'),
-    (0x1AF, 'M', 'ư'),
-    (0x1B0, 'V'),
-    (0x1B1, 'M', 'ʊ'),
-    (0x1B2, 'M', 'ʋ'),
-    (0x1B3, 'M', 'ƴ'),
-    (0x1B4, 'V'),
-    (0x1B5, 'M', 'ƶ'),
-    (0x1B6, 'V'),
-    (0x1B7, 'M', 'ʒ'),
-    (0x1B8, 'M', 'ƹ'),
-    (0x1B9, 'V'),
-    (0x1BC, 'M', 'ƽ'),
-    (0x1BD, 'V'),
-    (0x1C4, 'M', 'dž'),
-    (0x1C7, 'M', 'lj'),
-    (0x1CA, 'M', 'nj'),
-    (0x1CD, 'M', 'ǎ'),
-    (0x1CE, 'V'),
-    (0x1CF, 'M', 'ǐ'),
-    (0x1D0, 'V'),
-    (0x1D1, 'M', 'ǒ'),
-    (0x1D2, 'V'),
-    (0x1D3, 'M', 'ǔ'),
-    (0x1D4, 'V'),
-    (0x1D5, 'M', 'ǖ'),
-    (0x1D6, 'V'),
-    (0x1D7, 'M', 'ǘ'),
-    (0x1D8, 'V'),
-    (0x1D9, 'M', 'ǚ'),
-    (0x1DA, 'V'),
-    (0x1DB, 'M', 'ǜ'),
-    (0x1DC, 'V'),
-    (0x1DE, 'M', 'ǟ'),
-    (0x1DF, 'V'),
-    (0x1E0, 'M', 'ǡ'),
-    (0x1E1, 'V'),
-    (0x1E2, 'M', 'ǣ'),
-    (0x1E3, 'V'),
-    (0x1E4, 'M', 'ǥ'),
-    (0x1E5, 'V'),
-    (0x1E6, 'M', 'ǧ'),
-    (0x1E7, 'V'),
-    (0x1E8, 'M', 'ǩ'),
-    (0x1E9, 'V'),
-    (0x1EA, 'M', 'ǫ'),
-    (0x1EB, 'V'),
-    (0x1EC, 'M', 'ǭ'),
-    (0x1ED, 'V'),
-    (0x1EE, 'M', 'ǯ'),
-    (0x1EF, 'V'),
-    (0x1F1, 'M', 'dz'),
-    (0x1F4, 'M', 'ǵ'),
-    (0x1F5, 'V'),
-    (0x1F6, 'M', 'ƕ'),
-    (0x1F7, 'M', 'ƿ'),
-    (0x1F8, 'M', 'ǹ'),
-    (0x1F9, 'V'),
-    (0x1FA, 'M', 'ǻ'),
-    (0x1FB, 'V'),
-    (0x1FC, 'M', 'ǽ'),
-    (0x1FD, 'V'),
-    (0x1FE, 'M', 'ǿ'),
-    (0x1FF, 'V'),
-    (0x200, 'M', 'ȁ'),
-    (0x201, 'V'),
-    (0x202, 'M', 'ȃ'),
-    (0x203, 'V'),
-    (0x204, 'M', 'ȅ'),
-    (0x205, 'V'),
-    (0x206, 'M', 'ȇ'),
-    (0x207, 'V'),
-    (0x208, 'M', 'ȉ'),
-    (0x209, 'V'),
-    (0x20A, 'M', 'ȋ'),
-    (0x20B, 'V'),
-    (0x20C, 'M', 'ȍ'),
+        (0x194, "M", "ɣ"),
+        (0x195, "V"),
+        (0x196, "M", "ɩ"),
+        (0x197, "M", "ɨ"),
+        (0x198, "M", "ƙ"),
+        (0x199, "V"),
+        (0x19C, "M", "ɯ"),
+        (0x19D, "M", "ɲ"),
+        (0x19E, "V"),
+        (0x19F, "M", "ɵ"),
+        (0x1A0, "M", "ơ"),
+        (0x1A1, "V"),
+        (0x1A2, "M", "ƣ"),
+        (0x1A3, "V"),
+        (0x1A4, "M", "ƥ"),
+        (0x1A5, "V"),
+        (0x1A6, "M", "ʀ"),
+        (0x1A7, "M", "ƨ"),
+        (0x1A8, "V"),
+        (0x1A9, "M", "ʃ"),
+        (0x1AA, "V"),
+        (0x1AC, "M", "ƭ"),
+        (0x1AD, "V"),
+        (0x1AE, "M", "ʈ"),
+        (0x1AF, "M", "ư"),
+        (0x1B0, "V"),
+        (0x1B1, "M", "ʊ"),
+        (0x1B2, "M", "ʋ"),
+        (0x1B3, "M", "ƴ"),
+        (0x1B4, "V"),
+        (0x1B5, "M", "ƶ"),
+        (0x1B6, "V"),
+        (0x1B7, "M", "ʒ"),
+        (0x1B8, "M", "ƹ"),
+        (0x1B9, "V"),
+        (0x1BC, "M", "ƽ"),
+        (0x1BD, "V"),
+        (0x1C4, "M", "dž"),
+        (0x1C7, "M", "lj"),
+        (0x1CA, "M", "nj"),
+        (0x1CD, "M", "ǎ"),
+        (0x1CE, "V"),
+        (0x1CF, "M", "ǐ"),
+        (0x1D0, "V"),
+        (0x1D1, "M", "ǒ"),
+        (0x1D2, "V"),
+        (0x1D3, "M", "ǔ"),
+        (0x1D4, "V"),
+        (0x1D5, "M", "ǖ"),
+        (0x1D6, "V"),
+        (0x1D7, "M", "ǘ"),
+        (0x1D8, "V"),
+        (0x1D9, "M", "ǚ"),
+        (0x1DA, "V"),
+        (0x1DB, "M", "ǜ"),
+        (0x1DC, "V"),
+        (0x1DE, "M", "ǟ"),
+        (0x1DF, "V"),
+        (0x1E0, "M", "ǡ"),
+        (0x1E1, "V"),
+        (0x1E2, "M", "ǣ"),
+        (0x1E3, "V"),
+        (0x1E4, "M", "ǥ"),
+        (0x1E5, "V"),
+        (0x1E6, "M", "ǧ"),
+        (0x1E7, "V"),
+        (0x1E8, "M", "ǩ"),
+        (0x1E9, "V"),
+        (0x1EA, "M", "ǫ"),
+        (0x1EB, "V"),
+        (0x1EC, "M", "ǭ"),
+        (0x1ED, "V"),
+        (0x1EE, "M", "ǯ"),
+        (0x1EF, "V"),
+        (0x1F1, "M", "dz"),
+        (0x1F4, "M", "ǵ"),
+        (0x1F5, "V"),
+        (0x1F6, "M", "ƕ"),
+        (0x1F7, "M", "ƿ"),
+        (0x1F8, "M", "ǹ"),
+        (0x1F9, "V"),
+        (0x1FA, "M", "ǻ"),
+        (0x1FB, "V"),
+        (0x1FC, "M", "ǽ"),
+        (0x1FD, "V"),
+        (0x1FE, "M", "ǿ"),
+        (0x1FF, "V"),
+        (0x200, "M", "ȁ"),
+        (0x201, "V"),
+        (0x202, "M", "ȃ"),
+        (0x203, "V"),
+        (0x204, "M", "ȅ"),
+        (0x205, "V"),
+        (0x206, "M", "ȇ"),
+        (0x207, "V"),
+        (0x208, "M", "ȉ"),
+        (0x209, "V"),
+        (0x20A, "M", "ȋ"),
+        (0x20B, "V"),
+        (0x20C, "M", "ȍ"),
     ]
 
+
 def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x20D, 'V'),
-    (0x20E, 'M', 'ȏ'),
-    (0x20F, 'V'),
-    (0x210, 'M', 'ȑ'),
-    (0x211, 'V'),
-    (0x212, 'M', 'ȓ'),
-    (0x213, 'V'),
-    (0x214, 'M', 'ȕ'),
-    (0x215, 'V'),
-    (0x216, 'M', 'ȗ'),
-    (0x217, 'V'),
-    (0x218, 'M', 'ș'),
-    (0x219, 'V'),
-    (0x21A, 'M', 'ț'),
-    (0x21B, 'V'),
-    (0x21C, 'M', 'ȝ'),
-    (0x21D, 'V'),
-    (0x21E, 'M', 'ȟ'),
-    (0x21F, 'V'),
-    (0x220, 'M', 'ƞ'),
-    (0x221, 'V'),
-    (0x222, 'M', 'ȣ'),
-    (0x223, 'V'),
-    (0x224, 'M', 'ȥ'),
-    (0x225, 'V'),
-    (0x226, 'M', 'ȧ'),
-    (0x227, 'V'),
-    (0x228, 'M', 'ȩ'),
-    (0x229, 'V'),
-    (0x22A, 'M', 'ȫ'),
-    (0x22B, 'V'),
-    (0x22C, 'M', 'ȭ'),
-    (0x22D, 'V'),
-    (0x22E, 'M', 'ȯ'),
-    (0x22F, 'V'),
-    (0x230, 'M', 'ȱ'),
-    (0x231, 'V'),
-    (0x232, 'M', 'ȳ'),
-    (0x233, 'V'),
-    (0x23A, 'M', 'ⱥ'),
-    (0x23B, 'M', 'ȼ'),
-    (0x23C, 'V'),
-    (0x23D, 'M', 'ƚ'),
-    (0x23E, 'M', 'ⱦ'),
-    (0x23F, 'V'),
-    (0x241, 'M', 'ɂ'),
-    (0x242, 'V'),
-    (0x243, 'M', 'ƀ'),
-    (0x244, 'M', 'ʉ'),
-    (0x245, 'M', 'ʌ'),
-    (0x246, 'M', 'ɇ'),
-    (0x247, 'V'),
-    (0x248, 'M', 'ɉ'),
-    (0x249, 'V'),
-    (0x24A, 'M', 'ɋ'),
-    (0x24B, 'V'),
-    (0x24C, 'M', 'ɍ'),
-    (0x24D, 'V'),
-    (0x24E, 'M', 'ɏ'),
-    (0x24F, 'V'),
-    (0x2B0, 'M', 'h'),
-    (0x2B1, 'M', 'ɦ'),
-    (0x2B2, 'M', 'j'),
-    (0x2B3, 'M', 'r'),
-    (0x2B4, 'M', 'ɹ'),
-    (0x2B5, 'M', 'ɻ'),
-    (0x2B6, 'M', 'ʁ'),
-    (0x2B7, 'M', 'w'),
-    (0x2B8, 'M', 'y'),
-    (0x2B9, 'V'),
-    (0x2D8, '3', ' ̆'),
-    (0x2D9, '3', ' ̇'),
-    (0x2DA, '3', ' ̊'),
-    (0x2DB, '3', ' ̨'),
-    (0x2DC, '3', ' ̃'),
-    (0x2DD, '3', ' ̋'),
-    (0x2DE, 'V'),
-    (0x2E0, 'M', 'ɣ'),
-    (0x2E1, 'M', 'l'),
-    (0x2E2, 'M', 's'),
-    (0x2E3, 'M', 'x'),
-    (0x2E4, 'M', 'ʕ'),
-    (0x2E5, 'V'),
-    (0x340, 'M', '̀'),
-    (0x341, 'M', '́'),
-    (0x342, 'V'),
-    (0x343, 'M', '̓'),
-    (0x344, 'M', '̈́'),
-    (0x345, 'M', 'ι'),
-    (0x346, 'V'),
-    (0x34F, 'I'),
-    (0x350, 'V'),
-    (0x370, 'M', 'ͱ'),
-    (0x371, 'V'),
-    (0x372, 'M', 'ͳ'),
-    (0x373, 'V'),
-    (0x374, 'M', 'ʹ'),
-    (0x375, 'V'),
-    (0x376, 'M', 'ͷ'),
-    (0x377, 'V'),
+        (0x20D, "V"),
+        (0x20E, "M", "ȏ"),
+        (0x20F, "V"),
+        (0x210, "M", "ȑ"),
+        (0x211, "V"),
+        (0x212, "M", "ȓ"),
+        (0x213, "V"),
+        (0x214, "M", "ȕ"),
+        (0x215, "V"),
+        (0x216, "M", "ȗ"),
+        (0x217, "V"),
+        (0x218, "M", "ș"),
+        (0x219, "V"),
+        (0x21A, "M", "ț"),
+        (0x21B, "V"),
+        (0x21C, "M", "ȝ"),
+        (0x21D, "V"),
+        (0x21E, "M", "ȟ"),
+        (0x21F, "V"),
+        (0x220, "M", "ƞ"),
+        (0x221, "V"),
+        (0x222, "M", "ȣ"),
+        (0x223, "V"),
+        (0x224, "M", "ȥ"),
+        (0x225, "V"),
+        (0x226, "M", "ȧ"),
+        (0x227, "V"),
+        (0x228, "M", "ȩ"),
+        (0x229, "V"),
+        (0x22A, "M", "ȫ"),
+        (0x22B, "V"),
+        (0x22C, "M", "ȭ"),
+        (0x22D, "V"),
+        (0x22E, "M", "ȯ"),
+        (0x22F, "V"),
+        (0x230, "M", "ȱ"),
+        (0x231, "V"),
+        (0x232, "M", "ȳ"),
+        (0x233, "V"),
+        (0x23A, "M", "ⱥ"),
+        (0x23B, "M", "ȼ"),
+        (0x23C, "V"),
+        (0x23D, "M", "ƚ"),
+        (0x23E, "M", "ⱦ"),
+        (0x23F, "V"),
+        (0x241, "M", "ɂ"),
+        (0x242, "V"),
+        (0x243, "M", "ƀ"),
+        (0x244, "M", "ʉ"),
+        (0x245, "M", "ʌ"),
+        (0x246, "M", "ɇ"),
+        (0x247, "V"),
+        (0x248, "M", "ɉ"),
+        (0x249, "V"),
+        (0x24A, "M", "ɋ"),
+        (0x24B, "V"),
+        (0x24C, "M", "ɍ"),
+        (0x24D, "V"),
+        (0x24E, "M", "ɏ"),
+        (0x24F, "V"),
+        (0x2B0, "M", "h"),
+        (0x2B1, "M", "ɦ"),
+        (0x2B2, "M", "j"),
+        (0x2B3, "M", "r"),
+        (0x2B4, "M", "ɹ"),
+        (0x2B5, "M", "ɻ"),
+        (0x2B6, "M", "ʁ"),
+        (0x2B7, "M", "w"),
+        (0x2B8, "M", "y"),
+        (0x2B9, "V"),
+        (0x2D8, "3", " ̆"),
+        (0x2D9, "3", " ̇"),
+        (0x2DA, "3", " ̊"),
+        (0x2DB, "3", " ̨"),
+        (0x2DC, "3", " ̃"),
+        (0x2DD, "3", " ̋"),
+        (0x2DE, "V"),
+        (0x2E0, "M", "ɣ"),
+        (0x2E1, "M", "l"),
+        (0x2E2, "M", "s"),
+        (0x2E3, "M", "x"),
+        (0x2E4, "M", "ʕ"),
+        (0x2E5, "V"),
+        (0x340, "M", "̀"),
+        (0x341, "M", "́"),
+        (0x342, "V"),
+        (0x343, "M", "̓"),
+        (0x344, "M", "̈́"),
+        (0x345, "M", "ι"),
+        (0x346, "V"),
+        (0x34F, "I"),
+        (0x350, "V"),
+        (0x370, "M", "ͱ"),
+        (0x371, "V"),
+        (0x372, "M", "ͳ"),
+        (0x373, "V"),
+        (0x374, "M", "ʹ"),
+        (0x375, "V"),
+        (0x376, "M", "ͷ"),
+        (0x377, "V"),
     ]
 
+
 def _seg_6() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x378, 'X'),
-    (0x37A, '3', ' ι'),
-    (0x37B, 'V'),
-    (0x37E, '3', ';'),
-    (0x37F, 'M', 'ϳ'),
-    (0x380, 'X'),
-    (0x384, '3', ' ́'),
-    (0x385, '3', ' ̈́'),
-    (0x386, 'M', 'ά'),
-    (0x387, 'M', '·'),
-    (0x388, 'M', 'έ'),
-    (0x389, 'M', 'ή'),
-    (0x38A, 'M', 'ί'),
-    (0x38B, 'X'),
-    (0x38C, 'M', 'ό'),
-    (0x38D, 'X'),
-    (0x38E, 'M', 'ύ'),
-    (0x38F, 'M', 'ώ'),
-    (0x390, 'V'),
-    (0x391, 'M', 'α'),
-    (0x392, 'M', 'β'),
-    (0x393, 'M', 'γ'),
-    (0x394, 'M', 'δ'),
-    (0x395, 'M', 'ε'),
-    (0x396, 'M', 'ζ'),
-    (0x397, 'M', 'η'),
-    (0x398, 'M', 'θ'),
-    (0x399, 'M', 'ι'),
-    (0x39A, 'M', 'κ'),
-    (0x39B, 'M', 'λ'),
-    (0x39C, 'M', 'μ'),
-    (0x39D, 'M', 'ν'),
-    (0x39E, 'M', 'ξ'),
-    (0x39F, 'M', 'ο'),
-    (0x3A0, 'M', 'π'),
-    (0x3A1, 'M', 'ρ'),
-    (0x3A2, 'X'),
-    (0x3A3, 'M', 'σ'),
-    (0x3A4, 'M', 'τ'),
-    (0x3A5, 'M', 'υ'),
-    (0x3A6, 'M', 'φ'),
-    (0x3A7, 'M', 'χ'),
-    (0x3A8, 'M', 'ψ'),
-    (0x3A9, 'M', 'ω'),
-    (0x3AA, 'M', 'ϊ'),
-    (0x3AB, 'M', 'ϋ'),
-    (0x3AC, 'V'),
-    (0x3C2, 'D', 'σ'),
-    (0x3C3, 'V'),
-    (0x3CF, 'M', 'ϗ'),
-    (0x3D0, 'M', 'β'),
-    (0x3D1, 'M', 'θ'),
-    (0x3D2, 'M', 'υ'),
-    (0x3D3, 'M', 'ύ'),
-    (0x3D4, 'M', 'ϋ'),
-    (0x3D5, 'M', 'φ'),
-    (0x3D6, 'M', 'π'),
-    (0x3D7, 'V'),
-    (0x3D8, 'M', 'ϙ'),
-    (0x3D9, 'V'),
-    (0x3DA, 'M', 'ϛ'),
-    (0x3DB, 'V'),
-    (0x3DC, 'M', 'ϝ'),
-    (0x3DD, 'V'),
-    (0x3DE, 'M', 'ϟ'),
-    (0x3DF, 'V'),
-    (0x3E0, 'M', 'ϡ'),
-    (0x3E1, 'V'),
-    (0x3E2, 'M', 'ϣ'),
-    (0x3E3, 'V'),
-    (0x3E4, 'M', 'ϥ'),
-    (0x3E5, 'V'),
-    (0x3E6, 'M', 'ϧ'),
-    (0x3E7, 'V'),
-    (0x3E8, 'M', 'ϩ'),
-    (0x3E9, 'V'),
-    (0x3EA, 'M', 'ϫ'),
-    (0x3EB, 'V'),
-    (0x3EC, 'M', 'ϭ'),
-    (0x3ED, 'V'),
-    (0x3EE, 'M', 'ϯ'),
-    (0x3EF, 'V'),
-    (0x3F0, 'M', 'κ'),
-    (0x3F1, 'M', 'ρ'),
-    (0x3F2, 'M', 'σ'),
-    (0x3F3, 'V'),
-    (0x3F4, 'M', 'θ'),
-    (0x3F5, 'M', 'ε'),
-    (0x3F6, 'V'),
-    (0x3F7, 'M', 'ϸ'),
-    (0x3F8, 'V'),
-    (0x3F9, 'M', 'σ'),
-    (0x3FA, 'M', 'ϻ'),
-    (0x3FB, 'V'),
-    (0x3FD, 'M', 'ͻ'),
-    (0x3FE, 'M', 'ͼ'),
-    (0x3FF, 'M', 'ͽ'),
-    (0x400, 'M', 'ѐ'),
-    (0x401, 'M', 'ё'),
-    (0x402, 'M', 'ђ'),
+        (0x378, "X"),
+        (0x37A, "3", " ι"),
+        (0x37B, "V"),
+        (0x37E, "3", ";"),
+        (0x37F, "M", "ϳ"),
+        (0x380, "X"),
+        (0x384, "3", " ́"),
+        (0x385, "3", " ̈́"),
+        (0x386, "M", "ά"),
+        (0x387, "M", "·"),
+        (0x388, "M", "έ"),
+        (0x389, "M", "ή"),
+        (0x38A, "M", "ί"),
+        (0x38B, "X"),
+        (0x38C, "M", "ό"),
+        (0x38D, "X"),
+        (0x38E, "M", "ύ"),
+        (0x38F, "M", "ώ"),
+        (0x390, "V"),
+        (0x391, "M", "α"),
+        (0x392, "M", "β"),
+        (0x393, "M", "γ"),
+        (0x394, "M", "δ"),
+        (0x395, "M", "ε"),
+        (0x396, "M", "ζ"),
+        (0x397, "M", "η"),
+        (0x398, "M", "θ"),
+        (0x399, "M", "ι"),
+        (0x39A, "M", "κ"),
+        (0x39B, "M", "λ"),
+        (0x39C, "M", "μ"),
+        (0x39D, "M", "ν"),
+        (0x39E, "M", "ξ"),
+        (0x39F, "M", "ο"),
+        (0x3A0, "M", "π"),
+        (0x3A1, "M", "ρ"),
+        (0x3A2, "X"),
+        (0x3A3, "M", "σ"),
+        (0x3A4, "M", "τ"),
+        (0x3A5, "M", "υ"),
+        (0x3A6, "M", "φ"),
+        (0x3A7, "M", "χ"),
+        (0x3A8, "M", "ψ"),
+        (0x3A9, "M", "ω"),
+        (0x3AA, "M", "ϊ"),
+        (0x3AB, "M", "ϋ"),
+        (0x3AC, "V"),
+        (0x3C2, "D", "σ"),
+        (0x3C3, "V"),
+        (0x3CF, "M", "ϗ"),
+        (0x3D0, "M", "β"),
+        (0x3D1, "M", "θ"),
+        (0x3D2, "M", "υ"),
+        (0x3D3, "M", "ύ"),
+        (0x3D4, "M", "ϋ"),
+        (0x3D5, "M", "φ"),
+        (0x3D6, "M", "π"),
+        (0x3D7, "V"),
+        (0x3D8, "M", "ϙ"),
+        (0x3D9, "V"),
+        (0x3DA, "M", "ϛ"),
+        (0x3DB, "V"),
+        (0x3DC, "M", "ϝ"),
+        (0x3DD, "V"),
+        (0x3DE, "M", "ϟ"),
+        (0x3DF, "V"),
+        (0x3E0, "M", "ϡ"),
+        (0x3E1, "V"),
+        (0x3E2, "M", "ϣ"),
+        (0x3E3, "V"),
+        (0x3E4, "M", "ϥ"),
+        (0x3E5, "V"),
+        (0x3E6, "M", "ϧ"),
+        (0x3E7, "V"),
+        (0x3E8, "M", "ϩ"),
+        (0x3E9, "V"),
+        (0x3EA, "M", "ϫ"),
+        (0x3EB, "V"),
+        (0x3EC, "M", "ϭ"),
+        (0x3ED, "V"),
+        (0x3EE, "M", "ϯ"),
+        (0x3EF, "V"),
+        (0x3F0, "M", "κ"),
+        (0x3F1, "M", "ρ"),
+        (0x3F2, "M", "σ"),
+        (0x3F3, "V"),
+        (0x3F4, "M", "θ"),
+        (0x3F5, "M", "ε"),
+        (0x3F6, "V"),
+        (0x3F7, "M", "ϸ"),
+        (0x3F8, "V"),
+        (0x3F9, "M", "σ"),
+        (0x3FA, "M", "ϻ"),
+        (0x3FB, "V"),
+        (0x3FD, "M", "ͻ"),
+        (0x3FE, "M", "ͼ"),
+        (0x3FF, "M", "ͽ"),
+        (0x400, "M", "ѐ"),
+        (0x401, "M", "ё"),
+        (0x402, "M", "ђ"),
     ]
 
+
 def _seg_7() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x403, 'M', 'ѓ'),
-    (0x404, 'M', 'є'),
-    (0x405, 'M', 'ѕ'),
-    (0x406, 'M', 'і'),
-    (0x407, 'M', 'ї'),
-    (0x408, 'M', 'ј'),
-    (0x409, 'M', 'љ'),
-    (0x40A, 'M', 'њ'),
-    (0x40B, 'M', 'ћ'),
-    (0x40C, 'M', 'ќ'),
-    (0x40D, 'M', 'ѝ'),
-    (0x40E, 'M', 'ў'),
-    (0x40F, 'M', 'џ'),
-    (0x410, 'M', 'а'),
-    (0x411, 'M', 'б'),
-    (0x412, 'M', 'в'),
-    (0x413, 'M', 'г'),
-    (0x414, 'M', 'д'),
-    (0x415, 'M', 'е'),
-    (0x416, 'M', 'ж'),
-    (0x417, 'M', 'з'),
-    (0x418, 'M', 'и'),
-    (0x419, 'M', 'й'),
-    (0x41A, 'M', 'к'),
-    (0x41B, 'M', 'л'),
-    (0x41C, 'M', 'м'),
-    (0x41D, 'M', 'н'),
-    (0x41E, 'M', 'о'),
-    (0x41F, 'M', 'п'),
-    (0x420, 'M', 'р'),
-    (0x421, 'M', 'с'),
-    (0x422, 'M', 'т'),
-    (0x423, 'M', 'у'),
-    (0x424, 'M', 'ф'),
-    (0x425, 'M', 'х'),
-    (0x426, 'M', 'ц'),
-    (0x427, 'M', 'ч'),
-    (0x428, 'M', 'ш'),
-    (0x429, 'M', 'щ'),
-    (0x42A, 'M', 'ъ'),
-    (0x42B, 'M', 'ы'),
-    (0x42C, 'M', 'ь'),
-    (0x42D, 'M', 'э'),
-    (0x42E, 'M', 'ю'),
-    (0x42F, 'M', 'я'),
-    (0x430, 'V'),
-    (0x460, 'M', 'ѡ'),
-    (0x461, 'V'),
-    (0x462, 'M', 'ѣ'),
-    (0x463, 'V'),
-    (0x464, 'M', 'ѥ'),
-    (0x465, 'V'),
-    (0x466, 'M', 'ѧ'),
-    (0x467, 'V'),
-    (0x468, 'M', 'ѩ'),
-    (0x469, 'V'),
-    (0x46A, 'M', 'ѫ'),
-    (0x46B, 'V'),
-    (0x46C, 'M', 'ѭ'),
-    (0x46D, 'V'),
-    (0x46E, 'M', 'ѯ'),
-    (0x46F, 'V'),
-    (0x470, 'M', 'ѱ'),
-    (0x471, 'V'),
-    (0x472, 'M', 'ѳ'),
-    (0x473, 'V'),
-    (0x474, 'M', 'ѵ'),
-    (0x475, 'V'),
-    (0x476, 'M', 'ѷ'),
-    (0x477, 'V'),
-    (0x478, 'M', 'ѹ'),
-    (0x479, 'V'),
-    (0x47A, 'M', 'ѻ'),
-    (0x47B, 'V'),
-    (0x47C, 'M', 'ѽ'),
-    (0x47D, 'V'),
-    (0x47E, 'M', 'ѿ'),
-    (0x47F, 'V'),
-    (0x480, 'M', 'ҁ'),
-    (0x481, 'V'),
-    (0x48A, 'M', 'ҋ'),
-    (0x48B, 'V'),
-    (0x48C, 'M', 'ҍ'),
-    (0x48D, 'V'),
-    (0x48E, 'M', 'ҏ'),
-    (0x48F, 'V'),
-    (0x490, 'M', 'ґ'),
-    (0x491, 'V'),
-    (0x492, 'M', 'ғ'),
-    (0x493, 'V'),
-    (0x494, 'M', 'ҕ'),
-    (0x495, 'V'),
-    (0x496, 'M', 'җ'),
-    (0x497, 'V'),
-    (0x498, 'M', 'ҙ'),
-    (0x499, 'V'),
-    (0x49A, 'M', 'қ'),
-    (0x49B, 'V'),
-    (0x49C, 'M', 'ҝ'),
-    (0x49D, 'V'),
+        (0x403, "M", "ѓ"),
+        (0x404, "M", "є"),
+        (0x405, "M", "ѕ"),
+        (0x406, "M", "і"),
+        (0x407, "M", "ї"),
+        (0x408, "M", "ј"),
+        (0x409, "M", "љ"),
+        (0x40A, "M", "њ"),
+        (0x40B, "M", "ћ"),
+        (0x40C, "M", "ќ"),
+        (0x40D, "M", "ѝ"),
+        (0x40E, "M", "ў"),
+        (0x40F, "M", "џ"),
+        (0x410, "M", "а"),
+        (0x411, "M", "б"),
+        (0x412, "M", "в"),
+        (0x413, "M", "г"),
+        (0x414, "M", "д"),
+        (0x415, "M", "е"),
+        (0x416, "M", "ж"),
+        (0x417, "M", "з"),
+        (0x418, "M", "и"),
+        (0x419, "M", "й"),
+        (0x41A, "M", "к"),
+        (0x41B, "M", "л"),
+        (0x41C, "M", "м"),
+        (0x41D, "M", "н"),
+        (0x41E, "M", "о"),
+        (0x41F, "M", "п"),
+        (0x420, "M", "р"),
+        (0x421, "M", "с"),
+        (0x422, "M", "т"),
+        (0x423, "M", "у"),
+        (0x424, "M", "ф"),
+        (0x425, "M", "х"),
+        (0x426, "M", "ц"),
+        (0x427, "M", "ч"),
+        (0x428, "M", "ш"),
+        (0x429, "M", "щ"),
+        (0x42A, "M", "ъ"),
+        (0x42B, "M", "ы"),
+        (0x42C, "M", "ь"),
+        (0x42D, "M", "э"),
+        (0x42E, "M", "ю"),
+        (0x42F, "M", "я"),
+        (0x430, "V"),
+        (0x460, "M", "ѡ"),
+        (0x461, "V"),
+        (0x462, "M", "ѣ"),
+        (0x463, "V"),
+        (0x464, "M", "ѥ"),
+        (0x465, "V"),
+        (0x466, "M", "ѧ"),
+        (0x467, "V"),
+        (0x468, "M", "ѩ"),
+        (0x469, "V"),
+        (0x46A, "M", "ѫ"),
+        (0x46B, "V"),
+        (0x46C, "M", "ѭ"),
+        (0x46D, "V"),
+        (0x46E, "M", "ѯ"),
+        (0x46F, "V"),
+        (0x470, "M", "ѱ"),
+        (0x471, "V"),
+        (0x472, "M", "ѳ"),
+        (0x473, "V"),
+        (0x474, "M", "ѵ"),
+        (0x475, "V"),
+        (0x476, "M", "ѷ"),
+        (0x477, "V"),
+        (0x478, "M", "ѹ"),
+        (0x479, "V"),
+        (0x47A, "M", "ѻ"),
+        (0x47B, "V"),
+        (0x47C, "M", "ѽ"),
+        (0x47D, "V"),
+        (0x47E, "M", "ѿ"),
+        (0x47F, "V"),
+        (0x480, "M", "ҁ"),
+        (0x481, "V"),
+        (0x48A, "M", "ҋ"),
+        (0x48B, "V"),
+        (0x48C, "M", "ҍ"),
+        (0x48D, "V"),
+        (0x48E, "M", "ҏ"),
+        (0x48F, "V"),
+        (0x490, "M", "ґ"),
+        (0x491, "V"),
+        (0x492, "M", "ғ"),
+        (0x493, "V"),
+        (0x494, "M", "ҕ"),
+        (0x495, "V"),
+        (0x496, "M", "җ"),
+        (0x497, "V"),
+        (0x498, "M", "ҙ"),
+        (0x499, "V"),
+        (0x49A, "M", "қ"),
+        (0x49B, "V"),
+        (0x49C, "M", "ҝ"),
+        (0x49D, "V"),
     ]
 
+
 def _seg_8() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x49E, 'M', 'ҟ'),
-    (0x49F, 'V'),
-    (0x4A0, 'M', 'ҡ'),
-    (0x4A1, 'V'),
-    (0x4A2, 'M', 'ң'),
-    (0x4A3, 'V'),
-    (0x4A4, 'M', 'ҥ'),
-    (0x4A5, 'V'),
-    (0x4A6, 'M', 'ҧ'),
-    (0x4A7, 'V'),
-    (0x4A8, 'M', 'ҩ'),
-    (0x4A9, 'V'),
-    (0x4AA, 'M', 'ҫ'),
-    (0x4AB, 'V'),
-    (0x4AC, 'M', 'ҭ'),
-    (0x4AD, 'V'),
-    (0x4AE, 'M', 'ү'),
-    (0x4AF, 'V'),
-    (0x4B0, 'M', 'ұ'),
-    (0x4B1, 'V'),
-    (0x4B2, 'M', 'ҳ'),
-    (0x4B3, 'V'),
-    (0x4B4, 'M', 'ҵ'),
-    (0x4B5, 'V'),
-    (0x4B6, 'M', 'ҷ'),
-    (0x4B7, 'V'),
-    (0x4B8, 'M', 'ҹ'),
-    (0x4B9, 'V'),
-    (0x4BA, 'M', 'һ'),
-    (0x4BB, 'V'),
-    (0x4BC, 'M', 'ҽ'),
-    (0x4BD, 'V'),
-    (0x4BE, 'M', 'ҿ'),
-    (0x4BF, 'V'),
-    (0x4C0, 'X'),
-    (0x4C1, 'M', 'ӂ'),
-    (0x4C2, 'V'),
-    (0x4C3, 'M', 'ӄ'),
-    (0x4C4, 'V'),
-    (0x4C5, 'M', 'ӆ'),
-    (0x4C6, 'V'),
-    (0x4C7, 'M', 'ӈ'),
-    (0x4C8, 'V'),
-    (0x4C9, 'M', 'ӊ'),
-    (0x4CA, 'V'),
-    (0x4CB, 'M', 'ӌ'),
-    (0x4CC, 'V'),
-    (0x4CD, 'M', 'ӎ'),
-    (0x4CE, 'V'),
-    (0x4D0, 'M', 'ӑ'),
-    (0x4D1, 'V'),
-    (0x4D2, 'M', 'ӓ'),
-    (0x4D3, 'V'),
-    (0x4D4, 'M', 'ӕ'),
-    (0x4D5, 'V'),
-    (0x4D6, 'M', 'ӗ'),
-    (0x4D7, 'V'),
-    (0x4D8, 'M', 'ә'),
-    (0x4D9, 'V'),
-    (0x4DA, 'M', 'ӛ'),
-    (0x4DB, 'V'),
-    (0x4DC, 'M', 'ӝ'),
-    (0x4DD, 'V'),
-    (0x4DE, 'M', 'ӟ'),
-    (0x4DF, 'V'),
-    (0x4E0, 'M', 'ӡ'),
-    (0x4E1, 'V'),
-    (0x4E2, 'M', 'ӣ'),
-    (0x4E3, 'V'),
-    (0x4E4, 'M', 'ӥ'),
-    (0x4E5, 'V'),
-    (0x4E6, 'M', 'ӧ'),
-    (0x4E7, 'V'),
-    (0x4E8, 'M', 'ө'),
-    (0x4E9, 'V'),
-    (0x4EA, 'M', 'ӫ'),
-    (0x4EB, 'V'),
-    (0x4EC, 'M', 'ӭ'),
-    (0x4ED, 'V'),
-    (0x4EE, 'M', 'ӯ'),
-    (0x4EF, 'V'),
-    (0x4F0, 'M', 'ӱ'),
-    (0x4F1, 'V'),
-    (0x4F2, 'M', 'ӳ'),
-    (0x4F3, 'V'),
-    (0x4F4, 'M', 'ӵ'),
-    (0x4F5, 'V'),
-    (0x4F6, 'M', 'ӷ'),
-    (0x4F7, 'V'),
-    (0x4F8, 'M', 'ӹ'),
-    (0x4F9, 'V'),
-    (0x4FA, 'M', 'ӻ'),
-    (0x4FB, 'V'),
-    (0x4FC, 'M', 'ӽ'),
-    (0x4FD, 'V'),
-    (0x4FE, 'M', 'ӿ'),
-    (0x4FF, 'V'),
-    (0x500, 'M', 'ԁ'),
-    (0x501, 'V'),
-    (0x502, 'M', 'ԃ'),
+        (0x49E, "M", "ҟ"),
+        (0x49F, "V"),
+        (0x4A0, "M", "ҡ"),
+        (0x4A1, "V"),
+        (0x4A2, "M", "ң"),
+        (0x4A3, "V"),
+        (0x4A4, "M", "ҥ"),
+        (0x4A5, "V"),
+        (0x4A6, "M", "ҧ"),
+        (0x4A7, "V"),
+        (0x4A8, "M", "ҩ"),
+        (0x4A9, "V"),
+        (0x4AA, "M", "ҫ"),
+        (0x4AB, "V"),
+        (0x4AC, "M", "ҭ"),
+        (0x4AD, "V"),
+        (0x4AE, "M", "ү"),
+        (0x4AF, "V"),
+        (0x4B0, "M", "ұ"),
+        (0x4B1, "V"),
+        (0x4B2, "M", "ҳ"),
+        (0x4B3, "V"),
+        (0x4B4, "M", "ҵ"),
+        (0x4B5, "V"),
+        (0x4B6, "M", "ҷ"),
+        (0x4B7, "V"),
+        (0x4B8, "M", "ҹ"),
+        (0x4B9, "V"),
+        (0x4BA, "M", "һ"),
+        (0x4BB, "V"),
+        (0x4BC, "M", "ҽ"),
+        (0x4BD, "V"),
+        (0x4BE, "M", "ҿ"),
+        (0x4BF, "V"),
+        (0x4C0, "X"),
+        (0x4C1, "M", "ӂ"),
+        (0x4C2, "V"),
+        (0x4C3, "M", "ӄ"),
+        (0x4C4, "V"),
+        (0x4C5, "M", "ӆ"),
+        (0x4C6, "V"),
+        (0x4C7, "M", "ӈ"),
+        (0x4C8, "V"),
+        (0x4C9, "M", "ӊ"),
+        (0x4CA, "V"),
+        (0x4CB, "M", "ӌ"),
+        (0x4CC, "V"),
+        (0x4CD, "M", "ӎ"),
+        (0x4CE, "V"),
+        (0x4D0, "M", "ӑ"),
+        (0x4D1, "V"),
+        (0x4D2, "M", "ӓ"),
+        (0x4D3, "V"),
+        (0x4D4, "M", "ӕ"),
+        (0x4D5, "V"),
+        (0x4D6, "M", "ӗ"),
+        (0x4D7, "V"),
+        (0x4D8, "M", "ә"),
+        (0x4D9, "V"),
+        (0x4DA, "M", "ӛ"),
+        (0x4DB, "V"),
+        (0x4DC, "M", "ӝ"),
+        (0x4DD, "V"),
+        (0x4DE, "M", "ӟ"),
+        (0x4DF, "V"),
+        (0x4E0, "M", "ӡ"),
+        (0x4E1, "V"),
+        (0x4E2, "M", "ӣ"),
+        (0x4E3, "V"),
+        (0x4E4, "M", "ӥ"),
+        (0x4E5, "V"),
+        (0x4E6, "M", "ӧ"),
+        (0x4E7, "V"),
+        (0x4E8, "M", "ө"),
+        (0x4E9, "V"),
+        (0x4EA, "M", "ӫ"),
+        (0x4EB, "V"),
+        (0x4EC, "M", "ӭ"),
+        (0x4ED, "V"),
+        (0x4EE, "M", "ӯ"),
+        (0x4EF, "V"),
+        (0x4F0, "M", "ӱ"),
+        (0x4F1, "V"),
+        (0x4F2, "M", "ӳ"),
+        (0x4F3, "V"),
+        (0x4F4, "M", "ӵ"),
+        (0x4F5, "V"),
+        (0x4F6, "M", "ӷ"),
+        (0x4F7, "V"),
+        (0x4F8, "M", "ӹ"),
+        (0x4F9, "V"),
+        (0x4FA, "M", "ӻ"),
+        (0x4FB, "V"),
+        (0x4FC, "M", "ӽ"),
+        (0x4FD, "V"),
+        (0x4FE, "M", "ӿ"),
+        (0x4FF, "V"),
+        (0x500, "M", "ԁ"),
+        (0x501, "V"),
+        (0x502, "M", "ԃ"),
     ]
 
+
 def _seg_9() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x503, 'V'),
-    (0x504, 'M', 'ԅ'),
-    (0x505, 'V'),
-    (0x506, 'M', 'ԇ'),
-    (0x507, 'V'),
-    (0x508, 'M', 'ԉ'),
-    (0x509, 'V'),
-    (0x50A, 'M', 'ԋ'),
-    (0x50B, 'V'),
-    (0x50C, 'M', 'ԍ'),
-    (0x50D, 'V'),
-    (0x50E, 'M', 'ԏ'),
-    (0x50F, 'V'),
-    (0x510, 'M', 'ԑ'),
-    (0x511, 'V'),
-    (0x512, 'M', 'ԓ'),
-    (0x513, 'V'),
-    (0x514, 'M', 'ԕ'),
-    (0x515, 'V'),
-    (0x516, 'M', 'ԗ'),
-    (0x517, 'V'),
-    (0x518, 'M', 'ԙ'),
-    (0x519, 'V'),
-    (0x51A, 'M', 'ԛ'),
-    (0x51B, 'V'),
-    (0x51C, 'M', 'ԝ'),
-    (0x51D, 'V'),
-    (0x51E, 'M', 'ԟ'),
-    (0x51F, 'V'),
-    (0x520, 'M', 'ԡ'),
-    (0x521, 'V'),
-    (0x522, 'M', 'ԣ'),
-    (0x523, 'V'),
-    (0x524, 'M', 'ԥ'),
-    (0x525, 'V'),
-    (0x526, 'M', 'ԧ'),
-    (0x527, 'V'),
-    (0x528, 'M', 'ԩ'),
-    (0x529, 'V'),
-    (0x52A, 'M', 'ԫ'),
-    (0x52B, 'V'),
-    (0x52C, 'M', 'ԭ'),
-    (0x52D, 'V'),
-    (0x52E, 'M', 'ԯ'),
-    (0x52F, 'V'),
-    (0x530, 'X'),
-    (0x531, 'M', 'ա'),
-    (0x532, 'M', 'բ'),
-    (0x533, 'M', 'գ'),
-    (0x534, 'M', 'դ'),
-    (0x535, 'M', 'ե'),
-    (0x536, 'M', 'զ'),
-    (0x537, 'M', 'է'),
-    (0x538, 'M', 'ը'),
-    (0x539, 'M', 'թ'),
-    (0x53A, 'M', 'ժ'),
-    (0x53B, 'M', 'ի'),
-    (0x53C, 'M', 'լ'),
-    (0x53D, 'M', 'խ'),
-    (0x53E, 'M', 'ծ'),
-    (0x53F, 'M', 'կ'),
-    (0x540, 'M', 'հ'),
-    (0x541, 'M', 'ձ'),
-    (0x542, 'M', 'ղ'),
-    (0x543, 'M', 'ճ'),
-    (0x544, 'M', 'մ'),
-    (0x545, 'M', 'յ'),
-    (0x546, 'M', 'ն'),
-    (0x547, 'M', 'շ'),
-    (0x548, 'M', 'ո'),
-    (0x549, 'M', 'չ'),
-    (0x54A, 'M', 'պ'),
-    (0x54B, 'M', 'ջ'),
-    (0x54C, 'M', 'ռ'),
-    (0x54D, 'M', 'ս'),
-    (0x54E, 'M', 'վ'),
-    (0x54F, 'M', 'տ'),
-    (0x550, 'M', 'ր'),
-    (0x551, 'M', 'ց'),
-    (0x552, 'M', 'ւ'),
-    (0x553, 'M', 'փ'),
-    (0x554, 'M', 'ք'),
-    (0x555, 'M', 'օ'),
-    (0x556, 'M', 'ֆ'),
-    (0x557, 'X'),
-    (0x559, 'V'),
-    (0x587, 'M', 'եւ'),
-    (0x588, 'V'),
-    (0x58B, 'X'),
-    (0x58D, 'V'),
-    (0x590, 'X'),
-    (0x591, 'V'),
-    (0x5C8, 'X'),
-    (0x5D0, 'V'),
-    (0x5EB, 'X'),
-    (0x5EF, 'V'),
-    (0x5F5, 'X'),
-    (0x606, 'V'),
-    (0x61C, 'X'),
-    (0x61D, 'V'),
+        (0x503, "V"),
+        (0x504, "M", "ԅ"),
+        (0x505, "V"),
+        (0x506, "M", "ԇ"),
+        (0x507, "V"),
+        (0x508, "M", "ԉ"),
+        (0x509, "V"),
+        (0x50A, "M", "ԋ"),
+        (0x50B, "V"),
+        (0x50C, "M", "ԍ"),
+        (0x50D, "V"),
+        (0x50E, "M", "ԏ"),
+        (0x50F, "V"),
+        (0x510, "M", "ԑ"),
+        (0x511, "V"),
+        (0x512, "M", "ԓ"),
+        (0x513, "V"),
+        (0x514, "M", "ԕ"),
+        (0x515, "V"),
+        (0x516, "M", "ԗ"),
+        (0x517, "V"),
+        (0x518, "M", "ԙ"),
+        (0x519, "V"),
+        (0x51A, "M", "ԛ"),
+        (0x51B, "V"),
+        (0x51C, "M", "ԝ"),
+        (0x51D, "V"),
+        (0x51E, "M", "ԟ"),
+        (0x51F, "V"),
+        (0x520, "M", "ԡ"),
+        (0x521, "V"),
+        (0x522, "M", "ԣ"),
+        (0x523, "V"),
+        (0x524, "M", "ԥ"),
+        (0x525, "V"),
+        (0x526, "M", "ԧ"),
+        (0x527, "V"),
+        (0x528, "M", "ԩ"),
+        (0x529, "V"),
+        (0x52A, "M", "ԫ"),
+        (0x52B, "V"),
+        (0x52C, "M", "ԭ"),
+        (0x52D, "V"),
+        (0x52E, "M", "ԯ"),
+        (0x52F, "V"),
+        (0x530, "X"),
+        (0x531, "M", "ա"),
+        (0x532, "M", "բ"),
+        (0x533, "M", "գ"),
+        (0x534, "M", "դ"),
+        (0x535, "M", "ե"),
+        (0x536, "M", "զ"),
+        (0x537, "M", "է"),
+        (0x538, "M", "ը"),
+        (0x539, "M", "թ"),
+        (0x53A, "M", "ժ"),
+        (0x53B, "M", "ի"),
+        (0x53C, "M", "լ"),
+        (0x53D, "M", "խ"),
+        (0x53E, "M", "ծ"),
+        (0x53F, "M", "կ"),
+        (0x540, "M", "հ"),
+        (0x541, "M", "ձ"),
+        (0x542, "M", "ղ"),
+        (0x543, "M", "ճ"),
+        (0x544, "M", "մ"),
+        (0x545, "M", "յ"),
+        (0x546, "M", "ն"),
+        (0x547, "M", "շ"),
+        (0x548, "M", "ո"),
+        (0x549, "M", "չ"),
+        (0x54A, "M", "պ"),
+        (0x54B, "M", "ջ"),
+        (0x54C, "M", "ռ"),
+        (0x54D, "M", "ս"),
+        (0x54E, "M", "վ"),
+        (0x54F, "M", "տ"),
+        (0x550, "M", "ր"),
+        (0x551, "M", "ց"),
+        (0x552, "M", "ւ"),
+        (0x553, "M", "փ"),
+        (0x554, "M", "ք"),
+        (0x555, "M", "օ"),
+        (0x556, "M", "ֆ"),
+        (0x557, "X"),
+        (0x559, "V"),
+        (0x587, "M", "եւ"),
+        (0x588, "V"),
+        (0x58B, "X"),
+        (0x58D, "V"),
+        (0x590, "X"),
+        (0x591, "V"),
+        (0x5C8, "X"),
+        (0x5D0, "V"),
+        (0x5EB, "X"),
+        (0x5EF, "V"),
+        (0x5F5, "X"),
+        (0x606, "V"),
+        (0x61C, "X"),
+        (0x61D, "V"),
     ]
 
+
 def _seg_10() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x675, 'M', 'اٴ'),
-    (0x676, 'M', 'وٴ'),
-    (0x677, 'M', 'ۇٴ'),
-    (0x678, 'M', 'يٴ'),
-    (0x679, 'V'),
-    (0x6DD, 'X'),
-    (0x6DE, 'V'),
-    (0x70E, 'X'),
-    (0x710, 'V'),
-    (0x74B, 'X'),
-    (0x74D, 'V'),
-    (0x7B2, 'X'),
-    (0x7C0, 'V'),
-    (0x7FB, 'X'),
-    (0x7FD, 'V'),
-    (0x82E, 'X'),
-    (0x830, 'V'),
-    (0x83F, 'X'),
-    (0x840, 'V'),
-    (0x85C, 'X'),
-    (0x85E, 'V'),
-    (0x85F, 'X'),
-    (0x860, 'V'),
-    (0x86B, 'X'),
-    (0x870, 'V'),
-    (0x88F, 'X'),
-    (0x898, 'V'),
-    (0x8E2, 'X'),
-    (0x8E3, 'V'),
-    (0x958, 'M', 'क़'),
-    (0x959, 'M', 'ख़'),
-    (0x95A, 'M', 'ग़'),
-    (0x95B, 'M', 'ज़'),
-    (0x95C, 'M', 'ड़'),
-    (0x95D, 'M', 'ढ़'),
-    (0x95E, 'M', 'फ़'),
-    (0x95F, 'M', 'य़'),
-    (0x960, 'V'),
-    (0x984, 'X'),
-    (0x985, 'V'),
-    (0x98D, 'X'),
-    (0x98F, 'V'),
-    (0x991, 'X'),
-    (0x993, 'V'),
-    (0x9A9, 'X'),
-    (0x9AA, 'V'),
-    (0x9B1, 'X'),
-    (0x9B2, 'V'),
-    (0x9B3, 'X'),
-    (0x9B6, 'V'),
-    (0x9BA, 'X'),
-    (0x9BC, 'V'),
-    (0x9C5, 'X'),
-    (0x9C7, 'V'),
-    (0x9C9, 'X'),
-    (0x9CB, 'V'),
-    (0x9CF, 'X'),
-    (0x9D7, 'V'),
-    (0x9D8, 'X'),
-    (0x9DC, 'M', 'ড়'),
-    (0x9DD, 'M', 'ঢ়'),
-    (0x9DE, 'X'),
-    (0x9DF, 'M', 'য়'),
-    (0x9E0, 'V'),
-    (0x9E4, 'X'),
-    (0x9E6, 'V'),
-    (0x9FF, 'X'),
-    (0xA01, 'V'),
-    (0xA04, 'X'),
-    (0xA05, 'V'),
-    (0xA0B, 'X'),
-    (0xA0F, 'V'),
-    (0xA11, 'X'),
-    (0xA13, 'V'),
-    (0xA29, 'X'),
-    (0xA2A, 'V'),
-    (0xA31, 'X'),
-    (0xA32, 'V'),
-    (0xA33, 'M', 'ਲ਼'),
-    (0xA34, 'X'),
-    (0xA35, 'V'),
-    (0xA36, 'M', 'ਸ਼'),
-    (0xA37, 'X'),
-    (0xA38, 'V'),
-    (0xA3A, 'X'),
-    (0xA3C, 'V'),
-    (0xA3D, 'X'),
-    (0xA3E, 'V'),
-    (0xA43, 'X'),
-    (0xA47, 'V'),
-    (0xA49, 'X'),
-    (0xA4B, 'V'),
-    (0xA4E, 'X'),
-    (0xA51, 'V'),
-    (0xA52, 'X'),
-    (0xA59, 'M', 'ਖ਼'),
-    (0xA5A, 'M', 'ਗ਼'),
-    (0xA5B, 'M', 'ਜ਼'),
-    (0xA5C, 'V'),
-    (0xA5D, 'X'),
+        (0x675, "M", "اٴ"),
+        (0x676, "M", "وٴ"),
+        (0x677, "M", "ۇٴ"),
+        (0x678, "M", "يٴ"),
+        (0x679, "V"),
+        (0x6DD, "X"),
+        (0x6DE, "V"),
+        (0x70E, "X"),
+        (0x710, "V"),
+        (0x74B, "X"),
+        (0x74D, "V"),
+        (0x7B2, "X"),
+        (0x7C0, "V"),
+        (0x7FB, "X"),
+        (0x7FD, "V"),
+        (0x82E, "X"),
+        (0x830, "V"),
+        (0x83F, "X"),
+        (0x840, "V"),
+        (0x85C, "X"),
+        (0x85E, "V"),
+        (0x85F, "X"),
+        (0x860, "V"),
+        (0x86B, "X"),
+        (0x870, "V"),
+        (0x88F, "X"),
+        (0x898, "V"),
+        (0x8E2, "X"),
+        (0x8E3, "V"),
+        (0x958, "M", "क़"),
+        (0x959, "M", "ख़"),
+        (0x95A, "M", "ग़"),
+        (0x95B, "M", "ज़"),
+        (0x95C, "M", "ड़"),
+        (0x95D, "M", "ढ़"),
+        (0x95E, "M", "फ़"),
+        (0x95F, "M", "य़"),
+        (0x960, "V"),
+        (0x984, "X"),
+        (0x985, "V"),
+        (0x98D, "X"),
+        (0x98F, "V"),
+        (0x991, "X"),
+        (0x993, "V"),
+        (0x9A9, "X"),
+        (0x9AA, "V"),
+        (0x9B1, "X"),
+        (0x9B2, "V"),
+        (0x9B3, "X"),
+        (0x9B6, "V"),
+        (0x9BA, "X"),
+        (0x9BC, "V"),
+        (0x9C5, "X"),
+        (0x9C7, "V"),
+        (0x9C9, "X"),
+        (0x9CB, "V"),
+        (0x9CF, "X"),
+        (0x9D7, "V"),
+        (0x9D8, "X"),
+        (0x9DC, "M", "ড়"),
+        (0x9DD, "M", "ঢ়"),
+        (0x9DE, "X"),
+        (0x9DF, "M", "য়"),
+        (0x9E0, "V"),
+        (0x9E4, "X"),
+        (0x9E6, "V"),
+        (0x9FF, "X"),
+        (0xA01, "V"),
+        (0xA04, "X"),
+        (0xA05, "V"),
+        (0xA0B, "X"),
+        (0xA0F, "V"),
+        (0xA11, "X"),
+        (0xA13, "V"),
+        (0xA29, "X"),
+        (0xA2A, "V"),
+        (0xA31, "X"),
+        (0xA32, "V"),
+        (0xA33, "M", "ਲ਼"),
+        (0xA34, "X"),
+        (0xA35, "V"),
+        (0xA36, "M", "ਸ਼"),
+        (0xA37, "X"),
+        (0xA38, "V"),
+        (0xA3A, "X"),
+        (0xA3C, "V"),
+        (0xA3D, "X"),
+        (0xA3E, "V"),
+        (0xA43, "X"),
+        (0xA47, "V"),
+        (0xA49, "X"),
+        (0xA4B, "V"),
+        (0xA4E, "X"),
+        (0xA51, "V"),
+        (0xA52, "X"),
+        (0xA59, "M", "ਖ਼"),
+        (0xA5A, "M", "ਗ਼"),
+        (0xA5B, "M", "ਜ਼"),
+        (0xA5C, "V"),
+        (0xA5D, "X"),
     ]
 
+
 def _seg_11() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xA5E, 'M', 'ਫ਼'),
-    (0xA5F, 'X'),
-    (0xA66, 'V'),
-    (0xA77, 'X'),
-    (0xA81, 'V'),
-    (0xA84, 'X'),
-    (0xA85, 'V'),
-    (0xA8E, 'X'),
-    (0xA8F, 'V'),
-    (0xA92, 'X'),
-    (0xA93, 'V'),
-    (0xAA9, 'X'),
-    (0xAAA, 'V'),
-    (0xAB1, 'X'),
-    (0xAB2, 'V'),
-    (0xAB4, 'X'),
-    (0xAB5, 'V'),
-    (0xABA, 'X'),
-    (0xABC, 'V'),
-    (0xAC6, 'X'),
-    (0xAC7, 'V'),
-    (0xACA, 'X'),
-    (0xACB, 'V'),
-    (0xACE, 'X'),
-    (0xAD0, 'V'),
-    (0xAD1, 'X'),
-    (0xAE0, 'V'),
-    (0xAE4, 'X'),
-    (0xAE6, 'V'),
-    (0xAF2, 'X'),
-    (0xAF9, 'V'),
-    (0xB00, 'X'),
-    (0xB01, 'V'),
-    (0xB04, 'X'),
-    (0xB05, 'V'),
-    (0xB0D, 'X'),
-    (0xB0F, 'V'),
-    (0xB11, 'X'),
-    (0xB13, 'V'),
-    (0xB29, 'X'),
-    (0xB2A, 'V'),
-    (0xB31, 'X'),
-    (0xB32, 'V'),
-    (0xB34, 'X'),
-    (0xB35, 'V'),
-    (0xB3A, 'X'),
-    (0xB3C, 'V'),
-    (0xB45, 'X'),
-    (0xB47, 'V'),
-    (0xB49, 'X'),
-    (0xB4B, 'V'),
-    (0xB4E, 'X'),
-    (0xB55, 'V'),
-    (0xB58, 'X'),
-    (0xB5C, 'M', 'ଡ଼'),
-    (0xB5D, 'M', 'ଢ଼'),
-    (0xB5E, 'X'),
-    (0xB5F, 'V'),
-    (0xB64, 'X'),
-    (0xB66, 'V'),
-    (0xB78, 'X'),
-    (0xB82, 'V'),
-    (0xB84, 'X'),
-    (0xB85, 'V'),
-    (0xB8B, 'X'),
-    (0xB8E, 'V'),
-    (0xB91, 'X'),
-    (0xB92, 'V'),
-    (0xB96, 'X'),
-    (0xB99, 'V'),
-    (0xB9B, 'X'),
-    (0xB9C, 'V'),
-    (0xB9D, 'X'),
-    (0xB9E, 'V'),
-    (0xBA0, 'X'),
-    (0xBA3, 'V'),
-    (0xBA5, 'X'),
-    (0xBA8, 'V'),
-    (0xBAB, 'X'),
-    (0xBAE, 'V'),
-    (0xBBA, 'X'),
-    (0xBBE, 'V'),
-    (0xBC3, 'X'),
-    (0xBC6, 'V'),
-    (0xBC9, 'X'),
-    (0xBCA, 'V'),
-    (0xBCE, 'X'),
-    (0xBD0, 'V'),
-    (0xBD1, 'X'),
-    (0xBD7, 'V'),
-    (0xBD8, 'X'),
-    (0xBE6, 'V'),
-    (0xBFB, 'X'),
-    (0xC00, 'V'),
-    (0xC0D, 'X'),
-    (0xC0E, 'V'),
-    (0xC11, 'X'),
-    (0xC12, 'V'),
-    (0xC29, 'X'),
-    (0xC2A, 'V'),
+        (0xA5E, "M", "ਫ਼"),
+        (0xA5F, "X"),
+        (0xA66, "V"),
+        (0xA77, "X"),
+        (0xA81, "V"),
+        (0xA84, "X"),
+        (0xA85, "V"),
+        (0xA8E, "X"),
+        (0xA8F, "V"),
+        (0xA92, "X"),
+        (0xA93, "V"),
+        (0xAA9, "X"),
+        (0xAAA, "V"),
+        (0xAB1, "X"),
+        (0xAB2, "V"),
+        (0xAB4, "X"),
+        (0xAB5, "V"),
+        (0xABA, "X"),
+        (0xABC, "V"),
+        (0xAC6, "X"),
+        (0xAC7, "V"),
+        (0xACA, "X"),
+        (0xACB, "V"),
+        (0xACE, "X"),
+        (0xAD0, "V"),
+        (0xAD1, "X"),
+        (0xAE0, "V"),
+        (0xAE4, "X"),
+        (0xAE6, "V"),
+        (0xAF2, "X"),
+        (0xAF9, "V"),
+        (0xB00, "X"),
+        (0xB01, "V"),
+        (0xB04, "X"),
+        (0xB05, "V"),
+        (0xB0D, "X"),
+        (0xB0F, "V"),
+        (0xB11, "X"),
+        (0xB13, "V"),
+        (0xB29, "X"),
+        (0xB2A, "V"),
+        (0xB31, "X"),
+        (0xB32, "V"),
+        (0xB34, "X"),
+        (0xB35, "V"),
+        (0xB3A, "X"),
+        (0xB3C, "V"),
+        (0xB45, "X"),
+        (0xB47, "V"),
+        (0xB49, "X"),
+        (0xB4B, "V"),
+        (0xB4E, "X"),
+        (0xB55, "V"),
+        (0xB58, "X"),
+        (0xB5C, "M", "ଡ଼"),
+        (0xB5D, "M", "ଢ଼"),
+        (0xB5E, "X"),
+        (0xB5F, "V"),
+        (0xB64, "X"),
+        (0xB66, "V"),
+        (0xB78, "X"),
+        (0xB82, "V"),
+        (0xB84, "X"),
+        (0xB85, "V"),
+        (0xB8B, "X"),
+        (0xB8E, "V"),
+        (0xB91, "X"),
+        (0xB92, "V"),
+        (0xB96, "X"),
+        (0xB99, "V"),
+        (0xB9B, "X"),
+        (0xB9C, "V"),
+        (0xB9D, "X"),
+        (0xB9E, "V"),
+        (0xBA0, "X"),
+        (0xBA3, "V"),
+        (0xBA5, "X"),
+        (0xBA8, "V"),
+        (0xBAB, "X"),
+        (0xBAE, "V"),
+        (0xBBA, "X"),
+        (0xBBE, "V"),
+        (0xBC3, "X"),
+        (0xBC6, "V"),
+        (0xBC9, "X"),
+        (0xBCA, "V"),
+        (0xBCE, "X"),
+        (0xBD0, "V"),
+        (0xBD1, "X"),
+        (0xBD7, "V"),
+        (0xBD8, "X"),
+        (0xBE6, "V"),
+        (0xBFB, "X"),
+        (0xC00, "V"),
+        (0xC0D, "X"),
+        (0xC0E, "V"),
+        (0xC11, "X"),
+        (0xC12, "V"),
+        (0xC29, "X"),
+        (0xC2A, "V"),
     ]
 
+
 def _seg_12() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xC3A, 'X'),
-    (0xC3C, 'V'),
-    (0xC45, 'X'),
-    (0xC46, 'V'),
-    (0xC49, 'X'),
-    (0xC4A, 'V'),
-    (0xC4E, 'X'),
-    (0xC55, 'V'),
-    (0xC57, 'X'),
-    (0xC58, 'V'),
-    (0xC5B, 'X'),
-    (0xC5D, 'V'),
-    (0xC5E, 'X'),
-    (0xC60, 'V'),
-    (0xC64, 'X'),
-    (0xC66, 'V'),
-    (0xC70, 'X'),
-    (0xC77, 'V'),
-    (0xC8D, 'X'),
-    (0xC8E, 'V'),
-    (0xC91, 'X'),
-    (0xC92, 'V'),
-    (0xCA9, 'X'),
-    (0xCAA, 'V'),
-    (0xCB4, 'X'),
-    (0xCB5, 'V'),
-    (0xCBA, 'X'),
-    (0xCBC, 'V'),
-    (0xCC5, 'X'),
-    (0xCC6, 'V'),
-    (0xCC9, 'X'),
-    (0xCCA, 'V'),
-    (0xCCE, 'X'),
-    (0xCD5, 'V'),
-    (0xCD7, 'X'),
-    (0xCDD, 'V'),
-    (0xCDF, 'X'),
-    (0xCE0, 'V'),
-    (0xCE4, 'X'),
-    (0xCE6, 'V'),
-    (0xCF0, 'X'),
-    (0xCF1, 'V'),
-    (0xCF4, 'X'),
-    (0xD00, 'V'),
-    (0xD0D, 'X'),
-    (0xD0E, 'V'),
-    (0xD11, 'X'),
-    (0xD12, 'V'),
-    (0xD45, 'X'),
-    (0xD46, 'V'),
-    (0xD49, 'X'),
-    (0xD4A, 'V'),
-    (0xD50, 'X'),
-    (0xD54, 'V'),
-    (0xD64, 'X'),
-    (0xD66, 'V'),
-    (0xD80, 'X'),
-    (0xD81, 'V'),
-    (0xD84, 'X'),
-    (0xD85, 'V'),
-    (0xD97, 'X'),
-    (0xD9A, 'V'),
-    (0xDB2, 'X'),
-    (0xDB3, 'V'),
-    (0xDBC, 'X'),
-    (0xDBD, 'V'),
-    (0xDBE, 'X'),
-    (0xDC0, 'V'),
-    (0xDC7, 'X'),
-    (0xDCA, 'V'),
-    (0xDCB, 'X'),
-    (0xDCF, 'V'),
-    (0xDD5, 'X'),
-    (0xDD6, 'V'),
-    (0xDD7, 'X'),
-    (0xDD8, 'V'),
-    (0xDE0, 'X'),
-    (0xDE6, 'V'),
-    (0xDF0, 'X'),
-    (0xDF2, 'V'),
-    (0xDF5, 'X'),
-    (0xE01, 'V'),
-    (0xE33, 'M', 'ํา'),
-    (0xE34, 'V'),
-    (0xE3B, 'X'),
-    (0xE3F, 'V'),
-    (0xE5C, 'X'),
-    (0xE81, 'V'),
-    (0xE83, 'X'),
-    (0xE84, 'V'),
-    (0xE85, 'X'),
-    (0xE86, 'V'),
-    (0xE8B, 'X'),
-    (0xE8C, 'V'),
-    (0xEA4, 'X'),
-    (0xEA5, 'V'),
-    (0xEA6, 'X'),
-    (0xEA7, 'V'),
-    (0xEB3, 'M', 'ໍາ'),
-    (0xEB4, 'V'),
+        (0xC3A, "X"),
+        (0xC3C, "V"),
+        (0xC45, "X"),
+        (0xC46, "V"),
+        (0xC49, "X"),
+        (0xC4A, "V"),
+        (0xC4E, "X"),
+        (0xC55, "V"),
+        (0xC57, "X"),
+        (0xC58, "V"),
+        (0xC5B, "X"),
+        (0xC5D, "V"),
+        (0xC5E, "X"),
+        (0xC60, "V"),
+        (0xC64, "X"),
+        (0xC66, "V"),
+        (0xC70, "X"),
+        (0xC77, "V"),
+        (0xC8D, "X"),
+        (0xC8E, "V"),
+        (0xC91, "X"),
+        (0xC92, "V"),
+        (0xCA9, "X"),
+        (0xCAA, "V"),
+        (0xCB4, "X"),
+        (0xCB5, "V"),
+        (0xCBA, "X"),
+        (0xCBC, "V"),
+        (0xCC5, "X"),
+        (0xCC6, "V"),
+        (0xCC9, "X"),
+        (0xCCA, "V"),
+        (0xCCE, "X"),
+        (0xCD5, "V"),
+        (0xCD7, "X"),
+        (0xCDD, "V"),
+        (0xCDF, "X"),
+        (0xCE0, "V"),
+        (0xCE4, "X"),
+        (0xCE6, "V"),
+        (0xCF0, "X"),
+        (0xCF1, "V"),
+        (0xCF4, "X"),
+        (0xD00, "V"),
+        (0xD0D, "X"),
+        (0xD0E, "V"),
+        (0xD11, "X"),
+        (0xD12, "V"),
+        (0xD45, "X"),
+        (0xD46, "V"),
+        (0xD49, "X"),
+        (0xD4A, "V"),
+        (0xD50, "X"),
+        (0xD54, "V"),
+        (0xD64, "X"),
+        (0xD66, "V"),
+        (0xD80, "X"),
+        (0xD81, "V"),
+        (0xD84, "X"),
+        (0xD85, "V"),
+        (0xD97, "X"),
+        (0xD9A, "V"),
+        (0xDB2, "X"),
+        (0xDB3, "V"),
+        (0xDBC, "X"),
+        (0xDBD, "V"),
+        (0xDBE, "X"),
+        (0xDC0, "V"),
+        (0xDC7, "X"),
+        (0xDCA, "V"),
+        (0xDCB, "X"),
+        (0xDCF, "V"),
+        (0xDD5, "X"),
+        (0xDD6, "V"),
+        (0xDD7, "X"),
+        (0xDD8, "V"),
+        (0xDE0, "X"),
+        (0xDE6, "V"),
+        (0xDF0, "X"),
+        (0xDF2, "V"),
+        (0xDF5, "X"),
+        (0xE01, "V"),
+        (0xE33, "M", "ํา"),
+        (0xE34, "V"),
+        (0xE3B, "X"),
+        (0xE3F, "V"),
+        (0xE5C, "X"),
+        (0xE81, "V"),
+        (0xE83, "X"),
+        (0xE84, "V"),
+        (0xE85, "X"),
+        (0xE86, "V"),
+        (0xE8B, "X"),
+        (0xE8C, "V"),
+        (0xEA4, "X"),
+        (0xEA5, "V"),
+        (0xEA6, "X"),
+        (0xEA7, "V"),
+        (0xEB3, "M", "ໍາ"),
+        (0xEB4, "V"),
     ]
 
+
 def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xEBE, 'X'),
-    (0xEC0, 'V'),
-    (0xEC5, 'X'),
-    (0xEC6, 'V'),
-    (0xEC7, 'X'),
-    (0xEC8, 'V'),
-    (0xECF, 'X'),
-    (0xED0, 'V'),
-    (0xEDA, 'X'),
-    (0xEDC, 'M', 'ຫນ'),
-    (0xEDD, 'M', 'ຫມ'),
-    (0xEDE, 'V'),
-    (0xEE0, 'X'),
-    (0xF00, 'V'),
-    (0xF0C, 'M', '་'),
-    (0xF0D, 'V'),
-    (0xF43, 'M', 'གྷ'),
-    (0xF44, 'V'),
-    (0xF48, 'X'),
-    (0xF49, 'V'),
-    (0xF4D, 'M', 'ཌྷ'),
-    (0xF4E, 'V'),
-    (0xF52, 'M', 'དྷ'),
-    (0xF53, 'V'),
-    (0xF57, 'M', 'བྷ'),
-    (0xF58, 'V'),
-    (0xF5C, 'M', 'ཛྷ'),
-    (0xF5D, 'V'),
-    (0xF69, 'M', 'ཀྵ'),
-    (0xF6A, 'V'),
-    (0xF6D, 'X'),
-    (0xF71, 'V'),
-    (0xF73, 'M', 'ཱི'),
-    (0xF74, 'V'),
-    (0xF75, 'M', 'ཱུ'),
-    (0xF76, 'M', 'ྲྀ'),
-    (0xF77, 'M', 'ྲཱྀ'),
-    (0xF78, 'M', 'ླྀ'),
-    (0xF79, 'M', 'ླཱྀ'),
-    (0xF7A, 'V'),
-    (0xF81, 'M', 'ཱྀ'),
-    (0xF82, 'V'),
-    (0xF93, 'M', 'ྒྷ'),
-    (0xF94, 'V'),
-    (0xF98, 'X'),
-    (0xF99, 'V'),
-    (0xF9D, 'M', 'ྜྷ'),
-    (0xF9E, 'V'),
-    (0xFA2, 'M', 'ྡྷ'),
-    (0xFA3, 'V'),
-    (0xFA7, 'M', 'ྦྷ'),
-    (0xFA8, 'V'),
-    (0xFAC, 'M', 'ྫྷ'),
-    (0xFAD, 'V'),
-    (0xFB9, 'M', 'ྐྵ'),
-    (0xFBA, 'V'),
-    (0xFBD, 'X'),
-    (0xFBE, 'V'),
-    (0xFCD, 'X'),
-    (0xFCE, 'V'),
-    (0xFDB, 'X'),
-    (0x1000, 'V'),
-    (0x10A0, 'X'),
-    (0x10C7, 'M', 'ⴧ'),
-    (0x10C8, 'X'),
-    (0x10CD, 'M', 'ⴭ'),
-    (0x10CE, 'X'),
-    (0x10D0, 'V'),
-    (0x10FC, 'M', 'ნ'),
-    (0x10FD, 'V'),
-    (0x115F, 'X'),
-    (0x1161, 'V'),
-    (0x1249, 'X'),
-    (0x124A, 'V'),
-    (0x124E, 'X'),
-    (0x1250, 'V'),
-    (0x1257, 'X'),
-    (0x1258, 'V'),
-    (0x1259, 'X'),
-    (0x125A, 'V'),
-    (0x125E, 'X'),
-    (0x1260, 'V'),
-    (0x1289, 'X'),
-    (0x128A, 'V'),
-    (0x128E, 'X'),
-    (0x1290, 'V'),
-    (0x12B1, 'X'),
-    (0x12B2, 'V'),
-    (0x12B6, 'X'),
-    (0x12B8, 'V'),
-    (0x12BF, 'X'),
-    (0x12C0, 'V'),
-    (0x12C1, 'X'),
-    (0x12C2, 'V'),
-    (0x12C6, 'X'),
-    (0x12C8, 'V'),
-    (0x12D7, 'X'),
-    (0x12D8, 'V'),
-    (0x1311, 'X'),
-    (0x1312, 'V'),
+        (0xEBE, "X"),
+        (0xEC0, "V"),
+        (0xEC5, "X"),
+        (0xEC6, "V"),
+        (0xEC7, "X"),
+        (0xEC8, "V"),
+        (0xECF, "X"),
+        (0xED0, "V"),
+        (0xEDA, "X"),
+        (0xEDC, "M", "ຫນ"),
+        (0xEDD, "M", "ຫມ"),
+        (0xEDE, "V"),
+        (0xEE0, "X"),
+        (0xF00, "V"),
+        (0xF0C, "M", "་"),
+        (0xF0D, "V"),
+        (0xF43, "M", "གྷ"),
+        (0xF44, "V"),
+        (0xF48, "X"),
+        (0xF49, "V"),
+        (0xF4D, "M", "ཌྷ"),
+        (0xF4E, "V"),
+        (0xF52, "M", "དྷ"),
+        (0xF53, "V"),
+        (0xF57, "M", "བྷ"),
+        (0xF58, "V"),
+        (0xF5C, "M", "ཛྷ"),
+        (0xF5D, "V"),
+        (0xF69, "M", "ཀྵ"),
+        (0xF6A, "V"),
+        (0xF6D, "X"),
+        (0xF71, "V"),
+        (0xF73, "M", "ཱི"),
+        (0xF74, "V"),
+        (0xF75, "M", "ཱུ"),
+        (0xF76, "M", "ྲྀ"),
+        (0xF77, "M", "ྲཱྀ"),
+        (0xF78, "M", "ླྀ"),
+        (0xF79, "M", "ླཱྀ"),
+        (0xF7A, "V"),
+        (0xF81, "M", "ཱྀ"),
+        (0xF82, "V"),
+        (0xF93, "M", "ྒྷ"),
+        (0xF94, "V"),
+        (0xF98, "X"),
+        (0xF99, "V"),
+        (0xF9D, "M", "ྜྷ"),
+        (0xF9E, "V"),
+        (0xFA2, "M", "ྡྷ"),
+        (0xFA3, "V"),
+        (0xFA7, "M", "ྦྷ"),
+        (0xFA8, "V"),
+        (0xFAC, "M", "ྫྷ"),
+        (0xFAD, "V"),
+        (0xFB9, "M", "ྐྵ"),
+        (0xFBA, "V"),
+        (0xFBD, "X"),
+        (0xFBE, "V"),
+        (0xFCD, "X"),
+        (0xFCE, "V"),
+        (0xFDB, "X"),
+        (0x1000, "V"),
+        (0x10A0, "X"),
+        (0x10C7, "M", "ⴧ"),
+        (0x10C8, "X"),
+        (0x10CD, "M", "ⴭ"),
+        (0x10CE, "X"),
+        (0x10D0, "V"),
+        (0x10FC, "M", "ნ"),
+        (0x10FD, "V"),
+        (0x115F, "X"),
+        (0x1161, "V"),
+        (0x1249, "X"),
+        (0x124A, "V"),
+        (0x124E, "X"),
+        (0x1250, "V"),
+        (0x1257, "X"),
+        (0x1258, "V"),
+        (0x1259, "X"),
+        (0x125A, "V"),
+        (0x125E, "X"),
+        (0x1260, "V"),
+        (0x1289, "X"),
+        (0x128A, "V"),
+        (0x128E, "X"),
+        (0x1290, "V"),
+        (0x12B1, "X"),
+        (0x12B2, "V"),
+        (0x12B6, "X"),
+        (0x12B8, "V"),
+        (0x12BF, "X"),
+        (0x12C0, "V"),
+        (0x12C1, "X"),
+        (0x12C2, "V"),
+        (0x12C6, "X"),
+        (0x12C8, "V"),
+        (0x12D7, "X"),
+        (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'),
-    (0x135D, 'V'),
-    (0x137D, 'X'),
-    (0x1380, 'V'),
-    (0x139A, 'X'),
-    (0x13A0, 'V'),
-    (0x13F6, 'X'),
-    (0x13F8, 'M', 'Ᏸ'),
-    (0x13F9, 'M', 'Ᏹ'),
-    (0x13FA, 'M', 'Ᏺ'),
-    (0x13FB, 'M', 'Ᏻ'),
-    (0x13FC, 'M', 'Ᏼ'),
-    (0x13FD, 'M', 'Ᏽ'),
-    (0x13FE, 'X'),
-    (0x1400, 'V'),
-    (0x1680, 'X'),
-    (0x1681, 'V'),
-    (0x169D, 'X'),
-    (0x16A0, 'V'),
-    (0x16F9, 'X'),
-    (0x1700, 'V'),
-    (0x1716, 'X'),
-    (0x171F, 'V'),
-    (0x1737, 'X'),
-    (0x1740, 'V'),
-    (0x1754, 'X'),
-    (0x1760, 'V'),
-    (0x176D, 'X'),
-    (0x176E, 'V'),
-    (0x1771, 'X'),
-    (0x1772, 'V'),
-    (0x1774, 'X'),
-    (0x1780, 'V'),
-    (0x17B4, 'X'),
-    (0x17B6, 'V'),
-    (0x17DE, 'X'),
-    (0x17E0, 'V'),
-    (0x17EA, 'X'),
-    (0x17F0, 'V'),
-    (0x17FA, 'X'),
-    (0x1800, 'V'),
-    (0x1806, 'X'),
-    (0x1807, 'V'),
-    (0x180B, 'I'),
-    (0x180E, 'X'),
-    (0x180F, 'I'),
-    (0x1810, 'V'),
-    (0x181A, 'X'),
-    (0x1820, 'V'),
-    (0x1879, 'X'),
-    (0x1880, 'V'),
-    (0x18AB, 'X'),
-    (0x18B0, 'V'),
-    (0x18F6, 'X'),
-    (0x1900, 'V'),
-    (0x191F, 'X'),
-    (0x1920, 'V'),
-    (0x192C, 'X'),
-    (0x1930, 'V'),
-    (0x193C, 'X'),
-    (0x1940, 'V'),
-    (0x1941, 'X'),
-    (0x1944, 'V'),
-    (0x196E, 'X'),
-    (0x1970, 'V'),
-    (0x1975, 'X'),
-    (0x1980, 'V'),
-    (0x19AC, 'X'),
-    (0x19B0, 'V'),
-    (0x19CA, 'X'),
-    (0x19D0, 'V'),
-    (0x19DB, 'X'),
-    (0x19DE, 'V'),
-    (0x1A1C, 'X'),
-    (0x1A1E, 'V'),
-    (0x1A5F, 'X'),
-    (0x1A60, 'V'),
-    (0x1A7D, 'X'),
-    (0x1A7F, 'V'),
-    (0x1A8A, 'X'),
-    (0x1A90, 'V'),
-    (0x1A9A, 'X'),
-    (0x1AA0, 'V'),
-    (0x1AAE, 'X'),
-    (0x1AB0, 'V'),
-    (0x1ACF, 'X'),
-    (0x1B00, 'V'),
-    (0x1B4D, 'X'),
-    (0x1B50, 'V'),
-    (0x1B7F, 'X'),
-    (0x1B80, 'V'),
-    (0x1BF4, 'X'),
-    (0x1BFC, 'V'),
-    (0x1C38, 'X'),
-    (0x1C3B, 'V'),
-    (0x1C4A, 'X'),
-    (0x1C4D, 'V'),
-    (0x1C80, 'M', 'в'),
+        (0x1316, "X"),
+        (0x1318, "V"),
+        (0x135B, "X"),
+        (0x135D, "V"),
+        (0x137D, "X"),
+        (0x1380, "V"),
+        (0x139A, "X"),
+        (0x13A0, "V"),
+        (0x13F6, "X"),
+        (0x13F8, "M", "Ᏸ"),
+        (0x13F9, "M", "Ᏹ"),
+        (0x13FA, "M", "Ᏺ"),
+        (0x13FB, "M", "Ᏻ"),
+        (0x13FC, "M", "Ᏼ"),
+        (0x13FD, "M", "Ᏽ"),
+        (0x13FE, "X"),
+        (0x1400, "V"),
+        (0x1680, "X"),
+        (0x1681, "V"),
+        (0x169D, "X"),
+        (0x16A0, "V"),
+        (0x16F9, "X"),
+        (0x1700, "V"),
+        (0x1716, "X"),
+        (0x171F, "V"),
+        (0x1737, "X"),
+        (0x1740, "V"),
+        (0x1754, "X"),
+        (0x1760, "V"),
+        (0x176D, "X"),
+        (0x176E, "V"),
+        (0x1771, "X"),
+        (0x1772, "V"),
+        (0x1774, "X"),
+        (0x1780, "V"),
+        (0x17B4, "X"),
+        (0x17B6, "V"),
+        (0x17DE, "X"),
+        (0x17E0, "V"),
+        (0x17EA, "X"),
+        (0x17F0, "V"),
+        (0x17FA, "X"),
+        (0x1800, "V"),
+        (0x1806, "X"),
+        (0x1807, "V"),
+        (0x180B, "I"),
+        (0x180E, "X"),
+        (0x180F, "I"),
+        (0x1810, "V"),
+        (0x181A, "X"),
+        (0x1820, "V"),
+        (0x1879, "X"),
+        (0x1880, "V"),
+        (0x18AB, "X"),
+        (0x18B0, "V"),
+        (0x18F6, "X"),
+        (0x1900, "V"),
+        (0x191F, "X"),
+        (0x1920, "V"),
+        (0x192C, "X"),
+        (0x1930, "V"),
+        (0x193C, "X"),
+        (0x1940, "V"),
+        (0x1941, "X"),
+        (0x1944, "V"),
+        (0x196E, "X"),
+        (0x1970, "V"),
+        (0x1975, "X"),
+        (0x1980, "V"),
+        (0x19AC, "X"),
+        (0x19B0, "V"),
+        (0x19CA, "X"),
+        (0x19D0, "V"),
+        (0x19DB, "X"),
+        (0x19DE, "V"),
+        (0x1A1C, "X"),
+        (0x1A1E, "V"),
+        (0x1A5F, "X"),
+        (0x1A60, "V"),
+        (0x1A7D, "X"),
+        (0x1A7F, "V"),
+        (0x1A8A, "X"),
+        (0x1A90, "V"),
+        (0x1A9A, "X"),
+        (0x1AA0, "V"),
+        (0x1AAE, "X"),
+        (0x1AB0, "V"),
+        (0x1ACF, "X"),
+        (0x1B00, "V"),
+        (0x1B4D, "X"),
+        (0x1B50, "V"),
+        (0x1B7F, "X"),
+        (0x1B80, "V"),
+        (0x1BF4, "X"),
+        (0x1BFC, "V"),
+        (0x1C38, "X"),
+        (0x1C3B, "V"),
+        (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', 'с'),
-    (0x1C84, 'M', 'т'),
-    (0x1C86, 'M', 'ъ'),
-    (0x1C87, 'M', 'ѣ'),
-    (0x1C88, 'M', 'ꙋ'),
-    (0x1C89, 'X'),
-    (0x1C90, 'M', 'ა'),
-    (0x1C91, 'M', 'ბ'),
-    (0x1C92, 'M', 'გ'),
-    (0x1C93, 'M', 'დ'),
-    (0x1C94, 'M', 'ე'),
-    (0x1C95, 'M', 'ვ'),
-    (0x1C96, 'M', 'ზ'),
-    (0x1C97, 'M', 'თ'),
-    (0x1C98, 'M', 'ი'),
-    (0x1C99, 'M', 'კ'),
-    (0x1C9A, 'M', 'ლ'),
-    (0x1C9B, 'M', 'მ'),
-    (0x1C9C, 'M', 'ნ'),
-    (0x1C9D, 'M', 'ო'),
-    (0x1C9E, 'M', 'პ'),
-    (0x1C9F, 'M', 'ჟ'),
-    (0x1CA0, 'M', 'რ'),
-    (0x1CA1, 'M', 'ს'),
-    (0x1CA2, 'M', 'ტ'),
-    (0x1CA3, 'M', 'უ'),
-    (0x1CA4, 'M', 'ფ'),
-    (0x1CA5, 'M', 'ქ'),
-    (0x1CA6, 'M', 'ღ'),
-    (0x1CA7, 'M', 'ყ'),
-    (0x1CA8, 'M', 'შ'),
-    (0x1CA9, 'M', 'ჩ'),
-    (0x1CAA, 'M', 'ც'),
-    (0x1CAB, 'M', 'ძ'),
-    (0x1CAC, 'M', 'წ'),
-    (0x1CAD, 'M', 'ჭ'),
-    (0x1CAE, 'M', 'ხ'),
-    (0x1CAF, 'M', 'ჯ'),
-    (0x1CB0, 'M', 'ჰ'),
-    (0x1CB1, 'M', 'ჱ'),
-    (0x1CB2, 'M', 'ჲ'),
-    (0x1CB3, 'M', 'ჳ'),
-    (0x1CB4, 'M', 'ჴ'),
-    (0x1CB5, 'M', 'ჵ'),
-    (0x1CB6, 'M', 'ჶ'),
-    (0x1CB7, 'M', 'ჷ'),
-    (0x1CB8, 'M', 'ჸ'),
-    (0x1CB9, 'M', 'ჹ'),
-    (0x1CBA, 'M', 'ჺ'),
-    (0x1CBB, 'X'),
-    (0x1CBD, 'M', 'ჽ'),
-    (0x1CBE, 'M', 'ჾ'),
-    (0x1CBF, 'M', 'ჿ'),
-    (0x1CC0, 'V'),
-    (0x1CC8, 'X'),
-    (0x1CD0, 'V'),
-    (0x1CFB, 'X'),
-    (0x1D00, 'V'),
-    (0x1D2C, 'M', 'a'),
-    (0x1D2D, 'M', 'æ'),
-    (0x1D2E, 'M', 'b'),
-    (0x1D2F, 'V'),
-    (0x1D30, 'M', 'd'),
-    (0x1D31, 'M', 'e'),
-    (0x1D32, 'M', 'ǝ'),
-    (0x1D33, 'M', 'g'),
-    (0x1D34, 'M', 'h'),
-    (0x1D35, 'M', 'i'),
-    (0x1D36, 'M', 'j'),
-    (0x1D37, 'M', 'k'),
-    (0x1D38, 'M', 'l'),
-    (0x1D39, 'M', 'm'),
-    (0x1D3A, 'M', 'n'),
-    (0x1D3B, 'V'),
-    (0x1D3C, 'M', 'o'),
-    (0x1D3D, 'M', 'ȣ'),
-    (0x1D3E, 'M', 'p'),
-    (0x1D3F, 'M', 'r'),
-    (0x1D40, 'M', 't'),
-    (0x1D41, 'M', 'u'),
-    (0x1D42, 'M', 'w'),
-    (0x1D43, 'M', 'a'),
-    (0x1D44, 'M', 'ɐ'),
-    (0x1D45, 'M', 'ɑ'),
-    (0x1D46, 'M', 'ᴂ'),
-    (0x1D47, 'M', 'b'),
-    (0x1D48, 'M', 'd'),
-    (0x1D49, 'M', 'e'),
-    (0x1D4A, 'M', 'ə'),
-    (0x1D4B, 'M', 'ɛ'),
-    (0x1D4C, 'M', 'ɜ'),
-    (0x1D4D, 'M', 'g'),
-    (0x1D4E, 'V'),
-    (0x1D4F, 'M', 'k'),
-    (0x1D50, 'M', 'm'),
-    (0x1D51, 'M', 'ŋ'),
-    (0x1D52, 'M', 'o'),
-    (0x1D53, 'M', 'ɔ'),
+        (0x1C81, "M", "д"),
+        (0x1C82, "M", "о"),
+        (0x1C83, "M", "с"),
+        (0x1C84, "M", "т"),
+        (0x1C86, "M", "ъ"),
+        (0x1C87, "M", "ѣ"),
+        (0x1C88, "M", "ꙋ"),
+        (0x1C89, "X"),
+        (0x1C90, "M", "ა"),
+        (0x1C91, "M", "ბ"),
+        (0x1C92, "M", "გ"),
+        (0x1C93, "M", "დ"),
+        (0x1C94, "M", "ე"),
+        (0x1C95, "M", "ვ"),
+        (0x1C96, "M", "ზ"),
+        (0x1C97, "M", "თ"),
+        (0x1C98, "M", "ი"),
+        (0x1C99, "M", "კ"),
+        (0x1C9A, "M", "ლ"),
+        (0x1C9B, "M", "მ"),
+        (0x1C9C, "M", "ნ"),
+        (0x1C9D, "M", "ო"),
+        (0x1C9E, "M", "პ"),
+        (0x1C9F, "M", "ჟ"),
+        (0x1CA0, "M", "რ"),
+        (0x1CA1, "M", "ს"),
+        (0x1CA2, "M", "ტ"),
+        (0x1CA3, "M", "უ"),
+        (0x1CA4, "M", "ფ"),
+        (0x1CA5, "M", "ქ"),
+        (0x1CA6, "M", "ღ"),
+        (0x1CA7, "M", "ყ"),
+        (0x1CA8, "M", "შ"),
+        (0x1CA9, "M", "ჩ"),
+        (0x1CAA, "M", "ც"),
+        (0x1CAB, "M", "ძ"),
+        (0x1CAC, "M", "წ"),
+        (0x1CAD, "M", "ჭ"),
+        (0x1CAE, "M", "ხ"),
+        (0x1CAF, "M", "ჯ"),
+        (0x1CB0, "M", "ჰ"),
+        (0x1CB1, "M", "ჱ"),
+        (0x1CB2, "M", "ჲ"),
+        (0x1CB3, "M", "ჳ"),
+        (0x1CB4, "M", "ჴ"),
+        (0x1CB5, "M", "ჵ"),
+        (0x1CB6, "M", "ჶ"),
+        (0x1CB7, "M", "ჷ"),
+        (0x1CB8, "M", "ჸ"),
+        (0x1CB9, "M", "ჹ"),
+        (0x1CBA, "M", "ჺ"),
+        (0x1CBB, "X"),
+        (0x1CBD, "M", "ჽ"),
+        (0x1CBE, "M", "ჾ"),
+        (0x1CBF, "M", "ჿ"),
+        (0x1CC0, "V"),
+        (0x1CC8, "X"),
+        (0x1CD0, "V"),
+        (0x1CFB, "X"),
+        (0x1D00, "V"),
+        (0x1D2C, "M", "a"),
+        (0x1D2D, "M", "æ"),
+        (0x1D2E, "M", "b"),
+        (0x1D2F, "V"),
+        (0x1D30, "M", "d"),
+        (0x1D31, "M", "e"),
+        (0x1D32, "M", "ǝ"),
+        (0x1D33, "M", "g"),
+        (0x1D34, "M", "h"),
+        (0x1D35, "M", "i"),
+        (0x1D36, "M", "j"),
+        (0x1D37, "M", "k"),
+        (0x1D38, "M", "l"),
+        (0x1D39, "M", "m"),
+        (0x1D3A, "M", "n"),
+        (0x1D3B, "V"),
+        (0x1D3C, "M", "o"),
+        (0x1D3D, "M", "ȣ"),
+        (0x1D3E, "M", "p"),
+        (0x1D3F, "M", "r"),
+        (0x1D40, "M", "t"),
+        (0x1D41, "M", "u"),
+        (0x1D42, "M", "w"),
+        (0x1D43, "M", "a"),
+        (0x1D44, "M", "ɐ"),
+        (0x1D45, "M", "ɑ"),
+        (0x1D46, "M", "ᴂ"),
+        (0x1D47, "M", "b"),
+        (0x1D48, "M", "d"),
+        (0x1D49, "M", "e"),
+        (0x1D4A, "M", "ə"),
+        (0x1D4B, "M", "ɛ"),
+        (0x1D4C, "M", "ɜ"),
+        (0x1D4D, "M", "g"),
+        (0x1D4E, "V"),
+        (0x1D4F, "M", "k"),
+        (0x1D50, "M", "m"),
+        (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'),
-    (0x1D57, 'M', 't'),
-    (0x1D58, 'M', 'u'),
-    (0x1D59, 'M', 'ᴝ'),
-    (0x1D5A, 'M', 'ɯ'),
-    (0x1D5B, 'M', 'v'),
-    (0x1D5C, 'M', 'ᴥ'),
-    (0x1D5D, 'M', 'β'),
-    (0x1D5E, 'M', 'γ'),
-    (0x1D5F, 'M', 'δ'),
-    (0x1D60, 'M', 'φ'),
-    (0x1D61, 'M', 'χ'),
-    (0x1D62, 'M', 'i'),
-    (0x1D63, 'M', 'r'),
-    (0x1D64, 'M', 'u'),
-    (0x1D65, 'M', 'v'),
-    (0x1D66, 'M', 'β'),
-    (0x1D67, 'M', 'γ'),
-    (0x1D68, 'M', 'ρ'),
-    (0x1D69, 'M', 'φ'),
-    (0x1D6A, 'M', 'χ'),
-    (0x1D6B, 'V'),
-    (0x1D78, 'M', 'н'),
-    (0x1D79, 'V'),
-    (0x1D9B, 'M', 'ɒ'),
-    (0x1D9C, 'M', 'c'),
-    (0x1D9D, 'M', 'ɕ'),
-    (0x1D9E, 'M', 'ð'),
-    (0x1D9F, 'M', 'ɜ'),
-    (0x1DA0, 'M', 'f'),
-    (0x1DA1, 'M', 'ɟ'),
-    (0x1DA2, 'M', 'ɡ'),
-    (0x1DA3, 'M', 'ɥ'),
-    (0x1DA4, 'M', 'ɨ'),
-    (0x1DA5, 'M', 'ɩ'),
-    (0x1DA6, 'M', 'ɪ'),
-    (0x1DA7, 'M', 'ᵻ'),
-    (0x1DA8, 'M', 'ʝ'),
-    (0x1DA9, 'M', 'ɭ'),
-    (0x1DAA, 'M', 'ᶅ'),
-    (0x1DAB, 'M', 'ʟ'),
-    (0x1DAC, 'M', 'ɱ'),
-    (0x1DAD, 'M', 'ɰ'),
-    (0x1DAE, 'M', 'ɲ'),
-    (0x1DAF, 'M', 'ɳ'),
-    (0x1DB0, 'M', 'ɴ'),
-    (0x1DB1, 'M', 'ɵ'),
-    (0x1DB2, 'M', 'ɸ'),
-    (0x1DB3, 'M', 'ʂ'),
-    (0x1DB4, 'M', 'ʃ'),
-    (0x1DB5, 'M', 'ƫ'),
-    (0x1DB6, 'M', 'ʉ'),
-    (0x1DB7, 'M', 'ʊ'),
-    (0x1DB8, 'M', 'ᴜ'),
-    (0x1DB9, 'M', 'ʋ'),
-    (0x1DBA, 'M', 'ʌ'),
-    (0x1DBB, 'M', 'z'),
-    (0x1DBC, 'M', 'ʐ'),
-    (0x1DBD, 'M', 'ʑ'),
-    (0x1DBE, 'M', 'ʒ'),
-    (0x1DBF, 'M', 'θ'),
-    (0x1DC0, 'V'),
-    (0x1E00, 'M', 'ḁ'),
-    (0x1E01, 'V'),
-    (0x1E02, 'M', 'ḃ'),
-    (0x1E03, 'V'),
-    (0x1E04, 'M', 'ḅ'),
-    (0x1E05, 'V'),
-    (0x1E06, 'M', 'ḇ'),
-    (0x1E07, 'V'),
-    (0x1E08, 'M', 'ḉ'),
-    (0x1E09, 'V'),
-    (0x1E0A, 'M', 'ḋ'),
-    (0x1E0B, 'V'),
-    (0x1E0C, 'M', 'ḍ'),
-    (0x1E0D, 'V'),
-    (0x1E0E, 'M', 'ḏ'),
-    (0x1E0F, 'V'),
-    (0x1E10, 'M', 'ḑ'),
-    (0x1E11, 'V'),
-    (0x1E12, 'M', 'ḓ'),
-    (0x1E13, 'V'),
-    (0x1E14, 'M', 'ḕ'),
-    (0x1E15, 'V'),
-    (0x1E16, 'M', 'ḗ'),
-    (0x1E17, 'V'),
-    (0x1E18, 'M', 'ḙ'),
-    (0x1E19, 'V'),
-    (0x1E1A, 'M', 'ḛ'),
-    (0x1E1B, 'V'),
-    (0x1E1C, 'M', 'ḝ'),
-    (0x1E1D, 'V'),
-    (0x1E1E, 'M', 'ḟ'),
-    (0x1E1F, 'V'),
-    (0x1E20, 'M', 'ḡ'),
-    (0x1E21, 'V'),
-    (0x1E22, 'M', 'ḣ'),
-    (0x1E23, 'V'),
+        (0x1D54, "M", "ᴖ"),
+        (0x1D55, "M", "ᴗ"),
+        (0x1D56, "M", "p"),
+        (0x1D57, "M", "t"),
+        (0x1D58, "M", "u"),
+        (0x1D59, "M", "ᴝ"),
+        (0x1D5A, "M", "ɯ"),
+        (0x1D5B, "M", "v"),
+        (0x1D5C, "M", "ᴥ"),
+        (0x1D5D, "M", "β"),
+        (0x1D5E, "M", "γ"),
+        (0x1D5F, "M", "δ"),
+        (0x1D60, "M", "φ"),
+        (0x1D61, "M", "χ"),
+        (0x1D62, "M", "i"),
+        (0x1D63, "M", "r"),
+        (0x1D64, "M", "u"),
+        (0x1D65, "M", "v"),
+        (0x1D66, "M", "β"),
+        (0x1D67, "M", "γ"),
+        (0x1D68, "M", "ρ"),
+        (0x1D69, "M", "φ"),
+        (0x1D6A, "M", "χ"),
+        (0x1D6B, "V"),
+        (0x1D78, "M", "н"),
+        (0x1D79, "V"),
+        (0x1D9B, "M", "ɒ"),
+        (0x1D9C, "M", "c"),
+        (0x1D9D, "M", "ɕ"),
+        (0x1D9E, "M", "ð"),
+        (0x1D9F, "M", "ɜ"),
+        (0x1DA0, "M", "f"),
+        (0x1DA1, "M", "ɟ"),
+        (0x1DA2, "M", "ɡ"),
+        (0x1DA3, "M", "ɥ"),
+        (0x1DA4, "M", "ɨ"),
+        (0x1DA5, "M", "ɩ"),
+        (0x1DA6, "M", "ɪ"),
+        (0x1DA7, "M", "ᵻ"),
+        (0x1DA8, "M", "ʝ"),
+        (0x1DA9, "M", "ɭ"),
+        (0x1DAA, "M", "ᶅ"),
+        (0x1DAB, "M", "ʟ"),
+        (0x1DAC, "M", "ɱ"),
+        (0x1DAD, "M", "ɰ"),
+        (0x1DAE, "M", "ɲ"),
+        (0x1DAF, "M", "ɳ"),
+        (0x1DB0, "M", "ɴ"),
+        (0x1DB1, "M", "ɵ"),
+        (0x1DB2, "M", "ɸ"),
+        (0x1DB3, "M", "ʂ"),
+        (0x1DB4, "M", "ʃ"),
+        (0x1DB5, "M", "ƫ"),
+        (0x1DB6, "M", "ʉ"),
+        (0x1DB7, "M", "ʊ"),
+        (0x1DB8, "M", "ᴜ"),
+        (0x1DB9, "M", "ʋ"),
+        (0x1DBA, "M", "ʌ"),
+        (0x1DBB, "M", "z"),
+        (0x1DBC, "M", "ʐ"),
+        (0x1DBD, "M", "ʑ"),
+        (0x1DBE, "M", "ʒ"),
+        (0x1DBF, "M", "θ"),
+        (0x1DC0, "V"),
+        (0x1E00, "M", "ḁ"),
+        (0x1E01, "V"),
+        (0x1E02, "M", "ḃ"),
+        (0x1E03, "V"),
+        (0x1E04, "M", "ḅ"),
+        (0x1E05, "V"),
+        (0x1E06, "M", "ḇ"),
+        (0x1E07, "V"),
+        (0x1E08, "M", "ḉ"),
+        (0x1E09, "V"),
+        (0x1E0A, "M", "ḋ"),
+        (0x1E0B, "V"),
+        (0x1E0C, "M", "ḍ"),
+        (0x1E0D, "V"),
+        (0x1E0E, "M", "ḏ"),
+        (0x1E0F, "V"),
+        (0x1E10, "M", "ḑ"),
+        (0x1E11, "V"),
+        (0x1E12, "M", "ḓ"),
+        (0x1E13, "V"),
+        (0x1E14, "M", "ḕ"),
+        (0x1E15, "V"),
+        (0x1E16, "M", "ḗ"),
+        (0x1E17, "V"),
+        (0x1E18, "M", "ḙ"),
+        (0x1E19, "V"),
+        (0x1E1A, "M", "ḛ"),
+        (0x1E1B, "V"),
+        (0x1E1C, "M", "ḝ"),
+        (0x1E1D, "V"),
+        (0x1E1E, "M", "ḟ"),
+        (0x1E1F, "V"),
+        (0x1E20, "M", "ḡ"),
+        (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', 'ḧ'),
-    (0x1E27, 'V'),
-    (0x1E28, 'M', 'ḩ'),
-    (0x1E29, 'V'),
-    (0x1E2A, 'M', 'ḫ'),
-    (0x1E2B, 'V'),
-    (0x1E2C, 'M', 'ḭ'),
-    (0x1E2D, 'V'),
-    (0x1E2E, 'M', 'ḯ'),
-    (0x1E2F, 'V'),
-    (0x1E30, 'M', 'ḱ'),
-    (0x1E31, 'V'),
-    (0x1E32, 'M', 'ḳ'),
-    (0x1E33, 'V'),
-    (0x1E34, 'M', 'ḵ'),
-    (0x1E35, 'V'),
-    (0x1E36, 'M', 'ḷ'),
-    (0x1E37, 'V'),
-    (0x1E38, 'M', 'ḹ'),
-    (0x1E39, 'V'),
-    (0x1E3A, 'M', 'ḻ'),
-    (0x1E3B, 'V'),
-    (0x1E3C, 'M', 'ḽ'),
-    (0x1E3D, 'V'),
-    (0x1E3E, 'M', 'ḿ'),
-    (0x1E3F, 'V'),
-    (0x1E40, 'M', 'ṁ'),
-    (0x1E41, 'V'),
-    (0x1E42, 'M', 'ṃ'),
-    (0x1E43, 'V'),
-    (0x1E44, 'M', 'ṅ'),
-    (0x1E45, 'V'),
-    (0x1E46, 'M', 'ṇ'),
-    (0x1E47, 'V'),
-    (0x1E48, 'M', 'ṉ'),
-    (0x1E49, 'V'),
-    (0x1E4A, 'M', 'ṋ'),
-    (0x1E4B, 'V'),
-    (0x1E4C, 'M', 'ṍ'),
-    (0x1E4D, 'V'),
-    (0x1E4E, 'M', 'ṏ'),
-    (0x1E4F, 'V'),
-    (0x1E50, 'M', 'ṑ'),
-    (0x1E51, 'V'),
-    (0x1E52, 'M', 'ṓ'),
-    (0x1E53, 'V'),
-    (0x1E54, 'M', 'ṕ'),
-    (0x1E55, 'V'),
-    (0x1E56, 'M', 'ṗ'),
-    (0x1E57, 'V'),
-    (0x1E58, 'M', 'ṙ'),
-    (0x1E59, 'V'),
-    (0x1E5A, 'M', 'ṛ'),
-    (0x1E5B, 'V'),
-    (0x1E5C, 'M', 'ṝ'),
-    (0x1E5D, 'V'),
-    (0x1E5E, 'M', 'ṟ'),
-    (0x1E5F, 'V'),
-    (0x1E60, 'M', 'ṡ'),
-    (0x1E61, 'V'),
-    (0x1E62, 'M', 'ṣ'),
-    (0x1E63, 'V'),
-    (0x1E64, 'M', 'ṥ'),
-    (0x1E65, 'V'),
-    (0x1E66, 'M', 'ṧ'),
-    (0x1E67, 'V'),
-    (0x1E68, 'M', 'ṩ'),
-    (0x1E69, 'V'),
-    (0x1E6A, 'M', 'ṫ'),
-    (0x1E6B, 'V'),
-    (0x1E6C, 'M', 'ṭ'),
-    (0x1E6D, 'V'),
-    (0x1E6E, 'M', 'ṯ'),
-    (0x1E6F, 'V'),
-    (0x1E70, 'M', 'ṱ'),
-    (0x1E71, 'V'),
-    (0x1E72, 'M', 'ṳ'),
-    (0x1E73, 'V'),
-    (0x1E74, 'M', 'ṵ'),
-    (0x1E75, 'V'),
-    (0x1E76, 'M', 'ṷ'),
-    (0x1E77, 'V'),
-    (0x1E78, 'M', 'ṹ'),
-    (0x1E79, 'V'),
-    (0x1E7A, 'M', 'ṻ'),
-    (0x1E7B, 'V'),
-    (0x1E7C, 'M', 'ṽ'),
-    (0x1E7D, 'V'),
-    (0x1E7E, 'M', 'ṿ'),
-    (0x1E7F, 'V'),
-    (0x1E80, 'M', 'ẁ'),
-    (0x1E81, 'V'),
-    (0x1E82, 'M', 'ẃ'),
-    (0x1E83, 'V'),
-    (0x1E84, 'M', 'ẅ'),
-    (0x1E85, 'V'),
-    (0x1E86, 'M', 'ẇ'),
-    (0x1E87, 'V'),
+        (0x1E24, "M", "ḥ"),
+        (0x1E25, "V"),
+        (0x1E26, "M", "ḧ"),
+        (0x1E27, "V"),
+        (0x1E28, "M", "ḩ"),
+        (0x1E29, "V"),
+        (0x1E2A, "M", "ḫ"),
+        (0x1E2B, "V"),
+        (0x1E2C, "M", "ḭ"),
+        (0x1E2D, "V"),
+        (0x1E2E, "M", "ḯ"),
+        (0x1E2F, "V"),
+        (0x1E30, "M", "ḱ"),
+        (0x1E31, "V"),
+        (0x1E32, "M", "ḳ"),
+        (0x1E33, "V"),
+        (0x1E34, "M", "ḵ"),
+        (0x1E35, "V"),
+        (0x1E36, "M", "ḷ"),
+        (0x1E37, "V"),
+        (0x1E38, "M", "ḹ"),
+        (0x1E39, "V"),
+        (0x1E3A, "M", "ḻ"),
+        (0x1E3B, "V"),
+        (0x1E3C, "M", "ḽ"),
+        (0x1E3D, "V"),
+        (0x1E3E, "M", "ḿ"),
+        (0x1E3F, "V"),
+        (0x1E40, "M", "ṁ"),
+        (0x1E41, "V"),
+        (0x1E42, "M", "ṃ"),
+        (0x1E43, "V"),
+        (0x1E44, "M", "ṅ"),
+        (0x1E45, "V"),
+        (0x1E46, "M", "ṇ"),
+        (0x1E47, "V"),
+        (0x1E48, "M", "ṉ"),
+        (0x1E49, "V"),
+        (0x1E4A, "M", "ṋ"),
+        (0x1E4B, "V"),
+        (0x1E4C, "M", "ṍ"),
+        (0x1E4D, "V"),
+        (0x1E4E, "M", "ṏ"),
+        (0x1E4F, "V"),
+        (0x1E50, "M", "ṑ"),
+        (0x1E51, "V"),
+        (0x1E52, "M", "ṓ"),
+        (0x1E53, "V"),
+        (0x1E54, "M", "ṕ"),
+        (0x1E55, "V"),
+        (0x1E56, "M", "ṗ"),
+        (0x1E57, "V"),
+        (0x1E58, "M", "ṙ"),
+        (0x1E59, "V"),
+        (0x1E5A, "M", "ṛ"),
+        (0x1E5B, "V"),
+        (0x1E5C, "M", "ṝ"),
+        (0x1E5D, "V"),
+        (0x1E5E, "M", "ṟ"),
+        (0x1E5F, "V"),
+        (0x1E60, "M", "ṡ"),
+        (0x1E61, "V"),
+        (0x1E62, "M", "ṣ"),
+        (0x1E63, "V"),
+        (0x1E64, "M", "ṥ"),
+        (0x1E65, "V"),
+        (0x1E66, "M", "ṧ"),
+        (0x1E67, "V"),
+        (0x1E68, "M", "ṩ"),
+        (0x1E69, "V"),
+        (0x1E6A, "M", "ṫ"),
+        (0x1E6B, "V"),
+        (0x1E6C, "M", "ṭ"),
+        (0x1E6D, "V"),
+        (0x1E6E, "M", "ṯ"),
+        (0x1E6F, "V"),
+        (0x1E70, "M", "ṱ"),
+        (0x1E71, "V"),
+        (0x1E72, "M", "ṳ"),
+        (0x1E73, "V"),
+        (0x1E74, "M", "ṵ"),
+        (0x1E75, "V"),
+        (0x1E76, "M", "ṷ"),
+        (0x1E77, "V"),
+        (0x1E78, "M", "ṹ"),
+        (0x1E79, "V"),
+        (0x1E7A, "M", "ṻ"),
+        (0x1E7B, "V"),
+        (0x1E7C, "M", "ṽ"),
+        (0x1E7D, "V"),
+        (0x1E7E, "M", "ṿ"),
+        (0x1E7F, "V"),
+        (0x1E80, "M", "ẁ"),
+        (0x1E81, "V"),
+        (0x1E82, "M", "ẃ"),
+        (0x1E83, "V"),
+        (0x1E84, "M", "ẅ"),
+        (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', 'ẋ'),
-    (0x1E8B, 'V'),
-    (0x1E8C, 'M', 'ẍ'),
-    (0x1E8D, 'V'),
-    (0x1E8E, 'M', 'ẏ'),
-    (0x1E8F, 'V'),
-    (0x1E90, 'M', 'ẑ'),
-    (0x1E91, 'V'),
-    (0x1E92, 'M', 'ẓ'),
-    (0x1E93, 'V'),
-    (0x1E94, 'M', 'ẕ'),
-    (0x1E95, 'V'),
-    (0x1E9A, 'M', 'aʾ'),
-    (0x1E9B, 'M', 'ṡ'),
-    (0x1E9C, 'V'),
-    (0x1E9E, 'M', 'ß'),
-    (0x1E9F, 'V'),
-    (0x1EA0, 'M', 'ạ'),
-    (0x1EA1, 'V'),
-    (0x1EA2, 'M', 'ả'),
-    (0x1EA3, 'V'),
-    (0x1EA4, 'M', 'ấ'),
-    (0x1EA5, 'V'),
-    (0x1EA6, 'M', 'ầ'),
-    (0x1EA7, 'V'),
-    (0x1EA8, 'M', 'ẩ'),
-    (0x1EA9, 'V'),
-    (0x1EAA, 'M', 'ẫ'),
-    (0x1EAB, 'V'),
-    (0x1EAC, 'M', 'ậ'),
-    (0x1EAD, 'V'),
-    (0x1EAE, 'M', 'ắ'),
-    (0x1EAF, 'V'),
-    (0x1EB0, 'M', 'ằ'),
-    (0x1EB1, 'V'),
-    (0x1EB2, 'M', 'ẳ'),
-    (0x1EB3, 'V'),
-    (0x1EB4, 'M', 'ẵ'),
-    (0x1EB5, 'V'),
-    (0x1EB6, 'M', 'ặ'),
-    (0x1EB7, 'V'),
-    (0x1EB8, 'M', 'ẹ'),
-    (0x1EB9, 'V'),
-    (0x1EBA, 'M', 'ẻ'),
-    (0x1EBB, 'V'),
-    (0x1EBC, 'M', 'ẽ'),
-    (0x1EBD, 'V'),
-    (0x1EBE, 'M', 'ế'),
-    (0x1EBF, 'V'),
-    (0x1EC0, 'M', 'ề'),
-    (0x1EC1, 'V'),
-    (0x1EC2, 'M', 'ể'),
-    (0x1EC3, 'V'),
-    (0x1EC4, 'M', 'ễ'),
-    (0x1EC5, 'V'),
-    (0x1EC6, 'M', 'ệ'),
-    (0x1EC7, 'V'),
-    (0x1EC8, 'M', 'ỉ'),
-    (0x1EC9, 'V'),
-    (0x1ECA, 'M', 'ị'),
-    (0x1ECB, 'V'),
-    (0x1ECC, 'M', 'ọ'),
-    (0x1ECD, 'V'),
-    (0x1ECE, 'M', 'ỏ'),
-    (0x1ECF, 'V'),
-    (0x1ED0, 'M', 'ố'),
-    (0x1ED1, 'V'),
-    (0x1ED2, 'M', 'ồ'),
-    (0x1ED3, 'V'),
-    (0x1ED4, 'M', 'ổ'),
-    (0x1ED5, 'V'),
-    (0x1ED6, 'M', 'ỗ'),
-    (0x1ED7, 'V'),
-    (0x1ED8, 'M', 'ộ'),
-    (0x1ED9, 'V'),
-    (0x1EDA, 'M', 'ớ'),
-    (0x1EDB, 'V'),
-    (0x1EDC, 'M', 'ờ'),
-    (0x1EDD, 'V'),
-    (0x1EDE, 'M', 'ở'),
-    (0x1EDF, 'V'),
-    (0x1EE0, 'M', 'ỡ'),
-    (0x1EE1, 'V'),
-    (0x1EE2, 'M', 'ợ'),
-    (0x1EE3, 'V'),
-    (0x1EE4, 'M', 'ụ'),
-    (0x1EE5, 'V'),
-    (0x1EE6, 'M', 'ủ'),
-    (0x1EE7, 'V'),
-    (0x1EE8, 'M', 'ứ'),
-    (0x1EE9, 'V'),
-    (0x1EEA, 'M', 'ừ'),
-    (0x1EEB, 'V'),
-    (0x1EEC, 'M', 'ử'),
-    (0x1EED, 'V'),
-    (0x1EEE, 'M', 'ữ'),
-    (0x1EEF, 'V'),
-    (0x1EF0, 'M', 'ự'),
+        (0x1E88, "M", "ẉ"),
+        (0x1E89, "V"),
+        (0x1E8A, "M", "ẋ"),
+        (0x1E8B, "V"),
+        (0x1E8C, "M", "ẍ"),
+        (0x1E8D, "V"),
+        (0x1E8E, "M", "ẏ"),
+        (0x1E8F, "V"),
+        (0x1E90, "M", "ẑ"),
+        (0x1E91, "V"),
+        (0x1E92, "M", "ẓ"),
+        (0x1E93, "V"),
+        (0x1E94, "M", "ẕ"),
+        (0x1E95, "V"),
+        (0x1E9A, "M", "aʾ"),
+        (0x1E9B, "M", "ṡ"),
+        (0x1E9C, "V"),
+        (0x1E9E, "M", "ß"),
+        (0x1E9F, "V"),
+        (0x1EA0, "M", "ạ"),
+        (0x1EA1, "V"),
+        (0x1EA2, "M", "ả"),
+        (0x1EA3, "V"),
+        (0x1EA4, "M", "ấ"),
+        (0x1EA5, "V"),
+        (0x1EA6, "M", "ầ"),
+        (0x1EA7, "V"),
+        (0x1EA8, "M", "ẩ"),
+        (0x1EA9, "V"),
+        (0x1EAA, "M", "ẫ"),
+        (0x1EAB, "V"),
+        (0x1EAC, "M", "ậ"),
+        (0x1EAD, "V"),
+        (0x1EAE, "M", "ắ"),
+        (0x1EAF, "V"),
+        (0x1EB0, "M", "ằ"),
+        (0x1EB1, "V"),
+        (0x1EB2, "M", "ẳ"),
+        (0x1EB3, "V"),
+        (0x1EB4, "M", "ẵ"),
+        (0x1EB5, "V"),
+        (0x1EB6, "M", "ặ"),
+        (0x1EB7, "V"),
+        (0x1EB8, "M", "ẹ"),
+        (0x1EB9, "V"),
+        (0x1EBA, "M", "ẻ"),
+        (0x1EBB, "V"),
+        (0x1EBC, "M", "ẽ"),
+        (0x1EBD, "V"),
+        (0x1EBE, "M", "ế"),
+        (0x1EBF, "V"),
+        (0x1EC0, "M", "ề"),
+        (0x1EC1, "V"),
+        (0x1EC2, "M", "ể"),
+        (0x1EC3, "V"),
+        (0x1EC4, "M", "ễ"),
+        (0x1EC5, "V"),
+        (0x1EC6, "M", "ệ"),
+        (0x1EC7, "V"),
+        (0x1EC8, "M", "ỉ"),
+        (0x1EC9, "V"),
+        (0x1ECA, "M", "ị"),
+        (0x1ECB, "V"),
+        (0x1ECC, "M", "ọ"),
+        (0x1ECD, "V"),
+        (0x1ECE, "M", "ỏ"),
+        (0x1ECF, "V"),
+        (0x1ED0, "M", "ố"),
+        (0x1ED1, "V"),
+        (0x1ED2, "M", "ồ"),
+        (0x1ED3, "V"),
+        (0x1ED4, "M", "ổ"),
+        (0x1ED5, "V"),
+        (0x1ED6, "M", "ỗ"),
+        (0x1ED7, "V"),
+        (0x1ED8, "M", "ộ"),
+        (0x1ED9, "V"),
+        (0x1EDA, "M", "ớ"),
+        (0x1EDB, "V"),
+        (0x1EDC, "M", "ờ"),
+        (0x1EDD, "V"),
+        (0x1EDE, "M", "ở"),
+        (0x1EDF, "V"),
+        (0x1EE0, "M", "ỡ"),
+        (0x1EE1, "V"),
+        (0x1EE2, "M", "ợ"),
+        (0x1EE3, "V"),
+        (0x1EE4, "M", "ụ"),
+        (0x1EE5, "V"),
+        (0x1EE6, "M", "ủ"),
+        (0x1EE7, "V"),
+        (0x1EE8, "M", "ứ"),
+        (0x1EE9, "V"),
+        (0x1EEA, "M", "ừ"),
+        (0x1EEB, "V"),
+        (0x1EEC, "M", "ử"),
+        (0x1EED, "V"),
+        (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'),
-    (0x1EF4, 'M', 'ỵ'),
-    (0x1EF5, 'V'),
-    (0x1EF6, 'M', 'ỷ'),
-    (0x1EF7, 'V'),
-    (0x1EF8, 'M', 'ỹ'),
-    (0x1EF9, 'V'),
-    (0x1EFA, 'M', 'ỻ'),
-    (0x1EFB, 'V'),
-    (0x1EFC, 'M', 'ỽ'),
-    (0x1EFD, 'V'),
-    (0x1EFE, 'M', 'ỿ'),
-    (0x1EFF, 'V'),
-    (0x1F08, 'M', 'ἀ'),
-    (0x1F09, 'M', 'ἁ'),
-    (0x1F0A, 'M', 'ἂ'),
-    (0x1F0B, 'M', 'ἃ'),
-    (0x1F0C, 'M', 'ἄ'),
-    (0x1F0D, 'M', 'ἅ'),
-    (0x1F0E, 'M', 'ἆ'),
-    (0x1F0F, 'M', 'ἇ'),
-    (0x1F10, 'V'),
-    (0x1F16, 'X'),
-    (0x1F18, 'M', 'ἐ'),
-    (0x1F19, 'M', 'ἑ'),
-    (0x1F1A, 'M', 'ἒ'),
-    (0x1F1B, 'M', 'ἓ'),
-    (0x1F1C, 'M', 'ἔ'),
-    (0x1F1D, 'M', 'ἕ'),
-    (0x1F1E, 'X'),
-    (0x1F20, 'V'),
-    (0x1F28, 'M', 'ἠ'),
-    (0x1F29, 'M', 'ἡ'),
-    (0x1F2A, 'M', 'ἢ'),
-    (0x1F2B, 'M', 'ἣ'),
-    (0x1F2C, 'M', 'ἤ'),
-    (0x1F2D, 'M', 'ἥ'),
-    (0x1F2E, 'M', 'ἦ'),
-    (0x1F2F, 'M', 'ἧ'),
-    (0x1F30, 'V'),
-    (0x1F38, 'M', 'ἰ'),
-    (0x1F39, 'M', 'ἱ'),
-    (0x1F3A, 'M', 'ἲ'),
-    (0x1F3B, 'M', 'ἳ'),
-    (0x1F3C, 'M', 'ἴ'),
-    (0x1F3D, 'M', 'ἵ'),
-    (0x1F3E, 'M', 'ἶ'),
-    (0x1F3F, 'M', 'ἷ'),
-    (0x1F40, 'V'),
-    (0x1F46, 'X'),
-    (0x1F48, 'M', 'ὀ'),
-    (0x1F49, 'M', 'ὁ'),
-    (0x1F4A, 'M', 'ὂ'),
-    (0x1F4B, 'M', 'ὃ'),
-    (0x1F4C, 'M', 'ὄ'),
-    (0x1F4D, 'M', 'ὅ'),
-    (0x1F4E, 'X'),
-    (0x1F50, 'V'),
-    (0x1F58, 'X'),
-    (0x1F59, 'M', 'ὑ'),
-    (0x1F5A, 'X'),
-    (0x1F5B, 'M', 'ὓ'),
-    (0x1F5C, 'X'),
-    (0x1F5D, 'M', 'ὕ'),
-    (0x1F5E, 'X'),
-    (0x1F5F, 'M', 'ὗ'),
-    (0x1F60, 'V'),
-    (0x1F68, 'M', 'ὠ'),
-    (0x1F69, 'M', 'ὡ'),
-    (0x1F6A, 'M', 'ὢ'),
-    (0x1F6B, 'M', 'ὣ'),
-    (0x1F6C, 'M', 'ὤ'),
-    (0x1F6D, 'M', 'ὥ'),
-    (0x1F6E, 'M', 'ὦ'),
-    (0x1F6F, 'M', 'ὧ'),
-    (0x1F70, 'V'),
-    (0x1F71, 'M', 'ά'),
-    (0x1F72, 'V'),
-    (0x1F73, 'M', 'έ'),
-    (0x1F74, 'V'),
-    (0x1F75, 'M', 'ή'),
-    (0x1F76, 'V'),
-    (0x1F77, 'M', 'ί'),
-    (0x1F78, 'V'),
-    (0x1F79, 'M', 'ό'),
-    (0x1F7A, 'V'),
-    (0x1F7B, 'M', 'ύ'),
-    (0x1F7C, 'V'),
-    (0x1F7D, 'M', 'ώ'),
-    (0x1F7E, 'X'),
-    (0x1F80, 'M', 'ἀι'),
-    (0x1F81, 'M', 'ἁι'),
-    (0x1F82, 'M', 'ἂι'),
-    (0x1F83, 'M', 'ἃι'),
-    (0x1F84, 'M', 'ἄι'),
-    (0x1F85, 'M', 'ἅι'),
-    (0x1F86, 'M', 'ἆι'),
-    (0x1F87, 'M', 'ἇι'),
+        (0x1EF1, "V"),
+        (0x1EF2, "M", "ỳ"),
+        (0x1EF3, "V"),
+        (0x1EF4, "M", "ỵ"),
+        (0x1EF5, "V"),
+        (0x1EF6, "M", "ỷ"),
+        (0x1EF7, "V"),
+        (0x1EF8, "M", "ỹ"),
+        (0x1EF9, "V"),
+        (0x1EFA, "M", "ỻ"),
+        (0x1EFB, "V"),
+        (0x1EFC, "M", "ỽ"),
+        (0x1EFD, "V"),
+        (0x1EFE, "M", "ỿ"),
+        (0x1EFF, "V"),
+        (0x1F08, "M", "ἀ"),
+        (0x1F09, "M", "ἁ"),
+        (0x1F0A, "M", "ἂ"),
+        (0x1F0B, "M", "ἃ"),
+        (0x1F0C, "M", "ἄ"),
+        (0x1F0D, "M", "ἅ"),
+        (0x1F0E, "M", "ἆ"),
+        (0x1F0F, "M", "ἇ"),
+        (0x1F10, "V"),
+        (0x1F16, "X"),
+        (0x1F18, "M", "ἐ"),
+        (0x1F19, "M", "ἑ"),
+        (0x1F1A, "M", "ἒ"),
+        (0x1F1B, "M", "ἓ"),
+        (0x1F1C, "M", "ἔ"),
+        (0x1F1D, "M", "ἕ"),
+        (0x1F1E, "X"),
+        (0x1F20, "V"),
+        (0x1F28, "M", "ἠ"),
+        (0x1F29, "M", "ἡ"),
+        (0x1F2A, "M", "ἢ"),
+        (0x1F2B, "M", "ἣ"),
+        (0x1F2C, "M", "ἤ"),
+        (0x1F2D, "M", "ἥ"),
+        (0x1F2E, "M", "ἦ"),
+        (0x1F2F, "M", "ἧ"),
+        (0x1F30, "V"),
+        (0x1F38, "M", "ἰ"),
+        (0x1F39, "M", "ἱ"),
+        (0x1F3A, "M", "ἲ"),
+        (0x1F3B, "M", "ἳ"),
+        (0x1F3C, "M", "ἴ"),
+        (0x1F3D, "M", "ἵ"),
+        (0x1F3E, "M", "ἶ"),
+        (0x1F3F, "M", "ἷ"),
+        (0x1F40, "V"),
+        (0x1F46, "X"),
+        (0x1F48, "M", "ὀ"),
+        (0x1F49, "M", "ὁ"),
+        (0x1F4A, "M", "ὂ"),
+        (0x1F4B, "M", "ὃ"),
+        (0x1F4C, "M", "ὄ"),
+        (0x1F4D, "M", "ὅ"),
+        (0x1F4E, "X"),
+        (0x1F50, "V"),
+        (0x1F58, "X"),
+        (0x1F59, "M", "ὑ"),
+        (0x1F5A, "X"),
+        (0x1F5B, "M", "ὓ"),
+        (0x1F5C, "X"),
+        (0x1F5D, "M", "ὕ"),
+        (0x1F5E, "X"),
+        (0x1F5F, "M", "ὗ"),
+        (0x1F60, "V"),
+        (0x1F68, "M", "ὠ"),
+        (0x1F69, "M", "ὡ"),
+        (0x1F6A, "M", "ὢ"),
+        (0x1F6B, "M", "ὣ"),
+        (0x1F6C, "M", "ὤ"),
+        (0x1F6D, "M", "ὥ"),
+        (0x1F6E, "M", "ὦ"),
+        (0x1F6F, "M", "ὧ"),
+        (0x1F70, "V"),
+        (0x1F71, "M", "ά"),
+        (0x1F72, "V"),
+        (0x1F73, "M", "έ"),
+        (0x1F74, "V"),
+        (0x1F75, "M", "ή"),
+        (0x1F76, "V"),
+        (0x1F77, "M", "ί"),
+        (0x1F78, "V"),
+        (0x1F79, "M", "ό"),
+        (0x1F7A, "V"),
+        (0x1F7B, "M", "ύ"),
+        (0x1F7C, "V"),
+        (0x1F7D, "M", "ώ"),
+        (0x1F7E, "X"),
+        (0x1F80, "M", "ἀι"),
+        (0x1F81, "M", "ἁι"),
+        (0x1F82, "M", "ἂι"),
+        (0x1F83, "M", "ἃι"),
+        (0x1F84, "M", "ἄι"),
+        (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', 'ἂι'),
-    (0x1F8B, 'M', 'ἃι'),
-    (0x1F8C, 'M', 'ἄι'),
-    (0x1F8D, 'M', 'ἅι'),
-    (0x1F8E, 'M', 'ἆι'),
-    (0x1F8F, 'M', 'ἇι'),
-    (0x1F90, 'M', 'ἠι'),
-    (0x1F91, 'M', 'ἡι'),
-    (0x1F92, 'M', 'ἢι'),
-    (0x1F93, 'M', 'ἣι'),
-    (0x1F94, 'M', 'ἤι'),
-    (0x1F95, 'M', 'ἥι'),
-    (0x1F96, 'M', 'ἦι'),
-    (0x1F97, 'M', 'ἧι'),
-    (0x1F98, 'M', 'ἠι'),
-    (0x1F99, 'M', 'ἡι'),
-    (0x1F9A, 'M', 'ἢι'),
-    (0x1F9B, 'M', 'ἣι'),
-    (0x1F9C, 'M', 'ἤι'),
-    (0x1F9D, 'M', 'ἥι'),
-    (0x1F9E, 'M', 'ἦι'),
-    (0x1F9F, 'M', 'ἧι'),
-    (0x1FA0, 'M', 'ὠι'),
-    (0x1FA1, 'M', 'ὡι'),
-    (0x1FA2, 'M', 'ὢι'),
-    (0x1FA3, 'M', 'ὣι'),
-    (0x1FA4, 'M', 'ὤι'),
-    (0x1FA5, 'M', 'ὥι'),
-    (0x1FA6, 'M', 'ὦι'),
-    (0x1FA7, 'M', 'ὧι'),
-    (0x1FA8, 'M', 'ὠι'),
-    (0x1FA9, 'M', 'ὡι'),
-    (0x1FAA, 'M', 'ὢι'),
-    (0x1FAB, 'M', 'ὣι'),
-    (0x1FAC, 'M', 'ὤι'),
-    (0x1FAD, 'M', 'ὥι'),
-    (0x1FAE, 'M', 'ὦι'),
-    (0x1FAF, 'M', 'ὧι'),
-    (0x1FB0, 'V'),
-    (0x1FB2, 'M', 'ὰι'),
-    (0x1FB3, 'M', 'αι'),
-    (0x1FB4, 'M', 'άι'),
-    (0x1FB5, 'X'),
-    (0x1FB6, 'V'),
-    (0x1FB7, 'M', 'ᾶι'),
-    (0x1FB8, 'M', 'ᾰ'),
-    (0x1FB9, 'M', 'ᾱ'),
-    (0x1FBA, 'M', 'ὰ'),
-    (0x1FBB, 'M', 'ά'),
-    (0x1FBC, 'M', 'αι'),
-    (0x1FBD, '3', ' ̓'),
-    (0x1FBE, 'M', 'ι'),
-    (0x1FBF, '3', ' ̓'),
-    (0x1FC0, '3', ' ͂'),
-    (0x1FC1, '3', ' ̈͂'),
-    (0x1FC2, 'M', 'ὴι'),
-    (0x1FC3, 'M', 'ηι'),
-    (0x1FC4, 'M', 'ήι'),
-    (0x1FC5, 'X'),
-    (0x1FC6, 'V'),
-    (0x1FC7, 'M', 'ῆι'),
-    (0x1FC8, 'M', 'ὲ'),
-    (0x1FC9, 'M', 'έ'),
-    (0x1FCA, 'M', 'ὴ'),
-    (0x1FCB, 'M', 'ή'),
-    (0x1FCC, 'M', 'ηι'),
-    (0x1FCD, '3', ' ̓̀'),
-    (0x1FCE, '3', ' ̓́'),
-    (0x1FCF, '3', ' ̓͂'),
-    (0x1FD0, 'V'),
-    (0x1FD3, 'M', 'ΐ'),
-    (0x1FD4, 'X'),
-    (0x1FD6, 'V'),
-    (0x1FD8, 'M', 'ῐ'),
-    (0x1FD9, 'M', 'ῑ'),
-    (0x1FDA, 'M', 'ὶ'),
-    (0x1FDB, 'M', 'ί'),
-    (0x1FDC, 'X'),
-    (0x1FDD, '3', ' ̔̀'),
-    (0x1FDE, '3', ' ̔́'),
-    (0x1FDF, '3', ' ̔͂'),
-    (0x1FE0, 'V'),
-    (0x1FE3, 'M', 'ΰ'),
-    (0x1FE4, 'V'),
-    (0x1FE8, 'M', 'ῠ'),
-    (0x1FE9, 'M', 'ῡ'),
-    (0x1FEA, 'M', 'ὺ'),
-    (0x1FEB, 'M', 'ύ'),
-    (0x1FEC, 'M', 'ῥ'),
-    (0x1FED, '3', ' ̈̀'),
-    (0x1FEE, '3', ' ̈́'),
-    (0x1FEF, '3', '`'),
-    (0x1FF0, 'X'),
-    (0x1FF2, 'M', 'ὼι'),
-    (0x1FF3, 'M', 'ωι'),
-    (0x1FF4, 'M', 'ώι'),
-    (0x1FF5, 'X'),
-    (0x1FF6, 'V'),
+        (0x1F88, "M", "ἀι"),
+        (0x1F89, "M", "ἁι"),
+        (0x1F8A, "M", "ἂι"),
+        (0x1F8B, "M", "ἃι"),
+        (0x1F8C, "M", "ἄι"),
+        (0x1F8D, "M", "ἅι"),
+        (0x1F8E, "M", "ἆι"),
+        (0x1F8F, "M", "ἇι"),
+        (0x1F90, "M", "ἠι"),
+        (0x1F91, "M", "ἡι"),
+        (0x1F92, "M", "ἢι"),
+        (0x1F93, "M", "ἣι"),
+        (0x1F94, "M", "ἤι"),
+        (0x1F95, "M", "ἥι"),
+        (0x1F96, "M", "ἦι"),
+        (0x1F97, "M", "ἧι"),
+        (0x1F98, "M", "ἠι"),
+        (0x1F99, "M", "ἡι"),
+        (0x1F9A, "M", "ἢι"),
+        (0x1F9B, "M", "ἣι"),
+        (0x1F9C, "M", "ἤι"),
+        (0x1F9D, "M", "ἥι"),
+        (0x1F9E, "M", "ἦι"),
+        (0x1F9F, "M", "ἧι"),
+        (0x1FA0, "M", "ὠι"),
+        (0x1FA1, "M", "ὡι"),
+        (0x1FA2, "M", "ὢι"),
+        (0x1FA3, "M", "ὣι"),
+        (0x1FA4, "M", "ὤι"),
+        (0x1FA5, "M", "ὥι"),
+        (0x1FA6, "M", "ὦι"),
+        (0x1FA7, "M", "ὧι"),
+        (0x1FA8, "M", "ὠι"),
+        (0x1FA9, "M", "ὡι"),
+        (0x1FAA, "M", "ὢι"),
+        (0x1FAB, "M", "ὣι"),
+        (0x1FAC, "M", "ὤι"),
+        (0x1FAD, "M", "ὥι"),
+        (0x1FAE, "M", "ὦι"),
+        (0x1FAF, "M", "ὧι"),
+        (0x1FB0, "V"),
+        (0x1FB2, "M", "ὰι"),
+        (0x1FB3, "M", "αι"),
+        (0x1FB4, "M", "άι"),
+        (0x1FB5, "X"),
+        (0x1FB6, "V"),
+        (0x1FB7, "M", "ᾶι"),
+        (0x1FB8, "M", "ᾰ"),
+        (0x1FB9, "M", "ᾱ"),
+        (0x1FBA, "M", "ὰ"),
+        (0x1FBB, "M", "ά"),
+        (0x1FBC, "M", "αι"),
+        (0x1FBD, "3", " ̓"),
+        (0x1FBE, "M", "ι"),
+        (0x1FBF, "3", " ̓"),
+        (0x1FC0, "3", " ͂"),
+        (0x1FC1, "3", " ̈͂"),
+        (0x1FC2, "M", "ὴι"),
+        (0x1FC3, "M", "ηι"),
+        (0x1FC4, "M", "ήι"),
+        (0x1FC5, "X"),
+        (0x1FC6, "V"),
+        (0x1FC7, "M", "ῆι"),
+        (0x1FC8, "M", "ὲ"),
+        (0x1FC9, "M", "έ"),
+        (0x1FCA, "M", "ὴ"),
+        (0x1FCB, "M", "ή"),
+        (0x1FCC, "M", "ηι"),
+        (0x1FCD, "3", " ̓̀"),
+        (0x1FCE, "3", " ̓́"),
+        (0x1FCF, "3", " ̓͂"),
+        (0x1FD0, "V"),
+        (0x1FD3, "M", "ΐ"),
+        (0x1FD4, "X"),
+        (0x1FD6, "V"),
+        (0x1FD8, "M", "ῐ"),
+        (0x1FD9, "M", "ῑ"),
+        (0x1FDA, "M", "ὶ"),
+        (0x1FDB, "M", "ί"),
+        (0x1FDC, "X"),
+        (0x1FDD, "3", " ̔̀"),
+        (0x1FDE, "3", " ̔́"),
+        (0x1FDF, "3", " ̔͂"),
+        (0x1FE0, "V"),
+        (0x1FE3, "M", "ΰ"),
+        (0x1FE4, "V"),
+        (0x1FE8, "M", "ῠ"),
+        (0x1FE9, "M", "ῡ"),
+        (0x1FEA, "M", "ὺ"),
+        (0x1FEB, "M", "ύ"),
+        (0x1FEC, "M", "ῥ"),
+        (0x1FED, "3", " ̈̀"),
+        (0x1FEE, "3", " ̈́"),
+        (0x1FEF, "3", "`"),
+        (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', ' ̔'),
-    (0x1FFF, 'X'),
-    (0x2000, '3', ' '),
-    (0x200B, 'I'),
-    (0x200C, 'D', ''),
-    (0x200E, 'X'),
-    (0x2010, 'V'),
-    (0x2011, 'M', '‐'),
-    (0x2012, 'V'),
-    (0x2017, '3', ' ̳'),
-    (0x2018, 'V'),
-    (0x2024, 'X'),
-    (0x2027, 'V'),
-    (0x2028, 'X'),
-    (0x202F, '3', ' '),
-    (0x2030, 'V'),
-    (0x2033, 'M', '′′'),
-    (0x2034, 'M', '′′′'),
-    (0x2035, 'V'),
-    (0x2036, 'M', '‵‵'),
-    (0x2037, 'M', '‵‵‵'),
-    (0x2038, 'V'),
-    (0x203C, '3', '!!'),
-    (0x203D, 'V'),
-    (0x203E, '3', ' ̅'),
-    (0x203F, 'V'),
-    (0x2047, '3', '??'),
-    (0x2048, '3', '?!'),
-    (0x2049, '3', '!?'),
-    (0x204A, 'V'),
-    (0x2057, 'M', '′′′′'),
-    (0x2058, 'V'),
-    (0x205F, '3', ' '),
-    (0x2060, 'I'),
-    (0x2061, 'X'),
-    (0x2064, 'I'),
-    (0x2065, 'X'),
-    (0x2070, 'M', '0'),
-    (0x2071, 'M', 'i'),
-    (0x2072, 'X'),
-    (0x2074, 'M', '4'),
-    (0x2075, 'M', '5'),
-    (0x2076, 'M', '6'),
-    (0x2077, 'M', '7'),
-    (0x2078, 'M', '8'),
-    (0x2079, 'M', '9'),
-    (0x207A, '3', '+'),
-    (0x207B, 'M', '−'),
-    (0x207C, '3', '='),
-    (0x207D, '3', '('),
-    (0x207E, '3', ')'),
-    (0x207F, 'M', 'n'),
-    (0x2080, 'M', '0'),
-    (0x2081, 'M', '1'),
-    (0x2082, 'M', '2'),
-    (0x2083, 'M', '3'),
-    (0x2084, 'M', '4'),
-    (0x2085, 'M', '5'),
-    (0x2086, 'M', '6'),
-    (0x2087, 'M', '7'),
-    (0x2088, 'M', '8'),
-    (0x2089, 'M', '9'),
-    (0x208A, '3', '+'),
-    (0x208B, 'M', '−'),
-    (0x208C, '3', '='),
-    (0x208D, '3', '('),
-    (0x208E, '3', ')'),
-    (0x208F, 'X'),
-    (0x2090, 'M', 'a'),
-    (0x2091, 'M', 'e'),
-    (0x2092, 'M', 'o'),
-    (0x2093, 'M', 'x'),
-    (0x2094, 'M', 'ə'),
-    (0x2095, 'M', 'h'),
-    (0x2096, 'M', 'k'),
-    (0x2097, 'M', 'l'),
-    (0x2098, 'M', 'm'),
-    (0x2099, 'M', 'n'),
-    (0x209A, 'M', 'p'),
-    (0x209B, 'M', 's'),
-    (0x209C, 'M', 't'),
-    (0x209D, 'X'),
-    (0x20A0, 'V'),
-    (0x20A8, 'M', 'rs'),
-    (0x20A9, 'V'),
-    (0x20C1, 'X'),
-    (0x20D0, 'V'),
-    (0x20F1, 'X'),
-    (0x2100, '3', 'a/c'),
-    (0x2101, '3', 'a/s'),
-    (0x2102, 'M', 'c'),
-    (0x2103, 'M', '°c'),
-    (0x2104, 'V'),
+        (0x1FF7, "M", "ῶι"),
+        (0x1FF8, "M", "ὸ"),
+        (0x1FF9, "M", "ό"),
+        (0x1FFA, "M", "ὼ"),
+        (0x1FFB, "M", "ώ"),
+        (0x1FFC, "M", "ωι"),
+        (0x1FFD, "3", " ́"),
+        (0x1FFE, "3", " ̔"),
+        (0x1FFF, "X"),
+        (0x2000, "3", " "),
+        (0x200B, "I"),
+        (0x200C, "D", ""),
+        (0x200E, "X"),
+        (0x2010, "V"),
+        (0x2011, "M", "‐"),
+        (0x2012, "V"),
+        (0x2017, "3", " ̳"),
+        (0x2018, "V"),
+        (0x2024, "X"),
+        (0x2027, "V"),
+        (0x2028, "X"),
+        (0x202F, "3", " "),
+        (0x2030, "V"),
+        (0x2033, "M", "′′"),
+        (0x2034, "M", "′′′"),
+        (0x2035, "V"),
+        (0x2036, "M", "‵‵"),
+        (0x2037, "M", "‵‵‵"),
+        (0x2038, "V"),
+        (0x203C, "3", "!!"),
+        (0x203D, "V"),
+        (0x203E, "3", " ̅"),
+        (0x203F, "V"),
+        (0x2047, "3", "??"),
+        (0x2048, "3", "?!"),
+        (0x2049, "3", "!?"),
+        (0x204A, "V"),
+        (0x2057, "M", "′′′′"),
+        (0x2058, "V"),
+        (0x205F, "3", " "),
+        (0x2060, "I"),
+        (0x2061, "X"),
+        (0x2064, "I"),
+        (0x2065, "X"),
+        (0x2070, "M", "0"),
+        (0x2071, "M", "i"),
+        (0x2072, "X"),
+        (0x2074, "M", "4"),
+        (0x2075, "M", "5"),
+        (0x2076, "M", "6"),
+        (0x2077, "M", "7"),
+        (0x2078, "M", "8"),
+        (0x2079, "M", "9"),
+        (0x207A, "3", "+"),
+        (0x207B, "M", "−"),
+        (0x207C, "3", "="),
+        (0x207D, "3", "("),
+        (0x207E, "3", ")"),
+        (0x207F, "M", "n"),
+        (0x2080, "M", "0"),
+        (0x2081, "M", "1"),
+        (0x2082, "M", "2"),
+        (0x2083, "M", "3"),
+        (0x2084, "M", "4"),
+        (0x2085, "M", "5"),
+        (0x2086, "M", "6"),
+        (0x2087, "M", "7"),
+        (0x2088, "M", "8"),
+        (0x2089, "M", "9"),
+        (0x208A, "3", "+"),
+        (0x208B, "M", "−"),
+        (0x208C, "3", "="),
+        (0x208D, "3", "("),
+        (0x208E, "3", ")"),
+        (0x208F, "X"),
+        (0x2090, "M", "a"),
+        (0x2091, "M", "e"),
+        (0x2092, "M", "o"),
+        (0x2093, "M", "x"),
+        (0x2094, "M", "ə"),
+        (0x2095, "M", "h"),
+        (0x2096, "M", "k"),
+        (0x2097, "M", "l"),
+        (0x2098, "M", "m"),
+        (0x2099, "M", "n"),
+        (0x209A, "M", "p"),
+        (0x209B, "M", "s"),
+        (0x209C, "M", "t"),
+        (0x209D, "X"),
+        (0x20A0, "V"),
+        (0x20A8, "M", "rs"),
+        (0x20A9, "V"),
+        (0x20C1, "X"),
+        (0x20D0, "V"),
+        (0x20F1, "X"),
+        (0x2100, "3", "a/c"),
+        (0x2101, "3", "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'),
-    (0x2107, 'M', 'ɛ'),
-    (0x2108, 'V'),
-    (0x2109, 'M', '°f'),
-    (0x210A, 'M', 'g'),
-    (0x210B, 'M', 'h'),
-    (0x210F, 'M', 'ħ'),
-    (0x2110, 'M', 'i'),
-    (0x2112, 'M', 'l'),
-    (0x2114, 'V'),
-    (0x2115, 'M', 'n'),
-    (0x2116, 'M', 'no'),
-    (0x2117, 'V'),
-    (0x2119, 'M', 'p'),
-    (0x211A, 'M', 'q'),
-    (0x211B, 'M', 'r'),
-    (0x211E, 'V'),
-    (0x2120, 'M', 'sm'),
-    (0x2121, 'M', 'tel'),
-    (0x2122, 'M', 'tm'),
-    (0x2123, 'V'),
-    (0x2124, 'M', 'z'),
-    (0x2125, 'V'),
-    (0x2126, 'M', 'ω'),
-    (0x2127, 'V'),
-    (0x2128, 'M', 'z'),
-    (0x2129, 'V'),
-    (0x212A, 'M', 'k'),
-    (0x212B, 'M', 'å'),
-    (0x212C, 'M', 'b'),
-    (0x212D, 'M', 'c'),
-    (0x212E, 'V'),
-    (0x212F, 'M', 'e'),
-    (0x2131, 'M', 'f'),
-    (0x2132, 'X'),
-    (0x2133, 'M', 'm'),
-    (0x2134, 'M', 'o'),
-    (0x2135, 'M', 'א'),
-    (0x2136, 'M', 'ב'),
-    (0x2137, 'M', 'ג'),
-    (0x2138, 'M', 'ד'),
-    (0x2139, 'M', 'i'),
-    (0x213A, 'V'),
-    (0x213B, 'M', 'fax'),
-    (0x213C, 'M', 'π'),
-    (0x213D, 'M', 'γ'),
-    (0x213F, 'M', 'π'),
-    (0x2140, 'M', '∑'),
-    (0x2141, 'V'),
-    (0x2145, 'M', 'd'),
-    (0x2147, 'M', 'e'),
-    (0x2148, 'M', 'i'),
-    (0x2149, 'M', 'j'),
-    (0x214A, 'V'),
-    (0x2150, 'M', '1⁄7'),
-    (0x2151, 'M', '1⁄9'),
-    (0x2152, 'M', '1⁄10'),
-    (0x2153, 'M', '1⁄3'),
-    (0x2154, 'M', '2⁄3'),
-    (0x2155, 'M', '1⁄5'),
-    (0x2156, 'M', '2⁄5'),
-    (0x2157, 'M', '3⁄5'),
-    (0x2158, 'M', '4⁄5'),
-    (0x2159, 'M', '1⁄6'),
-    (0x215A, 'M', '5⁄6'),
-    (0x215B, 'M', '1⁄8'),
-    (0x215C, 'M', '3⁄8'),
-    (0x215D, 'M', '5⁄8'),
-    (0x215E, 'M', '7⁄8'),
-    (0x215F, 'M', '1⁄'),
-    (0x2160, 'M', 'i'),
-    (0x2161, 'M', 'ii'),
-    (0x2162, 'M', 'iii'),
-    (0x2163, 'M', 'iv'),
-    (0x2164, 'M', 'v'),
-    (0x2165, 'M', 'vi'),
-    (0x2166, 'M', 'vii'),
-    (0x2167, 'M', 'viii'),
-    (0x2168, 'M', 'ix'),
-    (0x2169, 'M', 'x'),
-    (0x216A, 'M', 'xi'),
-    (0x216B, 'M', 'xii'),
-    (0x216C, 'M', 'l'),
-    (0x216D, 'M', 'c'),
-    (0x216E, 'M', 'd'),
-    (0x216F, 'M', 'm'),
-    (0x2170, 'M', 'i'),
-    (0x2171, 'M', 'ii'),
-    (0x2172, 'M', 'iii'),
-    (0x2173, 'M', 'iv'),
-    (0x2174, 'M', 'v'),
-    (0x2175, 'M', 'vi'),
-    (0x2176, 'M', 'vii'),
-    (0x2177, 'M', 'viii'),
-    (0x2178, 'M', 'ix'),
-    (0x2179, 'M', 'x'),
-    (0x217A, 'M', 'xi'),
-    (0x217B, 'M', 'xii'),
-    (0x217C, 'M', 'l'),
+        (0x2105, "3", "c/o"),
+        (0x2106, "3", "c/u"),
+        (0x2107, "M", "ɛ"),
+        (0x2108, "V"),
+        (0x2109, "M", "°f"),
+        (0x210A, "M", "g"),
+        (0x210B, "M", "h"),
+        (0x210F, "M", "ħ"),
+        (0x2110, "M", "i"),
+        (0x2112, "M", "l"),
+        (0x2114, "V"),
+        (0x2115, "M", "n"),
+        (0x2116, "M", "no"),
+        (0x2117, "V"),
+        (0x2119, "M", "p"),
+        (0x211A, "M", "q"),
+        (0x211B, "M", "r"),
+        (0x211E, "V"),
+        (0x2120, "M", "sm"),
+        (0x2121, "M", "tel"),
+        (0x2122, "M", "tm"),
+        (0x2123, "V"),
+        (0x2124, "M", "z"),
+        (0x2125, "V"),
+        (0x2126, "M", "ω"),
+        (0x2127, "V"),
+        (0x2128, "M", "z"),
+        (0x2129, "V"),
+        (0x212A, "M", "k"),
+        (0x212B, "M", "å"),
+        (0x212C, "M", "b"),
+        (0x212D, "M", "c"),
+        (0x212E, "V"),
+        (0x212F, "M", "e"),
+        (0x2131, "M", "f"),
+        (0x2132, "X"),
+        (0x2133, "M", "m"),
+        (0x2134, "M", "o"),
+        (0x2135, "M", "א"),
+        (0x2136, "M", "ב"),
+        (0x2137, "M", "ג"),
+        (0x2138, "M", "ד"),
+        (0x2139, "M", "i"),
+        (0x213A, "V"),
+        (0x213B, "M", "fax"),
+        (0x213C, "M", "π"),
+        (0x213D, "M", "γ"),
+        (0x213F, "M", "π"),
+        (0x2140, "M", "∑"),
+        (0x2141, "V"),
+        (0x2145, "M", "d"),
+        (0x2147, "M", "e"),
+        (0x2148, "M", "i"),
+        (0x2149, "M", "j"),
+        (0x214A, "V"),
+        (0x2150, "M", "1⁄7"),
+        (0x2151, "M", "1⁄9"),
+        (0x2152, "M", "1⁄10"),
+        (0x2153, "M", "1⁄3"),
+        (0x2154, "M", "2⁄3"),
+        (0x2155, "M", "1⁄5"),
+        (0x2156, "M", "2⁄5"),
+        (0x2157, "M", "3⁄5"),
+        (0x2158, "M", "4⁄5"),
+        (0x2159, "M", "1⁄6"),
+        (0x215A, "M", "5⁄6"),
+        (0x215B, "M", "1⁄8"),
+        (0x215C, "M", "3⁄8"),
+        (0x215D, "M", "5⁄8"),
+        (0x215E, "M", "7⁄8"),
+        (0x215F, "M", "1⁄"),
+        (0x2160, "M", "i"),
+        (0x2161, "M", "ii"),
+        (0x2162, "M", "iii"),
+        (0x2163, "M", "iv"),
+        (0x2164, "M", "v"),
+        (0x2165, "M", "vi"),
+        (0x2166, "M", "vii"),
+        (0x2167, "M", "viii"),
+        (0x2168, "M", "ix"),
+        (0x2169, "M", "x"),
+        (0x216A, "M", "xi"),
+        (0x216B, "M", "xii"),
+        (0x216C, "M", "l"),
+        (0x216D, "M", "c"),
+        (0x216E, "M", "d"),
+        (0x216F, "M", "m"),
+        (0x2170, "M", "i"),
+        (0x2171, "M", "ii"),
+        (0x2172, "M", "iii"),
+        (0x2173, "M", "iv"),
+        (0x2174, "M", "v"),
+        (0x2175, "M", "vi"),
+        (0x2176, "M", "vii"),
+        (0x2177, "M", "viii"),
+        (0x2178, "M", "ix"),
+        (0x2179, "M", "x"),
+        (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'),
-    (0x2184, 'V'),
-    (0x2189, 'M', '0⁄3'),
-    (0x218A, 'V'),
-    (0x218C, 'X'),
-    (0x2190, 'V'),
-    (0x222C, 'M', '∫∫'),
-    (0x222D, 'M', '∫∫∫'),
-    (0x222E, 'V'),
-    (0x222F, 'M', '∮∮'),
-    (0x2230, 'M', '∮∮∮'),
-    (0x2231, 'V'),
-    (0x2329, 'M', '〈'),
-    (0x232A, 'M', '〉'),
-    (0x232B, 'V'),
-    (0x2427, 'X'),
-    (0x2440, 'V'),
-    (0x244B, 'X'),
-    (0x2460, 'M', '1'),
-    (0x2461, 'M', '2'),
-    (0x2462, 'M', '3'),
-    (0x2463, 'M', '4'),
-    (0x2464, 'M', '5'),
-    (0x2465, 'M', '6'),
-    (0x2466, 'M', '7'),
-    (0x2467, 'M', '8'),
-    (0x2468, 'M', '9'),
-    (0x2469, 'M', '10'),
-    (0x246A, 'M', '11'),
-    (0x246B, 'M', '12'),
-    (0x246C, 'M', '13'),
-    (0x246D, 'M', '14'),
-    (0x246E, 'M', '15'),
-    (0x246F, 'M', '16'),
-    (0x2470, 'M', '17'),
-    (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)'),
-    (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)'),
-    (0x24B6, 'M', 'a'),
-    (0x24B7, 'M', 'b'),
-    (0x24B8, 'M', 'c'),
-    (0x24B9, 'M', 'd'),
-    (0x24BA, 'M', 'e'),
-    (0x24BB, 'M', 'f'),
-    (0x24BC, 'M', 'g'),
-    (0x24BD, 'M', 'h'),
-    (0x24BE, 'M', 'i'),
-    (0x24BF, 'M', 'j'),
-    (0x24C0, 'M', 'k'),
+        (0x217D, "M", "c"),
+        (0x217E, "M", "d"),
+        (0x217F, "M", "m"),
+        (0x2180, "V"),
+        (0x2183, "X"),
+        (0x2184, "V"),
+        (0x2189, "M", "0⁄3"),
+        (0x218A, "V"),
+        (0x218C, "X"),
+        (0x2190, "V"),
+        (0x222C, "M", "∫∫"),
+        (0x222D, "M", "∫∫∫"),
+        (0x222E, "V"),
+        (0x222F, "M", "∮∮"),
+        (0x2230, "M", "∮∮∮"),
+        (0x2231, "V"),
+        (0x2329, "M", "〈"),
+        (0x232A, "M", "〉"),
+        (0x232B, "V"),
+        (0x2427, "X"),
+        (0x2440, "V"),
+        (0x244B, "X"),
+        (0x2460, "M", "1"),
+        (0x2461, "M", "2"),
+        (0x2462, "M", "3"),
+        (0x2463, "M", "4"),
+        (0x2464, "M", "5"),
+        (0x2465, "M", "6"),
+        (0x2466, "M", "7"),
+        (0x2467, "M", "8"),
+        (0x2468, "M", "9"),
+        (0x2469, "M", "10"),
+        (0x246A, "M", "11"),
+        (0x246B, "M", "12"),
+        (0x246C, "M", "13"),
+        (0x246D, "M", "14"),
+        (0x246E, "M", "15"),
+        (0x246F, "M", "16"),
+        (0x2470, "M", "17"),
+        (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)"),
+        (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)"),
+        (0x24B6, "M", "a"),
+        (0x24B7, "M", "b"),
+        (0x24B8, "M", "c"),
+        (0x24B9, "M", "d"),
+        (0x24BA, "M", "e"),
+        (0x24BB, "M", "f"),
+        (0x24BC, "M", "g"),
+        (0x24BD, "M", "h"),
+        (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'),
-    (0x24C4, 'M', 'o'),
-    (0x24C5, 'M', 'p'),
-    (0x24C6, 'M', 'q'),
-    (0x24C7, 'M', 'r'),
-    (0x24C8, 'M', 's'),
-    (0x24C9, 'M', 't'),
-    (0x24CA, 'M', 'u'),
-    (0x24CB, 'M', 'v'),
-    (0x24CC, 'M', 'w'),
-    (0x24CD, 'M', 'x'),
-    (0x24CE, 'M', 'y'),
-    (0x24CF, 'M', 'z'),
-    (0x24D0, 'M', 'a'),
-    (0x24D1, 'M', 'b'),
-    (0x24D2, 'M', 'c'),
-    (0x24D3, 'M', 'd'),
-    (0x24D4, 'M', 'e'),
-    (0x24D5, 'M', 'f'),
-    (0x24D6, 'M', 'g'),
-    (0x24D7, 'M', 'h'),
-    (0x24D8, 'M', 'i'),
-    (0x24D9, 'M', 'j'),
-    (0x24DA, 'M', 'k'),
-    (0x24DB, 'M', 'l'),
-    (0x24DC, 'M', 'm'),
-    (0x24DD, 'M', 'n'),
-    (0x24DE, 'M', 'o'),
-    (0x24DF, 'M', 'p'),
-    (0x24E0, 'M', 'q'),
-    (0x24E1, 'M', 'r'),
-    (0x24E2, 'M', 's'),
-    (0x24E3, 'M', 't'),
-    (0x24E4, 'M', 'u'),
-    (0x24E5, 'M', 'v'),
-    (0x24E6, 'M', 'w'),
-    (0x24E7, 'M', 'x'),
-    (0x24E8, 'M', 'y'),
-    (0x24E9, 'M', 'z'),
-    (0x24EA, 'M', '0'),
-    (0x24EB, 'V'),
-    (0x2A0C, 'M', '∫∫∫∫'),
-    (0x2A0D, 'V'),
-    (0x2A74, '3', '::='),
-    (0x2A75, '3', '=='),
-    (0x2A76, '3', '==='),
-    (0x2A77, 'V'),
-    (0x2ADC, 'M', '⫝̸'),
-    (0x2ADD, 'V'),
-    (0x2B74, 'X'),
-    (0x2B76, 'V'),
-    (0x2B96, 'X'),
-    (0x2B97, 'V'),
-    (0x2C00, 'M', 'ⰰ'),
-    (0x2C01, 'M', 'ⰱ'),
-    (0x2C02, 'M', 'ⰲ'),
-    (0x2C03, 'M', 'ⰳ'),
-    (0x2C04, 'M', 'ⰴ'),
-    (0x2C05, 'M', 'ⰵ'),
-    (0x2C06, 'M', 'ⰶ'),
-    (0x2C07, 'M', 'ⰷ'),
-    (0x2C08, 'M', 'ⰸ'),
-    (0x2C09, 'M', 'ⰹ'),
-    (0x2C0A, 'M', 'ⰺ'),
-    (0x2C0B, 'M', 'ⰻ'),
-    (0x2C0C, 'M', 'ⰼ'),
-    (0x2C0D, 'M', 'ⰽ'),
-    (0x2C0E, 'M', 'ⰾ'),
-    (0x2C0F, 'M', 'ⰿ'),
-    (0x2C10, 'M', 'ⱀ'),
-    (0x2C11, 'M', 'ⱁ'),
-    (0x2C12, 'M', 'ⱂ'),
-    (0x2C13, 'M', 'ⱃ'),
-    (0x2C14, 'M', 'ⱄ'),
-    (0x2C15, 'M', 'ⱅ'),
-    (0x2C16, 'M', 'ⱆ'),
-    (0x2C17, 'M', 'ⱇ'),
-    (0x2C18, 'M', 'ⱈ'),
-    (0x2C19, 'M', 'ⱉ'),
-    (0x2C1A, 'M', 'ⱊ'),
-    (0x2C1B, 'M', 'ⱋ'),
-    (0x2C1C, 'M', 'ⱌ'),
-    (0x2C1D, 'M', 'ⱍ'),
-    (0x2C1E, 'M', 'ⱎ'),
-    (0x2C1F, 'M', 'ⱏ'),
-    (0x2C20, 'M', 'ⱐ'),
-    (0x2C21, 'M', 'ⱑ'),
-    (0x2C22, 'M', 'ⱒ'),
-    (0x2C23, 'M', 'ⱓ'),
-    (0x2C24, 'M', 'ⱔ'),
-    (0x2C25, 'M', 'ⱕ'),
-    (0x2C26, 'M', 'ⱖ'),
-    (0x2C27, 'M', 'ⱗ'),
-    (0x2C28, 'M', 'ⱘ'),
-    (0x2C29, 'M', 'ⱙ'),
-    (0x2C2A, 'M', 'ⱚ'),
-    (0x2C2B, 'M', 'ⱛ'),
-    (0x2C2C, 'M', 'ⱜ'),
+        (0x24C1, "M", "l"),
+        (0x24C2, "M", "m"),
+        (0x24C3, "M", "n"),
+        (0x24C4, "M", "o"),
+        (0x24C5, "M", "p"),
+        (0x24C6, "M", "q"),
+        (0x24C7, "M", "r"),
+        (0x24C8, "M", "s"),
+        (0x24C9, "M", "t"),
+        (0x24CA, "M", "u"),
+        (0x24CB, "M", "v"),
+        (0x24CC, "M", "w"),
+        (0x24CD, "M", "x"),
+        (0x24CE, "M", "y"),
+        (0x24CF, "M", "z"),
+        (0x24D0, "M", "a"),
+        (0x24D1, "M", "b"),
+        (0x24D2, "M", "c"),
+        (0x24D3, "M", "d"),
+        (0x24D4, "M", "e"),
+        (0x24D5, "M", "f"),
+        (0x24D6, "M", "g"),
+        (0x24D7, "M", "h"),
+        (0x24D8, "M", "i"),
+        (0x24D9, "M", "j"),
+        (0x24DA, "M", "k"),
+        (0x24DB, "M", "l"),
+        (0x24DC, "M", "m"),
+        (0x24DD, "M", "n"),
+        (0x24DE, "M", "o"),
+        (0x24DF, "M", "p"),
+        (0x24E0, "M", "q"),
+        (0x24E1, "M", "r"),
+        (0x24E2, "M", "s"),
+        (0x24E3, "M", "t"),
+        (0x24E4, "M", "u"),
+        (0x24E5, "M", "v"),
+        (0x24E6, "M", "w"),
+        (0x24E7, "M", "x"),
+        (0x24E8, "M", "y"),
+        (0x24E9, "M", "z"),
+        (0x24EA, "M", "0"),
+        (0x24EB, "V"),
+        (0x2A0C, "M", "∫∫∫∫"),
+        (0x2A0D, "V"),
+        (0x2A74, "3", "::="),
+        (0x2A75, "3", "=="),
+        (0x2A76, "3", "==="),
+        (0x2A77, "V"),
+        (0x2ADC, "M", "⫝̸"),
+        (0x2ADD, "V"),
+        (0x2B74, "X"),
+        (0x2B76, "V"),
+        (0x2B96, "X"),
+        (0x2B97, "V"),
+        (0x2C00, "M", "ⰰ"),
+        (0x2C01, "M", "ⰱ"),
+        (0x2C02, "M", "ⰲ"),
+        (0x2C03, "M", "ⰳ"),
+        (0x2C04, "M", "ⰴ"),
+        (0x2C05, "M", "ⰵ"),
+        (0x2C06, "M", "ⰶ"),
+        (0x2C07, "M", "ⰷ"),
+        (0x2C08, "M", "ⰸ"),
+        (0x2C09, "M", "ⰹ"),
+        (0x2C0A, "M", "ⰺ"),
+        (0x2C0B, "M", "ⰻ"),
+        (0x2C0C, "M", "ⰼ"),
+        (0x2C0D, "M", "ⰽ"),
+        (0x2C0E, "M", "ⰾ"),
+        (0x2C0F, "M", "ⰿ"),
+        (0x2C10, "M", "ⱀ"),
+        (0x2C11, "M", "ⱁ"),
+        (0x2C12, "M", "ⱂ"),
+        (0x2C13, "M", "ⱃ"),
+        (0x2C14, "M", "ⱄ"),
+        (0x2C15, "M", "ⱅ"),
+        (0x2C16, "M", "ⱆ"),
+        (0x2C17, "M", "ⱇ"),
+        (0x2C18, "M", "ⱈ"),
+        (0x2C19, "M", "ⱉ"),
+        (0x2C1A, "M", "ⱊ"),
+        (0x2C1B, "M", "ⱋ"),
+        (0x2C1C, "M", "ⱌ"),
+        (0x2C1D, "M", "ⱍ"),
+        (0x2C1E, "M", "ⱎ"),
+        (0x2C1F, "M", "ⱏ"),
+        (0x2C20, "M", "ⱐ"),
+        (0x2C21, "M", "ⱑ"),
+        (0x2C22, "M", "ⱒ"),
+        (0x2C23, "M", "ⱓ"),
+        (0x2C24, "M", "ⱔ"),
+        (0x2C25, "M", "ⱕ"),
+        (0x2C26, "M", "ⱖ"),
+        (0x2C27, "M", "ⱗ"),
+        (0x2C28, "M", "ⱘ"),
+        (0x2C29, "M", "ⱙ"),
+        (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', 'ⱟ'),
-    (0x2C30, 'V'),
-    (0x2C60, 'M', 'ⱡ'),
-    (0x2C61, 'V'),
-    (0x2C62, 'M', 'ɫ'),
-    (0x2C63, 'M', 'ᵽ'),
-    (0x2C64, 'M', 'ɽ'),
-    (0x2C65, 'V'),
-    (0x2C67, 'M', 'ⱨ'),
-    (0x2C68, 'V'),
-    (0x2C69, 'M', 'ⱪ'),
-    (0x2C6A, 'V'),
-    (0x2C6B, 'M', 'ⱬ'),
-    (0x2C6C, 'V'),
-    (0x2C6D, 'M', 'ɑ'),
-    (0x2C6E, 'M', 'ɱ'),
-    (0x2C6F, 'M', 'ɐ'),
-    (0x2C70, 'M', 'ɒ'),
-    (0x2C71, 'V'),
-    (0x2C72, 'M', 'ⱳ'),
-    (0x2C73, 'V'),
-    (0x2C75, 'M', 'ⱶ'),
-    (0x2C76, 'V'),
-    (0x2C7C, 'M', 'j'),
-    (0x2C7D, 'M', 'v'),
-    (0x2C7E, 'M', 'ȿ'),
-    (0x2C7F, 'M', 'ɀ'),
-    (0x2C80, 'M', 'ⲁ'),
-    (0x2C81, 'V'),
-    (0x2C82, 'M', 'ⲃ'),
-    (0x2C83, 'V'),
-    (0x2C84, 'M', 'ⲅ'),
-    (0x2C85, 'V'),
-    (0x2C86, 'M', 'ⲇ'),
-    (0x2C87, 'V'),
-    (0x2C88, 'M', 'ⲉ'),
-    (0x2C89, 'V'),
-    (0x2C8A, 'M', 'ⲋ'),
-    (0x2C8B, 'V'),
-    (0x2C8C, 'M', 'ⲍ'),
-    (0x2C8D, 'V'),
-    (0x2C8E, 'M', 'ⲏ'),
-    (0x2C8F, 'V'),
-    (0x2C90, 'M', 'ⲑ'),
-    (0x2C91, 'V'),
-    (0x2C92, 'M', 'ⲓ'),
-    (0x2C93, 'V'),
-    (0x2C94, 'M', 'ⲕ'),
-    (0x2C95, 'V'),
-    (0x2C96, 'M', 'ⲗ'),
-    (0x2C97, 'V'),
-    (0x2C98, 'M', 'ⲙ'),
-    (0x2C99, 'V'),
-    (0x2C9A, 'M', 'ⲛ'),
-    (0x2C9B, 'V'),
-    (0x2C9C, 'M', 'ⲝ'),
-    (0x2C9D, 'V'),
-    (0x2C9E, 'M', 'ⲟ'),
-    (0x2C9F, 'V'),
-    (0x2CA0, 'M', 'ⲡ'),
-    (0x2CA1, 'V'),
-    (0x2CA2, 'M', 'ⲣ'),
-    (0x2CA3, 'V'),
-    (0x2CA4, 'M', 'ⲥ'),
-    (0x2CA5, 'V'),
-    (0x2CA6, 'M', 'ⲧ'),
-    (0x2CA7, 'V'),
-    (0x2CA8, 'M', 'ⲩ'),
-    (0x2CA9, 'V'),
-    (0x2CAA, 'M', 'ⲫ'),
-    (0x2CAB, 'V'),
-    (0x2CAC, 'M', 'ⲭ'),
-    (0x2CAD, 'V'),
-    (0x2CAE, 'M', 'ⲯ'),
-    (0x2CAF, 'V'),
-    (0x2CB0, 'M', 'ⲱ'),
-    (0x2CB1, 'V'),
-    (0x2CB2, 'M', 'ⲳ'),
-    (0x2CB3, 'V'),
-    (0x2CB4, 'M', 'ⲵ'),
-    (0x2CB5, 'V'),
-    (0x2CB6, 'M', 'ⲷ'),
-    (0x2CB7, 'V'),
-    (0x2CB8, 'M', 'ⲹ'),
-    (0x2CB9, 'V'),
-    (0x2CBA, 'M', 'ⲻ'),
-    (0x2CBB, 'V'),
-    (0x2CBC, 'M', 'ⲽ'),
-    (0x2CBD, 'V'),
-    (0x2CBE, 'M', 'ⲿ'),
-    (0x2CBF, 'V'),
-    (0x2CC0, 'M', 'ⳁ'),
-    (0x2CC1, 'V'),
-    (0x2CC2, 'M', 'ⳃ'),
-    (0x2CC3, 'V'),
-    (0x2CC4, 'M', 'ⳅ'),
-    (0x2CC5, 'V'),
-    (0x2CC6, 'M', 'ⳇ'),
+        (0x2C2D, "M", "ⱝ"),
+        (0x2C2E, "M", "ⱞ"),
+        (0x2C2F, "M", "ⱟ"),
+        (0x2C30, "V"),
+        (0x2C60, "M", "ⱡ"),
+        (0x2C61, "V"),
+        (0x2C62, "M", "ɫ"),
+        (0x2C63, "M", "ᵽ"),
+        (0x2C64, "M", "ɽ"),
+        (0x2C65, "V"),
+        (0x2C67, "M", "ⱨ"),
+        (0x2C68, "V"),
+        (0x2C69, "M", "ⱪ"),
+        (0x2C6A, "V"),
+        (0x2C6B, "M", "ⱬ"),
+        (0x2C6C, "V"),
+        (0x2C6D, "M", "ɑ"),
+        (0x2C6E, "M", "ɱ"),
+        (0x2C6F, "M", "ɐ"),
+        (0x2C70, "M", "ɒ"),
+        (0x2C71, "V"),
+        (0x2C72, "M", "ⱳ"),
+        (0x2C73, "V"),
+        (0x2C75, "M", "ⱶ"),
+        (0x2C76, "V"),
+        (0x2C7C, "M", "j"),
+        (0x2C7D, "M", "v"),
+        (0x2C7E, "M", "ȿ"),
+        (0x2C7F, "M", "ɀ"),
+        (0x2C80, "M", "ⲁ"),
+        (0x2C81, "V"),
+        (0x2C82, "M", "ⲃ"),
+        (0x2C83, "V"),
+        (0x2C84, "M", "ⲅ"),
+        (0x2C85, "V"),
+        (0x2C86, "M", "ⲇ"),
+        (0x2C87, "V"),
+        (0x2C88, "M", "ⲉ"),
+        (0x2C89, "V"),
+        (0x2C8A, "M", "ⲋ"),
+        (0x2C8B, "V"),
+        (0x2C8C, "M", "ⲍ"),
+        (0x2C8D, "V"),
+        (0x2C8E, "M", "ⲏ"),
+        (0x2C8F, "V"),
+        (0x2C90, "M", "ⲑ"),
+        (0x2C91, "V"),
+        (0x2C92, "M", "ⲓ"),
+        (0x2C93, "V"),
+        (0x2C94, "M", "ⲕ"),
+        (0x2C95, "V"),
+        (0x2C96, "M", "ⲗ"),
+        (0x2C97, "V"),
+        (0x2C98, "M", "ⲙ"),
+        (0x2C99, "V"),
+        (0x2C9A, "M", "ⲛ"),
+        (0x2C9B, "V"),
+        (0x2C9C, "M", "ⲝ"),
+        (0x2C9D, "V"),
+        (0x2C9E, "M", "ⲟ"),
+        (0x2C9F, "V"),
+        (0x2CA0, "M", "ⲡ"),
+        (0x2CA1, "V"),
+        (0x2CA2, "M", "ⲣ"),
+        (0x2CA3, "V"),
+        (0x2CA4, "M", "ⲥ"),
+        (0x2CA5, "V"),
+        (0x2CA6, "M", "ⲧ"),
+        (0x2CA7, "V"),
+        (0x2CA8, "M", "ⲩ"),
+        (0x2CA9, "V"),
+        (0x2CAA, "M", "ⲫ"),
+        (0x2CAB, "V"),
+        (0x2CAC, "M", "ⲭ"),
+        (0x2CAD, "V"),
+        (0x2CAE, "M", "ⲯ"),
+        (0x2CAF, "V"),
+        (0x2CB0, "M", "ⲱ"),
+        (0x2CB1, "V"),
+        (0x2CB2, "M", "ⲳ"),
+        (0x2CB3, "V"),
+        (0x2CB4, "M", "ⲵ"),
+        (0x2CB5, "V"),
+        (0x2CB6, "M", "ⲷ"),
+        (0x2CB7, "V"),
+        (0x2CB8, "M", "ⲹ"),
+        (0x2CB9, "V"),
+        (0x2CBA, "M", "ⲻ"),
+        (0x2CBB, "V"),
+        (0x2CBC, "M", "ⲽ"),
+        (0x2CBD, "V"),
+        (0x2CBE, "M", "ⲿ"),
+        (0x2CBF, "V"),
+        (0x2CC0, "M", "ⳁ"),
+        (0x2CC1, "V"),
+        (0x2CC2, "M", "ⳃ"),
+        (0x2CC3, "V"),
+        (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'),
-    (0x2CCA, 'M', 'ⳋ'),
-    (0x2CCB, 'V'),
-    (0x2CCC, 'M', 'ⳍ'),
-    (0x2CCD, 'V'),
-    (0x2CCE, 'M', 'ⳏ'),
-    (0x2CCF, 'V'),
-    (0x2CD0, 'M', 'ⳑ'),
-    (0x2CD1, 'V'),
-    (0x2CD2, 'M', 'ⳓ'),
-    (0x2CD3, 'V'),
-    (0x2CD4, 'M', 'ⳕ'),
-    (0x2CD5, 'V'),
-    (0x2CD6, 'M', 'ⳗ'),
-    (0x2CD7, 'V'),
-    (0x2CD8, 'M', 'ⳙ'),
-    (0x2CD9, 'V'),
-    (0x2CDA, 'M', 'ⳛ'),
-    (0x2CDB, 'V'),
-    (0x2CDC, 'M', 'ⳝ'),
-    (0x2CDD, 'V'),
-    (0x2CDE, 'M', 'ⳟ'),
-    (0x2CDF, 'V'),
-    (0x2CE0, 'M', 'ⳡ'),
-    (0x2CE1, 'V'),
-    (0x2CE2, 'M', 'ⳣ'),
-    (0x2CE3, 'V'),
-    (0x2CEB, 'M', 'ⳬ'),
-    (0x2CEC, 'V'),
-    (0x2CED, 'M', 'ⳮ'),
-    (0x2CEE, 'V'),
-    (0x2CF2, 'M', 'ⳳ'),
-    (0x2CF3, 'V'),
-    (0x2CF4, 'X'),
-    (0x2CF9, 'V'),
-    (0x2D26, 'X'),
-    (0x2D27, 'V'),
-    (0x2D28, 'X'),
-    (0x2D2D, 'V'),
-    (0x2D2E, 'X'),
-    (0x2D30, 'V'),
-    (0x2D68, 'X'),
-    (0x2D6F, 'M', 'ⵡ'),
-    (0x2D70, 'V'),
-    (0x2D71, 'X'),
-    (0x2D7F, 'V'),
-    (0x2D97, 'X'),
-    (0x2DA0, 'V'),
-    (0x2DA7, 'X'),
-    (0x2DA8, 'V'),
-    (0x2DAF, 'X'),
-    (0x2DB0, 'V'),
-    (0x2DB7, 'X'),
-    (0x2DB8, 'V'),
-    (0x2DBF, 'X'),
-    (0x2DC0, 'V'),
-    (0x2DC7, 'X'),
-    (0x2DC8, 'V'),
-    (0x2DCF, 'X'),
-    (0x2DD0, 'V'),
-    (0x2DD7, 'X'),
-    (0x2DD8, 'V'),
-    (0x2DDF, 'X'),
-    (0x2DE0, 'V'),
-    (0x2E5E, 'X'),
-    (0x2E80, 'V'),
-    (0x2E9A, 'X'),
-    (0x2E9B, 'V'),
-    (0x2E9F, 'M', '母'),
-    (0x2EA0, 'V'),
-    (0x2EF3, 'M', '龟'),
-    (0x2EF4, 'X'),
-    (0x2F00, 'M', '一'),
-    (0x2F01, 'M', '丨'),
-    (0x2F02, 'M', '丶'),
-    (0x2F03, 'M', '丿'),
-    (0x2F04, 'M', '乙'),
-    (0x2F05, 'M', '亅'),
-    (0x2F06, 'M', '二'),
-    (0x2F07, 'M', '亠'),
-    (0x2F08, 'M', '人'),
-    (0x2F09, 'M', '儿'),
-    (0x2F0A, 'M', '入'),
-    (0x2F0B, 'M', '八'),
-    (0x2F0C, 'M', '冂'),
-    (0x2F0D, 'M', '冖'),
-    (0x2F0E, 'M', '冫'),
-    (0x2F0F, 'M', '几'),
-    (0x2F10, 'M', '凵'),
-    (0x2F11, 'M', '刀'),
-    (0x2F12, 'M', '力'),
-    (0x2F13, 'M', '勹'),
-    (0x2F14, 'M', '匕'),
-    (0x2F15, 'M', '匚'),
-    (0x2F16, 'M', '匸'),
-    (0x2F17, 'M', '十'),
-    (0x2F18, 'M', '卜'),
-    (0x2F19, 'M', '卩'),
+        (0x2CC7, "V"),
+        (0x2CC8, "M", "ⳉ"),
+        (0x2CC9, "V"),
+        (0x2CCA, "M", "ⳋ"),
+        (0x2CCB, "V"),
+        (0x2CCC, "M", "ⳍ"),
+        (0x2CCD, "V"),
+        (0x2CCE, "M", "ⳏ"),
+        (0x2CCF, "V"),
+        (0x2CD0, "M", "ⳑ"),
+        (0x2CD1, "V"),
+        (0x2CD2, "M", "ⳓ"),
+        (0x2CD3, "V"),
+        (0x2CD4, "M", "ⳕ"),
+        (0x2CD5, "V"),
+        (0x2CD6, "M", "ⳗ"),
+        (0x2CD7, "V"),
+        (0x2CD8, "M", "ⳙ"),
+        (0x2CD9, "V"),
+        (0x2CDA, "M", "ⳛ"),
+        (0x2CDB, "V"),
+        (0x2CDC, "M", "ⳝ"),
+        (0x2CDD, "V"),
+        (0x2CDE, "M", "ⳟ"),
+        (0x2CDF, "V"),
+        (0x2CE0, "M", "ⳡ"),
+        (0x2CE1, "V"),
+        (0x2CE2, "M", "ⳣ"),
+        (0x2CE3, "V"),
+        (0x2CEB, "M", "ⳬ"),
+        (0x2CEC, "V"),
+        (0x2CED, "M", "ⳮ"),
+        (0x2CEE, "V"),
+        (0x2CF2, "M", "ⳳ"),
+        (0x2CF3, "V"),
+        (0x2CF4, "X"),
+        (0x2CF9, "V"),
+        (0x2D26, "X"),
+        (0x2D27, "V"),
+        (0x2D28, "X"),
+        (0x2D2D, "V"),
+        (0x2D2E, "X"),
+        (0x2D30, "V"),
+        (0x2D68, "X"),
+        (0x2D6F, "M", "ⵡ"),
+        (0x2D70, "V"),
+        (0x2D71, "X"),
+        (0x2D7F, "V"),
+        (0x2D97, "X"),
+        (0x2DA0, "V"),
+        (0x2DA7, "X"),
+        (0x2DA8, "V"),
+        (0x2DAF, "X"),
+        (0x2DB0, "V"),
+        (0x2DB7, "X"),
+        (0x2DB8, "V"),
+        (0x2DBF, "X"),
+        (0x2DC0, "V"),
+        (0x2DC7, "X"),
+        (0x2DC8, "V"),
+        (0x2DCF, "X"),
+        (0x2DD0, "V"),
+        (0x2DD7, "X"),
+        (0x2DD8, "V"),
+        (0x2DDF, "X"),
+        (0x2DE0, "V"),
+        (0x2E5E, "X"),
+        (0x2E80, "V"),
+        (0x2E9A, "X"),
+        (0x2E9B, "V"),
+        (0x2E9F, "M", "母"),
+        (0x2EA0, "V"),
+        (0x2EF3, "M", "龟"),
+        (0x2EF4, "X"),
+        (0x2F00, "M", "一"),
+        (0x2F01, "M", "丨"),
+        (0x2F02, "M", "丶"),
+        (0x2F03, "M", "丿"),
+        (0x2F04, "M", "乙"),
+        (0x2F05, "M", "亅"),
+        (0x2F06, "M", "二"),
+        (0x2F07, "M", "亠"),
+        (0x2F08, "M", "人"),
+        (0x2F09, "M", "儿"),
+        (0x2F0A, "M", "入"),
+        (0x2F0B, "M", "八"),
+        (0x2F0C, "M", "冂"),
+        (0x2F0D, "M", "冖"),
+        (0x2F0E, "M", "冫"),
+        (0x2F0F, "M", "几"),
+        (0x2F10, "M", "凵"),
+        (0x2F11, "M", "刀"),
+        (0x2F12, "M", "力"),
+        (0x2F13, "M", "勹"),
+        (0x2F14, "M", "匕"),
+        (0x2F15, "M", "匚"),
+        (0x2F16, "M", "匸"),
+        (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', '又'),
-    (0x2F1D, 'M', '口'),
-    (0x2F1E, 'M', '囗'),
-    (0x2F1F, 'M', '土'),
-    (0x2F20, 'M', '士'),
-    (0x2F21, 'M', '夂'),
-    (0x2F22, 'M', '夊'),
-    (0x2F23, 'M', '夕'),
-    (0x2F24, 'M', '大'),
-    (0x2F25, 'M', '女'),
-    (0x2F26, 'M', '子'),
-    (0x2F27, 'M', '宀'),
-    (0x2F28, 'M', '寸'),
-    (0x2F29, 'M', '小'),
-    (0x2F2A, 'M', '尢'),
-    (0x2F2B, 'M', '尸'),
-    (0x2F2C, 'M', '屮'),
-    (0x2F2D, 'M', '山'),
-    (0x2F2E, 'M', '巛'),
-    (0x2F2F, 'M', '工'),
-    (0x2F30, 'M', '己'),
-    (0x2F31, 'M', '巾'),
-    (0x2F32, 'M', '干'),
-    (0x2F33, 'M', '幺'),
-    (0x2F34, 'M', '广'),
-    (0x2F35, 'M', '廴'),
-    (0x2F36, 'M', '廾'),
-    (0x2F37, 'M', '弋'),
-    (0x2F38, 'M', '弓'),
-    (0x2F39, 'M', '彐'),
-    (0x2F3A, 'M', '彡'),
-    (0x2F3B, 'M', '彳'),
-    (0x2F3C, 'M', '心'),
-    (0x2F3D, 'M', '戈'),
-    (0x2F3E, 'M', '戶'),
-    (0x2F3F, 'M', '手'),
-    (0x2F40, 'M', '支'),
-    (0x2F41, 'M', '攴'),
-    (0x2F42, 'M', '文'),
-    (0x2F43, 'M', '斗'),
-    (0x2F44, 'M', '斤'),
-    (0x2F45, 'M', '方'),
-    (0x2F46, 'M', '无'),
-    (0x2F47, 'M', '日'),
-    (0x2F48, 'M', '曰'),
-    (0x2F49, 'M', '月'),
-    (0x2F4A, 'M', '木'),
-    (0x2F4B, 'M', '欠'),
-    (0x2F4C, 'M', '止'),
-    (0x2F4D, 'M', '歹'),
-    (0x2F4E, 'M', '殳'),
-    (0x2F4F, 'M', '毋'),
-    (0x2F50, 'M', '比'),
-    (0x2F51, 'M', '毛'),
-    (0x2F52, 'M', '氏'),
-    (0x2F53, 'M', '气'),
-    (0x2F54, 'M', '水'),
-    (0x2F55, 'M', '火'),
-    (0x2F56, 'M', '爪'),
-    (0x2F57, 'M', '父'),
-    (0x2F58, 'M', '爻'),
-    (0x2F59, 'M', '爿'),
-    (0x2F5A, 'M', '片'),
-    (0x2F5B, 'M', '牙'),
-    (0x2F5C, 'M', '牛'),
-    (0x2F5D, 'M', '犬'),
-    (0x2F5E, 'M', '玄'),
-    (0x2F5F, 'M', '玉'),
-    (0x2F60, 'M', '瓜'),
-    (0x2F61, 'M', '瓦'),
-    (0x2F62, 'M', '甘'),
-    (0x2F63, 'M', '生'),
-    (0x2F64, 'M', '用'),
-    (0x2F65, 'M', '田'),
-    (0x2F66, 'M', '疋'),
-    (0x2F67, 'M', '疒'),
-    (0x2F68, 'M', '癶'),
-    (0x2F69, 'M', '白'),
-    (0x2F6A, 'M', '皮'),
-    (0x2F6B, 'M', '皿'),
-    (0x2F6C, 'M', '目'),
-    (0x2F6D, 'M', '矛'),
-    (0x2F6E, 'M', '矢'),
-    (0x2F6F, 'M', '石'),
-    (0x2F70, 'M', '示'),
-    (0x2F71, 'M', '禸'),
-    (0x2F72, 'M', '禾'),
-    (0x2F73, 'M', '穴'),
-    (0x2F74, 'M', '立'),
-    (0x2F75, 'M', '竹'),
-    (0x2F76, 'M', '米'),
-    (0x2F77, 'M', '糸'),
-    (0x2F78, 'M', '缶'),
-    (0x2F79, 'M', '网'),
-    (0x2F7A, 'M', '羊'),
-    (0x2F7B, 'M', '羽'),
-    (0x2F7C, 'M', '老'),
-    (0x2F7D, 'M', '而'),
+        (0x2F1A, "M", "厂"),
+        (0x2F1B, "M", "厶"),
+        (0x2F1C, "M", "又"),
+        (0x2F1D, "M", "口"),
+        (0x2F1E, "M", "囗"),
+        (0x2F1F, "M", "土"),
+        (0x2F20, "M", "士"),
+        (0x2F21, "M", "夂"),
+        (0x2F22, "M", "夊"),
+        (0x2F23, "M", "夕"),
+        (0x2F24, "M", "大"),
+        (0x2F25, "M", "女"),
+        (0x2F26, "M", "子"),
+        (0x2F27, "M", "宀"),
+        (0x2F28, "M", "寸"),
+        (0x2F29, "M", "小"),
+        (0x2F2A, "M", "尢"),
+        (0x2F2B, "M", "尸"),
+        (0x2F2C, "M", "屮"),
+        (0x2F2D, "M", "山"),
+        (0x2F2E, "M", "巛"),
+        (0x2F2F, "M", "工"),
+        (0x2F30, "M", "己"),
+        (0x2F31, "M", "巾"),
+        (0x2F32, "M", "干"),
+        (0x2F33, "M", "幺"),
+        (0x2F34, "M", "广"),
+        (0x2F35, "M", "廴"),
+        (0x2F36, "M", "廾"),
+        (0x2F37, "M", "弋"),
+        (0x2F38, "M", "弓"),
+        (0x2F39, "M", "彐"),
+        (0x2F3A, "M", "彡"),
+        (0x2F3B, "M", "彳"),
+        (0x2F3C, "M", "心"),
+        (0x2F3D, "M", "戈"),
+        (0x2F3E, "M", "戶"),
+        (0x2F3F, "M", "手"),
+        (0x2F40, "M", "支"),
+        (0x2F41, "M", "攴"),
+        (0x2F42, "M", "文"),
+        (0x2F43, "M", "斗"),
+        (0x2F44, "M", "斤"),
+        (0x2F45, "M", "方"),
+        (0x2F46, "M", "无"),
+        (0x2F47, "M", "日"),
+        (0x2F48, "M", "曰"),
+        (0x2F49, "M", "月"),
+        (0x2F4A, "M", "木"),
+        (0x2F4B, "M", "欠"),
+        (0x2F4C, "M", "止"),
+        (0x2F4D, "M", "歹"),
+        (0x2F4E, "M", "殳"),
+        (0x2F4F, "M", "毋"),
+        (0x2F50, "M", "比"),
+        (0x2F51, "M", "毛"),
+        (0x2F52, "M", "氏"),
+        (0x2F53, "M", "气"),
+        (0x2F54, "M", "水"),
+        (0x2F55, "M", "火"),
+        (0x2F56, "M", "爪"),
+        (0x2F57, "M", "父"),
+        (0x2F58, "M", "爻"),
+        (0x2F59, "M", "爿"),
+        (0x2F5A, "M", "片"),
+        (0x2F5B, "M", "牙"),
+        (0x2F5C, "M", "牛"),
+        (0x2F5D, "M", "犬"),
+        (0x2F5E, "M", "玄"),
+        (0x2F5F, "M", "玉"),
+        (0x2F60, "M", "瓜"),
+        (0x2F61, "M", "瓦"),
+        (0x2F62, "M", "甘"),
+        (0x2F63, "M", "生"),
+        (0x2F64, "M", "用"),
+        (0x2F65, "M", "田"),
+        (0x2F66, "M", "疋"),
+        (0x2F67, "M", "疒"),
+        (0x2F68, "M", "癶"),
+        (0x2F69, "M", "白"),
+        (0x2F6A, "M", "皮"),
+        (0x2F6B, "M", "皿"),
+        (0x2F6C, "M", "目"),
+        (0x2F6D, "M", "矛"),
+        (0x2F6E, "M", "矢"),
+        (0x2F6F, "M", "石"),
+        (0x2F70, "M", "示"),
+        (0x2F71, "M", "禸"),
+        (0x2F72, "M", "禾"),
+        (0x2F73, "M", "穴"),
+        (0x2F74, "M", "立"),
+        (0x2F75, "M", "竹"),
+        (0x2F76, "M", "米"),
+        (0x2F77, "M", "糸"),
+        (0x2F78, "M", "缶"),
+        (0x2F79, "M", "网"),
+        (0x2F7A, "M", "羊"),
+        (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', '聿'),
-    (0x2F81, 'M', '肉'),
-    (0x2F82, 'M', '臣'),
-    (0x2F83, 'M', '自'),
-    (0x2F84, 'M', '至'),
-    (0x2F85, 'M', '臼'),
-    (0x2F86, 'M', '舌'),
-    (0x2F87, 'M', '舛'),
-    (0x2F88, 'M', '舟'),
-    (0x2F89, 'M', '艮'),
-    (0x2F8A, 'M', '色'),
-    (0x2F8B, 'M', '艸'),
-    (0x2F8C, 'M', '虍'),
-    (0x2F8D, 'M', '虫'),
-    (0x2F8E, 'M', '血'),
-    (0x2F8F, 'M', '行'),
-    (0x2F90, 'M', '衣'),
-    (0x2F91, 'M', '襾'),
-    (0x2F92, 'M', '見'),
-    (0x2F93, 'M', '角'),
-    (0x2F94, 'M', '言'),
-    (0x2F95, 'M', '谷'),
-    (0x2F96, 'M', '豆'),
-    (0x2F97, 'M', '豕'),
-    (0x2F98, 'M', '豸'),
-    (0x2F99, 'M', '貝'),
-    (0x2F9A, 'M', '赤'),
-    (0x2F9B, 'M', '走'),
-    (0x2F9C, 'M', '足'),
-    (0x2F9D, 'M', '身'),
-    (0x2F9E, 'M', '車'),
-    (0x2F9F, 'M', '辛'),
-    (0x2FA0, 'M', '辰'),
-    (0x2FA1, 'M', '辵'),
-    (0x2FA2, 'M', '邑'),
-    (0x2FA3, 'M', '酉'),
-    (0x2FA4, 'M', '釆'),
-    (0x2FA5, 'M', '里'),
-    (0x2FA6, 'M', '金'),
-    (0x2FA7, 'M', '長'),
-    (0x2FA8, 'M', '門'),
-    (0x2FA9, 'M', '阜'),
-    (0x2FAA, 'M', '隶'),
-    (0x2FAB, 'M', '隹'),
-    (0x2FAC, 'M', '雨'),
-    (0x2FAD, 'M', '靑'),
-    (0x2FAE, 'M', '非'),
-    (0x2FAF, 'M', '面'),
-    (0x2FB0, 'M', '革'),
-    (0x2FB1, 'M', '韋'),
-    (0x2FB2, 'M', '韭'),
-    (0x2FB3, 'M', '音'),
-    (0x2FB4, 'M', '頁'),
-    (0x2FB5, 'M', '風'),
-    (0x2FB6, 'M', '飛'),
-    (0x2FB7, 'M', '食'),
-    (0x2FB8, 'M', '首'),
-    (0x2FB9, 'M', '香'),
-    (0x2FBA, 'M', '馬'),
-    (0x2FBB, 'M', '骨'),
-    (0x2FBC, 'M', '高'),
-    (0x2FBD, 'M', '髟'),
-    (0x2FBE, 'M', '鬥'),
-    (0x2FBF, 'M', '鬯'),
-    (0x2FC0, 'M', '鬲'),
-    (0x2FC1, 'M', '鬼'),
-    (0x2FC2, 'M', '魚'),
-    (0x2FC3, 'M', '鳥'),
-    (0x2FC4, 'M', '鹵'),
-    (0x2FC5, 'M', '鹿'),
-    (0x2FC6, 'M', '麥'),
-    (0x2FC7, 'M', '麻'),
-    (0x2FC8, 'M', '黃'),
-    (0x2FC9, 'M', '黍'),
-    (0x2FCA, 'M', '黑'),
-    (0x2FCB, 'M', '黹'),
-    (0x2FCC, 'M', '黽'),
-    (0x2FCD, 'M', '鼎'),
-    (0x2FCE, 'M', '鼓'),
-    (0x2FCF, 'M', '鼠'),
-    (0x2FD0, 'M', '鼻'),
-    (0x2FD1, 'M', '齊'),
-    (0x2FD2, 'M', '齒'),
-    (0x2FD3, 'M', '龍'),
-    (0x2FD4, 'M', '龜'),
-    (0x2FD5, 'M', '龠'),
-    (0x2FD6, 'X'),
-    (0x3000, '3', ' '),
-    (0x3001, 'V'),
-    (0x3002, 'M', '.'),
-    (0x3003, 'V'),
-    (0x3036, 'M', '〒'),
-    (0x3037, 'V'),
-    (0x3038, 'M', '十'),
-    (0x3039, 'M', '卄'),
-    (0x303A, 'M', '卅'),
-    (0x303B, 'V'),
-    (0x3040, 'X'),
+        (0x2F7E, "M", "耒"),
+        (0x2F7F, "M", "耳"),
+        (0x2F80, "M", "聿"),
+        (0x2F81, "M", "肉"),
+        (0x2F82, "M", "臣"),
+        (0x2F83, "M", "自"),
+        (0x2F84, "M", "至"),
+        (0x2F85, "M", "臼"),
+        (0x2F86, "M", "舌"),
+        (0x2F87, "M", "舛"),
+        (0x2F88, "M", "舟"),
+        (0x2F89, "M", "艮"),
+        (0x2F8A, "M", "色"),
+        (0x2F8B, "M", "艸"),
+        (0x2F8C, "M", "虍"),
+        (0x2F8D, "M", "虫"),
+        (0x2F8E, "M", "血"),
+        (0x2F8F, "M", "行"),
+        (0x2F90, "M", "衣"),
+        (0x2F91, "M", "襾"),
+        (0x2F92, "M", "見"),
+        (0x2F93, "M", "角"),
+        (0x2F94, "M", "言"),
+        (0x2F95, "M", "谷"),
+        (0x2F96, "M", "豆"),
+        (0x2F97, "M", "豕"),
+        (0x2F98, "M", "豸"),
+        (0x2F99, "M", "貝"),
+        (0x2F9A, "M", "赤"),
+        (0x2F9B, "M", "走"),
+        (0x2F9C, "M", "足"),
+        (0x2F9D, "M", "身"),
+        (0x2F9E, "M", "車"),
+        (0x2F9F, "M", "辛"),
+        (0x2FA0, "M", "辰"),
+        (0x2FA1, "M", "辵"),
+        (0x2FA2, "M", "邑"),
+        (0x2FA3, "M", "酉"),
+        (0x2FA4, "M", "釆"),
+        (0x2FA5, "M", "里"),
+        (0x2FA6, "M", "金"),
+        (0x2FA7, "M", "長"),
+        (0x2FA8, "M", "門"),
+        (0x2FA9, "M", "阜"),
+        (0x2FAA, "M", "隶"),
+        (0x2FAB, "M", "隹"),
+        (0x2FAC, "M", "雨"),
+        (0x2FAD, "M", "靑"),
+        (0x2FAE, "M", "非"),
+        (0x2FAF, "M", "面"),
+        (0x2FB0, "M", "革"),
+        (0x2FB1, "M", "韋"),
+        (0x2FB2, "M", "韭"),
+        (0x2FB3, "M", "音"),
+        (0x2FB4, "M", "頁"),
+        (0x2FB5, "M", "風"),
+        (0x2FB6, "M", "飛"),
+        (0x2FB7, "M", "食"),
+        (0x2FB8, "M", "首"),
+        (0x2FB9, "M", "香"),
+        (0x2FBA, "M", "馬"),
+        (0x2FBB, "M", "骨"),
+        (0x2FBC, "M", "高"),
+        (0x2FBD, "M", "髟"),
+        (0x2FBE, "M", "鬥"),
+        (0x2FBF, "M", "鬯"),
+        (0x2FC0, "M", "鬲"),
+        (0x2FC1, "M", "鬼"),
+        (0x2FC2, "M", "魚"),
+        (0x2FC3, "M", "鳥"),
+        (0x2FC4, "M", "鹵"),
+        (0x2FC5, "M", "鹿"),
+        (0x2FC6, "M", "麥"),
+        (0x2FC7, "M", "麻"),
+        (0x2FC8, "M", "黃"),
+        (0x2FC9, "M", "黍"),
+        (0x2FCA, "M", "黑"),
+        (0x2FCB, "M", "黹"),
+        (0x2FCC, "M", "黽"),
+        (0x2FCD, "M", "鼎"),
+        (0x2FCE, "M", "鼓"),
+        (0x2FCF, "M", "鼠"),
+        (0x2FD0, "M", "鼻"),
+        (0x2FD1, "M", "齊"),
+        (0x2FD2, "M", "齒"),
+        (0x2FD3, "M", "龍"),
+        (0x2FD4, "M", "龜"),
+        (0x2FD5, "M", "龠"),
+        (0x2FD6, "X"),
+        (0x3000, "3", " "),
+        (0x3001, "V"),
+        (0x3002, "M", "."),
+        (0x3003, "V"),
+        (0x3036, "M", "〒"),
+        (0x3037, "V"),
+        (0x3038, "M", "十"),
+        (0x3039, "M", "卄"),
+        (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', ' ゚'),
-    (0x309D, 'V'),
-    (0x309F, 'M', 'より'),
-    (0x30A0, 'V'),
-    (0x30FF, 'M', 'コト'),
-    (0x3100, 'X'),
-    (0x3105, 'V'),
-    (0x3130, 'X'),
-    (0x3131, 'M', 'ᄀ'),
-    (0x3132, 'M', 'ᄁ'),
-    (0x3133, 'M', 'ᆪ'),
-    (0x3134, 'M', 'ᄂ'),
-    (0x3135, 'M', 'ᆬ'),
-    (0x3136, 'M', 'ᆭ'),
-    (0x3137, 'M', 'ᄃ'),
-    (0x3138, 'M', 'ᄄ'),
-    (0x3139, 'M', 'ᄅ'),
-    (0x313A, 'M', 'ᆰ'),
-    (0x313B, 'M', 'ᆱ'),
-    (0x313C, 'M', 'ᆲ'),
-    (0x313D, 'M', 'ᆳ'),
-    (0x313E, 'M', 'ᆴ'),
-    (0x313F, 'M', 'ᆵ'),
-    (0x3140, 'M', 'ᄚ'),
-    (0x3141, 'M', 'ᄆ'),
-    (0x3142, 'M', 'ᄇ'),
-    (0x3143, 'M', 'ᄈ'),
-    (0x3144, 'M', 'ᄡ'),
-    (0x3145, 'M', 'ᄉ'),
-    (0x3146, 'M', 'ᄊ'),
-    (0x3147, 'M', 'ᄋ'),
-    (0x3148, 'M', 'ᄌ'),
-    (0x3149, 'M', 'ᄍ'),
-    (0x314A, 'M', 'ᄎ'),
-    (0x314B, 'M', 'ᄏ'),
-    (0x314C, 'M', 'ᄐ'),
-    (0x314D, 'M', 'ᄑ'),
-    (0x314E, 'M', 'ᄒ'),
-    (0x314F, 'M', 'ᅡ'),
-    (0x3150, 'M', 'ᅢ'),
-    (0x3151, 'M', 'ᅣ'),
-    (0x3152, 'M', 'ᅤ'),
-    (0x3153, 'M', 'ᅥ'),
-    (0x3154, 'M', 'ᅦ'),
-    (0x3155, 'M', 'ᅧ'),
-    (0x3156, 'M', 'ᅨ'),
-    (0x3157, 'M', 'ᅩ'),
-    (0x3158, 'M', 'ᅪ'),
-    (0x3159, 'M', 'ᅫ'),
-    (0x315A, 'M', 'ᅬ'),
-    (0x315B, 'M', 'ᅭ'),
-    (0x315C, 'M', 'ᅮ'),
-    (0x315D, 'M', 'ᅯ'),
-    (0x315E, 'M', 'ᅰ'),
-    (0x315F, 'M', 'ᅱ'),
-    (0x3160, 'M', 'ᅲ'),
-    (0x3161, 'M', 'ᅳ'),
-    (0x3162, 'M', 'ᅴ'),
-    (0x3163, 'M', 'ᅵ'),
-    (0x3164, 'X'),
-    (0x3165, 'M', 'ᄔ'),
-    (0x3166, 'M', 'ᄕ'),
-    (0x3167, 'M', 'ᇇ'),
-    (0x3168, 'M', 'ᇈ'),
-    (0x3169, 'M', 'ᇌ'),
-    (0x316A, 'M', 'ᇎ'),
-    (0x316B, 'M', 'ᇓ'),
-    (0x316C, 'M', 'ᇗ'),
-    (0x316D, 'M', 'ᇙ'),
-    (0x316E, 'M', 'ᄜ'),
-    (0x316F, 'M', 'ᇝ'),
-    (0x3170, 'M', 'ᇟ'),
-    (0x3171, 'M', 'ᄝ'),
-    (0x3172, 'M', 'ᄞ'),
-    (0x3173, 'M', 'ᄠ'),
-    (0x3174, 'M', 'ᄢ'),
-    (0x3175, 'M', 'ᄣ'),
-    (0x3176, 'M', 'ᄧ'),
-    (0x3177, 'M', 'ᄩ'),
-    (0x3178, 'M', 'ᄫ'),
-    (0x3179, 'M', 'ᄬ'),
-    (0x317A, 'M', 'ᄭ'),
-    (0x317B, 'M', 'ᄮ'),
-    (0x317C, 'M', 'ᄯ'),
-    (0x317D, 'M', 'ᄲ'),
-    (0x317E, 'M', 'ᄶ'),
-    (0x317F, 'M', 'ᅀ'),
-    (0x3180, 'M', 'ᅇ'),
-    (0x3181, 'M', 'ᅌ'),
-    (0x3182, 'M', 'ᇱ'),
-    (0x3183, 'M', 'ᇲ'),
-    (0x3184, 'M', 'ᅗ'),
-    (0x3185, 'M', 'ᅘ'),
-    (0x3186, 'M', 'ᅙ'),
-    (0x3187, 'M', 'ᆄ'),
-    (0x3188, 'M', 'ᆅ'),
+        (0x3041, "V"),
+        (0x3097, "X"),
+        (0x3099, "V"),
+        (0x309B, "3", " ゙"),
+        (0x309C, "3", " ゚"),
+        (0x309D, "V"),
+        (0x309F, "M", "より"),
+        (0x30A0, "V"),
+        (0x30FF, "M", "コト"),
+        (0x3100, "X"),
+        (0x3105, "V"),
+        (0x3130, "X"),
+        (0x3131, "M", "ᄀ"),
+        (0x3132, "M", "ᄁ"),
+        (0x3133, "M", "ᆪ"),
+        (0x3134, "M", "ᄂ"),
+        (0x3135, "M", "ᆬ"),
+        (0x3136, "M", "ᆭ"),
+        (0x3137, "M", "ᄃ"),
+        (0x3138, "M", "ᄄ"),
+        (0x3139, "M", "ᄅ"),
+        (0x313A, "M", "ᆰ"),
+        (0x313B, "M", "ᆱ"),
+        (0x313C, "M", "ᆲ"),
+        (0x313D, "M", "ᆳ"),
+        (0x313E, "M", "ᆴ"),
+        (0x313F, "M", "ᆵ"),
+        (0x3140, "M", "ᄚ"),
+        (0x3141, "M", "ᄆ"),
+        (0x3142, "M", "ᄇ"),
+        (0x3143, "M", "ᄈ"),
+        (0x3144, "M", "ᄡ"),
+        (0x3145, "M", "ᄉ"),
+        (0x3146, "M", "ᄊ"),
+        (0x3147, "M", "ᄋ"),
+        (0x3148, "M", "ᄌ"),
+        (0x3149, "M", "ᄍ"),
+        (0x314A, "M", "ᄎ"),
+        (0x314B, "M", "ᄏ"),
+        (0x314C, "M", "ᄐ"),
+        (0x314D, "M", "ᄑ"),
+        (0x314E, "M", "ᄒ"),
+        (0x314F, "M", "ᅡ"),
+        (0x3150, "M", "ᅢ"),
+        (0x3151, "M", "ᅣ"),
+        (0x3152, "M", "ᅤ"),
+        (0x3153, "M", "ᅥ"),
+        (0x3154, "M", "ᅦ"),
+        (0x3155, "M", "ᅧ"),
+        (0x3156, "M", "ᅨ"),
+        (0x3157, "M", "ᅩ"),
+        (0x3158, "M", "ᅪ"),
+        (0x3159, "M", "ᅫ"),
+        (0x315A, "M", "ᅬ"),
+        (0x315B, "M", "ᅭ"),
+        (0x315C, "M", "ᅮ"),
+        (0x315D, "M", "ᅯ"),
+        (0x315E, "M", "ᅰ"),
+        (0x315F, "M", "ᅱ"),
+        (0x3160, "M", "ᅲ"),
+        (0x3161, "M", "ᅳ"),
+        (0x3162, "M", "ᅴ"),
+        (0x3163, "M", "ᅵ"),
+        (0x3164, "X"),
+        (0x3165, "M", "ᄔ"),
+        (0x3166, "M", "ᄕ"),
+        (0x3167, "M", "ᇇ"),
+        (0x3168, "M", "ᇈ"),
+        (0x3169, "M", "ᇌ"),
+        (0x316A, "M", "ᇎ"),
+        (0x316B, "M", "ᇓ"),
+        (0x316C, "M", "ᇗ"),
+        (0x316D, "M", "ᇙ"),
+        (0x316E, "M", "ᄜ"),
+        (0x316F, "M", "ᇝ"),
+        (0x3170, "M", "ᇟ"),
+        (0x3171, "M", "ᄝ"),
+        (0x3172, "M", "ᄞ"),
+        (0x3173, "M", "ᄠ"),
+        (0x3174, "M", "ᄢ"),
+        (0x3175, "M", "ᄣ"),
+        (0x3176, "M", "ᄧ"),
+        (0x3177, "M", "ᄩ"),
+        (0x3178, "M", "ᄫ"),
+        (0x3179, "M", "ᄬ"),
+        (0x317A, "M", "ᄭ"),
+        (0x317B, "M", "ᄮ"),
+        (0x317C, "M", "ᄯ"),
+        (0x317D, "M", "ᄲ"),
+        (0x317E, "M", "ᄶ"),
+        (0x317F, "M", "ᅀ"),
+        (0x3180, "M", "ᅇ"),
+        (0x3181, "M", "ᅌ"),
+        (0x3182, "M", "ᇱ"),
+        (0x3183, "M", "ᇲ"),
+        (0x3184, "M", "ᅗ"),
+        (0x3185, "M", "ᅘ"),
+        (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', 'ᆒ'),
-    (0x318C, 'M', 'ᆔ'),
-    (0x318D, 'M', 'ᆞ'),
-    (0x318E, 'M', 'ᆡ'),
-    (0x318F, 'X'),
-    (0x3190, 'V'),
-    (0x3192, 'M', '一'),
-    (0x3193, 'M', '二'),
-    (0x3194, 'M', '三'),
-    (0x3195, 'M', '四'),
-    (0x3196, 'M', '上'),
-    (0x3197, 'M', '中'),
-    (0x3198, 'M', '下'),
-    (0x3199, 'M', '甲'),
-    (0x319A, 'M', '乙'),
-    (0x319B, 'M', '丙'),
-    (0x319C, 'M', '丁'),
-    (0x319D, 'M', '天'),
-    (0x319E, 'M', '地'),
-    (0x319F, 'M', '人'),
-    (0x31A0, 'V'),
-    (0x31E4, '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', '(오후)'),
-    (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', '(至)'),
-    (0x3244, 'M', '問'),
-    (0x3245, 'M', '幼'),
-    (0x3246, 'M', '文'),
-    (0x3247, 'M', '箏'),
-    (0x3248, 'V'),
-    (0x3250, 'M', 'pte'),
-    (0x3251, 'M', '21'),
+        (0x3189, "M", "ᆈ"),
+        (0x318A, "M", "ᆑ"),
+        (0x318B, "M", "ᆒ"),
+        (0x318C, "M", "ᆔ"),
+        (0x318D, "M", "ᆞ"),
+        (0x318E, "M", "ᆡ"),
+        (0x318F, "X"),
+        (0x3190, "V"),
+        (0x3192, "M", "一"),
+        (0x3193, "M", "二"),
+        (0x3194, "M", "三"),
+        (0x3195, "M", "四"),
+        (0x3196, "M", "上"),
+        (0x3197, "M", "中"),
+        (0x3198, "M", "下"),
+        (0x3199, "M", "甲"),
+        (0x319A, "M", "乙"),
+        (0x319B, "M", "丙"),
+        (0x319C, "M", "丁"),
+        (0x319D, "M", "天"),
+        (0x319E, "M", "地"),
+        (0x319F, "M", "人"),
+        (0x31A0, "V"),
+        (0x31E4, "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", "(오후)"),
+        (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", "(至)"),
+        (0x3244, "M", "問"),
+        (0x3245, "M", "幼"),
+        (0x3246, "M", "文"),
+        (0x3247, "M", "箏"),
+        (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'),
-    (0x3255, 'M', '25'),
-    (0x3256, 'M', '26'),
-    (0x3257, 'M', '27'),
-    (0x3258, 'M', '28'),
-    (0x3259, 'M', '29'),
-    (0x325A, 'M', '30'),
-    (0x325B, 'M', '31'),
-    (0x325C, 'M', '32'),
-    (0x325D, 'M', '33'),
-    (0x325E, 'M', '34'),
-    (0x325F, 'M', '35'),
-    (0x3260, 'M', 'ᄀ'),
-    (0x3261, 'M', 'ᄂ'),
-    (0x3262, 'M', 'ᄃ'),
-    (0x3263, 'M', 'ᄅ'),
-    (0x3264, 'M', 'ᄆ'),
-    (0x3265, 'M', 'ᄇ'),
-    (0x3266, 'M', 'ᄉ'),
-    (0x3267, 'M', 'ᄋ'),
-    (0x3268, 'M', 'ᄌ'),
-    (0x3269, 'M', 'ᄎ'),
-    (0x326A, 'M', 'ᄏ'),
-    (0x326B, 'M', 'ᄐ'),
-    (0x326C, 'M', 'ᄑ'),
-    (0x326D, 'M', 'ᄒ'),
-    (0x326E, 'M', '가'),
-    (0x326F, 'M', '나'),
-    (0x3270, 'M', '다'),
-    (0x3271, 'M', '라'),
-    (0x3272, 'M', '마'),
-    (0x3273, 'M', '바'),
-    (0x3274, 'M', '사'),
-    (0x3275, 'M', '아'),
-    (0x3276, 'M', '자'),
-    (0x3277, 'M', '차'),
-    (0x3278, 'M', '카'),
-    (0x3279, 'M', '타'),
-    (0x327A, 'M', '파'),
-    (0x327B, 'M', '하'),
-    (0x327C, 'M', '참고'),
-    (0x327D, 'M', '주의'),
-    (0x327E, 'M', '우'),
-    (0x327F, 'V'),
-    (0x3280, 'M', '一'),
-    (0x3281, 'M', '二'),
-    (0x3282, 'M', '三'),
-    (0x3283, 'M', '四'),
-    (0x3284, 'M', '五'),
-    (0x3285, 'M', '六'),
-    (0x3286, 'M', '七'),
-    (0x3287, 'M', '八'),
-    (0x3288, 'M', '九'),
-    (0x3289, 'M', '十'),
-    (0x328A, 'M', '月'),
-    (0x328B, 'M', '火'),
-    (0x328C, 'M', '水'),
-    (0x328D, 'M', '木'),
-    (0x328E, 'M', '金'),
-    (0x328F, 'M', '土'),
-    (0x3290, 'M', '日'),
-    (0x3291, 'M', '株'),
-    (0x3292, 'M', '有'),
-    (0x3293, 'M', '社'),
-    (0x3294, 'M', '名'),
-    (0x3295, 'M', '特'),
-    (0x3296, 'M', '財'),
-    (0x3297, 'M', '祝'),
-    (0x3298, 'M', '労'),
-    (0x3299, 'M', '秘'),
-    (0x329A, 'M', '男'),
-    (0x329B, 'M', '女'),
-    (0x329C, 'M', '適'),
-    (0x329D, 'M', '優'),
-    (0x329E, 'M', '印'),
-    (0x329F, 'M', '注'),
-    (0x32A0, 'M', '項'),
-    (0x32A1, 'M', '休'),
-    (0x32A2, 'M', '写'),
-    (0x32A3, 'M', '正'),
-    (0x32A4, 'M', '上'),
-    (0x32A5, 'M', '中'),
-    (0x32A6, 'M', '下'),
-    (0x32A7, 'M', '左'),
-    (0x32A8, 'M', '右'),
-    (0x32A9, 'M', '医'),
-    (0x32AA, 'M', '宗'),
-    (0x32AB, 'M', '学'),
-    (0x32AC, 'M', '監'),
-    (0x32AD, 'M', '企'),
-    (0x32AE, 'M', '資'),
-    (0x32AF, 'M', '協'),
-    (0x32B0, 'M', '夜'),
-    (0x32B1, 'M', '36'),
-    (0x32B2, 'M', '37'),
-    (0x32B3, 'M', '38'),
-    (0x32B4, 'M', '39'),
-    (0x32B5, 'M', '40'),
+        (0x3252, "M", "22"),
+        (0x3253, "M", "23"),
+        (0x3254, "M", "24"),
+        (0x3255, "M", "25"),
+        (0x3256, "M", "26"),
+        (0x3257, "M", "27"),
+        (0x3258, "M", "28"),
+        (0x3259, "M", "29"),
+        (0x325A, "M", "30"),
+        (0x325B, "M", "31"),
+        (0x325C, "M", "32"),
+        (0x325D, "M", "33"),
+        (0x325E, "M", "34"),
+        (0x325F, "M", "35"),
+        (0x3260, "M", "ᄀ"),
+        (0x3261, "M", "ᄂ"),
+        (0x3262, "M", "ᄃ"),
+        (0x3263, "M", "ᄅ"),
+        (0x3264, "M", "ᄆ"),
+        (0x3265, "M", "ᄇ"),
+        (0x3266, "M", "ᄉ"),
+        (0x3267, "M", "ᄋ"),
+        (0x3268, "M", "ᄌ"),
+        (0x3269, "M", "ᄎ"),
+        (0x326A, "M", "ᄏ"),
+        (0x326B, "M", "ᄐ"),
+        (0x326C, "M", "ᄑ"),
+        (0x326D, "M", "ᄒ"),
+        (0x326E, "M", "가"),
+        (0x326F, "M", "나"),
+        (0x3270, "M", "다"),
+        (0x3271, "M", "라"),
+        (0x3272, "M", "마"),
+        (0x3273, "M", "바"),
+        (0x3274, "M", "사"),
+        (0x3275, "M", "아"),
+        (0x3276, "M", "자"),
+        (0x3277, "M", "차"),
+        (0x3278, "M", "카"),
+        (0x3279, "M", "타"),
+        (0x327A, "M", "파"),
+        (0x327B, "M", "하"),
+        (0x327C, "M", "참고"),
+        (0x327D, "M", "주의"),
+        (0x327E, "M", "우"),
+        (0x327F, "V"),
+        (0x3280, "M", "一"),
+        (0x3281, "M", "二"),
+        (0x3282, "M", "三"),
+        (0x3283, "M", "四"),
+        (0x3284, "M", "五"),
+        (0x3285, "M", "六"),
+        (0x3286, "M", "七"),
+        (0x3287, "M", "八"),
+        (0x3288, "M", "九"),
+        (0x3289, "M", "十"),
+        (0x328A, "M", "月"),
+        (0x328B, "M", "火"),
+        (0x328C, "M", "水"),
+        (0x328D, "M", "木"),
+        (0x328E, "M", "金"),
+        (0x328F, "M", "土"),
+        (0x3290, "M", "日"),
+        (0x3291, "M", "株"),
+        (0x3292, "M", "有"),
+        (0x3293, "M", "社"),
+        (0x3294, "M", "名"),
+        (0x3295, "M", "特"),
+        (0x3296, "M", "財"),
+        (0x3297, "M", "祝"),
+        (0x3298, "M", "労"),
+        (0x3299, "M", "秘"),
+        (0x329A, "M", "男"),
+        (0x329B, "M", "女"),
+        (0x329C, "M", "適"),
+        (0x329D, "M", "優"),
+        (0x329E, "M", "印"),
+        (0x329F, "M", "注"),
+        (0x32A0, "M", "項"),
+        (0x32A1, "M", "休"),
+        (0x32A2, "M", "写"),
+        (0x32A3, "M", "正"),
+        (0x32A4, "M", "上"),
+        (0x32A5, "M", "中"),
+        (0x32A6, "M", "下"),
+        (0x32A7, "M", "左"),
+        (0x32A8, "M", "右"),
+        (0x32A9, "M", "医"),
+        (0x32AA, "M", "宗"),
+        (0x32AB, "M", "学"),
+        (0x32AC, "M", "監"),
+        (0x32AD, "M", "企"),
+        (0x32AE, "M", "資"),
+        (0x32AF, "M", "協"),
+        (0x32B0, "M", "夜"),
+        (0x32B1, "M", "36"),
+        (0x32B2, "M", "37"),
+        (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'),
-    (0x32B9, 'M', '44'),
-    (0x32BA, 'M', '45'),
-    (0x32BB, 'M', '46'),
-    (0x32BC, 'M', '47'),
-    (0x32BD, 'M', '48'),
-    (0x32BE, 'M', '49'),
-    (0x32BF, 'M', '50'),
-    (0x32C0, 'M', '1月'),
-    (0x32C1, 'M', '2月'),
-    (0x32C2, 'M', '3月'),
-    (0x32C3, 'M', '4月'),
-    (0x32C4, 'M', '5月'),
-    (0x32C5, 'M', '6月'),
-    (0x32C6, 'M', '7月'),
-    (0x32C7, 'M', '8月'),
-    (0x32C8, 'M', '9月'),
-    (0x32C9, 'M', '10月'),
-    (0x32CA, 'M', '11月'),
-    (0x32CB, 'M', '12月'),
-    (0x32CC, 'M', 'hg'),
-    (0x32CD, 'M', 'erg'),
-    (0x32CE, 'M', 'ev'),
-    (0x32CF, 'M', 'ltd'),
-    (0x32D0, 'M', 'ア'),
-    (0x32D1, 'M', 'イ'),
-    (0x32D2, 'M', 'ウ'),
-    (0x32D3, 'M', 'エ'),
-    (0x32D4, 'M', 'オ'),
-    (0x32D5, 'M', 'カ'),
-    (0x32D6, 'M', 'キ'),
-    (0x32D7, 'M', 'ク'),
-    (0x32D8, 'M', 'ケ'),
-    (0x32D9, 'M', 'コ'),
-    (0x32DA, 'M', 'サ'),
-    (0x32DB, 'M', 'シ'),
-    (0x32DC, 'M', 'ス'),
-    (0x32DD, 'M', 'セ'),
-    (0x32DE, 'M', 'ソ'),
-    (0x32DF, 'M', 'タ'),
-    (0x32E0, 'M', 'チ'),
-    (0x32E1, 'M', 'ツ'),
-    (0x32E2, 'M', 'テ'),
-    (0x32E3, 'M', 'ト'),
-    (0x32E4, 'M', 'ナ'),
-    (0x32E5, 'M', 'ニ'),
-    (0x32E6, 'M', 'ヌ'),
-    (0x32E7, 'M', 'ネ'),
-    (0x32E8, 'M', 'ノ'),
-    (0x32E9, 'M', 'ハ'),
-    (0x32EA, 'M', 'ヒ'),
-    (0x32EB, 'M', 'フ'),
-    (0x32EC, 'M', 'ヘ'),
-    (0x32ED, 'M', 'ホ'),
-    (0x32EE, 'M', 'マ'),
-    (0x32EF, 'M', 'ミ'),
-    (0x32F0, 'M', 'ム'),
-    (0x32F1, 'M', 'メ'),
-    (0x32F2, 'M', 'モ'),
-    (0x32F3, 'M', 'ヤ'),
-    (0x32F4, 'M', 'ユ'),
-    (0x32F5, 'M', 'ヨ'),
-    (0x32F6, 'M', 'ラ'),
-    (0x32F7, 'M', 'リ'),
-    (0x32F8, 'M', 'ル'),
-    (0x32F9, 'M', 'レ'),
-    (0x32FA, 'M', 'ロ'),
-    (0x32FB, 'M', 'ワ'),
-    (0x32FC, 'M', 'ヰ'),
-    (0x32FD, 'M', 'ヱ'),
-    (0x32FE, 'M', 'ヲ'),
-    (0x32FF, 'M', '令和'),
-    (0x3300, 'M', 'アパート'),
-    (0x3301, 'M', 'アルファ'),
-    (0x3302, 'M', 'アンペア'),
-    (0x3303, 'M', 'アール'),
-    (0x3304, 'M', 'イニング'),
-    (0x3305, 'M', 'インチ'),
-    (0x3306, 'M', 'ウォン'),
-    (0x3307, 'M', 'エスクード'),
-    (0x3308, 'M', 'エーカー'),
-    (0x3309, 'M', 'オンス'),
-    (0x330A, 'M', 'オーム'),
-    (0x330B, 'M', 'カイリ'),
-    (0x330C, 'M', 'カラット'),
-    (0x330D, 'M', 'カロリー'),
-    (0x330E, 'M', 'ガロン'),
-    (0x330F, 'M', 'ガンマ'),
-    (0x3310, 'M', 'ギガ'),
-    (0x3311, 'M', 'ギニー'),
-    (0x3312, 'M', 'キュリー'),
-    (0x3313, 'M', 'ギルダー'),
-    (0x3314, 'M', 'キロ'),
-    (0x3315, 'M', 'キログラム'),
-    (0x3316, 'M', 'キロメートル'),
-    (0x3317, 'M', 'キロワット'),
-    (0x3318, 'M', 'グラム'),
-    (0x3319, 'M', 'グラムトン'),
+        (0x32B6, "M", "41"),
+        (0x32B7, "M", "42"),
+        (0x32B8, "M", "43"),
+        (0x32B9, "M", "44"),
+        (0x32BA, "M", "45"),
+        (0x32BB, "M", "46"),
+        (0x32BC, "M", "47"),
+        (0x32BD, "M", "48"),
+        (0x32BE, "M", "49"),
+        (0x32BF, "M", "50"),
+        (0x32C0, "M", "1月"),
+        (0x32C1, "M", "2月"),
+        (0x32C2, "M", "3月"),
+        (0x32C3, "M", "4月"),
+        (0x32C4, "M", "5月"),
+        (0x32C5, "M", "6月"),
+        (0x32C6, "M", "7月"),
+        (0x32C7, "M", "8月"),
+        (0x32C8, "M", "9月"),
+        (0x32C9, "M", "10月"),
+        (0x32CA, "M", "11月"),
+        (0x32CB, "M", "12月"),
+        (0x32CC, "M", "hg"),
+        (0x32CD, "M", "erg"),
+        (0x32CE, "M", "ev"),
+        (0x32CF, "M", "ltd"),
+        (0x32D0, "M", "ア"),
+        (0x32D1, "M", "イ"),
+        (0x32D2, "M", "ウ"),
+        (0x32D3, "M", "エ"),
+        (0x32D4, "M", "オ"),
+        (0x32D5, "M", "カ"),
+        (0x32D6, "M", "キ"),
+        (0x32D7, "M", "ク"),
+        (0x32D8, "M", "ケ"),
+        (0x32D9, "M", "コ"),
+        (0x32DA, "M", "サ"),
+        (0x32DB, "M", "シ"),
+        (0x32DC, "M", "ス"),
+        (0x32DD, "M", "セ"),
+        (0x32DE, "M", "ソ"),
+        (0x32DF, "M", "タ"),
+        (0x32E0, "M", "チ"),
+        (0x32E1, "M", "ツ"),
+        (0x32E2, "M", "テ"),
+        (0x32E3, "M", "ト"),
+        (0x32E4, "M", "ナ"),
+        (0x32E5, "M", "ニ"),
+        (0x32E6, "M", "ヌ"),
+        (0x32E7, "M", "ネ"),
+        (0x32E8, "M", "ノ"),
+        (0x32E9, "M", "ハ"),
+        (0x32EA, "M", "ヒ"),
+        (0x32EB, "M", "フ"),
+        (0x32EC, "M", "ヘ"),
+        (0x32ED, "M", "ホ"),
+        (0x32EE, "M", "マ"),
+        (0x32EF, "M", "ミ"),
+        (0x32F0, "M", "ム"),
+        (0x32F1, "M", "メ"),
+        (0x32F2, "M", "モ"),
+        (0x32F3, "M", "ヤ"),
+        (0x32F4, "M", "ユ"),
+        (0x32F5, "M", "ヨ"),
+        (0x32F6, "M", "ラ"),
+        (0x32F7, "M", "リ"),
+        (0x32F8, "M", "ル"),
+        (0x32F9, "M", "レ"),
+        (0x32FA, "M", "ロ"),
+        (0x32FB, "M", "ワ"),
+        (0x32FC, "M", "ヰ"),
+        (0x32FD, "M", "ヱ"),
+        (0x32FE, "M", "ヲ"),
+        (0x32FF, "M", "令和"),
+        (0x3300, "M", "アパート"),
+        (0x3301, "M", "アルファ"),
+        (0x3302, "M", "アンペア"),
+        (0x3303, "M", "アール"),
+        (0x3304, "M", "イニング"),
+        (0x3305, "M", "インチ"),
+        (0x3306, "M", "ウォン"),
+        (0x3307, "M", "エスクード"),
+        (0x3308, "M", "エーカー"),
+        (0x3309, "M", "オンス"),
+        (0x330A, "M", "オーム"),
+        (0x330B, "M", "カイリ"),
+        (0x330C, "M", "カラット"),
+        (0x330D, "M", "カロリー"),
+        (0x330E, "M", "ガロン"),
+        (0x330F, "M", "ガンマ"),
+        (0x3310, "M", "ギガ"),
+        (0x3311, "M", "ギニー"),
+        (0x3312, "M", "キュリー"),
+        (0x3313, "M", "ギルダー"),
+        (0x3314, "M", "キロ"),
+        (0x3315, "M", "キログラム"),
+        (0x3316, "M", "キロメートル"),
+        (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', 'ケース'),
-    (0x331D, 'M', 'コルナ'),
-    (0x331E, 'M', 'コーポ'),
-    (0x331F, 'M', 'サイクル'),
-    (0x3320, 'M', 'サンチーム'),
-    (0x3321, 'M', 'シリング'),
-    (0x3322, 'M', 'センチ'),
-    (0x3323, 'M', 'セント'),
-    (0x3324, 'M', 'ダース'),
-    (0x3325, 'M', 'デシ'),
-    (0x3326, 'M', 'ドル'),
-    (0x3327, 'M', 'トン'),
-    (0x3328, 'M', 'ナノ'),
-    (0x3329, 'M', 'ノット'),
-    (0x332A, 'M', 'ハイツ'),
-    (0x332B, 'M', 'パーセント'),
-    (0x332C, 'M', 'パーツ'),
-    (0x332D, 'M', 'バーレル'),
-    (0x332E, 'M', 'ピアストル'),
-    (0x332F, 'M', 'ピクル'),
-    (0x3330, 'M', 'ピコ'),
-    (0x3331, 'M', 'ビル'),
-    (0x3332, 'M', 'ファラッド'),
-    (0x3333, 'M', 'フィート'),
-    (0x3334, 'M', 'ブッシェル'),
-    (0x3335, 'M', 'フラン'),
-    (0x3336, 'M', 'ヘクタール'),
-    (0x3337, 'M', 'ペソ'),
-    (0x3338, 'M', 'ペニヒ'),
-    (0x3339, 'M', 'ヘルツ'),
-    (0x333A, 'M', 'ペンス'),
-    (0x333B, 'M', 'ページ'),
-    (0x333C, 'M', 'ベータ'),
-    (0x333D, 'M', 'ポイント'),
-    (0x333E, 'M', 'ボルト'),
-    (0x333F, 'M', 'ホン'),
-    (0x3340, 'M', 'ポンド'),
-    (0x3341, 'M', 'ホール'),
-    (0x3342, 'M', 'ホーン'),
-    (0x3343, 'M', 'マイクロ'),
-    (0x3344, 'M', 'マイル'),
-    (0x3345, 'M', 'マッハ'),
-    (0x3346, 'M', 'マルク'),
-    (0x3347, 'M', 'マンション'),
-    (0x3348, 'M', 'ミクロン'),
-    (0x3349, 'M', 'ミリ'),
-    (0x334A, 'M', 'ミリバール'),
-    (0x334B, 'M', 'メガ'),
-    (0x334C, 'M', 'メガトン'),
-    (0x334D, 'M', 'メートル'),
-    (0x334E, 'M', 'ヤード'),
-    (0x334F, 'M', 'ヤール'),
-    (0x3350, 'M', 'ユアン'),
-    (0x3351, 'M', 'リットル'),
-    (0x3352, 'M', 'リラ'),
-    (0x3353, 'M', 'ルピー'),
-    (0x3354, 'M', 'ルーブル'),
-    (0x3355, 'M', 'レム'),
-    (0x3356, 'M', 'レントゲン'),
-    (0x3357, 'M', 'ワット'),
-    (0x3358, 'M', '0点'),
-    (0x3359, 'M', '1点'),
-    (0x335A, 'M', '2点'),
-    (0x335B, 'M', '3点'),
-    (0x335C, 'M', '4点'),
-    (0x335D, 'M', '5点'),
-    (0x335E, 'M', '6点'),
-    (0x335F, 'M', '7点'),
-    (0x3360, 'M', '8点'),
-    (0x3361, 'M', '9点'),
-    (0x3362, 'M', '10点'),
-    (0x3363, 'M', '11点'),
-    (0x3364, 'M', '12点'),
-    (0x3365, 'M', '13点'),
-    (0x3366, 'M', '14点'),
-    (0x3367, 'M', '15点'),
-    (0x3368, 'M', '16点'),
-    (0x3369, 'M', '17点'),
-    (0x336A, 'M', '18点'),
-    (0x336B, 'M', '19点'),
-    (0x336C, 'M', '20点'),
-    (0x336D, 'M', '21点'),
-    (0x336E, 'M', '22点'),
-    (0x336F, 'M', '23点'),
-    (0x3370, 'M', '24点'),
-    (0x3371, 'M', 'hpa'),
-    (0x3372, 'M', 'da'),
-    (0x3373, 'M', 'au'),
-    (0x3374, 'M', 'bar'),
-    (0x3375, 'M', 'ov'),
-    (0x3376, 'M', 'pc'),
-    (0x3377, 'M', 'dm'),
-    (0x3378, 'M', 'dm2'),
-    (0x3379, 'M', 'dm3'),
-    (0x337A, 'M', 'iu'),
-    (0x337B, 'M', '平成'),
-    (0x337C, 'M', '昭和'),
-    (0x337D, 'M', '大正'),
+        (0x331A, "M", "クルゼイロ"),
+        (0x331B, "M", "クローネ"),
+        (0x331C, "M", "ケース"),
+        (0x331D, "M", "コルナ"),
+        (0x331E, "M", "コーポ"),
+        (0x331F, "M", "サイクル"),
+        (0x3320, "M", "サンチーム"),
+        (0x3321, "M", "シリング"),
+        (0x3322, "M", "センチ"),
+        (0x3323, "M", "セント"),
+        (0x3324, "M", "ダース"),
+        (0x3325, "M", "デシ"),
+        (0x3326, "M", "ドル"),
+        (0x3327, "M", "トン"),
+        (0x3328, "M", "ナノ"),
+        (0x3329, "M", "ノット"),
+        (0x332A, "M", "ハイツ"),
+        (0x332B, "M", "パーセント"),
+        (0x332C, "M", "パーツ"),
+        (0x332D, "M", "バーレル"),
+        (0x332E, "M", "ピアストル"),
+        (0x332F, "M", "ピクル"),
+        (0x3330, "M", "ピコ"),
+        (0x3331, "M", "ビル"),
+        (0x3332, "M", "ファラッド"),
+        (0x3333, "M", "フィート"),
+        (0x3334, "M", "ブッシェル"),
+        (0x3335, "M", "フラン"),
+        (0x3336, "M", "ヘクタール"),
+        (0x3337, "M", "ペソ"),
+        (0x3338, "M", "ペニヒ"),
+        (0x3339, "M", "ヘルツ"),
+        (0x333A, "M", "ペンス"),
+        (0x333B, "M", "ページ"),
+        (0x333C, "M", "ベータ"),
+        (0x333D, "M", "ポイント"),
+        (0x333E, "M", "ボルト"),
+        (0x333F, "M", "ホン"),
+        (0x3340, "M", "ポンド"),
+        (0x3341, "M", "ホール"),
+        (0x3342, "M", "ホーン"),
+        (0x3343, "M", "マイクロ"),
+        (0x3344, "M", "マイル"),
+        (0x3345, "M", "マッハ"),
+        (0x3346, "M", "マルク"),
+        (0x3347, "M", "マンション"),
+        (0x3348, "M", "ミクロン"),
+        (0x3349, "M", "ミリ"),
+        (0x334A, "M", "ミリバール"),
+        (0x334B, "M", "メガ"),
+        (0x334C, "M", "メガトン"),
+        (0x334D, "M", "メートル"),
+        (0x334E, "M", "ヤード"),
+        (0x334F, "M", "ヤール"),
+        (0x3350, "M", "ユアン"),
+        (0x3351, "M", "リットル"),
+        (0x3352, "M", "リラ"),
+        (0x3353, "M", "ルピー"),
+        (0x3354, "M", "ルーブル"),
+        (0x3355, "M", "レム"),
+        (0x3356, "M", "レントゲン"),
+        (0x3357, "M", "ワット"),
+        (0x3358, "M", "0点"),
+        (0x3359, "M", "1点"),
+        (0x335A, "M", "2点"),
+        (0x335B, "M", "3点"),
+        (0x335C, "M", "4点"),
+        (0x335D, "M", "5点"),
+        (0x335E, "M", "6点"),
+        (0x335F, "M", "7点"),
+        (0x3360, "M", "8点"),
+        (0x3361, "M", "9点"),
+        (0x3362, "M", "10点"),
+        (0x3363, "M", "11点"),
+        (0x3364, "M", "12点"),
+        (0x3365, "M", "13点"),
+        (0x3366, "M", "14点"),
+        (0x3367, "M", "15点"),
+        (0x3368, "M", "16点"),
+        (0x3369, "M", "17点"),
+        (0x336A, "M", "18点"),
+        (0x336B, "M", "19点"),
+        (0x336C, "M", "20点"),
+        (0x336D, "M", "21点"),
+        (0x336E, "M", "22点"),
+        (0x336F, "M", "23点"),
+        (0x3370, "M", "24点"),
+        (0x3371, "M", "hpa"),
+        (0x3372, "M", "da"),
+        (0x3373, "M", "au"),
+        (0x3374, "M", "bar"),
+        (0x3375, "M", "ov"),
+        (0x3376, "M", "pc"),
+        (0x3377, "M", "dm"),
+        (0x3378, "M", "dm2"),
+        (0x3379, "M", "dm3"),
+        (0x337A, "M", "iu"),
+        (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'),
-    (0x3381, 'M', 'na'),
-    (0x3382, 'M', 'μa'),
-    (0x3383, 'M', 'ma'),
-    (0x3384, 'M', 'ka'),
-    (0x3385, 'M', 'kb'),
-    (0x3386, 'M', 'mb'),
-    (0x3387, 'M', 'gb'),
-    (0x3388, 'M', 'cal'),
-    (0x3389, 'M', 'kcal'),
-    (0x338A, 'M', 'pf'),
-    (0x338B, 'M', 'nf'),
-    (0x338C, 'M', 'μf'),
-    (0x338D, 'M', 'μg'),
-    (0x338E, 'M', 'mg'),
-    (0x338F, 'M', 'kg'),
-    (0x3390, 'M', 'hz'),
-    (0x3391, 'M', 'khz'),
-    (0x3392, 'M', 'mhz'),
-    (0x3393, 'M', 'ghz'),
-    (0x3394, 'M', 'thz'),
-    (0x3395, 'M', 'μl'),
-    (0x3396, 'M', 'ml'),
-    (0x3397, 'M', 'dl'),
-    (0x3398, 'M', 'kl'),
-    (0x3399, 'M', 'fm'),
-    (0x339A, 'M', 'nm'),
-    (0x339B, 'M', 'μm'),
-    (0x339C, 'M', 'mm'),
-    (0x339D, 'M', 'cm'),
-    (0x339E, 'M', 'km'),
-    (0x339F, 'M', 'mm2'),
-    (0x33A0, 'M', 'cm2'),
-    (0x33A1, 'M', 'm2'),
-    (0x33A2, 'M', 'km2'),
-    (0x33A3, 'M', 'mm3'),
-    (0x33A4, 'M', 'cm3'),
-    (0x33A5, 'M', 'm3'),
-    (0x33A6, 'M', 'km3'),
-    (0x33A7, 'M', 'm∕s'),
-    (0x33A8, 'M', 'm∕s2'),
-    (0x33A9, 'M', 'pa'),
-    (0x33AA, 'M', 'kpa'),
-    (0x33AB, 'M', 'mpa'),
-    (0x33AC, 'M', 'gpa'),
-    (0x33AD, 'M', 'rad'),
-    (0x33AE, 'M', 'rad∕s'),
-    (0x33AF, 'M', 'rad∕s2'),
-    (0x33B0, 'M', 'ps'),
-    (0x33B1, 'M', 'ns'),
-    (0x33B2, 'M', 'μs'),
-    (0x33B3, 'M', 'ms'),
-    (0x33B4, 'M', 'pv'),
-    (0x33B5, 'M', 'nv'),
-    (0x33B6, 'M', 'μv'),
-    (0x33B7, 'M', 'mv'),
-    (0x33B8, 'M', 'kv'),
-    (0x33B9, 'M', 'mv'),
-    (0x33BA, 'M', 'pw'),
-    (0x33BB, 'M', 'nw'),
-    (0x33BC, 'M', 'μw'),
-    (0x33BD, 'M', 'mw'),
-    (0x33BE, 'M', 'kw'),
-    (0x33BF, 'M', 'mw'),
-    (0x33C0, 'M', 'kω'),
-    (0x33C1, 'M', 'mω'),
-    (0x33C2, 'X'),
-    (0x33C3, 'M', 'bq'),
-    (0x33C4, 'M', 'cc'),
-    (0x33C5, 'M', 'cd'),
-    (0x33C6, 'M', 'c∕kg'),
-    (0x33C7, 'X'),
-    (0x33C8, 'M', 'db'),
-    (0x33C9, 'M', 'gy'),
-    (0x33CA, 'M', 'ha'),
-    (0x33CB, 'M', 'hp'),
-    (0x33CC, 'M', 'in'),
-    (0x33CD, 'M', 'kk'),
-    (0x33CE, 'M', 'km'),
-    (0x33CF, 'M', 'kt'),
-    (0x33D0, 'M', 'lm'),
-    (0x33D1, 'M', 'ln'),
-    (0x33D2, 'M', 'log'),
-    (0x33D3, 'M', 'lx'),
-    (0x33D4, 'M', 'mb'),
-    (0x33D5, 'M', 'mil'),
-    (0x33D6, 'M', 'mol'),
-    (0x33D7, 'M', 'ph'),
-    (0x33D8, 'X'),
-    (0x33D9, 'M', 'ppm'),
-    (0x33DA, 'M', 'pr'),
-    (0x33DB, 'M', 'sr'),
-    (0x33DC, 'M', 'sv'),
-    (0x33DD, 'M', 'wb'),
-    (0x33DE, 'M', 'v∕m'),
-    (0x33DF, 'M', 'a∕m'),
-    (0x33E0, 'M', '1日'),
-    (0x33E1, 'M', '2日'),
+        (0x337E, "M", "明治"),
+        (0x337F, "M", "株式会社"),
+        (0x3380, "M", "pa"),
+        (0x3381, "M", "na"),
+        (0x3382, "M", "μa"),
+        (0x3383, "M", "ma"),
+        (0x3384, "M", "ka"),
+        (0x3385, "M", "kb"),
+        (0x3386, "M", "mb"),
+        (0x3387, "M", "gb"),
+        (0x3388, "M", "cal"),
+        (0x3389, "M", "kcal"),
+        (0x338A, "M", "pf"),
+        (0x338B, "M", "nf"),
+        (0x338C, "M", "μf"),
+        (0x338D, "M", "μg"),
+        (0x338E, "M", "mg"),
+        (0x338F, "M", "kg"),
+        (0x3390, "M", "hz"),
+        (0x3391, "M", "khz"),
+        (0x3392, "M", "mhz"),
+        (0x3393, "M", "ghz"),
+        (0x3394, "M", "thz"),
+        (0x3395, "M", "μl"),
+        (0x3396, "M", "ml"),
+        (0x3397, "M", "dl"),
+        (0x3398, "M", "kl"),
+        (0x3399, "M", "fm"),
+        (0x339A, "M", "nm"),
+        (0x339B, "M", "μm"),
+        (0x339C, "M", "mm"),
+        (0x339D, "M", "cm"),
+        (0x339E, "M", "km"),
+        (0x339F, "M", "mm2"),
+        (0x33A0, "M", "cm2"),
+        (0x33A1, "M", "m2"),
+        (0x33A2, "M", "km2"),
+        (0x33A3, "M", "mm3"),
+        (0x33A4, "M", "cm3"),
+        (0x33A5, "M", "m3"),
+        (0x33A6, "M", "km3"),
+        (0x33A7, "M", "m∕s"),
+        (0x33A8, "M", "m∕s2"),
+        (0x33A9, "M", "pa"),
+        (0x33AA, "M", "kpa"),
+        (0x33AB, "M", "mpa"),
+        (0x33AC, "M", "gpa"),
+        (0x33AD, "M", "rad"),
+        (0x33AE, "M", "rad∕s"),
+        (0x33AF, "M", "rad∕s2"),
+        (0x33B0, "M", "ps"),
+        (0x33B1, "M", "ns"),
+        (0x33B2, "M", "μs"),
+        (0x33B3, "M", "ms"),
+        (0x33B4, "M", "pv"),
+        (0x33B5, "M", "nv"),
+        (0x33B6, "M", "μv"),
+        (0x33B7, "M", "mv"),
+        (0x33B8, "M", "kv"),
+        (0x33B9, "M", "mv"),
+        (0x33BA, "M", "pw"),
+        (0x33BB, "M", "nw"),
+        (0x33BC, "M", "μw"),
+        (0x33BD, "M", "mw"),
+        (0x33BE, "M", "kw"),
+        (0x33BF, "M", "mw"),
+        (0x33C0, "M", "kω"),
+        (0x33C1, "M", "mω"),
+        (0x33C2, "X"),
+        (0x33C3, "M", "bq"),
+        (0x33C4, "M", "cc"),
+        (0x33C5, "M", "cd"),
+        (0x33C6, "M", "c∕kg"),
+        (0x33C7, "X"),
+        (0x33C8, "M", "db"),
+        (0x33C9, "M", "gy"),
+        (0x33CA, "M", "ha"),
+        (0x33CB, "M", "hp"),
+        (0x33CC, "M", "in"),
+        (0x33CD, "M", "kk"),
+        (0x33CE, "M", "km"),
+        (0x33CF, "M", "kt"),
+        (0x33D0, "M", "lm"),
+        (0x33D1, "M", "ln"),
+        (0x33D2, "M", "log"),
+        (0x33D3, "M", "lx"),
+        (0x33D4, "M", "mb"),
+        (0x33D5, "M", "mil"),
+        (0x33D6, "M", "mol"),
+        (0x33D7, "M", "ph"),
+        (0x33D8, "X"),
+        (0x33D9, "M", "ppm"),
+        (0x33DA, "M", "pr"),
+        (0x33DB, "M", "sr"),
+        (0x33DC, "M", "sv"),
+        (0x33DD, "M", "wb"),
+        (0x33DE, "M", "v∕m"),
+        (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日'),
-    (0x33E5, 'M', '6日'),
-    (0x33E6, 'M', '7日'),
-    (0x33E7, 'M', '8日'),
-    (0x33E8, 'M', '9日'),
-    (0x33E9, 'M', '10日'),
-    (0x33EA, 'M', '11日'),
-    (0x33EB, 'M', '12日'),
-    (0x33EC, 'M', '13日'),
-    (0x33ED, 'M', '14日'),
-    (0x33EE, 'M', '15日'),
-    (0x33EF, 'M', '16日'),
-    (0x33F0, 'M', '17日'),
-    (0x33F1, 'M', '18日'),
-    (0x33F2, 'M', '19日'),
-    (0x33F3, 'M', '20日'),
-    (0x33F4, 'M', '21日'),
-    (0x33F5, 'M', '22日'),
-    (0x33F6, 'M', '23日'),
-    (0x33F7, 'M', '24日'),
-    (0x33F8, 'M', '25日'),
-    (0x33F9, 'M', '26日'),
-    (0x33FA, 'M', '27日'),
-    (0x33FB, 'M', '28日'),
-    (0x33FC, 'M', '29日'),
-    (0x33FD, 'M', '30日'),
-    (0x33FE, 'M', '31日'),
-    (0x33FF, 'M', 'gal'),
-    (0x3400, 'V'),
-    (0xA48D, 'X'),
-    (0xA490, 'V'),
-    (0xA4C7, 'X'),
-    (0xA4D0, 'V'),
-    (0xA62C, 'X'),
-    (0xA640, 'M', 'ꙁ'),
-    (0xA641, 'V'),
-    (0xA642, 'M', 'ꙃ'),
-    (0xA643, 'V'),
-    (0xA644, 'M', 'ꙅ'),
-    (0xA645, 'V'),
-    (0xA646, 'M', 'ꙇ'),
-    (0xA647, 'V'),
-    (0xA648, 'M', 'ꙉ'),
-    (0xA649, 'V'),
-    (0xA64A, 'M', 'ꙋ'),
-    (0xA64B, 'V'),
-    (0xA64C, 'M', 'ꙍ'),
-    (0xA64D, 'V'),
-    (0xA64E, 'M', 'ꙏ'),
-    (0xA64F, 'V'),
-    (0xA650, 'M', 'ꙑ'),
-    (0xA651, 'V'),
-    (0xA652, 'M', 'ꙓ'),
-    (0xA653, 'V'),
-    (0xA654, 'M', 'ꙕ'),
-    (0xA655, 'V'),
-    (0xA656, 'M', 'ꙗ'),
-    (0xA657, 'V'),
-    (0xA658, 'M', 'ꙙ'),
-    (0xA659, 'V'),
-    (0xA65A, 'M', 'ꙛ'),
-    (0xA65B, 'V'),
-    (0xA65C, 'M', 'ꙝ'),
-    (0xA65D, 'V'),
-    (0xA65E, 'M', 'ꙟ'),
-    (0xA65F, 'V'),
-    (0xA660, 'M', 'ꙡ'),
-    (0xA661, 'V'),
-    (0xA662, 'M', 'ꙣ'),
-    (0xA663, 'V'),
-    (0xA664, 'M', 'ꙥ'),
-    (0xA665, 'V'),
-    (0xA666, 'M', 'ꙧ'),
-    (0xA667, 'V'),
-    (0xA668, 'M', 'ꙩ'),
-    (0xA669, 'V'),
-    (0xA66A, 'M', 'ꙫ'),
-    (0xA66B, 'V'),
-    (0xA66C, 'M', 'ꙭ'),
-    (0xA66D, 'V'),
-    (0xA680, 'M', 'ꚁ'),
-    (0xA681, 'V'),
-    (0xA682, 'M', 'ꚃ'),
-    (0xA683, 'V'),
-    (0xA684, 'M', 'ꚅ'),
-    (0xA685, 'V'),
-    (0xA686, 'M', 'ꚇ'),
-    (0xA687, 'V'),
-    (0xA688, 'M', 'ꚉ'),
-    (0xA689, 'V'),
-    (0xA68A, 'M', 'ꚋ'),
-    (0xA68B, 'V'),
-    (0xA68C, 'M', 'ꚍ'),
-    (0xA68D, 'V'),
-    (0xA68E, 'M', 'ꚏ'),
-    (0xA68F, 'V'),
-    (0xA690, 'M', 'ꚑ'),
-    (0xA691, 'V'),
+        (0x33E2, "M", "3日"),
+        (0x33E3, "M", "4日"),
+        (0x33E4, "M", "5日"),
+        (0x33E5, "M", "6日"),
+        (0x33E6, "M", "7日"),
+        (0x33E7, "M", "8日"),
+        (0x33E8, "M", "9日"),
+        (0x33E9, "M", "10日"),
+        (0x33EA, "M", "11日"),
+        (0x33EB, "M", "12日"),
+        (0x33EC, "M", "13日"),
+        (0x33ED, "M", "14日"),
+        (0x33EE, "M", "15日"),
+        (0x33EF, "M", "16日"),
+        (0x33F0, "M", "17日"),
+        (0x33F1, "M", "18日"),
+        (0x33F2, "M", "19日"),
+        (0x33F3, "M", "20日"),
+        (0x33F4, "M", "21日"),
+        (0x33F5, "M", "22日"),
+        (0x33F6, "M", "23日"),
+        (0x33F7, "M", "24日"),
+        (0x33F8, "M", "25日"),
+        (0x33F9, "M", "26日"),
+        (0x33FA, "M", "27日"),
+        (0x33FB, "M", "28日"),
+        (0x33FC, "M", "29日"),
+        (0x33FD, "M", "30日"),
+        (0x33FE, "M", "31日"),
+        (0x33FF, "M", "gal"),
+        (0x3400, "V"),
+        (0xA48D, "X"),
+        (0xA490, "V"),
+        (0xA4C7, "X"),
+        (0xA4D0, "V"),
+        (0xA62C, "X"),
+        (0xA640, "M", "ꙁ"),
+        (0xA641, "V"),
+        (0xA642, "M", "ꙃ"),
+        (0xA643, "V"),
+        (0xA644, "M", "ꙅ"),
+        (0xA645, "V"),
+        (0xA646, "M", "ꙇ"),
+        (0xA647, "V"),
+        (0xA648, "M", "ꙉ"),
+        (0xA649, "V"),
+        (0xA64A, "M", "ꙋ"),
+        (0xA64B, "V"),
+        (0xA64C, "M", "ꙍ"),
+        (0xA64D, "V"),
+        (0xA64E, "M", "ꙏ"),
+        (0xA64F, "V"),
+        (0xA650, "M", "ꙑ"),
+        (0xA651, "V"),
+        (0xA652, "M", "ꙓ"),
+        (0xA653, "V"),
+        (0xA654, "M", "ꙕ"),
+        (0xA655, "V"),
+        (0xA656, "M", "ꙗ"),
+        (0xA657, "V"),
+        (0xA658, "M", "ꙙ"),
+        (0xA659, "V"),
+        (0xA65A, "M", "ꙛ"),
+        (0xA65B, "V"),
+        (0xA65C, "M", "ꙝ"),
+        (0xA65D, "V"),
+        (0xA65E, "M", "ꙟ"),
+        (0xA65F, "V"),
+        (0xA660, "M", "ꙡ"),
+        (0xA661, "V"),
+        (0xA662, "M", "ꙣ"),
+        (0xA663, "V"),
+        (0xA664, "M", "ꙥ"),
+        (0xA665, "V"),
+        (0xA666, "M", "ꙧ"),
+        (0xA667, "V"),
+        (0xA668, "M", "ꙩ"),
+        (0xA669, "V"),
+        (0xA66A, "M", "ꙫ"),
+        (0xA66B, "V"),
+        (0xA66C, "M", "ꙭ"),
+        (0xA66D, "V"),
+        (0xA680, "M", "ꚁ"),
+        (0xA681, "V"),
+        (0xA682, "M", "ꚃ"),
+        (0xA683, "V"),
+        (0xA684, "M", "ꚅ"),
+        (0xA685, "V"),
+        (0xA686, "M", "ꚇ"),
+        (0xA687, "V"),
+        (0xA688, "M", "ꚉ"),
+        (0xA689, "V"),
+        (0xA68A, "M", "ꚋ"),
+        (0xA68B, "V"),
+        (0xA68C, "M", "ꚍ"),
+        (0xA68D, "V"),
+        (0xA68E, "M", "ꚏ"),
+        (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', 'ꚕ'),
-    (0xA695, 'V'),
-    (0xA696, 'M', 'ꚗ'),
-    (0xA697, 'V'),
-    (0xA698, 'M', 'ꚙ'),
-    (0xA699, 'V'),
-    (0xA69A, 'M', 'ꚛ'),
-    (0xA69B, 'V'),
-    (0xA69C, 'M', 'ъ'),
-    (0xA69D, 'M', 'ь'),
-    (0xA69E, 'V'),
-    (0xA6F8, 'X'),
-    (0xA700, 'V'),
-    (0xA722, 'M', 'ꜣ'),
-    (0xA723, 'V'),
-    (0xA724, 'M', 'ꜥ'),
-    (0xA725, 'V'),
-    (0xA726, 'M', 'ꜧ'),
-    (0xA727, 'V'),
-    (0xA728, 'M', 'ꜩ'),
-    (0xA729, 'V'),
-    (0xA72A, 'M', 'ꜫ'),
-    (0xA72B, 'V'),
-    (0xA72C, 'M', 'ꜭ'),
-    (0xA72D, 'V'),
-    (0xA72E, 'M', 'ꜯ'),
-    (0xA72F, 'V'),
-    (0xA732, 'M', 'ꜳ'),
-    (0xA733, 'V'),
-    (0xA734, 'M', 'ꜵ'),
-    (0xA735, 'V'),
-    (0xA736, 'M', 'ꜷ'),
-    (0xA737, 'V'),
-    (0xA738, 'M', 'ꜹ'),
-    (0xA739, 'V'),
-    (0xA73A, 'M', 'ꜻ'),
-    (0xA73B, 'V'),
-    (0xA73C, 'M', 'ꜽ'),
-    (0xA73D, 'V'),
-    (0xA73E, 'M', 'ꜿ'),
-    (0xA73F, 'V'),
-    (0xA740, 'M', 'ꝁ'),
-    (0xA741, 'V'),
-    (0xA742, 'M', 'ꝃ'),
-    (0xA743, 'V'),
-    (0xA744, 'M', 'ꝅ'),
-    (0xA745, 'V'),
-    (0xA746, 'M', 'ꝇ'),
-    (0xA747, 'V'),
-    (0xA748, 'M', 'ꝉ'),
-    (0xA749, 'V'),
-    (0xA74A, 'M', 'ꝋ'),
-    (0xA74B, 'V'),
-    (0xA74C, 'M', 'ꝍ'),
-    (0xA74D, 'V'),
-    (0xA74E, 'M', 'ꝏ'),
-    (0xA74F, 'V'),
-    (0xA750, 'M', 'ꝑ'),
-    (0xA751, 'V'),
-    (0xA752, 'M', 'ꝓ'),
-    (0xA753, 'V'),
-    (0xA754, 'M', 'ꝕ'),
-    (0xA755, 'V'),
-    (0xA756, 'M', 'ꝗ'),
-    (0xA757, 'V'),
-    (0xA758, 'M', 'ꝙ'),
-    (0xA759, 'V'),
-    (0xA75A, 'M', 'ꝛ'),
-    (0xA75B, 'V'),
-    (0xA75C, 'M', 'ꝝ'),
-    (0xA75D, 'V'),
-    (0xA75E, 'M', 'ꝟ'),
-    (0xA75F, 'V'),
-    (0xA760, 'M', 'ꝡ'),
-    (0xA761, 'V'),
-    (0xA762, 'M', 'ꝣ'),
-    (0xA763, 'V'),
-    (0xA764, 'M', 'ꝥ'),
-    (0xA765, 'V'),
-    (0xA766, 'M', 'ꝧ'),
-    (0xA767, 'V'),
-    (0xA768, 'M', 'ꝩ'),
-    (0xA769, 'V'),
-    (0xA76A, 'M', 'ꝫ'),
-    (0xA76B, 'V'),
-    (0xA76C, 'M', 'ꝭ'),
-    (0xA76D, 'V'),
-    (0xA76E, 'M', 'ꝯ'),
-    (0xA76F, 'V'),
-    (0xA770, 'M', 'ꝯ'),
-    (0xA771, 'V'),
-    (0xA779, 'M', 'ꝺ'),
-    (0xA77A, 'V'),
-    (0xA77B, 'M', 'ꝼ'),
-    (0xA77C, 'V'),
-    (0xA77D, 'M', 'ᵹ'),
-    (0xA77E, 'M', 'ꝿ'),
-    (0xA77F, 'V'),
+        (0xA692, "M", "ꚓ"),
+        (0xA693, "V"),
+        (0xA694, "M", "ꚕ"),
+        (0xA695, "V"),
+        (0xA696, "M", "ꚗ"),
+        (0xA697, "V"),
+        (0xA698, "M", "ꚙ"),
+        (0xA699, "V"),
+        (0xA69A, "M", "ꚛ"),
+        (0xA69B, "V"),
+        (0xA69C, "M", "ъ"),
+        (0xA69D, "M", "ь"),
+        (0xA69E, "V"),
+        (0xA6F8, "X"),
+        (0xA700, "V"),
+        (0xA722, "M", "ꜣ"),
+        (0xA723, "V"),
+        (0xA724, "M", "ꜥ"),
+        (0xA725, "V"),
+        (0xA726, "M", "ꜧ"),
+        (0xA727, "V"),
+        (0xA728, "M", "ꜩ"),
+        (0xA729, "V"),
+        (0xA72A, "M", "ꜫ"),
+        (0xA72B, "V"),
+        (0xA72C, "M", "ꜭ"),
+        (0xA72D, "V"),
+        (0xA72E, "M", "ꜯ"),
+        (0xA72F, "V"),
+        (0xA732, "M", "ꜳ"),
+        (0xA733, "V"),
+        (0xA734, "M", "ꜵ"),
+        (0xA735, "V"),
+        (0xA736, "M", "ꜷ"),
+        (0xA737, "V"),
+        (0xA738, "M", "ꜹ"),
+        (0xA739, "V"),
+        (0xA73A, "M", "ꜻ"),
+        (0xA73B, "V"),
+        (0xA73C, "M", "ꜽ"),
+        (0xA73D, "V"),
+        (0xA73E, "M", "ꜿ"),
+        (0xA73F, "V"),
+        (0xA740, "M", "ꝁ"),
+        (0xA741, "V"),
+        (0xA742, "M", "ꝃ"),
+        (0xA743, "V"),
+        (0xA744, "M", "ꝅ"),
+        (0xA745, "V"),
+        (0xA746, "M", "ꝇ"),
+        (0xA747, "V"),
+        (0xA748, "M", "ꝉ"),
+        (0xA749, "V"),
+        (0xA74A, "M", "ꝋ"),
+        (0xA74B, "V"),
+        (0xA74C, "M", "ꝍ"),
+        (0xA74D, "V"),
+        (0xA74E, "M", "ꝏ"),
+        (0xA74F, "V"),
+        (0xA750, "M", "ꝑ"),
+        (0xA751, "V"),
+        (0xA752, "M", "ꝓ"),
+        (0xA753, "V"),
+        (0xA754, "M", "ꝕ"),
+        (0xA755, "V"),
+        (0xA756, "M", "ꝗ"),
+        (0xA757, "V"),
+        (0xA758, "M", "ꝙ"),
+        (0xA759, "V"),
+        (0xA75A, "M", "ꝛ"),
+        (0xA75B, "V"),
+        (0xA75C, "M", "ꝝ"),
+        (0xA75D, "V"),
+        (0xA75E, "M", "ꝟ"),
+        (0xA75F, "V"),
+        (0xA760, "M", "ꝡ"),
+        (0xA761, "V"),
+        (0xA762, "M", "ꝣ"),
+        (0xA763, "V"),
+        (0xA764, "M", "ꝥ"),
+        (0xA765, "V"),
+        (0xA766, "M", "ꝧ"),
+        (0xA767, "V"),
+        (0xA768, "M", "ꝩ"),
+        (0xA769, "V"),
+        (0xA76A, "M", "ꝫ"),
+        (0xA76B, "V"),
+        (0xA76C, "M", "ꝭ"),
+        (0xA76D, "V"),
+        (0xA76E, "M", "ꝯ"),
+        (0xA76F, "V"),
+        (0xA770, "M", "ꝯ"),
+        (0xA771, "V"),
+        (0xA779, "M", "ꝺ"),
+        (0xA77A, "V"),
+        (0xA77B, "M", "ꝼ"),
+        (0xA77C, "V"),
+        (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', 'ꞃ'),
-    (0xA783, 'V'),
-    (0xA784, 'M', 'ꞅ'),
-    (0xA785, 'V'),
-    (0xA786, 'M', 'ꞇ'),
-    (0xA787, 'V'),
-    (0xA78B, 'M', 'ꞌ'),
-    (0xA78C, 'V'),
-    (0xA78D, 'M', 'ɥ'),
-    (0xA78E, 'V'),
-    (0xA790, 'M', 'ꞑ'),
-    (0xA791, 'V'),
-    (0xA792, 'M', 'ꞓ'),
-    (0xA793, 'V'),
-    (0xA796, 'M', 'ꞗ'),
-    (0xA797, 'V'),
-    (0xA798, 'M', 'ꞙ'),
-    (0xA799, 'V'),
-    (0xA79A, 'M', 'ꞛ'),
-    (0xA79B, 'V'),
-    (0xA79C, 'M', 'ꞝ'),
-    (0xA79D, 'V'),
-    (0xA79E, 'M', 'ꞟ'),
-    (0xA79F, 'V'),
-    (0xA7A0, 'M', 'ꞡ'),
-    (0xA7A1, 'V'),
-    (0xA7A2, 'M', 'ꞣ'),
-    (0xA7A3, 'V'),
-    (0xA7A4, 'M', 'ꞥ'),
-    (0xA7A5, 'V'),
-    (0xA7A6, 'M', 'ꞧ'),
-    (0xA7A7, 'V'),
-    (0xA7A8, 'M', 'ꞩ'),
-    (0xA7A9, 'V'),
-    (0xA7AA, 'M', 'ɦ'),
-    (0xA7AB, 'M', 'ɜ'),
-    (0xA7AC, 'M', 'ɡ'),
-    (0xA7AD, 'M', 'ɬ'),
-    (0xA7AE, 'M', 'ɪ'),
-    (0xA7AF, 'V'),
-    (0xA7B0, 'M', 'ʞ'),
-    (0xA7B1, 'M', 'ʇ'),
-    (0xA7B2, 'M', 'ʝ'),
-    (0xA7B3, 'M', 'ꭓ'),
-    (0xA7B4, 'M', 'ꞵ'),
-    (0xA7B5, 'V'),
-    (0xA7B6, 'M', 'ꞷ'),
-    (0xA7B7, 'V'),
-    (0xA7B8, 'M', 'ꞹ'),
-    (0xA7B9, 'V'),
-    (0xA7BA, 'M', 'ꞻ'),
-    (0xA7BB, 'V'),
-    (0xA7BC, 'M', 'ꞽ'),
-    (0xA7BD, 'V'),
-    (0xA7BE, 'M', 'ꞿ'),
-    (0xA7BF, 'V'),
-    (0xA7C0, 'M', 'ꟁ'),
-    (0xA7C1, 'V'),
-    (0xA7C2, 'M', 'ꟃ'),
-    (0xA7C3, 'V'),
-    (0xA7C4, 'M', 'ꞔ'),
-    (0xA7C5, 'M', 'ʂ'),
-    (0xA7C6, 'M', 'ᶎ'),
-    (0xA7C7, 'M', 'ꟈ'),
-    (0xA7C8, 'V'),
-    (0xA7C9, 'M', 'ꟊ'),
-    (0xA7CA, 'V'),
-    (0xA7CB, 'X'),
-    (0xA7D0, 'M', 'ꟑ'),
-    (0xA7D1, 'V'),
-    (0xA7D2, 'X'),
-    (0xA7D3, 'V'),
-    (0xA7D4, 'X'),
-    (0xA7D5, 'V'),
-    (0xA7D6, 'M', 'ꟗ'),
-    (0xA7D7, 'V'),
-    (0xA7D8, 'M', 'ꟙ'),
-    (0xA7D9, 'V'),
-    (0xA7DA, 'X'),
-    (0xA7F2, 'M', 'c'),
-    (0xA7F3, 'M', 'f'),
-    (0xA7F4, 'M', 'q'),
-    (0xA7F5, 'M', 'ꟶ'),
-    (0xA7F6, 'V'),
-    (0xA7F8, 'M', 'ħ'),
-    (0xA7F9, 'M', 'œ'),
-    (0xA7FA, 'V'),
-    (0xA82D, 'X'),
-    (0xA830, 'V'),
-    (0xA83A, 'X'),
-    (0xA840, 'V'),
-    (0xA878, 'X'),
-    (0xA880, 'V'),
-    (0xA8C6, 'X'),
-    (0xA8CE, 'V'),
-    (0xA8DA, 'X'),
-    (0xA8E0, 'V'),
-    (0xA954, 'X'),
+        (0xA780, "M", "ꞁ"),
+        (0xA781, "V"),
+        (0xA782, "M", "ꞃ"),
+        (0xA783, "V"),
+        (0xA784, "M", "ꞅ"),
+        (0xA785, "V"),
+        (0xA786, "M", "ꞇ"),
+        (0xA787, "V"),
+        (0xA78B, "M", "ꞌ"),
+        (0xA78C, "V"),
+        (0xA78D, "M", "ɥ"),
+        (0xA78E, "V"),
+        (0xA790, "M", "ꞑ"),
+        (0xA791, "V"),
+        (0xA792, "M", "ꞓ"),
+        (0xA793, "V"),
+        (0xA796, "M", "ꞗ"),
+        (0xA797, "V"),
+        (0xA798, "M", "ꞙ"),
+        (0xA799, "V"),
+        (0xA79A, "M", "ꞛ"),
+        (0xA79B, "V"),
+        (0xA79C, "M", "ꞝ"),
+        (0xA79D, "V"),
+        (0xA79E, "M", "ꞟ"),
+        (0xA79F, "V"),
+        (0xA7A0, "M", "ꞡ"),
+        (0xA7A1, "V"),
+        (0xA7A2, "M", "ꞣ"),
+        (0xA7A3, "V"),
+        (0xA7A4, "M", "ꞥ"),
+        (0xA7A5, "V"),
+        (0xA7A6, "M", "ꞧ"),
+        (0xA7A7, "V"),
+        (0xA7A8, "M", "ꞩ"),
+        (0xA7A9, "V"),
+        (0xA7AA, "M", "ɦ"),
+        (0xA7AB, "M", "ɜ"),
+        (0xA7AC, "M", "ɡ"),
+        (0xA7AD, "M", "ɬ"),
+        (0xA7AE, "M", "ɪ"),
+        (0xA7AF, "V"),
+        (0xA7B0, "M", "ʞ"),
+        (0xA7B1, "M", "ʇ"),
+        (0xA7B2, "M", "ʝ"),
+        (0xA7B3, "M", "ꭓ"),
+        (0xA7B4, "M", "ꞵ"),
+        (0xA7B5, "V"),
+        (0xA7B6, "M", "ꞷ"),
+        (0xA7B7, "V"),
+        (0xA7B8, "M", "ꞹ"),
+        (0xA7B9, "V"),
+        (0xA7BA, "M", "ꞻ"),
+        (0xA7BB, "V"),
+        (0xA7BC, "M", "ꞽ"),
+        (0xA7BD, "V"),
+        (0xA7BE, "M", "ꞿ"),
+        (0xA7BF, "V"),
+        (0xA7C0, "M", "ꟁ"),
+        (0xA7C1, "V"),
+        (0xA7C2, "M", "ꟃ"),
+        (0xA7C3, "V"),
+        (0xA7C4, "M", "ꞔ"),
+        (0xA7C5, "M", "ʂ"),
+        (0xA7C6, "M", "ᶎ"),
+        (0xA7C7, "M", "ꟈ"),
+        (0xA7C8, "V"),
+        (0xA7C9, "M", "ꟊ"),
+        (0xA7CA, "V"),
+        (0xA7CB, "X"),
+        (0xA7D0, "M", "ꟑ"),
+        (0xA7D1, "V"),
+        (0xA7D2, "X"),
+        (0xA7D3, "V"),
+        (0xA7D4, "X"),
+        (0xA7D5, "V"),
+        (0xA7D6, "M", "ꟗ"),
+        (0xA7D7, "V"),
+        (0xA7D8, "M", "ꟙ"),
+        (0xA7D9, "V"),
+        (0xA7DA, "X"),
+        (0xA7F2, "M", "c"),
+        (0xA7F3, "M", "f"),
+        (0xA7F4, "M", "q"),
+        (0xA7F5, "M", "ꟶ"),
+        (0xA7F6, "V"),
+        (0xA7F8, "M", "ħ"),
+        (0xA7F9, "M", "œ"),
+        (0xA7FA, "V"),
+        (0xA82D, "X"),
+        (0xA830, "V"),
+        (0xA83A, "X"),
+        (0xA840, "V"),
+        (0xA878, "X"),
+        (0xA880, "V"),
+        (0xA8C6, "X"),
+        (0xA8CE, "V"),
+        (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'),
-    (0xA9CE, 'X'),
-    (0xA9CF, 'V'),
-    (0xA9DA, 'X'),
-    (0xA9DE, 'V'),
-    (0xA9FF, 'X'),
-    (0xAA00, 'V'),
-    (0xAA37, 'X'),
-    (0xAA40, 'V'),
-    (0xAA4E, 'X'),
-    (0xAA50, 'V'),
-    (0xAA5A, 'X'),
-    (0xAA5C, 'V'),
-    (0xAAC3, 'X'),
-    (0xAADB, 'V'),
-    (0xAAF7, 'X'),
-    (0xAB01, 'V'),
-    (0xAB07, 'X'),
-    (0xAB09, 'V'),
-    (0xAB0F, 'X'),
-    (0xAB11, 'V'),
-    (0xAB17, 'X'),
-    (0xAB20, 'V'),
-    (0xAB27, 'X'),
-    (0xAB28, 'V'),
-    (0xAB2F, 'X'),
-    (0xAB30, 'V'),
-    (0xAB5C, 'M', 'ꜧ'),
-    (0xAB5D, 'M', 'ꬷ'),
-    (0xAB5E, 'M', 'ɫ'),
-    (0xAB5F, 'M', 'ꭒ'),
-    (0xAB60, 'V'),
-    (0xAB69, 'M', 'ʍ'),
-    (0xAB6A, 'V'),
-    (0xAB6C, 'X'),
-    (0xAB70, 'M', 'Ꭰ'),
-    (0xAB71, 'M', 'Ꭱ'),
-    (0xAB72, 'M', 'Ꭲ'),
-    (0xAB73, 'M', 'Ꭳ'),
-    (0xAB74, 'M', 'Ꭴ'),
-    (0xAB75, 'M', 'Ꭵ'),
-    (0xAB76, 'M', 'Ꭶ'),
-    (0xAB77, 'M', 'Ꭷ'),
-    (0xAB78, 'M', 'Ꭸ'),
-    (0xAB79, 'M', 'Ꭹ'),
-    (0xAB7A, 'M', 'Ꭺ'),
-    (0xAB7B, 'M', 'Ꭻ'),
-    (0xAB7C, 'M', 'Ꭼ'),
-    (0xAB7D, 'M', 'Ꭽ'),
-    (0xAB7E, 'M', 'Ꭾ'),
-    (0xAB7F, 'M', 'Ꭿ'),
-    (0xAB80, 'M', 'Ꮀ'),
-    (0xAB81, 'M', 'Ꮁ'),
-    (0xAB82, 'M', 'Ꮂ'),
-    (0xAB83, 'M', 'Ꮃ'),
-    (0xAB84, 'M', 'Ꮄ'),
-    (0xAB85, 'M', 'Ꮅ'),
-    (0xAB86, 'M', 'Ꮆ'),
-    (0xAB87, 'M', 'Ꮇ'),
-    (0xAB88, 'M', 'Ꮈ'),
-    (0xAB89, 'M', 'Ꮉ'),
-    (0xAB8A, 'M', 'Ꮊ'),
-    (0xAB8B, 'M', 'Ꮋ'),
-    (0xAB8C, 'M', 'Ꮌ'),
-    (0xAB8D, 'M', 'Ꮍ'),
-    (0xAB8E, 'M', 'Ꮎ'),
-    (0xAB8F, 'M', 'Ꮏ'),
-    (0xAB90, 'M', 'Ꮐ'),
-    (0xAB91, 'M', 'Ꮑ'),
-    (0xAB92, 'M', 'Ꮒ'),
-    (0xAB93, 'M', 'Ꮓ'),
-    (0xAB94, 'M', 'Ꮔ'),
-    (0xAB95, 'M', 'Ꮕ'),
-    (0xAB96, 'M', 'Ꮖ'),
-    (0xAB97, 'M', 'Ꮗ'),
-    (0xAB98, 'M', 'Ꮘ'),
-    (0xAB99, 'M', 'Ꮙ'),
-    (0xAB9A, 'M', 'Ꮚ'),
-    (0xAB9B, 'M', 'Ꮛ'),
-    (0xAB9C, 'M', 'Ꮜ'),
-    (0xAB9D, 'M', 'Ꮝ'),
-    (0xAB9E, 'M', 'Ꮞ'),
-    (0xAB9F, 'M', 'Ꮟ'),
-    (0xABA0, 'M', 'Ꮠ'),
-    (0xABA1, 'M', 'Ꮡ'),
-    (0xABA2, 'M', 'Ꮢ'),
-    (0xABA3, 'M', 'Ꮣ'),
-    (0xABA4, 'M', 'Ꮤ'),
-    (0xABA5, 'M', 'Ꮥ'),
-    (0xABA6, 'M', 'Ꮦ'),
-    (0xABA7, 'M', 'Ꮧ'),
-    (0xABA8, 'M', 'Ꮨ'),
-    (0xABA9, 'M', 'Ꮩ'),
-    (0xABAA, 'M', 'Ꮪ'),
-    (0xABAB, 'M', 'Ꮫ'),
-    (0xABAC, 'M', 'Ꮬ'),
-    (0xABAD, 'M', 'Ꮭ'),
-    (0xABAE, 'M', 'Ꮮ'),
+        (0xA95F, "V"),
+        (0xA97D, "X"),
+        (0xA980, "V"),
+        (0xA9CE, "X"),
+        (0xA9CF, "V"),
+        (0xA9DA, "X"),
+        (0xA9DE, "V"),
+        (0xA9FF, "X"),
+        (0xAA00, "V"),
+        (0xAA37, "X"),
+        (0xAA40, "V"),
+        (0xAA4E, "X"),
+        (0xAA50, "V"),
+        (0xAA5A, "X"),
+        (0xAA5C, "V"),
+        (0xAAC3, "X"),
+        (0xAADB, "V"),
+        (0xAAF7, "X"),
+        (0xAB01, "V"),
+        (0xAB07, "X"),
+        (0xAB09, "V"),
+        (0xAB0F, "X"),
+        (0xAB11, "V"),
+        (0xAB17, "X"),
+        (0xAB20, "V"),
+        (0xAB27, "X"),
+        (0xAB28, "V"),
+        (0xAB2F, "X"),
+        (0xAB30, "V"),
+        (0xAB5C, "M", "ꜧ"),
+        (0xAB5D, "M", "ꬷ"),
+        (0xAB5E, "M", "ɫ"),
+        (0xAB5F, "M", "ꭒ"),
+        (0xAB60, "V"),
+        (0xAB69, "M", "ʍ"),
+        (0xAB6A, "V"),
+        (0xAB6C, "X"),
+        (0xAB70, "M", "Ꭰ"),
+        (0xAB71, "M", "Ꭱ"),
+        (0xAB72, "M", "Ꭲ"),
+        (0xAB73, "M", "Ꭳ"),
+        (0xAB74, "M", "Ꭴ"),
+        (0xAB75, "M", "Ꭵ"),
+        (0xAB76, "M", "Ꭶ"),
+        (0xAB77, "M", "Ꭷ"),
+        (0xAB78, "M", "Ꭸ"),
+        (0xAB79, "M", "Ꭹ"),
+        (0xAB7A, "M", "Ꭺ"),
+        (0xAB7B, "M", "Ꭻ"),
+        (0xAB7C, "M", "Ꭼ"),
+        (0xAB7D, "M", "Ꭽ"),
+        (0xAB7E, "M", "Ꭾ"),
+        (0xAB7F, "M", "Ꭿ"),
+        (0xAB80, "M", "Ꮀ"),
+        (0xAB81, "M", "Ꮁ"),
+        (0xAB82, "M", "Ꮂ"),
+        (0xAB83, "M", "Ꮃ"),
+        (0xAB84, "M", "Ꮄ"),
+        (0xAB85, "M", "Ꮅ"),
+        (0xAB86, "M", "Ꮆ"),
+        (0xAB87, "M", "Ꮇ"),
+        (0xAB88, "M", "Ꮈ"),
+        (0xAB89, "M", "Ꮉ"),
+        (0xAB8A, "M", "Ꮊ"),
+        (0xAB8B, "M", "Ꮋ"),
+        (0xAB8C, "M", "Ꮌ"),
+        (0xAB8D, "M", "Ꮍ"),
+        (0xAB8E, "M", "Ꮎ"),
+        (0xAB8F, "M", "Ꮏ"),
+        (0xAB90, "M", "Ꮐ"),
+        (0xAB91, "M", "Ꮑ"),
+        (0xAB92, "M", "Ꮒ"),
+        (0xAB93, "M", "Ꮓ"),
+        (0xAB94, "M", "Ꮔ"),
+        (0xAB95, "M", "Ꮕ"),
+        (0xAB96, "M", "Ꮖ"),
+        (0xAB97, "M", "Ꮗ"),
+        (0xAB98, "M", "Ꮘ"),
+        (0xAB99, "M", "Ꮙ"),
+        (0xAB9A, "M", "Ꮚ"),
+        (0xAB9B, "M", "Ꮛ"),
+        (0xAB9C, "M", "Ꮜ"),
+        (0xAB9D, "M", "Ꮝ"),
+        (0xAB9E, "M", "Ꮞ"),
+        (0xAB9F, "M", "Ꮟ"),
+        (0xABA0, "M", "Ꮠ"),
+        (0xABA1, "M", "Ꮡ"),
+        (0xABA2, "M", "Ꮢ"),
+        (0xABA3, "M", "Ꮣ"),
+        (0xABA4, "M", "Ꮤ"),
+        (0xABA5, "M", "Ꮥ"),
+        (0xABA6, "M", "Ꮦ"),
+        (0xABA7, "M", "Ꮧ"),
+        (0xABA8, "M", "Ꮨ"),
+        (0xABA9, "M", "Ꮩ"),
+        (0xABAA, "M", "Ꮪ"),
+        (0xABAB, "M", "Ꮫ"),
+        (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', 'Ꮱ'),
-    (0xABB2, 'M', 'Ꮲ'),
-    (0xABB3, 'M', 'Ꮳ'),
-    (0xABB4, 'M', 'Ꮴ'),
-    (0xABB5, 'M', 'Ꮵ'),
-    (0xABB6, 'M', 'Ꮶ'),
-    (0xABB7, 'M', 'Ꮷ'),
-    (0xABB8, 'M', 'Ꮸ'),
-    (0xABB9, 'M', 'Ꮹ'),
-    (0xABBA, 'M', 'Ꮺ'),
-    (0xABBB, 'M', 'Ꮻ'),
-    (0xABBC, 'M', 'Ꮼ'),
-    (0xABBD, 'M', 'Ꮽ'),
-    (0xABBE, 'M', 'Ꮾ'),
-    (0xABBF, 'M', 'Ꮿ'),
-    (0xABC0, 'V'),
-    (0xABEE, 'X'),
-    (0xABF0, 'V'),
-    (0xABFA, 'X'),
-    (0xAC00, 'V'),
-    (0xD7A4, 'X'),
-    (0xD7B0, 'V'),
-    (0xD7C7, 'X'),
-    (0xD7CB, 'V'),
-    (0xD7FC, 'X'),
-    (0xF900, 'M', '豈'),
-    (0xF901, 'M', '更'),
-    (0xF902, 'M', '車'),
-    (0xF903, 'M', '賈'),
-    (0xF904, 'M', '滑'),
-    (0xF905, 'M', '串'),
-    (0xF906, 'M', '句'),
-    (0xF907, 'M', '龜'),
-    (0xF909, 'M', '契'),
-    (0xF90A, 'M', '金'),
-    (0xF90B, 'M', '喇'),
-    (0xF90C, 'M', '奈'),
-    (0xF90D, 'M', '懶'),
-    (0xF90E, 'M', '癩'),
-    (0xF90F, 'M', '羅'),
-    (0xF910, 'M', '蘿'),
-    (0xF911, 'M', '螺'),
-    (0xF912, 'M', '裸'),
-    (0xF913, 'M', '邏'),
-    (0xF914, 'M', '樂'),
-    (0xF915, 'M', '洛'),
-    (0xF916, 'M', '烙'),
-    (0xF917, 'M', '珞'),
-    (0xF918, 'M', '落'),
-    (0xF919, 'M', '酪'),
-    (0xF91A, 'M', '駱'),
-    (0xF91B, 'M', '亂'),
-    (0xF91C, 'M', '卵'),
-    (0xF91D, 'M', '欄'),
-    (0xF91E, 'M', '爛'),
-    (0xF91F, 'M', '蘭'),
-    (0xF920, 'M', '鸞'),
-    (0xF921, 'M', '嵐'),
-    (0xF922, 'M', '濫'),
-    (0xF923, 'M', '藍'),
-    (0xF924, 'M', '襤'),
-    (0xF925, 'M', '拉'),
-    (0xF926, 'M', '臘'),
-    (0xF927, 'M', '蠟'),
-    (0xF928, 'M', '廊'),
-    (0xF929, 'M', '朗'),
-    (0xF92A, 'M', '浪'),
-    (0xF92B, 'M', '狼'),
-    (0xF92C, 'M', '郎'),
-    (0xF92D, 'M', '來'),
-    (0xF92E, 'M', '冷'),
-    (0xF92F, 'M', '勞'),
-    (0xF930, 'M', '擄'),
-    (0xF931, 'M', '櫓'),
-    (0xF932, 'M', '爐'),
-    (0xF933, 'M', '盧'),
-    (0xF934, 'M', '老'),
-    (0xF935, 'M', '蘆'),
-    (0xF936, 'M', '虜'),
-    (0xF937, 'M', '路'),
-    (0xF938, 'M', '露'),
-    (0xF939, 'M', '魯'),
-    (0xF93A, 'M', '鷺'),
-    (0xF93B, 'M', '碌'),
-    (0xF93C, 'M', '祿'),
-    (0xF93D, 'M', '綠'),
-    (0xF93E, 'M', '菉'),
-    (0xF93F, 'M', '錄'),
-    (0xF940, 'M', '鹿'),
-    (0xF941, 'M', '論'),
-    (0xF942, 'M', '壟'),
-    (0xF943, 'M', '弄'),
-    (0xF944, 'M', '籠'),
-    (0xF945, 'M', '聾'),
-    (0xF946, 'M', '牢'),
-    (0xF947, 'M', '磊'),
-    (0xF948, 'M', '賂'),
-    (0xF949, 'M', '雷'),
+        (0xABAF, "M", "Ꮯ"),
+        (0xABB0, "M", "Ꮰ"),
+        (0xABB1, "M", "Ꮱ"),
+        (0xABB2, "M", "Ꮲ"),
+        (0xABB3, "M", "Ꮳ"),
+        (0xABB4, "M", "Ꮴ"),
+        (0xABB5, "M", "Ꮵ"),
+        (0xABB6, "M", "Ꮶ"),
+        (0xABB7, "M", "Ꮷ"),
+        (0xABB8, "M", "Ꮸ"),
+        (0xABB9, "M", "Ꮹ"),
+        (0xABBA, "M", "Ꮺ"),
+        (0xABBB, "M", "Ꮻ"),
+        (0xABBC, "M", "Ꮼ"),
+        (0xABBD, "M", "Ꮽ"),
+        (0xABBE, "M", "Ꮾ"),
+        (0xABBF, "M", "Ꮿ"),
+        (0xABC0, "V"),
+        (0xABEE, "X"),
+        (0xABF0, "V"),
+        (0xABFA, "X"),
+        (0xAC00, "V"),
+        (0xD7A4, "X"),
+        (0xD7B0, "V"),
+        (0xD7C7, "X"),
+        (0xD7CB, "V"),
+        (0xD7FC, "X"),
+        (0xF900, "M", "豈"),
+        (0xF901, "M", "更"),
+        (0xF902, "M", "車"),
+        (0xF903, "M", "賈"),
+        (0xF904, "M", "滑"),
+        (0xF905, "M", "串"),
+        (0xF906, "M", "句"),
+        (0xF907, "M", "龜"),
+        (0xF909, "M", "契"),
+        (0xF90A, "M", "金"),
+        (0xF90B, "M", "喇"),
+        (0xF90C, "M", "奈"),
+        (0xF90D, "M", "懶"),
+        (0xF90E, "M", "癩"),
+        (0xF90F, "M", "羅"),
+        (0xF910, "M", "蘿"),
+        (0xF911, "M", "螺"),
+        (0xF912, "M", "裸"),
+        (0xF913, "M", "邏"),
+        (0xF914, "M", "樂"),
+        (0xF915, "M", "洛"),
+        (0xF916, "M", "烙"),
+        (0xF917, "M", "珞"),
+        (0xF918, "M", "落"),
+        (0xF919, "M", "酪"),
+        (0xF91A, "M", "駱"),
+        (0xF91B, "M", "亂"),
+        (0xF91C, "M", "卵"),
+        (0xF91D, "M", "欄"),
+        (0xF91E, "M", "爛"),
+        (0xF91F, "M", "蘭"),
+        (0xF920, "M", "鸞"),
+        (0xF921, "M", "嵐"),
+        (0xF922, "M", "濫"),
+        (0xF923, "M", "藍"),
+        (0xF924, "M", "襤"),
+        (0xF925, "M", "拉"),
+        (0xF926, "M", "臘"),
+        (0xF927, "M", "蠟"),
+        (0xF928, "M", "廊"),
+        (0xF929, "M", "朗"),
+        (0xF92A, "M", "浪"),
+        (0xF92B, "M", "狼"),
+        (0xF92C, "M", "郎"),
+        (0xF92D, "M", "來"),
+        (0xF92E, "M", "冷"),
+        (0xF92F, "M", "勞"),
+        (0xF930, "M", "擄"),
+        (0xF931, "M", "櫓"),
+        (0xF932, "M", "爐"),
+        (0xF933, "M", "盧"),
+        (0xF934, "M", "老"),
+        (0xF935, "M", "蘆"),
+        (0xF936, "M", "虜"),
+        (0xF937, "M", "路"),
+        (0xF938, "M", "露"),
+        (0xF939, "M", "魯"),
+        (0xF93A, "M", "鷺"),
+        (0xF93B, "M", "碌"),
+        (0xF93C, "M", "祿"),
+        (0xF93D, "M", "綠"),
+        (0xF93E, "M", "菉"),
+        (0xF93F, "M", "錄"),
+        (0xF940, "M", "鹿"),
+        (0xF941, "M", "論"),
+        (0xF942, "M", "壟"),
+        (0xF943, "M", "弄"),
+        (0xF944, "M", "籠"),
+        (0xF945, "M", "聾"),
+        (0xF946, "M", "牢"),
+        (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', '樓'),
-    (0xF94D, 'M', '淚'),
-    (0xF94E, 'M', '漏'),
-    (0xF94F, 'M', '累'),
-    (0xF950, 'M', '縷'),
-    (0xF951, 'M', '陋'),
-    (0xF952, 'M', '勒'),
-    (0xF953, 'M', '肋'),
-    (0xF954, 'M', '凜'),
-    (0xF955, 'M', '凌'),
-    (0xF956, 'M', '稜'),
-    (0xF957, 'M', '綾'),
-    (0xF958, 'M', '菱'),
-    (0xF959, 'M', '陵'),
-    (0xF95A, 'M', '讀'),
-    (0xF95B, 'M', '拏'),
-    (0xF95C, 'M', '樂'),
-    (0xF95D, 'M', '諾'),
-    (0xF95E, 'M', '丹'),
-    (0xF95F, 'M', '寧'),
-    (0xF960, 'M', '怒'),
-    (0xF961, 'M', '率'),
-    (0xF962, 'M', '異'),
-    (0xF963, 'M', '北'),
-    (0xF964, 'M', '磻'),
-    (0xF965, 'M', '便'),
-    (0xF966, 'M', '復'),
-    (0xF967, 'M', '不'),
-    (0xF968, 'M', '泌'),
-    (0xF969, 'M', '數'),
-    (0xF96A, 'M', '索'),
-    (0xF96B, 'M', '參'),
-    (0xF96C, 'M', '塞'),
-    (0xF96D, 'M', '省'),
-    (0xF96E, 'M', '葉'),
-    (0xF96F, 'M', '說'),
-    (0xF970, 'M', '殺'),
-    (0xF971, 'M', '辰'),
-    (0xF972, 'M', '沈'),
-    (0xF973, 'M', '拾'),
-    (0xF974, 'M', '若'),
-    (0xF975, 'M', '掠'),
-    (0xF976, 'M', '略'),
-    (0xF977, 'M', '亮'),
-    (0xF978, 'M', '兩'),
-    (0xF979, 'M', '凉'),
-    (0xF97A, 'M', '梁'),
-    (0xF97B, 'M', '糧'),
-    (0xF97C, 'M', '良'),
-    (0xF97D, 'M', '諒'),
-    (0xF97E, 'M', '量'),
-    (0xF97F, 'M', '勵'),
-    (0xF980, 'M', '呂'),
-    (0xF981, 'M', '女'),
-    (0xF982, 'M', '廬'),
-    (0xF983, 'M', '旅'),
-    (0xF984, 'M', '濾'),
-    (0xF985, 'M', '礪'),
-    (0xF986, 'M', '閭'),
-    (0xF987, 'M', '驪'),
-    (0xF988, 'M', '麗'),
-    (0xF989, 'M', '黎'),
-    (0xF98A, 'M', '力'),
-    (0xF98B, 'M', '曆'),
-    (0xF98C, 'M', '歷'),
-    (0xF98D, 'M', '轢'),
-    (0xF98E, 'M', '年'),
-    (0xF98F, 'M', '憐'),
-    (0xF990, 'M', '戀'),
-    (0xF991, 'M', '撚'),
-    (0xF992, 'M', '漣'),
-    (0xF993, 'M', '煉'),
-    (0xF994, 'M', '璉'),
-    (0xF995, 'M', '秊'),
-    (0xF996, 'M', '練'),
-    (0xF997, 'M', '聯'),
-    (0xF998, 'M', '輦'),
-    (0xF999, 'M', '蓮'),
-    (0xF99A, 'M', '連'),
-    (0xF99B, 'M', '鍊'),
-    (0xF99C, 'M', '列'),
-    (0xF99D, 'M', '劣'),
-    (0xF99E, 'M', '咽'),
-    (0xF99F, 'M', '烈'),
-    (0xF9A0, 'M', '裂'),
-    (0xF9A1, 'M', '說'),
-    (0xF9A2, 'M', '廉'),
-    (0xF9A3, 'M', '念'),
-    (0xF9A4, 'M', '捻'),
-    (0xF9A5, 'M', '殮'),
-    (0xF9A6, 'M', '簾'),
-    (0xF9A7, 'M', '獵'),
-    (0xF9A8, 'M', '令'),
-    (0xF9A9, 'M', '囹'),
-    (0xF9AA, 'M', '寧'),
-    (0xF9AB, 'M', '嶺'),
-    (0xF9AC, 'M', '怜'),
-    (0xF9AD, 'M', '玲'),
+        (0xF94A, "M", "壘"),
+        (0xF94B, "M", "屢"),
+        (0xF94C, "M", "樓"),
+        (0xF94D, "M", "淚"),
+        (0xF94E, "M", "漏"),
+        (0xF94F, "M", "累"),
+        (0xF950, "M", "縷"),
+        (0xF951, "M", "陋"),
+        (0xF952, "M", "勒"),
+        (0xF953, "M", "肋"),
+        (0xF954, "M", "凜"),
+        (0xF955, "M", "凌"),
+        (0xF956, "M", "稜"),
+        (0xF957, "M", "綾"),
+        (0xF958, "M", "菱"),
+        (0xF959, "M", "陵"),
+        (0xF95A, "M", "讀"),
+        (0xF95B, "M", "拏"),
+        (0xF95C, "M", "樂"),
+        (0xF95D, "M", "諾"),
+        (0xF95E, "M", "丹"),
+        (0xF95F, "M", "寧"),
+        (0xF960, "M", "怒"),
+        (0xF961, "M", "率"),
+        (0xF962, "M", "異"),
+        (0xF963, "M", "北"),
+        (0xF964, "M", "磻"),
+        (0xF965, "M", "便"),
+        (0xF966, "M", "復"),
+        (0xF967, "M", "不"),
+        (0xF968, "M", "泌"),
+        (0xF969, "M", "數"),
+        (0xF96A, "M", "索"),
+        (0xF96B, "M", "參"),
+        (0xF96C, "M", "塞"),
+        (0xF96D, "M", "省"),
+        (0xF96E, "M", "葉"),
+        (0xF96F, "M", "說"),
+        (0xF970, "M", "殺"),
+        (0xF971, "M", "辰"),
+        (0xF972, "M", "沈"),
+        (0xF973, "M", "拾"),
+        (0xF974, "M", "若"),
+        (0xF975, "M", "掠"),
+        (0xF976, "M", "略"),
+        (0xF977, "M", "亮"),
+        (0xF978, "M", "兩"),
+        (0xF979, "M", "凉"),
+        (0xF97A, "M", "梁"),
+        (0xF97B, "M", "糧"),
+        (0xF97C, "M", "良"),
+        (0xF97D, "M", "諒"),
+        (0xF97E, "M", "量"),
+        (0xF97F, "M", "勵"),
+        (0xF980, "M", "呂"),
+        (0xF981, "M", "女"),
+        (0xF982, "M", "廬"),
+        (0xF983, "M", "旅"),
+        (0xF984, "M", "濾"),
+        (0xF985, "M", "礪"),
+        (0xF986, "M", "閭"),
+        (0xF987, "M", "驪"),
+        (0xF988, "M", "麗"),
+        (0xF989, "M", "黎"),
+        (0xF98A, "M", "力"),
+        (0xF98B, "M", "曆"),
+        (0xF98C, "M", "歷"),
+        (0xF98D, "M", "轢"),
+        (0xF98E, "M", "年"),
+        (0xF98F, "M", "憐"),
+        (0xF990, "M", "戀"),
+        (0xF991, "M", "撚"),
+        (0xF992, "M", "漣"),
+        (0xF993, "M", "煉"),
+        (0xF994, "M", "璉"),
+        (0xF995, "M", "秊"),
+        (0xF996, "M", "練"),
+        (0xF997, "M", "聯"),
+        (0xF998, "M", "輦"),
+        (0xF999, "M", "蓮"),
+        (0xF99A, "M", "連"),
+        (0xF99B, "M", "鍊"),
+        (0xF99C, "M", "列"),
+        (0xF99D, "M", "劣"),
+        (0xF99E, "M", "咽"),
+        (0xF99F, "M", "烈"),
+        (0xF9A0, "M", "裂"),
+        (0xF9A1, "M", "說"),
+        (0xF9A2, "M", "廉"),
+        (0xF9A3, "M", "念"),
+        (0xF9A4, "M", "捻"),
+        (0xF9A5, "M", "殮"),
+        (0xF9A6, "M", "簾"),
+        (0xF9A7, "M", "獵"),
+        (0xF9A8, "M", "令"),
+        (0xF9A9, "M", "囹"),
+        (0xF9AA, "M", "寧"),
+        (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', '聆'),
-    (0xF9B1, 'M', '鈴'),
-    (0xF9B2, 'M', '零'),
-    (0xF9B3, 'M', '靈'),
-    (0xF9B4, 'M', '領'),
-    (0xF9B5, 'M', '例'),
-    (0xF9B6, 'M', '禮'),
-    (0xF9B7, 'M', '醴'),
-    (0xF9B8, 'M', '隸'),
-    (0xF9B9, 'M', '惡'),
-    (0xF9BA, 'M', '了'),
-    (0xF9BB, 'M', '僚'),
-    (0xF9BC, 'M', '寮'),
-    (0xF9BD, 'M', '尿'),
-    (0xF9BE, 'M', '料'),
-    (0xF9BF, 'M', '樂'),
-    (0xF9C0, 'M', '燎'),
-    (0xF9C1, 'M', '療'),
-    (0xF9C2, 'M', '蓼'),
-    (0xF9C3, 'M', '遼'),
-    (0xF9C4, 'M', '龍'),
-    (0xF9C5, 'M', '暈'),
-    (0xF9C6, 'M', '阮'),
-    (0xF9C7, 'M', '劉'),
-    (0xF9C8, 'M', '杻'),
-    (0xF9C9, 'M', '柳'),
-    (0xF9CA, 'M', '流'),
-    (0xF9CB, 'M', '溜'),
-    (0xF9CC, 'M', '琉'),
-    (0xF9CD, 'M', '留'),
-    (0xF9CE, 'M', '硫'),
-    (0xF9CF, 'M', '紐'),
-    (0xF9D0, 'M', '類'),
-    (0xF9D1, 'M', '六'),
-    (0xF9D2, 'M', '戮'),
-    (0xF9D3, 'M', '陸'),
-    (0xF9D4, 'M', '倫'),
-    (0xF9D5, 'M', '崙'),
-    (0xF9D6, 'M', '淪'),
-    (0xF9D7, 'M', '輪'),
-    (0xF9D8, 'M', '律'),
-    (0xF9D9, 'M', '慄'),
-    (0xF9DA, 'M', '栗'),
-    (0xF9DB, 'M', '率'),
-    (0xF9DC, 'M', '隆'),
-    (0xF9DD, 'M', '利'),
-    (0xF9DE, 'M', '吏'),
-    (0xF9DF, 'M', '履'),
-    (0xF9E0, 'M', '易'),
-    (0xF9E1, 'M', '李'),
-    (0xF9E2, 'M', '梨'),
-    (0xF9E3, 'M', '泥'),
-    (0xF9E4, 'M', '理'),
-    (0xF9E5, 'M', '痢'),
-    (0xF9E6, 'M', '罹'),
-    (0xF9E7, 'M', '裏'),
-    (0xF9E8, 'M', '裡'),
-    (0xF9E9, 'M', '里'),
-    (0xF9EA, 'M', '離'),
-    (0xF9EB, 'M', '匿'),
-    (0xF9EC, 'M', '溺'),
-    (0xF9ED, 'M', '吝'),
-    (0xF9EE, 'M', '燐'),
-    (0xF9EF, 'M', '璘'),
-    (0xF9F0, 'M', '藺'),
-    (0xF9F1, 'M', '隣'),
-    (0xF9F2, 'M', '鱗'),
-    (0xF9F3, 'M', '麟'),
-    (0xF9F4, 'M', '林'),
-    (0xF9F5, 'M', '淋'),
-    (0xF9F6, 'M', '臨'),
-    (0xF9F7, 'M', '立'),
-    (0xF9F8, 'M', '笠'),
-    (0xF9F9, 'M', '粒'),
-    (0xF9FA, 'M', '狀'),
-    (0xF9FB, 'M', '炙'),
-    (0xF9FC, 'M', '識'),
-    (0xF9FD, 'M', '什'),
-    (0xF9FE, 'M', '茶'),
-    (0xF9FF, 'M', '刺'),
-    (0xFA00, 'M', '切'),
-    (0xFA01, 'M', '度'),
-    (0xFA02, 'M', '拓'),
-    (0xFA03, 'M', '糖'),
-    (0xFA04, 'M', '宅'),
-    (0xFA05, 'M', '洞'),
-    (0xFA06, 'M', '暴'),
-    (0xFA07, 'M', '輻'),
-    (0xFA08, 'M', '行'),
-    (0xFA09, 'M', '降'),
-    (0xFA0A, 'M', '見'),
-    (0xFA0B, 'M', '廓'),
-    (0xFA0C, 'M', '兀'),
-    (0xFA0D, 'M', '嗀'),
-    (0xFA0E, 'V'),
-    (0xFA10, 'M', '塚'),
-    (0xFA11, 'V'),
-    (0xFA12, 'M', '晴'),
+        (0xF9AE, "M", "瑩"),
+        (0xF9AF, "M", "羚"),
+        (0xF9B0, "M", "聆"),
+        (0xF9B1, "M", "鈴"),
+        (0xF9B2, "M", "零"),
+        (0xF9B3, "M", "靈"),
+        (0xF9B4, "M", "領"),
+        (0xF9B5, "M", "例"),
+        (0xF9B6, "M", "禮"),
+        (0xF9B7, "M", "醴"),
+        (0xF9B8, "M", "隸"),
+        (0xF9B9, "M", "惡"),
+        (0xF9BA, "M", "了"),
+        (0xF9BB, "M", "僚"),
+        (0xF9BC, "M", "寮"),
+        (0xF9BD, "M", "尿"),
+        (0xF9BE, "M", "料"),
+        (0xF9BF, "M", "樂"),
+        (0xF9C0, "M", "燎"),
+        (0xF9C1, "M", "療"),
+        (0xF9C2, "M", "蓼"),
+        (0xF9C3, "M", "遼"),
+        (0xF9C4, "M", "龍"),
+        (0xF9C5, "M", "暈"),
+        (0xF9C6, "M", "阮"),
+        (0xF9C7, "M", "劉"),
+        (0xF9C8, "M", "杻"),
+        (0xF9C9, "M", "柳"),
+        (0xF9CA, "M", "流"),
+        (0xF9CB, "M", "溜"),
+        (0xF9CC, "M", "琉"),
+        (0xF9CD, "M", "留"),
+        (0xF9CE, "M", "硫"),
+        (0xF9CF, "M", "紐"),
+        (0xF9D0, "M", "類"),
+        (0xF9D1, "M", "六"),
+        (0xF9D2, "M", "戮"),
+        (0xF9D3, "M", "陸"),
+        (0xF9D4, "M", "倫"),
+        (0xF9D5, "M", "崙"),
+        (0xF9D6, "M", "淪"),
+        (0xF9D7, "M", "輪"),
+        (0xF9D8, "M", "律"),
+        (0xF9D9, "M", "慄"),
+        (0xF9DA, "M", "栗"),
+        (0xF9DB, "M", "率"),
+        (0xF9DC, "M", "隆"),
+        (0xF9DD, "M", "利"),
+        (0xF9DE, "M", "吏"),
+        (0xF9DF, "M", "履"),
+        (0xF9E0, "M", "易"),
+        (0xF9E1, "M", "李"),
+        (0xF9E2, "M", "梨"),
+        (0xF9E3, "M", "泥"),
+        (0xF9E4, "M", "理"),
+        (0xF9E5, "M", "痢"),
+        (0xF9E6, "M", "罹"),
+        (0xF9E7, "M", "裏"),
+        (0xF9E8, "M", "裡"),
+        (0xF9E9, "M", "里"),
+        (0xF9EA, "M", "離"),
+        (0xF9EB, "M", "匿"),
+        (0xF9EC, "M", "溺"),
+        (0xF9ED, "M", "吝"),
+        (0xF9EE, "M", "燐"),
+        (0xF9EF, "M", "璘"),
+        (0xF9F0, "M", "藺"),
+        (0xF9F1, "M", "隣"),
+        (0xF9F2, "M", "鱗"),
+        (0xF9F3, "M", "麟"),
+        (0xF9F4, "M", "林"),
+        (0xF9F5, "M", "淋"),
+        (0xF9F6, "M", "臨"),
+        (0xF9F7, "M", "立"),
+        (0xF9F8, "M", "笠"),
+        (0xF9F9, "M", "粒"),
+        (0xF9FA, "M", "狀"),
+        (0xF9FB, "M", "炙"),
+        (0xF9FC, "M", "識"),
+        (0xF9FD, "M", "什"),
+        (0xF9FE, "M", "茶"),
+        (0xF9FF, "M", "刺"),
+        (0xFA00, "M", "切"),
+        (0xFA01, "M", "度"),
+        (0xFA02, "M", "拓"),
+        (0xFA03, "M", "糖"),
+        (0xFA04, "M", "宅"),
+        (0xFA05, "M", "洞"),
+        (0xFA06, "M", "暴"),
+        (0xFA07, "M", "輻"),
+        (0xFA08, "M", "行"),
+        (0xFA09, "M", "降"),
+        (0xFA0A, "M", "見"),
+        (0xFA0B, "M", "廓"),
+        (0xFA0C, "M", "兀"),
+        (0xFA0D, "M", "嗀"),
+        (0xFA0E, "V"),
+        (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', '猪'),
-    (0xFA17, 'M', '益'),
-    (0xFA18, 'M', '礼'),
-    (0xFA19, 'M', '神'),
-    (0xFA1A, 'M', '祥'),
-    (0xFA1B, 'M', '福'),
-    (0xFA1C, 'M', '靖'),
-    (0xFA1D, 'M', '精'),
-    (0xFA1E, 'M', '羽'),
-    (0xFA1F, 'V'),
-    (0xFA20, 'M', '蘒'),
-    (0xFA21, 'V'),
-    (0xFA22, 'M', '諸'),
-    (0xFA23, 'V'),
-    (0xFA25, 'M', '逸'),
-    (0xFA26, 'M', '都'),
-    (0xFA27, 'V'),
-    (0xFA2A, 'M', '飯'),
-    (0xFA2B, 'M', '飼'),
-    (0xFA2C, 'M', '館'),
-    (0xFA2D, 'M', '鶴'),
-    (0xFA2E, 'M', '郞'),
-    (0xFA2F, 'M', '隷'),
-    (0xFA30, 'M', '侮'),
-    (0xFA31, 'M', '僧'),
-    (0xFA32, 'M', '免'),
-    (0xFA33, 'M', '勉'),
-    (0xFA34, 'M', '勤'),
-    (0xFA35, 'M', '卑'),
-    (0xFA36, 'M', '喝'),
-    (0xFA37, 'M', '嘆'),
-    (0xFA38, 'M', '器'),
-    (0xFA39, 'M', '塀'),
-    (0xFA3A, 'M', '墨'),
-    (0xFA3B, 'M', '層'),
-    (0xFA3C, 'M', '屮'),
-    (0xFA3D, 'M', '悔'),
-    (0xFA3E, 'M', '慨'),
-    (0xFA3F, 'M', '憎'),
-    (0xFA40, 'M', '懲'),
-    (0xFA41, 'M', '敏'),
-    (0xFA42, 'M', '既'),
-    (0xFA43, 'M', '暑'),
-    (0xFA44, 'M', '梅'),
-    (0xFA45, 'M', '海'),
-    (0xFA46, 'M', '渚'),
-    (0xFA47, 'M', '漢'),
-    (0xFA48, 'M', '煮'),
-    (0xFA49, 'M', '爫'),
-    (0xFA4A, 'M', '琢'),
-    (0xFA4B, 'M', '碑'),
-    (0xFA4C, 'M', '社'),
-    (0xFA4D, 'M', '祉'),
-    (0xFA4E, 'M', '祈'),
-    (0xFA4F, 'M', '祐'),
-    (0xFA50, 'M', '祖'),
-    (0xFA51, 'M', '祝'),
-    (0xFA52, 'M', '禍'),
-    (0xFA53, 'M', '禎'),
-    (0xFA54, 'M', '穀'),
-    (0xFA55, 'M', '突'),
-    (0xFA56, 'M', '節'),
-    (0xFA57, 'M', '練'),
-    (0xFA58, 'M', '縉'),
-    (0xFA59, 'M', '繁'),
-    (0xFA5A, 'M', '署'),
-    (0xFA5B, 'M', '者'),
-    (0xFA5C, 'M', '臭'),
-    (0xFA5D, 'M', '艹'),
-    (0xFA5F, 'M', '著'),
-    (0xFA60, 'M', '褐'),
-    (0xFA61, 'M', '視'),
-    (0xFA62, 'M', '謁'),
-    (0xFA63, 'M', '謹'),
-    (0xFA64, 'M', '賓'),
-    (0xFA65, 'M', '贈'),
-    (0xFA66, 'M', '辶'),
-    (0xFA67, 'M', '逸'),
-    (0xFA68, 'M', '難'),
-    (0xFA69, 'M', '響'),
-    (0xFA6A, 'M', '頻'),
-    (0xFA6B, 'M', '恵'),
-    (0xFA6C, 'M', '𤋮'),
-    (0xFA6D, 'M', '舘'),
-    (0xFA6E, 'X'),
-    (0xFA70, 'M', '並'),
-    (0xFA71, 'M', '况'),
-    (0xFA72, 'M', '全'),
-    (0xFA73, 'M', '侀'),
-    (0xFA74, 'M', '充'),
-    (0xFA75, 'M', '冀'),
-    (0xFA76, 'M', '勇'),
-    (0xFA77, 'M', '勺'),
-    (0xFA78, 'M', '喝'),
-    (0xFA79, 'M', '啕'),
-    (0xFA7A, 'M', '喙'),
-    (0xFA7B, 'M', '嗢'),
-    (0xFA7C, 'M', '塚'),
+        (0xFA13, "V"),
+        (0xFA15, "M", "凞"),
+        (0xFA16, "M", "猪"),
+        (0xFA17, "M", "益"),
+        (0xFA18, "M", "礼"),
+        (0xFA19, "M", "神"),
+        (0xFA1A, "M", "祥"),
+        (0xFA1B, "M", "福"),
+        (0xFA1C, "M", "靖"),
+        (0xFA1D, "M", "精"),
+        (0xFA1E, "M", "羽"),
+        (0xFA1F, "V"),
+        (0xFA20, "M", "蘒"),
+        (0xFA21, "V"),
+        (0xFA22, "M", "諸"),
+        (0xFA23, "V"),
+        (0xFA25, "M", "逸"),
+        (0xFA26, "M", "都"),
+        (0xFA27, "V"),
+        (0xFA2A, "M", "飯"),
+        (0xFA2B, "M", "飼"),
+        (0xFA2C, "M", "館"),
+        (0xFA2D, "M", "鶴"),
+        (0xFA2E, "M", "郞"),
+        (0xFA2F, "M", "隷"),
+        (0xFA30, "M", "侮"),
+        (0xFA31, "M", "僧"),
+        (0xFA32, "M", "免"),
+        (0xFA33, "M", "勉"),
+        (0xFA34, "M", "勤"),
+        (0xFA35, "M", "卑"),
+        (0xFA36, "M", "喝"),
+        (0xFA37, "M", "嘆"),
+        (0xFA38, "M", "器"),
+        (0xFA39, "M", "塀"),
+        (0xFA3A, "M", "墨"),
+        (0xFA3B, "M", "層"),
+        (0xFA3C, "M", "屮"),
+        (0xFA3D, "M", "悔"),
+        (0xFA3E, "M", "慨"),
+        (0xFA3F, "M", "憎"),
+        (0xFA40, "M", "懲"),
+        (0xFA41, "M", "敏"),
+        (0xFA42, "M", "既"),
+        (0xFA43, "M", "暑"),
+        (0xFA44, "M", "梅"),
+        (0xFA45, "M", "海"),
+        (0xFA46, "M", "渚"),
+        (0xFA47, "M", "漢"),
+        (0xFA48, "M", "煮"),
+        (0xFA49, "M", "爫"),
+        (0xFA4A, "M", "琢"),
+        (0xFA4B, "M", "碑"),
+        (0xFA4C, "M", "社"),
+        (0xFA4D, "M", "祉"),
+        (0xFA4E, "M", "祈"),
+        (0xFA4F, "M", "祐"),
+        (0xFA50, "M", "祖"),
+        (0xFA51, "M", "祝"),
+        (0xFA52, "M", "禍"),
+        (0xFA53, "M", "禎"),
+        (0xFA54, "M", "穀"),
+        (0xFA55, "M", "突"),
+        (0xFA56, "M", "節"),
+        (0xFA57, "M", "練"),
+        (0xFA58, "M", "縉"),
+        (0xFA59, "M", "繁"),
+        (0xFA5A, "M", "署"),
+        (0xFA5B, "M", "者"),
+        (0xFA5C, "M", "臭"),
+        (0xFA5D, "M", "艹"),
+        (0xFA5F, "M", "著"),
+        (0xFA60, "M", "褐"),
+        (0xFA61, "M", "視"),
+        (0xFA62, "M", "謁"),
+        (0xFA63, "M", "謹"),
+        (0xFA64, "M", "賓"),
+        (0xFA65, "M", "贈"),
+        (0xFA66, "M", "辶"),
+        (0xFA67, "M", "逸"),
+        (0xFA68, "M", "難"),
+        (0xFA69, "M", "響"),
+        (0xFA6A, "M", "頻"),
+        (0xFA6B, "M", "恵"),
+        (0xFA6C, "M", "𤋮"),
+        (0xFA6D, "M", "舘"),
+        (0xFA6E, "X"),
+        (0xFA70, "M", "並"),
+        (0xFA71, "M", "况"),
+        (0xFA72, "M", "全"),
+        (0xFA73, "M", "侀"),
+        (0xFA74, "M", "充"),
+        (0xFA75, "M", "冀"),
+        (0xFA76, "M", "勇"),
+        (0xFA77, "M", "勺"),
+        (0xFA78, "M", "喝"),
+        (0xFA79, "M", "啕"),
+        (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', '奔'),
-    (0xFA80, 'M', '婢'),
-    (0xFA81, 'M', '嬨'),
-    (0xFA82, 'M', '廒'),
-    (0xFA83, 'M', '廙'),
-    (0xFA84, 'M', '彩'),
-    (0xFA85, 'M', '徭'),
-    (0xFA86, 'M', '惘'),
-    (0xFA87, 'M', '慎'),
-    (0xFA88, 'M', '愈'),
-    (0xFA89, 'M', '憎'),
-    (0xFA8A, 'M', '慠'),
-    (0xFA8B, 'M', '懲'),
-    (0xFA8C, 'M', '戴'),
-    (0xFA8D, 'M', '揄'),
-    (0xFA8E, 'M', '搜'),
-    (0xFA8F, 'M', '摒'),
-    (0xFA90, 'M', '敖'),
-    (0xFA91, 'M', '晴'),
-    (0xFA92, 'M', '朗'),
-    (0xFA93, 'M', '望'),
-    (0xFA94, 'M', '杖'),
-    (0xFA95, 'M', '歹'),
-    (0xFA96, 'M', '殺'),
-    (0xFA97, 'M', '流'),
-    (0xFA98, 'M', '滛'),
-    (0xFA99, 'M', '滋'),
-    (0xFA9A, 'M', '漢'),
-    (0xFA9B, 'M', '瀞'),
-    (0xFA9C, 'M', '煮'),
-    (0xFA9D, 'M', '瞧'),
-    (0xFA9E, 'M', '爵'),
-    (0xFA9F, 'M', '犯'),
-    (0xFAA0, 'M', '猪'),
-    (0xFAA1, 'M', '瑱'),
-    (0xFAA2, 'M', '甆'),
-    (0xFAA3, 'M', '画'),
-    (0xFAA4, 'M', '瘝'),
-    (0xFAA5, 'M', '瘟'),
-    (0xFAA6, 'M', '益'),
-    (0xFAA7, 'M', '盛'),
-    (0xFAA8, 'M', '直'),
-    (0xFAA9, 'M', '睊'),
-    (0xFAAA, 'M', '着'),
-    (0xFAAB, 'M', '磌'),
-    (0xFAAC, 'M', '窱'),
-    (0xFAAD, 'M', '節'),
-    (0xFAAE, 'M', '类'),
-    (0xFAAF, 'M', '絛'),
-    (0xFAB0, 'M', '練'),
-    (0xFAB1, 'M', '缾'),
-    (0xFAB2, 'M', '者'),
-    (0xFAB3, 'M', '荒'),
-    (0xFAB4, 'M', '華'),
-    (0xFAB5, 'M', '蝹'),
-    (0xFAB6, 'M', '襁'),
-    (0xFAB7, 'M', '覆'),
-    (0xFAB8, 'M', '視'),
-    (0xFAB9, 'M', '調'),
-    (0xFABA, 'M', '諸'),
-    (0xFABB, 'M', '請'),
-    (0xFABC, 'M', '謁'),
-    (0xFABD, 'M', '諾'),
-    (0xFABE, 'M', '諭'),
-    (0xFABF, 'M', '謹'),
-    (0xFAC0, 'M', '變'),
-    (0xFAC1, 'M', '贈'),
-    (0xFAC2, 'M', '輸'),
-    (0xFAC3, 'M', '遲'),
-    (0xFAC4, 'M', '醙'),
-    (0xFAC5, 'M', '鉶'),
-    (0xFAC6, 'M', '陼'),
-    (0xFAC7, 'M', '難'),
-    (0xFAC8, 'M', '靖'),
-    (0xFAC9, 'M', '韛'),
-    (0xFACA, 'M', '響'),
-    (0xFACB, 'M', '頋'),
-    (0xFACC, 'M', '頻'),
-    (0xFACD, 'M', '鬒'),
-    (0xFACE, 'M', '龜'),
-    (0xFACF, 'M', '𢡊'),
-    (0xFAD0, 'M', '𢡄'),
-    (0xFAD1, 'M', '𣏕'),
-    (0xFAD2, 'M', '㮝'),
-    (0xFAD3, 'M', '䀘'),
-    (0xFAD4, 'M', '䀹'),
-    (0xFAD5, 'M', '𥉉'),
-    (0xFAD6, 'M', '𥳐'),
-    (0xFAD7, 'M', '𧻓'),
-    (0xFAD8, 'M', '齃'),
-    (0xFAD9, 'M', '龎'),
-    (0xFADA, 'X'),
-    (0xFB00, 'M', 'ff'),
-    (0xFB01, 'M', 'fi'),
-    (0xFB02, 'M', 'fl'),
-    (0xFB03, 'M', 'ffi'),
-    (0xFB04, 'M', 'ffl'),
-    (0xFB05, 'M', 'st'),
+        (0xFA7D, "M", "墳"),
+        (0xFA7E, "M", "奄"),
+        (0xFA7F, "M", "奔"),
+        (0xFA80, "M", "婢"),
+        (0xFA81, "M", "嬨"),
+        (0xFA82, "M", "廒"),
+        (0xFA83, "M", "廙"),
+        (0xFA84, "M", "彩"),
+        (0xFA85, "M", "徭"),
+        (0xFA86, "M", "惘"),
+        (0xFA87, "M", "慎"),
+        (0xFA88, "M", "愈"),
+        (0xFA89, "M", "憎"),
+        (0xFA8A, "M", "慠"),
+        (0xFA8B, "M", "懲"),
+        (0xFA8C, "M", "戴"),
+        (0xFA8D, "M", "揄"),
+        (0xFA8E, "M", "搜"),
+        (0xFA8F, "M", "摒"),
+        (0xFA90, "M", "敖"),
+        (0xFA91, "M", "晴"),
+        (0xFA92, "M", "朗"),
+        (0xFA93, "M", "望"),
+        (0xFA94, "M", "杖"),
+        (0xFA95, "M", "歹"),
+        (0xFA96, "M", "殺"),
+        (0xFA97, "M", "流"),
+        (0xFA98, "M", "滛"),
+        (0xFA99, "M", "滋"),
+        (0xFA9A, "M", "漢"),
+        (0xFA9B, "M", "瀞"),
+        (0xFA9C, "M", "煮"),
+        (0xFA9D, "M", "瞧"),
+        (0xFA9E, "M", "爵"),
+        (0xFA9F, "M", "犯"),
+        (0xFAA0, "M", "猪"),
+        (0xFAA1, "M", "瑱"),
+        (0xFAA2, "M", "甆"),
+        (0xFAA3, "M", "画"),
+        (0xFAA4, "M", "瘝"),
+        (0xFAA5, "M", "瘟"),
+        (0xFAA6, "M", "益"),
+        (0xFAA7, "M", "盛"),
+        (0xFAA8, "M", "直"),
+        (0xFAA9, "M", "睊"),
+        (0xFAAA, "M", "着"),
+        (0xFAAB, "M", "磌"),
+        (0xFAAC, "M", "窱"),
+        (0xFAAD, "M", "節"),
+        (0xFAAE, "M", "类"),
+        (0xFAAF, "M", "絛"),
+        (0xFAB0, "M", "練"),
+        (0xFAB1, "M", "缾"),
+        (0xFAB2, "M", "者"),
+        (0xFAB3, "M", "荒"),
+        (0xFAB4, "M", "華"),
+        (0xFAB5, "M", "蝹"),
+        (0xFAB6, "M", "襁"),
+        (0xFAB7, "M", "覆"),
+        (0xFAB8, "M", "視"),
+        (0xFAB9, "M", "調"),
+        (0xFABA, "M", "諸"),
+        (0xFABB, "M", "請"),
+        (0xFABC, "M", "謁"),
+        (0xFABD, "M", "諾"),
+        (0xFABE, "M", "諭"),
+        (0xFABF, "M", "謹"),
+        (0xFAC0, "M", "變"),
+        (0xFAC1, "M", "贈"),
+        (0xFAC2, "M", "輸"),
+        (0xFAC3, "M", "遲"),
+        (0xFAC4, "M", "醙"),
+        (0xFAC5, "M", "鉶"),
+        (0xFAC6, "M", "陼"),
+        (0xFAC7, "M", "難"),
+        (0xFAC8, "M", "靖"),
+        (0xFAC9, "M", "韛"),
+        (0xFACA, "M", "響"),
+        (0xFACB, "M", "頋"),
+        (0xFACC, "M", "頻"),
+        (0xFACD, "M", "鬒"),
+        (0xFACE, "M", "龜"),
+        (0xFACF, "M", "𢡊"),
+        (0xFAD0, "M", "𢡄"),
+        (0xFAD1, "M", "𣏕"),
+        (0xFAD2, "M", "㮝"),
+        (0xFAD3, "M", "䀘"),
+        (0xFAD4, "M", "䀹"),
+        (0xFAD5, "M", "𥉉"),
+        (0xFAD6, "M", "𥳐"),
+        (0xFAD7, "M", "𧻓"),
+        (0xFAD8, "M", "齃"),
+        (0xFAD9, "M", "龎"),
+        (0xFADA, "X"),
+        (0xFB00, "M", "ff"),
+        (0xFB01, "M", "fi"),
+        (0xFB02, "M", "fl"),
+        (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', 'մե'),
-    (0xFB15, 'M', 'մի'),
-    (0xFB16, 'M', 'վն'),
-    (0xFB17, 'M', 'մխ'),
-    (0xFB18, 'X'),
-    (0xFB1D, 'M', 'יִ'),
-    (0xFB1E, 'V'),
-    (0xFB1F, 'M', 'ײַ'),
-    (0xFB20, 'M', 'ע'),
-    (0xFB21, 'M', 'א'),
-    (0xFB22, 'M', 'ד'),
-    (0xFB23, 'M', 'ה'),
-    (0xFB24, 'M', 'כ'),
-    (0xFB25, 'M', 'ל'),
-    (0xFB26, 'M', 'ם'),
-    (0xFB27, 'M', 'ר'),
-    (0xFB28, 'M', 'ת'),
-    (0xFB29, '3', '+'),
-    (0xFB2A, 'M', 'שׁ'),
-    (0xFB2B, 'M', 'שׂ'),
-    (0xFB2C, 'M', 'שּׁ'),
-    (0xFB2D, 'M', 'שּׂ'),
-    (0xFB2E, 'M', 'אַ'),
-    (0xFB2F, 'M', 'אָ'),
-    (0xFB30, 'M', 'אּ'),
-    (0xFB31, 'M', 'בּ'),
-    (0xFB32, 'M', 'גּ'),
-    (0xFB33, 'M', 'דּ'),
-    (0xFB34, 'M', 'הּ'),
-    (0xFB35, 'M', 'וּ'),
-    (0xFB36, 'M', 'זּ'),
-    (0xFB37, 'X'),
-    (0xFB38, 'M', 'טּ'),
-    (0xFB39, 'M', 'יּ'),
-    (0xFB3A, 'M', 'ךּ'),
-    (0xFB3B, 'M', 'כּ'),
-    (0xFB3C, 'M', 'לּ'),
-    (0xFB3D, 'X'),
-    (0xFB3E, 'M', 'מּ'),
-    (0xFB3F, 'X'),
-    (0xFB40, 'M', 'נּ'),
-    (0xFB41, 'M', 'סּ'),
-    (0xFB42, 'X'),
-    (0xFB43, 'M', 'ףּ'),
-    (0xFB44, 'M', 'פּ'),
-    (0xFB45, 'X'),
-    (0xFB46, 'M', 'צּ'),
-    (0xFB47, 'M', 'קּ'),
-    (0xFB48, 'M', 'רּ'),
-    (0xFB49, 'M', 'שּ'),
-    (0xFB4A, 'M', 'תּ'),
-    (0xFB4B, 'M', 'וֹ'),
-    (0xFB4C, 'M', 'בֿ'),
-    (0xFB4D, 'M', 'כֿ'),
-    (0xFB4E, 'M', 'פֿ'),
-    (0xFB4F, 'M', 'אל'),
-    (0xFB50, 'M', 'ٱ'),
-    (0xFB52, 'M', 'ٻ'),
-    (0xFB56, 'M', 'پ'),
-    (0xFB5A, 'M', 'ڀ'),
-    (0xFB5E, 'M', 'ٺ'),
-    (0xFB62, 'M', 'ٿ'),
-    (0xFB66, 'M', 'ٹ'),
-    (0xFB6A, 'M', 'ڤ'),
-    (0xFB6E, 'M', 'ڦ'),
-    (0xFB72, 'M', 'ڄ'),
-    (0xFB76, 'M', 'ڃ'),
-    (0xFB7A, 'M', 'چ'),
-    (0xFB7E, 'M', 'ڇ'),
-    (0xFB82, 'M', 'ڍ'),
-    (0xFB84, 'M', 'ڌ'),
-    (0xFB86, 'M', 'ڎ'),
-    (0xFB88, 'M', 'ڈ'),
-    (0xFB8A, 'M', 'ژ'),
-    (0xFB8C, 'M', 'ڑ'),
-    (0xFB8E, 'M', 'ک'),
-    (0xFB92, 'M', 'گ'),
-    (0xFB96, 'M', 'ڳ'),
-    (0xFB9A, 'M', 'ڱ'),
-    (0xFB9E, 'M', 'ں'),
-    (0xFBA0, 'M', 'ڻ'),
-    (0xFBA4, 'M', 'ۀ'),
-    (0xFBA6, 'M', 'ہ'),
-    (0xFBAA, 'M', 'ھ'),
-    (0xFBAE, 'M', 'ے'),
-    (0xFBB0, 'M', 'ۓ'),
-    (0xFBB2, 'V'),
-    (0xFBC3, 'X'),
-    (0xFBD3, 'M', 'ڭ'),
-    (0xFBD7, 'M', 'ۇ'),
-    (0xFBD9, 'M', 'ۆ'),
-    (0xFBDB, 'M', 'ۈ'),
-    (0xFBDD, 'M', 'ۇٴ'),
-    (0xFBDE, 'M', 'ۋ'),
-    (0xFBE0, 'M', 'ۅ'),
-    (0xFBE2, 'M', 'ۉ'),
-    (0xFBE4, 'M', 'ې'),
-    (0xFBE8, 'M', 'ى'),
+        (0xFB07, "X"),
+        (0xFB13, "M", "մն"),
+        (0xFB14, "M", "մե"),
+        (0xFB15, "M", "մի"),
+        (0xFB16, "M", "վն"),
+        (0xFB17, "M", "մխ"),
+        (0xFB18, "X"),
+        (0xFB1D, "M", "יִ"),
+        (0xFB1E, "V"),
+        (0xFB1F, "M", "ײַ"),
+        (0xFB20, "M", "ע"),
+        (0xFB21, "M", "א"),
+        (0xFB22, "M", "ד"),
+        (0xFB23, "M", "ה"),
+        (0xFB24, "M", "כ"),
+        (0xFB25, "M", "ל"),
+        (0xFB26, "M", "ם"),
+        (0xFB27, "M", "ר"),
+        (0xFB28, "M", "ת"),
+        (0xFB29, "3", "+"),
+        (0xFB2A, "M", "שׁ"),
+        (0xFB2B, "M", "שׂ"),
+        (0xFB2C, "M", "שּׁ"),
+        (0xFB2D, "M", "שּׂ"),
+        (0xFB2E, "M", "אַ"),
+        (0xFB2F, "M", "אָ"),
+        (0xFB30, "M", "אּ"),
+        (0xFB31, "M", "בּ"),
+        (0xFB32, "M", "גּ"),
+        (0xFB33, "M", "דּ"),
+        (0xFB34, "M", "הּ"),
+        (0xFB35, "M", "וּ"),
+        (0xFB36, "M", "זּ"),
+        (0xFB37, "X"),
+        (0xFB38, "M", "טּ"),
+        (0xFB39, "M", "יּ"),
+        (0xFB3A, "M", "ךּ"),
+        (0xFB3B, "M", "כּ"),
+        (0xFB3C, "M", "לּ"),
+        (0xFB3D, "X"),
+        (0xFB3E, "M", "מּ"),
+        (0xFB3F, "X"),
+        (0xFB40, "M", "נּ"),
+        (0xFB41, "M", "סּ"),
+        (0xFB42, "X"),
+        (0xFB43, "M", "ףּ"),
+        (0xFB44, "M", "פּ"),
+        (0xFB45, "X"),
+        (0xFB46, "M", "צּ"),
+        (0xFB47, "M", "קּ"),
+        (0xFB48, "M", "רּ"),
+        (0xFB49, "M", "שּ"),
+        (0xFB4A, "M", "תּ"),
+        (0xFB4B, "M", "וֹ"),
+        (0xFB4C, "M", "בֿ"),
+        (0xFB4D, "M", "כֿ"),
+        (0xFB4E, "M", "פֿ"),
+        (0xFB4F, "M", "אל"),
+        (0xFB50, "M", "ٱ"),
+        (0xFB52, "M", "ٻ"),
+        (0xFB56, "M", "پ"),
+        (0xFB5A, "M", "ڀ"),
+        (0xFB5E, "M", "ٺ"),
+        (0xFB62, "M", "ٿ"),
+        (0xFB66, "M", "ٹ"),
+        (0xFB6A, "M", "ڤ"),
+        (0xFB6E, "M", "ڦ"),
+        (0xFB72, "M", "ڄ"),
+        (0xFB76, "M", "ڃ"),
+        (0xFB7A, "M", "چ"),
+        (0xFB7E, "M", "ڇ"),
+        (0xFB82, "M", "ڍ"),
+        (0xFB84, "M", "ڌ"),
+        (0xFB86, "M", "ڎ"),
+        (0xFB88, "M", "ڈ"),
+        (0xFB8A, "M", "ژ"),
+        (0xFB8C, "M", "ڑ"),
+        (0xFB8E, "M", "ک"),
+        (0xFB92, "M", "گ"),
+        (0xFB96, "M", "ڳ"),
+        (0xFB9A, "M", "ڱ"),
+        (0xFB9E, "M", "ں"),
+        (0xFBA0, "M", "ڻ"),
+        (0xFBA4, "M", "ۀ"),
+        (0xFBA6, "M", "ہ"),
+        (0xFBAA, "M", "ھ"),
+        (0xFBAE, "M", "ے"),
+        (0xFBB0, "M", "ۓ"),
+        (0xFBB2, "V"),
+        (0xFBC3, "X"),
+        (0xFBD3, "M", "ڭ"),
+        (0xFBD7, "M", "ۇ"),
+        (0xFBD9, "M", "ۆ"),
+        (0xFBDB, "M", "ۈ"),
+        (0xFBDD, "M", "ۇٴ"),
+        (0xFBDE, "M", "ۋ"),
+        (0xFBE0, "M", "ۅ"),
+        (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', 'ئو'),
-    (0xFBF0, 'M', 'ئۇ'),
-    (0xFBF2, 'M', 'ئۆ'),
-    (0xFBF4, 'M', 'ئۈ'),
-    (0xFBF6, 'M', 'ئې'),
-    (0xFBF9, 'M', 'ئى'),
-    (0xFBFC, 'M', 'ی'),
-    (0xFC00, 'M', 'ئج'),
-    (0xFC01, 'M', 'ئح'),
-    (0xFC02, 'M', 'ئم'),
-    (0xFC03, 'M', 'ئى'),
-    (0xFC04, 'M', 'ئي'),
-    (0xFC05, 'M', 'بج'),
-    (0xFC06, 'M', 'بح'),
-    (0xFC07, 'M', 'بخ'),
-    (0xFC08, 'M', 'بم'),
-    (0xFC09, 'M', 'بى'),
-    (0xFC0A, 'M', 'بي'),
-    (0xFC0B, 'M', 'تج'),
-    (0xFC0C, 'M', 'تح'),
-    (0xFC0D, 'M', 'تخ'),
-    (0xFC0E, 'M', 'تم'),
-    (0xFC0F, 'M', 'تى'),
-    (0xFC10, 'M', 'تي'),
-    (0xFC11, 'M', 'ثج'),
-    (0xFC12, 'M', 'ثم'),
-    (0xFC13, 'M', 'ثى'),
-    (0xFC14, 'M', 'ثي'),
-    (0xFC15, 'M', 'جح'),
-    (0xFC16, 'M', 'جم'),
-    (0xFC17, 'M', 'حج'),
-    (0xFC18, 'M', 'حم'),
-    (0xFC19, 'M', 'خج'),
-    (0xFC1A, 'M', 'خح'),
-    (0xFC1B, 'M', 'خم'),
-    (0xFC1C, 'M', 'سج'),
-    (0xFC1D, 'M', 'سح'),
-    (0xFC1E, 'M', 'سخ'),
-    (0xFC1F, 'M', 'سم'),
-    (0xFC20, 'M', 'صح'),
-    (0xFC21, 'M', 'صم'),
-    (0xFC22, 'M', 'ضج'),
-    (0xFC23, 'M', 'ضح'),
-    (0xFC24, 'M', 'ضخ'),
-    (0xFC25, 'M', 'ضم'),
-    (0xFC26, 'M', 'طح'),
-    (0xFC27, 'M', 'طم'),
-    (0xFC28, 'M', 'ظم'),
-    (0xFC29, 'M', 'عج'),
-    (0xFC2A, 'M', 'عم'),
-    (0xFC2B, 'M', 'غج'),
-    (0xFC2C, 'M', 'غم'),
-    (0xFC2D, 'M', 'فج'),
-    (0xFC2E, 'M', 'فح'),
-    (0xFC2F, 'M', 'فخ'),
-    (0xFC30, 'M', 'فم'),
-    (0xFC31, 'M', 'فى'),
-    (0xFC32, 'M', 'في'),
-    (0xFC33, 'M', 'قح'),
-    (0xFC34, 'M', 'قم'),
-    (0xFC35, 'M', 'قى'),
-    (0xFC36, 'M', 'قي'),
-    (0xFC37, 'M', 'كا'),
-    (0xFC38, 'M', 'كج'),
-    (0xFC39, 'M', 'كح'),
-    (0xFC3A, 'M', 'كخ'),
-    (0xFC3B, 'M', 'كل'),
-    (0xFC3C, 'M', 'كم'),
-    (0xFC3D, 'M', 'كى'),
-    (0xFC3E, 'M', 'كي'),
-    (0xFC3F, 'M', 'لج'),
-    (0xFC40, 'M', 'لح'),
-    (0xFC41, 'M', 'لخ'),
-    (0xFC42, 'M', 'لم'),
-    (0xFC43, 'M', 'لى'),
-    (0xFC44, 'M', 'لي'),
-    (0xFC45, 'M', 'مج'),
-    (0xFC46, 'M', 'مح'),
-    (0xFC47, 'M', 'مخ'),
-    (0xFC48, 'M', 'مم'),
-    (0xFC49, 'M', 'مى'),
-    (0xFC4A, 'M', 'مي'),
-    (0xFC4B, 'M', 'نج'),
-    (0xFC4C, 'M', 'نح'),
-    (0xFC4D, 'M', 'نخ'),
-    (0xFC4E, 'M', 'نم'),
-    (0xFC4F, 'M', 'نى'),
-    (0xFC50, 'M', 'ني'),
-    (0xFC51, 'M', 'هج'),
-    (0xFC52, 'M', 'هم'),
-    (0xFC53, 'M', 'هى'),
-    (0xFC54, 'M', 'هي'),
-    (0xFC55, 'M', 'يج'),
-    (0xFC56, 'M', 'يح'),
-    (0xFC57, 'M', 'يخ'),
-    (0xFC58, 'M', 'يم'),
-    (0xFC59, 'M', 'يى'),
-    (0xFC5A, 'M', 'يي'),
+        (0xFBEA, "M", "ئا"),
+        (0xFBEC, "M", "ئە"),
+        (0xFBEE, "M", "ئو"),
+        (0xFBF0, "M", "ئۇ"),
+        (0xFBF2, "M", "ئۆ"),
+        (0xFBF4, "M", "ئۈ"),
+        (0xFBF6, "M", "ئې"),
+        (0xFBF9, "M", "ئى"),
+        (0xFBFC, "M", "ی"),
+        (0xFC00, "M", "ئج"),
+        (0xFC01, "M", "ئح"),
+        (0xFC02, "M", "ئم"),
+        (0xFC03, "M", "ئى"),
+        (0xFC04, "M", "ئي"),
+        (0xFC05, "M", "بج"),
+        (0xFC06, "M", "بح"),
+        (0xFC07, "M", "بخ"),
+        (0xFC08, "M", "بم"),
+        (0xFC09, "M", "بى"),
+        (0xFC0A, "M", "بي"),
+        (0xFC0B, "M", "تج"),
+        (0xFC0C, "M", "تح"),
+        (0xFC0D, "M", "تخ"),
+        (0xFC0E, "M", "تم"),
+        (0xFC0F, "M", "تى"),
+        (0xFC10, "M", "تي"),
+        (0xFC11, "M", "ثج"),
+        (0xFC12, "M", "ثم"),
+        (0xFC13, "M", "ثى"),
+        (0xFC14, "M", "ثي"),
+        (0xFC15, "M", "جح"),
+        (0xFC16, "M", "جم"),
+        (0xFC17, "M", "حج"),
+        (0xFC18, "M", "حم"),
+        (0xFC19, "M", "خج"),
+        (0xFC1A, "M", "خح"),
+        (0xFC1B, "M", "خم"),
+        (0xFC1C, "M", "سج"),
+        (0xFC1D, "M", "سح"),
+        (0xFC1E, "M", "سخ"),
+        (0xFC1F, "M", "سم"),
+        (0xFC20, "M", "صح"),
+        (0xFC21, "M", "صم"),
+        (0xFC22, "M", "ضج"),
+        (0xFC23, "M", "ضح"),
+        (0xFC24, "M", "ضخ"),
+        (0xFC25, "M", "ضم"),
+        (0xFC26, "M", "طح"),
+        (0xFC27, "M", "طم"),
+        (0xFC28, "M", "ظم"),
+        (0xFC29, "M", "عج"),
+        (0xFC2A, "M", "عم"),
+        (0xFC2B, "M", "غج"),
+        (0xFC2C, "M", "غم"),
+        (0xFC2D, "M", "فج"),
+        (0xFC2E, "M", "فح"),
+        (0xFC2F, "M", "فخ"),
+        (0xFC30, "M", "فم"),
+        (0xFC31, "M", "فى"),
+        (0xFC32, "M", "في"),
+        (0xFC33, "M", "قح"),
+        (0xFC34, "M", "قم"),
+        (0xFC35, "M", "قى"),
+        (0xFC36, "M", "قي"),
+        (0xFC37, "M", "كا"),
+        (0xFC38, "M", "كج"),
+        (0xFC39, "M", "كح"),
+        (0xFC3A, "M", "كخ"),
+        (0xFC3B, "M", "كل"),
+        (0xFC3C, "M", "كم"),
+        (0xFC3D, "M", "كى"),
+        (0xFC3E, "M", "كي"),
+        (0xFC3F, "M", "لج"),
+        (0xFC40, "M", "لح"),
+        (0xFC41, "M", "لخ"),
+        (0xFC42, "M", "لم"),
+        (0xFC43, "M", "لى"),
+        (0xFC44, "M", "لي"),
+        (0xFC45, "M", "مج"),
+        (0xFC46, "M", "مح"),
+        (0xFC47, "M", "مخ"),
+        (0xFC48, "M", "مم"),
+        (0xFC49, "M", "مى"),
+        (0xFC4A, "M", "مي"),
+        (0xFC4B, "M", "نج"),
+        (0xFC4C, "M", "نح"),
+        (0xFC4D, "M", "نخ"),
+        (0xFC4E, "M", "نم"),
+        (0xFC4F, "M", "نى"),
+        (0xFC50, "M", "ني"),
+        (0xFC51, "M", "هج"),
+        (0xFC52, "M", "هم"),
+        (0xFC53, "M", "هى"),
+        (0xFC54, "M", "هي"),
+        (0xFC55, "M", "يج"),
+        (0xFC56, "M", "يح"),
+        (0xFC57, "M", "يخ"),
+        (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', ' ّٰ'),
-    (0xFC64, 'M', 'ئر'),
-    (0xFC65, 'M', 'ئز'),
-    (0xFC66, 'M', 'ئم'),
-    (0xFC67, 'M', 'ئن'),
-    (0xFC68, 'M', 'ئى'),
-    (0xFC69, 'M', 'ئي'),
-    (0xFC6A, 'M', 'بر'),
-    (0xFC6B, 'M', 'بز'),
-    (0xFC6C, 'M', 'بم'),
-    (0xFC6D, 'M', 'بن'),
-    (0xFC6E, 'M', 'بى'),
-    (0xFC6F, 'M', 'بي'),
-    (0xFC70, 'M', 'تر'),
-    (0xFC71, 'M', 'تز'),
-    (0xFC72, 'M', 'تم'),
-    (0xFC73, 'M', 'تن'),
-    (0xFC74, 'M', 'تى'),
-    (0xFC75, 'M', 'تي'),
-    (0xFC76, 'M', 'ثر'),
-    (0xFC77, 'M', 'ثز'),
-    (0xFC78, 'M', 'ثم'),
-    (0xFC79, 'M', 'ثن'),
-    (0xFC7A, 'M', 'ثى'),
-    (0xFC7B, 'M', 'ثي'),
-    (0xFC7C, 'M', 'فى'),
-    (0xFC7D, 'M', 'في'),
-    (0xFC7E, 'M', 'قى'),
-    (0xFC7F, 'M', 'قي'),
-    (0xFC80, 'M', 'كا'),
-    (0xFC81, 'M', 'كل'),
-    (0xFC82, 'M', 'كم'),
-    (0xFC83, 'M', 'كى'),
-    (0xFC84, 'M', 'كي'),
-    (0xFC85, 'M', 'لم'),
-    (0xFC86, 'M', 'لى'),
-    (0xFC87, 'M', 'لي'),
-    (0xFC88, 'M', 'ما'),
-    (0xFC89, 'M', 'مم'),
-    (0xFC8A, 'M', 'نر'),
-    (0xFC8B, 'M', 'نز'),
-    (0xFC8C, 'M', 'نم'),
-    (0xFC8D, 'M', 'نن'),
-    (0xFC8E, 'M', 'نى'),
-    (0xFC8F, 'M', 'ني'),
-    (0xFC90, 'M', 'ىٰ'),
-    (0xFC91, 'M', 'ير'),
-    (0xFC92, 'M', 'يز'),
-    (0xFC93, 'M', 'يم'),
-    (0xFC94, 'M', 'ين'),
-    (0xFC95, 'M', 'يى'),
-    (0xFC96, 'M', 'يي'),
-    (0xFC97, 'M', 'ئج'),
-    (0xFC98, 'M', 'ئح'),
-    (0xFC99, 'M', 'ئخ'),
-    (0xFC9A, 'M', 'ئم'),
-    (0xFC9B, 'M', 'ئه'),
-    (0xFC9C, 'M', 'بج'),
-    (0xFC9D, 'M', 'بح'),
-    (0xFC9E, 'M', 'بخ'),
-    (0xFC9F, 'M', 'بم'),
-    (0xFCA0, 'M', 'به'),
-    (0xFCA1, 'M', 'تج'),
-    (0xFCA2, 'M', 'تح'),
-    (0xFCA3, 'M', 'تخ'),
-    (0xFCA4, 'M', 'تم'),
-    (0xFCA5, 'M', 'ته'),
-    (0xFCA6, 'M', 'ثم'),
-    (0xFCA7, 'M', 'جح'),
-    (0xFCA8, 'M', 'جم'),
-    (0xFCA9, 'M', 'حج'),
-    (0xFCAA, 'M', 'حم'),
-    (0xFCAB, 'M', 'خج'),
-    (0xFCAC, 'M', 'خم'),
-    (0xFCAD, 'M', 'سج'),
-    (0xFCAE, 'M', 'سح'),
-    (0xFCAF, 'M', 'سخ'),
-    (0xFCB0, 'M', 'سم'),
-    (0xFCB1, 'M', 'صح'),
-    (0xFCB2, 'M', 'صخ'),
-    (0xFCB3, 'M', 'صم'),
-    (0xFCB4, 'M', 'ضج'),
-    (0xFCB5, 'M', 'ضح'),
-    (0xFCB6, 'M', 'ضخ'),
-    (0xFCB7, 'M', 'ضم'),
-    (0xFCB8, 'M', 'طح'),
-    (0xFCB9, 'M', 'ظم'),
-    (0xFCBA, 'M', 'عج'),
-    (0xFCBB, 'M', 'عم'),
-    (0xFCBC, 'M', 'غج'),
-    (0xFCBD, 'M', 'غم'),
-    (0xFCBE, 'M', 'فج'),
+        (0xFC5B, "M", "ذٰ"),
+        (0xFC5C, "M", "رٰ"),
+        (0xFC5D, "M", "ىٰ"),
+        (0xFC5E, "3", " ٌّ"),
+        (0xFC5F, "3", " ٍّ"),
+        (0xFC60, "3", " َّ"),
+        (0xFC61, "3", " ُّ"),
+        (0xFC62, "3", " ِّ"),
+        (0xFC63, "3", " ّٰ"),
+        (0xFC64, "M", "ئر"),
+        (0xFC65, "M", "ئز"),
+        (0xFC66, "M", "ئم"),
+        (0xFC67, "M", "ئن"),
+        (0xFC68, "M", "ئى"),
+        (0xFC69, "M", "ئي"),
+        (0xFC6A, "M", "بر"),
+        (0xFC6B, "M", "بز"),
+        (0xFC6C, "M", "بم"),
+        (0xFC6D, "M", "بن"),
+        (0xFC6E, "M", "بى"),
+        (0xFC6F, "M", "بي"),
+        (0xFC70, "M", "تر"),
+        (0xFC71, "M", "تز"),
+        (0xFC72, "M", "تم"),
+        (0xFC73, "M", "تن"),
+        (0xFC74, "M", "تى"),
+        (0xFC75, "M", "تي"),
+        (0xFC76, "M", "ثر"),
+        (0xFC77, "M", "ثز"),
+        (0xFC78, "M", "ثم"),
+        (0xFC79, "M", "ثن"),
+        (0xFC7A, "M", "ثى"),
+        (0xFC7B, "M", "ثي"),
+        (0xFC7C, "M", "فى"),
+        (0xFC7D, "M", "في"),
+        (0xFC7E, "M", "قى"),
+        (0xFC7F, "M", "قي"),
+        (0xFC80, "M", "كا"),
+        (0xFC81, "M", "كل"),
+        (0xFC82, "M", "كم"),
+        (0xFC83, "M", "كى"),
+        (0xFC84, "M", "كي"),
+        (0xFC85, "M", "لم"),
+        (0xFC86, "M", "لى"),
+        (0xFC87, "M", "لي"),
+        (0xFC88, "M", "ما"),
+        (0xFC89, "M", "مم"),
+        (0xFC8A, "M", "نر"),
+        (0xFC8B, "M", "نز"),
+        (0xFC8C, "M", "نم"),
+        (0xFC8D, "M", "نن"),
+        (0xFC8E, "M", "نى"),
+        (0xFC8F, "M", "ني"),
+        (0xFC90, "M", "ىٰ"),
+        (0xFC91, "M", "ير"),
+        (0xFC92, "M", "يز"),
+        (0xFC93, "M", "يم"),
+        (0xFC94, "M", "ين"),
+        (0xFC95, "M", "يى"),
+        (0xFC96, "M", "يي"),
+        (0xFC97, "M", "ئج"),
+        (0xFC98, "M", "ئح"),
+        (0xFC99, "M", "ئخ"),
+        (0xFC9A, "M", "ئم"),
+        (0xFC9B, "M", "ئه"),
+        (0xFC9C, "M", "بج"),
+        (0xFC9D, "M", "بح"),
+        (0xFC9E, "M", "بخ"),
+        (0xFC9F, "M", "بم"),
+        (0xFCA0, "M", "به"),
+        (0xFCA1, "M", "تج"),
+        (0xFCA2, "M", "تح"),
+        (0xFCA3, "M", "تخ"),
+        (0xFCA4, "M", "تم"),
+        (0xFCA5, "M", "ته"),
+        (0xFCA6, "M", "ثم"),
+        (0xFCA7, "M", "جح"),
+        (0xFCA8, "M", "جم"),
+        (0xFCA9, "M", "حج"),
+        (0xFCAA, "M", "حم"),
+        (0xFCAB, "M", "خج"),
+        (0xFCAC, "M", "خم"),
+        (0xFCAD, "M", "سج"),
+        (0xFCAE, "M", "سح"),
+        (0xFCAF, "M", "سخ"),
+        (0xFCB0, "M", "سم"),
+        (0xFCB1, "M", "صح"),
+        (0xFCB2, "M", "صخ"),
+        (0xFCB3, "M", "صم"),
+        (0xFCB4, "M", "ضج"),
+        (0xFCB5, "M", "ضح"),
+        (0xFCB6, "M", "ضخ"),
+        (0xFCB7, "M", "ضم"),
+        (0xFCB8, "M", "طح"),
+        (0xFCB9, "M", "ظم"),
+        (0xFCBA, "M", "عج"),
+        (0xFCBB, "M", "عم"),
+        (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', 'فم'),
-    (0xFCC2, 'M', 'قح'),
-    (0xFCC3, 'M', 'قم'),
-    (0xFCC4, 'M', 'كج'),
-    (0xFCC5, 'M', 'كح'),
-    (0xFCC6, 'M', 'كخ'),
-    (0xFCC7, 'M', 'كل'),
-    (0xFCC8, 'M', 'كم'),
-    (0xFCC9, 'M', 'لج'),
-    (0xFCCA, 'M', 'لح'),
-    (0xFCCB, 'M', 'لخ'),
-    (0xFCCC, 'M', 'لم'),
-    (0xFCCD, 'M', 'له'),
-    (0xFCCE, 'M', 'مج'),
-    (0xFCCF, 'M', 'مح'),
-    (0xFCD0, 'M', 'مخ'),
-    (0xFCD1, 'M', 'مم'),
-    (0xFCD2, 'M', 'نج'),
-    (0xFCD3, 'M', 'نح'),
-    (0xFCD4, 'M', 'نخ'),
-    (0xFCD5, 'M', 'نم'),
-    (0xFCD6, 'M', 'نه'),
-    (0xFCD7, 'M', 'هج'),
-    (0xFCD8, 'M', 'هم'),
-    (0xFCD9, 'M', 'هٰ'),
-    (0xFCDA, 'M', 'يج'),
-    (0xFCDB, 'M', 'يح'),
-    (0xFCDC, 'M', 'يخ'),
-    (0xFCDD, 'M', 'يم'),
-    (0xFCDE, 'M', 'يه'),
-    (0xFCDF, 'M', 'ئم'),
-    (0xFCE0, 'M', 'ئه'),
-    (0xFCE1, 'M', 'بم'),
-    (0xFCE2, 'M', 'به'),
-    (0xFCE3, 'M', 'تم'),
-    (0xFCE4, 'M', 'ته'),
-    (0xFCE5, 'M', 'ثم'),
-    (0xFCE6, 'M', 'ثه'),
-    (0xFCE7, 'M', 'سم'),
-    (0xFCE8, 'M', 'سه'),
-    (0xFCE9, 'M', 'شم'),
-    (0xFCEA, 'M', 'شه'),
-    (0xFCEB, 'M', 'كل'),
-    (0xFCEC, 'M', 'كم'),
-    (0xFCED, 'M', 'لم'),
-    (0xFCEE, 'M', 'نم'),
-    (0xFCEF, 'M', 'نه'),
-    (0xFCF0, 'M', 'يم'),
-    (0xFCF1, 'M', 'يه'),
-    (0xFCF2, 'M', 'ـَّ'),
-    (0xFCF3, 'M', 'ـُّ'),
-    (0xFCF4, 'M', 'ـِّ'),
-    (0xFCF5, 'M', 'طى'),
-    (0xFCF6, 'M', 'طي'),
-    (0xFCF7, 'M', 'عى'),
-    (0xFCF8, 'M', 'عي'),
-    (0xFCF9, 'M', 'غى'),
-    (0xFCFA, 'M', 'غي'),
-    (0xFCFB, 'M', 'سى'),
-    (0xFCFC, 'M', 'سي'),
-    (0xFCFD, 'M', 'شى'),
-    (0xFCFE, 'M', 'شي'),
-    (0xFCFF, 'M', 'حى'),
-    (0xFD00, 'M', 'حي'),
-    (0xFD01, 'M', 'جى'),
-    (0xFD02, 'M', 'جي'),
-    (0xFD03, 'M', 'خى'),
-    (0xFD04, 'M', 'خي'),
-    (0xFD05, 'M', 'صى'),
-    (0xFD06, 'M', 'صي'),
-    (0xFD07, 'M', 'ضى'),
-    (0xFD08, 'M', 'ضي'),
-    (0xFD09, 'M', 'شج'),
-    (0xFD0A, 'M', 'شح'),
-    (0xFD0B, 'M', 'شخ'),
-    (0xFD0C, 'M', 'شم'),
-    (0xFD0D, 'M', 'شر'),
-    (0xFD0E, 'M', 'سر'),
-    (0xFD0F, 'M', 'صر'),
-    (0xFD10, 'M', 'ضر'),
-    (0xFD11, 'M', 'طى'),
-    (0xFD12, 'M', 'طي'),
-    (0xFD13, 'M', 'عى'),
-    (0xFD14, 'M', 'عي'),
-    (0xFD15, 'M', 'غى'),
-    (0xFD16, 'M', 'غي'),
-    (0xFD17, 'M', 'سى'),
-    (0xFD18, 'M', 'سي'),
-    (0xFD19, 'M', 'شى'),
-    (0xFD1A, 'M', 'شي'),
-    (0xFD1B, 'M', 'حى'),
-    (0xFD1C, 'M', 'حي'),
-    (0xFD1D, 'M', 'جى'),
-    (0xFD1E, 'M', 'جي'),
-    (0xFD1F, 'M', 'خى'),
-    (0xFD20, 'M', 'خي'),
-    (0xFD21, 'M', 'صى'),
-    (0xFD22, 'M', 'صي'),
+        (0xFCBF, "M", "فح"),
+        (0xFCC0, "M", "فخ"),
+        (0xFCC1, "M", "فم"),
+        (0xFCC2, "M", "قح"),
+        (0xFCC3, "M", "قم"),
+        (0xFCC4, "M", "كج"),
+        (0xFCC5, "M", "كح"),
+        (0xFCC6, "M", "كخ"),
+        (0xFCC7, "M", "كل"),
+        (0xFCC8, "M", "كم"),
+        (0xFCC9, "M", "لج"),
+        (0xFCCA, "M", "لح"),
+        (0xFCCB, "M", "لخ"),
+        (0xFCCC, "M", "لم"),
+        (0xFCCD, "M", "له"),
+        (0xFCCE, "M", "مج"),
+        (0xFCCF, "M", "مح"),
+        (0xFCD0, "M", "مخ"),
+        (0xFCD1, "M", "مم"),
+        (0xFCD2, "M", "نج"),
+        (0xFCD3, "M", "نح"),
+        (0xFCD4, "M", "نخ"),
+        (0xFCD5, "M", "نم"),
+        (0xFCD6, "M", "نه"),
+        (0xFCD7, "M", "هج"),
+        (0xFCD8, "M", "هم"),
+        (0xFCD9, "M", "هٰ"),
+        (0xFCDA, "M", "يج"),
+        (0xFCDB, "M", "يح"),
+        (0xFCDC, "M", "يخ"),
+        (0xFCDD, "M", "يم"),
+        (0xFCDE, "M", "يه"),
+        (0xFCDF, "M", "ئم"),
+        (0xFCE0, "M", "ئه"),
+        (0xFCE1, "M", "بم"),
+        (0xFCE2, "M", "به"),
+        (0xFCE3, "M", "تم"),
+        (0xFCE4, "M", "ته"),
+        (0xFCE5, "M", "ثم"),
+        (0xFCE6, "M", "ثه"),
+        (0xFCE7, "M", "سم"),
+        (0xFCE8, "M", "سه"),
+        (0xFCE9, "M", "شم"),
+        (0xFCEA, "M", "شه"),
+        (0xFCEB, "M", "كل"),
+        (0xFCEC, "M", "كم"),
+        (0xFCED, "M", "لم"),
+        (0xFCEE, "M", "نم"),
+        (0xFCEF, "M", "نه"),
+        (0xFCF0, "M", "يم"),
+        (0xFCF1, "M", "يه"),
+        (0xFCF2, "M", "ـَّ"),
+        (0xFCF3, "M", "ـُّ"),
+        (0xFCF4, "M", "ـِّ"),
+        (0xFCF5, "M", "طى"),
+        (0xFCF6, "M", "طي"),
+        (0xFCF7, "M", "عى"),
+        (0xFCF8, "M", "عي"),
+        (0xFCF9, "M", "غى"),
+        (0xFCFA, "M", "غي"),
+        (0xFCFB, "M", "سى"),
+        (0xFCFC, "M", "سي"),
+        (0xFCFD, "M", "شى"),
+        (0xFCFE, "M", "شي"),
+        (0xFCFF, "M", "حى"),
+        (0xFD00, "M", "حي"),
+        (0xFD01, "M", "جى"),
+        (0xFD02, "M", "جي"),
+        (0xFD03, "M", "خى"),
+        (0xFD04, "M", "خي"),
+        (0xFD05, "M", "صى"),
+        (0xFD06, "M", "صي"),
+        (0xFD07, "M", "ضى"),
+        (0xFD08, "M", "ضي"),
+        (0xFD09, "M", "شج"),
+        (0xFD0A, "M", "شح"),
+        (0xFD0B, "M", "شخ"),
+        (0xFD0C, "M", "شم"),
+        (0xFD0D, "M", "شر"),
+        (0xFD0E, "M", "سر"),
+        (0xFD0F, "M", "صر"),
+        (0xFD10, "M", "ضر"),
+        (0xFD11, "M", "طى"),
+        (0xFD12, "M", "طي"),
+        (0xFD13, "M", "عى"),
+        (0xFD14, "M", "عي"),
+        (0xFD15, "M", "غى"),
+        (0xFD16, "M", "غي"),
+        (0xFD17, "M", "سى"),
+        (0xFD18, "M", "سي"),
+        (0xFD19, "M", "شى"),
+        (0xFD1A, "M", "شي"),
+        (0xFD1B, "M", "حى"),
+        (0xFD1C, "M", "حي"),
+        (0xFD1D, "M", "جى"),
+        (0xFD1E, "M", "جي"),
+        (0xFD1F, "M", "خى"),
+        (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', 'شج'),
-    (0xFD26, 'M', 'شح'),
-    (0xFD27, 'M', 'شخ'),
-    (0xFD28, 'M', 'شم'),
-    (0xFD29, 'M', 'شر'),
-    (0xFD2A, 'M', 'سر'),
-    (0xFD2B, 'M', 'صر'),
-    (0xFD2C, 'M', 'ضر'),
-    (0xFD2D, 'M', 'شج'),
-    (0xFD2E, 'M', 'شح'),
-    (0xFD2F, 'M', 'شخ'),
-    (0xFD30, 'M', 'شم'),
-    (0xFD31, 'M', 'سه'),
-    (0xFD32, 'M', 'شه'),
-    (0xFD33, 'M', 'طم'),
-    (0xFD34, 'M', 'سج'),
-    (0xFD35, 'M', 'سح'),
-    (0xFD36, 'M', 'سخ'),
-    (0xFD37, 'M', 'شج'),
-    (0xFD38, 'M', 'شح'),
-    (0xFD39, 'M', 'شخ'),
-    (0xFD3A, 'M', 'طم'),
-    (0xFD3B, 'M', 'ظم'),
-    (0xFD3C, 'M', 'اً'),
-    (0xFD3E, 'V'),
-    (0xFD50, 'M', 'تجم'),
-    (0xFD51, 'M', 'تحج'),
-    (0xFD53, 'M', 'تحم'),
-    (0xFD54, 'M', 'تخم'),
-    (0xFD55, 'M', 'تمج'),
-    (0xFD56, 'M', 'تمح'),
-    (0xFD57, 'M', 'تمخ'),
-    (0xFD58, 'M', 'جمح'),
-    (0xFD5A, 'M', 'حمي'),
-    (0xFD5B, 'M', 'حمى'),
-    (0xFD5C, 'M', 'سحج'),
-    (0xFD5D, 'M', 'سجح'),
-    (0xFD5E, 'M', 'سجى'),
-    (0xFD5F, 'M', 'سمح'),
-    (0xFD61, 'M', 'سمج'),
-    (0xFD62, 'M', 'سمم'),
-    (0xFD64, 'M', 'صحح'),
-    (0xFD66, 'M', 'صمم'),
-    (0xFD67, 'M', 'شحم'),
-    (0xFD69, 'M', 'شجي'),
-    (0xFD6A, 'M', 'شمخ'),
-    (0xFD6C, 'M', 'شمم'),
-    (0xFD6E, 'M', 'ضحى'),
-    (0xFD6F, 'M', 'ضخم'),
-    (0xFD71, 'M', 'طمح'),
-    (0xFD73, 'M', 'طمم'),
-    (0xFD74, 'M', 'طمي'),
-    (0xFD75, 'M', 'عجم'),
-    (0xFD76, 'M', 'عمم'),
-    (0xFD78, 'M', 'عمى'),
-    (0xFD79, 'M', 'غمم'),
-    (0xFD7A, 'M', 'غمي'),
-    (0xFD7B, 'M', 'غمى'),
-    (0xFD7C, 'M', 'فخم'),
-    (0xFD7E, 'M', 'قمح'),
-    (0xFD7F, 'M', 'قمم'),
-    (0xFD80, 'M', 'لحم'),
-    (0xFD81, 'M', 'لحي'),
-    (0xFD82, 'M', 'لحى'),
-    (0xFD83, 'M', 'لجج'),
-    (0xFD85, 'M', 'لخم'),
-    (0xFD87, 'M', 'لمح'),
-    (0xFD89, 'M', 'محج'),
-    (0xFD8A, 'M', 'محم'),
-    (0xFD8B, 'M', 'محي'),
-    (0xFD8C, 'M', 'مجح'),
-    (0xFD8D, 'M', 'مجم'),
-    (0xFD8E, 'M', 'مخج'),
-    (0xFD8F, 'M', 'مخم'),
-    (0xFD90, 'X'),
-    (0xFD92, 'M', 'مجخ'),
-    (0xFD93, 'M', 'همج'),
-    (0xFD94, 'M', 'همم'),
-    (0xFD95, 'M', 'نحم'),
-    (0xFD96, 'M', 'نحى'),
-    (0xFD97, 'M', 'نجم'),
-    (0xFD99, 'M', 'نجى'),
-    (0xFD9A, 'M', 'نمي'),
-    (0xFD9B, 'M', 'نمى'),
-    (0xFD9C, 'M', 'يمم'),
-    (0xFD9E, 'M', 'بخي'),
-    (0xFD9F, 'M', 'تجي'),
-    (0xFDA0, 'M', 'تجى'),
-    (0xFDA1, 'M', 'تخي'),
-    (0xFDA2, 'M', 'تخى'),
-    (0xFDA3, 'M', 'تمي'),
-    (0xFDA4, 'M', 'تمى'),
-    (0xFDA5, 'M', 'جمي'),
-    (0xFDA6, 'M', 'جحى'),
-    (0xFDA7, 'M', 'جمى'),
-    (0xFDA8, 'M', 'سخى'),
-    (0xFDA9, 'M', 'صحي'),
-    (0xFDAA, 'M', 'شحي'),
+        (0xFD23, "M", "ضى"),
+        (0xFD24, "M", "ضي"),
+        (0xFD25, "M", "شج"),
+        (0xFD26, "M", "شح"),
+        (0xFD27, "M", "شخ"),
+        (0xFD28, "M", "شم"),
+        (0xFD29, "M", "شر"),
+        (0xFD2A, "M", "سر"),
+        (0xFD2B, "M", "صر"),
+        (0xFD2C, "M", "ضر"),
+        (0xFD2D, "M", "شج"),
+        (0xFD2E, "M", "شح"),
+        (0xFD2F, "M", "شخ"),
+        (0xFD30, "M", "شم"),
+        (0xFD31, "M", "سه"),
+        (0xFD32, "M", "شه"),
+        (0xFD33, "M", "طم"),
+        (0xFD34, "M", "سج"),
+        (0xFD35, "M", "سح"),
+        (0xFD36, "M", "سخ"),
+        (0xFD37, "M", "شج"),
+        (0xFD38, "M", "شح"),
+        (0xFD39, "M", "شخ"),
+        (0xFD3A, "M", "طم"),
+        (0xFD3B, "M", "ظم"),
+        (0xFD3C, "M", "اً"),
+        (0xFD3E, "V"),
+        (0xFD50, "M", "تجم"),
+        (0xFD51, "M", "تحج"),
+        (0xFD53, "M", "تحم"),
+        (0xFD54, "M", "تخم"),
+        (0xFD55, "M", "تمج"),
+        (0xFD56, "M", "تمح"),
+        (0xFD57, "M", "تمخ"),
+        (0xFD58, "M", "جمح"),
+        (0xFD5A, "M", "حمي"),
+        (0xFD5B, "M", "حمى"),
+        (0xFD5C, "M", "سحج"),
+        (0xFD5D, "M", "سجح"),
+        (0xFD5E, "M", "سجى"),
+        (0xFD5F, "M", "سمح"),
+        (0xFD61, "M", "سمج"),
+        (0xFD62, "M", "سمم"),
+        (0xFD64, "M", "صحح"),
+        (0xFD66, "M", "صمم"),
+        (0xFD67, "M", "شحم"),
+        (0xFD69, "M", "شجي"),
+        (0xFD6A, "M", "شمخ"),
+        (0xFD6C, "M", "شمم"),
+        (0xFD6E, "M", "ضحى"),
+        (0xFD6F, "M", "ضخم"),
+        (0xFD71, "M", "طمح"),
+        (0xFD73, "M", "طمم"),
+        (0xFD74, "M", "طمي"),
+        (0xFD75, "M", "عجم"),
+        (0xFD76, "M", "عمم"),
+        (0xFD78, "M", "عمى"),
+        (0xFD79, "M", "غمم"),
+        (0xFD7A, "M", "غمي"),
+        (0xFD7B, "M", "غمى"),
+        (0xFD7C, "M", "فخم"),
+        (0xFD7E, "M", "قمح"),
+        (0xFD7F, "M", "قمم"),
+        (0xFD80, "M", "لحم"),
+        (0xFD81, "M", "لحي"),
+        (0xFD82, "M", "لحى"),
+        (0xFD83, "M", "لجج"),
+        (0xFD85, "M", "لخم"),
+        (0xFD87, "M", "لمح"),
+        (0xFD89, "M", "محج"),
+        (0xFD8A, "M", "محم"),
+        (0xFD8B, "M", "محي"),
+        (0xFD8C, "M", "مجح"),
+        (0xFD8D, "M", "مجم"),
+        (0xFD8E, "M", "مخج"),
+        (0xFD8F, "M", "مخم"),
+        (0xFD90, "X"),
+        (0xFD92, "M", "مجخ"),
+        (0xFD93, "M", "همج"),
+        (0xFD94, "M", "همم"),
+        (0xFD95, "M", "نحم"),
+        (0xFD96, "M", "نحى"),
+        (0xFD97, "M", "نجم"),
+        (0xFD99, "M", "نجى"),
+        (0xFD9A, "M", "نمي"),
+        (0xFD9B, "M", "نمى"),
+        (0xFD9C, "M", "يمم"),
+        (0xFD9E, "M", "بخي"),
+        (0xFD9F, "M", "تجي"),
+        (0xFDA0, "M", "تجى"),
+        (0xFDA1, "M", "تخي"),
+        (0xFDA2, "M", "تخى"),
+        (0xFDA3, "M", "تمي"),
+        (0xFDA4, "M", "تمى"),
+        (0xFDA5, "M", "جمي"),
+        (0xFDA6, "M", "جحى"),
+        (0xFDA7, "M", "جمى"),
+        (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', 'لمي'),
-    (0xFDAE, 'M', 'يحي'),
-    (0xFDAF, 'M', 'يجي'),
-    (0xFDB0, 'M', 'يمي'),
-    (0xFDB1, 'M', 'ممي'),
-    (0xFDB2, 'M', 'قمي'),
-    (0xFDB3, 'M', 'نحي'),
-    (0xFDB4, 'M', 'قمح'),
-    (0xFDB5, 'M', 'لحم'),
-    (0xFDB6, 'M', 'عمي'),
-    (0xFDB7, 'M', 'كمي'),
-    (0xFDB8, 'M', 'نجح'),
-    (0xFDB9, 'M', 'مخي'),
-    (0xFDBA, 'M', 'لجم'),
-    (0xFDBB, 'M', 'كمم'),
-    (0xFDBC, 'M', 'لجم'),
-    (0xFDBD, 'M', 'نجح'),
-    (0xFDBE, 'M', 'جحي'),
-    (0xFDBF, 'M', 'حجي'),
-    (0xFDC0, 'M', 'مجي'),
-    (0xFDC1, 'M', 'فمي'),
-    (0xFDC2, 'M', 'بحي'),
-    (0xFDC3, 'M', 'كمم'),
-    (0xFDC4, 'M', 'عجم'),
-    (0xFDC5, 'M', 'صمم'),
-    (0xFDC6, 'M', 'سخي'),
-    (0xFDC7, 'M', 'نجي'),
-    (0xFDC8, 'X'),
-    (0xFDCF, 'V'),
-    (0xFDD0, 'X'),
-    (0xFDF0, 'M', 'صلے'),
-    (0xFDF1, 'M', 'قلے'),
-    (0xFDF2, 'M', 'الله'),
-    (0xFDF3, 'M', 'اكبر'),
-    (0xFDF4, 'M', 'محمد'),
-    (0xFDF5, 'M', 'صلعم'),
-    (0xFDF6, 'M', 'رسول'),
-    (0xFDF7, 'M', 'عليه'),
-    (0xFDF8, 'M', 'وسلم'),
-    (0xFDF9, 'M', 'صلى'),
-    (0xFDFA, '3', 'صلى الله عليه وسلم'),
-    (0xFDFB, '3', 'جل جلاله'),
-    (0xFDFC, 'M', 'ریال'),
-    (0xFDFD, 'V'),
-    (0xFE00, 'I'),
-    (0xFE10, '3', ','),
-    (0xFE11, 'M', '、'),
-    (0xFE12, 'X'),
-    (0xFE13, '3', ':'),
-    (0xFE14, '3', ';'),
-    (0xFE15, '3', '!'),
-    (0xFE16, '3', '?'),
-    (0xFE17, 'M', '〖'),
-    (0xFE18, 'M', '〗'),
-    (0xFE19, 'X'),
-    (0xFE20, 'V'),
-    (0xFE30, 'X'),
-    (0xFE31, 'M', '—'),
-    (0xFE32, 'M', '–'),
-    (0xFE33, '3', '_'),
-    (0xFE35, '3', '('),
-    (0xFE36, '3', ')'),
-    (0xFE37, '3', '{'),
-    (0xFE38, '3', '}'),
-    (0xFE39, 'M', '〔'),
-    (0xFE3A, 'M', '〕'),
-    (0xFE3B, 'M', '【'),
-    (0xFE3C, 'M', '】'),
-    (0xFE3D, 'M', '《'),
-    (0xFE3E, 'M', '》'),
-    (0xFE3F, 'M', '〈'),
-    (0xFE40, 'M', '〉'),
-    (0xFE41, 'M', '「'),
-    (0xFE42, 'M', '」'),
-    (0xFE43, 'M', '『'),
-    (0xFE44, 'M', '』'),
-    (0xFE45, 'V'),
-    (0xFE47, '3', '['),
-    (0xFE48, '3', ']'),
-    (0xFE49, '3', ' ̅'),
-    (0xFE4D, '3', '_'),
-    (0xFE50, '3', ','),
-    (0xFE51, 'M', '、'),
-    (0xFE52, 'X'),
-    (0xFE54, '3', ';'),
-    (0xFE55, '3', ':'),
-    (0xFE56, '3', '?'),
-    (0xFE57, '3', '!'),
-    (0xFE58, 'M', '—'),
-    (0xFE59, '3', '('),
-    (0xFE5A, '3', ')'),
-    (0xFE5B, '3', '{'),
-    (0xFE5C, '3', '}'),
-    (0xFE5D, 'M', '〔'),
-    (0xFE5E, 'M', '〕'),
-    (0xFE5F, '3', '#'),
-    (0xFE60, '3', '&'),
-    (0xFE61, '3', '*'),
+        (0xFDAB, "M", "ضحي"),
+        (0xFDAC, "M", "لجي"),
+        (0xFDAD, "M", "لمي"),
+        (0xFDAE, "M", "يحي"),
+        (0xFDAF, "M", "يجي"),
+        (0xFDB0, "M", "يمي"),
+        (0xFDB1, "M", "ممي"),
+        (0xFDB2, "M", "قمي"),
+        (0xFDB3, "M", "نحي"),
+        (0xFDB4, "M", "قمح"),
+        (0xFDB5, "M", "لحم"),
+        (0xFDB6, "M", "عمي"),
+        (0xFDB7, "M", "كمي"),
+        (0xFDB8, "M", "نجح"),
+        (0xFDB9, "M", "مخي"),
+        (0xFDBA, "M", "لجم"),
+        (0xFDBB, "M", "كمم"),
+        (0xFDBC, "M", "لجم"),
+        (0xFDBD, "M", "نجح"),
+        (0xFDBE, "M", "جحي"),
+        (0xFDBF, "M", "حجي"),
+        (0xFDC0, "M", "مجي"),
+        (0xFDC1, "M", "فمي"),
+        (0xFDC2, "M", "بحي"),
+        (0xFDC3, "M", "كمم"),
+        (0xFDC4, "M", "عجم"),
+        (0xFDC5, "M", "صمم"),
+        (0xFDC6, "M", "سخي"),
+        (0xFDC7, "M", "نجي"),
+        (0xFDC8, "X"),
+        (0xFDCF, "V"),
+        (0xFDD0, "X"),
+        (0xFDF0, "M", "صلے"),
+        (0xFDF1, "M", "قلے"),
+        (0xFDF2, "M", "الله"),
+        (0xFDF3, "M", "اكبر"),
+        (0xFDF4, "M", "محمد"),
+        (0xFDF5, "M", "صلعم"),
+        (0xFDF6, "M", "رسول"),
+        (0xFDF7, "M", "عليه"),
+        (0xFDF8, "M", "وسلم"),
+        (0xFDF9, "M", "صلى"),
+        (0xFDFA, "3", "صلى الله عليه وسلم"),
+        (0xFDFB, "3", "جل جلاله"),
+        (0xFDFC, "M", "ریال"),
+        (0xFDFD, "V"),
+        (0xFE00, "I"),
+        (0xFE10, "3", ","),
+        (0xFE11, "M", "、"),
+        (0xFE12, "X"),
+        (0xFE13, "3", ":"),
+        (0xFE14, "3", ";"),
+        (0xFE15, "3", "!"),
+        (0xFE16, "3", "?"),
+        (0xFE17, "M", "〖"),
+        (0xFE18, "M", "〗"),
+        (0xFE19, "X"),
+        (0xFE20, "V"),
+        (0xFE30, "X"),
+        (0xFE31, "M", "—"),
+        (0xFE32, "M", "–"),
+        (0xFE33, "3", "_"),
+        (0xFE35, "3", "("),
+        (0xFE36, "3", ")"),
+        (0xFE37, "3", "{"),
+        (0xFE38, "3", "}"),
+        (0xFE39, "M", "〔"),
+        (0xFE3A, "M", "〕"),
+        (0xFE3B, "M", "【"),
+        (0xFE3C, "M", "】"),
+        (0xFE3D, "M", "《"),
+        (0xFE3E, "M", "》"),
+        (0xFE3F, "M", "〈"),
+        (0xFE40, "M", "〉"),
+        (0xFE41, "M", "「"),
+        (0xFE42, "M", "」"),
+        (0xFE43, "M", "『"),
+        (0xFE44, "M", "』"),
+        (0xFE45, "V"),
+        (0xFE47, "3", "["),
+        (0xFE48, "3", "]"),
+        (0xFE49, "3", " ̅"),
+        (0xFE4D, "3", "_"),
+        (0xFE50, "3", ","),
+        (0xFE51, "M", "、"),
+        (0xFE52, "X"),
+        (0xFE54, "3", ";"),
+        (0xFE55, "3", ":"),
+        (0xFE56, "3", "?"),
+        (0xFE57, "3", "!"),
+        (0xFE58, "M", "—"),
+        (0xFE59, "3", "("),
+        (0xFE5A, "3", ")"),
+        (0xFE5B, "3", "{"),
+        (0xFE5C, "3", "}"),
+        (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', '+'),
-    (0xFE63, 'M', '-'),
-    (0xFE64, '3', '<'),
-    (0xFE65, '3', '>'),
-    (0xFE66, '3', '='),
-    (0xFE67, 'X'),
-    (0xFE68, '3', '\\'),
-    (0xFE69, '3', '$'),
-    (0xFE6A, '3', '%'),
-    (0xFE6B, '3', '@'),
-    (0xFE6C, 'X'),
-    (0xFE70, '3', ' ً'),
-    (0xFE71, 'M', 'ـً'),
-    (0xFE72, '3', ' ٌ'),
-    (0xFE73, 'V'),
-    (0xFE74, '3', ' ٍ'),
-    (0xFE75, 'X'),
-    (0xFE76, '3', ' َ'),
-    (0xFE77, 'M', 'ـَ'),
-    (0xFE78, '3', ' ُ'),
-    (0xFE79, 'M', 'ـُ'),
-    (0xFE7A, '3', ' ِ'),
-    (0xFE7B, 'M', 'ـِ'),
-    (0xFE7C, '3', ' ّ'),
-    (0xFE7D, 'M', 'ـّ'),
-    (0xFE7E, '3', ' ْ'),
-    (0xFE7F, 'M', 'ـْ'),
-    (0xFE80, 'M', 'ء'),
-    (0xFE81, 'M', 'آ'),
-    (0xFE83, 'M', 'أ'),
-    (0xFE85, 'M', 'ؤ'),
-    (0xFE87, 'M', 'إ'),
-    (0xFE89, 'M', 'ئ'),
-    (0xFE8D, 'M', 'ا'),
-    (0xFE8F, 'M', 'ب'),
-    (0xFE93, 'M', 'ة'),
-    (0xFE95, 'M', 'ت'),
-    (0xFE99, 'M', 'ث'),
-    (0xFE9D, 'M', 'ج'),
-    (0xFEA1, 'M', 'ح'),
-    (0xFEA5, 'M', 'خ'),
-    (0xFEA9, 'M', 'د'),
-    (0xFEAB, 'M', 'ذ'),
-    (0xFEAD, 'M', 'ر'),
-    (0xFEAF, 'M', 'ز'),
-    (0xFEB1, 'M', 'س'),
-    (0xFEB5, 'M', 'ش'),
-    (0xFEB9, 'M', 'ص'),
-    (0xFEBD, 'M', 'ض'),
-    (0xFEC1, 'M', 'ط'),
-    (0xFEC5, 'M', 'ظ'),
-    (0xFEC9, 'M', 'ع'),
-    (0xFECD, 'M', 'غ'),
-    (0xFED1, 'M', 'ف'),
-    (0xFED5, 'M', 'ق'),
-    (0xFED9, 'M', 'ك'),
-    (0xFEDD, 'M', 'ل'),
-    (0xFEE1, 'M', 'م'),
-    (0xFEE5, 'M', 'ن'),
-    (0xFEE9, 'M', 'ه'),
-    (0xFEED, 'M', 'و'),
-    (0xFEEF, 'M', 'ى'),
-    (0xFEF1, 'M', 'ي'),
-    (0xFEF5, 'M', 'لآ'),
-    (0xFEF7, 'M', 'لأ'),
-    (0xFEF9, 'M', 'لإ'),
-    (0xFEFB, 'M', 'لا'),
-    (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', ','),
-    (0xFF0D, 'M', '-'),
-    (0xFF0E, 'M', '.'),
-    (0xFF0F, '3', '/'),
-    (0xFF10, 'M', '0'),
-    (0xFF11, 'M', '1'),
-    (0xFF12, 'M', '2'),
-    (0xFF13, 'M', '3'),
-    (0xFF14, 'M', '4'),
-    (0xFF15, 'M', '5'),
-    (0xFF16, 'M', '6'),
-    (0xFF17, 'M', '7'),
-    (0xFF18, 'M', '8'),
-    (0xFF19, 'M', '9'),
-    (0xFF1A, '3', ':'),
-    (0xFF1B, '3', ';'),
-    (0xFF1C, '3', '<'),
-    (0xFF1D, '3', '='),
-    (0xFF1E, '3', '>'),
+        (0xFE62, "3", "+"),
+        (0xFE63, "M", "-"),
+        (0xFE64, "3", "<"),
+        (0xFE65, "3", ">"),
+        (0xFE66, "3", "="),
+        (0xFE67, "X"),
+        (0xFE68, "3", "\\"),
+        (0xFE69, "3", "$"),
+        (0xFE6A, "3", "%"),
+        (0xFE6B, "3", "@"),
+        (0xFE6C, "X"),
+        (0xFE70, "3", " ً"),
+        (0xFE71, "M", "ـً"),
+        (0xFE72, "3", " ٌ"),
+        (0xFE73, "V"),
+        (0xFE74, "3", " ٍ"),
+        (0xFE75, "X"),
+        (0xFE76, "3", " َ"),
+        (0xFE77, "M", "ـَ"),
+        (0xFE78, "3", " ُ"),
+        (0xFE79, "M", "ـُ"),
+        (0xFE7A, "3", " ِ"),
+        (0xFE7B, "M", "ـِ"),
+        (0xFE7C, "3", " ّ"),
+        (0xFE7D, "M", "ـّ"),
+        (0xFE7E, "3", " ْ"),
+        (0xFE7F, "M", "ـْ"),
+        (0xFE80, "M", "ء"),
+        (0xFE81, "M", "آ"),
+        (0xFE83, "M", "أ"),
+        (0xFE85, "M", "ؤ"),
+        (0xFE87, "M", "إ"),
+        (0xFE89, "M", "ئ"),
+        (0xFE8D, "M", "ا"),
+        (0xFE8F, "M", "ب"),
+        (0xFE93, "M", "ة"),
+        (0xFE95, "M", "ت"),
+        (0xFE99, "M", "ث"),
+        (0xFE9D, "M", "ج"),
+        (0xFEA1, "M", "ح"),
+        (0xFEA5, "M", "خ"),
+        (0xFEA9, "M", "د"),
+        (0xFEAB, "M", "ذ"),
+        (0xFEAD, "M", "ر"),
+        (0xFEAF, "M", "ز"),
+        (0xFEB1, "M", "س"),
+        (0xFEB5, "M", "ش"),
+        (0xFEB9, "M", "ص"),
+        (0xFEBD, "M", "ض"),
+        (0xFEC1, "M", "ط"),
+        (0xFEC5, "M", "ظ"),
+        (0xFEC9, "M", "ع"),
+        (0xFECD, "M", "غ"),
+        (0xFED1, "M", "ف"),
+        (0xFED5, "M", "ق"),
+        (0xFED9, "M", "ك"),
+        (0xFEDD, "M", "ل"),
+        (0xFEE1, "M", "م"),
+        (0xFEE5, "M", "ن"),
+        (0xFEE9, "M", "ه"),
+        (0xFEED, "M", "و"),
+        (0xFEEF, "M", "ى"),
+        (0xFEF1, "M", "ي"),
+        (0xFEF5, "M", "لآ"),
+        (0xFEF7, "M", "لأ"),
+        (0xFEF9, "M", "لإ"),
+        (0xFEFB, "M", "لا"),
+        (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", ","),
+        (0xFF0D, "M", "-"),
+        (0xFF0E, "M", "."),
+        (0xFF0F, "3", "/"),
+        (0xFF10, "M", "0"),
+        (0xFF11, "M", "1"),
+        (0xFF12, "M", "2"),
+        (0xFF13, "M", "3"),
+        (0xFF14, "M", "4"),
+        (0xFF15, "M", "5"),
+        (0xFF16, "M", "6"),
+        (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', '@'),
-    (0xFF21, 'M', 'a'),
-    (0xFF22, 'M', 'b'),
-    (0xFF23, 'M', 'c'),
-    (0xFF24, 'M', 'd'),
-    (0xFF25, 'M', 'e'),
-    (0xFF26, 'M', 'f'),
-    (0xFF27, 'M', 'g'),
-    (0xFF28, 'M', 'h'),
-    (0xFF29, 'M', 'i'),
-    (0xFF2A, 'M', 'j'),
-    (0xFF2B, 'M', 'k'),
-    (0xFF2C, 'M', 'l'),
-    (0xFF2D, 'M', 'm'),
-    (0xFF2E, 'M', 'n'),
-    (0xFF2F, 'M', 'o'),
-    (0xFF30, 'M', 'p'),
-    (0xFF31, 'M', 'q'),
-    (0xFF32, 'M', 'r'),
-    (0xFF33, 'M', 's'),
-    (0xFF34, 'M', 't'),
-    (0xFF35, 'M', 'u'),
-    (0xFF36, 'M', 'v'),
-    (0xFF37, 'M', 'w'),
-    (0xFF38, 'M', 'x'),
-    (0xFF39, 'M', 'y'),
-    (0xFF3A, 'M', 'z'),
-    (0xFF3B, '3', '['),
-    (0xFF3C, '3', '\\'),
-    (0xFF3D, '3', ']'),
-    (0xFF3E, '3', '^'),
-    (0xFF3F, '3', '_'),
-    (0xFF40, '3', '`'),
-    (0xFF41, 'M', 'a'),
-    (0xFF42, 'M', 'b'),
-    (0xFF43, 'M', 'c'),
-    (0xFF44, 'M', 'd'),
-    (0xFF45, 'M', 'e'),
-    (0xFF46, 'M', 'f'),
-    (0xFF47, 'M', 'g'),
-    (0xFF48, 'M', 'h'),
-    (0xFF49, 'M', 'i'),
-    (0xFF4A, 'M', 'j'),
-    (0xFF4B, 'M', 'k'),
-    (0xFF4C, 'M', 'l'),
-    (0xFF4D, 'M', 'm'),
-    (0xFF4E, 'M', 'n'),
-    (0xFF4F, 'M', 'o'),
-    (0xFF50, 'M', 'p'),
-    (0xFF51, 'M', 'q'),
-    (0xFF52, 'M', 'r'),
-    (0xFF53, 'M', 's'),
-    (0xFF54, 'M', 't'),
-    (0xFF55, 'M', 'u'),
-    (0xFF56, 'M', 'v'),
-    (0xFF57, 'M', 'w'),
-    (0xFF58, 'M', 'x'),
-    (0xFF59, 'M', 'y'),
-    (0xFF5A, 'M', 'z'),
-    (0xFF5B, '3', '{'),
-    (0xFF5C, '3', '|'),
-    (0xFF5D, '3', '}'),
-    (0xFF5E, '3', '~'),
-    (0xFF5F, 'M', '⦅'),
-    (0xFF60, 'M', '⦆'),
-    (0xFF61, 'M', '.'),
-    (0xFF62, 'M', '「'),
-    (0xFF63, 'M', '」'),
-    (0xFF64, 'M', '、'),
-    (0xFF65, 'M', '・'),
-    (0xFF66, 'M', 'ヲ'),
-    (0xFF67, 'M', 'ァ'),
-    (0xFF68, 'M', 'ィ'),
-    (0xFF69, 'M', 'ゥ'),
-    (0xFF6A, 'M', 'ェ'),
-    (0xFF6B, 'M', 'ォ'),
-    (0xFF6C, 'M', 'ャ'),
-    (0xFF6D, 'M', 'ュ'),
-    (0xFF6E, 'M', 'ョ'),
-    (0xFF6F, 'M', 'ッ'),
-    (0xFF70, 'M', 'ー'),
-    (0xFF71, 'M', 'ア'),
-    (0xFF72, 'M', 'イ'),
-    (0xFF73, 'M', 'ウ'),
-    (0xFF74, 'M', 'エ'),
-    (0xFF75, 'M', 'オ'),
-    (0xFF76, 'M', 'カ'),
-    (0xFF77, 'M', 'キ'),
-    (0xFF78, 'M', 'ク'),
-    (0xFF79, 'M', 'ケ'),
-    (0xFF7A, 'M', 'コ'),
-    (0xFF7B, 'M', 'サ'),
-    (0xFF7C, 'M', 'シ'),
-    (0xFF7D, 'M', 'ス'),
-    (0xFF7E, 'M', 'セ'),
-    (0xFF7F, 'M', 'ソ'),
-    (0xFF80, 'M', 'タ'),
-    (0xFF81, 'M', 'チ'),
-    (0xFF82, 'M', 'ツ'),
+        (0xFF1F, "3", "?"),
+        (0xFF20, "3", "@"),
+        (0xFF21, "M", "a"),
+        (0xFF22, "M", "b"),
+        (0xFF23, "M", "c"),
+        (0xFF24, "M", "d"),
+        (0xFF25, "M", "e"),
+        (0xFF26, "M", "f"),
+        (0xFF27, "M", "g"),
+        (0xFF28, "M", "h"),
+        (0xFF29, "M", "i"),
+        (0xFF2A, "M", "j"),
+        (0xFF2B, "M", "k"),
+        (0xFF2C, "M", "l"),
+        (0xFF2D, "M", "m"),
+        (0xFF2E, "M", "n"),
+        (0xFF2F, "M", "o"),
+        (0xFF30, "M", "p"),
+        (0xFF31, "M", "q"),
+        (0xFF32, "M", "r"),
+        (0xFF33, "M", "s"),
+        (0xFF34, "M", "t"),
+        (0xFF35, "M", "u"),
+        (0xFF36, "M", "v"),
+        (0xFF37, "M", "w"),
+        (0xFF38, "M", "x"),
+        (0xFF39, "M", "y"),
+        (0xFF3A, "M", "z"),
+        (0xFF3B, "3", "["),
+        (0xFF3C, "3", "\\"),
+        (0xFF3D, "3", "]"),
+        (0xFF3E, "3", "^"),
+        (0xFF3F, "3", "_"),
+        (0xFF40, "3", "`"),
+        (0xFF41, "M", "a"),
+        (0xFF42, "M", "b"),
+        (0xFF43, "M", "c"),
+        (0xFF44, "M", "d"),
+        (0xFF45, "M", "e"),
+        (0xFF46, "M", "f"),
+        (0xFF47, "M", "g"),
+        (0xFF48, "M", "h"),
+        (0xFF49, "M", "i"),
+        (0xFF4A, "M", "j"),
+        (0xFF4B, "M", "k"),
+        (0xFF4C, "M", "l"),
+        (0xFF4D, "M", "m"),
+        (0xFF4E, "M", "n"),
+        (0xFF4F, "M", "o"),
+        (0xFF50, "M", "p"),
+        (0xFF51, "M", "q"),
+        (0xFF52, "M", "r"),
+        (0xFF53, "M", "s"),
+        (0xFF54, "M", "t"),
+        (0xFF55, "M", "u"),
+        (0xFF56, "M", "v"),
+        (0xFF57, "M", "w"),
+        (0xFF58, "M", "x"),
+        (0xFF59, "M", "y"),
+        (0xFF5A, "M", "z"),
+        (0xFF5B, "3", "{"),
+        (0xFF5C, "3", "|"),
+        (0xFF5D, "3", "}"),
+        (0xFF5E, "3", "~"),
+        (0xFF5F, "M", "⦅"),
+        (0xFF60, "M", "⦆"),
+        (0xFF61, "M", "."),
+        (0xFF62, "M", "「"),
+        (0xFF63, "M", "」"),
+        (0xFF64, "M", "、"),
+        (0xFF65, "M", "・"),
+        (0xFF66, "M", "ヲ"),
+        (0xFF67, "M", "ァ"),
+        (0xFF68, "M", "ィ"),
+        (0xFF69, "M", "ゥ"),
+        (0xFF6A, "M", "ェ"),
+        (0xFF6B, "M", "ォ"),
+        (0xFF6C, "M", "ャ"),
+        (0xFF6D, "M", "ュ"),
+        (0xFF6E, "M", "ョ"),
+        (0xFF6F, "M", "ッ"),
+        (0xFF70, "M", "ー"),
+        (0xFF71, "M", "ア"),
+        (0xFF72, "M", "イ"),
+        (0xFF73, "M", "ウ"),
+        (0xFF74, "M", "エ"),
+        (0xFF75, "M", "オ"),
+        (0xFF76, "M", "カ"),
+        (0xFF77, "M", "キ"),
+        (0xFF78, "M", "ク"),
+        (0xFF79, "M", "ケ"),
+        (0xFF7A, "M", "コ"),
+        (0xFF7B, "M", "サ"),
+        (0xFF7C, "M", "シ"),
+        (0xFF7D, "M", "ス"),
+        (0xFF7E, "M", "セ"),
+        (0xFF7F, "M", "ソ"),
+        (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', 'ナ'),
-    (0xFF86, 'M', 'ニ'),
-    (0xFF87, 'M', 'ヌ'),
-    (0xFF88, 'M', 'ネ'),
-    (0xFF89, 'M', 'ノ'),
-    (0xFF8A, 'M', 'ハ'),
-    (0xFF8B, 'M', 'ヒ'),
-    (0xFF8C, 'M', 'フ'),
-    (0xFF8D, 'M', 'ヘ'),
-    (0xFF8E, 'M', 'ホ'),
-    (0xFF8F, 'M', 'マ'),
-    (0xFF90, 'M', 'ミ'),
-    (0xFF91, 'M', 'ム'),
-    (0xFF92, 'M', 'メ'),
-    (0xFF93, 'M', 'モ'),
-    (0xFF94, 'M', 'ヤ'),
-    (0xFF95, 'M', 'ユ'),
-    (0xFF96, 'M', 'ヨ'),
-    (0xFF97, 'M', 'ラ'),
-    (0xFF98, 'M', 'リ'),
-    (0xFF99, 'M', 'ル'),
-    (0xFF9A, 'M', 'レ'),
-    (0xFF9B, 'M', 'ロ'),
-    (0xFF9C, 'M', 'ワ'),
-    (0xFF9D, 'M', 'ン'),
-    (0xFF9E, 'M', '゙'),
-    (0xFF9F, 'M', '゚'),
-    (0xFFA0, 'X'),
-    (0xFFA1, 'M', 'ᄀ'),
-    (0xFFA2, 'M', 'ᄁ'),
-    (0xFFA3, 'M', 'ᆪ'),
-    (0xFFA4, 'M', 'ᄂ'),
-    (0xFFA5, 'M', 'ᆬ'),
-    (0xFFA6, 'M', 'ᆭ'),
-    (0xFFA7, 'M', 'ᄃ'),
-    (0xFFA8, 'M', 'ᄄ'),
-    (0xFFA9, 'M', 'ᄅ'),
-    (0xFFAA, 'M', 'ᆰ'),
-    (0xFFAB, 'M', 'ᆱ'),
-    (0xFFAC, 'M', 'ᆲ'),
-    (0xFFAD, 'M', 'ᆳ'),
-    (0xFFAE, 'M', 'ᆴ'),
-    (0xFFAF, 'M', 'ᆵ'),
-    (0xFFB0, 'M', 'ᄚ'),
-    (0xFFB1, 'M', 'ᄆ'),
-    (0xFFB2, 'M', 'ᄇ'),
-    (0xFFB3, 'M', 'ᄈ'),
-    (0xFFB4, 'M', 'ᄡ'),
-    (0xFFB5, 'M', 'ᄉ'),
-    (0xFFB6, 'M', 'ᄊ'),
-    (0xFFB7, 'M', 'ᄋ'),
-    (0xFFB8, 'M', 'ᄌ'),
-    (0xFFB9, 'M', 'ᄍ'),
-    (0xFFBA, 'M', 'ᄎ'),
-    (0xFFBB, 'M', 'ᄏ'),
-    (0xFFBC, 'M', 'ᄐ'),
-    (0xFFBD, 'M', 'ᄑ'),
-    (0xFFBE, 'M', 'ᄒ'),
-    (0xFFBF, 'X'),
-    (0xFFC2, 'M', 'ᅡ'),
-    (0xFFC3, 'M', 'ᅢ'),
-    (0xFFC4, 'M', 'ᅣ'),
-    (0xFFC5, 'M', 'ᅤ'),
-    (0xFFC6, 'M', 'ᅥ'),
-    (0xFFC7, 'M', 'ᅦ'),
-    (0xFFC8, 'X'),
-    (0xFFCA, 'M', 'ᅧ'),
-    (0xFFCB, 'M', 'ᅨ'),
-    (0xFFCC, 'M', 'ᅩ'),
-    (0xFFCD, 'M', 'ᅪ'),
-    (0xFFCE, 'M', 'ᅫ'),
-    (0xFFCF, 'M', 'ᅬ'),
-    (0xFFD0, 'X'),
-    (0xFFD2, 'M', 'ᅭ'),
-    (0xFFD3, 'M', 'ᅮ'),
-    (0xFFD4, 'M', 'ᅯ'),
-    (0xFFD5, 'M', 'ᅰ'),
-    (0xFFD6, 'M', 'ᅱ'),
-    (0xFFD7, 'M', 'ᅲ'),
-    (0xFFD8, 'X'),
-    (0xFFDA, 'M', 'ᅳ'),
-    (0xFFDB, 'M', 'ᅴ'),
-    (0xFFDC, 'M', 'ᅵ'),
-    (0xFFDD, 'X'),
-    (0xFFE0, 'M', '¢'),
-    (0xFFE1, 'M', '£'),
-    (0xFFE2, 'M', '¬'),
-    (0xFFE3, '3', ' ̄'),
-    (0xFFE4, 'M', '¦'),
-    (0xFFE5, 'M', '¥'),
-    (0xFFE6, 'M', '₩'),
-    (0xFFE7, 'X'),
-    (0xFFE8, 'M', '│'),
-    (0xFFE9, 'M', '←'),
-    (0xFFEA, 'M', '↑'),
-    (0xFFEB, 'M', '→'),
-    (0xFFEC, 'M', '↓'),
-    (0xFFED, 'M', '■'),
+        (0xFF83, "M", "テ"),
+        (0xFF84, "M", "ト"),
+        (0xFF85, "M", "ナ"),
+        (0xFF86, "M", "ニ"),
+        (0xFF87, "M", "ヌ"),
+        (0xFF88, "M", "ネ"),
+        (0xFF89, "M", "ノ"),
+        (0xFF8A, "M", "ハ"),
+        (0xFF8B, "M", "ヒ"),
+        (0xFF8C, "M", "フ"),
+        (0xFF8D, "M", "ヘ"),
+        (0xFF8E, "M", "ホ"),
+        (0xFF8F, "M", "マ"),
+        (0xFF90, "M", "ミ"),
+        (0xFF91, "M", "ム"),
+        (0xFF92, "M", "メ"),
+        (0xFF93, "M", "モ"),
+        (0xFF94, "M", "ヤ"),
+        (0xFF95, "M", "ユ"),
+        (0xFF96, "M", "ヨ"),
+        (0xFF97, "M", "ラ"),
+        (0xFF98, "M", "リ"),
+        (0xFF99, "M", "ル"),
+        (0xFF9A, "M", "レ"),
+        (0xFF9B, "M", "ロ"),
+        (0xFF9C, "M", "ワ"),
+        (0xFF9D, "M", "ン"),
+        (0xFF9E, "M", "゙"),
+        (0xFF9F, "M", "゚"),
+        (0xFFA0, "X"),
+        (0xFFA1, "M", "ᄀ"),
+        (0xFFA2, "M", "ᄁ"),
+        (0xFFA3, "M", "ᆪ"),
+        (0xFFA4, "M", "ᄂ"),
+        (0xFFA5, "M", "ᆬ"),
+        (0xFFA6, "M", "ᆭ"),
+        (0xFFA7, "M", "ᄃ"),
+        (0xFFA8, "M", "ᄄ"),
+        (0xFFA9, "M", "ᄅ"),
+        (0xFFAA, "M", "ᆰ"),
+        (0xFFAB, "M", "ᆱ"),
+        (0xFFAC, "M", "ᆲ"),
+        (0xFFAD, "M", "ᆳ"),
+        (0xFFAE, "M", "ᆴ"),
+        (0xFFAF, "M", "ᆵ"),
+        (0xFFB0, "M", "ᄚ"),
+        (0xFFB1, "M", "ᄆ"),
+        (0xFFB2, "M", "ᄇ"),
+        (0xFFB3, "M", "ᄈ"),
+        (0xFFB4, "M", "ᄡ"),
+        (0xFFB5, "M", "ᄉ"),
+        (0xFFB6, "M", "ᄊ"),
+        (0xFFB7, "M", "ᄋ"),
+        (0xFFB8, "M", "ᄌ"),
+        (0xFFB9, "M", "ᄍ"),
+        (0xFFBA, "M", "ᄎ"),
+        (0xFFBB, "M", "ᄏ"),
+        (0xFFBC, "M", "ᄐ"),
+        (0xFFBD, "M", "ᄑ"),
+        (0xFFBE, "M", "ᄒ"),
+        (0xFFBF, "X"),
+        (0xFFC2, "M", "ᅡ"),
+        (0xFFC3, "M", "ᅢ"),
+        (0xFFC4, "M", "ᅣ"),
+        (0xFFC5, "M", "ᅤ"),
+        (0xFFC6, "M", "ᅥ"),
+        (0xFFC7, "M", "ᅦ"),
+        (0xFFC8, "X"),
+        (0xFFCA, "M", "ᅧ"),
+        (0xFFCB, "M", "ᅨ"),
+        (0xFFCC, "M", "ᅩ"),
+        (0xFFCD, "M", "ᅪ"),
+        (0xFFCE, "M", "ᅫ"),
+        (0xFFCF, "M", "ᅬ"),
+        (0xFFD0, "X"),
+        (0xFFD2, "M", "ᅭ"),
+        (0xFFD3, "M", "ᅮ"),
+        (0xFFD4, "M", "ᅯ"),
+        (0xFFD5, "M", "ᅰ"),
+        (0xFFD6, "M", "ᅱ"),
+        (0xFFD7, "M", "ᅲ"),
+        (0xFFD8, "X"),
+        (0xFFDA, "M", "ᅳ"),
+        (0xFFDB, "M", "ᅴ"),
+        (0xFFDC, "M", "ᅵ"),
+        (0xFFDD, "X"),
+        (0xFFE0, "M", "¢"),
+        (0xFFE1, "M", "£"),
+        (0xFFE2, "M", "¬"),
+        (0xFFE3, "3", " ̄"),
+        (0xFFE4, "M", "¦"),
+        (0xFFE5, "M", "¥"),
+        (0xFFE6, "M", "₩"),
+        (0xFFE7, "X"),
+        (0xFFE8, "M", "│"),
+        (0xFFE9, "M", "←"),
+        (0xFFEA, "M", "↑"),
+        (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'),
-    (0x1000C, 'X'),
-    (0x1000D, 'V'),
-    (0x10027, 'X'),
-    (0x10028, 'V'),
-    (0x1003B, 'X'),
-    (0x1003C, 'V'),
-    (0x1003E, 'X'),
-    (0x1003F, 'V'),
-    (0x1004E, 'X'),
-    (0x10050, 'V'),
-    (0x1005E, 'X'),
-    (0x10080, 'V'),
-    (0x100FB, 'X'),
-    (0x10100, 'V'),
-    (0x10103, 'X'),
-    (0x10107, 'V'),
-    (0x10134, 'X'),
-    (0x10137, 'V'),
-    (0x1018F, 'X'),
-    (0x10190, 'V'),
-    (0x1019D, 'X'),
-    (0x101A0, 'V'),
-    (0x101A1, 'X'),
-    (0x101D0, 'V'),
-    (0x101FE, 'X'),
-    (0x10280, 'V'),
-    (0x1029D, 'X'),
-    (0x102A0, 'V'),
-    (0x102D1, 'X'),
-    (0x102E0, 'V'),
-    (0x102FC, 'X'),
-    (0x10300, 'V'),
-    (0x10324, 'X'),
-    (0x1032D, 'V'),
-    (0x1034B, 'X'),
-    (0x10350, 'V'),
-    (0x1037B, 'X'),
-    (0x10380, 'V'),
-    (0x1039E, 'X'),
-    (0x1039F, 'V'),
-    (0x103C4, 'X'),
-    (0x103C8, 'V'),
-    (0x103D6, 'X'),
-    (0x10400, 'M', '𐐨'),
-    (0x10401, 'M', '𐐩'),
-    (0x10402, 'M', '𐐪'),
-    (0x10403, 'M', '𐐫'),
-    (0x10404, 'M', '𐐬'),
-    (0x10405, 'M', '𐐭'),
-    (0x10406, 'M', '𐐮'),
-    (0x10407, 'M', '𐐯'),
-    (0x10408, 'M', '𐐰'),
-    (0x10409, 'M', '𐐱'),
-    (0x1040A, 'M', '𐐲'),
-    (0x1040B, 'M', '𐐳'),
-    (0x1040C, 'M', '𐐴'),
-    (0x1040D, 'M', '𐐵'),
-    (0x1040E, 'M', '𐐶'),
-    (0x1040F, 'M', '𐐷'),
-    (0x10410, 'M', '𐐸'),
-    (0x10411, 'M', '𐐹'),
-    (0x10412, 'M', '𐐺'),
-    (0x10413, 'M', '𐐻'),
-    (0x10414, 'M', '𐐼'),
-    (0x10415, 'M', '𐐽'),
-    (0x10416, 'M', '𐐾'),
-    (0x10417, 'M', '𐐿'),
-    (0x10418, 'M', '𐑀'),
-    (0x10419, 'M', '𐑁'),
-    (0x1041A, 'M', '𐑂'),
-    (0x1041B, 'M', '𐑃'),
-    (0x1041C, 'M', '𐑄'),
-    (0x1041D, 'M', '𐑅'),
-    (0x1041E, 'M', '𐑆'),
-    (0x1041F, 'M', '𐑇'),
-    (0x10420, 'M', '𐑈'),
-    (0x10421, 'M', '𐑉'),
-    (0x10422, 'M', '𐑊'),
-    (0x10423, 'M', '𐑋'),
-    (0x10424, 'M', '𐑌'),
-    (0x10425, 'M', '𐑍'),
-    (0x10426, 'M', '𐑎'),
-    (0x10427, 'M', '𐑏'),
-    (0x10428, 'V'),
-    (0x1049E, 'X'),
-    (0x104A0, 'V'),
-    (0x104AA, 'X'),
-    (0x104B0, 'M', '𐓘'),
-    (0x104B1, 'M', '𐓙'),
-    (0x104B2, 'M', '𐓚'),
-    (0x104B3, 'M', '𐓛'),
-    (0x104B4, 'M', '𐓜'),
-    (0x104B5, 'M', '𐓝'),
-    (0x104B6, 'M', '𐓞'),
-    (0x104B7, 'M', '𐓟'),
-    (0x104B8, 'M', '𐓠'),
-    (0x104B9, 'M', '𐓡'),
+        (0xFFEE, "M", "○"),
+        (0xFFEF, "X"),
+        (0x10000, "V"),
+        (0x1000C, "X"),
+        (0x1000D, "V"),
+        (0x10027, "X"),
+        (0x10028, "V"),
+        (0x1003B, "X"),
+        (0x1003C, "V"),
+        (0x1003E, "X"),
+        (0x1003F, "V"),
+        (0x1004E, "X"),
+        (0x10050, "V"),
+        (0x1005E, "X"),
+        (0x10080, "V"),
+        (0x100FB, "X"),
+        (0x10100, "V"),
+        (0x10103, "X"),
+        (0x10107, "V"),
+        (0x10134, "X"),
+        (0x10137, "V"),
+        (0x1018F, "X"),
+        (0x10190, "V"),
+        (0x1019D, "X"),
+        (0x101A0, "V"),
+        (0x101A1, "X"),
+        (0x101D0, "V"),
+        (0x101FE, "X"),
+        (0x10280, "V"),
+        (0x1029D, "X"),
+        (0x102A0, "V"),
+        (0x102D1, "X"),
+        (0x102E0, "V"),
+        (0x102FC, "X"),
+        (0x10300, "V"),
+        (0x10324, "X"),
+        (0x1032D, "V"),
+        (0x1034B, "X"),
+        (0x10350, "V"),
+        (0x1037B, "X"),
+        (0x10380, "V"),
+        (0x1039E, "X"),
+        (0x1039F, "V"),
+        (0x103C4, "X"),
+        (0x103C8, "V"),
+        (0x103D6, "X"),
+        (0x10400, "M", "𐐨"),
+        (0x10401, "M", "𐐩"),
+        (0x10402, "M", "𐐪"),
+        (0x10403, "M", "𐐫"),
+        (0x10404, "M", "𐐬"),
+        (0x10405, "M", "𐐭"),
+        (0x10406, "M", "𐐮"),
+        (0x10407, "M", "𐐯"),
+        (0x10408, "M", "𐐰"),
+        (0x10409, "M", "𐐱"),
+        (0x1040A, "M", "𐐲"),
+        (0x1040B, "M", "𐐳"),
+        (0x1040C, "M", "𐐴"),
+        (0x1040D, "M", "𐐵"),
+        (0x1040E, "M", "𐐶"),
+        (0x1040F, "M", "𐐷"),
+        (0x10410, "M", "𐐸"),
+        (0x10411, "M", "𐐹"),
+        (0x10412, "M", "𐐺"),
+        (0x10413, "M", "𐐻"),
+        (0x10414, "M", "𐐼"),
+        (0x10415, "M", "𐐽"),
+        (0x10416, "M", "𐐾"),
+        (0x10417, "M", "𐐿"),
+        (0x10418, "M", "𐑀"),
+        (0x10419, "M", "𐑁"),
+        (0x1041A, "M", "𐑂"),
+        (0x1041B, "M", "𐑃"),
+        (0x1041C, "M", "𐑄"),
+        (0x1041D, "M", "𐑅"),
+        (0x1041E, "M", "𐑆"),
+        (0x1041F, "M", "𐑇"),
+        (0x10420, "M", "𐑈"),
+        (0x10421, "M", "𐑉"),
+        (0x10422, "M", "𐑊"),
+        (0x10423, "M", "𐑋"),
+        (0x10424, "M", "𐑌"),
+        (0x10425, "M", "𐑍"),
+        (0x10426, "M", "𐑎"),
+        (0x10427, "M", "𐑏"),
+        (0x10428, "V"),
+        (0x1049E, "X"),
+        (0x104A0, "V"),
+        (0x104AA, "X"),
+        (0x104B0, "M", "𐓘"),
+        (0x104B1, "M", "𐓙"),
+        (0x104B2, "M", "𐓚"),
+        (0x104B3, "M", "𐓛"),
+        (0x104B4, "M", "𐓜"),
+        (0x104B5, "M", "𐓝"),
+        (0x104B6, "M", "𐓞"),
+        (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', '𐓤'),
-    (0x104BD, 'M', '𐓥'),
-    (0x104BE, 'M', '𐓦'),
-    (0x104BF, 'M', '𐓧'),
-    (0x104C0, 'M', '𐓨'),
-    (0x104C1, 'M', '𐓩'),
-    (0x104C2, 'M', '𐓪'),
-    (0x104C3, 'M', '𐓫'),
-    (0x104C4, 'M', '𐓬'),
-    (0x104C5, 'M', '𐓭'),
-    (0x104C6, 'M', '𐓮'),
-    (0x104C7, 'M', '𐓯'),
-    (0x104C8, 'M', '𐓰'),
-    (0x104C9, 'M', '𐓱'),
-    (0x104CA, 'M', '𐓲'),
-    (0x104CB, 'M', '𐓳'),
-    (0x104CC, 'M', '𐓴'),
-    (0x104CD, 'M', '𐓵'),
-    (0x104CE, 'M', '𐓶'),
-    (0x104CF, 'M', '𐓷'),
-    (0x104D0, 'M', '𐓸'),
-    (0x104D1, 'M', '𐓹'),
-    (0x104D2, 'M', '𐓺'),
-    (0x104D3, 'M', '𐓻'),
-    (0x104D4, 'X'),
-    (0x104D8, 'V'),
-    (0x104FC, 'X'),
-    (0x10500, 'V'),
-    (0x10528, 'X'),
-    (0x10530, 'V'),
-    (0x10564, 'X'),
-    (0x1056F, 'V'),
-    (0x10570, 'M', '𐖗'),
-    (0x10571, 'M', '𐖘'),
-    (0x10572, 'M', '𐖙'),
-    (0x10573, 'M', '𐖚'),
-    (0x10574, 'M', '𐖛'),
-    (0x10575, 'M', '𐖜'),
-    (0x10576, 'M', '𐖝'),
-    (0x10577, 'M', '𐖞'),
-    (0x10578, 'M', '𐖟'),
-    (0x10579, 'M', '𐖠'),
-    (0x1057A, 'M', '𐖡'),
-    (0x1057B, 'X'),
-    (0x1057C, 'M', '𐖣'),
-    (0x1057D, 'M', '𐖤'),
-    (0x1057E, 'M', '𐖥'),
-    (0x1057F, 'M', '𐖦'),
-    (0x10580, 'M', '𐖧'),
-    (0x10581, 'M', '𐖨'),
-    (0x10582, 'M', '𐖩'),
-    (0x10583, 'M', '𐖪'),
-    (0x10584, 'M', '𐖫'),
-    (0x10585, 'M', '𐖬'),
-    (0x10586, 'M', '𐖭'),
-    (0x10587, 'M', '𐖮'),
-    (0x10588, 'M', '𐖯'),
-    (0x10589, 'M', '𐖰'),
-    (0x1058A, 'M', '𐖱'),
-    (0x1058B, 'X'),
-    (0x1058C, 'M', '𐖳'),
-    (0x1058D, 'M', '𐖴'),
-    (0x1058E, 'M', '𐖵'),
-    (0x1058F, 'M', '𐖶'),
-    (0x10590, 'M', '𐖷'),
-    (0x10591, 'M', '𐖸'),
-    (0x10592, 'M', '𐖹'),
-    (0x10593, 'X'),
-    (0x10594, 'M', '𐖻'),
-    (0x10595, 'M', '𐖼'),
-    (0x10596, 'X'),
-    (0x10597, 'V'),
-    (0x105A2, 'X'),
-    (0x105A3, 'V'),
-    (0x105B2, 'X'),
-    (0x105B3, 'V'),
-    (0x105BA, 'X'),
-    (0x105BB, 'V'),
-    (0x105BD, 'X'),
-    (0x10600, 'V'),
-    (0x10737, 'X'),
-    (0x10740, 'V'),
-    (0x10756, 'X'),
-    (0x10760, 'V'),
-    (0x10768, 'X'),
-    (0x10780, 'V'),
-    (0x10781, 'M', 'ː'),
-    (0x10782, 'M', 'ˑ'),
-    (0x10783, 'M', 'æ'),
-    (0x10784, 'M', 'ʙ'),
-    (0x10785, 'M', 'ɓ'),
-    (0x10786, 'X'),
-    (0x10787, 'M', 'ʣ'),
-    (0x10788, 'M', 'ꭦ'),
-    (0x10789, 'M', 'ʥ'),
-    (0x1078A, 'M', 'ʤ'),
-    (0x1078B, 'M', 'ɖ'),
-    (0x1078C, 'M', 'ɗ'),
+        (0x104BA, "M", "𐓢"),
+        (0x104BB, "M", "𐓣"),
+        (0x104BC, "M", "𐓤"),
+        (0x104BD, "M", "𐓥"),
+        (0x104BE, "M", "𐓦"),
+        (0x104BF, "M", "𐓧"),
+        (0x104C0, "M", "𐓨"),
+        (0x104C1, "M", "𐓩"),
+        (0x104C2, "M", "𐓪"),
+        (0x104C3, "M", "𐓫"),
+        (0x104C4, "M", "𐓬"),
+        (0x104C5, "M", "𐓭"),
+        (0x104C6, "M", "𐓮"),
+        (0x104C7, "M", "𐓯"),
+        (0x104C8, "M", "𐓰"),
+        (0x104C9, "M", "𐓱"),
+        (0x104CA, "M", "𐓲"),
+        (0x104CB, "M", "𐓳"),
+        (0x104CC, "M", "𐓴"),
+        (0x104CD, "M", "𐓵"),
+        (0x104CE, "M", "𐓶"),
+        (0x104CF, "M", "𐓷"),
+        (0x104D0, "M", "𐓸"),
+        (0x104D1, "M", "𐓹"),
+        (0x104D2, "M", "𐓺"),
+        (0x104D3, "M", "𐓻"),
+        (0x104D4, "X"),
+        (0x104D8, "V"),
+        (0x104FC, "X"),
+        (0x10500, "V"),
+        (0x10528, "X"),
+        (0x10530, "V"),
+        (0x10564, "X"),
+        (0x1056F, "V"),
+        (0x10570, "M", "𐖗"),
+        (0x10571, "M", "𐖘"),
+        (0x10572, "M", "𐖙"),
+        (0x10573, "M", "𐖚"),
+        (0x10574, "M", "𐖛"),
+        (0x10575, "M", "𐖜"),
+        (0x10576, "M", "𐖝"),
+        (0x10577, "M", "𐖞"),
+        (0x10578, "M", "𐖟"),
+        (0x10579, "M", "𐖠"),
+        (0x1057A, "M", "𐖡"),
+        (0x1057B, "X"),
+        (0x1057C, "M", "𐖣"),
+        (0x1057D, "M", "𐖤"),
+        (0x1057E, "M", "𐖥"),
+        (0x1057F, "M", "𐖦"),
+        (0x10580, "M", "𐖧"),
+        (0x10581, "M", "𐖨"),
+        (0x10582, "M", "𐖩"),
+        (0x10583, "M", "𐖪"),
+        (0x10584, "M", "𐖫"),
+        (0x10585, "M", "𐖬"),
+        (0x10586, "M", "𐖭"),
+        (0x10587, "M", "𐖮"),
+        (0x10588, "M", "𐖯"),
+        (0x10589, "M", "𐖰"),
+        (0x1058A, "M", "𐖱"),
+        (0x1058B, "X"),
+        (0x1058C, "M", "𐖳"),
+        (0x1058D, "M", "𐖴"),
+        (0x1058E, "M", "𐖵"),
+        (0x1058F, "M", "𐖶"),
+        (0x10590, "M", "𐖷"),
+        (0x10591, "M", "𐖸"),
+        (0x10592, "M", "𐖹"),
+        (0x10593, "X"),
+        (0x10594, "M", "𐖻"),
+        (0x10595, "M", "𐖼"),
+        (0x10596, "X"),
+        (0x10597, "V"),
+        (0x105A2, "X"),
+        (0x105A3, "V"),
+        (0x105B2, "X"),
+        (0x105B3, "V"),
+        (0x105BA, "X"),
+        (0x105BB, "V"),
+        (0x105BD, "X"),
+        (0x10600, "V"),
+        (0x10737, "X"),
+        (0x10740, "V"),
+        (0x10756, "X"),
+        (0x10760, "V"),
+        (0x10768, "X"),
+        (0x10780, "V"),
+        (0x10781, "M", "ː"),
+        (0x10782, "M", "ˑ"),
+        (0x10783, "M", "æ"),
+        (0x10784, "M", "ʙ"),
+        (0x10785, "M", "ɓ"),
+        (0x10786, "X"),
+        (0x10787, "M", "ʣ"),
+        (0x10788, "M", "ꭦ"),
+        (0x10789, "M", "ʥ"),
+        (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', 'ɞ'),
-    (0x10790, 'M', 'ʩ'),
-    (0x10791, 'M', 'ɤ'),
-    (0x10792, 'M', 'ɢ'),
-    (0x10793, 'M', 'ɠ'),
-    (0x10794, 'M', 'ʛ'),
-    (0x10795, 'M', 'ħ'),
-    (0x10796, 'M', 'ʜ'),
-    (0x10797, 'M', 'ɧ'),
-    (0x10798, 'M', 'ʄ'),
-    (0x10799, 'M', 'ʪ'),
-    (0x1079A, 'M', 'ʫ'),
-    (0x1079B, 'M', 'ɬ'),
-    (0x1079C, 'M', '𝼄'),
-    (0x1079D, 'M', 'ꞎ'),
-    (0x1079E, 'M', 'ɮ'),
-    (0x1079F, 'M', '𝼅'),
-    (0x107A0, 'M', 'ʎ'),
-    (0x107A1, 'M', '𝼆'),
-    (0x107A2, 'M', 'ø'),
-    (0x107A3, 'M', 'ɶ'),
-    (0x107A4, 'M', 'ɷ'),
-    (0x107A5, 'M', 'q'),
-    (0x107A6, 'M', 'ɺ'),
-    (0x107A7, 'M', '𝼈'),
-    (0x107A8, 'M', 'ɽ'),
-    (0x107A9, 'M', 'ɾ'),
-    (0x107AA, 'M', 'ʀ'),
-    (0x107AB, 'M', 'ʨ'),
-    (0x107AC, 'M', 'ʦ'),
-    (0x107AD, 'M', 'ꭧ'),
-    (0x107AE, 'M', 'ʧ'),
-    (0x107AF, 'M', 'ʈ'),
-    (0x107B0, 'M', 'ⱱ'),
-    (0x107B1, 'X'),
-    (0x107B2, 'M', 'ʏ'),
-    (0x107B3, 'M', 'ʡ'),
-    (0x107B4, 'M', 'ʢ'),
-    (0x107B5, 'M', 'ʘ'),
-    (0x107B6, 'M', 'ǀ'),
-    (0x107B7, 'M', 'ǁ'),
-    (0x107B8, 'M', 'ǂ'),
-    (0x107B9, 'M', '𝼊'),
-    (0x107BA, 'M', '𝼞'),
-    (0x107BB, 'X'),
-    (0x10800, 'V'),
-    (0x10806, 'X'),
-    (0x10808, 'V'),
-    (0x10809, 'X'),
-    (0x1080A, 'V'),
-    (0x10836, 'X'),
-    (0x10837, 'V'),
-    (0x10839, 'X'),
-    (0x1083C, 'V'),
-    (0x1083D, 'X'),
-    (0x1083F, 'V'),
-    (0x10856, 'X'),
-    (0x10857, 'V'),
-    (0x1089F, 'X'),
-    (0x108A7, 'V'),
-    (0x108B0, 'X'),
-    (0x108E0, 'V'),
-    (0x108F3, 'X'),
-    (0x108F4, 'V'),
-    (0x108F6, 'X'),
-    (0x108FB, 'V'),
-    (0x1091C, 'X'),
-    (0x1091F, 'V'),
-    (0x1093A, 'X'),
-    (0x1093F, 'V'),
-    (0x10940, 'X'),
-    (0x10980, 'V'),
-    (0x109B8, 'X'),
-    (0x109BC, 'V'),
-    (0x109D0, 'X'),
-    (0x109D2, 'V'),
-    (0x10A04, 'X'),
-    (0x10A05, 'V'),
-    (0x10A07, 'X'),
-    (0x10A0C, 'V'),
-    (0x10A14, 'X'),
-    (0x10A15, 'V'),
-    (0x10A18, 'X'),
-    (0x10A19, 'V'),
-    (0x10A36, 'X'),
-    (0x10A38, 'V'),
-    (0x10A3B, 'X'),
-    (0x10A3F, 'V'),
-    (0x10A49, 'X'),
-    (0x10A50, 'V'),
-    (0x10A59, 'X'),
-    (0x10A60, 'V'),
-    (0x10AA0, 'X'),
-    (0x10AC0, 'V'),
-    (0x10AE7, 'X'),
-    (0x10AEB, 'V'),
-    (0x10AF7, 'X'),
-    (0x10B00, 'V'),
+        (0x1078D, "M", "ᶑ"),
+        (0x1078E, "M", "ɘ"),
+        (0x1078F, "M", "ɞ"),
+        (0x10790, "M", "ʩ"),
+        (0x10791, "M", "ɤ"),
+        (0x10792, "M", "ɢ"),
+        (0x10793, "M", "ɠ"),
+        (0x10794, "M", "ʛ"),
+        (0x10795, "M", "ħ"),
+        (0x10796, "M", "ʜ"),
+        (0x10797, "M", "ɧ"),
+        (0x10798, "M", "ʄ"),
+        (0x10799, "M", "ʪ"),
+        (0x1079A, "M", "ʫ"),
+        (0x1079B, "M", "ɬ"),
+        (0x1079C, "M", "𝼄"),
+        (0x1079D, "M", "ꞎ"),
+        (0x1079E, "M", "ɮ"),
+        (0x1079F, "M", "𝼅"),
+        (0x107A0, "M", "ʎ"),
+        (0x107A1, "M", "𝼆"),
+        (0x107A2, "M", "ø"),
+        (0x107A3, "M", "ɶ"),
+        (0x107A4, "M", "ɷ"),
+        (0x107A5, "M", "q"),
+        (0x107A6, "M", "ɺ"),
+        (0x107A7, "M", "𝼈"),
+        (0x107A8, "M", "ɽ"),
+        (0x107A9, "M", "ɾ"),
+        (0x107AA, "M", "ʀ"),
+        (0x107AB, "M", "ʨ"),
+        (0x107AC, "M", "ʦ"),
+        (0x107AD, "M", "ꭧ"),
+        (0x107AE, "M", "ʧ"),
+        (0x107AF, "M", "ʈ"),
+        (0x107B0, "M", "ⱱ"),
+        (0x107B1, "X"),
+        (0x107B2, "M", "ʏ"),
+        (0x107B3, "M", "ʡ"),
+        (0x107B4, "M", "ʢ"),
+        (0x107B5, "M", "ʘ"),
+        (0x107B6, "M", "ǀ"),
+        (0x107B7, "M", "ǁ"),
+        (0x107B8, "M", "ǂ"),
+        (0x107B9, "M", "𝼊"),
+        (0x107BA, "M", "𝼞"),
+        (0x107BB, "X"),
+        (0x10800, "V"),
+        (0x10806, "X"),
+        (0x10808, "V"),
+        (0x10809, "X"),
+        (0x1080A, "V"),
+        (0x10836, "X"),
+        (0x10837, "V"),
+        (0x10839, "X"),
+        (0x1083C, "V"),
+        (0x1083D, "X"),
+        (0x1083F, "V"),
+        (0x10856, "X"),
+        (0x10857, "V"),
+        (0x1089F, "X"),
+        (0x108A7, "V"),
+        (0x108B0, "X"),
+        (0x108E0, "V"),
+        (0x108F3, "X"),
+        (0x108F4, "V"),
+        (0x108F6, "X"),
+        (0x108FB, "V"),
+        (0x1091C, "X"),
+        (0x1091F, "V"),
+        (0x1093A, "X"),
+        (0x1093F, "V"),
+        (0x10940, "X"),
+        (0x10980, "V"),
+        (0x109B8, "X"),
+        (0x109BC, "V"),
+        (0x109D0, "X"),
+        (0x109D2, "V"),
+        (0x10A04, "X"),
+        (0x10A05, "V"),
+        (0x10A07, "X"),
+        (0x10A0C, "V"),
+        (0x10A14, "X"),
+        (0x10A15, "V"),
+        (0x10A18, "X"),
+        (0x10A19, "V"),
+        (0x10A36, "X"),
+        (0x10A38, "V"),
+        (0x10A3B, "X"),
+        (0x10A3F, "V"),
+        (0x10A49, "X"),
+        (0x10A50, "V"),
+        (0x10A59, "X"),
+        (0x10A60, "V"),
+        (0x10AA0, "X"),
+        (0x10AC0, "V"),
+        (0x10AE7, "X"),
+        (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'),
-    (0x10B58, 'V'),
-    (0x10B73, 'X'),
-    (0x10B78, 'V'),
-    (0x10B92, 'X'),
-    (0x10B99, 'V'),
-    (0x10B9D, 'X'),
-    (0x10BA9, 'V'),
-    (0x10BB0, 'X'),
-    (0x10C00, 'V'),
-    (0x10C49, 'X'),
-    (0x10C80, 'M', '𐳀'),
-    (0x10C81, 'M', '𐳁'),
-    (0x10C82, 'M', '𐳂'),
-    (0x10C83, 'M', '𐳃'),
-    (0x10C84, 'M', '𐳄'),
-    (0x10C85, 'M', '𐳅'),
-    (0x10C86, 'M', '𐳆'),
-    (0x10C87, 'M', '𐳇'),
-    (0x10C88, 'M', '𐳈'),
-    (0x10C89, 'M', '𐳉'),
-    (0x10C8A, 'M', '𐳊'),
-    (0x10C8B, 'M', '𐳋'),
-    (0x10C8C, 'M', '𐳌'),
-    (0x10C8D, 'M', '𐳍'),
-    (0x10C8E, 'M', '𐳎'),
-    (0x10C8F, 'M', '𐳏'),
-    (0x10C90, 'M', '𐳐'),
-    (0x10C91, 'M', '𐳑'),
-    (0x10C92, 'M', '𐳒'),
-    (0x10C93, 'M', '𐳓'),
-    (0x10C94, 'M', '𐳔'),
-    (0x10C95, 'M', '𐳕'),
-    (0x10C96, 'M', '𐳖'),
-    (0x10C97, 'M', '𐳗'),
-    (0x10C98, 'M', '𐳘'),
-    (0x10C99, 'M', '𐳙'),
-    (0x10C9A, 'M', '𐳚'),
-    (0x10C9B, 'M', '𐳛'),
-    (0x10C9C, 'M', '𐳜'),
-    (0x10C9D, 'M', '𐳝'),
-    (0x10C9E, 'M', '𐳞'),
-    (0x10C9F, 'M', '𐳟'),
-    (0x10CA0, 'M', '𐳠'),
-    (0x10CA1, 'M', '𐳡'),
-    (0x10CA2, 'M', '𐳢'),
-    (0x10CA3, 'M', '𐳣'),
-    (0x10CA4, 'M', '𐳤'),
-    (0x10CA5, 'M', '𐳥'),
-    (0x10CA6, 'M', '𐳦'),
-    (0x10CA7, 'M', '𐳧'),
-    (0x10CA8, 'M', '𐳨'),
-    (0x10CA9, 'M', '𐳩'),
-    (0x10CAA, 'M', '𐳪'),
-    (0x10CAB, 'M', '𐳫'),
-    (0x10CAC, 'M', '𐳬'),
-    (0x10CAD, 'M', '𐳭'),
-    (0x10CAE, 'M', '𐳮'),
-    (0x10CAF, 'M', '𐳯'),
-    (0x10CB0, 'M', '𐳰'),
-    (0x10CB1, 'M', '𐳱'),
-    (0x10CB2, 'M', '𐳲'),
-    (0x10CB3, 'X'),
-    (0x10CC0, 'V'),
-    (0x10CF3, 'X'),
-    (0x10CFA, 'V'),
-    (0x10D28, 'X'),
-    (0x10D30, 'V'),
-    (0x10D3A, 'X'),
-    (0x10E60, 'V'),
-    (0x10E7F, 'X'),
-    (0x10E80, 'V'),
-    (0x10EAA, 'X'),
-    (0x10EAB, 'V'),
-    (0x10EAE, 'X'),
-    (0x10EB0, 'V'),
-    (0x10EB2, 'X'),
-    (0x10EFD, 'V'),
-    (0x10F28, 'X'),
-    (0x10F30, 'V'),
-    (0x10F5A, 'X'),
-    (0x10F70, 'V'),
-    (0x10F8A, 'X'),
-    (0x10FB0, 'V'),
-    (0x10FCC, 'X'),
-    (0x10FE0, 'V'),
-    (0x10FF7, 'X'),
-    (0x11000, 'V'),
-    (0x1104E, 'X'),
-    (0x11052, 'V'),
-    (0x11076, 'X'),
-    (0x1107F, 'V'),
-    (0x110BD, 'X'),
-    (0x110BE, 'V'),
-    (0x110C3, 'X'),
-    (0x110D0, 'V'),
-    (0x110E9, 'X'),
-    (0x110F0, 'V'),
+        (0x10B36, "X"),
+        (0x10B39, "V"),
+        (0x10B56, "X"),
+        (0x10B58, "V"),
+        (0x10B73, "X"),
+        (0x10B78, "V"),
+        (0x10B92, "X"),
+        (0x10B99, "V"),
+        (0x10B9D, "X"),
+        (0x10BA9, "V"),
+        (0x10BB0, "X"),
+        (0x10C00, "V"),
+        (0x10C49, "X"),
+        (0x10C80, "M", "𐳀"),
+        (0x10C81, "M", "𐳁"),
+        (0x10C82, "M", "𐳂"),
+        (0x10C83, "M", "𐳃"),
+        (0x10C84, "M", "𐳄"),
+        (0x10C85, "M", "𐳅"),
+        (0x10C86, "M", "𐳆"),
+        (0x10C87, "M", "𐳇"),
+        (0x10C88, "M", "𐳈"),
+        (0x10C89, "M", "𐳉"),
+        (0x10C8A, "M", "𐳊"),
+        (0x10C8B, "M", "𐳋"),
+        (0x10C8C, "M", "𐳌"),
+        (0x10C8D, "M", "𐳍"),
+        (0x10C8E, "M", "𐳎"),
+        (0x10C8F, "M", "𐳏"),
+        (0x10C90, "M", "𐳐"),
+        (0x10C91, "M", "𐳑"),
+        (0x10C92, "M", "𐳒"),
+        (0x10C93, "M", "𐳓"),
+        (0x10C94, "M", "𐳔"),
+        (0x10C95, "M", "𐳕"),
+        (0x10C96, "M", "𐳖"),
+        (0x10C97, "M", "𐳗"),
+        (0x10C98, "M", "𐳘"),
+        (0x10C99, "M", "𐳙"),
+        (0x10C9A, "M", "𐳚"),
+        (0x10C9B, "M", "𐳛"),
+        (0x10C9C, "M", "𐳜"),
+        (0x10C9D, "M", "𐳝"),
+        (0x10C9E, "M", "𐳞"),
+        (0x10C9F, "M", "𐳟"),
+        (0x10CA0, "M", "𐳠"),
+        (0x10CA1, "M", "𐳡"),
+        (0x10CA2, "M", "𐳢"),
+        (0x10CA3, "M", "𐳣"),
+        (0x10CA4, "M", "𐳤"),
+        (0x10CA5, "M", "𐳥"),
+        (0x10CA6, "M", "𐳦"),
+        (0x10CA7, "M", "𐳧"),
+        (0x10CA8, "M", "𐳨"),
+        (0x10CA9, "M", "𐳩"),
+        (0x10CAA, "M", "𐳪"),
+        (0x10CAB, "M", "𐳫"),
+        (0x10CAC, "M", "𐳬"),
+        (0x10CAD, "M", "𐳭"),
+        (0x10CAE, "M", "𐳮"),
+        (0x10CAF, "M", "𐳯"),
+        (0x10CB0, "M", "𐳰"),
+        (0x10CB1, "M", "𐳱"),
+        (0x10CB2, "M", "𐳲"),
+        (0x10CB3, "X"),
+        (0x10CC0, "V"),
+        (0x10CF3, "X"),
+        (0x10CFA, "V"),
+        (0x10D28, "X"),
+        (0x10D30, "V"),
+        (0x10D3A, "X"),
+        (0x10E60, "V"),
+        (0x10E7F, "X"),
+        (0x10E80, "V"),
+        (0x10EAA, "X"),
+        (0x10EAB, "V"),
+        (0x10EAE, "X"),
+        (0x10EB0, "V"),
+        (0x10EB2, "X"),
+        (0x10EFD, "V"),
+        (0x10F28, "X"),
+        (0x10F30, "V"),
+        (0x10F5A, "X"),
+        (0x10F70, "V"),
+        (0x10F8A, "X"),
+        (0x10FB0, "V"),
+        (0x10FCC, "X"),
+        (0x10FE0, "V"),
+        (0x10FF7, "X"),
+        (0x11000, "V"),
+        (0x1104E, "X"),
+        (0x11052, "V"),
+        (0x11076, "X"),
+        (0x1107F, "V"),
+        (0x110BD, "X"),
+        (0x110BE, "V"),
+        (0x110C3, "X"),
+        (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'),
-    (0x11136, 'V'),
-    (0x11148, 'X'),
-    (0x11150, 'V'),
-    (0x11177, 'X'),
-    (0x11180, 'V'),
-    (0x111E0, 'X'),
-    (0x111E1, 'V'),
-    (0x111F5, 'X'),
-    (0x11200, 'V'),
-    (0x11212, 'X'),
-    (0x11213, 'V'),
-    (0x11242, 'X'),
-    (0x11280, 'V'),
-    (0x11287, 'X'),
-    (0x11288, 'V'),
-    (0x11289, 'X'),
-    (0x1128A, 'V'),
-    (0x1128E, 'X'),
-    (0x1128F, 'V'),
-    (0x1129E, 'X'),
-    (0x1129F, 'V'),
-    (0x112AA, 'X'),
-    (0x112B0, 'V'),
-    (0x112EB, 'X'),
-    (0x112F0, 'V'),
-    (0x112FA, 'X'),
-    (0x11300, 'V'),
-    (0x11304, 'X'),
-    (0x11305, 'V'),
-    (0x1130D, 'X'),
-    (0x1130F, 'V'),
-    (0x11311, 'X'),
-    (0x11313, 'V'),
-    (0x11329, 'X'),
-    (0x1132A, 'V'),
-    (0x11331, 'X'),
-    (0x11332, 'V'),
-    (0x11334, 'X'),
-    (0x11335, 'V'),
-    (0x1133A, 'X'),
-    (0x1133B, 'V'),
-    (0x11345, 'X'),
-    (0x11347, 'V'),
-    (0x11349, 'X'),
-    (0x1134B, 'V'),
-    (0x1134E, 'X'),
-    (0x11350, 'V'),
-    (0x11351, 'X'),
-    (0x11357, 'V'),
-    (0x11358, 'X'),
-    (0x1135D, 'V'),
-    (0x11364, 'X'),
-    (0x11366, 'V'),
-    (0x1136D, 'X'),
-    (0x11370, 'V'),
-    (0x11375, 'X'),
-    (0x11400, 'V'),
-    (0x1145C, 'X'),
-    (0x1145D, 'V'),
-    (0x11462, 'X'),
-    (0x11480, 'V'),
-    (0x114C8, 'X'),
-    (0x114D0, 'V'),
-    (0x114DA, 'X'),
-    (0x11580, 'V'),
-    (0x115B6, 'X'),
-    (0x115B8, 'V'),
-    (0x115DE, 'X'),
-    (0x11600, 'V'),
-    (0x11645, 'X'),
-    (0x11650, 'V'),
-    (0x1165A, 'X'),
-    (0x11660, 'V'),
-    (0x1166D, 'X'),
-    (0x11680, 'V'),
-    (0x116BA, 'X'),
-    (0x116C0, 'V'),
-    (0x116CA, 'X'),
-    (0x11700, 'V'),
-    (0x1171B, 'X'),
-    (0x1171D, 'V'),
-    (0x1172C, 'X'),
-    (0x11730, 'V'),
-    (0x11747, 'X'),
-    (0x11800, 'V'),
-    (0x1183C, 'X'),
-    (0x118A0, 'M', '𑣀'),
-    (0x118A1, 'M', '𑣁'),
-    (0x118A2, 'M', '𑣂'),
-    (0x118A3, 'M', '𑣃'),
-    (0x118A4, 'M', '𑣄'),
-    (0x118A5, 'M', '𑣅'),
-    (0x118A6, 'M', '𑣆'),
-    (0x118A7, 'M', '𑣇'),
-    (0x118A8, 'M', '𑣈'),
-    (0x118A9, 'M', '𑣉'),
-    (0x118AA, 'M', '𑣊'),
+        (0x110FA, "X"),
+        (0x11100, "V"),
+        (0x11135, "X"),
+        (0x11136, "V"),
+        (0x11148, "X"),
+        (0x11150, "V"),
+        (0x11177, "X"),
+        (0x11180, "V"),
+        (0x111E0, "X"),
+        (0x111E1, "V"),
+        (0x111F5, "X"),
+        (0x11200, "V"),
+        (0x11212, "X"),
+        (0x11213, "V"),
+        (0x11242, "X"),
+        (0x11280, "V"),
+        (0x11287, "X"),
+        (0x11288, "V"),
+        (0x11289, "X"),
+        (0x1128A, "V"),
+        (0x1128E, "X"),
+        (0x1128F, "V"),
+        (0x1129E, "X"),
+        (0x1129F, "V"),
+        (0x112AA, "X"),
+        (0x112B0, "V"),
+        (0x112EB, "X"),
+        (0x112F0, "V"),
+        (0x112FA, "X"),
+        (0x11300, "V"),
+        (0x11304, "X"),
+        (0x11305, "V"),
+        (0x1130D, "X"),
+        (0x1130F, "V"),
+        (0x11311, "X"),
+        (0x11313, "V"),
+        (0x11329, "X"),
+        (0x1132A, "V"),
+        (0x11331, "X"),
+        (0x11332, "V"),
+        (0x11334, "X"),
+        (0x11335, "V"),
+        (0x1133A, "X"),
+        (0x1133B, "V"),
+        (0x11345, "X"),
+        (0x11347, "V"),
+        (0x11349, "X"),
+        (0x1134B, "V"),
+        (0x1134E, "X"),
+        (0x11350, "V"),
+        (0x11351, "X"),
+        (0x11357, "V"),
+        (0x11358, "X"),
+        (0x1135D, "V"),
+        (0x11364, "X"),
+        (0x11366, "V"),
+        (0x1136D, "X"),
+        (0x11370, "V"),
+        (0x11375, "X"),
+        (0x11400, "V"),
+        (0x1145C, "X"),
+        (0x1145D, "V"),
+        (0x11462, "X"),
+        (0x11480, "V"),
+        (0x114C8, "X"),
+        (0x114D0, "V"),
+        (0x114DA, "X"),
+        (0x11580, "V"),
+        (0x115B6, "X"),
+        (0x115B8, "V"),
+        (0x115DE, "X"),
+        (0x11600, "V"),
+        (0x11645, "X"),
+        (0x11650, "V"),
+        (0x1165A, "X"),
+        (0x11660, "V"),
+        (0x1166D, "X"),
+        (0x11680, "V"),
+        (0x116BA, "X"),
+        (0x116C0, "V"),
+        (0x116CA, "X"),
+        (0x11700, "V"),
+        (0x1171B, "X"),
+        (0x1171D, "V"),
+        (0x1172C, "X"),
+        (0x11730, "V"),
+        (0x11747, "X"),
+        (0x11800, "V"),
+        (0x1183C, "X"),
+        (0x118A0, "M", "𑣀"),
+        (0x118A1, "M", "𑣁"),
+        (0x118A2, "M", "𑣂"),
+        (0x118A3, "M", "𑣃"),
+        (0x118A4, "M", "𑣄"),
+        (0x118A5, "M", "𑣅"),
+        (0x118A6, "M", "𑣆"),
+        (0x118A7, "M", "𑣇"),
+        (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', '𑣏'),
-    (0x118B0, 'M', '𑣐'),
-    (0x118B1, 'M', '𑣑'),
-    (0x118B2, 'M', '𑣒'),
-    (0x118B3, 'M', '𑣓'),
-    (0x118B4, 'M', '𑣔'),
-    (0x118B5, 'M', '𑣕'),
-    (0x118B6, 'M', '𑣖'),
-    (0x118B7, 'M', '𑣗'),
-    (0x118B8, 'M', '𑣘'),
-    (0x118B9, 'M', '𑣙'),
-    (0x118BA, 'M', '𑣚'),
-    (0x118BB, 'M', '𑣛'),
-    (0x118BC, 'M', '𑣜'),
-    (0x118BD, 'M', '𑣝'),
-    (0x118BE, 'M', '𑣞'),
-    (0x118BF, 'M', '𑣟'),
-    (0x118C0, 'V'),
-    (0x118F3, 'X'),
-    (0x118FF, 'V'),
-    (0x11907, 'X'),
-    (0x11909, 'V'),
-    (0x1190A, 'X'),
-    (0x1190C, 'V'),
-    (0x11914, 'X'),
-    (0x11915, 'V'),
-    (0x11917, 'X'),
-    (0x11918, 'V'),
-    (0x11936, 'X'),
-    (0x11937, 'V'),
-    (0x11939, 'X'),
-    (0x1193B, 'V'),
-    (0x11947, 'X'),
-    (0x11950, 'V'),
-    (0x1195A, 'X'),
-    (0x119A0, 'V'),
-    (0x119A8, 'X'),
-    (0x119AA, 'V'),
-    (0x119D8, 'X'),
-    (0x119DA, 'V'),
-    (0x119E5, 'X'),
-    (0x11A00, 'V'),
-    (0x11A48, 'X'),
-    (0x11A50, 'V'),
-    (0x11AA3, 'X'),
-    (0x11AB0, 'V'),
-    (0x11AF9, 'X'),
-    (0x11B00, 'V'),
-    (0x11B0A, 'X'),
-    (0x11C00, 'V'),
-    (0x11C09, 'X'),
-    (0x11C0A, 'V'),
-    (0x11C37, 'X'),
-    (0x11C38, 'V'),
-    (0x11C46, 'X'),
-    (0x11C50, 'V'),
-    (0x11C6D, 'X'),
-    (0x11C70, 'V'),
-    (0x11C90, 'X'),
-    (0x11C92, 'V'),
-    (0x11CA8, 'X'),
-    (0x11CA9, 'V'),
-    (0x11CB7, 'X'),
-    (0x11D00, 'V'),
-    (0x11D07, 'X'),
-    (0x11D08, 'V'),
-    (0x11D0A, 'X'),
-    (0x11D0B, 'V'),
-    (0x11D37, 'X'),
-    (0x11D3A, 'V'),
-    (0x11D3B, 'X'),
-    (0x11D3C, 'V'),
-    (0x11D3E, 'X'),
-    (0x11D3F, 'V'),
-    (0x11D48, 'X'),
-    (0x11D50, 'V'),
-    (0x11D5A, 'X'),
-    (0x11D60, 'V'),
-    (0x11D66, 'X'),
-    (0x11D67, 'V'),
-    (0x11D69, 'X'),
-    (0x11D6A, 'V'),
-    (0x11D8F, 'X'),
-    (0x11D90, 'V'),
-    (0x11D92, 'X'),
-    (0x11D93, 'V'),
-    (0x11D99, 'X'),
-    (0x11DA0, 'V'),
-    (0x11DAA, 'X'),
-    (0x11EE0, 'V'),
-    (0x11EF9, 'X'),
-    (0x11F00, 'V'),
-    (0x11F11, 'X'),
-    (0x11F12, 'V'),
-    (0x11F3B, 'X'),
-    (0x11F3E, 'V'),
+        (0x118AB, "M", "𑣋"),
+        (0x118AC, "M", "𑣌"),
+        (0x118AD, "M", "𑣍"),
+        (0x118AE, "M", "𑣎"),
+        (0x118AF, "M", "𑣏"),
+        (0x118B0, "M", "𑣐"),
+        (0x118B1, "M", "𑣑"),
+        (0x118B2, "M", "𑣒"),
+        (0x118B3, "M", "𑣓"),
+        (0x118B4, "M", "𑣔"),
+        (0x118B5, "M", "𑣕"),
+        (0x118B6, "M", "𑣖"),
+        (0x118B7, "M", "𑣗"),
+        (0x118B8, "M", "𑣘"),
+        (0x118B9, "M", "𑣙"),
+        (0x118BA, "M", "𑣚"),
+        (0x118BB, "M", "𑣛"),
+        (0x118BC, "M", "𑣜"),
+        (0x118BD, "M", "𑣝"),
+        (0x118BE, "M", "𑣞"),
+        (0x118BF, "M", "𑣟"),
+        (0x118C0, "V"),
+        (0x118F3, "X"),
+        (0x118FF, "V"),
+        (0x11907, "X"),
+        (0x11909, "V"),
+        (0x1190A, "X"),
+        (0x1190C, "V"),
+        (0x11914, "X"),
+        (0x11915, "V"),
+        (0x11917, "X"),
+        (0x11918, "V"),
+        (0x11936, "X"),
+        (0x11937, "V"),
+        (0x11939, "X"),
+        (0x1193B, "V"),
+        (0x11947, "X"),
+        (0x11950, "V"),
+        (0x1195A, "X"),
+        (0x119A0, "V"),
+        (0x119A8, "X"),
+        (0x119AA, "V"),
+        (0x119D8, "X"),
+        (0x119DA, "V"),
+        (0x119E5, "X"),
+        (0x11A00, "V"),
+        (0x11A48, "X"),
+        (0x11A50, "V"),
+        (0x11AA3, "X"),
+        (0x11AB0, "V"),
+        (0x11AF9, "X"),
+        (0x11B00, "V"),
+        (0x11B0A, "X"),
+        (0x11C00, "V"),
+        (0x11C09, "X"),
+        (0x11C0A, "V"),
+        (0x11C37, "X"),
+        (0x11C38, "V"),
+        (0x11C46, "X"),
+        (0x11C50, "V"),
+        (0x11C6D, "X"),
+        (0x11C70, "V"),
+        (0x11C90, "X"),
+        (0x11C92, "V"),
+        (0x11CA8, "X"),
+        (0x11CA9, "V"),
+        (0x11CB7, "X"),
+        (0x11D00, "V"),
+        (0x11D07, "X"),
+        (0x11D08, "V"),
+        (0x11D0A, "X"),
+        (0x11D0B, "V"),
+        (0x11D37, "X"),
+        (0x11D3A, "V"),
+        (0x11D3B, "X"),
+        (0x11D3C, "V"),
+        (0x11D3E, "X"),
+        (0x11D3F, "V"),
+        (0x11D48, "X"),
+        (0x11D50, "V"),
+        (0x11D5A, "X"),
+        (0x11D60, "V"),
+        (0x11D66, "X"),
+        (0x11D67, "V"),
+        (0x11D69, "X"),
+        (0x11D6A, "V"),
+        (0x11D8F, "X"),
+        (0x11D90, "V"),
+        (0x11D92, "X"),
+        (0x11D93, "V"),
+        (0x11D99, "X"),
+        (0x11DA0, "V"),
+        (0x11DAA, "X"),
+        (0x11EE0, "V"),
+        (0x11EF9, "X"),
+        (0x11F00, "V"),
+        (0x11F11, "X"),
+        (0x11F12, "V"),
+        (0x11F3B, "X"),
+        (0x11F3E, "V"),
     ]
 
+
 def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x11F5A, 'X'),
-    (0x11FB0, 'V'),
-    (0x11FB1, 'X'),
-    (0x11FC0, 'V'),
-    (0x11FF2, 'X'),
-    (0x11FFF, 'V'),
-    (0x1239A, 'X'),
-    (0x12400, 'V'),
-    (0x1246F, 'X'),
-    (0x12470, 'V'),
-    (0x12475, 'X'),
-    (0x12480, 'V'),
-    (0x12544, 'X'),
-    (0x12F90, 'V'),
-    (0x12FF3, 'X'),
-    (0x13000, 'V'),
-    (0x13430, 'X'),
-    (0x13440, 'V'),
-    (0x13456, 'X'),
-    (0x14400, 'V'),
-    (0x14647, 'X'),
-    (0x16800, 'V'),
-    (0x16A39, 'X'),
-    (0x16A40, 'V'),
-    (0x16A5F, 'X'),
-    (0x16A60, 'V'),
-    (0x16A6A, 'X'),
-    (0x16A6E, 'V'),
-    (0x16ABF, 'X'),
-    (0x16AC0, 'V'),
-    (0x16ACA, 'X'),
-    (0x16AD0, 'V'),
-    (0x16AEE, 'X'),
-    (0x16AF0, 'V'),
-    (0x16AF6, 'X'),
-    (0x16B00, 'V'),
-    (0x16B46, 'X'),
-    (0x16B50, 'V'),
-    (0x16B5A, 'X'),
-    (0x16B5B, 'V'),
-    (0x16B62, 'X'),
-    (0x16B63, 'V'),
-    (0x16B78, 'X'),
-    (0x16B7D, 'V'),
-    (0x16B90, 'X'),
-    (0x16E40, 'M', '𖹠'),
-    (0x16E41, 'M', '𖹡'),
-    (0x16E42, 'M', '𖹢'),
-    (0x16E43, 'M', '𖹣'),
-    (0x16E44, 'M', '𖹤'),
-    (0x16E45, 'M', '𖹥'),
-    (0x16E46, 'M', '𖹦'),
-    (0x16E47, 'M', '𖹧'),
-    (0x16E48, 'M', '𖹨'),
-    (0x16E49, 'M', '𖹩'),
-    (0x16E4A, 'M', '𖹪'),
-    (0x16E4B, 'M', '𖹫'),
-    (0x16E4C, 'M', '𖹬'),
-    (0x16E4D, 'M', '𖹭'),
-    (0x16E4E, 'M', '𖹮'),
-    (0x16E4F, 'M', '𖹯'),
-    (0x16E50, 'M', '𖹰'),
-    (0x16E51, 'M', '𖹱'),
-    (0x16E52, 'M', '𖹲'),
-    (0x16E53, 'M', '𖹳'),
-    (0x16E54, 'M', '𖹴'),
-    (0x16E55, 'M', '𖹵'),
-    (0x16E56, 'M', '𖹶'),
-    (0x16E57, 'M', '𖹷'),
-    (0x16E58, 'M', '𖹸'),
-    (0x16E59, 'M', '𖹹'),
-    (0x16E5A, 'M', '𖹺'),
-    (0x16E5B, 'M', '𖹻'),
-    (0x16E5C, 'M', '𖹼'),
-    (0x16E5D, 'M', '𖹽'),
-    (0x16E5E, 'M', '𖹾'),
-    (0x16E5F, 'M', '𖹿'),
-    (0x16E60, 'V'),
-    (0x16E9B, 'X'),
-    (0x16F00, 'V'),
-    (0x16F4B, 'X'),
-    (0x16F4F, 'V'),
-    (0x16F88, 'X'),
-    (0x16F8F, 'V'),
-    (0x16FA0, 'X'),
-    (0x16FE0, 'V'),
-    (0x16FE5, 'X'),
-    (0x16FF0, 'V'),
-    (0x16FF2, 'X'),
-    (0x17000, 'V'),
-    (0x187F8, 'X'),
-    (0x18800, 'V'),
-    (0x18CD6, 'X'),
-    (0x18D00, 'V'),
-    (0x18D09, 'X'),
-    (0x1AFF0, 'V'),
-    (0x1AFF4, 'X'),
-    (0x1AFF5, 'V'),
-    (0x1AFFC, 'X'),
-    (0x1AFFD, 'V'),
+        (0x11F5A, "X"),
+        (0x11FB0, "V"),
+        (0x11FB1, "X"),
+        (0x11FC0, "V"),
+        (0x11FF2, "X"),
+        (0x11FFF, "V"),
+        (0x1239A, "X"),
+        (0x12400, "V"),
+        (0x1246F, "X"),
+        (0x12470, "V"),
+        (0x12475, "X"),
+        (0x12480, "V"),
+        (0x12544, "X"),
+        (0x12F90, "V"),
+        (0x12FF3, "X"),
+        (0x13000, "V"),
+        (0x13430, "X"),
+        (0x13440, "V"),
+        (0x13456, "X"),
+        (0x14400, "V"),
+        (0x14647, "X"),
+        (0x16800, "V"),
+        (0x16A39, "X"),
+        (0x16A40, "V"),
+        (0x16A5F, "X"),
+        (0x16A60, "V"),
+        (0x16A6A, "X"),
+        (0x16A6E, "V"),
+        (0x16ABF, "X"),
+        (0x16AC0, "V"),
+        (0x16ACA, "X"),
+        (0x16AD0, "V"),
+        (0x16AEE, "X"),
+        (0x16AF0, "V"),
+        (0x16AF6, "X"),
+        (0x16B00, "V"),
+        (0x16B46, "X"),
+        (0x16B50, "V"),
+        (0x16B5A, "X"),
+        (0x16B5B, "V"),
+        (0x16B62, "X"),
+        (0x16B63, "V"),
+        (0x16B78, "X"),
+        (0x16B7D, "V"),
+        (0x16B90, "X"),
+        (0x16E40, "M", "𖹠"),
+        (0x16E41, "M", "𖹡"),
+        (0x16E42, "M", "𖹢"),
+        (0x16E43, "M", "𖹣"),
+        (0x16E44, "M", "𖹤"),
+        (0x16E45, "M", "𖹥"),
+        (0x16E46, "M", "𖹦"),
+        (0x16E47, "M", "𖹧"),
+        (0x16E48, "M", "𖹨"),
+        (0x16E49, "M", "𖹩"),
+        (0x16E4A, "M", "𖹪"),
+        (0x16E4B, "M", "𖹫"),
+        (0x16E4C, "M", "𖹬"),
+        (0x16E4D, "M", "𖹭"),
+        (0x16E4E, "M", "𖹮"),
+        (0x16E4F, "M", "𖹯"),
+        (0x16E50, "M", "𖹰"),
+        (0x16E51, "M", "𖹱"),
+        (0x16E52, "M", "𖹲"),
+        (0x16E53, "M", "𖹳"),
+        (0x16E54, "M", "𖹴"),
+        (0x16E55, "M", "𖹵"),
+        (0x16E56, "M", "𖹶"),
+        (0x16E57, "M", "𖹷"),
+        (0x16E58, "M", "𖹸"),
+        (0x16E59, "M", "𖹹"),
+        (0x16E5A, "M", "𖹺"),
+        (0x16E5B, "M", "𖹻"),
+        (0x16E5C, "M", "𖹼"),
+        (0x16E5D, "M", "𖹽"),
+        (0x16E5E, "M", "𖹾"),
+        (0x16E5F, "M", "𖹿"),
+        (0x16E60, "V"),
+        (0x16E9B, "X"),
+        (0x16F00, "V"),
+        (0x16F4B, "X"),
+        (0x16F4F, "V"),
+        (0x16F88, "X"),
+        (0x16F8F, "V"),
+        (0x16FA0, "X"),
+        (0x16FE0, "V"),
+        (0x16FE5, "X"),
+        (0x16FF0, "V"),
+        (0x16FF2, "X"),
+        (0x17000, "V"),
+        (0x187F8, "X"),
+        (0x18800, "V"),
+        (0x18CD6, "X"),
+        (0x18D00, "V"),
+        (0x18D09, "X"),
+        (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'),
-    (0x1B132, 'V'),
-    (0x1B133, 'X'),
-    (0x1B150, 'V'),
-    (0x1B153, 'X'),
-    (0x1B155, 'V'),
-    (0x1B156, 'X'),
-    (0x1B164, 'V'),
-    (0x1B168, 'X'),
-    (0x1B170, 'V'),
-    (0x1B2FC, 'X'),
-    (0x1BC00, 'V'),
-    (0x1BC6B, 'X'),
-    (0x1BC70, 'V'),
-    (0x1BC7D, 'X'),
-    (0x1BC80, 'V'),
-    (0x1BC89, 'X'),
-    (0x1BC90, 'V'),
-    (0x1BC9A, 'X'),
-    (0x1BC9C, 'V'),
-    (0x1BCA0, 'I'),
-    (0x1BCA4, 'X'),
-    (0x1CF00, 'V'),
-    (0x1CF2E, 'X'),
-    (0x1CF30, 'V'),
-    (0x1CF47, 'X'),
-    (0x1CF50, 'V'),
-    (0x1CFC4, 'X'),
-    (0x1D000, 'V'),
-    (0x1D0F6, 'X'),
-    (0x1D100, 'V'),
-    (0x1D127, 'X'),
-    (0x1D129, 'V'),
-    (0x1D15E, 'M', '𝅗𝅥'),
-    (0x1D15F, 'M', '𝅘𝅥'),
-    (0x1D160, 'M', '𝅘𝅥𝅮'),
-    (0x1D161, 'M', '𝅘𝅥𝅯'),
-    (0x1D162, 'M', '𝅘𝅥𝅰'),
-    (0x1D163, 'M', '𝅘𝅥𝅱'),
-    (0x1D164, 'M', '𝅘𝅥𝅲'),
-    (0x1D165, 'V'),
-    (0x1D173, 'X'),
-    (0x1D17B, 'V'),
-    (0x1D1BB, 'M', '𝆹𝅥'),
-    (0x1D1BC, 'M', '𝆺𝅥'),
-    (0x1D1BD, 'M', '𝆹𝅥𝅮'),
-    (0x1D1BE, 'M', '𝆺𝅥𝅮'),
-    (0x1D1BF, 'M', '𝆹𝅥𝅯'),
-    (0x1D1C0, 'M', '𝆺𝅥𝅯'),
-    (0x1D1C1, 'V'),
-    (0x1D1EB, 'X'),
-    (0x1D200, 'V'),
-    (0x1D246, 'X'),
-    (0x1D2C0, 'V'),
-    (0x1D2D4, 'X'),
-    (0x1D2E0, 'V'),
-    (0x1D2F4, 'X'),
-    (0x1D300, 'V'),
-    (0x1D357, 'X'),
-    (0x1D360, 'V'),
-    (0x1D379, 'X'),
-    (0x1D400, 'M', 'a'),
-    (0x1D401, 'M', 'b'),
-    (0x1D402, 'M', 'c'),
-    (0x1D403, 'M', 'd'),
-    (0x1D404, 'M', 'e'),
-    (0x1D405, 'M', 'f'),
-    (0x1D406, 'M', 'g'),
-    (0x1D407, 'M', 'h'),
-    (0x1D408, 'M', 'i'),
-    (0x1D409, 'M', 'j'),
-    (0x1D40A, 'M', 'k'),
-    (0x1D40B, 'M', 'l'),
-    (0x1D40C, 'M', 'm'),
-    (0x1D40D, 'M', 'n'),
-    (0x1D40E, 'M', 'o'),
-    (0x1D40F, 'M', 'p'),
-    (0x1D410, 'M', 'q'),
-    (0x1D411, 'M', 'r'),
-    (0x1D412, 'M', 's'),
-    (0x1D413, 'M', 't'),
-    (0x1D414, 'M', 'u'),
-    (0x1D415, 'M', 'v'),
-    (0x1D416, 'M', 'w'),
-    (0x1D417, 'M', 'x'),
-    (0x1D418, 'M', 'y'),
-    (0x1D419, 'M', 'z'),
-    (0x1D41A, 'M', 'a'),
-    (0x1D41B, 'M', 'b'),
-    (0x1D41C, 'M', 'c'),
-    (0x1D41D, 'M', 'd'),
-    (0x1D41E, 'M', 'e'),
-    (0x1D41F, 'M', 'f'),
-    (0x1D420, 'M', 'g'),
-    (0x1D421, 'M', 'h'),
-    (0x1D422, 'M', 'i'),
-    (0x1D423, 'M', 'j'),
-    (0x1D424, 'M', 'k'),
+        (0x1AFFF, "X"),
+        (0x1B000, "V"),
+        (0x1B123, "X"),
+        (0x1B132, "V"),
+        (0x1B133, "X"),
+        (0x1B150, "V"),
+        (0x1B153, "X"),
+        (0x1B155, "V"),
+        (0x1B156, "X"),
+        (0x1B164, "V"),
+        (0x1B168, "X"),
+        (0x1B170, "V"),
+        (0x1B2FC, "X"),
+        (0x1BC00, "V"),
+        (0x1BC6B, "X"),
+        (0x1BC70, "V"),
+        (0x1BC7D, "X"),
+        (0x1BC80, "V"),
+        (0x1BC89, "X"),
+        (0x1BC90, "V"),
+        (0x1BC9A, "X"),
+        (0x1BC9C, "V"),
+        (0x1BCA0, "I"),
+        (0x1BCA4, "X"),
+        (0x1CF00, "V"),
+        (0x1CF2E, "X"),
+        (0x1CF30, "V"),
+        (0x1CF47, "X"),
+        (0x1CF50, "V"),
+        (0x1CFC4, "X"),
+        (0x1D000, "V"),
+        (0x1D0F6, "X"),
+        (0x1D100, "V"),
+        (0x1D127, "X"),
+        (0x1D129, "V"),
+        (0x1D15E, "M", "𝅗𝅥"),
+        (0x1D15F, "M", "𝅘𝅥"),
+        (0x1D160, "M", "𝅘𝅥𝅮"),
+        (0x1D161, "M", "𝅘𝅥𝅯"),
+        (0x1D162, "M", "𝅘𝅥𝅰"),
+        (0x1D163, "M", "𝅘𝅥𝅱"),
+        (0x1D164, "M", "𝅘𝅥𝅲"),
+        (0x1D165, "V"),
+        (0x1D173, "X"),
+        (0x1D17B, "V"),
+        (0x1D1BB, "M", "𝆹𝅥"),
+        (0x1D1BC, "M", "𝆺𝅥"),
+        (0x1D1BD, "M", "𝆹𝅥𝅮"),
+        (0x1D1BE, "M", "𝆺𝅥𝅮"),
+        (0x1D1BF, "M", "𝆹𝅥𝅯"),
+        (0x1D1C0, "M", "𝆺𝅥𝅯"),
+        (0x1D1C1, "V"),
+        (0x1D1EB, "X"),
+        (0x1D200, "V"),
+        (0x1D246, "X"),
+        (0x1D2C0, "V"),
+        (0x1D2D4, "X"),
+        (0x1D2E0, "V"),
+        (0x1D2F4, "X"),
+        (0x1D300, "V"),
+        (0x1D357, "X"),
+        (0x1D360, "V"),
+        (0x1D379, "X"),
+        (0x1D400, "M", "a"),
+        (0x1D401, "M", "b"),
+        (0x1D402, "M", "c"),
+        (0x1D403, "M", "d"),
+        (0x1D404, "M", "e"),
+        (0x1D405, "M", "f"),
+        (0x1D406, "M", "g"),
+        (0x1D407, "M", "h"),
+        (0x1D408, "M", "i"),
+        (0x1D409, "M", "j"),
+        (0x1D40A, "M", "k"),
+        (0x1D40B, "M", "l"),
+        (0x1D40C, "M", "m"),
+        (0x1D40D, "M", "n"),
+        (0x1D40E, "M", "o"),
+        (0x1D40F, "M", "p"),
+        (0x1D410, "M", "q"),
+        (0x1D411, "M", "r"),
+        (0x1D412, "M", "s"),
+        (0x1D413, "M", "t"),
+        (0x1D414, "M", "u"),
+        (0x1D415, "M", "v"),
+        (0x1D416, "M", "w"),
+        (0x1D417, "M", "x"),
+        (0x1D418, "M", "y"),
+        (0x1D419, "M", "z"),
+        (0x1D41A, "M", "a"),
+        (0x1D41B, "M", "b"),
+        (0x1D41C, "M", "c"),
+        (0x1D41D, "M", "d"),
+        (0x1D41E, "M", "e"),
+        (0x1D41F, "M", "f"),
+        (0x1D420, "M", "g"),
+        (0x1D421, "M", "h"),
+        (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'),
-    (0x1D428, 'M', 'o'),
-    (0x1D429, 'M', 'p'),
-    (0x1D42A, 'M', 'q'),
-    (0x1D42B, 'M', 'r'),
-    (0x1D42C, 'M', 's'),
-    (0x1D42D, 'M', 't'),
-    (0x1D42E, 'M', 'u'),
-    (0x1D42F, 'M', 'v'),
-    (0x1D430, 'M', 'w'),
-    (0x1D431, 'M', 'x'),
-    (0x1D432, 'M', 'y'),
-    (0x1D433, 'M', 'z'),
-    (0x1D434, 'M', 'a'),
-    (0x1D435, 'M', 'b'),
-    (0x1D436, 'M', 'c'),
-    (0x1D437, 'M', 'd'),
-    (0x1D438, 'M', 'e'),
-    (0x1D439, 'M', 'f'),
-    (0x1D43A, 'M', 'g'),
-    (0x1D43B, 'M', 'h'),
-    (0x1D43C, 'M', 'i'),
-    (0x1D43D, 'M', 'j'),
-    (0x1D43E, 'M', 'k'),
-    (0x1D43F, 'M', 'l'),
-    (0x1D440, 'M', 'm'),
-    (0x1D441, 'M', 'n'),
-    (0x1D442, 'M', 'o'),
-    (0x1D443, 'M', 'p'),
-    (0x1D444, 'M', 'q'),
-    (0x1D445, 'M', 'r'),
-    (0x1D446, 'M', 's'),
-    (0x1D447, 'M', 't'),
-    (0x1D448, 'M', 'u'),
-    (0x1D449, 'M', 'v'),
-    (0x1D44A, 'M', 'w'),
-    (0x1D44B, 'M', 'x'),
-    (0x1D44C, 'M', 'y'),
-    (0x1D44D, 'M', 'z'),
-    (0x1D44E, 'M', 'a'),
-    (0x1D44F, 'M', 'b'),
-    (0x1D450, 'M', 'c'),
-    (0x1D451, 'M', 'd'),
-    (0x1D452, 'M', 'e'),
-    (0x1D453, 'M', 'f'),
-    (0x1D454, 'M', 'g'),
-    (0x1D455, 'X'),
-    (0x1D456, 'M', 'i'),
-    (0x1D457, 'M', 'j'),
-    (0x1D458, 'M', 'k'),
-    (0x1D459, 'M', 'l'),
-    (0x1D45A, 'M', 'm'),
-    (0x1D45B, 'M', 'n'),
-    (0x1D45C, 'M', 'o'),
-    (0x1D45D, 'M', 'p'),
-    (0x1D45E, 'M', 'q'),
-    (0x1D45F, 'M', 'r'),
-    (0x1D460, 'M', 's'),
-    (0x1D461, 'M', 't'),
-    (0x1D462, 'M', 'u'),
-    (0x1D463, 'M', 'v'),
-    (0x1D464, 'M', 'w'),
-    (0x1D465, 'M', 'x'),
-    (0x1D466, 'M', 'y'),
-    (0x1D467, 'M', 'z'),
-    (0x1D468, 'M', 'a'),
-    (0x1D469, 'M', 'b'),
-    (0x1D46A, 'M', 'c'),
-    (0x1D46B, 'M', 'd'),
-    (0x1D46C, 'M', 'e'),
-    (0x1D46D, 'M', 'f'),
-    (0x1D46E, 'M', 'g'),
-    (0x1D46F, 'M', 'h'),
-    (0x1D470, 'M', 'i'),
-    (0x1D471, 'M', 'j'),
-    (0x1D472, 'M', 'k'),
-    (0x1D473, 'M', 'l'),
-    (0x1D474, 'M', 'm'),
-    (0x1D475, 'M', 'n'),
-    (0x1D476, 'M', 'o'),
-    (0x1D477, 'M', 'p'),
-    (0x1D478, 'M', 'q'),
-    (0x1D479, 'M', 'r'),
-    (0x1D47A, 'M', 's'),
-    (0x1D47B, 'M', 't'),
-    (0x1D47C, 'M', 'u'),
-    (0x1D47D, 'M', 'v'),
-    (0x1D47E, 'M', 'w'),
-    (0x1D47F, 'M', 'x'),
-    (0x1D480, 'M', 'y'),
-    (0x1D481, 'M', 'z'),
-    (0x1D482, 'M', 'a'),
-    (0x1D483, 'M', 'b'),
-    (0x1D484, 'M', 'c'),
-    (0x1D485, 'M', 'd'),
-    (0x1D486, 'M', 'e'),
-    (0x1D487, 'M', 'f'),
-    (0x1D488, 'M', 'g'),
+        (0x1D425, "M", "l"),
+        (0x1D426, "M", "m"),
+        (0x1D427, "M", "n"),
+        (0x1D428, "M", "o"),
+        (0x1D429, "M", "p"),
+        (0x1D42A, "M", "q"),
+        (0x1D42B, "M", "r"),
+        (0x1D42C, "M", "s"),
+        (0x1D42D, "M", "t"),
+        (0x1D42E, "M", "u"),
+        (0x1D42F, "M", "v"),
+        (0x1D430, "M", "w"),
+        (0x1D431, "M", "x"),
+        (0x1D432, "M", "y"),
+        (0x1D433, "M", "z"),
+        (0x1D434, "M", "a"),
+        (0x1D435, "M", "b"),
+        (0x1D436, "M", "c"),
+        (0x1D437, "M", "d"),
+        (0x1D438, "M", "e"),
+        (0x1D439, "M", "f"),
+        (0x1D43A, "M", "g"),
+        (0x1D43B, "M", "h"),
+        (0x1D43C, "M", "i"),
+        (0x1D43D, "M", "j"),
+        (0x1D43E, "M", "k"),
+        (0x1D43F, "M", "l"),
+        (0x1D440, "M", "m"),
+        (0x1D441, "M", "n"),
+        (0x1D442, "M", "o"),
+        (0x1D443, "M", "p"),
+        (0x1D444, "M", "q"),
+        (0x1D445, "M", "r"),
+        (0x1D446, "M", "s"),
+        (0x1D447, "M", "t"),
+        (0x1D448, "M", "u"),
+        (0x1D449, "M", "v"),
+        (0x1D44A, "M", "w"),
+        (0x1D44B, "M", "x"),
+        (0x1D44C, "M", "y"),
+        (0x1D44D, "M", "z"),
+        (0x1D44E, "M", "a"),
+        (0x1D44F, "M", "b"),
+        (0x1D450, "M", "c"),
+        (0x1D451, "M", "d"),
+        (0x1D452, "M", "e"),
+        (0x1D453, "M", "f"),
+        (0x1D454, "M", "g"),
+        (0x1D455, "X"),
+        (0x1D456, "M", "i"),
+        (0x1D457, "M", "j"),
+        (0x1D458, "M", "k"),
+        (0x1D459, "M", "l"),
+        (0x1D45A, "M", "m"),
+        (0x1D45B, "M", "n"),
+        (0x1D45C, "M", "o"),
+        (0x1D45D, "M", "p"),
+        (0x1D45E, "M", "q"),
+        (0x1D45F, "M", "r"),
+        (0x1D460, "M", "s"),
+        (0x1D461, "M", "t"),
+        (0x1D462, "M", "u"),
+        (0x1D463, "M", "v"),
+        (0x1D464, "M", "w"),
+        (0x1D465, "M", "x"),
+        (0x1D466, "M", "y"),
+        (0x1D467, "M", "z"),
+        (0x1D468, "M", "a"),
+        (0x1D469, "M", "b"),
+        (0x1D46A, "M", "c"),
+        (0x1D46B, "M", "d"),
+        (0x1D46C, "M", "e"),
+        (0x1D46D, "M", "f"),
+        (0x1D46E, "M", "g"),
+        (0x1D46F, "M", "h"),
+        (0x1D470, "M", "i"),
+        (0x1D471, "M", "j"),
+        (0x1D472, "M", "k"),
+        (0x1D473, "M", "l"),
+        (0x1D474, "M", "m"),
+        (0x1D475, "M", "n"),
+        (0x1D476, "M", "o"),
+        (0x1D477, "M", "p"),
+        (0x1D478, "M", "q"),
+        (0x1D479, "M", "r"),
+        (0x1D47A, "M", "s"),
+        (0x1D47B, "M", "t"),
+        (0x1D47C, "M", "u"),
+        (0x1D47D, "M", "v"),
+        (0x1D47E, "M", "w"),
+        (0x1D47F, "M", "x"),
+        (0x1D480, "M", "y"),
+        (0x1D481, "M", "z"),
+        (0x1D482, "M", "a"),
+        (0x1D483, "M", "b"),
+        (0x1D484, "M", "c"),
+        (0x1D485, "M", "d"),
+        (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'),
-    (0x1D48C, 'M', 'k'),
-    (0x1D48D, 'M', 'l'),
-    (0x1D48E, 'M', 'm'),
-    (0x1D48F, 'M', 'n'),
-    (0x1D490, 'M', 'o'),
-    (0x1D491, 'M', 'p'),
-    (0x1D492, 'M', 'q'),
-    (0x1D493, 'M', 'r'),
-    (0x1D494, 'M', 's'),
-    (0x1D495, 'M', 't'),
-    (0x1D496, 'M', 'u'),
-    (0x1D497, 'M', 'v'),
-    (0x1D498, 'M', 'w'),
-    (0x1D499, 'M', 'x'),
-    (0x1D49A, 'M', 'y'),
-    (0x1D49B, 'M', 'z'),
-    (0x1D49C, 'M', 'a'),
-    (0x1D49D, 'X'),
-    (0x1D49E, 'M', 'c'),
-    (0x1D49F, 'M', 'd'),
-    (0x1D4A0, 'X'),
-    (0x1D4A2, 'M', 'g'),
-    (0x1D4A3, 'X'),
-    (0x1D4A5, 'M', 'j'),
-    (0x1D4A6, 'M', 'k'),
-    (0x1D4A7, 'X'),
-    (0x1D4A9, 'M', 'n'),
-    (0x1D4AA, 'M', 'o'),
-    (0x1D4AB, 'M', 'p'),
-    (0x1D4AC, 'M', 'q'),
-    (0x1D4AD, 'X'),
-    (0x1D4AE, 'M', 's'),
-    (0x1D4AF, 'M', 't'),
-    (0x1D4B0, 'M', 'u'),
-    (0x1D4B1, 'M', 'v'),
-    (0x1D4B2, 'M', 'w'),
-    (0x1D4B3, 'M', 'x'),
-    (0x1D4B4, 'M', 'y'),
-    (0x1D4B5, 'M', 'z'),
-    (0x1D4B6, 'M', 'a'),
-    (0x1D4B7, 'M', 'b'),
-    (0x1D4B8, 'M', 'c'),
-    (0x1D4B9, 'M', 'd'),
-    (0x1D4BA, 'X'),
-    (0x1D4BB, 'M', 'f'),
-    (0x1D4BC, 'X'),
-    (0x1D4BD, 'M', 'h'),
-    (0x1D4BE, 'M', 'i'),
-    (0x1D4BF, 'M', 'j'),
-    (0x1D4C0, 'M', 'k'),
-    (0x1D4C1, 'M', 'l'),
-    (0x1D4C2, 'M', 'm'),
-    (0x1D4C3, 'M', 'n'),
-    (0x1D4C4, 'X'),
-    (0x1D4C5, 'M', 'p'),
-    (0x1D4C6, 'M', 'q'),
-    (0x1D4C7, 'M', 'r'),
-    (0x1D4C8, 'M', 's'),
-    (0x1D4C9, 'M', 't'),
-    (0x1D4CA, 'M', 'u'),
-    (0x1D4CB, 'M', 'v'),
-    (0x1D4CC, 'M', 'w'),
-    (0x1D4CD, 'M', 'x'),
-    (0x1D4CE, 'M', 'y'),
-    (0x1D4CF, 'M', 'z'),
-    (0x1D4D0, 'M', 'a'),
-    (0x1D4D1, 'M', 'b'),
-    (0x1D4D2, 'M', 'c'),
-    (0x1D4D3, 'M', 'd'),
-    (0x1D4D4, 'M', 'e'),
-    (0x1D4D5, 'M', 'f'),
-    (0x1D4D6, 'M', 'g'),
-    (0x1D4D7, 'M', 'h'),
-    (0x1D4D8, 'M', 'i'),
-    (0x1D4D9, 'M', 'j'),
-    (0x1D4DA, 'M', 'k'),
-    (0x1D4DB, 'M', 'l'),
-    (0x1D4DC, 'M', 'm'),
-    (0x1D4DD, 'M', 'n'),
-    (0x1D4DE, 'M', 'o'),
-    (0x1D4DF, 'M', 'p'),
-    (0x1D4E0, 'M', 'q'),
-    (0x1D4E1, 'M', 'r'),
-    (0x1D4E2, 'M', 's'),
-    (0x1D4E3, 'M', 't'),
-    (0x1D4E4, 'M', 'u'),
-    (0x1D4E5, 'M', 'v'),
-    (0x1D4E6, 'M', 'w'),
-    (0x1D4E7, 'M', 'x'),
-    (0x1D4E8, 'M', 'y'),
-    (0x1D4E9, 'M', 'z'),
-    (0x1D4EA, 'M', 'a'),
-    (0x1D4EB, 'M', 'b'),
-    (0x1D4EC, 'M', 'c'),
-    (0x1D4ED, 'M', 'd'),
-    (0x1D4EE, 'M', 'e'),
-    (0x1D4EF, 'M', 'f'),
+        (0x1D489, "M", "h"),
+        (0x1D48A, "M", "i"),
+        (0x1D48B, "M", "j"),
+        (0x1D48C, "M", "k"),
+        (0x1D48D, "M", "l"),
+        (0x1D48E, "M", "m"),
+        (0x1D48F, "M", "n"),
+        (0x1D490, "M", "o"),
+        (0x1D491, "M", "p"),
+        (0x1D492, "M", "q"),
+        (0x1D493, "M", "r"),
+        (0x1D494, "M", "s"),
+        (0x1D495, "M", "t"),
+        (0x1D496, "M", "u"),
+        (0x1D497, "M", "v"),
+        (0x1D498, "M", "w"),
+        (0x1D499, "M", "x"),
+        (0x1D49A, "M", "y"),
+        (0x1D49B, "M", "z"),
+        (0x1D49C, "M", "a"),
+        (0x1D49D, "X"),
+        (0x1D49E, "M", "c"),
+        (0x1D49F, "M", "d"),
+        (0x1D4A0, "X"),
+        (0x1D4A2, "M", "g"),
+        (0x1D4A3, "X"),
+        (0x1D4A5, "M", "j"),
+        (0x1D4A6, "M", "k"),
+        (0x1D4A7, "X"),
+        (0x1D4A9, "M", "n"),
+        (0x1D4AA, "M", "o"),
+        (0x1D4AB, "M", "p"),
+        (0x1D4AC, "M", "q"),
+        (0x1D4AD, "X"),
+        (0x1D4AE, "M", "s"),
+        (0x1D4AF, "M", "t"),
+        (0x1D4B0, "M", "u"),
+        (0x1D4B1, "M", "v"),
+        (0x1D4B2, "M", "w"),
+        (0x1D4B3, "M", "x"),
+        (0x1D4B4, "M", "y"),
+        (0x1D4B5, "M", "z"),
+        (0x1D4B6, "M", "a"),
+        (0x1D4B7, "M", "b"),
+        (0x1D4B8, "M", "c"),
+        (0x1D4B9, "M", "d"),
+        (0x1D4BA, "X"),
+        (0x1D4BB, "M", "f"),
+        (0x1D4BC, "X"),
+        (0x1D4BD, "M", "h"),
+        (0x1D4BE, "M", "i"),
+        (0x1D4BF, "M", "j"),
+        (0x1D4C0, "M", "k"),
+        (0x1D4C1, "M", "l"),
+        (0x1D4C2, "M", "m"),
+        (0x1D4C3, "M", "n"),
+        (0x1D4C4, "X"),
+        (0x1D4C5, "M", "p"),
+        (0x1D4C6, "M", "q"),
+        (0x1D4C7, "M", "r"),
+        (0x1D4C8, "M", "s"),
+        (0x1D4C9, "M", "t"),
+        (0x1D4CA, "M", "u"),
+        (0x1D4CB, "M", "v"),
+        (0x1D4CC, "M", "w"),
+        (0x1D4CD, "M", "x"),
+        (0x1D4CE, "M", "y"),
+        (0x1D4CF, "M", "z"),
+        (0x1D4D0, "M", "a"),
+        (0x1D4D1, "M", "b"),
+        (0x1D4D2, "M", "c"),
+        (0x1D4D3, "M", "d"),
+        (0x1D4D4, "M", "e"),
+        (0x1D4D5, "M", "f"),
+        (0x1D4D6, "M", "g"),
+        (0x1D4D7, "M", "h"),
+        (0x1D4D8, "M", "i"),
+        (0x1D4D9, "M", "j"),
+        (0x1D4DA, "M", "k"),
+        (0x1D4DB, "M", "l"),
+        (0x1D4DC, "M", "m"),
+        (0x1D4DD, "M", "n"),
+        (0x1D4DE, "M", "o"),
+        (0x1D4DF, "M", "p"),
+        (0x1D4E0, "M", "q"),
+        (0x1D4E1, "M", "r"),
+        (0x1D4E2, "M", "s"),
+        (0x1D4E3, "M", "t"),
+        (0x1D4E4, "M", "u"),
+        (0x1D4E5, "M", "v"),
+        (0x1D4E6, "M", "w"),
+        (0x1D4E7, "M", "x"),
+        (0x1D4E8, "M", "y"),
+        (0x1D4E9, "M", "z"),
+        (0x1D4EA, "M", "a"),
+        (0x1D4EB, "M", "b"),
+        (0x1D4EC, "M", "c"),
+        (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'),
-    (0x1D4F3, 'M', 'j'),
-    (0x1D4F4, 'M', 'k'),
-    (0x1D4F5, 'M', 'l'),
-    (0x1D4F6, 'M', 'm'),
-    (0x1D4F7, 'M', 'n'),
-    (0x1D4F8, 'M', 'o'),
-    (0x1D4F9, 'M', 'p'),
-    (0x1D4FA, 'M', 'q'),
-    (0x1D4FB, 'M', 'r'),
-    (0x1D4FC, 'M', 's'),
-    (0x1D4FD, 'M', 't'),
-    (0x1D4FE, 'M', 'u'),
-    (0x1D4FF, 'M', 'v'),
-    (0x1D500, 'M', 'w'),
-    (0x1D501, 'M', 'x'),
-    (0x1D502, 'M', 'y'),
-    (0x1D503, 'M', 'z'),
-    (0x1D504, 'M', 'a'),
-    (0x1D505, 'M', 'b'),
-    (0x1D506, 'X'),
-    (0x1D507, 'M', 'd'),
-    (0x1D508, 'M', 'e'),
-    (0x1D509, 'M', 'f'),
-    (0x1D50A, 'M', 'g'),
-    (0x1D50B, 'X'),
-    (0x1D50D, 'M', 'j'),
-    (0x1D50E, 'M', 'k'),
-    (0x1D50F, 'M', 'l'),
-    (0x1D510, 'M', 'm'),
-    (0x1D511, 'M', 'n'),
-    (0x1D512, 'M', 'o'),
-    (0x1D513, 'M', 'p'),
-    (0x1D514, 'M', 'q'),
-    (0x1D515, 'X'),
-    (0x1D516, 'M', 's'),
-    (0x1D517, 'M', 't'),
-    (0x1D518, 'M', 'u'),
-    (0x1D519, 'M', 'v'),
-    (0x1D51A, 'M', 'w'),
-    (0x1D51B, 'M', 'x'),
-    (0x1D51C, 'M', 'y'),
-    (0x1D51D, 'X'),
-    (0x1D51E, 'M', 'a'),
-    (0x1D51F, 'M', 'b'),
-    (0x1D520, 'M', 'c'),
-    (0x1D521, 'M', 'd'),
-    (0x1D522, 'M', 'e'),
-    (0x1D523, 'M', 'f'),
-    (0x1D524, 'M', 'g'),
-    (0x1D525, 'M', 'h'),
-    (0x1D526, 'M', 'i'),
-    (0x1D527, 'M', 'j'),
-    (0x1D528, 'M', 'k'),
-    (0x1D529, 'M', 'l'),
-    (0x1D52A, 'M', 'm'),
-    (0x1D52B, 'M', 'n'),
-    (0x1D52C, 'M', 'o'),
-    (0x1D52D, 'M', 'p'),
-    (0x1D52E, 'M', 'q'),
-    (0x1D52F, 'M', 'r'),
-    (0x1D530, 'M', 's'),
-    (0x1D531, 'M', 't'),
-    (0x1D532, 'M', 'u'),
-    (0x1D533, 'M', 'v'),
-    (0x1D534, 'M', 'w'),
-    (0x1D535, 'M', 'x'),
-    (0x1D536, 'M', 'y'),
-    (0x1D537, 'M', 'z'),
-    (0x1D538, 'M', 'a'),
-    (0x1D539, 'M', 'b'),
-    (0x1D53A, 'X'),
-    (0x1D53B, 'M', 'd'),
-    (0x1D53C, 'M', 'e'),
-    (0x1D53D, 'M', 'f'),
-    (0x1D53E, 'M', 'g'),
-    (0x1D53F, 'X'),
-    (0x1D540, 'M', 'i'),
-    (0x1D541, 'M', 'j'),
-    (0x1D542, 'M', 'k'),
-    (0x1D543, 'M', 'l'),
-    (0x1D544, 'M', 'm'),
-    (0x1D545, 'X'),
-    (0x1D546, 'M', 'o'),
-    (0x1D547, 'X'),
-    (0x1D54A, 'M', 's'),
-    (0x1D54B, 'M', 't'),
-    (0x1D54C, 'M', 'u'),
-    (0x1D54D, 'M', 'v'),
-    (0x1D54E, 'M', 'w'),
-    (0x1D54F, 'M', 'x'),
-    (0x1D550, 'M', 'y'),
-    (0x1D551, 'X'),
-    (0x1D552, 'M', 'a'),
-    (0x1D553, 'M', 'b'),
-    (0x1D554, 'M', 'c'),
-    (0x1D555, 'M', 'd'),
-    (0x1D556, 'M', 'e'),
+        (0x1D4F0, "M", "g"),
+        (0x1D4F1, "M", "h"),
+        (0x1D4F2, "M", "i"),
+        (0x1D4F3, "M", "j"),
+        (0x1D4F4, "M", "k"),
+        (0x1D4F5, "M", "l"),
+        (0x1D4F6, "M", "m"),
+        (0x1D4F7, "M", "n"),
+        (0x1D4F8, "M", "o"),
+        (0x1D4F9, "M", "p"),
+        (0x1D4FA, "M", "q"),
+        (0x1D4FB, "M", "r"),
+        (0x1D4FC, "M", "s"),
+        (0x1D4FD, "M", "t"),
+        (0x1D4FE, "M", "u"),
+        (0x1D4FF, "M", "v"),
+        (0x1D500, "M", "w"),
+        (0x1D501, "M", "x"),
+        (0x1D502, "M", "y"),
+        (0x1D503, "M", "z"),
+        (0x1D504, "M", "a"),
+        (0x1D505, "M", "b"),
+        (0x1D506, "X"),
+        (0x1D507, "M", "d"),
+        (0x1D508, "M", "e"),
+        (0x1D509, "M", "f"),
+        (0x1D50A, "M", "g"),
+        (0x1D50B, "X"),
+        (0x1D50D, "M", "j"),
+        (0x1D50E, "M", "k"),
+        (0x1D50F, "M", "l"),
+        (0x1D510, "M", "m"),
+        (0x1D511, "M", "n"),
+        (0x1D512, "M", "o"),
+        (0x1D513, "M", "p"),
+        (0x1D514, "M", "q"),
+        (0x1D515, "X"),
+        (0x1D516, "M", "s"),
+        (0x1D517, "M", "t"),
+        (0x1D518, "M", "u"),
+        (0x1D519, "M", "v"),
+        (0x1D51A, "M", "w"),
+        (0x1D51B, "M", "x"),
+        (0x1D51C, "M", "y"),
+        (0x1D51D, "X"),
+        (0x1D51E, "M", "a"),
+        (0x1D51F, "M", "b"),
+        (0x1D520, "M", "c"),
+        (0x1D521, "M", "d"),
+        (0x1D522, "M", "e"),
+        (0x1D523, "M", "f"),
+        (0x1D524, "M", "g"),
+        (0x1D525, "M", "h"),
+        (0x1D526, "M", "i"),
+        (0x1D527, "M", "j"),
+        (0x1D528, "M", "k"),
+        (0x1D529, "M", "l"),
+        (0x1D52A, "M", "m"),
+        (0x1D52B, "M", "n"),
+        (0x1D52C, "M", "o"),
+        (0x1D52D, "M", "p"),
+        (0x1D52E, "M", "q"),
+        (0x1D52F, "M", "r"),
+        (0x1D530, "M", "s"),
+        (0x1D531, "M", "t"),
+        (0x1D532, "M", "u"),
+        (0x1D533, "M", "v"),
+        (0x1D534, "M", "w"),
+        (0x1D535, "M", "x"),
+        (0x1D536, "M", "y"),
+        (0x1D537, "M", "z"),
+        (0x1D538, "M", "a"),
+        (0x1D539, "M", "b"),
+        (0x1D53A, "X"),
+        (0x1D53B, "M", "d"),
+        (0x1D53C, "M", "e"),
+        (0x1D53D, "M", "f"),
+        (0x1D53E, "M", "g"),
+        (0x1D53F, "X"),
+        (0x1D540, "M", "i"),
+        (0x1D541, "M", "j"),
+        (0x1D542, "M", "k"),
+        (0x1D543, "M", "l"),
+        (0x1D544, "M", "m"),
+        (0x1D545, "X"),
+        (0x1D546, "M", "o"),
+        (0x1D547, "X"),
+        (0x1D54A, "M", "s"),
+        (0x1D54B, "M", "t"),
+        (0x1D54C, "M", "u"),
+        (0x1D54D, "M", "v"),
+        (0x1D54E, "M", "w"),
+        (0x1D54F, "M", "x"),
+        (0x1D550, "M", "y"),
+        (0x1D551, "X"),
+        (0x1D552, "M", "a"),
+        (0x1D553, "M", "b"),
+        (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'),
-    (0x1D55A, 'M', 'i'),
-    (0x1D55B, 'M', 'j'),
-    (0x1D55C, 'M', 'k'),
-    (0x1D55D, 'M', 'l'),
-    (0x1D55E, 'M', 'm'),
-    (0x1D55F, 'M', 'n'),
-    (0x1D560, 'M', 'o'),
-    (0x1D561, 'M', 'p'),
-    (0x1D562, 'M', 'q'),
-    (0x1D563, 'M', 'r'),
-    (0x1D564, 'M', 's'),
-    (0x1D565, 'M', 't'),
-    (0x1D566, 'M', 'u'),
-    (0x1D567, 'M', 'v'),
-    (0x1D568, 'M', 'w'),
-    (0x1D569, 'M', 'x'),
-    (0x1D56A, 'M', 'y'),
-    (0x1D56B, 'M', 'z'),
-    (0x1D56C, 'M', 'a'),
-    (0x1D56D, 'M', 'b'),
-    (0x1D56E, 'M', 'c'),
-    (0x1D56F, 'M', 'd'),
-    (0x1D570, 'M', 'e'),
-    (0x1D571, 'M', 'f'),
-    (0x1D572, 'M', 'g'),
-    (0x1D573, 'M', 'h'),
-    (0x1D574, 'M', 'i'),
-    (0x1D575, 'M', 'j'),
-    (0x1D576, 'M', 'k'),
-    (0x1D577, 'M', 'l'),
-    (0x1D578, 'M', 'm'),
-    (0x1D579, 'M', 'n'),
-    (0x1D57A, 'M', 'o'),
-    (0x1D57B, 'M', 'p'),
-    (0x1D57C, 'M', 'q'),
-    (0x1D57D, 'M', 'r'),
-    (0x1D57E, 'M', 's'),
-    (0x1D57F, 'M', 't'),
-    (0x1D580, 'M', 'u'),
-    (0x1D581, 'M', 'v'),
-    (0x1D582, 'M', 'w'),
-    (0x1D583, 'M', 'x'),
-    (0x1D584, 'M', 'y'),
-    (0x1D585, 'M', 'z'),
-    (0x1D586, 'M', 'a'),
-    (0x1D587, 'M', 'b'),
-    (0x1D588, 'M', 'c'),
-    (0x1D589, 'M', 'd'),
-    (0x1D58A, 'M', 'e'),
-    (0x1D58B, 'M', 'f'),
-    (0x1D58C, 'M', 'g'),
-    (0x1D58D, 'M', 'h'),
-    (0x1D58E, 'M', 'i'),
-    (0x1D58F, 'M', 'j'),
-    (0x1D590, 'M', 'k'),
-    (0x1D591, 'M', 'l'),
-    (0x1D592, 'M', 'm'),
-    (0x1D593, 'M', 'n'),
-    (0x1D594, 'M', 'o'),
-    (0x1D595, 'M', 'p'),
-    (0x1D596, 'M', 'q'),
-    (0x1D597, 'M', 'r'),
-    (0x1D598, 'M', 's'),
-    (0x1D599, 'M', 't'),
-    (0x1D59A, 'M', 'u'),
-    (0x1D59B, 'M', 'v'),
-    (0x1D59C, 'M', 'w'),
-    (0x1D59D, 'M', 'x'),
-    (0x1D59E, 'M', 'y'),
-    (0x1D59F, 'M', 'z'),
-    (0x1D5A0, 'M', 'a'),
-    (0x1D5A1, 'M', 'b'),
-    (0x1D5A2, 'M', 'c'),
-    (0x1D5A3, 'M', 'd'),
-    (0x1D5A4, 'M', 'e'),
-    (0x1D5A5, 'M', 'f'),
-    (0x1D5A6, 'M', 'g'),
-    (0x1D5A7, 'M', 'h'),
-    (0x1D5A8, 'M', 'i'),
-    (0x1D5A9, 'M', 'j'),
-    (0x1D5AA, 'M', 'k'),
-    (0x1D5AB, 'M', 'l'),
-    (0x1D5AC, 'M', 'm'),
-    (0x1D5AD, 'M', 'n'),
-    (0x1D5AE, 'M', 'o'),
-    (0x1D5AF, 'M', 'p'),
-    (0x1D5B0, 'M', 'q'),
-    (0x1D5B1, 'M', 'r'),
-    (0x1D5B2, 'M', 's'),
-    (0x1D5B3, 'M', 't'),
-    (0x1D5B4, 'M', 'u'),
-    (0x1D5B5, 'M', 'v'),
-    (0x1D5B6, 'M', 'w'),
-    (0x1D5B7, 'M', 'x'),
-    (0x1D5B8, 'M', 'y'),
-    (0x1D5B9, 'M', 'z'),
-    (0x1D5BA, 'M', 'a'),
+        (0x1D557, "M", "f"),
+        (0x1D558, "M", "g"),
+        (0x1D559, "M", "h"),
+        (0x1D55A, "M", "i"),
+        (0x1D55B, "M", "j"),
+        (0x1D55C, "M", "k"),
+        (0x1D55D, "M", "l"),
+        (0x1D55E, "M", "m"),
+        (0x1D55F, "M", "n"),
+        (0x1D560, "M", "o"),
+        (0x1D561, "M", "p"),
+        (0x1D562, "M", "q"),
+        (0x1D563, "M", "r"),
+        (0x1D564, "M", "s"),
+        (0x1D565, "M", "t"),
+        (0x1D566, "M", "u"),
+        (0x1D567, "M", "v"),
+        (0x1D568, "M", "w"),
+        (0x1D569, "M", "x"),
+        (0x1D56A, "M", "y"),
+        (0x1D56B, "M", "z"),
+        (0x1D56C, "M", "a"),
+        (0x1D56D, "M", "b"),
+        (0x1D56E, "M", "c"),
+        (0x1D56F, "M", "d"),
+        (0x1D570, "M", "e"),
+        (0x1D571, "M", "f"),
+        (0x1D572, "M", "g"),
+        (0x1D573, "M", "h"),
+        (0x1D574, "M", "i"),
+        (0x1D575, "M", "j"),
+        (0x1D576, "M", "k"),
+        (0x1D577, "M", "l"),
+        (0x1D578, "M", "m"),
+        (0x1D579, "M", "n"),
+        (0x1D57A, "M", "o"),
+        (0x1D57B, "M", "p"),
+        (0x1D57C, "M", "q"),
+        (0x1D57D, "M", "r"),
+        (0x1D57E, "M", "s"),
+        (0x1D57F, "M", "t"),
+        (0x1D580, "M", "u"),
+        (0x1D581, "M", "v"),
+        (0x1D582, "M", "w"),
+        (0x1D583, "M", "x"),
+        (0x1D584, "M", "y"),
+        (0x1D585, "M", "z"),
+        (0x1D586, "M", "a"),
+        (0x1D587, "M", "b"),
+        (0x1D588, "M", "c"),
+        (0x1D589, "M", "d"),
+        (0x1D58A, "M", "e"),
+        (0x1D58B, "M", "f"),
+        (0x1D58C, "M", "g"),
+        (0x1D58D, "M", "h"),
+        (0x1D58E, "M", "i"),
+        (0x1D58F, "M", "j"),
+        (0x1D590, "M", "k"),
+        (0x1D591, "M", "l"),
+        (0x1D592, "M", "m"),
+        (0x1D593, "M", "n"),
+        (0x1D594, "M", "o"),
+        (0x1D595, "M", "p"),
+        (0x1D596, "M", "q"),
+        (0x1D597, "M", "r"),
+        (0x1D598, "M", "s"),
+        (0x1D599, "M", "t"),
+        (0x1D59A, "M", "u"),
+        (0x1D59B, "M", "v"),
+        (0x1D59C, "M", "w"),
+        (0x1D59D, "M", "x"),
+        (0x1D59E, "M", "y"),
+        (0x1D59F, "M", "z"),
+        (0x1D5A0, "M", "a"),
+        (0x1D5A1, "M", "b"),
+        (0x1D5A2, "M", "c"),
+        (0x1D5A3, "M", "d"),
+        (0x1D5A4, "M", "e"),
+        (0x1D5A5, "M", "f"),
+        (0x1D5A6, "M", "g"),
+        (0x1D5A7, "M", "h"),
+        (0x1D5A8, "M", "i"),
+        (0x1D5A9, "M", "j"),
+        (0x1D5AA, "M", "k"),
+        (0x1D5AB, "M", "l"),
+        (0x1D5AC, "M", "m"),
+        (0x1D5AD, "M", "n"),
+        (0x1D5AE, "M", "o"),
+        (0x1D5AF, "M", "p"),
+        (0x1D5B0, "M", "q"),
+        (0x1D5B1, "M", "r"),
+        (0x1D5B2, "M", "s"),
+        (0x1D5B3, "M", "t"),
+        (0x1D5B4, "M", "u"),
+        (0x1D5B5, "M", "v"),
+        (0x1D5B6, "M", "w"),
+        (0x1D5B7, "M", "x"),
+        (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'),
-    (0x1D5BE, 'M', 'e'),
-    (0x1D5BF, 'M', 'f'),
-    (0x1D5C0, 'M', 'g'),
-    (0x1D5C1, 'M', 'h'),
-    (0x1D5C2, 'M', 'i'),
-    (0x1D5C3, 'M', 'j'),
-    (0x1D5C4, 'M', 'k'),
-    (0x1D5C5, 'M', 'l'),
-    (0x1D5C6, 'M', 'm'),
-    (0x1D5C7, 'M', 'n'),
-    (0x1D5C8, 'M', 'o'),
-    (0x1D5C9, 'M', 'p'),
-    (0x1D5CA, 'M', 'q'),
-    (0x1D5CB, 'M', 'r'),
-    (0x1D5CC, 'M', 's'),
-    (0x1D5CD, 'M', 't'),
-    (0x1D5CE, 'M', 'u'),
-    (0x1D5CF, 'M', 'v'),
-    (0x1D5D0, 'M', 'w'),
-    (0x1D5D1, 'M', 'x'),
-    (0x1D5D2, 'M', 'y'),
-    (0x1D5D3, 'M', 'z'),
-    (0x1D5D4, 'M', 'a'),
-    (0x1D5D5, 'M', 'b'),
-    (0x1D5D6, 'M', 'c'),
-    (0x1D5D7, 'M', 'd'),
-    (0x1D5D8, 'M', 'e'),
-    (0x1D5D9, 'M', 'f'),
-    (0x1D5DA, 'M', 'g'),
-    (0x1D5DB, 'M', 'h'),
-    (0x1D5DC, 'M', 'i'),
-    (0x1D5DD, 'M', 'j'),
-    (0x1D5DE, 'M', 'k'),
-    (0x1D5DF, 'M', 'l'),
-    (0x1D5E0, 'M', 'm'),
-    (0x1D5E1, 'M', 'n'),
-    (0x1D5E2, 'M', 'o'),
-    (0x1D5E3, 'M', 'p'),
-    (0x1D5E4, 'M', 'q'),
-    (0x1D5E5, 'M', 'r'),
-    (0x1D5E6, 'M', 's'),
-    (0x1D5E7, 'M', 't'),
-    (0x1D5E8, 'M', 'u'),
-    (0x1D5E9, 'M', 'v'),
-    (0x1D5EA, 'M', 'w'),
-    (0x1D5EB, 'M', 'x'),
-    (0x1D5EC, 'M', 'y'),
-    (0x1D5ED, 'M', 'z'),
-    (0x1D5EE, 'M', 'a'),
-    (0x1D5EF, 'M', 'b'),
-    (0x1D5F0, 'M', 'c'),
-    (0x1D5F1, 'M', 'd'),
-    (0x1D5F2, 'M', 'e'),
-    (0x1D5F3, 'M', 'f'),
-    (0x1D5F4, 'M', 'g'),
-    (0x1D5F5, 'M', 'h'),
-    (0x1D5F6, 'M', 'i'),
-    (0x1D5F7, 'M', 'j'),
-    (0x1D5F8, 'M', 'k'),
-    (0x1D5F9, 'M', 'l'),
-    (0x1D5FA, 'M', 'm'),
-    (0x1D5FB, 'M', 'n'),
-    (0x1D5FC, 'M', 'o'),
-    (0x1D5FD, 'M', 'p'),
-    (0x1D5FE, 'M', 'q'),
-    (0x1D5FF, 'M', 'r'),
-    (0x1D600, 'M', 's'),
-    (0x1D601, 'M', 't'),
-    (0x1D602, 'M', 'u'),
-    (0x1D603, 'M', 'v'),
-    (0x1D604, 'M', 'w'),
-    (0x1D605, 'M', 'x'),
-    (0x1D606, 'M', 'y'),
-    (0x1D607, 'M', 'z'),
-    (0x1D608, 'M', 'a'),
-    (0x1D609, 'M', 'b'),
-    (0x1D60A, 'M', 'c'),
-    (0x1D60B, 'M', 'd'),
-    (0x1D60C, 'M', 'e'),
-    (0x1D60D, 'M', 'f'),
-    (0x1D60E, 'M', 'g'),
-    (0x1D60F, 'M', 'h'),
-    (0x1D610, 'M', 'i'),
-    (0x1D611, 'M', 'j'),
-    (0x1D612, 'M', 'k'),
-    (0x1D613, 'M', 'l'),
-    (0x1D614, 'M', 'm'),
-    (0x1D615, 'M', 'n'),
-    (0x1D616, 'M', 'o'),
-    (0x1D617, 'M', 'p'),
-    (0x1D618, 'M', 'q'),
-    (0x1D619, 'M', 'r'),
-    (0x1D61A, 'M', 's'),
-    (0x1D61B, 'M', 't'),
-    (0x1D61C, 'M', 'u'),
-    (0x1D61D, 'M', 'v'),
-    (0x1D61E, 'M', 'w'),
+        (0x1D5BB, "M", "b"),
+        (0x1D5BC, "M", "c"),
+        (0x1D5BD, "M", "d"),
+        (0x1D5BE, "M", "e"),
+        (0x1D5BF, "M", "f"),
+        (0x1D5C0, "M", "g"),
+        (0x1D5C1, "M", "h"),
+        (0x1D5C2, "M", "i"),
+        (0x1D5C3, "M", "j"),
+        (0x1D5C4, "M", "k"),
+        (0x1D5C5, "M", "l"),
+        (0x1D5C6, "M", "m"),
+        (0x1D5C7, "M", "n"),
+        (0x1D5C8, "M", "o"),
+        (0x1D5C9, "M", "p"),
+        (0x1D5CA, "M", "q"),
+        (0x1D5CB, "M", "r"),
+        (0x1D5CC, "M", "s"),
+        (0x1D5CD, "M", "t"),
+        (0x1D5CE, "M", "u"),
+        (0x1D5CF, "M", "v"),
+        (0x1D5D0, "M", "w"),
+        (0x1D5D1, "M", "x"),
+        (0x1D5D2, "M", "y"),
+        (0x1D5D3, "M", "z"),
+        (0x1D5D4, "M", "a"),
+        (0x1D5D5, "M", "b"),
+        (0x1D5D6, "M", "c"),
+        (0x1D5D7, "M", "d"),
+        (0x1D5D8, "M", "e"),
+        (0x1D5D9, "M", "f"),
+        (0x1D5DA, "M", "g"),
+        (0x1D5DB, "M", "h"),
+        (0x1D5DC, "M", "i"),
+        (0x1D5DD, "M", "j"),
+        (0x1D5DE, "M", "k"),
+        (0x1D5DF, "M", "l"),
+        (0x1D5E0, "M", "m"),
+        (0x1D5E1, "M", "n"),
+        (0x1D5E2, "M", "o"),
+        (0x1D5E3, "M", "p"),
+        (0x1D5E4, "M", "q"),
+        (0x1D5E5, "M", "r"),
+        (0x1D5E6, "M", "s"),
+        (0x1D5E7, "M", "t"),
+        (0x1D5E8, "M", "u"),
+        (0x1D5E9, "M", "v"),
+        (0x1D5EA, "M", "w"),
+        (0x1D5EB, "M", "x"),
+        (0x1D5EC, "M", "y"),
+        (0x1D5ED, "M", "z"),
+        (0x1D5EE, "M", "a"),
+        (0x1D5EF, "M", "b"),
+        (0x1D5F0, "M", "c"),
+        (0x1D5F1, "M", "d"),
+        (0x1D5F2, "M", "e"),
+        (0x1D5F3, "M", "f"),
+        (0x1D5F4, "M", "g"),
+        (0x1D5F5, "M", "h"),
+        (0x1D5F6, "M", "i"),
+        (0x1D5F7, "M", "j"),
+        (0x1D5F8, "M", "k"),
+        (0x1D5F9, "M", "l"),
+        (0x1D5FA, "M", "m"),
+        (0x1D5FB, "M", "n"),
+        (0x1D5FC, "M", "o"),
+        (0x1D5FD, "M", "p"),
+        (0x1D5FE, "M", "q"),
+        (0x1D5FF, "M", "r"),
+        (0x1D600, "M", "s"),
+        (0x1D601, "M", "t"),
+        (0x1D602, "M", "u"),
+        (0x1D603, "M", "v"),
+        (0x1D604, "M", "w"),
+        (0x1D605, "M", "x"),
+        (0x1D606, "M", "y"),
+        (0x1D607, "M", "z"),
+        (0x1D608, "M", "a"),
+        (0x1D609, "M", "b"),
+        (0x1D60A, "M", "c"),
+        (0x1D60B, "M", "d"),
+        (0x1D60C, "M", "e"),
+        (0x1D60D, "M", "f"),
+        (0x1D60E, "M", "g"),
+        (0x1D60F, "M", "h"),
+        (0x1D610, "M", "i"),
+        (0x1D611, "M", "j"),
+        (0x1D612, "M", "k"),
+        (0x1D613, "M", "l"),
+        (0x1D614, "M", "m"),
+        (0x1D615, "M", "n"),
+        (0x1D616, "M", "o"),
+        (0x1D617, "M", "p"),
+        (0x1D618, "M", "q"),
+        (0x1D619, "M", "r"),
+        (0x1D61A, "M", "s"),
+        (0x1D61B, "M", "t"),
+        (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'),
-    (0x1D622, 'M', 'a'),
-    (0x1D623, 'M', 'b'),
-    (0x1D624, 'M', 'c'),
-    (0x1D625, 'M', 'd'),
-    (0x1D626, 'M', 'e'),
-    (0x1D627, 'M', 'f'),
-    (0x1D628, 'M', 'g'),
-    (0x1D629, 'M', 'h'),
-    (0x1D62A, 'M', 'i'),
-    (0x1D62B, 'M', 'j'),
-    (0x1D62C, 'M', 'k'),
-    (0x1D62D, 'M', 'l'),
-    (0x1D62E, 'M', 'm'),
-    (0x1D62F, 'M', 'n'),
-    (0x1D630, 'M', 'o'),
-    (0x1D631, 'M', 'p'),
-    (0x1D632, 'M', 'q'),
-    (0x1D633, 'M', 'r'),
-    (0x1D634, 'M', 's'),
-    (0x1D635, 'M', 't'),
-    (0x1D636, 'M', 'u'),
-    (0x1D637, 'M', 'v'),
-    (0x1D638, 'M', 'w'),
-    (0x1D639, 'M', 'x'),
-    (0x1D63A, 'M', 'y'),
-    (0x1D63B, 'M', 'z'),
-    (0x1D63C, 'M', 'a'),
-    (0x1D63D, 'M', 'b'),
-    (0x1D63E, 'M', 'c'),
-    (0x1D63F, 'M', 'd'),
-    (0x1D640, 'M', 'e'),
-    (0x1D641, 'M', 'f'),
-    (0x1D642, 'M', 'g'),
-    (0x1D643, 'M', 'h'),
-    (0x1D644, 'M', 'i'),
-    (0x1D645, 'M', 'j'),
-    (0x1D646, 'M', 'k'),
-    (0x1D647, 'M', 'l'),
-    (0x1D648, 'M', 'm'),
-    (0x1D649, 'M', 'n'),
-    (0x1D64A, 'M', 'o'),
-    (0x1D64B, 'M', 'p'),
-    (0x1D64C, 'M', 'q'),
-    (0x1D64D, 'M', 'r'),
-    (0x1D64E, 'M', 's'),
-    (0x1D64F, 'M', 't'),
-    (0x1D650, 'M', 'u'),
-    (0x1D651, 'M', 'v'),
-    (0x1D652, 'M', 'w'),
-    (0x1D653, 'M', 'x'),
-    (0x1D654, 'M', 'y'),
-    (0x1D655, 'M', 'z'),
-    (0x1D656, 'M', 'a'),
-    (0x1D657, 'M', 'b'),
-    (0x1D658, 'M', 'c'),
-    (0x1D659, 'M', 'd'),
-    (0x1D65A, 'M', 'e'),
-    (0x1D65B, 'M', 'f'),
-    (0x1D65C, 'M', 'g'),
-    (0x1D65D, 'M', 'h'),
-    (0x1D65E, 'M', 'i'),
-    (0x1D65F, 'M', 'j'),
-    (0x1D660, 'M', 'k'),
-    (0x1D661, 'M', 'l'),
-    (0x1D662, 'M', 'm'),
-    (0x1D663, 'M', 'n'),
-    (0x1D664, 'M', 'o'),
-    (0x1D665, 'M', 'p'),
-    (0x1D666, 'M', 'q'),
-    (0x1D667, 'M', 'r'),
-    (0x1D668, 'M', 's'),
-    (0x1D669, 'M', 't'),
-    (0x1D66A, 'M', 'u'),
-    (0x1D66B, 'M', 'v'),
-    (0x1D66C, 'M', 'w'),
-    (0x1D66D, 'M', 'x'),
-    (0x1D66E, 'M', 'y'),
-    (0x1D66F, 'M', 'z'),
-    (0x1D670, 'M', 'a'),
-    (0x1D671, 'M', 'b'),
-    (0x1D672, 'M', 'c'),
-    (0x1D673, 'M', 'd'),
-    (0x1D674, 'M', 'e'),
-    (0x1D675, 'M', 'f'),
-    (0x1D676, 'M', 'g'),
-    (0x1D677, 'M', 'h'),
-    (0x1D678, 'M', 'i'),
-    (0x1D679, 'M', 'j'),
-    (0x1D67A, 'M', 'k'),
-    (0x1D67B, 'M', 'l'),
-    (0x1D67C, 'M', 'm'),
-    (0x1D67D, 'M', 'n'),
-    (0x1D67E, 'M', 'o'),
-    (0x1D67F, 'M', 'p'),
-    (0x1D680, 'M', 'q'),
-    (0x1D681, 'M', 'r'),
-    (0x1D682, 'M', 's'),
+        (0x1D61F, "M", "x"),
+        (0x1D620, "M", "y"),
+        (0x1D621, "M", "z"),
+        (0x1D622, "M", "a"),
+        (0x1D623, "M", "b"),
+        (0x1D624, "M", "c"),
+        (0x1D625, "M", "d"),
+        (0x1D626, "M", "e"),
+        (0x1D627, "M", "f"),
+        (0x1D628, "M", "g"),
+        (0x1D629, "M", "h"),
+        (0x1D62A, "M", "i"),
+        (0x1D62B, "M", "j"),
+        (0x1D62C, "M", "k"),
+        (0x1D62D, "M", "l"),
+        (0x1D62E, "M", "m"),
+        (0x1D62F, "M", "n"),
+        (0x1D630, "M", "o"),
+        (0x1D631, "M", "p"),
+        (0x1D632, "M", "q"),
+        (0x1D633, "M", "r"),
+        (0x1D634, "M", "s"),
+        (0x1D635, "M", "t"),
+        (0x1D636, "M", "u"),
+        (0x1D637, "M", "v"),
+        (0x1D638, "M", "w"),
+        (0x1D639, "M", "x"),
+        (0x1D63A, "M", "y"),
+        (0x1D63B, "M", "z"),
+        (0x1D63C, "M", "a"),
+        (0x1D63D, "M", "b"),
+        (0x1D63E, "M", "c"),
+        (0x1D63F, "M", "d"),
+        (0x1D640, "M", "e"),
+        (0x1D641, "M", "f"),
+        (0x1D642, "M", "g"),
+        (0x1D643, "M", "h"),
+        (0x1D644, "M", "i"),
+        (0x1D645, "M", "j"),
+        (0x1D646, "M", "k"),
+        (0x1D647, "M", "l"),
+        (0x1D648, "M", "m"),
+        (0x1D649, "M", "n"),
+        (0x1D64A, "M", "o"),
+        (0x1D64B, "M", "p"),
+        (0x1D64C, "M", "q"),
+        (0x1D64D, "M", "r"),
+        (0x1D64E, "M", "s"),
+        (0x1D64F, "M", "t"),
+        (0x1D650, "M", "u"),
+        (0x1D651, "M", "v"),
+        (0x1D652, "M", "w"),
+        (0x1D653, "M", "x"),
+        (0x1D654, "M", "y"),
+        (0x1D655, "M", "z"),
+        (0x1D656, "M", "a"),
+        (0x1D657, "M", "b"),
+        (0x1D658, "M", "c"),
+        (0x1D659, "M", "d"),
+        (0x1D65A, "M", "e"),
+        (0x1D65B, "M", "f"),
+        (0x1D65C, "M", "g"),
+        (0x1D65D, "M", "h"),
+        (0x1D65E, "M", "i"),
+        (0x1D65F, "M", "j"),
+        (0x1D660, "M", "k"),
+        (0x1D661, "M", "l"),
+        (0x1D662, "M", "m"),
+        (0x1D663, "M", "n"),
+        (0x1D664, "M", "o"),
+        (0x1D665, "M", "p"),
+        (0x1D666, "M", "q"),
+        (0x1D667, "M", "r"),
+        (0x1D668, "M", "s"),
+        (0x1D669, "M", "t"),
+        (0x1D66A, "M", "u"),
+        (0x1D66B, "M", "v"),
+        (0x1D66C, "M", "w"),
+        (0x1D66D, "M", "x"),
+        (0x1D66E, "M", "y"),
+        (0x1D66F, "M", "z"),
+        (0x1D670, "M", "a"),
+        (0x1D671, "M", "b"),
+        (0x1D672, "M", "c"),
+        (0x1D673, "M", "d"),
+        (0x1D674, "M", "e"),
+        (0x1D675, "M", "f"),
+        (0x1D676, "M", "g"),
+        (0x1D677, "M", "h"),
+        (0x1D678, "M", "i"),
+        (0x1D679, "M", "j"),
+        (0x1D67A, "M", "k"),
+        (0x1D67B, "M", "l"),
+        (0x1D67C, "M", "m"),
+        (0x1D67D, "M", "n"),
+        (0x1D67E, "M", "o"),
+        (0x1D67F, "M", "p"),
+        (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'),
-    (0x1D686, 'M', 'w'),
-    (0x1D687, 'M', 'x'),
-    (0x1D688, 'M', 'y'),
-    (0x1D689, 'M', 'z'),
-    (0x1D68A, 'M', 'a'),
-    (0x1D68B, 'M', 'b'),
-    (0x1D68C, 'M', 'c'),
-    (0x1D68D, 'M', 'd'),
-    (0x1D68E, 'M', 'e'),
-    (0x1D68F, 'M', 'f'),
-    (0x1D690, 'M', 'g'),
-    (0x1D691, 'M', 'h'),
-    (0x1D692, 'M', 'i'),
-    (0x1D693, 'M', 'j'),
-    (0x1D694, 'M', 'k'),
-    (0x1D695, 'M', 'l'),
-    (0x1D696, 'M', 'm'),
-    (0x1D697, 'M', 'n'),
-    (0x1D698, 'M', 'o'),
-    (0x1D699, 'M', 'p'),
-    (0x1D69A, 'M', 'q'),
-    (0x1D69B, 'M', 'r'),
-    (0x1D69C, 'M', 's'),
-    (0x1D69D, 'M', 't'),
-    (0x1D69E, 'M', 'u'),
-    (0x1D69F, 'M', 'v'),
-    (0x1D6A0, 'M', 'w'),
-    (0x1D6A1, 'M', 'x'),
-    (0x1D6A2, 'M', 'y'),
-    (0x1D6A3, 'M', 'z'),
-    (0x1D6A4, 'M', 'ı'),
-    (0x1D6A5, 'M', 'ȷ'),
-    (0x1D6A6, 'X'),
-    (0x1D6A8, 'M', 'α'),
-    (0x1D6A9, 'M', 'β'),
-    (0x1D6AA, 'M', 'γ'),
-    (0x1D6AB, 'M', 'δ'),
-    (0x1D6AC, 'M', 'ε'),
-    (0x1D6AD, 'M', 'ζ'),
-    (0x1D6AE, 'M', 'η'),
-    (0x1D6AF, 'M', 'θ'),
-    (0x1D6B0, 'M', 'ι'),
-    (0x1D6B1, 'M', 'κ'),
-    (0x1D6B2, 'M', 'λ'),
-    (0x1D6B3, 'M', 'μ'),
-    (0x1D6B4, 'M', 'ν'),
-    (0x1D6B5, 'M', 'ξ'),
-    (0x1D6B6, 'M', 'ο'),
-    (0x1D6B7, 'M', 'π'),
-    (0x1D6B8, 'M', 'ρ'),
-    (0x1D6B9, 'M', 'θ'),
-    (0x1D6BA, 'M', 'σ'),
-    (0x1D6BB, 'M', 'τ'),
-    (0x1D6BC, 'M', 'υ'),
-    (0x1D6BD, 'M', 'φ'),
-    (0x1D6BE, 'M', 'χ'),
-    (0x1D6BF, 'M', 'ψ'),
-    (0x1D6C0, 'M', 'ω'),
-    (0x1D6C1, 'M', '∇'),
-    (0x1D6C2, 'M', 'α'),
-    (0x1D6C3, 'M', 'β'),
-    (0x1D6C4, 'M', 'γ'),
-    (0x1D6C5, 'M', 'δ'),
-    (0x1D6C6, 'M', 'ε'),
-    (0x1D6C7, 'M', 'ζ'),
-    (0x1D6C8, 'M', 'η'),
-    (0x1D6C9, 'M', 'θ'),
-    (0x1D6CA, 'M', 'ι'),
-    (0x1D6CB, 'M', 'κ'),
-    (0x1D6CC, 'M', 'λ'),
-    (0x1D6CD, 'M', 'μ'),
-    (0x1D6CE, 'M', 'ν'),
-    (0x1D6CF, 'M', 'ξ'),
-    (0x1D6D0, 'M', 'ο'),
-    (0x1D6D1, 'M', 'π'),
-    (0x1D6D2, 'M', 'ρ'),
-    (0x1D6D3, 'M', 'σ'),
-    (0x1D6D5, 'M', 'τ'),
-    (0x1D6D6, 'M', 'υ'),
-    (0x1D6D7, 'M', 'φ'),
-    (0x1D6D8, 'M', 'χ'),
-    (0x1D6D9, 'M', 'ψ'),
-    (0x1D6DA, 'M', 'ω'),
-    (0x1D6DB, 'M', '∂'),
-    (0x1D6DC, 'M', 'ε'),
-    (0x1D6DD, 'M', 'θ'),
-    (0x1D6DE, 'M', 'κ'),
-    (0x1D6DF, 'M', 'φ'),
-    (0x1D6E0, 'M', 'ρ'),
-    (0x1D6E1, 'M', 'π'),
-    (0x1D6E2, 'M', 'α'),
-    (0x1D6E3, 'M', 'β'),
-    (0x1D6E4, 'M', 'γ'),
-    (0x1D6E5, 'M', 'δ'),
-    (0x1D6E6, 'M', 'ε'),
-    (0x1D6E7, 'M', 'ζ'),
-    (0x1D6E8, 'M', 'η'),
+        (0x1D683, "M", "t"),
+        (0x1D684, "M", "u"),
+        (0x1D685, "M", "v"),
+        (0x1D686, "M", "w"),
+        (0x1D687, "M", "x"),
+        (0x1D688, "M", "y"),
+        (0x1D689, "M", "z"),
+        (0x1D68A, "M", "a"),
+        (0x1D68B, "M", "b"),
+        (0x1D68C, "M", "c"),
+        (0x1D68D, "M", "d"),
+        (0x1D68E, "M", "e"),
+        (0x1D68F, "M", "f"),
+        (0x1D690, "M", "g"),
+        (0x1D691, "M", "h"),
+        (0x1D692, "M", "i"),
+        (0x1D693, "M", "j"),
+        (0x1D694, "M", "k"),
+        (0x1D695, "M", "l"),
+        (0x1D696, "M", "m"),
+        (0x1D697, "M", "n"),
+        (0x1D698, "M", "o"),
+        (0x1D699, "M", "p"),
+        (0x1D69A, "M", "q"),
+        (0x1D69B, "M", "r"),
+        (0x1D69C, "M", "s"),
+        (0x1D69D, "M", "t"),
+        (0x1D69E, "M", "u"),
+        (0x1D69F, "M", "v"),
+        (0x1D6A0, "M", "w"),
+        (0x1D6A1, "M", "x"),
+        (0x1D6A2, "M", "y"),
+        (0x1D6A3, "M", "z"),
+        (0x1D6A4, "M", "ı"),
+        (0x1D6A5, "M", "ȷ"),
+        (0x1D6A6, "X"),
+        (0x1D6A8, "M", "α"),
+        (0x1D6A9, "M", "β"),
+        (0x1D6AA, "M", "γ"),
+        (0x1D6AB, "M", "δ"),
+        (0x1D6AC, "M", "ε"),
+        (0x1D6AD, "M", "ζ"),
+        (0x1D6AE, "M", "η"),
+        (0x1D6AF, "M", "θ"),
+        (0x1D6B0, "M", "ι"),
+        (0x1D6B1, "M", "κ"),
+        (0x1D6B2, "M", "λ"),
+        (0x1D6B3, "M", "μ"),
+        (0x1D6B4, "M", "ν"),
+        (0x1D6B5, "M", "ξ"),
+        (0x1D6B6, "M", "ο"),
+        (0x1D6B7, "M", "π"),
+        (0x1D6B8, "M", "ρ"),
+        (0x1D6B9, "M", "θ"),
+        (0x1D6BA, "M", "σ"),
+        (0x1D6BB, "M", "τ"),
+        (0x1D6BC, "M", "υ"),
+        (0x1D6BD, "M", "φ"),
+        (0x1D6BE, "M", "χ"),
+        (0x1D6BF, "M", "ψ"),
+        (0x1D6C0, "M", "ω"),
+        (0x1D6C1, "M", "∇"),
+        (0x1D6C2, "M", "α"),
+        (0x1D6C3, "M", "β"),
+        (0x1D6C4, "M", "γ"),
+        (0x1D6C5, "M", "δ"),
+        (0x1D6C6, "M", "ε"),
+        (0x1D6C7, "M", "ζ"),
+        (0x1D6C8, "M", "η"),
+        (0x1D6C9, "M", "θ"),
+        (0x1D6CA, "M", "ι"),
+        (0x1D6CB, "M", "κ"),
+        (0x1D6CC, "M", "λ"),
+        (0x1D6CD, "M", "μ"),
+        (0x1D6CE, "M", "ν"),
+        (0x1D6CF, "M", "ξ"),
+        (0x1D6D0, "M", "ο"),
+        (0x1D6D1, "M", "π"),
+        (0x1D6D2, "M", "ρ"),
+        (0x1D6D3, "M", "σ"),
+        (0x1D6D5, "M", "τ"),
+        (0x1D6D6, "M", "υ"),
+        (0x1D6D7, "M", "φ"),
+        (0x1D6D8, "M", "χ"),
+        (0x1D6D9, "M", "ψ"),
+        (0x1D6DA, "M", "ω"),
+        (0x1D6DB, "M", "∂"),
+        (0x1D6DC, "M", "ε"),
+        (0x1D6DD, "M", "θ"),
+        (0x1D6DE, "M", "κ"),
+        (0x1D6DF, "M", "φ"),
+        (0x1D6E0, "M", "ρ"),
+        (0x1D6E1, "M", "π"),
+        (0x1D6E2, "M", "α"),
+        (0x1D6E3, "M", "β"),
+        (0x1D6E4, "M", "γ"),
+        (0x1D6E5, "M", "δ"),
+        (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', 'κ'),
-    (0x1D6EC, 'M', 'λ'),
-    (0x1D6ED, 'M', 'μ'),
-    (0x1D6EE, 'M', 'ν'),
-    (0x1D6EF, 'M', 'ξ'),
-    (0x1D6F0, 'M', 'ο'),
-    (0x1D6F1, 'M', 'π'),
-    (0x1D6F2, 'M', 'ρ'),
-    (0x1D6F3, 'M', 'θ'),
-    (0x1D6F4, 'M', 'σ'),
-    (0x1D6F5, 'M', 'τ'),
-    (0x1D6F6, 'M', 'υ'),
-    (0x1D6F7, 'M', 'φ'),
-    (0x1D6F8, 'M', 'χ'),
-    (0x1D6F9, 'M', 'ψ'),
-    (0x1D6FA, 'M', 'ω'),
-    (0x1D6FB, 'M', '∇'),
-    (0x1D6FC, 'M', 'α'),
-    (0x1D6FD, 'M', 'β'),
-    (0x1D6FE, 'M', 'γ'),
-    (0x1D6FF, 'M', 'δ'),
-    (0x1D700, 'M', 'ε'),
-    (0x1D701, 'M', 'ζ'),
-    (0x1D702, 'M', 'η'),
-    (0x1D703, 'M', 'θ'),
-    (0x1D704, 'M', 'ι'),
-    (0x1D705, 'M', 'κ'),
-    (0x1D706, 'M', 'λ'),
-    (0x1D707, 'M', 'μ'),
-    (0x1D708, 'M', 'ν'),
-    (0x1D709, 'M', 'ξ'),
-    (0x1D70A, 'M', 'ο'),
-    (0x1D70B, 'M', 'π'),
-    (0x1D70C, 'M', 'ρ'),
-    (0x1D70D, 'M', 'σ'),
-    (0x1D70F, 'M', 'τ'),
-    (0x1D710, 'M', 'υ'),
-    (0x1D711, 'M', 'φ'),
-    (0x1D712, 'M', 'χ'),
-    (0x1D713, 'M', 'ψ'),
-    (0x1D714, 'M', 'ω'),
-    (0x1D715, 'M', '∂'),
-    (0x1D716, 'M', 'ε'),
-    (0x1D717, 'M', 'θ'),
-    (0x1D718, 'M', 'κ'),
-    (0x1D719, 'M', 'φ'),
-    (0x1D71A, 'M', 'ρ'),
-    (0x1D71B, 'M', 'π'),
-    (0x1D71C, 'M', 'α'),
-    (0x1D71D, 'M', 'β'),
-    (0x1D71E, 'M', 'γ'),
-    (0x1D71F, 'M', 'δ'),
-    (0x1D720, 'M', 'ε'),
-    (0x1D721, 'M', 'ζ'),
-    (0x1D722, 'M', 'η'),
-    (0x1D723, 'M', 'θ'),
-    (0x1D724, 'M', 'ι'),
-    (0x1D725, 'M', 'κ'),
-    (0x1D726, 'M', 'λ'),
-    (0x1D727, 'M', 'μ'),
-    (0x1D728, 'M', 'ν'),
-    (0x1D729, 'M', 'ξ'),
-    (0x1D72A, 'M', 'ο'),
-    (0x1D72B, 'M', 'π'),
-    (0x1D72C, 'M', 'ρ'),
-    (0x1D72D, 'M', 'θ'),
-    (0x1D72E, 'M', 'σ'),
-    (0x1D72F, 'M', 'τ'),
-    (0x1D730, 'M', 'υ'),
-    (0x1D731, 'M', 'φ'),
-    (0x1D732, 'M', 'χ'),
-    (0x1D733, 'M', 'ψ'),
-    (0x1D734, 'M', 'ω'),
-    (0x1D735, 'M', '∇'),
-    (0x1D736, 'M', 'α'),
-    (0x1D737, 'M', 'β'),
-    (0x1D738, 'M', 'γ'),
-    (0x1D739, 'M', 'δ'),
-    (0x1D73A, 'M', 'ε'),
-    (0x1D73B, 'M', 'ζ'),
-    (0x1D73C, 'M', 'η'),
-    (0x1D73D, 'M', 'θ'),
-    (0x1D73E, 'M', 'ι'),
-    (0x1D73F, 'M', 'κ'),
-    (0x1D740, 'M', 'λ'),
-    (0x1D741, 'M', 'μ'),
-    (0x1D742, 'M', 'ν'),
-    (0x1D743, 'M', 'ξ'),
-    (0x1D744, 'M', 'ο'),
-    (0x1D745, 'M', 'π'),
-    (0x1D746, 'M', 'ρ'),
-    (0x1D747, 'M', 'σ'),
-    (0x1D749, 'M', 'τ'),
-    (0x1D74A, 'M', 'υ'),
-    (0x1D74B, 'M', 'φ'),
-    (0x1D74C, 'M', 'χ'),
-    (0x1D74D, 'M', 'ψ'),
-    (0x1D74E, 'M', 'ω'),
+        (0x1D6E9, "M", "θ"),
+        (0x1D6EA, "M", "ι"),
+        (0x1D6EB, "M", "κ"),
+        (0x1D6EC, "M", "λ"),
+        (0x1D6ED, "M", "μ"),
+        (0x1D6EE, "M", "ν"),
+        (0x1D6EF, "M", "ξ"),
+        (0x1D6F0, "M", "ο"),
+        (0x1D6F1, "M", "π"),
+        (0x1D6F2, "M", "ρ"),
+        (0x1D6F3, "M", "θ"),
+        (0x1D6F4, "M", "σ"),
+        (0x1D6F5, "M", "τ"),
+        (0x1D6F6, "M", "υ"),
+        (0x1D6F7, "M", "φ"),
+        (0x1D6F8, "M", "χ"),
+        (0x1D6F9, "M", "ψ"),
+        (0x1D6FA, "M", "ω"),
+        (0x1D6FB, "M", "∇"),
+        (0x1D6FC, "M", "α"),
+        (0x1D6FD, "M", "β"),
+        (0x1D6FE, "M", "γ"),
+        (0x1D6FF, "M", "δ"),
+        (0x1D700, "M", "ε"),
+        (0x1D701, "M", "ζ"),
+        (0x1D702, "M", "η"),
+        (0x1D703, "M", "θ"),
+        (0x1D704, "M", "ι"),
+        (0x1D705, "M", "κ"),
+        (0x1D706, "M", "λ"),
+        (0x1D707, "M", "μ"),
+        (0x1D708, "M", "ν"),
+        (0x1D709, "M", "ξ"),
+        (0x1D70A, "M", "ο"),
+        (0x1D70B, "M", "π"),
+        (0x1D70C, "M", "ρ"),
+        (0x1D70D, "M", "σ"),
+        (0x1D70F, "M", "τ"),
+        (0x1D710, "M", "υ"),
+        (0x1D711, "M", "φ"),
+        (0x1D712, "M", "χ"),
+        (0x1D713, "M", "ψ"),
+        (0x1D714, "M", "ω"),
+        (0x1D715, "M", "∂"),
+        (0x1D716, "M", "ε"),
+        (0x1D717, "M", "θ"),
+        (0x1D718, "M", "κ"),
+        (0x1D719, "M", "φ"),
+        (0x1D71A, "M", "ρ"),
+        (0x1D71B, "M", "π"),
+        (0x1D71C, "M", "α"),
+        (0x1D71D, "M", "β"),
+        (0x1D71E, "M", "γ"),
+        (0x1D71F, "M", "δ"),
+        (0x1D720, "M", "ε"),
+        (0x1D721, "M", "ζ"),
+        (0x1D722, "M", "η"),
+        (0x1D723, "M", "θ"),
+        (0x1D724, "M", "ι"),
+        (0x1D725, "M", "κ"),
+        (0x1D726, "M", "λ"),
+        (0x1D727, "M", "μ"),
+        (0x1D728, "M", "ν"),
+        (0x1D729, "M", "ξ"),
+        (0x1D72A, "M", "ο"),
+        (0x1D72B, "M", "π"),
+        (0x1D72C, "M", "ρ"),
+        (0x1D72D, "M", "θ"),
+        (0x1D72E, "M", "σ"),
+        (0x1D72F, "M", "τ"),
+        (0x1D730, "M", "υ"),
+        (0x1D731, "M", "φ"),
+        (0x1D732, "M", "χ"),
+        (0x1D733, "M", "ψ"),
+        (0x1D734, "M", "ω"),
+        (0x1D735, "M", "∇"),
+        (0x1D736, "M", "α"),
+        (0x1D737, "M", "β"),
+        (0x1D738, "M", "γ"),
+        (0x1D739, "M", "δ"),
+        (0x1D73A, "M", "ε"),
+        (0x1D73B, "M", "ζ"),
+        (0x1D73C, "M", "η"),
+        (0x1D73D, "M", "θ"),
+        (0x1D73E, "M", "ι"),
+        (0x1D73F, "M", "κ"),
+        (0x1D740, "M", "λ"),
+        (0x1D741, "M", "μ"),
+        (0x1D742, "M", "ν"),
+        (0x1D743, "M", "ξ"),
+        (0x1D744, "M", "ο"),
+        (0x1D745, "M", "π"),
+        (0x1D746, "M", "ρ"),
+        (0x1D747, "M", "σ"),
+        (0x1D749, "M", "τ"),
+        (0x1D74A, "M", "υ"),
+        (0x1D74B, "M", "φ"),
+        (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', 'θ'),
-    (0x1D752, 'M', 'κ'),
-    (0x1D753, 'M', 'φ'),
-    (0x1D754, 'M', 'ρ'),
-    (0x1D755, 'M', 'π'),
-    (0x1D756, 'M', 'α'),
-    (0x1D757, 'M', 'β'),
-    (0x1D758, 'M', 'γ'),
-    (0x1D759, 'M', 'δ'),
-    (0x1D75A, 'M', 'ε'),
-    (0x1D75B, 'M', 'ζ'),
-    (0x1D75C, 'M', 'η'),
-    (0x1D75D, 'M', 'θ'),
-    (0x1D75E, 'M', 'ι'),
-    (0x1D75F, 'M', 'κ'),
-    (0x1D760, 'M', 'λ'),
-    (0x1D761, 'M', 'μ'),
-    (0x1D762, 'M', 'ν'),
-    (0x1D763, 'M', 'ξ'),
-    (0x1D764, 'M', 'ο'),
-    (0x1D765, 'M', 'π'),
-    (0x1D766, 'M', 'ρ'),
-    (0x1D767, 'M', 'θ'),
-    (0x1D768, 'M', 'σ'),
-    (0x1D769, 'M', 'τ'),
-    (0x1D76A, 'M', 'υ'),
-    (0x1D76B, 'M', 'φ'),
-    (0x1D76C, 'M', 'χ'),
-    (0x1D76D, 'M', 'ψ'),
-    (0x1D76E, 'M', 'ω'),
-    (0x1D76F, 'M', '∇'),
-    (0x1D770, 'M', 'α'),
-    (0x1D771, 'M', 'β'),
-    (0x1D772, 'M', 'γ'),
-    (0x1D773, 'M', 'δ'),
-    (0x1D774, 'M', 'ε'),
-    (0x1D775, 'M', 'ζ'),
-    (0x1D776, 'M', 'η'),
-    (0x1D777, 'M', 'θ'),
-    (0x1D778, 'M', 'ι'),
-    (0x1D779, 'M', 'κ'),
-    (0x1D77A, 'M', 'λ'),
-    (0x1D77B, 'M', 'μ'),
-    (0x1D77C, 'M', 'ν'),
-    (0x1D77D, 'M', 'ξ'),
-    (0x1D77E, 'M', 'ο'),
-    (0x1D77F, 'M', 'π'),
-    (0x1D780, 'M', 'ρ'),
-    (0x1D781, 'M', 'σ'),
-    (0x1D783, 'M', 'τ'),
-    (0x1D784, 'M', 'υ'),
-    (0x1D785, 'M', 'φ'),
-    (0x1D786, 'M', 'χ'),
-    (0x1D787, 'M', 'ψ'),
-    (0x1D788, 'M', 'ω'),
-    (0x1D789, 'M', '∂'),
-    (0x1D78A, 'M', 'ε'),
-    (0x1D78B, 'M', 'θ'),
-    (0x1D78C, 'M', 'κ'),
-    (0x1D78D, 'M', 'φ'),
-    (0x1D78E, 'M', 'ρ'),
-    (0x1D78F, 'M', 'π'),
-    (0x1D790, 'M', 'α'),
-    (0x1D791, 'M', 'β'),
-    (0x1D792, 'M', 'γ'),
-    (0x1D793, 'M', 'δ'),
-    (0x1D794, 'M', 'ε'),
-    (0x1D795, 'M', 'ζ'),
-    (0x1D796, 'M', 'η'),
-    (0x1D797, 'M', 'θ'),
-    (0x1D798, 'M', 'ι'),
-    (0x1D799, 'M', 'κ'),
-    (0x1D79A, 'M', 'λ'),
-    (0x1D79B, 'M', 'μ'),
-    (0x1D79C, 'M', 'ν'),
-    (0x1D79D, 'M', 'ξ'),
-    (0x1D79E, 'M', 'ο'),
-    (0x1D79F, 'M', 'π'),
-    (0x1D7A0, 'M', 'ρ'),
-    (0x1D7A1, 'M', 'θ'),
-    (0x1D7A2, 'M', 'σ'),
-    (0x1D7A3, 'M', 'τ'),
-    (0x1D7A4, 'M', 'υ'),
-    (0x1D7A5, 'M', 'φ'),
-    (0x1D7A6, 'M', 'χ'),
-    (0x1D7A7, 'M', 'ψ'),
-    (0x1D7A8, 'M', 'ω'),
-    (0x1D7A9, 'M', '∇'),
-    (0x1D7AA, 'M', 'α'),
-    (0x1D7AB, 'M', 'β'),
-    (0x1D7AC, 'M', 'γ'),
-    (0x1D7AD, 'M', 'δ'),
-    (0x1D7AE, 'M', 'ε'),
-    (0x1D7AF, 'M', 'ζ'),
-    (0x1D7B0, 'M', 'η'),
-    (0x1D7B1, 'M', 'θ'),
-    (0x1D7B2, 'M', 'ι'),
-    (0x1D7B3, 'M', 'κ'),
+        (0x1D74F, "M", "∂"),
+        (0x1D750, "M", "ε"),
+        (0x1D751, "M", "θ"),
+        (0x1D752, "M", "κ"),
+        (0x1D753, "M", "φ"),
+        (0x1D754, "M", "ρ"),
+        (0x1D755, "M", "π"),
+        (0x1D756, "M", "α"),
+        (0x1D757, "M", "β"),
+        (0x1D758, "M", "γ"),
+        (0x1D759, "M", "δ"),
+        (0x1D75A, "M", "ε"),
+        (0x1D75B, "M", "ζ"),
+        (0x1D75C, "M", "η"),
+        (0x1D75D, "M", "θ"),
+        (0x1D75E, "M", "ι"),
+        (0x1D75F, "M", "κ"),
+        (0x1D760, "M", "λ"),
+        (0x1D761, "M", "μ"),
+        (0x1D762, "M", "ν"),
+        (0x1D763, "M", "ξ"),
+        (0x1D764, "M", "ο"),
+        (0x1D765, "M", "π"),
+        (0x1D766, "M", "ρ"),
+        (0x1D767, "M", "θ"),
+        (0x1D768, "M", "σ"),
+        (0x1D769, "M", "τ"),
+        (0x1D76A, "M", "υ"),
+        (0x1D76B, "M", "φ"),
+        (0x1D76C, "M", "χ"),
+        (0x1D76D, "M", "ψ"),
+        (0x1D76E, "M", "ω"),
+        (0x1D76F, "M", "∇"),
+        (0x1D770, "M", "α"),
+        (0x1D771, "M", "β"),
+        (0x1D772, "M", "γ"),
+        (0x1D773, "M", "δ"),
+        (0x1D774, "M", "ε"),
+        (0x1D775, "M", "ζ"),
+        (0x1D776, "M", "η"),
+        (0x1D777, "M", "θ"),
+        (0x1D778, "M", "ι"),
+        (0x1D779, "M", "κ"),
+        (0x1D77A, "M", "λ"),
+        (0x1D77B, "M", "μ"),
+        (0x1D77C, "M", "ν"),
+        (0x1D77D, "M", "ξ"),
+        (0x1D77E, "M", "ο"),
+        (0x1D77F, "M", "π"),
+        (0x1D780, "M", "ρ"),
+        (0x1D781, "M", "σ"),
+        (0x1D783, "M", "τ"),
+        (0x1D784, "M", "υ"),
+        (0x1D785, "M", "φ"),
+        (0x1D786, "M", "χ"),
+        (0x1D787, "M", "ψ"),
+        (0x1D788, "M", "ω"),
+        (0x1D789, "M", "∂"),
+        (0x1D78A, "M", "ε"),
+        (0x1D78B, "M", "θ"),
+        (0x1D78C, "M", "κ"),
+        (0x1D78D, "M", "φ"),
+        (0x1D78E, "M", "ρ"),
+        (0x1D78F, "M", "π"),
+        (0x1D790, "M", "α"),
+        (0x1D791, "M", "β"),
+        (0x1D792, "M", "γ"),
+        (0x1D793, "M", "δ"),
+        (0x1D794, "M", "ε"),
+        (0x1D795, "M", "ζ"),
+        (0x1D796, "M", "η"),
+        (0x1D797, "M", "θ"),
+        (0x1D798, "M", "ι"),
+        (0x1D799, "M", "κ"),
+        (0x1D79A, "M", "λ"),
+        (0x1D79B, "M", "μ"),
+        (0x1D79C, "M", "ν"),
+        (0x1D79D, "M", "ξ"),
+        (0x1D79E, "M", "ο"),
+        (0x1D79F, "M", "π"),
+        (0x1D7A0, "M", "ρ"),
+        (0x1D7A1, "M", "θ"),
+        (0x1D7A2, "M", "σ"),
+        (0x1D7A3, "M", "τ"),
+        (0x1D7A4, "M", "υ"),
+        (0x1D7A5, "M", "φ"),
+        (0x1D7A6, "M", "χ"),
+        (0x1D7A7, "M", "ψ"),
+        (0x1D7A8, "M", "ω"),
+        (0x1D7A9, "M", "∇"),
+        (0x1D7AA, "M", "α"),
+        (0x1D7AB, "M", "β"),
+        (0x1D7AC, "M", "γ"),
+        (0x1D7AD, "M", "δ"),
+        (0x1D7AE, "M", "ε"),
+        (0x1D7AF, "M", "ζ"),
+        (0x1D7B0, "M", "η"),
+        (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', 'ν'),
-    (0x1D7B7, 'M', 'ξ'),
-    (0x1D7B8, 'M', 'ο'),
-    (0x1D7B9, 'M', 'π'),
-    (0x1D7BA, 'M', 'ρ'),
-    (0x1D7BB, 'M', 'σ'),
-    (0x1D7BD, 'M', 'τ'),
-    (0x1D7BE, 'M', 'υ'),
-    (0x1D7BF, 'M', 'φ'),
-    (0x1D7C0, 'M', 'χ'),
-    (0x1D7C1, 'M', 'ψ'),
-    (0x1D7C2, 'M', 'ω'),
-    (0x1D7C3, 'M', '∂'),
-    (0x1D7C4, 'M', 'ε'),
-    (0x1D7C5, 'M', 'θ'),
-    (0x1D7C6, 'M', 'κ'),
-    (0x1D7C7, 'M', 'φ'),
-    (0x1D7C8, 'M', 'ρ'),
-    (0x1D7C9, 'M', 'π'),
-    (0x1D7CA, 'M', 'ϝ'),
-    (0x1D7CC, 'X'),
-    (0x1D7CE, 'M', '0'),
-    (0x1D7CF, 'M', '1'),
-    (0x1D7D0, 'M', '2'),
-    (0x1D7D1, 'M', '3'),
-    (0x1D7D2, 'M', '4'),
-    (0x1D7D3, 'M', '5'),
-    (0x1D7D4, 'M', '6'),
-    (0x1D7D5, 'M', '7'),
-    (0x1D7D6, 'M', '8'),
-    (0x1D7D7, 'M', '9'),
-    (0x1D7D8, 'M', '0'),
-    (0x1D7D9, 'M', '1'),
-    (0x1D7DA, 'M', '2'),
-    (0x1D7DB, 'M', '3'),
-    (0x1D7DC, 'M', '4'),
-    (0x1D7DD, 'M', '5'),
-    (0x1D7DE, 'M', '6'),
-    (0x1D7DF, 'M', '7'),
-    (0x1D7E0, 'M', '8'),
-    (0x1D7E1, 'M', '9'),
-    (0x1D7E2, 'M', '0'),
-    (0x1D7E3, 'M', '1'),
-    (0x1D7E4, 'M', '2'),
-    (0x1D7E5, 'M', '3'),
-    (0x1D7E6, 'M', '4'),
-    (0x1D7E7, 'M', '5'),
-    (0x1D7E8, 'M', '6'),
-    (0x1D7E9, 'M', '7'),
-    (0x1D7EA, 'M', '8'),
-    (0x1D7EB, 'M', '9'),
-    (0x1D7EC, 'M', '0'),
-    (0x1D7ED, 'M', '1'),
-    (0x1D7EE, 'M', '2'),
-    (0x1D7EF, 'M', '3'),
-    (0x1D7F0, 'M', '4'),
-    (0x1D7F1, 'M', '5'),
-    (0x1D7F2, 'M', '6'),
-    (0x1D7F3, 'M', '7'),
-    (0x1D7F4, 'M', '8'),
-    (0x1D7F5, 'M', '9'),
-    (0x1D7F6, 'M', '0'),
-    (0x1D7F7, 'M', '1'),
-    (0x1D7F8, 'M', '2'),
-    (0x1D7F9, 'M', '3'),
-    (0x1D7FA, 'M', '4'),
-    (0x1D7FB, 'M', '5'),
-    (0x1D7FC, 'M', '6'),
-    (0x1D7FD, 'M', '7'),
-    (0x1D7FE, 'M', '8'),
-    (0x1D7FF, 'M', '9'),
-    (0x1D800, 'V'),
-    (0x1DA8C, 'X'),
-    (0x1DA9B, 'V'),
-    (0x1DAA0, 'X'),
-    (0x1DAA1, 'V'),
-    (0x1DAB0, 'X'),
-    (0x1DF00, 'V'),
-    (0x1DF1F, 'X'),
-    (0x1DF25, 'V'),
-    (0x1DF2B, 'X'),
-    (0x1E000, 'V'),
-    (0x1E007, 'X'),
-    (0x1E008, 'V'),
-    (0x1E019, 'X'),
-    (0x1E01B, 'V'),
-    (0x1E022, 'X'),
-    (0x1E023, 'V'),
-    (0x1E025, 'X'),
-    (0x1E026, 'V'),
-    (0x1E02B, 'X'),
-    (0x1E030, 'M', 'а'),
-    (0x1E031, 'M', 'б'),
-    (0x1E032, 'M', 'в'),
-    (0x1E033, 'M', 'г'),
-    (0x1E034, 'M', 'д'),
-    (0x1E035, 'M', 'е'),
-    (0x1E036, 'M', 'ж'),
+        (0x1D7B4, "M", "λ"),
+        (0x1D7B5, "M", "μ"),
+        (0x1D7B6, "M", "ν"),
+        (0x1D7B7, "M", "ξ"),
+        (0x1D7B8, "M", "ο"),
+        (0x1D7B9, "M", "π"),
+        (0x1D7BA, "M", "ρ"),
+        (0x1D7BB, "M", "σ"),
+        (0x1D7BD, "M", "τ"),
+        (0x1D7BE, "M", "υ"),
+        (0x1D7BF, "M", "φ"),
+        (0x1D7C0, "M", "χ"),
+        (0x1D7C1, "M", "ψ"),
+        (0x1D7C2, "M", "ω"),
+        (0x1D7C3, "M", "∂"),
+        (0x1D7C4, "M", "ε"),
+        (0x1D7C5, "M", "θ"),
+        (0x1D7C6, "M", "κ"),
+        (0x1D7C7, "M", "φ"),
+        (0x1D7C8, "M", "ρ"),
+        (0x1D7C9, "M", "π"),
+        (0x1D7CA, "M", "ϝ"),
+        (0x1D7CC, "X"),
+        (0x1D7CE, "M", "0"),
+        (0x1D7CF, "M", "1"),
+        (0x1D7D0, "M", "2"),
+        (0x1D7D1, "M", "3"),
+        (0x1D7D2, "M", "4"),
+        (0x1D7D3, "M", "5"),
+        (0x1D7D4, "M", "6"),
+        (0x1D7D5, "M", "7"),
+        (0x1D7D6, "M", "8"),
+        (0x1D7D7, "M", "9"),
+        (0x1D7D8, "M", "0"),
+        (0x1D7D9, "M", "1"),
+        (0x1D7DA, "M", "2"),
+        (0x1D7DB, "M", "3"),
+        (0x1D7DC, "M", "4"),
+        (0x1D7DD, "M", "5"),
+        (0x1D7DE, "M", "6"),
+        (0x1D7DF, "M", "7"),
+        (0x1D7E0, "M", "8"),
+        (0x1D7E1, "M", "9"),
+        (0x1D7E2, "M", "0"),
+        (0x1D7E3, "M", "1"),
+        (0x1D7E4, "M", "2"),
+        (0x1D7E5, "M", "3"),
+        (0x1D7E6, "M", "4"),
+        (0x1D7E7, "M", "5"),
+        (0x1D7E8, "M", "6"),
+        (0x1D7E9, "M", "7"),
+        (0x1D7EA, "M", "8"),
+        (0x1D7EB, "M", "9"),
+        (0x1D7EC, "M", "0"),
+        (0x1D7ED, "M", "1"),
+        (0x1D7EE, "M", "2"),
+        (0x1D7EF, "M", "3"),
+        (0x1D7F0, "M", "4"),
+        (0x1D7F1, "M", "5"),
+        (0x1D7F2, "M", "6"),
+        (0x1D7F3, "M", "7"),
+        (0x1D7F4, "M", "8"),
+        (0x1D7F5, "M", "9"),
+        (0x1D7F6, "M", "0"),
+        (0x1D7F7, "M", "1"),
+        (0x1D7F8, "M", "2"),
+        (0x1D7F9, "M", "3"),
+        (0x1D7FA, "M", "4"),
+        (0x1D7FB, "M", "5"),
+        (0x1D7FC, "M", "6"),
+        (0x1D7FD, "M", "7"),
+        (0x1D7FE, "M", "8"),
+        (0x1D7FF, "M", "9"),
+        (0x1D800, "V"),
+        (0x1DA8C, "X"),
+        (0x1DA9B, "V"),
+        (0x1DAA0, "X"),
+        (0x1DAA1, "V"),
+        (0x1DAB0, "X"),
+        (0x1DF00, "V"),
+        (0x1DF1F, "X"),
+        (0x1DF25, "V"),
+        (0x1DF2B, "X"),
+        (0x1E000, "V"),
+        (0x1E007, "X"),
+        (0x1E008, "V"),
+        (0x1E019, "X"),
+        (0x1E01B, "V"),
+        (0x1E022, "X"),
+        (0x1E023, "V"),
+        (0x1E025, "X"),
+        (0x1E026, "V"),
+        (0x1E02B, "X"),
+        (0x1E030, "M", "а"),
+        (0x1E031, "M", "б"),
+        (0x1E032, "M", "в"),
+        (0x1E033, "M", "г"),
+        (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', 'к'),
-    (0x1E03A, 'M', 'л'),
-    (0x1E03B, 'M', 'м'),
-    (0x1E03C, 'M', 'о'),
-    (0x1E03D, 'M', 'п'),
-    (0x1E03E, 'M', 'р'),
-    (0x1E03F, 'M', 'с'),
-    (0x1E040, 'M', 'т'),
-    (0x1E041, 'M', 'у'),
-    (0x1E042, 'M', 'ф'),
-    (0x1E043, 'M', 'х'),
-    (0x1E044, 'M', 'ц'),
-    (0x1E045, 'M', 'ч'),
-    (0x1E046, 'M', 'ш'),
-    (0x1E047, 'M', 'ы'),
-    (0x1E048, 'M', 'э'),
-    (0x1E049, 'M', 'ю'),
-    (0x1E04A, 'M', 'ꚉ'),
-    (0x1E04B, 'M', 'ә'),
-    (0x1E04C, 'M', 'і'),
-    (0x1E04D, 'M', 'ј'),
-    (0x1E04E, 'M', 'ө'),
-    (0x1E04F, 'M', 'ү'),
-    (0x1E050, 'M', 'ӏ'),
-    (0x1E051, 'M', 'а'),
-    (0x1E052, 'M', 'б'),
-    (0x1E053, 'M', 'в'),
-    (0x1E054, 'M', 'г'),
-    (0x1E055, 'M', 'д'),
-    (0x1E056, 'M', 'е'),
-    (0x1E057, 'M', 'ж'),
-    (0x1E058, 'M', 'з'),
-    (0x1E059, 'M', 'и'),
-    (0x1E05A, 'M', 'к'),
-    (0x1E05B, 'M', 'л'),
-    (0x1E05C, 'M', 'о'),
-    (0x1E05D, 'M', 'п'),
-    (0x1E05E, 'M', 'с'),
-    (0x1E05F, 'M', 'у'),
-    (0x1E060, 'M', 'ф'),
-    (0x1E061, 'M', 'х'),
-    (0x1E062, 'M', 'ц'),
-    (0x1E063, 'M', 'ч'),
-    (0x1E064, 'M', 'ш'),
-    (0x1E065, 'M', 'ъ'),
-    (0x1E066, 'M', 'ы'),
-    (0x1E067, 'M', 'ґ'),
-    (0x1E068, 'M', 'і'),
-    (0x1E069, 'M', 'ѕ'),
-    (0x1E06A, 'M', 'џ'),
-    (0x1E06B, 'M', 'ҫ'),
-    (0x1E06C, 'M', 'ꙑ'),
-    (0x1E06D, 'M', 'ұ'),
-    (0x1E06E, 'X'),
-    (0x1E08F, 'V'),
-    (0x1E090, 'X'),
-    (0x1E100, 'V'),
-    (0x1E12D, 'X'),
-    (0x1E130, 'V'),
-    (0x1E13E, 'X'),
-    (0x1E140, 'V'),
-    (0x1E14A, 'X'),
-    (0x1E14E, 'V'),
-    (0x1E150, 'X'),
-    (0x1E290, 'V'),
-    (0x1E2AF, 'X'),
-    (0x1E2C0, 'V'),
-    (0x1E2FA, 'X'),
-    (0x1E2FF, 'V'),
-    (0x1E300, 'X'),
-    (0x1E4D0, 'V'),
-    (0x1E4FA, 'X'),
-    (0x1E7E0, 'V'),
-    (0x1E7E7, 'X'),
-    (0x1E7E8, 'V'),
-    (0x1E7EC, 'X'),
-    (0x1E7ED, 'V'),
-    (0x1E7EF, 'X'),
-    (0x1E7F0, 'V'),
-    (0x1E7FF, 'X'),
-    (0x1E800, 'V'),
-    (0x1E8C5, 'X'),
-    (0x1E8C7, 'V'),
-    (0x1E8D7, 'X'),
-    (0x1E900, 'M', '𞤢'),
-    (0x1E901, 'M', '𞤣'),
-    (0x1E902, 'M', '𞤤'),
-    (0x1E903, 'M', '𞤥'),
-    (0x1E904, 'M', '𞤦'),
-    (0x1E905, 'M', '𞤧'),
-    (0x1E906, 'M', '𞤨'),
-    (0x1E907, 'M', '𞤩'),
-    (0x1E908, 'M', '𞤪'),
-    (0x1E909, 'M', '𞤫'),
-    (0x1E90A, 'M', '𞤬'),
-    (0x1E90B, 'M', '𞤭'),
-    (0x1E90C, 'M', '𞤮'),
-    (0x1E90D, 'M', '𞤯'),
+        (0x1E037, "M", "з"),
+        (0x1E038, "M", "и"),
+        (0x1E039, "M", "к"),
+        (0x1E03A, "M", "л"),
+        (0x1E03B, "M", "м"),
+        (0x1E03C, "M", "о"),
+        (0x1E03D, "M", "п"),
+        (0x1E03E, "M", "р"),
+        (0x1E03F, "M", "с"),
+        (0x1E040, "M", "т"),
+        (0x1E041, "M", "у"),
+        (0x1E042, "M", "ф"),
+        (0x1E043, "M", "х"),
+        (0x1E044, "M", "ц"),
+        (0x1E045, "M", "ч"),
+        (0x1E046, "M", "ш"),
+        (0x1E047, "M", "ы"),
+        (0x1E048, "M", "э"),
+        (0x1E049, "M", "ю"),
+        (0x1E04A, "M", "ꚉ"),
+        (0x1E04B, "M", "ә"),
+        (0x1E04C, "M", "і"),
+        (0x1E04D, "M", "ј"),
+        (0x1E04E, "M", "ө"),
+        (0x1E04F, "M", "ү"),
+        (0x1E050, "M", "ӏ"),
+        (0x1E051, "M", "а"),
+        (0x1E052, "M", "б"),
+        (0x1E053, "M", "в"),
+        (0x1E054, "M", "г"),
+        (0x1E055, "M", "д"),
+        (0x1E056, "M", "е"),
+        (0x1E057, "M", "ж"),
+        (0x1E058, "M", "з"),
+        (0x1E059, "M", "и"),
+        (0x1E05A, "M", "к"),
+        (0x1E05B, "M", "л"),
+        (0x1E05C, "M", "о"),
+        (0x1E05D, "M", "п"),
+        (0x1E05E, "M", "с"),
+        (0x1E05F, "M", "у"),
+        (0x1E060, "M", "ф"),
+        (0x1E061, "M", "х"),
+        (0x1E062, "M", "ц"),
+        (0x1E063, "M", "ч"),
+        (0x1E064, "M", "ш"),
+        (0x1E065, "M", "ъ"),
+        (0x1E066, "M", "ы"),
+        (0x1E067, "M", "ґ"),
+        (0x1E068, "M", "і"),
+        (0x1E069, "M", "ѕ"),
+        (0x1E06A, "M", "џ"),
+        (0x1E06B, "M", "ҫ"),
+        (0x1E06C, "M", "ꙑ"),
+        (0x1E06D, "M", "ұ"),
+        (0x1E06E, "X"),
+        (0x1E08F, "V"),
+        (0x1E090, "X"),
+        (0x1E100, "V"),
+        (0x1E12D, "X"),
+        (0x1E130, "V"),
+        (0x1E13E, "X"),
+        (0x1E140, "V"),
+        (0x1E14A, "X"),
+        (0x1E14E, "V"),
+        (0x1E150, "X"),
+        (0x1E290, "V"),
+        (0x1E2AF, "X"),
+        (0x1E2C0, "V"),
+        (0x1E2FA, "X"),
+        (0x1E2FF, "V"),
+        (0x1E300, "X"),
+        (0x1E4D0, "V"),
+        (0x1E4FA, "X"),
+        (0x1E7E0, "V"),
+        (0x1E7E7, "X"),
+        (0x1E7E8, "V"),
+        (0x1E7EC, "X"),
+        (0x1E7ED, "V"),
+        (0x1E7EF, "X"),
+        (0x1E7F0, "V"),
+        (0x1E7FF, "X"),
+        (0x1E800, "V"),
+        (0x1E8C5, "X"),
+        (0x1E8C7, "V"),
+        (0x1E8D7, "X"),
+        (0x1E900, "M", "𞤢"),
+        (0x1E901, "M", "𞤣"),
+        (0x1E902, "M", "𞤤"),
+        (0x1E903, "M", "𞤥"),
+        (0x1E904, "M", "𞤦"),
+        (0x1E905, "M", "𞤧"),
+        (0x1E906, "M", "𞤨"),
+        (0x1E907, "M", "𞤩"),
+        (0x1E908, "M", "𞤪"),
+        (0x1E909, "M", "𞤫"),
+        (0x1E90A, "M", "𞤬"),
+        (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', '𞤲'),
-    (0x1E911, 'M', '𞤳'),
-    (0x1E912, 'M', '𞤴'),
-    (0x1E913, 'M', '𞤵'),
-    (0x1E914, 'M', '𞤶'),
-    (0x1E915, 'M', '𞤷'),
-    (0x1E916, 'M', '𞤸'),
-    (0x1E917, 'M', '𞤹'),
-    (0x1E918, 'M', '𞤺'),
-    (0x1E919, 'M', '𞤻'),
-    (0x1E91A, 'M', '𞤼'),
-    (0x1E91B, 'M', '𞤽'),
-    (0x1E91C, 'M', '𞤾'),
-    (0x1E91D, 'M', '𞤿'),
-    (0x1E91E, 'M', '𞥀'),
-    (0x1E91F, 'M', '𞥁'),
-    (0x1E920, 'M', '𞥂'),
-    (0x1E921, 'M', '𞥃'),
-    (0x1E922, 'V'),
-    (0x1E94C, 'X'),
-    (0x1E950, 'V'),
-    (0x1E95A, 'X'),
-    (0x1E95E, 'V'),
-    (0x1E960, 'X'),
-    (0x1EC71, 'V'),
-    (0x1ECB5, 'X'),
-    (0x1ED01, 'V'),
-    (0x1ED3E, 'X'),
-    (0x1EE00, 'M', 'ا'),
-    (0x1EE01, 'M', 'ب'),
-    (0x1EE02, 'M', 'ج'),
-    (0x1EE03, 'M', 'د'),
-    (0x1EE04, 'X'),
-    (0x1EE05, 'M', 'و'),
-    (0x1EE06, 'M', 'ز'),
-    (0x1EE07, 'M', 'ح'),
-    (0x1EE08, 'M', 'ط'),
-    (0x1EE09, 'M', 'ي'),
-    (0x1EE0A, 'M', 'ك'),
-    (0x1EE0B, 'M', 'ل'),
-    (0x1EE0C, 'M', 'م'),
-    (0x1EE0D, 'M', 'ن'),
-    (0x1EE0E, 'M', 'س'),
-    (0x1EE0F, 'M', 'ع'),
-    (0x1EE10, 'M', 'ف'),
-    (0x1EE11, 'M', 'ص'),
-    (0x1EE12, 'M', 'ق'),
-    (0x1EE13, 'M', 'ر'),
-    (0x1EE14, 'M', 'ش'),
-    (0x1EE15, 'M', 'ت'),
-    (0x1EE16, 'M', 'ث'),
-    (0x1EE17, 'M', 'خ'),
-    (0x1EE18, 'M', 'ذ'),
-    (0x1EE19, 'M', 'ض'),
-    (0x1EE1A, 'M', 'ظ'),
-    (0x1EE1B, 'M', 'غ'),
-    (0x1EE1C, 'M', 'ٮ'),
-    (0x1EE1D, 'M', 'ں'),
-    (0x1EE1E, 'M', 'ڡ'),
-    (0x1EE1F, 'M', 'ٯ'),
-    (0x1EE20, 'X'),
-    (0x1EE21, 'M', 'ب'),
-    (0x1EE22, 'M', 'ج'),
-    (0x1EE23, 'X'),
-    (0x1EE24, 'M', 'ه'),
-    (0x1EE25, 'X'),
-    (0x1EE27, 'M', 'ح'),
-    (0x1EE28, 'X'),
-    (0x1EE29, 'M', 'ي'),
-    (0x1EE2A, 'M', 'ك'),
-    (0x1EE2B, 'M', 'ل'),
-    (0x1EE2C, 'M', 'م'),
-    (0x1EE2D, 'M', 'ن'),
-    (0x1EE2E, 'M', 'س'),
-    (0x1EE2F, 'M', 'ع'),
-    (0x1EE30, 'M', 'ف'),
-    (0x1EE31, 'M', 'ص'),
-    (0x1EE32, 'M', 'ق'),
-    (0x1EE33, 'X'),
-    (0x1EE34, 'M', 'ش'),
-    (0x1EE35, 'M', 'ت'),
-    (0x1EE36, 'M', 'ث'),
-    (0x1EE37, 'M', 'خ'),
-    (0x1EE38, 'X'),
-    (0x1EE39, 'M', 'ض'),
-    (0x1EE3A, 'X'),
-    (0x1EE3B, 'M', 'غ'),
-    (0x1EE3C, 'X'),
-    (0x1EE42, 'M', 'ج'),
-    (0x1EE43, 'X'),
-    (0x1EE47, 'M', 'ح'),
-    (0x1EE48, 'X'),
-    (0x1EE49, 'M', 'ي'),
-    (0x1EE4A, 'X'),
-    (0x1EE4B, 'M', 'ل'),
-    (0x1EE4C, 'X'),
-    (0x1EE4D, 'M', 'ن'),
-    (0x1EE4E, 'M', 'س'),
+        (0x1E90E, "M", "𞤰"),
+        (0x1E90F, "M", "𞤱"),
+        (0x1E910, "M", "𞤲"),
+        (0x1E911, "M", "𞤳"),
+        (0x1E912, "M", "𞤴"),
+        (0x1E913, "M", "𞤵"),
+        (0x1E914, "M", "𞤶"),
+        (0x1E915, "M", "𞤷"),
+        (0x1E916, "M", "𞤸"),
+        (0x1E917, "M", "𞤹"),
+        (0x1E918, "M", "𞤺"),
+        (0x1E919, "M", "𞤻"),
+        (0x1E91A, "M", "𞤼"),
+        (0x1E91B, "M", "𞤽"),
+        (0x1E91C, "M", "𞤾"),
+        (0x1E91D, "M", "𞤿"),
+        (0x1E91E, "M", "𞥀"),
+        (0x1E91F, "M", "𞥁"),
+        (0x1E920, "M", "𞥂"),
+        (0x1E921, "M", "𞥃"),
+        (0x1E922, "V"),
+        (0x1E94C, "X"),
+        (0x1E950, "V"),
+        (0x1E95A, "X"),
+        (0x1E95E, "V"),
+        (0x1E960, "X"),
+        (0x1EC71, "V"),
+        (0x1ECB5, "X"),
+        (0x1ED01, "V"),
+        (0x1ED3E, "X"),
+        (0x1EE00, "M", "ا"),
+        (0x1EE01, "M", "ب"),
+        (0x1EE02, "M", "ج"),
+        (0x1EE03, "M", "د"),
+        (0x1EE04, "X"),
+        (0x1EE05, "M", "و"),
+        (0x1EE06, "M", "ز"),
+        (0x1EE07, "M", "ح"),
+        (0x1EE08, "M", "ط"),
+        (0x1EE09, "M", "ي"),
+        (0x1EE0A, "M", "ك"),
+        (0x1EE0B, "M", "ل"),
+        (0x1EE0C, "M", "م"),
+        (0x1EE0D, "M", "ن"),
+        (0x1EE0E, "M", "س"),
+        (0x1EE0F, "M", "ع"),
+        (0x1EE10, "M", "ف"),
+        (0x1EE11, "M", "ص"),
+        (0x1EE12, "M", "ق"),
+        (0x1EE13, "M", "ر"),
+        (0x1EE14, "M", "ش"),
+        (0x1EE15, "M", "ت"),
+        (0x1EE16, "M", "ث"),
+        (0x1EE17, "M", "خ"),
+        (0x1EE18, "M", "ذ"),
+        (0x1EE19, "M", "ض"),
+        (0x1EE1A, "M", "ظ"),
+        (0x1EE1B, "M", "غ"),
+        (0x1EE1C, "M", "ٮ"),
+        (0x1EE1D, "M", "ں"),
+        (0x1EE1E, "M", "ڡ"),
+        (0x1EE1F, "M", "ٯ"),
+        (0x1EE20, "X"),
+        (0x1EE21, "M", "ب"),
+        (0x1EE22, "M", "ج"),
+        (0x1EE23, "X"),
+        (0x1EE24, "M", "ه"),
+        (0x1EE25, "X"),
+        (0x1EE27, "M", "ح"),
+        (0x1EE28, "X"),
+        (0x1EE29, "M", "ي"),
+        (0x1EE2A, "M", "ك"),
+        (0x1EE2B, "M", "ل"),
+        (0x1EE2C, "M", "م"),
+        (0x1EE2D, "M", "ن"),
+        (0x1EE2E, "M", "س"),
+        (0x1EE2F, "M", "ع"),
+        (0x1EE30, "M", "ف"),
+        (0x1EE31, "M", "ص"),
+        (0x1EE32, "M", "ق"),
+        (0x1EE33, "X"),
+        (0x1EE34, "M", "ش"),
+        (0x1EE35, "M", "ت"),
+        (0x1EE36, "M", "ث"),
+        (0x1EE37, "M", "خ"),
+        (0x1EE38, "X"),
+        (0x1EE39, "M", "ض"),
+        (0x1EE3A, "X"),
+        (0x1EE3B, "M", "غ"),
+        (0x1EE3C, "X"),
+        (0x1EE42, "M", "ج"),
+        (0x1EE43, "X"),
+        (0x1EE47, "M", "ح"),
+        (0x1EE48, "X"),
+        (0x1EE49, "M", "ي"),
+        (0x1EE4A, "X"),
+        (0x1EE4B, "M", "ل"),
+        (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', 'ص'),
-    (0x1EE52, 'M', 'ق'),
-    (0x1EE53, 'X'),
-    (0x1EE54, 'M', 'ش'),
-    (0x1EE55, 'X'),
-    (0x1EE57, 'M', 'خ'),
-    (0x1EE58, 'X'),
-    (0x1EE59, 'M', 'ض'),
-    (0x1EE5A, 'X'),
-    (0x1EE5B, 'M', 'غ'),
-    (0x1EE5C, 'X'),
-    (0x1EE5D, 'M', 'ں'),
-    (0x1EE5E, 'X'),
-    (0x1EE5F, 'M', 'ٯ'),
-    (0x1EE60, 'X'),
-    (0x1EE61, 'M', 'ب'),
-    (0x1EE62, 'M', 'ج'),
-    (0x1EE63, 'X'),
-    (0x1EE64, 'M', 'ه'),
-    (0x1EE65, 'X'),
-    (0x1EE67, 'M', 'ح'),
-    (0x1EE68, 'M', 'ط'),
-    (0x1EE69, 'M', 'ي'),
-    (0x1EE6A, 'M', 'ك'),
-    (0x1EE6B, 'X'),
-    (0x1EE6C, 'M', 'م'),
-    (0x1EE6D, 'M', 'ن'),
-    (0x1EE6E, 'M', 'س'),
-    (0x1EE6F, 'M', 'ع'),
-    (0x1EE70, 'M', 'ف'),
-    (0x1EE71, 'M', 'ص'),
-    (0x1EE72, 'M', 'ق'),
-    (0x1EE73, 'X'),
-    (0x1EE74, 'M', 'ش'),
-    (0x1EE75, 'M', 'ت'),
-    (0x1EE76, 'M', 'ث'),
-    (0x1EE77, 'M', 'خ'),
-    (0x1EE78, 'X'),
-    (0x1EE79, 'M', 'ض'),
-    (0x1EE7A, 'M', 'ظ'),
-    (0x1EE7B, 'M', 'غ'),
-    (0x1EE7C, 'M', 'ٮ'),
-    (0x1EE7D, 'X'),
-    (0x1EE7E, 'M', 'ڡ'),
-    (0x1EE7F, 'X'),
-    (0x1EE80, 'M', 'ا'),
-    (0x1EE81, 'M', 'ب'),
-    (0x1EE82, 'M', 'ج'),
-    (0x1EE83, 'M', 'د'),
-    (0x1EE84, 'M', 'ه'),
-    (0x1EE85, 'M', 'و'),
-    (0x1EE86, 'M', 'ز'),
-    (0x1EE87, 'M', 'ح'),
-    (0x1EE88, 'M', 'ط'),
-    (0x1EE89, 'M', 'ي'),
-    (0x1EE8A, 'X'),
-    (0x1EE8B, 'M', 'ل'),
-    (0x1EE8C, 'M', 'م'),
-    (0x1EE8D, 'M', 'ن'),
-    (0x1EE8E, 'M', 'س'),
-    (0x1EE8F, 'M', 'ع'),
-    (0x1EE90, 'M', 'ف'),
-    (0x1EE91, 'M', 'ص'),
-    (0x1EE92, 'M', 'ق'),
-    (0x1EE93, 'M', 'ر'),
-    (0x1EE94, 'M', 'ش'),
-    (0x1EE95, 'M', 'ت'),
-    (0x1EE96, 'M', 'ث'),
-    (0x1EE97, 'M', 'خ'),
-    (0x1EE98, 'M', 'ذ'),
-    (0x1EE99, 'M', 'ض'),
-    (0x1EE9A, 'M', 'ظ'),
-    (0x1EE9B, 'M', 'غ'),
-    (0x1EE9C, 'X'),
-    (0x1EEA1, 'M', 'ب'),
-    (0x1EEA2, 'M', 'ج'),
-    (0x1EEA3, 'M', 'د'),
-    (0x1EEA4, 'X'),
-    (0x1EEA5, 'M', 'و'),
-    (0x1EEA6, 'M', 'ز'),
-    (0x1EEA7, 'M', 'ح'),
-    (0x1EEA8, 'M', 'ط'),
-    (0x1EEA9, 'M', 'ي'),
-    (0x1EEAA, 'X'),
-    (0x1EEAB, 'M', 'ل'),
-    (0x1EEAC, 'M', 'م'),
-    (0x1EEAD, 'M', 'ن'),
-    (0x1EEAE, 'M', 'س'),
-    (0x1EEAF, 'M', 'ع'),
-    (0x1EEB0, 'M', 'ف'),
-    (0x1EEB1, 'M', 'ص'),
-    (0x1EEB2, 'M', 'ق'),
-    (0x1EEB3, 'M', 'ر'),
-    (0x1EEB4, 'M', 'ش'),
-    (0x1EEB5, 'M', 'ت'),
-    (0x1EEB6, 'M', 'ث'),
-    (0x1EEB7, 'M', 'خ'),
-    (0x1EEB8, 'M', 'ذ'),
+        (0x1EE4F, "M", "ع"),
+        (0x1EE50, "X"),
+        (0x1EE51, "M", "ص"),
+        (0x1EE52, "M", "ق"),
+        (0x1EE53, "X"),
+        (0x1EE54, "M", "ش"),
+        (0x1EE55, "X"),
+        (0x1EE57, "M", "خ"),
+        (0x1EE58, "X"),
+        (0x1EE59, "M", "ض"),
+        (0x1EE5A, "X"),
+        (0x1EE5B, "M", "غ"),
+        (0x1EE5C, "X"),
+        (0x1EE5D, "M", "ں"),
+        (0x1EE5E, "X"),
+        (0x1EE5F, "M", "ٯ"),
+        (0x1EE60, "X"),
+        (0x1EE61, "M", "ب"),
+        (0x1EE62, "M", "ج"),
+        (0x1EE63, "X"),
+        (0x1EE64, "M", "ه"),
+        (0x1EE65, "X"),
+        (0x1EE67, "M", "ح"),
+        (0x1EE68, "M", "ط"),
+        (0x1EE69, "M", "ي"),
+        (0x1EE6A, "M", "ك"),
+        (0x1EE6B, "X"),
+        (0x1EE6C, "M", "م"),
+        (0x1EE6D, "M", "ن"),
+        (0x1EE6E, "M", "س"),
+        (0x1EE6F, "M", "ع"),
+        (0x1EE70, "M", "ف"),
+        (0x1EE71, "M", "ص"),
+        (0x1EE72, "M", "ق"),
+        (0x1EE73, "X"),
+        (0x1EE74, "M", "ش"),
+        (0x1EE75, "M", "ت"),
+        (0x1EE76, "M", "ث"),
+        (0x1EE77, "M", "خ"),
+        (0x1EE78, "X"),
+        (0x1EE79, "M", "ض"),
+        (0x1EE7A, "M", "ظ"),
+        (0x1EE7B, "M", "غ"),
+        (0x1EE7C, "M", "ٮ"),
+        (0x1EE7D, "X"),
+        (0x1EE7E, "M", "ڡ"),
+        (0x1EE7F, "X"),
+        (0x1EE80, "M", "ا"),
+        (0x1EE81, "M", "ب"),
+        (0x1EE82, "M", "ج"),
+        (0x1EE83, "M", "د"),
+        (0x1EE84, "M", "ه"),
+        (0x1EE85, "M", "و"),
+        (0x1EE86, "M", "ز"),
+        (0x1EE87, "M", "ح"),
+        (0x1EE88, "M", "ط"),
+        (0x1EE89, "M", "ي"),
+        (0x1EE8A, "X"),
+        (0x1EE8B, "M", "ل"),
+        (0x1EE8C, "M", "م"),
+        (0x1EE8D, "M", "ن"),
+        (0x1EE8E, "M", "س"),
+        (0x1EE8F, "M", "ع"),
+        (0x1EE90, "M", "ف"),
+        (0x1EE91, "M", "ص"),
+        (0x1EE92, "M", "ق"),
+        (0x1EE93, "M", "ر"),
+        (0x1EE94, "M", "ش"),
+        (0x1EE95, "M", "ت"),
+        (0x1EE96, "M", "ث"),
+        (0x1EE97, "M", "خ"),
+        (0x1EE98, "M", "ذ"),
+        (0x1EE99, "M", "ض"),
+        (0x1EE9A, "M", "ظ"),
+        (0x1EE9B, "M", "غ"),
+        (0x1EE9C, "X"),
+        (0x1EEA1, "M", "ب"),
+        (0x1EEA2, "M", "ج"),
+        (0x1EEA3, "M", "د"),
+        (0x1EEA4, "X"),
+        (0x1EEA5, "M", "و"),
+        (0x1EEA6, "M", "ز"),
+        (0x1EEA7, "M", "ح"),
+        (0x1EEA8, "M", "ط"),
+        (0x1EEA9, "M", "ي"),
+        (0x1EEAA, "X"),
+        (0x1EEAB, "M", "ل"),
+        (0x1EEAC, "M", "م"),
+        (0x1EEAD, "M", "ن"),
+        (0x1EEAE, "M", "س"),
+        (0x1EEAF, "M", "ع"),
+        (0x1EEB0, "M", "ف"),
+        (0x1EEB1, "M", "ص"),
+        (0x1EEB2, "M", "ق"),
+        (0x1EEB3, "M", "ر"),
+        (0x1EEB4, "M", "ش"),
+        (0x1EEB5, "M", "ت"),
+        (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', 'غ'),
-    (0x1EEBC, 'X'),
-    (0x1EEF0, 'V'),
-    (0x1EEF2, 'X'),
-    (0x1F000, 'V'),
-    (0x1F02C, 'X'),
-    (0x1F030, 'V'),
-    (0x1F094, 'X'),
-    (0x1F0A0, 'V'),
-    (0x1F0AF, 'X'),
-    (0x1F0B1, 'V'),
-    (0x1F0C0, 'X'),
-    (0x1F0C1, 'V'),
-    (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,'),
-    (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)'),
-    (0x1F12A, 'M', '〔s〕'),
-    (0x1F12B, 'M', 'c'),
-    (0x1F12C, 'M', 'r'),
-    (0x1F12D, 'M', 'cd'),
-    (0x1F12E, 'M', 'wz'),
-    (0x1F12F, 'V'),
-    (0x1F130, 'M', 'a'),
-    (0x1F131, 'M', 'b'),
-    (0x1F132, 'M', 'c'),
-    (0x1F133, 'M', 'd'),
-    (0x1F134, 'M', 'e'),
-    (0x1F135, 'M', 'f'),
-    (0x1F136, 'M', 'g'),
-    (0x1F137, 'M', 'h'),
-    (0x1F138, 'M', 'i'),
-    (0x1F139, 'M', 'j'),
-    (0x1F13A, 'M', 'k'),
-    (0x1F13B, 'M', 'l'),
-    (0x1F13C, 'M', 'm'),
-    (0x1F13D, 'M', 'n'),
-    (0x1F13E, 'M', 'o'),
-    (0x1F13F, 'M', 'p'),
-    (0x1F140, 'M', 'q'),
-    (0x1F141, 'M', 'r'),
-    (0x1F142, 'M', 's'),
-    (0x1F143, 'M', 't'),
-    (0x1F144, 'M', 'u'),
-    (0x1F145, 'M', 'v'),
-    (0x1F146, 'M', 'w'),
-    (0x1F147, 'M', 'x'),
-    (0x1F148, 'M', 'y'),
-    (0x1F149, 'M', 'z'),
-    (0x1F14A, 'M', 'hv'),
-    (0x1F14B, 'M', 'mv'),
-    (0x1F14C, 'M', 'sd'),
-    (0x1F14D, 'M', 'ss'),
-    (0x1F14E, 'M', 'ppv'),
-    (0x1F14F, 'M', 'wc'),
-    (0x1F150, 'V'),
-    (0x1F16A, 'M', 'mc'),
-    (0x1F16B, 'M', 'md'),
-    (0x1F16C, 'M', 'mr'),
-    (0x1F16D, 'V'),
-    (0x1F190, 'M', 'dj'),
-    (0x1F191, 'V'),
+        (0x1EEB9, "M", "ض"),
+        (0x1EEBA, "M", "ظ"),
+        (0x1EEBB, "M", "غ"),
+        (0x1EEBC, "X"),
+        (0x1EEF0, "V"),
+        (0x1EEF2, "X"),
+        (0x1F000, "V"),
+        (0x1F02C, "X"),
+        (0x1F030, "V"),
+        (0x1F094, "X"),
+        (0x1F0A0, "V"),
+        (0x1F0AF, "X"),
+        (0x1F0B1, "V"),
+        (0x1F0C0, "X"),
+        (0x1F0C1, "V"),
+        (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,"),
+        (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)"),
+        (0x1F12A, "M", "〔s〕"),
+        (0x1F12B, "M", "c"),
+        (0x1F12C, "M", "r"),
+        (0x1F12D, "M", "cd"),
+        (0x1F12E, "M", "wz"),
+        (0x1F12F, "V"),
+        (0x1F130, "M", "a"),
+        (0x1F131, "M", "b"),
+        (0x1F132, "M", "c"),
+        (0x1F133, "M", "d"),
+        (0x1F134, "M", "e"),
+        (0x1F135, "M", "f"),
+        (0x1F136, "M", "g"),
+        (0x1F137, "M", "h"),
+        (0x1F138, "M", "i"),
+        (0x1F139, "M", "j"),
+        (0x1F13A, "M", "k"),
+        (0x1F13B, "M", "l"),
+        (0x1F13C, "M", "m"),
+        (0x1F13D, "M", "n"),
+        (0x1F13E, "M", "o"),
+        (0x1F13F, "M", "p"),
+        (0x1F140, "M", "q"),
+        (0x1F141, "M", "r"),
+        (0x1F142, "M", "s"),
+        (0x1F143, "M", "t"),
+        (0x1F144, "M", "u"),
+        (0x1F145, "M", "v"),
+        (0x1F146, "M", "w"),
+        (0x1F147, "M", "x"),
+        (0x1F148, "M", "y"),
+        (0x1F149, "M", "z"),
+        (0x1F14A, "M", "hv"),
+        (0x1F14B, "M", "mv"),
+        (0x1F14C, "M", "sd"),
+        (0x1F14D, "M", "ss"),
+        (0x1F14E, "M", "ppv"),
+        (0x1F14F, "M", "wc"),
+        (0x1F150, "V"),
+        (0x1F16A, "M", "mc"),
+        (0x1F16B, "M", "md"),
+        (0x1F16C, "M", "mr"),
+        (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', 'ほか'),
-    (0x1F201, 'M', 'ココ'),
-    (0x1F202, 'M', 'サ'),
-    (0x1F203, 'X'),
-    (0x1F210, 'M', '手'),
-    (0x1F211, 'M', '字'),
-    (0x1F212, 'M', '双'),
-    (0x1F213, 'M', 'デ'),
-    (0x1F214, 'M', '二'),
-    (0x1F215, 'M', '多'),
-    (0x1F216, 'M', '解'),
-    (0x1F217, 'M', '天'),
-    (0x1F218, 'M', '交'),
-    (0x1F219, 'M', '映'),
-    (0x1F21A, 'M', '無'),
-    (0x1F21B, 'M', '料'),
-    (0x1F21C, 'M', '前'),
-    (0x1F21D, 'M', '後'),
-    (0x1F21E, 'M', '再'),
-    (0x1F21F, 'M', '新'),
-    (0x1F220, 'M', '初'),
-    (0x1F221, 'M', '終'),
-    (0x1F222, 'M', '生'),
-    (0x1F223, 'M', '販'),
-    (0x1F224, 'M', '声'),
-    (0x1F225, 'M', '吹'),
-    (0x1F226, 'M', '演'),
-    (0x1F227, 'M', '投'),
-    (0x1F228, 'M', '捕'),
-    (0x1F229, 'M', '一'),
-    (0x1F22A, 'M', '三'),
-    (0x1F22B, 'M', '遊'),
-    (0x1F22C, 'M', '左'),
-    (0x1F22D, 'M', '中'),
-    (0x1F22E, 'M', '右'),
-    (0x1F22F, 'M', '指'),
-    (0x1F230, 'M', '走'),
-    (0x1F231, 'M', '打'),
-    (0x1F232, 'M', '禁'),
-    (0x1F233, 'M', '空'),
-    (0x1F234, 'M', '合'),
-    (0x1F235, 'M', '満'),
-    (0x1F236, 'M', '有'),
-    (0x1F237, 'M', '月'),
-    (0x1F238, 'M', '申'),
-    (0x1F239, 'M', '割'),
-    (0x1F23A, 'M', '営'),
-    (0x1F23B, 'M', '配'),
-    (0x1F23C, 'X'),
-    (0x1F240, 'M', '〔本〕'),
-    (0x1F241, 'M', '〔三〕'),
-    (0x1F242, 'M', '〔二〕'),
-    (0x1F243, 'M', '〔安〕'),
-    (0x1F244, 'M', '〔点〕'),
-    (0x1F245, 'M', '〔打〕'),
-    (0x1F246, 'M', '〔盗〕'),
-    (0x1F247, 'M', '〔勝〕'),
-    (0x1F248, 'M', '〔敗〕'),
-    (0x1F249, 'X'),
-    (0x1F250, 'M', '得'),
-    (0x1F251, 'M', '可'),
-    (0x1F252, 'X'),
-    (0x1F260, 'V'),
-    (0x1F266, 'X'),
-    (0x1F300, 'V'),
-    (0x1F6D8, 'X'),
-    (0x1F6DC, 'V'),
-    (0x1F6ED, 'X'),
-    (0x1F6F0, 'V'),
-    (0x1F6FD, 'X'),
-    (0x1F700, 'V'),
-    (0x1F777, 'X'),
-    (0x1F77B, 'V'),
-    (0x1F7DA, 'X'),
-    (0x1F7E0, 'V'),
-    (0x1F7EC, 'X'),
-    (0x1F7F0, 'V'),
-    (0x1F7F1, 'X'),
-    (0x1F800, 'V'),
-    (0x1F80C, 'X'),
-    (0x1F810, 'V'),
-    (0x1F848, 'X'),
-    (0x1F850, 'V'),
-    (0x1F85A, 'X'),
-    (0x1F860, 'V'),
-    (0x1F888, 'X'),
-    (0x1F890, 'V'),
-    (0x1F8AE, 'X'),
-    (0x1F8B0, 'V'),
-    (0x1F8B2, 'X'),
-    (0x1F900, 'V'),
-    (0x1FA54, 'X'),
-    (0x1FA60, 'V'),
-    (0x1FA6E, 'X'),
-    (0x1FA70, 'V'),
-    (0x1FA7D, 'X'),
-    (0x1FA80, 'V'),
-    (0x1FA89, 'X'),
+        (0x1F1AE, "X"),
+        (0x1F1E6, "V"),
+        (0x1F200, "M", "ほか"),
+        (0x1F201, "M", "ココ"),
+        (0x1F202, "M", "サ"),
+        (0x1F203, "X"),
+        (0x1F210, "M", "手"),
+        (0x1F211, "M", "字"),
+        (0x1F212, "M", "双"),
+        (0x1F213, "M", "デ"),
+        (0x1F214, "M", "二"),
+        (0x1F215, "M", "多"),
+        (0x1F216, "M", "解"),
+        (0x1F217, "M", "天"),
+        (0x1F218, "M", "交"),
+        (0x1F219, "M", "映"),
+        (0x1F21A, "M", "無"),
+        (0x1F21B, "M", "料"),
+        (0x1F21C, "M", "前"),
+        (0x1F21D, "M", "後"),
+        (0x1F21E, "M", "再"),
+        (0x1F21F, "M", "新"),
+        (0x1F220, "M", "初"),
+        (0x1F221, "M", "終"),
+        (0x1F222, "M", "生"),
+        (0x1F223, "M", "販"),
+        (0x1F224, "M", "声"),
+        (0x1F225, "M", "吹"),
+        (0x1F226, "M", "演"),
+        (0x1F227, "M", "投"),
+        (0x1F228, "M", "捕"),
+        (0x1F229, "M", "一"),
+        (0x1F22A, "M", "三"),
+        (0x1F22B, "M", "遊"),
+        (0x1F22C, "M", "左"),
+        (0x1F22D, "M", "中"),
+        (0x1F22E, "M", "右"),
+        (0x1F22F, "M", "指"),
+        (0x1F230, "M", "走"),
+        (0x1F231, "M", "打"),
+        (0x1F232, "M", "禁"),
+        (0x1F233, "M", "空"),
+        (0x1F234, "M", "合"),
+        (0x1F235, "M", "満"),
+        (0x1F236, "M", "有"),
+        (0x1F237, "M", "月"),
+        (0x1F238, "M", "申"),
+        (0x1F239, "M", "割"),
+        (0x1F23A, "M", "営"),
+        (0x1F23B, "M", "配"),
+        (0x1F23C, "X"),
+        (0x1F240, "M", "〔本〕"),
+        (0x1F241, "M", "〔三〕"),
+        (0x1F242, "M", "〔二〕"),
+        (0x1F243, "M", "〔安〕"),
+        (0x1F244, "M", "〔点〕"),
+        (0x1F245, "M", "〔打〕"),
+        (0x1F246, "M", "〔盗〕"),
+        (0x1F247, "M", "〔勝〕"),
+        (0x1F248, "M", "〔敗〕"),
+        (0x1F249, "X"),
+        (0x1F250, "M", "得"),
+        (0x1F251, "M", "可"),
+        (0x1F252, "X"),
+        (0x1F260, "V"),
+        (0x1F266, "X"),
+        (0x1F300, "V"),
+        (0x1F6D8, "X"),
+        (0x1F6DC, "V"),
+        (0x1F6ED, "X"),
+        (0x1F6F0, "V"),
+        (0x1F6FD, "X"),
+        (0x1F700, "V"),
+        (0x1F777, "X"),
+        (0x1F77B, "V"),
+        (0x1F7DA, "X"),
+        (0x1F7E0, "V"),
+        (0x1F7EC, "X"),
+        (0x1F7F0, "V"),
+        (0x1F7F1, "X"),
+        (0x1F800, "V"),
+        (0x1F80C, "X"),
+        (0x1F810, "V"),
+        (0x1F848, "X"),
+        (0x1F850, "V"),
+        (0x1F85A, "X"),
+        (0x1F860, "V"),
+        (0x1F888, "X"),
+        (0x1F890, "V"),
+        (0x1F8AE, "X"),
+        (0x1F8B0, "V"),
+        (0x1F8B2, "X"),
+        (0x1F900, "V"),
+        (0x1FA54, "X"),
+        (0x1FA60, "V"),
+        (0x1FA6E, "X"),
+        (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'),
-    (0x1FACE, 'V'),
-    (0x1FADC, 'X'),
-    (0x1FAE0, 'V'),
-    (0x1FAE9, 'X'),
-    (0x1FAF0, 'V'),
-    (0x1FAF9, 'X'),
-    (0x1FB00, 'V'),
-    (0x1FB93, 'X'),
-    (0x1FB94, 'V'),
-    (0x1FBCB, 'X'),
-    (0x1FBF0, 'M', '0'),
-    (0x1FBF1, 'M', '1'),
-    (0x1FBF2, 'M', '2'),
-    (0x1FBF3, 'M', '3'),
-    (0x1FBF4, 'M', '4'),
-    (0x1FBF5, 'M', '5'),
-    (0x1FBF6, 'M', '6'),
-    (0x1FBF7, 'M', '7'),
-    (0x1FBF8, 'M', '8'),
-    (0x1FBF9, 'M', '9'),
-    (0x1FBFA, 'X'),
-    (0x20000, 'V'),
-    (0x2A6E0, 'X'),
-    (0x2A700, 'V'),
-    (0x2B73A, 'X'),
-    (0x2B740, 'V'),
-    (0x2B81E, 'X'),
-    (0x2B820, 'V'),
-    (0x2CEA2, 'X'),
-    (0x2CEB0, 'V'),
-    (0x2EBE1, 'X'),
-    (0x2EBF0, 'V'),
-    (0x2EE5E, 'X'),
-    (0x2F800, 'M', '丽'),
-    (0x2F801, 'M', '丸'),
-    (0x2F802, 'M', '乁'),
-    (0x2F803, 'M', '𠄢'),
-    (0x2F804, 'M', '你'),
-    (0x2F805, 'M', '侮'),
-    (0x2F806, 'M', '侻'),
-    (0x2F807, 'M', '倂'),
-    (0x2F808, 'M', '偺'),
-    (0x2F809, 'M', '備'),
-    (0x2F80A, 'M', '僧'),
-    (0x2F80B, 'M', '像'),
-    (0x2F80C, 'M', '㒞'),
-    (0x2F80D, 'M', '𠘺'),
-    (0x2F80E, 'M', '免'),
-    (0x2F80F, 'M', '兔'),
-    (0x2F810, 'M', '兤'),
-    (0x2F811, 'M', '具'),
-    (0x2F812, 'M', '𠔜'),
-    (0x2F813, 'M', '㒹'),
-    (0x2F814, 'M', '內'),
-    (0x2F815, 'M', '再'),
-    (0x2F816, 'M', '𠕋'),
-    (0x2F817, 'M', '冗'),
-    (0x2F818, 'M', '冤'),
-    (0x2F819, 'M', '仌'),
-    (0x2F81A, 'M', '冬'),
-    (0x2F81B, 'M', '况'),
-    (0x2F81C, 'M', '𩇟'),
-    (0x2F81D, 'M', '凵'),
-    (0x2F81E, 'M', '刃'),
-    (0x2F81F, 'M', '㓟'),
-    (0x2F820, 'M', '刻'),
-    (0x2F821, 'M', '剆'),
-    (0x2F822, 'M', '割'),
-    (0x2F823, 'M', '剷'),
-    (0x2F824, 'M', '㔕'),
-    (0x2F825, 'M', '勇'),
-    (0x2F826, 'M', '勉'),
-    (0x2F827, 'M', '勤'),
-    (0x2F828, 'M', '勺'),
-    (0x2F829, 'M', '包'),
-    (0x2F82A, 'M', '匆'),
-    (0x2F82B, 'M', '北'),
-    (0x2F82C, 'M', '卉'),
-    (0x2F82D, 'M', '卑'),
-    (0x2F82E, 'M', '博'),
-    (0x2F82F, 'M', '即'),
-    (0x2F830, 'M', '卽'),
-    (0x2F831, 'M', '卿'),
-    (0x2F834, 'M', '𠨬'),
-    (0x2F835, 'M', '灰'),
-    (0x2F836, 'M', '及'),
-    (0x2F837, 'M', '叟'),
-    (0x2F838, 'M', '𠭣'),
-    (0x2F839, 'M', '叫'),
-    (0x2F83A, 'M', '叱'),
-    (0x2F83B, 'M', '吆'),
-    (0x2F83C, 'M', '咞'),
-    (0x2F83D, 'M', '吸'),
-    (0x2F83E, 'M', '呈'),
-    (0x2F83F, 'M', '周'),
-    (0x2F840, 'M', '咢'),
+        (0x1FA90, "V"),
+        (0x1FABE, "X"),
+        (0x1FABF, "V"),
+        (0x1FAC6, "X"),
+        (0x1FACE, "V"),
+        (0x1FADC, "X"),
+        (0x1FAE0, "V"),
+        (0x1FAE9, "X"),
+        (0x1FAF0, "V"),
+        (0x1FAF9, "X"),
+        (0x1FB00, "V"),
+        (0x1FB93, "X"),
+        (0x1FB94, "V"),
+        (0x1FBCB, "X"),
+        (0x1FBF0, "M", "0"),
+        (0x1FBF1, "M", "1"),
+        (0x1FBF2, "M", "2"),
+        (0x1FBF3, "M", "3"),
+        (0x1FBF4, "M", "4"),
+        (0x1FBF5, "M", "5"),
+        (0x1FBF6, "M", "6"),
+        (0x1FBF7, "M", "7"),
+        (0x1FBF8, "M", "8"),
+        (0x1FBF9, "M", "9"),
+        (0x1FBFA, "X"),
+        (0x20000, "V"),
+        (0x2A6E0, "X"),
+        (0x2A700, "V"),
+        (0x2B73A, "X"),
+        (0x2B740, "V"),
+        (0x2B81E, "X"),
+        (0x2B820, "V"),
+        (0x2CEA2, "X"),
+        (0x2CEB0, "V"),
+        (0x2EBE1, "X"),
+        (0x2EBF0, "V"),
+        (0x2EE5E, "X"),
+        (0x2F800, "M", "丽"),
+        (0x2F801, "M", "丸"),
+        (0x2F802, "M", "乁"),
+        (0x2F803, "M", "𠄢"),
+        (0x2F804, "M", "你"),
+        (0x2F805, "M", "侮"),
+        (0x2F806, "M", "侻"),
+        (0x2F807, "M", "倂"),
+        (0x2F808, "M", "偺"),
+        (0x2F809, "M", "備"),
+        (0x2F80A, "M", "僧"),
+        (0x2F80B, "M", "像"),
+        (0x2F80C, "M", "㒞"),
+        (0x2F80D, "M", "𠘺"),
+        (0x2F80E, "M", "免"),
+        (0x2F80F, "M", "兔"),
+        (0x2F810, "M", "兤"),
+        (0x2F811, "M", "具"),
+        (0x2F812, "M", "𠔜"),
+        (0x2F813, "M", "㒹"),
+        (0x2F814, "M", "內"),
+        (0x2F815, "M", "再"),
+        (0x2F816, "M", "𠕋"),
+        (0x2F817, "M", "冗"),
+        (0x2F818, "M", "冤"),
+        (0x2F819, "M", "仌"),
+        (0x2F81A, "M", "冬"),
+        (0x2F81B, "M", "况"),
+        (0x2F81C, "M", "𩇟"),
+        (0x2F81D, "M", "凵"),
+        (0x2F81E, "M", "刃"),
+        (0x2F81F, "M", "㓟"),
+        (0x2F820, "M", "刻"),
+        (0x2F821, "M", "剆"),
+        (0x2F822, "M", "割"),
+        (0x2F823, "M", "剷"),
+        (0x2F824, "M", "㔕"),
+        (0x2F825, "M", "勇"),
+        (0x2F826, "M", "勉"),
+        (0x2F827, "M", "勤"),
+        (0x2F828, "M", "勺"),
+        (0x2F829, "M", "包"),
+        (0x2F82A, "M", "匆"),
+        (0x2F82B, "M", "北"),
+        (0x2F82C, "M", "卉"),
+        (0x2F82D, "M", "卑"),
+        (0x2F82E, "M", "博"),
+        (0x2F82F, "M", "即"),
+        (0x2F830, "M", "卽"),
+        (0x2F831, "M", "卿"),
+        (0x2F834, "M", "𠨬"),
+        (0x2F835, "M", "灰"),
+        (0x2F836, "M", "及"),
+        (0x2F837, "M", "叟"),
+        (0x2F838, "M", "𠭣"),
+        (0x2F839, "M", "叫"),
+        (0x2F83A, "M", "叱"),
+        (0x2F83B, "M", "吆"),
+        (0x2F83C, "M", "咞"),
+        (0x2F83D, "M", "吸"),
+        (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', '啓'),
-    (0x2F844, 'M', '啣'),
-    (0x2F845, 'M', '善'),
-    (0x2F847, 'M', '喙'),
-    (0x2F848, 'M', '喫'),
-    (0x2F849, 'M', '喳'),
-    (0x2F84A, 'M', '嗂'),
-    (0x2F84B, 'M', '圖'),
-    (0x2F84C, 'M', '嘆'),
-    (0x2F84D, 'M', '圗'),
-    (0x2F84E, 'M', '噑'),
-    (0x2F84F, 'M', '噴'),
-    (0x2F850, 'M', '切'),
-    (0x2F851, 'M', '壮'),
-    (0x2F852, 'M', '城'),
-    (0x2F853, 'M', '埴'),
-    (0x2F854, 'M', '堍'),
-    (0x2F855, 'M', '型'),
-    (0x2F856, 'M', '堲'),
-    (0x2F857, 'M', '報'),
-    (0x2F858, 'M', '墬'),
-    (0x2F859, 'M', '𡓤'),
-    (0x2F85A, 'M', '売'),
-    (0x2F85B, 'M', '壷'),
-    (0x2F85C, 'M', '夆'),
-    (0x2F85D, 'M', '多'),
-    (0x2F85E, 'M', '夢'),
-    (0x2F85F, 'M', '奢'),
-    (0x2F860, 'M', '𡚨'),
-    (0x2F861, 'M', '𡛪'),
-    (0x2F862, 'M', '姬'),
-    (0x2F863, 'M', '娛'),
-    (0x2F864, 'M', '娧'),
-    (0x2F865, 'M', '姘'),
-    (0x2F866, 'M', '婦'),
-    (0x2F867, 'M', '㛮'),
-    (0x2F868, 'X'),
-    (0x2F869, 'M', '嬈'),
-    (0x2F86A, 'M', '嬾'),
-    (0x2F86C, 'M', '𡧈'),
-    (0x2F86D, 'M', '寃'),
-    (0x2F86E, 'M', '寘'),
-    (0x2F86F, 'M', '寧'),
-    (0x2F870, 'M', '寳'),
-    (0x2F871, 'M', '𡬘'),
-    (0x2F872, 'M', '寿'),
-    (0x2F873, 'M', '将'),
-    (0x2F874, 'X'),
-    (0x2F875, 'M', '尢'),
-    (0x2F876, 'M', '㞁'),
-    (0x2F877, 'M', '屠'),
-    (0x2F878, 'M', '屮'),
-    (0x2F879, 'M', '峀'),
-    (0x2F87A, 'M', '岍'),
-    (0x2F87B, 'M', '𡷤'),
-    (0x2F87C, 'M', '嵃'),
-    (0x2F87D, 'M', '𡷦'),
-    (0x2F87E, 'M', '嵮'),
-    (0x2F87F, 'M', '嵫'),
-    (0x2F880, 'M', '嵼'),
-    (0x2F881, 'M', '巡'),
-    (0x2F882, 'M', '巢'),
-    (0x2F883, 'M', '㠯'),
-    (0x2F884, 'M', '巽'),
-    (0x2F885, 'M', '帨'),
-    (0x2F886, 'M', '帽'),
-    (0x2F887, 'M', '幩'),
-    (0x2F888, 'M', '㡢'),
-    (0x2F889, 'M', '𢆃'),
-    (0x2F88A, 'M', '㡼'),
-    (0x2F88B, 'M', '庰'),
-    (0x2F88C, 'M', '庳'),
-    (0x2F88D, 'M', '庶'),
-    (0x2F88E, 'M', '廊'),
-    (0x2F88F, 'M', '𪎒'),
-    (0x2F890, 'M', '廾'),
-    (0x2F891, 'M', '𢌱'),
-    (0x2F893, 'M', '舁'),
-    (0x2F894, 'M', '弢'),
-    (0x2F896, 'M', '㣇'),
-    (0x2F897, 'M', '𣊸'),
-    (0x2F898, 'M', '𦇚'),
-    (0x2F899, 'M', '形'),
-    (0x2F89A, 'M', '彫'),
-    (0x2F89B, 'M', '㣣'),
-    (0x2F89C, 'M', '徚'),
-    (0x2F89D, 'M', '忍'),
-    (0x2F89E, 'M', '志'),
-    (0x2F89F, 'M', '忹'),
-    (0x2F8A0, 'M', '悁'),
-    (0x2F8A1, 'M', '㤺'),
-    (0x2F8A2, 'M', '㤜'),
-    (0x2F8A3, 'M', '悔'),
-    (0x2F8A4, 'M', '𢛔'),
-    (0x2F8A5, 'M', '惇'),
-    (0x2F8A6, 'M', '慈'),
-    (0x2F8A7, 'M', '慌'),
-    (0x2F8A8, 'M', '慎'),
+        (0x2F841, "M", "哶"),
+        (0x2F842, "M", "唐"),
+        (0x2F843, "M", "啓"),
+        (0x2F844, "M", "啣"),
+        (0x2F845, "M", "善"),
+        (0x2F847, "M", "喙"),
+        (0x2F848, "M", "喫"),
+        (0x2F849, "M", "喳"),
+        (0x2F84A, "M", "嗂"),
+        (0x2F84B, "M", "圖"),
+        (0x2F84C, "M", "嘆"),
+        (0x2F84D, "M", "圗"),
+        (0x2F84E, "M", "噑"),
+        (0x2F84F, "M", "噴"),
+        (0x2F850, "M", "切"),
+        (0x2F851, "M", "壮"),
+        (0x2F852, "M", "城"),
+        (0x2F853, "M", "埴"),
+        (0x2F854, "M", "堍"),
+        (0x2F855, "M", "型"),
+        (0x2F856, "M", "堲"),
+        (0x2F857, "M", "報"),
+        (0x2F858, "M", "墬"),
+        (0x2F859, "M", "𡓤"),
+        (0x2F85A, "M", "売"),
+        (0x2F85B, "M", "壷"),
+        (0x2F85C, "M", "夆"),
+        (0x2F85D, "M", "多"),
+        (0x2F85E, "M", "夢"),
+        (0x2F85F, "M", "奢"),
+        (0x2F860, "M", "𡚨"),
+        (0x2F861, "M", "𡛪"),
+        (0x2F862, "M", "姬"),
+        (0x2F863, "M", "娛"),
+        (0x2F864, "M", "娧"),
+        (0x2F865, "M", "姘"),
+        (0x2F866, "M", "婦"),
+        (0x2F867, "M", "㛮"),
+        (0x2F868, "X"),
+        (0x2F869, "M", "嬈"),
+        (0x2F86A, "M", "嬾"),
+        (0x2F86C, "M", "𡧈"),
+        (0x2F86D, "M", "寃"),
+        (0x2F86E, "M", "寘"),
+        (0x2F86F, "M", "寧"),
+        (0x2F870, "M", "寳"),
+        (0x2F871, "M", "𡬘"),
+        (0x2F872, "M", "寿"),
+        (0x2F873, "M", "将"),
+        (0x2F874, "X"),
+        (0x2F875, "M", "尢"),
+        (0x2F876, "M", "㞁"),
+        (0x2F877, "M", "屠"),
+        (0x2F878, "M", "屮"),
+        (0x2F879, "M", "峀"),
+        (0x2F87A, "M", "岍"),
+        (0x2F87B, "M", "𡷤"),
+        (0x2F87C, "M", "嵃"),
+        (0x2F87D, "M", "𡷦"),
+        (0x2F87E, "M", "嵮"),
+        (0x2F87F, "M", "嵫"),
+        (0x2F880, "M", "嵼"),
+        (0x2F881, "M", "巡"),
+        (0x2F882, "M", "巢"),
+        (0x2F883, "M", "㠯"),
+        (0x2F884, "M", "巽"),
+        (0x2F885, "M", "帨"),
+        (0x2F886, "M", "帽"),
+        (0x2F887, "M", "幩"),
+        (0x2F888, "M", "㡢"),
+        (0x2F889, "M", "𢆃"),
+        (0x2F88A, "M", "㡼"),
+        (0x2F88B, "M", "庰"),
+        (0x2F88C, "M", "庳"),
+        (0x2F88D, "M", "庶"),
+        (0x2F88E, "M", "廊"),
+        (0x2F88F, "M", "𪎒"),
+        (0x2F890, "M", "廾"),
+        (0x2F891, "M", "𢌱"),
+        (0x2F893, "M", "舁"),
+        (0x2F894, "M", "弢"),
+        (0x2F896, "M", "㣇"),
+        (0x2F897, "M", "𣊸"),
+        (0x2F898, "M", "𦇚"),
+        (0x2F899, "M", "形"),
+        (0x2F89A, "M", "彫"),
+        (0x2F89B, "M", "㣣"),
+        (0x2F89C, "M", "徚"),
+        (0x2F89D, "M", "忍"),
+        (0x2F89E, "M", "志"),
+        (0x2F89F, "M", "忹"),
+        (0x2F8A0, "M", "悁"),
+        (0x2F8A1, "M", "㤺"),
+        (0x2F8A2, "M", "㤜"),
+        (0x2F8A3, "M", "悔"),
+        (0x2F8A4, "M", "𢛔"),
+        (0x2F8A5, "M", "惇"),
+        (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', '憎'),
-    (0x2F8AC, 'M', '憲'),
-    (0x2F8AD, 'M', '憤'),
-    (0x2F8AE, 'M', '憯'),
-    (0x2F8AF, 'M', '懞'),
-    (0x2F8B0, 'M', '懲'),
-    (0x2F8B1, 'M', '懶'),
-    (0x2F8B2, 'M', '成'),
-    (0x2F8B3, 'M', '戛'),
-    (0x2F8B4, 'M', '扝'),
-    (0x2F8B5, 'M', '抱'),
-    (0x2F8B6, 'M', '拔'),
-    (0x2F8B7, 'M', '捐'),
-    (0x2F8B8, 'M', '𢬌'),
-    (0x2F8B9, 'M', '挽'),
-    (0x2F8BA, 'M', '拼'),
-    (0x2F8BB, 'M', '捨'),
-    (0x2F8BC, 'M', '掃'),
-    (0x2F8BD, 'M', '揤'),
-    (0x2F8BE, 'M', '𢯱'),
-    (0x2F8BF, 'M', '搢'),
-    (0x2F8C0, 'M', '揅'),
-    (0x2F8C1, 'M', '掩'),
-    (0x2F8C2, 'M', '㨮'),
-    (0x2F8C3, 'M', '摩'),
-    (0x2F8C4, 'M', '摾'),
-    (0x2F8C5, 'M', '撝'),
-    (0x2F8C6, 'M', '摷'),
-    (0x2F8C7, 'M', '㩬'),
-    (0x2F8C8, 'M', '敏'),
-    (0x2F8C9, 'M', '敬'),
-    (0x2F8CA, 'M', '𣀊'),
-    (0x2F8CB, 'M', '旣'),
-    (0x2F8CC, 'M', '書'),
-    (0x2F8CD, 'M', '晉'),
-    (0x2F8CE, 'M', '㬙'),
-    (0x2F8CF, 'M', '暑'),
-    (0x2F8D0, 'M', '㬈'),
-    (0x2F8D1, 'M', '㫤'),
-    (0x2F8D2, 'M', '冒'),
-    (0x2F8D3, 'M', '冕'),
-    (0x2F8D4, 'M', '最'),
-    (0x2F8D5, 'M', '暜'),
-    (0x2F8D6, 'M', '肭'),
-    (0x2F8D7, 'M', '䏙'),
-    (0x2F8D8, 'M', '朗'),
-    (0x2F8D9, 'M', '望'),
-    (0x2F8DA, 'M', '朡'),
-    (0x2F8DB, 'M', '杞'),
-    (0x2F8DC, 'M', '杓'),
-    (0x2F8DD, 'M', '𣏃'),
-    (0x2F8DE, 'M', '㭉'),
-    (0x2F8DF, 'M', '柺'),
-    (0x2F8E0, 'M', '枅'),
-    (0x2F8E1, 'M', '桒'),
-    (0x2F8E2, 'M', '梅'),
-    (0x2F8E3, 'M', '𣑭'),
-    (0x2F8E4, 'M', '梎'),
-    (0x2F8E5, 'M', '栟'),
-    (0x2F8E6, 'M', '椔'),
-    (0x2F8E7, 'M', '㮝'),
-    (0x2F8E8, 'M', '楂'),
-    (0x2F8E9, 'M', '榣'),
-    (0x2F8EA, 'M', '槪'),
-    (0x2F8EB, 'M', '檨'),
-    (0x2F8EC, 'M', '𣚣'),
-    (0x2F8ED, 'M', '櫛'),
-    (0x2F8EE, 'M', '㰘'),
-    (0x2F8EF, 'M', '次'),
-    (0x2F8F0, 'M', '𣢧'),
-    (0x2F8F1, 'M', '歔'),
-    (0x2F8F2, 'M', '㱎'),
-    (0x2F8F3, 'M', '歲'),
-    (0x2F8F4, 'M', '殟'),
-    (0x2F8F5, 'M', '殺'),
-    (0x2F8F6, 'M', '殻'),
-    (0x2F8F7, 'M', '𣪍'),
-    (0x2F8F8, 'M', '𡴋'),
-    (0x2F8F9, 'M', '𣫺'),
-    (0x2F8FA, 'M', '汎'),
-    (0x2F8FB, 'M', '𣲼'),
-    (0x2F8FC, 'M', '沿'),
-    (0x2F8FD, 'M', '泍'),
-    (0x2F8FE, 'M', '汧'),
-    (0x2F8FF, 'M', '洖'),
-    (0x2F900, 'M', '派'),
-    (0x2F901, 'M', '海'),
-    (0x2F902, 'M', '流'),
-    (0x2F903, 'M', '浩'),
-    (0x2F904, 'M', '浸'),
-    (0x2F905, 'M', '涅'),
-    (0x2F906, 'M', '𣴞'),
-    (0x2F907, 'M', '洴'),
-    (0x2F908, 'M', '港'),
-    (0x2F909, 'M', '湮'),
-    (0x2F90A, 'M', '㴳'),
-    (0x2F90B, 'M', '滋'),
-    (0x2F90C, 'M', '滇'),
+        (0x2F8A9, "M", "慌"),
+        (0x2F8AA, "M", "慺"),
+        (0x2F8AB, "M", "憎"),
+        (0x2F8AC, "M", "憲"),
+        (0x2F8AD, "M", "憤"),
+        (0x2F8AE, "M", "憯"),
+        (0x2F8AF, "M", "懞"),
+        (0x2F8B0, "M", "懲"),
+        (0x2F8B1, "M", "懶"),
+        (0x2F8B2, "M", "成"),
+        (0x2F8B3, "M", "戛"),
+        (0x2F8B4, "M", "扝"),
+        (0x2F8B5, "M", "抱"),
+        (0x2F8B6, "M", "拔"),
+        (0x2F8B7, "M", "捐"),
+        (0x2F8B8, "M", "𢬌"),
+        (0x2F8B9, "M", "挽"),
+        (0x2F8BA, "M", "拼"),
+        (0x2F8BB, "M", "捨"),
+        (0x2F8BC, "M", "掃"),
+        (0x2F8BD, "M", "揤"),
+        (0x2F8BE, "M", "𢯱"),
+        (0x2F8BF, "M", "搢"),
+        (0x2F8C0, "M", "揅"),
+        (0x2F8C1, "M", "掩"),
+        (0x2F8C2, "M", "㨮"),
+        (0x2F8C3, "M", "摩"),
+        (0x2F8C4, "M", "摾"),
+        (0x2F8C5, "M", "撝"),
+        (0x2F8C6, "M", "摷"),
+        (0x2F8C7, "M", "㩬"),
+        (0x2F8C8, "M", "敏"),
+        (0x2F8C9, "M", "敬"),
+        (0x2F8CA, "M", "𣀊"),
+        (0x2F8CB, "M", "旣"),
+        (0x2F8CC, "M", "書"),
+        (0x2F8CD, "M", "晉"),
+        (0x2F8CE, "M", "㬙"),
+        (0x2F8CF, "M", "暑"),
+        (0x2F8D0, "M", "㬈"),
+        (0x2F8D1, "M", "㫤"),
+        (0x2F8D2, "M", "冒"),
+        (0x2F8D3, "M", "冕"),
+        (0x2F8D4, "M", "最"),
+        (0x2F8D5, "M", "暜"),
+        (0x2F8D6, "M", "肭"),
+        (0x2F8D7, "M", "䏙"),
+        (0x2F8D8, "M", "朗"),
+        (0x2F8D9, "M", "望"),
+        (0x2F8DA, "M", "朡"),
+        (0x2F8DB, "M", "杞"),
+        (0x2F8DC, "M", "杓"),
+        (0x2F8DD, "M", "𣏃"),
+        (0x2F8DE, "M", "㭉"),
+        (0x2F8DF, "M", "柺"),
+        (0x2F8E0, "M", "枅"),
+        (0x2F8E1, "M", "桒"),
+        (0x2F8E2, "M", "梅"),
+        (0x2F8E3, "M", "𣑭"),
+        (0x2F8E4, "M", "梎"),
+        (0x2F8E5, "M", "栟"),
+        (0x2F8E6, "M", "椔"),
+        (0x2F8E7, "M", "㮝"),
+        (0x2F8E8, "M", "楂"),
+        (0x2F8E9, "M", "榣"),
+        (0x2F8EA, "M", "槪"),
+        (0x2F8EB, "M", "檨"),
+        (0x2F8EC, "M", "𣚣"),
+        (0x2F8ED, "M", "櫛"),
+        (0x2F8EE, "M", "㰘"),
+        (0x2F8EF, "M", "次"),
+        (0x2F8F0, "M", "𣢧"),
+        (0x2F8F1, "M", "歔"),
+        (0x2F8F2, "M", "㱎"),
+        (0x2F8F3, "M", "歲"),
+        (0x2F8F4, "M", "殟"),
+        (0x2F8F5, "M", "殺"),
+        (0x2F8F6, "M", "殻"),
+        (0x2F8F7, "M", "𣪍"),
+        (0x2F8F8, "M", "𡴋"),
+        (0x2F8F9, "M", "𣫺"),
+        (0x2F8FA, "M", "汎"),
+        (0x2F8FB, "M", "𣲼"),
+        (0x2F8FC, "M", "沿"),
+        (0x2F8FD, "M", "泍"),
+        (0x2F8FE, "M", "汧"),
+        (0x2F8FF, "M", "洖"),
+        (0x2F900, "M", "派"),
+        (0x2F901, "M", "海"),
+        (0x2F902, "M", "流"),
+        (0x2F903, "M", "浩"),
+        (0x2F904, "M", "浸"),
+        (0x2F905, "M", "涅"),
+        (0x2F906, "M", "𣴞"),
+        (0x2F907, "M", "洴"),
+        (0x2F908, "M", "港"),
+        (0x2F909, "M", "湮"),
+        (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', '潮'),
-    (0x2F910, 'M', '𣽞'),
-    (0x2F911, 'M', '𣾎'),
-    (0x2F912, 'M', '濆'),
-    (0x2F913, 'M', '瀹'),
-    (0x2F914, 'M', '瀞'),
-    (0x2F915, 'M', '瀛'),
-    (0x2F916, 'M', '㶖'),
-    (0x2F917, 'M', '灊'),
-    (0x2F918, 'M', '災'),
-    (0x2F919, 'M', '灷'),
-    (0x2F91A, 'M', '炭'),
-    (0x2F91B, 'M', '𠔥'),
-    (0x2F91C, 'M', '煅'),
-    (0x2F91D, 'M', '𤉣'),
-    (0x2F91E, 'M', '熜'),
-    (0x2F91F, 'X'),
-    (0x2F920, 'M', '爨'),
-    (0x2F921, 'M', '爵'),
-    (0x2F922, 'M', '牐'),
-    (0x2F923, 'M', '𤘈'),
-    (0x2F924, 'M', '犀'),
-    (0x2F925, 'M', '犕'),
-    (0x2F926, 'M', '𤜵'),
-    (0x2F927, 'M', '𤠔'),
-    (0x2F928, 'M', '獺'),
-    (0x2F929, 'M', '王'),
-    (0x2F92A, 'M', '㺬'),
-    (0x2F92B, 'M', '玥'),
-    (0x2F92C, 'M', '㺸'),
-    (0x2F92E, 'M', '瑇'),
-    (0x2F92F, 'M', '瑜'),
-    (0x2F930, 'M', '瑱'),
-    (0x2F931, 'M', '璅'),
-    (0x2F932, 'M', '瓊'),
-    (0x2F933, 'M', '㼛'),
-    (0x2F934, 'M', '甤'),
-    (0x2F935, 'M', '𤰶'),
-    (0x2F936, 'M', '甾'),
-    (0x2F937, 'M', '𤲒'),
-    (0x2F938, 'M', '異'),
-    (0x2F939, 'M', '𢆟'),
-    (0x2F93A, 'M', '瘐'),
-    (0x2F93B, 'M', '𤾡'),
-    (0x2F93C, 'M', '𤾸'),
-    (0x2F93D, 'M', '𥁄'),
-    (0x2F93E, 'M', '㿼'),
-    (0x2F93F, 'M', '䀈'),
-    (0x2F940, 'M', '直'),
-    (0x2F941, 'M', '𥃳'),
-    (0x2F942, 'M', '𥃲'),
-    (0x2F943, 'M', '𥄙'),
-    (0x2F944, 'M', '𥄳'),
-    (0x2F945, 'M', '眞'),
-    (0x2F946, 'M', '真'),
-    (0x2F948, 'M', '睊'),
-    (0x2F949, 'M', '䀹'),
-    (0x2F94A, 'M', '瞋'),
-    (0x2F94B, 'M', '䁆'),
-    (0x2F94C, 'M', '䂖'),
-    (0x2F94D, 'M', '𥐝'),
-    (0x2F94E, 'M', '硎'),
-    (0x2F94F, 'M', '碌'),
-    (0x2F950, 'M', '磌'),
-    (0x2F951, 'M', '䃣'),
-    (0x2F952, 'M', '𥘦'),
-    (0x2F953, 'M', '祖'),
-    (0x2F954, 'M', '𥚚'),
-    (0x2F955, 'M', '𥛅'),
-    (0x2F956, 'M', '福'),
-    (0x2F957, 'M', '秫'),
-    (0x2F958, 'M', '䄯'),
-    (0x2F959, 'M', '穀'),
-    (0x2F95A, 'M', '穊'),
-    (0x2F95B, 'M', '穏'),
-    (0x2F95C, 'M', '𥥼'),
-    (0x2F95D, 'M', '𥪧'),
-    (0x2F95F, 'X'),
-    (0x2F960, 'M', '䈂'),
-    (0x2F961, 'M', '𥮫'),
-    (0x2F962, 'M', '篆'),
-    (0x2F963, 'M', '築'),
-    (0x2F964, 'M', '䈧'),
-    (0x2F965, 'M', '𥲀'),
-    (0x2F966, 'M', '糒'),
-    (0x2F967, 'M', '䊠'),
-    (0x2F968, 'M', '糨'),
-    (0x2F969, 'M', '糣'),
-    (0x2F96A, 'M', '紀'),
-    (0x2F96B, 'M', '𥾆'),
-    (0x2F96C, 'M', '絣'),
-    (0x2F96D, 'M', '䌁'),
-    (0x2F96E, 'M', '緇'),
-    (0x2F96F, 'M', '縂'),
-    (0x2F970, 'M', '繅'),
-    (0x2F971, 'M', '䌴'),
-    (0x2F972, 'M', '𦈨'),
-    (0x2F973, 'M', '𦉇'),
+        (0x2F90D, "M", "𣻑"),
+        (0x2F90E, "M", "淹"),
+        (0x2F90F, "M", "潮"),
+        (0x2F910, "M", "𣽞"),
+        (0x2F911, "M", "𣾎"),
+        (0x2F912, "M", "濆"),
+        (0x2F913, "M", "瀹"),
+        (0x2F914, "M", "瀞"),
+        (0x2F915, "M", "瀛"),
+        (0x2F916, "M", "㶖"),
+        (0x2F917, "M", "灊"),
+        (0x2F918, "M", "災"),
+        (0x2F919, "M", "灷"),
+        (0x2F91A, "M", "炭"),
+        (0x2F91B, "M", "𠔥"),
+        (0x2F91C, "M", "煅"),
+        (0x2F91D, "M", "𤉣"),
+        (0x2F91E, "M", "熜"),
+        (0x2F91F, "X"),
+        (0x2F920, "M", "爨"),
+        (0x2F921, "M", "爵"),
+        (0x2F922, "M", "牐"),
+        (0x2F923, "M", "𤘈"),
+        (0x2F924, "M", "犀"),
+        (0x2F925, "M", "犕"),
+        (0x2F926, "M", "𤜵"),
+        (0x2F927, "M", "𤠔"),
+        (0x2F928, "M", "獺"),
+        (0x2F929, "M", "王"),
+        (0x2F92A, "M", "㺬"),
+        (0x2F92B, "M", "玥"),
+        (0x2F92C, "M", "㺸"),
+        (0x2F92E, "M", "瑇"),
+        (0x2F92F, "M", "瑜"),
+        (0x2F930, "M", "瑱"),
+        (0x2F931, "M", "璅"),
+        (0x2F932, "M", "瓊"),
+        (0x2F933, "M", "㼛"),
+        (0x2F934, "M", "甤"),
+        (0x2F935, "M", "𤰶"),
+        (0x2F936, "M", "甾"),
+        (0x2F937, "M", "𤲒"),
+        (0x2F938, "M", "異"),
+        (0x2F939, "M", "𢆟"),
+        (0x2F93A, "M", "瘐"),
+        (0x2F93B, "M", "𤾡"),
+        (0x2F93C, "M", "𤾸"),
+        (0x2F93D, "M", "𥁄"),
+        (0x2F93E, "M", "㿼"),
+        (0x2F93F, "M", "䀈"),
+        (0x2F940, "M", "直"),
+        (0x2F941, "M", "𥃳"),
+        (0x2F942, "M", "𥃲"),
+        (0x2F943, "M", "𥄙"),
+        (0x2F944, "M", "𥄳"),
+        (0x2F945, "M", "眞"),
+        (0x2F946, "M", "真"),
+        (0x2F948, "M", "睊"),
+        (0x2F949, "M", "䀹"),
+        (0x2F94A, "M", "瞋"),
+        (0x2F94B, "M", "䁆"),
+        (0x2F94C, "M", "䂖"),
+        (0x2F94D, "M", "𥐝"),
+        (0x2F94E, "M", "硎"),
+        (0x2F94F, "M", "碌"),
+        (0x2F950, "M", "磌"),
+        (0x2F951, "M", "䃣"),
+        (0x2F952, "M", "𥘦"),
+        (0x2F953, "M", "祖"),
+        (0x2F954, "M", "𥚚"),
+        (0x2F955, "M", "𥛅"),
+        (0x2F956, "M", "福"),
+        (0x2F957, "M", "秫"),
+        (0x2F958, "M", "䄯"),
+        (0x2F959, "M", "穀"),
+        (0x2F95A, "M", "穊"),
+        (0x2F95B, "M", "穏"),
+        (0x2F95C, "M", "𥥼"),
+        (0x2F95D, "M", "𥪧"),
+        (0x2F95F, "X"),
+        (0x2F960, "M", "䈂"),
+        (0x2F961, "M", "𥮫"),
+        (0x2F962, "M", "篆"),
+        (0x2F963, "M", "築"),
+        (0x2F964, "M", "䈧"),
+        (0x2F965, "M", "𥲀"),
+        (0x2F966, "M", "糒"),
+        (0x2F967, "M", "䊠"),
+        (0x2F968, "M", "糨"),
+        (0x2F969, "M", "糣"),
+        (0x2F96A, "M", "紀"),
+        (0x2F96B, "M", "𥾆"),
+        (0x2F96C, "M", "絣"),
+        (0x2F96D, "M", "䌁"),
+        (0x2F96E, "M", "緇"),
+        (0x2F96F, "M", "縂"),
+        (0x2F970, "M", "繅"),
+        (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', '罺'),
-    (0x2F977, 'M', '𦌾'),
-    (0x2F978, 'M', '羕'),
-    (0x2F979, 'M', '翺'),
-    (0x2F97A, 'M', '者'),
-    (0x2F97B, 'M', '𦓚'),
-    (0x2F97C, 'M', '𦔣'),
-    (0x2F97D, 'M', '聠'),
-    (0x2F97E, 'M', '𦖨'),
-    (0x2F97F, 'M', '聰'),
-    (0x2F980, 'M', '𣍟'),
-    (0x2F981, 'M', '䏕'),
-    (0x2F982, 'M', '育'),
-    (0x2F983, 'M', '脃'),
-    (0x2F984, 'M', '䐋'),
-    (0x2F985, 'M', '脾'),
-    (0x2F986, 'M', '媵'),
-    (0x2F987, 'M', '𦞧'),
-    (0x2F988, 'M', '𦞵'),
-    (0x2F989, 'M', '𣎓'),
-    (0x2F98A, 'M', '𣎜'),
-    (0x2F98B, 'M', '舁'),
-    (0x2F98C, 'M', '舄'),
-    (0x2F98D, 'M', '辞'),
-    (0x2F98E, 'M', '䑫'),
-    (0x2F98F, 'M', '芑'),
-    (0x2F990, 'M', '芋'),
-    (0x2F991, 'M', '芝'),
-    (0x2F992, 'M', '劳'),
-    (0x2F993, 'M', '花'),
-    (0x2F994, 'M', '芳'),
-    (0x2F995, 'M', '芽'),
-    (0x2F996, 'M', '苦'),
-    (0x2F997, 'M', '𦬼'),
-    (0x2F998, 'M', '若'),
-    (0x2F999, 'M', '茝'),
-    (0x2F99A, 'M', '荣'),
-    (0x2F99B, 'M', '莭'),
-    (0x2F99C, 'M', '茣'),
-    (0x2F99D, 'M', '莽'),
-    (0x2F99E, 'M', '菧'),
-    (0x2F99F, 'M', '著'),
-    (0x2F9A0, 'M', '荓'),
-    (0x2F9A1, 'M', '菊'),
-    (0x2F9A2, 'M', '菌'),
-    (0x2F9A3, 'M', '菜'),
-    (0x2F9A4, 'M', '𦰶'),
-    (0x2F9A5, 'M', '𦵫'),
-    (0x2F9A6, 'M', '𦳕'),
-    (0x2F9A7, 'M', '䔫'),
-    (0x2F9A8, 'M', '蓱'),
-    (0x2F9A9, 'M', '蓳'),
-    (0x2F9AA, 'M', '蔖'),
-    (0x2F9AB, 'M', '𧏊'),
-    (0x2F9AC, 'M', '蕤'),
-    (0x2F9AD, 'M', '𦼬'),
-    (0x2F9AE, 'M', '䕝'),
-    (0x2F9AF, 'M', '䕡'),
-    (0x2F9B0, 'M', '𦾱'),
-    (0x2F9B1, 'M', '𧃒'),
-    (0x2F9B2, 'M', '䕫'),
-    (0x2F9B3, 'M', '虐'),
-    (0x2F9B4, 'M', '虜'),
-    (0x2F9B5, 'M', '虧'),
-    (0x2F9B6, 'M', '虩'),
-    (0x2F9B7, 'M', '蚩'),
-    (0x2F9B8, 'M', '蚈'),
-    (0x2F9B9, 'M', '蜎'),
-    (0x2F9BA, 'M', '蛢'),
-    (0x2F9BB, 'M', '蝹'),
-    (0x2F9BC, 'M', '蜨'),
-    (0x2F9BD, 'M', '蝫'),
-    (0x2F9BE, 'M', '螆'),
-    (0x2F9BF, 'X'),
-    (0x2F9C0, 'M', '蟡'),
-    (0x2F9C1, 'M', '蠁'),
-    (0x2F9C2, 'M', '䗹'),
-    (0x2F9C3, 'M', '衠'),
-    (0x2F9C4, 'M', '衣'),
-    (0x2F9C5, 'M', '𧙧'),
-    (0x2F9C6, 'M', '裗'),
-    (0x2F9C7, 'M', '裞'),
-    (0x2F9C8, 'M', '䘵'),
-    (0x2F9C9, 'M', '裺'),
-    (0x2F9CA, 'M', '㒻'),
-    (0x2F9CB, 'M', '𧢮'),
-    (0x2F9CC, 'M', '𧥦'),
-    (0x2F9CD, 'M', '䚾'),
-    (0x2F9CE, 'M', '䛇'),
-    (0x2F9CF, 'M', '誠'),
-    (0x2F9D0, 'M', '諭'),
-    (0x2F9D1, 'M', '變'),
-    (0x2F9D2, 'M', '豕'),
-    (0x2F9D3, 'M', '𧲨'),
-    (0x2F9D4, 'M', '貫'),
-    (0x2F9D5, 'M', '賁'),
-    (0x2F9D6, 'M', '贛'),
-    (0x2F9D7, 'M', '起'),
+        (0x2F974, "M", "䍙"),
+        (0x2F975, "M", "𦋙"),
+        (0x2F976, "M", "罺"),
+        (0x2F977, "M", "𦌾"),
+        (0x2F978, "M", "羕"),
+        (0x2F979, "M", "翺"),
+        (0x2F97A, "M", "者"),
+        (0x2F97B, "M", "𦓚"),
+        (0x2F97C, "M", "𦔣"),
+        (0x2F97D, "M", "聠"),
+        (0x2F97E, "M", "𦖨"),
+        (0x2F97F, "M", "聰"),
+        (0x2F980, "M", "𣍟"),
+        (0x2F981, "M", "䏕"),
+        (0x2F982, "M", "育"),
+        (0x2F983, "M", "脃"),
+        (0x2F984, "M", "䐋"),
+        (0x2F985, "M", "脾"),
+        (0x2F986, "M", "媵"),
+        (0x2F987, "M", "𦞧"),
+        (0x2F988, "M", "𦞵"),
+        (0x2F989, "M", "𣎓"),
+        (0x2F98A, "M", "𣎜"),
+        (0x2F98B, "M", "舁"),
+        (0x2F98C, "M", "舄"),
+        (0x2F98D, "M", "辞"),
+        (0x2F98E, "M", "䑫"),
+        (0x2F98F, "M", "芑"),
+        (0x2F990, "M", "芋"),
+        (0x2F991, "M", "芝"),
+        (0x2F992, "M", "劳"),
+        (0x2F993, "M", "花"),
+        (0x2F994, "M", "芳"),
+        (0x2F995, "M", "芽"),
+        (0x2F996, "M", "苦"),
+        (0x2F997, "M", "𦬼"),
+        (0x2F998, "M", "若"),
+        (0x2F999, "M", "茝"),
+        (0x2F99A, "M", "荣"),
+        (0x2F99B, "M", "莭"),
+        (0x2F99C, "M", "茣"),
+        (0x2F99D, "M", "莽"),
+        (0x2F99E, "M", "菧"),
+        (0x2F99F, "M", "著"),
+        (0x2F9A0, "M", "荓"),
+        (0x2F9A1, "M", "菊"),
+        (0x2F9A2, "M", "菌"),
+        (0x2F9A3, "M", "菜"),
+        (0x2F9A4, "M", "𦰶"),
+        (0x2F9A5, "M", "𦵫"),
+        (0x2F9A6, "M", "𦳕"),
+        (0x2F9A7, "M", "䔫"),
+        (0x2F9A8, "M", "蓱"),
+        (0x2F9A9, "M", "蓳"),
+        (0x2F9AA, "M", "蔖"),
+        (0x2F9AB, "M", "𧏊"),
+        (0x2F9AC, "M", "蕤"),
+        (0x2F9AD, "M", "𦼬"),
+        (0x2F9AE, "M", "䕝"),
+        (0x2F9AF, "M", "䕡"),
+        (0x2F9B0, "M", "𦾱"),
+        (0x2F9B1, "M", "𧃒"),
+        (0x2F9B2, "M", "䕫"),
+        (0x2F9B3, "M", "虐"),
+        (0x2F9B4, "M", "虜"),
+        (0x2F9B5, "M", "虧"),
+        (0x2F9B6, "M", "虩"),
+        (0x2F9B7, "M", "蚩"),
+        (0x2F9B8, "M", "蚈"),
+        (0x2F9B9, "M", "蜎"),
+        (0x2F9BA, "M", "蛢"),
+        (0x2F9BB, "M", "蝹"),
+        (0x2F9BC, "M", "蜨"),
+        (0x2F9BD, "M", "蝫"),
+        (0x2F9BE, "M", "螆"),
+        (0x2F9BF, "X"),
+        (0x2F9C0, "M", "蟡"),
+        (0x2F9C1, "M", "蠁"),
+        (0x2F9C2, "M", "䗹"),
+        (0x2F9C3, "M", "衠"),
+        (0x2F9C4, "M", "衣"),
+        (0x2F9C5, "M", "𧙧"),
+        (0x2F9C6, "M", "裗"),
+        (0x2F9C7, "M", "裞"),
+        (0x2F9C8, "M", "䘵"),
+        (0x2F9C9, "M", "裺"),
+        (0x2F9CA, "M", "㒻"),
+        (0x2F9CB, "M", "𧢮"),
+        (0x2F9CC, "M", "𧥦"),
+        (0x2F9CD, "M", "䚾"),
+        (0x2F9CE, "M", "䛇"),
+        (0x2F9CF, "M", "誠"),
+        (0x2F9D0, "M", "諭"),
+        (0x2F9D1, "M", "變"),
+        (0x2F9D2, "M", "豕"),
+        (0x2F9D3, "M", "𧲨"),
+        (0x2F9D4, "M", "貫"),
+        (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', '跋'),
-    (0x2F9DB, 'M', '趼'),
-    (0x2F9DC, 'M', '跰'),
-    (0x2F9DD, 'M', '𠣞'),
-    (0x2F9DE, 'M', '軔'),
-    (0x2F9DF, 'M', '輸'),
-    (0x2F9E0, 'M', '𨗒'),
-    (0x2F9E1, 'M', '𨗭'),
-    (0x2F9E2, 'M', '邔'),
-    (0x2F9E3, 'M', '郱'),
-    (0x2F9E4, 'M', '鄑'),
-    (0x2F9E5, 'M', '𨜮'),
-    (0x2F9E6, 'M', '鄛'),
-    (0x2F9E7, 'M', '鈸'),
-    (0x2F9E8, 'M', '鋗'),
-    (0x2F9E9, 'M', '鋘'),
-    (0x2F9EA, 'M', '鉼'),
-    (0x2F9EB, 'M', '鏹'),
-    (0x2F9EC, 'M', '鐕'),
-    (0x2F9ED, 'M', '𨯺'),
-    (0x2F9EE, 'M', '開'),
-    (0x2F9EF, 'M', '䦕'),
-    (0x2F9F0, 'M', '閷'),
-    (0x2F9F1, 'M', '𨵷'),
-    (0x2F9F2, 'M', '䧦'),
-    (0x2F9F3, 'M', '雃'),
-    (0x2F9F4, 'M', '嶲'),
-    (0x2F9F5, 'M', '霣'),
-    (0x2F9F6, 'M', '𩅅'),
-    (0x2F9F7, 'M', '𩈚'),
-    (0x2F9F8, 'M', '䩮'),
-    (0x2F9F9, 'M', '䩶'),
-    (0x2F9FA, 'M', '韠'),
-    (0x2F9FB, 'M', '𩐊'),
-    (0x2F9FC, 'M', '䪲'),
-    (0x2F9FD, 'M', '𩒖'),
-    (0x2F9FE, 'M', '頋'),
-    (0x2FA00, 'M', '頩'),
-    (0x2FA01, 'M', '𩖶'),
-    (0x2FA02, 'M', '飢'),
-    (0x2FA03, 'M', '䬳'),
-    (0x2FA04, 'M', '餩'),
-    (0x2FA05, 'M', '馧'),
-    (0x2FA06, 'M', '駂'),
-    (0x2FA07, 'M', '駾'),
-    (0x2FA08, 'M', '䯎'),
-    (0x2FA09, 'M', '𩬰'),
-    (0x2FA0A, 'M', '鬒'),
-    (0x2FA0B, 'M', '鱀'),
-    (0x2FA0C, 'M', '鳽'),
-    (0x2FA0D, 'M', '䳎'),
-    (0x2FA0E, 'M', '䳭'),
-    (0x2FA0F, 'M', '鵧'),
-    (0x2FA10, 'M', '𪃎'),
-    (0x2FA11, 'M', '䳸'),
-    (0x2FA12, 'M', '𪄅'),
-    (0x2FA13, 'M', '𪈎'),
-    (0x2FA14, 'M', '𪊑'),
-    (0x2FA15, 'M', '麻'),
-    (0x2FA16, 'M', '䵖'),
-    (0x2FA17, 'M', '黹'),
-    (0x2FA18, 'M', '黾'),
-    (0x2FA19, 'M', '鼅'),
-    (0x2FA1A, 'M', '鼏'),
-    (0x2FA1B, 'M', '鼖'),
-    (0x2FA1C, 'M', '鼻'),
-    (0x2FA1D, 'M', '𪘀'),
-    (0x2FA1E, 'X'),
-    (0x30000, 'V'),
-    (0x3134B, 'X'),
-    (0x31350, 'V'),
-    (0x323B0, 'X'),
-    (0xE0100, 'I'),
-    (0xE01F0, 'X'),
+        (0x2F9D8, "M", "𧼯"),
+        (0x2F9D9, "M", "𠠄"),
+        (0x2F9DA, "M", "跋"),
+        (0x2F9DB, "M", "趼"),
+        (0x2F9DC, "M", "跰"),
+        (0x2F9DD, "M", "𠣞"),
+        (0x2F9DE, "M", "軔"),
+        (0x2F9DF, "M", "輸"),
+        (0x2F9E0, "M", "𨗒"),
+        (0x2F9E1, "M", "𨗭"),
+        (0x2F9E2, "M", "邔"),
+        (0x2F9E3, "M", "郱"),
+        (0x2F9E4, "M", "鄑"),
+        (0x2F9E5, "M", "𨜮"),
+        (0x2F9E6, "M", "鄛"),
+        (0x2F9E7, "M", "鈸"),
+        (0x2F9E8, "M", "鋗"),
+        (0x2F9E9, "M", "鋘"),
+        (0x2F9EA, "M", "鉼"),
+        (0x2F9EB, "M", "鏹"),
+        (0x2F9EC, "M", "鐕"),
+        (0x2F9ED, "M", "𨯺"),
+        (0x2F9EE, "M", "開"),
+        (0x2F9EF, "M", "䦕"),
+        (0x2F9F0, "M", "閷"),
+        (0x2F9F1, "M", "𨵷"),
+        (0x2F9F2, "M", "䧦"),
+        (0x2F9F3, "M", "雃"),
+        (0x2F9F4, "M", "嶲"),
+        (0x2F9F5, "M", "霣"),
+        (0x2F9F6, "M", "𩅅"),
+        (0x2F9F7, "M", "𩈚"),
+        (0x2F9F8, "M", "䩮"),
+        (0x2F9F9, "M", "䩶"),
+        (0x2F9FA, "M", "韠"),
+        (0x2F9FB, "M", "𩐊"),
+        (0x2F9FC, "M", "䪲"),
+        (0x2F9FD, "M", "𩒖"),
+        (0x2F9FE, "M", "頋"),
+        (0x2FA00, "M", "頩"),
+        (0x2FA01, "M", "𩖶"),
+        (0x2FA02, "M", "飢"),
+        (0x2FA03, "M", "䬳"),
+        (0x2FA04, "M", "餩"),
+        (0x2FA05, "M", "馧"),
+        (0x2FA06, "M", "駂"),
+        (0x2FA07, "M", "駾"),
+        (0x2FA08, "M", "䯎"),
+        (0x2FA09, "M", "𩬰"),
+        (0x2FA0A, "M", "鬒"),
+        (0x2FA0B, "M", "鱀"),
+        (0x2FA0C, "M", "鳽"),
+        (0x2FA0D, "M", "䳎"),
+        (0x2FA0E, "M", "䳭"),
+        (0x2FA0F, "M", "鵧"),
+        (0x2FA10, "M", "𪃎"),
+        (0x2FA11, "M", "䳸"),
+        (0x2FA12, "M", "𪄅"),
+        (0x2FA13, "M", "𪈎"),
+        (0x2FA14, "M", "𪊑"),
+        (0x2FA15, "M", "麻"),
+        (0x2FA16, "M", "䵖"),
+        (0x2FA17, "M", "黹"),
+        (0x2FA18, "M", "黾"),
+        (0x2FA19, "M", "鼅"),
+        (0x2FA1A, "M", "鼏"),
+        (0x2FA1B, "M", "鼖"),
+        (0x2FA1C, "M", "鼻"),
+        (0x2FA1D, "M", "𪘀"),
+        (0x2FA1E, "X"),
+        (0x30000, "V"),
+        (0x3134B, "X"),
+        (0x31350, "V"),
+        (0x323B0, "X"),
+        (0xE0100, "I"),
+        (0xE01F0, "X"),
     ]
 
+
 uts46data = tuple(
     _seg_0()
     + _seg_1()
diff --git a/libs/importlib_metadata-7.0.1.dist-info/RECORD b/libs/importlib_metadata-7.0.1.dist-info/RECORD
deleted file mode 100644
index 8ee59fab3..000000000
--- a/libs/importlib_metadata-7.0.1.dist-info/RECORD
+++ /dev/null
@@ -1,18 +0,0 @@
-importlib_metadata-7.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-importlib_metadata-7.0.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-importlib_metadata-7.0.1.dist-info/METADATA,sha256=67Yxj6rypSFswUjYHY01_GecCOIVMcAk8kYxodYgStU,4926
-importlib_metadata-7.0.1.dist-info/RECORD,,
-importlib_metadata-7.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_metadata-7.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-importlib_metadata-7.0.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
-importlib_metadata/__init__.py,sha256=CrDhGQz3SCK5Cct82OvmGzqzOqneJn3jLvvfmSx8nCs,31551
-importlib_metadata/_adapters.py,sha256=jZr_CmHrl8qTGatO0yMmuOdfFExOY64G8eEYf6Cnj9k,2455
-importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743
-importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314
-importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895
-importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068
-importlib_metadata/_meta.py,sha256=FRThoc8OnIaQ0trIKQ0kyj08cQhZvqNFyjEyXUgAvVs,1849
-importlib_metadata/_py39compat.py,sha256=2Tk5twb_VgLCY-1NEAQjdZp_S9OFMC-pUzP2isuaPsQ,1098
-importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166
-importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379
-importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/importlib_metadata-7.0.1.dist-info/WHEEL b/libs/importlib_metadata-7.0.1.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/importlib_metadata-7.0.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/importlib_resources-6.1.2.dist-info/INSTALLER b/libs/importlib_metadata-7.2.1.dist-info/INSTALLER
similarity index 100%
rename from libs/importlib_resources-6.1.2.dist-info/INSTALLER
rename to libs/importlib_metadata-7.2.1.dist-info/INSTALLER
diff --git a/libs/importlib_metadata-7.0.1.dist-info/LICENSE b/libs/importlib_metadata-7.2.1.dist-info/LICENSE
similarity index 100%
rename from libs/importlib_metadata-7.0.1.dist-info/LICENSE
rename to libs/importlib_metadata-7.2.1.dist-info/LICENSE
diff --git a/libs/importlib_metadata-7.0.1.dist-info/METADATA b/libs/importlib_metadata-7.2.1.dist-info/METADATA
similarity index 71%
rename from libs/importlib_metadata-7.0.1.dist-info/METADATA
rename to libs/importlib_metadata-7.2.1.dist-info/METADATA
index dee9754ac..7ba1967b1 100644
--- a/libs/importlib_metadata-7.0.1.dist-info/METADATA
+++ b/libs/importlib_metadata-7.2.1.dist-info/METADATA
@@ -1,42 +1,41 @@
 Metadata-Version: 2.1
 Name: importlib_metadata
-Version: 7.0.1
+Version: 7.2.1
 Summary: Read metadata from Python packages
-Home-page: https://github.com/python/importlib_metadata
-Author: Jason R. Coombs
-Author-email: jaraco@jaraco.com
+Author-email: "Jason R. Coombs" <jaraco@jaraco.com>
+Project-URL: Source, https://github.com/python/importlib_metadata
 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 >=0.5
 Requires-Dist: typing-extensions >=3.6.4 ; python_version < "3.8"
-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: 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: 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: packaging ; extra == 'testing'
-Requires-Dist: pyfakefs ; extra == 'testing'
-Requires-Dist: flufl.flake8 ; extra == 'testing'
-Requires-Dist: pytest-perf >=0.9.2 ; 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'
-Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra == 'testing'
+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'
 
 .. image:: https://img.shields.io/pypi/v/importlib_metadata.svg
    :target: https://pypi.org/project/importlib_metadata
@@ -51,14 +50,10 @@ Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra ==
     :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/importlib-metadata/badge/?version=latest
    :target: https://importlib-metadata.readthedocs.io/en/latest/?badge=latest
 
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. image:: https://tidelift.com/badges/package/pypi/importlib-metadata
diff --git a/libs/importlib_metadata-7.2.1.dist-info/RECORD b/libs/importlib_metadata-7.2.1.dist-info/RECORD
new file mode 100644
index 000000000..7f1c16f51
--- /dev/null
+++ b/libs/importlib_metadata-7.2.1.dist-info/RECORD
@@ -0,0 +1,20 @@
+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/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/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
+importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743
+importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314
+importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895
+importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068
+importlib_metadata/_meta.py,sha256=nxZ7C8GVlcBFAKWyVOn_dn7ot_twBcbm1NmvjIetBHI,1801
+importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166
+importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_metadata/compat/py311.py,sha256=uqm-K-uohyj1042TH4a9Er_I5o7667DvulcD-gC_fSA,608
+importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102
+importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379
+importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/importlib_resources-6.1.2.dist-info/REQUESTED b/libs/importlib_metadata-7.2.1.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_resources-6.1.2.dist-info/REQUESTED
rename to libs/importlib_metadata-7.2.1.dist-info/REQUESTED
diff --git a/libs/importlib_metadata-7.2.1.dist-info/WHEEL b/libs/importlib_metadata-7.2.1.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/importlib_metadata-7.2.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/importlib_metadata-7.0.1.dist-info/top_level.txt b/libs/importlib_metadata-7.2.1.dist-info/top_level.txt
similarity index 100%
rename from libs/importlib_metadata-7.0.1.dist-info/top_level.txt
rename to libs/importlib_metadata-7.2.1.dist-info/top_level.txt
diff --git a/libs/importlib_metadata/__init__.py b/libs/importlib_metadata/__init__.py
index 0ce535a1f..eab73ffe8 100644
--- a/libs/importlib_metadata/__init__.py
+++ b/libs/importlib_metadata/__init__.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 import os
 import re
 import abc
-import csv
 import sys
 import json
 import zipp
@@ -19,7 +18,8 @@ import itertools
 import posixpath
 import collections
 
-from . import _adapters, _meta, _py39compat
+from . import _meta
+from .compat import py39, py311
 from ._collections import FreezableDefaultDict, Pair
 from ._compat import (
     NullFinder,
@@ -33,7 +33,7 @@ from contextlib import suppress
 from importlib import import_module
 from importlib.abc import MetaPathFinder
 from itertools import starmap
-from typing import Iterable, List, Mapping, Optional, Set, cast
+from typing import Any, Iterable, List, Mapping, Match, Optional, Set, cast
 
 __all__ = [
     'Distribution',
@@ -170,17 +170,17 @@ class EntryPoint:
     value: str
     group: str
 
-    dist: Optional['Distribution'] = None
+    dist: Optional[Distribution] = None
 
     def __init__(self, name: str, value: str, group: str) -> None:
         vars(self).update(name=name, value=value, group=group)
 
-    def load(self):
+    def load(self) -> Any:
         """Load the entry point from its definition. If only a module
         is indicated by the value, return that module. Otherwise,
         return the named object.
         """
-        match = self.pattern.match(self.value)
+        match = cast(Match, self.pattern.match(self.value))
         module = import_module(match.group('module'))
         attrs = filter(None, (match.group('attr') or '').split('.'))
         return functools.reduce(getattr, attrs, module)
@@ -275,12 +275,12 @@ class EntryPoints(tuple):
         """
         return '%s(%r)' % (self.__class__.__name__, tuple(self))
 
-    def select(self, **params):
+    def select(self, **params) -> EntryPoints:
         """
         Select entry points from self that match the
         given parameters (typically group and/or name).
         """
-        return EntryPoints(ep for ep in self if _py39compat.ep_matches(ep, **params))
+        return EntryPoints(ep for ep in self if py39.ep_matches(ep, **params))
 
     @property
     def names(self) -> Set[str]:
@@ -311,9 +311,9 @@ class EntryPoints(tuple):
 class PackagePath(pathlib.PurePosixPath):
     """A reference to a path in a package"""
 
-    hash: Optional["FileHash"]
+    hash: Optional[FileHash]
     size: int
-    dist: "Distribution"
+    dist: Distribution
 
     def read_text(self, encoding: str = 'utf-8') -> str:  # type: ignore[override]
         return self.locate().read_text(encoding=encoding)
@@ -360,7 +360,9 @@ class Distribution(DeprecatedNonAbstract):
 
     Custom providers may derive from this class and define
     the abstract methods to provide a concrete implementation
-    for their environment.
+    for their environment. Some providers may opt to override
+    the default implementation of some properties to bypass
+    the file-reading mechanism.
     """
 
     @abc.abstractmethod
@@ -374,11 +376,10 @@ class Distribution(DeprecatedNonAbstract):
 
         - METADATA: The distribution metadata including fields
           like Name and Version and Description.
-        - entry_points.txt: A series of entry points defined by
-          the Setuptools spec in an ini format with sections
-          representing the groups.
-        - RECORD: A record of files as installed by a typical
-          installer.
+        - entry_points.txt: A series of entry points as defined in
+          `the entry points spec <https://packaging.python.org/en/latest/specifications/entry-points/#file-format>`_.
+        - RECORD: A record of files according to
+          `this recording spec <https://packaging.python.org/en/latest/specifications/recording-installed-packages/#the-record-file>`_.
 
         A package may provide any set of files, including those
         not listed here or none at all.
@@ -395,7 +396,7 @@ class Distribution(DeprecatedNonAbstract):
         """
 
     @classmethod
-    def from_name(cls, name: str) -> "Distribution":
+    def from_name(cls, name: str) -> Distribution:
         """Return the Distribution for the given package name.
 
         :param name: The name of the distribution package to search for.
@@ -414,8 +415,8 @@ class Distribution(DeprecatedNonAbstract):
 
     @classmethod
     def discover(
-        cls, *, context: Optional['DistributionFinder.Context'] = None, **kwargs
-    ) -> Iterable["Distribution"]:
+        cls, *, context: Optional[DistributionFinder.Context] = None, **kwargs
+    ) -> Iterable[Distribution]:
         """Return an iterable of Distribution objects for all packages.
 
         Pass a ``context`` or pass keyword arguments for constructing
@@ -433,7 +434,7 @@ class Distribution(DeprecatedNonAbstract):
         )
 
     @staticmethod
-    def at(path: str | os.PathLike[str]) -> "Distribution":
+    def at(path: str | os.PathLike[str]) -> Distribution:
         """Return a Distribution for the indicated metadata path.
 
         :param path: a string or path-like object
@@ -454,8 +455,15 @@ class Distribution(DeprecatedNonAbstract):
         """Return the parsed metadata for this Distribution.
 
         The returned object will have keys that name the various bits of
-        metadata.  See PEP 566 for details.
+        metadata per the
+        `Core metadata specifications <https://packaging.python.org/en/latest/specifications/core-metadata/#core-metadata>`_.
+
+        Custom providers may provide the METADATA file or override this
+        property.
         """
+        # deferred for performance (python/cpython#109829)
+        from . import _adapters
+
         opt_text = (
             self.read_text('METADATA')
             or self.read_text('PKG-INFO')
@@ -484,6 +492,12 @@ class Distribution(DeprecatedNonAbstract):
 
     @property
     def entry_points(self) -> EntryPoints:
+        """
+        Return EntryPoints for this distribution.
+
+        Custom providers may provide the ``entry_points.txt`` file
+        or override this property.
+        """
         return EntryPoints._from_text_for(self.read_text('entry_points.txt'), self)
 
     @property
@@ -496,6 +510,10 @@ class Distribution(DeprecatedNonAbstract):
         (i.e. RECORD for dist-info, or installed-files.txt or
         SOURCES.txt for egg-info) is missing.
         Result may be empty if the metadata exists but is empty.
+
+        Custom providers are recommended to provide a "RECORD" file (in
+        ``read_text``) or override this property to allow for callers to be
+        able to resolve filenames provided by the package.
         """
 
         def make_file(name, hash=None, size_str=None):
@@ -507,6 +525,10 @@ class Distribution(DeprecatedNonAbstract):
 
         @pass_none
         def make_files(lines):
+            # Delay csv import, since Distribution.files is not as widely used
+            # as other parts of importlib.metadata
+            import csv
+
             return starmap(make_file, csv.reader(lines))
 
         @pass_none
@@ -523,7 +545,7 @@ class Distribution(DeprecatedNonAbstract):
 
     def _read_files_distinfo(self):
         """
-        Read the lines of RECORD
+        Read the lines of RECORD.
         """
         text = self.read_text('RECORD')
         return text and text.splitlines()
@@ -548,9 +570,8 @@ class Distribution(DeprecatedNonAbstract):
             return
 
         paths = (
-            (subdir / name)
-            .resolve()
-            .relative_to(self.locate_file('').resolve())
+            py311.relative_fix((subdir / name).resolve())
+            .relative_to(self.locate_file('').resolve(), walk_up=True)
             .as_posix()
             for name in text.splitlines()
         )
@@ -637,6 +658,9 @@ class Distribution(DeprecatedNonAbstract):
 class DistributionFinder(MetaPathFinder):
     """
     A MetaPathFinder capable of discovering installed distributions.
+
+    Custom providers should implement this interface in order to
+    supply metadata.
     """
 
     class Context:
@@ -649,6 +673,17 @@ class DistributionFinder(MetaPathFinder):
         Each DistributionFinder may expect any parameters
         and should attempt to honor the canonical
         parameters defined below when appropriate.
+
+        This mechanism gives a custom provider a means to
+        solicit additional details from the caller beyond
+        "name" and "path" when searching distributions.
+        For example, imagine a provider that exposes suites
+        of packages in either a "public" or "private" ``realm``.
+        A caller may wish to query only for distributions in
+        a particular realm and could call
+        ``distributions(realm="private")`` to signal to the
+        custom provider to only include distributions from that
+        realm.
         """
 
         name = None
@@ -684,11 +719,18 @@ class DistributionFinder(MetaPathFinder):
 
 class FastPath:
     """
-    Micro-optimized class for searching a path for
-    children.
+    Micro-optimized class for searching a root for children.
+
+    Root is a path on the file system that may contain metadata
+    directories either as natural directories or within a zip file.
 
     >>> FastPath('').children()
     ['...']
+
+    FastPath objects are cached and recycled for any given root.
+
+    >>> FastPath('foobar') is FastPath('foobar')
+    True
     """
 
     @functools.lru_cache()  # type: ignore
@@ -730,7 +772,19 @@ class FastPath:
 
 
 class Lookup:
+    """
+    A micro-optimized class for searching a (fast) path for metadata.
+    """
+
     def __init__(self, path: FastPath):
+        """
+        Calculate all of the children representing metadata.
+
+        From the children in the path, calculate early all of the
+        children that appear to represent metadata (infos) or legacy
+        metadata (eggs).
+        """
+
         base = os.path.basename(path.root).lower()
         base_is_egg = base.endswith(".egg")
         self.infos = FreezableDefaultDict(list)
@@ -751,7 +805,10 @@ class Lookup:
         self.infos.freeze()
         self.eggs.freeze()
 
-    def search(self, prepared):
+    def search(self, prepared: Prepared):
+        """
+        Yield all infos and eggs matching the Prepared query.
+        """
         infos = (
             self.infos[prepared.normalized]
             if prepared
@@ -767,13 +824,28 @@ class Lookup:
 
 class Prepared:
     """
-    A prepared search for metadata on a possibly-named package.
+    A prepared search query for metadata on a possibly-named package.
+
+    Pre-calculates the normalization to prevent repeated operations.
+
+    >>> none = Prepared(None)
+    >>> none.normalized
+    >>> none.legacy_normalized
+    >>> bool(none)
+    False
+    >>> sample = Prepared('Sample__Pkg-name.foo')
+    >>> sample.normalized
+    'sample_pkg_name_foo'
+    >>> sample.legacy_normalized
+    'sample__pkg_name.foo'
+    >>> bool(sample)
+    True
     """
 
     normalized = None
     legacy_normalized = None
 
-    def __init__(self, name):
+    def __init__(self, name: Optional[str]):
         self.name = name
         if name is None:
             return
@@ -807,9 +879,10 @@ class MetadataPathFinder(NullFinder, DistributionFinder):
     of Python that do not have a PathFinder find_distributions().
     """
 
+    @classmethod
     def find_distributions(
-        self, context=DistributionFinder.Context()
-    ) -> Iterable["PathDistribution"]:
+        cls, context=DistributionFinder.Context()
+    ) -> Iterable[PathDistribution]:
         """
         Find distributions.
 
@@ -818,7 +891,7 @@ class MetadataPathFinder(NullFinder, DistributionFinder):
         (or all names if ``None`` indicated) along the paths in the list
         of directories ``context.path``.
         """
-        found = self._search_paths(context.name, context.path)
+        found = cls._search_paths(context.name, context.path)
         return map(PathDistribution, found)
 
     @classmethod
@@ -829,6 +902,7 @@ class MetadataPathFinder(NullFinder, DistributionFinder):
             path.search(prepared) for path in map(FastPath, paths)
         )
 
+    @classmethod
     def invalidate_caches(cls) -> None:
         FastPath.__new__.cache_clear()
 
@@ -926,7 +1000,7 @@ def version(distribution_name: str) -> str:
 
 _unique = functools.partial(
     unique_everseen,
-    key=_py39compat.normalized_name,
+    key=py39.normalized_name,
 )
 """
 Wrapper for ``distributions`` to return unique distributions by name.
diff --git a/libs/importlib_metadata/_meta.py b/libs/importlib_metadata/_meta.py
index 1342d839b..1927d0f62 100644
--- a/libs/importlib_metadata/_meta.py
+++ b/libs/importlib_metadata/_meta.py
@@ -9,30 +9,27 @@ _T = TypeVar("_T")
 
 
 class PackageMetadata(Protocol):
-    def __len__(self) -> int:
-        ...  # pragma: no cover
+    def __len__(self) -> int: ...  # pragma: no cover
 
-    def __contains__(self, item: str) -> bool:
-        ...  # pragma: no cover
+    def __contains__(self, item: str) -> bool: ...  # pragma: no cover
 
-    def __getitem__(self, key: str) -> str:
-        ...  # pragma: no cover
+    def __getitem__(self, key: str) -> str: ...  # pragma: no cover
 
-    def __iter__(self) -> Iterator[str]:
-        ...  # pragma: no cover
+    def __iter__(self) -> Iterator[str]: ...  # pragma: no cover
 
     @overload
-    def get(self, name: str, failobj: None = None) -> Optional[str]:
-        ...  # pragma: no cover
+    def get(
+        self, name: str, failobj: None = None
+    ) -> Optional[str]: ...  # pragma: no cover
 
     @overload
-    def get(self, name: str, failobj: _T) -> Union[str, _T]:
-        ...  # pragma: no cover
+    def get(self, name: str, failobj: _T) -> Union[str, _T]: ...  # pragma: no cover
 
     # overload per python/importlib_metadata#435
     @overload
-    def get_all(self, name: str, failobj: None = None) -> Optional[List[Any]]:
-        ...  # pragma: no cover
+    def get_all(
+        self, name: str, failobj: None = None
+    ) -> Optional[List[Any]]: ...  # pragma: no cover
 
     @overload
     def get_all(self, name: str, failobj: _T) -> Union[List[Any], _T]:
@@ -52,21 +49,19 @@ class SimplePath(Protocol):
     A minimal subset of pathlib.Path required by Distribution.
     """
 
-    def joinpath(self, other: Union[str, os.PathLike[str]]) -> SimplePath:
-        ...  # pragma: no cover
+    def joinpath(
+        self, other: Union[str, os.PathLike[str]]
+    ) -> SimplePath: ...  # pragma: no cover
 
-    def __truediv__(self, other: Union[str, os.PathLike[str]]) -> SimplePath:
-        ...  # pragma: no cover
+    def __truediv__(
+        self, other: Union[str, os.PathLike[str]]
+    ) -> SimplePath: ...  # pragma: no cover
 
     @property
-    def parent(self) -> SimplePath:
-        ...  # pragma: no cover
+    def parent(self) -> SimplePath: ...  # pragma: no cover
 
-    def read_text(self, encoding=None) -> str:
-        ...  # pragma: no cover
+    def read_text(self, encoding=None) -> str: ...  # pragma: no cover
 
-    def read_bytes(self) -> bytes:
-        ...  # pragma: no cover
+    def read_bytes(self) -> bytes: ...  # pragma: no cover
 
-    def exists(self) -> bool:
-        ...  # pragma: no cover
+    def exists(self) -> bool: ...  # pragma: no cover
diff --git a/libs/importlib_resources/tests/data01/__init__.py b/libs/importlib_metadata/compat/__init__.py
similarity index 100%
rename from libs/importlib_resources/tests/data01/__init__.py
rename to libs/importlib_metadata/compat/__init__.py
diff --git a/libs/importlib_metadata/compat/py311.py b/libs/importlib_metadata/compat/py311.py
new file mode 100644
index 000000000..3a5327436
--- /dev/null
+++ b/libs/importlib_metadata/compat/py311.py
@@ -0,0 +1,22 @@
+import os
+import pathlib
+import sys
+import types
+
+
+def wrap(path):  # pragma: no cover
+    """
+    Workaround for https://github.com/python/cpython/issues/84538
+    to add backward compatibility for walk_up=True.
+    An example affected package is dask-labextension, which uses
+    jupyter-packaging to install JupyterLab javascript files outside
+    of site-packages.
+    """
+
+    def relative_to(root, *, walk_up=False):
+        return pathlib.Path(os.path.relpath(path, root))
+
+    return types.SimpleNamespace(relative_to=relative_to)
+
+
+relative_fix = wrap if sys.version_info < (3, 12) else lambda x: x
diff --git a/libs/importlib_metadata/_py39compat.py b/libs/importlib_metadata/compat/py39.py
similarity index 82%
rename from libs/importlib_metadata/_py39compat.py
rename to libs/importlib_metadata/compat/py39.py
index cde4558fb..1f15bd97e 100644
--- a/libs/importlib_metadata/_py39compat.py
+++ b/libs/importlib_metadata/compat/py39.py
@@ -1,11 +1,12 @@
 """
 Compatibility layer with Python 3.8/3.9
 """
+
 from typing import TYPE_CHECKING, Any, Optional
 
 if TYPE_CHECKING:  # pragma: no cover
     # Prevent circular imports on runtime.
-    from . import Distribution, EntryPoint
+    from .. import Distribution, EntryPoint
 else:
     Distribution = EntryPoint = Any
 
@@ -17,7 +18,7 @@ def normalized_name(dist: Distribution) -> Optional[str]:
     try:
         return dist._normalized_name
     except AttributeError:
-        from . import Prepared  # -> delay to prevent circular imports.
+        from .. import Prepared  # -> delay to prevent circular imports.
 
         return Prepared.normalize(getattr(dist, "name", None) or dist.metadata['Name'])
 
@@ -29,7 +30,7 @@ def ep_matches(ep: EntryPoint, **params) -> bool:
     try:
         return ep.matches(**params)
     except AttributeError:
-        from . import EntryPoint  # -> delay to prevent circular imports.
+        from .. import EntryPoint  # -> delay to prevent circular imports.
 
         # Reconstruct the EntryPoint object to make sure it is compatible.
         return EntryPoint(ep.name, ep.value, ep.group).matches(**params)
diff --git a/libs/importlib_resources-6.1.2.dist-info/RECORD b/libs/importlib_resources-6.1.2.dist-info/RECORD
deleted file mode 100644
index 0b3918bae..000000000
--- a/libs/importlib_resources-6.1.2.dist-info/RECORD
+++ /dev/null
@@ -1,50 +0,0 @@
-importlib_resources-6.1.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-importlib_resources-6.1.2.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-importlib_resources-6.1.2.dist-info/METADATA,sha256=40TGqxYj6HL5HSbWcHoLR2lhonNI4JtCX-93I6S9Gr0,3890
-importlib_resources-6.1.2.dist-info/RECORD,,
-importlib_resources-6.1.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources-6.1.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-importlib_resources-6.1.2.dist-info/top_level.txt,sha256=fHIjHU1GZwAjvcydpmUnUrTnbvdiWjG4OEVZK8by0TQ,20
-importlib_resources/__init__.py,sha256=t3v1sx-q_TzszzsOs3dqNOjqBQVbSB_KY-BjCvf65qQ,226
-importlib_resources/_adapters.py,sha256=vprJGbUeHbajX6XCuMP6J3lMrqCi-P_MTlziJUR7jfk,4482
-importlib_resources/_common.py,sha256=SmaJImwoyTHuAImUNQcXTgxCtI9fhaVmIqiogDx5x6E,5512
-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=Wfln4uQUShNz1XdCG-toG6_Y0WrlUmO9JzpvtcfQ-Cw,184
-importlib_resources/future/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/future/adapters.py,sha256=Cz0dJUhgmeO4tcUwJFmSJ6gaTKGTglgzKPtZ2pip5ac,1429
-importlib_resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/readers.py,sha256=WNKurBHHVu9EVtUhWkOj2fxH50HP7uanNFuupAqH2S8,5863
-importlib_resources/simple.py,sha256=CQ3TiIMFiJs_80o-7xJL1EpbUUVna4-NGDrSTQ3HW2Y,2584
-importlib_resources/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/_compat.py,sha256=YTSB0U1R9oADnh6GrQcOCgojxcF_N6H1LklymEWf9SQ,708
-importlib_resources/tests/_path.py,sha256=nkv3ek7D1U898v921rYbldDCtKri2oyYOi3EJqGjEGU,1289
-importlib_resources/tests/data01/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/data01/binary.file,sha256=BU7ewdAhH2JP7Qy8qdT5QAsOSRxDdCryxbCr6_DJkNg,4
-importlib_resources/tests/data01/subdirectory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/data01/subdirectory/binary.file,sha256=xtRM9Bj2EOP-nh2SlP9D3vgcbNytbLsYIM_0jTqkNV0,4
-importlib_resources/tests/data01/utf-16.file,sha256=t5q9qhxX0rYqItBOM8D3ylwG-RHrnOYteTLtQr6sF7g,44
-importlib_resources/tests/data01/utf-8.file,sha256=kwWgYG4yQ-ZF2X_WA66EjYPmxJRn-w8aSOiS9e8tKYY,20
-importlib_resources/tests/data02/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/data02/one/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/data02/one/resource1.txt,sha256=10flKac7c-XXFzJ3t-AB5MJjlBy__dSZvPE_dOm2q6U,13
-importlib_resources/tests/data02/subdirectory/subsubdir/resource.txt,sha256=jnrBBztxYrtQck7cmVnc4xQVO4-agzAZDGSFkAWtlFw,10
-importlib_resources/tests/data02/two/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/data02/two/resource2.txt,sha256=lt2jbN3TMn9QiFKM832X39bU_62UptDdUkoYzkvEbl0,13
-importlib_resources/tests/namespacedata01/binary.file,sha256=BU7ewdAhH2JP7Qy8qdT5QAsOSRxDdCryxbCr6_DJkNg,4
-importlib_resources/tests/namespacedata01/subdirectory/binary.file,sha256=cbkhEL8TXIVYHIoSj2oZwPasp1KwxskeNXGJnPCbFF0,4
-importlib_resources/tests/namespacedata01/utf-16.file,sha256=t5q9qhxX0rYqItBOM8D3ylwG-RHrnOYteTLtQr6sF7g,44
-importlib_resources/tests/namespacedata01/utf-8.file,sha256=kwWgYG4yQ-ZF2X_WA66EjYPmxJRn-w8aSOiS9e8tKYY,20
-importlib_resources/tests/test_compatibilty_files.py,sha256=95N_R7aik8cvnE6sBJpsxmP0K5plOWRIJDgbalD-Hpw,3314
-importlib_resources/tests/test_contents.py,sha256=70HW3mL_hv05Emv-OgdmwoLhXxjtuVxiWVaUpgRaRWA,930
-importlib_resources/tests/test_custom.py,sha256=HMS544nh3L0EdEung-JwoTV8sAzZo3IYNZ0B9AQveBI,1217
-importlib_resources/tests/test_files.py,sha256=Hhw2k19OyPp0GvmjLKZhO91Cu9swJ6JMBVgS2P6d00Q,3239
-importlib_resources/tests/test_open.py,sha256=ccmzbOeEa6zTd4ymZZ8yISrecfuYV0jhon-Vddqysu4,2778
-importlib_resources/tests/test_path.py,sha256=x8r2gJxG3hFM9xCOFNkgmHYXxsMldMLTSW_AZYf1l-A,2009
-importlib_resources/tests/test_read.py,sha256=7tsILQ2NoqVGFQxhHqxBwc5hWcN8b_3idojCsszTNfQ,3112
-importlib_resources/tests/test_reader.py,sha256=IcIUXaiPAtuahGV4_ZT4YXFLMMsJmcM1iOxqdIH2Aa4,5001
-importlib_resources/tests/test_resource.py,sha256=fcF8WgZ6rDCTRFnxtAUbdiaNe4G23yGovT1nb2dc7ls,7823
-importlib_resources/tests/util.py,sha256=ZJ9ouR8UOZRbgQ6_ZeXxXBvcjOlSVae4ckIMqzhyAZg,4784
-importlib_resources/tests/zip.py,sha256=2MKmF8-osXBJSnqcUTuAUek_-tSB3iKmIT9qPhcsOsM,783
diff --git a/libs/importlib_resources-6.1.2.dist-info/WHEEL b/libs/importlib_resources-6.1.2.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/importlib_resources-6.1.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/inflect-7.0.0.dist-info/INSTALLER b/libs/importlib_resources-6.4.5.dist-info/INSTALLER
similarity index 100%
rename from libs/inflect-7.0.0.dist-info/INSTALLER
rename to libs/importlib_resources-6.4.5.dist-info/INSTALLER
diff --git a/libs/importlib_resources-6.1.2.dist-info/LICENSE b/libs/importlib_resources-6.4.5.dist-info/LICENSE
similarity index 100%
rename from libs/importlib_resources-6.1.2.dist-info/LICENSE
rename to libs/importlib_resources-6.4.5.dist-info/LICENSE
diff --git a/libs/importlib_resources-6.1.2.dist-info/METADATA b/libs/importlib_resources-6.4.5.dist-info/METADATA
similarity index 73%
rename from libs/importlib_resources-6.1.2.dist-info/METADATA
rename to libs/importlib_resources-6.4.5.dist-info/METADATA
index ab2ecc7e8..1ee4166c1 100644
--- a/libs/importlib_resources-6.1.2.dist-info/METADATA
+++ b/libs/importlib_resources-6.4.5.dist-info/METADATA
@@ -1,35 +1,39 @@
 Metadata-Version: 2.1
 Name: importlib_resources
-Version: 6.1.2
+Version: 6.4.5
 Summary: Read resources from Python packages
-Home-page: https://github.com/python/importlib_resources
-Author: Barry Warsaw
-Author-email: barry@python.org
-Project-URL: Documentation, https://importlib-resources.readthedocs.io/
+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: 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 >=0.2.1 ; extra == 'testing'
-Requires-Dist: zipp >=3.17 ; extra == 'testing'
-Requires-Dist: pytest-mypy ; (platform_python_implementation != "PyPy") and extra == 'testing'
+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
diff --git a/libs/importlib_resources-6.4.5.dist-info/RECORD b/libs/importlib_resources-6.4.5.dist-info/RECORD
new file mode 100644
index 000000000..2883b0ad3
--- /dev/null
+++ b/libs/importlib_resources-6.4.5.dist-info/RECORD
@@ -0,0 +1,38 @@
+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/inflect-7.0.0.dist-info/REQUESTED b/libs/importlib_resources-6.4.5.dist-info/REQUESTED
similarity index 100%
rename from libs/inflect-7.0.0.dist-info/REQUESTED
rename to libs/importlib_resources-6.4.5.dist-info/REQUESTED
diff --git a/libs/importlib_resources-6.4.5.dist-info/WHEEL b/libs/importlib_resources-6.4.5.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/importlib_resources-6.4.5.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/importlib_resources-6.1.2.dist-info/top_level.txt b/libs/importlib_resources-6.4.5.dist-info/top_level.txt
similarity index 100%
rename from libs/importlib_resources-6.1.2.dist-info/top_level.txt
rename to libs/importlib_resources-6.4.5.dist-info/top_level.txt
diff --git a/libs/importlib_resources/__init__.py b/libs/importlib_resources/__init__.py
index e6b60c18c..723c9f9eb 100644
--- a/libs/importlib_resources/__init__.py
+++ b/libs/importlib_resources/__init__.py
@@ -1,9 +1,27 @@
-"""Read resources contained within a package."""
+"""
+Read resources contained within a package.
+
+This codebase is shared between importlib.resources in the stdlib
+and importlib_resources in PyPI. See
+https://github.com/python/importlib_metadata/wiki/Development-Methodology
+for more detail.
+"""
 
 from ._common import (
     as_file,
     files,
     Package,
+    Anchor,
+)
+
+from ._functional import (
+    contents,
+    is_resource,
+    open_binary,
+    open_text,
+    path,
+    read_binary,
+    read_text,
 )
 
 from .abc import ResourceReader
@@ -11,7 +29,15 @@ from .abc import ResourceReader
 
 __all__ = [
     'Package',
+    'Anchor',
     'ResourceReader',
     'as_file',
     'files',
+    'contents',
+    'is_resource',
+    'open_binary',
+    'open_text',
+    'path',
+    'read_binary',
+    'read_text',
 ]
diff --git a/libs/importlib_resources/_common.py b/libs/importlib_resources/_common.py
index c9891359d..f065d493f 100644
--- a/libs/importlib_resources/_common.py
+++ b/libs/importlib_resources/_common.py
@@ -12,8 +12,6 @@ import itertools
 from typing import Union, Optional, cast
 from .abc import ResourceReader, Traversable
 
-from .future.adapters import wrap_spec
-
 Package = Union[types.ModuleType, str]
 Anchor = Package
 
@@ -68,10 +66,10 @@ def get_resource_reader(package: types.ModuleType) -> Optional[ResourceReader]:
     # zipimport.zipimporter does not support weak references, resulting in a
     # TypeError.  That seems terrible.
     spec = package.__spec__
-    reader = getattr(spec.loader, 'get_resource_reader', None)  # type: ignore
+    reader = getattr(spec.loader, 'get_resource_reader', None)  # type: ignore[union-attr]
     if reader is None:
         return None
-    return reader(spec.name)  # type: ignore
+    return reader(spec.name)  # type: ignore[union-attr]
 
 
 @functools.singledispatch
@@ -95,12 +93,13 @@ def _infer_caller():
     """
 
     def is_this_file(frame_info):
-        return frame_info.filename == __file__
+        return frame_info.filename == stack[0].filename
 
     def is_wrapper(frame_info):
         return frame_info.function == 'wrapper'
 
-    not_this_file = itertools.filterfalse(is_this_file, inspect.stack())
+    stack = inspect.stack()
+    not_this_file = itertools.filterfalse(is_this_file, stack)
     # also exclude 'wrapper' due to singledispatch in the call stack
     callers = itertools.filterfalse(is_wrapper, not_this_file)
     return next(callers).frame
@@ -111,6 +110,9 @@ def from_package(package: types.ModuleType):
     Return a Traversable object for the given package.
 
     """
+    # deferred for performance (python/cpython#109829)
+    from .future.adapters import wrap_spec
+
     spec = wrap_spec(package)
     reader = spec.loader.get_resource_reader(spec.name)
     return reader.files()
@@ -181,7 +183,7 @@ def _(path):
 @contextlib.contextmanager
 def _temp_path(dir: tempfile.TemporaryDirectory):
     """
-    Wrap tempfile.TemporyDirectory to return a pathlib object.
+    Wrap tempfile.TemporaryDirectory to return a pathlib object.
     """
     with dir as result:
         yield pathlib.Path(result)
diff --git a/libs/importlib_resources/_functional.py b/libs/importlib_resources/_functional.py
new file mode 100644
index 000000000..f59416f2d
--- /dev/null
+++ b/libs/importlib_resources/_functional.py
@@ -0,0 +1,81 @@
+"""Simplified function-based API for importlib.resources"""
+
+import warnings
+
+from ._common import files, as_file
+
+
+_MISSING = object()
+
+
+def open_binary(anchor, *path_names):
+    """Open for binary reading the *resource* within *package*."""
+    return _get_resource(anchor, path_names).open('rb')
+
+
+def open_text(anchor, *path_names, encoding=_MISSING, errors='strict'):
+    """Open for text reading the *resource* within *package*."""
+    encoding = _get_encoding_arg(path_names, encoding)
+    resource = _get_resource(anchor, path_names)
+    return resource.open('r', encoding=encoding, errors=errors)
+
+
+def read_binary(anchor, *path_names):
+    """Read and return contents of *resource* within *package* as bytes."""
+    return _get_resource(anchor, path_names).read_bytes()
+
+
+def read_text(anchor, *path_names, encoding=_MISSING, errors='strict'):
+    """Read and return contents of *resource* within *package* as str."""
+    encoding = _get_encoding_arg(path_names, encoding)
+    resource = _get_resource(anchor, path_names)
+    return resource.read_text(encoding=encoding, errors=errors)
+
+
+def path(anchor, *path_names):
+    """Return the path to the *resource* as an actual file system path."""
+    return as_file(_get_resource(anchor, path_names))
+
+
+def is_resource(anchor, *path_names):
+    """Return ``True`` if there is a resource named *name* in the package,
+
+    Otherwise returns ``False``.
+    """
+    return _get_resource(anchor, path_names).is_file()
+
+
+def contents(anchor, *path_names):
+    """Return an iterable over the named resources within the package.
+
+    The iterable returns :class:`str` resources (e.g. files).
+    The iterable does not recurse into subdirectories.
+    """
+    warnings.warn(
+        "importlib.resources.contents is deprecated. "
+        "Use files(anchor).iterdir() instead.",
+        DeprecationWarning,
+        stacklevel=1,
+    )
+    return (resource.name for resource in _get_resource(anchor, path_names).iterdir())
+
+
+def _get_encoding_arg(path_names, encoding):
+    # For compatibility with versions where *encoding* was a positional
+    # argument, it needs to be given explicitly when there are multiple
+    # *path_names*.
+    # This limitation can be removed in Python 3.15.
+    if encoding is _MISSING:
+        if len(path_names) > 1:
+            raise TypeError(
+                "'encoding' argument required with multiple path names",
+            )
+        else:
+            return 'utf-8'
+    return encoding
+
+
+def _get_resource(anchor, path_names):
+    if anchor is None:
+        raise TypeError("anchor must be module or string, got None")
+    return files(anchor).joinpath(*path_names)
diff --git a/libs/importlib_resources/compat/py39.py b/libs/importlib_resources/compat/py39.py
index ab87b9dc1..ed5abd5e5 100644
--- a/libs/importlib_resources/compat/py39.py
+++ b/libs/importlib_resources/compat/py39.py
@@ -5,6 +5,6 @@ __all__ = ['ZipPath']
 
 
 if sys.version_info >= (3, 10):
-    from zipfile import Path as ZipPath  # type: ignore
+    from zipfile import Path as ZipPath
 else:
-    from zipp import Path as ZipPath  # type: ignore
+    from zipp import Path as ZipPath
diff --git a/libs/importlib_resources/future/adapters.py b/libs/importlib_resources/future/adapters.py
index 56dea7cfc..0e9764bae 100644
--- a/libs/importlib_resources/future/adapters.py
+++ b/libs/importlib_resources/future/adapters.py
@@ -1,3 +1,4 @@
+import functools
 import pathlib
 from contextlib import suppress
 from types import SimpleNamespace
@@ -5,6 +6,50 @@ from types import SimpleNamespace
 from .. import readers, _adapters
 
 
+def _block_standard(reader_getter):
+    """
+    Wrap _adapters.TraversableResourcesLoader.get_resource_reader
+    and intercept any standard library readers.
+    """
+
+    @functools.wraps(reader_getter)
+    def wrapper(*args, **kwargs):
+        """
+        If the reader is from the standard library, return None to allow
+        allow likely newer implementations in this library to take precedence.
+        """
+        try:
+            reader = reader_getter(*args, **kwargs)
+        except NotADirectoryError:
+            # MultiplexedPath may fail on zip subdirectory
+            return
+        # Python 3.10+
+        mod_name = reader.__class__.__module__
+        if mod_name.startswith('importlib.') and mod_name.endswith('readers'):
+            return
+        # Python 3.8, 3.9
+        if isinstance(reader, _adapters.CompatibilityFiles) and (
+            reader.spec.loader.__class__.__module__.startswith('zipimport')
+            or reader.spec.loader.__class__.__module__.startswith(
+                '_frozen_importlib_external'
+            )
+        ):
+            return
+        return reader
+
+    return wrapper
+
+
+def _skip_degenerate(reader):
+    """
+    Mask any degenerate reader. Ref #298.
+    """
+    is_degenerate = (
+        isinstance(reader, _adapters.CompatibilityFiles) and not reader._reader
+    )
+    return reader if not is_degenerate else None
+
+
 class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
     """
     Adapt loaders to provide TraversableResources and other
@@ -15,7 +60,11 @@ class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
     """
 
     def get_resource_reader(self, name):
-        return self._standard_reader() or super().get_resource_reader(name)
+        return (
+            _skip_degenerate(_block_standard(super().get_resource_reader)(name))
+            or self._standard_reader()
+            or super().get_resource_reader(name)
+        )
 
     def _standard_reader(self):
         return self._zip_reader() or self._namespace_reader() or self._file_reader()
diff --git a/libs/importlib_resources/readers.py b/libs/importlib_resources/readers.py
index 4a80a774a..4f761c64b 100644
--- a/libs/importlib_resources/readers.py
+++ b/libs/importlib_resources/readers.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import collections
 import contextlib
 import itertools
@@ -5,6 +7,7 @@ import pathlib
 import operator
 import re
 import warnings
+from collections.abc import Iterator
 
 from . import abc
 
@@ -34,8 +37,10 @@ class FileReader(abc.TraversableResources):
 
 class ZipReader(abc.TraversableResources):
     def __init__(self, loader, module):
-        _, _, name = module.rpartition('.')
-        self.prefix = loader.prefix.replace('\\', '/') + name + '/'
+        self.prefix = loader.prefix.replace('\\', '/')
+        if loader.is_package(module):
+            _, _, name = module.rpartition('.')
+            self.prefix += name + '/'
         self.archive = loader.archive
 
     def open_resource(self, resource):
@@ -133,27 +138,31 @@ class NamespaceReader(abc.TraversableResources):
     def __init__(self, namespace_path):
         if 'NamespacePath' not in str(namespace_path):
             raise ValueError('Invalid path')
-        self.path = MultiplexedPath(*map(self._resolve, namespace_path))
+        self.path = MultiplexedPath(*filter(bool, map(self._resolve, namespace_path)))
 
     @classmethod
-    def _resolve(cls, path_str) -> abc.Traversable:
+    def _resolve(cls, path_str) -> abc.Traversable | None:
         r"""
         Given an item from a namespace path, resolve it to a Traversable.
 
         path_str might be a directory on the filesystem or a path to a
         zipfile plus the path within the zipfile, e.g. ``/foo/bar`` or
         ``/foo/baz.zip/inner_dir`` or ``foo\baz.zip\inner_dir\sub``.
+
+        path_str might also be a sentinel used by editable packages to
+        trigger other behaviors (see python/importlib_resources#311).
+        In that case, return None.
         """
-        (dir,) = (cand for cand in cls._candidate_paths(path_str) if cand.is_dir())
-        return dir
+        dirs = (cand for cand in cls._candidate_paths(path_str) if cand.is_dir())
+        return next(dirs, None)
 
     @classmethod
-    def _candidate_paths(cls, path_str):
+    def _candidate_paths(cls, path_str: str) -> Iterator[abc.Traversable]:
         yield pathlib.Path(path_str)
         yield from cls._resolve_zip_path(path_str)
 
     @staticmethod
-    def _resolve_zip_path(path_str):
+    def _resolve_zip_path(path_str: str):
         for match in reversed(list(re.finditer(r'[\\/]', path_str))):
             with contextlib.suppress(
                 FileNotFoundError,
diff --git a/libs/importlib_resources/simple.py b/libs/importlib_resources/simple.py
index 96f117fec..2e75299b1 100644
--- a/libs/importlib_resources/simple.py
+++ b/libs/importlib_resources/simple.py
@@ -77,7 +77,7 @@ class ResourceHandle(Traversable):
 
     def __init__(self, parent: ResourceContainer, name: str):
         self.parent = parent
-        self.name = name  # type: ignore
+        self.name = name  # type: ignore[misc]
 
     def is_file(self):
         return True
diff --git a/libs/importlib_resources/tests/_compat.py b/libs/importlib_resources/tests/_compat.py
deleted file mode 100644
index e7bf06dd4..000000000
--- a/libs/importlib_resources/tests/_compat.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import os
-
-
-try:
-    from test.support import import_helper  # type: ignore
-except ImportError:
-    # Python 3.9 and earlier
-    class import_helper:  # type: ignore
-        from test.support import (
-            modules_setup,
-            modules_cleanup,
-            DirsOnSysPath,
-            CleanImport,
-        )
-
-
-try:
-    from test.support import os_helper  # type: ignore
-except ImportError:
-    # Python 3.9 compat
-    class os_helper:  # type:ignore
-        from test.support import temp_dir
-
-
-try:
-    # Python 3.10
-    from test.support.os_helper import unlink
-except ImportError:
-    from test.support import unlink as _unlink
-
-    def unlink(target):
-        return _unlink(os.fspath(target))
diff --git a/libs/importlib_resources/tests/_path.py b/libs/importlib_resources/tests/_path.py
index 1f97c9614..b144628cb 100644
--- a/libs/importlib_resources/tests/_path.py
+++ b/libs/importlib_resources/tests/_path.py
@@ -2,15 +2,44 @@ import pathlib
 import functools
 
 from typing import Dict, Union
+from typing import runtime_checkable
+from typing import Protocol
 
 
 ####
-# from jaraco.path 3.4.1
-
-FilesSpec = Dict[str, Union[str, bytes, 'FilesSpec']]  # type: ignore
+# from jaraco.path 3.7.1
 
 
-def build(spec: FilesSpec, prefix=pathlib.Path()):
+class Symlink(str):
+    """
+    A string indicating the target of a symlink.
+    """
+
+
+FilesSpec = Dict[str, Union[str, bytes, Symlink, 'FilesSpec']]
+
+
+@runtime_checkable
+class TreeMaker(Protocol):
+    def __truediv__(self, *args, **kwargs): ...  # pragma: no cover
+
+    def mkdir(self, **kwargs): ...  # pragma: no cover
+
+    def write_text(self, content, **kwargs): ...  # pragma: no cover
+
+    def write_bytes(self, content): ...  # pragma: no cover
+
+    def symlink_to(self, target): ...  # pragma: no cover
+
+
+def _ensure_tree_maker(obj: Union[str, TreeMaker]) -> TreeMaker:
+    return obj if isinstance(obj, TreeMaker) else pathlib.Path(obj)  # type: ignore[return-value]
+
+
+def build(
+    spec: FilesSpec,
+    prefix: Union[str, TreeMaker] = pathlib.Path(),  # type: ignore[assignment]
+):
     """
     Build a set of files/directories, as described by the spec.
 
@@ -25,21 +54,25 @@ def build(spec: FilesSpec, prefix=pathlib.Path()):
     ...             "__init__.py": "",
     ...         },
     ...         "baz.py": "# Some code",
-    ...     }
+    ...         "bar.py": Symlink("baz.py"),
+    ...     },
+    ...     "bing": Symlink("foo"),
     ... }
     >>> target = getfixture('tmp_path')
     >>> build(spec, target)
     >>> target.joinpath('foo/baz.py').read_text(encoding='utf-8')
     '# Some code'
+    >>> target.joinpath('bing/bar.py').read_text(encoding='utf-8')
+    '# Some code'
     """
     for name, contents in spec.items():
-        create(contents, pathlib.Path(prefix) / name)
+        create(contents, _ensure_tree_maker(prefix) / name)
 
 
 @functools.singledispatch
 def create(content: Union[str, bytes, FilesSpec], path):
     path.mkdir(exist_ok=True)
-    build(content, prefix=path)  # type: ignore
+    build(content, prefix=path)  # type: ignore[arg-type]
 
 
 @create.register
@@ -52,5 +85,10 @@ def _(content: str, path):
     path.write_text(content, encoding='utf-8')
 
 
+@create.register
+def _(content: Symlink, path):
+    path.symlink_to(content)
+
+
 # end from jaraco.path
 ####
diff --git a/libs/importlib_resources/tests/data01/subdirectory/__init__.py b/libs/importlib_resources/tests/compat/__init__.py
similarity index 100%
rename from libs/importlib_resources/tests/data01/subdirectory/__init__.py
rename to libs/importlib_resources/tests/compat/__init__.py
diff --git a/libs/importlib_resources/tests/compat/py312.py b/libs/importlib_resources/tests/compat/py312.py
new file mode 100644
index 000000000..ea9a58ba2
--- /dev/null
+++ b/libs/importlib_resources/tests/compat/py312.py
@@ -0,0 +1,18 @@
+import contextlib
+
+from .py39 import import_helper
+
+
+@contextlib.contextmanager
+def isolated_modules():
+    """
+    Save modules on entry and cleanup on exit.
+    """
+    (saved,) = import_helper.modules_setup()
+    try:
+        yield
+    finally:
+        import_helper.modules_cleanup(saved)
+
+
+vars(import_helper).setdefault('isolated_modules', isolated_modules)
diff --git a/libs/importlib_resources/tests/compat/py39.py b/libs/importlib_resources/tests/compat/py39.py
new file mode 100644
index 000000000..e01d276bd
--- /dev/null
+++ b/libs/importlib_resources/tests/compat/py39.py
@@ -0,0 +1,13 @@
+"""
+Backward-compatability shims to support Python 3.9 and earlier.
+"""
+
+from jaraco.test.cpython import from_test_support, try_import
+
+import_helper = try_import('import_helper') or from_test_support(
+    'modules_setup', 'modules_cleanup', 'DirsOnSysPath'
+)
+os_helper = try_import('os_helper') or from_test_support('temp_dir')
+warnings_helper = try_import('warnings_helper') or from_test_support(
+    'ignore_warnings', 'check_warnings'
+)
diff --git a/libs/importlib_resources/tests/data01/binary.file b/libs/importlib_resources/tests/data01/binary.file
deleted file mode 100644
index eaf36c1da..000000000
Binary files a/libs/importlib_resources/tests/data01/binary.file and /dev/null differ
diff --git a/libs/importlib_resources/tests/data01/subdirectory/binary.file b/libs/importlib_resources/tests/data01/subdirectory/binary.file
deleted file mode 100644
index 5bd8bb897..000000000
--- a/libs/importlib_resources/tests/data01/subdirectory/binary.file
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/libs/importlib_resources/tests/data01/utf-16.file b/libs/importlib_resources/tests/data01/utf-16.file
deleted file mode 100644
index 2cb772295..000000000
Binary files a/libs/importlib_resources/tests/data01/utf-16.file and /dev/null differ
diff --git a/libs/importlib_resources/tests/data01/utf-8.file b/libs/importlib_resources/tests/data01/utf-8.file
deleted file mode 100644
index 1c0132ad9..000000000
--- a/libs/importlib_resources/tests/data01/utf-8.file
+++ /dev/null
@@ -1 +0,0 @@
-Hello, UTF-8 world!
diff --git a/libs/importlib_resources/tests/data02/one/resource1.txt b/libs/importlib_resources/tests/data02/one/resource1.txt
deleted file mode 100644
index 61a813e40..000000000
--- a/libs/importlib_resources/tests/data02/one/resource1.txt
+++ /dev/null
@@ -1 +0,0 @@
-one resource
diff --git a/libs/importlib_resources/tests/data02/subdirectory/subsubdir/resource.txt b/libs/importlib_resources/tests/data02/subdirectory/subsubdir/resource.txt
deleted file mode 100644
index 48f587a2d..000000000
--- a/libs/importlib_resources/tests/data02/subdirectory/subsubdir/resource.txt
+++ /dev/null
@@ -1 +0,0 @@
-a resource
\ No newline at end of file
diff --git a/libs/importlib_resources/tests/data02/two/resource2.txt b/libs/importlib_resources/tests/data02/two/resource2.txt
deleted file mode 100644
index a80ce46ea..000000000
--- a/libs/importlib_resources/tests/data02/two/resource2.txt
+++ /dev/null
@@ -1 +0,0 @@
-two resource
diff --git a/libs/importlib_resources/tests/namespacedata01/binary.file b/libs/importlib_resources/tests/namespacedata01/binary.file
deleted file mode 100644
index eaf36c1da..000000000
Binary files a/libs/importlib_resources/tests/namespacedata01/binary.file and /dev/null differ
diff --git a/libs/importlib_resources/tests/namespacedata01/subdirectory/binary.file b/libs/importlib_resources/tests/namespacedata01/subdirectory/binary.file
deleted file mode 100644
index 100f50643..000000000
--- a/libs/importlib_resources/tests/namespacedata01/subdirectory/binary.file
+++ /dev/null
@@ -1 +0,0 @@
-

\ No newline at end of file
diff --git a/libs/importlib_resources/tests/namespacedata01/utf-16.file b/libs/importlib_resources/tests/namespacedata01/utf-16.file
deleted file mode 100644
index 2cb772295..000000000
Binary files a/libs/importlib_resources/tests/namespacedata01/utf-16.file and /dev/null differ
diff --git a/libs/importlib_resources/tests/namespacedata01/utf-8.file b/libs/importlib_resources/tests/namespacedata01/utf-8.file
deleted file mode 100644
index 1c0132ad9..000000000
--- a/libs/importlib_resources/tests/namespacedata01/utf-8.file
+++ /dev/null
@@ -1 +0,0 @@
-Hello, UTF-8 world!
diff --git a/libs/importlib_resources/tests/test_contents.py b/libs/importlib_resources/tests/test_contents.py
index 7dc3b0a61..741a74076 100644
--- a/libs/importlib_resources/tests/test_contents.py
+++ b/libs/importlib_resources/tests/test_contents.py
@@ -1,7 +1,6 @@
 import unittest
 import importlib_resources as resources
 
-from . import data01
 from . import util
 
 
@@ -19,16 +18,17 @@ class ContentsTests:
         assert self.expected <= contents
 
 
-class ContentsDiskTests(ContentsTests, unittest.TestCase):
-    def setUp(self):
-        self.data = data01
+class ContentsDiskTests(ContentsTests, util.DiskSetup, unittest.TestCase):
+    pass
 
 
 class ContentsZipTests(ContentsTests, util.ZipSetup, unittest.TestCase):
     pass
 
 
-class ContentsNamespaceTests(ContentsTests, unittest.TestCase):
+class ContentsNamespaceTests(ContentsTests, util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
+
     expected = {
         # no __init__ because of namespace design
         'binary.file',
@@ -36,8 +36,3 @@ class ContentsNamespaceTests(ContentsTests, unittest.TestCase):
         'utf-16.file',
         'utf-8.file',
     }
-
-    def setUp(self):
-        from . import namespacedata01
-
-        self.data = namespacedata01
diff --git a/libs/importlib_resources/tests/test_custom.py b/libs/importlib_resources/tests/test_custom.py
index 35336f8fb..86c65676f 100644
--- a/libs/importlib_resources/tests/test_custom.py
+++ b/libs/importlib_resources/tests/test_custom.py
@@ -6,7 +6,7 @@ import importlib_resources as resources
 from .. import abc
 from ..abc import TraversableResources, ResourceReader
 from . import util
-from ._compat import os_helper
+from .compat.py39 import os_helper
 
 
 class SimpleLoader:
diff --git a/libs/importlib_resources/tests/test_files.py b/libs/importlib_resources/tests/test_files.py
index 51ecc8961..f1fe2337a 100644
--- a/libs/importlib_resources/tests/test_files.py
+++ b/libs/importlib_resources/tests/test_files.py
@@ -1,3 +1,7 @@
+import os
+import pathlib
+import py_compile
+import shutil
 import textwrap
 import unittest
 import warnings
@@ -6,10 +10,8 @@ import contextlib
 
 import importlib_resources as resources
 from ..abc import Traversable
-from . import data01
 from . import util
-from . import _path
-from ._compat import os_helper, import_helper
+from .compat.py39 import os_helper, import_helper
 
 
 @contextlib.contextmanager
@@ -33,6 +35,11 @@ class FilesTests:
     def test_traversable(self):
         assert isinstance(resources.files(self.data), Traversable)
 
+    def test_joinpath_with_multiple_args(self):
+        files = resources.files(self.data)
+        binfile = files.joinpath('subdirectory', 'binary.file')
+        self.assertTrue(binfile.is_file())
+
     def test_old_parameter(self):
         """
         Files used to take a 'package' parameter. Make sure anyone
@@ -42,70 +49,146 @@ class FilesTests:
             resources.files(package=self.data)
 
 
-class OpenDiskTests(FilesTests, unittest.TestCase):
-    def setUp(self):
-        self.data = data01
+class OpenDiskTests(FilesTests, util.DiskSetup, unittest.TestCase):
+    pass
 
 
 class OpenZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
     pass
 
 
-class OpenNamespaceTests(FilesTests, unittest.TestCase):
-    def setUp(self):
-        from . import namespacedata01
+class OpenNamespaceTests(FilesTests, util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
 
-        self.data = namespacedata01
+    def test_non_paths_in_dunder_path(self):
+        """
+        Non-path items in a namespace package's ``__path__`` are ignored.
+
+        As reported in python/importlib_resources#311, some tools
+        like Setuptools, when creating editable packages, will inject
+        non-paths into a namespace package's ``__path__``, a
+        sentinel like
+        ``__editable__.sample_namespace-1.0.finder.__path_hook__``
+        to cause the ``PathEntryFinder`` to be called when searching
+        for packages. In that case, resources should still be loadable.
+        """
+        import namespacedata01
+
+        namespacedata01.__path__.append(
+            '__editable__.sample_namespace-1.0.finder.__path_hook__'
+        )
+
+        resources.files(namespacedata01)
 
 
 class OpenNamespaceZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
     ZIP_MODULE = 'namespacedata01'
 
 
-class SiteDir:
-    def setUp(self):
-        self.fixtures = contextlib.ExitStack()
-        self.addCleanup(self.fixtures.close)
-        self.site_dir = self.fixtures.enter_context(os_helper.temp_dir())
-        self.fixtures.enter_context(import_helper.DirsOnSysPath(self.site_dir))
-        self.fixtures.enter_context(import_helper.CleanImport())
+class DirectSpec:
+    """
+    Override behavior of ModuleSetup to write a full spec directly.
+    """
+
+    MODULE = 'unused'
+
+    def load_fixture(self, name):
+        self.tree_on_path(self.spec)
 
 
-class ModulesFilesTests(SiteDir, unittest.TestCase):
+class ModulesFiles:
+    spec = {
+        'mod.py': '',
+        'res.txt': 'resources are the best',
+    }
+
     def test_module_resources(self):
         """
         A module can have resources found adjacent to the module.
         """
-        spec = {
-            'mod.py': '',
-            'res.txt': 'resources are the best',
-        }
-        _path.build(spec, self.site_dir)
-        import mod
+        import mod  # type: ignore[import-not-found]
 
         actual = resources.files(mod).joinpath('res.txt').read_text(encoding='utf-8')
-        assert actual == spec['res.txt']
+        assert actual == self.spec['res.txt']
 
 
-class ImplicitContextFilesTests(SiteDir, unittest.TestCase):
-    def test_implicit_files(self):
+class ModuleFilesDiskTests(DirectSpec, util.DiskSetup, ModulesFiles, unittest.TestCase):
+    pass
+
+
+class ModuleFilesZipTests(DirectSpec, util.ZipSetup, ModulesFiles, unittest.TestCase):
+    pass
+
+
+class ImplicitContextFiles:
+    set_val = textwrap.dedent(
+        f"""
+        import {resources.__name__} as res
+        val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
+        """
+    )
+    spec = {
+        'somepkg': {
+            '__init__.py': set_val,
+            'submod.py': set_val,
+            'res.txt': 'resources are the best',
+        },
+        'frozenpkg': {
+            '__init__.py': set_val.replace(resources.__name__, 'c_resources'),
+            'res.txt': 'resources are the best',
+        },
+    }
+
+    def test_implicit_files_package(self):
         """
         Without any parameter, files() will infer the location as the caller.
         """
-        spec = {
-            'somepkg': {
-                '__init__.py': textwrap.dedent(
-                    """
-                    import importlib_resources as res
-                    val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
-                    """
-                ),
-                'res.txt': 'resources are the best',
-            },
-        }
-        _path.build(spec, self.site_dir)
         assert importlib.import_module('somepkg').val == 'resources are the best'
 
+    def test_implicit_files_submodule(self):
+        """
+        Without any parameter, files() will infer the location as the caller.
+        """
+        assert importlib.import_module('somepkg.submod').val == 'resources are the best'
+
+    def _compile_importlib(self):
+        """
+        Make a compiled-only copy of the importlib resources package.
+        """
+        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)
+        self.fixtures.enter_context(import_helper.DirsOnSysPath(bin_site))
+
+    def test_implicit_files_with_compiled_importlib(self):
+        """
+        Caller detection works for compiled-only resources module.
+
+        python/cpython#123085
+        """
+        self._compile_importlib()
+        assert importlib.import_module('frozenpkg').val == 'resources are the best'
+
+
+class ImplicitContextFilesDiskTests(
+    DirectSpec, util.DiskSetup, ImplicitContextFiles, unittest.TestCase
+):
+    pass
+
+
+class ImplicitContextFilesZipTests(
+    DirectSpec, util.ZipSetup, ImplicitContextFiles, unittest.TestCase
+):
+    pass
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/libs/importlib_resources/tests/test_functional.py b/libs/importlib_resources/tests/test_functional.py
new file mode 100644
index 000000000..1851edfba
--- /dev/null
+++ b/libs/importlib_resources/tests/test_functional.py
@@ -0,0 +1,255 @@
+import unittest
+import os
+import importlib
+
+from .compat.py39 import warnings_helper
+
+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.
+
+
+class StringAnchorMixin:
+    anchor01 = 'data01'
+    anchor02 = 'data02'
+
+
+class ModuleAnchorMixin:
+    @property
+    def anchor01(self):
+        return importlib.import_module('data01')
+
+    @property
+    def anchor02(self):
+        return importlib.import_module('data02')
+
+
+class FunctionalAPIBase(util.DiskSetup):
+    def setUp(self):
+        super().setUp()
+        self.load_fixture('data02')
+
+    def _gen_resourcetxt_path_parts(self):
+        """Yield various names of a text file in anchor02, each in a subTest"""
+        for path_parts in (
+            ('subdirectory', 'subsubdir', 'resource.txt'),
+            ('subdirectory/subsubdir/resource.txt',),
+            ('subdirectory/subsubdir', 'resource.txt'),
+        ):
+            with self.subTest(path_parts=path_parts):
+                yield path_parts
+
+    def assertEndsWith(self, string, suffix):
+        """Assert that `string` ends with `suffix`.
+
+        Used to ignore an architecture-specific UTF-16 byte-order mark."""
+        self.assertEqual(string[-len(suffix) :], suffix)
+
+    def test_read_text(self):
+        self.assertEqual(
+            resources.read_text(self.anchor01, 'utf-8.file'),
+            'Hello, UTF-8 world!\n',
+        )
+        self.assertEqual(
+            resources.read_text(
+                self.anchor02,
+                'subdirectory',
+                'subsubdir',
+                'resource.txt',
+                encoding='utf-8',
+            ),
+            'a resource',
+        )
+        for path_parts in self._gen_resourcetxt_path_parts():
+            self.assertEqual(
+                resources.read_text(
+                    self.anchor02,
+                    *path_parts,
+                    encoding='utf-8',
+                ),
+                'a resource',
+            )
+        # Use generic OSError, since e.g. attempting to read a directory can
+        # fail with PermissionError rather than IsADirectoryError
+        with self.assertRaises(OSError):
+            resources.read_text(self.anchor01)
+        with self.assertRaises(OSError):
+            resources.read_text(self.anchor01, 'no-such-file')
+        with self.assertRaises(UnicodeDecodeError):
+            resources.read_text(self.anchor01, 'utf-16.file')
+        self.assertEqual(
+            resources.read_text(
+                self.anchor01,
+                'binary.file',
+                encoding='latin1',
+            ),
+            '\x00\x01\x02\x03',
+        )
+        self.assertEndsWith(  # ignore the BOM
+            resources.read_text(
+                self.anchor01,
+                'utf-16.file',
+                errors='backslashreplace',
+            ),
+            'Hello, UTF-16 world!\n'.encode('utf-16-le').decode(
+                errors='backslashreplace',
+            ),
+        )
+
+    def test_read_binary(self):
+        self.assertEqual(
+            resources.read_binary(self.anchor01, 'utf-8.file'),
+            b'Hello, UTF-8 world!\n',
+        )
+        for path_parts in self._gen_resourcetxt_path_parts():
+            self.assertEqual(
+                resources.read_binary(self.anchor02, *path_parts),
+                b'a resource',
+            )
+
+    def test_open_text(self):
+        with resources.open_text(self.anchor01, 'utf-8.file') as f:
+            self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
+        for path_parts in self._gen_resourcetxt_path_parts():
+            with resources.open_text(
+                self.anchor02,
+                *path_parts,
+                encoding='utf-8',
+            ) as f:
+                self.assertEqual(f.read(), 'a resource')
+        # Use generic OSError, since e.g. attempting to read a directory can
+        # fail with PermissionError rather than IsADirectoryError
+        with self.assertRaises(OSError):
+            resources.open_text(self.anchor01)
+        with self.assertRaises(OSError):
+            resources.open_text(self.anchor01, 'no-such-file')
+        with resources.open_text(self.anchor01, 'utf-16.file') as f:
+            with self.assertRaises(UnicodeDecodeError):
+                f.read()
+        with resources.open_text(
+            self.anchor01,
+            'binary.file',
+            encoding='latin1',
+        ) as f:
+            self.assertEqual(f.read(), '\x00\x01\x02\x03')
+        with resources.open_text(
+            self.anchor01,
+            'utf-16.file',
+            errors='backslashreplace',
+        ) as f:
+            self.assertEndsWith(  # ignore the BOM
+                f.read(),
+                'Hello, UTF-16 world!\n'.encode('utf-16-le').decode(
+                    errors='backslashreplace',
+                ),
+            )
+
+    def test_open_binary(self):
+        with resources.open_binary(self.anchor01, 'utf-8.file') as f:
+            self.assertEqual(f.read(), b'Hello, UTF-8 world!\n')
+        for path_parts in self._gen_resourcetxt_path_parts():
+            with resources.open_binary(
+                self.anchor02,
+                *path_parts,
+            ) as f:
+                self.assertEqual(f.read(), b'a resource')
+
+    def test_path(self):
+        with resources.path(self.anchor01, 'utf-8.file') as path:
+            with open(str(path), encoding='utf-8') as f:
+                self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
+        with resources.path(self.anchor01) as path:
+            with open(os.path.join(path, 'utf-8.file'), encoding='utf-8') as f:
+                self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
+
+    def test_is_resource(self):
+        is_resource = resources.is_resource
+        self.assertTrue(is_resource(self.anchor01, 'utf-8.file'))
+        self.assertFalse(is_resource(self.anchor01, 'no_such_file'))
+        self.assertFalse(is_resource(self.anchor01))
+        self.assertFalse(is_resource(self.anchor01, 'subdirectory'))
+        for path_parts in self._gen_resourcetxt_path_parts():
+            self.assertTrue(is_resource(self.anchor02, *path_parts))
+
+    def test_contents(self):
+        with warnings_helper.check_warnings((".*contents.*", DeprecationWarning)):
+            c = resources.contents(self.anchor01)
+        self.assertGreaterEqual(
+            set(c),
+            {'utf-8.file', 'utf-16.file', 'binary.file', 'subdirectory'},
+        )
+        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,
+            )):
+                list(resources.contents(self.anchor01, *path_parts))
+        with warnings_helper.check_warnings((".*contents.*", DeprecationWarning)):
+            c = resources.contents(self.anchor01, 'subdirectory')
+        self.assertGreaterEqual(
+            set(c),
+            {'binary.file'},
+        )
+
+    @warnings_helper.ignore_warnings(category=DeprecationWarning)
+    def test_common_errors(self):
+        for func in (
+            resources.read_text,
+            resources.read_binary,
+            resources.open_text,
+            resources.open_binary,
+            resources.path,
+            resources.is_resource,
+            resources.contents,
+        ):
+            with self.subTest(func=func):
+                # Rejecting None anchor
+                with self.assertRaises(TypeError):
+                    func(None)
+                # Rejecting invalid anchor type
+                with self.assertRaises((TypeError, AttributeError)):
+                    func(1234)
+                # Unknown module
+                with self.assertRaises(ModuleNotFoundError):
+                    func('$missing module$')
+
+    def test_text_errors(self):
+        for func in (
+            resources.read_text,
+            resources.open_text,
+        ):
+            with self.subTest(func=func):
+                # Multiple path arguments need explicit encoding argument.
+                with self.assertRaises(TypeError):
+                    func(
+                        self.anchor02,
+                        'subdirectory',
+                        'subsubdir',
+                        'resource.txt',
+                    )
+
+
+class FunctionalAPITest_StringAnchor(
+    StringAnchorMixin,
+    FunctionalAPIBase,
+    unittest.TestCase,
+):
+    pass
+
+
+class FunctionalAPITest_ModuleAnchor(
+    ModuleAnchorMixin,
+    FunctionalAPIBase,
+    unittest.TestCase,
+):
+    pass
diff --git a/libs/importlib_resources/tests/test_open.py b/libs/importlib_resources/tests/test_open.py
index 44f1018af..c40bb8c6f 100644
--- a/libs/importlib_resources/tests/test_open.py
+++ b/libs/importlib_resources/tests/test_open.py
@@ -1,7 +1,6 @@
 import unittest
 
 import importlib_resources as resources
-from . import data01
 from . import util
 
 
@@ -65,16 +64,12 @@ class OpenTests:
             target.open(encoding='utf-8')
 
 
-class OpenDiskTests(OpenTests, unittest.TestCase):
-    def setUp(self):
-        self.data = data01
+class OpenDiskTests(OpenTests, util.DiskSetup, unittest.TestCase):
+    pass
 
 
-class OpenDiskNamespaceTests(OpenTests, unittest.TestCase):
-    def setUp(self):
-        from . import namespacedata01
-
-        self.data = namespacedata01
+class OpenDiskNamespaceTests(OpenTests, util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
 
 
 class OpenZipTests(OpenTests, util.ZipSetup, unittest.TestCase):
@@ -82,7 +77,7 @@ class OpenZipTests(OpenTests, util.ZipSetup, unittest.TestCase):
 
 
 class OpenNamespaceZipTests(OpenTests, util.ZipSetup, unittest.TestCase):
-    ZIP_MODULE = 'namespacedata01'
+    MODULE = 'namespacedata01'
 
 
 if __name__ == '__main__':
diff --git a/libs/importlib_resources/tests/test_path.py b/libs/importlib_resources/tests/test_path.py
index c3e1cbb4e..1e30f2bc5 100644
--- a/libs/importlib_resources/tests/test_path.py
+++ b/libs/importlib_resources/tests/test_path.py
@@ -3,7 +3,6 @@ import pathlib
 import unittest
 
 import importlib_resources as resources
-from . import data01
 from . import util
 
 
@@ -25,9 +24,7 @@ class PathTests:
             self.assertEqual('Hello, UTF-8 world!\n', path.read_text(encoding='utf-8'))
 
 
-class PathDiskTests(PathTests, unittest.TestCase):
-    data = data01
-
+class PathDiskTests(PathTests, util.DiskSetup, unittest.TestCase):
     def test_natural_path(self):
         """
         Guarantee the internal implementation detail that
diff --git a/libs/importlib_resources/tests/test_read.py b/libs/importlib_resources/tests/test_read.py
index 97d90128c..6780a2d16 100644
--- a/libs/importlib_resources/tests/test_read.py
+++ b/libs/importlib_resources/tests/test_read.py
@@ -1,7 +1,6 @@
 import unittest
 import importlib_resources as resources
 
-from . import data01
 from . import util
 from importlib import import_module
 
@@ -52,8 +51,8 @@ class ReadTests:
         )
 
 
-class ReadDiskTests(ReadTests, unittest.TestCase):
-    data = data01
+class ReadDiskTests(ReadTests, util.DiskSetup, unittest.TestCase):
+    pass
 
 
 class ReadZipTests(ReadTests, util.ZipSetup, unittest.TestCase):
@@ -69,15 +68,12 @@ class ReadZipTests(ReadTests, util.ZipSetup, unittest.TestCase):
         self.assertEqual(result, bytes(range(4, 8)))
 
 
-class ReadNamespaceTests(ReadTests, unittest.TestCase):
-    def setUp(self):
-        from . import namespacedata01
-
-        self.data = namespacedata01
+class ReadNamespaceTests(ReadTests, util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
 
 
 class ReadNamespaceZipTests(ReadTests, util.ZipSetup, unittest.TestCase):
-    ZIP_MODULE = 'namespacedata01'
+    MODULE = 'namespacedata01'
 
     def test_read_submodule_resource(self):
         submodule = import_module('namespacedata01.subdirectory')
diff --git a/libs/importlib_resources/tests/test_reader.py b/libs/importlib_resources/tests/test_reader.py
index 95c2fc85a..0a77eb404 100644
--- a/libs/importlib_resources/tests/test_reader.py
+++ b/libs/importlib_resources/tests/test_reader.py
@@ -1,16 +1,21 @@
 import os.path
-import sys
 import pathlib
 import unittest
 
 from importlib import import_module
 from importlib_resources.readers import MultiplexedPath, NamespaceReader
 
+from . import util
 
-class MultiplexedPathTest(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.folder = pathlib.Path(__file__).parent / 'namespacedata01'
+
+class MultiplexedPathTest(util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
+
+    def setUp(self):
+        super().setUp()
+        self.folder = pathlib.Path(self.data.__path__[0])
+        self.data01 = pathlib.Path(self.load_fixture('data01').__file__).parent
+        self.data02 = pathlib.Path(self.load_fixture('data02').__file__).parent
 
     def test_init_no_paths(self):
         with self.assertRaises(FileNotFoundError):
@@ -31,9 +36,8 @@ class MultiplexedPathTest(unittest.TestCase):
         )
 
     def test_iterdir_duplicate(self):
-        data01 = pathlib.Path(__file__).parent.joinpath('data01')
         contents = {
-            path.name for path in MultiplexedPath(self.folder, data01).iterdir()
+            path.name for path in MultiplexedPath(self.folder, self.data01).iterdir()
         }
         for remove in ('__pycache__', '__init__.pyc'):
             try:
@@ -61,9 +65,8 @@ class MultiplexedPathTest(unittest.TestCase):
             path.open()
 
     def test_join_path(self):
-        data01 = pathlib.Path(__file__).parent.joinpath('data01')
-        prefix = str(data01.parent)
-        path = MultiplexedPath(self.folder, data01)
+        prefix = str(self.folder.parent)
+        path = MultiplexedPath(self.folder, self.data01)
         self.assertEqual(
             str(path.joinpath('binary.file'))[len(prefix) + 1 :],
             os.path.join('namespacedata01', 'binary.file'),
@@ -83,10 +86,8 @@ class MultiplexedPathTest(unittest.TestCase):
         assert not path.joinpath('imaginary/foo.py').exists()
 
     def test_join_path_common_subdir(self):
-        data01 = pathlib.Path(__file__).parent.joinpath('data01')
-        data02 = pathlib.Path(__file__).parent.joinpath('data02')
-        prefix = str(data01.parent)
-        path = MultiplexedPath(data01, data02)
+        prefix = str(self.data02.parent)
+        path = MultiplexedPath(self.data01, self.data02)
         self.assertIsInstance(path.joinpath('subdirectory'), MultiplexedPath)
         self.assertEqual(
             str(path.joinpath('subdirectory', 'subsubdir'))[len(prefix) + 1 :],
@@ -106,16 +107,8 @@ class MultiplexedPathTest(unittest.TestCase):
         )
 
 
-class NamespaceReaderTest(unittest.TestCase):
-    site_dir = str(pathlib.Path(__file__).parent)
-
-    @classmethod
-    def setUpClass(cls):
-        sys.path.append(cls.site_dir)
-
-    @classmethod
-    def tearDownClass(cls):
-        sys.path.remove(cls.site_dir)
+class NamespaceReaderTest(util.DiskSetup, unittest.TestCase):
+    MODULE = 'namespacedata01'
 
     def test_init_error(self):
         with self.assertRaises(ValueError):
@@ -125,7 +118,7 @@ class NamespaceReaderTest(unittest.TestCase):
         namespacedata01 = import_module('namespacedata01')
         reader = NamespaceReader(namespacedata01.__spec__.submodule_search_locations)
 
-        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata01'))
+        root = self.data.__path__[0]
         self.assertEqual(
             reader.resource_path('binary.file'), os.path.join(root, 'binary.file')
         )
@@ -134,9 +127,8 @@ class NamespaceReaderTest(unittest.TestCase):
         )
 
     def test_files(self):
-        namespacedata01 = import_module('namespacedata01')
-        reader = NamespaceReader(namespacedata01.__spec__.submodule_search_locations)
-        root = os.path.abspath(os.path.join(__file__, '..', 'namespacedata01'))
+        reader = NamespaceReader(self.data.__spec__.submodule_search_locations)
+        root = self.data.__path__[0]
         self.assertIsInstance(reader.files(), MultiplexedPath)
         self.assertEqual(repr(reader.files()), f"MultiplexedPath('{root}')")
 
diff --git a/libs/importlib_resources/tests/test_resource.py b/libs/importlib_resources/tests/test_resource.py
index dc2a108cd..a0da6a356 100644
--- a/libs/importlib_resources/tests/test_resource.py
+++ b/libs/importlib_resources/tests/test_resource.py
@@ -1,9 +1,6 @@
-import sys
 import unittest
 import importlib_resources as resources
-import pathlib
 
-from . import data01
 from . import util
 from importlib import import_module
 
@@ -25,9 +22,8 @@ class ResourceTests:
         self.assertTrue(target.is_dir())
 
 
-class ResourceDiskTests(ResourceTests, unittest.TestCase):
-    def setUp(self):
-        self.data = data01
+class ResourceDiskTests(ResourceTests, util.DiskSetup, unittest.TestCase):
+    pass
 
 
 class ResourceZipTests(ResourceTests, util.ZipSetup, unittest.TestCase):
@@ -38,33 +34,39 @@ def names(traversable):
     return {item.name for item in traversable.iterdir()}
 
 
-class ResourceLoaderTests(unittest.TestCase):
+class ResourceLoaderTests(util.DiskSetup, unittest.TestCase):
     def test_resource_contents(self):
         package = util.create_package(
-            file=data01, path=data01.__file__, contents=['A', 'B', 'C']
+            file=self.data, path=self.data.__file__, contents=['A', 'B', 'C']
         )
         self.assertEqual(names(resources.files(package)), {'A', 'B', 'C'})
 
     def test_is_file(self):
         package = util.create_package(
-            file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F']
+            file=self.data,
+            path=self.data.__file__,
+            contents=['A', 'B', 'C', 'D/E', 'D/F'],
         )
         self.assertTrue(resources.files(package).joinpath('B').is_file())
 
     def test_is_dir(self):
         package = util.create_package(
-            file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F']
+            file=self.data,
+            path=self.data.__file__,
+            contents=['A', 'B', 'C', 'D/E', 'D/F'],
         )
         self.assertTrue(resources.files(package).joinpath('D').is_dir())
 
     def test_resource_missing(self):
         package = util.create_package(
-            file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F']
+            file=self.data,
+            path=self.data.__file__,
+            contents=['A', 'B', 'C', 'D/E', 'D/F'],
         )
         self.assertFalse(resources.files(package).joinpath('Z').is_file())
 
 
-class ResourceCornerCaseTests(unittest.TestCase):
+class ResourceCornerCaseTests(util.DiskSetup, unittest.TestCase):
     def test_package_has_no_reader_fallback(self):
         """
         Test odd ball packages which:
@@ -73,7 +75,7 @@ class ResourceCornerCaseTests(unittest.TestCase):
         # 3. Are not in a zip file
         """
         module = util.create_package(
-            file=data01, path=data01.__file__, contents=['A', 'B', 'C']
+            file=self.data, path=self.data.__file__, contents=['A', 'B', 'C']
         )
         # Give the module a dummy loader.
         module.__loader__ = object()
@@ -84,9 +86,7 @@ class ResourceCornerCaseTests(unittest.TestCase):
         self.assertFalse(resources.files(module).joinpath('A').is_file())
 
 
-class ResourceFromZipsTest01(util.ZipSetupBase, unittest.TestCase):
-    ZIP_MODULE = 'data01'
-
+class ResourceFromZipsTest01(util.ZipSetup, unittest.TestCase):
     def test_is_submodule_resource(self):
         submodule = import_module('data01.subdirectory')
         self.assertTrue(resources.files(submodule).joinpath('binary.file').is_file())
@@ -117,8 +117,8 @@ class ResourceFromZipsTest01(util.ZipSetupBase, unittest.TestCase):
         assert not data.parent.exists()
 
 
-class ResourceFromZipsTest02(util.ZipSetupBase, unittest.TestCase):
-    ZIP_MODULE = 'data02'
+class ResourceFromZipsTest02(util.ZipSetup, unittest.TestCase):
+    MODULE = 'data02'
 
     def test_unrelated_contents(self):
         """
@@ -135,7 +135,7 @@ class ResourceFromZipsTest02(util.ZipSetupBase, unittest.TestCase):
         )
 
 
-class DeletingZipsTest(util.ZipSetupBase, unittest.TestCase):
+class DeletingZipsTest(util.ZipSetup, unittest.TestCase):
     """Having accessed resources in a zip file should not keep an open
     reference to the zip.
     """
@@ -217,24 +217,20 @@ class ResourceFromNamespaceTests:
         self.assertEqual(contents, {'binary.file'})
 
 
-class ResourceFromNamespaceDiskTests(ResourceFromNamespaceTests, unittest.TestCase):
-    site_dir = str(pathlib.Path(__file__).parent)
-
-    @classmethod
-    def setUpClass(cls):
-        sys.path.append(cls.site_dir)
-
-    @classmethod
-    def tearDownClass(cls):
-        sys.path.remove(cls.site_dir)
-
-
-class ResourceFromNamespaceZipTests(
-    util.ZipSetupBase,
+class ResourceFromNamespaceDiskTests(
+    util.DiskSetup,
     ResourceFromNamespaceTests,
     unittest.TestCase,
 ):
-    ZIP_MODULE = 'namespacedata01'
+    MODULE = 'namespacedata01'
+
+
+class ResourceFromNamespaceZipTests(
+    util.ZipSetup,
+    ResourceFromNamespaceTests,
+    unittest.TestCase,
+):
+    MODULE = 'namespacedata01'
 
 
 if __name__ == '__main__':
diff --git a/libs/importlib_resources/tests/util.py b/libs/importlib_resources/tests/util.py
index 066f41130..a4eafac3a 100644
--- a/libs/importlib_resources/tests/util.py
+++ b/libs/importlib_resources/tests/util.py
@@ -6,10 +6,10 @@ import types
 import pathlib
 import contextlib
 
-from . import data01
 from ..abc import ResourceReader
-from ._compat import import_helper, os_helper
+from .compat.py39 import import_helper, os_helper
 from . import zip as zip_
+from . import _path
 
 
 from importlib.machinery import ModuleSpec
@@ -68,7 +68,7 @@ def create_package(file=None, path=None, is_package=True, contents=()):
     )
 
 
-class CommonTests(metaclass=abc.ABCMeta):
+class CommonTestsBase(metaclass=abc.ABCMeta):
     """
     Tests shared by test_open, test_path, and test_read.
     """
@@ -84,34 +84,34 @@ class CommonTests(metaclass=abc.ABCMeta):
         """
         Passing in the package name should succeed.
         """
-        self.execute(data01.__name__, 'utf-8.file')
+        self.execute(self.data.__name__, 'utf-8.file')
 
     def test_package_object(self):
         """
         Passing in the package itself should succeed.
         """
-        self.execute(data01, 'utf-8.file')
+        self.execute(self.data, 'utf-8.file')
 
     def test_string_path(self):
         """
         Passing in a string for the path should succeed.
         """
         path = 'utf-8.file'
-        self.execute(data01, path)
+        self.execute(self.data, path)
 
     def test_pathlib_path(self):
         """
         Passing in a pathlib.PurePath object for the path should succeed.
         """
         path = pathlib.PurePath('utf-8.file')
-        self.execute(data01, path)
+        self.execute(self.data, path)
 
     def test_importing_module_as_side_effect(self):
         """
         The anchor package can already be imported.
         """
-        del sys.modules[data01.__name__]
-        self.execute(data01.__name__, 'utf-8.file')
+        del sys.modules[self.data.__name__]
+        self.execute(self.data.__name__, 'utf-8.file')
 
     def test_missing_path(self):
         """
@@ -141,25 +141,66 @@ class CommonTests(metaclass=abc.ABCMeta):
             self.execute(package, 'utf-8.file')
 
 
-class ZipSetupBase:
-    ZIP_MODULE = 'data01'
+fixtures = dict(
+    data01={
+        '__init__.py': '',
+        'binary.file': bytes(range(4)),
+        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
+        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
+        'subdirectory': {
+            '__init__.py': '',
+            'binary.file': bytes(range(4, 8)),
+        },
+    },
+    data02={
+        '__init__.py': '',
+        'one': {'__init__.py': '', 'resource1.txt': 'one resource'},
+        'two': {'__init__.py': '', 'resource2.txt': 'two resource'},
+        'subdirectory': {'subsubdir': {'resource.txt': 'a resource'}},
+    },
+    namespacedata01={
+        'binary.file': bytes(range(4)),
+        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
+        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
+        'subdirectory': {
+            'binary.file': bytes(range(12, 16)),
+        },
+    },
+)
 
+
+class ModuleSetup:
     def setUp(self):
         self.fixtures = contextlib.ExitStack()
         self.addCleanup(self.fixtures.close)
 
-        modules = import_helper.modules_setup()
-        self.addCleanup(import_helper.modules_cleanup, *modules)
+        self.fixtures.enter_context(import_helper.isolated_modules())
+        self.data = self.load_fixture(self.MODULE)
 
+    def load_fixture(self, module):
+        self.tree_on_path({module: fixtures[module]})
+        return importlib.import_module(module)
+
+
+class ZipSetup(ModuleSetup):
+    MODULE = 'data01'
+
+    def tree_on_path(self, spec):
         temp_dir = self.fixtures.enter_context(os_helper.temp_dir())
         modules = pathlib.Path(temp_dir) / 'zipped modules.zip'
-        src_path = pathlib.Path(__file__).parent.joinpath(self.ZIP_MODULE)
         self.fixtures.enter_context(
-            import_helper.DirsOnSysPath(str(zip_.make_zip_file(src_path, modules)))
+            import_helper.DirsOnSysPath(str(zip_.make_zip_file(spec, modules)))
         )
 
-        self.data = importlib.import_module(self.ZIP_MODULE)
+
+class DiskSetup(ModuleSetup):
+    MODULE = 'data01'
+
+    def tree_on_path(self, spec):
+        temp_dir = self.fixtures.enter_context(os_helper.temp_dir())
+        _path.build(spec, pathlib.Path(temp_dir))
+        self.fixtures.enter_context(import_helper.DirsOnSysPath(temp_dir))
 
 
-class ZipSetup(ZipSetupBase):
+class CommonTests(DiskSetup, CommonTestsBase):
     pass
diff --git a/libs/importlib_resources/tests/zip.py b/libs/importlib_resources/tests/zip.py
index 962195a90..51ee56487 100644
--- a/libs/importlib_resources/tests/zip.py
+++ b/libs/importlib_resources/tests/zip.py
@@ -2,31 +2,25 @@
 Generate zip test data files.
 """
 
-import contextlib
-import os
-import pathlib
 import zipfile
 
 import zipp
 
 
-def make_zip_file(src, dst):
+def make_zip_file(tree, dst):
     """
-    Zip the files in src into a new zipfile at dst.
+    Zip the files in tree into a new zipfile at dst.
     """
     with zipfile.ZipFile(dst, 'w') as zf:
-        for src_path, rel in walk(src):
-            dst_name = src.name / pathlib.PurePosixPath(rel.as_posix())
-            zf.write(src_path, dst_name)
+        for name, contents in walk(tree):
+            zf.writestr(name, contents)
         zipp.CompleteDirs.inject(zf)
     return dst
 
 
-def walk(datapath):
-    for dirpath, dirnames, filenames in os.walk(datapath):
-        with contextlib.suppress(ValueError):
-            dirnames.remove('__pycache__')
-        for filename in filenames:
-            res = pathlib.Path(dirpath) / filename
-            rel = res.relative_to(datapath)
-            yield res, rel
+def walk(tree, prefix=''):
+    for name, contents in tree.items():
+        if isinstance(contents, dict):
+            yield from walk(contents, prefix=f'{prefix}{name}/')
+        else:
+            yield f'{prefix}{name}', contents
diff --git a/libs/inflect-7.0.0.dist-info/RECORD b/libs/inflect-7.0.0.dist-info/RECORD
deleted file mode 100644
index 162cbe744..000000000
--- a/libs/inflect-7.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-inflect-7.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-inflect-7.0.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-inflect-7.0.0.dist-info/METADATA,sha256=8IoGgLa4FInqHNquqWJJmhw3unMmVk0yV3Wfue7DdJs,21470
-inflect-7.0.0.dist-info/RECORD,,
-inflect-7.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inflect-7.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-inflect-7.0.0.dist-info/top_level.txt,sha256=m52ujdp10CqT6jh1XQxZT6kEntcnv-7Tl7UiGNTzWZA,8
-inflect/__init__.py,sha256=5KHEEYdT98oCwaJ9TxWBkcyZhK5w3a35pOByPq-brLs,102919
-inflect/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inflect/compat/pydantic.py,sha256=N4wBaVCqJD5XyX8g6uX68fqm3PpgPUwDiraC97V3Jgo,507
-inflect/compat/pydantic1.py,sha256=myfFPMj2-1ybEtzhmDxYGohW7DQZ9rDr-_KWOPOCQeE,204
-inflect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/inflect-7.0.0.dist-info/WHEEL b/libs/inflect-7.0.0.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/inflect-7.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/itsdangerous-2.1.2.dist-info/INSTALLER b/libs/inflect-7.4.0.dist-info/INSTALLER
similarity index 100%
rename from libs/itsdangerous-2.1.2.dist-info/INSTALLER
rename to libs/inflect-7.4.0.dist-info/INSTALLER
diff --git a/libs/inflect-7.0.0.dist-info/LICENSE b/libs/inflect-7.4.0.dist-info/LICENSE
similarity index 100%
rename from libs/inflect-7.0.0.dist-info/LICENSE
rename to libs/inflect-7.4.0.dist-info/LICENSE
diff --git a/libs/inflect-7.0.0.dist-info/METADATA b/libs/inflect-7.4.0.dist-info/METADATA
similarity index 92%
rename from libs/inflect-7.0.0.dist-info/METADATA
rename to libs/inflect-7.4.0.dist-info/METADATA
index 300ee6a25..00a7fcdd0 100644
--- a/libs/inflect-7.0.0.dist-info/METADATA
+++ b/libs/inflect-7.4.0.dist-info/METADATA
@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: inflect
-Version: 7.0.0
-Summary: Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words
-Home-page: https://github.com/jaraco/inflect
-Author: Paul Dyson
-Author-email: pwdyson@yahoo.com
-Maintainer: Jason R. Coombs
-Maintainer-email: jaraco@jaraco.com
+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
@@ -17,32 +16,37 @@ 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: pydantic >=1.9.1
-Requires-Dist: typing-extensions
-Provides-Extra: docs
-Requires-Dist: sphinx >=3.5 ; extra == 'docs'
-Requires-Dist: jaraco.packaging >=9 ; 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: pygments ; 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'
+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/workflows/tests/badge.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
 
@@ -50,14 +54,10 @@ Requires-Dist: pytest-mypy >=0.9.1 ; (platform_python_implementation != "PyPy")
     :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/inflect/badge/?version=latest
    :target: https://inflect.readthedocs.io/en/latest/?badge=latest
 
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. image:: https://tidelift.com/badges/package/pypi/inflect
@@ -66,7 +66,7 @@ Requires-Dist: pytest-mypy >=0.9.1 ; (platform_python_implementation != "PyPy")
 NAME
 ====
 
-inflect.py - Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words.
+inflect.py - Accurately generate plurals, singular nouns, ordinals, indefinite articles, and word-based representations of numbers. This functionality is limited to English.
 
 SYNOPSIS
 ========
@@ -593,10 +593,3 @@ 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>`_.
-
-Security Contact
-================
-
-To report a security vulnerability, please use the
-`Tidelift security contact <https://tidelift.com/security>`_.
-Tidelift will coordinate the fix and disclosure.
diff --git a/libs/inflect-7.4.0.dist-info/RECORD b/libs/inflect-7.4.0.dist-info/RECORD
new file mode 100644
index 000000000..82e7c9ff4
--- /dev/null
+++ b/libs/inflect-7.4.0.dist-info/RECORD
@@ -0,0 +1,11 @@
+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/itsdangerous-2.1.2.dist-info/REQUESTED b/libs/inflect-7.4.0.dist-info/REQUESTED
similarity index 100%
rename from libs/itsdangerous-2.1.2.dist-info/REQUESTED
rename to libs/inflect-7.4.0.dist-info/REQUESTED
diff --git a/libs/inflect-7.4.0.dist-info/WHEEL b/libs/inflect-7.4.0.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/inflect-7.4.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/inflect-7.0.0.dist-info/top_level.txt b/libs/inflect-7.4.0.dist-info/top_level.txt
similarity index 100%
rename from libs/inflect-7.0.0.dist-info/top_level.txt
rename to libs/inflect-7.4.0.dist-info/top_level.txt
diff --git a/libs/inflect/__init__.py b/libs/inflect/__init__.py
index b638c6b8a..47a8e05fa 100644
--- a/libs/inflect/__init__.py
+++ b/libs/inflect/__init__.py
@@ -3,6 +3,8 @@ inflect: english language inflection
  - correctly generate plurals, ordinals, indefinite articles
  - convert numbers to words
 
+Copyright (C) 2010 Paul Dyson
+
 Based upon the Perl module
 `Lingua::EN::Inflect <https://metacpan.org/pod/Lingua::EN::Inflect>`_.
 
@@ -50,34 +52,35 @@ Exceptions:
 
 """
 
+from __future__ import annotations
+
 import ast
-import re
-import functools
 import collections
 import contextlib
+import functools
+import itertools
+import re
+from numbers import Number
 from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
     Dict,
-    Union,
-    Optional,
     Iterable,
     List,
+    Literal,
     Match,
-    Tuple,
-    Callable,
+    Optional,
     Sequence,
+    Tuple,
+    Union,
     cast,
-    Any,
 )
-from typing_extensions import Literal
-from numbers import Number
 
+from more_itertools import windowed_complete
+from typeguard import typechecked
 
-from pydantic import Field
-from typing_extensions import Annotated
-
-
-from .compat.pydantic1 import validate_call
-from .compat.pydantic import same_method
+from .compat.py38 import Annotated
 
 
 class UnknownClassicalModeError(Exception):
@@ -258,9 +261,9 @@ si_sb_irregular_compound = {v: k for (k, v) in pl_sb_irregular_compound.items()}
 for k in list(si_sb_irregular_compound):
     if "|" in k:
         k1, k2 = k.split("|")
-        si_sb_irregular_compound[k1] = si_sb_irregular_compound[
-            k2
-        ] = si_sb_irregular_compound[k]
+        si_sb_irregular_compound[k1] = si_sb_irregular_compound[k2] = (
+            si_sb_irregular_compound[k]
+        )
         del si_sb_irregular_compound[k]
 
 # si_sb_irregular_keys = enclose('|'.join(si_sb_irregular.keys()))
@@ -1597,7 +1600,7 @@ pl_prep_bysize = bysize(pl_prep_list_da)
 
 pl_prep = enclose("|".join(pl_prep_list_da))
 
-pl_sb_prep_dual_compound = fr"(.*?)((?:-|\s+)(?:{pl_prep})(?:-|\s+))a(?:-|\s+)(.*)"
+pl_sb_prep_dual_compound = rf"(.*?)((?:-|\s+)(?:{pl_prep})(?:-|\s+))a(?:-|\s+)(.*)"
 
 
 singular_pronoun_genders = {
@@ -1659,43 +1662,69 @@ pl_pron_acc_keys_bysize = bysize(pl_pron_acc)
 
 si_pron["acc"] = {v: k for (k, v) in pl_pron_acc.items()}
 
-for _thecase, _plur, _gend, _sing in (
-    ("nom", "they", "neuter", "it"),
-    ("nom", "they", "feminine", "she"),
-    ("nom", "they", "masculine", "he"),
-    ("nom", "they", "gender-neutral", "they"),
-    ("nom", "they", "feminine or masculine", "she or he"),
-    ("nom", "they", "masculine or feminine", "he or she"),
-    ("nom", "themselves", "neuter", "itself"),
-    ("nom", "themselves", "feminine", "herself"),
-    ("nom", "themselves", "masculine", "himself"),
-    ("nom", "themselves", "gender-neutral", "themself"),
-    ("nom", "themselves", "feminine or masculine", "herself or himself"),
-    ("nom", "themselves", "masculine or feminine", "himself or herself"),
-    ("nom", "theirs", "neuter", "its"),
-    ("nom", "theirs", "feminine", "hers"),
-    ("nom", "theirs", "masculine", "his"),
-    ("nom", "theirs", "gender-neutral", "theirs"),
-    ("nom", "theirs", "feminine or masculine", "hers or his"),
-    ("nom", "theirs", "masculine or feminine", "his or hers"),
-    ("acc", "them", "neuter", "it"),
-    ("acc", "them", "feminine", "her"),
-    ("acc", "them", "masculine", "him"),
-    ("acc", "them", "gender-neutral", "them"),
-    ("acc", "them", "feminine or masculine", "her or him"),
-    ("acc", "them", "masculine or feminine", "him or her"),
-    ("acc", "themselves", "neuter", "itself"),
-    ("acc", "themselves", "feminine", "herself"),
-    ("acc", "themselves", "masculine", "himself"),
-    ("acc", "themselves", "gender-neutral", "themself"),
-    ("acc", "themselves", "feminine or masculine", "herself or himself"),
-    ("acc", "themselves", "masculine or feminine", "himself or herself"),
+for _thecase, _plur, _gend_sing in (
+    (
+        "nom",
+        "they",
+        {
+            "neuter": "it",
+            "feminine": "she",
+            "masculine": "he",
+            "gender-neutral": "they",
+            "feminine or masculine": "she or he",
+            "masculine or feminine": "he or she",
+        },
+    ),
+    (
+        "nom",
+        "themselves",
+        {
+            "neuter": "itself",
+            "feminine": "herself",
+            "masculine": "himself",
+            "gender-neutral": "themself",
+            "feminine or masculine": "herself or himself",
+            "masculine or feminine": "himself or herself",
+        },
+    ),
+    (
+        "nom",
+        "theirs",
+        {
+            "neuter": "its",
+            "feminine": "hers",
+            "masculine": "his",
+            "gender-neutral": "theirs",
+            "feminine or masculine": "hers or his",
+            "masculine or feminine": "his or hers",
+        },
+    ),
+    (
+        "acc",
+        "them",
+        {
+            "neuter": "it",
+            "feminine": "her",
+            "masculine": "him",
+            "gender-neutral": "them",
+            "feminine or masculine": "her or him",
+            "masculine or feminine": "him or her",
+        },
+    ),
+    (
+        "acc",
+        "themselves",
+        {
+            "neuter": "itself",
+            "feminine": "herself",
+            "masculine": "himself",
+            "gender-neutral": "themself",
+            "feminine or masculine": "herself or himself",
+            "masculine or feminine": "himself or herself",
+        },
+    ),
 ):
-    try:
-        si_pron[_thecase][_plur][_gend] = _sing  # type: ignore
-    except TypeError:
-        si_pron[_thecase][_plur] = {}
-        si_pron[_thecase][_plur][_gend] = _sing  # type: ignore
+    si_pron[_thecase][_plur] = _gend_sing
 
 
 si_pron_acc_keys = enclose("|".join(si_pron["acc"]))
@@ -1764,7 +1793,7 @@ plverb_ambiguous_pres = {
 }
 
 plverb_ambiguous_pres_keys = re.compile(
-    fr"^({enclose('|'.join(plverb_ambiguous_pres))})((\s.*)?)$", re.IGNORECASE
+    rf"^({enclose('|'.join(plverb_ambiguous_pres))})((\s.*)?)$", re.IGNORECASE
 )
 
 
@@ -1804,7 +1833,7 @@ pl_count_one = ("1", "a", "an", "one", "each", "every", "this", "that")
 pl_adj_special = {"a": "some", "an": "some", "this": "these", "that": "those"}
 
 pl_adj_special_keys = re.compile(
-    fr"^({enclose('|'.join(pl_adj_special))})$", re.IGNORECASE
+    rf"^({enclose('|'.join(pl_adj_special))})$", re.IGNORECASE
 )
 
 pl_adj_poss = {
@@ -1816,7 +1845,7 @@ pl_adj_poss = {
     "their": "their",
 }
 
-pl_adj_poss_keys = re.compile(fr"^({enclose('|'.join(pl_adj_poss))})$", re.IGNORECASE)
+pl_adj_poss_keys = re.compile(rf"^({enclose('|'.join(pl_adj_poss))})$", re.IGNORECASE)
 
 
 # 2. INDEFINITE ARTICLES
@@ -1883,7 +1912,7 @@ ordinal = dict(
     twelve="twelfth",
 )
 
-ordinal_suff = re.compile(fr"({'|'.join(ordinal)})\Z")
+ordinal_suff = re.compile(rf"({'|'.join(ordinal)})\Z")
 
 
 # NUMBERS
@@ -1948,16 +1977,16 @@ DOLLAR_DIGITS = re.compile(r"\$(\d+)")
 FUNCTION_CALL = re.compile(r"((\w+)\([^)]*\)*)", re.IGNORECASE)
 PARTITION_WORD = re.compile(r"\A(\s*)(.+?)(\s*)\Z")
 PL_SB_POSTFIX_ADJ_STEMS_RE = re.compile(
-    fr"^(?:{pl_sb_postfix_adj_stems})$", re.IGNORECASE
+    rf"^(?:{pl_sb_postfix_adj_stems})$", re.IGNORECASE
 )
 PL_SB_PREP_DUAL_COMPOUND_RE = re.compile(
-    fr"^(?:{pl_sb_prep_dual_compound})$", re.IGNORECASE
+    rf"^(?:{pl_sb_prep_dual_compound})$", re.IGNORECASE
 )
 DENOMINATOR = re.compile(r"(?P<denominator>.+)( (per|a) .+)")
-PLVERB_SPECIAL_S_RE = re.compile(fr"^({plverb_special_s})$")
+PLVERB_SPECIAL_S_RE = re.compile(rf"^({plverb_special_s})$")
 WHITESPACE = re.compile(r"\s")
 ENDS_WITH_S = re.compile(r"^(.*[^s])s$", re.IGNORECASE)
-ENDS_WITH_APOSTROPHE_S = re.compile(r"^(.*)'s?$")
+ENDS_WITH_APOSTROPHE_S = re.compile(r"^(.+)'s?$")
 INDEFINITE_ARTICLE_TEST = re.compile(r"\A(\s*)(?:an?\s+)?(.+?)(\s*)\Z", re.IGNORECASE)
 SPECIAL_AN = re.compile(r"^[aefhilmnorsx]$", re.IGNORECASE)
 SPECIAL_A = re.compile(r"^[bcdgjkpqtuvwyz]$", re.IGNORECASE)
@@ -2020,10 +2049,25 @@ class Words(str):
         self.last = self.split_[-1]
 
 
-Word = Annotated[str, Field(min_length=1)]
 Falsish = Any  # ideally, falsish would only validate on bool(value) is False
 
 
+_STATIC_TYPE_CHECKING = TYPE_CHECKING
+# ^-- Workaround for typeguard AST manipulation:
+#     https://github.com/agronholm/typeguard/issues/353#issuecomment-1556306554
+
+if _STATIC_TYPE_CHECKING:  # pragma: no cover
+    Word = Annotated[str, "String with at least 1 character"]
+else:
+
+    class _WordMeta(type):  # Too dynamic to be supported by mypy...
+        def __instancecheck__(self, instance: Any) -> bool:
+            return isinstance(instance, str) and len(instance) >= 1
+
+    class Word(metaclass=_WordMeta):  # type: ignore[no-redef]
+        """String with at least 1 character"""
+
+
 class engine:
     def __init__(self) -> None:
         self.classical_dict = def_classical.copy()
@@ -2045,7 +2089,7 @@ class engine:
     def _number_args(self, val):
         self.__number_args = val
 
-    @validate_call
+    @typechecked
     def defnoun(self, singular: Optional[Word], plural: Optional[Word]) -> int:
         """
         Set the noun plural of singular to plural.
@@ -2057,7 +2101,7 @@ class engine:
         self.si_sb_user_defined.extend((plural, singular))
         return 1
 
-    @validate_call
+    @typechecked
     def defverb(
         self,
         s1: Optional[Word],
@@ -2082,7 +2126,7 @@ class engine:
         self.pl_v_user_defined.extend((s1, p1, s2, p2, s3, p3))
         return 1
 
-    @validate_call
+    @typechecked
     def defadj(self, singular: Optional[Word], plural: Optional[Word]) -> int:
         """
         Set the adjective plural of singular to plural.
@@ -2093,7 +2137,7 @@ class engine:
         self.pl_adj_user_defined.extend((singular, plural))
         return 1
 
-    @validate_call
+    @typechecked
     def defa(self, pattern: Optional[Word]) -> int:
         """
         Define the indefinite article as 'a' for words matching pattern.
@@ -2103,7 +2147,7 @@ class engine:
         self.A_a_user_defined.extend((pattern, "a"))
         return 1
 
-    @validate_call
+    @typechecked
     def defan(self, pattern: Optional[Word]) -> int:
         """
         Define the indefinite article as 'an' for words matching pattern.
@@ -2121,8 +2165,8 @@ class engine:
             return
         try:
             re.match(pattern, "")
-        except re.error:
-            raise BadUserDefinedPatternError(pattern)
+        except re.error as err:
+            raise BadUserDefinedPatternError(pattern) from err
 
     def checkpatplural(self, pattern: Optional[Word]) -> None:
         """
@@ -2130,10 +2174,10 @@ class engine:
         """
         return
 
-    @validate_call
+    @typechecked
     def ud_match(self, word: Word, wordlist: Sequence[Optional[Word]]) -> Optional[str]:
         for i in range(len(wordlist) - 2, -2, -2):  # backwards through even elements
-            mo = re.search(fr"^{wordlist[i]}$", word, re.IGNORECASE)
+            mo = re.search(rf"^{wordlist[i]}$", word, re.IGNORECASE)
             if mo:
                 if wordlist[i + 1] is None:
                     return None
@@ -2191,8 +2235,8 @@ class engine:
         if count is not None:
             try:
                 self.persistent_count = int(count)
-            except ValueError:
-                raise BadNumValueError
+            except ValueError as err:
+                raise BadNumValueError from err
             if (show is None) or show:
                 return str(count)
         else:
@@ -2270,7 +2314,7 @@ class engine:
 
     # 0. PERFORM GENERAL INFLECTIONS IN A STRING
 
-    @validate_call
+    @typechecked
     def inflect(self, text: Word) -> str:
         """
         Perform inflections in a string.
@@ -2347,7 +2391,7 @@ class engine:
         else:
             return "", "", ""
 
-    @validate_call
+    @typechecked
     def plural(self, text: Word, count: Optional[Union[str, int, Any]] = None) -> str:
         """
         Return the plural of text.
@@ -2371,7 +2415,7 @@ class engine:
         )
         return f"{pre}{plural}{post}"
 
-    @validate_call
+    @typechecked
     def plural_noun(
         self, text: Word, count: Optional[Union[str, int, Any]] = None
     ) -> str:
@@ -2392,7 +2436,7 @@ class engine:
         plural = self.postprocess(word, self._plnoun(word, count))
         return f"{pre}{plural}{post}"
 
-    @validate_call
+    @typechecked
     def plural_verb(
         self, text: Word, count: Optional[Union[str, int, Any]] = None
     ) -> str:
@@ -2416,7 +2460,7 @@ class engine:
         )
         return f"{pre}{plural}{post}"
 
-    @validate_call
+    @typechecked
     def plural_adj(
         self, text: Word, count: Optional[Union[str, int, Any]] = None
     ) -> str:
@@ -2437,7 +2481,7 @@ class engine:
         plural = self.postprocess(word, self._pl_special_adjective(word, count) or word)
         return f"{pre}{plural}{post}"
 
-    @validate_call
+    @typechecked
     def compare(self, word1: Word, word2: Word) -> Union[str, bool]:
         """
         compare word1 and word2 for equality regardless of plurality
@@ -2460,15 +2504,13 @@ class engine:
         >>> compare('egg', '')
         Traceback (most recent call last):
         ...
-        pydantic...ValidationError: ...
-        ...
-          ...at least 1 characters...
+        typeguard.TypeCheckError:...is not an instance of inflect.Word
         """
         norms = self.plural_noun, self.plural_verb, self.plural_adj
         results = (self._plequal(word1, word2, norm) for norm in norms)
         return next(filter(None, results), False)
 
-    @validate_call
+    @typechecked
     def compare_nouns(self, word1: Word, word2: Word) -> Union[str, bool]:
         """
         compare word1 and word2 for equality regardless of plurality
@@ -2484,7 +2526,7 @@ class engine:
         """
         return self._plequal(word1, word2, self.plural_noun)
 
-    @validate_call
+    @typechecked
     def compare_verbs(self, word1: Word, word2: Word) -> Union[str, bool]:
         """
         compare word1 and word2 for equality regardless of plurality
@@ -2500,7 +2542,7 @@ class engine:
         """
         return self._plequal(word1, word2, self.plural_verb)
 
-    @validate_call
+    @typechecked
     def compare_adjs(self, word1: Word, word2: Word) -> Union[str, bool]:
         """
         compare word1 and word2 for equality regardless of plurality
@@ -2516,7 +2558,7 @@ class engine:
         """
         return self._plequal(word1, word2, self.plural_adj)
 
-    @validate_call
+    @typechecked
     def singular_noun(
         self,
         text: Word,
@@ -2574,18 +2616,18 @@ class engine:
             return "s:p"
         self.classical_dict = classval.copy()
 
-        if same_method(pl, self.plural) or same_method(pl, self.plural_noun):
+        if pl == self.plural or pl == self.plural_noun:
             if self._pl_check_plurals_N(word1, word2):
                 return "p:p"
             if self._pl_check_plurals_N(word2, word1):
                 return "p:p"
-        if same_method(pl, self.plural) or same_method(pl, self.plural_adj):
+        if pl == self.plural or pl == self.plural_adj:
             if self._pl_check_plurals_adj(word1, word2):
                 return "p:p"
         return False
 
     def _pl_reg_plurals(self, pair: str, stems: str, end1: str, end2: str) -> bool:
-        pattern = fr"({stems})({end1}\|\1{end2}|{end2}\|\1{end1})"
+        pattern = rf"({stems})({end1}\|\1{end2}|{end2}\|\1{end1})"
         return bool(re.search(pattern, pair))
 
     def _pl_check_plurals_N(self, word1: str, word2: str) -> bool:
@@ -2679,6 +2721,8 @@ class engine:
         word = Words(word)
 
         if word.last.lower() in pl_sb_uninflected_complete:
+            if len(word.split_) >= 3:
+                return self._handle_long_compounds(word, count=2) or word
             return word
 
         if word in pl_sb_uninflected_caps:
@@ -2707,13 +2751,9 @@ class engine:
                 )
 
         if len(word.split_) >= 3:
-            for numword in range(1, len(word.split_) - 1):
-                if word.split_[numword] in pl_prep_list_da:
-                    return " ".join(
-                        word.split_[: numword - 1]
-                        + [self._plnoun(word.split_[numword - 1], 2)]
-                        + word.split_[numword:]
-                    )
+            handled_words = self._handle_long_compounds(word, count=2)
+            if handled_words is not None:
+                return handled_words
 
         # only pluralize denominators in units
         mo = DENOMINATOR.search(word.lowered)
@@ -2972,6 +3012,30 @@ class engine:
             parts[: pivot - 1] + [sep.join([transformed, parts[pivot], ''])]
         ) + " ".join(parts[(pivot + 1) :])
 
+    def _handle_long_compounds(self, word: Words, count: int) -> Union[str, None]:
+        """
+        Handles the plural and singular for compound `Words` that
+        have three or more words, based on the given count.
+
+        >>> engine()._handle_long_compounds(Words("pair of scissors"), 2)
+        'pairs of scissors'
+        >>> engine()._handle_long_compounds(Words("men beyond hills"), 1)
+        'man beyond hills'
+        """
+        inflection = self._sinoun if count == 1 else self._plnoun
+        solutions = (
+            " ".join(
+                itertools.chain(
+                    leader,
+                    [inflection(cand, count), prep],  # type: ignore[operator]
+                    trailer,
+                )
+            )
+            for leader, (cand, prep), trailer in windowed_complete(word.split_, 2)
+            if prep in pl_prep_list_da
+        )
+        return next(solutions, None)
+
     @staticmethod
     def _find_pivot(words, candidates):
         pivots = (
@@ -2980,7 +3044,7 @@ class engine:
         try:
             return next(pivots)
         except StopIteration:
-            raise ValueError("No pivot found")
+            raise ValueError("No pivot found") from None
 
     def _pl_special_verb(  # noqa: C901
         self, word: str, count: Optional[Union[str, int]] = None
@@ -3145,8 +3209,8 @@ class engine:
                 gender = self.thegender
             elif gender not in singular_pronoun_genders:
                 raise BadGenderError
-        except (TypeError, IndexError):
-            raise BadGenderError
+        except (TypeError, IndexError) as err:
+            raise BadGenderError from err
 
         # HANDLE USER-DEFINED NOUNS
 
@@ -3165,6 +3229,8 @@ class engine:
         words = Words(word)
 
         if words.last.lower() in pl_sb_uninflected_complete:
+            if len(words.split_) >= 3:
+                return self._handle_long_compounds(words, count=1) or word
             return word
 
         if word in pl_sb_uninflected_caps:
@@ -3450,7 +3516,7 @@ class engine:
 
     # ADJECTIVES
 
-    @validate_call
+    @typechecked
     def a(self, text: Word, count: Optional[Union[int, str, Any]] = 1) -> str:
         """
         Return the appropriate indefinite article followed by text.
@@ -3531,7 +3597,7 @@ class engine:
 
     # 2. TRANSLATE ZERO-QUANTIFIED $word TO "no plural($word)"
 
-    @validate_call
+    @typechecked
     def no(self, text: Word, count: Optional[Union[int, str]] = None) -> str:
         """
         If count is 0, no, zero or nil, return 'no' followed by the plural
@@ -3569,7 +3635,7 @@ class engine:
 
     # PARTICIPLES
 
-    @validate_call
+    @typechecked
     def present_participle(self, word: Word) -> str:
         """
         Return the present participle for word.
@@ -3588,7 +3654,7 @@ class engine:
 
     # NUMERICAL INFLECTIONS
 
-    @validate_call(config=dict(arbitrary_types_allowed=True))
+    @typechecked
     def ordinal(self, num: Union[Number, Word]) -> str:
         """
         Return the ordinal of num.
@@ -3609,26 +3675,18 @@ class engine:
                         # so only need last one for ordinal
                         n = int(str(num)[-1])
 
-                    except ValueError:  # ends with '.', so need to use whole string
+                    except ValueError:
+                        # ends with '.', so need to use whole string
                         n = int(str(num)[:-1])
                 else:
-                    n = int(num)  # type: ignore
+                    n = int(num)  # type: ignore[arg-type]
             try:
                 post = nth[n % 100]
             except KeyError:
                 post = nth[n % 10]
             return f"{num}{post}"
         else:
-            # Mad props to Damian Conway (?) whose ordinal()
-            # algorithm is type-bendy enough to foil MyPy
-            str_num: str = num  # type: ignore[assignment]
-            mo = ordinal_suff.search(str_num)
-            if mo:
-                post = ordinal[mo.group(1)]
-                rval = ordinal_suff.sub(post, str_num)
-            else:
-                rval = f"{str_num}th"
-            return rval
+            return self._sub_ord(num)
 
     def millfn(self, ind: int = 0) -> str:
         if ind > len(mill) - 1:
@@ -3747,7 +3805,36 @@ class engine:
             num = ONE_DIGIT_WORD.sub(self.unitsub, num, 1)
         return num
 
-    @validate_call(config=dict(arbitrary_types_allowed=True))  # noqa: C901
+    @staticmethod
+    def _sub_ord(val):
+        new = ordinal_suff.sub(lambda match: ordinal[match.group(1)], val)
+        return new + "th" * (new == val)
+
+    @classmethod
+    def _chunk_num(cls, num, decimal, group):
+        if decimal:
+            max_split = -1 if group != 0 else 1
+            chunks = num.split(".", max_split)
+        else:
+            chunks = [num]
+        return cls._remove_last_blank(chunks)
+
+    @staticmethod
+    def _remove_last_blank(chunks):
+        """
+        Remove the last item from chunks if it's a blank string.
+
+        Return the resultant chunks and whether the last item was removed.
+        """
+        removed = chunks[-1] == ""
+        result = chunks[:-1] if removed else chunks
+        return result, removed
+
+    @staticmethod
+    def _get_sign(num):
+        return {'+': 'plus', '-': 'minus'}.get(num.lstrip()[0], '')
+
+    @typechecked
     def number_to_words(  # noqa: C901
         self,
         num: Union[Number, Word],
@@ -3794,13 +3881,8 @@ class engine:
 
         if group < 0 or group > 3:
             raise BadChunkingOptionError
-        nowhite = num.lstrip()
-        if nowhite[0] == "+":
-            sign = "plus"
-        elif nowhite[0] == "-":
-            sign = "minus"
-        else:
-            sign = ""
+
+        sign = self._get_sign(num)
 
         if num in nth_suff:
             num = zero
@@ -3808,34 +3890,21 @@ class engine:
         myord = num[-2:] in nth_suff
         if myord:
             num = num[:-2]
-        finalpoint = False
-        if decimal:
-            if group != 0:
-                chunks = num.split(".")
-            else:
-                chunks = num.split(".", 1)
-            if chunks[-1] == "":  # remove blank string if nothing after decimal
-                chunks = chunks[:-1]
-                finalpoint = True  # add 'point' to end of output
-        else:
-            chunks = [num]
 
-        first: Union[int, str, bool] = 1
-        loopstart = 0
+        chunks, finalpoint = self._chunk_num(num, decimal, group)
 
-        if chunks[0] == "":
-            first = 0
-            if len(chunks) > 1:
-                loopstart = 1
+        loopstart = chunks[0] == ""
+        first: bool | None = not loopstart
+
+        def _handle_chunk(chunk):
+            nonlocal first
 
-        for i in range(loopstart, len(chunks)):
-            chunk = chunks[i]
             # remove all non numeric \D
             chunk = NON_DIGIT.sub("", chunk)
             if chunk == "":
                 chunk = "0"
 
-            if group == 0 and (first == 0 or first == ""):
+            if group == 0 and not first:
                 chunk = self.enword(chunk, 1)
             else:
                 chunk = self.enword(chunk, group)
@@ -3850,20 +3919,17 @@ class engine:
             # chunk = re.sub(r"(\A\s|\s\Z)", self.blankfn, chunk)
             chunk = chunk.strip()
             if first:
-                first = ""
-            chunks[i] = chunk
+                first = None
+            return chunk
+
+        chunks[loopstart:] = map(_handle_chunk, chunks[loopstart:])
 
         numchunks = []
         if first != 0:
             numchunks = chunks[0].split(f"{comma} ")
 
         if myord and numchunks:
-            # TODO: can this be just one re as it is in perl?
-            mo = ordinal_suff.search(numchunks[-1])
-            if mo:
-                numchunks[-1] = ordinal_suff.sub(ordinal[mo.group(1)], numchunks[-1])
-            else:
-                numchunks[-1] += "th"
+            numchunks[-1] = self._sub_ord(numchunks[-1])
 
         for chunk in chunks[1:]:
             numchunks.append(decimal)
@@ -3872,34 +3938,30 @@ class engine:
         if finalpoint:
             numchunks.append(decimal)
 
-        # wantlist: Perl list context. can explicitly specify in Python
         if wantlist:
-            if sign:
-                numchunks = [sign] + numchunks
-            return numchunks
-        elif group:
-            signout = f"{sign} " if sign else ""
-            return f"{signout}{', '.join(numchunks)}"
-        else:
-            signout = f"{sign} " if sign else ""
-            num = f"{signout}{numchunks.pop(0)}"
-            if decimal is None:
-                first = True
-            else:
-                first = not num.endswith(decimal)
-            for nc in numchunks:
-                if nc == decimal:
-                    num += f" {nc}"
-                    first = 0
-                elif first:
-                    num += f"{comma} {nc}"
-                else:
-                    num += f" {nc}"
-            return num
+            return [sign] * bool(sign) + numchunks
 
-    # Join words with commas and a trailing 'and' (when appropriate)...
+        signout = f"{sign} " if sign else ""
+        valout = (
+            ', '.join(numchunks)
+            if group
+            else ''.join(self._render(numchunks, decimal, comma))
+        )
+        return signout + valout
 
-    @validate_call
+    @staticmethod
+    def _render(chunks, decimal, comma):
+        first_item = chunks.pop(0)
+        yield first_item
+        first = decimal is None or not first_item.endswith(decimal)
+        for nc in chunks:
+            if nc == decimal:
+                first = False
+            elif first:
+                yield comma
+            yield f" {nc}"
+
+    @typechecked
     def join(
         self,
         words: Optional[Sequence[Word]],
diff --git a/libs/inflect/compat/py38.py b/libs/inflect/compat/py38.py
new file mode 100644
index 000000000..a2d01bd98
--- /dev/null
+++ b/libs/inflect/compat/py38.py
@@ -0,0 +1,7 @@
+import sys
+
+
+if sys.version_info > (3, 9):
+    from typing import Annotated
+else:  # pragma: no cover
+    from typing_extensions import Annotated  # noqa: F401
diff --git a/libs/inflect/compat/pydantic.py b/libs/inflect/compat/pydantic.py
deleted file mode 100644
index d777564ab..000000000
--- a/libs/inflect/compat/pydantic.py
+++ /dev/null
@@ -1,19 +0,0 @@
-class ValidateCallWrapperWrapper:
-    def __init__(self, wrapped):
-        self.orig = wrapped
-
-    def __eq__(self, other):
-        return self.raw_function == other.raw_function
-
-    @property
-    def raw_function(self):
-        return getattr(self.orig, 'raw_function') or self.orig
-
-
-def same_method(m1, m2) -> bool:
-    """
-    Return whether m1 and m2 are the same method.
-
-    Workaround for pydantic/pydantic#6390.
-    """
-    return ValidateCallWrapperWrapper(m1) == ValidateCallWrapperWrapper(m2)
diff --git a/libs/inflect/compat/pydantic1.py b/libs/inflect/compat/pydantic1.py
deleted file mode 100644
index 8262fdcf9..000000000
--- a/libs/inflect/compat/pydantic1.py
+++ /dev/null
@@ -1,8 +0,0 @@
-try:
-    from pydantic import validate_call  # type: ignore
-except ImportError:
-    # Pydantic 1
-    from pydantic import validate_arguments as validate_call  # type: ignore
-
-
-__all__ = ['validate_call']
diff --git a/libs/itsdangerous-2.1.2.dist-info/METADATA b/libs/itsdangerous-2.1.2.dist-info/METADATA
deleted file mode 100644
index 70ae1bef8..000000000
--- a/libs/itsdangerous-2.1.2.dist-info/METADATA
+++ /dev/null
@@ -1,94 +0,0 @@
-Metadata-Version: 2.1
-Name: itsdangerous
-Version: 2.1.2
-Summary: Safely pass data to untrusted environments and back.
-Home-page: https://palletsprojects.com/p/itsdangerous/
-Author: Armin Ronacher
-Author-email: armin.ronacher@active-4.com
-Maintainer: Pallets
-Maintainer-email: contact@palletsprojects.com
-License: BSD-3-Clause
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Documentation, https://itsdangerous.palletsprojects.com/
-Project-URL: Changes, https://itsdangerous.palletsprojects.com/changes/
-Project-URL: Source Code, https://github.com/pallets/itsdangerous/
-Project-URL: Issue Tracker, https://github.com/pallets/itsdangerous/issues/
-Project-URL: Twitter, https://twitter.com/PalletsTeam
-Project-URL: Chat, https://discord.gg/pallets
-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
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE.rst
-
-ItsDangerous
-============
-
-... so better sign this
-
-Various helpers to pass data to untrusted environments and to get it
-back safe and sound. Data is cryptographically signed to ensure that a
-token has not been tampered with.
-
-It's possible to customize how data is serialized. Data is compressed as
-needed. A timestamp can be added and verified automatically while
-loading a token.
-
-
-Installing
-----------
-
-Install and update using `pip`_:
-
-.. code-block:: text
-
-    pip install -U itsdangerous
-
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
-
-
-A Simple Example
-----------------
-
-Here's how you could generate a token for transmitting a user's id and
-name between web requests.
-
-.. code-block:: python
-
-    from itsdangerous import URLSafeSerializer
-    auth_s = URLSafeSerializer("secret key", "auth")
-    token = auth_s.dumps({"id": 5, "name": "itsdangerous"})
-
-    print(token)
-    # eyJpZCI6NSwibmFtZSI6Iml0c2Rhbmdlcm91cyJ9.6YP6T0BaO67XP--9UzTrmurXSmg
-
-    data = auth_s.loads(token)
-    print(data["name"])
-    # itsdangerous
-
-
-Donate
-------
-
-The Pallets organization develops and supports ItsDangerous 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://itsdangerous.palletsprojects.com/
--   Changes: https://itsdangerous.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/ItsDangerous/
--   Source Code: https://github.com/pallets/itsdangerous/
--   Issue Tracker: https://github.com/pallets/itsdangerous/issues/
--   Website: https://palletsprojects.com/p/itsdangerous/
--   Twitter: https://twitter.com/PalletsTeam
--   Chat: https://discord.gg/pallets
diff --git a/libs/itsdangerous-2.1.2.dist-info/RECORD b/libs/itsdangerous-2.1.2.dist-info/RECORD
deleted file mode 100644
index 74c5e4649..000000000
--- a/libs/itsdangerous-2.1.2.dist-info/RECORD
+++ /dev/null
@@ -1,16 +0,0 @@
-itsdangerous-2.1.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-itsdangerous-2.1.2.dist-info/LICENSE.rst,sha256=Y68JiRtr6K0aQlLtQ68PTvun_JSOIoNnvtfzxa4LCdc,1475
-itsdangerous-2.1.2.dist-info/METADATA,sha256=i9sDdrG-Rz4BK1jcyhmjsg8KAFpfGKLuN69uGaYJzdY,2908
-itsdangerous-2.1.2.dist-info/RECORD,,
-itsdangerous-2.1.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-itsdangerous-2.1.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-itsdangerous-2.1.2.dist-info/top_level.txt,sha256=gKN1OKLk81i7fbWWildJA88EQ9NhnGMSvZqhfz9ICjk,13
-itsdangerous/__init__.py,sha256=n4mkyjlIVn23pgsgCIw0MJKPdcHIetyeRpe5Fwsn8qg,876
-itsdangerous/_json.py,sha256=wIhs_7-_XZolmyr-JvKNiy_LgAcfevYR0qhCVdlIhg8,450
-itsdangerous/encoding.py,sha256=pgh86snHC76dPLNCnPlrjR5SaYL_M8H-gWRiiLNbhCU,1419
-itsdangerous/exc.py,sha256=VFxmP2lMoSJFqxNMzWonqs35ROII4-fvCBfG0v1Tkbs,3206
-itsdangerous/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-itsdangerous/serializer.py,sha256=zgZ1-U705jHDpt62x_pmLJdryEKDNAbt5UkJtnkcCSw,11144
-itsdangerous/signer.py,sha256=QUH0iX0in-OTptMAXKU5zWMwmOCXn1fsDsubXiGdFN4,9367
-itsdangerous/timed.py,sha256=5CBWLds4Nm8-3bFVC8RxNzFjx6PSwjch8wuZ5cwcHFI,8174
-itsdangerous/url_safe.py,sha256=5bC4jSKOjWNRkWrFseifWVXUnHnPgwOLROjiOwb-eeo,2402
diff --git a/libs/itsdangerous-2.1.2.dist-info/WHEEL b/libs/itsdangerous-2.1.2.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf9..000000000
--- a/libs/itsdangerous-2.1.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/itsdangerous-2.1.2.dist-info/top_level.txt b/libs/itsdangerous-2.1.2.dist-info/top_level.txt
deleted file mode 100644
index e163955e8..000000000
--- a/libs/itsdangerous-2.1.2.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-itsdangerous
diff --git a/libs/msgpack-1.0.7.dist-info/INSTALLER b/libs/itsdangerous-2.2.0.dist-info/INSTALLER
similarity index 100%
rename from libs/msgpack-1.0.7.dist-info/INSTALLER
rename to libs/itsdangerous-2.2.0.dist-info/INSTALLER
diff --git a/libs/itsdangerous-2.1.2.dist-info/LICENSE.rst b/libs/itsdangerous-2.2.0.dist-info/LICENSE.txt
similarity index 100%
rename from libs/itsdangerous-2.1.2.dist-info/LICENSE.rst
rename to libs/itsdangerous-2.2.0.dist-info/LICENSE.txt
diff --git a/libs/itsdangerous-2.2.0.dist-info/METADATA b/libs/itsdangerous-2.2.0.dist-info/METADATA
new file mode 100644
index 000000000..ddf546484
--- /dev/null
+++ b/libs/itsdangerous-2.2.0.dist-info/METADATA
@@ -0,0 +1,60 @@
+Metadata-Version: 2.1
+Name: itsdangerous
+Version: 2.2.0
+Summary: Safely pass data to untrusted environments and back.
+Maintainer-email: Pallets <contact@palletsprojects.com>
+Requires-Python: >=3.8
+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
+Project-URL: Changes, https://itsdangerous.palletsprojects.com/changes/
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://itsdangerous.palletsprojects.com/
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Source, https://github.com/pallets/itsdangerous/
+
+# ItsDangerous
+
+... so better sign this
+
+Various helpers to pass data to untrusted environments and to get it
+back safe and sound. Data is cryptographically signed to ensure that a
+token has not been tampered with.
+
+It's possible to customize how data is serialized. Data is compressed as
+needed. A timestamp can be added and verified automatically while
+loading a token.
+
+
+## A Simple Example
+
+Here's how you could generate a token for transmitting a user's id and
+name between web requests.
+
+```python
+from itsdangerous import URLSafeSerializer
+auth_s = URLSafeSerializer("secret key", "auth")
+token = auth_s.dumps({"id": 5, "name": "itsdangerous"})
+
+print(token)
+# eyJpZCI6NSwibmFtZSI6Iml0c2Rhbmdlcm91cyJ9.6YP6T0BaO67XP--9UzTrmurXSmg
+
+data = auth_s.loads(token)
+print(data["name"])
+# itsdangerous
+```
+
+
+## Donate
+
+The Pallets organization develops and supports ItsDangerous 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/itsdangerous-2.2.0.dist-info/RECORD b/libs/itsdangerous-2.2.0.dist-info/RECORD
new file mode 100644
index 000000000..01486a83b
--- /dev/null
+++ b/libs/itsdangerous-2.2.0.dist-info/RECORD
@@ -0,0 +1,15 @@
+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/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/__init__.py,sha256=4SK75sCe29xbRgQE1ZQtMHnKUuZYAf3bSpZOrff1IAY,1427
+itsdangerous/_json.py,sha256=wPQGmge2yZ9328EHKF6gadGeyGYCJQKxtU-iLKE6UnA,473
+itsdangerous/encoding.py,sha256=wwTz5q_3zLcaAdunk6_vSoStwGqYWe307Zl_U87aRFM,1409
+itsdangerous/exc.py,sha256=Rr3exo0MRFEcPZltwecyK16VV1bE2K9_F1-d-ljcUn4,3201
+itsdangerous/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+itsdangerous/serializer.py,sha256=PmdwADLqkSyQLZ0jOKAgDsAW4k_H0TlA71Ei3z0C5aI,15601
+itsdangerous/signer.py,sha256=YO0CV7NBvHA6j549REHJFUjUojw2pHqwcUpQnU7yNYQ,9647
+itsdangerous/timed.py,sha256=6RvDMqNumGMxf0-HlpaZdN9PUQQmRvrQGplKhxuivUs,8083
+itsdangerous/url_safe.py,sha256=az4e5fXi_vs-YbWj8YZwn4wiVKfeD--GEKRT5Ueu4P4,2505
diff --git a/libs/msgpack-1.0.7.dist-info/REQUESTED b/libs/itsdangerous-2.2.0.dist-info/REQUESTED
similarity index 100%
rename from libs/msgpack-1.0.7.dist-info/REQUESTED
rename to libs/itsdangerous-2.2.0.dist-info/REQUESTED
diff --git a/libs/flask-3.0.2.dist-info/WHEEL b/libs/itsdangerous-2.2.0.dist-info/WHEEL
similarity index 100%
rename from libs/flask-3.0.2.dist-info/WHEEL
rename to libs/itsdangerous-2.2.0.dist-info/WHEEL
diff --git a/libs/itsdangerous/__init__.py b/libs/itsdangerous/__init__.py
index fdb2dfd00..ea55256eb 100644
--- a/libs/itsdangerous/__init__.py
+++ b/libs/itsdangerous/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import typing as t
+
 from .encoding import base64_decode as base64_decode
 from .encoding import base64_encode as base64_encode
 from .encoding import want_bytes as want_bytes
@@ -16,4 +20,19 @@ from .timed import TimestampSigner as TimestampSigner
 from .url_safe import URLSafeSerializer as URLSafeSerializer
 from .url_safe import URLSafeTimedSerializer as URLSafeTimedSerializer
 
-__version__ = "2.1.2"
+
+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"
+            " ItsDangerous 2.3. Use feature detection or"
+            " 'importlib.metadata.version(\"itsdangerous\")' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return importlib.metadata.version("itsdangerous")
+
+    raise AttributeError(name)
diff --git a/libs/itsdangerous/_json.py b/libs/itsdangerous/_json.py
index c70d37a95..fc23feaaf 100644
--- a/libs/itsdangerous/_json.py
+++ b/libs/itsdangerous/_json.py
@@ -1,16 +1,18 @@
+from __future__ import annotations
+
 import json as _json
-import typing as _t
+import typing as t
 
 
 class _CompactJSON:
     """Wrapper around json module that strips whitespace."""
 
     @staticmethod
-    def loads(payload: _t.Union[str, bytes]) -> _t.Any:
+    def loads(payload: str | bytes) -> t.Any:
         return _json.loads(payload)
 
     @staticmethod
-    def dumps(obj: _t.Any, **kwargs: _t.Any) -> str:
+    def dumps(obj: t.Any, **kwargs: t.Any) -> str:
         kwargs.setdefault("ensure_ascii", False)
         kwargs.setdefault("separators", (",", ":"))
         return _json.dumps(obj, **kwargs)
diff --git a/libs/itsdangerous/encoding.py b/libs/itsdangerous/encoding.py
index edb04d1a6..f5ca80f90 100644
--- a/libs/itsdangerous/encoding.py
+++ b/libs/itsdangerous/encoding.py
@@ -1,15 +1,15 @@
+from __future__ import annotations
+
 import base64
 import string
 import struct
-import typing as _t
+import typing as t
 
 from .exc import BadData
 
-_t_str_bytes = _t.Union[str, bytes]
-
 
 def want_bytes(
-    s: _t_str_bytes, encoding: str = "utf-8", errors: str = "strict"
+    s: str | bytes, encoding: str = "utf-8", errors: str = "strict"
 ) -> bytes:
     if isinstance(s, str):
         s = s.encode(encoding, errors)
@@ -17,7 +17,7 @@ def want_bytes(
     return s
 
 
-def base64_encode(string: _t_str_bytes) -> bytes:
+def base64_encode(string: str | bytes) -> bytes:
     """Base64 encode a string of bytes or text. The resulting bytes are
     safe to use in URLs.
     """
@@ -25,7 +25,7 @@ def base64_encode(string: _t_str_bytes) -> bytes:
     return base64.urlsafe_b64encode(string).rstrip(b"=")
 
 
-def base64_decode(string: _t_str_bytes) -> bytes:
+def base64_decode(string: str | bytes) -> bytes:
     """Base64 decode a URL-safe string of bytes or text. The result is
     bytes.
     """
@@ -43,7 +43,7 @@ _base64_alphabet = f"{string.ascii_letters}{string.digits}-_=".encode("ascii")
 
 _int64_struct = struct.Struct(">Q")
 _int_to_bytes = _int64_struct.pack
-_bytes_to_int = _t.cast("_t.Callable[[bytes], _t.Tuple[int]]", _int64_struct.unpack)
+_bytes_to_int = t.cast("t.Callable[[bytes], tuple[int]]", _int64_struct.unpack)
 
 
 def int_to_bytes(num: int) -> bytes:
diff --git a/libs/itsdangerous/exc.py b/libs/itsdangerous/exc.py
index c38a6af52..a75adcd52 100644
--- a/libs/itsdangerous/exc.py
+++ b/libs/itsdangerous/exc.py
@@ -1,8 +1,7 @@
-import typing as _t
-from datetime import datetime
+from __future__ import annotations
 
-_t_opt_any = _t.Optional[_t.Any]
-_t_opt_exc = _t.Optional[Exception]
+import typing as t
+from datetime import datetime
 
 
 class BadData(Exception):
@@ -23,7 +22,7 @@ class BadData(Exception):
 class BadSignature(BadData):
     """Raised if a signature does not match."""
 
-    def __init__(self, message: str, payload: _t_opt_any = None):
+    def __init__(self, message: str, payload: t.Any | None = None):
         super().__init__(message)
 
         #: The payload that failed the signature test. In some
@@ -31,7 +30,7 @@ class BadSignature(BadData):
         #: you know it was tampered with.
         #:
         #: .. versionadded:: 0.14
-        self.payload: _t_opt_any = payload
+        self.payload: t.Any | None = payload
 
 
 class BadTimeSignature(BadSignature):
@@ -42,8 +41,8 @@ class BadTimeSignature(BadSignature):
     def __init__(
         self,
         message: str,
-        payload: _t_opt_any = None,
-        date_signed: _t.Optional[datetime] = None,
+        payload: t.Any | None = None,
+        date_signed: datetime | None = None,
     ):
         super().__init__(message, payload)
 
@@ -75,19 +74,19 @@ class BadHeader(BadSignature):
     def __init__(
         self,
         message: str,
-        payload: _t_opt_any = None,
-        header: _t_opt_any = None,
-        original_error: _t_opt_exc = None,
+        payload: t.Any | None = None,
+        header: t.Any | None = None,
+        original_error: Exception | None = None,
     ):
         super().__init__(message, payload)
 
         #: If the header is actually available but just malformed it
         #: might be stored here.
-        self.header: _t_opt_any = header
+        self.header: t.Any | None = header
 
         #: If available, the error that indicates why the payload was
         #: not valid. This might be ``None``.
-        self.original_error: _t_opt_exc = original_error
+        self.original_error: Exception | None = original_error
 
 
 class BadPayload(BadData):
@@ -99,9 +98,9 @@ class BadPayload(BadData):
     .. versionadded:: 0.15
     """
 
-    def __init__(self, message: str, original_error: _t_opt_exc = None):
+    def __init__(self, message: str, original_error: Exception | None = None):
         super().__init__(message)
 
         #: If available, the error that indicates why the payload was
         #: not valid. This might be ``None``.
-        self.original_error: _t_opt_exc = original_error
+        self.original_error: Exception | None = original_error
diff --git a/libs/itsdangerous/serializer.py b/libs/itsdangerous/serializer.py
index 9f4a84a17..5ddf3871d 100644
--- a/libs/itsdangerous/serializer.py
+++ b/libs/itsdangerous/serializer.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import json
-import typing as _t
+import typing as t
 
 from .encoding import want_bytes
 from .exc import BadPayload
@@ -7,22 +10,36 @@ from .exc import BadSignature
 from .signer import _make_keys_list
 from .signer import Signer
 
-_t_str_bytes = _t.Union[str, bytes]
-_t_opt_str_bytes = _t.Optional[_t_str_bytes]
-_t_kwargs = _t.Dict[str, _t.Any]
-_t_opt_kwargs = _t.Optional[_t_kwargs]
-_t_signer = _t.Type[Signer]
-_t_fallbacks = _t.List[_t.Union[_t_kwargs, _t.Tuple[_t_signer, _t_kwargs], _t_signer]]
-_t_load_unsafe = _t.Tuple[bool, _t.Any]
-_t_secret_key = _t.Union[_t.Iterable[_t_str_bytes], _t_str_bytes]
+if t.TYPE_CHECKING:
+    import typing_extensions as te
+
+    # This should be either be str or bytes. To avoid having to specify the
+    # bound type, it falls back to a union if structural matching fails.
+    _TSerialized = te.TypeVar(
+        "_TSerialized", bound=t.Union[str, bytes], default=t.Union[str, bytes]
+    )
+else:
+    # Still available at runtime on Python < 3.13, but without the default.
+    _TSerialized = t.TypeVar("_TSerialized", bound=t.Union[str, bytes])
 
 
-def is_text_serializer(serializer: _t.Any) -> bool:
+class _PDataSerializer(t.Protocol[_TSerialized]):
+    def loads(self, payload: _TSerialized, /) -> t.Any: ...
+    # A signature with additional arguments is not handled correctly by type
+    # checkers right now, so an overload is used below for serializers that
+    # don't match this strict protocol.
+    def dumps(self, obj: t.Any, /) -> _TSerialized: ...
+
+
+# Use TypeIs once it's available in typing_extensions or 3.13.
+def is_text_serializer(
+    serializer: _PDataSerializer[t.Any],
+) -> te.TypeGuard[_PDataSerializer[str]]:
     """Checks whether a serializer generates text or binary."""
     return isinstance(serializer.dumps({}), str)
 
 
-class Serializer:
+class Serializer(t.Generic[_TSerialized]):
     """A serializer wraps a :class:`~itsdangerous.signer.Signer` to
     enable serializing and securely signing data other than bytes. It
     can unsign to verify that the data hasn't been changed.
@@ -77,31 +94,120 @@ class Serializer:
     #: The default serialization module to use to serialize data to a
     #: string internally. The default is :mod:`json`, but can be changed
     #: to any object that provides ``dumps`` and ``loads`` methods.
-    default_serializer: _t.Any = json
+    default_serializer: _PDataSerializer[t.Any] = json
 
     #: The default ``Signer`` class to instantiate when signing data.
     #: The default is :class:`itsdangerous.signer.Signer`.
-    default_signer: _t_signer = Signer
+    default_signer: type[Signer] = Signer
 
     #: The default fallback signers to try when unsigning fails.
-    default_fallback_signers: _t_fallbacks = []
+    default_fallback_signers: list[
+        dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+    ] = []
+
+    # Serializer[str] if no data serializer is provided, or if it returns str.
+    @t.overload
+    def __init__(
+        self: Serializer[str],
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None = b"itsdangerous",
+        serializer: None | _PDataSerializer[str] = None,
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
+    ): ...
+
+    # Serializer[bytes] with a bytes data serializer positional argument.
+    @t.overload
+    def __init__(
+        self: Serializer[bytes],
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None,
+        serializer: _PDataSerializer[bytes],
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
+    ): ...
+
+    # Serializer[bytes] with a bytes data serializer keyword argument.
+    @t.overload
+    def __init__(
+        self: Serializer[bytes],
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None = b"itsdangerous",
+        *,
+        serializer: _PDataSerializer[bytes],
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
+    ): ...
+
+    # Fall back with a positional argument. If the strict signature of
+    # _PDataSerializer doesn't match, fall back to a union, requiring the user
+    # to specify the type.
+    @t.overload
+    def __init__(
+        self,
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None,
+        serializer: t.Any,
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
+    ): ...
+
+    # Fall back with a keyword argument.
+    @t.overload
+    def __init__(
+        self,
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None = b"itsdangerous",
+        *,
+        serializer: t.Any,
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
+    ): ...
 
     def __init__(
         self,
-        secret_key: _t_secret_key,
-        salt: _t_opt_str_bytes = b"itsdangerous",
-        serializer: _t.Any = None,
-        serializer_kwargs: _t_opt_kwargs = None,
-        signer: _t.Optional[_t_signer] = None,
-        signer_kwargs: _t_opt_kwargs = None,
-        fallback_signers: _t.Optional[_t_fallbacks] = None,
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None = b"itsdangerous",
+        serializer: t.Any | None = None,
+        serializer_kwargs: dict[str, t.Any] | None = None,
+        signer: type[Signer] | None = None,
+        signer_kwargs: dict[str, t.Any] | None = None,
+        fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ]
+        | None = None,
     ):
         #: The list of secret keys to try for verifying signatures, from
         #: oldest to newest. The newest (last) key is used for signing.
         #:
         #: This allows a key rotation system to keep a list of allowed
         #: keys and remove expired ones.
-        self.secret_keys: _t.List[bytes] = _make_keys_list(secret_key)
+        self.secret_keys: list[bytes] = _make_keys_list(secret_key)
 
         if salt is not None:
             salt = want_bytes(salt)
@@ -112,20 +218,22 @@ class Serializer:
         if serializer is None:
             serializer = self.default_serializer
 
-        self.serializer: _t.Any = serializer
+        self.serializer: _PDataSerializer[_TSerialized] = serializer
         self.is_text_serializer: bool = is_text_serializer(serializer)
 
         if signer is None:
             signer = self.default_signer
 
-        self.signer: _t_signer = signer
-        self.signer_kwargs: _t_kwargs = signer_kwargs or {}
+        self.signer: type[Signer] = signer
+        self.signer_kwargs: dict[str, t.Any] = signer_kwargs or {}
 
         if fallback_signers is None:
-            fallback_signers = list(self.default_fallback_signers or ())
+            fallback_signers = list(self.default_fallback_signers)
 
-        self.fallback_signers: _t_fallbacks = fallback_signers
-        self.serializer_kwargs: _t_kwargs = serializer_kwargs or {}
+        self.fallback_signers: list[
+            dict[str, t.Any] | tuple[type[Signer], dict[str, t.Any]] | type[Signer]
+        ] = fallback_signers
+        self.serializer_kwargs: dict[str, t.Any] = serializer_kwargs or {}
 
     @property
     def secret_key(self) -> bytes:
@@ -135,8 +243,8 @@ class Serializer:
         return self.secret_keys[-1]
 
     def load_payload(
-        self, payload: bytes, serializer: _t.Optional[_t.Any] = None
-    ) -> _t.Any:
+        self, payload: bytes, serializer: _PDataSerializer[t.Any] | None = None
+    ) -> t.Any:
         """Loads the encoded object. This function raises
         :class:`.BadPayload` if the payload is not valid. The
         ``serializer`` parameter can be used to override the serializer
@@ -144,16 +252,17 @@ class Serializer:
         bytes.
         """
         if serializer is None:
-            serializer = self.serializer
+            use_serializer = self.serializer
             is_text = self.is_text_serializer
         else:
+            use_serializer = serializer
             is_text = is_text_serializer(serializer)
 
         try:
             if is_text:
-                return serializer.loads(payload.decode("utf-8"))
+                return use_serializer.loads(payload.decode("utf-8"))  # type: ignore[arg-type]
 
-            return serializer.loads(payload)
+            return use_serializer.loads(payload)  # type: ignore[arg-type]
         except Exception as e:
             raise BadPayload(
                 "Could not load the payload because an exception"
@@ -161,14 +270,14 @@ class Serializer:
                 original_error=e,
             ) from e
 
-    def dump_payload(self, obj: _t.Any) -> bytes:
+    def dump_payload(self, obj: t.Any) -> bytes:
         """Dumps the encoded object. The return value is always bytes.
         If the internal serializer returns text, the value will be
         encoded as UTF-8.
         """
         return want_bytes(self.serializer.dumps(obj, **self.serializer_kwargs))
 
-    def make_signer(self, salt: _t_opt_str_bytes = None) -> Signer:
+    def make_signer(self, salt: str | bytes | None = None) -> Signer:
         """Creates a new instance of the signer to be used. The default
         implementation uses the :class:`.Signer` base class.
         """
@@ -177,7 +286,7 @@ class Serializer:
 
         return self.signer(self.secret_keys, salt=salt, **self.signer_kwargs)
 
-    def iter_unsigners(self, salt: _t_opt_str_bytes = None) -> _t.Iterator[Signer]:
+    def iter_unsigners(self, salt: str | bytes | None = None) -> cabc.Iterator[Signer]:
         """Iterates over all signers to be tried for unsigning. Starts
         with the configured signer, then constructs each signer
         specified in ``fallback_signers``.
@@ -199,7 +308,7 @@ class Serializer:
             for secret_key in self.secret_keys:
                 yield fallback(secret_key, salt=salt, **kwargs)
 
-    def dumps(self, obj: _t.Any, salt: _t_opt_str_bytes = None) -> _t_str_bytes:
+    def dumps(self, obj: t.Any, salt: str | bytes | None = None) -> _TSerialized:
         """Returns a signed string serialized with the internal
         serializer. The return value can be either a byte or unicode
         string depending on the format of the internal serializer.
@@ -208,19 +317,19 @@ class Serializer:
         rv = self.make_signer(salt).sign(payload)
 
         if self.is_text_serializer:
-            return rv.decode("utf-8")
+            return rv.decode("utf-8")  # type: ignore[return-value]
 
-        return rv
+        return rv  # type: ignore[return-value]
 
-    def dump(self, obj: _t.Any, f: _t.IO, salt: _t_opt_str_bytes = None) -> None:
+    def dump(self, obj: t.Any, f: t.IO[t.Any], salt: str | bytes | None = None) -> None:
         """Like :meth:`dumps` but dumps into a file. The file handle has
         to be compatible with what the internal serializer expects.
         """
         f.write(self.dumps(obj, salt))
 
     def loads(
-        self, s: _t_str_bytes, salt: _t_opt_str_bytes = None, **kwargs: _t.Any
-    ) -> _t.Any:
+        self, s: str | bytes, salt: str | bytes | None = None, **kwargs: t.Any
+    ) -> t.Any:
         """Reverse of :meth:`dumps`. Raises :exc:`.BadSignature` if the
         signature validation fails.
         """
@@ -233,15 +342,15 @@ class Serializer:
             except BadSignature as err:
                 last_exception = err
 
-        raise _t.cast(BadSignature, last_exception)
+        raise t.cast(BadSignature, last_exception)
 
-    def load(self, f: _t.IO, salt: _t_opt_str_bytes = None) -> _t.Any:
+    def load(self, f: t.IO[t.Any], salt: str | bytes | None = None) -> t.Any:
         """Like :meth:`loads` but loads from a file."""
         return self.loads(f.read(), salt)
 
     def loads_unsafe(
-        self, s: _t_str_bytes, salt: _t_opt_str_bytes = None
-    ) -> _t_load_unsafe:
+        self, s: str | bytes, salt: str | bytes | None = None
+    ) -> tuple[bool, t.Any]:
         """Like :meth:`loads` but without verifying the signature. This
         is potentially very dangerous to use depending on how your
         serializer works. The return value is ``(signature_valid,
@@ -259,11 +368,11 @@ class Serializer:
 
     def _loads_unsafe_impl(
         self,
-        s: _t_str_bytes,
-        salt: _t_opt_str_bytes,
-        load_kwargs: _t_opt_kwargs = None,
-        load_payload_kwargs: _t_opt_kwargs = None,
-    ) -> _t_load_unsafe:
+        s: str | bytes,
+        salt: str | bytes | None,
+        load_kwargs: dict[str, t.Any] | None = None,
+        load_payload_kwargs: dict[str, t.Any] | None = None,
+    ) -> tuple[bool, t.Any]:
         """Low level helper function to implement :meth:`loads_unsafe`
         in serializer subclasses.
         """
@@ -287,7 +396,9 @@ class Serializer:
             except BadPayload:
                 return False, None
 
-    def load_unsafe(self, f: _t.IO, salt: _t_opt_str_bytes = None) -> _t_load_unsafe:
+    def load_unsafe(
+        self, f: t.IO[t.Any], salt: str | bytes | None = None
+    ) -> tuple[bool, t.Any]:
         """Like :meth:`loads_unsafe` but loads from a file.
 
         .. versionadded:: 0.15
diff --git a/libs/itsdangerous/signer.py b/libs/itsdangerous/signer.py
index aa12005e9..e324dc03d 100644
--- a/libs/itsdangerous/signer.py
+++ b/libs/itsdangerous/signer.py
@@ -1,6 +1,9 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import hashlib
 import hmac
-import typing as _t
+import typing as t
 
 from .encoding import _base64_alphabet
 from .encoding import base64_decode
@@ -8,10 +11,6 @@ from .encoding import base64_encode
 from .encoding import want_bytes
 from .exc import BadSignature
 
-_t_str_bytes = _t.Union[str, bytes]
-_t_opt_str_bytes = _t.Optional[_t_str_bytes]
-_t_secret_key = _t.Union[_t.Iterable[_t_str_bytes], _t_str_bytes]
-
 
 class SigningAlgorithm:
     """Subclasses must implement :meth:`get_signature` to provide
@@ -38,30 +37,40 @@ class NoneAlgorithm(SigningAlgorithm):
         return b""
 
 
+def _lazy_sha1(string: bytes = b"") -> t.Any:
+    """Don't access ``hashlib.sha1`` until runtime. FIPS builds may not include
+    SHA-1, in which case the import and use as a default would fail before the
+    developer can configure something else.
+    """
+    return hashlib.sha1(string)
+
+
 class HMACAlgorithm(SigningAlgorithm):
     """Provides signature generation using HMACs."""
 
     #: The digest method to use with the MAC algorithm. This defaults to
     #: SHA1, but can be changed to any other function in the hashlib
     #: module.
-    default_digest_method: _t.Any = staticmethod(hashlib.sha1)
+    default_digest_method: t.Any = staticmethod(_lazy_sha1)
 
-    def __init__(self, digest_method: _t.Any = None):
+    def __init__(self, digest_method: t.Any = None):
         if digest_method is None:
             digest_method = self.default_digest_method
 
-        self.digest_method: _t.Any = digest_method
+        self.digest_method: t.Any = digest_method
 
     def get_signature(self, key: bytes, value: bytes) -> bytes:
         mac = hmac.new(key, msg=value, digestmod=self.digest_method)
         return mac.digest()
 
 
-def _make_keys_list(secret_key: _t_secret_key) -> _t.List[bytes]:
+def _make_keys_list(
+    secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+) -> list[bytes]:
     if isinstance(secret_key, (str, bytes)):
         return [want_bytes(secret_key)]
 
-    return [want_bytes(s) for s in secret_key]
+    return [want_bytes(s) for s in secret_key]  # pyright: ignore
 
 
 class Signer:
@@ -108,7 +117,7 @@ class Signer:
     #: doesn't apply when used intermediately in HMAC.
     #:
     #: .. versionadded:: 0.14
-    default_digest_method: _t.Any = staticmethod(hashlib.sha1)
+    default_digest_method: t.Any = staticmethod(_lazy_sha1)
 
     #: The default scheme to use to derive the signing key from the
     #: secret key and salt. The default is ``django-concat``. Possible
@@ -119,19 +128,19 @@ class Signer:
 
     def __init__(
         self,
-        secret_key: _t_secret_key,
-        salt: _t_opt_str_bytes = b"itsdangerous.Signer",
-        sep: _t_str_bytes = b".",
-        key_derivation: _t.Optional[str] = None,
-        digest_method: _t.Optional[_t.Any] = None,
-        algorithm: _t.Optional[SigningAlgorithm] = None,
+        secret_key: str | bytes | cabc.Iterable[str] | cabc.Iterable[bytes],
+        salt: str | bytes | None = b"itsdangerous.Signer",
+        sep: str | bytes = b".",
+        key_derivation: str | None = None,
+        digest_method: t.Any | None = None,
+        algorithm: SigningAlgorithm | None = None,
     ):
         #: The list of secret keys to try for verifying signatures, from
         #: oldest to newest. The newest (last) key is used for signing.
         #:
         #: This allows a key rotation system to keep a list of allowed
         #: keys and remove expired ones.
-        self.secret_keys: _t.List[bytes] = _make_keys_list(secret_key)
+        self.secret_keys: list[bytes] = _make_keys_list(secret_key)
         self.sep: bytes = want_bytes(sep)
 
         if self.sep in _base64_alphabet:
@@ -156,7 +165,7 @@ class Signer:
         if digest_method is None:
             digest_method = self.default_digest_method
 
-        self.digest_method: _t.Any = digest_method
+        self.digest_method: t.Any = digest_method
 
         if algorithm is None:
             algorithm = HMACAlgorithm(self.digest_method)
@@ -170,7 +179,7 @@ class Signer:
         """
         return self.secret_keys[-1]
 
-    def derive_key(self, secret_key: _t_opt_str_bytes = None) -> bytes:
+    def derive_key(self, secret_key: str | bytes | None = None) -> bytes:
         """This method is called to derive the key. The default key
         derivation choices can be overridden here. Key derivation is not
         intended to be used as a security method to make a complex key
@@ -189,9 +198,9 @@ class Signer:
             secret_key = want_bytes(secret_key)
 
         if self.key_derivation == "concat":
-            return _t.cast(bytes, self.digest_method(self.salt + secret_key).digest())
+            return t.cast(bytes, self.digest_method(self.salt + secret_key).digest())
         elif self.key_derivation == "django-concat":
-            return _t.cast(
+            return t.cast(
                 bytes, self.digest_method(self.salt + b"signer" + secret_key).digest()
             )
         elif self.key_derivation == "hmac":
@@ -203,19 +212,19 @@ class Signer:
         else:
             raise TypeError("Unknown key derivation method")
 
-    def get_signature(self, value: _t_str_bytes) -> bytes:
+    def get_signature(self, value: str | bytes) -> bytes:
         """Returns the signature for the given value."""
         value = want_bytes(value)
         key = self.derive_key()
         sig = self.algorithm.get_signature(key, value)
         return base64_encode(sig)
 
-    def sign(self, value: _t_str_bytes) -> bytes:
+    def sign(self, value: str | bytes) -> bytes:
         """Signs the given string."""
         value = want_bytes(value)
         return value + self.sep + self.get_signature(value)
 
-    def verify_signature(self, value: _t_str_bytes, sig: _t_str_bytes) -> bool:
+    def verify_signature(self, value: str | bytes, sig: str | bytes) -> bool:
         """Verifies the signature for the given value."""
         try:
             sig = base64_decode(sig)
@@ -232,7 +241,7 @@ class Signer:
 
         return False
 
-    def unsign(self, signed_value: _t_str_bytes) -> bytes:
+    def unsign(self, signed_value: str | bytes) -> bytes:
         """Unsigns the given string."""
         signed_value = want_bytes(signed_value)
 
@@ -246,7 +255,7 @@ class Signer:
 
         raise BadSignature(f"Signature {sig!r} does not match", payload=value)
 
-    def validate(self, signed_value: _t_str_bytes) -> bool:
+    def validate(self, signed_value: str | bytes) -> bool:
         """Only validates the given signed value. Returns ``True`` if
         the signature exists and is valid.
         """
diff --git a/libs/itsdangerous/timed.py b/libs/itsdangerous/timed.py
index cad8da341..73843755d 100644
--- a/libs/itsdangerous/timed.py
+++ b/libs/itsdangerous/timed.py
@@ -1,6 +1,8 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import time
-import typing
-import typing as _t
+import typing as t
 from datetime import datetime
 from datetime import timezone
 
@@ -12,16 +14,10 @@ from .encoding import want_bytes
 from .exc import BadSignature
 from .exc import BadTimeSignature
 from .exc import SignatureExpired
+from .serializer import _TSerialized
 from .serializer import Serializer
 from .signer import Signer
 
-_t_str_bytes = _t.Union[str, bytes]
-_t_opt_str_bytes = _t.Optional[_t_str_bytes]
-_t_opt_int = _t.Optional[int]
-
-if _t.TYPE_CHECKING:
-    import typing_extensions as _te
-
 
 class TimestampSigner(Signer):
     """Works like the regular :class:`.Signer` but also records the time
@@ -46,7 +42,7 @@ class TimestampSigner(Signer):
         """
         return datetime.fromtimestamp(ts, tz=timezone.utc)
 
-    def sign(self, value: _t_str_bytes) -> bytes:
+    def sign(self, value: str | bytes) -> bytes:
         """Signs the given string and also attaches time information."""
         value = want_bytes(value)
         timestamp = base64_encode(int_to_bytes(self.get_timestamp()))
@@ -57,30 +53,28 @@ class TimestampSigner(Signer):
     # Ignore overlapping signatures check, return_timestamp is the only
     # parameter that affects the return type.
 
-    @typing.overload
-    def unsign(  # type: ignore
+    @t.overload
+    def unsign(  # type: ignore[overload-overlap]
         self,
-        signed_value: _t_str_bytes,
-        max_age: _t_opt_int = None,
-        return_timestamp: "_te.Literal[False]" = False,
-    ) -> bytes:
-        ...
+        signed_value: str | bytes,
+        max_age: int | None = None,
+        return_timestamp: t.Literal[False] = False,
+    ) -> bytes: ...
 
-    @typing.overload
+    @t.overload
     def unsign(
         self,
-        signed_value: _t_str_bytes,
-        max_age: _t_opt_int = None,
-        return_timestamp: "_te.Literal[True]" = True,
-    ) -> _t.Tuple[bytes, datetime]:
-        ...
+        signed_value: str | bytes,
+        max_age: int | None = None,
+        return_timestamp: t.Literal[True] = True,
+    ) -> tuple[bytes, datetime]: ...
 
     def unsign(
         self,
-        signed_value: _t_str_bytes,
-        max_age: _t_opt_int = None,
+        signed_value: str | bytes,
+        max_age: int | None = None,
         return_timestamp: bool = False,
-    ) -> _t.Union[_t.Tuple[bytes, datetime], bytes]:
+    ) -> tuple[bytes, datetime] | bytes:
         """Works like the regular :meth:`.Signer.unsign` but can also
         validate the time. See the base docstring of the class for
         the general behavior. If ``return_timestamp`` is ``True`` the
@@ -112,8 +106,8 @@ class TimestampSigner(Signer):
             raise BadTimeSignature("timestamp missing", payload=result)
 
         value, ts_bytes = result.rsplit(sep, 1)
-        ts_int: _t_opt_int = None
-        ts_dt: _t.Optional[datetime] = None
+        ts_int: int | None = None
+        ts_dt: datetime | None = None
 
         try:
             ts_int = bytes_to_int(base64_decode(ts_bytes))
@@ -163,7 +157,7 @@ class TimestampSigner(Signer):
 
         return value
 
-    def validate(self, signed_value: _t_str_bytes, max_age: _t_opt_int = None) -> bool:
+    def validate(self, signed_value: str | bytes, max_age: int | None = None) -> bool:
         """Only validates the given signed value. Returns ``True`` if
         the signature exists and is valid."""
         try:
@@ -173,28 +167,28 @@ class TimestampSigner(Signer):
             return False
 
 
-class TimedSerializer(Serializer):
+class TimedSerializer(Serializer[_TSerialized]):
     """Uses :class:`TimestampSigner` instead of the default
     :class:`.Signer`.
     """
 
-    default_signer: _t.Type[TimestampSigner] = TimestampSigner
+    default_signer: type[TimestampSigner] = TimestampSigner
 
     def iter_unsigners(
-        self, salt: _t_opt_str_bytes = None
-    ) -> _t.Iterator[TimestampSigner]:
-        return _t.cast("_t.Iterator[TimestampSigner]", super().iter_unsigners(salt))
+        self, salt: str | bytes | None = None
+    ) -> cabc.Iterator[TimestampSigner]:
+        return t.cast("cabc.Iterator[TimestampSigner]", super().iter_unsigners(salt))
 
     # TODO: Signature is incompatible because parameters were added
     #  before salt.
 
-    def loads(  # type: ignore
+    def loads(  # type: ignore[override]
         self,
-        s: _t_str_bytes,
-        max_age: _t_opt_int = None,
+        s: str | bytes,
+        max_age: int | None = None,
         return_timestamp: bool = False,
-        salt: _t_opt_str_bytes = None,
-    ) -> _t.Any:
+        salt: str | bytes | None = None,
+    ) -> t.Any:
         """Reverse of :meth:`dumps`, raises :exc:`.BadSignature` if the
         signature validation fails. If a ``max_age`` is provided it will
         ensure the signature is not older than that time in seconds. In
@@ -223,12 +217,12 @@ class TimedSerializer(Serializer):
             except BadSignature as err:
                 last_exception = err
 
-        raise _t.cast(BadSignature, last_exception)
+        raise t.cast(BadSignature, last_exception)
 
-    def loads_unsafe(  # type: ignore
+    def loads_unsafe(  # type: ignore[override]
         self,
-        s: _t_str_bytes,
-        max_age: _t_opt_int = None,
-        salt: _t_opt_str_bytes = None,
-    ) -> _t.Tuple[bool, _t.Any]:
+        s: str | bytes,
+        max_age: int | None = None,
+        salt: str | bytes | None = None,
+    ) -> tuple[bool, t.Any]:
         return self._loads_unsafe_impl(s, salt, load_kwargs={"max_age": max_age})
diff --git a/libs/itsdangerous/url_safe.py b/libs/itsdangerous/url_safe.py
index d5a9b0c26..56a079331 100644
--- a/libs/itsdangerous/url_safe.py
+++ b/libs/itsdangerous/url_safe.py
@@ -1,29 +1,32 @@
-import typing as _t
+from __future__ import annotations
+
+import typing as t
 import zlib
 
 from ._json import _CompactJSON
 from .encoding import base64_decode
 from .encoding import base64_encode
 from .exc import BadPayload
+from .serializer import _PDataSerializer
 from .serializer import Serializer
 from .timed import TimedSerializer
 
 
-class URLSafeSerializerMixin(Serializer):
+class URLSafeSerializerMixin(Serializer[str]):
     """Mixed in with a regular serializer it will attempt to zlib
     compress the string to make it shorter if necessary. It will also
     base64 encode the string so that it can safely be placed in a URL.
     """
 
-    default_serializer = _CompactJSON
+    default_serializer: _PDataSerializer[str] = _CompactJSON
 
     def load_payload(
         self,
         payload: bytes,
-        *args: _t.Any,
-        serializer: _t.Optional[_t.Any] = None,
-        **kwargs: _t.Any,
-    ) -> _t.Any:
+        *args: t.Any,
+        serializer: t.Any | None = None,
+        **kwargs: t.Any,
+    ) -> t.Any:
         decompress = False
 
         if payload.startswith(b"."):
@@ -49,7 +52,7 @@ class URLSafeSerializerMixin(Serializer):
 
         return super().load_payload(json, *args, **kwargs)
 
-    def dump_payload(self, obj: _t.Any) -> bytes:
+    def dump_payload(self, obj: t.Any) -> bytes:
         json = super().dump_payload(obj)
         is_compressed = False
         compressed = zlib.compress(json)
@@ -66,14 +69,14 @@ class URLSafeSerializerMixin(Serializer):
         return base64d
 
 
-class URLSafeSerializer(URLSafeSerializerMixin, Serializer):
+class URLSafeSerializer(URLSafeSerializerMixin, Serializer[str]):
     """Works like :class:`.Serializer` but dumps and loads into a URL
     safe string consisting of the upper and lowercase character of the
     alphabet as well as ``'_'``, ``'-'`` and ``'.'``.
     """
 
 
-class URLSafeTimedSerializer(URLSafeSerializerMixin, TimedSerializer):
+class URLSafeTimedSerializer(URLSafeSerializerMixin, TimedSerializer[str]):
     """Works like :class:`.TimedSerializer` but dumps and loads into a
     URL safe string consisting of the upper and lowercase character of
     the alphabet as well as ``'_'``, ``'-'`` and ``'.'``.
diff --git a/libs/platformdirs-4.2.0.dist-info/INSTALLER b/libs/jinja2-3.1.5.dist-info/INSTALLER
similarity index 100%
rename from libs/platformdirs-4.2.0.dist-info/INSTALLER
rename to libs/jinja2-3.1.5.dist-info/INSTALLER
diff --git a/libs/Jinja2-3.1.3.dist-info/LICENSE.rst b/libs/jinja2-3.1.5.dist-info/LICENSE.txt
similarity index 100%
rename from libs/Jinja2-3.1.3.dist-info/LICENSE.rst
rename to libs/jinja2-3.1.5.dist-info/LICENSE.txt
diff --git a/libs/Jinja2-3.1.3.dist-info/METADATA b/libs/jinja2-3.1.5.dist-info/METADATA
similarity index 57%
rename from libs/Jinja2-3.1.3.dist-info/METADATA
rename to libs/jinja2-3.1.5.dist-info/METADATA
index 56e942902..6d0348d9d 100644
--- a/libs/Jinja2-3.1.3.dist-info/METADATA
+++ b/libs/jinja2-3.1.5.dist-info/METADATA
@@ -1,17 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: Jinja2
-Version: 3.1.3
+Version: 3.1.5
 Summary: A very fast and expressive template engine.
-Home-page: https://palletsprojects.com/p/jinja/
-Maintainer: Pallets
-Maintainer-email: contact@palletsprojects.com
-License: BSD-3-Clause
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Documentation, https://jinja.palletsprojects.com/
-Project-URL: Changes, https://jinja.palletsprojects.com/changes/
-Project-URL: Source Code, https://github.com/pallets/jinja/
-Project-URL: Issue Tracker, https://github.com/pallets/jinja/issues/
-Project-URL: Chat, https://discord.gg/pallets
+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
@@ -20,15 +13,17 @@ 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
-Requires-Dist: MarkupSafe >=2.0
+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
-Requires-Dist: Babel >=2.7 ; extra == 'i18n'
 
-Jinja
-=====
+# Jinja
 
 Jinja is a fast, expressive, extensible templating engine. Special
 placeholders in the template allow writing code similar to Python
@@ -55,51 +50,26 @@ possible, it shouldn't make the template designer's job difficult by
 restricting functionality too much.
 
 
-Installing
-----------
+## In A Nutshell
 
-Install and update using `pip`_:
+```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 %}
+```
 
-.. code-block:: text
-
-    $ pip install -U Jinja2
-
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
-
-
-In A Nutshell
--------------
-
-.. code-block:: 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
-------
+## 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`_.
+allow the maintainers to devote more time to the projects, [please
+donate today][].
 
-.. _please donate today: https://palletsprojects.com/donate
+[please donate today]: https://palletsprojects.com/donate
 
-
-Links
------
-
--   Documentation: https://jinja.palletsprojects.com/
--   Changes: https://jinja.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/Jinja2/
--   Source Code: https://github.com/pallets/jinja/
--   Issue Tracker: https://github.com/pallets/jinja/issues/
--   Chat: https://discord.gg/pallets
diff --git a/libs/jinja2-3.1.5.dist-info/RECORD b/libs/jinja2-3.1.5.dist-info/RECORD
new file mode 100644
index 000000000..35ef2e15e
--- /dev/null
+++ b/libs/jinja2-3.1.5.dist-info/RECORD
@@ -0,0 +1,33 @@
+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/platformdirs-4.2.0.dist-info/REQUESTED b/libs/jinja2-3.1.5.dist-info/REQUESTED
similarity index 100%
rename from libs/platformdirs-4.2.0.dist-info/REQUESTED
rename to libs/jinja2-3.1.5.dist-info/REQUESTED
diff --git a/libs/platformdirs-4.2.0.dist-info/WHEEL b/libs/jinja2-3.1.5.dist-info/WHEEL
similarity index 67%
rename from libs/platformdirs-4.2.0.dist-info/WHEEL
rename to libs/jinja2-3.1.5.dist-info/WHEEL
index 5998f3aab..e3c6feefa 100644
--- a/libs/platformdirs-4.2.0.dist-info/WHEEL
+++ b/libs/jinja2-3.1.5.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: flit 3.10.1
 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.5.dist-info/entry_points.txt
new file mode 100644
index 000000000..abc3eae3b
--- /dev/null
+++ b/libs/jinja2-3.1.5.dist-info/entry_points.txt
@@ -0,0 +1,3 @@
+[babel.extractors]
+jinja2=jinja2.ext:babel_extract[i18n]
+
diff --git a/libs/jinja2/__init__.py b/libs/jinja2/__init__.py
index af5d4288d..d669f295b 100644
--- a/libs/jinja2/__init__.py
+++ b/libs/jinja2/__init__.py
@@ -2,6 +2,7 @@
 non-XML syntax that supports inline expressions and an optional
 sandboxed environment.
 """
+
 from .bccache import BytecodeCache as BytecodeCache
 from .bccache import FileSystemBytecodeCache as FileSystemBytecodeCache
 from .bccache import MemcachedBytecodeCache as MemcachedBytecodeCache
@@ -34,4 +35,4 @@ from .utils import pass_environment as pass_environment
 from .utils import pass_eval_context as pass_eval_context
 from .utils import select_autoescape as select_autoescape
 
-__version__ = "3.1.3"
+__version__ = "3.1.5"
diff --git a/libs/jinja2/async_utils.py b/libs/jinja2/async_utils.py
index 715d70119..f0c140205 100644
--- a/libs/jinja2/async_utils.py
+++ b/libs/jinja2/async_utils.py
@@ -6,6 +6,9 @@ from functools import wraps
 from .utils import _PassArg
 from .utils import pass_eval_context
 
+if t.TYPE_CHECKING:
+    import typing_extensions as te
+
 V = t.TypeVar("V")
 
 
@@ -47,7 +50,7 @@ def async_variant(normal_func):  # type: ignore
         if need_eval_context:
             wrapper = pass_eval_context(wrapper)
 
-        wrapper.jinja_async_variant = True
+        wrapper.jinja_async_variant = True  # type: ignore[attr-defined]
         return wrapper
 
     return decorator
@@ -64,18 +67,30 @@ async def auto_await(value: t.Union[t.Awaitable["V"], "V"]) -> "V":
     if inspect.isawaitable(value):
         return await t.cast("t.Awaitable[V]", value)
 
-    return t.cast("V", value)
+    return value
 
 
-async def auto_aiter(
+class _IteratorToAsyncIterator(t.Generic[V]):
+    def __init__(self, iterator: "t.Iterator[V]"):
+        self._iterator = iterator
+
+    def __aiter__(self) -> "te.Self":
+        return self
+
+    async def __anext__(self) -> V:
+        try:
+            return next(self._iterator)
+        except StopIteration as e:
+            raise StopAsyncIteration(e.value) from e
+
+
+def auto_aiter(
     iterable: "t.Union[t.AsyncIterable[V], t.Iterable[V]]",
 ) -> "t.AsyncIterator[V]":
     if hasattr(iterable, "__aiter__"):
-        async for item in t.cast("t.AsyncIterable[V]", iterable):
-            yield item
+        return iterable.__aiter__()
     else:
-        for item in iterable:
-            yield item
+        return _IteratorToAsyncIterator(iter(iterable))
 
 
 async def auto_to_list(
diff --git a/libs/jinja2/bccache.py b/libs/jinja2/bccache.py
index d0ddf56ef..ada8b099f 100644
--- a/libs/jinja2/bccache.py
+++ b/libs/jinja2/bccache.py
@@ -5,6 +5,7 @@ slows down your application too much.
 Situations where this is useful are often forking web applications that
 are initialized on the first request.
 """
+
 import errno
 import fnmatch
 import marshal
@@ -20,14 +21,15 @@ from types import CodeType
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
 
     class _MemcachedClient(te.Protocol):
-        def get(self, key: str) -> bytes:
-            ...
+        def get(self, key: str) -> bytes: ...
 
-        def set(self, key: str, value: bytes, timeout: t.Optional[int] = None) -> None:
-            ...
+        def set(
+            self, key: str, value: bytes, timeout: t.Optional[int] = None
+        ) -> None: ...
 
 
 bc_version = 5
diff --git a/libs/jinja2/compiler.py b/libs/jinja2/compiler.py
index ff95c807b..a4ff6a1b1 100644
--- a/libs/jinja2/compiler.py
+++ b/libs/jinja2/compiler.py
@@ -1,4 +1,5 @@
 """Compiles nodes from the parser into Python code."""
+
 import typing as t
 from contextlib import contextmanager
 from functools import update_wrapper
@@ -24,6 +25,7 @@ from .visitor import NodeVisitor
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
 
 F = t.TypeVar("F", bound=t.Callable[..., t.Any])
@@ -53,15 +55,14 @@ def optimizeconst(f: F) -> F:
 
         return f(self, node, frame, **kwargs)
 
-    return update_wrapper(t.cast(F, new_func), f)
+    return update_wrapper(new_func, f)  # type: ignore[return-value]
 
 
 def _make_binop(op: str) -> t.Callable[["CodeGenerator", nodes.BinExpr, "Frame"], None]:
     @optimizeconst
     def visitor(self: "CodeGenerator", node: nodes.BinExpr, frame: Frame) -> None:
         if (
-            self.environment.sandboxed
-            and op in self.environment.intercepted_binops  # type: ignore
+            self.environment.sandboxed and op in self.environment.intercepted_binops  # type: ignore
         ):
             self.write(f"environment.call_binop(context, {op!r}, ")
             self.visit(node.left, frame)
@@ -84,8 +85,7 @@ def _make_unop(
     @optimizeconst
     def visitor(self: "CodeGenerator", node: nodes.UnaryExpr, frame: Frame) -> None:
         if (
-            self.environment.sandboxed
-            and op in self.environment.intercepted_unops  # type: ignore
+            self.environment.sandboxed and op in self.environment.intercepted_unops  # type: ignore
         ):
             self.write(f"environment.call_unop(context, {op!r}, ")
             self.visit(node.node, frame)
@@ -133,7 +133,7 @@ def has_safe_repr(value: t.Any) -> bool:
     if type(value) in {tuple, list, set, frozenset}:
         return all(has_safe_repr(v) for v in value)
 
-    if type(value) is dict:
+    if type(value) is dict:  # noqa E721
         return all(has_safe_repr(k) and has_safe_repr(v) for k, v in value.items())
 
     return False
@@ -216,7 +216,7 @@ class Frame:
         # or compile time.
         self.soft_frame = False
 
-    def copy(self) -> "Frame":
+    def copy(self) -> "te.Self":
         """Create a copy of the current one."""
         rv = object.__new__(self.__class__)
         rv.__dict__.update(self.__dict__)
@@ -229,7 +229,7 @@ class Frame:
             return Frame(self.eval_ctx, level=self.symbols.level + 1)
         return Frame(self.eval_ctx, self)
 
-    def soft(self) -> "Frame":
+    def soft(self) -> "te.Self":
         """Return a soft frame.  A soft frame may not be modified as
         standalone thing as it shares the resources with the frame it
         was created of, but it's not a rootlevel frame any longer.
@@ -551,10 +551,13 @@ class CodeGenerator(NodeVisitor):
         for node in nodes:
             visitor.visit(node)
 
-        for id_map, names, dependency in (self.filters, visitor.filters, "filters"), (
-            self.tests,
-            visitor.tests,
-            "tests",
+        for id_map, names, dependency in (
+            (self.filters, visitor.filters, "filters"),
+            (
+                self.tests,
+                visitor.tests,
+                "tests",
+            ),
         ):
             for name in sorted(names):
                 if name not in id_map:
@@ -808,7 +811,7 @@ class CodeGenerator(NodeVisitor):
                 self.writeline("_block_vars.update({")
             else:
                 self.writeline("context.vars.update({")
-            for idx, name in enumerate(vars):
+            for idx, name in enumerate(sorted(vars)):
                 if idx:
                     self.write(", ")
                 ref = frame.symbols.ref(name)
@@ -818,7 +821,7 @@ class CodeGenerator(NodeVisitor):
             if len(public_names) == 1:
                 self.writeline(f"context.exported_vars.add({public_names[0]!r})")
             else:
-                names_str = ", ".join(map(repr, public_names))
+                names_str = ", ".join(map(repr, sorted(public_names)))
                 self.writeline(f"context.exported_vars.update(({names_str}))")
 
     # -- Statement Visitors
@@ -829,7 +832,8 @@ class CodeGenerator(NodeVisitor):
         assert frame is None, "no root frame allowed"
         eval_ctx = EvalContext(self.environment, self.name)
 
-        from .runtime import exported, async_exported
+        from .runtime import async_exported
+        from .runtime import exported
 
         if self.environment.is_async:
             exported_names = sorted(exported + async_exported)
@@ -898,12 +902,15 @@ class CodeGenerator(NodeVisitor):
             if not self.environment.is_async:
                 self.writeline("yield from parent_template.root_render_func(context)")
             else:
-                self.writeline(
-                    "async for event in parent_template.root_render_func(context):"
-                )
+                self.writeline("agen = parent_template.root_render_func(context)")
+                self.writeline("try:")
+                self.indent()
+                self.writeline("async for event in agen:")
                 self.indent()
                 self.writeline("yield event")
                 self.outdent()
+                self.outdent()
+                self.writeline("finally: await agen.aclose()")
             self.outdent(1 + (not self.has_known_extends))
 
         # at this point we now have the blocks collected and can visit them too.
@@ -973,14 +980,20 @@ class CodeGenerator(NodeVisitor):
                 f"yield from context.blocks[{node.name!r}][0]({context})", node
             )
         else:
+            self.writeline(f"gen = context.blocks[{node.name!r}][0]({context})")
+            self.writeline("try:")
+            self.indent()
             self.writeline(
-                f"{self.choose_async()}for event in"
-                f" context.blocks[{node.name!r}][0]({context}):",
+                f"{self.choose_async()}for event in gen:",
                 node,
             )
             self.indent()
             self.simple_write("event", frame)
             self.outdent()
+            self.outdent()
+            self.writeline(
+                f"finally: {self.choose_async('await gen.aclose()', 'gen.close()')}"
+            )
 
         self.outdent(level)
 
@@ -1053,26 +1066,33 @@ class CodeGenerator(NodeVisitor):
             self.writeline("else:")
             self.indent()
 
-        skip_event_yield = False
+        def loop_body() -> None:
+            self.indent()
+            self.simple_write("event", frame)
+            self.outdent()
+
         if node.with_context:
             self.writeline(
-                f"{self.choose_async()}for event in template.root_render_func("
+                f"gen = template.root_render_func("
                 "template.new_context(context.get_all(), True,"
-                f" {self.dump_local_context(frame)})):"
+                f" {self.dump_local_context(frame)}))"
+            )
+            self.writeline("try:")
+            self.indent()
+            self.writeline(f"{self.choose_async()}for event in gen:")
+            loop_body()
+            self.outdent()
+            self.writeline(
+                f"finally: {self.choose_async('await gen.aclose()', 'gen.close()')}"
             )
         elif self.environment.is_async:
             self.writeline(
                 "for event in (await template._get_default_module_async())"
                 "._body_stream:"
             )
+            loop_body()
         else:
             self.writeline("yield from template._get_default_module()._body_stream")
-            skip_event_yield = True
-
-        if not skip_event_yield:
-            self.indent()
-            self.simple_write("event", frame)
-            self.outdent()
 
         if node.ignore_missing:
             self.outdent()
@@ -1121,9 +1141,14 @@ class CodeGenerator(NodeVisitor):
             )
             self.writeline(f"if {frame.symbols.ref(alias)} is missing:")
             self.indent()
+            # The position will contain the template name, and will be formatted
+            # into a string that will be compiled into an f-string. Curly braces
+            # in the name must be replaced with escapes so that they will not be
+            # executed as part of the f-string.
+            position = self.position(node).replace("{", "{{").replace("}", "}}")
             message = (
                 "the template {included_template.__name__!r}"
-                f" (imported on {self.position(node)})"
+                f" (imported on {position})"
                 f" does not export the requested name {name!r}"
             )
             self.writeline(
@@ -1556,6 +1581,29 @@ class CodeGenerator(NodeVisitor):
 
     def visit_Assign(self, node: nodes.Assign, frame: Frame) -> None:
         self.push_assign_tracking()
+
+        # ``a.b`` is allowed for assignment, and is parsed as an NSRef. However,
+        # it is only valid if it references a Namespace object. Emit a check for
+        # that for each ref here, before assignment code is emitted. This can't
+        # be done in visit_NSRef as the ref could be in the middle of a tuple.
+        seen_refs: t.Set[str] = set()
+
+        for nsref in node.find_all(nodes.NSRef):
+            if nsref.name in seen_refs:
+                # Only emit the check for each reference once, in case the same
+                # ref is used multiple times in a tuple, `ns.a, ns.b = c, d`.
+                continue
+
+            seen_refs.add(nsref.name)
+            ref = frame.symbols.ref(nsref.name)
+            self.writeline(f"if not isinstance({ref}, Namespace):")
+            self.indent()
+            self.writeline(
+                "raise TemplateRuntimeError"
+                '("cannot assign attribute on non-namespace object")'
+            )
+            self.outdent()
+
         self.newline(node)
         self.visit(node.target, frame)
         self.write(" = ")
@@ -1612,17 +1660,11 @@ class CodeGenerator(NodeVisitor):
         self.write(ref)
 
     def visit_NSRef(self, node: nodes.NSRef, frame: Frame) -> None:
-        # NSRefs can only be used to store values; since they use the normal
-        # `foo.bar` notation they will be parsed as a normal attribute access
-        # when used anywhere but in a `set` context
+        # NSRef is a dotted assignment target a.b=c, but uses a[b]=c internally.
+        # visit_Assign emits code to validate that each ref is to a Namespace
+        # object only. That can't be emitted here as the ref could be in the
+        # middle of a tuple assignment.
         ref = frame.symbols.ref(node.name)
-        self.writeline(f"if not isinstance({ref}, Namespace):")
-        self.indent()
-        self.writeline(
-            "raise TemplateRuntimeError"
-            '("cannot assign attribute on non-namespace object")'
-        )
-        self.outdent()
         self.writeline(f"{ref}[{node.attr!r}]")
 
     def visit_Const(self, node: nodes.Const, frame: Frame) -> None:
diff --git a/libs/jinja2/debug.py b/libs/jinja2/debug.py
index 7ed7e9297..eeeeee78b 100644
--- a/libs/jinja2/debug.py
+++ b/libs/jinja2/debug.py
@@ -152,7 +152,7 @@ def get_template_locals(real_locals: t.Mapping[str, t.Any]) -> t.Dict[str, t.Any
     available at that point in the template.
     """
     # Start with the current template context.
-    ctx: "t.Optional[Context]" = real_locals.get("context")
+    ctx: t.Optional[Context] = real_locals.get("context")
 
     if ctx is not None:
         data: t.Dict[str, t.Any] = ctx.get_all().copy()
diff --git a/libs/jinja2/environment.py b/libs/jinja2/environment.py
index 185d33246..0fc6e5be8 100644
--- a/libs/jinja2/environment.py
+++ b/libs/jinja2/environment.py
@@ -1,6 +1,7 @@
 """Classes for managing templates and their runtime and compile time
 options.
 """
+
 import os
 import typing
 import typing as t
@@ -20,10 +21,10 @@ from .defaults import BLOCK_END_STRING
 from .defaults import BLOCK_START_STRING
 from .defaults import COMMENT_END_STRING
 from .defaults import COMMENT_START_STRING
-from .defaults import DEFAULT_FILTERS
+from .defaults import DEFAULT_FILTERS  # type: ignore[attr-defined]
 from .defaults import DEFAULT_NAMESPACE
 from .defaults import DEFAULT_POLICIES
-from .defaults import DEFAULT_TESTS
+from .defaults import DEFAULT_TESTS  # type: ignore[attr-defined]
 from .defaults import KEEP_TRAILING_NEWLINE
 from .defaults import LINE_COMMENT_PREFIX
 from .defaults import LINE_STATEMENT_PREFIX
@@ -55,6 +56,7 @@ from .utils import missing
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .bccache import BytecodeCache
     from .ext import Extension
     from .loaders import BaseLoader
@@ -79,7 +81,7 @@ def get_spontaneous_environment(cls: t.Type[_env_bound], *args: t.Any) -> _env_b
 
 def create_cache(
     size: int,
-) -> t.Optional[t.MutableMapping[t.Tuple[weakref.ref, str], "Template"]]:
+) -> t.Optional[t.MutableMapping[t.Tuple["weakref.ref[t.Any]", str], "Template"]]:
     """Return the cache class for the given size."""
     if size == 0:
         return None
@@ -91,13 +93,13 @@ def create_cache(
 
 
 def copy_cache(
-    cache: t.Optional[t.MutableMapping],
-) -> t.Optional[t.MutableMapping[t.Tuple[weakref.ref, str], "Template"]]:
+    cache: t.Optional[t.MutableMapping[t.Any, t.Any]],
+) -> t.Optional[t.MutableMapping[t.Tuple["weakref.ref[t.Any]", str], "Template"]]:
     """Create an empty copy of the given cache."""
     if cache is None:
         return None
 
-    if type(cache) is dict:
+    if type(cache) is dict:  # noqa E721
         return {}
 
     return LRUCache(cache.capacity)  # type: ignore
@@ -121,7 +123,7 @@ def load_extensions(
     return result
 
 
-def _environment_config_check(environment: "Environment") -> "Environment":
+def _environment_config_check(environment: _env_bound) -> _env_bound:
     """Perform a sanity check on the environment."""
     assert issubclass(
         environment.undefined, Undefined
@@ -404,8 +406,8 @@ class Environment:
         cache_size: int = missing,
         auto_reload: bool = missing,
         bytecode_cache: t.Optional["BytecodeCache"] = missing,
-        enable_async: bool = False,
-    ) -> "Environment":
+        enable_async: bool = missing,
+    ) -> "te.Self":
         """Create a new overlay environment that shares all the data with the
         current environment except for cache and the overridden attributes.
         Extensions cannot be removed for an overlayed environment.  An overlayed
@@ -417,8 +419,11 @@ class Environment:
         copied over so modifications on the original environment may not shine
         through.
 
+        .. versionchanged:: 3.1.5
+            ``enable_async`` is applied correctly.
+
         .. versionchanged:: 3.1.2
-            Added the ``newline_sequence``,, ``keep_trailing_newline``,
+            Added the ``newline_sequence``, ``keep_trailing_newline``,
             and ``enable_async`` parameters to match ``__init__``.
         """
         args = dict(locals())
@@ -670,7 +675,7 @@ class Environment:
             stream = ext.filter_stream(stream)  # type: ignore
 
             if not isinstance(stream, TokenStream):
-                stream = TokenStream(stream, name, filename)  # type: ignore
+                stream = TokenStream(stream, name, filename)
 
         return stream
 
@@ -704,15 +709,14 @@ class Environment:
         return compile(source, filename, "exec")
 
     @typing.overload
-    def compile(  # type: ignore
+    def compile(
         self,
         source: t.Union[str, nodes.Template],
         name: t.Optional[str] = None,
         filename: t.Optional[str] = None,
         raw: "te.Literal[False]" = False,
         defer_init: bool = False,
-    ) -> CodeType:
-        ...
+    ) -> CodeType: ...
 
     @typing.overload
     def compile(
@@ -722,8 +726,7 @@ class Environment:
         filename: t.Optional[str] = None,
         raw: "te.Literal[True]" = ...,
         defer_init: bool = False,
-    ) -> str:
-        ...
+    ) -> str: ...
 
     @internalcode
     def compile(
@@ -814,7 +817,7 @@ class Environment:
 
     def compile_templates(
         self,
-        target: t.Union[str, os.PathLike],
+        target: t.Union[str, "os.PathLike[str]"],
         extensions: t.Optional[t.Collection[str]] = None,
         filter_func: t.Optional[t.Callable[[str], bool]] = None,
         zip: t.Optional[str] = "deflated",
@@ -858,7 +861,10 @@ class Environment:
                     f.write(data.encode("utf8"))
 
         if zip is not None:
-            from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED, ZIP_STORED
+            from zipfile import ZIP_DEFLATED
+            from zipfile import ZIP_STORED
+            from zipfile import ZipFile
+            from zipfile import ZipInfo
 
             zip_file = ZipFile(
                 target, "w", dict(deflated=ZIP_DEFLATED, stored=ZIP_STORED)[zip]
@@ -1245,7 +1251,7 @@ class Template:
         namespace: t.MutableMapping[str, t.Any],
         globals: t.MutableMapping[str, t.Any],
     ) -> "Template":
-        t: "Template" = object.__new__(cls)
+        t: Template = object.__new__(cls)
         t.environment = environment
         t.globals = globals
         t.name = namespace["name"]
@@ -1279,19 +1285,7 @@ class Template:
         if self.environment.is_async:
             import asyncio
 
-            close = False
-
-            try:
-                loop = asyncio.get_running_loop()
-            except RuntimeError:
-                loop = asyncio.new_event_loop()
-                close = True
-
-            try:
-                return loop.run_until_complete(self.render_async(*args, **kwargs))
-            finally:
-                if close:
-                    loop.close()
+            return asyncio.run(self.render_async(*args, **kwargs))
 
         ctx = self.new_context(dict(*args, **kwargs))
 
@@ -1355,7 +1349,7 @@ class Template:
 
     async def generate_async(
         self, *args: t.Any, **kwargs: t.Any
-    ) -> t.AsyncIterator[str]:
+    ) -> t.AsyncGenerator[str, object]:
         """An async version of :meth:`generate`.  Works very similarly but
         returns an async iterator instead.
         """
@@ -1367,8 +1361,14 @@ class Template:
         ctx = self.new_context(dict(*args, **kwargs))
 
         try:
-            async for event in self.root_render_func(ctx):  # type: ignore
-                yield event
+            agen = self.root_render_func(ctx)
+            try:
+                async for event in agen:  # type: ignore
+                    yield event
+            finally:
+                # we can't use async with aclosing(...) because that's only
+                # in 3.10+
+                await agen.aclose()  # type: ignore
         except Exception:
             yield self.environment.handle_exception()
 
@@ -1417,7 +1417,9 @@ class Template:
         """
         ctx = self.new_context(vars, shared, locals)
         return TemplateModule(
-            self, ctx, [x async for x in self.root_render_func(ctx)]  # type: ignore
+            self,
+            ctx,
+            [x async for x in self.root_render_func(ctx)],  # type: ignore
         )
 
     @internalcode
@@ -1588,7 +1590,7 @@ class TemplateStream:
 
     def dump(
         self,
-        fp: t.Union[str, t.IO],
+        fp: t.Union[str, t.IO[bytes]],
         encoding: t.Optional[str] = None,
         errors: t.Optional[str] = "strict",
     ) -> None:
@@ -1606,22 +1608,25 @@ class TemplateStream:
             if encoding is None:
                 encoding = "utf-8"
 
-            fp = open(fp, "wb")
+            real_fp: t.IO[bytes] = open(fp, "wb")
             close = True
+        else:
+            real_fp = fp
+
         try:
             if encoding is not None:
                 iterable = (x.encode(encoding, errors) for x in self)  # type: ignore
             else:
                 iterable = self  # type: ignore
 
-            if hasattr(fp, "writelines"):
-                fp.writelines(iterable)
+            if hasattr(real_fp, "writelines"):
+                real_fp.writelines(iterable)
             else:
                 for item in iterable:
-                    fp.write(item)
+                    real_fp.write(item)
         finally:
             if close:
-                fp.close()
+                real_fp.close()
 
     def disable_buffering(self) -> None:
         """Disable the output buffering."""
diff --git a/libs/jinja2/ext.py b/libs/jinja2/ext.py
index fade1fa3b..c7af8d45f 100644
--- a/libs/jinja2/ext.py
+++ b/libs/jinja2/ext.py
@@ -1,4 +1,5 @@
 """Extension API for adding custom tags and behavior."""
+
 import pprint
 import re
 import typing as t
@@ -18,23 +19,23 @@ from .utils import pass_context
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .lexer import Token
     from .lexer import TokenStream
     from .parser import Parser
 
     class _TranslationsBasic(te.Protocol):
-        def gettext(self, message: str) -> str:
-            ...
+        def gettext(self, message: str) -> str: ...
 
         def ngettext(self, singular: str, plural: str, n: int) -> str:
             pass
 
     class _TranslationsContext(_TranslationsBasic):
-        def pgettext(self, context: str, message: str) -> str:
-            ...
+        def pgettext(self, context: str, message: str) -> str: ...
 
-        def npgettext(self, context: str, singular: str, plural: str, n: int) -> str:
-            ...
+        def npgettext(
+            self, context: str, singular: str, plural: str, n: int
+        ) -> str: ...
 
     _SupportedTranslations = t.Union[_TranslationsBasic, _TranslationsContext]
 
@@ -88,7 +89,7 @@ class Extension:
     def __init__(self, environment: Environment) -> None:
         self.environment = environment
 
-    def bind(self, environment: Environment) -> "Extension":
+    def bind(self, environment: Environment) -> "te.Self":
         """Create a copy of this extension bound to another environment."""
         rv = object.__new__(self.__class__)
         rv.__dict__.update(self.__dict__)
@@ -218,7 +219,7 @@ def _make_new_pgettext(func: t.Callable[[str, str], str]) -> t.Callable[..., str
 
 
 def _make_new_npgettext(
-    func: t.Callable[[str, str, str, int], str]
+    func: t.Callable[[str, str, str, int], str],
 ) -> t.Callable[..., str]:
     @pass_context
     def npgettext(
@@ -294,14 +295,14 @@ class InternationalizationExtension(Extension):
             pgettext = translations.pgettext
         else:
 
-            def pgettext(c: str, s: str) -> str:
+            def pgettext(c: str, s: str) -> str:  # type: ignore[misc]
                 return s
 
         if hasattr(translations, "npgettext"):
             npgettext = translations.npgettext
         else:
 
-            def npgettext(c: str, s: str, p: str, n: int) -> str:
+            def npgettext(c: str, s: str, p: str, n: int) -> str:  # type: ignore[misc]
                 return s if n == 1 else p
 
         self._install_callables(
diff --git a/libs/jinja2/filters.py b/libs/jinja2/filters.py
index c7ecc9bb6..e5b5a00c5 100644
--- a/libs/jinja2/filters.py
+++ b/libs/jinja2/filters.py
@@ -1,4 +1,5 @@
 """Built-in template filters used with the ``|`` operator."""
+
 import math
 import random
 import re
@@ -28,6 +29,7 @@ from .utils import urlize
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
     from .nodes import EvalContext
     from .runtime import Context
@@ -122,7 +124,7 @@ def make_multi_attrgetter(
 
 
 def _prepare_attribute_parts(
-    attr: t.Optional[t.Union[str, int]]
+    attr: t.Optional[t.Union[str, int]],
 ) -> t.List[t.Union[str, int]]:
     if attr is None:
         return []
@@ -142,7 +144,7 @@ def do_forceescape(value: "t.Union[str, HasHTML]") -> Markup:
 
 
 def do_urlencode(
-    value: t.Union[str, t.Mapping[str, t.Any], t.Iterable[t.Tuple[str, t.Any]]]
+    value: t.Union[str, t.Mapping[str, t.Any], t.Iterable[t.Tuple[str, t.Any]]],
 ) -> str:
     """Quote data for use in a URL path or query using UTF-8.
 
@@ -248,7 +250,9 @@ def do_items(value: t.Union[t.Mapping[K, V], Undefined]) -> t.Iterator[t.Tuple[K
     yield from value.items()
 
 
-_space_re = re.compile(r"\s", flags=re.ASCII)
+# Check for characters that would move the parser state from key to value.
+# https://html.spec.whatwg.org/#attribute-name-state
+_attr_key_re = re.compile(r"[\s/>=]", flags=re.ASCII)
 
 
 @pass_eval_context
@@ -257,8 +261,14 @@ def do_xmlattr(
 ) -> str:
     """Create an SGML/XML attribute string based on the items in a dict.
 
-    If any key contains a space, this fails with a ``ValueError``. Values that
-    are neither ``none`` nor ``undefined`` are automatically escaped.
+    **Values** that are neither ``none`` nor ``undefined`` are automatically
+    escaped, safely allowing untrusted user input.
+
+    User input should not be used as **keys** to this filter. If any key
+    contains a space, ``/`` solidus, ``>`` greater-than sign, or ``=`` equals
+    sign, this fails with a ``ValueError``. Regardless of this, user input
+    should never be used as keys to this filter, or must be separately validated
+    first.
 
     .. sourcecode:: html+jinja
 
@@ -278,6 +288,10 @@ def do_xmlattr(
     As you can see it automatically prepends a space in front of the item
     if the filter returned something unless the second parameter is false.
 
+    .. versionchanged:: 3.1.4
+        Keys with ``/`` solidus, ``>`` greater-than sign, or ``=`` equals sign
+        are not allowed.
+
     .. versionchanged:: 3.1.3
         Keys with spaces are not allowed.
     """
@@ -287,8 +301,8 @@ def do_xmlattr(
         if value is None or isinstance(value, Undefined):
             continue
 
-        if _space_re.search(key) is not None:
-            raise ValueError(f"Spaces are not allowed in attributes: '{key}'")
+        if _attr_key_re.search(key) is not None:
+            raise ValueError(f"Invalid character in attribute name: {key!r}")
 
         items.append(f'{escape(key)}="{escape(value)}"')
 
@@ -424,7 +438,7 @@ def do_sort(
 
 
 @pass_environment
-def do_unique(
+def sync_do_unique(
     environment: "Environment",
     value: "t.Iterable[V]",
     case_sensitive: bool = False,
@@ -456,6 +470,18 @@ def do_unique(
             yield item
 
 
+@async_variant(sync_do_unique)  # type: ignore
+async def do_unique(
+    environment: "Environment",
+    value: "t.Union[t.AsyncIterable[V], t.Iterable[V]]",
+    case_sensitive: bool = False,
+    attribute: t.Optional[t.Union[str, int]] = None,
+) -> "t.Iterator[V]":
+    return sync_do_unique(
+        environment, await auto_to_list(value), case_sensitive, attribute
+    )
+
+
 def _min_or_max(
     environment: "Environment",
     value: "t.Iterable[V]",
@@ -552,7 +578,7 @@ def do_default(
 @pass_eval_context
 def sync_do_join(
     eval_ctx: "EvalContext",
-    value: t.Iterable,
+    value: t.Iterable[t.Any],
     d: str = "",
     attribute: t.Optional[t.Union[str, int]] = None,
 ) -> str:
@@ -610,7 +636,7 @@ def sync_do_join(
 @async_variant(sync_do_join)  # type: ignore
 async def do_join(
     eval_ctx: "EvalContext",
-    value: t.Union[t.AsyncIterable, t.Iterable],
+    value: t.Union[t.AsyncIterable[t.Any], t.Iterable[t.Any]],
     d: str = "",
     attribute: t.Optional[t.Union[str, int]] = None,
 ) -> str:
@@ -973,7 +999,7 @@ def do_int(value: t.Any, default: int = 0, base: int = 10) -> int:
         # this quirk is necessary so that "42.23"|int gives 42.
         try:
             return int(float(value))
-        except (TypeError, ValueError):
+        except (TypeError, ValueError, OverflowError):
             return default
 
 
@@ -1102,7 +1128,7 @@ def do_batch(
         {%- endfor %}
         </table>
     """
-    tmp: "t.List[V]" = []
+    tmp: t.List[V] = []
 
     for item in value:
         if len(tmp) == linecount:
@@ -1160,7 +1186,7 @@ def do_round(
 
 class _GroupTuple(t.NamedTuple):
     grouper: t.Any
-    list: t.List
+    list: t.List[t.Any]
 
     # Use the regular tuple repr to hide this subclass if users print
     # out the value during debugging.
@@ -1356,13 +1382,11 @@ def do_mark_unsafe(value: str) -> str:
 
 
 @typing.overload
-def do_reverse(value: str) -> str:
-    ...
+def do_reverse(value: str) -> str: ...
 
 
 @typing.overload
-def do_reverse(value: "t.Iterable[V]") -> "t.Iterable[V]":
-    ...
+def do_reverse(value: "t.Iterable[V]") -> "t.Iterable[V]": ...
 
 
 def do_reverse(value: t.Union[str, t.Iterable[V]]) -> t.Union[str, t.Iterable[V]]:
@@ -1416,26 +1440,28 @@ def do_attr(
 
 @typing.overload
 def sync_do_map(
-    context: "Context", value: t.Iterable, name: str, *args: t.Any, **kwargs: t.Any
-) -> t.Iterable:
-    ...
+    context: "Context",
+    value: t.Iterable[t.Any],
+    name: str,
+    *args: t.Any,
+    **kwargs: t.Any,
+) -> t.Iterable[t.Any]: ...
 
 
 @typing.overload
 def sync_do_map(
     context: "Context",
-    value: t.Iterable,
+    value: t.Iterable[t.Any],
     *,
     attribute: str = ...,
     default: t.Optional[t.Any] = None,
-) -> t.Iterable:
-    ...
+) -> t.Iterable[t.Any]: ...
 
 
 @pass_context
 def sync_do_map(
-    context: "Context", value: t.Iterable, *args: t.Any, **kwargs: t.Any
-) -> t.Iterable:
+    context: "Context", value: t.Iterable[t.Any], *args: t.Any, **kwargs: t.Any
+) -> t.Iterable[t.Any]:
     """Applies a filter on a sequence of objects or looks up an attribute.
     This is useful when dealing with lists of objects but you are really
     only interested in a certain value of it.
@@ -1485,32 +1511,30 @@ def sync_do_map(
 @typing.overload
 def do_map(
     context: "Context",
-    value: t.Union[t.AsyncIterable, t.Iterable],
+    value: t.Union[t.AsyncIterable[t.Any], t.Iterable[t.Any]],
     name: str,
     *args: t.Any,
     **kwargs: t.Any,
-) -> t.Iterable:
-    ...
+) -> t.Iterable[t.Any]: ...
 
 
 @typing.overload
 def do_map(
     context: "Context",
-    value: t.Union[t.AsyncIterable, t.Iterable],
+    value: t.Union[t.AsyncIterable[t.Any], t.Iterable[t.Any]],
     *,
     attribute: str = ...,
     default: t.Optional[t.Any] = None,
-) -> t.Iterable:
-    ...
+) -> t.Iterable[t.Any]: ...
 
 
 @async_variant(sync_do_map)  # type: ignore
 async def do_map(
     context: "Context",
-    value: t.Union[t.AsyncIterable, t.Iterable],
+    value: t.Union[t.AsyncIterable[t.Any], t.Iterable[t.Any]],
     *args: t.Any,
     **kwargs: t.Any,
-) -> t.AsyncIterable:
+) -> t.AsyncIterable[t.Any]:
     if value:
         func = prepare_map(context, args, kwargs)
 
@@ -1617,8 +1641,8 @@ def sync_do_selectattr(
 
     .. code-block:: python
 
-        (u for user in users if user.is_active)
-        (u for user in users if test_none(user.email))
+        (user for user in users if user.is_active)
+        (user for user in users if test_none(user.email))
 
     .. versionadded:: 2.7
     """
@@ -1655,8 +1679,8 @@ def sync_do_rejectattr(
 
     .. code-block:: python
 
-        (u for user in users if not user.is_active)
-        (u for user in users if not test_none(user.email))
+        (user for user in users if not user.is_active)
+        (user for user in users if not test_none(user.email))
 
     .. versionadded:: 2.7
     """
@@ -1703,7 +1727,7 @@ def do_tojson(
 
 
 def prepare_map(
-    context: "Context", args: t.Tuple, kwargs: t.Dict[str, t.Any]
+    context: "Context", args: t.Tuple[t.Any, ...], kwargs: t.Dict[str, t.Any]
 ) -> t.Callable[[t.Any], t.Any]:
     if not args and "attribute" in kwargs:
         attribute = kwargs.pop("attribute")
@@ -1732,7 +1756,7 @@ def prepare_map(
 
 def prepare_select_or_reject(
     context: "Context",
-    args: t.Tuple,
+    args: t.Tuple[t.Any, ...],
     kwargs: t.Dict[str, t.Any],
     modfunc: t.Callable[[t.Any], t.Any],
     lookup_attr: bool,
@@ -1756,7 +1780,7 @@ def prepare_select_or_reject(
         args = args[1 + off :]
 
         def func(item: t.Any) -> t.Any:
-            return context.environment.call_test(name, item, args, kwargs)
+            return context.environment.call_test(name, item, args, kwargs, context)
 
     except LookupError:
         func = bool  # type: ignore
@@ -1767,7 +1791,7 @@ def prepare_select_or_reject(
 def select_or_reject(
     context: "Context",
     value: "t.Iterable[V]",
-    args: t.Tuple,
+    args: t.Tuple[t.Any, ...],
     kwargs: t.Dict[str, t.Any],
     modfunc: t.Callable[[t.Any], t.Any],
     lookup_attr: bool,
@@ -1783,7 +1807,7 @@ def select_or_reject(
 async def async_select_or_reject(
     context: "Context",
     value: "t.Union[t.AsyncIterable[V], t.Iterable[V]]",
-    args: t.Tuple,
+    args: t.Tuple[t.Any, ...],
     kwargs: t.Dict[str, t.Any],
     modfunc: t.Callable[[t.Any], t.Any],
     lookup_attr: bool,
diff --git a/libs/jinja2/idtracking.py b/libs/jinja2/idtracking.py
index 995ebaa0c..e6dd8cd11 100644
--- a/libs/jinja2/idtracking.py
+++ b/libs/jinja2/idtracking.py
@@ -3,6 +3,9 @@ import typing as t
 from . import nodes
 from .visitor import NodeVisitor
 
+if t.TYPE_CHECKING:
+    import typing_extensions as te
+
 VAR_LOAD_PARAMETER = "param"
 VAR_LOAD_RESOLVE = "resolve"
 VAR_LOAD_ALIAS = "alias"
@@ -83,7 +86,7 @@ class Symbols:
             )
         return rv
 
-    def copy(self) -> "Symbols":
+    def copy(self) -> "te.Self":
         rv = object.__new__(self.__class__)
         rv.__dict__.update(self.__dict__)
         rv.refs = self.refs.copy()
@@ -118,23 +121,20 @@ class Symbols:
             self._define_ref(name, load=(VAR_LOAD_RESOLVE, name))
 
     def branch_update(self, branch_symbols: t.Sequence["Symbols"]) -> None:
-        stores: t.Dict[str, int] = {}
+        stores: t.Set[str] = set()
+
         for branch in branch_symbols:
-            for target in branch.stores:
-                if target in self.stores:
-                    continue
-                stores[target] = stores.get(target, 0) + 1
+            stores.update(branch.stores)
+
+        stores.difference_update(self.stores)
 
         for sym in branch_symbols:
             self.refs.update(sym.refs)
             self.loads.update(sym.loads)
             self.stores.update(sym.stores)
 
-        for name, branch_count in stores.items():
-            if branch_count == len(branch_symbols):
-                continue
-
-            target = self.find_ref(name)  # type: ignore
+        for name in stores:
+            target = self.find_ref(name)
             assert target is not None, "should not happen"
 
             if self.parent is not None:
@@ -146,7 +146,7 @@ class Symbols:
 
     def dump_stores(self) -> t.Dict[str, str]:
         rv: t.Dict[str, str] = {}
-        node: t.Optional["Symbols"] = self
+        node: t.Optional[Symbols] = self
 
         while node is not None:
             for name in sorted(node.stores):
@@ -159,7 +159,7 @@ class Symbols:
 
     def dump_param_targets(self) -> t.Set[str]:
         rv = set()
-        node: t.Optional["Symbols"] = self
+        node: t.Optional[Symbols] = self
 
         while node is not None:
             for target, (instr, _) in self.loads.items():
diff --git a/libs/jinja2/lexer.py b/libs/jinja2/lexer.py
index aff7e9f99..9b1c96979 100644
--- a/libs/jinja2/lexer.py
+++ b/libs/jinja2/lexer.py
@@ -3,6 +3,7 @@ is used to do some preprocessing. It filters out invalid operators like
 the bitshift operators we don't allow in templates. It separates
 template code and python code in expressions.
 """
+
 import re
 import typing as t
 from ast import literal_eval
@@ -15,6 +16,7 @@ from .utils import LRUCache
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
 
 # cache for the lexers. Exists in order to be able to have multiple
@@ -260,7 +262,7 @@ class Failure:
         self.message = message
         self.error_class = cls
 
-    def __call__(self, lineno: int, filename: str) -> "te.NoReturn":
+    def __call__(self, lineno: int, filename: t.Optional[str]) -> "te.NoReturn":
         raise self.error_class(self.message, lineno, filename)
 
 
@@ -327,7 +329,7 @@ class TokenStream:
         filename: t.Optional[str],
     ):
         self._iter = iter(generator)
-        self._pushed: "te.Deque[Token]" = deque()
+        self._pushed: te.Deque[Token] = deque()
         self.name = name
         self.filename = filename
         self.closed = False
@@ -447,7 +449,7 @@ def get_lexer(environment: "Environment") -> "Lexer":
     return lexer
 
 
-class OptionalLStrip(tuple):
+class OptionalLStrip(tuple):  # type: ignore[type-arg]
     """A special tuple for marking a point in the state that can have
     lstrip applied.
     """
@@ -755,7 +757,7 @@ class Lexer:
 
                     for idx, token in enumerate(tokens):
                         # failure group
-                        if token.__class__ is Failure:
+                        if isinstance(token, Failure):
                             raise token(lineno, filename)
                         # bygroup is a bit more complex, in that case we
                         # yield for the current token the first named
@@ -776,7 +778,7 @@ class Lexer:
                             data = groups[idx]
 
                             if data or token not in ignore_if_empty:
-                                yield lineno, token, data
+                                yield lineno, token, data  # type: ignore[misc]
 
                             lineno += data.count("\n") + newlines_stripped
                             newlines_stripped = 0
diff --git a/libs/jinja2/loaders.py b/libs/jinja2/loaders.py
index 32f3a74e7..3913ee51e 100644
--- a/libs/jinja2/loaders.py
+++ b/libs/jinja2/loaders.py
@@ -1,6 +1,7 @@
 """API and implementations for loading templates from different data
 sources.
 """
+
 import importlib.util
 import os
 import posixpath
@@ -177,7 +178,9 @@ class FileSystemLoader(BaseLoader):
 
     def __init__(
         self,
-        searchpath: t.Union[str, os.PathLike, t.Sequence[t.Union[str, os.PathLike]]],
+        searchpath: t.Union[
+            str, "os.PathLike[str]", t.Sequence[t.Union[str, "os.PathLike[str]"]]
+        ],
         encoding: str = "utf-8",
         followlinks: bool = False,
     ) -> None:
@@ -201,7 +204,12 @@ class FileSystemLoader(BaseLoader):
             if os.path.isfile(filename):
                 break
         else:
-            raise TemplateNotFound(template)
+            plural = "path" if len(self.searchpath) == 1 else "paths"
+            paths_str = ", ".join(repr(p) for p in self.searchpath)
+            raise TemplateNotFound(
+                template,
+                f"{template!r} not found in search {plural}: {paths_str}",
+            )
 
         with open(filename, encoding=self.encoding) as f:
             contents = f.read()
@@ -235,6 +243,30 @@ class FileSystemLoader(BaseLoader):
         return sorted(found)
 
 
+if sys.version_info >= (3, 13):
+
+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
+        try:
+            get_files = z._get_files
+        except AttributeError as e:
+            raise TypeError(
+                "This zip import does not have the required"
+                " metadata to list templates."
+            ) from e
+        return get_files()
+else:
+
+    def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
+        try:
+            files = z._files
+        except AttributeError as e:
+            raise TypeError(
+                "This zip import does not have the required"
+                " metadata to list templates."
+            ) from e
+        return files  # type: ignore[no-any-return]
+
+
 class PackageLoader(BaseLoader):
     """Load templates from a directory in a Python package.
 
@@ -295,7 +327,6 @@ class PackageLoader(BaseLoader):
         assert loader is not None, "A loader was not found for the package."
         self._loader = loader
         self._archive = None
-        template_root = None
 
         if isinstance(loader, zipimport.zipimporter):
             self._archive = loader.archive
@@ -312,18 +343,23 @@ class PackageLoader(BaseLoader):
             elif spec.origin is not None:
                 roots.append(os.path.dirname(spec.origin))
 
+            if not roots:
+                raise ValueError(
+                    f"The {package_name!r} package was not installed in a"
+                    " way that PackageLoader understands."
+                )
+
             for root in roots:
                 root = os.path.join(root, package_path)
 
                 if os.path.isdir(root):
                     template_root = root
                     break
-
-        if template_root is None:
-            raise ValueError(
-                f"The {package_name!r} package was not installed in a"
-                " way that PackageLoader understands."
-            )
+            else:
+                raise ValueError(
+                    f"PackageLoader could not find a {package_path!r} directory"
+                    f" in the {package_name!r} package."
+                )
 
         self._template_root = template_root
 
@@ -379,11 +415,7 @@ class PackageLoader(BaseLoader):
                     for name in filenames
                 )
         else:
-            if not hasattr(self._loader, "_files"):
-                raise TypeError(
-                    "This zip import does not have the required"
-                    " metadata to list templates."
-                )
+            files = _get_zipimporter_files(self._loader)
 
             # Package is a zip file.
             prefix = (
@@ -392,7 +424,7 @@ class PackageLoader(BaseLoader):
             )
             offset = len(prefix)
 
-            for name in self._loader._files.keys():
+            for name in files:
                 # Find names under the templates directory that aren't directories.
                 if name.startswith(prefix) and name[-1] != os.path.sep:
                     results.append(name[offset:].replace(os.path.sep, "/"))
@@ -407,7 +439,7 @@ class DictLoader(BaseLoader):
 
     >>> loader = DictLoader({'index.html': 'source here'})
 
-    Because auto reloading is rarely useful this is disabled per default.
+    Because auto reloading is rarely useful this is disabled by default.
     """
 
     def __init__(self, mapping: t.Mapping[str, str]) -> None:
@@ -590,10 +622,7 @@ class ModuleLoader(BaseLoader):
 
     Example usage:
 
-    >>> loader = ChoiceLoader([
-    ...     ModuleLoader('/path/to/compiled/templates'),
-    ...     FileSystemLoader('/path/to/templates')
-    ... ])
+    >>> loader = ModuleLoader('/path/to/compiled/templates')
 
     Templates can be precompiled with :meth:`Environment.compile_templates`.
     """
@@ -601,7 +630,10 @@ class ModuleLoader(BaseLoader):
     has_source_access = False
 
     def __init__(
-        self, path: t.Union[str, os.PathLike, t.Sequence[t.Union[str, os.PathLike]]]
+        self,
+        path: t.Union[
+            str, "os.PathLike[str]", t.Sequence[t.Union[str, "os.PathLike[str]"]]
+        ],
     ) -> None:
         package_name = f"_jinja2_module_templates_{id(self):x}"
 
diff --git a/libs/jinja2/meta.py b/libs/jinja2/meta.py
index 0057d6eab..298499e26 100644
--- a/libs/jinja2/meta.py
+++ b/libs/jinja2/meta.py
@@ -1,6 +1,7 @@
 """Functions that expose information about templates that might be
 interesting for introspection.
 """
+
 import typing as t
 
 from . import nodes
diff --git a/libs/jinja2/nodes.py b/libs/jinja2/nodes.py
index b2f88d9d9..2f93b90ec 100644
--- a/libs/jinja2/nodes.py
+++ b/libs/jinja2/nodes.py
@@ -2,6 +2,7 @@
 some node tree helper functions used by the parser and compiler in order
 to normalize nodes.
 """
+
 import inspect
 import operator
 import typing as t
@@ -13,6 +14,7 @@ from .utils import _PassArg
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
 
 _NodeBound = t.TypeVar("_NodeBound", bound="Node")
@@ -56,7 +58,7 @@ class NodeType(type):
 
     def __new__(mcs, name, bases, d):  # type: ignore
         for attr in "fields", "attributes":
-            storage = []
+            storage: t.List[t.Tuple[str, ...]] = []
             storage.extend(getattr(bases[0] if bases else object, attr, ()))
             storage.extend(d.get(attr, ()))
             assert len(bases) <= 1, "multiple inheritance not allowed"
diff --git a/libs/jinja2/optimizer.py b/libs/jinja2/optimizer.py
index fe1010705..32d1c717b 100644
--- a/libs/jinja2/optimizer.py
+++ b/libs/jinja2/optimizer.py
@@ -7,6 +7,7 @@ want. For example, loop unrolling doesn't work because unrolled loops
 would have a different scope. The solution would be a second syntax tree
 that stored the scoping rules.
 """
+
 import typing as t
 
 from . import nodes
diff --git a/libs/jinja2/parser.py b/libs/jinja2/parser.py
index 3354bc933..f4117754a 100644
--- a/libs/jinja2/parser.py
+++ b/libs/jinja2/parser.py
@@ -1,4 +1,5 @@
 """Parse tokens from the lexer into nodes for the compiler."""
+
 import typing
 import typing as t
 
@@ -10,6 +11,7 @@ from .lexer import describe_token_expr
 
 if t.TYPE_CHECKING:
     import typing_extensions as te
+
     from .environment import Environment
 
 _ImportInclude = t.TypeVar("_ImportInclude", nodes.Import, nodes.Include)
@@ -62,7 +64,7 @@ class Parser:
         self.filename = filename
         self.closed = False
         self.extensions: t.Dict[
-            str, t.Callable[["Parser"], t.Union[nodes.Node, t.List[nodes.Node]]]
+            str, t.Callable[[Parser], t.Union[nodes.Node, t.List[nodes.Node]]]
         ] = {}
         for extension in environment.iter_extensions():
             for tag in extension.tags:
@@ -457,8 +459,7 @@ class Parser:
     @typing.overload
     def parse_assign_target(
         self, with_tuple: bool = ..., name_only: "te.Literal[True]" = ...
-    ) -> nodes.Name:
-        ...
+    ) -> nodes.Name: ...
 
     @typing.overload
     def parse_assign_target(
@@ -467,8 +468,7 @@ class Parser:
         name_only: bool = False,
         extra_end_rules: t.Optional[t.Tuple[str, ...]] = None,
         with_namespace: bool = False,
-    ) -> t.Union[nodes.NSRef, nodes.Name, nodes.Tuple]:
-        ...
+    ) -> t.Union[nodes.NSRef, nodes.Name, nodes.Tuple]: ...
 
     def parse_assign_target(
         self,
@@ -487,21 +487,18 @@ class Parser:
         """
         target: nodes.Expr
 
-        if with_namespace and self.stream.look().type == "dot":
-            token = self.stream.expect("name")
-            next(self.stream)  # dot
-            attr = self.stream.expect("name")
-            target = nodes.NSRef(token.value, attr.value, lineno=token.lineno)
-        elif name_only:
+        if name_only:
             token = self.stream.expect("name")
             target = nodes.Name(token.value, "store", lineno=token.lineno)
         else:
             if with_tuple:
                 target = self.parse_tuple(
-                    simplified=True, extra_end_rules=extra_end_rules
+                    simplified=True,
+                    extra_end_rules=extra_end_rules,
+                    with_namespace=with_namespace,
                 )
             else:
-                target = self.parse_primary()
+                target = self.parse_primary(with_namespace=with_namespace)
 
             target.set_ctx("store")
 
@@ -643,17 +640,25 @@ class Parser:
             node = self.parse_filter_expr(node)
         return node
 
-    def parse_primary(self) -> nodes.Expr:
+    def parse_primary(self, with_namespace: bool = False) -> nodes.Expr:
+        """Parse a name or literal value. If ``with_namespace`` is enabled, also
+        parse namespace attr refs, for use in assignments."""
         token = self.stream.current
         node: nodes.Expr
         if token.type == "name":
+            next(self.stream)
             if token.value in ("true", "false", "True", "False"):
                 node = nodes.Const(token.value in ("true", "True"), lineno=token.lineno)
             elif token.value in ("none", "None"):
                 node = nodes.Const(None, lineno=token.lineno)
+            elif with_namespace and self.stream.current.type == "dot":
+                # If namespace attributes are allowed at this point, and the next
+                # token is a dot, produce a namespace reference.
+                next(self.stream)
+                attr = self.stream.expect("name")
+                node = nodes.NSRef(token.value, attr.value, lineno=token.lineno)
             else:
                 node = nodes.Name(token.value, "load", lineno=token.lineno)
-            next(self.stream)
         elif token.type == "string":
             next(self.stream)
             buf = [token.value]
@@ -683,6 +688,7 @@ class Parser:
         with_condexpr: bool = True,
         extra_end_rules: t.Optional[t.Tuple[str, ...]] = None,
         explicit_parentheses: bool = False,
+        with_namespace: bool = False,
     ) -> t.Union[nodes.Tuple, nodes.Expr]:
         """Works like `parse_expression` but if multiple expressions are
         delimited by a comma a :class:`~jinja2.nodes.Tuple` node is created.
@@ -690,8 +696,9 @@ class Parser:
         if no commas where found.
 
         The default parsing mode is a full tuple.  If `simplified` is `True`
-        only names and literals are parsed.  The `no_condexpr` parameter is
-        forwarded to :meth:`parse_expression`.
+        only names and literals are parsed; ``with_namespace`` allows namespace
+        attr refs as well. The `no_condexpr` parameter is forwarded to
+        :meth:`parse_expression`.
 
         Because tuples do not require delimiters and may end in a bogus comma
         an extra hint is needed that marks the end of a tuple.  For example
@@ -704,13 +711,14 @@ class Parser:
         """
         lineno = self.stream.current.lineno
         if simplified:
-            parse = self.parse_primary
-        elif with_condexpr:
-            parse = self.parse_expression
+
+            def parse() -> nodes.Expr:
+                return self.parse_primary(with_namespace=with_namespace)
+
         else:
 
             def parse() -> nodes.Expr:
-                return self.parse_expression(with_condexpr=False)
+                return self.parse_expression(with_condexpr=with_condexpr)
 
         args: t.List[nodes.Expr] = []
         is_tuple = False
@@ -861,7 +869,14 @@ class Parser:
 
         return nodes.Slice(lineno=lineno, *args)  # noqa: B026
 
-    def parse_call_args(self) -> t.Tuple:
+    def parse_call_args(
+        self,
+    ) -> t.Tuple[
+        t.List[nodes.Expr],
+        t.List[nodes.Keyword],
+        t.Optional[nodes.Expr],
+        t.Optional[nodes.Expr],
+    ]:
         token = self.stream.expect("lparen")
         args = []
         kwargs = []
@@ -952,7 +967,7 @@ class Parser:
             next(self.stream)
             name += "." + self.stream.expect("name").value
         dyn_args = dyn_kwargs = None
-        kwargs = []
+        kwargs: t.List[nodes.Keyword] = []
         if self.stream.current.type == "lparen":
             args, kwargs, dyn_args, dyn_kwargs = self.parse_call_args()
         elif self.stream.current.type in {
diff --git a/libs/jinja2/runtime.py b/libs/jinja2/runtime.py
index 58a540ba3..09119e2ae 100644
--- a/libs/jinja2/runtime.py
+++ b/libs/jinja2/runtime.py
@@ -1,4 +1,5 @@
 """The runtime functions and state used by compiled templates."""
+
 import functools
 import sys
 import typing as t
@@ -28,7 +29,9 @@ F = t.TypeVar("F", bound=t.Callable[..., t.Any])
 
 if t.TYPE_CHECKING:
     import logging
+
     import typing_extensions as te
+
     from .environment import Environment
 
     class LoopRenderFunc(te.Protocol):
@@ -37,8 +40,7 @@ if t.TYPE_CHECKING:
             reciter: t.Iterable[V],
             loop_render_func: "LoopRenderFunc",
             depth: int = 0,
-        ) -> str:
-            ...
+        ) -> str: ...
 
 
 # these variables are exported to the template runtime
@@ -170,7 +172,7 @@ class Context:
     ):
         self.parent = parent
         self.vars: t.Dict[str, t.Any] = {}
-        self.environment: "Environment" = environment
+        self.environment: Environment = environment
         self.eval_ctx = EvalContext(self.environment, name)
         self.exported_vars: t.Set[str] = set()
         self.name = name
@@ -259,7 +261,10 @@ class Context:
 
     @internalcode
     def call(
-        __self, __obj: t.Callable, *args: t.Any, **kwargs: t.Any  # noqa: B902
+        __self,
+        __obj: t.Callable[..., t.Any],
+        *args: t.Any,
+        **kwargs: t.Any,  # noqa: B902
     ) -> t.Union[t.Any, "Undefined"]:
         """Call the callable with the arguments and keyword arguments
         provided but inject the active context or environment as first
@@ -362,7 +367,7 @@ class BlockReference:
 
     @internalcode
     async def _async_call(self) -> str:
-        rv = concat(
+        rv = self._context.environment.concat(  # type: ignore
             [x async for x in self._stack[self._depth](self._context)]  # type: ignore
         )
 
@@ -376,7 +381,9 @@ class BlockReference:
         if self._context.environment.is_async:
             return self._async_call()  # type: ignore
 
-        rv = concat(self._stack[self._depth](self._context))
+        rv = self._context.environment.concat(  # type: ignore
+            self._stack[self._depth](self._context)
+        )
 
         if self._context.eval_ctx.autoescape:
             return Markup(rv)
@@ -586,7 +593,7 @@ class AsyncLoopContext(LoopContext):
 
     @staticmethod
     def _to_iterator(  # type: ignore
-        iterable: t.Union[t.Iterable[V], t.AsyncIterable[V]]
+        iterable: t.Union[t.Iterable[V], t.AsyncIterable[V]],
     ) -> t.AsyncIterator[V]:
         return auto_aiter(iterable)
 
@@ -787,8 +794,8 @@ class Macro:
 
 
 class Undefined:
-    """The default undefined type.  This undefined type can be printed and
-    iterated over, but every other access will raise an :exc:`UndefinedError`:
+    """The default undefined type. This can be printed, iterated, and treated as
+    a boolean. Any other operation will raise an :exc:`UndefinedError`.
 
     >>> foo = Undefined(name='foo')
     >>> str(foo)
@@ -853,7 +860,11 @@ class Undefined:
 
     @internalcode
     def __getattr__(self, name: str) -> t.Any:
-        if name[:2] == "__":
+        # Raise AttributeError on requests for names that appear to be unimplemented
+        # dunder methods to keep Python's internal protocol probing behaviors working
+        # properly in cases where another exception type could cause unexpected or
+        # difficult-to-diagnose failures.
+        if name[:2] == "__" and name[-2:] == "__":
             raise AttributeError(name)
 
         return self._fail_with_undefined_error()
@@ -977,10 +988,20 @@ class ChainableUndefined(Undefined):
     def __html__(self) -> str:
         return str(self)
 
-    def __getattr__(self, _: str) -> "ChainableUndefined":
+    def __getattr__(self, name: str) -> "ChainableUndefined":
+        # Raise AttributeError on requests for names that appear to be unimplemented
+        # dunder methods to avoid confusing Python with truthy non-method objects that
+        # do not implement the protocol being probed for. e.g., copy.copy(Undefined())
+        # fails spectacularly if getattr(Undefined(), '__setstate__') returns an
+        # Undefined object instead of raising AttributeError to signal that it does not
+        # support that style of object initialization.
+        if name[:2] == "__" and name[-2:] == "__":
+            raise AttributeError(name)
+
         return self
 
-    __getitem__ = __getattr__  # type: ignore
+    def __getitem__(self, _name: str) -> "ChainableUndefined":  # type: ignore[override]
+        return self
 
 
 class DebugUndefined(Undefined):
@@ -1039,13 +1060,3 @@ class StrictUndefined(Undefined):
     __iter__ = __str__ = __len__ = Undefined._fail_with_undefined_error
     __eq__ = __ne__ = __bool__ = __hash__ = Undefined._fail_with_undefined_error
     __contains__ = Undefined._fail_with_undefined_error
-
-
-# Remove slots attributes, after the metaclass is applied they are
-# unneeded and contain wrong data for subclasses.
-del (
-    Undefined.__slots__,
-    ChainableUndefined.__slots__,
-    DebugUndefined.__slots__,
-    StrictUndefined.__slots__,
-)
diff --git a/libs/jinja2/sandbox.py b/libs/jinja2/sandbox.py
index 06d74148e..9c9dae22f 100644
--- a/libs/jinja2/sandbox.py
+++ b/libs/jinja2/sandbox.py
@@ -1,12 +1,14 @@
 """A sandbox layer that ensures unsafe operations cannot be performed.
 Useful when the template itself comes from an untrusted source.
 """
+
 import operator
 import types
 import typing as t
 from _string import formatter_field_name_split  # type: ignore
 from collections import abc
 from collections import deque
+from functools import update_wrapper
 from string import Formatter
 
 from markupsafe import EscapeFormatter
@@ -37,7 +39,7 @@ UNSAFE_COROUTINE_ATTRIBUTES = {"cr_frame", "cr_code"}
 #: unsafe attributes on async generators
 UNSAFE_ASYNC_GENERATOR_ATTRIBUTES = {"ag_code", "ag_frame"}
 
-_mutable_spec: t.Tuple[t.Tuple[t.Type, t.FrozenSet[str]], ...] = (
+_mutable_spec: t.Tuple[t.Tuple[t.Type[t.Any], t.FrozenSet[str]], ...] = (
     (
         abc.MutableSet,
         frozenset(
@@ -59,7 +61,9 @@ _mutable_spec: t.Tuple[t.Tuple[t.Type, t.FrozenSet[str]], ...] = (
     ),
     (
         abc.MutableSequence,
-        frozenset(["append", "reverse", "insert", "sort", "extend", "remove"]),
+        frozenset(
+            ["append", "clear", "pop", "reverse", "insert", "sort", "extend", "remove"]
+        ),
     ),
     (
         deque,
@@ -80,20 +84,6 @@ _mutable_spec: t.Tuple[t.Tuple[t.Type, t.FrozenSet[str]], ...] = (
 )
 
 
-def inspect_format_method(callable: t.Callable) -> t.Optional[str]:
-    if not isinstance(
-        callable, (types.MethodType, types.BuiltinMethodType)
-    ) or callable.__name__ not in ("format", "format_map"):
-        return None
-
-    obj = callable.__self__
-
-    if isinstance(obj, str):
-        return obj
-
-    return None
-
-
 def safe_range(*args: int) -> range:
     """A range that can't generate ranges with a length of more than
     MAX_RANGE items.
@@ -313,6 +303,9 @@ class SandboxedEnvironment(Environment):
                     except AttributeError:
                         pass
                     else:
+                        fmt = self.wrap_str_format(value)
+                        if fmt is not None:
+                            return fmt
                         if self.is_safe_attribute(obj, argument, value):
                             return value
                         return self.unsafe_undefined(obj, argument)
@@ -330,6 +323,9 @@ class SandboxedEnvironment(Environment):
             except (TypeError, LookupError):
                 pass
         else:
+            fmt = self.wrap_str_format(value)
+            if fmt is not None:
+                return fmt
             if self.is_safe_attribute(obj, attribute, value):
                 return value
             return self.unsafe_undefined(obj, attribute)
@@ -345,34 +341,49 @@ class SandboxedEnvironment(Environment):
             exc=SecurityError,
         )
 
-    def format_string(
-        self,
-        s: str,
-        args: t.Tuple[t.Any, ...],
-        kwargs: t.Dict[str, t.Any],
-        format_func: t.Optional[t.Callable] = None,
-    ) -> str:
-        """If a format call is detected, then this is routed through this
-        method so that our safety sandbox can be used for it.
+    def wrap_str_format(self, value: t.Any) -> t.Optional[t.Callable[..., str]]:
+        """If the given value is a ``str.format`` or ``str.format_map`` method,
+        return a new function than handles sandboxing. This is done at access
+        rather than in :meth:`call`, so that calls made without ``call`` are
+        also sandboxed.
         """
+        if not isinstance(
+            value, (types.MethodType, types.BuiltinMethodType)
+        ) or value.__name__ not in ("format", "format_map"):
+            return None
+
+        f_self: t.Any = value.__self__
+
+        if not isinstance(f_self, str):
+            return None
+
+        str_type: t.Type[str] = type(f_self)
+        is_format_map = value.__name__ == "format_map"
         formatter: SandboxedFormatter
-        if isinstance(s, Markup):
-            formatter = SandboxedEscapeFormatter(self, escape=s.escape)
+
+        if isinstance(f_self, Markup):
+            formatter = SandboxedEscapeFormatter(self, escape=f_self.escape)
         else:
             formatter = SandboxedFormatter(self)
 
-        if format_func is not None and format_func.__name__ == "format_map":
-            if len(args) != 1 or kwargs:
-                raise TypeError(
-                    "format_map() takes exactly one argument"
-                    f" {len(args) + (kwargs is not None)} given"
-                )
+        vformat = formatter.vformat
 
-            kwargs = args[0]
-            args = ()
+        def wrapper(*args: t.Any, **kwargs: t.Any) -> str:
+            if is_format_map:
+                if kwargs:
+                    raise TypeError("format_map() takes no keyword arguments")
 
-        rv = formatter.vformat(s, args, kwargs)
-        return type(s)(rv)
+                if len(args) != 1:
+                    raise TypeError(
+                        f"format_map() takes exactly one argument ({len(args)} given)"
+                    )
+
+                kwargs = args[0]
+                args = ()
+
+            return str_type(vformat(f_self, args, kwargs))
+
+        return update_wrapper(wrapper, value)
 
     def call(
         __self,  # noqa: B902
@@ -382,9 +393,6 @@ class SandboxedEnvironment(Environment):
         **kwargs: t.Any,
     ) -> t.Any:
         """Call an object from sandboxed code."""
-        fmt = inspect_format_method(__obj)
-        if fmt is not None:
-            return __self.format_string(fmt, args, kwargs, __obj)
 
         # the double prefixes are to avoid double keyword argument
         # errors when proxying the call.
diff --git a/libs/jinja2/tests.py b/libs/jinja2/tests.py
index a467cf08b..1a59e3703 100644
--- a/libs/jinja2/tests.py
+++ b/libs/jinja2/tests.py
@@ -1,4 +1,5 @@
 """Built-in template tests used with the ``is`` operator."""
+
 import operator
 import typing as t
 from collections import abc
@@ -169,7 +170,7 @@ def test_sequence(value: t.Any) -> bool:
     """
     try:
         len(value)
-        value.__getitem__
+        value.__getitem__  # noqa B018
     except Exception:
         return False
 
@@ -204,7 +205,7 @@ def test_escaped(value: t.Any) -> bool:
     return hasattr(value, "__html__")
 
 
-def test_in(value: t.Any, seq: t.Container) -> bool:
+def test_in(value: t.Any, seq: t.Container[t.Any]) -> bool:
     """Check if value is in seq.
 
     .. versionadded:: 2.10
diff --git a/libs/jinja2/utils.py b/libs/jinja2/utils.py
index 18914a58f..7c922629a 100644
--- a/libs/jinja2/utils.py
+++ b/libs/jinja2/utils.py
@@ -18,8 +18,17 @@ if t.TYPE_CHECKING:
 
 F = t.TypeVar("F", bound=t.Callable[..., t.Any])
 
-# special singleton representing missing values for the runtime
-missing: t.Any = type("MissingType", (), {"__repr__": lambda x: "missing"})()
+
+class _MissingType:
+    def __repr__(self) -> str:
+        return "missing"
+
+    def __reduce__(self) -> str:
+        return "missing"
+
+
+missing: t.Any = _MissingType()
+"""Special singleton representing missing values for the runtime."""
 
 internal_code: t.MutableSet[CodeType] = set()
 
@@ -152,7 +161,7 @@ def import_string(import_name: str, silent: bool = False) -> t.Any:
             raise
 
 
-def open_if_exists(filename: str, mode: str = "rb") -> t.Optional[t.IO]:
+def open_if_exists(filename: str, mode: str = "rb") -> t.Optional[t.IO[t.Any]]:
     """Returns a file descriptor for the filename if that file exists,
     otherwise ``None``.
     """
@@ -324,6 +333,8 @@ def urlize(
         elif (
             "@" in middle
             and not middle.startswith("www.")
+            # ignore values like `@a@b`
+            and not middle.startswith("@")
             and ":" not in middle
             and _email_re.match(middle)
         ):
@@ -428,7 +439,7 @@ class LRUCache:
     def __init__(self, capacity: int) -> None:
         self.capacity = capacity
         self._mapping: t.Dict[t.Any, t.Any] = {}
-        self._queue: "te.Deque[t.Any]" = deque()
+        self._queue: te.Deque[t.Any] = deque()
         self._postinit()
 
     def _postinit(self) -> None:
@@ -450,10 +461,10 @@ class LRUCache:
         self.__dict__.update(d)
         self._postinit()
 
-    def __getnewargs__(self) -> t.Tuple:
+    def __getnewargs__(self) -> t.Tuple[t.Any, ...]:
         return (self.capacity,)
 
-    def copy(self) -> "LRUCache":
+    def copy(self) -> "te.Self":
         """Return a shallow copy of the instance."""
         rv = self.__class__(self.capacity)
         rv._mapping.update(self._mapping)
diff --git a/libs/jinja2/visitor.py b/libs/jinja2/visitor.py
index 17c6aaba5..7b8e18060 100644
--- a/libs/jinja2/visitor.py
+++ b/libs/jinja2/visitor.py
@@ -1,6 +1,7 @@
 """API for traversing the AST nodes. Implemented by the compiler and
 meta introspection.
 """
+
 import typing as t
 
 from .nodes import Node
@@ -9,8 +10,7 @@ if t.TYPE_CHECKING:
     import typing_extensions as te
 
     class VisitCallable(te.Protocol):
-        def __call__(self, node: Node, *args: t.Any, **kwargs: t.Any) -> t.Any:
-            ...
+        def __call__(self, node: Node, *args: t.Any, **kwargs: t.Any) -> t.Any: ...
 
 
 class NodeVisitor:
diff --git a/libs/jsonschema-4.17.3.dist-info/METADATA b/libs/jsonschema-4.17.3.dist-info/METADATA
index 07ec3f119..e1b42afd3 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.1
+Metadata-Version: 2.3
 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 f7b57b07a..a3d24eb00 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
 jsonschema-4.17.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-jsonschema-4.17.3.dist-info/METADATA,sha256=YnDEs-j6S4At_Fq54u7PqfYG4gQT8E5nrp8vu2PXeXw,7879
+jsonschema-4.17.3.dist-info/METADATA,sha256=x_UDV2TgG-vvXjMZDEKIsx-NByuAhR-0OaABungk3cM,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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+jsonschema-4.17.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,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 5998f3aab..cdd68a497 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.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/mako/__init__.py b/libs/mako/__init__.py
index d022cf82d..ba34f43bf 100644
--- a/libs/mako/__init__.py
+++ b/libs/mako/__init__.py
@@ -5,4 +5,4 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = "1.3.2"
+__version__ = "1.3.8"
diff --git a/libs/mako/codegen.py b/libs/mako/codegen.py
index ce6f83aac..b9fea937b 100644
--- a/libs/mako/codegen.py
+++ b/libs/mako/codegen.py
@@ -838,13 +838,24 @@ class _GenerateRenderMethod:
                 text = node.text
             self.printer.writeline(text)
             children = node.get_children()
-            # this covers the three situations where we want to insert a pass:
-            #    1) a ternary control line with no children,
-            #    2) a primary control line with nothing but its own ternary
-            #          and end control lines, and
-            #    3) any control line with no content other than comments
-            if not children or (
-                all(
+
+            # this covers the four situations where we want to insert a pass:
+            # 1) a ternary control line with no children,
+            # 2) a primary control line with nothing but its own ternary
+            #       and end control lines, and
+            # 3) any control line with no content other than comments
+            # 4) the first control block with no content other than comments
+            def _search_for_control_line():
+                for c in children:
+                    if isinstance(c, parsetree.Comment):
+                        continue
+                    elif isinstance(c, parsetree.ControlLine):
+                        return True
+                    return False
+
+            if (
+                not children
+                or all(
                     isinstance(c, (parsetree.Comment, parsetree.ControlLine))
                     for c in children
                 )
@@ -853,6 +864,7 @@ class _GenerateRenderMethod:
                     for c in children
                     if isinstance(c, parsetree.ControlLine)
                 )
+                or _search_for_control_line()
             ):
                 self.printer.writeline("pass")
 
diff --git a/libs/mako/lexer.py b/libs/mako/lexer.py
index 9d1f5f30d..b4a76a45f 100644
--- a/libs/mako/lexer.py
+++ b/libs/mako/lexer.py
@@ -375,7 +375,7 @@ class Lexer:
                  |
                  (?=\${)      # an expression
                  |
-                 (?=</?[%&])  # a substitution or block or call start or end
+                 (?=</?%)  # a substitution or block or call start or end
                               # - don't consume
                  |
                  (\\\r?\n)    # an escaped newline  - throw away
diff --git a/libs/mako/parsetree.py b/libs/mako/parsetree.py
index 04686ece1..ac9973686 100644
--- a/libs/mako/parsetree.py
+++ b/libs/mako/parsetree.py
@@ -322,7 +322,7 @@ class Tag(Node, metaclass=_TagMeta):
         for key in self.attributes:
             if key in expressions:
                 expr = []
-                for x in re.compile(r"(\${.+?})", re.S).split(
+                for x in re.compile(r"(\${(?:[^$]*?{.+|.+?)})", re.S).split(
                     self.attributes[key]
                 ):
                     m = re.compile(r"^\${(.+?)}$", re.S).match(x)
diff --git a/libs/mako/pyparser.py b/libs/mako/pyparser.py
index 9b63dc330..714e00435 100644
--- a/libs/mako/pyparser.py
+++ b/libs/mako/pyparser.py
@@ -90,6 +90,22 @@ class FindIdentifiers(_ast_util.NodeVisitor):
         self._add_declared(node.name)
         self._visit_function(node, False)
 
+    def visit_ListComp(self, node):
+        if self.in_function:
+            for comp in node.generators:
+                self.visit(comp.iter)
+        else:
+            self.generic_visit(node)
+
+    visit_SetComp = visit_GeneratorExp = visit_ListComp
+
+    def visit_DictComp(self, node):
+        if self.in_function:
+            for comp in node.generators:
+                self.visit(comp.iter)
+        else:
+            self.generic_visit(node)
+
     def _expand_tuples(self, args):
         for arg in args:
             if isinstance(arg, _ast.Tuple):
diff --git a/libs/markdown/__meta__.py b/libs/markdown/__meta__.py
index a35a2de8f..640d23fb5 100644
--- a/libs/markdown/__meta__.py
+++ b/libs/markdown/__meta__.py
@@ -28,7 +28,7 @@
 from __future__ import annotations
 
 
-__version_info__ = (3, 5, 2, 'final', 0)
+__version_info__ = (3, 7, 0, 'final', 0)
 
 
 def _get_version(version_info):
diff --git a/libs/markdown/blockprocessors.py b/libs/markdown/blockprocessors.py
index d2020b9b6..3ed4cf07f 100644
--- a/libs/markdown/blockprocessors.py
+++ b/libs/markdown/blockprocessors.py
@@ -479,6 +479,11 @@ class HashHeaderProcessor(BlockProcessor):
             h.text = m.group('header').strip()
             if after:
                 # Insert remaining lines as first block for future parsing.
+                if self.parser.state.isstate('looselist'):
+                    # This is a weird edge case where a header is a child of a loose list
+                    # and there is no blank line after the header. To ensure proper
+                    # parsing, the line(s) after need to be detabbed. See #1443.
+                    after = self.looseDetab(after)
                 blocks.insert(0, after)
         else:  # pragma: no cover
             # This should never happen, but just in case...
diff --git a/libs/markdown/extensions/abbr.py b/libs/markdown/extensions/abbr.py
index 738368afe..693c3bba9 100644
--- a/libs/markdown/extensions/abbr.py
+++ b/libs/markdown/extensions/abbr.py
@@ -25,31 +25,120 @@ from __future__ import annotations
 from . import Extension
 from ..blockprocessors import BlockProcessor
 from ..inlinepatterns import InlineProcessor
-from ..util import AtomicString
+from ..treeprocessors import Treeprocessor
+from ..util import AtomicString, deprecated
+from typing import TYPE_CHECKING
 import re
 import xml.etree.ElementTree as etree
 
+if TYPE_CHECKING:  # pragma: no cover
+    from .. import Markdown
+    from ..blockparsers import BlockParser
+
 
 class AbbrExtension(Extension):
     """ Abbreviation Extension for Python-Markdown. """
 
+    def __init__(self, **kwargs):
+        """ Initiate Extension and set up configs. """
+        self.config = {
+            'glossary': [
+                {},
+                'A dictionary where the `key` is the abbreviation and the `value` is the definition.'
+                "Default: `{}`"
+            ],
+        }
+        """ Default configuration options. """
+        super().__init__(**kwargs)
+        self.abbrs = {}
+        self.glossary = {}
+
+    def reset(self):
+        """ Clear all previously defined abbreviations. """
+        self.abbrs.clear()
+        if (self.glossary):
+            self.abbrs.update(self.glossary)
+
+    def reset_glossary(self):
+        """ Clear all abbreviations from the glossary. """
+        self.glossary.clear()
+
+    def load_glossary(self, dictionary: dict[str, str]):
+        """Adds `dictionary` to our glossary. Any abbreviations that already exist will be overwritten."""
+        if dictionary:
+            self.glossary = {**dictionary, **self.glossary}
+
     def extendMarkdown(self, md):
-        """ Insert `AbbrPreprocessor` before `ReferencePreprocessor`. """
-        md.parser.blockprocessors.register(AbbrPreprocessor(md.parser), 'abbr', 16)
+        """ Insert `AbbrTreeprocessor` and `AbbrBlockprocessor`. """
+        if (self.config['glossary'][0]):
+            self.load_glossary(self.config['glossary'][0])
+        self.abbrs.update(self.glossary)
+        md.registerExtension(self)
+        md.treeprocessors.register(AbbrTreeprocessor(md, self.abbrs), 'abbr', 7)
+        md.parser.blockprocessors.register(AbbrBlockprocessor(md.parser, self.abbrs), 'abbr', 16)
 
 
-class AbbrPreprocessor(BlockProcessor):
-    """ Abbreviation Preprocessor - parse text for abbr references. """
+class AbbrTreeprocessor(Treeprocessor):
+    """ Replace abbreviation text with `<abbr>` elements. """
 
-    RE = re.compile(r'^[*]\[(?P<abbr>[^\]]*)\][ ]?:[ ]*\n?[ ]*(?P<title>.*)$', re.MULTILINE)
+    def __init__(self, md: Markdown | None = None, abbrs: dict | None = None):
+        self.abbrs: dict = abbrs if abbrs is not None else {}
+        self.RE: re.RegexObject | None = None
+        super().__init__(md)
+
+    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 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
+
+    def run(self, root: etree.Element) -> etree.Element | None:
+        ''' Step through tree to find known abbreviations. '''
+        if not self.abbrs:
+            # No abbreviations defined. Skip running processor.
+            return
+        # Build and compile regex
+        abbr_list = list(self.abbrs.keys())
+        abbr_list.sort(key=len, reverse=True)
+        self.RE = re.compile(f"\\b(?:{ '|'.join(re.escape(key) for key in abbr_list) })\\b")
+        # Step through tree and modify on matches
+        self.iter_element(root)
+
+
+class AbbrBlockprocessor(BlockProcessor):
+    """ Parse text for abbreviation references. """
+
+    RE = re.compile(r'^[*]\[(?P<abbr>[^\\]*?)\][ ]?:[ ]*\n?[ ]*(?P<title>.*)$', re.MULTILINE)
+
+    def __init__(self, parser: BlockParser, abbrs: dict):
+        self.abbrs: dict = abbrs
+        super().__init__(parser)
 
     def test(self, parent: etree.Element, block: str) -> bool:
         return True
 
     def run(self, parent: etree.Element, blocks: list[str]) -> bool:
         """
-        Find and remove all Abbreviation references from the text.
-        Each reference is set as a new `AbbrPattern` in the markdown instance.
+        Find and remove all abbreviation references from the text.
+        Each reference is added to the abbreviation collection.
 
         """
         block = blocks.pop(0)
@@ -57,36 +146,27 @@ class AbbrPreprocessor(BlockProcessor):
         if m:
             abbr = m.group('abbr').strip()
             title = m.group('title').strip()
-            self.parser.md.inlinePatterns.register(
-                AbbrInlineProcessor(self._generate_pattern(abbr), title), 'abbr-%s' % abbr, 2
-            )
-            if block[m.end():].strip():
-                # Add any content after match back to blocks as separate block
-                blocks.insert(0, block[m.end():].lstrip('\n'))
-            if block[:m.start()].strip():
-                # Add any content before match back to blocks as separate block
-                blocks.insert(0, block[:m.start()].rstrip('\n'))
-            return True
+            if title and abbr:
+                if title == "''" or title == '""':
+                    self.abbrs.pop(abbr)
+                else:
+                    self.abbrs[abbr] = title
+                if block[m.end():].strip():
+                    # Add any content after match back to blocks as separate block
+                    blocks.insert(0, block[m.end():].lstrip('\n'))
+                if block[:m.start()].strip():
+                    # Add any content before match back to blocks as separate block
+                    blocks.insert(0, block[:m.start()].rstrip('\n'))
+                return True
         # No match. Restore block.
         blocks.insert(0, block)
         return False
 
-    def _generate_pattern(self, text: str) -> str:
-        """
-        Given a string, returns an regex pattern to match that string.
 
-        'HTML' -> r'(?P<abbr>[H][T][M][L])'
-
-        Note: we force each char as a literal match (in brackets) as we don't
-        know what they will be beforehand.
-
-        """
-        chars = list(text)
-        for i in range(len(chars)):
-            chars[i] = r'[%s]' % chars[i]
-        return r'(?P<abbr>\b%s\b)' % (r''.join(chars))
+AbbrPreprocessor = deprecated("This class has been renamed to `AbbrBlockprocessor`.")(AbbrBlockprocessor)
 
 
+@deprecated("This class will be removed in the future; use `AbbrTreeprocessor` instead.")
 class AbbrInlineProcessor(InlineProcessor):
     """ Abbreviation inline pattern. """
 
diff --git a/libs/markdown/extensions/attr_list.py b/libs/markdown/extensions/attr_list.py
index 7ce3f9925..9206d11e6 100644
--- a/libs/markdown/extensions/attr_list.py
+++ b/libs/markdown/extensions/attr_list.py
@@ -57,17 +57,30 @@ def _handle_word(s, t):
 
 
 _scanner = re.Scanner([
-    (r'[^ =]+=".*?"', _handle_double_quote),
-    (r"[^ =]+='.*?'", _handle_single_quote),
-    (r'[^ =]+=[^ =]+', _handle_key_value),
-    (r'[^ =]+', _handle_word),
+    (r'[^ =}]+=".*?"', _handle_double_quote),
+    (r"[^ =}]+='.*?'", _handle_single_quote),
+    (r'[^ =}]+=[^ =}]+', _handle_key_value),
+    (r'[^ =}]+', _handle_word),
     (r' ', None)
 ])
 
 
-def get_attrs(str: str) -> list[tuple[str, str]]:
-    """ Parse attribute list and return a list of attribute tuples. """
-    return _scanner.scan(str)[0]
+def get_attrs_and_remainder(attrs_string: str) -> tuple[list[tuple[str, str]], str]:
+    """ Parse attribute list and return a list of attribute tuples.
+
+    Additionally, return any text that remained after a curly brace. In typical cases, its presence
+    should mean that the input does not match the intended attribute list syntax.
+    """
+    attrs, remainder = _scanner.scan(attrs_string)
+    # To keep historic behavior, discard all unparsable text prior to '}'.
+    index = remainder.find('}')
+    remainder = remainder[index:] if index != -1 else ''
+    return attrs, remainder
+
+
+def get_attrs(str: str) -> list[tuple[str, str]]:  # pragma: no cover
+    """ Soft-deprecated. Prefer `get_attrs_and_remainder`. """
+    return get_attrs_and_remainder(str)[0]
 
 
 def isheader(elem: Element) -> bool:
@@ -76,7 +89,7 @@ def isheader(elem: Element) -> bool:
 
 class AttrListTreeprocessor(Treeprocessor):
 
-    BASE_RE = r'\{\:?[ ]*([^\}\n ][^\}\n]*)[ ]*\}'
+    BASE_RE = r'\{\:?[ ]*([^\}\n ][^\n]*)[ ]*\}'
     HEADER_RE = re.compile(r'[ ]+{}[ ]*$'.format(BASE_RE))
     BLOCK_RE = re.compile(r'\n[ ]*{}[ ]*$'.format(BASE_RE))
     INLINE_RE = re.compile(r'^{}'.format(BASE_RE))
@@ -106,49 +119,58 @@ class AttrListTreeprocessor(Treeprocessor):
                         # use tail of last child. no `ul` or `ol`.
                         m = RE.search(elem[-1].tail)
                         if m:
-                            self.assign_attrs(elem, m.group(1))
-                            elem[-1].tail = elem[-1].tail[:m.start()]
+                            if not self.assign_attrs(elem, m.group(1), strict=True):
+                                elem[-1].tail = elem[-1].tail[:m.start()]
                     elif pos is not None and pos > 0 and elem[pos-1].tail:
                         # use tail of last child before `ul` or `ol`
                         m = RE.search(elem[pos-1].tail)
                         if m:
-                            self.assign_attrs(elem, m.group(1))
-                            elem[pos-1].tail = elem[pos-1].tail[:m.start()]
+                            if not self.assign_attrs(elem, m.group(1), strict=True):
+                                elem[pos-1].tail = elem[pos-1].tail[:m.start()]
                     elif elem.text:
                         # use text. `ul` is first child.
                         m = RE.search(elem.text)
                         if m:
-                            self.assign_attrs(elem, m.group(1))
-                            elem.text = elem.text[:m.start()]
+                            if not self.assign_attrs(elem, m.group(1), strict=True):
+                                elem.text = elem.text[:m.start()]
                 elif len(elem) and elem[-1].tail:
                     # has children. Get from tail of last child
                     m = RE.search(elem[-1].tail)
                     if m:
-                        self.assign_attrs(elem, m.group(1))
-                        elem[-1].tail = elem[-1].tail[:m.start()]
-                        if isheader(elem):
-                            # clean up trailing #s
-                            elem[-1].tail = elem[-1].tail.rstrip('#').rstrip()
+                        if not self.assign_attrs(elem, m.group(1), strict=True):
+                            elem[-1].tail = elem[-1].tail[:m.start()]
+                            if isheader(elem):
+                                # clean up trailing #s
+                                elem[-1].tail = elem[-1].tail.rstrip('#').rstrip()
                 elif elem.text:
                     # no children. Get from text.
                     m = RE.search(elem.text)
                     if m:
-                        self.assign_attrs(elem, m.group(1))
-                        elem.text = elem.text[:m.start()]
-                        if isheader(elem):
-                            # clean up trailing #s
-                            elem.text = elem.text.rstrip('#').rstrip()
+                        if not self.assign_attrs(elem, m.group(1), strict=True):
+                            elem.text = elem.text[:m.start()]
+                            if isheader(elem):
+                                # clean up trailing #s
+                                elem.text = elem.text.rstrip('#').rstrip()
             else:
                 # inline: check for `attrs` at start of tail
                 if elem.tail:
                     m = self.INLINE_RE.match(elem.tail)
                     if m:
-                        self.assign_attrs(elem, m.group(1))
-                        elem.tail = elem.tail[m.end():]
+                        remainder = self.assign_attrs(elem, m.group(1))
+                        elem.tail = elem.tail[m.end():] + remainder
 
-    def assign_attrs(self, elem: Element, attrs: str) -> None:
-        """ Assign `attrs` to element. """
-        for k, v in get_attrs(attrs):
+    def assign_attrs(self, elem: Element, attrs_string: str, *, strict: bool = False) -> str:
+        """ Assign `attrs` to element.
+
+        If the `attrs_string` has an extra closing curly brace, the remaining text is returned.
+
+        The `strict` argument controls whether to still assign `attrs` if there is a remaining `}`.
+        """
+        attrs, remainder = get_attrs_and_remainder(attrs_string)
+        if strict and remainder:
+            return remainder
+
+        for k, v in attrs:
             if k == '.':
                 # add to class
                 cls = elem.get('class')
@@ -159,11 +181,13 @@ class AttrListTreeprocessor(Treeprocessor):
             else:
                 # assign attribute `k` with `v`
                 elem.set(self.sanitize_name(k), v)
+        # The text that we initially over-matched will be put back.
+        return remainder
 
     def sanitize_name(self, name: str) -> str:
         """
-        Sanitize name as 'an XML Name, minus the ":"'.
-        See https://www.w3.org/TR/REC-xml-names/#NT-NCName
+        Sanitize name as 'an XML Name, minus the `:`.'
+        See <https://www.w3.org/TR/REC-xml-names/#NT-NCName>.
         """
         return self.NAME_RE.sub('_', name)
 
diff --git a/libs/markdown/extensions/fenced_code.py b/libs/markdown/extensions/fenced_code.py
index da1a9be1e..bae7330a3 100644
--- a/libs/markdown/extensions/fenced_code.py
+++ b/libs/markdown/extensions/fenced_code.py
@@ -25,7 +25,7 @@ from textwrap import dedent
 from . import Extension
 from ..preprocessors import Preprocessor
 from .codehilite import CodeHilite, CodeHiliteExtension, parse_hl_lines
-from .attr_list import get_attrs, AttrListExtension
+from .attr_list import get_attrs_and_remainder, AttrListExtension
 from ..util import parseBoolValue
 from ..serializers import _escape_attrib_html
 import re
@@ -56,7 +56,7 @@ class FencedBlockPreprocessor(Preprocessor):
     FENCED_BLOCK_RE = re.compile(
         dedent(r'''
             (?P<fence>^(?:~{3,}|`{3,}))[ ]*                          # opening fence
-            ((\{(?P<attrs>[^\}\n]*)\})|                              # (optional {attrs} or
+            ((\{(?P<attrs>[^\n]*)\})|                                # (optional {attrs} or
             (\.?(?P<lang>[\w#.+-]*)[ ]*)?                            # optional (.)lang
             (hl_lines=(?P<quot>"|')(?P<hl_lines>.*?)(?P=quot)[ ]*)?) # optional hl_lines)
             \n                                                       # newline (end of opening fence)
@@ -94,12 +94,17 @@ class FencedBlockPreprocessor(Preprocessor):
             self.checked_for_deps = True
 
         text = "\n".join(lines)
+        index = 0
         while 1:
-            m = self.FENCED_BLOCK_RE.search(text)
+            m = self.FENCED_BLOCK_RE.search(text, index)
             if m:
                 lang, id, classes, config = None, '', [], {}
                 if m.group('attrs'):
-                    id, classes, config = self.handle_attrs(get_attrs(m.group('attrs')))
+                    attrs, remainder = get_attrs_and_remainder(m.group('attrs'))
+                    if remainder:  # Does not have correctly matching curly braces, so the syntax is invalid.
+                        index = m.end('attrs')  # Explicitly skip over this, to prevent an infinite loop.
+                        continue
+                    id, classes, config = self.handle_attrs(attrs)
                     if len(classes):
                         lang = classes.pop(0)
                 else:
@@ -151,6 +156,8 @@ class FencedBlockPreprocessor(Preprocessor):
 
                 placeholder = self.md.htmlStash.store(code)
                 text = f'{text[:m.start()]}\n{placeholder}\n{text[m.end():]}'
+                # Continue from after the replaced text in the next iteration.
+                index = m.start() + 1 + len(placeholder)
             else:
                 break
         return text.split("\n")
diff --git a/libs/markdown/extensions/smarty.py b/libs/markdown/extensions/smarty.py
index 0ce7772a7..7a7c952dc 100644
--- a/libs/markdown/extensions/smarty.py
+++ b/libs/markdown/extensions/smarty.py
@@ -269,7 +269,7 @@ class SmartyExtension(Extension):
             self.educateDashes(md)
         inlineProcessor = InlineProcessor(md)
         inlineProcessor.inlinePatterns = self.inlinePatterns
-        md.treeprocessors.register(inlineProcessor, 'smarty', 2)
+        md.treeprocessors.register(inlineProcessor, 'smarty', 6)
         md.ESCAPED_CHARS.extend(['"', "'"])
 
 
diff --git a/libs/markdown/extensions/toc.py b/libs/markdown/extensions/toc.py
index a17d7241c..5462a906c 100644
--- a/libs/markdown/extensions/toc.py
+++ b/libs/markdown/extensions/toc.py
@@ -6,7 +6,7 @@
 
 # Original code Copyright 2008 [Jack Miller](https://codezen.org/)
 
-# All changes Copyright 2008-2014 The Python Markdown Project
+# All changes Copyright 2008-2024 The Python Markdown Project
 
 # License: [BSD](https://opensource.org/licenses/bsd-license.php)
 
@@ -21,11 +21,13 @@ from __future__ import annotations
 
 from . import Extension
 from ..treeprocessors import Treeprocessor
-from ..util import code_escape, parseBoolValue, AMP_SUBSTITUTE, HTML_PLACEHOLDER_RE, AtomicString
+from ..util import parseBoolValue, AMP_SUBSTITUTE, deprecated, HTML_PLACEHOLDER_RE, AtomicString
 from ..treeprocessors import UnescapeTreeprocessor
+from ..serializers import RE_AMP
 import re
 import html
 import unicodedata
+from copy import deepcopy
 import xml.etree.ElementTree as etree
 from typing import TYPE_CHECKING, Any, Iterator, MutableSet
 
@@ -63,6 +65,7 @@ def unique(id: str, ids: MutableSet[str]) -> str:
     return id
 
 
+@deprecated('Use `render_inner_html` and `striptags` instead.')
 def get_name(el: etree.Element) -> str:
     """Get title name."""
 
@@ -75,6 +78,7 @@ def get_name(el: etree.Element) -> str:
     return ''.join(text).strip()
 
 
+@deprecated('Use `run_postprocessors`, `render_inner_html` and/or `striptags` instead.')
 def stashedHTML2text(text: str, md: Markdown, strip_entities: bool = True) -> str:
     """ Extract raw HTML from stash, reduce to plain text and swap with placeholder. """
     def _html_sub(m: re.Match[str]) -> str:
@@ -93,11 +97,80 @@ def stashedHTML2text(text: str, md: Markdown, strip_entities: bool = True) -> st
 
 
 def unescape(text: str) -> str:
-    """ Unescape escaped text. """
+    """ Unescape Markdown backslash escaped text. """
     c = UnescapeTreeprocessor()
     return c.unescape(text)
 
 
+def strip_tags(text: str) -> str:
+    """ Strip HTML tags and return plain text. Note: HTML entities are unaffected. """
+    # A comment could contain a tag, so strip comments first
+    while (start := text.find('<!--')) != -1 and (end := text.find('-->', start)) != -1:
+        text = f'{text[:start]}{text[end + 3:]}'
+
+    while (start := text.find('<')) != -1 and (end := text.find('>', start)) != -1:
+        text = f'{text[:start]}{text[end + 1:]}'
+
+    # Collapse whitespace
+    text = ' '.join(text.split())
+    return text
+
+
+def escape_cdata(text: str) -> str:
+    """ Escape character data. """
+    if "&" in text:
+        # Only replace & when not part of an entity
+        text = RE_AMP.sub('&amp;', text)
+    if "<" in text:
+        text = text.replace("<", "&lt;")
+    if ">" in text:
+        text = text.replace(">", "&gt;")
+    return text
+
+
+def run_postprocessors(text: str, md: Markdown) -> str:
+    """ Run postprocessors from Markdown instance on text. """
+    for pp in md.postprocessors:
+        text = pp.run(text)
+    return text.strip()
+
+
+def render_inner_html(el: etree.Element, md: Markdown) -> str:
+    """ Fully render inner html of an `etree` element as a string. """
+    # The `UnescapeTreeprocessor` runs after `toc` extension so run here.
+    text = unescape(md.serializer(el))
+
+    # strip parent tag
+    start = text.index('>') + 1
+    end = text.rindex('<')
+    text = text[start:end].strip()
+
+    return run_postprocessors(text, md)
+
+
+def remove_fnrefs(root: etree.Element) -> etree.Element:
+    """ Remove footnote references from a copy of the element, if any are present. """
+    # Remove footnote references, which look like this: `<sup id="fnref:1">...</sup>`.
+    # If there are no `sup` elements, then nothing to do.
+    if next(root.iter('sup'), None) is None:
+        return root
+    root = deepcopy(root)
+    # Find parent elements that contain `sup` elements.
+    for parent in root.findall('.//sup/..'):
+        carry_text = ""
+        for child in reversed(parent):  # Reversed for the ability to mutate during iteration.
+            # Remove matching footnote references but carry any `tail` text to preceding elements.
+            if child.tag == 'sup' and child.get('id', '').startswith('fnref'):
+                carry_text = f'{child.tail or ""}{carry_text}'
+                parent.remove(child)
+            elif carry_text:
+                child.tail = f'{child.tail or ""}{carry_text}'
+                carry_text = ""
+        if carry_text:
+            parent.text = f'{parent.text or ""}{carry_text}'
+    return root
+
+
 def nest_toc_tokens(toc_list):
     """Given an unsorted list with errors and skips, return a nested one.
 
@@ -300,27 +373,30 @@ class TocTreeprocessor(Treeprocessor):
         for el in doc.iter():
             if isinstance(el.tag, str) and self.header_rgx.match(el.tag):
                 self.set_level(el)
-                text = get_name(el)
+                innerhtml = render_inner_html(remove_fnrefs(el), self.md)
+                name = strip_tags(innerhtml)
 
                 # Do not override pre-existing ids
                 if "id" not in el.attrib:
-                    innertext = unescape(stashedHTML2text(text, self.md))
-                    el.attrib["id"] = unique(self.slugify(innertext, self.sep), used_ids)
+                    el.attrib["id"] = unique(self.slugify(html.unescape(name), self.sep), used_ids)
+
+                data_toc_label = ''
+                if 'data-toc-label' in el.attrib:
+                    data_toc_label = run_postprocessors(unescape(el.attrib['data-toc-label']), self.md)
+                    # Overwrite name with sanitized value of `data-toc-label`.
+                    name = escape_cdata(strip_tags(data_toc_label))
+                    # Remove the data-toc-label attribute as it is no longer needed
+                    del el.attrib['data-toc-label']
 
                 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"],
-                        'name': unescape(stashedHTML2text(
-                            code_escape(el.attrib.get('data-toc-label', text)),
-                            self.md, strip_entities=False
-                        ))
+                        'name': name,
+                        'html': innerhtml,
+                        'data-toc-label': data_toc_label
                     })
 
-                # Remove the data-toc-label attribute as it is no longer needed
-                if 'data-toc-label' in el.attrib:
-                    del el.attrib['data-toc-label']
-
                 if self.use_anchors:
                     self.add_anchor(el, el.attrib["id"])
                 if self.use_permalinks not in [False, None]:
diff --git a/libs/msgpack-1.0.7.dist-info/RECORD b/libs/msgpack-1.0.7.dist-info/RECORD
deleted file mode 100644
index a24a8c38b..000000000
--- a/libs/msgpack-1.0.7.dist-info/RECORD
+++ /dev/null
@@ -1,23 +0,0 @@
-msgpack-1.0.7.dist-info/COPYING,sha256=SS3tuoXaWHL3jmCRvNH-pHTWYNNay03ulkuKqz8AdCc,614
-msgpack-1.0.7.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-msgpack-1.0.7.dist-info/METADATA,sha256=eTTPd8hl96E9Twz499RXt7iV67QBu793z8bmlOsNOQY,9074
-msgpack-1.0.7.dist-info/RECORD,,
-msgpack-1.0.7.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-msgpack-1.0.7.dist-info/WHEEL,sha256=UkJU7GAEhyIKVwGX1j1L5OGjUFT--MirwyCseqfCpZU,109
-msgpack-1.0.7.dist-info/top_level.txt,sha256=2tykSY1pXdiA2xYTDR6jPw0qI5ZGxRihyhf4S5hZyXk,8
-msgpack/__init__.py,sha256=tMxCiw7hJRLJN3JgUmPXOo64qMaUAbKTCf44CvE2tg8,1077
-msgpack/_cmsgpack.cpp,sha256=OzCMmPJHElYxP0pEu781YltqN0UDwMKCvfpU3d6AG_c,1024996
-msgpack/_cmsgpack.cpython-38-darwin.so,sha256=kUdrR4exdyExOu59q8djhksQwZu24Na_c4GCNF4ABK0,215704
-msgpack/_cmsgpack.pyx,sha256=JQb-SpqADciQgq3jEhFskYbQmtZL-o46G7CEkOi5qFc,335
-msgpack/_packer.pyx,sha256=4X3JTr9wbEmkbqEw2NEDnNQsbqlTZjh3X2PFUdAI34w,14607
-msgpack/_unpacker.pyx,sha256=9oq2d3v_0VzsY1biMQ3_3CwPyQfDOYRDjU3ZxPkXXTc,18888
-msgpack/buff_converter.h,sha256=t0RwS7ilhFPHeo83lznAtJsvBBbD85txgvVDOJCSGYg,220
-msgpack/exceptions.py,sha256=dCTWei8dpkrMsQDcjQk74ATl9HsIBH0ybt8zOPNqMYc,1081
-msgpack/ext.py,sha256=fKp00BqDLjUtZnPd70Llr138zk8JsCuSpJkkZ5S4dt8,5629
-msgpack/fallback.py,sha256=wdUWJkWX2gzfRW9BBCTOuIE1Wvrf5PtBtR8ZtY7G_EE,33175
-msgpack/pack.h,sha256=tK5VBNP9-R5FJ4etPQ1hWTswfyTnlqNuAYRczwBUCP0,2072
-msgpack/pack_template.h,sha256=Yqe6kpV4w9CVwhCluL5kHoqz1ihceY1zN6Sypx2Lztc,21775
-msgpack/sysdep.h,sha256=g0Be20rldEx2yZHY-s7eFtzx7dZlnognCutLNL2Cys8,6452
-msgpack/unpack.h,sha256=2349vxJmTKqSB9H69ILZqCjb7W9oDNJgmLk0RXN1ax4,10976
-msgpack/unpack_define.h,sha256=ebuKljj6t2eb7UVM-cl6cr2l0oK0PcMx3l7Zhqq6wEQ,2366
-msgpack/unpack_template.h,sha256=iyowdiEgnnnue1Mpj5BU5d0Q_Tc-SWFrbM_rOmE5_qk,14846
diff --git a/libs/msgpack-1.0.7.dist-info/COPYING b/libs/msgpack-1.1.0.dist-info/COPYING
similarity index 100%
rename from libs/msgpack-1.0.7.dist-info/COPYING
rename to libs/msgpack-1.1.0.dist-info/COPYING
diff --git a/libs/pycountry-23.12.11.dist-info/INSTALLER b/libs/msgpack-1.1.0.dist-info/INSTALLER
similarity index 100%
rename from libs/pycountry-23.12.11.dist-info/INSTALLER
rename to libs/msgpack-1.1.0.dist-info/INSTALLER
diff --git a/libs/msgpack-1.0.7.dist-info/METADATA b/libs/msgpack-1.1.0.dist-info/METADATA
similarity index 79%
rename from libs/msgpack-1.0.7.dist-info/METADATA
rename to libs/msgpack-1.1.0.dist-info/METADATA
index 04593911b..0adb412db 100644
--- a/libs/msgpack-1.0.7.dist-info/METADATA
+++ b/libs/msgpack-1.1.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: msgpack
-Version: 1.0.7
+Version: 1.1.0
 Summary: MessagePack serializer
 Author-email: Inada Naoki <songofacandy@gmail.com>
 License: Apache 2.0
@@ -39,53 +39,6 @@ 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.
 
-
-## Very important notes for existing users
-
-### PyPI package name
-
-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`.
-
-
-### Compatibility with the old format
-
-You can use `use_bin_type=False` option to pack `bytes`
-object into raw type in the old msgpack spec, instead of bin type in new msgpack spec.
-
-You can unpack old msgpack format using `raw=True` option.
-It unpacks str (raw) type in msgpack into Python bytes.
-
-See note below for detail.
-
-
-### Major breaking changes in msgpack 1.0
-
-* Python 2
-
-  * The extension module does not support Python 2 anymore.
-    The pure Python implementation (`msgpack.fallback`) is used for Python 2.
-
-* Packer
-
-  * `use_bin_type=True` by default.  bytes are encoded in bin type in msgpack.
-    **If you are still using Python 2, you must use unicode for all string types.**
-    You can use `use_bin_type=False` to encode into old msgpack format.
-  * `encoding` option is removed.  UTF-8 is used always.
-
-* Unpacker
-
-  * `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.
-  * Default value of `max_buffer_size` is changed from 0 to 100 MiB.
-  * 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.
-
-
 ## Install
 
 ```
@@ -94,12 +47,9 @@ $ pip install msgpack
 
 ### Pure Python implementation
 
-The extension module in msgpack (`msgpack._cmsgpack`) does not support
-Python 2 and PyPy.
-
-But msgpack provides a pure Python implementation (`msgpack.fallback`)
-for PyPy and Python 2.
+The extension module in msgpack (`msgpack._cmsgpack`) does not support PyPy.
 
+But msgpack provides a pure Python implementation (`msgpack.fallback`) for PyPy.
 
 
 ### Windows
@@ -111,10 +61,6 @@ Without extension, using pure Python implementation on CPython runs slowly.
 
 ## How to use
 
-NOTE: In examples below, I use `raw=False` and `use_bin_type=True` for users
-using msgpack < 1.0. These options are default from msgpack 1.0 so you can omit them.
-
-
 ### One-shot pack & unpack
 
 Use `packb` for packing and `unpackb` for unpacking.
@@ -126,23 +72,13 @@ msgpack provides `dumps` and `loads` as an alias for compatibility with
 
 ```pycon
 >>> import msgpack
->>> msgpack.packb([1, 2, 3], use_bin_type=True)
+>>> msgpack.packb([1, 2, 3])
 '\x93\x01\x02\x03'
->>> msgpack.unpackb(_, raw=False)
+>>> msgpack.unpackb(_)
 [1, 2, 3]
 ```
 
-`unpack` unpacks msgpack's array to Python's list, but can also unpack to tuple:
-
-```pycon
->>> msgpack.unpackb(b'\x93\x01\x02\x03', use_list=False, raw=False)
-(1, 2, 3)
-```
-
-You should always specify the `use_list` keyword argument for backward compatibility.
-See performance issues relating to `use_list option`_ below.
-
-Read the docstring for other options.
+Read the docstring for options.
 
 
 ### Streaming unpacking
@@ -156,11 +92,11 @@ from io import BytesIO
 
 buf = BytesIO()
 for i in range(100):
-   buf.write(msgpack.packb(i, use_bin_type=True))
+   buf.write(msgpack.packb(i))
 
 buf.seek(0)
 
-unpacker = msgpack.Unpacker(buf, raw=False)
+unpacker = msgpack.Unpacker(buf)
 for unpacked in unpacker:
     print(unpacked)
 ```
@@ -191,14 +127,17 @@ def encode_datetime(obj):
     return obj
 
 
-packed_dict = msgpack.packb(useful_dict, default=encode_datetime, use_bin_type=True)
-this_dict_again = msgpack.unpackb(packed_dict, object_hook=decode_datetime, raw=False)
+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
 
@@ -220,8 +159,8 @@ It is also possible to pack/unpack custom data types using the **ext** type.
 ...     return ExtType(code, data)
 ...
 >>> data = array.array('d', [1.2, 3.4])
->>> packed = msgpack.packb(data, default=default, use_bin_type=True)
->>> unpacked = msgpack.unpackb(packed, ext_hook=ext_hook, raw=False)
+>>> packed = msgpack.packb(data, default=default)
+>>> unpacked = msgpack.unpackb(packed, ext_hook=ext_hook)
 >>> data == unpacked
 True
 ```
@@ -239,7 +178,7 @@ in a map, can be unpacked or skipped individually.
 
 ## Notes
 
-### string and binary type
+### 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**.
@@ -292,3 +231,41 @@ 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
new file mode 100644
index 000000000..305695694
--- /dev/null
+++ b/libs/msgpack-1.1.0.dist-info/RECORD
@@ -0,0 +1,12 @@
+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/pycountry-23.12.11.dist-info/REQUESTED b/libs/msgpack-1.1.0.dist-info/REQUESTED
similarity index 100%
rename from libs/pycountry-23.12.11.dist-info/REQUESTED
rename to libs/msgpack-1.1.0.dist-info/REQUESTED
diff --git a/libs/msgpack-1.0.7.dist-info/WHEEL b/libs/msgpack-1.1.0.dist-info/WHEEL
similarity index 70%
rename from libs/msgpack-1.0.7.dist-info/WHEEL
rename to libs/msgpack-1.1.0.dist-info/WHEEL
index 844cf17ca..be75fa70d 100644
--- a/libs/msgpack-1.0.7.dist-info/WHEEL
+++ b/libs/msgpack-1.1.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_12_0_x86_64
 
diff --git a/libs/msgpack-1.0.7.dist-info/top_level.txt b/libs/msgpack-1.1.0.dist-info/top_level.txt
similarity index 100%
rename from libs/msgpack-1.0.7.dist-info/top_level.txt
rename to libs/msgpack-1.1.0.dist-info/top_level.txt
diff --git a/libs/msgpack/__init__.py b/libs/msgpack/__init__.py
index 60a088ccf..b61510544 100644
--- a/libs/msgpack/__init__.py
+++ b/libs/msgpack/__init__.py
@@ -1,20 +1,20 @@
-from .exceptions import *
-from .ext import ExtType, Timestamp
-
+# ruff: noqa: F401
 import os
 
+from .exceptions import *  # noqa: F403
+from .ext import ExtType, Timestamp
 
-version = (1, 0, 7)
-__version__ = "1.0.7"
+version = (1, 1, 0)
+__version__ = "1.1.0"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON"):
-    from .fallback import Packer, unpackb, Unpacker
+    from .fallback import Packer, Unpacker, unpackb
 else:
     try:
-        from ._cmsgpack import Packer, unpackb, Unpacker
+        from ._cmsgpack import Packer, Unpacker, unpackb
     except ImportError:
-        from .fallback import Packer, unpackb, Unpacker
+        from .fallback import Packer, Unpacker, unpackb
 
 
 def pack(o, stream, **kwargs):
diff --git a/libs/msgpack/_cmsgpack.cpp b/libs/msgpack/_cmsgpack.cpp
deleted file mode 100644
index 7ce2c20c0..000000000
--- a/libs/msgpack/_cmsgpack.cpp
+++ /dev/null
@@ -1,25187 +0,0 @@
-/* Generated by Cython 3.0.2 */
-
-#ifndef PY_SSIZE_T_CLEAN
-#define PY_SSIZE_T_CLEAN
-#endif /* PY_SSIZE_T_CLEAN */
-#if defined(CYTHON_LIMITED_API) && 0
-  #ifndef Py_LIMITED_API
-    #if CYTHON_LIMITED_API+0 > 0x03030000
-      #define Py_LIMITED_API CYTHON_LIMITED_API
-    #else
-      #define Py_LIMITED_API 0x03030000
-    #endif
-  #endif
-#endif
-
-#include "Python.h"
-
-    #if PY_MAJOR_VERSION >= 3
-      #define __Pyx_PyFloat_FromString(obj)  PyFloat_FromString(obj)
-    #else
-      #define __Pyx_PyFloat_FromString(obj)  PyFloat_FromString(obj, NULL)
-    #endif
-    
-
-    #if PY_MAJOR_VERSION <= 2
-    #define PyDict_GetItemWithError _PyDict_GetItemWithError
-    #endif
-    
-
-    #if (PY_VERSION_HEX < 0x030700b1 || (CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM < 0x07030600)) && !defined(PyContextVar_Get)
-    #define PyContextVar_Get(var, d, v)         ((d) ?             ((void)(var), Py_INCREF(d), (v)[0] = (d), 0) :             ((v)[0] = NULL, 0)         )
-    #endif
-    
-#ifndef Py_PYTHON_H
-    #error Python headers needed to compile C extensions, please install development version of Python.
-#elif PY_VERSION_HEX < 0x02070000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000)
-    #error Cython requires Python 2.7+ or Python 3.3+.
-#else
-#if CYTHON_LIMITED_API
-#define __PYX_EXTRA_ABI_MODULE_NAME "limited"
-#else
-#define __PYX_EXTRA_ABI_MODULE_NAME ""
-#endif
-#define CYTHON_ABI "3_0_2" __PYX_EXTRA_ABI_MODULE_NAME
-#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
-#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x030002F0
-#define CYTHON_FUTURE_DIVISION 1
-#include <stddef.h>
-#ifndef offsetof
-  #define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
-#endif
-#if !defined(_WIN32) && !defined(WIN32) && !defined(MS_WINDOWS)
-  #ifndef __stdcall
-    #define __stdcall
-  #endif
-  #ifndef __cdecl
-    #define __cdecl
-  #endif
-  #ifndef __fastcall
-    #define __fastcall
-  #endif
-#endif
-#ifndef DL_IMPORT
-  #define DL_IMPORT(t) t
-#endif
-#ifndef DL_EXPORT
-  #define DL_EXPORT(t) t
-#endif
-#define __PYX_COMMA ,
-#ifndef HAVE_LONG_LONG
-  #define HAVE_LONG_LONG
-#endif
-#ifndef PY_LONG_LONG
-  #define PY_LONG_LONG LONG_LONG
-#endif
-#ifndef Py_HUGE_VAL
-  #define Py_HUGE_VAL HUGE_VAL
-#endif
-#define __PYX_LIMITED_VERSION_HEX PY_VERSION_HEX
-#if defined(GRAALVM_PYTHON)
-  /* For very preliminary testing purposes. Most variables are set the same as PyPy.
-     The existence of this section does not imply that anything works or is even tested */
-  #define CYTHON_COMPILING_IN_PYPY 0
-  #define CYTHON_COMPILING_IN_CPYTHON 0
-  #define CYTHON_COMPILING_IN_LIMITED_API 0
-  #define CYTHON_COMPILING_IN_GRAAL 1
-  #define CYTHON_COMPILING_IN_NOGIL 0
-  #undef CYTHON_USE_TYPE_SLOTS
-  #define CYTHON_USE_TYPE_SLOTS 0
-  #undef CYTHON_USE_TYPE_SPECS
-  #define CYTHON_USE_TYPE_SPECS 0
-  #undef CYTHON_USE_PYTYPE_LOOKUP
-  #define CYTHON_USE_PYTYPE_LOOKUP 0
-  #if PY_VERSION_HEX < 0x03050000
-    #undef CYTHON_USE_ASYNC_SLOTS
-    #define CYTHON_USE_ASYNC_SLOTS 0
-  #elif !defined(CYTHON_USE_ASYNC_SLOTS)
-    #define CYTHON_USE_ASYNC_SLOTS 1
-  #endif
-  #undef CYTHON_USE_PYLIST_INTERNALS
-  #define CYTHON_USE_PYLIST_INTERNALS 0
-  #undef CYTHON_USE_UNICODE_INTERNALS
-  #define CYTHON_USE_UNICODE_INTERNALS 0
-  #undef CYTHON_USE_UNICODE_WRITER
-  #define CYTHON_USE_UNICODE_WRITER 0
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
-  #undef CYTHON_AVOID_BORROWED_REFS
-  #define CYTHON_AVOID_BORROWED_REFS 1
-  #undef CYTHON_ASSUME_SAFE_MACROS
-  #define CYTHON_ASSUME_SAFE_MACROS 0
-  #undef CYTHON_UNPACK_METHODS
-  #define CYTHON_UNPACK_METHODS 0
-  #undef CYTHON_FAST_THREAD_STATE
-  #define CYTHON_FAST_THREAD_STATE 0
-  #undef CYTHON_FAST_GIL
-  #define CYTHON_FAST_GIL 0
-  #undef CYTHON_METH_FASTCALL
-  #define CYTHON_METH_FASTCALL 0
-  #undef CYTHON_FAST_PYCALL
-  #define CYTHON_FAST_PYCALL 0
-  #ifndef CYTHON_PEP487_INIT_SUBCLASS
-    #define CYTHON_PEP487_INIT_SUBCLASS (PY_MAJOR_VERSION >= 3)
-  #endif
-  #undef CYTHON_PEP489_MULTI_PHASE_INIT
-  #define CYTHON_PEP489_MULTI_PHASE_INIT 1
-  #undef CYTHON_USE_MODULE_STATE
-  #define CYTHON_USE_MODULE_STATE 0
-  #undef CYTHON_USE_TP_FINALIZE
-  #define CYTHON_USE_TP_FINALIZE 0
-  #undef CYTHON_USE_DICT_VERSIONS
-  #define CYTHON_USE_DICT_VERSIONS 0
-  #undef CYTHON_USE_EXC_INFO_STACK
-  #define CYTHON_USE_EXC_INFO_STACK 0
-  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
-    #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
-  #endif
-#elif defined(PYPY_VERSION)
-  #define CYTHON_COMPILING_IN_PYPY 1
-  #define CYTHON_COMPILING_IN_CPYTHON 0
-  #define CYTHON_COMPILING_IN_LIMITED_API 0
-  #define CYTHON_COMPILING_IN_GRAAL 0
-  #define CYTHON_COMPILING_IN_NOGIL 0
-  #undef CYTHON_USE_TYPE_SLOTS
-  #define CYTHON_USE_TYPE_SLOTS 0
-  #ifndef CYTHON_USE_TYPE_SPECS
-    #define CYTHON_USE_TYPE_SPECS 0
-  #endif
-  #undef CYTHON_USE_PYTYPE_LOOKUP
-  #define CYTHON_USE_PYTYPE_LOOKUP 0
-  #if PY_VERSION_HEX < 0x03050000
-    #undef CYTHON_USE_ASYNC_SLOTS
-    #define CYTHON_USE_ASYNC_SLOTS 0
-  #elif !defined(CYTHON_USE_ASYNC_SLOTS)
-    #define CYTHON_USE_ASYNC_SLOTS 1
-  #endif
-  #undef CYTHON_USE_PYLIST_INTERNALS
-  #define CYTHON_USE_PYLIST_INTERNALS 0
-  #undef CYTHON_USE_UNICODE_INTERNALS
-  #define CYTHON_USE_UNICODE_INTERNALS 0
-  #undef CYTHON_USE_UNICODE_WRITER
-  #define CYTHON_USE_UNICODE_WRITER 0
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
-  #undef CYTHON_AVOID_BORROWED_REFS
-  #define CYTHON_AVOID_BORROWED_REFS 1
-  #undef CYTHON_ASSUME_SAFE_MACROS
-  #define CYTHON_ASSUME_SAFE_MACROS 0
-  #undef CYTHON_UNPACK_METHODS
-  #define CYTHON_UNPACK_METHODS 0
-  #undef CYTHON_FAST_THREAD_STATE
-  #define CYTHON_FAST_THREAD_STATE 0
-  #undef CYTHON_FAST_GIL
-  #define CYTHON_FAST_GIL 0
-  #undef CYTHON_METH_FASTCALL
-  #define CYTHON_METH_FASTCALL 0
-  #undef CYTHON_FAST_PYCALL
-  #define CYTHON_FAST_PYCALL 0
-  #ifndef CYTHON_PEP487_INIT_SUBCLASS
-    #define CYTHON_PEP487_INIT_SUBCLASS (PY_MAJOR_VERSION >= 3)
-  #endif
-  #if PY_VERSION_HEX < 0x03090000
-    #undef CYTHON_PEP489_MULTI_PHASE_INIT
-    #define CYTHON_PEP489_MULTI_PHASE_INIT 0
-  #elif !defined(CYTHON_PEP489_MULTI_PHASE_INIT)
-    #define CYTHON_PEP489_MULTI_PHASE_INIT 1
-  #endif
-  #undef CYTHON_USE_MODULE_STATE
-  #define CYTHON_USE_MODULE_STATE 0
-  #undef CYTHON_USE_TP_FINALIZE
-  #define CYTHON_USE_TP_FINALIZE (PY_VERSION_HEX >= 0x030400a1 && PYPY_VERSION_NUM >= 0x07030C00)
-  #undef CYTHON_USE_DICT_VERSIONS
-  #define CYTHON_USE_DICT_VERSIONS 0
-  #undef CYTHON_USE_EXC_INFO_STACK
-  #define CYTHON_USE_EXC_INFO_STACK 0
-  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
-    #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
-  #endif
-#elif defined(CYTHON_LIMITED_API)
-  #ifdef Py_LIMITED_API
-    #undef __PYX_LIMITED_VERSION_HEX
-    #define __PYX_LIMITED_VERSION_HEX Py_LIMITED_API
-  #endif
-  #define CYTHON_COMPILING_IN_PYPY 0
-  #define CYTHON_COMPILING_IN_CPYTHON 0
-  #define CYTHON_COMPILING_IN_LIMITED_API 1
-  #define CYTHON_COMPILING_IN_GRAAL 0
-  #define CYTHON_COMPILING_IN_NOGIL 0
-  #undef CYTHON_CLINE_IN_TRACEBACK
-  #define CYTHON_CLINE_IN_TRACEBACK 0
-  #undef CYTHON_USE_TYPE_SLOTS
-  #define CYTHON_USE_TYPE_SLOTS 0
-  #undef CYTHON_USE_TYPE_SPECS
-  #define CYTHON_USE_TYPE_SPECS 1
-  #undef CYTHON_USE_PYTYPE_LOOKUP
-  #define CYTHON_USE_PYTYPE_LOOKUP 0
-  #undef CYTHON_USE_ASYNC_SLOTS
-  #define CYTHON_USE_ASYNC_SLOTS 0
-  #undef CYTHON_USE_PYLIST_INTERNALS
-  #define CYTHON_USE_PYLIST_INTERNALS 0
-  #undef CYTHON_USE_UNICODE_INTERNALS
-  #define CYTHON_USE_UNICODE_INTERNALS 0
-  #ifndef CYTHON_USE_UNICODE_WRITER
-    #define CYTHON_USE_UNICODE_WRITER 0
-  #endif
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
-  #ifndef CYTHON_AVOID_BORROWED_REFS
-    #define CYTHON_AVOID_BORROWED_REFS 0
-  #endif
-  #undef CYTHON_ASSUME_SAFE_MACROS
-  #define CYTHON_ASSUME_SAFE_MACROS 0
-  #undef CYTHON_UNPACK_METHODS
-  #define CYTHON_UNPACK_METHODS 0
-  #undef CYTHON_FAST_THREAD_STATE
-  #define CYTHON_FAST_THREAD_STATE 0
-  #undef CYTHON_FAST_GIL
-  #define CYTHON_FAST_GIL 0
-  #undef CYTHON_METH_FASTCALL
-  #define CYTHON_METH_FASTCALL 0
-  #undef CYTHON_FAST_PYCALL
-  #define CYTHON_FAST_PYCALL 0
-  #ifndef CYTHON_PEP487_INIT_SUBCLASS
-    #define CYTHON_PEP487_INIT_SUBCLASS 1
-  #endif
-  #undef CYTHON_PEP489_MULTI_PHASE_INIT
-  #define CYTHON_PEP489_MULTI_PHASE_INIT 0
-  #undef CYTHON_USE_MODULE_STATE
-  #define CYTHON_USE_MODULE_STATE 1
-  #ifndef CYTHON_USE_TP_FINALIZE
-    #define CYTHON_USE_TP_FINALIZE 0
-  #endif
-  #undef CYTHON_USE_DICT_VERSIONS
-  #define CYTHON_USE_DICT_VERSIONS 0
-  #undef CYTHON_USE_EXC_INFO_STACK
-  #define CYTHON_USE_EXC_INFO_STACK 0
-  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
-    #define CYTHON_UPDATE_DESCRIPTOR_DOC 0
-  #endif
-#elif defined(PY_NOGIL)
-  #define CYTHON_COMPILING_IN_PYPY 0
-  #define CYTHON_COMPILING_IN_CPYTHON 0
-  #define CYTHON_COMPILING_IN_LIMITED_API 0
-  #define CYTHON_COMPILING_IN_GRAAL 0
-  #define CYTHON_COMPILING_IN_NOGIL 1
-  #ifndef CYTHON_USE_TYPE_SLOTS
-    #define CYTHON_USE_TYPE_SLOTS 1
-  #endif
-  #undef CYTHON_USE_PYTYPE_LOOKUP
-  #define CYTHON_USE_PYTYPE_LOOKUP 0
-  #ifndef CYTHON_USE_ASYNC_SLOTS
-    #define CYTHON_USE_ASYNC_SLOTS 1
-  #endif
-  #undef CYTHON_USE_PYLIST_INTERNALS
-  #define CYTHON_USE_PYLIST_INTERNALS 0
-  #ifndef CYTHON_USE_UNICODE_INTERNALS
-    #define CYTHON_USE_UNICODE_INTERNALS 1
-  #endif
-  #undef CYTHON_USE_UNICODE_WRITER
-  #define CYTHON_USE_UNICODE_WRITER 0
-  #undef CYTHON_USE_PYLONG_INTERNALS
-  #define CYTHON_USE_PYLONG_INTERNALS 0
-  #ifndef CYTHON_AVOID_BORROWED_REFS
-    #define CYTHON_AVOID_BORROWED_REFS 0
-  #endif
-  #ifndef CYTHON_ASSUME_SAFE_MACROS
-    #define CYTHON_ASSUME_SAFE_MACROS 1
-  #endif
-  #ifndef CYTHON_UNPACK_METHODS
-    #define CYTHON_UNPACK_METHODS 1
-  #endif
-  #undef CYTHON_FAST_THREAD_STATE
-  #define CYTHON_FAST_THREAD_STATE 0
-  #undef CYTHON_FAST_PYCALL
-  #define CYTHON_FAST_PYCALL 0
-  #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
-    #define CYTHON_PEP489_MULTI_PHASE_INIT 1
-  #endif
-  #ifndef CYTHON_USE_TP_FINALIZE
-    #define CYTHON_USE_TP_FINALIZE 1
-  #endif
-  #undef CYTHON_USE_DICT_VERSIONS
-  #define CYTHON_USE_DICT_VERSIONS 0
-  #undef CYTHON_USE_EXC_INFO_STACK
-  #define CYTHON_USE_EXC_INFO_STACK 0
-#else
-  #define CYTHON_COMPILING_IN_PYPY 0
-  #define CYTHON_COMPILING_IN_CPYTHON 1
-  #define CYTHON_COMPILING_IN_LIMITED_API 0
-  #define CYTHON_COMPILING_IN_GRAAL 0
-  #define CYTHON_COMPILING_IN_NOGIL 0
-  #ifndef CYTHON_USE_TYPE_SLOTS
-    #define CYTHON_USE_TYPE_SLOTS 1
-  #endif
-  #ifndef CYTHON_USE_TYPE_SPECS
-    #define CYTHON_USE_TYPE_SPECS 0
-  #endif
-  #ifndef CYTHON_USE_PYTYPE_LOOKUP
-    #define CYTHON_USE_PYTYPE_LOOKUP 1
-  #endif
-  #if PY_MAJOR_VERSION < 3
-    #undef CYTHON_USE_ASYNC_SLOTS
-    #define CYTHON_USE_ASYNC_SLOTS 0
-  #elif !defined(CYTHON_USE_ASYNC_SLOTS)
-    #define CYTHON_USE_ASYNC_SLOTS 1
-  #endif
-  #ifndef CYTHON_USE_PYLONG_INTERNALS
-    #define CYTHON_USE_PYLONG_INTERNALS 1
-  #endif
-  #ifndef CYTHON_USE_PYLIST_INTERNALS
-    #define CYTHON_USE_PYLIST_INTERNALS 1
-  #endif
-  #ifndef CYTHON_USE_UNICODE_INTERNALS
-    #define CYTHON_USE_UNICODE_INTERNALS 1
-  #endif
-  #if PY_VERSION_HEX < 0x030300F0 || PY_VERSION_HEX >= 0x030B00A2
-    #undef CYTHON_USE_UNICODE_WRITER
-    #define CYTHON_USE_UNICODE_WRITER 0
-  #elif !defined(CYTHON_USE_UNICODE_WRITER)
-    #define CYTHON_USE_UNICODE_WRITER 1
-  #endif
-  #ifndef CYTHON_AVOID_BORROWED_REFS
-    #define CYTHON_AVOID_BORROWED_REFS 0
-  #endif
-  #ifndef CYTHON_ASSUME_SAFE_MACROS
-    #define CYTHON_ASSUME_SAFE_MACROS 1
-  #endif
-  #ifndef CYTHON_UNPACK_METHODS
-    #define CYTHON_UNPACK_METHODS 1
-  #endif
-  #ifndef CYTHON_FAST_THREAD_STATE
-    #define CYTHON_FAST_THREAD_STATE 1
-  #endif
-  #ifndef CYTHON_FAST_GIL
-    #define CYTHON_FAST_GIL (PY_MAJOR_VERSION < 3 || PY_VERSION_HEX >= 0x03060000 && PY_VERSION_HEX < 0x030C00A6)
-  #endif
-  #ifndef CYTHON_METH_FASTCALL
-    #define CYTHON_METH_FASTCALL (PY_VERSION_HEX >= 0x030700A1)
-  #endif
-  #ifndef CYTHON_FAST_PYCALL
-    #define CYTHON_FAST_PYCALL 1
-  #endif
-  #ifndef CYTHON_PEP487_INIT_SUBCLASS
-    #define CYTHON_PEP487_INIT_SUBCLASS 1
-  #endif
-  #if PY_VERSION_HEX < 0x03050000
-    #undef CYTHON_PEP489_MULTI_PHASE_INIT
-    #define CYTHON_PEP489_MULTI_PHASE_INIT 0
-  #elif !defined(CYTHON_PEP489_MULTI_PHASE_INIT)
-    #define CYTHON_PEP489_MULTI_PHASE_INIT 1
-  #endif
-  #ifndef CYTHON_USE_MODULE_STATE
-    #define CYTHON_USE_MODULE_STATE 0
-  #endif
-  #if PY_VERSION_HEX < 0x030400a1
-    #undef CYTHON_USE_TP_FINALIZE
-    #define CYTHON_USE_TP_FINALIZE 0
-  #elif !defined(CYTHON_USE_TP_FINALIZE)
-    #define CYTHON_USE_TP_FINALIZE 1
-  #endif
-  #if PY_VERSION_HEX < 0x030600B1
-    #undef CYTHON_USE_DICT_VERSIONS
-    #define CYTHON_USE_DICT_VERSIONS 0
-  #elif !defined(CYTHON_USE_DICT_VERSIONS)
-    #define CYTHON_USE_DICT_VERSIONS  (PY_VERSION_HEX < 0x030C00A5)
-  #endif
-  #if PY_VERSION_HEX < 0x030700A3
-    #undef CYTHON_USE_EXC_INFO_STACK
-    #define CYTHON_USE_EXC_INFO_STACK 0
-  #elif !defined(CYTHON_USE_EXC_INFO_STACK)
-    #define CYTHON_USE_EXC_INFO_STACK 1
-  #endif
-  #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
-    #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
-  #endif
-#endif
-#if !defined(CYTHON_FAST_PYCCALL)
-#define CYTHON_FAST_PYCCALL  (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
-#endif
-#if !defined(CYTHON_VECTORCALL)
-#define CYTHON_VECTORCALL  (CYTHON_FAST_PYCCALL && PY_VERSION_HEX >= 0x030800B1)
-#endif
-#define CYTHON_BACKPORT_VECTORCALL (CYTHON_METH_FASTCALL && PY_VERSION_HEX < 0x030800B1)
-#if CYTHON_USE_PYLONG_INTERNALS
-  #if PY_MAJOR_VERSION < 3
-    #include "longintrepr.h"
-  #endif
-  #undef SHIFT
-  #undef BASE
-  #undef MASK
-  #ifdef SIZEOF_VOID_P
-    enum { __pyx_check_sizeof_voidp = 1 / (int)(SIZEOF_VOID_P == sizeof(void*)) };
-  #endif
-#endif
-#ifndef __has_attribute
-  #define __has_attribute(x) 0
-#endif
-#ifndef __has_cpp_attribute
-  #define __has_cpp_attribute(x) 0
-#endif
-#ifndef CYTHON_RESTRICT
-  #if defined(__GNUC__)
-    #define CYTHON_RESTRICT __restrict__
-  #elif defined(_MSC_VER) && _MSC_VER >= 1400
-    #define CYTHON_RESTRICT __restrict
-  #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-    #define CYTHON_RESTRICT restrict
-  #else
-    #define CYTHON_RESTRICT
-  #endif
-#endif
-#ifndef CYTHON_UNUSED
-  #if defined(__cplusplus)
-    /* for clang __has_cpp_attribute(maybe_unused) is true even before C++17
-     * but leads to warnings with -pedantic, since it is a C++17 feature */
-    #if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-      #if __has_cpp_attribute(maybe_unused)
-        #define CYTHON_UNUSED [[maybe_unused]]
-      #endif
-    #endif
-  #endif
-#endif
-#ifndef CYTHON_UNUSED
-# if defined(__GNUC__)
-#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define CYTHON_UNUSED __attribute__ ((__unused__))
-#   else
-#     define CYTHON_UNUSED
-#   endif
-# elif defined(__ICC) || (defined(__INTEL_COMPILER) && !defined(_MSC_VER))
-#   define CYTHON_UNUSED __attribute__ ((__unused__))
-# else
-#   define CYTHON_UNUSED
-# endif
-#endif
-#ifndef CYTHON_UNUSED_VAR
-#  if defined(__cplusplus)
-     template<class T> void CYTHON_UNUSED_VAR( const T& ) { }
-#  else
-#    define CYTHON_UNUSED_VAR(x) (void)(x)
-#  endif
-#endif
-#ifndef CYTHON_MAYBE_UNUSED_VAR
-  #define CYTHON_MAYBE_UNUSED_VAR(x) CYTHON_UNUSED_VAR(x)
-#endif
-#ifndef CYTHON_NCP_UNUSED
-# if CYTHON_COMPILING_IN_CPYTHON
-#  define CYTHON_NCP_UNUSED
-# else
-#  define CYTHON_NCP_UNUSED CYTHON_UNUSED
-# endif
-#endif
-#ifndef CYTHON_USE_CPP_STD_MOVE
-  #if defined(__cplusplus) && (\
-    __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600))
-    #define CYTHON_USE_CPP_STD_MOVE 1
-  #else
-    #define CYTHON_USE_CPP_STD_MOVE 0
-  #endif
-#endif
-#define __Pyx_void_to_None(void_result) ((void)(void_result), Py_INCREF(Py_None), Py_None)
-#ifdef _MSC_VER
-    #ifndef _MSC_STDINT_H_
-        #if _MSC_VER < 1300
-            typedef unsigned char     uint8_t;
-            typedef unsigned short    uint16_t;
-            typedef unsigned int      uint32_t;
-        #else
-            typedef unsigned __int8   uint8_t;
-            typedef unsigned __int16  uint16_t;
-            typedef unsigned __int32  uint32_t;
-        #endif
-    #endif
-    #if _MSC_VER < 1300
-        #ifdef _WIN64
-            typedef unsigned long long  __pyx_uintptr_t;
-        #else
-            typedef unsigned int        __pyx_uintptr_t;
-        #endif
-    #else
-        #ifdef _WIN64
-            typedef unsigned __int64    __pyx_uintptr_t;
-        #else
-            typedef unsigned __int32    __pyx_uintptr_t;
-        #endif
-    #endif
-#else
-    #include <stdint.h>
-    typedef uintptr_t  __pyx_uintptr_t;
-#endif
-#ifndef CYTHON_FALLTHROUGH
-  #if defined(__cplusplus)
-    /* for clang __has_cpp_attribute(fallthrough) is true even before C++17
-     * but leads to warnings with -pedantic, since it is a C++17 feature */
-    #if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
-      #if __has_cpp_attribute(fallthrough)
-        #define CYTHON_FALLTHROUGH [[fallthrough]]
-      #endif
-    #endif
-    #ifndef CYTHON_FALLTHROUGH
-      #if __has_cpp_attribute(clang::fallthrough)
-        #define CYTHON_FALLTHROUGH [[clang::fallthrough]]
-      #elif __has_cpp_attribute(gnu::fallthrough)
-        #define CYTHON_FALLTHROUGH [[gnu::fallthrough]]
-      #endif
-    #endif
-  #endif
-  #ifndef CYTHON_FALLTHROUGH
-    #if __has_attribute(fallthrough)
-      #define CYTHON_FALLTHROUGH __attribute__((fallthrough))
-    #else
-      #define CYTHON_FALLTHROUGH
-    #endif
-  #endif
-  #if defined(__clang__) && defined(__apple_build_version__)
-    #if __apple_build_version__ < 7000000
-      #undef  CYTHON_FALLTHROUGH
-      #define CYTHON_FALLTHROUGH
-    #endif
-  #endif
-#endif
-#ifdef __cplusplus
-  template <typename T>
-  struct __PYX_IS_UNSIGNED_IMPL {static const bool value = T(0) < T(-1);};
-  #define __PYX_IS_UNSIGNED(type) (__PYX_IS_UNSIGNED_IMPL<type>::value)
-#else
-  #define __PYX_IS_UNSIGNED(type) (((type)-1) > 0)
-#endif
-#if CYTHON_COMPILING_IN_PYPY == 1
-  #define __PYX_NEED_TP_PRINT_SLOT  (PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x030A0000)
-#else
-  #define __PYX_NEED_TP_PRINT_SLOT  (PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000)
-#endif
-#define __PYX_REINTERPRET_FUNCION(func_pointer, other_pointer) ((func_pointer)(void(*)(void))(other_pointer))
-
-#ifndef __cplusplus
-  #error "Cython files generated with the C++ option must be compiled with a C++ compiler."
-#endif
-#ifndef CYTHON_INLINE
-  #if defined(__clang__)
-    #define CYTHON_INLINE __inline__ __attribute__ ((__unused__))
-  #else
-    #define CYTHON_INLINE inline
-  #endif
-#endif
-template<typename T>
-void __Pyx_call_destructor(T& x) {
-    x.~T();
-}
-template<typename T>
-class __Pyx_FakeReference {
-  public:
-    __Pyx_FakeReference() : ptr(NULL) { }
-    __Pyx_FakeReference(const T& ref) : ptr(const_cast<T*>(&ref)) { }
-    T *operator->() { return ptr; }
-    T *operator&() { return ptr; }
-    operator T&() { return *ptr; }
-    template<typename U> bool operator ==(const U& other) const { return *ptr == other; }
-    template<typename U> bool operator !=(const U& other) const { return *ptr != other; }
-    template<typename U> bool operator==(const __Pyx_FakeReference<U>& other) const { return *ptr == *other.ptr; }
-    template<typename U> bool operator!=(const __Pyx_FakeReference<U>& other) const { return *ptr != *other.ptr; }
-  private:
-    T *ptr;
-};
-
-#define __PYX_BUILD_PY_SSIZE_T "n"
-#define CYTHON_FORMAT_SSIZE_T "z"
-#if PY_MAJOR_VERSION < 3
-  #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
-  #define __Pyx_DefaultClassType PyClass_Type
-  #define __Pyx_PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\
-          PyCode_New(a+k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
-#else
-  #define __Pyx_BUILTIN_MODULE_NAME "builtins"
-  #define __Pyx_DefaultClassType PyType_Type
-#if CYTHON_COMPILING_IN_LIMITED_API
-    static CYTHON_INLINE PyObject* __Pyx_PyCode_New(int a, int p, int k, int l, int s, int f,
-                                                    PyObject *code, PyObject *c, PyObject* n, PyObject *v,
-                                                    PyObject *fv, PyObject *cell, PyObject* fn,
-                                                    PyObject *name, int fline, PyObject *lnos) {
-        PyObject *exception_table = NULL;
-        PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
-        PyObject *version_info; // borrowed
-        PyObject *py_minor_version = NULL;
-        long minor_version = 0;
-        PyObject *type, *value, *traceback;
-        PyErr_Fetch(&type, &value, &traceback);
-        #if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
-        minor_version = 11; // we don't yet need to distinguish between versions > 11
-        #else
-        if (!(version_info = PySys_GetObject("version_info"))) goto end;
-        if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
-        minor_version = PyLong_AsLong(py_minor_version);
-        if (minor_version == -1 && PyErr_Occurred()) goto end;
-        #endif
-        if (!(types_module = PyImport_ImportModule("types"))) goto end;
-        if (!(code_type = PyObject_GetAttrString(types_module, "CodeType"))) goto end;
-        if (minor_version <= 7) {
-            (void)p;
-            result = PyObject_CallFunction(code_type, "iiiiiOOOOOOiOO", a, k, l, s, f, code,
-                          c, n, v, fn, name, fline, lnos, fv, cell);
-        } else if (minor_version <= 10) {
-            result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOiOO", a,p, k, l, s, f, code,
-                          c, n, v, fn, name, fline, lnos, fv, cell);
-        } else {
-            if (!(exception_table = PyBytes_FromStringAndSize(NULL, 0))) goto end;
-            result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOOiOO", a,p, k, l, s, f, code,
-                          c, n, v, fn, name, name, fline, lnos, exception_table, fv, cell);
-        }
-    end:
-        Py_XDECREF(code_type);
-        Py_XDECREF(exception_table);
-        Py_XDECREF(types_module);
-        Py_XDECREF(py_minor_version);
-        if (type) {
-            PyErr_Restore(type, value, traceback);
-        }
-        return result;
-    }
-    #ifndef CO_OPTIMIZED
-    #define CO_OPTIMIZED 0x0001
-    #endif
-    #ifndef CO_NEWLOCALS
-    #define CO_NEWLOCALS 0x0002
-    #endif
-    #ifndef CO_VARARGS
-    #define CO_VARARGS 0x0004
-    #endif
-    #ifndef CO_VARKEYWORDS
-    #define CO_VARKEYWORDS 0x0008
-    #endif
-    #ifndef CO_ASYNC_GENERATOR
-    #define CO_ASYNC_GENERATOR 0x0200
-    #endif
-    #ifndef CO_GENERATOR
-    #define CO_GENERATOR 0x0020
-    #endif
-    #ifndef CO_COROUTINE
-    #define CO_COROUTINE 0x0080
-    #endif
-#elif PY_VERSION_HEX >= 0x030B0000
-  static CYTHON_INLINE PyCodeObject* __Pyx_PyCode_New(int a, int p, int k, int l, int s, int f,
-                                                    PyObject *code, PyObject *c, PyObject* n, PyObject *v,
-                                                    PyObject *fv, PyObject *cell, PyObject* fn,
-                                                    PyObject *name, int fline, PyObject *lnos) {
-    PyCodeObject *result;
-    PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);  // we don't have access to __pyx_empty_bytes here
-    if (!empty_bytes) return NULL;
-    result =
-      #if PY_VERSION_HEX >= 0x030C0000
-        PyUnstable_Code_NewWithPosOnlyArgs
-      #else
-        PyCode_NewWithPosOnlyArgs
-      #endif
-        (a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, name, fline, lnos, empty_bytes);
-    Py_DECREF(empty_bytes);
-    return result;
-  }
-#elif PY_VERSION_HEX >= 0x030800B2 && !CYTHON_COMPILING_IN_PYPY
-  #define __Pyx_PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\
-          PyCode_NewWithPosOnlyArgs(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
-#else
-  #define __Pyx_PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\
-          PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
-#endif
-#endif
-#if PY_VERSION_HEX >= 0x030900A4 || defined(Py_IS_TYPE)
-  #define __Pyx_IS_TYPE(ob, type) Py_IS_TYPE(ob, type)
-#else
-  #define __Pyx_IS_TYPE(ob, type) (((const PyObject*)ob)->ob_type == (type))
-#endif
-#if PY_VERSION_HEX >= 0x030A00B1 || defined(Py_Is)
-  #define __Pyx_Py_Is(x, y)  Py_Is(x, y)
-#else
-  #define __Pyx_Py_Is(x, y) ((x) == (y))
-#endif
-#if PY_VERSION_HEX >= 0x030A00B1 || defined(Py_IsNone)
-  #define __Pyx_Py_IsNone(ob) Py_IsNone(ob)
-#else
-  #define __Pyx_Py_IsNone(ob) __Pyx_Py_Is((ob), Py_None)
-#endif
-#if PY_VERSION_HEX >= 0x030A00B1 || defined(Py_IsTrue)
-  #define __Pyx_Py_IsTrue(ob) Py_IsTrue(ob)
-#else
-  #define __Pyx_Py_IsTrue(ob) __Pyx_Py_Is((ob), Py_True)
-#endif
-#if PY_VERSION_HEX >= 0x030A00B1 || defined(Py_IsFalse)
-  #define __Pyx_Py_IsFalse(ob) Py_IsFalse(ob)
-#else
-  #define __Pyx_Py_IsFalse(ob) __Pyx_Py_Is((ob), Py_False)
-#endif
-#define __Pyx_NoneAsNull(obj)  (__Pyx_Py_IsNone(obj) ? NULL : (obj))
-#if PY_VERSION_HEX >= 0x030900F0 && !CYTHON_COMPILING_IN_PYPY
-  #define __Pyx_PyObject_GC_IsFinalized(o) PyObject_GC_IsFinalized(o)
-#else
-  #define __Pyx_PyObject_GC_IsFinalized(o) _PyGC_FINALIZED(o)
-#endif
-#ifndef CO_COROUTINE
-  #define CO_COROUTINE 0x80
-#endif
-#ifndef CO_ASYNC_GENERATOR
-  #define CO_ASYNC_GENERATOR 0x200
-#endif
-#ifndef Py_TPFLAGS_CHECKTYPES
-  #define Py_TPFLAGS_CHECKTYPES 0
-#endif
-#ifndef Py_TPFLAGS_HAVE_INDEX
-  #define Py_TPFLAGS_HAVE_INDEX 0
-#endif
-#ifndef Py_TPFLAGS_HAVE_NEWBUFFER
-  #define Py_TPFLAGS_HAVE_NEWBUFFER 0
-#endif
-#ifndef Py_TPFLAGS_HAVE_FINALIZE
-  #define Py_TPFLAGS_HAVE_FINALIZE 0
-#endif
-#ifndef Py_TPFLAGS_SEQUENCE
-  #define Py_TPFLAGS_SEQUENCE 0
-#endif
-#ifndef Py_TPFLAGS_MAPPING
-  #define Py_TPFLAGS_MAPPING 0
-#endif
-#ifndef METH_STACKLESS
-  #define METH_STACKLESS 0
-#endif
-#if PY_VERSION_HEX <= 0x030700A3 || !defined(METH_FASTCALL)
-  #ifndef METH_FASTCALL
-     #define METH_FASTCALL 0x80
-  #endif
-  typedef PyObject *(*__Pyx_PyCFunctionFast) (PyObject *self, PyObject *const *args, Py_ssize_t nargs);
-  typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args,
-                                                          Py_ssize_t nargs, PyObject *kwnames);
-#else
-  #define __Pyx_PyCFunctionFast _PyCFunctionFast
-  #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
-#endif
-#if CYTHON_METH_FASTCALL
-  #define __Pyx_METH_FASTCALL METH_FASTCALL
-  #define __Pyx_PyCFunction_FastCall __Pyx_PyCFunctionFast
-  #define __Pyx_PyCFunction_FastCallWithKeywords __Pyx_PyCFunctionFastWithKeywords
-#else
-  #define __Pyx_METH_FASTCALL METH_VARARGS
-  #define __Pyx_PyCFunction_FastCall PyCFunction
-  #define __Pyx_PyCFunction_FastCallWithKeywords PyCFunctionWithKeywords
-#endif
-#if CYTHON_VECTORCALL
-  #define __pyx_vectorcallfunc vectorcallfunc
-  #define __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET  PY_VECTORCALL_ARGUMENTS_OFFSET
-  #define __Pyx_PyVectorcall_NARGS(n)  PyVectorcall_NARGS((size_t)(n))
-#elif CYTHON_BACKPORT_VECTORCALL
-  typedef PyObject *(*__pyx_vectorcallfunc)(PyObject *callable, PyObject *const *args,
-                                            size_t nargsf, PyObject *kwnames);
-  #define __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET  ((size_t)1 << (8 * sizeof(size_t) - 1))
-  #define __Pyx_PyVectorcall_NARGS(n)  ((Py_ssize_t)(((size_t)(n)) & ~__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET))
-#else
-  #define __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET  0
-  #define __Pyx_PyVectorcall_NARGS(n)  ((Py_ssize_t)(n))
-#endif
-#if __PYX_LIMITED_VERSION_HEX < 0x030900B1
-  #define __Pyx_PyType_FromModuleAndSpec(m, s, b)  ((void)m, PyType_FromSpecWithBases(s, b))
-  typedef PyObject *(*__Pyx_PyCMethod)(PyObject *, PyTypeObject *, PyObject *const *, size_t, PyObject *);
-#else
-  #define __Pyx_PyType_FromModuleAndSpec(m, s, b)  PyType_FromModuleAndSpec(m, s, b)
-  #define __Pyx_PyCMethod  PyCMethod
-#endif
-#ifndef METH_METHOD
-  #define METH_METHOD 0x200
-#endif
-#if CYTHON_COMPILING_IN_PYPY && !defined(PyObject_Malloc)
-  #define PyObject_Malloc(s)   PyMem_Malloc(s)
-  #define PyObject_Free(p)     PyMem_Free(p)
-  #define PyObject_Realloc(p)  PyMem_Realloc(p)
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-  #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
-  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)
-#else
-  #define __Pyx_PyCode_HasFreeVars(co)  (PyCode_GetNumFree(co) > 0)
-  #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-  #define __Pyx_PyThreadState_Current PyThreadState_Get()
-#elif !CYTHON_FAST_THREAD_STATE
-  #define __Pyx_PyThreadState_Current PyThreadState_GET()
-#elif PY_VERSION_HEX >= 0x03060000
-  #define __Pyx_PyThreadState_Current _PyThreadState_UncheckedGet()
-#elif PY_VERSION_HEX >= 0x03000000
-  #define __Pyx_PyThreadState_Current PyThreadState_GET()
-#else
-  #define __Pyx_PyThreadState_Current _PyThreadState_Current
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_INLINE void *__Pyx_PyModule_GetState(PyObject *op)
-{
-    void *result;
-    result = PyModule_GetState(op);
-    if (!result)
-        Py_FatalError("Couldn't find the module state");
-    return result;
-}
-#endif
-#define __Pyx_PyObject_GetSlot(obj, name, func_ctype)  __Pyx_PyType_GetSlot(Py_TYPE(obj), name, func_ctype)
-#if CYTHON_COMPILING_IN_LIMITED_API
-  #define __Pyx_PyType_GetSlot(type, name, func_ctype)  ((func_ctype) PyType_GetSlot((type), Py_##name))
-#else
-  #define __Pyx_PyType_GetSlot(type, name, func_ctype)  ((type)->name)
-#endif
-#if PY_VERSION_HEX < 0x030700A2 && !defined(PyThread_tss_create) && !defined(Py_tss_NEEDS_INIT)
-#include "pythread.h"
-#define Py_tss_NEEDS_INIT 0
-typedef int Py_tss_t;
-static CYTHON_INLINE int PyThread_tss_create(Py_tss_t *key) {
-  *key = PyThread_create_key();
-  return 0;
-}
-static CYTHON_INLINE Py_tss_t * PyThread_tss_alloc(void) {
-  Py_tss_t *key = (Py_tss_t *)PyObject_Malloc(sizeof(Py_tss_t));
-  *key = Py_tss_NEEDS_INIT;
-  return key;
-}
-static CYTHON_INLINE void PyThread_tss_free(Py_tss_t *key) {
-  PyObject_Free(key);
-}
-static CYTHON_INLINE int PyThread_tss_is_created(Py_tss_t *key) {
-  return *key != Py_tss_NEEDS_INIT;
-}
-static CYTHON_INLINE void PyThread_tss_delete(Py_tss_t *key) {
-  PyThread_delete_key(*key);
-  *key = Py_tss_NEEDS_INIT;
-}
-static CYTHON_INLINE int PyThread_tss_set(Py_tss_t *key, void *value) {
-  return PyThread_set_key_value(*key, value);
-}
-static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) {
-  return PyThread_get_key_value(*key);
-}
-#endif
-#if PY_MAJOR_VERSION < 3
-    #if CYTHON_COMPILING_IN_PYPY
-        #if PYPY_VERSION_NUM < 0x07030600
-            #if defined(__cplusplus) && __cplusplus >= 201402L
-                [[deprecated("`with nogil:` inside a nogil function will not release the GIL in PyPy2 < 7.3.6")]]
-            #elif defined(__GNUC__) || defined(__clang__)
-                __attribute__ ((__deprecated__("`with nogil:` inside a nogil function will not release the GIL in PyPy2 < 7.3.6")))
-            #elif defined(_MSC_VER)
-                __declspec(deprecated("`with nogil:` inside a nogil function will not release the GIL in PyPy2 < 7.3.6"))
-            #endif
-            static CYTHON_INLINE int PyGILState_Check(void) {
-                return 0;
-            }
-        #else  // PYPY_VERSION_NUM < 0x07030600
-        #endif  // PYPY_VERSION_NUM < 0x07030600
-    #else
-        static CYTHON_INLINE int PyGILState_Check(void) {
-            PyThreadState * tstate = _PyThreadState_Current;
-            return tstate && (tstate == PyGILState_GetThisThreadState());
-        }
-    #endif
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON || defined(_PyDict_NewPresized)
-#define __Pyx_PyDict_NewPresized(n)  ((n <= 8) ? PyDict_New() : _PyDict_NewPresized(n))
-#else
-#define __Pyx_PyDict_NewPresized(n)  PyDict_New()
-#endif
-#if PY_MAJOR_VERSION >= 3 || CYTHON_FUTURE_DIVISION
-  #define __Pyx_PyNumber_Divide(x,y)         PyNumber_TrueDivide(x,y)
-  #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceTrueDivide(x,y)
-#else
-  #define __Pyx_PyNumber_Divide(x,y)         PyNumber_Divide(x,y)
-  #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceDivide(x,y)
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX > 0x030600B4 && CYTHON_USE_UNICODE_INTERNALS
-#define __Pyx_PyDict_GetItemStrWithError(dict, name)  _PyDict_GetItem_KnownHash(dict, name, ((PyASCIIObject *) name)->hash)
-static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStr(PyObject *dict, PyObject *name) {
-    PyObject *res = __Pyx_PyDict_GetItemStrWithError(dict, name);
-    if (res == NULL) PyErr_Clear();
-    return res;
-}
-#elif PY_MAJOR_VERSION >= 3 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07020000)
-#define __Pyx_PyDict_GetItemStrWithError  PyDict_GetItemWithError
-#define __Pyx_PyDict_GetItemStr           PyDict_GetItem
-#else
-static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict, PyObject *name) {
-#if CYTHON_COMPILING_IN_PYPY
-    return PyDict_GetItem(dict, name);
-#else
-    PyDictEntry *ep;
-    PyDictObject *mp = (PyDictObject*) dict;
-    long hash = ((PyStringObject *) name)->ob_shash;
-    assert(hash != -1);
-    ep = (mp->ma_lookup)(mp, name, hash);
-    if (ep == NULL) {
-        return NULL;
-    }
-    return ep->me_value;
-#endif
-}
-#define __Pyx_PyDict_GetItemStr           PyDict_GetItem
-#endif
-#if CYTHON_USE_TYPE_SLOTS
-  #define __Pyx_PyType_GetFlags(tp)   (((PyTypeObject *)tp)->tp_flags)
-  #define __Pyx_PyType_HasFeature(type, feature)  ((__Pyx_PyType_GetFlags(type) & (feature)) != 0)
-  #define __Pyx_PyObject_GetIterNextFunc(obj)  (Py_TYPE(obj)->tp_iternext)
-#else
-  #define __Pyx_PyType_GetFlags(tp)   (PyType_GetFlags((PyTypeObject *)tp))
-  #define __Pyx_PyType_HasFeature(type, feature)  PyType_HasFeature(type, feature)
-  #define __Pyx_PyObject_GetIterNextFunc(obj)  PyIter_Next
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-  #define __Pyx_SetItemOnTypeDict(tp, k, v) PyObject_GenericSetAttr((PyObject*)tp, k, v)
-#else
-  #define __Pyx_SetItemOnTypeDict(tp, k, v) PyDict_SetItem(tp->tp_dict, k, v)
-#endif
-#if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
-#define __Pyx_PyHeapTypeObject_GC_Del(obj)  {\
-    PyTypeObject *type = Py_TYPE(obj);\
-    assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
-    PyObject_GC_Del(obj);\
-    Py_DECREF(type);\
-}
-#else
-#define __Pyx_PyHeapTypeObject_GC_Del(obj)  PyObject_GC_Del(obj)
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-  #define CYTHON_PEP393_ENABLED 1
-  #define __Pyx_PyUnicode_READY(op)       (0)
-  #define __Pyx_PyUnicode_GET_LENGTH(u)   PyUnicode_GetLength(u)
-  #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_ReadChar(u, i)
-  #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u)   ((void)u, 1114111U)
-  #define __Pyx_PyUnicode_KIND(u)         ((void)u, (0))
-  #define __Pyx_PyUnicode_DATA(u)         ((void*)u)
-  #define __Pyx_PyUnicode_READ(k, d, i)   ((void)k, PyUnicode_ReadChar((PyObject*)(d), i))
-  #define __Pyx_PyUnicode_IS_TRUE(u)      (0 != PyUnicode_GetLength(u))
-#elif PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND)
-  #define CYTHON_PEP393_ENABLED 1
-  #if PY_VERSION_HEX >= 0x030C0000
-    #define __Pyx_PyUnicode_READY(op)       (0)
-  #else
-    #define __Pyx_PyUnicode_READY(op)       (likely(PyUnicode_IS_READY(op)) ?\
-                                                0 : _PyUnicode_Ready((PyObject *)(op)))
-  #endif
-  #define __Pyx_PyUnicode_GET_LENGTH(u)   PyUnicode_GET_LENGTH(u)
-  #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i)
-  #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u)   PyUnicode_MAX_CHAR_VALUE(u)
-  #define __Pyx_PyUnicode_KIND(u)         ((int)PyUnicode_KIND(u))
-  #define __Pyx_PyUnicode_DATA(u)         PyUnicode_DATA(u)
-  #define __Pyx_PyUnicode_READ(k, d, i)   PyUnicode_READ(k, d, i)
-  #define __Pyx_PyUnicode_WRITE(k, d, i, ch)  PyUnicode_WRITE(k, d, i, (Py_UCS4) ch)
-  #if PY_VERSION_HEX >= 0x030C0000
-    #define __Pyx_PyUnicode_IS_TRUE(u)      (0 != PyUnicode_GET_LENGTH(u))
-  #else
-    #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000
-    #define __Pyx_PyUnicode_IS_TRUE(u)      (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length))
-    #else
-    #define __Pyx_PyUnicode_IS_TRUE(u)      (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u)))
-    #endif
-  #endif
-#else
-  #define CYTHON_PEP393_ENABLED 0
-  #define PyUnicode_1BYTE_KIND  1
-  #define PyUnicode_2BYTE_KIND  2
-  #define PyUnicode_4BYTE_KIND  4
-  #define __Pyx_PyUnicode_READY(op)       (0)
-  #define __Pyx_PyUnicode_GET_LENGTH(u)   PyUnicode_GET_SIZE(u)
-  #define __Pyx_PyUnicode_READ_CHAR(u, i) ((Py_UCS4)(PyUnicode_AS_UNICODE(u)[i]))
-  #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u)   ((sizeof(Py_UNICODE) == 2) ? 65535U : 1114111U)
-  #define __Pyx_PyUnicode_KIND(u)         ((int)sizeof(Py_UNICODE))
-  #define __Pyx_PyUnicode_DATA(u)         ((void*)PyUnicode_AS_UNICODE(u))
-  #define __Pyx_PyUnicode_READ(k, d, i)   ((void)(k), (Py_UCS4)(((Py_UNICODE*)d)[i]))
-  #define __Pyx_PyUnicode_WRITE(k, d, i, ch)  (((void)(k)), ((Py_UNICODE*)d)[i] = (Py_UNICODE) ch)
-  #define __Pyx_PyUnicode_IS_TRUE(u)      (0 != PyUnicode_GET_SIZE(u))
-#endif
-#if CYTHON_COMPILING_IN_PYPY
-  #define __Pyx_PyUnicode_Concat(a, b)      PyNumber_Add(a, b)
-  #define __Pyx_PyUnicode_ConcatSafe(a, b)  PyNumber_Add(a, b)
-#else
-  #define __Pyx_PyUnicode_Concat(a, b)      PyUnicode_Concat(a, b)
-  #define __Pyx_PyUnicode_ConcatSafe(a, b)  ((unlikely((a) == Py_None) || unlikely((b) == Py_None)) ?\
-      PyNumber_Add(a, b) : __Pyx_PyUnicode_Concat(a, b))
-#endif
-#if CYTHON_COMPILING_IN_PYPY
-  #if !defined(PyUnicode_DecodeUnicodeEscape)
-    #define PyUnicode_DecodeUnicodeEscape(s, size, errors)  PyUnicode_Decode(s, size, "unicode_escape", errors)
-  #endif
-  #if !defined(PyUnicode_Contains) || (PY_MAJOR_VERSION == 2 && PYPY_VERSION_NUM < 0x07030500)
-    #undef PyUnicode_Contains
-    #define PyUnicode_Contains(u, s)  PySequence_Contains(u, s)
-  #endif
-  #if !defined(PyByteArray_Check)
-    #define PyByteArray_Check(obj)  PyObject_TypeCheck(obj, &PyByteArray_Type)
-  #endif
-  #if !defined(PyObject_Format)
-    #define PyObject_Format(obj, fmt)  PyObject_CallMethod(obj, "__format__", "O", fmt)
-  #endif
-#endif
-#define __Pyx_PyString_FormatSafe(a, b)   ((unlikely((a) == Py_None || (PyString_Check(b) && !PyString_CheckExact(b)))) ? PyNumber_Remainder(a, b) : __Pyx_PyString_Format(a, b))
-#define __Pyx_PyUnicode_FormatSafe(a, b)  ((unlikely((a) == Py_None || (PyUnicode_Check(b) && !PyUnicode_CheckExact(b)))) ? PyNumber_Remainder(a, b) : PyUnicode_Format(a, b))
-#if PY_MAJOR_VERSION >= 3
-  #define __Pyx_PyString_Format(a, b)  PyUnicode_Format(a, b)
-#else
-  #define __Pyx_PyString_Format(a, b)  PyString_Format(a, b)
-#endif
-#if PY_MAJOR_VERSION < 3 && !defined(PyObject_ASCII)
-  #define PyObject_ASCII(o)            PyObject_Repr(o)
-#endif
-#if PY_MAJOR_VERSION >= 3
-  #define PyBaseString_Type            PyUnicode_Type
-  #define PyStringObject               PyUnicodeObject
-  #define PyString_Type                PyUnicode_Type
-  #define PyString_Check               PyUnicode_Check
-  #define PyString_CheckExact          PyUnicode_CheckExact
-#ifndef PyObject_Unicode
-  #define PyObject_Unicode             PyObject_Str
-#endif
-#endif
-#if PY_MAJOR_VERSION >= 3
-  #define __Pyx_PyBaseString_Check(obj) PyUnicode_Check(obj)
-  #define __Pyx_PyBaseString_CheckExact(obj) PyUnicode_CheckExact(obj)
-#else
-  #define __Pyx_PyBaseString_Check(obj) (PyString_Check(obj) || PyUnicode_Check(obj))
-  #define __Pyx_PyBaseString_CheckExact(obj) (PyString_CheckExact(obj) || PyUnicode_CheckExact(obj))
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON
-  #define __Pyx_PySequence_ListKeepNew(obj)\
-    (likely(PyList_CheckExact(obj) && Py_REFCNT(obj) == 1) ? __Pyx_NewRef(obj) : PySequence_List(obj))
-#else
-  #define __Pyx_PySequence_ListKeepNew(obj)  PySequence_List(obj)
-#endif
-#ifndef PySet_CheckExact
-  #define PySet_CheckExact(obj)        __Pyx_IS_TYPE(obj, &PySet_Type)
-#endif
-#if PY_VERSION_HEX >= 0x030900A4
-  #define __Pyx_SET_REFCNT(obj, refcnt) Py_SET_REFCNT(obj, refcnt)
-  #define __Pyx_SET_SIZE(obj, size) Py_SET_SIZE(obj, size)
-#else
-  #define __Pyx_SET_REFCNT(obj, refcnt) Py_REFCNT(obj) = (refcnt)
-  #define __Pyx_SET_SIZE(obj, size) Py_SIZE(obj) = (size)
-#endif
-#if CYTHON_ASSUME_SAFE_MACROS
-  #define __Pyx_PySequence_ITEM(o, i) PySequence_ITEM(o, i)
-  #define __Pyx_PySequence_SIZE(seq)  Py_SIZE(seq)
-  #define __Pyx_PyTuple_SET_ITEM(o, i, v) (PyTuple_SET_ITEM(o, i, v), (0))
-  #define __Pyx_PyList_SET_ITEM(o, i, v) (PyList_SET_ITEM(o, i, v), (0))
-  #define __Pyx_PyTuple_GET_SIZE(o) PyTuple_GET_SIZE(o)
-  #define __Pyx_PyList_GET_SIZE(o) PyList_GET_SIZE(o)
-  #define __Pyx_PySet_GET_SIZE(o) PySet_GET_SIZE(o)
-  #define __Pyx_PyBytes_GET_SIZE(o) PyBytes_GET_SIZE(o)
-  #define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_GET_SIZE(o)
-#else
-  #define __Pyx_PySequence_ITEM(o, i) PySequence_GetItem(o, i)
-  #define __Pyx_PySequence_SIZE(seq)  PySequence_Size(seq)
-  #define __Pyx_PyTuple_SET_ITEM(o, i, v) PyTuple_SetItem(o, i, v)
-  #define __Pyx_PyList_SET_ITEM(o, i, v) PyList_SetItem(o, i, v)
-  #define __Pyx_PyTuple_GET_SIZE(o) PyTuple_Size(o)
-  #define __Pyx_PyList_GET_SIZE(o) PyList_Size(o)
-  #define __Pyx_PySet_GET_SIZE(o) PySet_Size(o)
-  #define __Pyx_PyBytes_GET_SIZE(o) PyBytes_Size(o)
-  #define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_Size(o)
-#endif
-#if PY_MAJOR_VERSION >= 3
-  #define PyIntObject                  PyLongObject
-  #define PyInt_Type                   PyLong_Type
-  #define PyInt_Check(op)              PyLong_Check(op)
-  #define PyInt_CheckExact(op)         PyLong_CheckExact(op)
-  #define __Pyx_Py3Int_Check(op)       PyLong_Check(op)
-  #define __Pyx_Py3Int_CheckExact(op)  PyLong_CheckExact(op)
-  #define PyInt_FromString             PyLong_FromString
-  #define PyInt_FromUnicode            PyLong_FromUnicode
-  #define PyInt_FromLong               PyLong_FromLong
-  #define PyInt_FromSize_t             PyLong_FromSize_t
-  #define PyInt_FromSsize_t            PyLong_FromSsize_t
-  #define PyInt_AsLong                 PyLong_AsLong
-  #define PyInt_AS_LONG                PyLong_AS_LONG
-  #define PyInt_AsSsize_t              PyLong_AsSsize_t
-  #define PyInt_AsUnsignedLongMask     PyLong_AsUnsignedLongMask
-  #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
-  #define PyNumber_Int                 PyNumber_Long
-#else
-  #define __Pyx_Py3Int_Check(op)       (PyLong_Check(op) || PyInt_Check(op))
-  #define __Pyx_Py3Int_CheckExact(op)  (PyLong_CheckExact(op) || PyInt_CheckExact(op))
-#endif
-#if PY_MAJOR_VERSION >= 3
-  #define PyBoolObject                 PyLongObject
-#endif
-#if PY_MAJOR_VERSION >= 3 && CYTHON_COMPILING_IN_PYPY
-  #ifndef PyUnicode_InternFromString
-    #define PyUnicode_InternFromString(s) PyUnicode_FromString(s)
-  #endif
-#endif
-#if PY_VERSION_HEX < 0x030200A4
-  typedef long Py_hash_t;
-  #define __Pyx_PyInt_FromHash_t PyInt_FromLong
-  #define __Pyx_PyInt_AsHash_t   __Pyx_PyIndex_AsHash_t
-#else
-  #define __Pyx_PyInt_FromHash_t PyInt_FromSsize_t
-  #define __Pyx_PyInt_AsHash_t   __Pyx_PyIndex_AsSsize_t
-#endif
-#if CYTHON_USE_ASYNC_SLOTS
-  #if PY_VERSION_HEX >= 0x030500B1
-    #define __Pyx_PyAsyncMethodsStruct PyAsyncMethods
-    #define __Pyx_PyType_AsAsync(obj) (Py_TYPE(obj)->tp_as_async)
-  #else
-    #define __Pyx_PyType_AsAsync(obj) ((__Pyx_PyAsyncMethodsStruct*) (Py_TYPE(obj)->tp_reserved))
-  #endif
-#else
-  #define __Pyx_PyType_AsAsync(obj) NULL
-#endif
-#ifndef __Pyx_PyAsyncMethodsStruct
-    typedef struct {
-        unaryfunc am_await;
-        unaryfunc am_aiter;
-        unaryfunc am_anext;
-    } __Pyx_PyAsyncMethodsStruct;
-#endif
-
-#if defined(_WIN32) || defined(WIN32) || defined(MS_WINDOWS)
-  #if !defined(_USE_MATH_DEFINES)
-    #define _USE_MATH_DEFINES
-  #endif
-#endif
-#include <math.h>
-#ifdef NAN
-#define __PYX_NAN() ((float) NAN)
-#else
-static CYTHON_INLINE float __PYX_NAN() {
-  float value;
-  memset(&value, 0xFF, sizeof(value));
-  return value;
-}
-#endif
-#if defined(__CYGWIN__) && defined(_LDBL_EQ_DBL)
-#define __Pyx_truncl trunc
-#else
-#define __Pyx_truncl truncl
-#endif
-
-#define __PYX_MARK_ERR_POS(f_index, lineno) \
-    { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
-#define __PYX_ERR(f_index, lineno, Ln_error) \
-    { __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; }
-
-#ifdef CYTHON_EXTERN_C
-    #undef __PYX_EXTERN_C
-    #define __PYX_EXTERN_C CYTHON_EXTERN_C
-#elif defined(__PYX_EXTERN_C)
-    #ifdef _MSC_VER
-    #pragma message ("Please do not define the '__PYX_EXTERN_C' macro externally. Use 'CYTHON_EXTERN_C' instead.")
-    #else
-    #warning Please do not define the '__PYX_EXTERN_C' macro externally. Use 'CYTHON_EXTERN_C' instead.
-    #endif
-#else
-    #define __PYX_EXTERN_C extern "C++"
-#endif
-
-#define __PYX_HAVE__msgpack___cmsgpack
-#define __PYX_HAVE_API__msgpack___cmsgpack
-/* Early includes */
-#include <string.h>
-#include <stdio.h>
-#include "datetime.h"
-
-    /* Backport for Python 2.x */
-    #if PY_MAJOR_VERSION < 3
-        #ifndef PyDateTime_DELTA_GET_DAYS
-            #define PyDateTime_DELTA_GET_DAYS(o) (((PyDateTime_Delta*)o)->days)
-        #endif
-        #ifndef PyDateTime_DELTA_GET_SECONDS
-            #define PyDateTime_DELTA_GET_SECONDS(o) (((PyDateTime_Delta*)o)->seconds)
-        #endif
-        #ifndef PyDateTime_DELTA_GET_MICROSECONDS
-            #define PyDateTime_DELTA_GET_MICROSECONDS(o) (((PyDateTime_Delta*)o)->microseconds)
-        #endif
-    #endif
-
-    /* Backport for Python < 3.6 */
-    #if PY_VERSION_HEX < 0x030600a4
-        #ifndef PyDateTime_TIME_GET_FOLD
-            #define PyDateTime_TIME_GET_FOLD(o) ((void)(o), 0)
-        #endif
-        #ifndef PyDateTime_DATE_GET_FOLD
-            #define PyDateTime_DATE_GET_FOLD(o) ((void)(o), 0)
-        #endif
-    #endif
-
-    /* Backport for Python < 3.6 */
-    #if PY_VERSION_HEX < 0x030600a4
-        #define __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)             ((void)(fold), PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, minute, second,                 microsecond, tz, PyDateTimeAPI->DateTimeType))
-        #define __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)             ((void)(fold), PyDateTimeAPI->Time_FromTime(hour, minute, second, microsecond, tz, PyDateTimeAPI->TimeType))
-    #else /* For Python 3.6+ so that we can pass tz */
-        #define __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)             PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, minute, second,                 microsecond, tz, fold, PyDateTimeAPI->DateTimeType)
-        #define __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)             PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, microsecond, tz, fold, PyDateTimeAPI->TimeType)
-    #endif
-
-    /* Backport for Python < 3.7 */
-    #if PY_VERSION_HEX < 0x030700b1
-        #define __Pyx_TimeZone_UTC NULL
-        #define __Pyx_TimeZone_FromOffsetAndName(offset, name) ((void)(offset), (void)(name), (PyObject*)NULL)
-    #else
-        #define __Pyx_TimeZone_UTC PyDateTime_TimeZone_UTC
-        #define __Pyx_TimeZone_FromOffsetAndName(offset, name) PyTimeZone_FromOffsetAndName(offset, name)
-    #endif
-
-    /* Backport for Python < 3.10 */
-    #if PY_VERSION_HEX < 0x030a00a1
-        #ifndef PyDateTime_TIME_GET_TZINFO
-            #define PyDateTime_TIME_GET_TZINFO(o)                 ((((PyDateTime_Time*)o)->hastzinfo) ? ((PyDateTime_Time*)o)->tzinfo : Py_None)
-        #endif
-        #ifndef PyDateTime_DATE_GET_TZINFO
-            #define PyDateTime_DATE_GET_TZINFO(o)                 ((((PyDateTime_DateTime*)o)->hastzinfo) ? ((PyDateTime_DateTime*)o)->tzinfo : Py_None)
-        #endif
-    #endif
-    
-#include "pythread.h"
-#include "pack.h"
-#include "buff_converter.h"
-#include <stdlib.h>
-#include <limits.h>
-#include <stdint.h>
-#include "unpack.h"
-#ifdef _OPENMP
-#include <omp.h>
-#endif /* _OPENMP */
-
-#if defined(PYREX_WITHOUT_ASSERTIONS) && !defined(CYTHON_WITHOUT_ASSERTIONS)
-#define CYTHON_WITHOUT_ASSERTIONS
-#endif
-
-typedef struct {PyObject **p; const char *s; const Py_ssize_t n; const char* encoding;
-                const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry;
-
-#define __PYX_DEFAULT_STRING_ENCODING_IS_ASCII 1
-#define __PYX_DEFAULT_STRING_ENCODING_IS_UTF8 0
-#define __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT (PY_MAJOR_VERSION >= 3 && __PYX_DEFAULT_STRING_ENCODING_IS_UTF8)
-#define __PYX_DEFAULT_STRING_ENCODING "ascii"
-#define __Pyx_PyObject_FromString __Pyx_PyBytes_FromString
-#define __Pyx_PyObject_FromStringAndSize __Pyx_PyBytes_FromStringAndSize
-#define __Pyx_uchar_cast(c) ((unsigned char)c)
-#define __Pyx_long_cast(x) ((long)x)
-#define __Pyx_fits_Py_ssize_t(v, type, is_signed)  (\
-    (sizeof(type) < sizeof(Py_ssize_t))  ||\
-    (sizeof(type) > sizeof(Py_ssize_t) &&\
-          likely(v < (type)PY_SSIZE_T_MAX ||\
-                 v == (type)PY_SSIZE_T_MAX)  &&\
-          (!is_signed || likely(v > (type)PY_SSIZE_T_MIN ||\
-                                v == (type)PY_SSIZE_T_MIN)))  ||\
-    (sizeof(type) == sizeof(Py_ssize_t) &&\
-          (is_signed || likely(v < (type)PY_SSIZE_T_MAX ||\
-                               v == (type)PY_SSIZE_T_MAX)))  )
-static CYTHON_INLINE int __Pyx_is_valid_index(Py_ssize_t i, Py_ssize_t limit) {
-    return (size_t) i < (size_t) limit;
-}
-#if defined (__cplusplus) && __cplusplus >= 201103L
-    #include <cstdlib>
-    #define __Pyx_sst_abs(value) std::abs(value)
-#elif SIZEOF_INT >= SIZEOF_SIZE_T
-    #define __Pyx_sst_abs(value) abs(value)
-#elif SIZEOF_LONG >= SIZEOF_SIZE_T
-    #define __Pyx_sst_abs(value) labs(value)
-#elif defined (_MSC_VER)
-    #define __Pyx_sst_abs(value) ((Py_ssize_t)_abs64(value))
-#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-    #define __Pyx_sst_abs(value) llabs(value)
-#elif defined (__GNUC__)
-    #define __Pyx_sst_abs(value) __builtin_llabs(value)
-#else
-    #define __Pyx_sst_abs(value) ((value<0) ? -value : value)
-#endif
-static CYTHON_INLINE const char* __Pyx_PyObject_AsString(PyObject*);
-static CYTHON_INLINE const char* __Pyx_PyObject_AsStringAndSize(PyObject*, Py_ssize_t* length);
-#define __Pyx_PyByteArray_FromString(s) PyByteArray_FromStringAndSize((const char*)s, strlen((const char*)s))
-#define __Pyx_PyByteArray_FromStringAndSize(s, l) PyByteArray_FromStringAndSize((const char*)s, l)
-#define __Pyx_PyBytes_FromString        PyBytes_FromString
-#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize
-static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char*);
-#if PY_MAJOR_VERSION < 3
-    #define __Pyx_PyStr_FromString        __Pyx_PyBytes_FromString
-    #define __Pyx_PyStr_FromStringAndSize __Pyx_PyBytes_FromStringAndSize
-#else
-    #define __Pyx_PyStr_FromString        __Pyx_PyUnicode_FromString
-    #define __Pyx_PyStr_FromStringAndSize __Pyx_PyUnicode_FromStringAndSize
-#endif
-#define __Pyx_PyBytes_AsWritableString(s)     ((char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyBytes_AsWritableSString(s)    ((signed char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyBytes_AsWritableUString(s)    ((unsigned char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyBytes_AsString(s)     ((const char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyBytes_AsSString(s)    ((const signed char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyBytes_AsUString(s)    ((const unsigned char*) PyBytes_AS_STRING(s))
-#define __Pyx_PyObject_AsWritableString(s)    ((char*)(__pyx_uintptr_t) __Pyx_PyObject_AsString(s))
-#define __Pyx_PyObject_AsWritableSString(s)    ((signed char*)(__pyx_uintptr_t) __Pyx_PyObject_AsString(s))
-#define __Pyx_PyObject_AsWritableUString(s)    ((unsigned char*)(__pyx_uintptr_t) __Pyx_PyObject_AsString(s))
-#define __Pyx_PyObject_AsSString(s)    ((const signed char*) __Pyx_PyObject_AsString(s))
-#define __Pyx_PyObject_AsUString(s)    ((const unsigned char*) __Pyx_PyObject_AsString(s))
-#define __Pyx_PyObject_FromCString(s)  __Pyx_PyObject_FromString((const char*)s)
-#define __Pyx_PyBytes_FromCString(s)   __Pyx_PyBytes_FromString((const char*)s)
-#define __Pyx_PyByteArray_FromCString(s)   __Pyx_PyByteArray_FromString((const char*)s)
-#define __Pyx_PyStr_FromCString(s)     __Pyx_PyStr_FromString((const char*)s)
-#define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s)
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const wchar_t *u)
-{
-    const wchar_t *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#else
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u)
-{
-    const Py_UNICODE *u_end = u;
-    while (*u_end++) ;
-    return (size_t)(u_end - u - 1);
-}
-#endif
-#define __Pyx_PyUnicode_FromOrdinal(o)       PyUnicode_FromOrdinal((int)o)
-#define __Pyx_PyUnicode_FromUnicode(u)       PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u))
-#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode
-#define __Pyx_PyUnicode_AsUnicode            PyUnicode_AsUnicode
-#define __Pyx_NewRef(obj) (Py_INCREF(obj), obj)
-#define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None)
-static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b);
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static CYTHON_INLINE int __Pyx_PyObject_IsTrueAndDecref(PyObject*);
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_IntOrLong(PyObject* x);
-#define __Pyx_PySequence_Tuple(obj)\
-    (likely(PyTuple_CheckExact(obj)) ? __Pyx_NewRef(obj) : PySequence_Tuple(obj))
-static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
-#if CYTHON_ASSUME_SAFE_MACROS
-#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
-#else
-#define __pyx_PyFloat_AsDouble(x) PyFloat_AsDouble(x)
-#endif
-#define __pyx_PyFloat_AsFloat(x) ((float) __pyx_PyFloat_AsDouble(x))
-#if PY_MAJOR_VERSION >= 3
-#define __Pyx_PyNumber_Int(x) (PyLong_CheckExact(x) ? __Pyx_NewRef(x) : PyNumber_Long(x))
-#else
-#define __Pyx_PyNumber_Int(x) (PyInt_CheckExact(x) ? __Pyx_NewRef(x) : PyNumber_Int(x))
-#endif
-#if CYTHON_USE_PYLONG_INTERNALS
-  #if PY_VERSION_HEX >= 0x030C00A7
-  #ifndef _PyLong_SIGN_MASK
-    #define _PyLong_SIGN_MASK 3
-  #endif
-  #ifndef _PyLong_NON_SIZE_BITS
-    #define _PyLong_NON_SIZE_BITS 3
-  #endif
-  #define __Pyx_PyLong_Sign(x)  (((PyLongObject*)x)->long_value.lv_tag & _PyLong_SIGN_MASK)
-  #define __Pyx_PyLong_IsNeg(x)  ((__Pyx_PyLong_Sign(x) & 2) != 0)
-  #define __Pyx_PyLong_IsNonNeg(x)  (!__Pyx_PyLong_IsNeg(x))
-  #define __Pyx_PyLong_IsZero(x)  (__Pyx_PyLong_Sign(x) & 1)
-  #define __Pyx_PyLong_IsPos(x)  (__Pyx_PyLong_Sign(x) == 0)
-  #define __Pyx_PyLong_CompactValueUnsigned(x)  (__Pyx_PyLong_Digits(x)[0])
-  #define __Pyx_PyLong_DigitCount(x)  ((Py_ssize_t) (((PyLongObject*)x)->long_value.lv_tag >> _PyLong_NON_SIZE_BITS))
-  #define __Pyx_PyLong_SignedDigitCount(x)\
-        ((1 - (Py_ssize_t) __Pyx_PyLong_Sign(x)) * __Pyx_PyLong_DigitCount(x))
-  #if defined(PyUnstable_Long_IsCompact) && defined(PyUnstable_Long_CompactValue)
-    #define __Pyx_PyLong_IsCompact(x)     PyUnstable_Long_IsCompact((PyLongObject*) x)
-    #define __Pyx_PyLong_CompactValue(x)  PyUnstable_Long_CompactValue((PyLongObject*) x)
-  #else
-    #define __Pyx_PyLong_IsCompact(x)     (((PyLongObject*)x)->long_value.lv_tag < (2 << _PyLong_NON_SIZE_BITS))
-    #define __Pyx_PyLong_CompactValue(x)  ((1 - (Py_ssize_t) __Pyx_PyLong_Sign(x)) * (Py_ssize_t) __Pyx_PyLong_Digits(x)[0])
-  #endif
-  typedef Py_ssize_t  __Pyx_compact_pylong;
-  typedef size_t  __Pyx_compact_upylong;
-  #else  // Py < 3.12
-  #define __Pyx_PyLong_IsNeg(x)  (Py_SIZE(x) < 0)
-  #define __Pyx_PyLong_IsNonNeg(x)  (Py_SIZE(x) >= 0)
-  #define __Pyx_PyLong_IsZero(x)  (Py_SIZE(x) == 0)
-  #define __Pyx_PyLong_IsPos(x)  (Py_SIZE(x) > 0)
-  #define __Pyx_PyLong_CompactValueUnsigned(x)  ((Py_SIZE(x) == 0) ? 0 : __Pyx_PyLong_Digits(x)[0])
-  #define __Pyx_PyLong_DigitCount(x)  __Pyx_sst_abs(Py_SIZE(x))
-  #define __Pyx_PyLong_SignedDigitCount(x)  Py_SIZE(x)
-  #define __Pyx_PyLong_IsCompact(x)  (Py_SIZE(x) == 0 || Py_SIZE(x) == 1 || Py_SIZE(x) == -1)
-  #define __Pyx_PyLong_CompactValue(x)\
-        ((Py_SIZE(x) == 0) ? (sdigit) 0 : ((Py_SIZE(x) < 0) ? -(sdigit)__Pyx_PyLong_Digits(x)[0] : (sdigit)__Pyx_PyLong_Digits(x)[0]))
-  typedef sdigit  __Pyx_compact_pylong;
-  typedef digit  __Pyx_compact_upylong;
-  #endif
-  #if PY_VERSION_HEX >= 0x030C00A5
-  #define __Pyx_PyLong_Digits(x)  (((PyLongObject*)x)->long_value.ob_digit)
-  #else
-  #define __Pyx_PyLong_Digits(x)  (((PyLongObject*)x)->ob_digit)
-  #endif
-#endif
-#if PY_MAJOR_VERSION < 3 && __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
-static int __Pyx_sys_getdefaultencoding_not_ascii;
-static int __Pyx_init_sys_getdefaultencoding_params(void) {
-    PyObject* sys;
-    PyObject* default_encoding = NULL;
-    PyObject* ascii_chars_u = NULL;
-    PyObject* ascii_chars_b = NULL;
-    const char* default_encoding_c;
-    sys = PyImport_ImportModule("sys");
-    if (!sys) goto bad;
-    default_encoding = PyObject_CallMethod(sys, (char*) "getdefaultencoding", NULL);
-    Py_DECREF(sys);
-    if (!default_encoding) goto bad;
-    default_encoding_c = PyBytes_AsString(default_encoding);
-    if (!default_encoding_c) goto bad;
-    if (strcmp(default_encoding_c, "ascii") == 0) {
-        __Pyx_sys_getdefaultencoding_not_ascii = 0;
-    } else {
-        char ascii_chars[128];
-        int c;
-        for (c = 0; c < 128; c++) {
-            ascii_chars[c] = (char) c;
-        }
-        __Pyx_sys_getdefaultencoding_not_ascii = 1;
-        ascii_chars_u = PyUnicode_DecodeASCII(ascii_chars, 128, NULL);
-        if (!ascii_chars_u) goto bad;
-        ascii_chars_b = PyUnicode_AsEncodedString(ascii_chars_u, default_encoding_c, NULL);
-        if (!ascii_chars_b || !PyBytes_Check(ascii_chars_b) || memcmp(ascii_chars, PyBytes_AS_STRING(ascii_chars_b), 128) != 0) {
-            PyErr_Format(
-                PyExc_ValueError,
-                "This module compiled with c_string_encoding=ascii, but default encoding '%.200s' is not a superset of ascii.",
-                default_encoding_c);
-            goto bad;
-        }
-        Py_DECREF(ascii_chars_u);
-        Py_DECREF(ascii_chars_b);
-    }
-    Py_DECREF(default_encoding);
-    return 0;
-bad:
-    Py_XDECREF(default_encoding);
-    Py_XDECREF(ascii_chars_u);
-    Py_XDECREF(ascii_chars_b);
-    return -1;
-}
-#endif
-#if __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT && PY_MAJOR_VERSION >= 3
-#define __Pyx_PyUnicode_FromStringAndSize(c_str, size) PyUnicode_DecodeUTF8(c_str, size, NULL)
-#else
-#define __Pyx_PyUnicode_FromStringAndSize(c_str, size) PyUnicode_Decode(c_str, size, __PYX_DEFAULT_STRING_ENCODING, NULL)
-#if __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
-static char* __PYX_DEFAULT_STRING_ENCODING;
-static int __Pyx_init_sys_getdefaultencoding_params(void) {
-    PyObject* sys;
-    PyObject* default_encoding = NULL;
-    char* default_encoding_c;
-    sys = PyImport_ImportModule("sys");
-    if (!sys) goto bad;
-    default_encoding = PyObject_CallMethod(sys, (char*) (const char*) "getdefaultencoding", NULL);
-    Py_DECREF(sys);
-    if (!default_encoding) goto bad;
-    default_encoding_c = PyBytes_AsString(default_encoding);
-    if (!default_encoding_c) goto bad;
-    __PYX_DEFAULT_STRING_ENCODING = (char*) malloc(strlen(default_encoding_c) + 1);
-    if (!__PYX_DEFAULT_STRING_ENCODING) goto bad;
-    strcpy(__PYX_DEFAULT_STRING_ENCODING, default_encoding_c);
-    Py_DECREF(default_encoding);
-    return 0;
-bad:
-    Py_XDECREF(default_encoding);
-    return -1;
-}
-#endif
-#endif
-
-
-/* Test for GCC > 2.95 */
-#if defined(__GNUC__)     && (__GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)))
-  #define likely(x)   __builtin_expect(!!(x), 1)
-  #define unlikely(x) __builtin_expect(!!(x), 0)
-#else /* !__GNUC__ or GCC < 2.95 */
-  #define likely(x)   (x)
-  #define unlikely(x) (x)
-#endif /* __GNUC__ */
-static CYTHON_INLINE void __Pyx_pretend_to_initialize(void* ptr) { (void)ptr; }
-
-#if !CYTHON_USE_MODULE_STATE
-static PyObject *__pyx_m = NULL;
-#endif
-static int __pyx_lineno;
-static int __pyx_clineno = 0;
-static const char * __pyx_cfilenm = __FILE__;
-static const char *__pyx_filename;
-
-/* #### Code section: filename_table ### */
-
-static const char *__pyx_f[] = {
-  "msgpack/_packer.pyx",
-  "msgpack/_unpacker.pyx",
-  "datetime.pxd",
-  "contextvars.pxd",
-  "<stringsource>",
-  "msgpack/_cmsgpack.pyx",
-  "type.pxd",
-  "bool.pxd",
-  "complex.pxd",
-};
-/* #### Code section: utility_code_proto_before_types ### */
-/* #### Code section: numeric_typedefs ### */
-/* #### Code section: complex_type_declarations ### */
-/* #### Code section: type_declarations ### */
-
-/*--- Type declarations ---*/
-struct __pyx_obj_7msgpack_9_cmsgpack_Packer;
-struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker;
-struct __pyx_opt_args_7cpython_11contextvars_get_value;
-struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default;
-
-/* "cpython/contextvars.pxd":112
- * 
- * 
- * cdef inline object get_value(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the default value of the context variable,
- */
-struct __pyx_opt_args_7cpython_11contextvars_get_value {
-  int __pyx_n;
-  PyObject *default_value;
-};
-
-/* "cpython/contextvars.pxd":129
- * 
- * 
- * cdef inline object get_value_no_default(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the provided default value if no such value was found.
- */
-struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default {
-  int __pyx_n;
-  PyObject *default_value;
-};
-struct __pyx_opt_args_7cpython_8datetime_time_new;
-struct __pyx_opt_args_7cpython_8datetime_datetime_new;
-struct __pyx_opt_args_7cpython_8datetime_timezone_new;
-struct __pyx_opt_args_7cpython_8datetime_datetime_from_timestamp;
-
-/* "cpython/datetime.pxd":292
- * # Create time object using DateTime CAPI factory function
- * # Note, there are no range checks for any of the arguments.
- * cdef inline time time_new(int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)
- * 
- */
-struct __pyx_opt_args_7cpython_8datetime_time_new {
-  int __pyx_n;
-  int fold;
-};
-
-/* "cpython/datetime.pxd":297
- * # Create datetime object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline datetime datetime_new(int year, int month, int day, int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)
- * 
- */
-struct __pyx_opt_args_7cpython_8datetime_datetime_new {
-  int __pyx_n;
-  int fold;
-};
-
-/* "cpython/datetime.pxd":306
- * 
- * # Create timedelta object using DateTime CAPI factory function.
- * cdef inline object timezone_new(object offset, object name=None):             # <<<<<<<<<<<<<<
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- */
-struct __pyx_opt_args_7cpython_8datetime_timezone_new {
-  int __pyx_n;
-  PyObject *name;
-};
-
-/* "cpython/datetime.pxd":312
- * 
- * # Create datetime object using DB API constructor.
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.DateTime_FromTimestamp(
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)
- */
-struct __pyx_opt_args_7cpython_8datetime_datetime_from_timestamp {
-  int __pyx_n;
-  PyObject *tz;
-};
-struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack;
-struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack;
-struct __pyx_defaults;
-typedef struct __pyx_defaults __pyx_defaults;
-
-/* "msgpack/_packer.pyx":147
- *         self.pk.buf = NULL
- * 
- *     cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:             # <<<<<<<<<<<<<<
- *         cdef long long llval
- *         cdef unsigned long long ullval
- */
-struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack {
-  int __pyx_n;
-  int nest_limit;
-};
-
-/* "msgpack/_unpacker.pyx":455
- *         return 0
- * 
- *     cdef object _unpack(self, execute_fn execute, bint iter=0):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         cdef object obj
- */
-struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack {
-  int __pyx_n;
-  int iter;
-};
-struct __pyx_defaults {
-  PyObject *__pyx_arg_ext_hook;
-};
-
-/* "msgpack/_packer.pyx":62
- * 
- * 
- * cdef class Packer(object):             # <<<<<<<<<<<<<<
- *     """
- *     MessagePack Packer
- */
-struct __pyx_obj_7msgpack_9_cmsgpack_Packer {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *__pyx_vtab;
-  struct msgpack_packer pk;
-  PyObject *_default;
-  PyObject *_berrors;
-  char const *unicode_errors;
-  int strict_types;
-  int use_float;
-  int autoreset;
-  int datetime;
-};
-
-
-/* "msgpack/_unpacker.pyx":213
- * 
- * 
- * cdef class Unpacker(object):             # <<<<<<<<<<<<<<
- *     """Streaming unpacker.
- * 
- */
-struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *__pyx_vtab;
-  unpack_context ctx;
-  char *buf;
-  Py_ssize_t buf_size;
-  Py_ssize_t buf_head;
-  Py_ssize_t buf_tail;
-  PyObject *file_like;
-  PyObject *file_like_read;
-  Py_ssize_t read_size;
-  PyObject *object_hook;
-  PyObject *object_pairs_hook;
-  PyObject *list_hook;
-  PyObject *ext_hook;
-  PyObject *unicode_errors;
-  Py_ssize_t max_buffer_size;
-  uint64_t stream_offset;
-};
-
-
-
-/* "msgpack/_packer.pyx":62
- * 
- * 
- * cdef class Packer(object):             # <<<<<<<<<<<<<<
- *     """
- *     MessagePack Packer
- */
-
-struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer {
-  int (*_pack)(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *, PyObject *, struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack *__pyx_optional_args);
-  PyObject *(*pack)(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *, PyObject *, int __pyx_skip_dispatch);
-};
-static struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *__pyx_vtabptr_7msgpack_9_cmsgpack_Packer;
-
-
-/* "msgpack/_unpacker.pyx":213
- * 
- * 
- * cdef class Unpacker(object):             # <<<<<<<<<<<<<<
- *     """Streaming unpacker.
- * 
- */
-
-struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker {
-  PyObject *(*append_buffer)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *, void *, Py_ssize_t);
-  int (*read_from_file)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *);
-  PyObject *(*_unpack)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *, execute_fn, struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack *__pyx_optional_args);
-};
-static struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *__pyx_vtabptr_7msgpack_9_cmsgpack_Unpacker;
-/* #### Code section: utility_code_proto ### */
-
-/* --- Runtime support code (head) --- */
-/* Refnanny.proto */
-#ifndef CYTHON_REFNANNY
-  #define CYTHON_REFNANNY 0
-#endif
-#if CYTHON_REFNANNY
-  typedef struct {
-    void (*INCREF)(void*, PyObject*, Py_ssize_t);
-    void (*DECREF)(void*, PyObject*, Py_ssize_t);
-    void (*GOTREF)(void*, PyObject*, Py_ssize_t);
-    void (*GIVEREF)(void*, PyObject*, Py_ssize_t);
-    void* (*SetupContext)(const char*, Py_ssize_t, const char*);
-    void (*FinishContext)(void**);
-  } __Pyx_RefNannyAPIStruct;
-  static __Pyx_RefNannyAPIStruct *__Pyx_RefNanny = NULL;
-  static __Pyx_RefNannyAPIStruct *__Pyx_RefNannyImportAPI(const char *modname);
-  #define __Pyx_RefNannyDeclarations void *__pyx_refnanny = NULL;
-#ifdef WITH_THREAD
-  #define __Pyx_RefNannySetupContext(name, acquire_gil)\
-          if (acquire_gil) {\
-              PyGILState_STATE __pyx_gilstate_save = PyGILState_Ensure();\
-              __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), (__LINE__), (__FILE__));\
-              PyGILState_Release(__pyx_gilstate_save);\
-          } else {\
-              __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), (__LINE__), (__FILE__));\
-          }
-  #define __Pyx_RefNannyFinishContextNogil() {\
-              PyGILState_STATE __pyx_gilstate_save = PyGILState_Ensure();\
-              __Pyx_RefNannyFinishContext();\
-              PyGILState_Release(__pyx_gilstate_save);\
-          }
-#else
-  #define __Pyx_RefNannySetupContext(name, acquire_gil)\
-          __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), (__LINE__), (__FILE__))
-  #define __Pyx_RefNannyFinishContextNogil() __Pyx_RefNannyFinishContext()
-#endif
-  #define __Pyx_RefNannyFinishContextNogil() {\
-              PyGILState_STATE __pyx_gilstate_save = PyGILState_Ensure();\
-              __Pyx_RefNannyFinishContext();\
-              PyGILState_Release(__pyx_gilstate_save);\
-          }
-  #define __Pyx_RefNannyFinishContext()\
-          __Pyx_RefNanny->FinishContext(&__pyx_refnanny)
-  #define __Pyx_INCREF(r)  __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), (__LINE__))
-  #define __Pyx_DECREF(r)  __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), (__LINE__))
-  #define __Pyx_GOTREF(r)  __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), (__LINE__))
-  #define __Pyx_GIVEREF(r) __Pyx_RefNanny->GIVEREF(__pyx_refnanny, (PyObject *)(r), (__LINE__))
-  #define __Pyx_XINCREF(r)  do { if((r) == NULL); else {__Pyx_INCREF(r); }} while(0)
-  #define __Pyx_XDECREF(r)  do { if((r) == NULL); else {__Pyx_DECREF(r); }} while(0)
-  #define __Pyx_XGOTREF(r)  do { if((r) == NULL); else {__Pyx_GOTREF(r); }} while(0)
-  #define __Pyx_XGIVEREF(r) do { if((r) == NULL); else {__Pyx_GIVEREF(r);}} while(0)
-#else
-  #define __Pyx_RefNannyDeclarations
-  #define __Pyx_RefNannySetupContext(name, acquire_gil)
-  #define __Pyx_RefNannyFinishContextNogil()
-  #define __Pyx_RefNannyFinishContext()
-  #define __Pyx_INCREF(r) Py_INCREF(r)
-  #define __Pyx_DECREF(r) Py_DECREF(r)
-  #define __Pyx_GOTREF(r)
-  #define __Pyx_GIVEREF(r)
-  #define __Pyx_XINCREF(r) Py_XINCREF(r)
-  #define __Pyx_XDECREF(r) Py_XDECREF(r)
-  #define __Pyx_XGOTREF(r)
-  #define __Pyx_XGIVEREF(r)
-#endif
-#define __Pyx_Py_XDECREF_SET(r, v) do {\
-        PyObject *tmp = (PyObject *) r;\
-        r = v; Py_XDECREF(tmp);\
-    } while (0)
-#define __Pyx_XDECREF_SET(r, v) do {\
-        PyObject *tmp = (PyObject *) r;\
-        r = v; __Pyx_XDECREF(tmp);\
-    } while (0)
-#define __Pyx_DECREF_SET(r, v) do {\
-        PyObject *tmp = (PyObject *) r;\
-        r = v; __Pyx_DECREF(tmp);\
-    } while (0)
-#define __Pyx_CLEAR(r)    do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
-#define __Pyx_XCLEAR(r)   do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
-
-/* PyErrExceptionMatches.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_PyErr_ExceptionMatches(err) __Pyx_PyErr_ExceptionMatchesInState(__pyx_tstate, err)
-static CYTHON_INLINE int __Pyx_PyErr_ExceptionMatchesInState(PyThreadState* tstate, PyObject* err);
-#else
-#define __Pyx_PyErr_ExceptionMatches(err)  PyErr_ExceptionMatches(err)
-#endif
-
-/* PyThreadStateGet.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_PyThreadState_declare  PyThreadState *__pyx_tstate;
-#define __Pyx_PyThreadState_assign  __pyx_tstate = __Pyx_PyThreadState_Current;
-#if PY_VERSION_HEX >= 0x030C00A6
-#define __Pyx_PyErr_Occurred()  (__pyx_tstate->current_exception != NULL)
-#define __Pyx_PyErr_CurrentExceptionType()  (__pyx_tstate->current_exception ? (PyObject*) Py_TYPE(__pyx_tstate->current_exception) : (PyObject*) NULL)
-#else
-#define __Pyx_PyErr_Occurred()  (__pyx_tstate->curexc_type != NULL)
-#define __Pyx_PyErr_CurrentExceptionType()  (__pyx_tstate->curexc_type)
-#endif
-#else
-#define __Pyx_PyThreadState_declare
-#define __Pyx_PyThreadState_assign
-#define __Pyx_PyErr_Occurred()  (PyErr_Occurred() != NULL)
-#define __Pyx_PyErr_CurrentExceptionType()  PyErr_Occurred()
-#endif
-
-/* PyErrFetchRestore.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_PyErr_Clear() __Pyx_ErrRestore(NULL, NULL, NULL)
-#define __Pyx_ErrRestoreWithState(type, value, tb)  __Pyx_ErrRestoreInState(PyThreadState_GET(), type, value, tb)
-#define __Pyx_ErrFetchWithState(type, value, tb)    __Pyx_ErrFetchInState(PyThreadState_GET(), type, value, tb)
-#define __Pyx_ErrRestore(type, value, tb)  __Pyx_ErrRestoreInState(__pyx_tstate, type, value, tb)
-#define __Pyx_ErrFetch(type, value, tb)    __Pyx_ErrFetchInState(__pyx_tstate, type, value, tb)
-static CYTHON_INLINE void __Pyx_ErrRestoreInState(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb);
-static CYTHON_INLINE void __Pyx_ErrFetchInState(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A6
-#define __Pyx_PyErr_SetNone(exc) (Py_INCREF(exc), __Pyx_ErrRestore((exc), NULL, NULL))
-#else
-#define __Pyx_PyErr_SetNone(exc) PyErr_SetNone(exc)
-#endif
-#else
-#define __Pyx_PyErr_Clear() PyErr_Clear()
-#define __Pyx_PyErr_SetNone(exc) PyErr_SetNone(exc)
-#define __Pyx_ErrRestoreWithState(type, value, tb)  PyErr_Restore(type, value, tb)
-#define __Pyx_ErrFetchWithState(type, value, tb)  PyErr_Fetch(type, value, tb)
-#define __Pyx_ErrRestoreInState(tstate, type, value, tb)  PyErr_Restore(type, value, tb)
-#define __Pyx_ErrFetchInState(tstate, type, value, tb)  PyErr_Fetch(type, value, tb)
-#define __Pyx_ErrRestore(type, value, tb)  PyErr_Restore(type, value, tb)
-#define __Pyx_ErrFetch(type, value, tb)  PyErr_Fetch(type, value, tb)
-#endif
-
-/* PyObjectGetAttrStr.proto */
-#if CYTHON_USE_TYPE_SLOTS
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name);
-#else
-#define __Pyx_PyObject_GetAttrStr(o,n) PyObject_GetAttr(o,n)
-#endif
-
-/* PyObjectGetAttrStrNoError.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStrNoError(PyObject* obj, PyObject* attr_name);
-
-/* GetBuiltinName.proto */
-static PyObject *__Pyx_GetBuiltinName(PyObject *name);
-
-/* ExtTypeTest.proto */
-static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type);
-
-/* PyObjectCall.proto */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw);
-#else
-#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw)
-#endif
-
-/* RaiseException.proto */
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
-
-/* TupleAndListFromArray.proto */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE PyObject* __Pyx_PyList_FromArray(PyObject *const *src, Py_ssize_t n);
-static CYTHON_INLINE PyObject* __Pyx_PyTuple_FromArray(PyObject *const *src, Py_ssize_t n);
-#endif
-
-/* IncludeStringH.proto */
-#include <string.h>
-
-/* BytesEquals.proto */
-static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals);
-
-/* UnicodeEquals.proto */
-static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals);
-
-/* fastcall.proto */
-#if CYTHON_AVOID_BORROWED_REFS
-    #define __Pyx_Arg_VARARGS(args, i) PySequence_GetItem(args, i)
-#elif CYTHON_ASSUME_SAFE_MACROS
-    #define __Pyx_Arg_VARARGS(args, i) PyTuple_GET_ITEM(args, i)
-#else
-    #define __Pyx_Arg_VARARGS(args, i) PyTuple_GetItem(args, i)
-#endif
-#if CYTHON_AVOID_BORROWED_REFS
-    #define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
-    #define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
-#else
-    #define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
-    #define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
-#endif
-#define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
-#define __Pyx_KwValues_VARARGS(args, nargs) NULL
-#define __Pyx_GetKwValue_VARARGS(kw, kwvalues, s) __Pyx_PyDict_GetItemStrWithError(kw, s)
-#define __Pyx_KwargsAsDict_VARARGS(kw, kwvalues) PyDict_Copy(kw)
-#if CYTHON_METH_FASTCALL
-    #define __Pyx_Arg_FASTCALL(args, i) args[i]
-    #define __Pyx_NumKwargs_FASTCALL(kwds) PyTuple_GET_SIZE(kwds)
-    #define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
-    static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
-    #define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
-    #define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
-    #define __Pyx_Arg_XDECREF_FASTCALL(arg)  // no-op - arg was returned from array
-#else
-    #define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
-    #define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
-    #define __Pyx_KwValues_FASTCALL __Pyx_KwValues_VARARGS
-    #define __Pyx_GetKwValue_FASTCALL __Pyx_GetKwValue_VARARGS
-    #define __Pyx_KwargsAsDict_FASTCALL __Pyx_KwargsAsDict_VARARGS
-    #define __Pyx_Arg_NewRef_FASTCALL(arg) __Pyx_Arg_NewRef_VARARGS(arg)
-    #define __Pyx_Arg_XDECREF_FASTCALL(arg) __Pyx_Arg_XDECREF_VARARGS(arg)
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-#define __Pyx_ArgsSlice_VARARGS(args, start, stop) __Pyx_PyTuple_FromArray(&__Pyx_Arg_VARARGS(args, start), stop - start)
-#define __Pyx_ArgsSlice_FASTCALL(args, start, stop) __Pyx_PyTuple_FromArray(&__Pyx_Arg_FASTCALL(args, start), stop - start)
-#else
-#define __Pyx_ArgsSlice_VARARGS(args, start, stop) PyTuple_GetSlice(args, start, stop)
-#define __Pyx_ArgsSlice_FASTCALL(args, start, stop) PyTuple_GetSlice(args, start, stop)
-#endif
-
-/* RaiseArgTupleInvalid.proto */
-static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
-    Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found);
-
-/* KeywordStringCheck.proto */
-static int __Pyx_CheckKeywordStrings(PyObject *kw, const char* function_name, int kw_allowed);
-
-/* RaiseDoubleKeywords.proto */
-static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name);
-
-/* ParseKeywords.proto */
-static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject *const *kwvalues,
-    PyObject **argnames[],
-    PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,
-    const char* function_name);
-
-/* GetTopmostException.proto */
-#if CYTHON_USE_EXC_INFO_STACK && CYTHON_FAST_THREAD_STATE
-static _PyErr_StackItem * __Pyx_PyErr_GetTopmostException(PyThreadState *tstate);
-#endif
-
-/* SaveResetException.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_ExceptionSave(type, value, tb)  __Pyx__ExceptionSave(__pyx_tstate, type, value, tb)
-static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
-#define __Pyx_ExceptionReset(type, value, tb)  __Pyx__ExceptionReset(__pyx_tstate, type, value, tb)
-static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb);
-#else
-#define __Pyx_ExceptionSave(type, value, tb)   PyErr_GetExcInfo(type, value, tb)
-#define __Pyx_ExceptionReset(type, value, tb)  PyErr_SetExcInfo(type, value, tb)
-#endif
-
-/* GetException.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_GetException(type, value, tb)  __Pyx__GetException(__pyx_tstate, type, value, tb)
-static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
-#else
-static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb);
-#endif
-
-/* PyFunctionFastCall.proto */
-#if CYTHON_FAST_PYCALL
-#if !CYTHON_VECTORCALL
-#define __Pyx_PyFunction_FastCall(func, args, nargs)\
-    __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL)
-static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs);
-#endif
-#define __Pyx_BUILD_ASSERT_EXPR(cond)\
-    (sizeof(char [1 - 2*!(cond)]) - 1)
-#ifndef Py_MEMBER_SIZE
-#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
-#endif
-#if !CYTHON_VECTORCALL
-#if PY_VERSION_HEX >= 0x03080000
-  #include "frameobject.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
-  #ifndef Py_BUILD_CORE
-    #define Py_BUILD_CORE 1
-  #endif
-  #include "internal/pycore_frame.h"
-#endif
-  #define __Pxy_PyFrame_Initialize_Offsets()
-  #define __Pyx_PyFrame_GetLocalsplus(frame)  ((frame)->f_localsplus)
-#else
-  static size_t __pyx_pyframe_localsplus_offset = 0;
-  #include "frameobject.h"
-  #define __Pxy_PyFrame_Initialize_Offsets()\
-    ((void)__Pyx_BUILD_ASSERT_EXPR(sizeof(PyFrameObject) == offsetof(PyFrameObject, f_localsplus) + Py_MEMBER_SIZE(PyFrameObject, f_localsplus)),\
-     (void)(__pyx_pyframe_localsplus_offset = ((size_t)PyFrame_Type.tp_basicsize) - Py_MEMBER_SIZE(PyFrameObject, f_localsplus)))
-  #define __Pyx_PyFrame_GetLocalsplus(frame)\
-    (assert(__pyx_pyframe_localsplus_offset), (PyObject **)(((char *)(frame)) + __pyx_pyframe_localsplus_offset))
-#endif
-#endif
-#endif
-
-/* PyObjectCallMethO.proto */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg);
-#endif
-
-/* PyObjectFastCall.proto */
-#define __Pyx_PyObject_FastCall(func, args, nargs)  __Pyx_PyObject_FastCallDict(func, args, (size_t)(nargs), NULL)
-static CYTHON_INLINE PyObject* __Pyx_PyObject_FastCallDict(PyObject *func, PyObject **args, size_t nargs, PyObject *kwargs);
-
-/* SwapException.proto */
-#if CYTHON_FAST_THREAD_STATE
-#define __Pyx_ExceptionSwap(type, value, tb)  __Pyx__ExceptionSwap(__pyx_tstate, type, value, tb)
-static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
-#else
-static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb);
-#endif
-
-/* IterFinish.proto */
-static CYTHON_INLINE int __Pyx_IterFinish(void);
-
-/* PyObjectCallNoArg.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func);
-
-/* PyObjectCallOneArg.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg);
-
-/* PyObjectGetMethod.proto */
-static int __Pyx_PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method);
-
-/* PyObjectCallMethod0.proto */
-static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name);
-
-/* RaiseNeedMoreValuesToUnpack.proto */
-static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
-
-/* RaiseTooManyValuesToUnpack.proto */
-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected);
-
-/* UnpackItemEndCheck.proto */
-static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected);
-
-/* RaiseNoneIterError.proto */
-static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);
-
-/* UnpackTupleError.proto */
-static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index);
-
-/* UnpackTuple2.proto */
-#define __Pyx_unpack_tuple2(tuple, value1, value2, is_tuple, has_known_size, decref_tuple)\
-    (likely(is_tuple || PyTuple_Check(tuple)) ?\
-        (likely(has_known_size || PyTuple_GET_SIZE(tuple) == 2) ?\
-            __Pyx_unpack_tuple2_exact(tuple, value1, value2, decref_tuple) :\
-            (__Pyx_UnpackTupleError(tuple, 2), -1)) :\
-        __Pyx_unpack_tuple2_generic(tuple, value1, value2, has_known_size, decref_tuple))
-static CYTHON_INLINE int __Pyx_unpack_tuple2_exact(
-    PyObject* tuple, PyObject** value1, PyObject** value2, int decref_tuple);
-static int __Pyx_unpack_tuple2_generic(
-    PyObject* tuple, PyObject** value1, PyObject** value2, int has_known_size, int decref_tuple);
-
-/* dict_iter.proto */
-static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int is_dict, PyObject* method_name,
-                                                   Py_ssize_t* p_orig_length, int* p_is_dict);
-static CYTHON_INLINE int __Pyx_dict_iter_next(PyObject* dict_or_iter, Py_ssize_t orig_length, Py_ssize_t* ppos,
-                                              PyObject** pkey, PyObject** pvalue, PyObject** pitem, int is_dict);
-
-/* PyDictVersioning.proto */
-#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
-#define __PYX_DICT_VERSION_INIT  ((PY_UINT64_T) -1)
-#define __PYX_GET_DICT_VERSION(dict)  (((PyDictObject*)(dict))->ma_version_tag)
-#define __PYX_UPDATE_DICT_CACHE(dict, value, cache_var, version_var)\
-    (version_var) = __PYX_GET_DICT_VERSION(dict);\
-    (cache_var) = (value);
-#define __PYX_PY_DICT_LOOKUP_IF_MODIFIED(VAR, DICT, LOOKUP) {\
-    static PY_UINT64_T __pyx_dict_version = 0;\
-    static PyObject *__pyx_dict_cached_value = NULL;\
-    if (likely(__PYX_GET_DICT_VERSION(DICT) == __pyx_dict_version)) {\
-        (VAR) = __pyx_dict_cached_value;\
-    } else {\
-        (VAR) = __pyx_dict_cached_value = (LOOKUP);\
-        __pyx_dict_version = __PYX_GET_DICT_VERSION(DICT);\
-    }\
-}
-static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj);
-static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj);
-static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version);
-#else
-#define __PYX_GET_DICT_VERSION(dict)  (0)
-#define __PYX_UPDATE_DICT_CACHE(dict, value, cache_var, version_var)
-#define __PYX_PY_DICT_LOOKUP_IF_MODIFIED(VAR, DICT, LOOKUP)  (VAR) = (LOOKUP);
-#endif
-
-/* ReRaiseException.proto */
-static CYTHON_INLINE void __Pyx_ReraiseException(void);
-
-/* DivInt[Py_ssize_t].proto */
-static CYTHON_INLINE Py_ssize_t __Pyx_div_Py_ssize_t(Py_ssize_t, Py_ssize_t);
-
-/* GetModuleGlobalName.proto */
-#if CYTHON_USE_DICT_VERSIONS
-#define __Pyx_GetModuleGlobalName(var, name)  do {\
-    static PY_UINT64_T __pyx_dict_version = 0;\
-    static PyObject *__pyx_dict_cached_value = NULL;\
-    (var) = (likely(__pyx_dict_version == __PYX_GET_DICT_VERSION(__pyx_d))) ?\
-        (likely(__pyx_dict_cached_value) ? __Pyx_NewRef(__pyx_dict_cached_value) : __Pyx_GetBuiltinName(name)) :\
-        __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\
-} while(0)
-#define __Pyx_GetModuleGlobalNameUncached(var, name)  do {\
-    PY_UINT64_T __pyx_dict_version;\
-    PyObject *__pyx_dict_cached_value;\
-    (var) = __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\
-} while(0)
-static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value);
-#else
-#define __Pyx_GetModuleGlobalName(var, name)  (var) = __Pyx__GetModuleGlobalName(name)
-#define __Pyx_GetModuleGlobalNameUncached(var, name)  (var) = __Pyx__GetModuleGlobalName(name)
-static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name);
-#endif
-
-/* GCCDiagnostics.proto */
-#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-#define __Pyx_HAS_GCC_DIAGNOSTIC
-#endif
-
-/* BuildPyUnicode.proto */
-static PyObject* __Pyx_PyUnicode_BuildFromAscii(Py_ssize_t ulength, char* chars, int clength,
-                                                int prepend_sign, char padding_char);
-
-/* CIntToPyUnicode.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t width, char padding_char, char format_char);
-
-/* IncludeStructmemberH.proto */
-#include <structmember.h>
-
-/* FixUpExtensionType.proto */
-#if CYTHON_USE_TYPE_SPECS
-static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject *type);
-#endif
-
-/* ValidateBasesTuple.proto */
-#if CYTHON_COMPILING_IN_CPYTHON || CYTHON_COMPILING_IN_LIMITED_API || CYTHON_USE_TYPE_SPECS
-static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffset, PyObject *bases);
-#endif
-
-/* PyType_Ready.proto */
-CYTHON_UNUSED static int __Pyx_PyType_Ready(PyTypeObject *t);
-
-/* PyObject_GenericGetAttrNoDict.proto */
-#if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GenericGetAttrNoDict(PyObject* obj, PyObject* attr_name);
-#else
-#define __Pyx_PyObject_GenericGetAttrNoDict PyObject_GenericGetAttr
-#endif
-
-/* PyObject_GenericGetAttr.proto */
-#if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
-static PyObject* __Pyx_PyObject_GenericGetAttr(PyObject* obj, PyObject* attr_name);
-#else
-#define __Pyx_PyObject_GenericGetAttr PyObject_GenericGetAttr
-#endif
-
-/* SetVTable.proto */
-static int __Pyx_SetVtable(PyTypeObject* typeptr , void* vtable);
-
-/* GetVTable.proto */
-static void* __Pyx_GetVtable(PyTypeObject *type);
-
-/* MergeVTables.proto */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-static int __Pyx_MergeVtables(PyTypeObject *type);
-#endif
-
-/* SetupReduce.proto */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-static int __Pyx_setup_reduce(PyObject* type_obj);
-#endif
-
-/* TypeImport.proto */
-#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_2
-#define __PYX_HAVE_RT_ImportType_proto_3_0_2
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-#include <stdalign.h>
-#endif
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
-#define __PYX_GET_STRUCT_ALIGNMENT_3_0_2(s) alignof(s)
-#else
-#define __PYX_GET_STRUCT_ALIGNMENT_3_0_2(s) sizeof(void*)
-#endif
-enum __Pyx_ImportType_CheckSize_3_0_2 {
-   __Pyx_ImportType_CheckSize_Error_3_0_2 = 0,
-   __Pyx_ImportType_CheckSize_Warn_3_0_2 = 1,
-   __Pyx_ImportType_CheckSize_Ignore_3_0_2 = 2
-};
-static PyTypeObject *__Pyx_ImportType_3_0_2(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_2 check_size);
-#endif
-
-/* Import.proto */
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
-
-/* ImportDottedModule.proto */
-static PyObject *__Pyx_ImportDottedModule(PyObject *name, PyObject *parts_tuple);
-#if PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx_ImportDottedModule_WalkParts(PyObject *module, PyObject *name, PyObject *parts_tuple);
-#endif
-
-/* ImportFrom.proto */
-static PyObject* __Pyx_ImportFrom(PyObject* module, PyObject* name);
-
-/* FetchSharedCythonModule.proto */
-static PyObject *__Pyx_FetchSharedCythonABIModule(void);
-
-/* FetchCommonType.proto */
-#if !CYTHON_USE_TYPE_SPECS
-static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type);
-#else
-static PyTypeObject* __Pyx_FetchCommonTypeFromSpec(PyObject *module, PyType_Spec *spec, PyObject *bases);
-#endif
-
-/* PyMethodNew.proto */
-#if CYTHON_COMPILING_IN_LIMITED_API
-static PyObject *__Pyx_PyMethod_New(PyObject *func, PyObject *self, PyObject *typ) {
-    PyObject *typesModule=NULL, *methodType=NULL, *result=NULL;
-    CYTHON_UNUSED_VAR(typ);
-    if (!self)
-        return __Pyx_NewRef(func);
-    typesModule = PyImport_ImportModule("types");
-    if (!typesModule) return NULL;
-    methodType = PyObject_GetAttrString(typesModule, "MethodType");
-    Py_DECREF(typesModule);
-    if (!methodType) return NULL;
-    result = PyObject_CallFunctionObjArgs(methodType, func, self, NULL);
-    Py_DECREF(methodType);
-    return result;
-}
-#elif PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx_PyMethod_New(PyObject *func, PyObject *self, PyObject *typ) {
-    CYTHON_UNUSED_VAR(typ);
-    if (!self)
-        return __Pyx_NewRef(func);
-    return PyMethod_New(func, self);
-}
-#else
-    #define __Pyx_PyMethod_New PyMethod_New
-#endif
-
-/* PyVectorcallFastCallDict.proto */
-#if CYTHON_METH_FASTCALL
-static CYTHON_INLINE PyObject *__Pyx_PyVectorcall_FastCallDict(PyObject *func, __pyx_vectorcallfunc vc, PyObject *const *args, size_t nargs, PyObject *kw);
-#endif
-
-/* CythonFunctionShared.proto */
-#define __Pyx_CyFunction_USED
-#define __Pyx_CYFUNCTION_STATICMETHOD  0x01
-#define __Pyx_CYFUNCTION_CLASSMETHOD   0x02
-#define __Pyx_CYFUNCTION_CCLASS        0x04
-#define __Pyx_CYFUNCTION_COROUTINE     0x08
-#define __Pyx_CyFunction_GetClosure(f)\
-    (((__pyx_CyFunctionObject *) (f))->func_closure)
-#if PY_VERSION_HEX < 0x030900B1 || CYTHON_COMPILING_IN_LIMITED_API
-  #define __Pyx_CyFunction_GetClassObj(f)\
-      (((__pyx_CyFunctionObject *) (f))->func_classobj)
-#else
-  #define __Pyx_CyFunction_GetClassObj(f)\
-      ((PyObject*) ((PyCMethodObject *) (f))->mm_class)
-#endif
-#define __Pyx_CyFunction_SetClassObj(f, classobj)\
-    __Pyx__CyFunction_SetClassObj((__pyx_CyFunctionObject *) (f), (classobj))
-#define __Pyx_CyFunction_Defaults(type, f)\
-    ((type *)(((__pyx_CyFunctionObject *) (f))->defaults))
-#define __Pyx_CyFunction_SetDefaultsGetter(f, g)\
-    ((__pyx_CyFunctionObject *) (f))->defaults_getter = (g)
-typedef struct {
-#if CYTHON_COMPILING_IN_LIMITED_API
-    PyObject_HEAD
-    PyObject *func;
-#elif PY_VERSION_HEX < 0x030900B1
-    PyCFunctionObject func;
-#else
-    PyCMethodObject func;
-#endif
-#if CYTHON_BACKPORT_VECTORCALL
-    __pyx_vectorcallfunc func_vectorcall;
-#endif
-#if PY_VERSION_HEX < 0x030500A0 || CYTHON_COMPILING_IN_LIMITED_API
-    PyObject *func_weakreflist;
-#endif
-    PyObject *func_dict;
-    PyObject *func_name;
-    PyObject *func_qualname;
-    PyObject *func_doc;
-    PyObject *func_globals;
-    PyObject *func_code;
-    PyObject *func_closure;
-#if PY_VERSION_HEX < 0x030900B1 || CYTHON_COMPILING_IN_LIMITED_API
-    PyObject *func_classobj;
-#endif
-    void *defaults;
-    int defaults_pyobjects;
-    size_t defaults_size;  // used by FusedFunction for copying defaults
-    int flags;
-    PyObject *defaults_tuple;
-    PyObject *defaults_kwdict;
-    PyObject *(*defaults_getter)(PyObject *);
-    PyObject *func_annotations;
-    PyObject *func_is_coroutine;
-} __pyx_CyFunctionObject;
-#define __Pyx_CyFunction_Check(obj)  __Pyx_TypeCheck(obj, __pyx_CyFunctionType)
-#define __Pyx_IsCyOrPyCFunction(obj)  __Pyx_TypeCheck2(obj, __pyx_CyFunctionType, &PyCFunction_Type)
-#define __Pyx_CyFunction_CheckExact(obj)  __Pyx_IS_TYPE(obj, __pyx_CyFunctionType)
-static PyObject *__Pyx_CyFunction_Init(__pyx_CyFunctionObject* op, PyMethodDef *ml,
-                                      int flags, PyObject* qualname,
-                                      PyObject *closure,
-                                      PyObject *module, PyObject *globals,
-                                      PyObject* code);
-static CYTHON_INLINE void __Pyx__CyFunction_SetClassObj(__pyx_CyFunctionObject* f, PyObject* classobj);
-static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *m,
-                                                         size_t size,
-                                                         int pyobjects);
-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsTuple(PyObject *m,
-                                                            PyObject *tuple);
-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsKwDict(PyObject *m,
-                                                             PyObject *dict);
-static CYTHON_INLINE void __Pyx_CyFunction_SetAnnotationsDict(PyObject *m,
-                                                              PyObject *dict);
-static int __pyx_CyFunction_init(PyObject *module);
-#if CYTHON_METH_FASTCALL
-static PyObject * __Pyx_CyFunction_Vectorcall_NOARGS(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-static PyObject * __Pyx_CyFunction_Vectorcall_O(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
-#if CYTHON_BACKPORT_VECTORCALL
-#define __Pyx_CyFunction_func_vectorcall(f) (((__pyx_CyFunctionObject*)f)->func_vectorcall)
-#else
-#define __Pyx_CyFunction_func_vectorcall(f) (((PyCFunctionObject*)f)->vectorcall)
-#endif
-#endif
-
-/* CythonFunction.proto */
-static PyObject *__Pyx_CyFunction_New(PyMethodDef *ml,
-                                      int flags, PyObject* qualname,
-                                      PyObject *closure,
-                                      PyObject *module, PyObject *globals,
-                                      PyObject* code);
-
-/* CLineInTraceback.proto */
-#ifdef CYTHON_CLINE_IN_TRACEBACK
-#define __Pyx_CLineForTraceback(tstate, c_line)  (((CYTHON_CLINE_IN_TRACEBACK)) ? c_line : 0)
-#else
-static int __Pyx_CLineForTraceback(PyThreadState *tstate, int c_line);
-#endif
-
-/* CodeObjectCache.proto */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-typedef struct {
-    PyCodeObject* code_object;
-    int code_line;
-} __Pyx_CodeObjectCacheEntry;
-struct __Pyx_CodeObjectCache {
-    int count;
-    int max_count;
-    __Pyx_CodeObjectCacheEntry* entries;
-};
-static struct __Pyx_CodeObjectCache __pyx_code_cache = {0,0,NULL};
-static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line);
-static PyCodeObject *__pyx_find_code_object(int code_line);
-static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object);
-#endif
-
-/* AddTraceback.proto */
-static void __Pyx_AddTraceback(const char *funcname, int c_line,
-                               int py_line, const char *filename);
-
-/* None.proto */
-#include <new>
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_As_PY_LONG_LONG(PyObject *);
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
-
-/* CIntToPy.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value);
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_As_unsigned_PY_LONG_LONG(PyObject *);
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *);
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE unsigned long __Pyx_PyInt_As_unsigned_long(PyObject *);
-
-/* CIntFromPy.proto */
-static CYTHON_INLINE char __Pyx_PyInt_As_char(PyObject *);
-
-/* CIntToPy.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint64_t(uint64_t value);
-
-/* FormatTypeName.proto */
-#if CYTHON_COMPILING_IN_LIMITED_API
-typedef PyObject *__Pyx_TypeName;
-#define __Pyx_FMT_TYPENAME "%U"
-static __Pyx_TypeName __Pyx_PyType_GetName(PyTypeObject* tp);
-#define __Pyx_DECREF_TypeName(obj) Py_XDECREF(obj)
-#else
-typedef const char *__Pyx_TypeName;
-#define __Pyx_FMT_TYPENAME "%.200s"
-#define __Pyx_PyType_GetName(tp) ((tp)->tp_name)
-#define __Pyx_DECREF_TypeName(obj)
-#endif
-
-/* CIntToPy.proto */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);
-
-/* FastTypeChecks.proto */
-#if CYTHON_COMPILING_IN_CPYTHON
-#define __Pyx_TypeCheck(obj, type) __Pyx_IsSubtype(Py_TYPE(obj), (PyTypeObject *)type)
-#define __Pyx_TypeCheck2(obj, type1, type2) __Pyx_IsAnySubtype2(Py_TYPE(obj), (PyTypeObject *)type1, (PyTypeObject *)type2)
-static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b);
-static CYTHON_INLINE int __Pyx_IsAnySubtype2(PyTypeObject *cls, PyTypeObject *a, PyTypeObject *b);
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject *type);
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *type1, PyObject *type2);
-#else
-#define __Pyx_TypeCheck(obj, type) PyObject_TypeCheck(obj, (PyTypeObject *)type)
-#define __Pyx_TypeCheck2(obj, type1, type2) (PyObject_TypeCheck(obj, (PyTypeObject *)type1) || PyObject_TypeCheck(obj, (PyTypeObject *)type2))
-#define __Pyx_PyErr_GivenExceptionMatches(err, type) PyErr_GivenExceptionMatches(err, type)
-#define __Pyx_PyErr_GivenExceptionMatches2(err, type1, type2) (PyErr_GivenExceptionMatches(err, type1) || PyErr_GivenExceptionMatches(err, type2))
-#endif
-#define __Pyx_PyErr_ExceptionMatches2(err1, err2)  __Pyx_PyErr_GivenExceptionMatches2(__Pyx_PyErr_CurrentExceptionType(), err1, err2)
-#define __Pyx_PyException_Check(obj) __Pyx_TypeCheck(obj, PyExc_Exception)
-
-/* CheckBinaryVersion.proto */
-static int __Pyx_check_binary_version(void);
-
-/* InitStrings.proto */
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
-
-/* #### Code section: module_declarations ### */
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_4year_year(PyDateTime_Date *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_5month_month(PyDateTime_Date *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_3day_day(PyDateTime_Date *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_4hour_hour(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_6minute_minute(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_6second_second(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_11microsecond_microsecond(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_4time_6tzinfo_tzinfo(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_4fold_fold(PyDateTime_Time *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4year_year(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_5month_month(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_3day_day(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4hour_hour(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_6minute_minute(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_6second_second(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_11microsecond_microsecond(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_8datetime_6tzinfo_tzinfo(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4fold_fold(PyDateTime_DateTime *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_3day_day(PyDateTime_Delta *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_6second_second(PyDateTime_Delta *__pyx_v_self); /* proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_11microsecond_microsecond(PyDateTime_Delta *__pyx_v_self); /* proto*/
-static CYTHON_INLINE double __pyx_f_7cpython_7complex_7complex_4real_real(PyComplexObject *__pyx_v_self); /* proto*/
-static CYTHON_INLINE double __pyx_f_7cpython_7complex_7complex_4imag_imag(PyComplexObject *__pyx_v_self); /* proto*/
-static int __pyx_f_7msgpack_9_cmsgpack_6Packer__pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_o, struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack *__pyx_optional_args); /* proto*/
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_6Packer_pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_obj, int __pyx_skip_dispatch); /* proto*/
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_8Unpacker_append_buffer(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, void *__pyx_v__buf, Py_ssize_t __pyx_v__buf_len); /* proto*/
-static int __pyx_f_7msgpack_9_cmsgpack_8Unpacker_read_from_file(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto*/
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_8Unpacker__unpack(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, execute_fn __pyx_v_execute, struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack *__pyx_optional_args); /* proto*/
-
-/* Module declarations from "libc.string" */
-
-/* Module declarations from "libc.stdio" */
-
-/* Module declarations from "__builtin__" */
-
-/* Module declarations from "cpython.type" */
-
-/* Module declarations from "cpython.version" */
-
-/* Module declarations from "cpython.ref" */
-
-/* Module declarations from "cpython.exc" */
-
-/* Module declarations from "cpython.module" */
-
-/* Module declarations from "cpython.mem" */
-
-/* Module declarations from "cpython.tuple" */
-
-/* Module declarations from "cpython.list" */
-
-/* Module declarations from "cpython.sequence" */
-
-/* Module declarations from "cpython.mapping" */
-
-/* Module declarations from "cpython.iterator" */
-
-/* Module declarations from "cpython.number" */
-
-/* Module declarations from "cpython.int" */
-
-/* Module declarations from "__builtin__" */
-
-/* Module declarations from "cpython.bool" */
-
-/* Module declarations from "cpython.long" */
-
-/* Module declarations from "cpython.float" */
-
-/* Module declarations from "__builtin__" */
-
-/* Module declarations from "cpython.complex" */
-
-/* Module declarations from "cpython.string" */
-
-/* Module declarations from "cpython.unicode" */
-
-/* Module declarations from "cpython.pyport" */
-
-/* Module declarations from "cpython.dict" */
-
-/* Module declarations from "cpython.instance" */
-
-/* Module declarations from "cpython.function" */
-
-/* Module declarations from "cpython.method" */
-
-/* Module declarations from "cpython.weakref" */
-
-/* Module declarations from "cpython.getargs" */
-
-/* Module declarations from "cpython.pythread" */
-
-/* Module declarations from "cpython.pystate" */
-
-/* Module declarations from "cpython.cobject" */
-
-/* Module declarations from "cpython.oldbuffer" */
-
-/* Module declarations from "cpython.set" */
-
-/* Module declarations from "cpython.buffer" */
-
-/* Module declarations from "cpython.bytes" */
-
-/* Module declarations from "cpython.pycapsule" */
-
-/* Module declarations from "cpython.contextvars" */
-
-/* Module declarations from "cpython" */
-
-/* Module declarations from "cpython.object" */
-
-/* Module declarations from "datetime" */
-
-/* Module declarations from "cpython.datetime" */
-static CYTHON_INLINE void __pyx_f_7cpython_8datetime_import_datetime(void); /*proto*/
-static CYTHON_INLINE PyDateTime_DateTime *__pyx_f_7cpython_8datetime_datetime_new(int, int, int, int, int, int, int, PyObject *, struct __pyx_opt_args_7cpython_8datetime_datetime_new *__pyx_optional_args); /*proto*/
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_datetime_tzinfo(PyObject *); /*proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_days(PyObject *); /*proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_seconds(PyObject *); /*proto*/
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_microseconds(PyObject *); /*proto*/
-
-/* Module declarations from "cpython.bytearray" */
-
-/* Module declarations from "libc.stdlib" */
-
-/* Module declarations from "libc.limits" */
-
-/* Module declarations from "libc.stdint" */
-
-/* Module declarations from "msgpack._cmsgpack" */
-static PyObject *__pyx_v_7msgpack_9_cmsgpack_utc = 0;
-static PyObject *__pyx_v_7msgpack_9_cmsgpack_epoch = 0;
-static PyObject *__pyx_v_7msgpack_9_cmsgpack_ExtType = 0;
-static PyObject *__pyx_v_7msgpack_9_cmsgpack_Timestamp = 0;
-static int __pyx_v_7msgpack_9_cmsgpack_DEFAULT_RECURSE_LIMIT;
-static PY_LONG_LONG __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT;
-static PyObject *__pyx_v_7msgpack_9_cmsgpack_giga = 0;
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_Check(PyObject *); /*proto*/
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_CheckExact(PyObject *); /*proto*/
-static CYTHON_INLINE PyObject *__pyx_f_7msgpack_9_cmsgpack_init_ctx(unpack_context *, PyObject *, PyObject *, PyObject *, PyObject *, int, int, int, int, char const *, Py_ssize_t, Py_ssize_t, Py_ssize_t, Py_ssize_t, Py_ssize_t); /*proto*/
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_get_data_from_buffer(PyObject *, Py_buffer *, char **, Py_ssize_t *); /*proto*/
-/* #### Code section: typeinfo ### */
-/* #### Code section: before_global_var ### */
-#define __Pyx_MODULE_NAME "msgpack._cmsgpack"
-extern int __pyx_module_is_main_msgpack___cmsgpack;
-int __pyx_module_is_main_msgpack___cmsgpack = 0;
-
-/* Implementation of "msgpack._cmsgpack" */
-/* #### Code section: global_var ### */
-static PyObject *__pyx_builtin_MemoryError;
-static PyObject *__pyx_builtin_TypeError;
-static PyObject *__pyx_builtin_ValueError;
-static PyObject *__pyx_builtin_OverflowError;
-static PyObject *__pyx_builtin_RuntimeError;
-static PyObject *__pyx_builtin_NotImplementedError;
-static PyObject *__pyx_builtin_BufferError;
-static PyObject *__pyx_builtin_AssertionError;
-static PyObject *__pyx_builtin_StopIteration;
-/* #### Code section: string_decls ### */
-static const char __pyx_k_d[] = "d";
-static const char __pyx_k_k[] = "k";
-static const char __pyx_k_v[] = "v";
-static const char __pyx_k_gc[] = "gc";
-static const char __pyx_k__29[] = "*";
-static const char __pyx_k__30[] = ".";
-static const char __pyx_k__62[] = "?";
-static const char __pyx_k_buf[] = "buf";
-static const char __pyx_k_ctx[] = "ctx";
-static const char __pyx_k_ext[] = "ext";
-static const char __pyx_k_obj[] = "obj";
-static const char __pyx_k_off[] = "off";
-static const char __pyx_k_raw[] = "raw";
-static const char __pyx_k_ret[] = "ret";
-static const char __pyx_k_utc[] = "utc";
-static const char __pyx_k_cerr[] = "cerr";
-static const char __pyx_k_code[] = "code";
-static const char __pyx_k_data[] = "data";
-static const char __pyx_k_feed[] = "feed";
-static const char __pyx_k_main[] = "__main__";
-static const char __pyx_k_name[] = "__name__";
-static const char __pyx_k_pack[] = "pack";
-static const char __pyx_k_read[] = "read";
-static const char __pyx_k_self[] = "self";
-static const char __pyx_k_size[] = "size";
-static const char __pyx_k_skip[] = "skip";
-static const char __pyx_k_spec[] = "__spec__";
-static const char __pyx_k_tell[] = "tell";
-static const char __pyx_k_test[] = "__test__";
-static const char __pyx_k_view[] = "view";
-static const char __pyx_k_bytes[] = "bytes";
-static const char __pyx_k_items[] = "items";
-static const char __pyx_k_nread[] = "nread";
-static const char __pyx_k_pairs[] = "pairs";
-static const char __pyx_k_reset[] = "reset";
-static const char __pyx_k_Packer[] = "Packer";
-static const char __pyx_k_enable[] = "enable";
-static const char __pyx_k_import[] = "__import__";
-static const char __pyx_k_nbytes[] = "nbytes";
-static const char __pyx_k_packed[] = "packed";
-static const char __pyx_k_pybuff[] = "pybuff";
-static const char __pyx_k_reduce[] = "__reduce__";
-static const char __pyx_k_unpack[] = "unpack";
-static const char __pyx_k_ExtType[] = "ExtType";
-static const char __pyx_k_buf_len[] = "buf_len";
-static const char __pyx_k_default[] = "default";
-static const char __pyx_k_disable[] = "disable";
-static const char __pyx_k_seconds[] = "seconds";
-static const char __pyx_k_unpackb[] = "unpackb";
-static const char __pyx_k_Unpacker[] = "Unpacker";
-static const char __pyx_k_datetime[] = "datetime";
-static const char __pyx_k_ext_hook[] = "ext_hook";
-static const char __pyx_k_getstate[] = "__getstate__";
-static const char __pyx_k_setstate[] = "__setstate__";
-static const char __pyx_k_timezone[] = "timezone";
-static const char __pyx_k_typecode[] = "typecode";
-static const char __pyx_k_use_list[] = "use_list";
-static const char __pyx_k_ExtraData[] = "ExtraData";
-static const char __pyx_k_OutOfData[] = "OutOfData";
-static const char __pyx_k_Timestamp[] = "Timestamp";
-static const char __pyx_k_TypeError[] = "TypeError";
-static const char __pyx_k_autoreset[] = "autoreset";
-static const char __pyx_k_file_like[] = "file_like";
-static const char __pyx_k_getbuffer[] = "getbuffer";
-static const char __pyx_k_isenabled[] = "isenabled";
-static const char __pyx_k_list_hook[] = "list_hook";
-static const char __pyx_k_pyx_state[] = "__pyx_state";
-static const char __pyx_k_read_size[] = "read_size";
-static const char __pyx_k_reduce_ex[] = "__reduce_ex__";
-static const char __pyx_k_timestamp[] = "timestamp";
-static const char __pyx_k_BufferFull[] = "BufferFull";
-static const char __pyx_k_StackError[] = "StackError";
-static const char __pyx_k_ValueError[] = "ValueError";
-static const char __pyx_k_exceptions[] = "exceptions";
-static const char __pyx_k_next_bytes[] = "next_bytes";
-static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
-static const char __pyx_k_read_bytes[] = "read_bytes";
-static const char __pyx_k_BufferError[] = "BufferError";
-static const char __pyx_k_FormatError[] = "FormatError";
-static const char __pyx_k_MemoryError[] = "MemoryError";
-static const char __pyx_k_Packer_pack[] = "Packer.pack";
-static const char __pyx_k_max_bin_len[] = "max_bin_len";
-static const char __pyx_k_max_ext_len[] = "max_ext_len";
-static const char __pyx_k_max_map_len[] = "max_map_len";
-static const char __pyx_k_max_str_len[] = "max_str_len";
-static const char __pyx_k_nanoseconds[] = "nanoseconds";
-static const char __pyx_k_object_hook[] = "object_hook";
-static const char __pyx_k_Packer_bytes[] = "Packer.bytes";
-static const char __pyx_k_Packer_reset[] = "Packer.reset";
-static const char __pyx_k_RuntimeError[] = "RuntimeError";
-static const char __pyx_k_initializing[] = "_initializing";
-static const char __pyx_k_is_coroutine[] = "_is_coroutine";
-static const char __pyx_k_strict_types[] = "strict_types";
-static const char __pyx_k_stringsource[] = "<stringsource>";
-static const char __pyx_k_use_bin_type[] = "use_bin_type";
-static const char __pyx_k_OverflowError[] = "OverflowError";
-static const char __pyx_k_StopIteration[] = "StopIteration";
-static const char __pyx_k_Unpacker_feed[] = "Unpacker.feed";
-static const char __pyx_k_Unpacker_skip[] = "Unpacker.skip";
-static const char __pyx_k_Unpacker_tell[] = "Unpacker.tell";
-static const char __pyx_k_max_array_len[] = "max_array_len";
-static const char __pyx_k_pack_ext_type[] = "pack_ext_type";
-static const char __pyx_k_reduce_cython[] = "__reduce_cython__";
-static const char __pyx_k_AssertionError[] = "AssertionError";
-static const char __pyx_k_internal_error[] = "internal error";
-static const char __pyx_k_pack_map_pairs[] = "pack_map_pairs";
-static const char __pyx_k_strict_map_key[] = "strict_map_key";
-static const char __pyx_k_unicode_errors[] = "unicode_errors";
-static const char __pyx_k_Unpacker_unpack[] = "Unpacker.unpack";
-static const char __pyx_k_max_buffer_size[] = "max_buffer_size";
-static const char __pyx_k_pack_map_header[] = "pack_map_header";
-static const char __pyx_k_read_map_header[] = "read_map_header";
-static const char __pyx_k_setstate_cython[] = "__setstate_cython__";
-static const char __pyx_k_Packer_getbuffer[] = "Packer.getbuffer";
-static const char __pyx_k_use_single_float[] = "use_single_float";
-static const char __pyx_k_dict_is_too_large[] = "dict is too large";
-static const char __pyx_k_list_is_too_large[] = "list is too large";
-static const char __pyx_k_msgpack__cmsgpack[] = "msgpack._cmsgpack";
-static const char __pyx_k_object_pairs_hook[] = "object_pairs_hook";
-static const char __pyx_k_pack_array_header[] = "pack_array_header";
-static const char __pyx_k_read_array_header[] = "read_array_header";
-static const char __pyx_k_asyncio_coroutines[] = "asyncio.coroutines";
-static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback";
-static const char __pyx_k_NotImplementedError[] = "NotImplementedError";
-static const char __pyx_k_Unpack_failed_error[] = "Unpack failed: error = ";
-static const char __pyx_k_Unpacker_read_bytes[] = "Unpacker.read_bytes";
-static const char __pyx_k_msgpack__packer_pyx[] = "msgpack/_packer.pyx";
-static const char __pyx_k_Packer_pack_ext_type[] = "Packer.pack_ext_type";
-static const char __pyx_k_EXT_data_is_too_large[] = "EXT data is too large";
-static const char __pyx_k_Packer_pack_map_pairs[] = "Packer.pack_map_pairs";
-static const char __pyx_k_msgpack__unpacker_pyx[] = "msgpack/_unpacker.pyx";
-static const char __pyx_k_timestamp_must_be_0_3[] = "timestamp must be 0..3";
-static const char __pyx_k_No_more_data_to_unpack[] = "No more data to unpack.";
-static const char __pyx_k_Packer___reduce_cython[] = "Packer.__reduce_cython__";
-static const char __pyx_k_Packer_pack_map_header[] = "Packer.pack_map_header";
-static const char __pyx_k_memoryview_is_too_large[] = "memoryview is too large";
-static const char __pyx_k_Packer___setstate_cython[] = "Packer.__setstate_cython__";
-static const char __pyx_k_Packer_pack_array_header[] = "Packer.pack_array_header";
-static const char __pyx_k_Unpacker___reduce_cython[] = "Unpacker.__reduce_cython__";
-static const char __pyx_k_Unpacker_read_map_header[] = "Unpacker.read_map_header";
-static const char __pyx_k_recursion_limit_exceeded[] = "recursion limit exceeded.";
-static const char __pyx_k_failed_to_calculate_delta[] = "failed to calculate delta";
-static const char __pyx_k_Integer_value_out_of_range[] = "Integer value out of range";
-static const char __pyx_k_Unpacker___setstate_cython[] = "Unpacker.__setstate_cython__";
-static const char __pyx_k_Unpacker_read_array_header[] = "Unpacker.read_array_header";
-static const char __pyx_k_default_must_be_a_callable[] = "default must be a callable.";
-static const char __pyx_k_default_read_extended_type[] = "default_read_extended_type";
-static const char __pyx_k_ext_hook_must_be_a_callable[] = "ext_hook must be a callable.";
-static const char __pyx_k_unicode_string_is_too_large[] = "unicode string is too large";
-static const char __pyx_k_list_hook_must_be_a_callable[] = "list_hook must be a callable.";
-static const char __pyx_k_Unpack_failed_incomplete_input[] = "Unpack failed: incomplete input";
-static const char __pyx_k_object_hook_must_be_a_callable[] = "object_hook must be a callable.";
-static const char __pyx_k_file_like_read_must_be_a_callab[] = "`file_like.read` must be a callable.";
-static const char __pyx_k_unpacker_feed_is_not_be_able_to[] = "unpacker.feed() is not be able to use with `file_like`.";
-static const char __pyx_k_Cannot_decode_extended_type_with[] = "Cannot decode extended type with typecode=%d";
-static const char __pyx_k_Time_zones_are_not_available_fro[] = "Time zones are not available from the C-API.";
-static const char __pyx_k_Unable_to_allocate_internal_buff[] = "Unable to allocate internal buffer.";
-static const char __pyx_k_Unable_to_enlarge_internal_buffe[] = "Unable to enlarge internal buffer.";
-static const char __pyx_k_cannot_unpack_from_multi_byte_ob[] = "cannot unpack from multi-byte object";
-static const char __pyx_k_could_not_get_buffer_for_memoryv[] = "could not get buffer for memoryview";
-static const char __pyx_k_no_default___reduce___due_to_non[] = "no default __reduce__ due to non-trivial __cinit__";
-static const char __pyx_k_object_pairs_hook_and_object_hoo[] = "object_pairs_hook and object_hook are mutually exclusive.";
-static const char __pyx_k_object_pairs_hook_must_be_a_call[] = "object_pairs_hook must be a callable.";
-static const char __pyx_k_read_size_should_be_less_or_equa[] = "read_size should be less or equal to max_buffer_size";
-/* #### Code section: decls ### */
-static int __pyx_pf_7msgpack_9_cmsgpack_6Packer___cinit__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static int __pyx_pf_7msgpack_9_cmsgpack_6Packer_2__init__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_default, int __pyx_v_use_single_float, int __pyx_v_autoreset, int __pyx_v_use_bin_type, int __pyx_v_strict_types, int __pyx_v_datetime, PyObject *__pyx_v_unicode_errors); /* proto */
-static void __pyx_pf_7msgpack_9_cmsgpack_6Packer_4__dealloc__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_6pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_obj); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_8pack_ext_type(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_typecode, PyObject *__pyx_v_data); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_10pack_array_header(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PY_LONG_LONG __pyx_v_size); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_12pack_map_header(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PY_LONG_LONG __pyx_v_size); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_pairs); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_16reset(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_18bytes(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_20getbuffer(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_default_read_extended_type(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_typecode, CYTHON_UNUSED PyObject *__pyx_v_data); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_4__defaults__(CYTHON_UNUSED PyObject *__pyx_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_2unpackb(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_packed, PyObject *__pyx_v_object_hook, PyObject *__pyx_v_list_hook, int __pyx_v_use_list, int __pyx_v_raw, int __pyx_v_timestamp, int __pyx_v_strict_map_key, PyObject *__pyx_v_unicode_errors, PyObject *__pyx_v_object_pairs_hook, PyObject *__pyx_v_ext_hook, Py_ssize_t __pyx_v_max_str_len, Py_ssize_t __pyx_v_max_bin_len, Py_ssize_t __pyx_v_max_array_len, Py_ssize_t __pyx_v_max_map_len, Py_ssize_t __pyx_v_max_ext_len); /* proto */
-static int __pyx_pf_7msgpack_9_cmsgpack_8Unpacker___cinit__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static void __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_2__dealloc__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static int __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_4__init__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, PyObject *__pyx_v_file_like, Py_ssize_t __pyx_v_read_size, int __pyx_v_use_list, int __pyx_v_raw, int __pyx_v_timestamp, int __pyx_v_strict_map_key, PyObject *__pyx_v_object_hook, PyObject *__pyx_v_object_pairs_hook, PyObject *__pyx_v_list_hook, PyObject *__pyx_v_unicode_errors, Py_ssize_t __pyx_v_max_buffer_size, PyObject *__pyx_v_ext_hook, Py_ssize_t __pyx_v_max_str_len, Py_ssize_t __pyx_v_max_bin_len, Py_ssize_t __pyx_v_max_array_len, Py_ssize_t __pyx_v_max_map_len, Py_ssize_t __pyx_v_max_ext_len); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_6feed(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, PyObject *__pyx_v_next_bytes); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_8read_bytes(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, Py_ssize_t __pyx_v_nbytes); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_10unpack(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_12skip(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_14read_array_header(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_16read_map_header(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_18tell(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_20__iter__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_22__next__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self); /* proto */
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
-static PyObject *__pyx_tp_new_7msgpack_9_cmsgpack_Packer(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_7msgpack_9_cmsgpack_Unpacker(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-/* #### Code section: late_includes ### */
-/* #### Code section: module_state ### */
-typedef struct {
-  PyObject *__pyx_d;
-  PyObject *__pyx_b;
-  PyObject *__pyx_cython_runtime;
-  PyObject *__pyx_empty_tuple;
-  PyObject *__pyx_empty_bytes;
-  PyObject *__pyx_empty_unicode;
-  #ifdef __Pyx_CyFunction_USED
-  PyTypeObject *__pyx_CyFunctionType;
-  #endif
-  #ifdef __Pyx_FusedFunction_USED
-  PyTypeObject *__pyx_FusedFunctionType;
-  #endif
-  #ifdef __Pyx_Generator_USED
-  PyTypeObject *__pyx_GeneratorType;
-  #endif
-  #ifdef __Pyx_IterableCoroutine_USED
-  PyTypeObject *__pyx_IterableCoroutineType;
-  #endif
-  #ifdef __Pyx_Coroutine_USED
-  PyTypeObject *__pyx_CoroutineAwaitType;
-  #endif
-  #ifdef __Pyx_Coroutine_USED
-  PyTypeObject *__pyx_CoroutineType;
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  PyTypeObject *__pyx_ptype_7cpython_4type_type;
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  PyTypeObject *__pyx_ptype_7cpython_4bool_bool;
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  PyTypeObject *__pyx_ptype_7cpython_7complex_complex;
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  PyTypeObject *__pyx_ptype_7cpython_8datetime_date;
-  PyTypeObject *__pyx_ptype_7cpython_8datetime_time;
-  PyTypeObject *__pyx_ptype_7cpython_8datetime_datetime;
-  PyTypeObject *__pyx_ptype_7cpython_8datetime_timedelta;
-  PyTypeObject *__pyx_ptype_7cpython_8datetime_tzinfo;
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  #endif
-  #if CYTHON_USE_MODULE_STATE
-  PyObject *__pyx_type_7msgpack_9_cmsgpack_Packer;
-  PyObject *__pyx_type_7msgpack_9_cmsgpack_Unpacker;
-  #endif
-  PyTypeObject *__pyx_ptype_7msgpack_9_cmsgpack_Packer;
-  PyTypeObject *__pyx_ptype_7msgpack_9_cmsgpack_Unpacker;
-  PyObject *__pyx_n_s_AssertionError;
-  PyObject *__pyx_n_s_BufferError;
-  PyObject *__pyx_n_s_BufferFull;
-  PyObject *__pyx_kp_u_Cannot_decode_extended_type_with;
-  PyObject *__pyx_kp_u_EXT_data_is_too_large;
-  PyObject *__pyx_n_s_ExtType;
-  PyObject *__pyx_n_s_ExtraData;
-  PyObject *__pyx_n_s_FormatError;
-  PyObject *__pyx_kp_u_Integer_value_out_of_range;
-  PyObject *__pyx_n_s_MemoryError;
-  PyObject *__pyx_kp_u_No_more_data_to_unpack;
-  PyObject *__pyx_n_s_NotImplementedError;
-  PyObject *__pyx_n_s_OutOfData;
-  PyObject *__pyx_n_s_OverflowError;
-  PyObject *__pyx_n_s_Packer;
-  PyObject *__pyx_n_s_Packer___reduce_cython;
-  PyObject *__pyx_n_s_Packer___setstate_cython;
-  PyObject *__pyx_n_s_Packer_bytes;
-  PyObject *__pyx_n_s_Packer_getbuffer;
-  PyObject *__pyx_n_s_Packer_pack;
-  PyObject *__pyx_n_s_Packer_pack_array_header;
-  PyObject *__pyx_n_s_Packer_pack_ext_type;
-  PyObject *__pyx_n_s_Packer_pack_map_header;
-  PyObject *__pyx_n_s_Packer_pack_map_pairs;
-  PyObject *__pyx_n_s_Packer_reset;
-  PyObject *__pyx_n_s_RuntimeError;
-  PyObject *__pyx_n_s_StackError;
-  PyObject *__pyx_n_s_StopIteration;
-  PyObject *__pyx_kp_u_Time_zones_are_not_available_fro;
-  PyObject *__pyx_n_s_Timestamp;
-  PyObject *__pyx_n_s_TypeError;
-  PyObject *__pyx_kp_u_Unable_to_allocate_internal_buff;
-  PyObject *__pyx_kp_u_Unable_to_enlarge_internal_buffe;
-  PyObject *__pyx_kp_u_Unpack_failed_error;
-  PyObject *__pyx_kp_u_Unpack_failed_incomplete_input;
-  PyObject *__pyx_n_s_Unpacker;
-  PyObject *__pyx_n_s_Unpacker___reduce_cython;
-  PyObject *__pyx_n_s_Unpacker___setstate_cython;
-  PyObject *__pyx_n_s_Unpacker_feed;
-  PyObject *__pyx_n_s_Unpacker_read_array_header;
-  PyObject *__pyx_n_s_Unpacker_read_bytes;
-  PyObject *__pyx_n_s_Unpacker_read_map_header;
-  PyObject *__pyx_n_s_Unpacker_skip;
-  PyObject *__pyx_n_s_Unpacker_tell;
-  PyObject *__pyx_n_s_Unpacker_unpack;
-  PyObject *__pyx_n_s_ValueError;
-  PyObject *__pyx_n_s__29;
-  PyObject *__pyx_kp_u__30;
-  PyObject *__pyx_n_s__62;
-  PyObject *__pyx_n_s_asyncio_coroutines;
-  PyObject *__pyx_n_s_autoreset;
-  PyObject *__pyx_n_s_buf;
-  PyObject *__pyx_n_s_buf_len;
-  PyObject *__pyx_n_s_bytes;
-  PyObject *__pyx_kp_u_cannot_unpack_from_multi_byte_ob;
-  PyObject *__pyx_n_s_cerr;
-  PyObject *__pyx_n_s_cline_in_traceback;
-  PyObject *__pyx_n_s_code;
-  PyObject *__pyx_kp_u_could_not_get_buffer_for_memoryv;
-  PyObject *__pyx_n_s_ctx;
-  PyObject *__pyx_n_u_d;
-  PyObject *__pyx_n_s_data;
-  PyObject *__pyx_n_s_datetime;
-  PyObject *__pyx_n_s_default;
-  PyObject *__pyx_kp_u_default_must_be_a_callable;
-  PyObject *__pyx_n_s_default_read_extended_type;
-  PyObject *__pyx_kp_u_dict_is_too_large;
-  PyObject *__pyx_kp_u_disable;
-  PyObject *__pyx_kp_u_enable;
-  PyObject *__pyx_n_s_exceptions;
-  PyObject *__pyx_n_s_ext;
-  PyObject *__pyx_n_s_ext_hook;
-  PyObject *__pyx_kp_u_ext_hook_must_be_a_callable;
-  PyObject *__pyx_kp_u_failed_to_calculate_delta;
-  PyObject *__pyx_n_s_feed;
-  PyObject *__pyx_n_s_file_like;
-  PyObject *__pyx_kp_u_file_like_read_must_be_a_callab;
-  PyObject *__pyx_kp_u_gc;
-  PyObject *__pyx_n_s_getbuffer;
-  PyObject *__pyx_n_s_getstate;
-  PyObject *__pyx_n_s_import;
-  PyObject *__pyx_n_s_initializing;
-  PyObject *__pyx_kp_u_internal_error;
-  PyObject *__pyx_n_s_is_coroutine;
-  PyObject *__pyx_kp_u_isenabled;
-  PyObject *__pyx_n_s_items;
-  PyObject *__pyx_n_s_k;
-  PyObject *__pyx_n_s_list_hook;
-  PyObject *__pyx_kp_u_list_hook_must_be_a_callable;
-  PyObject *__pyx_kp_u_list_is_too_large;
-  PyObject *__pyx_n_s_main;
-  PyObject *__pyx_n_s_max_array_len;
-  PyObject *__pyx_n_s_max_bin_len;
-  PyObject *__pyx_n_s_max_buffer_size;
-  PyObject *__pyx_n_s_max_ext_len;
-  PyObject *__pyx_n_s_max_map_len;
-  PyObject *__pyx_n_s_max_str_len;
-  PyObject *__pyx_kp_u_memoryview_is_too_large;
-  PyObject *__pyx_n_s_msgpack__cmsgpack;
-  PyObject *__pyx_kp_s_msgpack__packer_pyx;
-  PyObject *__pyx_kp_s_msgpack__unpacker_pyx;
-  PyObject *__pyx_n_s_name;
-  PyObject *__pyx_n_s_nanoseconds;
-  PyObject *__pyx_n_s_nbytes;
-  PyObject *__pyx_n_s_next_bytes;
-  PyObject *__pyx_kp_s_no_default___reduce___due_to_non;
-  PyObject *__pyx_n_s_nread;
-  PyObject *__pyx_n_s_obj;
-  PyObject *__pyx_n_s_object_hook;
-  PyObject *__pyx_kp_u_object_hook_must_be_a_callable;
-  PyObject *__pyx_n_s_object_pairs_hook;
-  PyObject *__pyx_kp_u_object_pairs_hook_and_object_hoo;
-  PyObject *__pyx_kp_u_object_pairs_hook_must_be_a_call;
-  PyObject *__pyx_n_s_off;
-  PyObject *__pyx_n_s_pack;
-  PyObject *__pyx_n_s_pack_array_header;
-  PyObject *__pyx_n_s_pack_ext_type;
-  PyObject *__pyx_n_s_pack_map_header;
-  PyObject *__pyx_n_s_pack_map_pairs;
-  PyObject *__pyx_n_s_packed;
-  PyObject *__pyx_n_s_pairs;
-  PyObject *__pyx_n_s_pybuff;
-  PyObject *__pyx_n_s_pyx_state;
-  PyObject *__pyx_n_s_pyx_vtable;
-  PyObject *__pyx_n_s_raw;
-  PyObject *__pyx_n_s_read;
-  PyObject *__pyx_n_s_read_array_header;
-  PyObject *__pyx_n_s_read_bytes;
-  PyObject *__pyx_n_s_read_map_header;
-  PyObject *__pyx_n_s_read_size;
-  PyObject *__pyx_kp_u_read_size_should_be_less_or_equa;
-  PyObject *__pyx_kp_u_recursion_limit_exceeded;
-  PyObject *__pyx_n_s_reduce;
-  PyObject *__pyx_n_s_reduce_cython;
-  PyObject *__pyx_n_s_reduce_ex;
-  PyObject *__pyx_n_s_reset;
-  PyObject *__pyx_n_s_ret;
-  PyObject *__pyx_n_s_seconds;
-  PyObject *__pyx_n_s_self;
-  PyObject *__pyx_n_s_setstate;
-  PyObject *__pyx_n_s_setstate_cython;
-  PyObject *__pyx_n_s_size;
-  PyObject *__pyx_n_s_skip;
-  PyObject *__pyx_n_s_spec;
-  PyObject *__pyx_n_s_strict_map_key;
-  PyObject *__pyx_n_s_strict_types;
-  PyObject *__pyx_kp_s_stringsource;
-  PyObject *__pyx_n_s_tell;
-  PyObject *__pyx_n_s_test;
-  PyObject *__pyx_n_s_timestamp;
-  PyObject *__pyx_kp_u_timestamp_must_be_0_3;
-  PyObject *__pyx_n_s_timezone;
-  PyObject *__pyx_n_s_typecode;
-  PyObject *__pyx_n_s_unicode_errors;
-  PyObject *__pyx_kp_u_unicode_string_is_too_large;
-  PyObject *__pyx_n_s_unpack;
-  PyObject *__pyx_n_s_unpackb;
-  PyObject *__pyx_kp_u_unpacker_feed_is_not_be_able_to;
-  PyObject *__pyx_n_s_use_bin_type;
-  PyObject *__pyx_n_s_use_list;
-  PyObject *__pyx_n_s_use_single_float;
-  PyObject *__pyx_n_s_utc;
-  PyObject *__pyx_n_s_v;
-  PyObject *__pyx_n_s_view;
-  PyObject *__pyx_int_0;
-  PyObject *__pyx_int_1000000000;
-  int __pyx_k__4;
-  PyObject *__pyx_k__23;
-  PyObject *__pyx_tuple_;
-  PyObject *__pyx_tuple__2;
-  PyObject *__pyx_tuple__3;
-  PyObject *__pyx_tuple__5;
-  PyObject *__pyx_tuple__6;
-  PyObject *__pyx_tuple__7;
-  PyObject *__pyx_tuple__8;
-  PyObject *__pyx_tuple__9;
-  PyObject *__pyx_tuple__10;
-  PyObject *__pyx_tuple__11;
-  PyObject *__pyx_tuple__12;
-  PyObject *__pyx_tuple__13;
-  PyObject *__pyx_tuple__14;
-  PyObject *__pyx_tuple__15;
-  PyObject *__pyx_tuple__16;
-  PyObject *__pyx_tuple__17;
-  PyObject *__pyx_tuple__18;
-  PyObject *__pyx_tuple__19;
-  PyObject *__pyx_tuple__20;
-  PyObject *__pyx_tuple__21;
-  PyObject *__pyx_tuple__22;
-  PyObject *__pyx_tuple__24;
-  PyObject *__pyx_tuple__25;
-  PyObject *__pyx_tuple__26;
-  PyObject *__pyx_tuple__27;
-  PyObject *__pyx_tuple__28;
-  PyObject *__pyx_tuple__31;
-  PyObject *__pyx_tuple__33;
-  PyObject *__pyx_tuple__35;
-  PyObject *__pyx_tuple__38;
-  PyObject *__pyx_tuple__40;
-  PyObject *__pyx_tuple__45;
-  PyObject *__pyx_tuple__47;
-  PyObject *__pyx_tuple__49;
-  PyObject *__pyx_tuple__51;
-  PyObject *__pyx_tuple__53;
-  PyObject *__pyx_codeobj__32;
-  PyObject *__pyx_codeobj__34;
-  PyObject *__pyx_codeobj__36;
-  PyObject *__pyx_codeobj__37;
-  PyObject *__pyx_codeobj__39;
-  PyObject *__pyx_codeobj__41;
-  PyObject *__pyx_codeobj__42;
-  PyObject *__pyx_codeobj__43;
-  PyObject *__pyx_codeobj__44;
-  PyObject *__pyx_codeobj__46;
-  PyObject *__pyx_codeobj__48;
-  PyObject *__pyx_codeobj__50;
-  PyObject *__pyx_codeobj__52;
-  PyObject *__pyx_codeobj__54;
-  PyObject *__pyx_codeobj__55;
-  PyObject *__pyx_codeobj__56;
-  PyObject *__pyx_codeobj__57;
-  PyObject *__pyx_codeobj__58;
-  PyObject *__pyx_codeobj__59;
-  PyObject *__pyx_codeobj__60;
-  PyObject *__pyx_codeobj__61;
-} __pyx_mstate;
-
-#if CYTHON_USE_MODULE_STATE
-#ifdef __cplusplus
-namespace {
-  extern struct PyModuleDef __pyx_moduledef;
-} /* anonymous namespace */
-#else
-static struct PyModuleDef __pyx_moduledef;
-#endif
-
-#define __pyx_mstate(o) ((__pyx_mstate *)__Pyx_PyModule_GetState(o))
-
-#define __pyx_mstate_global (__pyx_mstate(PyState_FindModule(&__pyx_moduledef)))
-
-#define __pyx_m (PyState_FindModule(&__pyx_moduledef))
-#else
-static __pyx_mstate __pyx_mstate_global_static =
-#ifdef __cplusplus
-    {};
-#else
-    {0};
-#endif
-static __pyx_mstate *__pyx_mstate_global = &__pyx_mstate_global_static;
-#endif
-/* #### Code section: module_state_clear ### */
-#if CYTHON_USE_MODULE_STATE
-static int __pyx_m_clear(PyObject *m) {
-  __pyx_mstate *clear_module_state = __pyx_mstate(m);
-  if (!clear_module_state) return 0;
-  Py_CLEAR(clear_module_state->__pyx_d);
-  Py_CLEAR(clear_module_state->__pyx_b);
-  Py_CLEAR(clear_module_state->__pyx_cython_runtime);
-  Py_CLEAR(clear_module_state->__pyx_empty_tuple);
-  Py_CLEAR(clear_module_state->__pyx_empty_bytes);
-  Py_CLEAR(clear_module_state->__pyx_empty_unicode);
-  #ifdef __Pyx_CyFunction_USED
-  Py_CLEAR(clear_module_state->__pyx_CyFunctionType);
-  #endif
-  #ifdef __Pyx_FusedFunction_USED
-  Py_CLEAR(clear_module_state->__pyx_FusedFunctionType);
-  #endif
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_4type_type);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_4bool_bool);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_7complex_complex);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_8datetime_date);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_8datetime_time);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_8datetime_datetime);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_8datetime_timedelta);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7cpython_8datetime_tzinfo);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-  Py_CLEAR(clear_module_state->__pyx_type_7msgpack_9_cmsgpack_Packer);
-  Py_CLEAR(clear_module_state->__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-  Py_CLEAR(clear_module_state->__pyx_type_7msgpack_9_cmsgpack_Unpacker);
-  Py_CLEAR(clear_module_state->__pyx_n_s_AssertionError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_BufferError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_BufferFull);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Cannot_decode_extended_type_with);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_EXT_data_is_too_large);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ExtType);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ExtraData);
-  Py_CLEAR(clear_module_state->__pyx_n_s_FormatError);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Integer_value_out_of_range);
-  Py_CLEAR(clear_module_state->__pyx_n_s_MemoryError);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_No_more_data_to_unpack);
-  Py_CLEAR(clear_module_state->__pyx_n_s_NotImplementedError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_OutOfData);
-  Py_CLEAR(clear_module_state->__pyx_n_s_OverflowError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer___reduce_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer___setstate_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_bytes);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_getbuffer);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_pack);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_pack_array_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_pack_ext_type);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_pack_map_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_pack_map_pairs);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Packer_reset);
-  Py_CLEAR(clear_module_state->__pyx_n_s_RuntimeError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_StackError);
-  Py_CLEAR(clear_module_state->__pyx_n_s_StopIteration);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Time_zones_are_not_available_fro);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Timestamp);
-  Py_CLEAR(clear_module_state->__pyx_n_s_TypeError);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Unable_to_allocate_internal_buff);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Unable_to_enlarge_internal_buffe);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Unpack_failed_error);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_Unpack_failed_incomplete_input);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker___reduce_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker___setstate_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_feed);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_read_array_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_read_bytes);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_read_map_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_skip);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_tell);
-  Py_CLEAR(clear_module_state->__pyx_n_s_Unpacker_unpack);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ValueError);
-  Py_CLEAR(clear_module_state->__pyx_n_s__29);
-  Py_CLEAR(clear_module_state->__pyx_kp_u__30);
-  Py_CLEAR(clear_module_state->__pyx_n_s__62);
-  Py_CLEAR(clear_module_state->__pyx_n_s_asyncio_coroutines);
-  Py_CLEAR(clear_module_state->__pyx_n_s_autoreset);
-  Py_CLEAR(clear_module_state->__pyx_n_s_buf);
-  Py_CLEAR(clear_module_state->__pyx_n_s_buf_len);
-  Py_CLEAR(clear_module_state->__pyx_n_s_bytes);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_cannot_unpack_from_multi_byte_ob);
-  Py_CLEAR(clear_module_state->__pyx_n_s_cerr);
-  Py_CLEAR(clear_module_state->__pyx_n_s_cline_in_traceback);
-  Py_CLEAR(clear_module_state->__pyx_n_s_code);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_could_not_get_buffer_for_memoryv);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ctx);
-  Py_CLEAR(clear_module_state->__pyx_n_u_d);
-  Py_CLEAR(clear_module_state->__pyx_n_s_data);
-  Py_CLEAR(clear_module_state->__pyx_n_s_datetime);
-  Py_CLEAR(clear_module_state->__pyx_n_s_default);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_default_must_be_a_callable);
-  Py_CLEAR(clear_module_state->__pyx_n_s_default_read_extended_type);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_dict_is_too_large);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_disable);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_enable);
-  Py_CLEAR(clear_module_state->__pyx_n_s_exceptions);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ext);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ext_hook);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_ext_hook_must_be_a_callable);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_failed_to_calculate_delta);
-  Py_CLEAR(clear_module_state->__pyx_n_s_feed);
-  Py_CLEAR(clear_module_state->__pyx_n_s_file_like);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_file_like_read_must_be_a_callab);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_gc);
-  Py_CLEAR(clear_module_state->__pyx_n_s_getbuffer);
-  Py_CLEAR(clear_module_state->__pyx_n_s_getstate);
-  Py_CLEAR(clear_module_state->__pyx_n_s_import);
-  Py_CLEAR(clear_module_state->__pyx_n_s_initializing);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_internal_error);
-  Py_CLEAR(clear_module_state->__pyx_n_s_is_coroutine);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_isenabled);
-  Py_CLEAR(clear_module_state->__pyx_n_s_items);
-  Py_CLEAR(clear_module_state->__pyx_n_s_k);
-  Py_CLEAR(clear_module_state->__pyx_n_s_list_hook);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_list_hook_must_be_a_callable);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_list_is_too_large);
-  Py_CLEAR(clear_module_state->__pyx_n_s_main);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_array_len);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_bin_len);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_buffer_size);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_ext_len);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_map_len);
-  Py_CLEAR(clear_module_state->__pyx_n_s_max_str_len);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_memoryview_is_too_large);
-  Py_CLEAR(clear_module_state->__pyx_n_s_msgpack__cmsgpack);
-  Py_CLEAR(clear_module_state->__pyx_kp_s_msgpack__packer_pyx);
-  Py_CLEAR(clear_module_state->__pyx_kp_s_msgpack__unpacker_pyx);
-  Py_CLEAR(clear_module_state->__pyx_n_s_name);
-  Py_CLEAR(clear_module_state->__pyx_n_s_nanoseconds);
-  Py_CLEAR(clear_module_state->__pyx_n_s_nbytes);
-  Py_CLEAR(clear_module_state->__pyx_n_s_next_bytes);
-  Py_CLEAR(clear_module_state->__pyx_kp_s_no_default___reduce___due_to_non);
-  Py_CLEAR(clear_module_state->__pyx_n_s_nread);
-  Py_CLEAR(clear_module_state->__pyx_n_s_obj);
-  Py_CLEAR(clear_module_state->__pyx_n_s_object_hook);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_object_hook_must_be_a_callable);
-  Py_CLEAR(clear_module_state->__pyx_n_s_object_pairs_hook);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_object_pairs_hook_and_object_hoo);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_object_pairs_hook_must_be_a_call);
-  Py_CLEAR(clear_module_state->__pyx_n_s_off);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pack);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pack_array_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pack_ext_type);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pack_map_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pack_map_pairs);
-  Py_CLEAR(clear_module_state->__pyx_n_s_packed);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pairs);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pybuff);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pyx_state);
-  Py_CLEAR(clear_module_state->__pyx_n_s_pyx_vtable);
-  Py_CLEAR(clear_module_state->__pyx_n_s_raw);
-  Py_CLEAR(clear_module_state->__pyx_n_s_read);
-  Py_CLEAR(clear_module_state->__pyx_n_s_read_array_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_read_bytes);
-  Py_CLEAR(clear_module_state->__pyx_n_s_read_map_header);
-  Py_CLEAR(clear_module_state->__pyx_n_s_read_size);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_read_size_should_be_less_or_equa);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_recursion_limit_exceeded);
-  Py_CLEAR(clear_module_state->__pyx_n_s_reduce);
-  Py_CLEAR(clear_module_state->__pyx_n_s_reduce_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_reduce_ex);
-  Py_CLEAR(clear_module_state->__pyx_n_s_reset);
-  Py_CLEAR(clear_module_state->__pyx_n_s_ret);
-  Py_CLEAR(clear_module_state->__pyx_n_s_seconds);
-  Py_CLEAR(clear_module_state->__pyx_n_s_self);
-  Py_CLEAR(clear_module_state->__pyx_n_s_setstate);
-  Py_CLEAR(clear_module_state->__pyx_n_s_setstate_cython);
-  Py_CLEAR(clear_module_state->__pyx_n_s_size);
-  Py_CLEAR(clear_module_state->__pyx_n_s_skip);
-  Py_CLEAR(clear_module_state->__pyx_n_s_spec);
-  Py_CLEAR(clear_module_state->__pyx_n_s_strict_map_key);
-  Py_CLEAR(clear_module_state->__pyx_n_s_strict_types);
-  Py_CLEAR(clear_module_state->__pyx_kp_s_stringsource);
-  Py_CLEAR(clear_module_state->__pyx_n_s_tell);
-  Py_CLEAR(clear_module_state->__pyx_n_s_test);
-  Py_CLEAR(clear_module_state->__pyx_n_s_timestamp);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_timestamp_must_be_0_3);
-  Py_CLEAR(clear_module_state->__pyx_n_s_timezone);
-  Py_CLEAR(clear_module_state->__pyx_n_s_typecode);
-  Py_CLEAR(clear_module_state->__pyx_n_s_unicode_errors);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_unicode_string_is_too_large);
-  Py_CLEAR(clear_module_state->__pyx_n_s_unpack);
-  Py_CLEAR(clear_module_state->__pyx_n_s_unpackb);
-  Py_CLEAR(clear_module_state->__pyx_kp_u_unpacker_feed_is_not_be_able_to);
-  Py_CLEAR(clear_module_state->__pyx_n_s_use_bin_type);
-  Py_CLEAR(clear_module_state->__pyx_n_s_use_list);
-  Py_CLEAR(clear_module_state->__pyx_n_s_use_single_float);
-  Py_CLEAR(clear_module_state->__pyx_n_s_utc);
-  Py_CLEAR(clear_module_state->__pyx_n_s_v);
-  Py_CLEAR(clear_module_state->__pyx_n_s_view);
-  Py_CLEAR(clear_module_state->__pyx_int_0);
-  Py_CLEAR(clear_module_state->__pyx_int_1000000000);
-  Py_CLEAR(clear_module_state->__pyx_k__23);
-  Py_CLEAR(clear_module_state->__pyx_tuple_);
-  Py_CLEAR(clear_module_state->__pyx_tuple__2);
-  Py_CLEAR(clear_module_state->__pyx_tuple__3);
-  Py_CLEAR(clear_module_state->__pyx_tuple__5);
-  Py_CLEAR(clear_module_state->__pyx_tuple__6);
-  Py_CLEAR(clear_module_state->__pyx_tuple__7);
-  Py_CLEAR(clear_module_state->__pyx_tuple__8);
-  Py_CLEAR(clear_module_state->__pyx_tuple__9);
-  Py_CLEAR(clear_module_state->__pyx_tuple__10);
-  Py_CLEAR(clear_module_state->__pyx_tuple__11);
-  Py_CLEAR(clear_module_state->__pyx_tuple__12);
-  Py_CLEAR(clear_module_state->__pyx_tuple__13);
-  Py_CLEAR(clear_module_state->__pyx_tuple__14);
-  Py_CLEAR(clear_module_state->__pyx_tuple__15);
-  Py_CLEAR(clear_module_state->__pyx_tuple__16);
-  Py_CLEAR(clear_module_state->__pyx_tuple__17);
-  Py_CLEAR(clear_module_state->__pyx_tuple__18);
-  Py_CLEAR(clear_module_state->__pyx_tuple__19);
-  Py_CLEAR(clear_module_state->__pyx_tuple__20);
-  Py_CLEAR(clear_module_state->__pyx_tuple__21);
-  Py_CLEAR(clear_module_state->__pyx_tuple__22);
-  Py_CLEAR(clear_module_state->__pyx_tuple__24);
-  Py_CLEAR(clear_module_state->__pyx_tuple__25);
-  Py_CLEAR(clear_module_state->__pyx_tuple__26);
-  Py_CLEAR(clear_module_state->__pyx_tuple__27);
-  Py_CLEAR(clear_module_state->__pyx_tuple__28);
-  Py_CLEAR(clear_module_state->__pyx_tuple__31);
-  Py_CLEAR(clear_module_state->__pyx_tuple__33);
-  Py_CLEAR(clear_module_state->__pyx_tuple__35);
-  Py_CLEAR(clear_module_state->__pyx_tuple__38);
-  Py_CLEAR(clear_module_state->__pyx_tuple__40);
-  Py_CLEAR(clear_module_state->__pyx_tuple__45);
-  Py_CLEAR(clear_module_state->__pyx_tuple__47);
-  Py_CLEAR(clear_module_state->__pyx_tuple__49);
-  Py_CLEAR(clear_module_state->__pyx_tuple__51);
-  Py_CLEAR(clear_module_state->__pyx_tuple__53);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__32);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__34);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__36);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__37);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__39);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__41);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__42);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__43);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__44);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__46);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__48);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__50);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__52);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__54);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__55);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__56);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__57);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__58);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__59);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__60);
-  Py_CLEAR(clear_module_state->__pyx_codeobj__61);
-  return 0;
-}
-#endif
-/* #### Code section: module_state_traverse ### */
-#if CYTHON_USE_MODULE_STATE
-static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
-  __pyx_mstate *traverse_module_state = __pyx_mstate(m);
-  if (!traverse_module_state) return 0;
-  Py_VISIT(traverse_module_state->__pyx_d);
-  Py_VISIT(traverse_module_state->__pyx_b);
-  Py_VISIT(traverse_module_state->__pyx_cython_runtime);
-  Py_VISIT(traverse_module_state->__pyx_empty_tuple);
-  Py_VISIT(traverse_module_state->__pyx_empty_bytes);
-  Py_VISIT(traverse_module_state->__pyx_empty_unicode);
-  #ifdef __Pyx_CyFunction_USED
-  Py_VISIT(traverse_module_state->__pyx_CyFunctionType);
-  #endif
-  #ifdef __Pyx_FusedFunction_USED
-  Py_VISIT(traverse_module_state->__pyx_FusedFunctionType);
-  #endif
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_4type_type);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_4bool_bool);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_7complex_complex);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_8datetime_date);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_8datetime_time);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_8datetime_datetime);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_8datetime_timedelta);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7cpython_8datetime_tzinfo);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-  Py_VISIT(traverse_module_state->__pyx_type_7msgpack_9_cmsgpack_Packer);
-  Py_VISIT(traverse_module_state->__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-  Py_VISIT(traverse_module_state->__pyx_type_7msgpack_9_cmsgpack_Unpacker);
-  Py_VISIT(traverse_module_state->__pyx_n_s_AssertionError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_BufferError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_BufferFull);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Cannot_decode_extended_type_with);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_EXT_data_is_too_large);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ExtType);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ExtraData);
-  Py_VISIT(traverse_module_state->__pyx_n_s_FormatError);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Integer_value_out_of_range);
-  Py_VISIT(traverse_module_state->__pyx_n_s_MemoryError);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_No_more_data_to_unpack);
-  Py_VISIT(traverse_module_state->__pyx_n_s_NotImplementedError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_OutOfData);
-  Py_VISIT(traverse_module_state->__pyx_n_s_OverflowError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer___reduce_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer___setstate_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_bytes);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_getbuffer);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_pack);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_pack_array_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_pack_ext_type);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_pack_map_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_pack_map_pairs);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Packer_reset);
-  Py_VISIT(traverse_module_state->__pyx_n_s_RuntimeError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_StackError);
-  Py_VISIT(traverse_module_state->__pyx_n_s_StopIteration);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Time_zones_are_not_available_fro);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Timestamp);
-  Py_VISIT(traverse_module_state->__pyx_n_s_TypeError);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Unable_to_allocate_internal_buff);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Unable_to_enlarge_internal_buffe);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Unpack_failed_error);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_Unpack_failed_incomplete_input);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker___reduce_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker___setstate_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_feed);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_read_array_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_read_bytes);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_read_map_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_skip);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_tell);
-  Py_VISIT(traverse_module_state->__pyx_n_s_Unpacker_unpack);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ValueError);
-  Py_VISIT(traverse_module_state->__pyx_n_s__29);
-  Py_VISIT(traverse_module_state->__pyx_kp_u__30);
-  Py_VISIT(traverse_module_state->__pyx_n_s__62);
-  Py_VISIT(traverse_module_state->__pyx_n_s_asyncio_coroutines);
-  Py_VISIT(traverse_module_state->__pyx_n_s_autoreset);
-  Py_VISIT(traverse_module_state->__pyx_n_s_buf);
-  Py_VISIT(traverse_module_state->__pyx_n_s_buf_len);
-  Py_VISIT(traverse_module_state->__pyx_n_s_bytes);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_cannot_unpack_from_multi_byte_ob);
-  Py_VISIT(traverse_module_state->__pyx_n_s_cerr);
-  Py_VISIT(traverse_module_state->__pyx_n_s_cline_in_traceback);
-  Py_VISIT(traverse_module_state->__pyx_n_s_code);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_could_not_get_buffer_for_memoryv);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ctx);
-  Py_VISIT(traverse_module_state->__pyx_n_u_d);
-  Py_VISIT(traverse_module_state->__pyx_n_s_data);
-  Py_VISIT(traverse_module_state->__pyx_n_s_datetime);
-  Py_VISIT(traverse_module_state->__pyx_n_s_default);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_default_must_be_a_callable);
-  Py_VISIT(traverse_module_state->__pyx_n_s_default_read_extended_type);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_dict_is_too_large);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_disable);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_enable);
-  Py_VISIT(traverse_module_state->__pyx_n_s_exceptions);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ext);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ext_hook);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_ext_hook_must_be_a_callable);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_failed_to_calculate_delta);
-  Py_VISIT(traverse_module_state->__pyx_n_s_feed);
-  Py_VISIT(traverse_module_state->__pyx_n_s_file_like);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_file_like_read_must_be_a_callab);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_gc);
-  Py_VISIT(traverse_module_state->__pyx_n_s_getbuffer);
-  Py_VISIT(traverse_module_state->__pyx_n_s_getstate);
-  Py_VISIT(traverse_module_state->__pyx_n_s_import);
-  Py_VISIT(traverse_module_state->__pyx_n_s_initializing);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_internal_error);
-  Py_VISIT(traverse_module_state->__pyx_n_s_is_coroutine);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_isenabled);
-  Py_VISIT(traverse_module_state->__pyx_n_s_items);
-  Py_VISIT(traverse_module_state->__pyx_n_s_k);
-  Py_VISIT(traverse_module_state->__pyx_n_s_list_hook);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_list_hook_must_be_a_callable);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_list_is_too_large);
-  Py_VISIT(traverse_module_state->__pyx_n_s_main);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_array_len);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_bin_len);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_buffer_size);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_ext_len);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_map_len);
-  Py_VISIT(traverse_module_state->__pyx_n_s_max_str_len);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_memoryview_is_too_large);
-  Py_VISIT(traverse_module_state->__pyx_n_s_msgpack__cmsgpack);
-  Py_VISIT(traverse_module_state->__pyx_kp_s_msgpack__packer_pyx);
-  Py_VISIT(traverse_module_state->__pyx_kp_s_msgpack__unpacker_pyx);
-  Py_VISIT(traverse_module_state->__pyx_n_s_name);
-  Py_VISIT(traverse_module_state->__pyx_n_s_nanoseconds);
-  Py_VISIT(traverse_module_state->__pyx_n_s_nbytes);
-  Py_VISIT(traverse_module_state->__pyx_n_s_next_bytes);
-  Py_VISIT(traverse_module_state->__pyx_kp_s_no_default___reduce___due_to_non);
-  Py_VISIT(traverse_module_state->__pyx_n_s_nread);
-  Py_VISIT(traverse_module_state->__pyx_n_s_obj);
-  Py_VISIT(traverse_module_state->__pyx_n_s_object_hook);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_object_hook_must_be_a_callable);
-  Py_VISIT(traverse_module_state->__pyx_n_s_object_pairs_hook);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_object_pairs_hook_and_object_hoo);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_object_pairs_hook_must_be_a_call);
-  Py_VISIT(traverse_module_state->__pyx_n_s_off);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pack);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pack_array_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pack_ext_type);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pack_map_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pack_map_pairs);
-  Py_VISIT(traverse_module_state->__pyx_n_s_packed);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pairs);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pybuff);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pyx_state);
-  Py_VISIT(traverse_module_state->__pyx_n_s_pyx_vtable);
-  Py_VISIT(traverse_module_state->__pyx_n_s_raw);
-  Py_VISIT(traverse_module_state->__pyx_n_s_read);
-  Py_VISIT(traverse_module_state->__pyx_n_s_read_array_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_read_bytes);
-  Py_VISIT(traverse_module_state->__pyx_n_s_read_map_header);
-  Py_VISIT(traverse_module_state->__pyx_n_s_read_size);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_read_size_should_be_less_or_equa);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_recursion_limit_exceeded);
-  Py_VISIT(traverse_module_state->__pyx_n_s_reduce);
-  Py_VISIT(traverse_module_state->__pyx_n_s_reduce_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_reduce_ex);
-  Py_VISIT(traverse_module_state->__pyx_n_s_reset);
-  Py_VISIT(traverse_module_state->__pyx_n_s_ret);
-  Py_VISIT(traverse_module_state->__pyx_n_s_seconds);
-  Py_VISIT(traverse_module_state->__pyx_n_s_self);
-  Py_VISIT(traverse_module_state->__pyx_n_s_setstate);
-  Py_VISIT(traverse_module_state->__pyx_n_s_setstate_cython);
-  Py_VISIT(traverse_module_state->__pyx_n_s_size);
-  Py_VISIT(traverse_module_state->__pyx_n_s_skip);
-  Py_VISIT(traverse_module_state->__pyx_n_s_spec);
-  Py_VISIT(traverse_module_state->__pyx_n_s_strict_map_key);
-  Py_VISIT(traverse_module_state->__pyx_n_s_strict_types);
-  Py_VISIT(traverse_module_state->__pyx_kp_s_stringsource);
-  Py_VISIT(traverse_module_state->__pyx_n_s_tell);
-  Py_VISIT(traverse_module_state->__pyx_n_s_test);
-  Py_VISIT(traverse_module_state->__pyx_n_s_timestamp);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_timestamp_must_be_0_3);
-  Py_VISIT(traverse_module_state->__pyx_n_s_timezone);
-  Py_VISIT(traverse_module_state->__pyx_n_s_typecode);
-  Py_VISIT(traverse_module_state->__pyx_n_s_unicode_errors);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_unicode_string_is_too_large);
-  Py_VISIT(traverse_module_state->__pyx_n_s_unpack);
-  Py_VISIT(traverse_module_state->__pyx_n_s_unpackb);
-  Py_VISIT(traverse_module_state->__pyx_kp_u_unpacker_feed_is_not_be_able_to);
-  Py_VISIT(traverse_module_state->__pyx_n_s_use_bin_type);
-  Py_VISIT(traverse_module_state->__pyx_n_s_use_list);
-  Py_VISIT(traverse_module_state->__pyx_n_s_use_single_float);
-  Py_VISIT(traverse_module_state->__pyx_n_s_utc);
-  Py_VISIT(traverse_module_state->__pyx_n_s_v);
-  Py_VISIT(traverse_module_state->__pyx_n_s_view);
-  Py_VISIT(traverse_module_state->__pyx_int_0);
-  Py_VISIT(traverse_module_state->__pyx_int_1000000000);
-  Py_VISIT(traverse_module_state->__pyx_k__23);
-  Py_VISIT(traverse_module_state->__pyx_tuple_);
-  Py_VISIT(traverse_module_state->__pyx_tuple__2);
-  Py_VISIT(traverse_module_state->__pyx_tuple__3);
-  Py_VISIT(traverse_module_state->__pyx_tuple__5);
-  Py_VISIT(traverse_module_state->__pyx_tuple__6);
-  Py_VISIT(traverse_module_state->__pyx_tuple__7);
-  Py_VISIT(traverse_module_state->__pyx_tuple__8);
-  Py_VISIT(traverse_module_state->__pyx_tuple__9);
-  Py_VISIT(traverse_module_state->__pyx_tuple__10);
-  Py_VISIT(traverse_module_state->__pyx_tuple__11);
-  Py_VISIT(traverse_module_state->__pyx_tuple__12);
-  Py_VISIT(traverse_module_state->__pyx_tuple__13);
-  Py_VISIT(traverse_module_state->__pyx_tuple__14);
-  Py_VISIT(traverse_module_state->__pyx_tuple__15);
-  Py_VISIT(traverse_module_state->__pyx_tuple__16);
-  Py_VISIT(traverse_module_state->__pyx_tuple__17);
-  Py_VISIT(traverse_module_state->__pyx_tuple__18);
-  Py_VISIT(traverse_module_state->__pyx_tuple__19);
-  Py_VISIT(traverse_module_state->__pyx_tuple__20);
-  Py_VISIT(traverse_module_state->__pyx_tuple__21);
-  Py_VISIT(traverse_module_state->__pyx_tuple__22);
-  Py_VISIT(traverse_module_state->__pyx_tuple__24);
-  Py_VISIT(traverse_module_state->__pyx_tuple__25);
-  Py_VISIT(traverse_module_state->__pyx_tuple__26);
-  Py_VISIT(traverse_module_state->__pyx_tuple__27);
-  Py_VISIT(traverse_module_state->__pyx_tuple__28);
-  Py_VISIT(traverse_module_state->__pyx_tuple__31);
-  Py_VISIT(traverse_module_state->__pyx_tuple__33);
-  Py_VISIT(traverse_module_state->__pyx_tuple__35);
-  Py_VISIT(traverse_module_state->__pyx_tuple__38);
-  Py_VISIT(traverse_module_state->__pyx_tuple__40);
-  Py_VISIT(traverse_module_state->__pyx_tuple__45);
-  Py_VISIT(traverse_module_state->__pyx_tuple__47);
-  Py_VISIT(traverse_module_state->__pyx_tuple__49);
-  Py_VISIT(traverse_module_state->__pyx_tuple__51);
-  Py_VISIT(traverse_module_state->__pyx_tuple__53);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__32);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__34);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__36);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__37);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__39);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__41);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__42);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__43);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__44);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__46);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__48);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__50);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__52);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__54);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__55);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__56);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__57);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__58);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__59);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__60);
-  Py_VISIT(traverse_module_state->__pyx_codeobj__61);
-  return 0;
-}
-#endif
-/* #### Code section: module_state_defines ### */
-#define __pyx_d __pyx_mstate_global->__pyx_d
-#define __pyx_b __pyx_mstate_global->__pyx_b
-#define __pyx_cython_runtime __pyx_mstate_global->__pyx_cython_runtime
-#define __pyx_empty_tuple __pyx_mstate_global->__pyx_empty_tuple
-#define __pyx_empty_bytes __pyx_mstate_global->__pyx_empty_bytes
-#define __pyx_empty_unicode __pyx_mstate_global->__pyx_empty_unicode
-#ifdef __Pyx_CyFunction_USED
-#define __pyx_CyFunctionType __pyx_mstate_global->__pyx_CyFunctionType
-#endif
-#ifdef __Pyx_FusedFunction_USED
-#define __pyx_FusedFunctionType __pyx_mstate_global->__pyx_FusedFunctionType
-#endif
-#ifdef __Pyx_Generator_USED
-#define __pyx_GeneratorType __pyx_mstate_global->__pyx_GeneratorType
-#endif
-#ifdef __Pyx_IterableCoroutine_USED
-#define __pyx_IterableCoroutineType __pyx_mstate_global->__pyx_IterableCoroutineType
-#endif
-#ifdef __Pyx_Coroutine_USED
-#define __pyx_CoroutineAwaitType __pyx_mstate_global->__pyx_CoroutineAwaitType
-#endif
-#ifdef __Pyx_Coroutine_USED
-#define __pyx_CoroutineType __pyx_mstate_global->__pyx_CoroutineType
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#define __pyx_ptype_7cpython_4type_type __pyx_mstate_global->__pyx_ptype_7cpython_4type_type
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#define __pyx_ptype_7cpython_4bool_bool __pyx_mstate_global->__pyx_ptype_7cpython_4bool_bool
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#define __pyx_ptype_7cpython_7complex_complex __pyx_mstate_global->__pyx_ptype_7cpython_7complex_complex
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#define __pyx_ptype_7cpython_8datetime_date __pyx_mstate_global->__pyx_ptype_7cpython_8datetime_date
-#define __pyx_ptype_7cpython_8datetime_time __pyx_mstate_global->__pyx_ptype_7cpython_8datetime_time
-#define __pyx_ptype_7cpython_8datetime_datetime __pyx_mstate_global->__pyx_ptype_7cpython_8datetime_datetime
-#define __pyx_ptype_7cpython_8datetime_timedelta __pyx_mstate_global->__pyx_ptype_7cpython_8datetime_timedelta
-#define __pyx_ptype_7cpython_8datetime_tzinfo __pyx_mstate_global->__pyx_ptype_7cpython_8datetime_tzinfo
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#endif
-#if CYTHON_USE_MODULE_STATE
-#define __pyx_type_7msgpack_9_cmsgpack_Packer __pyx_mstate_global->__pyx_type_7msgpack_9_cmsgpack_Packer
-#define __pyx_type_7msgpack_9_cmsgpack_Unpacker __pyx_mstate_global->__pyx_type_7msgpack_9_cmsgpack_Unpacker
-#endif
-#define __pyx_ptype_7msgpack_9_cmsgpack_Packer __pyx_mstate_global->__pyx_ptype_7msgpack_9_cmsgpack_Packer
-#define __pyx_ptype_7msgpack_9_cmsgpack_Unpacker __pyx_mstate_global->__pyx_ptype_7msgpack_9_cmsgpack_Unpacker
-#define __pyx_n_s_AssertionError __pyx_mstate_global->__pyx_n_s_AssertionError
-#define __pyx_n_s_BufferError __pyx_mstate_global->__pyx_n_s_BufferError
-#define __pyx_n_s_BufferFull __pyx_mstate_global->__pyx_n_s_BufferFull
-#define __pyx_kp_u_Cannot_decode_extended_type_with __pyx_mstate_global->__pyx_kp_u_Cannot_decode_extended_type_with
-#define __pyx_kp_u_EXT_data_is_too_large __pyx_mstate_global->__pyx_kp_u_EXT_data_is_too_large
-#define __pyx_n_s_ExtType __pyx_mstate_global->__pyx_n_s_ExtType
-#define __pyx_n_s_ExtraData __pyx_mstate_global->__pyx_n_s_ExtraData
-#define __pyx_n_s_FormatError __pyx_mstate_global->__pyx_n_s_FormatError
-#define __pyx_kp_u_Integer_value_out_of_range __pyx_mstate_global->__pyx_kp_u_Integer_value_out_of_range
-#define __pyx_n_s_MemoryError __pyx_mstate_global->__pyx_n_s_MemoryError
-#define __pyx_kp_u_No_more_data_to_unpack __pyx_mstate_global->__pyx_kp_u_No_more_data_to_unpack
-#define __pyx_n_s_NotImplementedError __pyx_mstate_global->__pyx_n_s_NotImplementedError
-#define __pyx_n_s_OutOfData __pyx_mstate_global->__pyx_n_s_OutOfData
-#define __pyx_n_s_OverflowError __pyx_mstate_global->__pyx_n_s_OverflowError
-#define __pyx_n_s_Packer __pyx_mstate_global->__pyx_n_s_Packer
-#define __pyx_n_s_Packer___reduce_cython __pyx_mstate_global->__pyx_n_s_Packer___reduce_cython
-#define __pyx_n_s_Packer___setstate_cython __pyx_mstate_global->__pyx_n_s_Packer___setstate_cython
-#define __pyx_n_s_Packer_bytes __pyx_mstate_global->__pyx_n_s_Packer_bytes
-#define __pyx_n_s_Packer_getbuffer __pyx_mstate_global->__pyx_n_s_Packer_getbuffer
-#define __pyx_n_s_Packer_pack __pyx_mstate_global->__pyx_n_s_Packer_pack
-#define __pyx_n_s_Packer_pack_array_header __pyx_mstate_global->__pyx_n_s_Packer_pack_array_header
-#define __pyx_n_s_Packer_pack_ext_type __pyx_mstate_global->__pyx_n_s_Packer_pack_ext_type
-#define __pyx_n_s_Packer_pack_map_header __pyx_mstate_global->__pyx_n_s_Packer_pack_map_header
-#define __pyx_n_s_Packer_pack_map_pairs __pyx_mstate_global->__pyx_n_s_Packer_pack_map_pairs
-#define __pyx_n_s_Packer_reset __pyx_mstate_global->__pyx_n_s_Packer_reset
-#define __pyx_n_s_RuntimeError __pyx_mstate_global->__pyx_n_s_RuntimeError
-#define __pyx_n_s_StackError __pyx_mstate_global->__pyx_n_s_StackError
-#define __pyx_n_s_StopIteration __pyx_mstate_global->__pyx_n_s_StopIteration
-#define __pyx_kp_u_Time_zones_are_not_available_fro __pyx_mstate_global->__pyx_kp_u_Time_zones_are_not_available_fro
-#define __pyx_n_s_Timestamp __pyx_mstate_global->__pyx_n_s_Timestamp
-#define __pyx_n_s_TypeError __pyx_mstate_global->__pyx_n_s_TypeError
-#define __pyx_kp_u_Unable_to_allocate_internal_buff __pyx_mstate_global->__pyx_kp_u_Unable_to_allocate_internal_buff
-#define __pyx_kp_u_Unable_to_enlarge_internal_buffe __pyx_mstate_global->__pyx_kp_u_Unable_to_enlarge_internal_buffe
-#define __pyx_kp_u_Unpack_failed_error __pyx_mstate_global->__pyx_kp_u_Unpack_failed_error
-#define __pyx_kp_u_Unpack_failed_incomplete_input __pyx_mstate_global->__pyx_kp_u_Unpack_failed_incomplete_input
-#define __pyx_n_s_Unpacker __pyx_mstate_global->__pyx_n_s_Unpacker
-#define __pyx_n_s_Unpacker___reduce_cython __pyx_mstate_global->__pyx_n_s_Unpacker___reduce_cython
-#define __pyx_n_s_Unpacker___setstate_cython __pyx_mstate_global->__pyx_n_s_Unpacker___setstate_cython
-#define __pyx_n_s_Unpacker_feed __pyx_mstate_global->__pyx_n_s_Unpacker_feed
-#define __pyx_n_s_Unpacker_read_array_header __pyx_mstate_global->__pyx_n_s_Unpacker_read_array_header
-#define __pyx_n_s_Unpacker_read_bytes __pyx_mstate_global->__pyx_n_s_Unpacker_read_bytes
-#define __pyx_n_s_Unpacker_read_map_header __pyx_mstate_global->__pyx_n_s_Unpacker_read_map_header
-#define __pyx_n_s_Unpacker_skip __pyx_mstate_global->__pyx_n_s_Unpacker_skip
-#define __pyx_n_s_Unpacker_tell __pyx_mstate_global->__pyx_n_s_Unpacker_tell
-#define __pyx_n_s_Unpacker_unpack __pyx_mstate_global->__pyx_n_s_Unpacker_unpack
-#define __pyx_n_s_ValueError __pyx_mstate_global->__pyx_n_s_ValueError
-#define __pyx_n_s__29 __pyx_mstate_global->__pyx_n_s__29
-#define __pyx_kp_u__30 __pyx_mstate_global->__pyx_kp_u__30
-#define __pyx_n_s__62 __pyx_mstate_global->__pyx_n_s__62
-#define __pyx_n_s_asyncio_coroutines __pyx_mstate_global->__pyx_n_s_asyncio_coroutines
-#define __pyx_n_s_autoreset __pyx_mstate_global->__pyx_n_s_autoreset
-#define __pyx_n_s_buf __pyx_mstate_global->__pyx_n_s_buf
-#define __pyx_n_s_buf_len __pyx_mstate_global->__pyx_n_s_buf_len
-#define __pyx_n_s_bytes __pyx_mstate_global->__pyx_n_s_bytes
-#define __pyx_kp_u_cannot_unpack_from_multi_byte_ob __pyx_mstate_global->__pyx_kp_u_cannot_unpack_from_multi_byte_ob
-#define __pyx_n_s_cerr __pyx_mstate_global->__pyx_n_s_cerr
-#define __pyx_n_s_cline_in_traceback __pyx_mstate_global->__pyx_n_s_cline_in_traceback
-#define __pyx_n_s_code __pyx_mstate_global->__pyx_n_s_code
-#define __pyx_kp_u_could_not_get_buffer_for_memoryv __pyx_mstate_global->__pyx_kp_u_could_not_get_buffer_for_memoryv
-#define __pyx_n_s_ctx __pyx_mstate_global->__pyx_n_s_ctx
-#define __pyx_n_u_d __pyx_mstate_global->__pyx_n_u_d
-#define __pyx_n_s_data __pyx_mstate_global->__pyx_n_s_data
-#define __pyx_n_s_datetime __pyx_mstate_global->__pyx_n_s_datetime
-#define __pyx_n_s_default __pyx_mstate_global->__pyx_n_s_default
-#define __pyx_kp_u_default_must_be_a_callable __pyx_mstate_global->__pyx_kp_u_default_must_be_a_callable
-#define __pyx_n_s_default_read_extended_type __pyx_mstate_global->__pyx_n_s_default_read_extended_type
-#define __pyx_kp_u_dict_is_too_large __pyx_mstate_global->__pyx_kp_u_dict_is_too_large
-#define __pyx_kp_u_disable __pyx_mstate_global->__pyx_kp_u_disable
-#define __pyx_kp_u_enable __pyx_mstate_global->__pyx_kp_u_enable
-#define __pyx_n_s_exceptions __pyx_mstate_global->__pyx_n_s_exceptions
-#define __pyx_n_s_ext __pyx_mstate_global->__pyx_n_s_ext
-#define __pyx_n_s_ext_hook __pyx_mstate_global->__pyx_n_s_ext_hook
-#define __pyx_kp_u_ext_hook_must_be_a_callable __pyx_mstate_global->__pyx_kp_u_ext_hook_must_be_a_callable
-#define __pyx_kp_u_failed_to_calculate_delta __pyx_mstate_global->__pyx_kp_u_failed_to_calculate_delta
-#define __pyx_n_s_feed __pyx_mstate_global->__pyx_n_s_feed
-#define __pyx_n_s_file_like __pyx_mstate_global->__pyx_n_s_file_like
-#define __pyx_kp_u_file_like_read_must_be_a_callab __pyx_mstate_global->__pyx_kp_u_file_like_read_must_be_a_callab
-#define __pyx_kp_u_gc __pyx_mstate_global->__pyx_kp_u_gc
-#define __pyx_n_s_getbuffer __pyx_mstate_global->__pyx_n_s_getbuffer
-#define __pyx_n_s_getstate __pyx_mstate_global->__pyx_n_s_getstate
-#define __pyx_n_s_import __pyx_mstate_global->__pyx_n_s_import
-#define __pyx_n_s_initializing __pyx_mstate_global->__pyx_n_s_initializing
-#define __pyx_kp_u_internal_error __pyx_mstate_global->__pyx_kp_u_internal_error
-#define __pyx_n_s_is_coroutine __pyx_mstate_global->__pyx_n_s_is_coroutine
-#define __pyx_kp_u_isenabled __pyx_mstate_global->__pyx_kp_u_isenabled
-#define __pyx_n_s_items __pyx_mstate_global->__pyx_n_s_items
-#define __pyx_n_s_k __pyx_mstate_global->__pyx_n_s_k
-#define __pyx_n_s_list_hook __pyx_mstate_global->__pyx_n_s_list_hook
-#define __pyx_kp_u_list_hook_must_be_a_callable __pyx_mstate_global->__pyx_kp_u_list_hook_must_be_a_callable
-#define __pyx_kp_u_list_is_too_large __pyx_mstate_global->__pyx_kp_u_list_is_too_large
-#define __pyx_n_s_main __pyx_mstate_global->__pyx_n_s_main
-#define __pyx_n_s_max_array_len __pyx_mstate_global->__pyx_n_s_max_array_len
-#define __pyx_n_s_max_bin_len __pyx_mstate_global->__pyx_n_s_max_bin_len
-#define __pyx_n_s_max_buffer_size __pyx_mstate_global->__pyx_n_s_max_buffer_size
-#define __pyx_n_s_max_ext_len __pyx_mstate_global->__pyx_n_s_max_ext_len
-#define __pyx_n_s_max_map_len __pyx_mstate_global->__pyx_n_s_max_map_len
-#define __pyx_n_s_max_str_len __pyx_mstate_global->__pyx_n_s_max_str_len
-#define __pyx_kp_u_memoryview_is_too_large __pyx_mstate_global->__pyx_kp_u_memoryview_is_too_large
-#define __pyx_n_s_msgpack__cmsgpack __pyx_mstate_global->__pyx_n_s_msgpack__cmsgpack
-#define __pyx_kp_s_msgpack__packer_pyx __pyx_mstate_global->__pyx_kp_s_msgpack__packer_pyx
-#define __pyx_kp_s_msgpack__unpacker_pyx __pyx_mstate_global->__pyx_kp_s_msgpack__unpacker_pyx
-#define __pyx_n_s_name __pyx_mstate_global->__pyx_n_s_name
-#define __pyx_n_s_nanoseconds __pyx_mstate_global->__pyx_n_s_nanoseconds
-#define __pyx_n_s_nbytes __pyx_mstate_global->__pyx_n_s_nbytes
-#define __pyx_n_s_next_bytes __pyx_mstate_global->__pyx_n_s_next_bytes
-#define __pyx_kp_s_no_default___reduce___due_to_non __pyx_mstate_global->__pyx_kp_s_no_default___reduce___due_to_non
-#define __pyx_n_s_nread __pyx_mstate_global->__pyx_n_s_nread
-#define __pyx_n_s_obj __pyx_mstate_global->__pyx_n_s_obj
-#define __pyx_n_s_object_hook __pyx_mstate_global->__pyx_n_s_object_hook
-#define __pyx_kp_u_object_hook_must_be_a_callable __pyx_mstate_global->__pyx_kp_u_object_hook_must_be_a_callable
-#define __pyx_n_s_object_pairs_hook __pyx_mstate_global->__pyx_n_s_object_pairs_hook
-#define __pyx_kp_u_object_pairs_hook_and_object_hoo __pyx_mstate_global->__pyx_kp_u_object_pairs_hook_and_object_hoo
-#define __pyx_kp_u_object_pairs_hook_must_be_a_call __pyx_mstate_global->__pyx_kp_u_object_pairs_hook_must_be_a_call
-#define __pyx_n_s_off __pyx_mstate_global->__pyx_n_s_off
-#define __pyx_n_s_pack __pyx_mstate_global->__pyx_n_s_pack
-#define __pyx_n_s_pack_array_header __pyx_mstate_global->__pyx_n_s_pack_array_header
-#define __pyx_n_s_pack_ext_type __pyx_mstate_global->__pyx_n_s_pack_ext_type
-#define __pyx_n_s_pack_map_header __pyx_mstate_global->__pyx_n_s_pack_map_header
-#define __pyx_n_s_pack_map_pairs __pyx_mstate_global->__pyx_n_s_pack_map_pairs
-#define __pyx_n_s_packed __pyx_mstate_global->__pyx_n_s_packed
-#define __pyx_n_s_pairs __pyx_mstate_global->__pyx_n_s_pairs
-#define __pyx_n_s_pybuff __pyx_mstate_global->__pyx_n_s_pybuff
-#define __pyx_n_s_pyx_state __pyx_mstate_global->__pyx_n_s_pyx_state
-#define __pyx_n_s_pyx_vtable __pyx_mstate_global->__pyx_n_s_pyx_vtable
-#define __pyx_n_s_raw __pyx_mstate_global->__pyx_n_s_raw
-#define __pyx_n_s_read __pyx_mstate_global->__pyx_n_s_read
-#define __pyx_n_s_read_array_header __pyx_mstate_global->__pyx_n_s_read_array_header
-#define __pyx_n_s_read_bytes __pyx_mstate_global->__pyx_n_s_read_bytes
-#define __pyx_n_s_read_map_header __pyx_mstate_global->__pyx_n_s_read_map_header
-#define __pyx_n_s_read_size __pyx_mstate_global->__pyx_n_s_read_size
-#define __pyx_kp_u_read_size_should_be_less_or_equa __pyx_mstate_global->__pyx_kp_u_read_size_should_be_less_or_equa
-#define __pyx_kp_u_recursion_limit_exceeded __pyx_mstate_global->__pyx_kp_u_recursion_limit_exceeded
-#define __pyx_n_s_reduce __pyx_mstate_global->__pyx_n_s_reduce
-#define __pyx_n_s_reduce_cython __pyx_mstate_global->__pyx_n_s_reduce_cython
-#define __pyx_n_s_reduce_ex __pyx_mstate_global->__pyx_n_s_reduce_ex
-#define __pyx_n_s_reset __pyx_mstate_global->__pyx_n_s_reset
-#define __pyx_n_s_ret __pyx_mstate_global->__pyx_n_s_ret
-#define __pyx_n_s_seconds __pyx_mstate_global->__pyx_n_s_seconds
-#define __pyx_n_s_self __pyx_mstate_global->__pyx_n_s_self
-#define __pyx_n_s_setstate __pyx_mstate_global->__pyx_n_s_setstate
-#define __pyx_n_s_setstate_cython __pyx_mstate_global->__pyx_n_s_setstate_cython
-#define __pyx_n_s_size __pyx_mstate_global->__pyx_n_s_size
-#define __pyx_n_s_skip __pyx_mstate_global->__pyx_n_s_skip
-#define __pyx_n_s_spec __pyx_mstate_global->__pyx_n_s_spec
-#define __pyx_n_s_strict_map_key __pyx_mstate_global->__pyx_n_s_strict_map_key
-#define __pyx_n_s_strict_types __pyx_mstate_global->__pyx_n_s_strict_types
-#define __pyx_kp_s_stringsource __pyx_mstate_global->__pyx_kp_s_stringsource
-#define __pyx_n_s_tell __pyx_mstate_global->__pyx_n_s_tell
-#define __pyx_n_s_test __pyx_mstate_global->__pyx_n_s_test
-#define __pyx_n_s_timestamp __pyx_mstate_global->__pyx_n_s_timestamp
-#define __pyx_kp_u_timestamp_must_be_0_3 __pyx_mstate_global->__pyx_kp_u_timestamp_must_be_0_3
-#define __pyx_n_s_timezone __pyx_mstate_global->__pyx_n_s_timezone
-#define __pyx_n_s_typecode __pyx_mstate_global->__pyx_n_s_typecode
-#define __pyx_n_s_unicode_errors __pyx_mstate_global->__pyx_n_s_unicode_errors
-#define __pyx_kp_u_unicode_string_is_too_large __pyx_mstate_global->__pyx_kp_u_unicode_string_is_too_large
-#define __pyx_n_s_unpack __pyx_mstate_global->__pyx_n_s_unpack
-#define __pyx_n_s_unpackb __pyx_mstate_global->__pyx_n_s_unpackb
-#define __pyx_kp_u_unpacker_feed_is_not_be_able_to __pyx_mstate_global->__pyx_kp_u_unpacker_feed_is_not_be_able_to
-#define __pyx_n_s_use_bin_type __pyx_mstate_global->__pyx_n_s_use_bin_type
-#define __pyx_n_s_use_list __pyx_mstate_global->__pyx_n_s_use_list
-#define __pyx_n_s_use_single_float __pyx_mstate_global->__pyx_n_s_use_single_float
-#define __pyx_n_s_utc __pyx_mstate_global->__pyx_n_s_utc
-#define __pyx_n_s_v __pyx_mstate_global->__pyx_n_s_v
-#define __pyx_n_s_view __pyx_mstate_global->__pyx_n_s_view
-#define __pyx_int_0 __pyx_mstate_global->__pyx_int_0
-#define __pyx_int_1000000000 __pyx_mstate_global->__pyx_int_1000000000
-#define __pyx_k__4 __pyx_mstate_global->__pyx_k__4
-#define __pyx_k__23 __pyx_mstate_global->__pyx_k__23
-#define __pyx_tuple_ __pyx_mstate_global->__pyx_tuple_
-#define __pyx_tuple__2 __pyx_mstate_global->__pyx_tuple__2
-#define __pyx_tuple__3 __pyx_mstate_global->__pyx_tuple__3
-#define __pyx_tuple__5 __pyx_mstate_global->__pyx_tuple__5
-#define __pyx_tuple__6 __pyx_mstate_global->__pyx_tuple__6
-#define __pyx_tuple__7 __pyx_mstate_global->__pyx_tuple__7
-#define __pyx_tuple__8 __pyx_mstate_global->__pyx_tuple__8
-#define __pyx_tuple__9 __pyx_mstate_global->__pyx_tuple__9
-#define __pyx_tuple__10 __pyx_mstate_global->__pyx_tuple__10
-#define __pyx_tuple__11 __pyx_mstate_global->__pyx_tuple__11
-#define __pyx_tuple__12 __pyx_mstate_global->__pyx_tuple__12
-#define __pyx_tuple__13 __pyx_mstate_global->__pyx_tuple__13
-#define __pyx_tuple__14 __pyx_mstate_global->__pyx_tuple__14
-#define __pyx_tuple__15 __pyx_mstate_global->__pyx_tuple__15
-#define __pyx_tuple__16 __pyx_mstate_global->__pyx_tuple__16
-#define __pyx_tuple__17 __pyx_mstate_global->__pyx_tuple__17
-#define __pyx_tuple__18 __pyx_mstate_global->__pyx_tuple__18
-#define __pyx_tuple__19 __pyx_mstate_global->__pyx_tuple__19
-#define __pyx_tuple__20 __pyx_mstate_global->__pyx_tuple__20
-#define __pyx_tuple__21 __pyx_mstate_global->__pyx_tuple__21
-#define __pyx_tuple__22 __pyx_mstate_global->__pyx_tuple__22
-#define __pyx_tuple__24 __pyx_mstate_global->__pyx_tuple__24
-#define __pyx_tuple__25 __pyx_mstate_global->__pyx_tuple__25
-#define __pyx_tuple__26 __pyx_mstate_global->__pyx_tuple__26
-#define __pyx_tuple__27 __pyx_mstate_global->__pyx_tuple__27
-#define __pyx_tuple__28 __pyx_mstate_global->__pyx_tuple__28
-#define __pyx_tuple__31 __pyx_mstate_global->__pyx_tuple__31
-#define __pyx_tuple__33 __pyx_mstate_global->__pyx_tuple__33
-#define __pyx_tuple__35 __pyx_mstate_global->__pyx_tuple__35
-#define __pyx_tuple__38 __pyx_mstate_global->__pyx_tuple__38
-#define __pyx_tuple__40 __pyx_mstate_global->__pyx_tuple__40
-#define __pyx_tuple__45 __pyx_mstate_global->__pyx_tuple__45
-#define __pyx_tuple__47 __pyx_mstate_global->__pyx_tuple__47
-#define __pyx_tuple__49 __pyx_mstate_global->__pyx_tuple__49
-#define __pyx_tuple__51 __pyx_mstate_global->__pyx_tuple__51
-#define __pyx_tuple__53 __pyx_mstate_global->__pyx_tuple__53
-#define __pyx_codeobj__32 __pyx_mstate_global->__pyx_codeobj__32
-#define __pyx_codeobj__34 __pyx_mstate_global->__pyx_codeobj__34
-#define __pyx_codeobj__36 __pyx_mstate_global->__pyx_codeobj__36
-#define __pyx_codeobj__37 __pyx_mstate_global->__pyx_codeobj__37
-#define __pyx_codeobj__39 __pyx_mstate_global->__pyx_codeobj__39
-#define __pyx_codeobj__41 __pyx_mstate_global->__pyx_codeobj__41
-#define __pyx_codeobj__42 __pyx_mstate_global->__pyx_codeobj__42
-#define __pyx_codeobj__43 __pyx_mstate_global->__pyx_codeobj__43
-#define __pyx_codeobj__44 __pyx_mstate_global->__pyx_codeobj__44
-#define __pyx_codeobj__46 __pyx_mstate_global->__pyx_codeobj__46
-#define __pyx_codeobj__48 __pyx_mstate_global->__pyx_codeobj__48
-#define __pyx_codeobj__50 __pyx_mstate_global->__pyx_codeobj__50
-#define __pyx_codeobj__52 __pyx_mstate_global->__pyx_codeobj__52
-#define __pyx_codeobj__54 __pyx_mstate_global->__pyx_codeobj__54
-#define __pyx_codeobj__55 __pyx_mstate_global->__pyx_codeobj__55
-#define __pyx_codeobj__56 __pyx_mstate_global->__pyx_codeobj__56
-#define __pyx_codeobj__57 __pyx_mstate_global->__pyx_codeobj__57
-#define __pyx_codeobj__58 __pyx_mstate_global->__pyx_codeobj__58
-#define __pyx_codeobj__59 __pyx_mstate_global->__pyx_codeobj__59
-#define __pyx_codeobj__60 __pyx_mstate_global->__pyx_codeobj__60
-#define __pyx_codeobj__61 __pyx_mstate_global->__pyx_codeobj__61
-/* #### Code section: module_code ### */
-
-/* "cpython/datetime.pxd":72
- *     ctypedef extern class datetime.date[object PyDateTime_Date]:
- *         @property
- *         cdef inline int year(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_YEAR(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_4year_year(PyDateTime_Date *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("year", 0);
-
-  /* "cpython/datetime.pxd":73
- *         @property
- *         cdef inline int year(self):
- *             return PyDateTime_GET_YEAR(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_GET_YEAR(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":72
- *     ctypedef extern class datetime.date[object PyDateTime_Date]:
- *         @property
- *         cdef inline int year(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_YEAR(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":76
- * 
- *         @property
- *         cdef inline int month(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_MONTH(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_5month_month(PyDateTime_Date *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("month", 0);
-
-  /* "cpython/datetime.pxd":77
- *         @property
- *         cdef inline int month(self):
- *             return PyDateTime_GET_MONTH(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_GET_MONTH(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":76
- * 
- *         @property
- *         cdef inline int month(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_MONTH(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":80
- * 
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_DAY(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4date_3day_day(PyDateTime_Date *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("day", 0);
-
-  /* "cpython/datetime.pxd":81
- *         @property
- *         cdef inline int day(self):
- *             return PyDateTime_GET_DAY(self)             # <<<<<<<<<<<<<<
- * 
- *     ctypedef extern class datetime.time[object PyDateTime_Time]:
- */
-  __pyx_r = PyDateTime_GET_DAY(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":80
- * 
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_DAY(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":85
- *     ctypedef extern class datetime.time[object PyDateTime_Time]:
- *         @property
- *         cdef inline int hour(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_HOUR(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_4hour_hour(PyDateTime_Time *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("hour", 0);
-
-  /* "cpython/datetime.pxd":86
- *         @property
- *         cdef inline int hour(self):
- *             return PyDateTime_TIME_GET_HOUR(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_TIME_GET_HOUR(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":85
- *     ctypedef extern class datetime.time[object PyDateTime_Time]:
- *         @property
- *         cdef inline int hour(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_HOUR(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":89
- * 
- *         @property
- *         cdef inline int minute(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_MINUTE(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_6minute_minute(PyDateTime_Time *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("minute", 0);
-
-  /* "cpython/datetime.pxd":90
- *         @property
- *         cdef inline int minute(self):
- *             return PyDateTime_TIME_GET_MINUTE(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_TIME_GET_MINUTE(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":89
- * 
- *         @property
- *         cdef inline int minute(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_MINUTE(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":93
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_SECOND(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_6second_second(PyDateTime_Time *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("second", 0);
-
-  /* "cpython/datetime.pxd":94
- *         @property
- *         cdef inline int second(self):
- *             return PyDateTime_TIME_GET_SECOND(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_TIME_GET_SECOND(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":93
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_SECOND(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":97
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_MICROSECOND(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_11microsecond_microsecond(PyDateTime_Time *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("microsecond", 0);
-
-  /* "cpython/datetime.pxd":98
- *         @property
- *         cdef inline int microsecond(self):
- *             return PyDateTime_TIME_GET_MICROSECOND(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_TIME_GET_MICROSECOND(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":97
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_TIME_GET_MICROSECOND(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":101
- * 
- *         @property
- *         cdef inline object tzinfo(self):             # <<<<<<<<<<<<<<
- *             return <object>PyDateTime_TIME_GET_TZINFO(self)
- * 
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_4time_6tzinfo_tzinfo(PyDateTime_Time *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1;
-  __Pyx_RefNannySetupContext("tzinfo", 0);
-
-  /* "cpython/datetime.pxd":102
- *         @property
- *         cdef inline object tzinfo(self):
- *             return <object>PyDateTime_TIME_GET_TZINFO(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyDateTime_TIME_GET_TZINFO(((PyObject *)__pyx_v_self));
-  __Pyx_INCREF(((PyObject *)__pyx_t_1));
-  __pyx_r = ((PyObject *)__pyx_t_1);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":101
- * 
- *         @property
- *         cdef inline object tzinfo(self):             # <<<<<<<<<<<<<<
- *             return <object>PyDateTime_TIME_GET_TZINFO(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":105
- * 
- *         @property
- *         cdef inline int fold(self):             # <<<<<<<<<<<<<<
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_TIME_GET_FOLD(self)
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_4time_4fold_fold(PyDateTime_Time *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("fold", 0);
-
-  /* "cpython/datetime.pxd":107
- *         cdef inline int fold(self):
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_TIME_GET_FOLD(self)             # <<<<<<<<<<<<<<
- * 
- *     ctypedef extern class datetime.datetime[object PyDateTime_DateTime]:
- */
-  __pyx_r = PyDateTime_TIME_GET_FOLD(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":105
- * 
- *         @property
- *         cdef inline int fold(self):             # <<<<<<<<<<<<<<
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_TIME_GET_FOLD(self)
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":111
- *     ctypedef extern class datetime.datetime[object PyDateTime_DateTime]:
- *         @property
- *         cdef inline int year(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_YEAR(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4year_year(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("year", 0);
-
-  /* "cpython/datetime.pxd":112
- *         @property
- *         cdef inline int year(self):
- *             return PyDateTime_GET_YEAR(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_GET_YEAR(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":111
- *     ctypedef extern class datetime.datetime[object PyDateTime_DateTime]:
- *         @property
- *         cdef inline int year(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_YEAR(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":115
- * 
- *         @property
- *         cdef inline int month(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_MONTH(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_5month_month(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("month", 0);
-
-  /* "cpython/datetime.pxd":116
- *         @property
- *         cdef inline int month(self):
- *             return PyDateTime_GET_MONTH(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_GET_MONTH(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":115
- * 
- *         @property
- *         cdef inline int month(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_MONTH(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":119
- * 
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_DAY(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_3day_day(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("day", 0);
-
-  /* "cpython/datetime.pxd":120
- *         @property
- *         cdef inline int day(self):
- *             return PyDateTime_GET_DAY(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_GET_DAY(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":119
- * 
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_GET_DAY(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":123
- * 
- *         @property
- *         cdef inline int hour(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_HOUR(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4hour_hour(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("hour", 0);
-
-  /* "cpython/datetime.pxd":124
- *         @property
- *         cdef inline int hour(self):
- *             return PyDateTime_DATE_GET_HOUR(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DATE_GET_HOUR(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":123
- * 
- *         @property
- *         cdef inline int hour(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_HOUR(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":127
- * 
- *         @property
- *         cdef inline int minute(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_MINUTE(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_6minute_minute(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("minute", 0);
-
-  /* "cpython/datetime.pxd":128
- *         @property
- *         cdef inline int minute(self):
- *             return PyDateTime_DATE_GET_MINUTE(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DATE_GET_MINUTE(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":127
- * 
- *         @property
- *         cdef inline int minute(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_MINUTE(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":131
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_SECOND(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_6second_second(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("second", 0);
-
-  /* "cpython/datetime.pxd":132
- *         @property
- *         cdef inline int second(self):
- *             return PyDateTime_DATE_GET_SECOND(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DATE_GET_SECOND(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":131
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_SECOND(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":135
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_MICROSECOND(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_11microsecond_microsecond(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("microsecond", 0);
-
-  /* "cpython/datetime.pxd":136
- *         @property
- *         cdef inline int microsecond(self):
- *             return PyDateTime_DATE_GET_MICROSECOND(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DATE_GET_MICROSECOND(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":135
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DATE_GET_MICROSECOND(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":139
- * 
- *         @property
- *         cdef inline object tzinfo(self):             # <<<<<<<<<<<<<<
- *             return <object>PyDateTime_DATE_GET_TZINFO(self)
- * 
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_8datetime_6tzinfo_tzinfo(PyDateTime_DateTime *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1;
-  __Pyx_RefNannySetupContext("tzinfo", 0);
-
-  /* "cpython/datetime.pxd":140
- *         @property
- *         cdef inline object tzinfo(self):
- *             return <object>PyDateTime_DATE_GET_TZINFO(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyDateTime_DATE_GET_TZINFO(((PyObject *)__pyx_v_self));
-  __Pyx_INCREF(((PyObject *)__pyx_t_1));
-  __pyx_r = ((PyObject *)__pyx_t_1);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":139
- * 
- *         @property
- *         cdef inline object tzinfo(self):             # <<<<<<<<<<<<<<
- *             return <object>PyDateTime_DATE_GET_TZINFO(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":143
- * 
- *         @property
- *         cdef inline int fold(self):             # <<<<<<<<<<<<<<
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_DATE_GET_FOLD(self)
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_8datetime_4fold_fold(PyDateTime_DateTime *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("fold", 0);
-
-  /* "cpython/datetime.pxd":145
- *         cdef inline int fold(self):
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_DATE_GET_FOLD(self)             # <<<<<<<<<<<<<<
- * 
- *     ctypedef extern class datetime.timedelta[object PyDateTime_Delta]:
- */
-  __pyx_r = PyDateTime_DATE_GET_FOLD(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":143
- * 
- *         @property
- *         cdef inline int fold(self):             # <<<<<<<<<<<<<<
- *             # For Python < 3.6 this returns 0 no matter what
- *             return PyDateTime_DATE_GET_FOLD(self)
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":149
- *     ctypedef extern class datetime.timedelta[object PyDateTime_Delta]:
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_DAYS(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_3day_day(PyDateTime_Delta *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("day", 0);
-
-  /* "cpython/datetime.pxd":150
- *         @property
- *         cdef inline int day(self):
- *             return PyDateTime_DELTA_GET_DAYS(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DELTA_GET_DAYS(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":149
- *     ctypedef extern class datetime.timedelta[object PyDateTime_Delta]:
- *         @property
- *         cdef inline int day(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_DAYS(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":153
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_SECONDS(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_6second_second(PyDateTime_Delta *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("second", 0);
-
-  /* "cpython/datetime.pxd":154
- *         @property
- *         cdef inline int second(self):
- *             return PyDateTime_DELTA_GET_SECONDS(self)             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = PyDateTime_DELTA_GET_SECONDS(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":153
- * 
- *         @property
- *         cdef inline int second(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_SECONDS(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":157
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_MICROSECONDS(self)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_9timedelta_11microsecond_microsecond(PyDateTime_Delta *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("microsecond", 0);
-
-  /* "cpython/datetime.pxd":158
- *         @property
- *         cdef inline int microsecond(self):
- *             return PyDateTime_DELTA_GET_MICROSECONDS(self)             # <<<<<<<<<<<<<<
- * 
- *     ctypedef extern class datetime.tzinfo[object PyDateTime_TZInfo]:
- */
-  __pyx_r = PyDateTime_DELTA_GET_MICROSECONDS(((PyObject *)__pyx_v_self));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":157
- * 
- *         @property
- *         cdef inline int microsecond(self):             # <<<<<<<<<<<<<<
- *             return PyDateTime_DELTA_GET_MICROSECONDS(self)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":282
- * # Datetime C API initialization function.
- * # You have to call it before any usage of DateTime CAPI functions.
- * cdef inline void import_datetime():             # <<<<<<<<<<<<<<
- *     PyDateTime_IMPORT
- * 
- */
-
-static CYTHON_INLINE void __pyx_f_7cpython_8datetime_import_datetime(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("import_datetime", 0);
-
-  /* "cpython/datetime.pxd":283
- * # You have to call it before any usage of DateTime CAPI functions.
- * cdef inline void import_datetime():
- *     PyDateTime_IMPORT             # <<<<<<<<<<<<<<
- * 
- * # Create date object using DateTime CAPI factory function.
- */
-  (void)(PyDateTime_IMPORT);
-
-  /* "cpython/datetime.pxd":282
- * # Datetime C API initialization function.
- * # You have to call it before any usage of DateTime CAPI functions.
- * cdef inline void import_datetime():             # <<<<<<<<<<<<<<
- *     PyDateTime_IMPORT
- * 
- */
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-}
-
-/* "cpython/datetime.pxd":287
- * # Create date object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline date date_new(int year, int month, int day):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Date_FromDate(year, month, day, PyDateTimeAPI.DateType)
- * 
- */
-
-static CYTHON_INLINE PyDateTime_Date *__pyx_f_7cpython_8datetime_date_new(int __pyx_v_year, int __pyx_v_month, int __pyx_v_day) {
-  PyDateTime_Date *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("date_new", 0);
-
-  /* "cpython/datetime.pxd":288
- * # Note, there are no range checks for any of the arguments.
- * cdef inline date date_new(int year, int month, int day):
- *     return PyDateTimeAPI.Date_FromDate(year, month, day, PyDateTimeAPI.DateType)             # <<<<<<<<<<<<<<
- * 
- * # Create time object using DateTime CAPI factory function
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-  __pyx_t_1 = ((PyObject *)PyDateTimeAPI->Date_FromDate(__pyx_v_year, __pyx_v_month, __pyx_v_day, PyDateTimeAPI->DateType)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 288, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = ((PyDateTime_Date *)__pyx_t_1);
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":287
- * # Create date object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline date date_new(int year, int month, int day):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Date_FromDate(year, month, day, PyDateTimeAPI.DateType)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("cpython.datetime.date_new", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":292
- * # Create time object using DateTime CAPI factory function
- * # Note, there are no range checks for any of the arguments.
- * cdef inline time time_new(int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)
- * 
- */
-
-static CYTHON_INLINE PyDateTime_Time *__pyx_f_7cpython_8datetime_time_new(int __pyx_v_hour, int __pyx_v_minute, int __pyx_v_second, int __pyx_v_microsecond, PyObject *__pyx_v_tz, struct __pyx_opt_args_7cpython_8datetime_time_new *__pyx_optional_args) {
-  int __pyx_v_fold = ((int)0);
-  PyDateTime_Time *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("time_new", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_fold = __pyx_optional_args->fold;
-    }
-  }
-
-  /* "cpython/datetime.pxd":293
- * # Note, there are no range checks for any of the arguments.
- * cdef inline time time_new(int hour, int minute, int second, int microsecond, object tz, int fold=0):
- *     return __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)             # <<<<<<<<<<<<<<
- * 
- * # Create datetime object using DateTime CAPI factory function.
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-  __pyx_t_1 = ((PyObject *)__Pyx_DateTime_TimeWithFold(__pyx_v_hour, __pyx_v_minute, __pyx_v_second, __pyx_v_microsecond, __pyx_v_tz, __pyx_v_fold)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 293, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_7cpython_8datetime_time))))) __PYX_ERR(2, 293, __pyx_L1_error)
-  __pyx_r = ((PyDateTime_Time *)__pyx_t_1);
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":292
- * # Create time object using DateTime CAPI factory function
- * # Note, there are no range checks for any of the arguments.
- * cdef inline time time_new(int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_TimeWithFold(hour, minute, second, microsecond, tz, fold)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("cpython.datetime.time_new", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":297
- * # Create datetime object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline datetime datetime_new(int year, int month, int day, int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)
- * 
- */
-
-static CYTHON_INLINE PyDateTime_DateTime *__pyx_f_7cpython_8datetime_datetime_new(int __pyx_v_year, int __pyx_v_month, int __pyx_v_day, int __pyx_v_hour, int __pyx_v_minute, int __pyx_v_second, int __pyx_v_microsecond, PyObject *__pyx_v_tz, struct __pyx_opt_args_7cpython_8datetime_datetime_new *__pyx_optional_args) {
-  int __pyx_v_fold = ((int)0);
-  PyDateTime_DateTime *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("datetime_new", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_fold = __pyx_optional_args->fold;
-    }
-  }
-
-  /* "cpython/datetime.pxd":298
- * # Note, there are no range checks for any of the arguments.
- * cdef inline datetime datetime_new(int year, int month, int day, int hour, int minute, int second, int microsecond, object tz, int fold=0):
- *     return __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)             # <<<<<<<<<<<<<<
- * 
- * # Create timedelta object using DateTime CAPI factory function.
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-  __pyx_t_1 = ((PyObject *)__Pyx_DateTime_DateTimeWithFold(__pyx_v_year, __pyx_v_month, __pyx_v_day, __pyx_v_hour, __pyx_v_minute, __pyx_v_second, __pyx_v_microsecond, __pyx_v_tz, __pyx_v_fold)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 298, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = ((PyDateTime_DateTime *)__pyx_t_1);
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":297
- * # Create datetime object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline datetime datetime_new(int year, int month, int day, int hour, int minute, int second, int microsecond, object tz, int fold=0):             # <<<<<<<<<<<<<<
- *     return __Pyx_DateTime_DateTimeWithFold(year, month, day, hour, minute, second, microsecond, tz, fold)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("cpython.datetime.datetime_new", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":302
- * # Create timedelta object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline timedelta timedelta_new(int days, int seconds, int useconds):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Delta_FromDelta(days, seconds, useconds, 1, PyDateTimeAPI.DeltaType)
- * 
- */
-
-static CYTHON_INLINE PyDateTime_Delta *__pyx_f_7cpython_8datetime_timedelta_new(int __pyx_v_days, int __pyx_v_seconds, int __pyx_v_useconds) {
-  PyDateTime_Delta *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("timedelta_new", 0);
-
-  /* "cpython/datetime.pxd":303
- * # Note, there are no range checks for any of the arguments.
- * cdef inline timedelta timedelta_new(int days, int seconds, int useconds):
- *     return PyDateTimeAPI.Delta_FromDelta(days, seconds, useconds, 1, PyDateTimeAPI.DeltaType)             # <<<<<<<<<<<<<<
- * 
- * # Create timedelta object using DateTime CAPI factory function.
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-  __pyx_t_1 = ((PyObject *)PyDateTimeAPI->Delta_FromDelta(__pyx_v_days, __pyx_v_seconds, __pyx_v_useconds, 1, PyDateTimeAPI->DeltaType)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 303, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = ((PyDateTime_Delta *)__pyx_t_1);
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":302
- * # Create timedelta object using DateTime CAPI factory function.
- * # Note, there are no range checks for any of the arguments.
- * cdef inline timedelta timedelta_new(int days, int seconds, int useconds):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Delta_FromDelta(days, seconds, useconds, 1, PyDateTimeAPI.DeltaType)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("cpython.datetime.timedelta_new", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":306
- * 
- * # Create timedelta object using DateTime CAPI factory function.
- * cdef inline object timezone_new(object offset, object name=None):             # <<<<<<<<<<<<<<
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_timezone_new(PyObject *__pyx_v_offset, struct __pyx_opt_args_7cpython_8datetime_timezone_new *__pyx_optional_args) {
-  PyObject *__pyx_v_name = ((PyObject *)Py_None);
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("timezone_new", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_name = __pyx_optional_args->name;
-    }
-  }
-
-  /* "cpython/datetime.pxd":307
- * # Create timedelta object using DateTime CAPI factory function.
- * cdef inline object timezone_new(object offset, object name=None):
- *     if PY_VERSION_HEX < 0x030700b1:             # <<<<<<<<<<<<<<
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return __Pyx_TimeZone_FromOffsetAndName(offset, <PyObject*>name if name is not None else NULL)
- */
-  __pyx_t_1 = (PY_VERSION_HEX < 0x030700b1);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "cpython/datetime.pxd":308
- * cdef inline object timezone_new(object offset, object name=None):
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')             # <<<<<<<<<<<<<<
- *     return __Pyx_TimeZone_FromOffsetAndName(offset, <PyObject*>name if name is not None else NULL)
- * 
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 308, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(2, 308, __pyx_L1_error)
-
-    /* "cpython/datetime.pxd":307
- * # Create timedelta object using DateTime CAPI factory function.
- * cdef inline object timezone_new(object offset, object name=None):
- *     if PY_VERSION_HEX < 0x030700b1:             # <<<<<<<<<<<<<<
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return __Pyx_TimeZone_FromOffsetAndName(offset, <PyObject*>name if name is not None else NULL)
- */
-  }
-
-  /* "cpython/datetime.pxd":309
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return __Pyx_TimeZone_FromOffsetAndName(offset, <PyObject*>name if name is not None else NULL)             # <<<<<<<<<<<<<<
- * 
- * # Create datetime object using DB API constructor.
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = (__pyx_v_name != Py_None);
-  if (__pyx_t_1) {
-    __pyx_t_3 = ((PyObject *)__pyx_v_name);
-  } else {
-    __pyx_t_3 = NULL;
-  }
-  __pyx_t_2 = __Pyx_TimeZone_FromOffsetAndName(__pyx_v_offset, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 309, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_r = __pyx_t_2;
-  __pyx_t_2 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":306
- * 
- * # Create timedelta object using DateTime CAPI factory function.
- * cdef inline object timezone_new(object offset, object name=None):             # <<<<<<<<<<<<<<
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("cpython.datetime.timezone_new", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":312
- * 
- * # Create datetime object using DB API constructor.
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.DateTime_FromTimestamp(
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)
- */
-
-static CYTHON_INLINE PyDateTime_DateTime *__pyx_f_7cpython_8datetime_datetime_from_timestamp(PyObject *__pyx_v_timestamp, struct __pyx_opt_args_7cpython_8datetime_datetime_from_timestamp *__pyx_optional_args) {
-  PyObject *__pyx_v_tz = ((PyObject *)Py_None);
-  PyDateTime_DateTime *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("datetime_from_timestamp", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_tz = __pyx_optional_args->tz;
-    }
-  }
-
-  /* "cpython/datetime.pxd":313
- * # Create datetime object using DB API constructor.
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):
- *     return PyDateTimeAPI.DateTime_FromTimestamp(             # <<<<<<<<<<<<<<
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)
- * 
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-
-  /* "cpython/datetime.pxd":314
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):
- *     return PyDateTimeAPI.DateTime_FromTimestamp(
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)             # <<<<<<<<<<<<<<
- * 
- * # Create date object using DB API constructor.
- */
-  __pyx_t_2 = (__pyx_v_tz != Py_None);
-  if (__pyx_t_2) {
-    __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 314, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_INCREF(__pyx_v_timestamp);
-    __Pyx_GIVEREF(__pyx_v_timestamp);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_timestamp)) __PYX_ERR(2, 314, __pyx_L1_error);
-    __Pyx_INCREF(__pyx_v_tz);
-    __Pyx_GIVEREF(__pyx_v_tz);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_tz)) __PYX_ERR(2, 314, __pyx_L1_error);
-    __pyx_t_1 = __pyx_t_3;
-    __pyx_t_3 = 0;
-  } else {
-    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 314, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_INCREF(__pyx_v_timestamp);
-    __Pyx_GIVEREF(__pyx_v_timestamp);
-    if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_timestamp)) __PYX_ERR(2, 314, __pyx_L1_error);
-    __pyx_t_1 = __pyx_t_3;
-    __pyx_t_3 = 0;
-  }
-
-  /* "cpython/datetime.pxd":313
- * # Create datetime object using DB API constructor.
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):
- *     return PyDateTimeAPI.DateTime_FromTimestamp(             # <<<<<<<<<<<<<<
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)
- * 
- */
-  __pyx_t_3 = ((PyObject *)PyDateTimeAPI->DateTime_FromTimestamp(((PyObject *)PyDateTimeAPI->DateTimeType), __pyx_t_1, NULL)); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 313, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_r = ((PyDateTime_DateTime *)__pyx_t_3);
-  __pyx_t_3 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":312
- * 
- * # Create datetime object using DB API constructor.
- * cdef inline datetime datetime_from_timestamp(timestamp, tz=None):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.DateTime_FromTimestamp(
- *         <PyObject*>PyDateTimeAPI.DateTimeType, (timestamp, tz) if tz is not None else (timestamp,), NULL)
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_AddTraceback("cpython.datetime.datetime_from_timestamp", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":317
- * 
- * # Create date object using DB API constructor.
- * cdef inline date date_from_timestamp(timestamp):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Date_FromTimestamp(<PyObject*>PyDateTimeAPI.DateType, (timestamp,))
- * 
- */
-
-static CYTHON_INLINE PyDateTime_Date *__pyx_f_7cpython_8datetime_date_from_timestamp(PyObject *__pyx_v_timestamp) {
-  PyDateTime_Date *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("date_from_timestamp", 0);
-
-  /* "cpython/datetime.pxd":318
- * # Create date object using DB API constructor.
- * cdef inline date date_from_timestamp(timestamp):
- *     return PyDateTimeAPI.Date_FromTimestamp(<PyObject*>PyDateTimeAPI.DateType, (timestamp,))             # <<<<<<<<<<<<<<
- * 
- * # More recognizable getters for date/time/datetime/timedelta.
- */
-  __Pyx_XDECREF((PyObject *)__pyx_r);
-  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 318, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_INCREF(__pyx_v_timestamp);
-  __Pyx_GIVEREF(__pyx_v_timestamp);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_timestamp)) __PYX_ERR(2, 318, __pyx_L1_error);
-  __pyx_t_2 = ((PyObject *)PyDateTimeAPI->Date_FromTimestamp(((PyObject *)PyDateTimeAPI->DateType), __pyx_t_1)); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 318, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_r = ((PyDateTime_Date *)__pyx_t_2);
-  __pyx_t_2 = 0;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":317
- * 
- * # Create date object using DB API constructor.
- * cdef inline date date_from_timestamp(timestamp):             # <<<<<<<<<<<<<<
- *     return PyDateTimeAPI.Date_FromTimestamp(<PyObject*>PyDateTimeAPI.DateType, (timestamp,))
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("cpython.datetime.date_from_timestamp", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF((PyObject *)__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":326
- * 
- * # Get UTC singleton
- * cdef inline object get_utc():             # <<<<<<<<<<<<<<
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_get_utc(void) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("get_utc", 0);
-
-  /* "cpython/datetime.pxd":327
- * # Get UTC singleton
- * cdef inline object get_utc():
- *     if PY_VERSION_HEX < 0x030700b1:             # <<<<<<<<<<<<<<
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return <object>__Pyx_TimeZone_UTC
- */
-  __pyx_t_1 = (PY_VERSION_HEX < 0x030700b1);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "cpython/datetime.pxd":328
- * cdef inline object get_utc():
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')             # <<<<<<<<<<<<<<
- *     return <object>__Pyx_TimeZone_UTC
- * 
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 328, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(2, 328, __pyx_L1_error)
-
-    /* "cpython/datetime.pxd":327
- * # Get UTC singleton
- * cdef inline object get_utc():
- *     if PY_VERSION_HEX < 0x030700b1:             # <<<<<<<<<<<<<<
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return <object>__Pyx_TimeZone_UTC
- */
-  }
-
-  /* "cpython/datetime.pxd":329
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- *     return <object>__Pyx_TimeZone_UTC             # <<<<<<<<<<<<<<
- * 
- * # Get tzinfo of time
- */
-  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(((PyObject *)__Pyx_TimeZone_UTC));
-  __pyx_r = ((PyObject *)__Pyx_TimeZone_UTC);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":326
- * 
- * # Get UTC singleton
- * cdef inline object get_utc():             # <<<<<<<<<<<<<<
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("cpython.datetime.get_utc", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":332
- * 
- * # Get tzinfo of time
- * cdef inline object time_tzinfo(object o):             # <<<<<<<<<<<<<<
- *     return <object>PyDateTime_TIME_GET_TZINFO(o)
- * 
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_time_tzinfo(PyObject *__pyx_v_o) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1;
-  __Pyx_RefNannySetupContext("time_tzinfo", 0);
-
-  /* "cpython/datetime.pxd":333
- * # Get tzinfo of time
- * cdef inline object time_tzinfo(object o):
- *     return <object>PyDateTime_TIME_GET_TZINFO(o)             # <<<<<<<<<<<<<<
- * 
- * # Get tzinfo of datetime
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyDateTime_TIME_GET_TZINFO(__pyx_v_o);
-  __Pyx_INCREF(((PyObject *)__pyx_t_1));
-  __pyx_r = ((PyObject *)__pyx_t_1);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":332
- * 
- * # Get tzinfo of time
- * cdef inline object time_tzinfo(object o):             # <<<<<<<<<<<<<<
- *     return <object>PyDateTime_TIME_GET_TZINFO(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":336
- * 
- * # Get tzinfo of datetime
- * cdef inline object datetime_tzinfo(object o):             # <<<<<<<<<<<<<<
- *     return <object>PyDateTime_DATE_GET_TZINFO(o)
- * 
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_8datetime_datetime_tzinfo(PyObject *__pyx_v_o) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1;
-  __Pyx_RefNannySetupContext("datetime_tzinfo", 0);
-
-  /* "cpython/datetime.pxd":337
- * # Get tzinfo of datetime
- * cdef inline object datetime_tzinfo(object o):
- *     return <object>PyDateTime_DATE_GET_TZINFO(o)             # <<<<<<<<<<<<<<
- * 
- * # Get year of date
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyDateTime_DATE_GET_TZINFO(__pyx_v_o);
-  __Pyx_INCREF(((PyObject *)__pyx_t_1));
-  __pyx_r = ((PyObject *)__pyx_t_1);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":336
- * 
- * # Get tzinfo of datetime
- * cdef inline object datetime_tzinfo(object o):             # <<<<<<<<<<<<<<
- *     return <object>PyDateTime_DATE_GET_TZINFO(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":340
- * 
- * # Get year of date
- * cdef inline int date_year(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_YEAR(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_date_year(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("date_year", 0);
-
-  /* "cpython/datetime.pxd":341
- * # Get year of date
- * cdef inline int date_year(object o):
- *     return PyDateTime_GET_YEAR(o)             # <<<<<<<<<<<<<<
- * 
- * # Get month of date
- */
-  __pyx_r = PyDateTime_GET_YEAR(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":340
- * 
- * # Get year of date
- * cdef inline int date_year(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_YEAR(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":344
- * 
- * # Get month of date
- * cdef inline int date_month(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_MONTH(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_date_month(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("date_month", 0);
-
-  /* "cpython/datetime.pxd":345
- * # Get month of date
- * cdef inline int date_month(object o):
- *     return PyDateTime_GET_MONTH(o)             # <<<<<<<<<<<<<<
- * 
- * # Get day of date
- */
-  __pyx_r = PyDateTime_GET_MONTH(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":344
- * 
- * # Get month of date
- * cdef inline int date_month(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_MONTH(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":348
- * 
- * # Get day of date
- * cdef inline int date_day(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_DAY(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_date_day(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("date_day", 0);
-
-  /* "cpython/datetime.pxd":349
- * # Get day of date
- * cdef inline int date_day(object o):
- *     return PyDateTime_GET_DAY(o)             # <<<<<<<<<<<<<<
- * 
- * # Get year of datetime
- */
-  __pyx_r = PyDateTime_GET_DAY(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":348
- * 
- * # Get day of date
- * cdef inline int date_day(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_DAY(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":352
- * 
- * # Get year of datetime
- * cdef inline int datetime_year(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_YEAR(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_year(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_year", 0);
-
-  /* "cpython/datetime.pxd":353
- * # Get year of datetime
- * cdef inline int datetime_year(object o):
- *     return PyDateTime_GET_YEAR(o)             # <<<<<<<<<<<<<<
- * 
- * # Get month of datetime
- */
-  __pyx_r = PyDateTime_GET_YEAR(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":352
- * 
- * # Get year of datetime
- * cdef inline int datetime_year(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_YEAR(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":356
- * 
- * # Get month of datetime
- * cdef inline int datetime_month(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_MONTH(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_month(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_month", 0);
-
-  /* "cpython/datetime.pxd":357
- * # Get month of datetime
- * cdef inline int datetime_month(object o):
- *     return PyDateTime_GET_MONTH(o)             # <<<<<<<<<<<<<<
- * 
- * # Get day of datetime
- */
-  __pyx_r = PyDateTime_GET_MONTH(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":356
- * 
- * # Get month of datetime
- * cdef inline int datetime_month(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_MONTH(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":360
- * 
- * # Get day of datetime
- * cdef inline int datetime_day(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_DAY(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_day(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_day", 0);
-
-  /* "cpython/datetime.pxd":361
- * # Get day of datetime
- * cdef inline int datetime_day(object o):
- *     return PyDateTime_GET_DAY(o)             # <<<<<<<<<<<<<<
- * 
- * # Get hour of time
- */
-  __pyx_r = PyDateTime_GET_DAY(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":360
- * 
- * # Get day of datetime
- * cdef inline int datetime_day(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_GET_DAY(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":364
- * 
- * # Get hour of time
- * cdef inline int time_hour(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_HOUR(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_time_hour(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("time_hour", 0);
-
-  /* "cpython/datetime.pxd":365
- * # Get hour of time
- * cdef inline int time_hour(object o):
- *     return PyDateTime_TIME_GET_HOUR(o)             # <<<<<<<<<<<<<<
- * 
- * # Get minute of time
- */
-  __pyx_r = PyDateTime_TIME_GET_HOUR(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":364
- * 
- * # Get hour of time
- * cdef inline int time_hour(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_HOUR(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":368
- * 
- * # Get minute of time
- * cdef inline int time_minute(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_MINUTE(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_time_minute(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("time_minute", 0);
-
-  /* "cpython/datetime.pxd":369
- * # Get minute of time
- * cdef inline int time_minute(object o):
- *     return PyDateTime_TIME_GET_MINUTE(o)             # <<<<<<<<<<<<<<
- * 
- * # Get second of time
- */
-  __pyx_r = PyDateTime_TIME_GET_MINUTE(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":368
- * 
- * # Get minute of time
- * cdef inline int time_minute(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_MINUTE(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":372
- * 
- * # Get second of time
- * cdef inline int time_second(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_SECOND(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_time_second(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("time_second", 0);
-
-  /* "cpython/datetime.pxd":373
- * # Get second of time
- * cdef inline int time_second(object o):
- *     return PyDateTime_TIME_GET_SECOND(o)             # <<<<<<<<<<<<<<
- * 
- * # Get microsecond of time
- */
-  __pyx_r = PyDateTime_TIME_GET_SECOND(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":372
- * 
- * # Get second of time
- * cdef inline int time_second(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_SECOND(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":376
- * 
- * # Get microsecond of time
- * cdef inline int time_microsecond(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_MICROSECOND(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_time_microsecond(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("time_microsecond", 0);
-
-  /* "cpython/datetime.pxd":377
- * # Get microsecond of time
- * cdef inline int time_microsecond(object o):
- *     return PyDateTime_TIME_GET_MICROSECOND(o)             # <<<<<<<<<<<<<<
- * 
- * # Get fold of time
- */
-  __pyx_r = PyDateTime_TIME_GET_MICROSECOND(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":376
- * 
- * # Get microsecond of time
- * cdef inline int time_microsecond(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_TIME_GET_MICROSECOND(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":380
- * 
- * # Get fold of time
- * cdef inline int time_fold(object o):             # <<<<<<<<<<<<<<
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_TIME_GET_FOLD(o)
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_time_fold(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("time_fold", 0);
-
-  /* "cpython/datetime.pxd":382
- * cdef inline int time_fold(object o):
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_TIME_GET_FOLD(o)             # <<<<<<<<<<<<<<
- * 
- * # Get hour of datetime
- */
-  __pyx_r = PyDateTime_TIME_GET_FOLD(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":380
- * 
- * # Get fold of time
- * cdef inline int time_fold(object o):             # <<<<<<<<<<<<<<
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_TIME_GET_FOLD(o)
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":385
- * 
- * # Get hour of datetime
- * cdef inline int datetime_hour(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_HOUR(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_hour(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_hour", 0);
-
-  /* "cpython/datetime.pxd":386
- * # Get hour of datetime
- * cdef inline int datetime_hour(object o):
- *     return PyDateTime_DATE_GET_HOUR(o)             # <<<<<<<<<<<<<<
- * 
- * # Get minute of datetime
- */
-  __pyx_r = PyDateTime_DATE_GET_HOUR(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":385
- * 
- * # Get hour of datetime
- * cdef inline int datetime_hour(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_HOUR(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":389
- * 
- * # Get minute of datetime
- * cdef inline int datetime_minute(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_MINUTE(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_minute(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_minute", 0);
-
-  /* "cpython/datetime.pxd":390
- * # Get minute of datetime
- * cdef inline int datetime_minute(object o):
- *     return PyDateTime_DATE_GET_MINUTE(o)             # <<<<<<<<<<<<<<
- * 
- * # Get second of datetime
- */
-  __pyx_r = PyDateTime_DATE_GET_MINUTE(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":389
- * 
- * # Get minute of datetime
- * cdef inline int datetime_minute(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_MINUTE(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":393
- * 
- * # Get second of datetime
- * cdef inline int datetime_second(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_SECOND(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_second(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_second", 0);
-
-  /* "cpython/datetime.pxd":394
- * # Get second of datetime
- * cdef inline int datetime_second(object o):
- *     return PyDateTime_DATE_GET_SECOND(o)             # <<<<<<<<<<<<<<
- * 
- * # Get microsecond of datetime
- */
-  __pyx_r = PyDateTime_DATE_GET_SECOND(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":393
- * 
- * # Get second of datetime
- * cdef inline int datetime_second(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_SECOND(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":397
- * 
- * # Get microsecond of datetime
- * cdef inline int datetime_microsecond(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_MICROSECOND(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_microsecond(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_microsecond", 0);
-
-  /* "cpython/datetime.pxd":398
- * # Get microsecond of datetime
- * cdef inline int datetime_microsecond(object o):
- *     return PyDateTime_DATE_GET_MICROSECOND(o)             # <<<<<<<<<<<<<<
- * 
- * # Get fold of datetime
- */
-  __pyx_r = PyDateTime_DATE_GET_MICROSECOND(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":397
- * 
- * # Get microsecond of datetime
- * cdef inline int datetime_microsecond(object o):             # <<<<<<<<<<<<<<
- *     return PyDateTime_DATE_GET_MICROSECOND(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":401
- * 
- * # Get fold of datetime
- * cdef inline int datetime_fold(object o):             # <<<<<<<<<<<<<<
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_DATE_GET_FOLD(o)
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_datetime_fold(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("datetime_fold", 0);
-
-  /* "cpython/datetime.pxd":403
- * cdef inline int datetime_fold(object o):
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_DATE_GET_FOLD(o)             # <<<<<<<<<<<<<<
- * 
- * # Get days of timedelta
- */
-  __pyx_r = PyDateTime_DATE_GET_FOLD(__pyx_v_o);
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":401
- * 
- * # Get fold of datetime
- * cdef inline int datetime_fold(object o):             # <<<<<<<<<<<<<<
- *     # For Python < 3.6 this returns 0 no matter what
- *     return PyDateTime_DATE_GET_FOLD(o)
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":406
- * 
- * # Get days of timedelta
- * cdef inline int timedelta_days(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).days
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_days(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("timedelta_days", 0);
-
-  /* "cpython/datetime.pxd":407
- * # Get days of timedelta
- * cdef inline int timedelta_days(object o):
- *     return (<PyDateTime_Delta*>o).days             # <<<<<<<<<<<<<<
- * 
- * # Get seconds of timedelta
- */
-  __pyx_r = ((PyDateTime_Delta *)__pyx_v_o)->days;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":406
- * 
- * # Get days of timedelta
- * cdef inline int timedelta_days(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).days
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":410
- * 
- * # Get seconds of timedelta
- * cdef inline int timedelta_seconds(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).seconds
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_seconds(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("timedelta_seconds", 0);
-
-  /* "cpython/datetime.pxd":411
- * # Get seconds of timedelta
- * cdef inline int timedelta_seconds(object o):
- *     return (<PyDateTime_Delta*>o).seconds             # <<<<<<<<<<<<<<
- * 
- * # Get microseconds of timedelta
- */
-  __pyx_r = ((PyDateTime_Delta *)__pyx_v_o)->seconds;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":410
- * 
- * # Get seconds of timedelta
- * cdef inline int timedelta_seconds(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).seconds
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":414
- * 
- * # Get microseconds of timedelta
- * cdef inline int timedelta_microseconds(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).microseconds
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7cpython_8datetime_timedelta_microseconds(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("timedelta_microseconds", 0);
-
-  /* "cpython/datetime.pxd":415
- * # Get microseconds of timedelta
- * cdef inline int timedelta_microseconds(object o):
- *     return (<PyDateTime_Delta*>o).microseconds             # <<<<<<<<<<<<<<
- * 
- * cdef inline double total_seconds(timedelta obj):
- */
-  __pyx_r = ((PyDateTime_Delta *)__pyx_v_o)->microseconds;
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":414
- * 
- * # Get microseconds of timedelta
- * cdef inline int timedelta_microseconds(object o):             # <<<<<<<<<<<<<<
- *     return (<PyDateTime_Delta*>o).microseconds
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/datetime.pxd":417
- *     return (<PyDateTime_Delta*>o).microseconds
- * 
- * cdef inline double total_seconds(timedelta obj):             # <<<<<<<<<<<<<<
- *     # Mirrors the "timedelta.total_seconds()" method.
- *     # Note that this implementation is not guaranteed to give *exactly* the same
- */
-
-static CYTHON_INLINE double __pyx_f_7cpython_8datetime_total_seconds(PyDateTime_Delta *__pyx_v_obj) {
-  double __pyx_v_days;
-  double __pyx_v_seconds;
-  double __pyx_v_micros;
-  double __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("total_seconds", 0);
-
-  /* "cpython/datetime.pxd":423
- *     cdef:
- *         double days, seconds, micros
- *     days = <double>PyDateTime_DELTA_GET_DAYS(obj)             # <<<<<<<<<<<<<<
- *     seconds = <double>PyDateTime_DELTA_GET_SECONDS(obj)
- *     micros = <double>PyDateTime_DELTA_GET_MICROSECONDS(obj)
- */
-  __pyx_v_days = ((double)PyDateTime_DELTA_GET_DAYS(((PyObject *)__pyx_v_obj)));
-
-  /* "cpython/datetime.pxd":424
- *         double days, seconds, micros
- *     days = <double>PyDateTime_DELTA_GET_DAYS(obj)
- *     seconds = <double>PyDateTime_DELTA_GET_SECONDS(obj)             # <<<<<<<<<<<<<<
- *     micros = <double>PyDateTime_DELTA_GET_MICROSECONDS(obj)
- *     return days * 24 * 3600 + seconds + micros / 1_000_000
- */
-  __pyx_v_seconds = ((double)PyDateTime_DELTA_GET_SECONDS(((PyObject *)__pyx_v_obj)));
-
-  /* "cpython/datetime.pxd":425
- *     days = <double>PyDateTime_DELTA_GET_DAYS(obj)
- *     seconds = <double>PyDateTime_DELTA_GET_SECONDS(obj)
- *     micros = <double>PyDateTime_DELTA_GET_MICROSECONDS(obj)             # <<<<<<<<<<<<<<
- *     return days * 24 * 3600 + seconds + micros / 1_000_000
- */
-  __pyx_v_micros = ((double)PyDateTime_DELTA_GET_MICROSECONDS(((PyObject *)__pyx_v_obj)));
-
-  /* "cpython/datetime.pxd":426
- *     seconds = <double>PyDateTime_DELTA_GET_SECONDS(obj)
- *     micros = <double>PyDateTime_DELTA_GET_MICROSECONDS(obj)
- *     return days * 24 * 3600 + seconds + micros / 1_000_000             # <<<<<<<<<<<<<<
- */
-  __pyx_r = ((((__pyx_v_days * 24.0) * 3600.0) + __pyx_v_seconds) + (__pyx_v_micros / 1000000.0));
-  goto __pyx_L0;
-
-  /* "cpython/datetime.pxd":417
- *     return (<PyDateTime_Delta*>o).microseconds
- * 
- * cdef inline double total_seconds(timedelta obj):             # <<<<<<<<<<<<<<
- *     # Mirrors the "timedelta.total_seconds()" method.
- *     # Note that this implementation is not guaranteed to give *exactly* the same
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/complex.pxd":19
- * 
- *         @property
- *         cdef inline double real(self):             # <<<<<<<<<<<<<<
- *             return self.cval.real
- * 
- */
-
-static CYTHON_INLINE double __pyx_f_7cpython_7complex_7complex_4real_real(PyComplexObject *__pyx_v_self) {
-  double __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("real", 0);
-
-  /* "cpython/complex.pxd":20
- *         @property
- *         cdef inline double real(self):
- *             return self.cval.real             # <<<<<<<<<<<<<<
- * 
- *         @property
- */
-  __pyx_r = __pyx_v_self->cval.real;
-  goto __pyx_L0;
-
-  /* "cpython/complex.pxd":19
- * 
- *         @property
- *         cdef inline double real(self):             # <<<<<<<<<<<<<<
- *             return self.cval.real
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/complex.pxd":23
- * 
- *         @property
- *         cdef inline double imag(self):             # <<<<<<<<<<<<<<
- *             return self.cval.imag
- * 
- */
-
-static CYTHON_INLINE double __pyx_f_7cpython_7complex_7complex_4imag_imag(PyComplexObject *__pyx_v_self) {
-  double __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("imag", 0);
-
-  /* "cpython/complex.pxd":24
- *         @property
- *         cdef inline double imag(self):
- *             return self.cval.imag             # <<<<<<<<<<<<<<
- * 
- *     # PyTypeObject PyComplex_Type
- */
-  __pyx_r = __pyx_v_self->cval.imag;
-  goto __pyx_L0;
-
-  /* "cpython/complex.pxd":23
- * 
- *         @property
- *         cdef inline double imag(self):             # <<<<<<<<<<<<<<
- *             return self.cval.imag
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/contextvars.pxd":112
- * 
- * 
- * cdef inline object get_value(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the default value of the context variable,
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_11contextvars_get_value(PyObject *__pyx_v_var, struct __pyx_opt_args_7cpython_11contextvars_get_value *__pyx_optional_args) {
-  PyObject *__pyx_v_default_value = ((PyObject *)Py_None);
-  PyObject *__pyx_v_value;
-  PyObject *__pyx_v_pyvalue = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("get_value", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_default_value = __pyx_optional_args->default_value;
-    }
-  }
-
-  /* "cpython/contextvars.pxd":117
- *     or None if no such value or default was found.
- *     """
- *     cdef PyObject *value = NULL             # <<<<<<<<<<<<<<
- *     PyContextVar_Get(var, NULL, &value)
- *     if value is NULL:
- */
-  __pyx_v_value = NULL;
-
-  /* "cpython/contextvars.pxd":118
- *     """
- *     cdef PyObject *value = NULL
- *     PyContextVar_Get(var, NULL, &value)             # <<<<<<<<<<<<<<
- *     if value is NULL:
- *         # context variable does not have a default
- */
-  __pyx_t_1 = PyContextVar_Get(__pyx_v_var, NULL, (&__pyx_v_value)); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 118, __pyx_L1_error)
-
-  /* "cpython/contextvars.pxd":119
- *     cdef PyObject *value = NULL
- *     PyContextVar_Get(var, NULL, &value)
- *     if value is NULL:             # <<<<<<<<<<<<<<
- *         # context variable does not have a default
- *         pyvalue = default_value
- */
-  __pyx_t_2 = (__pyx_v_value == NULL);
-  if (__pyx_t_2) {
-
-    /* "cpython/contextvars.pxd":121
- *     if value is NULL:
- *         # context variable does not have a default
- *         pyvalue = default_value             # <<<<<<<<<<<<<<
- *     else:
- *         # value or default value of context variable
- */
-    __Pyx_INCREF(__pyx_v_default_value);
-    __pyx_v_pyvalue = __pyx_v_default_value;
-
-    /* "cpython/contextvars.pxd":119
- *     cdef PyObject *value = NULL
- *     PyContextVar_Get(var, NULL, &value)
- *     if value is NULL:             # <<<<<<<<<<<<<<
- *         # context variable does not have a default
- *         pyvalue = default_value
- */
-    goto __pyx_L3;
-  }
-
-  /* "cpython/contextvars.pxd":124
- *     else:
- *         # value or default value of context variable
- *         pyvalue = <object>value             # <<<<<<<<<<<<<<
- *         Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'
- *     return pyvalue
- */
-  /*else*/ {
-    __pyx_t_3 = ((PyObject *)__pyx_v_value);
-    __Pyx_INCREF(__pyx_t_3);
-    __pyx_v_pyvalue = __pyx_t_3;
-    __pyx_t_3 = 0;
-
-    /* "cpython/contextvars.pxd":125
- *         # value or default value of context variable
- *         pyvalue = <object>value
- *         Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'             # <<<<<<<<<<<<<<
- *     return pyvalue
- * 
- */
-    Py_XDECREF(__pyx_v_value);
-  }
-  __pyx_L3:;
-
-  /* "cpython/contextvars.pxd":126
- *         pyvalue = <object>value
- *         Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'
- *     return pyvalue             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(__pyx_v_pyvalue);
-  __pyx_r = __pyx_v_pyvalue;
-  goto __pyx_L0;
-
-  /* "cpython/contextvars.pxd":112
- * 
- * 
- * cdef inline object get_value(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the default value of the context variable,
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_AddTraceback("cpython.contextvars.get_value", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_pyvalue);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "cpython/contextvars.pxd":129
- * 
- * 
- * cdef inline object get_value_no_default(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the provided default value if no such value was found.
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7cpython_11contextvars_get_value_no_default(PyObject *__pyx_v_var, struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default *__pyx_optional_args) {
-  PyObject *__pyx_v_default_value = ((PyObject *)Py_None);
-  PyObject *__pyx_v_value;
-  PyObject *__pyx_v_pyvalue = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("get_value_no_default", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_default_value = __pyx_optional_args->default_value;
-    }
-  }
-
-  /* "cpython/contextvars.pxd":135
- *     Ignores the default value of the context variable, if any.
- *     """
- *     cdef PyObject *value = NULL             # <<<<<<<<<<<<<<
- *     PyContextVar_Get(var, <PyObject*>default_value, &value)
- *     # value of context variable or 'default_value'
- */
-  __pyx_v_value = NULL;
-
-  /* "cpython/contextvars.pxd":136
- *     """
- *     cdef PyObject *value = NULL
- *     PyContextVar_Get(var, <PyObject*>default_value, &value)             # <<<<<<<<<<<<<<
- *     # value of context variable or 'default_value'
- *     pyvalue = <object>value
- */
-  __pyx_t_1 = PyContextVar_Get(__pyx_v_var, ((PyObject *)__pyx_v_default_value), (&__pyx_v_value)); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 136, __pyx_L1_error)
-
-  /* "cpython/contextvars.pxd":138
- *     PyContextVar_Get(var, <PyObject*>default_value, &value)
- *     # value of context variable or 'default_value'
- *     pyvalue = <object>value             # <<<<<<<<<<<<<<
- *     Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'
- *     return pyvalue
- */
-  __pyx_t_2 = ((PyObject *)__pyx_v_value);
-  __Pyx_INCREF(__pyx_t_2);
-  __pyx_v_pyvalue = __pyx_t_2;
-  __pyx_t_2 = 0;
-
-  /* "cpython/contextvars.pxd":139
- *     # value of context variable or 'default_value'
- *     pyvalue = <object>value
- *     Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'             # <<<<<<<<<<<<<<
- *     return pyvalue
- */
-  Py_XDECREF(__pyx_v_value);
-
-  /* "cpython/contextvars.pxd":140
- *     pyvalue = <object>value
- *     Py_XDECREF(value)  # PyContextVar_Get() returned an owned reference as 'PyObject*'
- *     return pyvalue             # <<<<<<<<<<<<<<
- */
-  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(__pyx_v_pyvalue);
-  __pyx_r = __pyx_v_pyvalue;
-  goto __pyx_L0;
-
-  /* "cpython/contextvars.pxd":129
- * 
- * 
- * cdef inline object get_value_no_default(var, default_value=None):             # <<<<<<<<<<<<<<
- *     """Return a new reference to the value of the context variable,
- *     or the provided default value if no such value was found.
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("cpython.contextvars.get_value_no_default", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_pyvalue);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":54
- * 
- * 
- * cdef inline int PyBytesLike_Check(object o):             # <<<<<<<<<<<<<<
- *     return PyBytes_Check(o) or PyByteArray_Check(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_Check(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_t_2;
-  __Pyx_RefNannySetupContext("PyBytesLike_Check", 0);
-
-  /* "msgpack/_packer.pyx":55
- * 
- * cdef inline int PyBytesLike_Check(object o):
- *     return PyBytes_Check(o) or PyByteArray_Check(o)             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_t_2 = PyBytes_Check(__pyx_v_o);
-  if (!__pyx_t_2) {
-  } else {
-    __pyx_t_1 = __pyx_t_2;
-    goto __pyx_L3_bool_binop_done;
-  }
-  __pyx_t_2 = PyByteArray_Check(__pyx_v_o);
-  __pyx_t_1 = __pyx_t_2;
-  __pyx_L3_bool_binop_done:;
-  __pyx_r = __pyx_t_1;
-  goto __pyx_L0;
-
-  /* "msgpack/_packer.pyx":54
- * 
- * 
- * cdef inline int PyBytesLike_Check(object o):             # <<<<<<<<<<<<<<
- *     return PyBytes_Check(o) or PyByteArray_Check(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":58
- * 
- * 
- * cdef inline int PyBytesLike_CheckExact(object o):             # <<<<<<<<<<<<<<
- *     return PyBytes_CheckExact(o) or PyByteArray_CheckExact(o)
- * 
- */
-
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_CheckExact(PyObject *__pyx_v_o) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_t_2;
-  __Pyx_RefNannySetupContext("PyBytesLike_CheckExact", 0);
-
-  /* "msgpack/_packer.pyx":59
- * 
- * cdef inline int PyBytesLike_CheckExact(object o):
- *     return PyBytes_CheckExact(o) or PyByteArray_CheckExact(o)             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_t_2 = PyBytes_CheckExact(__pyx_v_o);
-  if (!__pyx_t_2) {
-  } else {
-    __pyx_t_1 = __pyx_t_2;
-    goto __pyx_L3_bool_binop_done;
-  }
-  __pyx_t_2 = PyByteArray_CheckExact(__pyx_v_o);
-  __pyx_t_1 = __pyx_t_2;
-  __pyx_L3_bool_binop_done:;
-  __pyx_r = __pyx_t_1;
-  goto __pyx_L0;
-
-  /* "msgpack/_packer.pyx":58
- * 
- * 
- * cdef inline int PyBytesLike_CheckExact(object o):             # <<<<<<<<<<<<<<
- *     return PyBytes_CheckExact(o) or PyByteArray_CheckExact(o)
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":116
- *     cdef bint datetime
- * 
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         cdef int buf_size = 1024*1024
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- */
-
-/* Python wrapper */
-static int __pyx_pw_7msgpack_9_cmsgpack_6Packer_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static int __pyx_pw_7msgpack_9_cmsgpack_6Packer_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__cinit__ (wrapper)", 0);
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 116, __pyx_L3_error)
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, __pyx_nargs); return -1;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_VARARGS(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__cinit__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return -1;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer___cinit__(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static int __pyx_pf_7msgpack_9_cmsgpack_6Packer___cinit__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  int __pyx_v_buf_size;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__cinit__", 0);
-
-  /* "msgpack/_packer.pyx":117
- * 
- *     def __cinit__(self):
- *         cdef int buf_size = 1024*1024             # <<<<<<<<<<<<<<
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- *         if self.pk.buf == NULL:
- */
-  __pyx_v_buf_size = 0x100000;
-
-  /* "msgpack/_packer.pyx":118
- *     def __cinit__(self):
- *         cdef int buf_size = 1024*1024
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)             # <<<<<<<<<<<<<<
- *         if self.pk.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")
- */
-  __pyx_v_self->pk.buf = ((char *)PyMem_Malloc(__pyx_v_buf_size));
-
-  /* "msgpack/_packer.pyx":119
- *         cdef int buf_size = 1024*1024
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- *         if self.pk.buf == NULL:             # <<<<<<<<<<<<<<
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.pk.buf_size = buf_size
- */
-  __pyx_t_1 = (__pyx_v_self->pk.buf == NULL);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":120
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- *         if self.pk.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")             # <<<<<<<<<<<<<<
- *         self.pk.buf_size = buf_size
- *         self.pk.length = 0
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 120, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":119
- *         cdef int buf_size = 1024*1024
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- *         if self.pk.buf == NULL:             # <<<<<<<<<<<<<<
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.pk.buf_size = buf_size
- */
-  }
-
-  /* "msgpack/_packer.pyx":121
- *         if self.pk.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.pk.buf_size = buf_size             # <<<<<<<<<<<<<<
- *         self.pk.length = 0
- * 
- */
-  __pyx_v_self->pk.buf_size = __pyx_v_buf_size;
-
-  /* "msgpack/_packer.pyx":122
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.pk.buf_size = buf_size
- *         self.pk.length = 0             # <<<<<<<<<<<<<<
- * 
- *     def __init__(self, *, default=None,
- */
-  __pyx_v_self->pk.length = 0;
-
-  /* "msgpack/_packer.pyx":116
- *     cdef bint datetime
- * 
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         cdef int buf_size = 1024*1024
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- */
-
-  /* function exit code */
-  __pyx_r = 0;
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__cinit__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = -1;
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":124
- *         self.pk.length = 0
- * 
- *     def __init__(self, *, default=None,             # <<<<<<<<<<<<<<
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- */
-
-/* Python wrapper */
-static int __pyx_pw_7msgpack_9_cmsgpack_6Packer_3__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static int __pyx_pw_7msgpack_9_cmsgpack_6Packer_3__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyObject *__pyx_v_default = 0;
-  int __pyx_v_use_single_float;
-  int __pyx_v_autoreset;
-  int __pyx_v_use_bin_type;
-  int __pyx_v_strict_types;
-  int __pyx_v_datetime;
-  PyObject *__pyx_v_unicode_errors = 0;
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[7] = {0,0,0,0,0,0,0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 124, __pyx_L3_error)
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_default,&__pyx_n_s_use_single_float,&__pyx_n_s_autoreset,&__pyx_n_s_use_bin_type,&__pyx_n_s_strict_types,&__pyx_n_s_datetime,&__pyx_n_s_unicode_errors,0};
-    values[0] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-
-    /* "msgpack/_packer.pyx":126
- *     def __init__(self, *, default=None,
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):             # <<<<<<<<<<<<<<
- *         self.use_float = use_single_float
- *         self.strict_types = strict_types
- */
-    values[6] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_VARARGS(__pyx_kwds);
-      if (kw_args > 0 && likely(kw_args <= 7)) {
-        Py_ssize_t index;
-        for (index = 0; index < 7 && kw_args > 0; index++) {
-          PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, *__pyx_pyargnames[index]);
-          if (value) { values[index] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 124, __pyx_L3_error)
-        }
-      }
-      if (unlikely(kw_args > 0)) {
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, 0, "__init__") < 0)) __PYX_ERR(0, 124, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 0)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-    }
-    __pyx_v_default = values[0];
-    if (values[1]) {
-      __pyx_v_use_single_float = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_use_single_float == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L3_error)
-    } else {
-
-      /* "msgpack/_packer.pyx":125
- * 
- *     def __init__(self, *, default=None,
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,             # <<<<<<<<<<<<<<
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- *         self.use_float = use_single_float
- */
-      __pyx_v_use_single_float = ((int)0);
-    }
-    if (values[2]) {
-      __pyx_v_autoreset = __Pyx_PyObject_IsTrue(values[2]); if (unlikely((__pyx_v_autoreset == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L3_error)
-    } else {
-      __pyx_v_autoreset = ((int)1);
-    }
-    if (values[3]) {
-      __pyx_v_use_bin_type = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_use_bin_type == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L3_error)
-    } else {
-      __pyx_v_use_bin_type = ((int)1);
-    }
-    if (values[4]) {
-      __pyx_v_strict_types = __Pyx_PyObject_IsTrue(values[4]); if (unlikely((__pyx_v_strict_types == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
-    } else {
-
-      /* "msgpack/_packer.pyx":126
- *     def __init__(self, *, default=None,
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):             # <<<<<<<<<<<<<<
- *         self.use_float = use_single_float
- *         self.strict_types = strict_types
- */
-      __pyx_v_strict_types = ((int)0);
-    }
-    if (values[5]) {
-      __pyx_v_datetime = __Pyx_PyObject_IsTrue(values[5]); if (unlikely((__pyx_v_datetime == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L3_error)
-    } else {
-      __pyx_v_datetime = ((int)0);
-    }
-    __pyx_v_unicode_errors = values[6];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 0, 0, __pyx_nargs); __PYX_ERR(0, 124, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_VARARGS(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return -1;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_2__init__(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_default, __pyx_v_use_single_float, __pyx_v_autoreset, __pyx_v_use_bin_type, __pyx_v_strict_types, __pyx_v_datetime, __pyx_v_unicode_errors);
-
-  /* "msgpack/_packer.pyx":124
- *         self.pk.length = 0
- * 
- *     def __init__(self, *, default=None,             # <<<<<<<<<<<<<<
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- */
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_VARARGS(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static int __pyx_pf_7msgpack_9_cmsgpack_6Packer_2__init__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_default, int __pyx_v_use_single_float, int __pyx_v_autoreset, int __pyx_v_use_bin_type, int __pyx_v_strict_types, int __pyx_v_datetime, PyObject *__pyx_v_unicode_errors) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  char const *__pyx_t_3;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__init__", 0);
-
-  /* "msgpack/_packer.pyx":127
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- *         self.use_float = use_single_float             # <<<<<<<<<<<<<<
- *         self.strict_types = strict_types
- *         self.autoreset = autoreset
- */
-  __pyx_v_self->use_float = __pyx_v_use_single_float;
-
-  /* "msgpack/_packer.pyx":128
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- *         self.use_float = use_single_float
- *         self.strict_types = strict_types             # <<<<<<<<<<<<<<
- *         self.autoreset = autoreset
- *         self.datetime = datetime
- */
-  __pyx_v_self->strict_types = __pyx_v_strict_types;
-
-  /* "msgpack/_packer.pyx":129
- *         self.use_float = use_single_float
- *         self.strict_types = strict_types
- *         self.autoreset = autoreset             # <<<<<<<<<<<<<<
- *         self.datetime = datetime
- *         self.pk.use_bin_type = use_bin_type
- */
-  __pyx_v_self->autoreset = __pyx_v_autoreset;
-
-  /* "msgpack/_packer.pyx":130
- *         self.strict_types = strict_types
- *         self.autoreset = autoreset
- *         self.datetime = datetime             # <<<<<<<<<<<<<<
- *         self.pk.use_bin_type = use_bin_type
- *         if default is not None:
- */
-  __pyx_v_self->datetime = __pyx_v_datetime;
-
-  /* "msgpack/_packer.pyx":131
- *         self.autoreset = autoreset
- *         self.datetime = datetime
- *         self.pk.use_bin_type = use_bin_type             # <<<<<<<<<<<<<<
- *         if default is not None:
- *             if not PyCallable_Check(default):
- */
-  __pyx_v_self->pk.use_bin_type = __pyx_v_use_bin_type;
-
-  /* "msgpack/_packer.pyx":132
- *         self.datetime = datetime
- *         self.pk.use_bin_type = use_bin_type
- *         if default is not None:             # <<<<<<<<<<<<<<
- *             if not PyCallable_Check(default):
- *                 raise TypeError("default must be a callable.")
- */
-  __pyx_t_1 = (__pyx_v_default != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_packer.pyx":133
- *         self.pk.use_bin_type = use_bin_type
- *         if default is not None:
- *             if not PyCallable_Check(default):             # <<<<<<<<<<<<<<
- *                 raise TypeError("default must be a callable.")
- *         self._default = default
- */
-    __pyx_t_1 = (!PyCallable_Check(__pyx_v_default));
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_packer.pyx":134
- *         if default is not None:
- *             if not PyCallable_Check(default):
- *                 raise TypeError("default must be a callable.")             # <<<<<<<<<<<<<<
- *         self._default = default
- * 
- */
-      __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __PYX_ERR(0, 134, __pyx_L1_error)
-
-      /* "msgpack/_packer.pyx":133
- *         self.pk.use_bin_type = use_bin_type
- *         if default is not None:
- *             if not PyCallable_Check(default):             # <<<<<<<<<<<<<<
- *                 raise TypeError("default must be a callable.")
- *         self._default = default
- */
-    }
-
-    /* "msgpack/_packer.pyx":132
- *         self.datetime = datetime
- *         self.pk.use_bin_type = use_bin_type
- *         if default is not None:             # <<<<<<<<<<<<<<
- *             if not PyCallable_Check(default):
- *                 raise TypeError("default must be a callable.")
- */
-  }
-
-  /* "msgpack/_packer.pyx":135
- *             if not PyCallable_Check(default):
- *                 raise TypeError("default must be a callable.")
- *         self._default = default             # <<<<<<<<<<<<<<
- * 
- *         self._berrors = unicode_errors
- */
-  __Pyx_INCREF(__pyx_v_default);
-  __Pyx_GIVEREF(__pyx_v_default);
-  __Pyx_GOTREF(__pyx_v_self->_default);
-  __Pyx_DECREF(__pyx_v_self->_default);
-  __pyx_v_self->_default = __pyx_v_default;
-
-  /* "msgpack/_packer.pyx":137
- *         self._default = default
- * 
- *         self._berrors = unicode_errors             # <<<<<<<<<<<<<<
- *         if unicode_errors is None:
- *             self.unicode_errors = NULL
- */
-  __Pyx_INCREF(__pyx_v_unicode_errors);
-  __Pyx_GIVEREF(__pyx_v_unicode_errors);
-  __Pyx_GOTREF(__pyx_v_self->_berrors);
-  __Pyx_DECREF(__pyx_v_self->_berrors);
-  __pyx_v_self->_berrors = __pyx_v_unicode_errors;
-
-  /* "msgpack/_packer.pyx":138
- * 
- *         self._berrors = unicode_errors
- *         if unicode_errors is None:             # <<<<<<<<<<<<<<
- *             self.unicode_errors = NULL
- *         else:
- */
-  __pyx_t_1 = (__pyx_v_unicode_errors == Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_packer.pyx":139
- *         self._berrors = unicode_errors
- *         if unicode_errors is None:
- *             self.unicode_errors = NULL             # <<<<<<<<<<<<<<
- *         else:
- *             self.unicode_errors = self._berrors
- */
-    __pyx_v_self->unicode_errors = NULL;
-
-    /* "msgpack/_packer.pyx":138
- * 
- *         self._berrors = unicode_errors
- *         if unicode_errors is None:             # <<<<<<<<<<<<<<
- *             self.unicode_errors = NULL
- *         else:
- */
-    goto __pyx_L5;
-  }
-
-  /* "msgpack/_packer.pyx":141
- *             self.unicode_errors = NULL
- *         else:
- *             self.unicode_errors = self._berrors             # <<<<<<<<<<<<<<
- * 
- *     def __dealloc__(self):
- */
-  /*else*/ {
-    __pyx_t_3 = __Pyx_PyObject_AsString(__pyx_v_self->_berrors); if (unlikely((!__pyx_t_3) && PyErr_Occurred())) __PYX_ERR(0, 141, __pyx_L1_error)
-    __pyx_v_self->unicode_errors = __pyx_t_3;
-  }
-  __pyx_L5:;
-
-  /* "msgpack/_packer.pyx":124
- *         self.pk.length = 0
- * 
- *     def __init__(self, *, default=None,             # <<<<<<<<<<<<<<
- *                  bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
- *                  bint strict_types=False, bint datetime=False, unicode_errors=None):
- */
-
-  /* function exit code */
-  __pyx_r = 0;
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = -1;
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":143
- *             self.unicode_errors = self._berrors
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         PyMem_Free(self.pk.buf)
- *         self.pk.buf = NULL
- */
-
-/* Python wrapper */
-static void __pyx_pw_7msgpack_9_cmsgpack_6Packer_5__dealloc__(PyObject *__pyx_v_self); /*proto*/
-static void __pyx_pw_7msgpack_9_cmsgpack_6Packer_5__dealloc__(PyObject *__pyx_v_self) {
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  __pyx_pf_7msgpack_9_cmsgpack_6Packer_4__dealloc__(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-}
-
-static void __pyx_pf_7msgpack_9_cmsgpack_6Packer_4__dealloc__(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__dealloc__", 0);
-
-  /* "msgpack/_packer.pyx":144
- * 
- *     def __dealloc__(self):
- *         PyMem_Free(self.pk.buf)             # <<<<<<<<<<<<<<
- *         self.pk.buf = NULL
- * 
- */
-  PyMem_Free(__pyx_v_self->pk.buf);
-
-  /* "msgpack/_packer.pyx":145
- *     def __dealloc__(self):
- *         PyMem_Free(self.pk.buf)
- *         self.pk.buf = NULL             # <<<<<<<<<<<<<<
- * 
- *     cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:
- */
-  __pyx_v_self->pk.buf = NULL;
-
-  /* "msgpack/_packer.pyx":143
- *             self.unicode_errors = self._berrors
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         PyMem_Free(self.pk.buf)
- *         self.pk.buf = NULL
- */
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-}
-
-/* "msgpack/_packer.pyx":147
- *         self.pk.buf = NULL
- * 
- *     cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:             # <<<<<<<<<<<<<<
- *         cdef long long llval
- *         cdef unsigned long long ullval
- */
-
-static int __pyx_f_7msgpack_9_cmsgpack_6Packer__pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_o, struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack *__pyx_optional_args) {
-  int __pyx_v_nest_limit = __pyx_k__4;
-  PY_LONG_LONG __pyx_v_llval;
-  unsigned PY_LONG_LONG __pyx_v_ullval;
-  unsigned long __pyx_v_ulval;
-  long __pyx_v_longval;
-  float __pyx_v_fval;
-  double __pyx_v_dval;
-  char *__pyx_v_rawval;
-  int __pyx_v_ret;
-  PyObject *__pyx_v_d = 0;
-  Py_ssize_t __pyx_v_L;
-  int __pyx_v_default_used;
-  int __pyx_v_strict_types;
-  Py_buffer __pyx_v_view;
-  CYTHON_UNUSED PyObject *__pyx_v_oe = NULL;
-  PyObject *__pyx_v_k = NULL;
-  PyObject *__pyx_v_v = NULL;
-  PyObject *__pyx_v_delta = NULL;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
-  PyObject *__pyx_t_4 = NULL;
-  PyObject *__pyx_t_5 = NULL;
-  unsigned PY_LONG_LONG __pyx_t_6;
-  PY_LONG_LONG __pyx_t_7;
-  int __pyx_t_8;
-  PyObject *__pyx_t_9 = NULL;
-  PyObject *__pyx_t_10 = NULL;
-  int __pyx_t_11;
-  PyObject *__pyx_t_12 = NULL;
-  PyObject *__pyx_t_13 = NULL;
-  PyObject *__pyx_t_14 = NULL;
-  int __pyx_t_15;
-  char const *__pyx_t_16;
-  PyObject *__pyx_t_17 = NULL;
-  PyObject *__pyx_t_18 = NULL;
-  PyObject *__pyx_t_19 = NULL;
-  PyObject *__pyx_t_20 = NULL;
-  PyObject *__pyx_t_21 = NULL;
-  PyObject *__pyx_t_22 = NULL;
-  long __pyx_t_23;
-  float __pyx_t_24;
-  double __pyx_t_25;
-  PyObject *__pyx_t_26;
-  char *__pyx_t_27;
-  Py_ssize_t __pyx_t_28;
-  Py_ssize_t __pyx_t_29;
-  struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack __pyx_t_30;
-  unsigned long __pyx_t_31;
-  int __pyx_t_32;
-  PyObject *(*__pyx_t_33)(PyObject *);
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("_pack", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_nest_limit = __pyx_optional_args->nest_limit;
-    }
-  }
-  __Pyx_INCREF(__pyx_v_o);
-
-  /* "msgpack/_packer.pyx":158
- *         cdef dict d
- *         cdef Py_ssize_t L
- *         cdef int default_used = 0             # <<<<<<<<<<<<<<
- *         cdef bint strict_types = self.strict_types
- *         cdef Py_buffer view
- */
-  __pyx_v_default_used = 0;
-
-  /* "msgpack/_packer.pyx":159
- *         cdef Py_ssize_t L
- *         cdef int default_used = 0
- *         cdef bint strict_types = self.strict_types             # <<<<<<<<<<<<<<
- *         cdef Py_buffer view
- * 
- */
-  __pyx_t_1 = __pyx_v_self->strict_types;
-  __pyx_v_strict_types = __pyx_t_1;
-
-  /* "msgpack/_packer.pyx":162
- *         cdef Py_buffer view
- * 
- *         if nest_limit < 0:             # <<<<<<<<<<<<<<
- *             raise ValueError("recursion limit exceeded.")
- * 
- */
-  __pyx_t_1 = (__pyx_v_nest_limit < 0);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":163
- * 
- *         if nest_limit < 0:
- *             raise ValueError("recursion limit exceeded.")             # <<<<<<<<<<<<<<
- * 
- *         while True:
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 163, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(0, 163, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":162
- *         cdef Py_buffer view
- * 
- *         if nest_limit < 0:             # <<<<<<<<<<<<<<
- *             raise ValueError("recursion limit exceeded.")
- * 
- */
-  }
-
-  /* "msgpack/_packer.pyx":165
- *             raise ValueError("recursion limit exceeded.")
- * 
- *         while True:             # <<<<<<<<<<<<<<
- *             if o is None:
- *                 ret = msgpack_pack_nil(&self.pk)
- */
-  while (1) {
-
-    /* "msgpack/_packer.pyx":166
- * 
- *         while True:
- *             if o is None:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_nil(&self.pk)
- *             elif o is True:
- */
-    __pyx_t_1 = (__pyx_v_o == Py_None);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":167
- *         while True:
- *             if o is None:
- *                 ret = msgpack_pack_nil(&self.pk)             # <<<<<<<<<<<<<<
- *             elif o is True:
- *                 ret = msgpack_pack_true(&self.pk)
- */
-      __pyx_v_ret = msgpack_pack_nil((&__pyx_v_self->pk));
-
-      /* "msgpack/_packer.pyx":166
- * 
- *         while True:
- *             if o is None:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_nil(&self.pk)
- *             elif o is True:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":168
- *             if o is None:
- *                 ret = msgpack_pack_nil(&self.pk)
- *             elif o is True:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_true(&self.pk)
- *             elif o is False:
- */
-    __pyx_t_1 = (__pyx_v_o == Py_True);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":169
- *                 ret = msgpack_pack_nil(&self.pk)
- *             elif o is True:
- *                 ret = msgpack_pack_true(&self.pk)             # <<<<<<<<<<<<<<
- *             elif o is False:
- *                 ret = msgpack_pack_false(&self.pk)
- */
-      __pyx_v_ret = msgpack_pack_true((&__pyx_v_self->pk));
-
-      /* "msgpack/_packer.pyx":168
- *             if o is None:
- *                 ret = msgpack_pack_nil(&self.pk)
- *             elif o is True:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_true(&self.pk)
- *             elif o is False:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":170
- *             elif o is True:
- *                 ret = msgpack_pack_true(&self.pk)
- *             elif o is False:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_false(&self.pk)
- *             elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):
- */
-    __pyx_t_1 = (__pyx_v_o == Py_False);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":171
- *                 ret = msgpack_pack_true(&self.pk)
- *             elif o is False:
- *                 ret = msgpack_pack_false(&self.pk)             # <<<<<<<<<<<<<<
- *             elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):
- *                 # PyInt_Check(long) is True for Python 3.
- */
-      __pyx_v_ret = msgpack_pack_false((&__pyx_v_self->pk));
-
-      /* "msgpack/_packer.pyx":170
- *             elif o is True:
- *                 ret = msgpack_pack_true(&self.pk)
- *             elif o is False:             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_false(&self.pk)
- *             elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":172
- *             elif o is False:
- *                 ret = msgpack_pack_false(&self.pk)
- *             elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):             # <<<<<<<<<<<<<<
- *                 # PyInt_Check(long) is True for Python 3.
- *                 # So we should test long before int.
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_1 = PyLong_CheckExact(__pyx_v_o);
-    } else {
-      __pyx_t_1 = PyLong_Check(__pyx_v_o);
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":175
- *                 # PyInt_Check(long) is True for Python 3.
- *                 # So we should test long before int.
- *                 try:             # <<<<<<<<<<<<<<
- *                     if o > 0:
- *                         ullval = o
- */
-      {
-        __Pyx_PyThreadState_declare
-        __Pyx_PyThreadState_assign
-        __Pyx_ExceptionSave(&__pyx_t_3, &__pyx_t_4, &__pyx_t_5);
-        __Pyx_XGOTREF(__pyx_t_3);
-        __Pyx_XGOTREF(__pyx_t_4);
-        __Pyx_XGOTREF(__pyx_t_5);
-        /*try:*/ {
-
-          /* "msgpack/_packer.pyx":176
- *                 # So we should test long before int.
- *                 try:
- *                     if o > 0:             # <<<<<<<<<<<<<<
- *                         ullval = o
- *                         ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
- */
-          __pyx_t_2 = PyObject_RichCompare(__pyx_v_o, __pyx_int_0, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 176, __pyx_L7_error)
-          __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(0, 176, __pyx_L7_error)
-          __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-          if (__pyx_t_1) {
-
-            /* "msgpack/_packer.pyx":177
- *                 try:
- *                     if o > 0:
- *                         ullval = o             # <<<<<<<<<<<<<<
- *                         ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
- *                     else:
- */
-            __pyx_t_6 = __Pyx_PyInt_As_unsigned_PY_LONG_LONG(__pyx_v_o); if (unlikely((__pyx_t_6 == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred())) __PYX_ERR(0, 177, __pyx_L7_error)
-            __pyx_v_ullval = __pyx_t_6;
-
-            /* "msgpack/_packer.pyx":178
- *                     if o > 0:
- *                         ullval = o
- *                         ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)             # <<<<<<<<<<<<<<
- *                     else:
- *                         llval = o
- */
-            __pyx_v_ret = msgpack_pack_unsigned_long_long((&__pyx_v_self->pk), __pyx_v_ullval);
-
-            /* "msgpack/_packer.pyx":176
- *                 # So we should test long before int.
- *                 try:
- *                     if o > 0:             # <<<<<<<<<<<<<<
- *                         ullval = o
- *                         ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
- */
-            goto __pyx_L15;
-          }
-
-          /* "msgpack/_packer.pyx":180
- *                         ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
- *                     else:
- *                         llval = o             # <<<<<<<<<<<<<<
- *                         ret = msgpack_pack_long_long(&self.pk, llval)
- *                 except OverflowError as oe:
- */
-          /*else*/ {
-            __pyx_t_7 = __Pyx_PyInt_As_PY_LONG_LONG(__pyx_v_o); if (unlikely((__pyx_t_7 == (PY_LONG_LONG)-1) && PyErr_Occurred())) __PYX_ERR(0, 180, __pyx_L7_error)
-            __pyx_v_llval = __pyx_t_7;
-
-            /* "msgpack/_packer.pyx":181
- *                     else:
- *                         llval = o
- *                         ret = msgpack_pack_long_long(&self.pk, llval)             # <<<<<<<<<<<<<<
- *                 except OverflowError as oe:
- *                     if not default_used and self._default is not None:
- */
-            __pyx_v_ret = msgpack_pack_long_long((&__pyx_v_self->pk), __pyx_v_llval);
-          }
-          __pyx_L15:;
-
-          /* "msgpack/_packer.pyx":175
- *                 # PyInt_Check(long) is True for Python 3.
- *                 # So we should test long before int.
- *                 try:             # <<<<<<<<<<<<<<
- *                     if o > 0:
- *                         ullval = o
- */
-        }
-        __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-        __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-        goto __pyx_L14_try_end;
-        __pyx_L7_error:;
-        __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-        /* "msgpack/_packer.pyx":182
- *                         llval = o
- *                         ret = msgpack_pack_long_long(&self.pk, llval)
- *                 except OverflowError as oe:             # <<<<<<<<<<<<<<
- *                     if not default_used and self._default is not None:
- *                         o = self._default(o)
- */
-        __pyx_t_8 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_OverflowError);
-        if (__pyx_t_8) {
-          __Pyx_AddTraceback("msgpack._cmsgpack.Packer._pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-          if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_9, &__pyx_t_10) < 0) __PYX_ERR(0, 182, __pyx_L9_except_error)
-          __Pyx_XGOTREF(__pyx_t_2);
-          __Pyx_XGOTREF(__pyx_t_9);
-          __Pyx_XGOTREF(__pyx_t_10);
-          __Pyx_INCREF(__pyx_t_9);
-          __pyx_v_oe = __pyx_t_9;
-          /*try:*/ {
-
-            /* "msgpack/_packer.pyx":183
- *                         ret = msgpack_pack_long_long(&self.pk, llval)
- *                 except OverflowError as oe:
- *                     if not default_used and self._default is not None:             # <<<<<<<<<<<<<<
- *                         o = self._default(o)
- *                         default_used = True
- */
-            __pyx_t_11 = (!(__pyx_v_default_used != 0));
-            if (__pyx_t_11) {
-            } else {
-              __pyx_t_1 = __pyx_t_11;
-              goto __pyx_L24_bool_binop_done;
-            }
-            __pyx_t_11 = (__pyx_v_self->_default != Py_None);
-            __pyx_t_1 = __pyx_t_11;
-            __pyx_L24_bool_binop_done:;
-            if (likely(__pyx_t_1)) {
-
-              /* "msgpack/_packer.pyx":184
- *                 except OverflowError as oe:
- *                     if not default_used and self._default is not None:
- *                         o = self._default(o)             # <<<<<<<<<<<<<<
- *                         default_used = True
- *                         continue
- */
-              __Pyx_INCREF(__pyx_v_self->_default);
-              __pyx_t_13 = __pyx_v_self->_default; __pyx_t_14 = NULL;
-              __pyx_t_8 = 0;
-              #if CYTHON_UNPACK_METHODS
-              if (likely(PyMethod_Check(__pyx_t_13))) {
-                __pyx_t_14 = PyMethod_GET_SELF(__pyx_t_13);
-                if (likely(__pyx_t_14)) {
-                  PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13);
-                  __Pyx_INCREF(__pyx_t_14);
-                  __Pyx_INCREF(function);
-                  __Pyx_DECREF_SET(__pyx_t_13, function);
-                  __pyx_t_8 = 1;
-                }
-              }
-              #endif
-              {
-                PyObject *__pyx_callargs[2] = {__pyx_t_14, __pyx_v_o};
-                __pyx_t_12 = __Pyx_PyObject_FastCall(__pyx_t_13, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8);
-                __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0;
-                if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 184, __pyx_L21_error)
-                __Pyx_GOTREF(__pyx_t_12);
-                __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
-              }
-              __Pyx_DECREF_SET(__pyx_v_o, __pyx_t_12);
-              __pyx_t_12 = 0;
-
-              /* "msgpack/_packer.pyx":185
- *                     if not default_used and self._default is not None:
- *                         o = self._default(o)
- *                         default_used = True             # <<<<<<<<<<<<<<
- *                         continue
- *                     else:
- */
-              __pyx_v_default_used = 1;
-
-              /* "msgpack/_packer.pyx":186
- *                         o = self._default(o)
- *                         default_used = True
- *                         continue             # <<<<<<<<<<<<<<
- *                     else:
- *                         raise OverflowError("Integer value out of range")
- */
-              goto __pyx_L18_continue;
-
-              /* "msgpack/_packer.pyx":183
- *                         ret = msgpack_pack_long_long(&self.pk, llval)
- *                 except OverflowError as oe:
- *                     if not default_used and self._default is not None:             # <<<<<<<<<<<<<<
- *                         o = self._default(o)
- *                         default_used = True
- */
-            }
-
-            /* "msgpack/_packer.pyx":188
- *                         continue
- *                     else:
- *                         raise OverflowError("Integer value out of range")             # <<<<<<<<<<<<<<
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):
- *                 longval = o
- */
-            /*else*/ {
-              __pyx_t_12 = __Pyx_PyObject_Call(__pyx_builtin_OverflowError, __pyx_tuple__6, NULL); if (unlikely(!__pyx_t_12)) __PYX_ERR(0, 188, __pyx_L21_error)
-              __Pyx_GOTREF(__pyx_t_12);
-              __Pyx_Raise(__pyx_t_12, 0, 0, 0);
-              __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
-              __PYX_ERR(0, 188, __pyx_L21_error)
-            }
-          }
-
-          /* "msgpack/_packer.pyx":182
- *                         llval = o
- *                         ret = msgpack_pack_long_long(&self.pk, llval)
- *                 except OverflowError as oe:             # <<<<<<<<<<<<<<
- *                     if not default_used and self._default is not None:
- *                         o = self._default(o)
- */
-          /*finally:*/ {
-            __pyx_L21_error:;
-            /*exception exit:*/{
-              __Pyx_PyThreadState_declare
-              __Pyx_PyThreadState_assign
-              __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0;
-              __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
-              __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;
-              __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0;
-              if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22);
-              if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19) < 0)) __Pyx_ErrFetch(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19);
-              __Pyx_XGOTREF(__pyx_t_17);
-              __Pyx_XGOTREF(__pyx_t_18);
-              __Pyx_XGOTREF(__pyx_t_19);
-              __Pyx_XGOTREF(__pyx_t_20);
-              __Pyx_XGOTREF(__pyx_t_21);
-              __Pyx_XGOTREF(__pyx_t_22);
-              __pyx_t_8 = __pyx_lineno; __pyx_t_15 = __pyx_clineno; __pyx_t_16 = __pyx_filename;
-              {
-                __Pyx_DECREF(__pyx_v_oe); __pyx_v_oe = 0;
-              }
-              if (PY_MAJOR_VERSION >= 3) {
-                __Pyx_XGIVEREF(__pyx_t_20);
-                __Pyx_XGIVEREF(__pyx_t_21);
-                __Pyx_XGIVEREF(__pyx_t_22);
-                __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22);
-              }
-              __Pyx_XGIVEREF(__pyx_t_17);
-              __Pyx_XGIVEREF(__pyx_t_18);
-              __Pyx_XGIVEREF(__pyx_t_19);
-              __Pyx_ErrRestore(__pyx_t_17, __pyx_t_18, __pyx_t_19);
-              __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0;
-              __pyx_lineno = __pyx_t_8; __pyx_clineno = __pyx_t_15; __pyx_filename = __pyx_t_16;
-              goto __pyx_L9_except_error;
-            }
-            __pyx_L18_continue: {
-              __Pyx_DECREF(__pyx_v_oe); __pyx_v_oe = 0;
-              goto __pyx_L16_except_continue;
-            }
-          }
-          __pyx_L16_except_continue:;
-          __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-          __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
-          __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
-          goto __pyx_L13_try_continue;
-        }
-        goto __pyx_L9_except_error;
-
-        /* "msgpack/_packer.pyx":175
- *                 # PyInt_Check(long) is True for Python 3.
- *                 # So we should test long before int.
- *                 try:             # <<<<<<<<<<<<<<
- *                     if o > 0:
- *                         ullval = o
- */
-        __pyx_L9_except_error:;
-        __Pyx_XGIVEREF(__pyx_t_3);
-        __Pyx_XGIVEREF(__pyx_t_4);
-        __Pyx_XGIVEREF(__pyx_t_5);
-        __Pyx_ExceptionReset(__pyx_t_3, __pyx_t_4, __pyx_t_5);
-        goto __pyx_L1_error;
-        __pyx_L13_try_continue:;
-        __Pyx_XGIVEREF(__pyx_t_3);
-        __Pyx_XGIVEREF(__pyx_t_4);
-        __Pyx_XGIVEREF(__pyx_t_5);
-        __Pyx_ExceptionReset(__pyx_t_3, __pyx_t_4, __pyx_t_5);
-        goto __pyx_L4_continue;
-        __pyx_L14_try_end:;
-      }
-
-      /* "msgpack/_packer.pyx":172
- *             elif o is False:
- *                 ret = msgpack_pack_false(&self.pk)
- *             elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):             # <<<<<<<<<<<<<<
- *                 # PyInt_Check(long) is True for Python 3.
- *                 # So we should test long before int.
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":189
- *                     else:
- *                         raise OverflowError("Integer value out of range")
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):             # <<<<<<<<<<<<<<
- *                 longval = o
- *                 ret = msgpack_pack_long(&self.pk, longval)
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_1 = PyInt_CheckExact(__pyx_v_o);
-    } else {
-      __pyx_t_1 = PyInt_Check(__pyx_v_o);
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":190
- *                         raise OverflowError("Integer value out of range")
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):
- *                 longval = o             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_long(&self.pk, longval)
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
- */
-      __pyx_t_23 = __Pyx_PyInt_As_long(__pyx_v_o); if (unlikely((__pyx_t_23 == (long)-1) && PyErr_Occurred())) __PYX_ERR(0, 190, __pyx_L1_error)
-      __pyx_v_longval = __pyx_t_23;
-
-      /* "msgpack/_packer.pyx":191
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):
- *                 longval = o
- *                 ret = msgpack_pack_long(&self.pk, longval)             # <<<<<<<<<<<<<<
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
- *                 if self.use_float:
- */
-      __pyx_v_ret = msgpack_pack_long((&__pyx_v_self->pk), __pyx_v_longval);
-
-      /* "msgpack/_packer.pyx":189
- *                     else:
- *                         raise OverflowError("Integer value out of range")
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):             # <<<<<<<<<<<<<<
- *                 longval = o
- *                 ret = msgpack_pack_long(&self.pk, longval)
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":192
- *                 longval = o
- *                 ret = msgpack_pack_long(&self.pk, longval)
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):             # <<<<<<<<<<<<<<
- *                 if self.use_float:
- *                    fval = o
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_1 = PyFloat_CheckExact(__pyx_v_o);
-    } else {
-      __pyx_t_1 = PyFloat_Check(__pyx_v_o);
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":193
- *                 ret = msgpack_pack_long(&self.pk, longval)
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
- *                 if self.use_float:             # <<<<<<<<<<<<<<
- *                    fval = o
- *                    ret = msgpack_pack_float(&self.pk, fval)
- */
-      if (__pyx_v_self->use_float) {
-
-        /* "msgpack/_packer.pyx":194
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
- *                 if self.use_float:
- *                    fval = o             # <<<<<<<<<<<<<<
- *                    ret = msgpack_pack_float(&self.pk, fval)
- *                 else:
- */
-        __pyx_t_24 = __pyx_PyFloat_AsFloat(__pyx_v_o); if (unlikely((__pyx_t_24 == (float)-1) && PyErr_Occurred())) __PYX_ERR(0, 194, __pyx_L1_error)
-        __pyx_v_fval = __pyx_t_24;
-
-        /* "msgpack/_packer.pyx":195
- *                 if self.use_float:
- *                    fval = o
- *                    ret = msgpack_pack_float(&self.pk, fval)             # <<<<<<<<<<<<<<
- *                 else:
- *                    dval = o
- */
-        __pyx_v_ret = msgpack_pack_float((&__pyx_v_self->pk), __pyx_v_fval);
-
-        /* "msgpack/_packer.pyx":193
- *                 ret = msgpack_pack_long(&self.pk, longval)
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
- *                 if self.use_float:             # <<<<<<<<<<<<<<
- *                    fval = o
- *                    ret = msgpack_pack_float(&self.pk, fval)
- */
-        goto __pyx_L30;
-      }
-
-      /* "msgpack/_packer.pyx":197
- *                    ret = msgpack_pack_float(&self.pk, fval)
- *                 else:
- *                    dval = o             # <<<<<<<<<<<<<<
- *                    ret = msgpack_pack_double(&self.pk, dval)
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
- */
-      /*else*/ {
-        __pyx_t_25 = __pyx_PyFloat_AsDouble(__pyx_v_o); if (unlikely((__pyx_t_25 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 197, __pyx_L1_error)
-        __pyx_v_dval = __pyx_t_25;
-
-        /* "msgpack/_packer.pyx":198
- *                 else:
- *                    dval = o
- *                    ret = msgpack_pack_double(&self.pk, dval)             # <<<<<<<<<<<<<<
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
- *                 L = Py_SIZE(o)
- */
-        __pyx_v_ret = msgpack_pack_double((&__pyx_v_self->pk), __pyx_v_dval);
-      }
-      __pyx_L30:;
-
-      /* "msgpack/_packer.pyx":192
- *                 longval = o
- *                 ret = msgpack_pack_long(&self.pk, longval)
- *             elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):             # <<<<<<<<<<<<<<
- *                 if self.use_float:
- *                    fval = o
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":199
- *                    dval = o
- *                    ret = msgpack_pack_double(&self.pk, dval)
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):             # <<<<<<<<<<<<<<
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_8 = __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_CheckExact(__pyx_v_o); if (unlikely(__pyx_t_8 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 199, __pyx_L1_error)
-      __pyx_t_15 = __pyx_t_8;
-    } else {
-      __pyx_t_8 = __pyx_f_7msgpack_9_cmsgpack_PyBytesLike_Check(__pyx_v_o); if (unlikely(__pyx_t_8 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 199, __pyx_L1_error)
-      __pyx_t_15 = __pyx_t_8;
-    }
-    __pyx_t_1 = (__pyx_t_15 != 0);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":200
- *                    ret = msgpack_pack_double(&self.pk, dval)
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
- *                 L = Py_SIZE(o)             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
- */
-      __pyx_v_L = Py_SIZE(__pyx_v_o);
-
-      /* "msgpack/_packer.pyx":201
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
- *                 rawval = o
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":202
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)             # <<<<<<<<<<<<<<
- *                 rawval = o
- *                 ret = msgpack_pack_bin(&self.pk, L)
- */
-        __pyx_t_26 = PyErr_Format(__pyx_builtin_ValueError, ((char *)"%.200s object is too large"), Py_TYPE(__pyx_v_o)->tp_name); if (unlikely(__pyx_t_26 == ((PyObject *)NULL))) __PYX_ERR(0, 202, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":201
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
- *                 rawval = o
- */
-      }
-
-      /* "msgpack/_packer.pyx":203
- *                 if L > ITEM_LIMIT:
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
- *                 rawval = o             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:
- */
-      __pyx_t_27 = __Pyx_PyObject_AsWritableString(__pyx_v_o); if (unlikely((!__pyx_t_27) && PyErr_Occurred())) __PYX_ERR(0, 203, __pyx_L1_error)
-      __pyx_v_rawval = __pyx_t_27;
-
-      /* "msgpack/_packer.pyx":204
- *                     PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
- *                 rawval = o
- *                 ret = msgpack_pack_bin(&self.pk, L)             # <<<<<<<<<<<<<<
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- */
-      __pyx_v_ret = msgpack_pack_bin((&__pyx_v_self->pk), __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":205
- *                 rawval = o
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- */
-      __pyx_t_1 = (__pyx_v_ret == 0);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":206
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)             # <<<<<<<<<<<<<<
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- *                 if self.unicode_errors == NULL:
- */
-        __pyx_v_ret = msgpack_pack_raw_body((&__pyx_v_self->pk), __pyx_v_rawval, __pyx_v_L);
-
-        /* "msgpack/_packer.pyx":205
- *                 rawval = o
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- */
-      }
-
-      /* "msgpack/_packer.pyx":199
- *                    dval = o
- *                    ret = msgpack_pack_double(&self.pk, dval)
- *             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):             # <<<<<<<<<<<<<<
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":207
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):             # <<<<<<<<<<<<<<
- *                 if self.unicode_errors == NULL:
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_1 = PyUnicode_CheckExact(__pyx_v_o);
-    } else {
-      __pyx_t_1 = PyUnicode_Check(__pyx_v_o);
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":208
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- *                 if self.unicode_errors == NULL:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:
- */
-      __pyx_t_1 = (__pyx_v_self->unicode_errors == NULL);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":209
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- *                 if self.unicode_errors == NULL:
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);             # <<<<<<<<<<<<<<
- *                     if ret == -2:
- *                         raise ValueError("unicode string is too large")
- */
-        __pyx_v_ret = msgpack_pack_unicode((&__pyx_v_self->pk), __pyx_v_o, __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-
-        /* "msgpack/_packer.pyx":210
- *                 if self.unicode_errors == NULL:
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:             # <<<<<<<<<<<<<<
- *                         raise ValueError("unicode string is too large")
- *                 else:
- */
-        __pyx_t_1 = (__pyx_v_ret == -2L);
-        if (unlikely(__pyx_t_1)) {
-
-          /* "msgpack/_packer.pyx":211
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:
- *                         raise ValueError("unicode string is too large")             # <<<<<<<<<<<<<<
- *                 else:
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
- */
-          __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 211, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_10);
-          __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-          __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-          __PYX_ERR(0, 211, __pyx_L1_error)
-
-          /* "msgpack/_packer.pyx":210
- *                 if self.unicode_errors == NULL:
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:             # <<<<<<<<<<<<<<
- *                         raise ValueError("unicode string is too large")
- *                 else:
- */
-        }
-
-        /* "msgpack/_packer.pyx":208
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
- *                 if self.unicode_errors == NULL:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:
- */
-        goto __pyx_L33;
-      }
-
-      /* "msgpack/_packer.pyx":213
- *                         raise ValueError("unicode string is too large")
- *                 else:
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)             # <<<<<<<<<<<<<<
- *                     L = Py_SIZE(o)
- *                     if L > ITEM_LIMIT:
- */
-      /*else*/ {
-        __pyx_t_10 = PyUnicode_AsEncodedString(__pyx_v_o, NULL, __pyx_v_self->unicode_errors); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 213, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_DECREF_SET(__pyx_v_o, __pyx_t_10);
-        __pyx_t_10 = 0;
-
-        /* "msgpack/_packer.pyx":214
- *                 else:
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
- *                     L = Py_SIZE(o)             # <<<<<<<<<<<<<<
- *                     if L > ITEM_LIMIT:
- *                         raise ValueError("unicode string is too large")
- */
-        __pyx_v_L = Py_SIZE(__pyx_v_o);
-
-        /* "msgpack/_packer.pyx":215
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
- *                     L = Py_SIZE(o)
- *                     if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                         raise ValueError("unicode string is too large")
- *                     ret = msgpack_pack_raw(&self.pk, L)
- */
-        __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-        if (unlikely(__pyx_t_1)) {
-
-          /* "msgpack/_packer.pyx":216
- *                     L = Py_SIZE(o)
- *                     if L > ITEM_LIMIT:
- *                         raise ValueError("unicode string is too large")             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_raw(&self.pk, L)
- *                     if ret == 0:
- */
-          __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 216, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_10);
-          __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-          __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-          __PYX_ERR(0, 216, __pyx_L1_error)
-
-          /* "msgpack/_packer.pyx":215
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
- *                     L = Py_SIZE(o)
- *                     if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                         raise ValueError("unicode string is too large")
- *                     ret = msgpack_pack_raw(&self.pk, L)
- */
-        }
-
-        /* "msgpack/_packer.pyx":217
- *                     if L > ITEM_LIMIT:
- *                         raise ValueError("unicode string is too large")
- *                     ret = msgpack_pack_raw(&self.pk, L)             # <<<<<<<<<<<<<<
- *                     if ret == 0:
- *                         rawval = o
- */
-        __pyx_v_ret = msgpack_pack_raw((&__pyx_v_self->pk), __pyx_v_L);
-
-        /* "msgpack/_packer.pyx":218
- *                         raise ValueError("unicode string is too large")
- *                     ret = msgpack_pack_raw(&self.pk, L)
- *                     if ret == 0:             # <<<<<<<<<<<<<<
- *                         rawval = o
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- */
-        __pyx_t_1 = (__pyx_v_ret == 0);
-        if (__pyx_t_1) {
-
-          /* "msgpack/_packer.pyx":219
- *                     ret = msgpack_pack_raw(&self.pk, L)
- *                     if ret == 0:
- *                         rawval = o             # <<<<<<<<<<<<<<
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyDict_CheckExact(o):
- */
-          __pyx_t_27 = __Pyx_PyObject_AsWritableString(__pyx_v_o); if (unlikely((!__pyx_t_27) && PyErr_Occurred())) __PYX_ERR(0, 219, __pyx_L1_error)
-          __pyx_v_rawval = __pyx_t_27;
-
-          /* "msgpack/_packer.pyx":220
- *                     if ret == 0:
- *                         rawval = o
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)             # <<<<<<<<<<<<<<
- *             elif PyDict_CheckExact(o):
- *                 d = <dict>o
- */
-          __pyx_v_ret = msgpack_pack_raw_body((&__pyx_v_self->pk), __pyx_v_rawval, __pyx_v_L);
-
-          /* "msgpack/_packer.pyx":218
- *                         raise ValueError("unicode string is too large")
- *                     ret = msgpack_pack_raw(&self.pk, L)
- *                     if ret == 0:             # <<<<<<<<<<<<<<
- *                         rawval = o
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- */
-        }
-      }
-      __pyx_L33:;
-
-      /* "msgpack/_packer.pyx":207
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):             # <<<<<<<<<<<<<<
- *                 if self.unicode_errors == NULL:
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":221
- *                         rawval = o
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyDict_CheckExact(o):             # <<<<<<<<<<<<<<
- *                 d = <dict>o
- *                 L = len(d)
- */
-    __pyx_t_1 = PyDict_CheckExact(__pyx_v_o);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":222
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyDict_CheckExact(o):
- *                 d = <dict>o             # <<<<<<<<<<<<<<
- *                 L = len(d)
- *                 if L > ITEM_LIMIT:
- */
-      __pyx_t_10 = __pyx_v_o;
-      __Pyx_INCREF(__pyx_t_10);
-      __pyx_v_d = ((PyObject*)__pyx_t_10);
-      __pyx_t_10 = 0;
-
-      /* "msgpack/_packer.pyx":223
- *             elif PyDict_CheckExact(o):
- *                 d = <dict>o
- *                 L = len(d)             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")
- */
-      if (unlikely(__pyx_v_d == Py_None)) {
-        PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
-        __PYX_ERR(0, 223, __pyx_L1_error)
-      }
-      __pyx_t_28 = PyDict_Size(__pyx_v_d); if (unlikely(__pyx_t_28 == ((Py_ssize_t)-1))) __PYX_ERR(0, 223, __pyx_L1_error)
-      __pyx_v_L = __pyx_t_28;
-
-      /* "msgpack/_packer.pyx":224
- *                 d = <dict>o
- *                 L = len(d)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":225
- *                 L = len(d)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 225, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 225, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":224
- *                 d = <dict>o
- *                 L = len(d)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- */
-      }
-
-      /* "msgpack/_packer.pyx":226
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)             # <<<<<<<<<<<<<<
- *                 if ret == 0:
- *                     for k, v in d.items():
- */
-      __pyx_v_ret = msgpack_pack_map((&__pyx_v_self->pk), __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":227
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for k, v in d.items():
- *                         ret = self._pack(k, nest_limit-1)
- */
-      __pyx_t_1 = (__pyx_v_ret == 0);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":228
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:
- *                     for k, v in d.items():             # <<<<<<<<<<<<<<
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break
- */
-        __pyx_t_28 = 0;
-        if (unlikely(__pyx_v_d == Py_None)) {
-          PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "items");
-          __PYX_ERR(0, 228, __pyx_L1_error)
-        }
-        __pyx_t_9 = __Pyx_dict_iterator(__pyx_v_d, 1, __pyx_n_s_items, (&__pyx_t_29), (&__pyx_t_15)); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 228, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_9);
-        __Pyx_XDECREF(__pyx_t_10);
-        __pyx_t_10 = __pyx_t_9;
-        __pyx_t_9 = 0;
-        while (1) {
-          __pyx_t_8 = __Pyx_dict_iter_next(__pyx_t_10, __pyx_t_29, &__pyx_t_28, &__pyx_t_9, &__pyx_t_2, NULL, __pyx_t_15);
-          if (unlikely(__pyx_t_8 == 0)) break;
-          if (unlikely(__pyx_t_8 == -1)) __PYX_ERR(0, 228, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_9);
-          __Pyx_GOTREF(__pyx_t_2);
-          __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_9);
-          __pyx_t_9 = 0;
-          __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_2);
-          __pyx_t_2 = 0;
-
-          /* "msgpack/_packer.pyx":229
- *                 if ret == 0:
- *                     for k, v in d.items():
- *                         ret = self._pack(k, nest_limit-1)             # <<<<<<<<<<<<<<
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)
- */
-          __pyx_t_30.__pyx_n = 1;
-          __pyx_t_30.nest_limit = (__pyx_v_nest_limit - 1);
-          __pyx_t_8 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_k, &__pyx_t_30); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 229, __pyx_L1_error)
-          __pyx_v_ret = __pyx_t_8;
-
-          /* "msgpack/_packer.pyx":230
- *                     for k, v in d.items():
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break             # <<<<<<<<<<<<<<
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- */
-          __pyx_t_1 = (__pyx_v_ret != 0);
-          if (__pyx_t_1) {
-            goto __pyx_L40_break;
-          }
-
-          /* "msgpack/_packer.pyx":231
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)             # <<<<<<<<<<<<<<
- *                         if ret != 0: break
- *             elif not strict_types and PyDict_Check(o):
- */
-          __pyx_t_30.__pyx_n = 1;
-          __pyx_t_30.nest_limit = (__pyx_v_nest_limit - 1);
-          __pyx_t_8 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_v, &__pyx_t_30); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 231, __pyx_L1_error)
-          __pyx_v_ret = __pyx_t_8;
-
-          /* "msgpack/_packer.pyx":232
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break             # <<<<<<<<<<<<<<
- *             elif not strict_types and PyDict_Check(o):
- *                 L = len(o)
- */
-          __pyx_t_1 = (__pyx_v_ret != 0);
-          if (__pyx_t_1) {
-            goto __pyx_L40_break;
-          }
-        }
-        __pyx_L40_break:;
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-
-        /* "msgpack/_packer.pyx":227
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for k, v in d.items():
- *                         ret = self._pack(k, nest_limit-1)
- */
-      }
-
-      /* "msgpack/_packer.pyx":221
- *                         rawval = o
- *                         ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif PyDict_CheckExact(o):             # <<<<<<<<<<<<<<
- *                 d = <dict>o
- *                 L = len(d)
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":233
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif not strict_types and PyDict_Check(o):             # <<<<<<<<<<<<<<
- *                 L = len(o)
- *                 if L > ITEM_LIMIT:
- */
-    __pyx_t_11 = (!__pyx_v_strict_types);
-    if (__pyx_t_11) {
-    } else {
-      __pyx_t_1 = __pyx_t_11;
-      goto __pyx_L43_bool_binop_done;
-    }
-    __pyx_t_11 = PyDict_Check(__pyx_v_o);
-    __pyx_t_1 = __pyx_t_11;
-    __pyx_L43_bool_binop_done:;
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":234
- *                         if ret != 0: break
- *             elif not strict_types and PyDict_Check(o):
- *                 L = len(o)             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")
- */
-      __pyx_t_29 = PyObject_Length(__pyx_v_o); if (unlikely(__pyx_t_29 == ((Py_ssize_t)-1))) __PYX_ERR(0, 234, __pyx_L1_error)
-      __pyx_v_L = __pyx_t_29;
-
-      /* "msgpack/_packer.pyx":235
- *             elif not strict_types and PyDict_Check(o):
- *                 L = len(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":236
- *                 L = len(o)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 236, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 236, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":235
- *             elif not strict_types and PyDict_Check(o):
- *                 L = len(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- */
-      }
-
-      /* "msgpack/_packer.pyx":237
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)             # <<<<<<<<<<<<<<
- *                 if ret == 0:
- *                     for k, v in o.items():
- */
-      __pyx_v_ret = msgpack_pack_map((&__pyx_v_self->pk), __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":238
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for k, v in o.items():
- *                         ret = self._pack(k, nest_limit-1)
- */
-      __pyx_t_1 = (__pyx_v_ret == 0);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":239
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:
- *                     for k, v in o.items():             # <<<<<<<<<<<<<<
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break
- */
-        __pyx_t_29 = 0;
-        if (unlikely(__pyx_v_o == Py_None)) {
-          PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "items");
-          __PYX_ERR(0, 239, __pyx_L1_error)
-        }
-        __pyx_t_2 = __Pyx_dict_iterator(__pyx_v_o, 0, __pyx_n_s_items, (&__pyx_t_28), (&__pyx_t_15)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 239, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_2);
-        __Pyx_XDECREF(__pyx_t_10);
-        __pyx_t_10 = __pyx_t_2;
-        __pyx_t_2 = 0;
-        while (1) {
-          __pyx_t_8 = __Pyx_dict_iter_next(__pyx_t_10, __pyx_t_28, &__pyx_t_29, &__pyx_t_2, &__pyx_t_9, NULL, __pyx_t_15);
-          if (unlikely(__pyx_t_8 == 0)) break;
-          if (unlikely(__pyx_t_8 == -1)) __PYX_ERR(0, 239, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_2);
-          __Pyx_GOTREF(__pyx_t_9);
-          __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_2);
-          __pyx_t_2 = 0;
-          __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_9);
-          __pyx_t_9 = 0;
-
-          /* "msgpack/_packer.pyx":240
- *                 if ret == 0:
- *                     for k, v in o.items():
- *                         ret = self._pack(k, nest_limit-1)             # <<<<<<<<<<<<<<
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)
- */
-          __pyx_t_30.__pyx_n = 1;
-          __pyx_t_30.nest_limit = (__pyx_v_nest_limit - 1);
-          __pyx_t_8 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_k, &__pyx_t_30); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 240, __pyx_L1_error)
-          __pyx_v_ret = __pyx_t_8;
-
-          /* "msgpack/_packer.pyx":241
- *                     for k, v in o.items():
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break             # <<<<<<<<<<<<<<
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- */
-          __pyx_t_1 = (__pyx_v_ret != 0);
-          if (__pyx_t_1) {
-            goto __pyx_L48_break;
-          }
-
-          /* "msgpack/_packer.pyx":242
- *                         ret = self._pack(k, nest_limit-1)
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)             # <<<<<<<<<<<<<<
- *                         if ret != 0: break
- *             elif type(o) is ExtType if strict_types else isinstance(o, ExtType):
- */
-          __pyx_t_30.__pyx_n = 1;
-          __pyx_t_30.nest_limit = (__pyx_v_nest_limit - 1);
-          __pyx_t_8 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_v, &__pyx_t_30); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 242, __pyx_L1_error)
-          __pyx_v_ret = __pyx_t_8;
-
-          /* "msgpack/_packer.pyx":243
- *                         if ret != 0: break
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break             # <<<<<<<<<<<<<<
- *             elif type(o) is ExtType if strict_types else isinstance(o, ExtType):
- *                 # This should be before Tuple because ExtType is namedtuple.
- */
-          __pyx_t_1 = (__pyx_v_ret != 0);
-          if (__pyx_t_1) {
-            goto __pyx_L48_break;
-          }
-        }
-        __pyx_L48_break:;
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-
-        /* "msgpack/_packer.pyx":238
- *                     raise ValueError("dict is too large")
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for k, v in o.items():
- *                         ret = self._pack(k, nest_limit-1)
- */
-      }
-
-      /* "msgpack/_packer.pyx":233
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif not strict_types and PyDict_Check(o):             # <<<<<<<<<<<<<<
- *                 L = len(o)
- *                 if L > ITEM_LIMIT:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":244
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif type(o) is ExtType if strict_types else isinstance(o, ExtType):             # <<<<<<<<<<<<<<
- *                 # This should be before Tuple because ExtType is namedtuple.
- *                 longval = o.code
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_10 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cpython_4type_type), __pyx_v_o); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 244, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_11 = (__pyx_t_10 == __pyx_v_7msgpack_9_cmsgpack_ExtType);
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_t_1 = __pyx_t_11;
-    } else {
-      __pyx_t_10 = __pyx_v_7msgpack_9_cmsgpack_ExtType;
-      __Pyx_INCREF(__pyx_t_10);
-      __pyx_t_11 = PyObject_IsInstance(__pyx_v_o, __pyx_t_10); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 244, __pyx_L1_error)
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_t_1 = __pyx_t_11;
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":246
- *             elif type(o) is ExtType if strict_types else isinstance(o, ExtType):
- *                 # This should be before Tuple because ExtType is namedtuple.
- *                 longval = o.code             # <<<<<<<<<<<<<<
- *                 rawval = o.data
- *                 L = len(o.data)
- */
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_code); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 246, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_23 = __Pyx_PyInt_As_long(__pyx_t_10); if (unlikely((__pyx_t_23 == (long)-1) && PyErr_Occurred())) __PYX_ERR(0, 246, __pyx_L1_error)
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_v_longval = __pyx_t_23;
-
-      /* "msgpack/_packer.pyx":247
- *                 # This should be before Tuple because ExtType is namedtuple.
- *                 longval = o.code
- *                 rawval = o.data             # <<<<<<<<<<<<<<
- *                 L = len(o.data)
- *                 if L > ITEM_LIMIT:
- */
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_data); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 247, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_27 = __Pyx_PyObject_AsWritableString(__pyx_t_10); if (unlikely((!__pyx_t_27) && PyErr_Occurred())) __PYX_ERR(0, 247, __pyx_L1_error)
-      __pyx_v_rawval = __pyx_t_27;
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-
-      /* "msgpack/_packer.pyx":248
- *                 longval = o.code
- *                 rawval = o.data
- *                 L = len(o.data)             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("EXT data is too large")
- */
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_data); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 248, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_28 = PyObject_Length(__pyx_t_10); if (unlikely(__pyx_t_28 == ((Py_ssize_t)-1))) __PYX_ERR(0, 248, __pyx_L1_error)
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_v_L = __pyx_t_28;
-
-      /* "msgpack/_packer.pyx":249
- *                 rawval = o.data
- *                 L = len(o.data)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("EXT data is too large")
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":250
- *                 L = len(o.data)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("EXT data is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 250, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 250, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":249
- *                 rawval = o.data
- *                 L = len(o.data)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("EXT data is too large")
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- */
-      }
-
-      /* "msgpack/_packer.pyx":251
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("EXT data is too large")
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif type(o) is Timestamp:
- */
-      __pyx_v_ret = msgpack_pack_ext((&__pyx_v_self->pk), __pyx_v_longval, __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":252
- *                     raise ValueError("EXT data is too large")
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)             # <<<<<<<<<<<<<<
- *             elif type(o) is Timestamp:
- *                 llval = o.seconds
- */
-      __pyx_v_ret = msgpack_pack_raw_body((&__pyx_v_self->pk), __pyx_v_rawval, __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":244
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif type(o) is ExtType if strict_types else isinstance(o, ExtType):             # <<<<<<<<<<<<<<
- *                 # This should be before Tuple because ExtType is namedtuple.
- *                 longval = o.code
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":253
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif type(o) is Timestamp:             # <<<<<<<<<<<<<<
- *                 llval = o.seconds
- *                 ulval = o.nanoseconds
- */
-    __pyx_t_10 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cpython_4type_type), __pyx_v_o); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 253, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_10);
-    __pyx_t_1 = (__pyx_t_10 == __pyx_v_7msgpack_9_cmsgpack_Timestamp);
-    __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":254
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif type(o) is Timestamp:
- *                 llval = o.seconds             # <<<<<<<<<<<<<<
- *                 ulval = o.nanoseconds
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- */
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_seconds); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 254, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_7 = __Pyx_PyInt_As_PY_LONG_LONG(__pyx_t_10); if (unlikely((__pyx_t_7 == (PY_LONG_LONG)-1) && PyErr_Occurred())) __PYX_ERR(0, 254, __pyx_L1_error)
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_v_llval = __pyx_t_7;
-
-      /* "msgpack/_packer.pyx":255
- *             elif type(o) is Timestamp:
- *                 llval = o.seconds
- *                 ulval = o.nanoseconds             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
- */
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_nanoseconds); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 255, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_31 = __Pyx_PyInt_As_unsigned_long(__pyx_t_10); if (unlikely((__pyx_t_31 == (unsigned long)-1) && PyErr_Occurred())) __PYX_ERR(0, 255, __pyx_L1_error)
-      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-      __pyx_v_ulval = __pyx_t_31;
-
-      /* "msgpack/_packer.pyx":256
- *                 llval = o.seconds
- *                 ulval = o.nanoseconds
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)             # <<<<<<<<<<<<<<
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
- *                 L = Py_SIZE(o)
- */
-      __pyx_v_ret = msgpack_pack_timestamp((&__pyx_v_self->pk), __pyx_v_llval, __pyx_v_ulval);
-
-      /* "msgpack/_packer.pyx":253
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- *             elif type(o) is Timestamp:             # <<<<<<<<<<<<<<
- *                 llval = o.seconds
- *                 ulval = o.nanoseconds
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":257
- *                 ulval = o.nanoseconds
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):             # <<<<<<<<<<<<<<
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- */
-    if (__pyx_v_strict_types) {
-      __pyx_t_1 = PyList_CheckExact(__pyx_v_o);
-    } else {
-      __pyx_t_32 = PyTuple_Check(__pyx_v_o);
-      if (!__pyx_t_32) {
-      } else {
-        __pyx_t_11 = __pyx_t_32;
-        goto __pyx_L52_bool_binop_done;
-      }
-      __pyx_t_32 = PyList_Check(__pyx_v_o);
-      __pyx_t_11 = __pyx_t_32;
-      __pyx_L52_bool_binop_done:;
-      __pyx_t_1 = __pyx_t_11;
-    }
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":258
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
- *                 L = Py_SIZE(o)             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("list is too large")
- */
-      __pyx_v_L = Py_SIZE(__pyx_v_o);
-
-      /* "msgpack/_packer.pyx":259
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("list is too large")
- *                 ret = msgpack_pack_array(&self.pk, L)
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":260
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("list is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 260, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 260, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":259
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     raise ValueError("list is too large")
- *                 ret = msgpack_pack_array(&self.pk, L)
- */
-      }
-
-      /* "msgpack/_packer.pyx":261
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("list is too large")
- *                 ret = msgpack_pack_array(&self.pk, L)             # <<<<<<<<<<<<<<
- *                 if ret == 0:
- *                     for v in o:
- */
-      __pyx_v_ret = msgpack_pack_array((&__pyx_v_self->pk), __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":262
- *                     raise ValueError("list is too large")
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for v in o:
- *                         ret = self._pack(v, nest_limit-1)
- */
-      __pyx_t_1 = (__pyx_v_ret == 0);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":263
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:
- *                     for v in o:             # <<<<<<<<<<<<<<
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- */
-        if (likely(PyList_CheckExact(__pyx_v_o)) || PyTuple_CheckExact(__pyx_v_o)) {
-          __pyx_t_10 = __pyx_v_o; __Pyx_INCREF(__pyx_t_10); __pyx_t_28 = 0;
-          __pyx_t_33 = NULL;
-        } else {
-          __pyx_t_28 = -1; __pyx_t_10 = PyObject_GetIter(__pyx_v_o); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 263, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_10);
-          __pyx_t_33 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_10); if (unlikely(!__pyx_t_33)) __PYX_ERR(0, 263, __pyx_L1_error)
-        }
-        for (;;) {
-          if (likely(!__pyx_t_33)) {
-            if (likely(PyList_CheckExact(__pyx_t_10))) {
-              if (__pyx_t_28 >= PyList_GET_SIZE(__pyx_t_10)) break;
-              #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-              __pyx_t_9 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_28); __Pyx_INCREF(__pyx_t_9); __pyx_t_28++; if (unlikely((0 < 0))) __PYX_ERR(0, 263, __pyx_L1_error)
-              #else
-              __pyx_t_9 = PySequence_ITEM(__pyx_t_10, __pyx_t_28); __pyx_t_28++; if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 263, __pyx_L1_error)
-              __Pyx_GOTREF(__pyx_t_9);
-              #endif
-            } else {
-              if (__pyx_t_28 >= PyTuple_GET_SIZE(__pyx_t_10)) break;
-              #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-              __pyx_t_9 = PyTuple_GET_ITEM(__pyx_t_10, __pyx_t_28); __Pyx_INCREF(__pyx_t_9); __pyx_t_28++; if (unlikely((0 < 0))) __PYX_ERR(0, 263, __pyx_L1_error)
-              #else
-              __pyx_t_9 = PySequence_ITEM(__pyx_t_10, __pyx_t_28); __pyx_t_28++; if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 263, __pyx_L1_error)
-              __Pyx_GOTREF(__pyx_t_9);
-              #endif
-            }
-          } else {
-            __pyx_t_9 = __pyx_t_33(__pyx_t_10);
-            if (unlikely(!__pyx_t_9)) {
-              PyObject* exc_type = PyErr_Occurred();
-              if (exc_type) {
-                if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-                else __PYX_ERR(0, 263, __pyx_L1_error)
-              }
-              break;
-            }
-            __Pyx_GOTREF(__pyx_t_9);
-          }
-          __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_9);
-          __pyx_t_9 = 0;
-
-          /* "msgpack/_packer.pyx":264
- *                 if ret == 0:
- *                     for v in o:
- *                         ret = self._pack(v, nest_limit-1)             # <<<<<<<<<<<<<<
- *                         if ret != 0: break
- *             elif PyMemoryView_Check(o):
- */
-          __pyx_t_30.__pyx_n = 1;
-          __pyx_t_30.nest_limit = (__pyx_v_nest_limit - 1);
-          __pyx_t_15 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_v, &__pyx_t_30); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 264, __pyx_L1_error)
-          __pyx_v_ret = __pyx_t_15;
-
-          /* "msgpack/_packer.pyx":265
- *                     for v in o:
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break             # <<<<<<<<<<<<<<
- *             elif PyMemoryView_Check(o):
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- */
-          __pyx_t_1 = (__pyx_v_ret != 0);
-          if (__pyx_t_1) {
-            goto __pyx_L57_break;
-          }
-
-          /* "msgpack/_packer.pyx":263
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:
- *                     for v in o:             # <<<<<<<<<<<<<<
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- */
-        }
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        goto __pyx_L59_for_end;
-        __pyx_L57_break:;
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        goto __pyx_L59_for_end;
-        __pyx_L59_for_end:;
-
-        /* "msgpack/_packer.pyx":262
- *                     raise ValueError("list is too large")
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     for v in o:
- *                         ret = self._pack(v, nest_limit-1)
- */
-      }
-
-      /* "msgpack/_packer.pyx":257
- *                 ulval = o.nanoseconds
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):             # <<<<<<<<<<<<<<
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":266
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif PyMemoryView_Check(o):             # <<<<<<<<<<<<<<
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- *                     raise ValueError("could not get buffer for memoryview")
- */
-    __pyx_t_1 = (PyMemoryView_Check(__pyx_v_o) != 0);
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":267
- *                         if ret != 0: break
- *             elif PyMemoryView_Check(o):
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:             # <<<<<<<<<<<<<<
- *                     raise ValueError("could not get buffer for memoryview")
- *                 L = view.len
- */
-      __pyx_t_15 = PyObject_GetBuffer(__pyx_v_o, (&__pyx_v_view), PyBUF_SIMPLE); if (unlikely(__pyx_t_15 == ((int)-1))) __PYX_ERR(0, 267, __pyx_L1_error)
-      __pyx_t_1 = (__pyx_t_15 != 0);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":268
- *             elif PyMemoryView_Check(o):
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- *                     raise ValueError("could not get buffer for memoryview")             # <<<<<<<<<<<<<<
- *                 L = view.len
- *                 if L > ITEM_LIMIT:
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 268, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 268, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":267
- *                         if ret != 0: break
- *             elif PyMemoryView_Check(o):
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:             # <<<<<<<<<<<<<<
- *                     raise ValueError("could not get buffer for memoryview")
- *                 L = view.len
- */
-      }
-
-      /* "msgpack/_packer.pyx":269
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- *                     raise ValueError("could not get buffer for memoryview")
- *                 L = view.len             # <<<<<<<<<<<<<<
- *                 if L > ITEM_LIMIT:
- *                     PyBuffer_Release(&view);
- */
-      __pyx_t_28 = __pyx_v_view.len;
-      __pyx_v_L = __pyx_t_28;
-
-      /* "msgpack/_packer.pyx":270
- *                     raise ValueError("could not get buffer for memoryview")
- *                 L = view.len
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     PyBuffer_Release(&view);
- *                     raise ValueError("memoryview is too large")
- */
-      __pyx_t_1 = (__pyx_v_L > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":271
- *                 L = view.len
- *                 if L > ITEM_LIMIT:
- *                     PyBuffer_Release(&view);             # <<<<<<<<<<<<<<
- *                     raise ValueError("memoryview is too large")
- *                 ret = msgpack_pack_bin(&self.pk, L)
- */
-        PyBuffer_Release((&__pyx_v_view));
-
-        /* "msgpack/_packer.pyx":272
- *                 if L > ITEM_LIMIT:
- *                     PyBuffer_Release(&view);
- *                     raise ValueError("memoryview is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 272, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 272, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":270
- *                     raise ValueError("could not get buffer for memoryview")
- *                 L = view.len
- *                 if L > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *                     PyBuffer_Release(&view);
- *                     raise ValueError("memoryview is too large")
- */
-      }
-
-      /* "msgpack/_packer.pyx":273
- *                     PyBuffer_Release(&view);
- *                     raise ValueError("memoryview is too large")
- *                 ret = msgpack_pack_bin(&self.pk, L)             # <<<<<<<<<<<<<<
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- */
-      __pyx_v_ret = msgpack_pack_bin((&__pyx_v_self->pk), __pyx_v_L);
-
-      /* "msgpack/_packer.pyx":274
- *                     raise ValueError("memoryview is too large")
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- *                 PyBuffer_Release(&view);
- */
-      __pyx_t_1 = (__pyx_v_ret == 0);
-      if (__pyx_t_1) {
-
-        /* "msgpack/_packer.pyx":275
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)             # <<<<<<<<<<<<<<
- *                 PyBuffer_Release(&view);
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
- */
-        __pyx_v_ret = msgpack_pack_raw_body((&__pyx_v_self->pk), ((char *)__pyx_v_view.buf), __pyx_v_L);
-
-        /* "msgpack/_packer.pyx":274
- *                     raise ValueError("memoryview is too large")
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:             # <<<<<<<<<<<<<<
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- *                 PyBuffer_Release(&view);
- */
-      }
-
-      /* "msgpack/_packer.pyx":276
- *                 if ret == 0:
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- *                 PyBuffer_Release(&view);             # <<<<<<<<<<<<<<
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
- *                 delta = o - epoch
- */
-      PyBuffer_Release((&__pyx_v_view));
-
-      /* "msgpack/_packer.pyx":266
- *                         ret = self._pack(v, nest_limit-1)
- *                         if ret != 0: break
- *             elif PyMemoryView_Check(o):             # <<<<<<<<<<<<<<
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- *                     raise ValueError("could not get buffer for memoryview")
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":277
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- *                 PyBuffer_Release(&view);
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:             # <<<<<<<<<<<<<<
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):
- */
-    if (__pyx_v_self->datetime) {
-    } else {
-      __pyx_t_1 = __pyx_v_self->datetime;
-      goto __pyx_L63_bool_binop_done;
-    }
-    __pyx_t_11 = PyDateTime_CheckExact(__pyx_v_o);
-    if (__pyx_t_11) {
-    } else {
-      __pyx_t_1 = __pyx_t_11;
-      goto __pyx_L63_bool_binop_done;
-    }
-    __pyx_t_10 = __pyx_f_7cpython_8datetime_datetime_tzinfo(__pyx_v_o); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 277, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_10);
-    __pyx_t_11 = (__pyx_t_10 != Py_None);
-    __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-    __pyx_t_1 = __pyx_t_11;
-    __pyx_L63_bool_binop_done:;
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":278
- *                 PyBuffer_Release(&view);
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
- *                 delta = o - epoch             # <<<<<<<<<<<<<<
- *                 if not PyDelta_CheckExact(delta):
- *                     raise ValueError("failed to calculate delta")
- */
-      __pyx_t_10 = PyNumber_Subtract(__pyx_v_o, __pyx_v_7msgpack_9_cmsgpack_epoch); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 278, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_10);
-      __pyx_v_delta = __pyx_t_10;
-      __pyx_t_10 = 0;
-
-      /* "msgpack/_packer.pyx":279
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):             # <<<<<<<<<<<<<<
- *                     raise ValueError("failed to calculate delta")
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- */
-      __pyx_t_1 = (!PyDelta_CheckExact(__pyx_v_delta));
-      if (unlikely(__pyx_t_1)) {
-
-        /* "msgpack/_packer.pyx":280
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):
- *                     raise ValueError("failed to calculate delta")             # <<<<<<<<<<<<<<
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- *                 ulval = timedelta_microseconds(delta) * 1000
- */
-        __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__13, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 280, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_Raise(__pyx_t_10, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
-        __PYX_ERR(0, 280, __pyx_L1_error)
-
-        /* "msgpack/_packer.pyx":279
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):             # <<<<<<<<<<<<<<
- *                     raise ValueError("failed to calculate delta")
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- */
-      }
-
-      /* "msgpack/_packer.pyx":281
- *                 if not PyDelta_CheckExact(delta):
- *                     raise ValueError("failed to calculate delta")
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)             # <<<<<<<<<<<<<<
- *                 ulval = timedelta_microseconds(delta) * 1000
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- */
-      __pyx_t_15 = __pyx_f_7cpython_8datetime_timedelta_days(__pyx_v_delta); if (unlikely(__pyx_t_15 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 281, __pyx_L1_error)
-      __pyx_t_8 = __pyx_f_7cpython_8datetime_timedelta_seconds(__pyx_v_delta); if (unlikely(__pyx_t_8 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 281, __pyx_L1_error)
-      __pyx_v_llval = ((__pyx_t_15 * ((PY_LONG_LONG)0x15180)) + __pyx_t_8);
-
-      /* "msgpack/_packer.pyx":282
- *                     raise ValueError("failed to calculate delta")
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- *                 ulval = timedelta_microseconds(delta) * 1000             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif not default_used and self._default:
- */
-      __pyx_t_8 = __pyx_f_7cpython_8datetime_timedelta_microseconds(__pyx_v_delta); if (unlikely(__pyx_t_8 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(0, 282, __pyx_L1_error)
-      __pyx_v_ulval = (__pyx_t_8 * 0x3E8);
-
-      /* "msgpack/_packer.pyx":283
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- *                 ulval = timedelta_microseconds(delta) * 1000
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)             # <<<<<<<<<<<<<<
- *             elif not default_used and self._default:
- *                 o = self._default(o)
- */
-      __pyx_v_ret = msgpack_pack_timestamp((&__pyx_v_self->pk), __pyx_v_llval, __pyx_v_ulval);
-
-      /* "msgpack/_packer.pyx":277
- *                     ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
- *                 PyBuffer_Release(&view);
- *             elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:             # <<<<<<<<<<<<<<
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":284
- *                 ulval = timedelta_microseconds(delta) * 1000
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif not default_used and self._default:             # <<<<<<<<<<<<<<
- *                 o = self._default(o)
- *                 default_used = 1
- */
-    __pyx_t_11 = (!(__pyx_v_default_used != 0));
-    if (__pyx_t_11) {
-    } else {
-      __pyx_t_1 = __pyx_t_11;
-      goto __pyx_L67_bool_binop_done;
-    }
-    __pyx_t_11 = __Pyx_PyObject_IsTrue(__pyx_v_self->_default); if (unlikely((__pyx_t_11 < 0))) __PYX_ERR(0, 284, __pyx_L1_error)
-    __pyx_t_1 = __pyx_t_11;
-    __pyx_L67_bool_binop_done:;
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":285
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif not default_used and self._default:
- *                 o = self._default(o)             # <<<<<<<<<<<<<<
- *                 default_used = 1
- *                 continue
- */
-      __Pyx_INCREF(__pyx_v_self->_default);
-      __pyx_t_9 = __pyx_v_self->_default; __pyx_t_2 = NULL;
-      __pyx_t_8 = 0;
-      #if CYTHON_UNPACK_METHODS
-      if (likely(PyMethod_Check(__pyx_t_9))) {
-        __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_9);
-        if (likely(__pyx_t_2)) {
-          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9);
-          __Pyx_INCREF(__pyx_t_2);
-          __Pyx_INCREF(function);
-          __Pyx_DECREF_SET(__pyx_t_9, function);
-          __pyx_t_8 = 1;
-        }
-      }
-      #endif
-      {
-        PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_o};
-        __pyx_t_10 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8);
-        __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-        if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 285, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_10);
-        __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
-      }
-      __Pyx_DECREF_SET(__pyx_v_o, __pyx_t_10);
-      __pyx_t_10 = 0;
-
-      /* "msgpack/_packer.pyx":286
- *             elif not default_used and self._default:
- *                 o = self._default(o)
- *                 default_used = 1             # <<<<<<<<<<<<<<
- *                 continue
- *             elif self.datetime and PyDateTime_CheckExact(o):
- */
-      __pyx_v_default_used = 1;
-
-      /* "msgpack/_packer.pyx":287
- *                 o = self._default(o)
- *                 default_used = 1
- *                 continue             # <<<<<<<<<<<<<<
- *             elif self.datetime and PyDateTime_CheckExact(o):
- *                 PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
- */
-      goto __pyx_L4_continue;
-
-      /* "msgpack/_packer.pyx":284
- *                 ulval = timedelta_microseconds(delta) * 1000
- *                 ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
- *             elif not default_used and self._default:             # <<<<<<<<<<<<<<
- *                 o = self._default(o)
- *                 default_used = 1
- */
-    }
-
-    /* "msgpack/_packer.pyx":288
- *                 default_used = 1
- *                 continue
- *             elif self.datetime and PyDateTime_CheckExact(o):             # <<<<<<<<<<<<<<
- *                 PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
- *             else:
- */
-    if (__pyx_v_self->datetime) {
-    } else {
-      __pyx_t_1 = __pyx_v_self->datetime;
-      goto __pyx_L69_bool_binop_done;
-    }
-    __pyx_t_11 = PyDateTime_CheckExact(__pyx_v_o);
-    __pyx_t_1 = __pyx_t_11;
-    __pyx_L69_bool_binop_done:;
-    if (__pyx_t_1) {
-
-      /* "msgpack/_packer.pyx":289
- *                 continue
- *             elif self.datetime and PyDateTime_CheckExact(o):
- *                 PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)             # <<<<<<<<<<<<<<
- *             else:
- *                 PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
- */
-      __pyx_t_26 = PyErr_Format(__pyx_builtin_ValueError, ((char *)"can not serialize '%.200s' object where tzinfo=None"), Py_TYPE(__pyx_v_o)->tp_name); if (unlikely(__pyx_t_26 == ((PyObject *)NULL))) __PYX_ERR(0, 289, __pyx_L1_error)
-
-      /* "msgpack/_packer.pyx":288
- *                 default_used = 1
- *                 continue
- *             elif self.datetime and PyDateTime_CheckExact(o):             # <<<<<<<<<<<<<<
- *                 PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
- *             else:
- */
-      goto __pyx_L6;
-    }
-
-    /* "msgpack/_packer.pyx":291
- *                 PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
- *             else:
- *                 PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)             # <<<<<<<<<<<<<<
- *             return ret
- * 
- */
-    /*else*/ {
-      __pyx_t_26 = PyErr_Format(__pyx_builtin_TypeError, ((char *)"can not serialize '%.200s' object"), Py_TYPE(__pyx_v_o)->tp_name); if (unlikely(__pyx_t_26 == ((PyObject *)NULL))) __PYX_ERR(0, 291, __pyx_L1_error)
-    }
-    __pyx_L6:;
-
-    /* "msgpack/_packer.pyx":292
- *             else:
- *                 PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
- *             return ret             # <<<<<<<<<<<<<<
- * 
- *     cpdef pack(self, object obj):
- */
-    __pyx_r = __pyx_v_ret;
-    goto __pyx_L0;
-    __pyx_L4_continue:;
-  }
-
-  /* "msgpack/_packer.pyx":147
- *         self.pk.buf = NULL
- * 
- *     cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:             # <<<<<<<<<<<<<<
- *         cdef long long llval
- *         cdef unsigned long long ullval
- */
-
-  /* function exit code */
-  __pyx_r = 0;
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_9);
-  __Pyx_XDECREF(__pyx_t_10);
-  __Pyx_XDECREF(__pyx_t_12);
-  __Pyx_XDECREF(__pyx_t_13);
-  __Pyx_XDECREF(__pyx_t_14);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer._pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = -1;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_d);
-  __Pyx_XDECREF(__pyx_v_oe);
-  __Pyx_XDECREF(__pyx_v_k);
-  __Pyx_XDECREF(__pyx_v_v);
-  __Pyx_XDECREF(__pyx_v_delta);
-  __Pyx_XDECREF(__pyx_v_o);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":294
- *             return ret
- * 
- *     cpdef pack(self, object obj):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         try:
- */
-
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_7pack(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_6Packer_pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_obj, int __pyx_skip_dispatch) {
-  int __pyx_v_ret;
-  PyObject *__pyx_v_buf = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
-  PyObject *__pyx_t_4 = NULL;
-  int __pyx_t_5;
-  PyObject *__pyx_t_6 = NULL;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack __pyx_t_9;
-  int __pyx_t_10;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack", 0);
-  /* Check if called by wrapper */
-  if (unlikely(__pyx_skip_dispatch)) ;
-  /* Check if overridden in Python */
-  else if (unlikely((Py_TYPE(((PyObject *)__pyx_v_self))->tp_dictoffset != 0) || __Pyx_PyType_HasFeature(Py_TYPE(((PyObject *)__pyx_v_self)), (Py_TPFLAGS_IS_ABSTRACT | Py_TPFLAGS_HEAPTYPE)))) {
-    #if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS
-    static PY_UINT64_T __pyx_tp_dict_version = __PYX_DICT_VERSION_INIT, __pyx_obj_dict_version = __PYX_DICT_VERSION_INIT;
-    if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
-      PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
-      #endif
-      __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_pack); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 294, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_1);
-      #ifdef __Pyx_CyFunction_USED
-      if (!__Pyx_IsCyOrPyCFunction(__pyx_t_1)
-      #else
-      if (!PyCFunction_Check(__pyx_t_1)
-      #endif
-              || (PyCFunction_GET_FUNCTION(__pyx_t_1) != (PyCFunction)(void*)__pyx_pw_7msgpack_9_cmsgpack_6Packer_7pack)) {
-        __Pyx_XDECREF(__pyx_r);
-        __Pyx_INCREF(__pyx_t_1);
-        __pyx_t_3 = __pyx_t_1; __pyx_t_4 = NULL;
-        __pyx_t_5 = 0;
-        #if CYTHON_UNPACK_METHODS
-        if (unlikely(PyMethod_Check(__pyx_t_3))) {
-          __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3);
-          if (likely(__pyx_t_4)) {
-            PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
-            __Pyx_INCREF(__pyx_t_4);
-            __Pyx_INCREF(function);
-            __Pyx_DECREF_SET(__pyx_t_3, function);
-            __pyx_t_5 = 1;
-          }
-        }
-        #endif
-        {
-          PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_obj};
-          __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
-          __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-          if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 294, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_2);
-          __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-        }
-        __pyx_r = __pyx_t_2;
-        __pyx_t_2 = 0;
-        __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-        goto __pyx_L0;
-      }
-      #if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS
-      __pyx_tp_dict_version = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
-      __pyx_obj_dict_version = __Pyx_get_object_dict_version(((PyObject *)__pyx_v_self));
-      if (unlikely(__pyx_typedict_guard != __pyx_tp_dict_version)) {
-        __pyx_tp_dict_version = __pyx_obj_dict_version = __PYX_DICT_VERSION_INIT;
-      }
-      #endif
-      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      #if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS
-    }
-    #endif
-  }
-
-  /* "msgpack/_packer.pyx":296
- *     cpdef pack(self, object obj):
- *         cdef int ret
- *         try:             # <<<<<<<<<<<<<<
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
- *         except:
- */
-  {
-    __Pyx_PyThreadState_declare
-    __Pyx_PyThreadState_assign
-    __Pyx_ExceptionSave(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8);
-    __Pyx_XGOTREF(__pyx_t_6);
-    __Pyx_XGOTREF(__pyx_t_7);
-    __Pyx_XGOTREF(__pyx_t_8);
-    /*try:*/ {
-
-      /* "msgpack/_packer.pyx":297
- *         cdef int ret
- *         try:
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)             # <<<<<<<<<<<<<<
- *         except:
- *             self.pk.length = 0
- */
-      __pyx_t_9.__pyx_n = 1;
-      __pyx_t_9.nest_limit = __pyx_v_7msgpack_9_cmsgpack_DEFAULT_RECURSE_LIMIT;
-      __pyx_t_5 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_obj, &__pyx_t_9); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 297, __pyx_L3_error)
-      __pyx_v_ret = __pyx_t_5;
-
-      /* "msgpack/_packer.pyx":296
- *     cpdef pack(self, object obj):
- *         cdef int ret
- *         try:             # <<<<<<<<<<<<<<
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
- *         except:
- */
-    }
-    __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
-    __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-    goto __pyx_L8_try_end;
-    __pyx_L3_error:;
-    __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
-    __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-
-    /* "msgpack/_packer.pyx":298
- *         try:
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
- *         except:             # <<<<<<<<<<<<<<
- *             self.pk.length = 0
- *             raise
- */
-    /*except:*/ {
-      __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-      if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_2, &__pyx_t_3) < 0) __PYX_ERR(0, 298, __pyx_L5_except_error)
-      __Pyx_XGOTREF(__pyx_t_1);
-      __Pyx_XGOTREF(__pyx_t_2);
-      __Pyx_XGOTREF(__pyx_t_3);
-
-      /* "msgpack/_packer.pyx":299
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
- *         except:
- *             self.pk.length = 0             # <<<<<<<<<<<<<<
- *             raise
- *         if ret:  # should not happen.
- */
-      __pyx_v_self->pk.length = 0;
-
-      /* "msgpack/_packer.pyx":300
- *         except:
- *             self.pk.length = 0
- *             raise             # <<<<<<<<<<<<<<
- *         if ret:  # should not happen.
- *             raise RuntimeError("internal error")
- */
-      __Pyx_GIVEREF(__pyx_t_1);
-      __Pyx_GIVEREF(__pyx_t_2);
-      __Pyx_XGIVEREF(__pyx_t_3);
-      __Pyx_ErrRestoreWithState(__pyx_t_1, __pyx_t_2, __pyx_t_3);
-      __pyx_t_1 = 0; __pyx_t_2 = 0; __pyx_t_3 = 0; 
-      __PYX_ERR(0, 300, __pyx_L5_except_error)
-    }
-
-    /* "msgpack/_packer.pyx":296
- *     cpdef pack(self, object obj):
- *         cdef int ret
- *         try:             # <<<<<<<<<<<<<<
- *             ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
- *         except:
- */
-    __pyx_L5_except_error:;
-    __Pyx_XGIVEREF(__pyx_t_6);
-    __Pyx_XGIVEREF(__pyx_t_7);
-    __Pyx_XGIVEREF(__pyx_t_8);
-    __Pyx_ExceptionReset(__pyx_t_6, __pyx_t_7, __pyx_t_8);
-    goto __pyx_L1_error;
-    __pyx_L8_try_end:;
-  }
-
-  /* "msgpack/_packer.pyx":301
- *             self.pk.length = 0
- *             raise
- *         if ret:  # should not happen.             # <<<<<<<<<<<<<<
- *             raise RuntimeError("internal error")
- *         if self.autoreset:
- */
-  __pyx_t_10 = (__pyx_v_ret != 0);
-  if (unlikely(__pyx_t_10)) {
-
-    /* "msgpack/_packer.pyx":302
- *             raise
- *         if ret:  # should not happen.
- *             raise RuntimeError("internal error")             # <<<<<<<<<<<<<<
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__14, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 302, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(0, 302, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":301
- *             self.pk.length = 0
- *             raise
- *         if ret:  # should not happen.             # <<<<<<<<<<<<<<
- *             raise RuntimeError("internal error")
- *         if self.autoreset:
- */
-  }
-
-  /* "msgpack/_packer.pyx":303
- *         if ret:  # should not happen.
- *             raise RuntimeError("internal error")
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  if (__pyx_v_self->autoreset) {
-
-    /* "msgpack/_packer.pyx":304
- *             raise RuntimeError("internal error")
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- *             self.pk.length = 0
- *             return buf
- */
-    __pyx_t_3 = PyBytes_FromStringAndSize(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 304, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_v_buf = ((PyObject*)__pyx_t_3);
-    __pyx_t_3 = 0;
-
-    /* "msgpack/_packer.pyx":305
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0             # <<<<<<<<<<<<<<
- *             return buf
- * 
- */
-    __pyx_v_self->pk.length = 0;
-
-    /* "msgpack/_packer.pyx":306
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- *             return buf             # <<<<<<<<<<<<<<
- * 
- *     def pack_ext_type(self, typecode, data):
- */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(__pyx_v_buf);
-    __pyx_r = __pyx_v_buf;
-    goto __pyx_L0;
-
-    /* "msgpack/_packer.pyx":303
- *         if ret:  # should not happen.
- *             raise RuntimeError("internal error")
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  }
-
-  /* "msgpack/_packer.pyx":294
- *             return ret
- * 
- *     cpdef pack(self, object obj):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         try:
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_4);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_buf);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_7pack(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_6pack, "Packer.pack(self, obj)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_7pack = {"pack", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_7pack, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_6pack};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_7pack(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_obj = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("pack (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 294, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_obj,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_obj)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 294, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "pack") < 0)) __PYX_ERR(0, 294, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_obj = values[0];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("pack", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 294, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_6pack(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_obj);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_6pack(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_obj) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack", 0);
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __pyx_f_7msgpack_9_cmsgpack_6Packer_pack(__pyx_v_self, __pyx_v_obj, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 294, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":308
- *             return buf
- * 
- *     def pack_ext_type(self, typecode, data):             # <<<<<<<<<<<<<<
- *         msgpack_pack_ext(&self.pk, typecode, len(data))
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_9pack_ext_type(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_8pack_ext_type, "Packer.pack_ext_type(self, typecode, data)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_9pack_ext_type = {"pack_ext_type", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_9pack_ext_type, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_8pack_ext_type};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_9pack_ext_type(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_typecode = 0;
-  PyObject *__pyx_v_data = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[2] = {0,0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("pack_ext_type (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 308, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_typecode,&__pyx_n_s_data,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  2: values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
-        CYTHON_FALLTHROUGH;
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_typecode)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-        CYTHON_FALLTHROUGH;
-        case  1:
-        if (likely((values[1] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_data)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L3_error)
-        else {
-          __Pyx_RaiseArgtupleInvalid("pack_ext_type", 1, 2, 2, 1); __PYX_ERR(0, 308, __pyx_L3_error)
-        }
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "pack_ext_type") < 0)) __PYX_ERR(0, 308, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 2)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-      values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
-    }
-    __pyx_v_typecode = values[0];
-    __pyx_v_data = values[1];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("pack_ext_type", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 308, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_ext_type", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_8pack_ext_type(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_typecode, __pyx_v_data);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_8pack_ext_type(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_typecode, PyObject *__pyx_v_data) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  char __pyx_t_1;
-  Py_ssize_t __pyx_t_2;
-  char *__pyx_t_3;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack_ext_type", 0);
-
-  /* "msgpack/_packer.pyx":309
- * 
- *     def pack_ext_type(self, typecode, data):
- *         msgpack_pack_ext(&self.pk, typecode, len(data))             # <<<<<<<<<<<<<<
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- * 
- */
-  __pyx_t_1 = __Pyx_PyInt_As_char(__pyx_v_typecode); if (unlikely((__pyx_t_1 == (char)-1) && PyErr_Occurred())) __PYX_ERR(0, 309, __pyx_L1_error)
-  __pyx_t_2 = PyObject_Length(__pyx_v_data); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 309, __pyx_L1_error)
-  (void)(msgpack_pack_ext((&__pyx_v_self->pk), __pyx_t_1, __pyx_t_2));
-
-  /* "msgpack/_packer.pyx":310
- *     def pack_ext_type(self, typecode, data):
- *         msgpack_pack_ext(&self.pk, typecode, len(data))
- *         msgpack_pack_raw_body(&self.pk, data, len(data))             # <<<<<<<<<<<<<<
- * 
- *     def pack_array_header(self, long long size):
- */
-  __pyx_t_3 = __Pyx_PyObject_AsWritableString(__pyx_v_data); if (unlikely((!__pyx_t_3) && PyErr_Occurred())) __PYX_ERR(0, 310, __pyx_L1_error)
-  __pyx_t_2 = PyObject_Length(__pyx_v_data); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 310, __pyx_L1_error)
-  (void)(msgpack_pack_raw_body((&__pyx_v_self->pk), __pyx_t_3, __pyx_t_2));
-
-  /* "msgpack/_packer.pyx":308
- *             return buf
- * 
- *     def pack_ext_type(self, typecode, data):             # <<<<<<<<<<<<<<
- *         msgpack_pack_ext(&self.pk, typecode, len(data))
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_ext_type", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":312
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- * 
- *     def pack_array_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_11pack_array_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_10pack_array_header, "Packer.pack_array_header(self, long long size)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_11pack_array_header = {"pack_array_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_11pack_array_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_10pack_array_header};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_11pack_array_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PY_LONG_LONG __pyx_v_size;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("pack_array_header (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 312, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_size,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_size)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 312, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "pack_array_header") < 0)) __PYX_ERR(0, 312, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_size = __Pyx_PyInt_As_PY_LONG_LONG(values[0]); if (unlikely((__pyx_v_size == (PY_LONG_LONG)-1) && PyErr_Occurred())) __PYX_ERR(0, 312, __pyx_L3_error)
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("pack_array_header", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 312, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_array_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_10pack_array_header(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_size);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_10pack_array_header(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PY_LONG_LONG __pyx_v_size) {
-  int __pyx_v_ret;
-  PyObject *__pyx_v_buf = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack_array_header", 0);
-
-  /* "msgpack/_packer.pyx":313
- * 
- *     def pack_array_header(self, long long size):
- *         if size > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *             raise ValueError
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- */
-  __pyx_t_1 = (__pyx_v_size > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":314
- *     def pack_array_header(self, long long size):
- *         if size > ITEM_LIMIT:
- *             raise ValueError             # <<<<<<<<<<<<<<
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- *         if ret == -1:
- */
-    __Pyx_Raise(__pyx_builtin_ValueError, 0, 0, 0);
-    __PYX_ERR(0, 314, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":313
- * 
- *     def pack_array_header(self, long long size):
- *         if size > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *             raise ValueError
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- */
-  }
-
-  /* "msgpack/_packer.pyx":315
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- *         cdef int ret = msgpack_pack_array(&self.pk, size)             # <<<<<<<<<<<<<<
- *         if ret == -1:
- *             raise MemoryError
- */
-  __pyx_v_ret = msgpack_pack_array((&__pyx_v_self->pk), __pyx_v_size);
-
-  /* "msgpack/_packer.pyx":316
- *             raise ValueError
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  __pyx_t_1 = (__pyx_v_ret == -1L);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":317
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- *         if ret == -1:
- *             raise MemoryError             # <<<<<<<<<<<<<<
- *         elif ret:  # should not happen
- *             raise TypeError
- */
-    PyErr_NoMemory(); __PYX_ERR(0, 317, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":316
- *             raise ValueError
- *         cdef int ret = msgpack_pack_array(&self.pk, size)
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  }
-
-  /* "msgpack/_packer.pyx":318
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  __pyx_t_1 = (__pyx_v_ret != 0);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":319
- *             raise MemoryError
- *         elif ret:  # should not happen
- *             raise TypeError             # <<<<<<<<<<<<<<
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-    __Pyx_Raise(__pyx_builtin_TypeError, 0, 0, 0);
-    __PYX_ERR(0, 319, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":318
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  }
-
-  /* "msgpack/_packer.pyx":320
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  if (__pyx_v_self->autoreset) {
-
-    /* "msgpack/_packer.pyx":321
- *             raise TypeError
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- *             self.pk.length = 0
- *             return buf
- */
-    __pyx_t_2 = PyBytes_FromStringAndSize(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __pyx_v_buf = ((PyObject*)__pyx_t_2);
-    __pyx_t_2 = 0;
-
-    /* "msgpack/_packer.pyx":322
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0             # <<<<<<<<<<<<<<
- *             return buf
- * 
- */
-    __pyx_v_self->pk.length = 0;
-
-    /* "msgpack/_packer.pyx":323
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- *             return buf             # <<<<<<<<<<<<<<
- * 
- *     def pack_map_header(self, long long size):
- */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(__pyx_v_buf);
-    __pyx_r = __pyx_v_buf;
-    goto __pyx_L0;
-
-    /* "msgpack/_packer.pyx":320
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  }
-
-  /* "msgpack/_packer.pyx":312
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- * 
- *     def pack_array_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_array_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_buf);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":325
- *             return buf
- * 
- *     def pack_map_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_13pack_map_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_12pack_map_header, "Packer.pack_map_header(self, long long size)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_13pack_map_header = {"pack_map_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_13pack_map_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_12pack_map_header};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_13pack_map_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PY_LONG_LONG __pyx_v_size;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("pack_map_header (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 325, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_size,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_size)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 325, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "pack_map_header") < 0)) __PYX_ERR(0, 325, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_size = __Pyx_PyInt_As_PY_LONG_LONG(values[0]); if (unlikely((__pyx_v_size == (PY_LONG_LONG)-1) && PyErr_Occurred())) __PYX_ERR(0, 325, __pyx_L3_error)
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("pack_map_header", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 325, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_map_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_12pack_map_header(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_size);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_12pack_map_header(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PY_LONG_LONG __pyx_v_size) {
-  int __pyx_v_ret;
-  PyObject *__pyx_v_buf = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack_map_header", 0);
-
-  /* "msgpack/_packer.pyx":326
- * 
- *     def pack_map_header(self, long long size):
- *         if size > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *             raise ValueError
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- */
-  __pyx_t_1 = (__pyx_v_size > __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":327
- *     def pack_map_header(self, long long size):
- *         if size > ITEM_LIMIT:
- *             raise ValueError             # <<<<<<<<<<<<<<
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- *         if ret == -1:
- */
-    __Pyx_Raise(__pyx_builtin_ValueError, 0, 0, 0);
-    __PYX_ERR(0, 327, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":326
- * 
- *     def pack_map_header(self, long long size):
- *         if size > ITEM_LIMIT:             # <<<<<<<<<<<<<<
- *             raise ValueError
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- */
-  }
-
-  /* "msgpack/_packer.pyx":328
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- *         cdef int ret = msgpack_pack_map(&self.pk, size)             # <<<<<<<<<<<<<<
- *         if ret == -1:
- *             raise MemoryError
- */
-  __pyx_v_ret = msgpack_pack_map((&__pyx_v_self->pk), __pyx_v_size);
-
-  /* "msgpack/_packer.pyx":329
- *             raise ValueError
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  __pyx_t_1 = (__pyx_v_ret == -1L);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":330
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- *         if ret == -1:
- *             raise MemoryError             # <<<<<<<<<<<<<<
- *         elif ret:  # should not happen
- *             raise TypeError
- */
-    PyErr_NoMemory(); __PYX_ERR(0, 330, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":329
- *             raise ValueError
- *         cdef int ret = msgpack_pack_map(&self.pk, size)
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  }
-
-  /* "msgpack/_packer.pyx":331
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  __pyx_t_1 = (__pyx_v_ret != 0);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_packer.pyx":332
- *             raise MemoryError
- *         elif ret:  # should not happen
- *             raise TypeError             # <<<<<<<<<<<<<<
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-    __Pyx_Raise(__pyx_builtin_TypeError, 0, 0, 0);
-    __PYX_ERR(0, 332, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":331
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  }
-
-  /* "msgpack/_packer.pyx":333
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  if (__pyx_v_self->autoreset) {
-
-    /* "msgpack/_packer.pyx":334
- *             raise TypeError
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- *             self.pk.length = 0
- *             return buf
- */
-    __pyx_t_2 = PyBytes_FromStringAndSize(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 334, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __pyx_v_buf = ((PyObject*)__pyx_t_2);
-    __pyx_t_2 = 0;
-
-    /* "msgpack/_packer.pyx":335
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0             # <<<<<<<<<<<<<<
- *             return buf
- * 
- */
-    __pyx_v_self->pk.length = 0;
-
-    /* "msgpack/_packer.pyx":336
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- *             return buf             # <<<<<<<<<<<<<<
- * 
- *     def pack_map_pairs(self, object pairs):
- */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(__pyx_v_buf);
-    __pyx_r = __pyx_v_buf;
-    goto __pyx_L0;
-
-    /* "msgpack/_packer.pyx":333
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  }
-
-  /* "msgpack/_packer.pyx":325
- *             return buf
- * 
- *     def pack_map_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_map_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_buf);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":338
- *             return buf
- * 
- *     def pack_map_pairs(self, object pairs):             # <<<<<<<<<<<<<<
- *         """
- *         Pack *pairs* as msgpack map type.
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs, "Packer.pack_map_pairs(self, pairs)\n\n        Pack *pairs* as msgpack map type.\n\n        *pairs* should be a sequence of pairs.\n        (`len(pairs)` and `for k, v in pairs:` should be supported.)\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs = {"pack_map_pairs", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_pairs = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("pack_map_pairs (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 338, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_pairs,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_pairs)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 338, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "pack_map_pairs") < 0)) __PYX_ERR(0, 338, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_pairs = values[0];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("pack_map_pairs", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 338, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_map_pairs", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v_pairs);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, PyObject *__pyx_v_pairs) {
-  int __pyx_v_ret;
-  PyObject *__pyx_v_k = NULL;
-  PyObject *__pyx_v_v = NULL;
-  PyObject *__pyx_v_buf = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  Py_ssize_t __pyx_t_1;
-  int __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
-  PyObject *(*__pyx_t_4)(PyObject *);
-  PyObject *__pyx_t_5 = NULL;
-  PyObject *__pyx_t_6 = NULL;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  PyObject *(*__pyx_t_9)(PyObject *);
-  int __pyx_t_10;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("pack_map_pairs", 0);
-
-  /* "msgpack/_packer.pyx":345
- *         (`len(pairs)` and `for k, v in pairs:` should be supported.)
- *         """
- *         cdef int ret = msgpack_pack_map(&self.pk, len(pairs))             # <<<<<<<<<<<<<<
- *         if ret == 0:
- *             for k, v in pairs:
- */
-  __pyx_t_1 = PyObject_Length(__pyx_v_pairs); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 345, __pyx_L1_error)
-  __pyx_v_ret = msgpack_pack_map((&__pyx_v_self->pk), __pyx_t_1);
-
-  /* "msgpack/_packer.pyx":346
- *         """
- *         cdef int ret = msgpack_pack_map(&self.pk, len(pairs))
- *         if ret == 0:             # <<<<<<<<<<<<<<
- *             for k, v in pairs:
- *                 ret = self._pack(k)
- */
-  __pyx_t_2 = (__pyx_v_ret == 0);
-  if (__pyx_t_2) {
-
-    /* "msgpack/_packer.pyx":347
- *         cdef int ret = msgpack_pack_map(&self.pk, len(pairs))
- *         if ret == 0:
- *             for k, v in pairs:             # <<<<<<<<<<<<<<
- *                 ret = self._pack(k)
- *                 if ret != 0: break
- */
-    if (likely(PyList_CheckExact(__pyx_v_pairs)) || PyTuple_CheckExact(__pyx_v_pairs)) {
-      __pyx_t_3 = __pyx_v_pairs; __Pyx_INCREF(__pyx_t_3); __pyx_t_1 = 0;
-      __pyx_t_4 = NULL;
-    } else {
-      __pyx_t_1 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_v_pairs); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 347, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_4 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 347, __pyx_L1_error)
-    }
-    for (;;) {
-      if (likely(!__pyx_t_4)) {
-        if (likely(PyList_CheckExact(__pyx_t_3))) {
-          if (__pyx_t_1 >= PyList_GET_SIZE(__pyx_t_3)) break;
-          #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_5 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely((0 < 0))) __PYX_ERR(0, 347, __pyx_L1_error)
-          #else
-          __pyx_t_5 = PySequence_ITEM(__pyx_t_3, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 347, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_5);
-          #endif
-        } else {
-          if (__pyx_t_1 >= PyTuple_GET_SIZE(__pyx_t_3)) break;
-          #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-          __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely((0 < 0))) __PYX_ERR(0, 347, __pyx_L1_error)
-          #else
-          __pyx_t_5 = PySequence_ITEM(__pyx_t_3, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 347, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_5);
-          #endif
-        }
-      } else {
-        __pyx_t_5 = __pyx_t_4(__pyx_t_3);
-        if (unlikely(!__pyx_t_5)) {
-          PyObject* exc_type = PyErr_Occurred();
-          if (exc_type) {
-            if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
-            else __PYX_ERR(0, 347, __pyx_L1_error)
-          }
-          break;
-        }
-        __Pyx_GOTREF(__pyx_t_5);
-      }
-      if ((likely(PyTuple_CheckExact(__pyx_t_5))) || (PyList_CheckExact(__pyx_t_5))) {
-        PyObject* sequence = __pyx_t_5;
-        Py_ssize_t size = __Pyx_PySequence_SIZE(sequence);
-        if (unlikely(size != 2)) {
-          if (size > 2) __Pyx_RaiseTooManyValuesError(2);
-          else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-          __PYX_ERR(0, 347, __pyx_L1_error)
-        }
-        #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        if (likely(PyTuple_CheckExact(sequence))) {
-          __pyx_t_6 = PyTuple_GET_ITEM(sequence, 0); 
-          __pyx_t_7 = PyTuple_GET_ITEM(sequence, 1); 
-        } else {
-          __pyx_t_6 = PyList_GET_ITEM(sequence, 0); 
-          __pyx_t_7 = PyList_GET_ITEM(sequence, 1); 
-        }
-        __Pyx_INCREF(__pyx_t_6);
-        __Pyx_INCREF(__pyx_t_7);
-        #else
-        __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 347, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_6);
-        __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 347, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_7);
-        #endif
-        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-      } else {
-        Py_ssize_t index = -1;
-        __pyx_t_8 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 347, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_8);
-        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-        __pyx_t_9 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_8);
-        index = 0; __pyx_t_6 = __pyx_t_9(__pyx_t_8); if (unlikely(!__pyx_t_6)) goto __pyx_L6_unpacking_failed;
-        __Pyx_GOTREF(__pyx_t_6);
-        index = 1; __pyx_t_7 = __pyx_t_9(__pyx_t_8); if (unlikely(!__pyx_t_7)) goto __pyx_L6_unpacking_failed;
-        __Pyx_GOTREF(__pyx_t_7);
-        if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 347, __pyx_L1_error)
-        __pyx_t_9 = NULL;
-        __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-        goto __pyx_L7_unpacking_done;
-        __pyx_L6_unpacking_failed:;
-        __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-        __pyx_t_9 = NULL;
-        if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-        __PYX_ERR(0, 347, __pyx_L1_error)
-        __pyx_L7_unpacking_done:;
-      }
-      __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_6);
-      __pyx_t_6 = 0;
-      __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_7);
-      __pyx_t_7 = 0;
-
-      /* "msgpack/_packer.pyx":348
- *         if ret == 0:
- *             for k, v in pairs:
- *                 ret = self._pack(k)             # <<<<<<<<<<<<<<
- *                 if ret != 0: break
- *                 ret = self._pack(v)
- */
-      __pyx_t_10 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_k, NULL); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 348, __pyx_L1_error)
-      __pyx_v_ret = __pyx_t_10;
-
-      /* "msgpack/_packer.pyx":349
- *             for k, v in pairs:
- *                 ret = self._pack(k)
- *                 if ret != 0: break             # <<<<<<<<<<<<<<
- *                 ret = self._pack(v)
- *                 if ret != 0: break
- */
-      __pyx_t_2 = (__pyx_v_ret != 0);
-      if (__pyx_t_2) {
-        goto __pyx_L5_break;
-      }
-
-      /* "msgpack/_packer.pyx":350
- *                 ret = self._pack(k)
- *                 if ret != 0: break
- *                 ret = self._pack(v)             # <<<<<<<<<<<<<<
- *                 if ret != 0: break
- *         if ret == -1:
- */
-      __pyx_t_10 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer *)__pyx_v_self->__pyx_vtab)->_pack(__pyx_v_self, __pyx_v_v, NULL); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 350, __pyx_L1_error)
-      __pyx_v_ret = __pyx_t_10;
-
-      /* "msgpack/_packer.pyx":351
- *                 if ret != 0: break
- *                 ret = self._pack(v)
- *                 if ret != 0: break             # <<<<<<<<<<<<<<
- *         if ret == -1:
- *             raise MemoryError
- */
-      __pyx_t_2 = (__pyx_v_ret != 0);
-      if (__pyx_t_2) {
-        goto __pyx_L5_break;
-      }
-
-      /* "msgpack/_packer.pyx":347
- *         cdef int ret = msgpack_pack_map(&self.pk, len(pairs))
- *         if ret == 0:
- *             for k, v in pairs:             # <<<<<<<<<<<<<<
- *                 ret = self._pack(k)
- *                 if ret != 0: break
- */
-    }
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    goto __pyx_L10_for_end;
-    __pyx_L5_break:;
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    goto __pyx_L10_for_end;
-    __pyx_L10_for_end:;
-
-    /* "msgpack/_packer.pyx":346
- *         """
- *         cdef int ret = msgpack_pack_map(&self.pk, len(pairs))
- *         if ret == 0:             # <<<<<<<<<<<<<<
- *             for k, v in pairs:
- *                 ret = self._pack(k)
- */
-  }
-
-  /* "msgpack/_packer.pyx":352
- *                 ret = self._pack(v)
- *                 if ret != 0: break
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  __pyx_t_2 = (__pyx_v_ret == -1L);
-  if (unlikely(__pyx_t_2)) {
-
-    /* "msgpack/_packer.pyx":353
- *                 if ret != 0: break
- *         if ret == -1:
- *             raise MemoryError             # <<<<<<<<<<<<<<
- *         elif ret:  # should not happen
- *             raise TypeError
- */
-    PyErr_NoMemory(); __PYX_ERR(0, 353, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":352
- *                 ret = self._pack(v)
- *                 if ret != 0: break
- *         if ret == -1:             # <<<<<<<<<<<<<<
- *             raise MemoryError
- *         elif ret:  # should not happen
- */
-  }
-
-  /* "msgpack/_packer.pyx":354
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  __pyx_t_2 = (__pyx_v_ret != 0);
-  if (unlikely(__pyx_t_2)) {
-
-    /* "msgpack/_packer.pyx":355
- *             raise MemoryError
- *         elif ret:  # should not happen
- *             raise TypeError             # <<<<<<<<<<<<<<
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-    __Pyx_Raise(__pyx_builtin_TypeError, 0, 0, 0);
-    __PYX_ERR(0, 355, __pyx_L1_error)
-
-    /* "msgpack/_packer.pyx":354
- *         if ret == -1:
- *             raise MemoryError
- *         elif ret:  # should not happen             # <<<<<<<<<<<<<<
- *             raise TypeError
- *         if self.autoreset:
- */
-  }
-
-  /* "msgpack/_packer.pyx":356
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  if (__pyx_v_self->autoreset) {
-
-    /* "msgpack/_packer.pyx":357
- *             raise TypeError
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- *             self.pk.length = 0
- *             return buf
- */
-    __pyx_t_3 = PyBytes_FromStringAndSize(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 357, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_v_buf = ((PyObject*)__pyx_t_3);
-    __pyx_t_3 = 0;
-
-    /* "msgpack/_packer.pyx":358
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0             # <<<<<<<<<<<<<<
- *             return buf
- * 
- */
-    __pyx_v_self->pk.length = 0;
-
-    /* "msgpack/_packer.pyx":359
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- *             return buf             # <<<<<<<<<<<<<<
- * 
- *     def reset(self):
- */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(__pyx_v_buf);
-    __pyx_r = __pyx_v_buf;
-    goto __pyx_L0;
-
-    /* "msgpack/_packer.pyx":356
- *         elif ret:  # should not happen
- *             raise TypeError
- *         if self.autoreset:             # <<<<<<<<<<<<<<
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- *             self.pk.length = 0
- */
-  }
-
-  /* "msgpack/_packer.pyx":338
- *             return buf
- * 
- *     def pack_map_pairs(self, object pairs):             # <<<<<<<<<<<<<<
- *         """
- *         Pack *pairs* as msgpack map type.
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_5);
-  __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_XDECREF(__pyx_t_7);
-  __Pyx_XDECREF(__pyx_t_8);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.pack_map_pairs", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_k);
-  __Pyx_XDECREF(__pyx_v_v);
-  __Pyx_XDECREF(__pyx_v_buf);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":361
- *             return buf
- * 
- *     def reset(self):             # <<<<<<<<<<<<<<
- *         """Reset internal buffer.
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_17reset(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_16reset, "Packer.reset(self)\nReset internal buffer.\n\n        This method is useful only when autoreset=False.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_17reset = {"reset", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_17reset, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_16reset};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_17reset(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("reset (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 361, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("reset", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "reset", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.reset", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_16reset(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_16reset(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("reset", 0);
-
-  /* "msgpack/_packer.pyx":366
- *         This method is useful only when autoreset=False.
- *         """
- *         self.pk.length = 0             # <<<<<<<<<<<<<<
- * 
- *     def bytes(self):
- */
-  __pyx_v_self->pk.length = 0;
-
-  /* "msgpack/_packer.pyx":361
- *             return buf
- * 
- *     def reset(self):             # <<<<<<<<<<<<<<
- *         """Reset internal buffer.
- * 
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":368
- *         self.pk.length = 0
- * 
- *     def bytes(self):             # <<<<<<<<<<<<<<
- *         """Return internal buffer contents as bytes object"""
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_19bytes(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_18bytes, "Packer.bytes(self)\nReturn internal buffer contents as bytes object");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_19bytes = {"bytes", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_19bytes, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_18bytes};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_19bytes(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("bytes (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 368, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("bytes", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "bytes", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.bytes", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_18bytes(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_18bytes(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("bytes", 0);
-
-  /* "msgpack/_packer.pyx":370
- *     def bytes(self):
- *         """Return internal buffer contents as bytes object"""
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- * 
- *     def getbuffer(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyBytes_FromStringAndSize(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 370, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_packer.pyx":368
- *         self.pk.length = 0
- * 
- *     def bytes(self):             # <<<<<<<<<<<<<<
- *         """Return internal buffer contents as bytes object"""
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.bytes", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_packer.pyx":372
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- * 
- *     def getbuffer(self):             # <<<<<<<<<<<<<<
- *         """Return view of internal buffer."""
- *         return buff_to_buff(self.pk.buf, self.pk.length)
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_21getbuffer(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_20getbuffer, "Packer.getbuffer(self)\nReturn view of internal buffer.");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_21getbuffer = {"getbuffer", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_21getbuffer, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_20getbuffer};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_21getbuffer(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("getbuffer (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(0, 372, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("getbuffer", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "getbuffer", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.getbuffer", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_20getbuffer(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_20getbuffer(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("getbuffer", 0);
-
-  /* "msgpack/_packer.pyx":374
- *     def getbuffer(self):
- *         """Return view of internal buffer."""
- *         return buff_to_buff(self.pk.buf, self.pk.length)             # <<<<<<<<<<<<<<
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = buff_to_buff(__pyx_v_self->pk.buf, __pyx_v_self->pk.length); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 374, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_packer.pyx":372
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- * 
- *     def getbuffer(self):             # <<<<<<<<<<<<<<
- *         """Return view of internal buffer."""
- *         return buff_to_buff(self.pk.buf, self.pk.length)
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.getbuffer", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__, "Packer.__reduce_cython__(self)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(4, 1, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("__reduce_cython__", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__reduce_cython__", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__reduce_cython__", 0);
-
-  /* "(tree fragment)":2
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"             # <<<<<<<<<<<<<<
- * def __setstate_cython__(self, __pyx_state):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __Pyx_Raise(__pyx_builtin_TypeError, __pyx_kp_s_no_default___reduce___due_to_non, 0, 0);
-  __PYX_ERR(4, 2, __pyx_L1_error)
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__, "Packer.__setstate_cython__(self, __pyx_state)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  CYTHON_UNUSED PyObject *__pyx_v___pyx_state = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(4, 3, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_pyx_state,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_pyx_state)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(4, 3, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__setstate_cython__") < 0)) __PYX_ERR(4, 3, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v___pyx_state = values[0];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, __pyx_nargs); __PYX_ERR(4, 3, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__(((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)__pyx_v_self), __pyx_v___pyx_state);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Packer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__setstate_cython__", 0);
-
-  /* "(tree fragment)":4
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"             # <<<<<<<<<<<<<<
- */
-  __Pyx_Raise(__pyx_builtin_TypeError, __pyx_kp_s_no_default___reduce___due_to_non, 0, 0);
-  __PYX_ERR(4, 4, __pyx_L1_error)
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Packer.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":60
- *     void unpack_clear(unpack_context* ctx)
- * 
- * cdef inline init_ctx(unpack_context *ctx,             # <<<<<<<<<<<<<<
- *                      object object_hook, object object_pairs_hook,
- *                      object list_hook, object ext_hook,
- */
-
-static CYTHON_INLINE PyObject *__pyx_f_7msgpack_9_cmsgpack_init_ctx(unpack_context *__pyx_v_ctx, PyObject *__pyx_v_object_hook, PyObject *__pyx_v_object_pairs_hook, PyObject *__pyx_v_list_hook, PyObject *__pyx_v_ext_hook, int __pyx_v_use_list, int __pyx_v_raw, int __pyx_v_timestamp, int __pyx_v_strict_map_key, char const *__pyx_v_unicode_errors, Py_ssize_t __pyx_v_max_str_len, Py_ssize_t __pyx_v_max_bin_len, Py_ssize_t __pyx_v_max_array_len, Py_ssize_t __pyx_v_max_map_len, Py_ssize_t __pyx_v_max_ext_len) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("init_ctx", 0);
-
-  /* "msgpack/_unpacker.pyx":69
- *                      Py_ssize_t max_array_len, Py_ssize_t max_map_len,
- *                      Py_ssize_t max_ext_len):
- *     unpack_init(ctx)             # <<<<<<<<<<<<<<
- *     ctx.user.use_list = use_list
- *     ctx.user.raw = raw
- */
-  unpack_init(__pyx_v_ctx);
-
-  /* "msgpack/_unpacker.pyx":70
- *                      Py_ssize_t max_ext_len):
- *     unpack_init(ctx)
- *     ctx.user.use_list = use_list             # <<<<<<<<<<<<<<
- *     ctx.user.raw = raw
- *     ctx.user.strict_map_key = strict_map_key
- */
-  __pyx_v_ctx->user.use_list = __pyx_v_use_list;
-
-  /* "msgpack/_unpacker.pyx":71
- *     unpack_init(ctx)
- *     ctx.user.use_list = use_list
- *     ctx.user.raw = raw             # <<<<<<<<<<<<<<
- *     ctx.user.strict_map_key = strict_map_key
- *     ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL
- */
-  __pyx_v_ctx->user.raw = __pyx_v_raw;
-
-  /* "msgpack/_unpacker.pyx":72
- *     ctx.user.use_list = use_list
- *     ctx.user.raw = raw
- *     ctx.user.strict_map_key = strict_map_key             # <<<<<<<<<<<<<<
- *     ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL
- *     ctx.user.max_str_len = max_str_len
- */
-  __pyx_v_ctx->user.strict_map_key = __pyx_v_strict_map_key;
-
-  /* "msgpack/_unpacker.pyx":73
- *     ctx.user.raw = raw
- *     ctx.user.strict_map_key = strict_map_key
- *     ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL             # <<<<<<<<<<<<<<
- *     ctx.user.max_str_len = max_str_len
- *     ctx.user.max_bin_len = max_bin_len
- */
-  __pyx_v_ctx->user.object_hook = ((PyObject *)NULL);
-  __pyx_v_ctx->user.list_hook = ((PyObject *)NULL);
-
-  /* "msgpack/_unpacker.pyx":74
- *     ctx.user.strict_map_key = strict_map_key
- *     ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL
- *     ctx.user.max_str_len = max_str_len             # <<<<<<<<<<<<<<
- *     ctx.user.max_bin_len = max_bin_len
- *     ctx.user.max_array_len = max_array_len
- */
-  __pyx_v_ctx->user.max_str_len = __pyx_v_max_str_len;
-
-  /* "msgpack/_unpacker.pyx":75
- *     ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL
- *     ctx.user.max_str_len = max_str_len
- *     ctx.user.max_bin_len = max_bin_len             # <<<<<<<<<<<<<<
- *     ctx.user.max_array_len = max_array_len
- *     ctx.user.max_map_len = max_map_len
- */
-  __pyx_v_ctx->user.max_bin_len = __pyx_v_max_bin_len;
-
-  /* "msgpack/_unpacker.pyx":76
- *     ctx.user.max_str_len = max_str_len
- *     ctx.user.max_bin_len = max_bin_len
- *     ctx.user.max_array_len = max_array_len             # <<<<<<<<<<<<<<
- *     ctx.user.max_map_len = max_map_len
- *     ctx.user.max_ext_len = max_ext_len
- */
-  __pyx_v_ctx->user.max_array_len = __pyx_v_max_array_len;
-
-  /* "msgpack/_unpacker.pyx":77
- *     ctx.user.max_bin_len = max_bin_len
- *     ctx.user.max_array_len = max_array_len
- *     ctx.user.max_map_len = max_map_len             # <<<<<<<<<<<<<<
- *     ctx.user.max_ext_len = max_ext_len
- * 
- */
-  __pyx_v_ctx->user.max_map_len = __pyx_v_max_map_len;
-
-  /* "msgpack/_unpacker.pyx":78
- *     ctx.user.max_array_len = max_array_len
- *     ctx.user.max_map_len = max_map_len
- *     ctx.user.max_ext_len = max_ext_len             # <<<<<<<<<<<<<<
- * 
- *     if object_hook is not None and object_pairs_hook is not None:
- */
-  __pyx_v_ctx->user.max_ext_len = __pyx_v_max_ext_len;
-
-  /* "msgpack/_unpacker.pyx":80
- *     ctx.user.max_ext_len = max_ext_len
- * 
- *     if object_hook is not None and object_pairs_hook is not None:             # <<<<<<<<<<<<<<
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")
- * 
- */
-  __pyx_t_2 = (__pyx_v_object_hook != Py_None);
-  if (__pyx_t_2) {
-  } else {
-    __pyx_t_1 = __pyx_t_2;
-    goto __pyx_L4_bool_binop_done;
-  }
-  __pyx_t_2 = (__pyx_v_object_pairs_hook != Py_None);
-  __pyx_t_1 = __pyx_t_2;
-  __pyx_L4_bool_binop_done:;
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":81
- * 
- *     if object_hook is not None and object_pairs_hook is not None:
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")             # <<<<<<<<<<<<<<
- * 
- *     if object_hook is not None:
- */
-    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__15, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 81, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(1, 81, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":80
- *     ctx.user.max_ext_len = max_ext_len
- * 
- *     if object_hook is not None and object_pairs_hook is not None:             # <<<<<<<<<<<<<<
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":83
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")
- * 
- *     if object_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(object_hook):
- *             raise TypeError("object_hook must be a callable.")
- */
-  __pyx_t_1 = (__pyx_v_object_hook != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":84
- * 
- *     if object_hook is not None:
- *         if not PyCallable_Check(object_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("object_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_hook
- */
-    __pyx_t_1 = (!PyCallable_Check(__pyx_v_object_hook));
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":85
- *     if object_hook is not None:
- *         if not PyCallable_Check(object_hook):
- *             raise TypeError("object_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.object_hook = <PyObject*>object_hook
- * 
- */
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 85, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(1, 85, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":84
- * 
- *     if object_hook is not None:
- *         if not PyCallable_Check(object_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("object_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_hook
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":86
- *         if not PyCallable_Check(object_hook):
- *             raise TypeError("object_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_hook             # <<<<<<<<<<<<<<
- * 
- *     if object_pairs_hook is None:
- */
-    __pyx_v_ctx->user.object_hook = ((PyObject *)__pyx_v_object_hook);
-
-    /* "msgpack/_unpacker.pyx":83
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")
- * 
- *     if object_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(object_hook):
- *             raise TypeError("object_hook must be a callable.")
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":88
- *         ctx.user.object_hook = <PyObject*>object_hook
- * 
- *     if object_pairs_hook is None:             # <<<<<<<<<<<<<<
- *         ctx.user.has_pairs_hook = False
- *     else:
- */
-  __pyx_t_1 = (__pyx_v_object_pairs_hook == Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":89
- * 
- *     if object_pairs_hook is None:
- *         ctx.user.has_pairs_hook = False             # <<<<<<<<<<<<<<
- *     else:
- *         if not PyCallable_Check(object_pairs_hook):
- */
-    __pyx_v_ctx->user.has_pairs_hook = 0;
-
-    /* "msgpack/_unpacker.pyx":88
- *         ctx.user.object_hook = <PyObject*>object_hook
- * 
- *     if object_pairs_hook is None:             # <<<<<<<<<<<<<<
- *         ctx.user.has_pairs_hook = False
- *     else:
- */
-    goto __pyx_L8;
-  }
-
-  /* "msgpack/_unpacker.pyx":91
- *         ctx.user.has_pairs_hook = False
- *     else:
- *         if not PyCallable_Check(object_pairs_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("object_pairs_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook
- */
-  /*else*/ {
-    __pyx_t_1 = (!PyCallable_Check(__pyx_v_object_pairs_hook));
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":92
- *     else:
- *         if not PyCallable_Check(object_pairs_hook):
- *             raise TypeError("object_pairs_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook
- *         ctx.user.has_pairs_hook = True
- */
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 92, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(1, 92, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":91
- *         ctx.user.has_pairs_hook = False
- *     else:
- *         if not PyCallable_Check(object_pairs_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("object_pairs_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":93
- *         if not PyCallable_Check(object_pairs_hook):
- *             raise TypeError("object_pairs_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook             # <<<<<<<<<<<<<<
- *         ctx.user.has_pairs_hook = True
- * 
- */
-    __pyx_v_ctx->user.object_hook = ((PyObject *)__pyx_v_object_pairs_hook);
-
-    /* "msgpack/_unpacker.pyx":94
- *             raise TypeError("object_pairs_hook must be a callable.")
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook
- *         ctx.user.has_pairs_hook = True             # <<<<<<<<<<<<<<
- * 
- *     if list_hook is not None:
- */
-    __pyx_v_ctx->user.has_pairs_hook = 1;
-  }
-  __pyx_L8:;
-
-  /* "msgpack/_unpacker.pyx":96
- *         ctx.user.has_pairs_hook = True
- * 
- *     if list_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(list_hook):
- *             raise TypeError("list_hook must be a callable.")
- */
-  __pyx_t_1 = (__pyx_v_list_hook != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":97
- * 
- *     if list_hook is not None:
- *         if not PyCallable_Check(list_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("list_hook must be a callable.")
- *         ctx.user.list_hook = <PyObject*>list_hook
- */
-    __pyx_t_1 = (!PyCallable_Check(__pyx_v_list_hook));
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":98
- *     if list_hook is not None:
- *         if not PyCallable_Check(list_hook):
- *             raise TypeError("list_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.list_hook = <PyObject*>list_hook
- * 
- */
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 98, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(1, 98, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":97
- * 
- *     if list_hook is not None:
- *         if not PyCallable_Check(list_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("list_hook must be a callable.")
- *         ctx.user.list_hook = <PyObject*>list_hook
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":99
- *         if not PyCallable_Check(list_hook):
- *             raise TypeError("list_hook must be a callable.")
- *         ctx.user.list_hook = <PyObject*>list_hook             # <<<<<<<<<<<<<<
- * 
- *     if ext_hook is not None:
- */
-    __pyx_v_ctx->user.list_hook = ((PyObject *)__pyx_v_list_hook);
-
-    /* "msgpack/_unpacker.pyx":96
- *         ctx.user.has_pairs_hook = True
- * 
- *     if list_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(list_hook):
- *             raise TypeError("list_hook must be a callable.")
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":101
- *         ctx.user.list_hook = <PyObject*>list_hook
- * 
- *     if ext_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(ext_hook):
- *             raise TypeError("ext_hook must be a callable.")
- */
-  __pyx_t_1 = (__pyx_v_ext_hook != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":102
- * 
- *     if ext_hook is not None:
- *         if not PyCallable_Check(ext_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("ext_hook must be a callable.")
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- */
-    __pyx_t_1 = (!PyCallable_Check(__pyx_v_ext_hook));
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":103
- *     if ext_hook is not None:
- *         if not PyCallable_Check(ext_hook):
- *             raise TypeError("ext_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- * 
- */
-      __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 103, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __PYX_ERR(1, 103, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":102
- * 
- *     if ext_hook is not None:
- *         if not PyCallable_Check(ext_hook):             # <<<<<<<<<<<<<<
- *             raise TypeError("ext_hook must be a callable.")
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":104
- *         if not PyCallable_Check(ext_hook):
- *             raise TypeError("ext_hook must be a callable.")
- *         ctx.user.ext_hook = <PyObject*>ext_hook             # <<<<<<<<<<<<<<
- * 
- *     if timestamp < 0 or 3 < timestamp:
- */
-    __pyx_v_ctx->user.ext_hook = ((PyObject *)__pyx_v_ext_hook);
-
-    /* "msgpack/_unpacker.pyx":101
- *         ctx.user.list_hook = <PyObject*>list_hook
- * 
- *     if ext_hook is not None:             # <<<<<<<<<<<<<<
- *         if not PyCallable_Check(ext_hook):
- *             raise TypeError("ext_hook must be a callable.")
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":106
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- * 
- *     if timestamp < 0 or 3 < timestamp:             # <<<<<<<<<<<<<<
- *         raise ValueError("timestamp must be 0..3")
- * 
- */
-  __pyx_t_2 = (__pyx_v_timestamp < 0);
-  if (!__pyx_t_2) {
-  } else {
-    __pyx_t_1 = __pyx_t_2;
-    goto __pyx_L15_bool_binop_done;
-  }
-  __pyx_t_2 = (3 < __pyx_v_timestamp);
-  __pyx_t_1 = __pyx_t_2;
-  __pyx_L15_bool_binop_done:;
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":107
- * 
- *     if timestamp < 0 or 3 < timestamp:
- *         raise ValueError("timestamp must be 0..3")             # <<<<<<<<<<<<<<
- * 
- *     # Add Timestamp type to the user object so it may be used in unpack.h
- */
-    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__20, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 107, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(1, 107, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":106
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- * 
- *     if timestamp < 0 or 3 < timestamp:             # <<<<<<<<<<<<<<
- *         raise ValueError("timestamp must be 0..3")
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":110
- * 
- *     # Add Timestamp type to the user object so it may be used in unpack.h
- *     ctx.user.timestamp = timestamp             # <<<<<<<<<<<<<<
- *     ctx.user.timestamp_t = <PyObject*>Timestamp
- *     ctx.user.giga = <PyObject*>giga
- */
-  __pyx_v_ctx->user.timestamp = __pyx_v_timestamp;
-
-  /* "msgpack/_unpacker.pyx":111
- *     # Add Timestamp type to the user object so it may be used in unpack.h
- *     ctx.user.timestamp = timestamp
- *     ctx.user.timestamp_t = <PyObject*>Timestamp             # <<<<<<<<<<<<<<
- *     ctx.user.giga = <PyObject*>giga
- *     ctx.user.utc = <PyObject*>utc
- */
-  __pyx_v_ctx->user.timestamp_t = ((PyObject *)__pyx_v_7msgpack_9_cmsgpack_Timestamp);
-
-  /* "msgpack/_unpacker.pyx":112
- *     ctx.user.timestamp = timestamp
- *     ctx.user.timestamp_t = <PyObject*>Timestamp
- *     ctx.user.giga = <PyObject*>giga             # <<<<<<<<<<<<<<
- *     ctx.user.utc = <PyObject*>utc
- *     ctx.user.unicode_errors = unicode_errors
- */
-  __pyx_v_ctx->user.giga = ((PyObject *)__pyx_v_7msgpack_9_cmsgpack_giga);
-
-  /* "msgpack/_unpacker.pyx":113
- *     ctx.user.timestamp_t = <PyObject*>Timestamp
- *     ctx.user.giga = <PyObject*>giga
- *     ctx.user.utc = <PyObject*>utc             # <<<<<<<<<<<<<<
- *     ctx.user.unicode_errors = unicode_errors
- * 
- */
-  __pyx_v_ctx->user.utc = ((PyObject *)__pyx_v_7msgpack_9_cmsgpack_utc);
-
-  /* "msgpack/_unpacker.pyx":114
- *     ctx.user.giga = <PyObject*>giga
- *     ctx.user.utc = <PyObject*>utc
- *     ctx.user.unicode_errors = unicode_errors             # <<<<<<<<<<<<<<
- * 
- * def default_read_extended_type(typecode, data):
- */
-  __pyx_v_ctx->user.unicode_errors = __pyx_v_unicode_errors;
-
-  /* "msgpack/_unpacker.pyx":60
- *     void unpack_clear(unpack_context* ctx)
- * 
- * cdef inline init_ctx(unpack_context *ctx,             # <<<<<<<<<<<<<<
- *                      object object_hook, object object_pairs_hook,
- *                      object list_hook, object ext_hook,
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_AddTraceback("msgpack._cmsgpack.init_ctx", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":116
- *     ctx.user.unicode_errors = unicode_errors
- * 
- * def default_read_extended_type(typecode, data):             # <<<<<<<<<<<<<<
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_1default_read_extended_type(PyObject *__pyx_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_default_read_extended_type, "default_read_extended_type(typecode, data)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_1default_read_extended_type = {"default_read_extended_type", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_1default_read_extended_type, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_default_read_extended_type};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_1default_read_extended_type(PyObject *__pyx_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_typecode = 0;
-  CYTHON_UNUSED PyObject *__pyx_v_data = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[2] = {0,0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("default_read_extended_type (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 116, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_typecode,&__pyx_n_s_data,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  2: values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
-        CYTHON_FALLTHROUGH;
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_typecode)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 116, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-        CYTHON_FALLTHROUGH;
-        case  1:
-        if (likely((values[1] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_data)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 116, __pyx_L3_error)
-        else {
-          __Pyx_RaiseArgtupleInvalid("default_read_extended_type", 1, 2, 2, 1); __PYX_ERR(1, 116, __pyx_L3_error)
-        }
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "default_read_extended_type") < 0)) __PYX_ERR(1, 116, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 2)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-      values[1] = __Pyx_Arg_FASTCALL(__pyx_args, 1);
-    }
-    __pyx_v_typecode = values[0];
-    __pyx_v_data = values[1];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("default_read_extended_type", 1, 2, 2, __pyx_nargs); __PYX_ERR(1, 116, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.default_read_extended_type", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_default_read_extended_type(__pyx_self, __pyx_v_typecode, __pyx_v_data);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_default_read_extended_type(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_typecode, CYTHON_UNUSED PyObject *__pyx_v_data) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("default_read_extended_type", 0);
-
-  /* "msgpack/_unpacker.pyx":117
- * 
- * def default_read_extended_type(typecode, data):
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)             # <<<<<<<<<<<<<<
- * 
- * cdef inline int get_data_from_buffer(object obj,
- */
-  __pyx_t_1 = __Pyx_PyUnicode_FormatSafe(__pyx_kp_u_Cannot_decode_extended_type_with, __pyx_v_typecode); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 117, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_NotImplementedError, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 117, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __PYX_ERR(1, 117, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":116
- *     ctx.user.unicode_errors = unicode_errors
- * 
- * def default_read_extended_type(typecode, data):             # <<<<<<<<<<<<<<
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.default_read_extended_type", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":119
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- * cdef inline int get_data_from_buffer(object obj,             # <<<<<<<<<<<<<<
- *                                      Py_buffer *view,
- *                                      char **buf,
- */
-
-static CYTHON_INLINE int __pyx_f_7msgpack_9_cmsgpack_get_data_from_buffer(PyObject *__pyx_v_obj, Py_buffer *__pyx_v_view, char **__pyx_v_buf, Py_ssize_t *__pyx_v_buffer_len) {
-  PyObject *__pyx_v_contiguous = 0;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
-  Py_ssize_t __pyx_t_4;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("get_data_from_buffer", 0);
-
-  /* "msgpack/_unpacker.pyx":125
- *     cdef object contiguous
- *     cdef Py_buffer tmp
- *     if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:             # <<<<<<<<<<<<<<
- *         raise
- *     if view.itemsize != 1:
- */
-  __pyx_t_1 = PyObject_GetBuffer(__pyx_v_obj, __pyx_v_view, PyBUF_FULL_RO); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 125, __pyx_L1_error)
-  __pyx_t_2 = (__pyx_t_1 == -1L);
-  if (unlikely(__pyx_t_2)) {
-
-    /* "msgpack/_unpacker.pyx":126
- *     cdef Py_buffer tmp
- *     if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:
- *         raise             # <<<<<<<<<<<<<<
- *     if view.itemsize != 1:
- *         PyBuffer_Release(view)
- */
-    __Pyx_ReraiseException(); __PYX_ERR(1, 126, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":125
- *     cdef object contiguous
- *     cdef Py_buffer tmp
- *     if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:             # <<<<<<<<<<<<<<
- *         raise
- *     if view.itemsize != 1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":127
- *     if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:
- *         raise
- *     if view.itemsize != 1:             # <<<<<<<<<<<<<<
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")
- */
-  __pyx_t_2 = (__pyx_v_view->itemsize != 1);
-  if (unlikely(__pyx_t_2)) {
-
-    /* "msgpack/_unpacker.pyx":128
- *         raise
- *     if view.itemsize != 1:
- *         PyBuffer_Release(view)             # <<<<<<<<<<<<<<
- *         raise BufferError("cannot unpack from multi-byte object")
- *     if PyBuffer_IsContiguous(view, b'A') == 0:
- */
-    PyBuffer_Release(__pyx_v_view);
-
-    /* "msgpack/_unpacker.pyx":129
- *     if view.itemsize != 1:
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")             # <<<<<<<<<<<<<<
- *     if PyBuffer_IsContiguous(view, b'A') == 0:
- *         PyBuffer_Release(view)
- */
-    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_BufferError, __pyx_tuple__21, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 129, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __PYX_ERR(1, 129, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":127
- *     if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:
- *         raise
- *     if view.itemsize != 1:             # <<<<<<<<<<<<<<
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":130
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")
- *     if PyBuffer_IsContiguous(view, b'A') == 0:             # <<<<<<<<<<<<<<
- *         PyBuffer_Release(view)
- *         # create a contiguous copy and get buffer
- */
-  __pyx_t_2 = (PyBuffer_IsContiguous(__pyx_v_view, 'A') == 0);
-  if (__pyx_t_2) {
-
-    /* "msgpack/_unpacker.pyx":131
- *         raise BufferError("cannot unpack from multi-byte object")
- *     if PyBuffer_IsContiguous(view, b'A') == 0:
- *         PyBuffer_Release(view)             # <<<<<<<<<<<<<<
- *         # create a contiguous copy and get buffer
- *         contiguous = PyMemoryView_GetContiguous(obj, PyBUF_READ, b'C')
- */
-    PyBuffer_Release(__pyx_v_view);
-
-    /* "msgpack/_unpacker.pyx":133
- *         PyBuffer_Release(view)
- *         # create a contiguous copy and get buffer
- *         contiguous = PyMemoryView_GetContiguous(obj, PyBUF_READ, b'C')             # <<<<<<<<<<<<<<
- *         PyObject_GetBuffer(contiguous, view, PyBUF_SIMPLE)
- *         # view must hold the only reference to contiguous,
- */
-    __pyx_t_3 = PyMemoryView_GetContiguous(__pyx_v_obj, PyBUF_READ, 'C'); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 133, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_v_contiguous = __pyx_t_3;
-    __pyx_t_3 = 0;
-
-    /* "msgpack/_unpacker.pyx":134
- *         # create a contiguous copy and get buffer
- *         contiguous = PyMemoryView_GetContiguous(obj, PyBUF_READ, b'C')
- *         PyObject_GetBuffer(contiguous, view, PyBUF_SIMPLE)             # <<<<<<<<<<<<<<
- *         # view must hold the only reference to contiguous,
- *         # so memory is freed when view is released
- */
-    __pyx_t_1 = PyObject_GetBuffer(__pyx_v_contiguous, __pyx_v_view, PyBUF_SIMPLE); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 134, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":137
- *         # view must hold the only reference to contiguous,
- *         # so memory is freed when view is released
- *         Py_DECREF(contiguous)             # <<<<<<<<<<<<<<
- *     buffer_len[0] = view.len
- *     buf[0] = <char*> view.buf
- */
-    Py_DECREF(__pyx_v_contiguous);
-
-    /* "msgpack/_unpacker.pyx":130
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")
- *     if PyBuffer_IsContiguous(view, b'A') == 0:             # <<<<<<<<<<<<<<
- *         PyBuffer_Release(view)
- *         # create a contiguous copy and get buffer
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":138
- *         # so memory is freed when view is released
- *         Py_DECREF(contiguous)
- *     buffer_len[0] = view.len             # <<<<<<<<<<<<<<
- *     buf[0] = <char*> view.buf
- *     return 1
- */
-  __pyx_t_4 = __pyx_v_view->len;
-  (__pyx_v_buffer_len[0]) = __pyx_t_4;
-
-  /* "msgpack/_unpacker.pyx":139
- *         Py_DECREF(contiguous)
- *     buffer_len[0] = view.len
- *     buf[0] = <char*> view.buf             # <<<<<<<<<<<<<<
- *     return 1
- * 
- */
-  (__pyx_v_buf[0]) = ((char *)__pyx_v_view->buf);
-
-  /* "msgpack/_unpacker.pyx":140
- *     buffer_len[0] = view.len
- *     buf[0] = <char*> view.buf
- *     return 1             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_r = 1;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":119
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- * cdef inline int get_data_from_buffer(object obj,             # <<<<<<<<<<<<<<
- *                                      Py_buffer *view,
- *                                      char **buf,
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_AddTraceback("msgpack._cmsgpack.get_data_from_buffer", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_contiguous);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_4__defaults__(CYTHON_UNUSED PyObject *__pyx_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__defaults__", 0);
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyDict_NewPresized(14); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_object_hook, Py_None) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_list_hook, Py_None) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":144
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,             # <<<<<<<<<<<<<<
- *             unicode_errors=None,
- *             object_pairs_hook=None, ext_hook=ExtType,
- */
-  __pyx_t_2 = __Pyx_PyBool_FromLong(((int)1)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 144, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_use_list, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyBool_FromLong(((int)0)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 144, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_raw, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyInt_From_int(((int)0)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 144, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_timestamp, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyBool_FromLong(((int)1)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 144, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_strict_map_key, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":145
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,             # <<<<<<<<<<<<<<
- *             object_pairs_hook=None, ext_hook=ExtType,
- *             Py_ssize_t max_str_len=-1,
- */
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_unicode_errors, Py_None) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":146
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- *             object_pairs_hook=None, ext_hook=ExtType,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_str_len=-1,
- *             Py_ssize_t max_bin_len=-1,
- */
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_object_pairs_hook, Py_None) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_ext_hook, __Pyx_CyFunction_Defaults(__pyx_defaults, __pyx_self)->__pyx_arg_ext_hook) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":147
- *             unicode_errors=None,
- *             object_pairs_hook=None, ext_hook=ExtType,
- *             Py_ssize_t max_str_len=-1,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_bin_len=-1,
- *             Py_ssize_t max_array_len=-1,
- */
-  __pyx_t_2 = PyInt_FromSsize_t(((Py_ssize_t)-1L)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 147, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_max_str_len, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":148
- *             object_pairs_hook=None, ext_hook=ExtType,
- *             Py_ssize_t max_str_len=-1,
- *             Py_ssize_t max_bin_len=-1,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_array_len=-1,
- *             Py_ssize_t max_map_len=-1,
- */
-  __pyx_t_2 = PyInt_FromSsize_t(((Py_ssize_t)-1L)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 148, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_max_bin_len, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":149
- *             Py_ssize_t max_str_len=-1,
- *             Py_ssize_t max_bin_len=-1,
- *             Py_ssize_t max_array_len=-1,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_map_len=-1,
- *             Py_ssize_t max_ext_len=-1):
- */
-  __pyx_t_2 = PyInt_FromSsize_t(((Py_ssize_t)-1L)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 149, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_max_array_len, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":150
- *             Py_ssize_t max_bin_len=-1,
- *             Py_ssize_t max_array_len=-1,
- *             Py_ssize_t max_map_len=-1,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_ext_len=-1):
- *     """
- */
-  __pyx_t_2 = PyInt_FromSsize_t(((Py_ssize_t)-1L)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 150, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_max_map_len, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":151
- *             Py_ssize_t max_array_len=-1,
- *             Py_ssize_t max_map_len=-1,
- *             Py_ssize_t max_ext_len=-1):             # <<<<<<<<<<<<<<
- *     """
- *     Unpack packed_bytes to object. Returns an unpacked object.
- */
-  __pyx_t_2 = PyInt_FromSsize_t(((Py_ssize_t)-1L)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 151, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_max_ext_len, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_INCREF(Py_None);
-  __Pyx_GIVEREF(Py_None);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, Py_None)) __PYX_ERR(1, 143, __pyx_L1_error);
-  __Pyx_GIVEREF(__pyx_t_1);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1)) __PYX_ERR(1, 143, __pyx_L1_error);
-  __pyx_t_1 = 0;
-  __pyx_r = __pyx_t_2;
-  __pyx_t_2 = 0;
-  goto __pyx_L0;
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.__defaults__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_3unpackb(PyObject *__pyx_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_2unpackb, "unpackb(packed, *, object_hook=None, list_hook=None, bool use_list=True, bool raw=False, int timestamp=0, bool strict_map_key=True, unicode_errors=None, object_pairs_hook=None, ext_hook=ExtType, Py_ssize_t max_str_len=-1, Py_ssize_t max_bin_len=-1, Py_ssize_t max_array_len=-1, Py_ssize_t max_map_len=-1, Py_ssize_t max_ext_len=-1)\n\n    Unpack packed_bytes to object. Returns an unpacked object.\n\n    Raises ``ExtraData`` when *packed* contains extra bytes.\n    Raises ``ValueError`` when *packed* is incomplete.\n    Raises ``FormatError`` when *packed* is not valid msgpack.\n    Raises ``StackError`` when *packed* contains too nested.\n    Other exceptions can be raised during unpacking.\n\n    See :class:`Unpacker` for options.\n\n    *max_xxx_len* options are configured automatically from ``len(packed)``.\n    ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_3unpackb = {"unpackb", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_3unpackb, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_2unpackb};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_3unpackb(PyObject *__pyx_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_packed = 0;
-  PyObject *__pyx_v_object_hook = 0;
-  PyObject *__pyx_v_list_hook = 0;
-  int __pyx_v_use_list;
-  int __pyx_v_raw;
-  int __pyx_v_timestamp;
-  int __pyx_v_strict_map_key;
-  PyObject *__pyx_v_unicode_errors = 0;
-  PyObject *__pyx_v_object_pairs_hook = 0;
-  PyObject *__pyx_v_ext_hook = 0;
-  Py_ssize_t __pyx_v_max_str_len;
-  Py_ssize_t __pyx_v_max_bin_len;
-  Py_ssize_t __pyx_v_max_array_len;
-  Py_ssize_t __pyx_v_max_map_len;
-  Py_ssize_t __pyx_v_max_ext_len;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("unpackb (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 143, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_packed,&__pyx_n_s_object_hook,&__pyx_n_s_list_hook,&__pyx_n_s_use_list,&__pyx_n_s_raw,&__pyx_n_s_timestamp,&__pyx_n_s_strict_map_key,&__pyx_n_s_unicode_errors,&__pyx_n_s_object_pairs_hook,&__pyx_n_s_ext_hook,&__pyx_n_s_max_str_len,&__pyx_n_s_max_bin_len,&__pyx_n_s_max_array_len,&__pyx_n_s_max_map_len,&__pyx_n_s_max_ext_len,0};
-    __pyx_defaults *__pyx_dynamic_args = __Pyx_CyFunction_Defaults(__pyx_defaults, __pyx_self);
-    values[1] = __Pyx_Arg_NewRef_FASTCALL(((PyObject *)Py_None));
-    values[2] = __Pyx_Arg_NewRef_FASTCALL(((PyObject *)Py_None));
-
-    /* "msgpack/_unpacker.pyx":145
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,             # <<<<<<<<<<<<<<
- *             object_pairs_hook=None, ext_hook=ExtType,
- *             Py_ssize_t max_str_len=-1,
- */
-    values[7] = __Pyx_Arg_NewRef_FASTCALL(((PyObject *)Py_None));
-
-    /* "msgpack/_unpacker.pyx":146
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- *             object_pairs_hook=None, ext_hook=ExtType,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_str_len=-1,
- *             Py_ssize_t max_bin_len=-1,
- */
-    values[8] = __Pyx_Arg_NewRef_FASTCALL(((PyObject *)Py_None));
-    values[9] = __Pyx_Arg_NewRef_FASTCALL(__pyx_dynamic_args->__pyx_arg_ext_hook);
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_packed)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 143, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (kw_args > 0 && likely(kw_args <= 14)) {
-        Py_ssize_t index;
-        for (index = 1; index < 15 && kw_args > 0; index++) {
-          PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, *__pyx_pyargnames[index]);
-          if (value) { values[index] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 143, __pyx_L3_error)
-        }
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "unpackb") < 0)) __PYX_ERR(1, 143, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_packed = values[0];
-    __pyx_v_object_hook = values[1];
-    __pyx_v_list_hook = values[2];
-    if (values[3]) {
-      __pyx_v_use_list = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_use_list == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 144, __pyx_L3_error)
-    } else {
-      __pyx_v_use_list = ((int)((int)1));
-    }
-    if (values[4]) {
-      __pyx_v_raw = __Pyx_PyObject_IsTrue(values[4]); if (unlikely((__pyx_v_raw == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 144, __pyx_L3_error)
-    } else {
-      __pyx_v_raw = ((int)((int)0));
-    }
-    if (values[5]) {
-      __pyx_v_timestamp = __Pyx_PyInt_As_int(values[5]); if (unlikely((__pyx_v_timestamp == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 144, __pyx_L3_error)
-    } else {
-      __pyx_v_timestamp = ((int)((int)0));
-    }
-    if (values[6]) {
-      __pyx_v_strict_map_key = __Pyx_PyObject_IsTrue(values[6]); if (unlikely((__pyx_v_strict_map_key == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 144, __pyx_L3_error)
-    } else {
-      __pyx_v_strict_map_key = ((int)((int)1));
-    }
-    __pyx_v_unicode_errors = values[7];
-    __pyx_v_object_pairs_hook = values[8];
-    __pyx_v_ext_hook = values[9];
-    if (values[10]) {
-      __pyx_v_max_str_len = __Pyx_PyIndex_AsSsize_t(values[10]); if (unlikely((__pyx_v_max_str_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 147, __pyx_L3_error)
-    } else {
-      __pyx_v_max_str_len = ((Py_ssize_t)((Py_ssize_t)-1L));
-    }
-    if (values[11]) {
-      __pyx_v_max_bin_len = __Pyx_PyIndex_AsSsize_t(values[11]); if (unlikely((__pyx_v_max_bin_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 148, __pyx_L3_error)
-    } else {
-      __pyx_v_max_bin_len = ((Py_ssize_t)((Py_ssize_t)-1L));
-    }
-    if (values[12]) {
-      __pyx_v_max_array_len = __Pyx_PyIndex_AsSsize_t(values[12]); if (unlikely((__pyx_v_max_array_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 149, __pyx_L3_error)
-    } else {
-      __pyx_v_max_array_len = ((Py_ssize_t)((Py_ssize_t)-1L));
-    }
-    if (values[13]) {
-      __pyx_v_max_map_len = __Pyx_PyIndex_AsSsize_t(values[13]); if (unlikely((__pyx_v_max_map_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 150, __pyx_L3_error)
-    } else {
-      __pyx_v_max_map_len = ((Py_ssize_t)((Py_ssize_t)-1L));
-    }
-    if (values[14]) {
-      __pyx_v_max_ext_len = __Pyx_PyIndex_AsSsize_t(values[14]); if (unlikely((__pyx_v_max_ext_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 151, __pyx_L3_error)
-    } else {
-      __pyx_v_max_ext_len = ((Py_ssize_t)((Py_ssize_t)-1L));
-    }
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("unpackb", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 143, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.unpackb", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_2unpackb(__pyx_self, __pyx_v_packed, __pyx_v_object_hook, __pyx_v_list_hook, __pyx_v_use_list, __pyx_v_raw, __pyx_v_timestamp, __pyx_v_strict_map_key, __pyx_v_unicode_errors, __pyx_v_object_pairs_hook, __pyx_v_ext_hook, __pyx_v_max_str_len, __pyx_v_max_bin_len, __pyx_v_max_array_len, __pyx_v_max_map_len, __pyx_v_max_ext_len);
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_2unpackb(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_packed, PyObject *__pyx_v_object_hook, PyObject *__pyx_v_list_hook, int __pyx_v_use_list, int __pyx_v_raw, int __pyx_v_timestamp, int __pyx_v_strict_map_key, PyObject *__pyx_v_unicode_errors, PyObject *__pyx_v_object_pairs_hook, PyObject *__pyx_v_ext_hook, Py_ssize_t __pyx_v_max_str_len, Py_ssize_t __pyx_v_max_bin_len, Py_ssize_t __pyx_v_max_array_len, Py_ssize_t __pyx_v_max_map_len, Py_ssize_t __pyx_v_max_ext_len) {
-  unpack_context __pyx_v_ctx;
-  Py_ssize_t __pyx_v_off;
-  int __pyx_v_ret;
-  Py_buffer __pyx_v_view;
-  char *__pyx_v_buf;
-  Py_ssize_t __pyx_v_buf_len;
-  char const *__pyx_v_cerr;
-  PyObject *__pyx_v_obj = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  char const *__pyx_t_2;
-  int __pyx_t_3;
-  PyObject *__pyx_t_4 = NULL;
-  int __pyx_t_5;
-  char const *__pyx_t_6;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  PyObject *__pyx_t_9 = NULL;
-  PyObject *__pyx_t_10 = NULL;
-  PyObject *__pyx_t_11 = NULL;
-  PyObject *__pyx_t_12 = NULL;
-  PyObject *__pyx_t_13 = NULL;
-  PyObject *__pyx_t_14 = NULL;
-  PyObject *__pyx_t_15 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("unpackb", 0);
-
-  /* "msgpack/_unpacker.pyx":166
- *     """
- *     cdef unpack_context ctx
- *     cdef Py_ssize_t off = 0             # <<<<<<<<<<<<<<
- *     cdef int ret
- * 
- */
-  __pyx_v_off = 0;
-
-  /* "msgpack/_unpacker.pyx":170
- * 
- *     cdef Py_buffer view
- *     cdef char* buf = NULL             # <<<<<<<<<<<<<<
- *     cdef Py_ssize_t buf_len
- *     cdef const char* cerr = NULL
- */
-  __pyx_v_buf = NULL;
-
-  /* "msgpack/_unpacker.pyx":172
- *     cdef char* buf = NULL
- *     cdef Py_ssize_t buf_len
- *     cdef const char* cerr = NULL             # <<<<<<<<<<<<<<
- * 
- *     if unicode_errors is not None:
- */
-  __pyx_v_cerr = NULL;
-
-  /* "msgpack/_unpacker.pyx":174
- *     cdef const char* cerr = NULL
- * 
- *     if unicode_errors is not None:             # <<<<<<<<<<<<<<
- *         cerr = unicode_errors
- * 
- */
-  __pyx_t_1 = (__pyx_v_unicode_errors != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":175
- * 
- *     if unicode_errors is not None:
- *         cerr = unicode_errors             # <<<<<<<<<<<<<<
- * 
- *     get_data_from_buffer(packed, &view, &buf, &buf_len)
- */
-    __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_unicode_errors); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) __PYX_ERR(1, 175, __pyx_L1_error)
-    __pyx_v_cerr = __pyx_t_2;
-
-    /* "msgpack/_unpacker.pyx":174
- *     cdef const char* cerr = NULL
- * 
- *     if unicode_errors is not None:             # <<<<<<<<<<<<<<
- *         cerr = unicode_errors
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":177
- *         cerr = unicode_errors
- * 
- *     get_data_from_buffer(packed, &view, &buf, &buf_len)             # <<<<<<<<<<<<<<
- * 
- *     if max_str_len == -1:
- */
-  __pyx_t_3 = __pyx_f_7msgpack_9_cmsgpack_get_data_from_buffer(__pyx_v_packed, (&__pyx_v_view), (&__pyx_v_buf), (&__pyx_v_buf_len)); if (unlikely(__pyx_t_3 == ((int)0))) __PYX_ERR(1, 177, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":179
- *     get_data_from_buffer(packed, &view, &buf, &buf_len)
- * 
- *     if max_str_len == -1:             # <<<<<<<<<<<<<<
- *         max_str_len = buf_len
- *     if max_bin_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_str_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":180
- * 
- *     if max_str_len == -1:
- *         max_str_len = buf_len             # <<<<<<<<<<<<<<
- *     if max_bin_len == -1:
- *         max_bin_len = buf_len
- */
-    __pyx_v_max_str_len = __pyx_v_buf_len;
-
-    /* "msgpack/_unpacker.pyx":179
- *     get_data_from_buffer(packed, &view, &buf, &buf_len)
- * 
- *     if max_str_len == -1:             # <<<<<<<<<<<<<<
- *         max_str_len = buf_len
- *     if max_bin_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":181
- *     if max_str_len == -1:
- *         max_str_len = buf_len
- *     if max_bin_len == -1:             # <<<<<<<<<<<<<<
- *         max_bin_len = buf_len
- *     if max_array_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_bin_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":182
- *         max_str_len = buf_len
- *     if max_bin_len == -1:
- *         max_bin_len = buf_len             # <<<<<<<<<<<<<<
- *     if max_array_len == -1:
- *         max_array_len = buf_len
- */
-    __pyx_v_max_bin_len = __pyx_v_buf_len;
-
-    /* "msgpack/_unpacker.pyx":181
- *     if max_str_len == -1:
- *         max_str_len = buf_len
- *     if max_bin_len == -1:             # <<<<<<<<<<<<<<
- *         max_bin_len = buf_len
- *     if max_array_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":183
- *     if max_bin_len == -1:
- *         max_bin_len = buf_len
- *     if max_array_len == -1:             # <<<<<<<<<<<<<<
- *         max_array_len = buf_len
- *     if max_map_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_array_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":184
- *         max_bin_len = buf_len
- *     if max_array_len == -1:
- *         max_array_len = buf_len             # <<<<<<<<<<<<<<
- *     if max_map_len == -1:
- *         max_map_len = buf_len//2
- */
-    __pyx_v_max_array_len = __pyx_v_buf_len;
-
-    /* "msgpack/_unpacker.pyx":183
- *     if max_bin_len == -1:
- *         max_bin_len = buf_len
- *     if max_array_len == -1:             # <<<<<<<<<<<<<<
- *         max_array_len = buf_len
- *     if max_map_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":185
- *     if max_array_len == -1:
- *         max_array_len = buf_len
- *     if max_map_len == -1:             # <<<<<<<<<<<<<<
- *         max_map_len = buf_len//2
- *     if max_ext_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_map_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":186
- *         max_array_len = buf_len
- *     if max_map_len == -1:
- *         max_map_len = buf_len//2             # <<<<<<<<<<<<<<
- *     if max_ext_len == -1:
- *         max_ext_len = buf_len
- */
-    __pyx_v_max_map_len = __Pyx_div_Py_ssize_t(__pyx_v_buf_len, 2);
-
-    /* "msgpack/_unpacker.pyx":185
- *     if max_array_len == -1:
- *         max_array_len = buf_len
- *     if max_map_len == -1:             # <<<<<<<<<<<<<<
- *         max_map_len = buf_len//2
- *     if max_ext_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":187
- *     if max_map_len == -1:
- *         max_map_len = buf_len//2
- *     if max_ext_len == -1:             # <<<<<<<<<<<<<<
- *         max_ext_len = buf_len
- * 
- */
-  __pyx_t_1 = (__pyx_v_max_ext_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":188
- *         max_map_len = buf_len//2
- *     if max_ext_len == -1:
- *         max_ext_len = buf_len             # <<<<<<<<<<<<<<
- * 
- *     try:
- */
-    __pyx_v_max_ext_len = __pyx_v_buf_len;
-
-    /* "msgpack/_unpacker.pyx":187
- *     if max_map_len == -1:
- *         max_map_len = buf_len//2
- *     if max_ext_len == -1:             # <<<<<<<<<<<<<<
- *         max_ext_len = buf_len
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":190
- *         max_ext_len = buf_len
- * 
- *     try:             # <<<<<<<<<<<<<<
- *         init_ctx(&ctx, object_hook, object_pairs_hook, list_hook, ext_hook,
- *                  use_list, raw, timestamp, strict_map_key, cerr,
- */
-  /*try:*/ {
-
-    /* "msgpack/_unpacker.pyx":191
- * 
- *     try:
- *         init_ctx(&ctx, object_hook, object_pairs_hook, list_hook, ext_hook,             # <<<<<<<<<<<<<<
- *                  use_list, raw, timestamp, strict_map_key, cerr,
- *                  max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len)
- */
-    __pyx_t_4 = __pyx_f_7msgpack_9_cmsgpack_init_ctx((&__pyx_v_ctx), __pyx_v_object_hook, __pyx_v_object_pairs_hook, __pyx_v_list_hook, __pyx_v_ext_hook, __pyx_v_use_list, __pyx_v_raw, __pyx_v_timestamp, __pyx_v_strict_map_key, __pyx_v_cerr, __pyx_v_max_str_len, __pyx_v_max_bin_len, __pyx_v_max_array_len, __pyx_v_max_map_len, __pyx_v_max_ext_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 191, __pyx_L10_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-
-    /* "msgpack/_unpacker.pyx":194
- *                  use_list, raw, timestamp, strict_map_key, cerr,
- *                  max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len)
- *         ret = unpack_construct(&ctx, buf, buf_len, &off)             # <<<<<<<<<<<<<<
- *     finally:
- *         PyBuffer_Release(&view);
- */
-    __pyx_t_3 = unpack_construct((&__pyx_v_ctx), __pyx_v_buf, __pyx_v_buf_len, (&__pyx_v_off)); if (unlikely(__pyx_t_3 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(1, 194, __pyx_L10_error)
-    __pyx_v_ret = __pyx_t_3;
-  }
-
-  /* "msgpack/_unpacker.pyx":196
- *         ret = unpack_construct(&ctx, buf, buf_len, &off)
- *     finally:
- *         PyBuffer_Release(&view);             # <<<<<<<<<<<<<<
- * 
- *     if ret == 1:
- */
-  /*finally:*/ {
-    /*normal exit:*/{
-      PyBuffer_Release((&__pyx_v_view));
-      goto __pyx_L11;
-    }
-    __pyx_L10_error:;
-    /*exception exit:*/{
-      __Pyx_PyThreadState_declare
-      __Pyx_PyThreadState_assign
-      __pyx_t_7 = 0; __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0;
-      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_10, &__pyx_t_11, &__pyx_t_12);
-      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_7, &__pyx_t_8, &__pyx_t_9) < 0)) __Pyx_ErrFetch(&__pyx_t_7, &__pyx_t_8, &__pyx_t_9);
-      __Pyx_XGOTREF(__pyx_t_7);
-      __Pyx_XGOTREF(__pyx_t_8);
-      __Pyx_XGOTREF(__pyx_t_9);
-      __Pyx_XGOTREF(__pyx_t_10);
-      __Pyx_XGOTREF(__pyx_t_11);
-      __Pyx_XGOTREF(__pyx_t_12);
-      __pyx_t_3 = __pyx_lineno; __pyx_t_5 = __pyx_clineno; __pyx_t_6 = __pyx_filename;
-      {
-        PyBuffer_Release((&__pyx_v_view));
-      }
-      if (PY_MAJOR_VERSION >= 3) {
-        __Pyx_XGIVEREF(__pyx_t_10);
-        __Pyx_XGIVEREF(__pyx_t_11);
-        __Pyx_XGIVEREF(__pyx_t_12);
-        __Pyx_ExceptionReset(__pyx_t_10, __pyx_t_11, __pyx_t_12);
-      }
-      __Pyx_XGIVEREF(__pyx_t_7);
-      __Pyx_XGIVEREF(__pyx_t_8);
-      __Pyx_XGIVEREF(__pyx_t_9);
-      __Pyx_ErrRestore(__pyx_t_7, __pyx_t_8, __pyx_t_9);
-      __pyx_t_7 = 0; __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0;
-      __pyx_lineno = __pyx_t_3; __pyx_clineno = __pyx_t_5; __pyx_filename = __pyx_t_6;
-      goto __pyx_L1_error;
-    }
-    __pyx_L11:;
-  }
-
-  /* "msgpack/_unpacker.pyx":198
- *         PyBuffer_Release(&view);
- * 
- *     if ret == 1:             # <<<<<<<<<<<<<<
- *         obj = unpack_data(&ctx)
- *         if off < buf_len:
- */
-  __pyx_t_1 = (__pyx_v_ret == 1);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":199
- * 
- *     if ret == 1:
- *         obj = unpack_data(&ctx)             # <<<<<<<<<<<<<<
- *         if off < buf_len:
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
- */
-    __pyx_t_4 = unpack_data((&__pyx_v_ctx)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 199, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __pyx_v_obj = __pyx_t_4;
-    __pyx_t_4 = 0;
-
-    /* "msgpack/_unpacker.pyx":200
- *     if ret == 1:
- *         obj = unpack_data(&ctx)
- *         if off < buf_len:             # <<<<<<<<<<<<<<
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
- *         return obj
- */
-    __pyx_t_1 = (__pyx_v_off < __pyx_v_buf_len);
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":201
- *         obj = unpack_data(&ctx)
- *         if off < buf_len:
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))             # <<<<<<<<<<<<<<
- *         return obj
- *     unpack_clear(&ctx)
- */
-      __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_ExtraData); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 201, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_13);
-      __pyx_t_14 = PyBytes_FromStringAndSize((__pyx_v_buf + __pyx_v_off), (__pyx_v_buf_len - __pyx_v_off)); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 201, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_14);
-      __pyx_t_15 = NULL;
-      __pyx_t_5 = 0;
-      #if CYTHON_UNPACK_METHODS
-      if (unlikely(PyMethod_Check(__pyx_t_13))) {
-        __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_13);
-        if (likely(__pyx_t_15)) {
-          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13);
-          __Pyx_INCREF(__pyx_t_15);
-          __Pyx_INCREF(function);
-          __Pyx_DECREF_SET(__pyx_t_13, function);
-          __pyx_t_5 = 1;
-        }
-      }
-      #endif
-      {
-        PyObject *__pyx_callargs[3] = {__pyx_t_15, __pyx_v_obj, __pyx_t_14};
-        __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_13, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5);
-        __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0;
-        __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
-        if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 201, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_4);
-        __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
-      }
-      __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __PYX_ERR(1, 201, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":200
- *     if ret == 1:
- *         obj = unpack_data(&ctx)
- *         if off < buf_len:             # <<<<<<<<<<<<<<
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
- *         return obj
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":202
- *         if off < buf_len:
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
- *         return obj             # <<<<<<<<<<<<<<
- *     unpack_clear(&ctx)
- *     if ret == 0:
- */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(__pyx_v_obj);
-    __pyx_r = __pyx_v_obj;
-    goto __pyx_L0;
-
-    /* "msgpack/_unpacker.pyx":198
- *         PyBuffer_Release(&view);
- * 
- *     if ret == 1:             # <<<<<<<<<<<<<<
- *         obj = unpack_data(&ctx)
- *         if off < buf_len:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":203
- *             raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
- *         return obj
- *     unpack_clear(&ctx)             # <<<<<<<<<<<<<<
- *     if ret == 0:
- *         raise ValueError("Unpack failed: incomplete input")
- */
-  unpack_clear((&__pyx_v_ctx));
-
-  /* "msgpack/_unpacker.pyx":204
- *         return obj
- *     unpack_clear(&ctx)
- *     if ret == 0:             # <<<<<<<<<<<<<<
- *         raise ValueError("Unpack failed: incomplete input")
- *     elif ret == -2:
- */
-  switch (__pyx_v_ret) {
-    case 0:
-
-    /* "msgpack/_unpacker.pyx":205
- *     unpack_clear(&ctx)
- *     if ret == 0:
- *         raise ValueError("Unpack failed: incomplete input")             # <<<<<<<<<<<<<<
- *     elif ret == -2:
- *         raise FormatError
- */
-    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__22, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 205, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(1, 205, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":204
- *         return obj
- *     unpack_clear(&ctx)
- *     if ret == 0:             # <<<<<<<<<<<<<<
- *         raise ValueError("Unpack failed: incomplete input")
- *     elif ret == -2:
- */
-    break;
-    case -2L:
-
-    /* "msgpack/_unpacker.pyx":207
- *         raise ValueError("Unpack failed: incomplete input")
- *     elif ret == -2:
- *         raise FormatError             # <<<<<<<<<<<<<<
- *     elif ret == -3:
- *         raise StackError
- */
-    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FormatError); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 207, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(1, 207, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":206
- *     if ret == 0:
- *         raise ValueError("Unpack failed: incomplete input")
- *     elif ret == -2:             # <<<<<<<<<<<<<<
- *         raise FormatError
- *     elif ret == -3:
- */
-    break;
-    case -3L:
-
-    /* "msgpack/_unpacker.pyx":209
- *         raise FormatError
- *     elif ret == -3:
- *         raise StackError             # <<<<<<<<<<<<<<
- *     raise ValueError("Unpack failed: error = %d" % (ret,))
- * 
- */
-    __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_StackError); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 209, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __PYX_ERR(1, 209, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":208
- *     elif ret == -2:
- *         raise FormatError
- *     elif ret == -3:             # <<<<<<<<<<<<<<
- *         raise StackError
- *     raise ValueError("Unpack failed: error = %d" % (ret,))
- */
-    break;
-    default: break;
-  }
-
-  /* "msgpack/_unpacker.pyx":210
- *     elif ret == -3:
- *         raise StackError
- *     raise ValueError("Unpack failed: error = %d" % (ret,))             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_t_4 = __Pyx_PyUnicode_From_int(__pyx_v_ret, 0, ' ', 'd'); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 210, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_13 = __Pyx_PyUnicode_Concat(__pyx_kp_u_Unpack_failed_error, __pyx_t_4); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 210, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_13);
-  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_13); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 210, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
-  __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __PYX_ERR(1, 210, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_4);
-  __Pyx_XDECREF(__pyx_t_13);
-  __Pyx_XDECREF(__pyx_t_14);
-  __Pyx_XDECREF(__pyx_t_15);
-  __Pyx_AddTraceback("msgpack._cmsgpack.unpackb", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_obj);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":320
- *     cdef uint64_t stream_offset
- * 
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         self.buf = NULL
- * 
- */
-
-/* Python wrapper */
-static int __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static int __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__cinit__ (wrapper)", 0);
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 320, __pyx_L3_error)
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, __pyx_nargs); return -1;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_VARARGS(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__cinit__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return -1;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker___cinit__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static int __pyx_pf_7msgpack_9_cmsgpack_8Unpacker___cinit__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__cinit__", 0);
-
-  /* "msgpack/_unpacker.pyx":321
- * 
- *     def __cinit__(self):
- *         self.buf = NULL             # <<<<<<<<<<<<<<
- * 
- *     def __dealloc__(self):
- */
-  __pyx_v_self->buf = NULL;
-
-  /* "msgpack/_unpacker.pyx":320
- *     cdef uint64_t stream_offset
- * 
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         self.buf = NULL
- * 
- */
-
-  /* function exit code */
-  __pyx_r = 0;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":323
- *         self.buf = NULL
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         PyMem_Free(self.buf)
- *         self.buf = NULL
- */
-
-/* Python wrapper */
-static void __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
-static void __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_3__dealloc__(PyObject *__pyx_v_self) {
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_2__dealloc__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-}
-
-static void __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_2__dealloc__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__dealloc__", 0);
-
-  /* "msgpack/_unpacker.pyx":324
- * 
- *     def __dealloc__(self):
- *         PyMem_Free(self.buf)             # <<<<<<<<<<<<<<
- *         self.buf = NULL
- * 
- */
-  PyMem_Free(__pyx_v_self->buf);
-
-  /* "msgpack/_unpacker.pyx":325
- *     def __dealloc__(self):
- *         PyMem_Free(self.buf)
- *         self.buf = NULL             # <<<<<<<<<<<<<<
- * 
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,
- */
-  __pyx_v_self->buf = NULL;
-
-  /* "msgpack/_unpacker.pyx":323
- *         self.buf = NULL
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         PyMem_Free(self.buf)
- *         self.buf = NULL
- */
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-}
-
-/* "msgpack/_unpacker.pyx":327
- *         self.buf = NULL
- * 
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,             # <<<<<<<<<<<<<<
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- */
-
-/* Python wrapper */
-static int __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_5__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static int __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_5__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyObject *__pyx_v_file_like = 0;
-  Py_ssize_t __pyx_v_read_size;
-  int __pyx_v_use_list;
-  int __pyx_v_raw;
-  int __pyx_v_timestamp;
-  int __pyx_v_strict_map_key;
-  PyObject *__pyx_v_object_hook = 0;
-  PyObject *__pyx_v_object_pairs_hook = 0;
-  PyObject *__pyx_v_list_hook = 0;
-  PyObject *__pyx_v_unicode_errors = 0;
-  Py_ssize_t __pyx_v_max_buffer_size;
-  PyObject *__pyx_v_ext_hook = 0;
-  Py_ssize_t __pyx_v_max_str_len;
-  Py_ssize_t __pyx_v_max_bin_len;
-  Py_ssize_t __pyx_v_max_array_len;
-  Py_ssize_t __pyx_v_max_map_len;
-  Py_ssize_t __pyx_v_max_ext_len;
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[17] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 327, __pyx_L3_error)
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_file_like,&__pyx_n_s_read_size,&__pyx_n_s_use_list,&__pyx_n_s_raw,&__pyx_n_s_timestamp,&__pyx_n_s_strict_map_key,&__pyx_n_s_object_hook,&__pyx_n_s_object_pairs_hook,&__pyx_n_s_list_hook,&__pyx_n_s_unicode_errors,&__pyx_n_s_max_buffer_size,&__pyx_n_s_ext_hook,&__pyx_n_s_max_str_len,&__pyx_n_s_max_bin_len,&__pyx_n_s_max_array_len,&__pyx_n_s_max_map_len,&__pyx_n_s_max_ext_len,0};
-    values[0] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-
-    /* "msgpack/_unpacker.pyx":329
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *                  unicode_errors=None, Py_ssize_t max_buffer_size=100*1024*1024,
- *                  object ext_hook=ExtType,
- */
-    values[6] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-    values[7] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-    values[8] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-
-    /* "msgpack/_unpacker.pyx":330
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- *                  unicode_errors=None, Py_ssize_t max_buffer_size=100*1024*1024,             # <<<<<<<<<<<<<<
- *                  object ext_hook=ExtType,
- *                  Py_ssize_t max_str_len=-1,
- */
-    values[9] = __Pyx_Arg_NewRef_VARARGS(((PyObject *)Py_None));
-    values[11] = __Pyx_Arg_NewRef_VARARGS(__pyx_k__23);
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_VARARGS(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (kw_args > 0) {
-          PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_file_like);
-          if (value) { values[0] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 327, __pyx_L3_error)
-        }
-      }
-      if (kw_args > 0 && likely(kw_args <= 16)) {
-        Py_ssize_t index;
-        for (index = 1; index < 17 && kw_args > 0; index++) {
-          PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, *__pyx_pyargnames[index]);
-          if (value) { values[index] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; }
-          else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 327, __pyx_L3_error)
-        }
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(1, 327, __pyx_L3_error)
-      }
-    } else {
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_VARARGS(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-    }
-    __pyx_v_file_like = values[0];
-    if (values[1]) {
-      __pyx_v_read_size = __Pyx_PyIndex_AsSsize_t(values[1]); if (unlikely((__pyx_v_read_size == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 327, __pyx_L3_error)
-    } else {
-      __pyx_v_read_size = ((Py_ssize_t)0);
-    }
-    if (values[2]) {
-      __pyx_v_use_list = __Pyx_PyObject_IsTrue(values[2]); if (unlikely((__pyx_v_use_list == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 328, __pyx_L3_error)
-    } else {
-
-      /* "msgpack/_unpacker.pyx":328
- * 
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,             # <<<<<<<<<<<<<<
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- *                  unicode_errors=None, Py_ssize_t max_buffer_size=100*1024*1024,
- */
-      __pyx_v_use_list = ((int)1);
-    }
-    if (values[3]) {
-      __pyx_v_raw = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_raw == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 328, __pyx_L3_error)
-    } else {
-      __pyx_v_raw = ((int)0);
-    }
-    if (values[4]) {
-      __pyx_v_timestamp = __Pyx_PyInt_As_int(values[4]); if (unlikely((__pyx_v_timestamp == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 328, __pyx_L3_error)
-    } else {
-      __pyx_v_timestamp = ((int)0);
-    }
-    if (values[5]) {
-      __pyx_v_strict_map_key = __Pyx_PyObject_IsTrue(values[5]); if (unlikely((__pyx_v_strict_map_key == (int)-1) && PyErr_Occurred())) __PYX_ERR(1, 328, __pyx_L3_error)
-    } else {
-      __pyx_v_strict_map_key = ((int)1);
-    }
-    __pyx_v_object_hook = values[6];
-    __pyx_v_object_pairs_hook = values[7];
-    __pyx_v_list_hook = values[8];
-    __pyx_v_unicode_errors = values[9];
-    if (values[10]) {
-      __pyx_v_max_buffer_size = __Pyx_PyIndex_AsSsize_t(values[10]); if (unlikely((__pyx_v_max_buffer_size == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 330, __pyx_L3_error)
-    } else {
-      __pyx_v_max_buffer_size = ((Py_ssize_t)0x6400000);
-    }
-    __pyx_v_ext_hook = values[11];
-    if (values[12]) {
-      __pyx_v_max_str_len = __Pyx_PyIndex_AsSsize_t(values[12]); if (unlikely((__pyx_v_max_str_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 332, __pyx_L3_error)
-    } else {
-      __pyx_v_max_str_len = ((Py_ssize_t)-1L);
-    }
-    if (values[13]) {
-      __pyx_v_max_bin_len = __Pyx_PyIndex_AsSsize_t(values[13]); if (unlikely((__pyx_v_max_bin_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 333, __pyx_L3_error)
-    } else {
-      __pyx_v_max_bin_len = ((Py_ssize_t)-1L);
-    }
-    if (values[14]) {
-      __pyx_v_max_array_len = __Pyx_PyIndex_AsSsize_t(values[14]); if (unlikely((__pyx_v_max_array_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 334, __pyx_L3_error)
-    } else {
-      __pyx_v_max_array_len = ((Py_ssize_t)-1L);
-    }
-    if (values[15]) {
-      __pyx_v_max_map_len = __Pyx_PyIndex_AsSsize_t(values[15]); if (unlikely((__pyx_v_max_map_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 335, __pyx_L3_error)
-    } else {
-      __pyx_v_max_map_len = ((Py_ssize_t)-1L);
-    }
-    if (values[16]) {
-      __pyx_v_max_ext_len = __Pyx_PyIndex_AsSsize_t(values[16]); if (unlikely((__pyx_v_max_ext_len == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 336, __pyx_L3_error)
-    } else {
-      __pyx_v_max_ext_len = ((Py_ssize_t)-1L);
-    }
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 0, 0, 1, __pyx_nargs); __PYX_ERR(1, 327, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_VARARGS(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return -1;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_4__init__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self), __pyx_v_file_like, __pyx_v_read_size, __pyx_v_use_list, __pyx_v_raw, __pyx_v_timestamp, __pyx_v_strict_map_key, __pyx_v_object_hook, __pyx_v_object_pairs_hook, __pyx_v_list_hook, __pyx_v_unicode_errors, __pyx_v_max_buffer_size, __pyx_v_ext_hook, __pyx_v_max_str_len, __pyx_v_max_bin_len, __pyx_v_max_array_len, __pyx_v_max_map_len, __pyx_v_max_ext_len);
-
-  /* "msgpack/_unpacker.pyx":327
- *         self.buf = NULL
- * 
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,             # <<<<<<<<<<<<<<
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- */
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_VARARGS(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static int __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_4__init__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, PyObject *__pyx_v_file_like, Py_ssize_t __pyx_v_read_size, int __pyx_v_use_list, int __pyx_v_raw, int __pyx_v_timestamp, int __pyx_v_strict_map_key, PyObject *__pyx_v_object_hook, PyObject *__pyx_v_object_pairs_hook, PyObject *__pyx_v_list_hook, PyObject *__pyx_v_unicode_errors, Py_ssize_t __pyx_v_max_buffer_size, PyObject *__pyx_v_ext_hook, Py_ssize_t __pyx_v_max_str_len, Py_ssize_t __pyx_v_max_bin_len, Py_ssize_t __pyx_v_max_array_len, Py_ssize_t __pyx_v_max_map_len, Py_ssize_t __pyx_v_max_ext_len) {
-  char const *__pyx_v_cerr;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  long __pyx_t_3;
-  Py_ssize_t __pyx_t_4;
-  Py_ssize_t __pyx_t_5;
-  char const *__pyx_t_6;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__init__", 0);
-
-  /* "msgpack/_unpacker.pyx":337
- *                  Py_ssize_t max_map_len=-1,
- *                  Py_ssize_t max_ext_len=-1):
- *         cdef const char *cerr=NULL             # <<<<<<<<<<<<<<
- * 
- *         self.object_hook = object_hook
- */
-  __pyx_v_cerr = NULL;
-
-  /* "msgpack/_unpacker.pyx":339
- *         cdef const char *cerr=NULL
- * 
- *         self.object_hook = object_hook             # <<<<<<<<<<<<<<
- *         self.object_pairs_hook = object_pairs_hook
- *         self.list_hook = list_hook
- */
-  __Pyx_INCREF(__pyx_v_object_hook);
-  __Pyx_GIVEREF(__pyx_v_object_hook);
-  __Pyx_GOTREF(__pyx_v_self->object_hook);
-  __Pyx_DECREF(__pyx_v_self->object_hook);
-  __pyx_v_self->object_hook = __pyx_v_object_hook;
-
-  /* "msgpack/_unpacker.pyx":340
- * 
- *         self.object_hook = object_hook
- *         self.object_pairs_hook = object_pairs_hook             # <<<<<<<<<<<<<<
- *         self.list_hook = list_hook
- *         self.ext_hook = ext_hook
- */
-  __Pyx_INCREF(__pyx_v_object_pairs_hook);
-  __Pyx_GIVEREF(__pyx_v_object_pairs_hook);
-  __Pyx_GOTREF(__pyx_v_self->object_pairs_hook);
-  __Pyx_DECREF(__pyx_v_self->object_pairs_hook);
-  __pyx_v_self->object_pairs_hook = __pyx_v_object_pairs_hook;
-
-  /* "msgpack/_unpacker.pyx":341
- *         self.object_hook = object_hook
- *         self.object_pairs_hook = object_pairs_hook
- *         self.list_hook = list_hook             # <<<<<<<<<<<<<<
- *         self.ext_hook = ext_hook
- * 
- */
-  __Pyx_INCREF(__pyx_v_list_hook);
-  __Pyx_GIVEREF(__pyx_v_list_hook);
-  __Pyx_GOTREF(__pyx_v_self->list_hook);
-  __Pyx_DECREF(__pyx_v_self->list_hook);
-  __pyx_v_self->list_hook = __pyx_v_list_hook;
-
-  /* "msgpack/_unpacker.pyx":342
- *         self.object_pairs_hook = object_pairs_hook
- *         self.list_hook = list_hook
- *         self.ext_hook = ext_hook             # <<<<<<<<<<<<<<
- * 
- *         self.file_like = file_like
- */
-  __Pyx_INCREF(__pyx_v_ext_hook);
-  __Pyx_GIVEREF(__pyx_v_ext_hook);
-  __Pyx_GOTREF(__pyx_v_self->ext_hook);
-  __Pyx_DECREF(__pyx_v_self->ext_hook);
-  __pyx_v_self->ext_hook = __pyx_v_ext_hook;
-
-  /* "msgpack/_unpacker.pyx":344
- *         self.ext_hook = ext_hook
- * 
- *         self.file_like = file_like             # <<<<<<<<<<<<<<
- *         if file_like:
- *             self.file_like_read = file_like.read
- */
-  __Pyx_INCREF(__pyx_v_file_like);
-  __Pyx_GIVEREF(__pyx_v_file_like);
-  __Pyx_GOTREF(__pyx_v_self->file_like);
-  __Pyx_DECREF(__pyx_v_self->file_like);
-  __pyx_v_self->file_like = __pyx_v_file_like;
-
-  /* "msgpack/_unpacker.pyx":345
- * 
- *         self.file_like = file_like
- *         if file_like:             # <<<<<<<<<<<<<<
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):
- */
-  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_file_like); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(1, 345, __pyx_L1_error)
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":346
- *         self.file_like = file_like
- *         if file_like:
- *             self.file_like_read = file_like.read             # <<<<<<<<<<<<<<
- *             if not PyCallable_Check(self.file_like_read):
- *                 raise TypeError("`file_like.read` must be a callable.")
- */
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_file_like, __pyx_n_s_read); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 346, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_GIVEREF(__pyx_t_2);
-    __Pyx_GOTREF(__pyx_v_self->file_like_read);
-    __Pyx_DECREF(__pyx_v_self->file_like_read);
-    __pyx_v_self->file_like_read = __pyx_t_2;
-    __pyx_t_2 = 0;
-
-    /* "msgpack/_unpacker.pyx":347
- *         if file_like:
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):             # <<<<<<<<<<<<<<
- *                 raise TypeError("`file_like.read` must be a callable.")
- * 
- */
-    __pyx_t_2 = __pyx_v_self->file_like_read;
-    __Pyx_INCREF(__pyx_t_2);
-    __pyx_t_1 = (!PyCallable_Check(__pyx_t_2));
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (unlikely(__pyx_t_1)) {
-
-      /* "msgpack/_unpacker.pyx":348
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):
- *                 raise TypeError("`file_like.read` must be a callable.")             # <<<<<<<<<<<<<<
- * 
- *         if not max_buffer_size:
- */
-      __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__24, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 348, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __PYX_ERR(1, 348, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":347
- *         if file_like:
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):             # <<<<<<<<<<<<<<
- *                 raise TypeError("`file_like.read` must be a callable.")
- * 
- */
-    }
-
-    /* "msgpack/_unpacker.pyx":345
- * 
- *         self.file_like = file_like
- *         if file_like:             # <<<<<<<<<<<<<<
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":350
- *                 raise TypeError("`file_like.read` must be a callable.")
- * 
- *         if not max_buffer_size:             # <<<<<<<<<<<<<<
- *             max_buffer_size = INT_MAX
- *         if max_str_len == -1:
- */
-  __pyx_t_1 = (!(__pyx_v_max_buffer_size != 0));
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":351
- * 
- *         if not max_buffer_size:
- *             max_buffer_size = INT_MAX             # <<<<<<<<<<<<<<
- *         if max_str_len == -1:
- *             max_str_len = max_buffer_size
- */
-    __pyx_v_max_buffer_size = INT_MAX;
-
-    /* "msgpack/_unpacker.pyx":350
- *                 raise TypeError("`file_like.read` must be a callable.")
- * 
- *         if not max_buffer_size:             # <<<<<<<<<<<<<<
- *             max_buffer_size = INT_MAX
- *         if max_str_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":352
- *         if not max_buffer_size:
- *             max_buffer_size = INT_MAX
- *         if max_str_len == -1:             # <<<<<<<<<<<<<<
- *             max_str_len = max_buffer_size
- *         if max_bin_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_str_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":353
- *             max_buffer_size = INT_MAX
- *         if max_str_len == -1:
- *             max_str_len = max_buffer_size             # <<<<<<<<<<<<<<
- *         if max_bin_len == -1:
- *             max_bin_len = max_buffer_size
- */
-    __pyx_v_max_str_len = __pyx_v_max_buffer_size;
-
-    /* "msgpack/_unpacker.pyx":352
- *         if not max_buffer_size:
- *             max_buffer_size = INT_MAX
- *         if max_str_len == -1:             # <<<<<<<<<<<<<<
- *             max_str_len = max_buffer_size
- *         if max_bin_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":354
- *         if max_str_len == -1:
- *             max_str_len = max_buffer_size
- *         if max_bin_len == -1:             # <<<<<<<<<<<<<<
- *             max_bin_len = max_buffer_size
- *         if max_array_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_bin_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":355
- *             max_str_len = max_buffer_size
- *         if max_bin_len == -1:
- *             max_bin_len = max_buffer_size             # <<<<<<<<<<<<<<
- *         if max_array_len == -1:
- *             max_array_len = max_buffer_size
- */
-    __pyx_v_max_bin_len = __pyx_v_max_buffer_size;
-
-    /* "msgpack/_unpacker.pyx":354
- *         if max_str_len == -1:
- *             max_str_len = max_buffer_size
- *         if max_bin_len == -1:             # <<<<<<<<<<<<<<
- *             max_bin_len = max_buffer_size
- *         if max_array_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":356
- *         if max_bin_len == -1:
- *             max_bin_len = max_buffer_size
- *         if max_array_len == -1:             # <<<<<<<<<<<<<<
- *             max_array_len = max_buffer_size
- *         if max_map_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_array_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":357
- *             max_bin_len = max_buffer_size
- *         if max_array_len == -1:
- *             max_array_len = max_buffer_size             # <<<<<<<<<<<<<<
- *         if max_map_len == -1:
- *             max_map_len = max_buffer_size//2
- */
-    __pyx_v_max_array_len = __pyx_v_max_buffer_size;
-
-    /* "msgpack/_unpacker.pyx":356
- *         if max_bin_len == -1:
- *             max_bin_len = max_buffer_size
- *         if max_array_len == -1:             # <<<<<<<<<<<<<<
- *             max_array_len = max_buffer_size
- *         if max_map_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":358
- *         if max_array_len == -1:
- *             max_array_len = max_buffer_size
- *         if max_map_len == -1:             # <<<<<<<<<<<<<<
- *             max_map_len = max_buffer_size//2
- *         if max_ext_len == -1:
- */
-  __pyx_t_1 = (__pyx_v_max_map_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":359
- *             max_array_len = max_buffer_size
- *         if max_map_len == -1:
- *             max_map_len = max_buffer_size//2             # <<<<<<<<<<<<<<
- *         if max_ext_len == -1:
- *             max_ext_len = max_buffer_size
- */
-    __pyx_v_max_map_len = __Pyx_div_Py_ssize_t(__pyx_v_max_buffer_size, 2);
-
-    /* "msgpack/_unpacker.pyx":358
- *         if max_array_len == -1:
- *             max_array_len = max_buffer_size
- *         if max_map_len == -1:             # <<<<<<<<<<<<<<
- *             max_map_len = max_buffer_size//2
- *         if max_ext_len == -1:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":360
- *         if max_map_len == -1:
- *             max_map_len = max_buffer_size//2
- *         if max_ext_len == -1:             # <<<<<<<<<<<<<<
- *             max_ext_len = max_buffer_size
- * 
- */
-  __pyx_t_1 = (__pyx_v_max_ext_len == -1L);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":361
- *             max_map_len = max_buffer_size//2
- *         if max_ext_len == -1:
- *             max_ext_len = max_buffer_size             # <<<<<<<<<<<<<<
- * 
- *         if read_size > max_buffer_size:
- */
-    __pyx_v_max_ext_len = __pyx_v_max_buffer_size;
-
-    /* "msgpack/_unpacker.pyx":360
- *         if max_map_len == -1:
- *             max_map_len = max_buffer_size//2
- *         if max_ext_len == -1:             # <<<<<<<<<<<<<<
- *             max_ext_len = max_buffer_size
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":363
- *             max_ext_len = max_buffer_size
- * 
- *         if read_size > max_buffer_size:             # <<<<<<<<<<<<<<
- *             raise ValueError("read_size should be less or equal to max_buffer_size")
- *         if not read_size:
- */
-  __pyx_t_1 = (__pyx_v_read_size > __pyx_v_max_buffer_size);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":364
- * 
- *         if read_size > max_buffer_size:
- *             raise ValueError("read_size should be less or equal to max_buffer_size")             # <<<<<<<<<<<<<<
- *         if not read_size:
- *             read_size = min(max_buffer_size, 1024**2)
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__25, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 364, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(1, 364, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":363
- *             max_ext_len = max_buffer_size
- * 
- *         if read_size > max_buffer_size:             # <<<<<<<<<<<<<<
- *             raise ValueError("read_size should be less or equal to max_buffer_size")
- *         if not read_size:
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":365
- *         if read_size > max_buffer_size:
- *             raise ValueError("read_size should be less or equal to max_buffer_size")
- *         if not read_size:             # <<<<<<<<<<<<<<
- *             read_size = min(max_buffer_size, 1024**2)
- * 
- */
-  __pyx_t_1 = (!(__pyx_v_read_size != 0));
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":366
- *             raise ValueError("read_size should be less or equal to max_buffer_size")
- *         if not read_size:
- *             read_size = min(max_buffer_size, 1024**2)             # <<<<<<<<<<<<<<
- * 
- *         self.max_buffer_size = max_buffer_size
- */
-    __pyx_t_3 = 0x100000;
-    __pyx_t_4 = __pyx_v_max_buffer_size;
-    __pyx_t_1 = (__pyx_t_3 < __pyx_t_4);
-    if (__pyx_t_1) {
-      __pyx_t_5 = __pyx_t_3;
-    } else {
-      __pyx_t_5 = __pyx_t_4;
-    }
-    __pyx_v_read_size = __pyx_t_5;
-
-    /* "msgpack/_unpacker.pyx":365
- *         if read_size > max_buffer_size:
- *             raise ValueError("read_size should be less or equal to max_buffer_size")
- *         if not read_size:             # <<<<<<<<<<<<<<
- *             read_size = min(max_buffer_size, 1024**2)
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":368
- *             read_size = min(max_buffer_size, 1024**2)
- * 
- *         self.max_buffer_size = max_buffer_size             # <<<<<<<<<<<<<<
- *         self.read_size = read_size
- *         self.buf = <char*>PyMem_Malloc(read_size)
- */
-  __pyx_v_self->max_buffer_size = __pyx_v_max_buffer_size;
-
-  /* "msgpack/_unpacker.pyx":369
- * 
- *         self.max_buffer_size = max_buffer_size
- *         self.read_size = read_size             # <<<<<<<<<<<<<<
- *         self.buf = <char*>PyMem_Malloc(read_size)
- *         if self.buf == NULL:
- */
-  __pyx_v_self->read_size = __pyx_v_read_size;
-
-  /* "msgpack/_unpacker.pyx":370
- *         self.max_buffer_size = max_buffer_size
- *         self.read_size = read_size
- *         self.buf = <char*>PyMem_Malloc(read_size)             # <<<<<<<<<<<<<<
- *         if self.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")
- */
-  __pyx_v_self->buf = ((char *)PyMem_Malloc(__pyx_v_read_size));
-
-  /* "msgpack/_unpacker.pyx":371
- *         self.read_size = read_size
- *         self.buf = <char*>PyMem_Malloc(read_size)
- *         if self.buf == NULL:             # <<<<<<<<<<<<<<
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.buf_size = read_size
- */
-  __pyx_t_1 = (__pyx_v_self->buf == NULL);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":372
- *         self.buf = <char*>PyMem_Malloc(read_size)
- *         if self.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")             # <<<<<<<<<<<<<<
- *         self.buf_size = read_size
- *         self.buf_head = 0
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 372, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(1, 372, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":371
- *         self.read_size = read_size
- *         self.buf = <char*>PyMem_Malloc(read_size)
- *         if self.buf == NULL:             # <<<<<<<<<<<<<<
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.buf_size = read_size
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":373
- *         if self.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.buf_size = read_size             # <<<<<<<<<<<<<<
- *         self.buf_head = 0
- *         self.buf_tail = 0
- */
-  __pyx_v_self->buf_size = __pyx_v_read_size;
-
-  /* "msgpack/_unpacker.pyx":374
- *             raise MemoryError("Unable to allocate internal buffer.")
- *         self.buf_size = read_size
- *         self.buf_head = 0             # <<<<<<<<<<<<<<
- *         self.buf_tail = 0
- *         self.stream_offset = 0
- */
-  __pyx_v_self->buf_head = 0;
-
-  /* "msgpack/_unpacker.pyx":375
- *         self.buf_size = read_size
- *         self.buf_head = 0
- *         self.buf_tail = 0             # <<<<<<<<<<<<<<
- *         self.stream_offset = 0
- * 
- */
-  __pyx_v_self->buf_tail = 0;
-
-  /* "msgpack/_unpacker.pyx":376
- *         self.buf_head = 0
- *         self.buf_tail = 0
- *         self.stream_offset = 0             # <<<<<<<<<<<<<<
- * 
- *         if unicode_errors is not None:
- */
-  __pyx_v_self->stream_offset = 0;
-
-  /* "msgpack/_unpacker.pyx":378
- *         self.stream_offset = 0
- * 
- *         if unicode_errors is not None:             # <<<<<<<<<<<<<<
- *             self.unicode_errors = unicode_errors
- *             cerr = unicode_errors
- */
-  __pyx_t_1 = (__pyx_v_unicode_errors != Py_None);
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":379
- * 
- *         if unicode_errors is not None:
- *             self.unicode_errors = unicode_errors             # <<<<<<<<<<<<<<
- *             cerr = unicode_errors
- * 
- */
-    __Pyx_INCREF(__pyx_v_unicode_errors);
-    __Pyx_GIVEREF(__pyx_v_unicode_errors);
-    __Pyx_GOTREF(__pyx_v_self->unicode_errors);
-    __Pyx_DECREF(__pyx_v_self->unicode_errors);
-    __pyx_v_self->unicode_errors = __pyx_v_unicode_errors;
-
-    /* "msgpack/_unpacker.pyx":380
- *         if unicode_errors is not None:
- *             self.unicode_errors = unicode_errors
- *             cerr = unicode_errors             # <<<<<<<<<<<<<<
- * 
- *         init_ctx(&self.ctx, object_hook, object_pairs_hook, list_hook,
- */
-    __pyx_t_6 = __Pyx_PyObject_AsString(__pyx_v_unicode_errors); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) __PYX_ERR(1, 380, __pyx_L1_error)
-    __pyx_v_cerr = __pyx_t_6;
-
-    /* "msgpack/_unpacker.pyx":378
- *         self.stream_offset = 0
- * 
- *         if unicode_errors is not None:             # <<<<<<<<<<<<<<
- *             self.unicode_errors = unicode_errors
- *             cerr = unicode_errors
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":382
- *             cerr = unicode_errors
- * 
- *         init_ctx(&self.ctx, object_hook, object_pairs_hook, list_hook,             # <<<<<<<<<<<<<<
- *                  ext_hook, use_list, raw, timestamp, strict_map_key, cerr,
- *                  max_str_len, max_bin_len, max_array_len,
- */
-  __pyx_t_2 = __pyx_f_7msgpack_9_cmsgpack_init_ctx((&__pyx_v_self->ctx), __pyx_v_object_hook, __pyx_v_object_pairs_hook, __pyx_v_list_hook, __pyx_v_ext_hook, __pyx_v_use_list, __pyx_v_raw, __pyx_v_timestamp, __pyx_v_strict_map_key, __pyx_v_cerr, __pyx_v_max_str_len, __pyx_v_max_bin_len, __pyx_v_max_array_len, __pyx_v_max_map_len, __pyx_v_max_ext_len); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 382, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":327
- *         self.buf = NULL
- * 
- *     def __init__(self, file_like=None, *, Py_ssize_t read_size=0,             # <<<<<<<<<<<<<<
- *                  bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- */
-
-  /* function exit code */
-  __pyx_r = 0;
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = -1;
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":387
- *                  max_map_len, max_ext_len)
- * 
- *     def feed(self, object next_bytes):             # <<<<<<<<<<<<<<
- *         """Append `next_bytes` to internal buffer."""
- *         cdef Py_buffer pybuff
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_7feed(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_6feed, "Unpacker.feed(self, next_bytes)\nAppend `next_bytes` to internal buffer.");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_7feed = {"feed", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_7feed, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_6feed};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_7feed(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  PyObject *__pyx_v_next_bytes = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("feed (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 387, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_next_bytes,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_next_bytes)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 387, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "feed") < 0)) __PYX_ERR(1, 387, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_next_bytes = values[0];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("feed", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 387, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.feed", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_6feed(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self), __pyx_v_next_bytes);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_6feed(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, PyObject *__pyx_v_next_bytes) {
-  Py_buffer __pyx_v_pybuff;
-  char *__pyx_v_buf;
-  Py_ssize_t __pyx_v_buf_len;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  int __pyx_t_3;
-  int __pyx_t_4;
-  char const *__pyx_t_5;
-  PyObject *__pyx_t_6 = NULL;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  PyObject *__pyx_t_9 = NULL;
-  PyObject *__pyx_t_10 = NULL;
-  PyObject *__pyx_t_11 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("feed", 0);
-
-  /* "msgpack/_unpacker.pyx":393
- *         cdef Py_ssize_t buf_len
- * 
- *         if self.file_like is not None:             # <<<<<<<<<<<<<<
- *             raise AssertionError(
- *                     "unpacker.feed() is not be able to use with `file_like`.")
- */
-  __pyx_t_1 = (__pyx_v_self->file_like != Py_None);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":394
- * 
- *         if self.file_like is not None:
- *             raise AssertionError(             # <<<<<<<<<<<<<<
- *                     "unpacker.feed() is not be able to use with `file_like`.")
- * 
- */
-    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_AssertionError, __pyx_tuple__26, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 394, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(1, 394, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":393
- *         cdef Py_ssize_t buf_len
- * 
- *         if self.file_like is not None:             # <<<<<<<<<<<<<<
- *             raise AssertionError(
- *                     "unpacker.feed() is not be able to use with `file_like`.")
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":397
- *                     "unpacker.feed() is not be able to use with `file_like`.")
- * 
- *         get_data_from_buffer(next_bytes, &pybuff, &buf, &buf_len)             # <<<<<<<<<<<<<<
- *         try:
- *             self.append_buffer(buf, buf_len)
- */
-  __pyx_t_3 = __pyx_f_7msgpack_9_cmsgpack_get_data_from_buffer(__pyx_v_next_bytes, (&__pyx_v_pybuff), (&__pyx_v_buf), (&__pyx_v_buf_len)); if (unlikely(__pyx_t_3 == ((int)0))) __PYX_ERR(1, 397, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":398
- * 
- *         get_data_from_buffer(next_bytes, &pybuff, &buf, &buf_len)
- *         try:             # <<<<<<<<<<<<<<
- *             self.append_buffer(buf, buf_len)
- *         finally:
- */
-  /*try:*/ {
-
-    /* "msgpack/_unpacker.pyx":399
- *         get_data_from_buffer(next_bytes, &pybuff, &buf, &buf_len)
- *         try:
- *             self.append_buffer(buf, buf_len)             # <<<<<<<<<<<<<<
- *         finally:
- *             PyBuffer_Release(&pybuff)
- */
-    __pyx_t_2 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->append_buffer(__pyx_v_self, __pyx_v_buf, __pyx_v_buf_len); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 399, __pyx_L5_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  }
-
-  /* "msgpack/_unpacker.pyx":401
- *             self.append_buffer(buf, buf_len)
- *         finally:
- *             PyBuffer_Release(&pybuff)             # <<<<<<<<<<<<<<
- * 
- *     cdef append_buffer(self, void* _buf, Py_ssize_t _buf_len):
- */
-  /*finally:*/ {
-    /*normal exit:*/{
-      PyBuffer_Release((&__pyx_v_pybuff));
-      goto __pyx_L6;
-    }
-    __pyx_L5_error:;
-    /*exception exit:*/{
-      __Pyx_PyThreadState_declare
-      __Pyx_PyThreadState_assign
-      __pyx_t_6 = 0; __pyx_t_7 = 0; __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0;
-      __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);
-      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8) < 0)) __Pyx_ErrFetch(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8);
-      __Pyx_XGOTREF(__pyx_t_6);
-      __Pyx_XGOTREF(__pyx_t_7);
-      __Pyx_XGOTREF(__pyx_t_8);
-      __Pyx_XGOTREF(__pyx_t_9);
-      __Pyx_XGOTREF(__pyx_t_10);
-      __Pyx_XGOTREF(__pyx_t_11);
-      __pyx_t_3 = __pyx_lineno; __pyx_t_4 = __pyx_clineno; __pyx_t_5 = __pyx_filename;
-      {
-        PyBuffer_Release((&__pyx_v_pybuff));
-      }
-      if (PY_MAJOR_VERSION >= 3) {
-        __Pyx_XGIVEREF(__pyx_t_9);
-        __Pyx_XGIVEREF(__pyx_t_10);
-        __Pyx_XGIVEREF(__pyx_t_11);
-        __Pyx_ExceptionReset(__pyx_t_9, __pyx_t_10, __pyx_t_11);
-      }
-      __Pyx_XGIVEREF(__pyx_t_6);
-      __Pyx_XGIVEREF(__pyx_t_7);
-      __Pyx_XGIVEREF(__pyx_t_8);
-      __Pyx_ErrRestore(__pyx_t_6, __pyx_t_7, __pyx_t_8);
-      __pyx_t_6 = 0; __pyx_t_7 = 0; __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0;
-      __pyx_lineno = __pyx_t_3; __pyx_clineno = __pyx_t_4; __pyx_filename = __pyx_t_5;
-      goto __pyx_L1_error;
-    }
-    __pyx_L6:;
-  }
-
-  /* "msgpack/_unpacker.pyx":387
- *                  max_map_len, max_ext_len)
- * 
- *     def feed(self, object next_bytes):             # <<<<<<<<<<<<<<
- *         """Append `next_bytes` to internal buffer."""
- *         cdef Py_buffer pybuff
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.feed", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":403
- *             PyBuffer_Release(&pybuff)
- * 
- *     cdef append_buffer(self, void* _buf, Py_ssize_t _buf_len):             # <<<<<<<<<<<<<<
- *         cdef:
- *             char* buf = self.buf
- */
-
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_8Unpacker_append_buffer(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, void *__pyx_v__buf, Py_ssize_t __pyx_v__buf_len) {
-  char *__pyx_v_buf;
-  char *__pyx_v_new_buf;
-  Py_ssize_t __pyx_v_head;
-  Py_ssize_t __pyx_v_tail;
-  Py_ssize_t __pyx_v_buf_size;
-  Py_ssize_t __pyx_v_new_size;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  char *__pyx_t_1;
-  Py_ssize_t __pyx_t_2;
-  int __pyx_t_3;
-  PyObject *__pyx_t_4 = NULL;
-  Py_ssize_t __pyx_t_5;
-  Py_ssize_t __pyx_t_6;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("append_buffer", 0);
-
-  /* "msgpack/_unpacker.pyx":405
- *     cdef append_buffer(self, void* _buf, Py_ssize_t _buf_len):
- *         cdef:
- *             char* buf = self.buf             # <<<<<<<<<<<<<<
- *             char* new_buf
- *             Py_ssize_t head = self.buf_head
- */
-  __pyx_t_1 = __pyx_v_self->buf;
-  __pyx_v_buf = __pyx_t_1;
-
-  /* "msgpack/_unpacker.pyx":407
- *             char* buf = self.buf
- *             char* new_buf
- *             Py_ssize_t head = self.buf_head             # <<<<<<<<<<<<<<
- *             Py_ssize_t tail = self.buf_tail
- *             Py_ssize_t buf_size = self.buf_size
- */
-  __pyx_t_2 = __pyx_v_self->buf_head;
-  __pyx_v_head = __pyx_t_2;
-
-  /* "msgpack/_unpacker.pyx":408
- *             char* new_buf
- *             Py_ssize_t head = self.buf_head
- *             Py_ssize_t tail = self.buf_tail             # <<<<<<<<<<<<<<
- *             Py_ssize_t buf_size = self.buf_size
- *             Py_ssize_t new_size
- */
-  __pyx_t_2 = __pyx_v_self->buf_tail;
-  __pyx_v_tail = __pyx_t_2;
-
-  /* "msgpack/_unpacker.pyx":409
- *             Py_ssize_t head = self.buf_head
- *             Py_ssize_t tail = self.buf_tail
- *             Py_ssize_t buf_size = self.buf_size             # <<<<<<<<<<<<<<
- *             Py_ssize_t new_size
- * 
- */
-  __pyx_t_2 = __pyx_v_self->buf_size;
-  __pyx_v_buf_size = __pyx_t_2;
-
-  /* "msgpack/_unpacker.pyx":412
- *             Py_ssize_t new_size
- * 
- *         if tail + _buf_len > buf_size:             # <<<<<<<<<<<<<<
- *             if ((tail - head) + _buf_len) <= buf_size:
- *                 # move to front.
- */
-  __pyx_t_3 = ((__pyx_v_tail + __pyx_v__buf_len) > __pyx_v_buf_size);
-  if (__pyx_t_3) {
-
-    /* "msgpack/_unpacker.pyx":413
- * 
- *         if tail + _buf_len > buf_size:
- *             if ((tail - head) + _buf_len) <= buf_size:             # <<<<<<<<<<<<<<
- *                 # move to front.
- *                 memmove(buf, buf + head, tail - head)
- */
-    __pyx_t_3 = (((__pyx_v_tail - __pyx_v_head) + __pyx_v__buf_len) <= __pyx_v_buf_size);
-    if (__pyx_t_3) {
-
-      /* "msgpack/_unpacker.pyx":415
- *             if ((tail - head) + _buf_len) <= buf_size:
- *                 # move to front.
- *                 memmove(buf, buf + head, tail - head)             # <<<<<<<<<<<<<<
- *                 tail -= head
- *                 head = 0
- */
-      (void)(memmove(__pyx_v_buf, (__pyx_v_buf + __pyx_v_head), (__pyx_v_tail - __pyx_v_head)));
-
-      /* "msgpack/_unpacker.pyx":416
- *                 # move to front.
- *                 memmove(buf, buf + head, tail - head)
- *                 tail -= head             # <<<<<<<<<<<<<<
- *                 head = 0
- *             else:
- */
-      __pyx_v_tail = (__pyx_v_tail - __pyx_v_head);
-
-      /* "msgpack/_unpacker.pyx":417
- *                 memmove(buf, buf + head, tail - head)
- *                 tail -= head
- *                 head = 0             # <<<<<<<<<<<<<<
- *             else:
- *                 # expand buffer.
- */
-      __pyx_v_head = 0;
-
-      /* "msgpack/_unpacker.pyx":413
- * 
- *         if tail + _buf_len > buf_size:
- *             if ((tail - head) + _buf_len) <= buf_size:             # <<<<<<<<<<<<<<
- *                 # move to front.
- *                 memmove(buf, buf + head, tail - head)
- */
-      goto __pyx_L4;
-    }
-
-    /* "msgpack/_unpacker.pyx":420
- *             else:
- *                 # expand buffer.
- *                 new_size = (tail-head) + _buf_len             # <<<<<<<<<<<<<<
- *                 if new_size > self.max_buffer_size:
- *                     raise BufferFull
- */
-    /*else*/ {
-      __pyx_v_new_size = ((__pyx_v_tail - __pyx_v_head) + __pyx_v__buf_len);
-
-      /* "msgpack/_unpacker.pyx":421
- *                 # expand buffer.
- *                 new_size = (tail-head) + _buf_len
- *                 if new_size > self.max_buffer_size:             # <<<<<<<<<<<<<<
- *                     raise BufferFull
- *                 new_size = min(new_size*2, self.max_buffer_size)
- */
-      __pyx_t_3 = (__pyx_v_new_size > __pyx_v_self->max_buffer_size);
-      if (unlikely(__pyx_t_3)) {
-
-        /* "msgpack/_unpacker.pyx":422
- *                 new_size = (tail-head) + _buf_len
- *                 if new_size > self.max_buffer_size:
- *                     raise BufferFull             # <<<<<<<<<<<<<<
- *                 new_size = min(new_size*2, self.max_buffer_size)
- *                 new_buf = <char*>PyMem_Malloc(new_size)
- */
-        __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_BufferFull); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 422, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_4);
-        __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __PYX_ERR(1, 422, __pyx_L1_error)
-
-        /* "msgpack/_unpacker.pyx":421
- *                 # expand buffer.
- *                 new_size = (tail-head) + _buf_len
- *                 if new_size > self.max_buffer_size:             # <<<<<<<<<<<<<<
- *                     raise BufferFull
- *                 new_size = min(new_size*2, self.max_buffer_size)
- */
-      }
-
-      /* "msgpack/_unpacker.pyx":423
- *                 if new_size > self.max_buffer_size:
- *                     raise BufferFull
- *                 new_size = min(new_size*2, self.max_buffer_size)             # <<<<<<<<<<<<<<
- *                 new_buf = <char*>PyMem_Malloc(new_size)
- *                 if new_buf == NULL:
- */
-      __pyx_t_2 = __pyx_v_self->max_buffer_size;
-      __pyx_t_5 = (__pyx_v_new_size * 2);
-      __pyx_t_3 = (__pyx_t_2 < __pyx_t_5);
-      if (__pyx_t_3) {
-        __pyx_t_6 = __pyx_t_2;
-      } else {
-        __pyx_t_6 = __pyx_t_5;
-      }
-      __pyx_v_new_size = __pyx_t_6;
-
-      /* "msgpack/_unpacker.pyx":424
- *                     raise BufferFull
- *                 new_size = min(new_size*2, self.max_buffer_size)
- *                 new_buf = <char*>PyMem_Malloc(new_size)             # <<<<<<<<<<<<<<
- *                 if new_buf == NULL:
- *                     # self.buf still holds old buffer and will be freed during
- */
-      __pyx_v_new_buf = ((char *)PyMem_Malloc(__pyx_v_new_size));
-
-      /* "msgpack/_unpacker.pyx":425
- *                 new_size = min(new_size*2, self.max_buffer_size)
- *                 new_buf = <char*>PyMem_Malloc(new_size)
- *                 if new_buf == NULL:             # <<<<<<<<<<<<<<
- *                     # self.buf still holds old buffer and will be freed during
- *                     # obj destruction
- */
-      __pyx_t_3 = (__pyx_v_new_buf == NULL);
-      if (unlikely(__pyx_t_3)) {
-
-        /* "msgpack/_unpacker.pyx":428
- *                     # self.buf still holds old buffer and will be freed during
- *                     # obj destruction
- *                     raise MemoryError("Unable to enlarge internal buffer.")             # <<<<<<<<<<<<<<
- *                 memcpy(new_buf, buf + head, tail - head)
- *                 PyMem_Free(buf)
- */
-        __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__27, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 428, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_4);
-        __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __PYX_ERR(1, 428, __pyx_L1_error)
-
-        /* "msgpack/_unpacker.pyx":425
- *                 new_size = min(new_size*2, self.max_buffer_size)
- *                 new_buf = <char*>PyMem_Malloc(new_size)
- *                 if new_buf == NULL:             # <<<<<<<<<<<<<<
- *                     # self.buf still holds old buffer and will be freed during
- *                     # obj destruction
- */
-      }
-
-      /* "msgpack/_unpacker.pyx":429
- *                     # obj destruction
- *                     raise MemoryError("Unable to enlarge internal buffer.")
- *                 memcpy(new_buf, buf + head, tail - head)             # <<<<<<<<<<<<<<
- *                 PyMem_Free(buf)
- * 
- */
-      (void)(memcpy(__pyx_v_new_buf, (__pyx_v_buf + __pyx_v_head), (__pyx_v_tail - __pyx_v_head)));
-
-      /* "msgpack/_unpacker.pyx":430
- *                     raise MemoryError("Unable to enlarge internal buffer.")
- *                 memcpy(new_buf, buf + head, tail - head)
- *                 PyMem_Free(buf)             # <<<<<<<<<<<<<<
- * 
- *                 buf = new_buf
- */
-      PyMem_Free(__pyx_v_buf);
-
-      /* "msgpack/_unpacker.pyx":432
- *                 PyMem_Free(buf)
- * 
- *                 buf = new_buf             # <<<<<<<<<<<<<<
- *                 buf_size = new_size
- *                 tail -= head
- */
-      __pyx_v_buf = __pyx_v_new_buf;
-
-      /* "msgpack/_unpacker.pyx":433
- * 
- *                 buf = new_buf
- *                 buf_size = new_size             # <<<<<<<<<<<<<<
- *                 tail -= head
- *                 head = 0
- */
-      __pyx_v_buf_size = __pyx_v_new_size;
-
-      /* "msgpack/_unpacker.pyx":434
- *                 buf = new_buf
- *                 buf_size = new_size
- *                 tail -= head             # <<<<<<<<<<<<<<
- *                 head = 0
- * 
- */
-      __pyx_v_tail = (__pyx_v_tail - __pyx_v_head);
-
-      /* "msgpack/_unpacker.pyx":435
- *                 buf_size = new_size
- *                 tail -= head
- *                 head = 0             # <<<<<<<<<<<<<<
- * 
- *         memcpy(buf + tail, <char*>(_buf), _buf_len)
- */
-      __pyx_v_head = 0;
-    }
-    __pyx_L4:;
-
-    /* "msgpack/_unpacker.pyx":412
- *             Py_ssize_t new_size
- * 
- *         if tail + _buf_len > buf_size:             # <<<<<<<<<<<<<<
- *             if ((tail - head) + _buf_len) <= buf_size:
- *                 # move to front.
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":437
- *                 head = 0
- * 
- *         memcpy(buf + tail, <char*>(_buf), _buf_len)             # <<<<<<<<<<<<<<
- *         self.buf = buf
- *         self.buf_head = head
- */
-  (void)(memcpy((__pyx_v_buf + __pyx_v_tail), ((char *)__pyx_v__buf), __pyx_v__buf_len));
-
-  /* "msgpack/_unpacker.pyx":438
- * 
- *         memcpy(buf + tail, <char*>(_buf), _buf_len)
- *         self.buf = buf             # <<<<<<<<<<<<<<
- *         self.buf_head = head
- *         self.buf_size = buf_size
- */
-  __pyx_v_self->buf = __pyx_v_buf;
-
-  /* "msgpack/_unpacker.pyx":439
- *         memcpy(buf + tail, <char*>(_buf), _buf_len)
- *         self.buf = buf
- *         self.buf_head = head             # <<<<<<<<<<<<<<
- *         self.buf_size = buf_size
- *         self.buf_tail = tail + _buf_len
- */
-  __pyx_v_self->buf_head = __pyx_v_head;
-
-  /* "msgpack/_unpacker.pyx":440
- *         self.buf = buf
- *         self.buf_head = head
- *         self.buf_size = buf_size             # <<<<<<<<<<<<<<
- *         self.buf_tail = tail + _buf_len
- * 
- */
-  __pyx_v_self->buf_size = __pyx_v_buf_size;
-
-  /* "msgpack/_unpacker.pyx":441
- *         self.buf_head = head
- *         self.buf_size = buf_size
- *         self.buf_tail = tail + _buf_len             # <<<<<<<<<<<<<<
- * 
- *     cdef int read_from_file(self) except -1:
- */
-  __pyx_v_self->buf_tail = (__pyx_v_tail + __pyx_v__buf_len);
-
-  /* "msgpack/_unpacker.pyx":403
- *             PyBuffer_Release(&pybuff)
- * 
- *     cdef append_buffer(self, void* _buf, Py_ssize_t _buf_len):             # <<<<<<<<<<<<<<
- *         cdef:
- *             char* buf = self.buf
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_4);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.append_buffer", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":443
- *         self.buf_tail = tail + _buf_len
- * 
- *     cdef int read_from_file(self) except -1:             # <<<<<<<<<<<<<<
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
- *         if remains <= 0:
- */
-
-static int __pyx_f_7msgpack_9_cmsgpack_8Unpacker_read_from_file(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  Py_ssize_t __pyx_v_remains;
-  PyObject *__pyx_v_next_bytes = NULL;
-  int __pyx_r;
-  __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  Py_ssize_t __pyx_t_3;
-  Py_ssize_t __pyx_t_4;
-  Py_ssize_t __pyx_t_5;
-  PyObject *__pyx_t_6 = NULL;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  int __pyx_t_9;
-  char *__pyx_t_10;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("read_from_file", 0);
-
-  /* "msgpack/_unpacker.pyx":444
- * 
- *     cdef int read_from_file(self) except -1:
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)             # <<<<<<<<<<<<<<
- *         if remains <= 0:
- *             raise BufferFull
- */
-  __pyx_v_remains = (__pyx_v_self->max_buffer_size - (__pyx_v_self->buf_tail - __pyx_v_self->buf_head));
-
-  /* "msgpack/_unpacker.pyx":445
- *     cdef int read_from_file(self) except -1:
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
- *         if remains <= 0:             # <<<<<<<<<<<<<<
- *             raise BufferFull
- * 
- */
-  __pyx_t_1 = (__pyx_v_remains <= 0);
-  if (unlikely(__pyx_t_1)) {
-
-    /* "msgpack/_unpacker.pyx":446
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
- *         if remains <= 0:
- *             raise BufferFull             # <<<<<<<<<<<<<<
- * 
- *         next_bytes = self.file_like_read(min(self.read_size, remains))
- */
-    __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_BufferFull); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 446, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_Raise(__pyx_t_2, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __PYX_ERR(1, 446, __pyx_L1_error)
-
-    /* "msgpack/_unpacker.pyx":445
- *     cdef int read_from_file(self) except -1:
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
- *         if remains <= 0:             # <<<<<<<<<<<<<<
- *             raise BufferFull
- * 
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":448
- *             raise BufferFull
- * 
- *         next_bytes = self.file_like_read(min(self.read_size, remains))             # <<<<<<<<<<<<<<
- *         if next_bytes:
- *             self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))
- */
-  __pyx_t_3 = __pyx_v_remains;
-  __pyx_t_4 = __pyx_v_self->read_size;
-  __pyx_t_1 = (__pyx_t_3 < __pyx_t_4);
-  if (__pyx_t_1) {
-    __pyx_t_5 = __pyx_t_3;
-  } else {
-    __pyx_t_5 = __pyx_t_4;
-  }
-  __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 448, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_6);
-  __Pyx_INCREF(__pyx_v_self->file_like_read);
-  __pyx_t_7 = __pyx_v_self->file_like_read; __pyx_t_8 = NULL;
-  __pyx_t_9 = 0;
-  #if CYTHON_UNPACK_METHODS
-  if (likely(PyMethod_Check(__pyx_t_7))) {
-    __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_7);
-    if (likely(__pyx_t_8)) {
-      PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7);
-      __Pyx_INCREF(__pyx_t_8);
-      __Pyx_INCREF(function);
-      __Pyx_DECREF_SET(__pyx_t_7, function);
-      __pyx_t_9 = 1;
-    }
-  }
-  #endif
-  {
-    PyObject *__pyx_callargs[2] = {__pyx_t_8, __pyx_t_6};
-    __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
-    __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 448, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-  }
-  __pyx_v_next_bytes = __pyx_t_2;
-  __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":449
- * 
- *         next_bytes = self.file_like_read(min(self.read_size, remains))
- *         if next_bytes:             # <<<<<<<<<<<<<<
- *             self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))
- *         else:
- */
-  __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_next_bytes); if (unlikely((__pyx_t_1 < 0))) __PYX_ERR(1, 449, __pyx_L1_error)
-  if (__pyx_t_1) {
-
-    /* "msgpack/_unpacker.pyx":450
- *         next_bytes = self.file_like_read(min(self.read_size, remains))
- *         if next_bytes:
- *             self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))             # <<<<<<<<<<<<<<
- *         else:
- *             self.file_like = None
- */
-    __pyx_t_10 = PyBytes_AsString(__pyx_v_next_bytes); if (unlikely(__pyx_t_10 == ((char *)NULL))) __PYX_ERR(1, 450, __pyx_L1_error)
-    __pyx_t_5 = PyBytes_Size(__pyx_v_next_bytes); if (unlikely(__pyx_t_5 == ((Py_ssize_t)-1L))) __PYX_ERR(1, 450, __pyx_L1_error)
-    __pyx_t_2 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->append_buffer(__pyx_v_self, __pyx_t_10, __pyx_t_5); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 450, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-    /* "msgpack/_unpacker.pyx":449
- * 
- *         next_bytes = self.file_like_read(min(self.read_size, remains))
- *         if next_bytes:             # <<<<<<<<<<<<<<
- *             self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))
- *         else:
- */
-    goto __pyx_L4;
-  }
-
-  /* "msgpack/_unpacker.pyx":452
- *             self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))
- *         else:
- *             self.file_like = None             # <<<<<<<<<<<<<<
- *         return 0
- * 
- */
-  /*else*/ {
-    __Pyx_INCREF(Py_None);
-    __Pyx_GIVEREF(Py_None);
-    __Pyx_GOTREF(__pyx_v_self->file_like);
-    __Pyx_DECREF(__pyx_v_self->file_like);
-    __pyx_v_self->file_like = Py_None;
-  }
-  __pyx_L4:;
-
-  /* "msgpack/_unpacker.pyx":453
- *         else:
- *             self.file_like = None
- *         return 0             # <<<<<<<<<<<<<<
- * 
- *     cdef object _unpack(self, execute_fn execute, bint iter=0):
- */
-  __pyx_r = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":443
- *         self.buf_tail = tail + _buf_len
- * 
- *     cdef int read_from_file(self) except -1:             # <<<<<<<<<<<<<<
- *         cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
- *         if remains <= 0:
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_XDECREF(__pyx_t_7);
-  __Pyx_XDECREF(__pyx_t_8);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_from_file", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = -1;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_next_bytes);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":455
- *         return 0
- * 
- *     cdef object _unpack(self, execute_fn execute, bint iter=0):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         cdef object obj
- */
-
-static PyObject *__pyx_f_7msgpack_9_cmsgpack_8Unpacker__unpack(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, execute_fn __pyx_v_execute, struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack *__pyx_optional_args) {
-  int __pyx_v_iter = ((int)0);
-  int __pyx_v_ret;
-  PyObject *__pyx_v_obj = 0;
-  Py_ssize_t __pyx_v_prev_head;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  Py_ssize_t __pyx_t_1;
-  int __pyx_t_2;
-  int __pyx_t_3;
-  PyObject *__pyx_t_4 = NULL;
-  PyObject *__pyx_t_5 = NULL;
-  PyObject *__pyx_t_6 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("_unpack", 0);
-  if (__pyx_optional_args) {
-    if (__pyx_optional_args->__pyx_n > 0) {
-      __pyx_v_iter = __pyx_optional_args->iter;
-    }
-  }
-
-  /* "msgpack/_unpacker.pyx":460
- *         cdef Py_ssize_t prev_head
- * 
- *         while 1:             # <<<<<<<<<<<<<<
- *             prev_head = self.buf_head
- *             if prev_head < self.buf_tail:
- */
-  while (1) {
-
-    /* "msgpack/_unpacker.pyx":461
- * 
- *         while 1:
- *             prev_head = self.buf_head             # <<<<<<<<<<<<<<
- *             if prev_head < self.buf_tail:
- *                 ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
- */
-    __pyx_t_1 = __pyx_v_self->buf_head;
-    __pyx_v_prev_head = __pyx_t_1;
-
-    /* "msgpack/_unpacker.pyx":462
- *         while 1:
- *             prev_head = self.buf_head
- *             if prev_head < self.buf_tail:             # <<<<<<<<<<<<<<
- *                 ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
- *                 self.stream_offset += self.buf_head - prev_head
- */
-    __pyx_t_2 = (__pyx_v_prev_head < __pyx_v_self->buf_tail);
-    if (__pyx_t_2) {
-
-      /* "msgpack/_unpacker.pyx":463
- *             prev_head = self.buf_head
- *             if prev_head < self.buf_tail:
- *                 ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)             # <<<<<<<<<<<<<<
- *                 self.stream_offset += self.buf_head - prev_head
- *             else:
- */
-      __pyx_t_3 = __pyx_v_execute((&__pyx_v_self->ctx), __pyx_v_self->buf, __pyx_v_self->buf_tail, (&__pyx_v_self->buf_head)); if (unlikely(__pyx_t_3 == ((int)-1) && PyErr_Occurred())) __PYX_ERR(1, 463, __pyx_L1_error)
-      __pyx_v_ret = __pyx_t_3;
-
-      /* "msgpack/_unpacker.pyx":464
- *             if prev_head < self.buf_tail:
- *                 ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
- *                 self.stream_offset += self.buf_head - prev_head             # <<<<<<<<<<<<<<
- *             else:
- *                 ret = 0
- */
-      __pyx_v_self->stream_offset = (__pyx_v_self->stream_offset + (__pyx_v_self->buf_head - __pyx_v_prev_head));
-
-      /* "msgpack/_unpacker.pyx":462
- *         while 1:
- *             prev_head = self.buf_head
- *             if prev_head < self.buf_tail:             # <<<<<<<<<<<<<<
- *                 ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
- *                 self.stream_offset += self.buf_head - prev_head
- */
-      goto __pyx_L5;
-    }
-
-    /* "msgpack/_unpacker.pyx":466
- *                 self.stream_offset += self.buf_head - prev_head
- *             else:
- *                 ret = 0             # <<<<<<<<<<<<<<
- * 
- *             if ret == 1:
- */
-    /*else*/ {
-      __pyx_v_ret = 0;
-    }
-    __pyx_L5:;
-
-    /* "msgpack/_unpacker.pyx":468
- *                 ret = 0
- * 
- *             if ret == 1:             # <<<<<<<<<<<<<<
- *                 obj = unpack_data(&self.ctx)
- *                 unpack_init(&self.ctx)
- */
-    switch (__pyx_v_ret) {
-      case 1:
-
-      /* "msgpack/_unpacker.pyx":469
- * 
- *             if ret == 1:
- *                 obj = unpack_data(&self.ctx)             # <<<<<<<<<<<<<<
- *                 unpack_init(&self.ctx)
- *                 return obj
- */
-      __pyx_t_4 = unpack_data((&__pyx_v_self->ctx)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 469, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __pyx_v_obj = __pyx_t_4;
-      __pyx_t_4 = 0;
-
-      /* "msgpack/_unpacker.pyx":470
- *             if ret == 1:
- *                 obj = unpack_data(&self.ctx)
- *                 unpack_init(&self.ctx)             # <<<<<<<<<<<<<<
- *                 return obj
- *             elif ret == 0:
- */
-      unpack_init((&__pyx_v_self->ctx));
-
-      /* "msgpack/_unpacker.pyx":471
- *                 obj = unpack_data(&self.ctx)
- *                 unpack_init(&self.ctx)
- *                 return obj             # <<<<<<<<<<<<<<
- *             elif ret == 0:
- *                 if self.file_like is not None:
- */
-      __Pyx_XDECREF(__pyx_r);
-      __Pyx_INCREF(__pyx_v_obj);
-      __pyx_r = __pyx_v_obj;
-      goto __pyx_L0;
-
-      /* "msgpack/_unpacker.pyx":468
- *                 ret = 0
- * 
- *             if ret == 1:             # <<<<<<<<<<<<<<
- *                 obj = unpack_data(&self.ctx)
- *                 unpack_init(&self.ctx)
- */
-      break;
-      case 0:
-
-      /* "msgpack/_unpacker.pyx":473
- *                 return obj
- *             elif ret == 0:
- *                 if self.file_like is not None:             # <<<<<<<<<<<<<<
- *                     self.read_from_file()
- *                     continue
- */
-      __pyx_t_2 = (__pyx_v_self->file_like != Py_None);
-      if (__pyx_t_2) {
-
-        /* "msgpack/_unpacker.pyx":474
- *             elif ret == 0:
- *                 if self.file_like is not None:
- *                     self.read_from_file()             # <<<<<<<<<<<<<<
- *                     continue
- *                 if iter:
- */
-        __pyx_t_3 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->read_from_file(__pyx_v_self); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(1, 474, __pyx_L1_error)
-
-        /* "msgpack/_unpacker.pyx":475
- *                 if self.file_like is not None:
- *                     self.read_from_file()
- *                     continue             # <<<<<<<<<<<<<<
- *                 if iter:
- *                     raise StopIteration("No more data to unpack.")
- */
-        goto __pyx_L3_continue;
-
-        /* "msgpack/_unpacker.pyx":473
- *                 return obj
- *             elif ret == 0:
- *                 if self.file_like is not None:             # <<<<<<<<<<<<<<
- *                     self.read_from_file()
- *                     continue
- */
-      }
-
-      /* "msgpack/_unpacker.pyx":476
- *                     self.read_from_file()
- *                     continue
- *                 if iter:             # <<<<<<<<<<<<<<
- *                     raise StopIteration("No more data to unpack.")
- *                 else:
- */
-      if (unlikely(__pyx_v_iter)) {
-
-        /* "msgpack/_unpacker.pyx":477
- *                     continue
- *                 if iter:
- *                     raise StopIteration("No more data to unpack.")             # <<<<<<<<<<<<<<
- *                 else:
- *                     raise OutOfData("No more data to unpack.")
- */
-        __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_StopIteration, __pyx_tuple__28, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 477, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_4);
-        __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __PYX_ERR(1, 477, __pyx_L1_error)
-
-        /* "msgpack/_unpacker.pyx":476
- *                     self.read_from_file()
- *                     continue
- *                 if iter:             # <<<<<<<<<<<<<<
- *                     raise StopIteration("No more data to unpack.")
- *                 else:
- */
-      }
-
-      /* "msgpack/_unpacker.pyx":479
- *                     raise StopIteration("No more data to unpack.")
- *                 else:
- *                     raise OutOfData("No more data to unpack.")             # <<<<<<<<<<<<<<
- *             elif ret == -2:
- *                 raise FormatError
- */
-      /*else*/ {
-        __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_OutOfData); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 479, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_5);
-        __pyx_t_6 = NULL;
-        __pyx_t_3 = 0;
-        #if CYTHON_UNPACK_METHODS
-        if (unlikely(PyMethod_Check(__pyx_t_5))) {
-          __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5);
-          if (likely(__pyx_t_6)) {
-            PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
-            __Pyx_INCREF(__pyx_t_6);
-            __Pyx_INCREF(function);
-            __Pyx_DECREF_SET(__pyx_t_5, function);
-            __pyx_t_3 = 1;
-          }
-        }
-        #endif
-        {
-          PyObject *__pyx_callargs[2] = {__pyx_t_6, __pyx_kp_u_No_more_data_to_unpack};
-          __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_3, 1+__pyx_t_3);
-          __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-          if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 479, __pyx_L1_error)
-          __Pyx_GOTREF(__pyx_t_4);
-          __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-        }
-        __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-        __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-        __PYX_ERR(1, 479, __pyx_L1_error)
-      }
-
-      /* "msgpack/_unpacker.pyx":472
- *                 unpack_init(&self.ctx)
- *                 return obj
- *             elif ret == 0:             # <<<<<<<<<<<<<<
- *                 if self.file_like is not None:
- *                     self.read_from_file()
- */
-      break;
-      case -2L:
-
-      /* "msgpack/_unpacker.pyx":481
- *                     raise OutOfData("No more data to unpack.")
- *             elif ret == -2:
- *                 raise FormatError             # <<<<<<<<<<<<<<
- *             elif ret == -3:
- *                 raise StackError
- */
-      __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FormatError); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 481, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __PYX_ERR(1, 481, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":480
- *                 else:
- *                     raise OutOfData("No more data to unpack.")
- *             elif ret == -2:             # <<<<<<<<<<<<<<
- *                 raise FormatError
- *             elif ret == -3:
- */
-      break;
-      case -3L:
-
-      /* "msgpack/_unpacker.pyx":483
- *                 raise FormatError
- *             elif ret == -3:
- *                 raise StackError             # <<<<<<<<<<<<<<
- *             else:
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))
- */
-      __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_StackError); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 483, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __PYX_ERR(1, 483, __pyx_L1_error)
-
-      /* "msgpack/_unpacker.pyx":482
- *             elif ret == -2:
- *                 raise FormatError
- *             elif ret == -3:             # <<<<<<<<<<<<<<
- *                 raise StackError
- *             else:
- */
-      break;
-      default:
-
-      /* "msgpack/_unpacker.pyx":485
- *                 raise StackError
- *             else:
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))             # <<<<<<<<<<<<<<
- * 
- *     def read_bytes(self, Py_ssize_t nbytes):
- */
-      __pyx_t_4 = __Pyx_PyUnicode_From_int(__pyx_v_ret, 0, ' ', 'd'); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 485, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_5 = __Pyx_PyUnicode_Concat(__pyx_kp_u_Unpack_failed_error, __pyx_t_4); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 485, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_5);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 485, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __PYX_ERR(1, 485, __pyx_L1_error)
-      break;
-    }
-    __pyx_L3_continue:;
-  }
-
-  /* "msgpack/_unpacker.pyx":455
- *         return 0
- * 
- *     cdef object _unpack(self, execute_fn execute, bint iter=0):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         cdef object obj
- */
-
-  /* function exit code */
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_4);
-  __Pyx_XDECREF(__pyx_t_5);
-  __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker._unpack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = 0;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_obj);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":487
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))
- * 
- *     def read_bytes(self, Py_ssize_t nbytes):             # <<<<<<<<<<<<<<
- *         """Read a specified number of raw bytes from the stream"""
- *         cdef Py_ssize_t nread
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_9read_bytes(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_8read_bytes, "Unpacker.read_bytes(self, Py_ssize_t nbytes)\nRead a specified number of raw bytes from the stream");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_9read_bytes = {"read_bytes", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_9read_bytes, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_8read_bytes};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_9read_bytes(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  Py_ssize_t __pyx_v_nbytes;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("read_bytes (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 487, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_nbytes,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_nbytes)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 487, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "read_bytes") < 0)) __PYX_ERR(1, 487, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v_nbytes = __Pyx_PyIndex_AsSsize_t(values[0]); if (unlikely((__pyx_v_nbytes == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 487, __pyx_L3_error)
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("read_bytes", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 487, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_bytes", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_8read_bytes(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self), __pyx_v_nbytes);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_8read_bytes(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, Py_ssize_t __pyx_v_nbytes) {
-  Py_ssize_t __pyx_v_nread;
-  PyObject *__pyx_v_ret = NULL;
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  Py_ssize_t __pyx_t_1;
-  Py_ssize_t __pyx_t_2;
-  Py_ssize_t __pyx_t_3;
-  int __pyx_t_4;
-  PyObject *__pyx_t_5 = NULL;
-  int __pyx_t_6;
-  PyObject *__pyx_t_7 = NULL;
-  PyObject *__pyx_t_8 = NULL;
-  PyObject *__pyx_t_9 = NULL;
-  int __pyx_t_10;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("read_bytes", 0);
-
-  /* "msgpack/_unpacker.pyx":490
- *         """Read a specified number of raw bytes from the stream"""
- *         cdef Py_ssize_t nread
- *         nread = min(self.buf_tail - self.buf_head, nbytes)             # <<<<<<<<<<<<<<
- *         ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
- *         self.buf_head += nread
- */
-  __pyx_t_1 = __pyx_v_nbytes;
-  __pyx_t_2 = (__pyx_v_self->buf_tail - __pyx_v_self->buf_head);
-  __pyx_t_4 = (__pyx_t_1 < __pyx_t_2);
-  if (__pyx_t_4) {
-    __pyx_t_3 = __pyx_t_1;
-  } else {
-    __pyx_t_3 = __pyx_t_2;
-  }
-  __pyx_v_nread = __pyx_t_3;
-
-  /* "msgpack/_unpacker.pyx":491
- *         cdef Py_ssize_t nread
- *         nread = min(self.buf_tail - self.buf_head, nbytes)
- *         ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)             # <<<<<<<<<<<<<<
- *         self.buf_head += nread
- *         if nread < nbytes and self.file_like is not None:
- */
-  __pyx_t_5 = PyBytes_FromStringAndSize((__pyx_v_self->buf + __pyx_v_self->buf_head), __pyx_v_nread); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 491, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_5);
-  __pyx_v_ret = __pyx_t_5;
-  __pyx_t_5 = 0;
-
-  /* "msgpack/_unpacker.pyx":492
- *         nread = min(self.buf_tail - self.buf_head, nbytes)
- *         ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
- *         self.buf_head += nread             # <<<<<<<<<<<<<<
- *         if nread < nbytes and self.file_like is not None:
- *             ret += self.file_like.read(nbytes - nread)
- */
-  __pyx_v_self->buf_head = (__pyx_v_self->buf_head + __pyx_v_nread);
-
-  /* "msgpack/_unpacker.pyx":493
- *         ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
- *         self.buf_head += nread
- *         if nread < nbytes and self.file_like is not None:             # <<<<<<<<<<<<<<
- *             ret += self.file_like.read(nbytes - nread)
- *             nread = len(ret)
- */
-  __pyx_t_6 = (__pyx_v_nread < __pyx_v_nbytes);
-  if (__pyx_t_6) {
-  } else {
-    __pyx_t_4 = __pyx_t_6;
-    goto __pyx_L4_bool_binop_done;
-  }
-  __pyx_t_6 = (__pyx_v_self->file_like != Py_None);
-  __pyx_t_4 = __pyx_t_6;
-  __pyx_L4_bool_binop_done:;
-  if (__pyx_t_4) {
-
-    /* "msgpack/_unpacker.pyx":494
- *         self.buf_head += nread
- *         if nread < nbytes and self.file_like is not None:
- *             ret += self.file_like.read(nbytes - nread)             # <<<<<<<<<<<<<<
- *             nread = len(ret)
- *         self.stream_offset += nread
- */
-    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_self->file_like, __pyx_n_s_read); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 494, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_8 = PyInt_FromSsize_t((__pyx_v_nbytes - __pyx_v_nread)); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 494, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_9 = NULL;
-    __pyx_t_10 = 0;
-    #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_7))) {
-      __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_7);
-      if (likely(__pyx_t_9)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7);
-        __Pyx_INCREF(__pyx_t_9);
-        __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_7, function);
-        __pyx_t_10 = 1;
-      }
-    }
-    #endif
-    {
-      PyObject *__pyx_callargs[2] = {__pyx_t_9, __pyx_t_8};
-      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_10, 1+__pyx_t_10);
-      __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-      if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 494, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_5);
-      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    }
-    __pyx_t_7 = PyNumber_InPlaceAdd(__pyx_v_ret, __pyx_t_5); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 494, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_7);
-    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __Pyx_DECREF_SET(__pyx_v_ret, __pyx_t_7);
-    __pyx_t_7 = 0;
-
-    /* "msgpack/_unpacker.pyx":495
- *         if nread < nbytes and self.file_like is not None:
- *             ret += self.file_like.read(nbytes - nread)
- *             nread = len(ret)             # <<<<<<<<<<<<<<
- *         self.stream_offset += nread
- *         return ret
- */
-    __pyx_t_3 = PyObject_Length(__pyx_v_ret); if (unlikely(__pyx_t_3 == ((Py_ssize_t)-1))) __PYX_ERR(1, 495, __pyx_L1_error)
-    __pyx_v_nread = __pyx_t_3;
-
-    /* "msgpack/_unpacker.pyx":493
- *         ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
- *         self.buf_head += nread
- *         if nread < nbytes and self.file_like is not None:             # <<<<<<<<<<<<<<
- *             ret += self.file_like.read(nbytes - nread)
- *             nread = len(ret)
- */
-  }
-
-  /* "msgpack/_unpacker.pyx":496
- *             ret += self.file_like.read(nbytes - nread)
- *             nread = len(ret)
- *         self.stream_offset += nread             # <<<<<<<<<<<<<<
- *         return ret
- * 
- */
-  __pyx_v_self->stream_offset = (__pyx_v_self->stream_offset + __pyx_v_nread);
-
-  /* "msgpack/_unpacker.pyx":497
- *             nread = len(ret)
- *         self.stream_offset += nread
- *         return ret             # <<<<<<<<<<<<<<
- * 
- *     def unpack(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(__pyx_v_ret);
-  __pyx_r = __pyx_v_ret;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":487
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))
- * 
- *     def read_bytes(self, Py_ssize_t nbytes):             # <<<<<<<<<<<<<<
- *         """Read a specified number of raw bytes from the stream"""
- *         cdef Py_ssize_t nread
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_5);
-  __Pyx_XDECREF(__pyx_t_7);
-  __Pyx_XDECREF(__pyx_t_8);
-  __Pyx_XDECREF(__pyx_t_9);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_bytes", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XDECREF(__pyx_v_ret);
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":499
- *         return ret
- * 
- *     def unpack(self):             # <<<<<<<<<<<<<<
- *         """Unpack one object
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_11unpack(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_10unpack, "Unpacker.unpack(self)\nUnpack one object\n\n        Raises `OutOfData` when there are no more bytes to unpack.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_11unpack = {"unpack", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_11unpack, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_10unpack};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_11unpack(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("unpack (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 499, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("unpack", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "unpack", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.unpack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_10unpack(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_10unpack(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("unpack", 0);
-
-  /* "msgpack/_unpacker.pyx":504
- *         Raises `OutOfData` when there are no more bytes to unpack.
- *         """
- *         return self._unpack(unpack_construct)             # <<<<<<<<<<<<<<
- * 
- *     def skip(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->_unpack(__pyx_v_self, unpack_construct, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 504, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":499
- *         return ret
- * 
- *     def unpack(self):             # <<<<<<<<<<<<<<
- *         """Unpack one object
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.unpack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":506
- *         return self._unpack(unpack_construct)
- * 
- *     def skip(self):             # <<<<<<<<<<<<<<
- *         """Read and ignore one object, returning None
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_13skip(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_12skip, "Unpacker.skip(self)\nRead and ignore one object, returning None\n\n        Raises `OutOfData` when there are no more bytes to unpack.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_13skip = {"skip", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_13skip, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_12skip};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_13skip(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("skip (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 506, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("skip", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "skip", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.skip", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_12skip(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_12skip(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("skip", 0);
-
-  /* "msgpack/_unpacker.pyx":511
- *         Raises `OutOfData` when there are no more bytes to unpack.
- *         """
- *         return self._unpack(unpack_skip)             # <<<<<<<<<<<<<<
- * 
- *     def read_array_header(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->_unpack(__pyx_v_self, unpack_skip, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 511, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":506
- *         return self._unpack(unpack_construct)
- * 
- *     def skip(self):             # <<<<<<<<<<<<<<
- *         """Read and ignore one object, returning None
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.skip", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":513
- *         return self._unpack(unpack_skip)
- * 
- *     def read_array_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is an array, return its size n, such that
- *         the next n unpack() calls will iterate over its contents.
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_15read_array_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_14read_array_header, "Unpacker.read_array_header(self)\nassuming the next object is an array, return its size n, such that\n        the next n unpack() calls will iterate over its contents.\n\n        Raises `OutOfData` when there are no more bytes to unpack.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_15read_array_header = {"read_array_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_15read_array_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_14read_array_header};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_15read_array_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("read_array_header (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 513, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("read_array_header", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "read_array_header", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_array_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_14read_array_header(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_14read_array_header(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("read_array_header", 0);
-
-  /* "msgpack/_unpacker.pyx":519
- *         Raises `OutOfData` when there are no more bytes to unpack.
- *         """
- *         return self._unpack(read_array_header)             # <<<<<<<<<<<<<<
- * 
- *     def read_map_header(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->_unpack(__pyx_v_self, read_array_header, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 519, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":513
- *         return self._unpack(unpack_skip)
- * 
- *     def read_array_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is an array, return its size n, such that
- *         the next n unpack() calls will iterate over its contents.
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_array_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":521
- *         return self._unpack(read_array_header)
- * 
- *     def read_map_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is a map, return its size n, such that the
- *         next n * 2 unpack() calls will iterate over its key-value pairs.
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_17read_map_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_16read_map_header, "Unpacker.read_map_header(self)\nassuming the next object is a map, return its size n, such that the\n        next n * 2 unpack() calls will iterate over its key-value pairs.\n\n        Raises `OutOfData` when there are no more bytes to unpack.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_17read_map_header = {"read_map_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_17read_map_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_16read_map_header};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_17read_map_header(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("read_map_header (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 521, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("read_map_header", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "read_map_header", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_map_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_16read_map_header(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_16read_map_header(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("read_map_header", 0);
-
-  /* "msgpack/_unpacker.pyx":527
- *         Raises `OutOfData` when there are no more bytes to unpack.
- *         """
- *         return self._unpack(read_map_header)             # <<<<<<<<<<<<<<
- * 
- *     def tell(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->_unpack(__pyx_v_self, read_map_header, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 527, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":521
- *         return self._unpack(read_array_header)
- * 
- *     def read_map_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is a map, return its size n, such that the
- *         next n * 2 unpack() calls will iterate over its key-value pairs.
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.read_map_header", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":529
- *         return self._unpack(read_map_header)
- * 
- *     def tell(self):             # <<<<<<<<<<<<<<
- *         """Returns the current position of the Unpacker in bytes, i.e., the
- *         number of bytes that were read from the input, also the starting
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_19tell(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_18tell, "Unpacker.tell(self)\nReturns the current position of the Unpacker in bytes, i.e., the\n        number of bytes that were read from the input, also the starting\n        position of the next object.\n        ");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_19tell = {"tell", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_19tell, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_18tell};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_19tell(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("tell (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(1, 529, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("tell", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "tell", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.tell", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_18tell(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_18tell(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("tell", 0);
-
-  /* "msgpack/_unpacker.pyx":534
- *         position of the next object.
- *         """
- *         return self.stream_offset             # <<<<<<<<<<<<<<
- * 
- *     def __iter__(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyInt_From_uint64_t(__pyx_v_self->stream_offset); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 534, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":529
- *         return self._unpack(read_map_header)
- * 
- *     def tell(self):             # <<<<<<<<<<<<<<
- *         """Returns the current position of the Unpacker in bytes, i.e., the
- *         number of bytes that were read from the input, also the starting
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.tell", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":536
- *         return self.stream_offset
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         return self
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_21__iter__(PyObject *__pyx_v_self); /*proto*/
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_21__iter__(PyObject *__pyx_v_self) {
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_20__iter__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_20__iter__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__iter__", 0);
-
-  /* "msgpack/_unpacker.pyx":537
- * 
- *     def __iter__(self):
- *         return self             # <<<<<<<<<<<<<<
- * 
- *     def __next__(self):
- */
-  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF((PyObject *)__pyx_v_self);
-  __pyx_r = ((PyObject *)__pyx_v_self);
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":536
- *         return self.stream_offset
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         return self
- * 
- */
-
-  /* function exit code */
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "msgpack/_unpacker.pyx":539
- *         return self
- * 
- *     def __next__(self):             # <<<<<<<<<<<<<<
- *         return self._unpack(unpack_construct, 1)
- * 
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__(PyObject *__pyx_v_self); /*proto*/
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__(PyObject *__pyx_v_self) {
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__next__ (wrapper)", 0);
-  __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_22__next__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_22__next__(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack __pyx_t_2;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__next__", 0);
-
-  /* "msgpack/_unpacker.pyx":540
- * 
- *     def __next__(self):
- *         return self._unpack(unpack_construct, 1)             # <<<<<<<<<<<<<<
- * 
- *     # for debug.
- */
-  __Pyx_XDECREF(__pyx_r);
-  __pyx_t_2.__pyx_n = 1;
-  __pyx_t_2.iter = 1;
-  __pyx_t_1 = ((struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self->__pyx_vtab)->_unpack(__pyx_v_self, unpack_construct, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 540, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = __pyx_t_1;
-  __pyx_t_1 = 0;
-  goto __pyx_L0;
-
-  /* "msgpack/_unpacker.pyx":539
- *         return self
- * 
- *     def __next__(self):             # <<<<<<<<<<<<<<
- *         return self._unpack(unpack_construct, 1)
- * 
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__next__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __pyx_L0:;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__, "Unpacker.__reduce_cython__(self)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(4, 1, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  if (unlikely(__pyx_nargs > 0)) {
-    __Pyx_RaiseArgtupleInvalid("__reduce_cython__", 1, 0, 0, __pyx_nargs); return NULL;}
-  if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__reduce_cython__", 0))) return NULL;
-  goto __pyx_L4_argument_unpacking_done;
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self));
-
-  /* function exit code */
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__reduce_cython__", 0);
-
-  /* "(tree fragment)":2
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"             # <<<<<<<<<<<<<<
- * def __setstate_cython__(self, __pyx_state):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __Pyx_Raise(__pyx_builtin_TypeError, __pyx_kp_s_no_default___reduce___due_to_non, 0, 0);
-  __PYX_ERR(4, 2, __pyx_L1_error)
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-/* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-
-/* Python wrapper */
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-); /*proto*/
-PyDoc_STRVAR(__pyx_doc_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__, "Unpacker.__setstate_cython__(self, __pyx_state)");
-static PyMethodDef __pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__};
-static PyObject *__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__(PyObject *__pyx_v_self, 
-#if CYTHON_METH_FASTCALL
-PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
-#else
-PyObject *__pyx_args, PyObject *__pyx_kwds
-#endif
-) {
-  CYTHON_UNUSED PyObject *__pyx_v___pyx_state = 0;
-  #if !CYTHON_METH_FASTCALL
-  CYTHON_UNUSED Py_ssize_t __pyx_nargs;
-  #endif
-  CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
-  PyObject* values[1] = {0};
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  PyObject *__pyx_r = 0;
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0);
-  #if !CYTHON_METH_FASTCALL
-  #if CYTHON_ASSUME_SAFE_MACROS
-  __pyx_nargs = PyTuple_GET_SIZE(__pyx_args);
-  #else
-  __pyx_nargs = PyTuple_Size(__pyx_args);
-  if (unlikely((__pyx_nargs < 0))) __PYX_ERR(4, 3, __pyx_L3_error)
-  #endif
-  #endif
-  __pyx_kwvalues = __Pyx_KwValues_FASTCALL(__pyx_args, __pyx_nargs);
-  {
-    PyObject **__pyx_pyargnames[] = {&__pyx_n_s_pyx_state,0};
-    if (__pyx_kwds) {
-      Py_ssize_t kw_args;
-      switch (__pyx_nargs) {
-        case  1: values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-        CYTHON_FALLTHROUGH;
-        case  0: break;
-        default: goto __pyx_L5_argtuple_error;
-      }
-      kw_args = __Pyx_NumKwargs_FASTCALL(__pyx_kwds);
-      switch (__pyx_nargs) {
-        case  0:
-        if (likely((values[0] = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_pyx_state)) != 0)) {
-          (void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
-          kw_args--;
-        }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(4, 3, __pyx_L3_error)
-        else goto __pyx_L5_argtuple_error;
-      }
-      if (unlikely(kw_args > 0)) {
-        const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__setstate_cython__") < 0)) __PYX_ERR(4, 3, __pyx_L3_error)
-      }
-    } else if (unlikely(__pyx_nargs != 1)) {
-      goto __pyx_L5_argtuple_error;
-    } else {
-      values[0] = __Pyx_Arg_FASTCALL(__pyx_args, 0);
-    }
-    __pyx_v___pyx_state = values[0];
-  }
-  goto __pyx_L4_argument_unpacking_done;
-  __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, __pyx_nargs); __PYX_ERR(4, 3, __pyx_L3_error)
-  goto __pyx_L3_error;
-  __pyx_L3_error:;
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __Pyx_RefNannyFinishContext();
-  return NULL;
-  __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__(((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)__pyx_v_self), __pyx_v___pyx_state);
-
-  /* function exit code */
-  {
-    Py_ssize_t __pyx_temp;
-    for (__pyx_temp=0; __pyx_temp < (Py_ssize_t)(sizeof(values)/sizeof(values[0])); ++__pyx_temp) {
-      __Pyx_Arg_XDECREF_FASTCALL(values[__pyx_temp]);
-    }
-  }
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-
-static PyObject *__pyx_pf_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) {
-  PyObject *__pyx_r = NULL;
-  __Pyx_RefNannyDeclarations
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__setstate_cython__", 0);
-
-  /* "(tree fragment)":4
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"             # <<<<<<<<<<<<<<
- */
-  __Pyx_Raise(__pyx_builtin_TypeError, __pyx_kp_s_no_default___reduce___due_to_non, 0, 0);
-  __PYX_ERR(4, 4, __pyx_L1_error)
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-
-  /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_AddTraceback("msgpack._cmsgpack.Unpacker.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename);
-  __pyx_r = NULL;
-  __Pyx_XGIVEREF(__pyx_r);
-  __Pyx_RefNannyFinishContext();
-  return __pyx_r;
-}
-static struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Packer __pyx_vtable_7msgpack_9_cmsgpack_Packer;
-
-static PyObject *__pyx_tp_new_7msgpack_9_cmsgpack_Packer(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_7msgpack_9_cmsgpack_Packer *p;
-  PyObject *o;
-  #if CYTHON_COMPILING_IN_LIMITED_API
-  allocfunc alloc_func = (allocfunc)PyType_GetSlot(t, Py_tp_alloc);
-  o = alloc_func(t, 0);
-  #else
-  if (likely(!__Pyx_PyType_HasFeature(t, Py_TPFLAGS_IS_ABSTRACT))) {
-    o = (*t->tp_alloc)(t, 0);
-  } else {
-    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
-  }
-  if (unlikely(!o)) return 0;
-  #endif
-  p = ((struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)o);
-  p->__pyx_vtab = __pyx_vtabptr_7msgpack_9_cmsgpack_Packer;
-  new((void*)&(p->pk)) struct msgpack_packer();
-  p->_default = Py_None; Py_INCREF(Py_None);
-  p->_berrors = Py_None; Py_INCREF(Py_None);
-  if (unlikely(__pyx_pw_7msgpack_9_cmsgpack_6Packer_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) goto bad;
-  return o;
-  bad:
-  Py_DECREF(o); o = 0;
-  return NULL;
-}
-
-static void __pyx_tp_dealloc_7msgpack_9_cmsgpack_Packer(PyObject *o) {
-  struct __pyx_obj_7msgpack_9_cmsgpack_Packer *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)o;
-  #if CYTHON_USE_TP_FINALIZE
-  if (unlikely((PY_VERSION_HEX >= 0x03080000 || __Pyx_PyType_HasFeature(Py_TYPE(o), Py_TPFLAGS_HAVE_FINALIZE)) && __Pyx_PyObject_GetSlot(o, tp_finalize, destructor)) && !__Pyx_PyObject_GC_IsFinalized(o)) {
-    if (__Pyx_PyObject_GetSlot(o, tp_dealloc, destructor) == __pyx_tp_dealloc_7msgpack_9_cmsgpack_Packer) {
-      if (PyObject_CallFinalizerFromDealloc(o)) return;
-    }
-  }
-  #endif
-  PyObject_GC_UnTrack(o);
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    __Pyx_SET_REFCNT(o, Py_REFCNT(o) + 1);
-    __pyx_pw_7msgpack_9_cmsgpack_6Packer_5__dealloc__(o);
-    __Pyx_SET_REFCNT(o, Py_REFCNT(o) - 1);
-    PyErr_Restore(etype, eval, etb);
-  }
-  __Pyx_call_destructor(p->pk);
-  Py_CLEAR(p->_default);
-  Py_CLEAR(p->_berrors);
-  #if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
-  (*Py_TYPE(o)->tp_free)(o);
-  #else
-  {
-    freefunc tp_free = (freefunc)PyType_GetSlot(Py_TYPE(o), Py_tp_free);
-    if (tp_free) tp_free(o);
-  }
-  #endif
-}
-
-static int __pyx_tp_traverse_7msgpack_9_cmsgpack_Packer(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_7msgpack_9_cmsgpack_Packer *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)o;
-  if (p->_default) {
-    e = (*v)(p->_default, a); if (e) return e;
-  }
-  if (p->_berrors) {
-    e = (*v)(p->_berrors, a); if (e) return e;
-  }
-  return 0;
-}
-
-static int __pyx_tp_clear_7msgpack_9_cmsgpack_Packer(PyObject *o) {
-  PyObject* tmp;
-  struct __pyx_obj_7msgpack_9_cmsgpack_Packer *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Packer *)o;
-  tmp = ((PyObject*)p->_default);
-  p->_default = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->_berrors);
-  p->_berrors = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
-}
-
-static PyMethodDef __pyx_methods_7msgpack_9_cmsgpack_Packer[] = {
-  {"pack_ext_type", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_9pack_ext_type, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_8pack_ext_type},
-  {"pack_array_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_11pack_array_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_10pack_array_header},
-  {"pack_map_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_13pack_map_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_12pack_map_header},
-  {"pack_map_pairs", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_14pack_map_pairs},
-  {"reset", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_17reset, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_16reset},
-  {"bytes", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_19bytes, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_18bytes},
-  {"getbuffer", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_21getbuffer, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_20getbuffer},
-  {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_22__reduce_cython__},
-  {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_6Packer_24__setstate_cython__},
-  {0, 0, 0, 0}
-};
-#if CYTHON_USE_TYPE_SPECS
-static PyType_Slot __pyx_type_7msgpack_9_cmsgpack_Packer_slots[] = {
-  {Py_tp_dealloc, (void *)__pyx_tp_dealloc_7msgpack_9_cmsgpack_Packer},
-  {Py_tp_doc, (void *)PyDoc_STR("Packer(default=None, *, bool use_single_float=False, bool autoreset=True, bool use_bin_type=True, bool strict_types=False, bool datetime=False, unicode_errors=None)\n\n    MessagePack Packer\n\n    Usage::\n\n        packer = Packer()\n        astream.write(packer.pack(a))\n        astream.write(packer.pack(b))\n\n    Packer's constructor has some keyword arguments:\n\n    :param default:\n        When specified, it should be callable.\n        Convert user type to builtin type that Packer supports.\n        See also simplejson's document.\n\n    :param bool use_single_float:\n        Use single precision float type for float. (default: False)\n\n    :param bool autoreset:\n        Reset buffer after each pack and return its content as `bytes`. (default: True).\n        If set this to false, use `bytes()` to get content and `.reset()` to clear buffer.\n\n    :param bool use_bin_type:\n        Use bin type introduced in msgpack spec 2.0 for bytes.\n        It also enables str8 type for unicode. (default: True)\n\n    :param bool strict_types:\n        If set to true, types will be checked to be exact. Derived classes\n        from serializeable types will not be serialized and will be\n        treated as unsupported type and forwarded to default.\n        Additionally tuples will not be serialized as lists.\n        This is useful when trying to implement accurate serialization\n        for python types.\n\n    :param bool datetime:\n        If set to true, datetime with tzinfo is packed into Timestamp type.\n        Note that the tzinfo is stripped in the timestamp.\n        You can get UTC datetime with `timestamp=3` option of the Unpacker.\n\n    :param str unicode_errors:\n        The error handler for encoding unicode. (default: 'strict')\n        DO NOT USE THIS!!  This option is kept for very specific usage.\n    ")},
-  {Py_tp_traverse, (void *)__pyx_tp_traverse_7msgpack_9_cmsgpack_Packer},
-  {Py_tp_clear, (void *)__pyx_tp_clear_7msgpack_9_cmsgpack_Packer},
-  {Py_tp_methods, (void *)__pyx_methods_7msgpack_9_cmsgpack_Packer},
-  {Py_tp_init, (void *)__pyx_pw_7msgpack_9_cmsgpack_6Packer_3__init__},
-  {Py_tp_new, (void *)__pyx_tp_new_7msgpack_9_cmsgpack_Packer},
-  {0, 0},
-};
-static PyType_Spec __pyx_type_7msgpack_9_cmsgpack_Packer_spec = {
-  "msgpack._cmsgpack.Packer",
-  sizeof(struct __pyx_obj_7msgpack_9_cmsgpack_Packer),
-  0,
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC,
-  __pyx_type_7msgpack_9_cmsgpack_Packer_slots,
-};
-#else
-
-static PyTypeObject __pyx_type_7msgpack_9_cmsgpack_Packer = {
-  PyVarObject_HEAD_INIT(0, 0)
-  "msgpack._cmsgpack.""Packer", /*tp_name*/
-  sizeof(struct __pyx_obj_7msgpack_9_cmsgpack_Packer), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_7msgpack_9_cmsgpack_Packer, /*tp_dealloc*/
-  #if PY_VERSION_HEX < 0x030800b4
-  0, /*tp_print*/
-  #endif
-  #if PY_VERSION_HEX >= 0x030800b4
-  0, /*tp_vectorcall_offset*/
-  #endif
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #endif
-  #if PY_MAJOR_VERSION >= 3
-  0, /*tp_as_async*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  0, /*tp_str*/
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-  PyDoc_STR("Packer(default=None, *, bool use_single_float=False, bool autoreset=True, bool use_bin_type=True, bool strict_types=False, bool datetime=False, unicode_errors=None)\n\n    MessagePack Packer\n\n    Usage::\n\n        packer = Packer()\n        astream.write(packer.pack(a))\n        astream.write(packer.pack(b))\n\n    Packer's constructor has some keyword arguments:\n\n    :param default:\n        When specified, it should be callable.\n        Convert user type to builtin type that Packer supports.\n        See also simplejson's document.\n\n    :param bool use_single_float:\n        Use single precision float type for float. (default: False)\n\n    :param bool autoreset:\n        Reset buffer after each pack and return its content as `bytes`. (default: True).\n        If set this to false, use `bytes()` to get content and `.reset()` to clear buffer.\n\n    :param bool use_bin_type:\n        Use bin type introduced in msgpack spec 2.0 for bytes.\n        It also enables str8 type for unicode. (default: True)\n\n    :param bool strict_types:\n        If set to true, types will be checked to be exact. Derived classes\n        from serializeable types will not be serialized and will be\n        treated as unsupported type and forwarded to default.\n        Additionally tuples will not be serialized as lists.\n        This is useful when trying to implement accurate serialization\n        for python types.\n\n    :param bool datetime:\n        If set to true, datetime with tzinfo is packed into Timestamp type.\n        Note that the tzinfo is stripped in the timestamp.\n        You can get UTC datetime with `timestamp=3` option of the Unpacker.\n\n    :param str unicode_errors:\n        The error handler for encoding unicode. (default: 'strict')\n        DO NOT USE THIS!!  This option is kept for very specific usage.\n    "), /*tp_doc*/
-  __pyx_tp_traverse_7msgpack_9_cmsgpack_Packer, /*tp_traverse*/
-  __pyx_tp_clear_7msgpack_9_cmsgpack_Packer, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
-  0, /*tp_iternext*/
-  __pyx_methods_7msgpack_9_cmsgpack_Packer, /*tp_methods*/
-  0, /*tp_members*/
-  0, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  #if !CYTHON_USE_TYPE_SPECS
-  0, /*tp_dictoffset*/
-  #endif
-  __pyx_pw_7msgpack_9_cmsgpack_6Packer_3__init__, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_7msgpack_9_cmsgpack_Packer, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  0, /*tp_version_tag*/
-  #if PY_VERSION_HEX >= 0x030400a1
-  #if CYTHON_USE_TP_FINALIZE
-  0, /*tp_finalize*/
-  #else
-  NULL, /*tp_finalize*/
-  #endif
-  #endif
-  #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
-  0, /*tp_vectorcall*/
-  #endif
-  #if __PYX_NEED_TP_PRINT_SLOT == 1
-  0, /*tp_print*/
-  #endif
-  #if PY_VERSION_HEX >= 0x030C0000
-  0, /*tp_watched*/
-  #endif
-  #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
-  0, /*tp_pypy_flags*/
-  #endif
-};
-#endif
-static struct __pyx_vtabstruct_7msgpack_9_cmsgpack_Unpacker __pyx_vtable_7msgpack_9_cmsgpack_Unpacker;
-
-static PyObject *__pyx_tp_new_7msgpack_9_cmsgpack_Unpacker(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *p;
-  PyObject *o;
-  #if CYTHON_COMPILING_IN_LIMITED_API
-  allocfunc alloc_func = (allocfunc)PyType_GetSlot(t, Py_tp_alloc);
-  o = alloc_func(t, 0);
-  #else
-  if (likely(!__Pyx_PyType_HasFeature(t, Py_TPFLAGS_IS_ABSTRACT))) {
-    o = (*t->tp_alloc)(t, 0);
-  } else {
-    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
-  }
-  if (unlikely(!o)) return 0;
-  #endif
-  p = ((struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)o);
-  p->__pyx_vtab = __pyx_vtabptr_7msgpack_9_cmsgpack_Unpacker;
-  new((void*)&(p->ctx)) unpack_context();
-  p->file_like = Py_None; Py_INCREF(Py_None);
-  p->file_like_read = Py_None; Py_INCREF(Py_None);
-  p->object_hook = Py_None; Py_INCREF(Py_None);
-  p->object_pairs_hook = Py_None; Py_INCREF(Py_None);
-  p->list_hook = Py_None; Py_INCREF(Py_None);
-  p->ext_hook = Py_None; Py_INCREF(Py_None);
-  p->unicode_errors = Py_None; Py_INCREF(Py_None);
-  if (unlikely(__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) goto bad;
-  return o;
-  bad:
-  Py_DECREF(o); o = 0;
-  return NULL;
-}
-
-static void __pyx_tp_dealloc_7msgpack_9_cmsgpack_Unpacker(PyObject *o) {
-  struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)o;
-  #if CYTHON_USE_TP_FINALIZE
-  if (unlikely((PY_VERSION_HEX >= 0x03080000 || __Pyx_PyType_HasFeature(Py_TYPE(o), Py_TPFLAGS_HAVE_FINALIZE)) && __Pyx_PyObject_GetSlot(o, tp_finalize, destructor)) && !__Pyx_PyObject_GC_IsFinalized(o)) {
-    if (__Pyx_PyObject_GetSlot(o, tp_dealloc, destructor) == __pyx_tp_dealloc_7msgpack_9_cmsgpack_Unpacker) {
-      if (PyObject_CallFinalizerFromDealloc(o)) return;
-    }
-  }
-  #endif
-  PyObject_GC_UnTrack(o);
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    __Pyx_SET_REFCNT(o, Py_REFCNT(o) + 1);
-    __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_3__dealloc__(o);
-    __Pyx_SET_REFCNT(o, Py_REFCNT(o) - 1);
-    PyErr_Restore(etype, eval, etb);
-  }
-  __Pyx_call_destructor(p->ctx);
-  Py_CLEAR(p->file_like);
-  Py_CLEAR(p->file_like_read);
-  Py_CLEAR(p->object_hook);
-  Py_CLEAR(p->object_pairs_hook);
-  Py_CLEAR(p->list_hook);
-  Py_CLEAR(p->ext_hook);
-  Py_CLEAR(p->unicode_errors);
-  #if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
-  (*Py_TYPE(o)->tp_free)(o);
-  #else
-  {
-    freefunc tp_free = (freefunc)PyType_GetSlot(Py_TYPE(o), Py_tp_free);
-    if (tp_free) tp_free(o);
-  }
-  #endif
-}
-
-static int __pyx_tp_traverse_7msgpack_9_cmsgpack_Unpacker(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)o;
-  if (p->file_like) {
-    e = (*v)(p->file_like, a); if (e) return e;
-  }
-  if (p->file_like_read) {
-    e = (*v)(p->file_like_read, a); if (e) return e;
-  }
-  if (p->object_hook) {
-    e = (*v)(p->object_hook, a); if (e) return e;
-  }
-  if (p->object_pairs_hook) {
-    e = (*v)(p->object_pairs_hook, a); if (e) return e;
-  }
-  if (p->list_hook) {
-    e = (*v)(p->list_hook, a); if (e) return e;
-  }
-  if (p->ext_hook) {
-    e = (*v)(p->ext_hook, a); if (e) return e;
-  }
-  if (p->unicode_errors) {
-    e = (*v)(p->unicode_errors, a); if (e) return e;
-  }
-  return 0;
-}
-
-static int __pyx_tp_clear_7msgpack_9_cmsgpack_Unpacker(PyObject *o) {
-  PyObject* tmp;
-  struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *p = (struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *)o;
-  tmp = ((PyObject*)p->file_like);
-  p->file_like = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->file_like_read);
-  p->file_like_read = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->object_hook);
-  p->object_hook = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->object_pairs_hook);
-  p->object_pairs_hook = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->list_hook);
-  p->list_hook = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->ext_hook);
-  p->ext_hook = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->unicode_errors);
-  p->unicode_errors = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
-}
-
-static PyObject *__pyx_specialmethod___pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__(PyObject *self, CYTHON_UNUSED PyObject *arg) {
-  PyObject *res = __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__(self);
-  if (!res && !PyErr_Occurred()) { PyErr_SetNone(PyExc_StopIteration); }
-  return res;
-}
-
-static PyMethodDef __pyx_methods_7msgpack_9_cmsgpack_Unpacker[] = {
-  {"feed", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_7feed, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_6feed},
-  {"read_bytes", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_9read_bytes, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_8read_bytes},
-  {"unpack", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_11unpack, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_10unpack},
-  {"skip", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_13skip, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_12skip},
-  {"read_array_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_15read_array_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_14read_array_header},
-  {"read_map_header", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_17read_map_header, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_16read_map_header},
-  {"tell", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_19tell, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_18tell},
-  {"__next__", (PyCFunction)__pyx_specialmethod___pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__, METH_NOARGS|METH_COEXIST, 0},
-  {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_24__reduce_cython__},
-  {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, __pyx_doc_7msgpack_9_cmsgpack_8Unpacker_26__setstate_cython__},
-  {0, 0, 0, 0}
-};
-#if CYTHON_USE_TYPE_SPECS
-static PyType_Slot __pyx_type_7msgpack_9_cmsgpack_Unpacker_slots[] = {
-  {Py_tp_dealloc, (void *)__pyx_tp_dealloc_7msgpack_9_cmsgpack_Unpacker},
-  {Py_tp_doc, (void *)PyDoc_STR("Unpacker(file_like=None, Py_ssize_t read_size=0, *, bool use_list=True, bool raw=False, int timestamp=0, bool strict_map_key=True, object_hook=None, object_pairs_hook=None, list_hook=None, unicode_errors=None, Py_ssize_t max_buffer_size=0x6400000, ext_hook=ExtType, Py_ssize_t max_str_len=-1, Py_ssize_t max_bin_len=-1, Py_ssize_t max_array_len=-1, Py_ssize_t max_map_len=-1, Py_ssize_t max_ext_len=-1)\nStreaming unpacker.\n\n    Arguments:\n\n    :param file_like:\n        File-like object having `.read(n)` method.\n        If specified, unpacker reads serialized data from it and `.feed()` is not usable.\n\n    :param int read_size:\n        Used as `file_like.read(read_size)`. (default: `min(16*1024, max_buffer_size)`)\n\n    :param bool use_list:\n        If true, unpack msgpack array to Python list.\n        Otherwise, unpack to Python tuple. (default: True)\n\n    :param bool raw:\n        If true, unpack msgpack raw to Python bytes.\n        Otherwise, unpack to Python str by decoding with UTF-8 encoding (default).\n\n    :param int timestamp:\n        Control how timestamp type is unpacked:\n\n            0 - Timestamp\n            1 - float  (Seconds from the EPOCH)\n            2 - int  (Nanoseconds from the EPOCH)\n            3 - datetime.datetime  (UTC).\n\n    :param bool strict_map_key:\n        If true (default), only str or bytes are accepted for map (dict) keys.\n\n    :param object_hook:\n        When specified, it should be callable.\n        Unpacker calls it with a dict argument after unpacking msgpack map.\n        (See also simplejson)\n\n    :param object_pairs_hook:\n        When specified, it should be callable.\n        Unpacker calls it with a list of key-value pairs after unpacking msgpack map.\n        (See also simplejson)\n\n    :param str unicode_errors:\n        The error handler for decoding unicode. (default: 'strict')\n        This option should be used only when you have msgpack data which\n        contains invalid UTF-8 string.""\n\n    :param int max_buffer_size:\n        Limits size of data waiting unpacked.  0 means 2**32-1.\n        The default value is 100*1024*1024 (100MiB).\n        Raises `BufferFull` exception when it is insufficient.\n        You should set this parameter when unpacking data from untrusted source.\n\n    :param int max_str_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max length of str. (default: max_buffer_size)\n\n    :param int max_bin_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max length of bin. (default: max_buffer_size)\n\n    :param int max_array_len:\n        Limits max length of array.\n        (default: max_buffer_size)\n\n    :param int max_map_len:\n        Limits max length of map.\n        (default: max_buffer_size//2)\n\n    :param int max_ext_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max size of ext type.  (default: max_buffer_size)\n\n    Example of streaming deserialize from file-like object::\n\n        unpacker = Unpacker(file_like)\n        for o in unpacker:\n            process(o)\n\n    Example of streaming deserialize from socket::\n\n        unpacker = Unpacker()\n        while True:\n            buf = sock.recv(1024**2)\n            if not buf:\n                break\n            unpacker.feed(buf)\n            for o in unpacker:\n                process(o)\n\n    Raises ``ExtraData`` when *packed* contains extra bytes.\n    Raises ``OutOfData`` when *packed* is incomplete.\n    Raises ``FormatError`` when *packed* is not valid msgpack.\n    Raises ``StackError`` when *packed* contains too nested.\n    Other exceptions can be raised during unpacking.\n    ")},
-  {Py_tp_traverse, (void *)__pyx_tp_traverse_7msgpack_9_cmsgpack_Unpacker},
-  {Py_tp_clear, (void *)__pyx_tp_clear_7msgpack_9_cmsgpack_Unpacker},
-  {Py_tp_iter, (void *)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_21__iter__},
-  {Py_tp_iternext, (void *)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__},
-  {Py_tp_methods, (void *)__pyx_methods_7msgpack_9_cmsgpack_Unpacker},
-  {Py_tp_init, (void *)__pyx_pw_7msgpack_9_cmsgpack_8Unpacker_5__init__},
-  {Py_tp_new, (void *)__pyx_tp_new_7msgpack_9_cmsgpack_Unpacker},
-  {0, 0},
-};
-static PyType_Spec __pyx_type_7msgpack_9_cmsgpack_Unpacker_spec = {
-  "msgpack._cmsgpack.Unpacker",
-  sizeof(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker),
-  0,
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC,
-  __pyx_type_7msgpack_9_cmsgpack_Unpacker_slots,
-};
-#else
-
-static PyTypeObject __pyx_type_7msgpack_9_cmsgpack_Unpacker = {
-  PyVarObject_HEAD_INIT(0, 0)
-  "msgpack._cmsgpack.""Unpacker", /*tp_name*/
-  sizeof(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_7msgpack_9_cmsgpack_Unpacker, /*tp_dealloc*/
-  #if PY_VERSION_HEX < 0x030800b4
-  0, /*tp_print*/
-  #endif
-  #if PY_VERSION_HEX >= 0x030800b4
-  0, /*tp_vectorcall_offset*/
-  #endif
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #endif
-  #if PY_MAJOR_VERSION >= 3
-  0, /*tp_as_async*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  0, /*tp_str*/
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-  PyDoc_STR("Unpacker(file_like=None, Py_ssize_t read_size=0, *, bool use_list=True, bool raw=False, int timestamp=0, bool strict_map_key=True, object_hook=None, object_pairs_hook=None, list_hook=None, unicode_errors=None, Py_ssize_t max_buffer_size=0x6400000, ext_hook=ExtType, Py_ssize_t max_str_len=-1, Py_ssize_t max_bin_len=-1, Py_ssize_t max_array_len=-1, Py_ssize_t max_map_len=-1, Py_ssize_t max_ext_len=-1)\nStreaming unpacker.\n\n    Arguments:\n\n    :param file_like:\n        File-like object having `.read(n)` method.\n        If specified, unpacker reads serialized data from it and `.feed()` is not usable.\n\n    :param int read_size:\n        Used as `file_like.read(read_size)`. (default: `min(16*1024, max_buffer_size)`)\n\n    :param bool use_list:\n        If true, unpack msgpack array to Python list.\n        Otherwise, unpack to Python tuple. (default: True)\n\n    :param bool raw:\n        If true, unpack msgpack raw to Python bytes.\n        Otherwise, unpack to Python str by decoding with UTF-8 encoding (default).\n\n    :param int timestamp:\n        Control how timestamp type is unpacked:\n\n            0 - Timestamp\n            1 - float  (Seconds from the EPOCH)\n            2 - int  (Nanoseconds from the EPOCH)\n            3 - datetime.datetime  (UTC).\n\n    :param bool strict_map_key:\n        If true (default), only str or bytes are accepted for map (dict) keys.\n\n    :param object_hook:\n        When specified, it should be callable.\n        Unpacker calls it with a dict argument after unpacking msgpack map.\n        (See also simplejson)\n\n    :param object_pairs_hook:\n        When specified, it should be callable.\n        Unpacker calls it with a list of key-value pairs after unpacking msgpack map.\n        (See also simplejson)\n\n    :param str unicode_errors:\n        The error handler for decoding unicode. (default: 'strict')\n        This option should be used only when you have msgpack data which\n        contains invalid UTF-8 string.""\n\n    :param int max_buffer_size:\n        Limits size of data waiting unpacked.  0 means 2**32-1.\n        The default value is 100*1024*1024 (100MiB).\n        Raises `BufferFull` exception when it is insufficient.\n        You should set this parameter when unpacking data from untrusted source.\n\n    :param int max_str_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max length of str. (default: max_buffer_size)\n\n    :param int max_bin_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max length of bin. (default: max_buffer_size)\n\n    :param int max_array_len:\n        Limits max length of array.\n        (default: max_buffer_size)\n\n    :param int max_map_len:\n        Limits max length of map.\n        (default: max_buffer_size//2)\n\n    :param int max_ext_len:\n        Deprecated, use *max_buffer_size* instead.\n        Limits max size of ext type.  (default: max_buffer_size)\n\n    Example of streaming deserialize from file-like object::\n\n        unpacker = Unpacker(file_like)\n        for o in unpacker:\n            process(o)\n\n    Example of streaming deserialize from socket::\n\n        unpacker = Unpacker()\n        while True:\n            buf = sock.recv(1024**2)\n            if not buf:\n                break\n            unpacker.feed(buf)\n            for o in unpacker:\n                process(o)\n\n    Raises ``ExtraData`` when *packed* contains extra bytes.\n    Raises ``OutOfData`` when *packed* is incomplete.\n    Raises ``FormatError`` when *packed* is not valid msgpack.\n    Raises ``StackError`` when *packed* contains too nested.\n    Other exceptions can be raised during unpacking.\n    "), /*tp_doc*/
-  __pyx_tp_traverse_7msgpack_9_cmsgpack_Unpacker, /*tp_traverse*/
-  __pyx_tp_clear_7msgpack_9_cmsgpack_Unpacker, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_21__iter__, /*tp_iter*/
-  __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_23__next__, /*tp_iternext*/
-  __pyx_methods_7msgpack_9_cmsgpack_Unpacker, /*tp_methods*/
-  0, /*tp_members*/
-  0, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  #if !CYTHON_USE_TYPE_SPECS
-  0, /*tp_dictoffset*/
-  #endif
-  __pyx_pw_7msgpack_9_cmsgpack_8Unpacker_5__init__, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_7msgpack_9_cmsgpack_Unpacker, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  0, /*tp_version_tag*/
-  #if PY_VERSION_HEX >= 0x030400a1
-  #if CYTHON_USE_TP_FINALIZE
-  0, /*tp_finalize*/
-  #else
-  NULL, /*tp_finalize*/
-  #endif
-  #endif
-  #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
-  0, /*tp_vectorcall*/
-  #endif
-  #if __PYX_NEED_TP_PRINT_SLOT == 1
-  0, /*tp_print*/
-  #endif
-  #if PY_VERSION_HEX >= 0x030C0000
-  0, /*tp_watched*/
-  #endif
-  #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
-  0, /*tp_pypy_flags*/
-  #endif
-};
-#endif
-
-static PyMethodDef __pyx_methods[] = {
-  {0, 0, 0, 0}
-};
-#ifndef CYTHON_SMALL_CODE
-#if defined(__clang__)
-    #define CYTHON_SMALL_CODE
-#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-    #define CYTHON_SMALL_CODE __attribute__((cold))
-#else
-    #define CYTHON_SMALL_CODE
-#endif
-#endif
-/* #### Code section: pystring_table ### */
-
-static int __Pyx_CreateStringTabAndInitStrings(void) {
-  __Pyx_StringTabEntry __pyx_string_tab[] = {
-    {&__pyx_n_s_AssertionError, __pyx_k_AssertionError, sizeof(__pyx_k_AssertionError), 0, 0, 1, 1},
-    {&__pyx_n_s_BufferError, __pyx_k_BufferError, sizeof(__pyx_k_BufferError), 0, 0, 1, 1},
-    {&__pyx_n_s_BufferFull, __pyx_k_BufferFull, sizeof(__pyx_k_BufferFull), 0, 0, 1, 1},
-    {&__pyx_kp_u_Cannot_decode_extended_type_with, __pyx_k_Cannot_decode_extended_type_with, sizeof(__pyx_k_Cannot_decode_extended_type_with), 0, 1, 0, 0},
-    {&__pyx_kp_u_EXT_data_is_too_large, __pyx_k_EXT_data_is_too_large, sizeof(__pyx_k_EXT_data_is_too_large), 0, 1, 0, 0},
-    {&__pyx_n_s_ExtType, __pyx_k_ExtType, sizeof(__pyx_k_ExtType), 0, 0, 1, 1},
-    {&__pyx_n_s_ExtraData, __pyx_k_ExtraData, sizeof(__pyx_k_ExtraData), 0, 0, 1, 1},
-    {&__pyx_n_s_FormatError, __pyx_k_FormatError, sizeof(__pyx_k_FormatError), 0, 0, 1, 1},
-    {&__pyx_kp_u_Integer_value_out_of_range, __pyx_k_Integer_value_out_of_range, sizeof(__pyx_k_Integer_value_out_of_range), 0, 1, 0, 0},
-    {&__pyx_n_s_MemoryError, __pyx_k_MemoryError, sizeof(__pyx_k_MemoryError), 0, 0, 1, 1},
-    {&__pyx_kp_u_No_more_data_to_unpack, __pyx_k_No_more_data_to_unpack, sizeof(__pyx_k_No_more_data_to_unpack), 0, 1, 0, 0},
-    {&__pyx_n_s_NotImplementedError, __pyx_k_NotImplementedError, sizeof(__pyx_k_NotImplementedError), 0, 0, 1, 1},
-    {&__pyx_n_s_OutOfData, __pyx_k_OutOfData, sizeof(__pyx_k_OutOfData), 0, 0, 1, 1},
-    {&__pyx_n_s_OverflowError, __pyx_k_OverflowError, sizeof(__pyx_k_OverflowError), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer, __pyx_k_Packer, sizeof(__pyx_k_Packer), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer___reduce_cython, __pyx_k_Packer___reduce_cython, sizeof(__pyx_k_Packer___reduce_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer___setstate_cython, __pyx_k_Packer___setstate_cython, sizeof(__pyx_k_Packer___setstate_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_bytes, __pyx_k_Packer_bytes, sizeof(__pyx_k_Packer_bytes), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_getbuffer, __pyx_k_Packer_getbuffer, sizeof(__pyx_k_Packer_getbuffer), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_pack, __pyx_k_Packer_pack, sizeof(__pyx_k_Packer_pack), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_pack_array_header, __pyx_k_Packer_pack_array_header, sizeof(__pyx_k_Packer_pack_array_header), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_pack_ext_type, __pyx_k_Packer_pack_ext_type, sizeof(__pyx_k_Packer_pack_ext_type), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_pack_map_header, __pyx_k_Packer_pack_map_header, sizeof(__pyx_k_Packer_pack_map_header), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_pack_map_pairs, __pyx_k_Packer_pack_map_pairs, sizeof(__pyx_k_Packer_pack_map_pairs), 0, 0, 1, 1},
-    {&__pyx_n_s_Packer_reset, __pyx_k_Packer_reset, sizeof(__pyx_k_Packer_reset), 0, 0, 1, 1},
-    {&__pyx_n_s_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 0, 0, 1, 1},
-    {&__pyx_n_s_StackError, __pyx_k_StackError, sizeof(__pyx_k_StackError), 0, 0, 1, 1},
-    {&__pyx_n_s_StopIteration, __pyx_k_StopIteration, sizeof(__pyx_k_StopIteration), 0, 0, 1, 1},
-    {&__pyx_kp_u_Time_zones_are_not_available_fro, __pyx_k_Time_zones_are_not_available_fro, sizeof(__pyx_k_Time_zones_are_not_available_fro), 0, 1, 0, 0},
-    {&__pyx_n_s_Timestamp, __pyx_k_Timestamp, sizeof(__pyx_k_Timestamp), 0, 0, 1, 1},
-    {&__pyx_n_s_TypeError, __pyx_k_TypeError, sizeof(__pyx_k_TypeError), 0, 0, 1, 1},
-    {&__pyx_kp_u_Unable_to_allocate_internal_buff, __pyx_k_Unable_to_allocate_internal_buff, sizeof(__pyx_k_Unable_to_allocate_internal_buff), 0, 1, 0, 0},
-    {&__pyx_kp_u_Unable_to_enlarge_internal_buffe, __pyx_k_Unable_to_enlarge_internal_buffe, sizeof(__pyx_k_Unable_to_enlarge_internal_buffe), 0, 1, 0, 0},
-    {&__pyx_kp_u_Unpack_failed_error, __pyx_k_Unpack_failed_error, sizeof(__pyx_k_Unpack_failed_error), 0, 1, 0, 0},
-    {&__pyx_kp_u_Unpack_failed_incomplete_input, __pyx_k_Unpack_failed_incomplete_input, sizeof(__pyx_k_Unpack_failed_incomplete_input), 0, 1, 0, 0},
-    {&__pyx_n_s_Unpacker, __pyx_k_Unpacker, sizeof(__pyx_k_Unpacker), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker___reduce_cython, __pyx_k_Unpacker___reduce_cython, sizeof(__pyx_k_Unpacker___reduce_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker___setstate_cython, __pyx_k_Unpacker___setstate_cython, sizeof(__pyx_k_Unpacker___setstate_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_feed, __pyx_k_Unpacker_feed, sizeof(__pyx_k_Unpacker_feed), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_read_array_header, __pyx_k_Unpacker_read_array_header, sizeof(__pyx_k_Unpacker_read_array_header), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_read_bytes, __pyx_k_Unpacker_read_bytes, sizeof(__pyx_k_Unpacker_read_bytes), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_read_map_header, __pyx_k_Unpacker_read_map_header, sizeof(__pyx_k_Unpacker_read_map_header), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_skip, __pyx_k_Unpacker_skip, sizeof(__pyx_k_Unpacker_skip), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_tell, __pyx_k_Unpacker_tell, sizeof(__pyx_k_Unpacker_tell), 0, 0, 1, 1},
-    {&__pyx_n_s_Unpacker_unpack, __pyx_k_Unpacker_unpack, sizeof(__pyx_k_Unpacker_unpack), 0, 0, 1, 1},
-    {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},
-    {&__pyx_n_s__29, __pyx_k__29, sizeof(__pyx_k__29), 0, 0, 1, 1},
-    {&__pyx_kp_u__30, __pyx_k__30, sizeof(__pyx_k__30), 0, 1, 0, 0},
-    {&__pyx_n_s__62, __pyx_k__62, sizeof(__pyx_k__62), 0, 0, 1, 1},
-    {&__pyx_n_s_asyncio_coroutines, __pyx_k_asyncio_coroutines, sizeof(__pyx_k_asyncio_coroutines), 0, 0, 1, 1},
-    {&__pyx_n_s_autoreset, __pyx_k_autoreset, sizeof(__pyx_k_autoreset), 0, 0, 1, 1},
-    {&__pyx_n_s_buf, __pyx_k_buf, sizeof(__pyx_k_buf), 0, 0, 1, 1},
-    {&__pyx_n_s_buf_len, __pyx_k_buf_len, sizeof(__pyx_k_buf_len), 0, 0, 1, 1},
-    {&__pyx_n_s_bytes, __pyx_k_bytes, sizeof(__pyx_k_bytes), 0, 0, 1, 1},
-    {&__pyx_kp_u_cannot_unpack_from_multi_byte_ob, __pyx_k_cannot_unpack_from_multi_byte_ob, sizeof(__pyx_k_cannot_unpack_from_multi_byte_ob), 0, 1, 0, 0},
-    {&__pyx_n_s_cerr, __pyx_k_cerr, sizeof(__pyx_k_cerr), 0, 0, 1, 1},
-    {&__pyx_n_s_cline_in_traceback, __pyx_k_cline_in_traceback, sizeof(__pyx_k_cline_in_traceback), 0, 0, 1, 1},
-    {&__pyx_n_s_code, __pyx_k_code, sizeof(__pyx_k_code), 0, 0, 1, 1},
-    {&__pyx_kp_u_could_not_get_buffer_for_memoryv, __pyx_k_could_not_get_buffer_for_memoryv, sizeof(__pyx_k_could_not_get_buffer_for_memoryv), 0, 1, 0, 0},
-    {&__pyx_n_s_ctx, __pyx_k_ctx, sizeof(__pyx_k_ctx), 0, 0, 1, 1},
-    {&__pyx_n_u_d, __pyx_k_d, sizeof(__pyx_k_d), 0, 1, 0, 1},
-    {&__pyx_n_s_data, __pyx_k_data, sizeof(__pyx_k_data), 0, 0, 1, 1},
-    {&__pyx_n_s_datetime, __pyx_k_datetime, sizeof(__pyx_k_datetime), 0, 0, 1, 1},
-    {&__pyx_n_s_default, __pyx_k_default, sizeof(__pyx_k_default), 0, 0, 1, 1},
-    {&__pyx_kp_u_default_must_be_a_callable, __pyx_k_default_must_be_a_callable, sizeof(__pyx_k_default_must_be_a_callable), 0, 1, 0, 0},
-    {&__pyx_n_s_default_read_extended_type, __pyx_k_default_read_extended_type, sizeof(__pyx_k_default_read_extended_type), 0, 0, 1, 1},
-    {&__pyx_kp_u_dict_is_too_large, __pyx_k_dict_is_too_large, sizeof(__pyx_k_dict_is_too_large), 0, 1, 0, 0},
-    {&__pyx_kp_u_disable, __pyx_k_disable, sizeof(__pyx_k_disable), 0, 1, 0, 0},
-    {&__pyx_kp_u_enable, __pyx_k_enable, sizeof(__pyx_k_enable), 0, 1, 0, 0},
-    {&__pyx_n_s_exceptions, __pyx_k_exceptions, sizeof(__pyx_k_exceptions), 0, 0, 1, 1},
-    {&__pyx_n_s_ext, __pyx_k_ext, sizeof(__pyx_k_ext), 0, 0, 1, 1},
-    {&__pyx_n_s_ext_hook, __pyx_k_ext_hook, sizeof(__pyx_k_ext_hook), 0, 0, 1, 1},
-    {&__pyx_kp_u_ext_hook_must_be_a_callable, __pyx_k_ext_hook_must_be_a_callable, sizeof(__pyx_k_ext_hook_must_be_a_callable), 0, 1, 0, 0},
-    {&__pyx_kp_u_failed_to_calculate_delta, __pyx_k_failed_to_calculate_delta, sizeof(__pyx_k_failed_to_calculate_delta), 0, 1, 0, 0},
-    {&__pyx_n_s_feed, __pyx_k_feed, sizeof(__pyx_k_feed), 0, 0, 1, 1},
-    {&__pyx_n_s_file_like, __pyx_k_file_like, sizeof(__pyx_k_file_like), 0, 0, 1, 1},
-    {&__pyx_kp_u_file_like_read_must_be_a_callab, __pyx_k_file_like_read_must_be_a_callab, sizeof(__pyx_k_file_like_read_must_be_a_callab), 0, 1, 0, 0},
-    {&__pyx_kp_u_gc, __pyx_k_gc, sizeof(__pyx_k_gc), 0, 1, 0, 0},
-    {&__pyx_n_s_getbuffer, __pyx_k_getbuffer, sizeof(__pyx_k_getbuffer), 0, 0, 1, 1},
-    {&__pyx_n_s_getstate, __pyx_k_getstate, sizeof(__pyx_k_getstate), 0, 0, 1, 1},
-    {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1},
-    {&__pyx_n_s_initializing, __pyx_k_initializing, sizeof(__pyx_k_initializing), 0, 0, 1, 1},
-    {&__pyx_kp_u_internal_error, __pyx_k_internal_error, sizeof(__pyx_k_internal_error), 0, 1, 0, 0},
-    {&__pyx_n_s_is_coroutine, __pyx_k_is_coroutine, sizeof(__pyx_k_is_coroutine), 0, 0, 1, 1},
-    {&__pyx_kp_u_isenabled, __pyx_k_isenabled, sizeof(__pyx_k_isenabled), 0, 1, 0, 0},
-    {&__pyx_n_s_items, __pyx_k_items, sizeof(__pyx_k_items), 0, 0, 1, 1},
-    {&__pyx_n_s_k, __pyx_k_k, sizeof(__pyx_k_k), 0, 0, 1, 1},
-    {&__pyx_n_s_list_hook, __pyx_k_list_hook, sizeof(__pyx_k_list_hook), 0, 0, 1, 1},
-    {&__pyx_kp_u_list_hook_must_be_a_callable, __pyx_k_list_hook_must_be_a_callable, sizeof(__pyx_k_list_hook_must_be_a_callable), 0, 1, 0, 0},
-    {&__pyx_kp_u_list_is_too_large, __pyx_k_list_is_too_large, sizeof(__pyx_k_list_is_too_large), 0, 1, 0, 0},
-    {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1},
-    {&__pyx_n_s_max_array_len, __pyx_k_max_array_len, sizeof(__pyx_k_max_array_len), 0, 0, 1, 1},
-    {&__pyx_n_s_max_bin_len, __pyx_k_max_bin_len, sizeof(__pyx_k_max_bin_len), 0, 0, 1, 1},
-    {&__pyx_n_s_max_buffer_size, __pyx_k_max_buffer_size, sizeof(__pyx_k_max_buffer_size), 0, 0, 1, 1},
-    {&__pyx_n_s_max_ext_len, __pyx_k_max_ext_len, sizeof(__pyx_k_max_ext_len), 0, 0, 1, 1},
-    {&__pyx_n_s_max_map_len, __pyx_k_max_map_len, sizeof(__pyx_k_max_map_len), 0, 0, 1, 1},
-    {&__pyx_n_s_max_str_len, __pyx_k_max_str_len, sizeof(__pyx_k_max_str_len), 0, 0, 1, 1},
-    {&__pyx_kp_u_memoryview_is_too_large, __pyx_k_memoryview_is_too_large, sizeof(__pyx_k_memoryview_is_too_large), 0, 1, 0, 0},
-    {&__pyx_n_s_msgpack__cmsgpack, __pyx_k_msgpack__cmsgpack, sizeof(__pyx_k_msgpack__cmsgpack), 0, 0, 1, 1},
-    {&__pyx_kp_s_msgpack__packer_pyx, __pyx_k_msgpack__packer_pyx, sizeof(__pyx_k_msgpack__packer_pyx), 0, 0, 1, 0},
-    {&__pyx_kp_s_msgpack__unpacker_pyx, __pyx_k_msgpack__unpacker_pyx, sizeof(__pyx_k_msgpack__unpacker_pyx), 0, 0, 1, 0},
-    {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
-    {&__pyx_n_s_nanoseconds, __pyx_k_nanoseconds, sizeof(__pyx_k_nanoseconds), 0, 0, 1, 1},
-    {&__pyx_n_s_nbytes, __pyx_k_nbytes, sizeof(__pyx_k_nbytes), 0, 0, 1, 1},
-    {&__pyx_n_s_next_bytes, __pyx_k_next_bytes, sizeof(__pyx_k_next_bytes), 0, 0, 1, 1},
-    {&__pyx_kp_s_no_default___reduce___due_to_non, __pyx_k_no_default___reduce___due_to_non, sizeof(__pyx_k_no_default___reduce___due_to_non), 0, 0, 1, 0},
-    {&__pyx_n_s_nread, __pyx_k_nread, sizeof(__pyx_k_nread), 0, 0, 1, 1},
-    {&__pyx_n_s_obj, __pyx_k_obj, sizeof(__pyx_k_obj), 0, 0, 1, 1},
-    {&__pyx_n_s_object_hook, __pyx_k_object_hook, sizeof(__pyx_k_object_hook), 0, 0, 1, 1},
-    {&__pyx_kp_u_object_hook_must_be_a_callable, __pyx_k_object_hook_must_be_a_callable, sizeof(__pyx_k_object_hook_must_be_a_callable), 0, 1, 0, 0},
-    {&__pyx_n_s_object_pairs_hook, __pyx_k_object_pairs_hook, sizeof(__pyx_k_object_pairs_hook), 0, 0, 1, 1},
-    {&__pyx_kp_u_object_pairs_hook_and_object_hoo, __pyx_k_object_pairs_hook_and_object_hoo, sizeof(__pyx_k_object_pairs_hook_and_object_hoo), 0, 1, 0, 0},
-    {&__pyx_kp_u_object_pairs_hook_must_be_a_call, __pyx_k_object_pairs_hook_must_be_a_call, sizeof(__pyx_k_object_pairs_hook_must_be_a_call), 0, 1, 0, 0},
-    {&__pyx_n_s_off, __pyx_k_off, sizeof(__pyx_k_off), 0, 0, 1, 1},
-    {&__pyx_n_s_pack, __pyx_k_pack, sizeof(__pyx_k_pack), 0, 0, 1, 1},
-    {&__pyx_n_s_pack_array_header, __pyx_k_pack_array_header, sizeof(__pyx_k_pack_array_header), 0, 0, 1, 1},
-    {&__pyx_n_s_pack_ext_type, __pyx_k_pack_ext_type, sizeof(__pyx_k_pack_ext_type), 0, 0, 1, 1},
-    {&__pyx_n_s_pack_map_header, __pyx_k_pack_map_header, sizeof(__pyx_k_pack_map_header), 0, 0, 1, 1},
-    {&__pyx_n_s_pack_map_pairs, __pyx_k_pack_map_pairs, sizeof(__pyx_k_pack_map_pairs), 0, 0, 1, 1},
-    {&__pyx_n_s_packed, __pyx_k_packed, sizeof(__pyx_k_packed), 0, 0, 1, 1},
-    {&__pyx_n_s_pairs, __pyx_k_pairs, sizeof(__pyx_k_pairs), 0, 0, 1, 1},
-    {&__pyx_n_s_pybuff, __pyx_k_pybuff, sizeof(__pyx_k_pybuff), 0, 0, 1, 1},
-    {&__pyx_n_s_pyx_state, __pyx_k_pyx_state, sizeof(__pyx_k_pyx_state), 0, 0, 1, 1},
-    {&__pyx_n_s_pyx_vtable, __pyx_k_pyx_vtable, sizeof(__pyx_k_pyx_vtable), 0, 0, 1, 1},
-    {&__pyx_n_s_raw, __pyx_k_raw, sizeof(__pyx_k_raw), 0, 0, 1, 1},
-    {&__pyx_n_s_read, __pyx_k_read, sizeof(__pyx_k_read), 0, 0, 1, 1},
-    {&__pyx_n_s_read_array_header, __pyx_k_read_array_header, sizeof(__pyx_k_read_array_header), 0, 0, 1, 1},
-    {&__pyx_n_s_read_bytes, __pyx_k_read_bytes, sizeof(__pyx_k_read_bytes), 0, 0, 1, 1},
-    {&__pyx_n_s_read_map_header, __pyx_k_read_map_header, sizeof(__pyx_k_read_map_header), 0, 0, 1, 1},
-    {&__pyx_n_s_read_size, __pyx_k_read_size, sizeof(__pyx_k_read_size), 0, 0, 1, 1},
-    {&__pyx_kp_u_read_size_should_be_less_or_equa, __pyx_k_read_size_should_be_less_or_equa, sizeof(__pyx_k_read_size_should_be_less_or_equa), 0, 1, 0, 0},
-    {&__pyx_kp_u_recursion_limit_exceeded, __pyx_k_recursion_limit_exceeded, sizeof(__pyx_k_recursion_limit_exceeded), 0, 1, 0, 0},
-    {&__pyx_n_s_reduce, __pyx_k_reduce, sizeof(__pyx_k_reduce), 0, 0, 1, 1},
-    {&__pyx_n_s_reduce_cython, __pyx_k_reduce_cython, sizeof(__pyx_k_reduce_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_reduce_ex, __pyx_k_reduce_ex, sizeof(__pyx_k_reduce_ex), 0, 0, 1, 1},
-    {&__pyx_n_s_reset, __pyx_k_reset, sizeof(__pyx_k_reset), 0, 0, 1, 1},
-    {&__pyx_n_s_ret, __pyx_k_ret, sizeof(__pyx_k_ret), 0, 0, 1, 1},
-    {&__pyx_n_s_seconds, __pyx_k_seconds, sizeof(__pyx_k_seconds), 0, 0, 1, 1},
-    {&__pyx_n_s_self, __pyx_k_self, sizeof(__pyx_k_self), 0, 0, 1, 1},
-    {&__pyx_n_s_setstate, __pyx_k_setstate, sizeof(__pyx_k_setstate), 0, 0, 1, 1},
-    {&__pyx_n_s_setstate_cython, __pyx_k_setstate_cython, sizeof(__pyx_k_setstate_cython), 0, 0, 1, 1},
-    {&__pyx_n_s_size, __pyx_k_size, sizeof(__pyx_k_size), 0, 0, 1, 1},
-    {&__pyx_n_s_skip, __pyx_k_skip, sizeof(__pyx_k_skip), 0, 0, 1, 1},
-    {&__pyx_n_s_spec, __pyx_k_spec, sizeof(__pyx_k_spec), 0, 0, 1, 1},
-    {&__pyx_n_s_strict_map_key, __pyx_k_strict_map_key, sizeof(__pyx_k_strict_map_key), 0, 0, 1, 1},
-    {&__pyx_n_s_strict_types, __pyx_k_strict_types, sizeof(__pyx_k_strict_types), 0, 0, 1, 1},
-    {&__pyx_kp_s_stringsource, __pyx_k_stringsource, sizeof(__pyx_k_stringsource), 0, 0, 1, 0},
-    {&__pyx_n_s_tell, __pyx_k_tell, sizeof(__pyx_k_tell), 0, 0, 1, 1},
-    {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
-    {&__pyx_n_s_timestamp, __pyx_k_timestamp, sizeof(__pyx_k_timestamp), 0, 0, 1, 1},
-    {&__pyx_kp_u_timestamp_must_be_0_3, __pyx_k_timestamp_must_be_0_3, sizeof(__pyx_k_timestamp_must_be_0_3), 0, 1, 0, 0},
-    {&__pyx_n_s_timezone, __pyx_k_timezone, sizeof(__pyx_k_timezone), 0, 0, 1, 1},
-    {&__pyx_n_s_typecode, __pyx_k_typecode, sizeof(__pyx_k_typecode), 0, 0, 1, 1},
-    {&__pyx_n_s_unicode_errors, __pyx_k_unicode_errors, sizeof(__pyx_k_unicode_errors), 0, 0, 1, 1},
-    {&__pyx_kp_u_unicode_string_is_too_large, __pyx_k_unicode_string_is_too_large, sizeof(__pyx_k_unicode_string_is_too_large), 0, 1, 0, 0},
-    {&__pyx_n_s_unpack, __pyx_k_unpack, sizeof(__pyx_k_unpack), 0, 0, 1, 1},
-    {&__pyx_n_s_unpackb, __pyx_k_unpackb, sizeof(__pyx_k_unpackb), 0, 0, 1, 1},
-    {&__pyx_kp_u_unpacker_feed_is_not_be_able_to, __pyx_k_unpacker_feed_is_not_be_able_to, sizeof(__pyx_k_unpacker_feed_is_not_be_able_to), 0, 1, 0, 0},
-    {&__pyx_n_s_use_bin_type, __pyx_k_use_bin_type, sizeof(__pyx_k_use_bin_type), 0, 0, 1, 1},
-    {&__pyx_n_s_use_list, __pyx_k_use_list, sizeof(__pyx_k_use_list), 0, 0, 1, 1},
-    {&__pyx_n_s_use_single_float, __pyx_k_use_single_float, sizeof(__pyx_k_use_single_float), 0, 0, 1, 1},
-    {&__pyx_n_s_utc, __pyx_k_utc, sizeof(__pyx_k_utc), 0, 0, 1, 1},
-    {&__pyx_n_s_v, __pyx_k_v, sizeof(__pyx_k_v), 0, 0, 1, 1},
-    {&__pyx_n_s_view, __pyx_k_view, sizeof(__pyx_k_view), 0, 0, 1, 1},
-    {0, 0, 0, 0, 0, 0, 0}
-  };
-  return __Pyx_InitStrings(__pyx_string_tab);
-}
-/* #### Code section: cached_builtins ### */
-static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(0, 120, __pyx_L1_error)
-  __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 134, __pyx_L1_error)
-  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 163, __pyx_L1_error)
-  __pyx_builtin_OverflowError = __Pyx_GetBuiltinName(__pyx_n_s_OverflowError); if (!__pyx_builtin_OverflowError) __PYX_ERR(0, 182, __pyx_L1_error)
-  __pyx_builtin_RuntimeError = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeError); if (!__pyx_builtin_RuntimeError) __PYX_ERR(0, 302, __pyx_L1_error)
-  __pyx_builtin_NotImplementedError = __Pyx_GetBuiltinName(__pyx_n_s_NotImplementedError); if (!__pyx_builtin_NotImplementedError) __PYX_ERR(1, 117, __pyx_L1_error)
-  __pyx_builtin_BufferError = __Pyx_GetBuiltinName(__pyx_n_s_BufferError); if (!__pyx_builtin_BufferError) __PYX_ERR(1, 129, __pyx_L1_error)
-  __pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_n_s_AssertionError); if (!__pyx_builtin_AssertionError) __PYX_ERR(1, 394, __pyx_L1_error)
-  __pyx_builtin_StopIteration = __Pyx_GetBuiltinName(__pyx_n_s_StopIteration); if (!__pyx_builtin_StopIteration) __PYX_ERR(1, 477, __pyx_L1_error)
-  return 0;
-  __pyx_L1_error:;
-  return -1;
-}
-/* #### Code section: cached_constants ### */
-
-static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
-
-  /* "cpython/datetime.pxd":308
- * cdef inline object timezone_new(object offset, object name=None):
- *     if PY_VERSION_HEX < 0x030700b1:
- *         raise RuntimeError('Time zones are not available from the C-API.')             # <<<<<<<<<<<<<<
- *     return __Pyx_TimeZone_FromOffsetAndName(offset, <PyObject*>name if name is not None else NULL)
- * 
- */
-  __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_Time_zones_are_not_available_fro); if (unlikely(!__pyx_tuple_)) __PYX_ERR(2, 308, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple_);
-  __Pyx_GIVEREF(__pyx_tuple_);
-
-  /* "msgpack/_packer.pyx":120
- *         self.pk.buf = <char*> PyMem_Malloc(buf_size)
- *         if self.pk.buf == NULL:
- *             raise MemoryError("Unable to allocate internal buffer.")             # <<<<<<<<<<<<<<
- *         self.pk.buf_size = buf_size
- *         self.pk.length = 0
- */
-  __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_u_Unable_to_allocate_internal_buff); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 120, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__2);
-  __Pyx_GIVEREF(__pyx_tuple__2);
-
-  /* "msgpack/_packer.pyx":134
- *         if default is not None:
- *             if not PyCallable_Check(default):
- *                 raise TypeError("default must be a callable.")             # <<<<<<<<<<<<<<
- *         self._default = default
- * 
- */
-  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_default_must_be_a_callable); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 134, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__3);
-  __Pyx_GIVEREF(__pyx_tuple__3);
-
-  /* "msgpack/_packer.pyx":163
- * 
- *         if nest_limit < 0:
- *             raise ValueError("recursion limit exceeded.")             # <<<<<<<<<<<<<<
- * 
- *         while True:
- */
-  __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_u_recursion_limit_exceeded); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 163, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__5);
-  __Pyx_GIVEREF(__pyx_tuple__5);
-
-  /* "msgpack/_packer.pyx":188
- *                         continue
- *                     else:
- *                         raise OverflowError("Integer value out of range")             # <<<<<<<<<<<<<<
- *             elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):
- *                 longval = o
- */
-  __pyx_tuple__6 = PyTuple_Pack(1, __pyx_kp_u_Integer_value_out_of_range); if (unlikely(!__pyx_tuple__6)) __PYX_ERR(0, 188, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__6);
-  __Pyx_GIVEREF(__pyx_tuple__6);
-
-  /* "msgpack/_packer.pyx":211
- *                     ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
- *                     if ret == -2:
- *                         raise ValueError("unicode string is too large")             # <<<<<<<<<<<<<<
- *                 else:
- *                     o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
- */
-  __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_u_unicode_string_is_too_large); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 211, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__7);
-  __Pyx_GIVEREF(__pyx_tuple__7);
-
-  /* "msgpack/_packer.pyx":225
- *                 L = len(d)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("dict is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_map(&self.pk, L)
- *                 if ret == 0:
- */
-  __pyx_tuple__8 = PyTuple_Pack(1, __pyx_kp_u_dict_is_too_large); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 225, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__8);
-  __Pyx_GIVEREF(__pyx_tuple__8);
-
-  /* "msgpack/_packer.pyx":250
- *                 L = len(o.data)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("EXT data is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_ext(&self.pk, longval, L)
- *                 ret = msgpack_pack_raw_body(&self.pk, rawval, L)
- */
-  __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_u_EXT_data_is_too_large); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 250, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__9);
-  __Pyx_GIVEREF(__pyx_tuple__9);
-
-  /* "msgpack/_packer.pyx":260
- *                 L = Py_SIZE(o)
- *                 if L > ITEM_LIMIT:
- *                     raise ValueError("list is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_array(&self.pk, L)
- *                 if ret == 0:
- */
-  __pyx_tuple__10 = PyTuple_Pack(1, __pyx_kp_u_list_is_too_large); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 260, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__10);
-  __Pyx_GIVEREF(__pyx_tuple__10);
-
-  /* "msgpack/_packer.pyx":268
- *             elif PyMemoryView_Check(o):
- *                 if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
- *                     raise ValueError("could not get buffer for memoryview")             # <<<<<<<<<<<<<<
- *                 L = view.len
- *                 if L > ITEM_LIMIT:
- */
-  __pyx_tuple__11 = PyTuple_Pack(1, __pyx_kp_u_could_not_get_buffer_for_memoryv); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 268, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__11);
-  __Pyx_GIVEREF(__pyx_tuple__11);
-
-  /* "msgpack/_packer.pyx":272
- *                 if L > ITEM_LIMIT:
- *                     PyBuffer_Release(&view);
- *                     raise ValueError("memoryview is too large")             # <<<<<<<<<<<<<<
- *                 ret = msgpack_pack_bin(&self.pk, L)
- *                 if ret == 0:
- */
-  __pyx_tuple__12 = PyTuple_Pack(1, __pyx_kp_u_memoryview_is_too_large); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 272, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__12);
-  __Pyx_GIVEREF(__pyx_tuple__12);
-
-  /* "msgpack/_packer.pyx":280
- *                 delta = o - epoch
- *                 if not PyDelta_CheckExact(delta):
- *                     raise ValueError("failed to calculate delta")             # <<<<<<<<<<<<<<
- *                 llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
- *                 ulval = timedelta_microseconds(delta) * 1000
- */
-  __pyx_tuple__13 = PyTuple_Pack(1, __pyx_kp_u_failed_to_calculate_delta); if (unlikely(!__pyx_tuple__13)) __PYX_ERR(0, 280, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__13);
-  __Pyx_GIVEREF(__pyx_tuple__13);
-
-  /* "msgpack/_packer.pyx":302
- *             raise
- *         if ret:  # should not happen.
- *             raise RuntimeError("internal error")             # <<<<<<<<<<<<<<
- *         if self.autoreset:
- *             buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-  __pyx_tuple__14 = PyTuple_Pack(1, __pyx_kp_u_internal_error); if (unlikely(!__pyx_tuple__14)) __PYX_ERR(0, 302, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__14);
-  __Pyx_GIVEREF(__pyx_tuple__14);
-
-  /* "msgpack/_unpacker.pyx":81
- * 
- *     if object_hook is not None and object_pairs_hook is not None:
- *         raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")             # <<<<<<<<<<<<<<
- * 
- *     if object_hook is not None:
- */
-  __pyx_tuple__15 = PyTuple_Pack(1, __pyx_kp_u_object_pairs_hook_and_object_hoo); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(1, 81, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__15);
-  __Pyx_GIVEREF(__pyx_tuple__15);
-
-  /* "msgpack/_unpacker.pyx":85
- *     if object_hook is not None:
- *         if not PyCallable_Check(object_hook):
- *             raise TypeError("object_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.object_hook = <PyObject*>object_hook
- * 
- */
-  __pyx_tuple__16 = PyTuple_Pack(1, __pyx_kp_u_object_hook_must_be_a_callable); if (unlikely(!__pyx_tuple__16)) __PYX_ERR(1, 85, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__16);
-  __Pyx_GIVEREF(__pyx_tuple__16);
-
-  /* "msgpack/_unpacker.pyx":92
- *     else:
- *         if not PyCallable_Check(object_pairs_hook):
- *             raise TypeError("object_pairs_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.object_hook = <PyObject*>object_pairs_hook
- *         ctx.user.has_pairs_hook = True
- */
-  __pyx_tuple__17 = PyTuple_Pack(1, __pyx_kp_u_object_pairs_hook_must_be_a_call); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(1, 92, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__17);
-  __Pyx_GIVEREF(__pyx_tuple__17);
-
-  /* "msgpack/_unpacker.pyx":98
- *     if list_hook is not None:
- *         if not PyCallable_Check(list_hook):
- *             raise TypeError("list_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.list_hook = <PyObject*>list_hook
- * 
- */
-  __pyx_tuple__18 = PyTuple_Pack(1, __pyx_kp_u_list_hook_must_be_a_callable); if (unlikely(!__pyx_tuple__18)) __PYX_ERR(1, 98, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__18);
-  __Pyx_GIVEREF(__pyx_tuple__18);
-
-  /* "msgpack/_unpacker.pyx":103
- *     if ext_hook is not None:
- *         if not PyCallable_Check(ext_hook):
- *             raise TypeError("ext_hook must be a callable.")             # <<<<<<<<<<<<<<
- *         ctx.user.ext_hook = <PyObject*>ext_hook
- * 
- */
-  __pyx_tuple__19 = PyTuple_Pack(1, __pyx_kp_u_ext_hook_must_be_a_callable); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(1, 103, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__19);
-  __Pyx_GIVEREF(__pyx_tuple__19);
-
-  /* "msgpack/_unpacker.pyx":107
- * 
- *     if timestamp < 0 or 3 < timestamp:
- *         raise ValueError("timestamp must be 0..3")             # <<<<<<<<<<<<<<
- * 
- *     # Add Timestamp type to the user object so it may be used in unpack.h
- */
-  __pyx_tuple__20 = PyTuple_Pack(1, __pyx_kp_u_timestamp_must_be_0_3); if (unlikely(!__pyx_tuple__20)) __PYX_ERR(1, 107, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__20);
-  __Pyx_GIVEREF(__pyx_tuple__20);
-
-  /* "msgpack/_unpacker.pyx":129
- *     if view.itemsize != 1:
- *         PyBuffer_Release(view)
- *         raise BufferError("cannot unpack from multi-byte object")             # <<<<<<<<<<<<<<
- *     if PyBuffer_IsContiguous(view, b'A') == 0:
- *         PyBuffer_Release(view)
- */
-  __pyx_tuple__21 = PyTuple_Pack(1, __pyx_kp_u_cannot_unpack_from_multi_byte_ob); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(1, 129, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__21);
-  __Pyx_GIVEREF(__pyx_tuple__21);
-
-  /* "msgpack/_unpacker.pyx":205
- *     unpack_clear(&ctx)
- *     if ret == 0:
- *         raise ValueError("Unpack failed: incomplete input")             # <<<<<<<<<<<<<<
- *     elif ret == -2:
- *         raise FormatError
- */
-  __pyx_tuple__22 = PyTuple_Pack(1, __pyx_kp_u_Unpack_failed_incomplete_input); if (unlikely(!__pyx_tuple__22)) __PYX_ERR(1, 205, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__22);
-  __Pyx_GIVEREF(__pyx_tuple__22);
-
-  /* "msgpack/_unpacker.pyx":348
- *             self.file_like_read = file_like.read
- *             if not PyCallable_Check(self.file_like_read):
- *                 raise TypeError("`file_like.read` must be a callable.")             # <<<<<<<<<<<<<<
- * 
- *         if not max_buffer_size:
- */
-  __pyx_tuple__24 = PyTuple_Pack(1, __pyx_kp_u_file_like_read_must_be_a_callab); if (unlikely(!__pyx_tuple__24)) __PYX_ERR(1, 348, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__24);
-  __Pyx_GIVEREF(__pyx_tuple__24);
-
-  /* "msgpack/_unpacker.pyx":364
- * 
- *         if read_size > max_buffer_size:
- *             raise ValueError("read_size should be less or equal to max_buffer_size")             # <<<<<<<<<<<<<<
- *         if not read_size:
- *             read_size = min(max_buffer_size, 1024**2)
- */
-  __pyx_tuple__25 = PyTuple_Pack(1, __pyx_kp_u_read_size_should_be_less_or_equa); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(1, 364, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__25);
-  __Pyx_GIVEREF(__pyx_tuple__25);
-
-  /* "msgpack/_unpacker.pyx":394
- * 
- *         if self.file_like is not None:
- *             raise AssertionError(             # <<<<<<<<<<<<<<
- *                     "unpacker.feed() is not be able to use with `file_like`.")
- * 
- */
-  __pyx_tuple__26 = PyTuple_Pack(1, __pyx_kp_u_unpacker_feed_is_not_be_able_to); if (unlikely(!__pyx_tuple__26)) __PYX_ERR(1, 394, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__26);
-  __Pyx_GIVEREF(__pyx_tuple__26);
-
-  /* "msgpack/_unpacker.pyx":428
- *                     # self.buf still holds old buffer and will be freed during
- *                     # obj destruction
- *                     raise MemoryError("Unable to enlarge internal buffer.")             # <<<<<<<<<<<<<<
- *                 memcpy(new_buf, buf + head, tail - head)
- *                 PyMem_Free(buf)
- */
-  __pyx_tuple__27 = PyTuple_Pack(1, __pyx_kp_u_Unable_to_enlarge_internal_buffe); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(1, 428, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__27);
-  __Pyx_GIVEREF(__pyx_tuple__27);
-
-  /* "msgpack/_unpacker.pyx":477
- *                     continue
- *                 if iter:
- *                     raise StopIteration("No more data to unpack.")             # <<<<<<<<<<<<<<
- *                 else:
- *                     raise OutOfData("No more data to unpack.")
- */
-  __pyx_tuple__28 = PyTuple_Pack(1, __pyx_kp_u_No_more_data_to_unpack); if (unlikely(!__pyx_tuple__28)) __PYX_ERR(1, 477, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__28);
-  __Pyx_GIVEREF(__pyx_tuple__28);
-
-  /* "msgpack/_packer.pyx":294
- *             return ret
- * 
- *     cpdef pack(self, object obj):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         try:
- */
-  __pyx_tuple__31 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__31)) __PYX_ERR(0, 294, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__31);
-  __Pyx_GIVEREF(__pyx_tuple__31);
-  __pyx_codeobj__32 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__31, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_pack, 294, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) __PYX_ERR(0, 294, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":308
- *             return buf
- * 
- *     def pack_ext_type(self, typecode, data):             # <<<<<<<<<<<<<<
- *         msgpack_pack_ext(&self.pk, typecode, len(data))
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- */
-  __pyx_tuple__33 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_typecode, __pyx_n_s_data); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 308, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__33);
-  __Pyx_GIVEREF(__pyx_tuple__33);
-  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_pack_ext_type, 308, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 308, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":312
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- * 
- *     def pack_array_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-  __pyx_tuple__35 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_size, __pyx_n_s_ret, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 312, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__35);
-  __Pyx_GIVEREF(__pyx_tuple__35);
-  __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_pack_array_header, 312, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 312, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":325
- *             return buf
- * 
- *     def pack_map_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-  __pyx_codeobj__37 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_pack_map_header, 325, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__37)) __PYX_ERR(0, 325, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":338
- *             return buf
- * 
- *     def pack_map_pairs(self, object pairs):             # <<<<<<<<<<<<<<
- *         """
- *         Pack *pairs* as msgpack map type.
- */
-  __pyx_tuple__38 = PyTuple_Pack(6, __pyx_n_s_self, __pyx_n_s_pairs, __pyx_n_s_ret, __pyx_n_s_k, __pyx_n_s_v, __pyx_n_s_buf); if (unlikely(!__pyx_tuple__38)) __PYX_ERR(0, 338, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__38);
-  __Pyx_GIVEREF(__pyx_tuple__38);
-  __pyx_codeobj__39 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 6, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__38, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_pack_map_pairs, 338, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__39)) __PYX_ERR(0, 338, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":361
- *             return buf
- * 
- *     def reset(self):             # <<<<<<<<<<<<<<
- *         """Reset internal buffer.
- * 
- */
-  __pyx_tuple__40 = PyTuple_Pack(1, __pyx_n_s_self); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(0, 361, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__40);
-  __Pyx_GIVEREF(__pyx_tuple__40);
-  __pyx_codeobj__41 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_reset, 361, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__41)) __PYX_ERR(0, 361, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":368
- *         self.pk.length = 0
- * 
- *     def bytes(self):             # <<<<<<<<<<<<<<
- *         """Return internal buffer contents as bytes object"""
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-  __pyx_codeobj__42 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_bytes, 368, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__42)) __PYX_ERR(0, 368, __pyx_L1_error)
-
-  /* "msgpack/_packer.pyx":372
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- * 
- *     def getbuffer(self):             # <<<<<<<<<<<<<<
- *         """Return view of internal buffer."""
- *         return buff_to_buff(self.pk.buf, self.pk.length)
- */
-  __pyx_codeobj__43 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__packer_pyx, __pyx_n_s_getbuffer, 372, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__43)) __PYX_ERR(0, 372, __pyx_L1_error)
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-  __pyx_codeobj__44 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_reduce_cython, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__44)) __PYX_ERR(4, 1, __pyx_L1_error)
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __pyx_tuple__45 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_pyx_state); if (unlikely(!__pyx_tuple__45)) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__45);
-  __Pyx_GIVEREF(__pyx_tuple__45);
-  __pyx_codeobj__46 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__45, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__46)) __PYX_ERR(4, 3, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":116
- *     ctx.user.unicode_errors = unicode_errors
- * 
- * def default_read_extended_type(typecode, data):             # <<<<<<<<<<<<<<
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- */
-  __pyx_tuple__47 = PyTuple_Pack(2, __pyx_n_s_typecode, __pyx_n_s_data); if (unlikely(!__pyx_tuple__47)) __PYX_ERR(1, 116, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__47);
-  __Pyx_GIVEREF(__pyx_tuple__47);
-  __pyx_codeobj__48 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__47, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_default_read_extended_type, 116, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__48)) __PYX_ERR(1, 116, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-  __pyx_tuple__49 = PyTuple_Pack(23, __pyx_n_s_packed, __pyx_n_s_object_hook, __pyx_n_s_list_hook, __pyx_n_s_use_list, __pyx_n_s_raw, __pyx_n_s_timestamp, __pyx_n_s_strict_map_key, __pyx_n_s_unicode_errors, __pyx_n_s_object_pairs_hook, __pyx_n_s_ext_hook, __pyx_n_s_max_str_len, __pyx_n_s_max_bin_len, __pyx_n_s_max_array_len, __pyx_n_s_max_map_len, __pyx_n_s_max_ext_len, __pyx_n_s_ctx, __pyx_n_s_off, __pyx_n_s_ret, __pyx_n_s_view, __pyx_n_s_buf, __pyx_n_s_buf_len, __pyx_n_s_cerr, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__49)) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__49);
-  __Pyx_GIVEREF(__pyx_tuple__49);
-  __pyx_codeobj__50 = (PyObject*)__Pyx_PyCode_New(1, 0, 14, 23, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__49, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_unpackb, 143, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__50)) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":387
- *                  max_map_len, max_ext_len)
- * 
- *     def feed(self, object next_bytes):             # <<<<<<<<<<<<<<
- *         """Append `next_bytes` to internal buffer."""
- *         cdef Py_buffer pybuff
- */
-  __pyx_tuple__51 = PyTuple_Pack(5, __pyx_n_s_self, __pyx_n_s_next_bytes, __pyx_n_s_pybuff, __pyx_n_s_buf, __pyx_n_s_buf_len); if (unlikely(!__pyx_tuple__51)) __PYX_ERR(1, 387, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__51);
-  __Pyx_GIVEREF(__pyx_tuple__51);
-  __pyx_codeobj__52 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__51, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_feed, 387, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__52)) __PYX_ERR(1, 387, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":487
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))
- * 
- *     def read_bytes(self, Py_ssize_t nbytes):             # <<<<<<<<<<<<<<
- *         """Read a specified number of raw bytes from the stream"""
- *         cdef Py_ssize_t nread
- */
-  __pyx_tuple__53 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_nbytes, __pyx_n_s_nread, __pyx_n_s_ret); if (unlikely(!__pyx_tuple__53)) __PYX_ERR(1, 487, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__53);
-  __Pyx_GIVEREF(__pyx_tuple__53);
-  __pyx_codeobj__54 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__53, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_read_bytes, 487, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__54)) __PYX_ERR(1, 487, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":499
- *         return ret
- * 
- *     def unpack(self):             # <<<<<<<<<<<<<<
- *         """Unpack one object
- * 
- */
-  __pyx_codeobj__55 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_unpack, 499, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__55)) __PYX_ERR(1, 499, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":506
- *         return self._unpack(unpack_construct)
- * 
- *     def skip(self):             # <<<<<<<<<<<<<<
- *         """Read and ignore one object, returning None
- * 
- */
-  __pyx_codeobj__56 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_skip, 506, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__56)) __PYX_ERR(1, 506, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":513
- *         return self._unpack(unpack_skip)
- * 
- *     def read_array_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is an array, return its size n, such that
- *         the next n unpack() calls will iterate over its contents.
- */
-  __pyx_codeobj__57 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_read_array_header, 513, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__57)) __PYX_ERR(1, 513, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":521
- *         return self._unpack(read_array_header)
- * 
- *     def read_map_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is a map, return its size n, such that the
- *         next n * 2 unpack() calls will iterate over its key-value pairs.
- */
-  __pyx_codeobj__58 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_read_map_header, 521, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__58)) __PYX_ERR(1, 521, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":529
- *         return self._unpack(read_map_header)
- * 
- *     def tell(self):             # <<<<<<<<<<<<<<
- *         """Returns the current position of the Unpacker in bytes, i.e., the
- *         number of bytes that were read from the input, also the starting
- */
-  __pyx_codeobj__59 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_msgpack__unpacker_pyx, __pyx_n_s_tell, 529, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__59)) __PYX_ERR(1, 529, __pyx_L1_error)
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-  __pyx_codeobj__60 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_reduce_cython, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__60)) __PYX_ERR(4, 1, __pyx_L1_error)
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __pyx_codeobj__61 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__45, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_setstate_cython, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__61)) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_RefNannyFinishContext();
-  return 0;
-  __pyx_L1_error:;
-  __Pyx_RefNannyFinishContext();
-  return -1;
-}
-/* #### Code section: init_constants ### */
-
-static CYTHON_SMALL_CODE int __Pyx_InitConstants(void) {
-  if (__Pyx_CreateStringTabAndInitStrings() < 0) __PYX_ERR(5, 1, __pyx_L1_error);
-  __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(5, 1, __pyx_L1_error)
-  __pyx_int_1000000000 = PyInt_FromLong(1000000000L); if (unlikely(!__pyx_int_1000000000)) __PYX_ERR(5, 1, __pyx_L1_error)
-  return 0;
-  __pyx_L1_error:;
-  return -1;
-}
-/* #### Code section: init_globals ### */
-
-static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) {
-  return 0;
-}
-/* #### Code section: init_module ### */
-
-static CYTHON_SMALL_CODE int __Pyx_modinit_global_init_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_variable_export_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_function_export_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_type_init_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_type_import_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_variable_import_code(void); /*proto*/
-static CYTHON_SMALL_CODE int __Pyx_modinit_function_import_code(void); /*proto*/
-
-static int __Pyx_modinit_global_init_code(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_modinit_global_init_code", 0);
-  /*--- Global init code ---*/
-  __pyx_v_7msgpack_9_cmsgpack_utc = Py_None; Py_INCREF(Py_None);
-  __pyx_v_7msgpack_9_cmsgpack_epoch = Py_None; Py_INCREF(Py_None);
-  __pyx_v_7msgpack_9_cmsgpack_ExtType = Py_None; Py_INCREF(Py_None);
-  __pyx_v_7msgpack_9_cmsgpack_Timestamp = Py_None; Py_INCREF(Py_None);
-  __pyx_v_7msgpack_9_cmsgpack_giga = Py_None; Py_INCREF(Py_None);
-  __Pyx_RefNannyFinishContext();
-  return 0;
-}
-
-static int __Pyx_modinit_variable_export_code(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_modinit_variable_export_code", 0);
-  /*--- Variable export code ---*/
-  __Pyx_RefNannyFinishContext();
-  return 0;
-}
-
-static int __Pyx_modinit_function_export_code(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_modinit_function_export_code", 0);
-  /*--- Function export code ---*/
-  __Pyx_RefNannyFinishContext();
-  return 0;
-}
-
-static int __Pyx_modinit_type_init_code(void) {
-  __Pyx_RefNannyDeclarations
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0);
-  /*--- Type init code ---*/
-  __pyx_vtabptr_7msgpack_9_cmsgpack_Packer = &__pyx_vtable_7msgpack_9_cmsgpack_Packer;
-  __pyx_vtable_7msgpack_9_cmsgpack_Packer._pack = (int (*)(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *, PyObject *, struct __pyx_opt_args_7msgpack_9_cmsgpack_6Packer__pack *__pyx_optional_args))__pyx_f_7msgpack_9_cmsgpack_6Packer__pack;
-  __pyx_vtable_7msgpack_9_cmsgpack_Packer.pack = (PyObject *(*)(struct __pyx_obj_7msgpack_9_cmsgpack_Packer *, PyObject *, int __pyx_skip_dispatch))__pyx_f_7msgpack_9_cmsgpack_6Packer_pack;
-  #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_7msgpack_9_cmsgpack_Packer = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7msgpack_9_cmsgpack_Packer_spec, NULL); if (unlikely(!__pyx_ptype_7msgpack_9_cmsgpack_Packer)) __PYX_ERR(0, 62, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7msgpack_9_cmsgpack_Packer_spec, __pyx_ptype_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #else
-  __pyx_ptype_7msgpack_9_cmsgpack_Packer = &__pyx_type_7msgpack_9_cmsgpack_Packer;
-  #endif
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  #endif
-  #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #endif
-  #if PY_MAJOR_VERSION < 3
-  __pyx_ptype_7msgpack_9_cmsgpack_Packer->tp_print = 0;
-  #endif
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_ptype_7msgpack_9_cmsgpack_Packer->tp_dictoffset && __pyx_ptype_7msgpack_9_cmsgpack_Packer->tp_getattro == PyObject_GenericGetAttr)) {
-    __pyx_ptype_7msgpack_9_cmsgpack_Packer->tp_getattro = __Pyx_PyObject_GenericGetAttr;
-  }
-  #endif
-  if (__Pyx_SetVtable(__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_vtabptr_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Packer, (PyObject *) __pyx_ptype_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_7msgpack_9_cmsgpack_Packer) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
-  #endif
-  __pyx_vtabptr_7msgpack_9_cmsgpack_Unpacker = &__pyx_vtable_7msgpack_9_cmsgpack_Unpacker;
-  __pyx_vtable_7msgpack_9_cmsgpack_Unpacker.append_buffer = (PyObject *(*)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *, void *, Py_ssize_t))__pyx_f_7msgpack_9_cmsgpack_8Unpacker_append_buffer;
-  __pyx_vtable_7msgpack_9_cmsgpack_Unpacker.read_from_file = (int (*)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *))__pyx_f_7msgpack_9_cmsgpack_8Unpacker_read_from_file;
-  __pyx_vtable_7msgpack_9_cmsgpack_Unpacker._unpack = (PyObject *(*)(struct __pyx_obj_7msgpack_9_cmsgpack_Unpacker *, execute_fn, struct __pyx_opt_args_7msgpack_9_cmsgpack_8Unpacker__unpack *__pyx_optional_args))__pyx_f_7msgpack_9_cmsgpack_8Unpacker__unpack;
-  #if CYTHON_USE_TYPE_SPECS
-  __pyx_ptype_7msgpack_9_cmsgpack_Unpacker = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_7msgpack_9_cmsgpack_Unpacker_spec, NULL); if (unlikely(!__pyx_ptype_7msgpack_9_cmsgpack_Unpacker)) __PYX_ERR(1, 213, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_7msgpack_9_cmsgpack_Unpacker_spec, __pyx_ptype_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #else
-  __pyx_ptype_7msgpack_9_cmsgpack_Unpacker = &__pyx_type_7msgpack_9_cmsgpack_Unpacker;
-  #endif
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  #endif
-  #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #endif
-  #if PY_MAJOR_VERSION < 3
-  __pyx_ptype_7msgpack_9_cmsgpack_Unpacker->tp_print = 0;
-  #endif
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_ptype_7msgpack_9_cmsgpack_Unpacker->tp_dictoffset && __pyx_ptype_7msgpack_9_cmsgpack_Unpacker->tp_getattro == PyObject_GenericGetAttr)) {
-    __pyx_ptype_7msgpack_9_cmsgpack_Unpacker->tp_getattro = __Pyx_PyObject_GenericGetAttr;
-  }
-  #endif
-  if (__Pyx_SetVtable(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_vtabptr_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Unpacker, (PyObject *) __pyx_ptype_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_7msgpack_9_cmsgpack_Unpacker) < 0) __PYX_ERR(1, 213, __pyx_L1_error)
-  #endif
-  __Pyx_RefNannyFinishContext();
-  return 0;
-  __pyx_L1_error:;
-  __Pyx_RefNannyFinishContext();
-  return -1;
-}
-
-static int __Pyx_modinit_type_import_code(void) {
-  __Pyx_RefNannyDeclarations
-  PyObject *__pyx_t_1 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannySetupContext("__Pyx_modinit_type_import_code", 0);
-  /*--- Type import code ---*/
-  __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(6, 9, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", 
-  #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000
-  sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyTypeObject),
-  #elif CYTHON_COMPILING_IN_LIMITED_API
-  sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyTypeObject),
-  #else
-  sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyHeapTypeObject),
-  #endif
-  __Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(6, 9, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(7, 8, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_7cpython_4bool_bool = __Pyx_ImportType_3_0_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "bool", sizeof(PyBoolObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyBoolObject),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_4bool_bool) __PYX_ERR(7, 8, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(8, 15, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_7cpython_7complex_complex = __Pyx_ImportType_3_0_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "complex", sizeof(PyComplexObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyComplexObject),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_7complex_complex) __PYX_ERR(8, 15, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyImport_ImportModule("datetime"); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 70, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_ptype_7cpython_8datetime_date = __Pyx_ImportType_3_0_2(__pyx_t_1, "datetime", "date", sizeof(PyDateTime_Date), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyDateTime_Date),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_8datetime_date) __PYX_ERR(2, 70, __pyx_L1_error)
-  __pyx_ptype_7cpython_8datetime_time = __Pyx_ImportType_3_0_2(__pyx_t_1, "datetime", "time", sizeof(PyDateTime_Time), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyDateTime_Time),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_8datetime_time) __PYX_ERR(2, 83, __pyx_L1_error)
-  __pyx_ptype_7cpython_8datetime_datetime = __Pyx_ImportType_3_0_2(__pyx_t_1, "datetime", "datetime", sizeof(PyDateTime_DateTime), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyDateTime_DateTime),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_8datetime_datetime) __PYX_ERR(2, 109, __pyx_L1_error)
-  __pyx_ptype_7cpython_8datetime_timedelta = __Pyx_ImportType_3_0_2(__pyx_t_1, "datetime", "timedelta", sizeof(PyDateTime_Delta), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyDateTime_Delta),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_8datetime_timedelta) __PYX_ERR(2, 147, __pyx_L1_error)
-  __pyx_ptype_7cpython_8datetime_tzinfo = __Pyx_ImportType_3_0_2(__pyx_t_1, "datetime", "tzinfo", sizeof(PyDateTime_TZInfo), __PYX_GET_STRUCT_ALIGNMENT_3_0_2(PyDateTime_TZInfo),__Pyx_ImportType_CheckSize_Warn_3_0_2); if (!__pyx_ptype_7cpython_8datetime_tzinfo) __PYX_ERR(2, 160, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_RefNannyFinishContext();
-  return 0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_1);
-  __Pyx_RefNannyFinishContext();
-  return -1;
-}
-
-static int __Pyx_modinit_variable_import_code(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_modinit_variable_import_code", 0);
-  /*--- Variable import code ---*/
-  __Pyx_RefNannyFinishContext();
-  return 0;
-}
-
-static int __Pyx_modinit_function_import_code(void) {
-  __Pyx_RefNannyDeclarations
-  __Pyx_RefNannySetupContext("__Pyx_modinit_function_import_code", 0);
-  /*--- Function import code ---*/
-  __Pyx_RefNannyFinishContext();
-  return 0;
-}
-
-
-#if PY_MAJOR_VERSION >= 3
-#if CYTHON_PEP489_MULTI_PHASE_INIT
-static PyObject* __pyx_pymod_create(PyObject *spec, PyModuleDef *def); /*proto*/
-static int __pyx_pymod_exec__cmsgpack(PyObject* module); /*proto*/
-static PyModuleDef_Slot __pyx_moduledef_slots[] = {
-  {Py_mod_create, (void*)__pyx_pymod_create},
-  {Py_mod_exec, (void*)__pyx_pymod_exec__cmsgpack},
-  {0, NULL}
-};
-#endif
-
-#ifdef __cplusplus
-namespace {
-  struct PyModuleDef __pyx_moduledef =
-  #else
-  static struct PyModuleDef __pyx_moduledef =
-  #endif
-  {
-      PyModuleDef_HEAD_INIT,
-      "_cmsgpack",
-      0, /* m_doc */
-    #if CYTHON_PEP489_MULTI_PHASE_INIT
-      0, /* m_size */
-    #elif CYTHON_USE_MODULE_STATE
-      sizeof(__pyx_mstate), /* m_size */
-    #else
-      -1, /* m_size */
-    #endif
-      __pyx_methods /* m_methods */,
-    #if CYTHON_PEP489_MULTI_PHASE_INIT
-      __pyx_moduledef_slots, /* m_slots */
-    #else
-      NULL, /* m_reload */
-    #endif
-    #if CYTHON_USE_MODULE_STATE
-      __pyx_m_traverse, /* m_traverse */
-      __pyx_m_clear, /* m_clear */
-      NULL /* m_free */
-    #else
-      NULL, /* m_traverse */
-      NULL, /* m_clear */
-      NULL /* m_free */
-    #endif
-  };
-  #ifdef __cplusplus
-} /* anonymous namespace */
-#endif
-#endif
-
-#ifndef CYTHON_NO_PYINIT_EXPORT
-#define __Pyx_PyMODINIT_FUNC PyMODINIT_FUNC
-#elif PY_MAJOR_VERSION < 3
-#ifdef __cplusplus
-#define __Pyx_PyMODINIT_FUNC extern "C" void
-#else
-#define __Pyx_PyMODINIT_FUNC void
-#endif
-#else
-#ifdef __cplusplus
-#define __Pyx_PyMODINIT_FUNC extern "C" PyObject *
-#else
-#define __Pyx_PyMODINIT_FUNC PyObject *
-#endif
-#endif
-
-
-#if PY_MAJOR_VERSION < 3
-__Pyx_PyMODINIT_FUNC init_cmsgpack(void) CYTHON_SMALL_CODE; /*proto*/
-__Pyx_PyMODINIT_FUNC init_cmsgpack(void)
-#else
-__Pyx_PyMODINIT_FUNC PyInit__cmsgpack(void) CYTHON_SMALL_CODE; /*proto*/
-__Pyx_PyMODINIT_FUNC PyInit__cmsgpack(void)
-#if CYTHON_PEP489_MULTI_PHASE_INIT
-{
-  return PyModuleDef_Init(&__pyx_moduledef);
-}
-static CYTHON_SMALL_CODE int __Pyx_check_single_interpreter(void) {
-    #if PY_VERSION_HEX >= 0x030700A1
-    static PY_INT64_T main_interpreter_id = -1;
-    PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
-    if (main_interpreter_id == -1) {
-        main_interpreter_id = current_id;
-        return (unlikely(current_id == -1)) ? -1 : 0;
-    } else if (unlikely(main_interpreter_id != current_id))
-    #else
-    static PyInterpreterState *main_interpreter = NULL;
-    PyInterpreterState *current_interpreter = PyThreadState_Get()->interp;
-    if (!main_interpreter) {
-        main_interpreter = current_interpreter;
-    } else if (unlikely(main_interpreter != current_interpreter))
-    #endif
-    {
-        PyErr_SetString(
-            PyExc_ImportError,
-            "Interpreter change detected - this module can only be loaded into one interpreter per process.");
-        return -1;
-    }
-    return 0;
-}
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_SMALL_CODE int __Pyx_copy_spec_to_module(PyObject *spec, PyObject *module, const char* from_name, const char* to_name, int allow_none)
-#else
-static CYTHON_SMALL_CODE int __Pyx_copy_spec_to_module(PyObject *spec, PyObject *moddict, const char* from_name, const char* to_name, int allow_none)
-#endif
-{
-    PyObject *value = PyObject_GetAttrString(spec, from_name);
-    int result = 0;
-    if (likely(value)) {
-        if (allow_none || value != Py_None) {
-#if CYTHON_COMPILING_IN_LIMITED_API
-            result = PyModule_AddObject(module, to_name, value);
-#else
-            result = PyDict_SetItemString(moddict, to_name, value);
-#endif
-        }
-        Py_DECREF(value);
-    } else if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
-        PyErr_Clear();
-    } else {
-        result = -1;
-    }
-    return result;
-}
-static CYTHON_SMALL_CODE PyObject* __pyx_pymod_create(PyObject *spec, PyModuleDef *def) {
-    PyObject *module = NULL, *moddict, *modname;
-    CYTHON_UNUSED_VAR(def);
-    if (__Pyx_check_single_interpreter())
-        return NULL;
-    if (__pyx_m)
-        return __Pyx_NewRef(__pyx_m);
-    modname = PyObject_GetAttrString(spec, "name");
-    if (unlikely(!modname)) goto bad;
-    module = PyModule_NewObject(modname);
-    Py_DECREF(modname);
-    if (unlikely(!module)) goto bad;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    moddict = module;
-#else
-    moddict = PyModule_GetDict(module);
-    if (unlikely(!moddict)) goto bad;
-#endif
-    if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "loader", "__loader__", 1) < 0)) goto bad;
-    if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "origin", "__file__", 1) < 0)) goto bad;
-    if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "parent", "__package__", 1) < 0)) goto bad;
-    if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "submodule_search_locations", "__path__", 0) < 0)) goto bad;
-    return module;
-bad:
-    Py_XDECREF(module);
-    return NULL;
-}
-
-
-static CYTHON_SMALL_CODE int __pyx_pymod_exec__cmsgpack(PyObject *__pyx_pyinit_module)
-#endif
-#endif
-{
-  int stringtab_initialized = 0;
-  #if CYTHON_USE_MODULE_STATE
-  int pystate_addmodule_run = 0;
-  #endif
-  PyObject *__pyx_t_1 = NULL;
-  PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
-  __Pyx_RefNannyDeclarations
-  #if CYTHON_PEP489_MULTI_PHASE_INIT
-  if (__pyx_m) {
-    if (__pyx_m == __pyx_pyinit_module) return 0;
-    PyErr_SetString(PyExc_RuntimeError, "Module '_cmsgpack' has already been imported. Re-initialisation is not supported.");
-    return -1;
-  }
-  #elif PY_MAJOR_VERSION >= 3
-  if (__pyx_m) return __Pyx_NewRef(__pyx_m);
-  #endif
-  /*--- Module creation code ---*/
-  #if CYTHON_PEP489_MULTI_PHASE_INIT
-  __pyx_m = __pyx_pyinit_module;
-  Py_INCREF(__pyx_m);
-  #else
-  #if PY_MAJOR_VERSION < 3
-  __pyx_m = Py_InitModule4("_cmsgpack", __pyx_methods, 0, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m);
-  if (unlikely(!__pyx_m)) __PYX_ERR(5, 1, __pyx_L1_error)
-  #elif CYTHON_USE_MODULE_STATE
-  __pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(5, 1, __pyx_L1_error)
-  {
-    int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
-    __pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to _cmsgpack pseudovariable */
-    if (unlikely((add_module_result < 0))) __PYX_ERR(5, 1, __pyx_L1_error)
-    pystate_addmodule_run = 1;
-  }
-  #else
-  __pyx_m = PyModule_Create(&__pyx_moduledef);
-  if (unlikely(!__pyx_m)) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #endif
-  CYTHON_UNUSED_VAR(__pyx_t_1);
-  __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) __PYX_ERR(5, 1, __pyx_L1_error)
-  Py_INCREF(__pyx_d);
-  __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(5, 1, __pyx_L1_error)
-  Py_INCREF(__pyx_b);
-  __pyx_cython_runtime = PyImport_AddModule((char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(5, 1, __pyx_L1_error)
-  Py_INCREF(__pyx_cython_runtime);
-  if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #if CYTHON_REFNANNY
-__Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
-if (!__Pyx_RefNanny) {
-  PyErr_Clear();
-  __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny");
-  if (!__Pyx_RefNanny)
-      Py_FatalError("failed to import 'refnanny' module");
-}
-#endif
-  __Pyx_RefNannySetupContext("__Pyx_PyMODINIT_FUNC PyInit__cmsgpack(void)", 0);
-  if (__Pyx_check_binary_version() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #ifdef __Pxy_PyFrame_Initialize_Offsets
-  __Pxy_PyFrame_Initialize_Offsets();
-  #endif
-  __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) __PYX_ERR(5, 1, __pyx_L1_error)
-  __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) __PYX_ERR(5, 1, __pyx_L1_error)
-  __pyx_empty_unicode = PyUnicode_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_unicode)) __PYX_ERR(5, 1, __pyx_L1_error)
-  #ifdef __Pyx_CyFunction_USED
-  if (__pyx_CyFunction_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #ifdef __Pyx_FusedFunction_USED
-  if (__pyx_FusedFunction_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #ifdef __Pyx_Coroutine_USED
-  if (__pyx_Coroutine_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #ifdef __Pyx_Generator_USED
-  if (__pyx_Generator_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #ifdef __Pyx_AsyncGen_USED
-  if (__pyx_AsyncGen_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  #ifdef __Pyx_StopAsyncIteration_USED
-  if (__pyx_StopAsyncIteration_init(__pyx_m) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  /*--- Library function declarations ---*/
-  /*--- Threads initialization code ---*/
-  #if defined(WITH_THREAD) && PY_VERSION_HEX < 0x030700F0 && defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
-  PyEval_InitThreads();
-  #endif
-  /*--- Initialize various global constants etc. ---*/
-  if (__Pyx_InitConstants() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  stringtab_initialized = 1;
-  if (__Pyx_InitGlobals() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT)
-  if (__Pyx_init_sys_getdefaultencoding_params() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-  if (__pyx_module_is_main_msgpack___cmsgpack) {
-    if (PyObject_SetAttr(__pyx_m, __pyx_n_s_name, __pyx_n_s_main) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  }
-  #if PY_MAJOR_VERSION >= 3
-  {
-    PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(5, 1, __pyx_L1_error)
-    if (!PyDict_GetItemString(modules, "msgpack._cmsgpack")) {
-      if (unlikely((PyDict_SetItemString(modules, "msgpack._cmsgpack", __pyx_m) < 0))) __PYX_ERR(5, 1, __pyx_L1_error)
-    }
-  }
-  #endif
-  /*--- Builtin init code ---*/
-  if (__Pyx_InitCachedBuiltins() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  /*--- Constants init code ---*/
-  if (__Pyx_InitCachedConstants() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  /*--- Global type/function init code ---*/
-  (void)__Pyx_modinit_global_init_code();
-  (void)__Pyx_modinit_variable_export_code();
-  (void)__Pyx_modinit_function_export_code();
-  if (unlikely((__Pyx_modinit_type_init_code() < 0))) __PYX_ERR(5, 1, __pyx_L1_error)
-  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(5, 1, __pyx_L1_error)
-  (void)__Pyx_modinit_variable_import_code();
-  (void)__Pyx_modinit_function_import_code();
-  /*--- Execution code ---*/
-  #if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)
-  if (__Pyx_patch_abc() < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  #endif
-
-  /* "msgpack/_cmsgpack.pyx":4
- * #cython: embedsignature=True, c_string_encoding=ascii, language_level=3
- * from cpython.datetime cimport import_datetime, datetime_new
- * import_datetime()             # <<<<<<<<<<<<<<
- * 
- * import datetime
- */
-  __pyx_f_7cpython_8datetime_import_datetime(); if (unlikely(PyErr_Occurred())) __PYX_ERR(5, 4, __pyx_L1_error)
-
-  /* "msgpack/_cmsgpack.pyx":6
- * import_datetime()
- * 
- * import datetime             # <<<<<<<<<<<<<<
- * cdef object utc = datetime.timezone.utc
- * cdef object epoch = datetime_new(1970, 1, 1, 0, 0, 0, 0, tz=utc)
- */
-  __pyx_t_2 = __Pyx_ImportDottedModule(__pyx_n_s_datetime, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(5, 6, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_datetime, __pyx_t_2) < 0) __PYX_ERR(5, 6, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_cmsgpack.pyx":7
- * 
- * import datetime
- * cdef object utc = datetime.timezone.utc             # <<<<<<<<<<<<<<
- * cdef object epoch = datetime_new(1970, 1, 1, 0, 0, 0, 0, tz=utc)
- * 
- */
-  __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_datetime); if (unlikely(!__pyx_t_2)) __PYX_ERR(5, 7, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_timezone); if (unlikely(!__pyx_t_3)) __PYX_ERR(5, 7, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_utc); if (unlikely(!__pyx_t_2)) __PYX_ERR(5, 7, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_utc);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_utc, __pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_2);
-  __pyx_t_2 = 0;
-
-  /* "msgpack/_cmsgpack.pyx":8
- * import datetime
- * cdef object utc = datetime.timezone.utc
- * cdef object epoch = datetime_new(1970, 1, 1, 0, 0, 0, 0, tz=utc)             # <<<<<<<<<<<<<<
- * 
- * include "_packer.pyx"
- */
-  __pyx_t_2 = __pyx_v_7msgpack_9_cmsgpack_utc;
-  __Pyx_INCREF(__pyx_t_2);
-  __pyx_t_3 = ((PyObject *)__pyx_f_7cpython_8datetime_datetime_new(0x7B2, 1, 1, 0, 0, 0, 0, __pyx_t_2, NULL)); if (unlikely(!__pyx_t_3)) __PYX_ERR(5, 8, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_epoch);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_epoch, __pyx_t_3);
-  __Pyx_GIVEREF(__pyx_t_3);
-  __pyx_t_3 = 0;
-
-  /* "msgpack/_packer.pyx":13
- * cdef Timestamp
- * 
- * from .ext import ExtType, Timestamp             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_n_s_ExtType);
-  __Pyx_GIVEREF(__pyx_n_s_ExtType);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_n_s_ExtType)) __PYX_ERR(0, 13, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_Timestamp);
-  __Pyx_GIVEREF(__pyx_n_s_Timestamp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 1, __pyx_n_s_Timestamp)) __PYX_ERR(0, 13, __pyx_L1_error);
-  __pyx_t_2 = __Pyx_Import(__pyx_n_s_ext, __pyx_t_3, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_ExtType); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_t_3);
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_ExtType, __pyx_t_3);
-  __Pyx_GIVEREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Timestamp); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_t_3);
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_Timestamp);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_Timestamp, __pyx_t_3);
-  __Pyx_GIVEREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_packer.pyx":50
- *     object buff_to_buff(char *, Py_ssize_t)
- * 
- * cdef int DEFAULT_RECURSE_LIMIT=511             # <<<<<<<<<<<<<<
- * cdef long long ITEM_LIMIT = (2**32)-1
- * 
- */
-  __pyx_v_7msgpack_9_cmsgpack_DEFAULT_RECURSE_LIMIT = 0x1FF;
-
-  /* "msgpack/_packer.pyx":51
- * 
- * cdef int DEFAULT_RECURSE_LIMIT=511
- * cdef long long ITEM_LIMIT = (2**32)-1             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __pyx_v_7msgpack_9_cmsgpack_ITEM_LIMIT = 0xffffffff;
-
-  /* "msgpack/_packer.pyx":147
- *         self.pk.buf = NULL
- * 
- *     cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:             # <<<<<<<<<<<<<<
- *         cdef long long llval
- *         cdef unsigned long long ullval
- */
-  __pyx_k__4 = __pyx_v_7msgpack_9_cmsgpack_DEFAULT_RECURSE_LIMIT;
-
-  /* "msgpack/_packer.pyx":294
- *             return ret
- * 
- *     cpdef pack(self, object obj):             # <<<<<<<<<<<<<<
- *         cdef int ret
- *         try:
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_7pack, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_pack, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__32)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 294, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_pack, __pyx_t_2) < 0) __PYX_ERR(0, 294, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":308
- *             return buf
- * 
- *     def pack_ext_type(self, typecode, data):             # <<<<<<<<<<<<<<
- *         msgpack_pack_ext(&self.pk, typecode, len(data))
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_9pack_ext_type, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_pack_ext_type, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 308, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_pack_ext_type, __pyx_t_2) < 0) __PYX_ERR(0, 308, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":312
- *         msgpack_pack_raw_body(&self.pk, data, len(data))
- * 
- *     def pack_array_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_11pack_array_header, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_pack_array_header, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__36)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 312, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_pack_array_header, __pyx_t_2) < 0) __PYX_ERR(0, 312, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":325
- *             return buf
- * 
- *     def pack_map_header(self, long long size):             # <<<<<<<<<<<<<<
- *         if size > ITEM_LIMIT:
- *             raise ValueError
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_13pack_map_header, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_pack_map_header, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__37)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 325, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_pack_map_header, __pyx_t_2) < 0) __PYX_ERR(0, 325, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":338
- *             return buf
- * 
- *     def pack_map_pairs(self, object pairs):             # <<<<<<<<<<<<<<
- *         """
- *         Pack *pairs* as msgpack map type.
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_15pack_map_pairs, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_pack_map_pairs, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__39)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 338, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_pack_map_pairs, __pyx_t_2) < 0) __PYX_ERR(0, 338, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":361
- *             return buf
- * 
- *     def reset(self):             # <<<<<<<<<<<<<<
- *         """Reset internal buffer.
- * 
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_17reset, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_reset, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__41)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 361, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_reset, __pyx_t_2) < 0) __PYX_ERR(0, 361, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":368
- *         self.pk.length = 0
- * 
- *     def bytes(self):             # <<<<<<<<<<<<<<
- *         """Return internal buffer contents as bytes object"""
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_19bytes, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_bytes, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__42)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 368, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_bytes, __pyx_t_2) < 0) __PYX_ERR(0, 368, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "msgpack/_packer.pyx":372
- *         return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
- * 
- *     def getbuffer(self):             # <<<<<<<<<<<<<<
- *         """Return view of internal buffer."""
- *         return buff_to_buff(self.pk.buf, self.pk.length)
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_21getbuffer, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer_getbuffer, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__43)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 372, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Packer, __pyx_n_s_getbuffer, __pyx_t_2) < 0) __PYX_ERR(0, 372, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Packer);
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_23__reduce_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer___reduce_cython, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__44)); if (unlikely(!__pyx_t_2)) __PYX_ERR(4, 1, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_reduce_cython, __pyx_t_2) < 0) __PYX_ERR(4, 1, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_6Packer_25__setstate_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Packer___setstate_cython, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__46)); if (unlikely(!__pyx_t_2)) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_2) < 0) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":14
- * 
- * from .exceptions import (
- *     BufferFull,             # <<<<<<<<<<<<<<
- *     OutOfData,
- *     ExtraData,
- */
-  __pyx_t_2 = PyList_New(5); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 14, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_INCREF(__pyx_n_s_BufferFull);
-  __Pyx_GIVEREF(__pyx_n_s_BufferFull);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_BufferFull)) __PYX_ERR(1, 14, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_OutOfData);
-  __Pyx_GIVEREF(__pyx_n_s_OutOfData);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_OutOfData)) __PYX_ERR(1, 14, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_ExtraData);
-  __Pyx_GIVEREF(__pyx_n_s_ExtraData);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_2, 2, __pyx_n_s_ExtraData)) __PYX_ERR(1, 14, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_FormatError);
-  __Pyx_GIVEREF(__pyx_n_s_FormatError);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_2, 3, __pyx_n_s_FormatError)) __PYX_ERR(1, 14, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_StackError);
-  __Pyx_GIVEREF(__pyx_n_s_StackError);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_2, 4, __pyx_n_s_StackError)) __PYX_ERR(1, 14, __pyx_L1_error);
-
-  /* "msgpack/_unpacker.pyx":13
- * from libc.stdint cimport uint64_t
- * 
- * from .exceptions import (             # <<<<<<<<<<<<<<
- *     BufferFull,
- *     OutOfData,
- */
-  __pyx_t_3 = __Pyx_Import(__pyx_n_s_exceptions, __pyx_t_2, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_BufferFull); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_BufferFull, __pyx_t_2) < 0) __PYX_ERR(1, 14, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_OutOfData); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_OutOfData, __pyx_t_2) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_ExtraData); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_ExtraData, __pyx_t_2) < 0) __PYX_ERR(1, 16, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_FormatError); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_FormatError, __pyx_t_2) < 0) __PYX_ERR(1, 17, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_StackError); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_StackError, __pyx_t_2) < 0) __PYX_ERR(1, 18, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-
-  /* "msgpack/_unpacker.pyx":20
- *     StackError,
- * )
- * from .ext import ExtType, Timestamp             # <<<<<<<<<<<<<<
- * 
- * cdef object giga = 1_000_000_000
- */
-  __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 20, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_n_s_ExtType);
-  __Pyx_GIVEREF(__pyx_n_s_ExtType);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_n_s_ExtType)) __PYX_ERR(1, 20, __pyx_L1_error);
-  __Pyx_INCREF(__pyx_n_s_Timestamp);
-  __Pyx_GIVEREF(__pyx_n_s_Timestamp);
-  if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 1, __pyx_n_s_Timestamp)) __PYX_ERR(1, 20, __pyx_L1_error);
-  __pyx_t_2 = __Pyx_Import(__pyx_n_s_ext, __pyx_t_3, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 20, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_ExtType); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 20, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_t_3);
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_ExtType, __pyx_t_3);
-  __Pyx_GIVEREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_Timestamp); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 20, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(__pyx_t_3);
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_Timestamp);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_Timestamp, __pyx_t_3);
-  __Pyx_GIVEREF(__pyx_t_3);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":22
- * from .ext import ExtType, Timestamp
- * 
- * cdef object giga = 1_000_000_000             # <<<<<<<<<<<<<<
- * 
- * 
- */
-  __Pyx_INCREF(__pyx_int_1000000000);
-  __Pyx_XGOTREF(__pyx_v_7msgpack_9_cmsgpack_giga);
-  __Pyx_DECREF_SET(__pyx_v_7msgpack_9_cmsgpack_giga, __pyx_int_1000000000);
-  __Pyx_GIVEREF(__pyx_int_1000000000);
-
-  /* "msgpack/_unpacker.pyx":116
- *     ctx.user.unicode_errors = unicode_errors
- * 
- * def default_read_extended_type(typecode, data):             # <<<<<<<<<<<<<<
- *     raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
- * 
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_1default_read_extended_type, 0, __pyx_n_s_default_read_extended_type, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__48)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 116, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_default_read_extended_type, __pyx_t_2) < 0) __PYX_ERR(1, 116, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":143
- * 
- * 
- * def unpackb(object packed, *, object object_hook=None, object list_hook=None,             # <<<<<<<<<<<<<<
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_3unpackb, 0, __pyx_n_s_unpackb, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__50)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (!__Pyx_CyFunction_InitDefaults(__pyx_t_2, sizeof(__pyx_defaults), 1)) __PYX_ERR(1, 143, __pyx_L1_error)
-
-  /* "msgpack/_unpacker.pyx":146
- *             bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
- *             unicode_errors=None,
- *             object_pairs_hook=None, ext_hook=ExtType,             # <<<<<<<<<<<<<<
- *             Py_ssize_t max_str_len=-1,
- *             Py_ssize_t max_bin_len=-1,
- */
-  __Pyx_INCREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-  __Pyx_CyFunction_Defaults(__pyx_defaults, __pyx_t_2)->__pyx_arg_ext_hook = __pyx_v_7msgpack_9_cmsgpack_ExtType;
-  __Pyx_GIVEREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-  __Pyx_CyFunction_SetDefaultsGetter(__pyx_t_2, __pyx_pf_7msgpack_9_cmsgpack_4__defaults__);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_unpackb, __pyx_t_2) < 0) __PYX_ERR(1, 143, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_unpacker.pyx":331
- *                  object object_hook=None, object object_pairs_hook=None, object list_hook=None,
- *                  unicode_errors=None, Py_ssize_t max_buffer_size=100*1024*1024,
- *                  object ext_hook=ExtType,             # <<<<<<<<<<<<<<
- *                  Py_ssize_t max_str_len=-1,
- *                  Py_ssize_t max_bin_len=-1,
- */
-  __Pyx_INCREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-  __pyx_k__23 = __pyx_v_7msgpack_9_cmsgpack_ExtType;
-  __Pyx_GIVEREF(__pyx_v_7msgpack_9_cmsgpack_ExtType);
-
-  /* "msgpack/_unpacker.pyx":387
- *                  max_map_len, max_ext_len)
- * 
- *     def feed(self, object next_bytes):             # <<<<<<<<<<<<<<
- *         """Append `next_bytes` to internal buffer."""
- *         cdef Py_buffer pybuff
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_7feed, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_feed, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__52)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 387, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_feed, __pyx_t_2) < 0) __PYX_ERR(1, 387, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":487
- *                 raise ValueError("Unpack failed: error = %d" % (ret,))
- * 
- *     def read_bytes(self, Py_ssize_t nbytes):             # <<<<<<<<<<<<<<
- *         """Read a specified number of raw bytes from the stream"""
- *         cdef Py_ssize_t nread
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_9read_bytes, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_read_bytes, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__54)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 487, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_read_bytes, __pyx_t_2) < 0) __PYX_ERR(1, 487, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":499
- *         return ret
- * 
- *     def unpack(self):             # <<<<<<<<<<<<<<
- *         """Unpack one object
- * 
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_11unpack, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_unpack, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__55)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 499, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_unpack, __pyx_t_2) < 0) __PYX_ERR(1, 499, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":506
- *         return self._unpack(unpack_construct)
- * 
- *     def skip(self):             # <<<<<<<<<<<<<<
- *         """Read and ignore one object, returning None
- * 
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_13skip, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_skip, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__56)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 506, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_skip, __pyx_t_2) < 0) __PYX_ERR(1, 506, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":513
- *         return self._unpack(unpack_skip)
- * 
- *     def read_array_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is an array, return its size n, such that
- *         the next n unpack() calls will iterate over its contents.
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_15read_array_header, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_read_array_header, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__57)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 513, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_read_array_header, __pyx_t_2) < 0) __PYX_ERR(1, 513, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":521
- *         return self._unpack(read_array_header)
- * 
- *     def read_map_header(self):             # <<<<<<<<<<<<<<
- *         """assuming the next object is a map, return its size n, such that the
- *         next n * 2 unpack() calls will iterate over its key-value pairs.
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_17read_map_header, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_read_map_header, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__58)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 521, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_read_map_header, __pyx_t_2) < 0) __PYX_ERR(1, 521, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "msgpack/_unpacker.pyx":529
- *         return self._unpack(read_map_header)
- * 
- *     def tell(self):             # <<<<<<<<<<<<<<
- *         """Returns the current position of the Unpacker in bytes, i.e., the
- *         number of bytes that were read from the input, also the starting
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_19tell, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker_tell, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__59)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 529, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7msgpack_9_cmsgpack_Unpacker, __pyx_n_s_tell, __pyx_t_2) < 0) __PYX_ERR(1, 529, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  PyType_Modified(__pyx_ptype_7msgpack_9_cmsgpack_Unpacker);
-
-  /* "(tree fragment)":1
- * def __reduce_cython__(self):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_25__reduce_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker___reduce_cython, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__60)); if (unlikely(!__pyx_t_2)) __PYX_ERR(4, 1, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_reduce_cython, __pyx_t_2) < 0) __PYX_ERR(4, 1, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "(tree fragment)":3
- * def __reduce_cython__(self):
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- * def __setstate_cython__(self, __pyx_state):             # <<<<<<<<<<<<<<
- *     raise TypeError, "no default __reduce__ due to non-trivial __cinit__"
- */
-  __pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7msgpack_9_cmsgpack_8Unpacker_27__setstate_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpacker___setstate_cython, NULL, __pyx_n_s_msgpack__cmsgpack, __pyx_d, ((PyObject *)__pyx_codeobj__61)); if (unlikely(!__pyx_t_2)) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_2) < 0) __PYX_ERR(4, 3, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /* "msgpack/_cmsgpack.pyx":1
- * # coding: utf-8             # <<<<<<<<<<<<<<
- * #cython: embedsignature=True, c_string_encoding=ascii, language_level=3
- * from cpython.datetime cimport import_datetime, datetime_new
- */
-  __pyx_t_2 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_2)) __PYX_ERR(5, 1, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_2);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_2) < 0) __PYX_ERR(5, 1, __pyx_L1_error)
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-
-  /*--- Wrapped vars code ---*/
-
-  goto __pyx_L0;
-  __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_3);
-  if (__pyx_m) {
-    if (__pyx_d && stringtab_initialized) {
-      __Pyx_AddTraceback("init msgpack._cmsgpack", __pyx_clineno, __pyx_lineno, __pyx_filename);
-    }
-    #if !CYTHON_USE_MODULE_STATE
-    Py_CLEAR(__pyx_m);
-    #else
-    Py_DECREF(__pyx_m);
-    if (pystate_addmodule_run) {
-      PyObject *tp, *value, *tb;
-      PyErr_Fetch(&tp, &value, &tb);
-      PyState_RemoveModule(&__pyx_moduledef);
-      PyErr_Restore(tp, value, tb);
-    }
-    #endif
-  } else if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_ImportError, "init msgpack._cmsgpack");
-  }
-  __pyx_L0:;
-  __Pyx_RefNannyFinishContext();
-  #if CYTHON_PEP489_MULTI_PHASE_INIT
-  return (__pyx_m != NULL) ? 0 : -1;
-  #elif PY_MAJOR_VERSION >= 3
-  return __pyx_m;
-  #else
-  return;
-  #endif
-}
-/* #### Code section: cleanup_globals ### */
-/* #### Code section: cleanup_module ### */
-/* #### Code section: main_method ### */
-/* #### Code section: utility_code_pragmas ### */
-#ifdef _MSC_VER
-#pragma warning( push )
-/* Warning 4127: conditional expression is constant
- * Cython uses constant conditional expressions to allow in inline functions to be optimized at
- * compile-time, so this warning is not useful
- */
-#pragma warning( disable : 4127 )
-#endif
-
-
-
-/* #### Code section: utility_code_def ### */
-
-/* --- Runtime support code --- */
-/* Refnanny */
-#if CYTHON_REFNANNY
-static __Pyx_RefNannyAPIStruct *__Pyx_RefNannyImportAPI(const char *modname) {
-    PyObject *m = NULL, *p = NULL;
-    void *r = NULL;
-    m = PyImport_ImportModule(modname);
-    if (!m) goto end;
-    p = PyObject_GetAttrString(m, "RefNannyAPI");
-    if (!p) goto end;
-    r = PyLong_AsVoidPtr(p);
-end:
-    Py_XDECREF(p);
-    Py_XDECREF(m);
-    return (__Pyx_RefNannyAPIStruct *)r;
-}
-#endif
-
-/* PyErrExceptionMatches */
-#if CYTHON_FAST_THREAD_STATE
-static int __Pyx_PyErr_ExceptionMatchesTuple(PyObject *exc_type, PyObject *tuple) {
-    Py_ssize_t i, n;
-    n = PyTuple_GET_SIZE(tuple);
-#if PY_MAJOR_VERSION >= 3
-    for (i=0; i<n; i++) {
-        if (exc_type == PyTuple_GET_ITEM(tuple, i)) return 1;
-    }
-#endif
-    for (i=0; i<n; i++) {
-        if (__Pyx_PyErr_GivenExceptionMatches(exc_type, PyTuple_GET_ITEM(tuple, i))) return 1;
-    }
-    return 0;
-}
-static CYTHON_INLINE int __Pyx_PyErr_ExceptionMatchesInState(PyThreadState* tstate, PyObject* err) {
-    int result;
-    PyObject *exc_type;
-#if PY_VERSION_HEX >= 0x030C00A6
-    PyObject *current_exception = tstate->current_exception;
-    if (unlikely(!current_exception)) return 0;
-    exc_type = (PyObject*) Py_TYPE(current_exception);
-    if (exc_type == err) return 1;
-#else
-    exc_type = tstate->curexc_type;
-    if (exc_type == err) return 1;
-    if (unlikely(!exc_type)) return 0;
-#endif
-    #if CYTHON_AVOID_BORROWED_REFS
-    Py_INCREF(exc_type);
-    #endif
-    if (unlikely(PyTuple_Check(err))) {
-        result = __Pyx_PyErr_ExceptionMatchesTuple(exc_type, err);
-    } else {
-        result = __Pyx_PyErr_GivenExceptionMatches(exc_type, err);
-    }
-    #if CYTHON_AVOID_BORROWED_REFS
-    Py_DECREF(exc_type);
-    #endif
-    return result;
-}
-#endif
-
-/* PyErrFetchRestore */
-#if CYTHON_FAST_THREAD_STATE
-static CYTHON_INLINE void __Pyx_ErrRestoreInState(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {
-#if PY_VERSION_HEX >= 0x030C00A6
-    PyObject *tmp_value;
-    assert(type == NULL || (value != NULL && type == (PyObject*) Py_TYPE(value)));
-    if (value) {
-        #if CYTHON_COMPILING_IN_CPYTHON
-        if (unlikely(((PyBaseExceptionObject*) value)->traceback != tb))
-        #endif
-            PyException_SetTraceback(value, tb);
-    }
-    tmp_value = tstate->current_exception;
-    tstate->current_exception = value;
-    Py_XDECREF(tmp_value);
-#else
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-    tmp_type = tstate->curexc_type;
-    tmp_value = tstate->curexc_value;
-    tmp_tb = tstate->curexc_traceback;
-    tstate->curexc_type = type;
-    tstate->curexc_value = value;
-    tstate->curexc_traceback = tb;
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
-#endif
-}
-static CYTHON_INLINE void __Pyx_ErrFetchInState(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
-#if PY_VERSION_HEX >= 0x030C00A6
-    PyObject* exc_value;
-    exc_value = tstate->current_exception;
-    tstate->current_exception = 0;
-    *value = exc_value;
-    *type = NULL;
-    *tb = NULL;
-    if (exc_value) {
-        *type = (PyObject*) Py_TYPE(exc_value);
-        Py_INCREF(*type);
-        #if CYTHON_COMPILING_IN_CPYTHON
-        *tb = ((PyBaseExceptionObject*) exc_value)->traceback;
-        Py_XINCREF(*tb);
-        #else
-        *tb = PyException_GetTraceback(exc_value);
-        #endif
-    }
-#else
-    *type = tstate->curexc_type;
-    *value = tstate->curexc_value;
-    *tb = tstate->curexc_traceback;
-    tstate->curexc_type = 0;
-    tstate->curexc_value = 0;
-    tstate->curexc_traceback = 0;
-#endif
-}
-#endif
-
-/* PyObjectGetAttrStr */
-#if CYTHON_USE_TYPE_SLOTS
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name) {
-    PyTypeObject* tp = Py_TYPE(obj);
-    if (likely(tp->tp_getattro))
-        return tp->tp_getattro(obj, attr_name);
-#if PY_MAJOR_VERSION < 3
-    if (likely(tp->tp_getattr))
-        return tp->tp_getattr(obj, PyString_AS_STRING(attr_name));
-#endif
-    return PyObject_GetAttr(obj, attr_name);
-}
-#endif
-
-/* PyObjectGetAttrStrNoError */
-static void __Pyx_PyObject_GetAttrStr_ClearAttributeError(void) {
-    __Pyx_PyThreadState_declare
-    __Pyx_PyThreadState_assign
-    if (likely(__Pyx_PyErr_ExceptionMatches(PyExc_AttributeError)))
-        __Pyx_PyErr_Clear();
-}
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStrNoError(PyObject* obj, PyObject* attr_name) {
-    PyObject *result;
-#if CYTHON_COMPILING_IN_CPYTHON && CYTHON_USE_TYPE_SLOTS && PY_VERSION_HEX >= 0x030700B1
-    PyTypeObject* tp = Py_TYPE(obj);
-    if (likely(tp->tp_getattro == PyObject_GenericGetAttr)) {
-        return _PyObject_GenericGetAttrWithDict(obj, attr_name, NULL, 1);
-    }
-#endif
-    result = __Pyx_PyObject_GetAttrStr(obj, attr_name);
-    if (unlikely(!result)) {
-        __Pyx_PyObject_GetAttrStr_ClearAttributeError();
-    }
-    return result;
-}
-
-/* GetBuiltinName */
-static PyObject *__Pyx_GetBuiltinName(PyObject *name) {
-    PyObject* result = __Pyx_PyObject_GetAttrStrNoError(__pyx_b, name);
-    if (unlikely(!result) && !PyErr_Occurred()) {
-        PyErr_Format(PyExc_NameError,
-#if PY_MAJOR_VERSION >= 3
-            "name '%U' is not defined", name);
-#else
-            "name '%.200s' is not defined", PyString_AS_STRING(name));
-#endif
-    }
-    return result;
-}
-
-/* ExtTypeTest */
-static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
-    __Pyx_TypeName obj_type_name;
-    __Pyx_TypeName type_name;
-    if (unlikely(!type)) {
-        PyErr_SetString(PyExc_SystemError, "Missing type object");
-        return 0;
-    }
-    if (likely(__Pyx_TypeCheck(obj, type)))
-        return 1;
-    obj_type_name = __Pyx_PyType_GetName(Py_TYPE(obj));
-    type_name = __Pyx_PyType_GetName(type);
-    PyErr_Format(PyExc_TypeError,
-                 "Cannot convert " __Pyx_FMT_TYPENAME " to " __Pyx_FMT_TYPENAME,
-                 obj_type_name, type_name);
-    __Pyx_DECREF_TypeName(obj_type_name);
-    __Pyx_DECREF_TypeName(type_name);
-    return 0;
-}
-
-/* PyObjectCall */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {
-    PyObject *result;
-    ternaryfunc call = Py_TYPE(func)->tp_call;
-    if (unlikely(!call))
-        return PyObject_Call(func, arg, kw);
-    if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
-        return NULL;
-    result = (*call)(func, arg, kw);
-    Py_LeaveRecursiveCall();
-    if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
-        PyErr_SetString(
-            PyExc_SystemError,
-            "NULL result without error in PyObject_Call");
-    }
-    return result;
-}
-#endif
-
-/* RaiseException */
-#if PY_MAJOR_VERSION < 3
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
-    __Pyx_PyThreadState_declare
-    CYTHON_UNUSED_VAR(cause);
-    Py_XINCREF(type);
-    if (!value || value == Py_None)
-        value = NULL;
-    else
-        Py_INCREF(value);
-    if (!tb || tb == Py_None)
-        tb = NULL;
-    else {
-        Py_INCREF(tb);
-        if (!PyTraceBack_Check(tb)) {
-            PyErr_SetString(PyExc_TypeError,
-                "raise: arg 3 must be a traceback or None");
-            goto raise_error;
-        }
-    }
-    if (PyType_Check(type)) {
-#if CYTHON_COMPILING_IN_PYPY
-        if (!value) {
-            Py_INCREF(Py_None);
-            value = Py_None;
-        }
-#endif
-        PyErr_NormalizeException(&type, &value, &tb);
-    } else {
-        if (value) {
-            PyErr_SetString(PyExc_TypeError,
-                "instance exception may not have a separate value");
-            goto raise_error;
-        }
-        value = type;
-        type = (PyObject*) Py_TYPE(type);
-        Py_INCREF(type);
-        if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
-            PyErr_SetString(PyExc_TypeError,
-                "raise: exception class must be a subclass of BaseException");
-            goto raise_error;
-        }
-    }
-    __Pyx_PyThreadState_assign
-    __Pyx_ErrRestore(type, value, tb);
-    return;
-raise_error:
-    Py_XDECREF(value);
-    Py_XDECREF(type);
-    Py_XDECREF(tb);
-    return;
-}
-#else
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
-    PyObject* owned_instance = NULL;
-    if (tb == Py_None) {
-        tb = 0;
-    } else if (tb && !PyTraceBack_Check(tb)) {
-        PyErr_SetString(PyExc_TypeError,
-            "raise: arg 3 must be a traceback or None");
-        goto bad;
-    }
-    if (value == Py_None)
-        value = 0;
-    if (PyExceptionInstance_Check(type)) {
-        if (value) {
-            PyErr_SetString(PyExc_TypeError,
-                "instance exception may not have a separate value");
-            goto bad;
-        }
-        value = type;
-        type = (PyObject*) Py_TYPE(value);
-    } else if (PyExceptionClass_Check(type)) {
-        PyObject *instance_class = NULL;
-        if (value && PyExceptionInstance_Check(value)) {
-            instance_class = (PyObject*) Py_TYPE(value);
-            if (instance_class != type) {
-                int is_subclass = PyObject_IsSubclass(instance_class, type);
-                if (!is_subclass) {
-                    instance_class = NULL;
-                } else if (unlikely(is_subclass == -1)) {
-                    goto bad;
-                } else {
-                    type = instance_class;
-                }
-            }
-        }
-        if (!instance_class) {
-            PyObject *args;
-            if (!value)
-                args = PyTuple_New(0);
-            else if (PyTuple_Check(value)) {
-                Py_INCREF(value);
-                args = value;
-            } else
-                args = PyTuple_Pack(1, value);
-            if (!args)
-                goto bad;
-            owned_instance = PyObject_Call(type, args, NULL);
-            Py_DECREF(args);
-            if (!owned_instance)
-                goto bad;
-            value = owned_instance;
-            if (!PyExceptionInstance_Check(value)) {
-                PyErr_Format(PyExc_TypeError,
-                             "calling %R should have returned an instance of "
-                             "BaseException, not %R",
-                             type, Py_TYPE(value));
-                goto bad;
-            }
-        }
-    } else {
-        PyErr_SetString(PyExc_TypeError,
-            "raise: exception class must be a subclass of BaseException");
-        goto bad;
-    }
-    if (cause) {
-        PyObject *fixed_cause;
-        if (cause == Py_None) {
-            fixed_cause = NULL;
-        } else if (PyExceptionClass_Check(cause)) {
-            fixed_cause = PyObject_CallObject(cause, NULL);
-            if (fixed_cause == NULL)
-                goto bad;
-        } else if (PyExceptionInstance_Check(cause)) {
-            fixed_cause = cause;
-            Py_INCREF(fixed_cause);
-        } else {
-            PyErr_SetString(PyExc_TypeError,
-                            "exception causes must derive from "
-                            "BaseException");
-            goto bad;
-        }
-        PyException_SetCause(value, fixed_cause);
-    }
-    PyErr_SetObject(type, value);
-    if (tb) {
-      #if PY_VERSION_HEX >= 0x030C00A6
-        PyException_SetTraceback(value, tb);
-      #elif CYTHON_FAST_THREAD_STATE
-        PyThreadState *tstate = __Pyx_PyThreadState_Current;
-        PyObject* tmp_tb = tstate->curexc_traceback;
-        if (tb != tmp_tb) {
-            Py_INCREF(tb);
-            tstate->curexc_traceback = tb;
-            Py_XDECREF(tmp_tb);
-        }
-#else
-        PyObject *tmp_type, *tmp_value, *tmp_tb;
-        PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb);
-        Py_INCREF(tb);
-        PyErr_Restore(tmp_type, tmp_value, tb);
-        Py_XDECREF(tmp_tb);
-#endif
-    }
-bad:
-    Py_XDECREF(owned_instance);
-    return;
-}
-#endif
-
-/* TupleAndListFromArray */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE void __Pyx_copy_object_array(PyObject *const *CYTHON_RESTRICT src, PyObject** CYTHON_RESTRICT dest, Py_ssize_t length) {
-    PyObject *v;
-    Py_ssize_t i;
-    for (i = 0; i < length; i++) {
-        v = dest[i] = src[i];
-        Py_INCREF(v);
-    }
-}
-static CYTHON_INLINE PyObject *
-__Pyx_PyTuple_FromArray(PyObject *const *src, Py_ssize_t n)
-{
-    PyObject *res;
-    if (n <= 0) {
-        Py_INCREF(__pyx_empty_tuple);
-        return __pyx_empty_tuple;
-    }
-    res = PyTuple_New(n);
-    if (unlikely(res == NULL)) return NULL;
-    __Pyx_copy_object_array(src, ((PyTupleObject*)res)->ob_item, n);
-    return res;
-}
-static CYTHON_INLINE PyObject *
-__Pyx_PyList_FromArray(PyObject *const *src, Py_ssize_t n)
-{
-    PyObject *res;
-    if (n <= 0) {
-        return PyList_New(0);
-    }
-    res = PyList_New(n);
-    if (unlikely(res == NULL)) return NULL;
-    __Pyx_copy_object_array(src, ((PyListObject*)res)->ob_item, n);
-    return res;
-}
-#endif
-
-/* BytesEquals */
-static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals) {
-#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API
-    return PyObject_RichCompareBool(s1, s2, equals);
-#else
-    if (s1 == s2) {
-        return (equals == Py_EQ);
-    } else if (PyBytes_CheckExact(s1) & PyBytes_CheckExact(s2)) {
-        const char *ps1, *ps2;
-        Py_ssize_t length = PyBytes_GET_SIZE(s1);
-        if (length != PyBytes_GET_SIZE(s2))
-            return (equals == Py_NE);
-        ps1 = PyBytes_AS_STRING(s1);
-        ps2 = PyBytes_AS_STRING(s2);
-        if (ps1[0] != ps2[0]) {
-            return (equals == Py_NE);
-        } else if (length == 1) {
-            return (equals == Py_EQ);
-        } else {
-            int result;
-#if CYTHON_USE_UNICODE_INTERNALS && (PY_VERSION_HEX < 0x030B0000)
-            Py_hash_t hash1, hash2;
-            hash1 = ((PyBytesObject*)s1)->ob_shash;
-            hash2 = ((PyBytesObject*)s2)->ob_shash;
-            if (hash1 != hash2 && hash1 != -1 && hash2 != -1) {
-                return (equals == Py_NE);
-            }
-#endif
-            result = memcmp(ps1, ps2, (size_t)length);
-            return (equals == Py_EQ) ? (result == 0) : (result != 0);
-        }
-    } else if ((s1 == Py_None) & PyBytes_CheckExact(s2)) {
-        return (equals == Py_NE);
-    } else if ((s2 == Py_None) & PyBytes_CheckExact(s1)) {
-        return (equals == Py_NE);
-    } else {
-        int result;
-        PyObject* py_result = PyObject_RichCompare(s1, s2, equals);
-        if (!py_result)
-            return -1;
-        result = __Pyx_PyObject_IsTrue(py_result);
-        Py_DECREF(py_result);
-        return result;
-    }
-#endif
-}
-
-/* UnicodeEquals */
-static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals) {
-#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API
-    return PyObject_RichCompareBool(s1, s2, equals);
-#else
-#if PY_MAJOR_VERSION < 3
-    PyObject* owned_ref = NULL;
-#endif
-    int s1_is_unicode, s2_is_unicode;
-    if (s1 == s2) {
-        goto return_eq;
-    }
-    s1_is_unicode = PyUnicode_CheckExact(s1);
-    s2_is_unicode = PyUnicode_CheckExact(s2);
-#if PY_MAJOR_VERSION < 3
-    if ((s1_is_unicode & (!s2_is_unicode)) && PyString_CheckExact(s2)) {
-        owned_ref = PyUnicode_FromObject(s2);
-        if (unlikely(!owned_ref))
-            return -1;
-        s2 = owned_ref;
-        s2_is_unicode = 1;
-    } else if ((s2_is_unicode & (!s1_is_unicode)) && PyString_CheckExact(s1)) {
-        owned_ref = PyUnicode_FromObject(s1);
-        if (unlikely(!owned_ref))
-            return -1;
-        s1 = owned_ref;
-        s1_is_unicode = 1;
-    } else if (((!s2_is_unicode) & (!s1_is_unicode))) {
-        return __Pyx_PyBytes_Equals(s1, s2, equals);
-    }
-#endif
-    if (s1_is_unicode & s2_is_unicode) {
-        Py_ssize_t length;
-        int kind;
-        void *data1, *data2;
-        if (unlikely(__Pyx_PyUnicode_READY(s1) < 0) || unlikely(__Pyx_PyUnicode_READY(s2) < 0))
-            return -1;
-        length = __Pyx_PyUnicode_GET_LENGTH(s1);
-        if (length != __Pyx_PyUnicode_GET_LENGTH(s2)) {
-            goto return_ne;
-        }
-#if CYTHON_USE_UNICODE_INTERNALS
-        {
-            Py_hash_t hash1, hash2;
-        #if CYTHON_PEP393_ENABLED
-            hash1 = ((PyASCIIObject*)s1)->hash;
-            hash2 = ((PyASCIIObject*)s2)->hash;
-        #else
-            hash1 = ((PyUnicodeObject*)s1)->hash;
-            hash2 = ((PyUnicodeObject*)s2)->hash;
-        #endif
-            if (hash1 != hash2 && hash1 != -1 && hash2 != -1) {
-                goto return_ne;
-            }
-        }
-#endif
-        kind = __Pyx_PyUnicode_KIND(s1);
-        if (kind != __Pyx_PyUnicode_KIND(s2)) {
-            goto return_ne;
-        }
-        data1 = __Pyx_PyUnicode_DATA(s1);
-        data2 = __Pyx_PyUnicode_DATA(s2);
-        if (__Pyx_PyUnicode_READ(kind, data1, 0) != __Pyx_PyUnicode_READ(kind, data2, 0)) {
-            goto return_ne;
-        } else if (length == 1) {
-            goto return_eq;
-        } else {
-            int result = memcmp(data1, data2, (size_t)(length * kind));
-            #if PY_MAJOR_VERSION < 3
-            Py_XDECREF(owned_ref);
-            #endif
-            return (equals == Py_EQ) ? (result == 0) : (result != 0);
-        }
-    } else if ((s1 == Py_None) & s2_is_unicode) {
-        goto return_ne;
-    } else if ((s2 == Py_None) & s1_is_unicode) {
-        goto return_ne;
-    } else {
-        int result;
-        PyObject* py_result = PyObject_RichCompare(s1, s2, equals);
-        #if PY_MAJOR_VERSION < 3
-        Py_XDECREF(owned_ref);
-        #endif
-        if (!py_result)
-            return -1;
-        result = __Pyx_PyObject_IsTrue(py_result);
-        Py_DECREF(py_result);
-        return result;
-    }
-return_eq:
-    #if PY_MAJOR_VERSION < 3
-    Py_XDECREF(owned_ref);
-    #endif
-    return (equals == Py_EQ);
-return_ne:
-    #if PY_MAJOR_VERSION < 3
-    Py_XDECREF(owned_ref);
-    #endif
-    return (equals == Py_NE);
-#endif
-}
-
-/* fastcall */
-#if CYTHON_METH_FASTCALL
-static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s)
-{
-    Py_ssize_t i, n = PyTuple_GET_SIZE(kwnames);
-    for (i = 0; i < n; i++)
-    {
-        if (s == PyTuple_GET_ITEM(kwnames, i)) return kwvalues[i];
-    }
-    for (i = 0; i < n; i++)
-    {
-        int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
-        if (unlikely(eq != 0)) {
-            if (unlikely(eq < 0)) return NULL;  // error
-            return kwvalues[i];
-        }
-    }
-    return NULL;  // not found (no exception set)
-}
-#endif
-
-/* RaiseArgTupleInvalid */
-static void __Pyx_RaiseArgtupleInvalid(
-    const char* func_name,
-    int exact,
-    Py_ssize_t num_min,
-    Py_ssize_t num_max,
-    Py_ssize_t num_found)
-{
-    Py_ssize_t num_expected;
-    const char *more_or_less;
-    if (num_found < num_min) {
-        num_expected = num_min;
-        more_or_less = "at least";
-    } else {
-        num_expected = num_max;
-        more_or_less = "at most";
-    }
-    if (exact) {
-        more_or_less = "exactly";
-    }
-    PyErr_Format(PyExc_TypeError,
-                 "%.200s() takes %.8s %" CYTHON_FORMAT_SSIZE_T "d positional argument%.1s (%" CYTHON_FORMAT_SSIZE_T "d given)",
-                 func_name, more_or_less, num_expected,
-                 (num_expected == 1) ? "" : "s", num_found);
-}
-
-/* KeywordStringCheck */
-static int __Pyx_CheckKeywordStrings(
-    PyObject *kw,
-    const char* function_name,
-    int kw_allowed)
-{
-    PyObject* key = 0;
-    Py_ssize_t pos = 0;
-#if CYTHON_COMPILING_IN_PYPY
-    if (!kw_allowed && PyDict_Next(kw, &pos, &key, 0))
-        goto invalid_keyword;
-    return 1;
-#else
-    if (CYTHON_METH_FASTCALL && likely(PyTuple_Check(kw))) {
-        Py_ssize_t kwsize;
-#if CYTHON_ASSUME_SAFE_MACROS
-        kwsize = PyTuple_GET_SIZE(kw);
-#else
-        kwsize = PyTuple_Size(kw);
-        if (kwsize < 0) return 0;
-#endif
-        if (unlikely(kwsize == 0))
-            return 1;
-        if (!kw_allowed) {
-#if CYTHON_ASSUME_SAFE_MACROS
-            key = PyTuple_GET_ITEM(kw, 0);
-#else
-            key = PyTuple_GetItem(kw, pos);
-            if (!key) return 0;
-#endif
-            goto invalid_keyword;
-        }
-#if PY_VERSION_HEX < 0x03090000
-        for (pos = 0; pos < kwsize; pos++) {
-#if CYTHON_ASSUME_SAFE_MACROS
-            key = PyTuple_GET_ITEM(kw, pos);
-#else
-            key = PyTuple_GetItem(kw, pos);
-            if (!key) return 0;
-#endif
-            if (unlikely(!PyUnicode_Check(key)))
-                goto invalid_keyword_type;
-        }
-#endif
-        return 1;
-    }
-    while (PyDict_Next(kw, &pos, &key, 0)) {
-        #if PY_MAJOR_VERSION < 3
-        if (unlikely(!PyString_Check(key)))
-        #endif
-            if (unlikely(!PyUnicode_Check(key)))
-                goto invalid_keyword_type;
-    }
-    if (!kw_allowed && unlikely(key))
-        goto invalid_keyword;
-    return 1;
-invalid_keyword_type:
-    PyErr_Format(PyExc_TypeError,
-        "%.200s() keywords must be strings", function_name);
-    return 0;
-#endif
-invalid_keyword:
-    #if PY_MAJOR_VERSION < 3
-    PyErr_Format(PyExc_TypeError,
-        "%.200s() got an unexpected keyword argument '%.200s'",
-        function_name, PyString_AsString(key));
-    #else
-    PyErr_Format(PyExc_TypeError,
-        "%s() got an unexpected keyword argument '%U'",
-        function_name, key);
-    #endif
-    return 0;
-}
-
-/* RaiseDoubleKeywords */
-static void __Pyx_RaiseDoubleKeywordsError(
-    const char* func_name,
-    PyObject* kw_name)
-{
-    PyErr_Format(PyExc_TypeError,
-        #if PY_MAJOR_VERSION >= 3
-        "%s() got multiple values for keyword argument '%U'", func_name, kw_name);
-        #else
-        "%s() got multiple values for keyword argument '%s'", func_name,
-        PyString_AsString(kw_name));
-        #endif
-}
-
-/* ParseKeywords */
-static int __Pyx_ParseOptionalKeywords(
-    PyObject *kwds,
-    PyObject *const *kwvalues,
-    PyObject **argnames[],
-    PyObject *kwds2,
-    PyObject *values[],
-    Py_ssize_t num_pos_args,
-    const char* function_name)
-{
-    PyObject *key = 0, *value = 0;
-    Py_ssize_t pos = 0;
-    PyObject*** name;
-    PyObject*** first_kw_arg = argnames + num_pos_args;
-    int kwds_is_tuple = CYTHON_METH_FASTCALL && likely(PyTuple_Check(kwds));
-    while (1) {
-        Py_XDECREF(key); key = NULL;
-        Py_XDECREF(value); value = NULL;
-        if (kwds_is_tuple) {
-            Py_ssize_t size;
-#if CYTHON_ASSUME_SAFE_MACROS
-            size = PyTuple_GET_SIZE(kwds);
-#else
-            size = PyTuple_Size(kwds);
-            if (size < 0) goto bad;
-#endif
-            if (pos >= size) break;
-#if CYTHON_AVOID_BORROWED_REFS
-            key = __Pyx_PySequence_ITEM(kwds, pos);
-            if (!key) goto bad;
-#elif CYTHON_ASSUME_SAFE_MACROS
-            key = PyTuple_GET_ITEM(kwds, pos);
-#else
-            key = PyTuple_GetItem(kwds, pos);
-            if (!key) goto bad;
-#endif
-            value = kwvalues[pos];
-            pos++;
-        }
-        else
-        {
-            if (!PyDict_Next(kwds, &pos, &key, &value)) break;
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_INCREF(key);
-#endif
-        }
-        name = first_kw_arg;
-        while (*name && (**name != key)) name++;
-        if (*name) {
-            values[name-argnames] = value;
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_INCREF(value); // transfer ownership of value to values
-            Py_DECREF(key);
-#endif
-            key = NULL;
-            value = NULL;
-            continue;
-        }
-#if !CYTHON_AVOID_BORROWED_REFS
-        Py_INCREF(key);
-#endif
-        Py_INCREF(value);
-        name = first_kw_arg;
-        #if PY_MAJOR_VERSION < 3
-        if (likely(PyString_Check(key))) {
-            while (*name) {
-                if ((CYTHON_COMPILING_IN_PYPY || PyString_GET_SIZE(**name) == PyString_GET_SIZE(key))
-                        && _PyString_Eq(**name, key)) {
-                    values[name-argnames] = value;
-#if CYTHON_AVOID_BORROWED_REFS
-                    value = NULL;  // ownership transferred to values
-#endif
-                    break;
-                }
-                name++;
-            }
-            if (*name) continue;
-            else {
-                PyObject*** argname = argnames;
-                while (argname != first_kw_arg) {
-                    if ((**argname == key) || (
-                            (CYTHON_COMPILING_IN_PYPY || PyString_GET_SIZE(**argname) == PyString_GET_SIZE(key))
-                             && _PyString_Eq(**argname, key))) {
-                        goto arg_passed_twice;
-                    }
-                    argname++;
-                }
-            }
-        } else
-        #endif
-        if (likely(PyUnicode_Check(key))) {
-            while (*name) {
-                int cmp = (
-                #if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION >= 3
-                    (__Pyx_PyUnicode_GET_LENGTH(**name) != __Pyx_PyUnicode_GET_LENGTH(key)) ? 1 :
-                #endif
-                    PyUnicode_Compare(**name, key)
-                );
-                if (cmp < 0 && unlikely(PyErr_Occurred())) goto bad;
-                if (cmp == 0) {
-                    values[name-argnames] = value;
-#if CYTHON_AVOID_BORROWED_REFS
-                    value = NULL; // ownership transferred to values
-#endif
-                    break;
-                }
-                name++;
-            }
-            if (*name) continue;
-            else {
-                PyObject*** argname = argnames;
-                while (argname != first_kw_arg) {
-                    int cmp = (**argname == key) ? 0 :
-                    #if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION >= 3
-                        (__Pyx_PyUnicode_GET_LENGTH(**argname) != __Pyx_PyUnicode_GET_LENGTH(key)) ? 1 :
-                    #endif
-                        PyUnicode_Compare(**argname, key);
-                    if (cmp < 0 && unlikely(PyErr_Occurred())) goto bad;
-                    if (cmp == 0) goto arg_passed_twice;
-                    argname++;
-                }
-            }
-        } else
-            goto invalid_keyword_type;
-        if (kwds2) {
-            if (unlikely(PyDict_SetItem(kwds2, key, value))) goto bad;
-        } else {
-            goto invalid_keyword;
-        }
-    }
-    Py_XDECREF(key);
-    Py_XDECREF(value);
-    return 0;
-arg_passed_twice:
-    __Pyx_RaiseDoubleKeywordsError(function_name, key);
-    goto bad;
-invalid_keyword_type:
-    PyErr_Format(PyExc_TypeError,
-        "%.200s() keywords must be strings", function_name);
-    goto bad;
-invalid_keyword:
-    #if PY_MAJOR_VERSION < 3
-    PyErr_Format(PyExc_TypeError,
-        "%.200s() got an unexpected keyword argument '%.200s'",
-        function_name, PyString_AsString(key));
-    #else
-    PyErr_Format(PyExc_TypeError,
-        "%s() got an unexpected keyword argument '%U'",
-        function_name, key);
-    #endif
-bad:
-    Py_XDECREF(key);
-    Py_XDECREF(value);
-    return -1;
-}
-
-/* GetTopmostException */
-#if CYTHON_USE_EXC_INFO_STACK && CYTHON_FAST_THREAD_STATE
-static _PyErr_StackItem *
-__Pyx_PyErr_GetTopmostException(PyThreadState *tstate)
-{
-    _PyErr_StackItem *exc_info = tstate->exc_info;
-    while ((exc_info->exc_value == NULL || exc_info->exc_value == Py_None) &&
-           exc_info->previous_item != NULL)
-    {
-        exc_info = exc_info->previous_item;
-    }
-    return exc_info;
-}
-#endif
-
-/* SaveResetException */
-#if CYTHON_FAST_THREAD_STATE
-static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
-  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
-    _PyErr_StackItem *exc_info = __Pyx_PyErr_GetTopmostException(tstate);
-    PyObject *exc_value = exc_info->exc_value;
-    if (exc_value == NULL || exc_value == Py_None) {
-        *value = NULL;
-        *type = NULL;
-        *tb = NULL;
-    } else {
-        *value = exc_value;
-        Py_INCREF(*value);
-        *type = (PyObject*) Py_TYPE(exc_value);
-        Py_INCREF(*type);
-        *tb = PyException_GetTraceback(exc_value);
-    }
-  #elif CYTHON_USE_EXC_INFO_STACK
-    _PyErr_StackItem *exc_info = __Pyx_PyErr_GetTopmostException(tstate);
-    *type = exc_info->exc_type;
-    *value = exc_info->exc_value;
-    *tb = exc_info->exc_traceback;
-    Py_XINCREF(*type);
-    Py_XINCREF(*value);
-    Py_XINCREF(*tb);
-  #else
-    *type = tstate->exc_type;
-    *value = tstate->exc_value;
-    *tb = tstate->exc_traceback;
-    Py_XINCREF(*type);
-    Py_XINCREF(*value);
-    Py_XINCREF(*tb);
-  #endif
-}
-static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {
-  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
-    _PyErr_StackItem *exc_info = tstate->exc_info;
-    PyObject *tmp_value = exc_info->exc_value;
-    exc_info->exc_value = value;
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(type);
-    Py_XDECREF(tb);
-  #else
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-    #if CYTHON_USE_EXC_INFO_STACK
-    _PyErr_StackItem *exc_info = tstate->exc_info;
-    tmp_type = exc_info->exc_type;
-    tmp_value = exc_info->exc_value;
-    tmp_tb = exc_info->exc_traceback;
-    exc_info->exc_type = type;
-    exc_info->exc_value = value;
-    exc_info->exc_traceback = tb;
-    #else
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = type;
-    tstate->exc_value = value;
-    tstate->exc_traceback = tb;
-    #endif
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
-  #endif
-}
-#endif
-
-/* GetException */
-#if CYTHON_FAST_THREAD_STATE
-static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb)
-#else
-static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
-#endif
-{
-    PyObject *local_type = NULL, *local_value, *local_tb = NULL;
-#if CYTHON_FAST_THREAD_STATE
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-  #if PY_VERSION_HEX >= 0x030C00A6
-    local_value = tstate->current_exception;
-    tstate->current_exception = 0;
-    if (likely(local_value)) {
-        local_type = (PyObject*) Py_TYPE(local_value);
-        Py_INCREF(local_type);
-        local_tb = PyException_GetTraceback(local_value);
-    }
-  #else
-    local_type = tstate->curexc_type;
-    local_value = tstate->curexc_value;
-    local_tb = tstate->curexc_traceback;
-    tstate->curexc_type = 0;
-    tstate->curexc_value = 0;
-    tstate->curexc_traceback = 0;
-  #endif
-#else
-    PyErr_Fetch(&local_type, &local_value, &local_tb);
-#endif
-    PyErr_NormalizeException(&local_type, &local_value, &local_tb);
-#if CYTHON_FAST_THREAD_STATE && PY_VERSION_HEX >= 0x030C00A6
-    if (unlikely(tstate->current_exception))
-#elif CYTHON_FAST_THREAD_STATE
-    if (unlikely(tstate->curexc_type))
-#else
-    if (unlikely(PyErr_Occurred()))
-#endif
-        goto bad;
-    #if PY_MAJOR_VERSION >= 3
-    if (local_tb) {
-        if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))
-            goto bad;
-    }
-    #endif
-    Py_XINCREF(local_tb);
-    Py_XINCREF(local_type);
-    Py_XINCREF(local_value);
-    *type = local_type;
-    *value = local_value;
-    *tb = local_tb;
-#if CYTHON_FAST_THREAD_STATE
-    #if CYTHON_USE_EXC_INFO_STACK
-    {
-        _PyErr_StackItem *exc_info = tstate->exc_info;
-      #if PY_VERSION_HEX >= 0x030B00a4
-        tmp_value = exc_info->exc_value;
-        exc_info->exc_value = local_value;
-        tmp_type = NULL;
-        tmp_tb = NULL;
-        Py_XDECREF(local_type);
-        Py_XDECREF(local_tb);
-      #else
-        tmp_type = exc_info->exc_type;
-        tmp_value = exc_info->exc_value;
-        tmp_tb = exc_info->exc_traceback;
-        exc_info->exc_type = local_type;
-        exc_info->exc_value = local_value;
-        exc_info->exc_traceback = local_tb;
-      #endif
-    }
-    #else
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = local_type;
-    tstate->exc_value = local_value;
-    tstate->exc_traceback = local_tb;
-    #endif
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
-#else
-    PyErr_SetExcInfo(local_type, local_value, local_tb);
-#endif
-    return 0;
-bad:
-    *type = 0;
-    *value = 0;
-    *tb = 0;
-    Py_XDECREF(local_type);
-    Py_XDECREF(local_value);
-    Py_XDECREF(local_tb);
-    return -1;
-}
-
-/* PyFunctionFastCall */
-#if CYTHON_FAST_PYCALL && !CYTHON_VECTORCALL
-static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na,
-                                               PyObject *globals) {
-    PyFrameObject *f;
-    PyThreadState *tstate = __Pyx_PyThreadState_Current;
-    PyObject **fastlocals;
-    Py_ssize_t i;
-    PyObject *result;
-    assert(globals != NULL);
-    /* XXX Perhaps we should create a specialized
-       PyFrame_New() that doesn't take locals, but does
-       take builtins without sanity checking them.
-       */
-    assert(tstate != NULL);
-    f = PyFrame_New(tstate, co, globals, NULL);
-    if (f == NULL) {
-        return NULL;
-    }
-    fastlocals = __Pyx_PyFrame_GetLocalsplus(f);
-    for (i = 0; i < na; i++) {
-        Py_INCREF(*args);
-        fastlocals[i] = *args++;
-    }
-    result = PyEval_EvalFrameEx(f,0);
-    ++tstate->recursion_depth;
-    Py_DECREF(f);
-    --tstate->recursion_depth;
-    return result;
-}
-static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs) {
-    PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);
-    PyObject *globals = PyFunction_GET_GLOBALS(func);
-    PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
-    PyObject *closure;
-#if PY_MAJOR_VERSION >= 3
-    PyObject *kwdefs;
-#endif
-    PyObject *kwtuple, **k;
-    PyObject **d;
-    Py_ssize_t nd;
-    Py_ssize_t nk;
-    PyObject *result;
-    assert(kwargs == NULL || PyDict_Check(kwargs));
-    nk = kwargs ? PyDict_Size(kwargs) : 0;
-    if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object"))) {
-        return NULL;
-    }
-    if (
-#if PY_MAJOR_VERSION >= 3
-            co->co_kwonlyargcount == 0 &&
-#endif
-            likely(kwargs == NULL || nk == 0) &&
-            co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) {
-        if (argdefs == NULL && co->co_argcount == nargs) {
-            result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals);
-            goto done;
-        }
-        else if (nargs == 0 && argdefs != NULL
-                 && co->co_argcount == Py_SIZE(argdefs)) {
-            /* function called with no arguments, but all parameters have
-               a default value: use default values as arguments .*/
-            args = &PyTuple_GET_ITEM(argdefs, 0);
-            result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals);
-            goto done;
-        }
-    }
-    if (kwargs != NULL) {
-        Py_ssize_t pos, i;
-        kwtuple = PyTuple_New(2 * nk);
-        if (kwtuple == NULL) {
-            result = NULL;
-            goto done;
-        }
-        k = &PyTuple_GET_ITEM(kwtuple, 0);
-        pos = i = 0;
-        while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) {
-            Py_INCREF(k[i]);
-            Py_INCREF(k[i+1]);
-            i += 2;
-        }
-        nk = i / 2;
-    }
-    else {
-        kwtuple = NULL;
-        k = NULL;
-    }
-    closure = PyFunction_GET_CLOSURE(func);
-#if PY_MAJOR_VERSION >= 3
-    kwdefs = PyFunction_GET_KW_DEFAULTS(func);
-#endif
-    if (argdefs != NULL) {
-        d = &PyTuple_GET_ITEM(argdefs, 0);
-        nd = Py_SIZE(argdefs);
-    }
-    else {
-        d = NULL;
-        nd = 0;
-    }
-#if PY_MAJOR_VERSION >= 3
-    result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL,
-                               args, (int)nargs,
-                               k, (int)nk,
-                               d, (int)nd, kwdefs, closure);
-#else
-    result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL,
-                               args, (int)nargs,
-                               k, (int)nk,
-                               d, (int)nd, closure);
-#endif
-    Py_XDECREF(kwtuple);
-done:
-    Py_LeaveRecursiveCall();
-    return result;
-}
-#endif
-
-/* PyObjectCallMethO */
-#if CYTHON_COMPILING_IN_CPYTHON
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) {
-    PyObject *self, *result;
-    PyCFunction cfunc;
-    cfunc = PyCFunction_GET_FUNCTION(func);
-    self = PyCFunction_GET_SELF(func);
-    if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
-        return NULL;
-    result = cfunc(self, arg);
-    Py_LeaveRecursiveCall();
-    if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
-        PyErr_SetString(
-            PyExc_SystemError,
-            "NULL result without error in PyObject_Call");
-    }
-    return result;
-}
-#endif
-
-/* PyObjectFastCall */
-static PyObject* __Pyx_PyObject_FastCall_fallback(PyObject *func, PyObject **args, size_t nargs, PyObject *kwargs) {
-    PyObject *argstuple;
-    PyObject *result = 0;
-    size_t i;
-    argstuple = PyTuple_New((Py_ssize_t)nargs);
-    if (unlikely(!argstuple)) return NULL;
-    for (i = 0; i < nargs; i++) {
-        Py_INCREF(args[i]);
-        if (__Pyx_PyTuple_SET_ITEM(argstuple, (Py_ssize_t)i, args[i]) < 0) goto bad;
-    }
-    result = __Pyx_PyObject_Call(func, argstuple, kwargs);
-  bad:
-    Py_DECREF(argstuple);
-    return result;
-}
-static CYTHON_INLINE PyObject* __Pyx_PyObject_FastCallDict(PyObject *func, PyObject **args, size_t _nargs, PyObject *kwargs) {
-    Py_ssize_t nargs = __Pyx_PyVectorcall_NARGS(_nargs);
-#if CYTHON_COMPILING_IN_CPYTHON
-    if (nargs == 0 && kwargs == NULL) {
-#if defined(__Pyx_CyFunction_USED) && defined(NDEBUG)
-        if (__Pyx_IsCyOrPyCFunction(func))
-#else
-        if (PyCFunction_Check(func))
-#endif
-        {
-            if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) {
-                return __Pyx_PyObject_CallMethO(func, NULL);
-            }
-        }
-    }
-    else if (nargs == 1 && kwargs == NULL) {
-        if (PyCFunction_Check(func))
-        {
-            if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) {
-                return __Pyx_PyObject_CallMethO(func, args[0]);
-            }
-        }
-    }
-#endif
-    #if PY_VERSION_HEX < 0x030800B1
-    #if CYTHON_FAST_PYCCALL
-    if (PyCFunction_Check(func)) {
-        if (kwargs) {
-            return _PyCFunction_FastCallDict(func, args, nargs, kwargs);
-        } else {
-            return _PyCFunction_FastCallKeywords(func, args, nargs, NULL);
-        }
-    }
-    #if PY_VERSION_HEX >= 0x030700A1
-    if (!kwargs && __Pyx_IS_TYPE(func, &PyMethodDescr_Type)) {
-        return _PyMethodDescr_FastCallKeywords(func, args, nargs, NULL);
-    }
-    #endif
-    #endif
-    #if CYTHON_FAST_PYCALL
-    if (PyFunction_Check(func)) {
-        return __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs);
-    }
-    #endif
-    #endif
-    #if CYTHON_VECTORCALL
-    #if Py_VERSION_HEX < 0x03090000
-    vectorcallfunc f = _PyVectorcall_Function(func);
-    #else
-    vectorcallfunc f = PyVectorcall_Function(func);
-    #endif
-    if (f) {
-        return f(func, args, (size_t)nargs, kwargs);
-    }
-    #elif defined(__Pyx_CyFunction_USED) && CYTHON_BACKPORT_VECTORCALL
-    if (__Pyx_CyFunction_CheckExact(func)) {
-        __pyx_vectorcallfunc f = __Pyx_CyFunction_func_vectorcall(func);
-        if (f) return f(func, args, (size_t)nargs, kwargs);
-    }
-    #endif
-    if (nargs == 0) {
-        return __Pyx_PyObject_Call(func, __pyx_empty_tuple, kwargs);
-    }
-    return __Pyx_PyObject_FastCall_fallback(func, args, (size_t)nargs, kwargs);
-}
-
-/* SwapException */
-#if CYTHON_FAST_THREAD_STATE
-static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-  #if CYTHON_USE_EXC_INFO_STACK && PY_VERSION_HEX >= 0x030B00a4
-    _PyErr_StackItem *exc_info = tstate->exc_info;
-    tmp_value = exc_info->exc_value;
-    exc_info->exc_value = *value;
-    if (tmp_value == NULL || tmp_value == Py_None) {
-        Py_XDECREF(tmp_value);
-        tmp_value = NULL;
-        tmp_type = NULL;
-        tmp_tb = NULL;
-    } else {
-        tmp_type = (PyObject*) Py_TYPE(tmp_value);
-        Py_INCREF(tmp_type);
-        #if CYTHON_COMPILING_IN_CPYTHON
-        tmp_tb = ((PyBaseExceptionObject*) tmp_value)->traceback;
-        Py_XINCREF(tmp_tb);
-        #else
-        tmp_tb = PyException_GetTraceback(tmp_value);
-        #endif
-    }
-  #elif CYTHON_USE_EXC_INFO_STACK
-    _PyErr_StackItem *exc_info = tstate->exc_info;
-    tmp_type = exc_info->exc_type;
-    tmp_value = exc_info->exc_value;
-    tmp_tb = exc_info->exc_traceback;
-    exc_info->exc_type = *type;
-    exc_info->exc_value = *value;
-    exc_info->exc_traceback = *tb;
-  #else
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = *type;
-    tstate->exc_value = *value;
-    tstate->exc_traceback = *tb;
-  #endif
-    *type = tmp_type;
-    *value = tmp_value;
-    *tb = tmp_tb;
-}
-#else
-static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb) {
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-    PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
-    PyErr_SetExcInfo(*type, *value, *tb);
-    *type = tmp_type;
-    *value = tmp_value;
-    *tb = tmp_tb;
-}
-#endif
-
-/* IterFinish */
-static CYTHON_INLINE int __Pyx_IterFinish(void) {
-    __Pyx_PyThreadState_declare
-    __Pyx_PyThreadState_assign
-    PyObject* exc_type = __Pyx_PyErr_CurrentExceptionType();
-    if (unlikely(exc_type)) {
-        if (unlikely(!__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)))
-            return -1;
-        __Pyx_PyErr_Clear();
-        return 0;
-    }
-    return 0;
-}
-
-/* PyObjectCallNoArg */
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) {
-    PyObject *arg = NULL;
-    return __Pyx_PyObject_FastCall(func, (&arg)+1, 0 | __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET);
-}
-
-/* PyObjectCallOneArg */
-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {
-    PyObject *args[2] = {NULL, arg};
-    return __Pyx_PyObject_FastCall(func, args+1, 1 | __Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET);
-}
-
-/* PyObjectGetMethod */
-static int __Pyx_PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method) {
-    PyObject *attr;
-#if CYTHON_UNPACK_METHODS && CYTHON_COMPILING_IN_CPYTHON && CYTHON_USE_PYTYPE_LOOKUP
-    __Pyx_TypeName type_name;
-    PyTypeObject *tp = Py_TYPE(obj);
-    PyObject *descr;
-    descrgetfunc f = NULL;
-    PyObject **dictptr, *dict;
-    int meth_found = 0;
-    assert (*method == NULL);
-    if (unlikely(tp->tp_getattro != PyObject_GenericGetAttr)) {
-        attr = __Pyx_PyObject_GetAttrStr(obj, name);
-        goto try_unpack;
-    }
-    if (unlikely(tp->tp_dict == NULL) && unlikely(PyType_Ready(tp) < 0)) {
-        return 0;
-    }
-    descr = _PyType_Lookup(tp, name);
-    if (likely(descr != NULL)) {
-        Py_INCREF(descr);
-#if defined(Py_TPFLAGS_METHOD_DESCRIPTOR) && Py_TPFLAGS_METHOD_DESCRIPTOR
-        if (__Pyx_PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR))
-#elif PY_MAJOR_VERSION >= 3
-        #ifdef __Pyx_CyFunction_USED
-        if (likely(PyFunction_Check(descr) || __Pyx_IS_TYPE(descr, &PyMethodDescr_Type) || __Pyx_CyFunction_Check(descr)))
-        #else
-        if (likely(PyFunction_Check(descr) || __Pyx_IS_TYPE(descr, &PyMethodDescr_Type)))
-        #endif
-#else
-        #ifdef __Pyx_CyFunction_USED
-        if (likely(PyFunction_Check(descr) || __Pyx_CyFunction_Check(descr)))
-        #else
-        if (likely(PyFunction_Check(descr)))
-        #endif
-#endif
-        {
-            meth_found = 1;
-        } else {
-            f = Py_TYPE(descr)->tp_descr_get;
-            if (f != NULL && PyDescr_IsData(descr)) {
-                attr = f(descr, obj, (PyObject *)Py_TYPE(obj));
-                Py_DECREF(descr);
-                goto try_unpack;
-            }
-        }
-    }
-    dictptr = _PyObject_GetDictPtr(obj);
-    if (dictptr != NULL && (dict = *dictptr) != NULL) {
-        Py_INCREF(dict);
-        attr = __Pyx_PyDict_GetItemStr(dict, name);
-        if (attr != NULL) {
-            Py_INCREF(attr);
-            Py_DECREF(dict);
-            Py_XDECREF(descr);
-            goto try_unpack;
-        }
-        Py_DECREF(dict);
-    }
-    if (meth_found) {
-        *method = descr;
-        return 1;
-    }
-    if (f != NULL) {
-        attr = f(descr, obj, (PyObject *)Py_TYPE(obj));
-        Py_DECREF(descr);
-        goto try_unpack;
-    }
-    if (likely(descr != NULL)) {
-        *method = descr;
-        return 0;
-    }
-    type_name = __Pyx_PyType_GetName(tp);
-    PyErr_Format(PyExc_AttributeError,
-#if PY_MAJOR_VERSION >= 3
-                 "'" __Pyx_FMT_TYPENAME "' object has no attribute '%U'",
-                 type_name, name);
-#else
-                 "'" __Pyx_FMT_TYPENAME "' object has no attribute '%.400s'",
-                 type_name, PyString_AS_STRING(name));
-#endif
-    __Pyx_DECREF_TypeName(type_name);
-    return 0;
-#else
-    attr = __Pyx_PyObject_GetAttrStr(obj, name);
-    goto try_unpack;
-#endif
-try_unpack:
-#if CYTHON_UNPACK_METHODS
-    if (likely(attr) && PyMethod_Check(attr) && likely(PyMethod_GET_SELF(attr) == obj)) {
-        PyObject *function = PyMethod_GET_FUNCTION(attr);
-        Py_INCREF(function);
-        Py_DECREF(attr);
-        *method = function;
-        return 1;
-    }
-#endif
-    *method = attr;
-    return 0;
-}
-
-/* PyObjectCallMethod0 */
-static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name) {
-    PyObject *method = NULL, *result = NULL;
-    int is_method = __Pyx_PyObject_GetMethod(obj, method_name, &method);
-    if (likely(is_method)) {
-        result = __Pyx_PyObject_CallOneArg(method, obj);
-        Py_DECREF(method);
-        return result;
-    }
-    if (unlikely(!method)) goto bad;
-    result = __Pyx_PyObject_CallNoArg(method);
-    Py_DECREF(method);
-bad:
-    return result;
-}
-
-/* RaiseNeedMoreValuesToUnpack */
-static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
-    PyErr_Format(PyExc_ValueError,
-                 "need more than %" CYTHON_FORMAT_SSIZE_T "d value%.1s to unpack",
-                 index, (index == 1) ? "" : "s");
-}
-
-/* RaiseTooManyValuesToUnpack */
-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {
-    PyErr_Format(PyExc_ValueError,
-                 "too many values to unpack (expected %" CYTHON_FORMAT_SSIZE_T "d)", expected);
-}
-
-/* UnpackItemEndCheck */
-static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) {
-    if (unlikely(retval)) {
-        Py_DECREF(retval);
-        __Pyx_RaiseTooManyValuesError(expected);
-        return -1;
-    }
-    return __Pyx_IterFinish();
-}
-
-/* RaiseNoneIterError */
-static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void) {
-    PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
-}
-
-/* UnpackTupleError */
-static void __Pyx_UnpackTupleError(PyObject *t, Py_ssize_t index) {
-    if (t == Py_None) {
-      __Pyx_RaiseNoneNotIterableError();
-    } else if (PyTuple_GET_SIZE(t) < index) {
-      __Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(t));
-    } else {
-      __Pyx_RaiseTooManyValuesError(index);
-    }
-}
-
-/* UnpackTuple2 */
-static CYTHON_INLINE int __Pyx_unpack_tuple2_exact(
-        PyObject* tuple, PyObject** pvalue1, PyObject** pvalue2, int decref_tuple) {
-    PyObject *value1 = NULL, *value2 = NULL;
-#if CYTHON_COMPILING_IN_PYPY
-    value1 = PySequence_ITEM(tuple, 0);  if (unlikely(!value1)) goto bad;
-    value2 = PySequence_ITEM(tuple, 1);  if (unlikely(!value2)) goto bad;
-#else
-    value1 = PyTuple_GET_ITEM(tuple, 0);  Py_INCREF(value1);
-    value2 = PyTuple_GET_ITEM(tuple, 1);  Py_INCREF(value2);
-#endif
-    if (decref_tuple) {
-        Py_DECREF(tuple);
-    }
-    *pvalue1 = value1;
-    *pvalue2 = value2;
-    return 0;
-#if CYTHON_COMPILING_IN_PYPY
-bad:
-    Py_XDECREF(value1);
-    Py_XDECREF(value2);
-    if (decref_tuple) { Py_XDECREF(tuple); }
-    return -1;
-#endif
-}
-static int __Pyx_unpack_tuple2_generic(PyObject* tuple, PyObject** pvalue1, PyObject** pvalue2,
-                                       int has_known_size, int decref_tuple) {
-    Py_ssize_t index;
-    PyObject *value1 = NULL, *value2 = NULL, *iter = NULL;
-    iternextfunc iternext;
-    iter = PyObject_GetIter(tuple);
-    if (unlikely(!iter)) goto bad;
-    if (decref_tuple) { Py_DECREF(tuple); tuple = NULL; }
-    iternext = __Pyx_PyObject_GetIterNextFunc(iter);
-    value1 = iternext(iter); if (unlikely(!value1)) { index = 0; goto unpacking_failed; }
-    value2 = iternext(iter); if (unlikely(!value2)) { index = 1; goto unpacking_failed; }
-    if (!has_known_size && unlikely(__Pyx_IternextUnpackEndCheck(iternext(iter), 2))) goto bad;
-    Py_DECREF(iter);
-    *pvalue1 = value1;
-    *pvalue2 = value2;
-    return 0;
-unpacking_failed:
-    if (!has_known_size && __Pyx_IterFinish() == 0)
-        __Pyx_RaiseNeedMoreValuesError(index);
-bad:
-    Py_XDECREF(iter);
-    Py_XDECREF(value1);
-    Py_XDECREF(value2);
-    if (decref_tuple) { Py_XDECREF(tuple); }
-    return -1;
-}
-
-/* dict_iter */
-static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* iterable, int is_dict, PyObject* method_name,
-                                                   Py_ssize_t* p_orig_length, int* p_source_is_dict) {
-    is_dict = is_dict || likely(PyDict_CheckExact(iterable));
-    *p_source_is_dict = is_dict;
-    if (is_dict) {
-#if !CYTHON_COMPILING_IN_PYPY
-        *p_orig_length = PyDict_Size(iterable);
-        Py_INCREF(iterable);
-        return iterable;
-#elif PY_MAJOR_VERSION >= 3
-        static PyObject *py_items = NULL, *py_keys = NULL, *py_values = NULL;
-        PyObject **pp = NULL;
-        if (method_name) {
-            const char *name = PyUnicode_AsUTF8(method_name);
-            if (strcmp(name, "iteritems") == 0) pp = &py_items;
-            else if (strcmp(name, "iterkeys") == 0) pp = &py_keys;
-            else if (strcmp(name, "itervalues") == 0) pp = &py_values;
-            if (pp) {
-                if (!*pp) {
-                    *pp = PyUnicode_FromString(name + 4);
-                    if (!*pp)
-                        return NULL;
-                }
-                method_name = *pp;
-            }
-        }
-#endif
-    }
-    *p_orig_length = 0;
-    if (method_name) {
-        PyObject* iter;
-        iterable = __Pyx_PyObject_CallMethod0(iterable, method_name);
-        if (!iterable)
-            return NULL;
-#if !CYTHON_COMPILING_IN_PYPY
-        if (PyTuple_CheckExact(iterable) || PyList_CheckExact(iterable))
-            return iterable;
-#endif
-        iter = PyObject_GetIter(iterable);
-        Py_DECREF(iterable);
-        return iter;
-    }
-    return PyObject_GetIter(iterable);
-}
-static CYTHON_INLINE int __Pyx_dict_iter_next(
-        PyObject* iter_obj, CYTHON_NCP_UNUSED Py_ssize_t orig_length, CYTHON_NCP_UNUSED Py_ssize_t* ppos,
-        PyObject** pkey, PyObject** pvalue, PyObject** pitem, int source_is_dict) {
-    PyObject* next_item;
-#if !CYTHON_COMPILING_IN_PYPY
-    if (source_is_dict) {
-        PyObject *key, *value;
-        if (unlikely(orig_length != PyDict_Size(iter_obj))) {
-            PyErr_SetString(PyExc_RuntimeError, "dictionary changed size during iteration");
-            return -1;
-        }
-        if (unlikely(!PyDict_Next(iter_obj, ppos, &key, &value))) {
-            return 0;
-        }
-        if (pitem) {
-            PyObject* tuple = PyTuple_New(2);
-            if (unlikely(!tuple)) {
-                return -1;
-            }
-            Py_INCREF(key);
-            Py_INCREF(value);
-            PyTuple_SET_ITEM(tuple, 0, key);
-            PyTuple_SET_ITEM(tuple, 1, value);
-            *pitem = tuple;
-        } else {
-            if (pkey) {
-                Py_INCREF(key);
-                *pkey = key;
-            }
-            if (pvalue) {
-                Py_INCREF(value);
-                *pvalue = value;
-            }
-        }
-        return 1;
-    } else if (PyTuple_CheckExact(iter_obj)) {
-        Py_ssize_t pos = *ppos;
-        if (unlikely(pos >= PyTuple_GET_SIZE(iter_obj))) return 0;
-        *ppos = pos + 1;
-        next_item = PyTuple_GET_ITEM(iter_obj, pos);
-        Py_INCREF(next_item);
-    } else if (PyList_CheckExact(iter_obj)) {
-        Py_ssize_t pos = *ppos;
-        if (unlikely(pos >= PyList_GET_SIZE(iter_obj))) return 0;
-        *ppos = pos + 1;
-        next_item = PyList_GET_ITEM(iter_obj, pos);
-        Py_INCREF(next_item);
-    } else
-#endif
-    {
-        next_item = PyIter_Next(iter_obj);
-        if (unlikely(!next_item)) {
-            return __Pyx_IterFinish();
-        }
-    }
-    if (pitem) {
-        *pitem = next_item;
-    } else if (pkey && pvalue) {
-        if (__Pyx_unpack_tuple2(next_item, pkey, pvalue, source_is_dict, source_is_dict, 1))
-            return -1;
-    } else if (pkey) {
-        *pkey = next_item;
-    } else {
-        *pvalue = next_item;
-    }
-    return 1;
-}
-
-/* PyDictVersioning */
-#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
-static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) {
-    PyObject *dict = Py_TYPE(obj)->tp_dict;
-    return likely(dict) ? __PYX_GET_DICT_VERSION(dict) : 0;
-}
-static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj) {
-    PyObject **dictptr = NULL;
-    Py_ssize_t offset = Py_TYPE(obj)->tp_dictoffset;
-    if (offset) {
-#if CYTHON_COMPILING_IN_CPYTHON
-        dictptr = (likely(offset > 0)) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj);
-#else
-        dictptr = _PyObject_GetDictPtr(obj);
-#endif
-    }
-    return (dictptr && *dictptr) ? __PYX_GET_DICT_VERSION(*dictptr) : 0;
-}
-static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version) {
-    PyObject *dict = Py_TYPE(obj)->tp_dict;
-    if (unlikely(!dict) || unlikely(tp_dict_version != __PYX_GET_DICT_VERSION(dict)))
-        return 0;
-    return obj_dict_version == __Pyx_get_object_dict_version(obj);
-}
-#endif
-
-/* ReRaiseException */
-static CYTHON_INLINE void __Pyx_ReraiseException(void) {
-    PyObject *type = NULL, *value = NULL, *tb = NULL;
-#if CYTHON_FAST_THREAD_STATE
-    PyThreadState *tstate = PyThreadState_GET();
-  #if CYTHON_USE_EXC_INFO_STACK
-    _PyErr_StackItem *exc_info = __Pyx_PyErr_GetTopmostException(tstate);
-    value = exc_info->exc_value;
-    #if PY_VERSION_HEX >= 0x030B00a4
-    if (unlikely(value == Py_None)) {
-        value = NULL;
-    } else if (value) {
-        Py_INCREF(value);
-        type = (PyObject*) Py_TYPE(value);
-        Py_INCREF(type);
-        tb = PyException_GetTraceback(value);
-    }
-    #else
-    type = exc_info->exc_type;
-    tb = exc_info->exc_traceback;
-    Py_XINCREF(type);
-    Py_XINCREF(value);
-    Py_XINCREF(tb);
-    #endif
-  #else
-    type = tstate->exc_type;
-    value = tstate->exc_value;
-    tb = tstate->exc_traceback;
-    Py_XINCREF(type);
-    Py_XINCREF(value);
-    Py_XINCREF(tb);
-  #endif
-#else
-    PyErr_GetExcInfo(&type, &value, &tb);
-#endif
-    if (unlikely(!type || type == Py_None)) {
-        Py_XDECREF(type);
-        Py_XDECREF(value);
-        Py_XDECREF(tb);
-        PyErr_SetString(PyExc_RuntimeError,
-            "No active exception to reraise");
-    } else {
-        PyErr_Restore(type, value, tb);
-    }
-}
-
-/* DivInt[Py_ssize_t] */
-static CYTHON_INLINE Py_ssize_t __Pyx_div_Py_ssize_t(Py_ssize_t a, Py_ssize_t b) {
-    Py_ssize_t q = a / b;
-    Py_ssize_t r = a - q*b;
-    q -= ((r != 0) & ((r ^ b) < 0));
-    return q;
-}
-
-/* GetModuleGlobalName */
-#if CYTHON_USE_DICT_VERSIONS
-static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value)
-#else
-static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name)
-#endif
-{
-    PyObject *result;
-#if !CYTHON_AVOID_BORROWED_REFS
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1
-    result = _PyDict_GetItem_KnownHash(__pyx_d, name, ((PyASCIIObject *) name)->hash);
-    __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
-    if (likely(result)) {
-        return __Pyx_NewRef(result);
-    } else if (unlikely(PyErr_Occurred())) {
-        return NULL;
-    }
-#elif CYTHON_COMPILING_IN_LIMITED_API
-    if (unlikely(!__pyx_m)) {
-        return NULL;
-    }
-    result = PyObject_GetAttr(__pyx_m, name);
-    if (likely(result)) {
-        return result;
-    }
-#else
-    result = PyDict_GetItem(__pyx_d, name);
-    __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
-    if (likely(result)) {
-        return __Pyx_NewRef(result);
-    }
-#endif
-#else
-    result = PyObject_GetItem(__pyx_d, name);
-    __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
-    if (likely(result)) {
-        return __Pyx_NewRef(result);
-    }
-    PyErr_Clear();
-#endif
-    return __Pyx_GetBuiltinName(name);
-}
-
-/* CIntToDigits */
-static const char DIGIT_PAIRS_10[2*10*10+1] = {
-    "00010203040506070809"
-    "10111213141516171819"
-    "20212223242526272829"
-    "30313233343536373839"
-    "40414243444546474849"
-    "50515253545556575859"
-    "60616263646566676869"
-    "70717273747576777879"
-    "80818283848586878889"
-    "90919293949596979899"
-};
-static const char DIGIT_PAIRS_8[2*8*8+1] = {
-    "0001020304050607"
-    "1011121314151617"
-    "2021222324252627"
-    "3031323334353637"
-    "4041424344454647"
-    "5051525354555657"
-    "6061626364656667"
-    "7071727374757677"
-};
-static const char DIGITS_HEX[2*16+1] = {
-    "0123456789abcdef"
-    "0123456789ABCDEF"
-};
-
-/* BuildPyUnicode */
-static PyObject* __Pyx_PyUnicode_BuildFromAscii(Py_ssize_t ulength, char* chars, int clength,
-                                                int prepend_sign, char padding_char) {
-    PyObject *uval;
-    Py_ssize_t uoffset = ulength - clength;
-#if CYTHON_USE_UNICODE_INTERNALS
-    Py_ssize_t i;
-#if CYTHON_PEP393_ENABLED
-    void *udata;
-    uval = PyUnicode_New(ulength, 127);
-    if (unlikely(!uval)) return NULL;
-    udata = PyUnicode_DATA(uval);
-#else
-    Py_UNICODE *udata;
-    uval = PyUnicode_FromUnicode(NULL, ulength);
-    if (unlikely(!uval)) return NULL;
-    udata = PyUnicode_AS_UNICODE(uval);
-#endif
-    if (uoffset > 0) {
-        i = 0;
-        if (prepend_sign) {
-            __Pyx_PyUnicode_WRITE(PyUnicode_1BYTE_KIND, udata, 0, '-');
-            i++;
-        }
-        for (; i < uoffset; i++) {
-            __Pyx_PyUnicode_WRITE(PyUnicode_1BYTE_KIND, udata, i, padding_char);
-        }
-    }
-    for (i=0; i < clength; i++) {
-        __Pyx_PyUnicode_WRITE(PyUnicode_1BYTE_KIND, udata, uoffset+i, chars[i]);
-    }
-#else
-    {
-        PyObject *sign = NULL, *padding = NULL;
-        uval = NULL;
-        if (uoffset > 0) {
-            prepend_sign = !!prepend_sign;
-            if (uoffset > prepend_sign) {
-                padding = PyUnicode_FromOrdinal(padding_char);
-                if (likely(padding) && uoffset > prepend_sign + 1) {
-                    PyObject *tmp;
-                    PyObject *repeat = PyInt_FromSsize_t(uoffset - prepend_sign);
-                    if (unlikely(!repeat)) goto done_or_error;
-                    tmp = PyNumber_Multiply(padding, repeat);
-                    Py_DECREF(repeat);
-                    Py_DECREF(padding);
-                    padding = tmp;
-                }
-                if (unlikely(!padding)) goto done_or_error;
-            }
-            if (prepend_sign) {
-                sign = PyUnicode_FromOrdinal('-');
-                if (unlikely(!sign)) goto done_or_error;
-            }
-        }
-        uval = PyUnicode_DecodeASCII(chars, clength, NULL);
-        if (likely(uval) && padding) {
-            PyObject *tmp = PyNumber_Add(padding, uval);
-            Py_DECREF(uval);
-            uval = tmp;
-        }
-        if (likely(uval) && sign) {
-            PyObject *tmp = PyNumber_Add(sign, uval);
-            Py_DECREF(uval);
-            uval = tmp;
-        }
-done_or_error:
-        Py_XDECREF(padding);
-        Py_XDECREF(sign);
-    }
-#endif
-    return uval;
-}
-
-/* CIntToPyUnicode */
-static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t width, char padding_char, char format_char) {
-    char digits[sizeof(int)*3+2];
-    char *dpos, *end = digits + sizeof(int)*3+2;
-    const char *hex_digits = DIGITS_HEX;
-    Py_ssize_t length, ulength;
-    int prepend_sign, last_one_off;
-    int remaining;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const int neg_one = (int) -1, const_zero = (int) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-    if (format_char == 'X') {
-        hex_digits += 16;
-        format_char = 'x';
-    }
-    remaining = value;
-    last_one_off = 0;
-    dpos = end;
-    do {
-        int digit_pos;
-        switch (format_char) {
-        case 'o':
-            digit_pos = abs((int)(remaining % (8*8)));
-            remaining = (int) (remaining / (8*8));
-            dpos -= 2;
-            memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2);
-            last_one_off = (digit_pos < 8);
-            break;
-        case 'd':
-            digit_pos = abs((int)(remaining % (10*10)));
-            remaining = (int) (remaining / (10*10));
-            dpos -= 2;
-            memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2);
-            last_one_off = (digit_pos < 10);
-            break;
-        case 'x':
-            *(--dpos) = hex_digits[abs((int)(remaining % 16))];
-            remaining = (int) (remaining / 16);
-            break;
-        default:
-            assert(0);
-            break;
-        }
-    } while (unlikely(remaining != 0));
-    assert(!last_one_off || *dpos == '0');
-    dpos += last_one_off;
-    length = end - dpos;
-    ulength = length;
-    prepend_sign = 0;
-    if (!is_unsigned && value <= neg_one) {
-        if (padding_char == ' ' || width <= length + 1) {
-            *(--dpos) = '-';
-            ++length;
-        } else {
-            prepend_sign = 1;
-        }
-        ++ulength;
-    }
-    if (width > ulength) {
-        ulength = width;
-    }
-    if (ulength == 1) {
-        return PyUnicode_FromOrdinal(*dpos);
-    }
-    return __Pyx_PyUnicode_BuildFromAscii(ulength, dpos, (int) length, prepend_sign, padding_char);
-}
-
-/* FixUpExtensionType */
-#if CYTHON_USE_TYPE_SPECS
-static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject *type) {
-#if PY_VERSION_HEX > 0x030900B1 || CYTHON_COMPILING_IN_LIMITED_API
-    CYTHON_UNUSED_VAR(spec);
-    CYTHON_UNUSED_VAR(type);
-#else
-    const PyType_Slot *slot = spec->slots;
-    while (slot && slot->slot && slot->slot != Py_tp_members)
-        slot++;
-    if (slot && slot->slot == Py_tp_members) {
-        int changed = 0;
-#if !(PY_VERSION_HEX <= 0x030900b1 && CYTHON_COMPILING_IN_CPYTHON)
-        const
-#endif
-            PyMemberDef *memb = (PyMemberDef*) slot->pfunc;
-        while (memb && memb->name) {
-            if (memb->name[0] == '_' && memb->name[1] == '_') {
-#if PY_VERSION_HEX < 0x030900b1
-                if (strcmp(memb->name, "__weaklistoffset__") == 0) {
-                    assert(memb->type == T_PYSSIZET);
-                    assert(memb->flags == READONLY);
-                    type->tp_weaklistoffset = memb->offset;
-                    changed = 1;
-                }
-                else if (strcmp(memb->name, "__dictoffset__") == 0) {
-                    assert(memb->type == T_PYSSIZET);
-                    assert(memb->flags == READONLY);
-                    type->tp_dictoffset = memb->offset;
-                    changed = 1;
-                }
-#if CYTHON_METH_FASTCALL
-                else if (strcmp(memb->name, "__vectorcalloffset__") == 0) {
-                    assert(memb->type == T_PYSSIZET);
-                    assert(memb->flags == READONLY);
-#if PY_VERSION_HEX >= 0x030800b4
-                    type->tp_vectorcall_offset = memb->offset;
-#else
-                    type->tp_print = (printfunc) memb->offset;
-#endif
-                    changed = 1;
-                }
-#endif
-#else
-                if ((0));
-#endif
-#if PY_VERSION_HEX <= 0x030900b1 && CYTHON_COMPILING_IN_CPYTHON
-                else if (strcmp(memb->name, "__module__") == 0) {
-                    PyObject *descr;
-                    assert(memb->type == T_OBJECT);
-                    assert(memb->flags == 0 || memb->flags == READONLY);
-                    descr = PyDescr_NewMember(type, memb);
-                    if (unlikely(!descr))
-                        return -1;
-                    if (unlikely(PyDict_SetItem(type->tp_dict, PyDescr_NAME(descr), descr) < 0)) {
-                        Py_DECREF(descr);
-                        return -1;
-                    }
-                    Py_DECREF(descr);
-                    changed = 1;
-                }
-#endif
-            }
-            memb++;
-        }
-        if (changed)
-            PyType_Modified(type);
-    }
-#endif
-    return 0;
-}
-#endif
-
-/* ValidateBasesTuple */
-#if CYTHON_COMPILING_IN_CPYTHON || CYTHON_COMPILING_IN_LIMITED_API || CYTHON_USE_TYPE_SPECS
-static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffset, PyObject *bases) {
-    Py_ssize_t i, n;
-#if CYTHON_ASSUME_SAFE_MACROS
-    n = PyTuple_GET_SIZE(bases);
-#else
-    n = PyTuple_Size(bases);
-    if (n < 0) return -1;
-#endif
-    for (i = 1; i < n; i++)
-    {
-#if CYTHON_AVOID_BORROWED_REFS
-        PyObject *b0 = PySequence_GetItem(bases, i);
-        if (!b0) return -1;
-#elif CYTHON_ASSUME_SAFE_MACROS
-        PyObject *b0 = PyTuple_GET_ITEM(bases, i);
-#else
-        PyObject *b0 = PyTuple_GetItem(bases, i);
-        if (!b0) return -1;
-#endif
-        PyTypeObject *b;
-#if PY_MAJOR_VERSION < 3
-        if (PyClass_Check(b0))
-        {
-            PyErr_Format(PyExc_TypeError, "base class '%.200s' is an old-style class",
-                         PyString_AS_STRING(((PyClassObject*)b0)->cl_name));
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_DECREF(b0);
-#endif
-            return -1;
-        }
-#endif
-        b = (PyTypeObject*) b0;
-        if (!__Pyx_PyType_HasFeature(b, Py_TPFLAGS_HEAPTYPE))
-        {
-            __Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
-            PyErr_Format(PyExc_TypeError,
-                "base class '" __Pyx_FMT_TYPENAME "' is not a heap type", b_name);
-            __Pyx_DECREF_TypeName(b_name);
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_DECREF(b0);
-#endif
-            return -1;
-        }
-#if !CYTHON_USE_TYPE_SLOTS
-        if (dictoffset == 0) {
-            PyErr_Format(PyExc_TypeError,
-                "extension type '%s.200s': "
-                "unable to validate whether bases have a __dict__ "
-                "when CYTHON_USE_TYPE_SLOTS is off "
-                "(likely because you are building in the limited API). "
-                "Therefore, all extension types with multiple bases "
-                "must add 'cdef dict __dict__' in this compilation mode",
-                type_name);
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_DECREF(b0);
-#endif
-            return -1;
-        }
-#else
-        if (dictoffset == 0 && b->tp_dictoffset)
-        {
-            __Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
-            PyErr_Format(PyExc_TypeError,
-                "extension type '%.200s' has no __dict__ slot, "
-                "but base type '" __Pyx_FMT_TYPENAME "' has: "
-                "either add 'cdef dict __dict__' to the extension type "
-                "or add '__slots__ = [...]' to the base type",
-                type_name, b_name);
-            __Pyx_DECREF_TypeName(b_name);
-#if CYTHON_AVOID_BORROWED_REFS
-            Py_DECREF(b0);
-#endif
-            return -1;
-        }
-#endif
-#if CYTHON_AVOID_BORROWED_REFS
-        Py_DECREF(b0);
-#endif
-    }
-    return 0;
-}
-#endif
-
-/* PyType_Ready */
-static int __Pyx_PyType_Ready(PyTypeObject *t) {
-#if CYTHON_USE_TYPE_SPECS || !(CYTHON_COMPILING_IN_CPYTHON || CYTHON_COMPILING_IN_LIMITED_API) || defined(PYSTON_MAJOR_VERSION)
-    (void)__Pyx_PyObject_CallMethod0;
-#if CYTHON_USE_TYPE_SPECS
-    (void)__Pyx_validate_bases_tuple;
-#endif
-    return PyType_Ready(t);
-#else
-    int r;
-    PyObject *bases = __Pyx_PyType_GetSlot(t, tp_bases, PyObject*);
-    if (bases && unlikely(__Pyx_validate_bases_tuple(t->tp_name, t->tp_dictoffset, bases) == -1))
-        return -1;
-#if PY_VERSION_HEX >= 0x03050000 && !defined(PYSTON_MAJOR_VERSION)
-    {
-        int gc_was_enabled;
-    #if PY_VERSION_HEX >= 0x030A00b1
-        gc_was_enabled = PyGC_Disable();
-        (void)__Pyx_PyObject_CallMethod0;
-    #else
-        PyObject *ret, *py_status;
-        PyObject *gc = NULL;
-        #if PY_VERSION_HEX >= 0x030700a1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM+0 >= 0x07030400)
-        gc = PyImport_GetModule(__pyx_kp_u_gc);
-        #endif
-        if (unlikely(!gc)) gc = PyImport_Import(__pyx_kp_u_gc);
-        if (unlikely(!gc)) return -1;
-        py_status = __Pyx_PyObject_CallMethod0(gc, __pyx_kp_u_isenabled);
-        if (unlikely(!py_status)) {
-            Py_DECREF(gc);
-            return -1;
-        }
-        gc_was_enabled = __Pyx_PyObject_IsTrue(py_status);
-        Py_DECREF(py_status);
-        if (gc_was_enabled > 0) {
-            ret = __Pyx_PyObject_CallMethod0(gc, __pyx_kp_u_disable);
-            if (unlikely(!ret)) {
-                Py_DECREF(gc);
-                return -1;
-            }
-            Py_DECREF(ret);
-        } else if (unlikely(gc_was_enabled == -1)) {
-            Py_DECREF(gc);
-            return -1;
-        }
-    #endif
-        t->tp_flags |= Py_TPFLAGS_HEAPTYPE;
-#if PY_VERSION_HEX >= 0x030A0000
-        t->tp_flags |= Py_TPFLAGS_IMMUTABLETYPE;
-#endif
-#else
-        (void)__Pyx_PyObject_CallMethod0;
-#endif
-    r = PyType_Ready(t);
-#if PY_VERSION_HEX >= 0x03050000 && !defined(PYSTON_MAJOR_VERSION)
-        t->tp_flags &= ~Py_TPFLAGS_HEAPTYPE;
-    #if PY_VERSION_HEX >= 0x030A00b1
-        if (gc_was_enabled)
-            PyGC_Enable();
-    #else
-        if (gc_was_enabled) {
-            PyObject *tp, *v, *tb;
-            PyErr_Fetch(&tp, &v, &tb);
-            ret = __Pyx_PyObject_CallMethod0(gc, __pyx_kp_u_enable);
-            if (likely(ret || r == -1)) {
-                Py_XDECREF(ret);
-                PyErr_Restore(tp, v, tb);
-            } else {
-                Py_XDECREF(tp);
-                Py_XDECREF(v);
-                Py_XDECREF(tb);
-                r = -1;
-            }
-        }
-        Py_DECREF(gc);
-    #endif
-    }
-#endif
-    return r;
-#endif
-}
-
-/* PyObject_GenericGetAttrNoDict */
-#if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
-static PyObject *__Pyx_RaiseGenericGetAttributeError(PyTypeObject *tp, PyObject *attr_name) {
-    __Pyx_TypeName type_name = __Pyx_PyType_GetName(tp);
-    PyErr_Format(PyExc_AttributeError,
-#if PY_MAJOR_VERSION >= 3
-                 "'" __Pyx_FMT_TYPENAME "' object has no attribute '%U'",
-                 type_name, attr_name);
-#else
-                 "'" __Pyx_FMT_TYPENAME "' object has no attribute '%.400s'",
-                 type_name, PyString_AS_STRING(attr_name));
-#endif
-    __Pyx_DECREF_TypeName(type_name);
-    return NULL;
-}
-static CYTHON_INLINE PyObject* __Pyx_PyObject_GenericGetAttrNoDict(PyObject* obj, PyObject* attr_name) {
-    PyObject *descr;
-    PyTypeObject *tp = Py_TYPE(obj);
-    if (unlikely(!PyString_Check(attr_name))) {
-        return PyObject_GenericGetAttr(obj, attr_name);
-    }
-    assert(!tp->tp_dictoffset);
-    descr = _PyType_Lookup(tp, attr_name);
-    if (unlikely(!descr)) {
-        return __Pyx_RaiseGenericGetAttributeError(tp, attr_name);
-    }
-    Py_INCREF(descr);
-    #if PY_MAJOR_VERSION < 3
-    if (likely(PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_HAVE_CLASS)))
-    #endif
-    {
-        descrgetfunc f = Py_TYPE(descr)->tp_descr_get;
-        if (unlikely(f)) {
-            PyObject *res = f(descr, obj, (PyObject *)tp);
-            Py_DECREF(descr);
-            return res;
-        }
-    }
-    return descr;
-}
-#endif
-
-/* PyObject_GenericGetAttr */
-#if CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP && PY_VERSION_HEX < 0x03070000
-static PyObject* __Pyx_PyObject_GenericGetAttr(PyObject* obj, PyObject* attr_name) {
-    if (unlikely(Py_TYPE(obj)->tp_dictoffset)) {
-        return PyObject_GenericGetAttr(obj, attr_name);
-    }
-    return __Pyx_PyObject_GenericGetAttrNoDict(obj, attr_name);
-}
-#endif
-
-/* SetVTable */
-static int __Pyx_SetVtable(PyTypeObject *type, void *vtable) {
-    PyObject *ob = PyCapsule_New(vtable, 0, 0);
-    if (unlikely(!ob))
-        goto bad;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    if (unlikely(PyObject_SetAttr((PyObject *) type, __pyx_n_s_pyx_vtable, ob) < 0))
-#else
-    if (unlikely(PyDict_SetItem(type->tp_dict, __pyx_n_s_pyx_vtable, ob) < 0))
-#endif
-        goto bad;
-    Py_DECREF(ob);
-    return 0;
-bad:
-    Py_XDECREF(ob);
-    return -1;
-}
-
-/* GetVTable */
-static void* __Pyx_GetVtable(PyTypeObject *type) {
-    void* ptr;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    PyObject *ob = PyObject_GetAttr((PyObject *)type, __pyx_n_s_pyx_vtable);
-#else
-    PyObject *ob = PyObject_GetItem(type->tp_dict, __pyx_n_s_pyx_vtable);
-#endif
-    if (!ob)
-        goto bad;
-    ptr = PyCapsule_GetPointer(ob, 0);
-    if (!ptr && !PyErr_Occurred())
-        PyErr_SetString(PyExc_RuntimeError, "invalid vtable found for imported type");
-    Py_DECREF(ob);
-    return ptr;
-bad:
-    Py_XDECREF(ob);
-    return NULL;
-}
-
-/* MergeVTables */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-static int __Pyx_MergeVtables(PyTypeObject *type) {
-    int i;
-    void** base_vtables;
-    __Pyx_TypeName tp_base_name;
-    __Pyx_TypeName base_name;
-    void* unknown = (void*)-1;
-    PyObject* bases = type->tp_bases;
-    int base_depth = 0;
-    {
-        PyTypeObject* base = type->tp_base;
-        while (base) {
-            base_depth += 1;
-            base = base->tp_base;
-        }
-    }
-    base_vtables = (void**) malloc(sizeof(void*) * (size_t)(base_depth + 1));
-    base_vtables[0] = unknown;
-    for (i = 1; i < PyTuple_GET_SIZE(bases); i++) {
-        void* base_vtable = __Pyx_GetVtable(((PyTypeObject*)PyTuple_GET_ITEM(bases, i)));
-        if (base_vtable != NULL) {
-            int j;
-            PyTypeObject* base = type->tp_base;
-            for (j = 0; j < base_depth; j++) {
-                if (base_vtables[j] == unknown) {
-                    base_vtables[j] = __Pyx_GetVtable(base);
-                    base_vtables[j + 1] = unknown;
-                }
-                if (base_vtables[j] == base_vtable) {
-                    break;
-                } else if (base_vtables[j] == NULL) {
-                    goto bad;
-                }
-                base = base->tp_base;
-            }
-        }
-    }
-    PyErr_Clear();
-    free(base_vtables);
-    return 0;
-bad:
-    tp_base_name = __Pyx_PyType_GetName(type->tp_base);
-    base_name = __Pyx_PyType_GetName((PyTypeObject*)PyTuple_GET_ITEM(bases, i));
-    PyErr_Format(PyExc_TypeError,
-        "multiple bases have vtable conflict: '" __Pyx_FMT_TYPENAME "' and '" __Pyx_FMT_TYPENAME "'", tp_base_name, base_name);
-    __Pyx_DECREF_TypeName(tp_base_name);
-    __Pyx_DECREF_TypeName(base_name);
-    free(base_vtables);
-    return -1;
-}
-#endif
-
-/* SetupReduce */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-static int __Pyx_setup_reduce_is_named(PyObject* meth, PyObject* name) {
-  int ret;
-  PyObject *name_attr;
-  name_attr = __Pyx_PyObject_GetAttrStrNoError(meth, __pyx_n_s_name);
-  if (likely(name_attr)) {
-      ret = PyObject_RichCompareBool(name_attr, name, Py_EQ);
-  } else {
-      ret = -1;
-  }
-  if (unlikely(ret < 0)) {
-      PyErr_Clear();
-      ret = 0;
-  }
-  Py_XDECREF(name_attr);
-  return ret;
-}
-static int __Pyx_setup_reduce(PyObject* type_obj) {
-    int ret = 0;
-    PyObject *object_reduce = NULL;
-    PyObject *object_getstate = NULL;
-    PyObject *object_reduce_ex = NULL;
-    PyObject *reduce = NULL;
-    PyObject *reduce_ex = NULL;
-    PyObject *reduce_cython = NULL;
-    PyObject *setstate = NULL;
-    PyObject *setstate_cython = NULL;
-    PyObject *getstate = NULL;
-#if CYTHON_USE_PYTYPE_LOOKUP
-    getstate = _PyType_Lookup((PyTypeObject*)type_obj, __pyx_n_s_getstate);
-#else
-    getstate = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_getstate);
-    if (!getstate && PyErr_Occurred()) {
-        goto __PYX_BAD;
-    }
-#endif
-    if (getstate) {
-#if CYTHON_USE_PYTYPE_LOOKUP
-        object_getstate = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_getstate);
-#else
-        object_getstate = __Pyx_PyObject_GetAttrStrNoError((PyObject*)&PyBaseObject_Type, __pyx_n_s_getstate);
-        if (!object_getstate && PyErr_Occurred()) {
-            goto __PYX_BAD;
-        }
-#endif
-        if (object_getstate != getstate) {
-            goto __PYX_GOOD;
-        }
-    }
-#if CYTHON_USE_PYTYPE_LOOKUP
-    object_reduce_ex = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_reduce_ex); if (!object_reduce_ex) goto __PYX_BAD;
-#else
-    object_reduce_ex = __Pyx_PyObject_GetAttrStr((PyObject*)&PyBaseObject_Type, __pyx_n_s_reduce_ex); if (!object_reduce_ex) goto __PYX_BAD;
-#endif
-    reduce_ex = __Pyx_PyObject_GetAttrStr(type_obj, __pyx_n_s_reduce_ex); if (unlikely(!reduce_ex)) goto __PYX_BAD;
-    if (reduce_ex == object_reduce_ex) {
-#if CYTHON_USE_PYTYPE_LOOKUP
-        object_reduce = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_reduce); if (!object_reduce) goto __PYX_BAD;
-#else
-        object_reduce = __Pyx_PyObject_GetAttrStr((PyObject*)&PyBaseObject_Type, __pyx_n_s_reduce); if (!object_reduce) goto __PYX_BAD;
-#endif
-        reduce = __Pyx_PyObject_GetAttrStr(type_obj, __pyx_n_s_reduce); if (unlikely(!reduce)) goto __PYX_BAD;
-        if (reduce == object_reduce || __Pyx_setup_reduce_is_named(reduce, __pyx_n_s_reduce_cython)) {
-            reduce_cython = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_reduce_cython);
-            if (likely(reduce_cython)) {
-                ret = PyDict_SetItem(((PyTypeObject*)type_obj)->tp_dict, __pyx_n_s_reduce, reduce_cython); if (unlikely(ret < 0)) goto __PYX_BAD;
-                ret = PyDict_DelItem(((PyTypeObject*)type_obj)->tp_dict, __pyx_n_s_reduce_cython); if (unlikely(ret < 0)) goto __PYX_BAD;
-            } else if (reduce == object_reduce || PyErr_Occurred()) {
-                goto __PYX_BAD;
-            }
-            setstate = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_setstate);
-            if (!setstate) PyErr_Clear();
-            if (!setstate || __Pyx_setup_reduce_is_named(setstate, __pyx_n_s_setstate_cython)) {
-                setstate_cython = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_setstate_cython);
-                if (likely(setstate_cython)) {
-                    ret = PyDict_SetItem(((PyTypeObject*)type_obj)->tp_dict, __pyx_n_s_setstate, setstate_cython); if (unlikely(ret < 0)) goto __PYX_BAD;
-                    ret = PyDict_DelItem(((PyTypeObject*)type_obj)->tp_dict, __pyx_n_s_setstate_cython); if (unlikely(ret < 0)) goto __PYX_BAD;
-                } else if (!setstate || PyErr_Occurred()) {
-                    goto __PYX_BAD;
-                }
-            }
-            PyType_Modified((PyTypeObject*)type_obj);
-        }
-    }
-    goto __PYX_GOOD;
-__PYX_BAD:
-    if (!PyErr_Occurred()) {
-        __Pyx_TypeName type_obj_name =
-            __Pyx_PyType_GetName((PyTypeObject*)type_obj);
-        PyErr_Format(PyExc_RuntimeError,
-            "Unable to initialize pickling for " __Pyx_FMT_TYPENAME, type_obj_name);
-        __Pyx_DECREF_TypeName(type_obj_name);
-    }
-    ret = -1;
-__PYX_GOOD:
-#if !CYTHON_USE_PYTYPE_LOOKUP
-    Py_XDECREF(object_reduce);
-    Py_XDECREF(object_reduce_ex);
-    Py_XDECREF(object_getstate);
-    Py_XDECREF(getstate);
-#endif
-    Py_XDECREF(reduce);
-    Py_XDECREF(reduce_ex);
-    Py_XDECREF(reduce_cython);
-    Py_XDECREF(setstate);
-    Py_XDECREF(setstate_cython);
-    return ret;
-}
-#endif
-
-/* TypeImport */
-#ifndef __PYX_HAVE_RT_ImportType_3_0_2
-#define __PYX_HAVE_RT_ImportType_3_0_2
-static PyTypeObject *__Pyx_ImportType_3_0_2(PyObject *module, const char *module_name, const char *class_name,
-    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_2 check_size)
-{
-    PyObject *result = 0;
-    char warning[200];
-    Py_ssize_t basicsize;
-    Py_ssize_t itemsize;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    PyObject *py_basicsize;
-    PyObject *py_itemsize;
-#endif
-    result = PyObject_GetAttrString(module, class_name);
-    if (!result)
-        goto bad;
-    if (!PyType_Check(result)) {
-        PyErr_Format(PyExc_TypeError,
-            "%.200s.%.200s is not a type object",
-            module_name, class_name);
-        goto bad;
-    }
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    basicsize = ((PyTypeObject *)result)->tp_basicsize;
-    itemsize = ((PyTypeObject *)result)->tp_itemsize;
-#else
-    py_basicsize = PyObject_GetAttrString(result, "__basicsize__");
-    if (!py_basicsize)
-        goto bad;
-    basicsize = PyLong_AsSsize_t(py_basicsize);
-    Py_DECREF(py_basicsize);
-    py_basicsize = 0;
-    if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())
-        goto bad;
-    py_itemsize = PyObject_GetAttrString(result, "__itemsize__");
-    if (!py_itemsize)
-        goto bad;
-    itemsize = PyLong_AsSsize_t(py_itemsize);
-    Py_DECREF(py_itemsize);
-    py_itemsize = 0;
-    if (itemsize == (Py_ssize_t)-1 && PyErr_Occurred())
-        goto bad;
-#endif
-    if (itemsize) {
-        if (size % alignment) {
-            alignment = size % alignment;
-        }
-        if (itemsize < (Py_ssize_t)alignment)
-            itemsize = (Py_ssize_t)alignment;
-    }
-    if ((size_t)(basicsize + itemsize) < size) {
-        PyErr_Format(PyExc_ValueError,
-            "%.200s.%.200s size changed, may indicate binary incompatibility. "
-            "Expected %zd from C header, got %zd from PyObject",
-            module_name, class_name, size, basicsize+itemsize);
-        goto bad;
-    }
-    if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_2 &&
-            ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
-        PyErr_Format(PyExc_ValueError,
-            "%.200s.%.200s size changed, may indicate binary incompatibility. "
-            "Expected %zd from C header, got %zd-%zd from PyObject",
-            module_name, class_name, size, basicsize, basicsize+itemsize);
-        goto bad;
-    }
-    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_2 && (size_t)basicsize > size) {
-        PyOS_snprintf(warning, sizeof(warning),
-            "%s.%s size changed, may indicate binary incompatibility. "
-            "Expected %zd from C header, got %zd from PyObject",
-            module_name, class_name, size, basicsize);
-        if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;
-    }
-    return (PyTypeObject *)result;
-bad:
-    Py_XDECREF(result);
-    return NULL;
-}
-#endif
-
-/* Import */
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
-    PyObject *module = 0;
-    PyObject *empty_dict = 0;
-    PyObject *empty_list = 0;
-    #if PY_MAJOR_VERSION < 3
-    PyObject *py_import;
-    py_import = __Pyx_PyObject_GetAttrStr(__pyx_b, __pyx_n_s_import);
-    if (unlikely(!py_import))
-        goto bad;
-    if (!from_list) {
-        empty_list = PyList_New(0);
-        if (unlikely(!empty_list))
-            goto bad;
-        from_list = empty_list;
-    }
-    #endif
-    empty_dict = PyDict_New();
-    if (unlikely(!empty_dict))
-        goto bad;
-    {
-        #if PY_MAJOR_VERSION >= 3
-        if (level == -1) {
-            if ((1) && (strchr(__Pyx_MODULE_NAME, '.'))) {
-                module = PyImport_ImportModuleLevelObject(
-                    name, __pyx_d, empty_dict, from_list, 1);
-                if (unlikely(!module)) {
-                    if (unlikely(!PyErr_ExceptionMatches(PyExc_ImportError)))
-                        goto bad;
-                    PyErr_Clear();
-                }
-            }
-            level = 0;
-        }
-        #endif
-        if (!module) {
-            #if PY_MAJOR_VERSION < 3
-            PyObject *py_level = PyInt_FromLong(level);
-            if (unlikely(!py_level))
-                goto bad;
-            module = PyObject_CallFunctionObjArgs(py_import,
-                name, __pyx_d, empty_dict, from_list, py_level, (PyObject *)NULL);
-            Py_DECREF(py_level);
-            #else
-            module = PyImport_ImportModuleLevelObject(
-                name, __pyx_d, empty_dict, from_list, level);
-            #endif
-        }
-    }
-bad:
-    Py_XDECREF(empty_dict);
-    Py_XDECREF(empty_list);
-    #if PY_MAJOR_VERSION < 3
-    Py_XDECREF(py_import);
-    #endif
-    return module;
-}
-
-/* ImportDottedModule */
-#if PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx__ImportDottedModule_Error(PyObject *name, PyObject *parts_tuple, Py_ssize_t count) {
-    PyObject *partial_name = NULL, *slice = NULL, *sep = NULL;
-    if (unlikely(PyErr_Occurred())) {
-        PyErr_Clear();
-    }
-    if (likely(PyTuple_GET_SIZE(parts_tuple) == count)) {
-        partial_name = name;
-    } else {
-        slice = PySequence_GetSlice(parts_tuple, 0, count);
-        if (unlikely(!slice))
-            goto bad;
-        sep = PyUnicode_FromStringAndSize(".", 1);
-        if (unlikely(!sep))
-            goto bad;
-        partial_name = PyUnicode_Join(sep, slice);
-    }
-    PyErr_Format(
-#if PY_MAJOR_VERSION < 3
-        PyExc_ImportError,
-        "No module named '%s'", PyString_AS_STRING(partial_name));
-#else
-#if PY_VERSION_HEX >= 0x030600B1
-        PyExc_ModuleNotFoundError,
-#else
-        PyExc_ImportError,
-#endif
-        "No module named '%U'", partial_name);
-#endif
-bad:
-    Py_XDECREF(sep);
-    Py_XDECREF(slice);
-    Py_XDECREF(partial_name);
-    return NULL;
-}
-#endif
-#if PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx__ImportDottedModule_Lookup(PyObject *name) {
-    PyObject *imported_module;
-#if PY_VERSION_HEX < 0x030700A1 || (CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM  < 0x07030400)
-    PyObject *modules = PyImport_GetModuleDict();
-    if (unlikely(!modules))
-        return NULL;
-    imported_module = __Pyx_PyDict_GetItemStr(modules, name);
-    Py_XINCREF(imported_module);
-#else
-    imported_module = PyImport_GetModule(name);
-#endif
-    return imported_module;
-}
-#endif
-#if PY_MAJOR_VERSION >= 3
-static PyObject *__Pyx_ImportDottedModule_WalkParts(PyObject *module, PyObject *name, PyObject *parts_tuple) {
-    Py_ssize_t i, nparts;
-    nparts = PyTuple_GET_SIZE(parts_tuple);
-    for (i=1; i < nparts && module; i++) {
-        PyObject *part, *submodule;
-#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-        part = PyTuple_GET_ITEM(parts_tuple, i);
-#else
-        part = PySequence_ITEM(parts_tuple, i);
-#endif
-        submodule = __Pyx_PyObject_GetAttrStrNoError(module, part);
-#if !(CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS)
-        Py_DECREF(part);
-#endif
-        Py_DECREF(module);
-        module = submodule;
-    }
-    if (unlikely(!module)) {
-        return __Pyx__ImportDottedModule_Error(name, parts_tuple, i);
-    }
-    return module;
-}
-#endif
-static PyObject *__Pyx__ImportDottedModule(PyObject *name, PyObject *parts_tuple) {
-#if PY_MAJOR_VERSION < 3
-    PyObject *module, *from_list, *star = __pyx_n_s__29;
-    CYTHON_UNUSED_VAR(parts_tuple);
-    from_list = PyList_New(1);
-    if (unlikely(!from_list))
-        return NULL;
-    Py_INCREF(star);
-    PyList_SET_ITEM(from_list, 0, star);
-    module = __Pyx_Import(name, from_list, 0);
-    Py_DECREF(from_list);
-    return module;
-#else
-    PyObject *imported_module;
-    PyObject *module = __Pyx_Import(name, NULL, 0);
-    if (!parts_tuple || unlikely(!module))
-        return module;
-    imported_module = __Pyx__ImportDottedModule_Lookup(name);
-    if (likely(imported_module)) {
-        Py_DECREF(module);
-        return imported_module;
-    }
-    PyErr_Clear();
-    return __Pyx_ImportDottedModule_WalkParts(module, name, parts_tuple);
-#endif
-}
-static PyObject *__Pyx_ImportDottedModule(PyObject *name, PyObject *parts_tuple) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030400B1
-    PyObject *module = __Pyx__ImportDottedModule_Lookup(name);
-    if (likely(module)) {
-        PyObject *spec = __Pyx_PyObject_GetAttrStrNoError(module, __pyx_n_s_spec);
-        if (likely(spec)) {
-            PyObject *unsafe = __Pyx_PyObject_GetAttrStrNoError(spec, __pyx_n_s_initializing);
-            if (likely(!unsafe || !__Pyx_PyObject_IsTrue(unsafe))) {
-                Py_DECREF(spec);
-                spec = NULL;
-            }
-            Py_XDECREF(unsafe);
-        }
-        if (likely(!spec)) {
-            PyErr_Clear();
-            return module;
-        }
-        Py_DECREF(spec);
-        Py_DECREF(module);
-    } else if (PyErr_Occurred()) {
-        PyErr_Clear();
-    }
-#endif
-    return __Pyx__ImportDottedModule(name, parts_tuple);
-}
-
-/* ImportFrom */
-static PyObject* __Pyx_ImportFrom(PyObject* module, PyObject* name) {
-    PyObject* value = __Pyx_PyObject_GetAttrStr(module, name);
-    if (unlikely(!value) && PyErr_ExceptionMatches(PyExc_AttributeError)) {
-        const char* module_name_str = 0;
-        PyObject* module_name = 0;
-        PyObject* module_dot = 0;
-        PyObject* full_name = 0;
-        PyErr_Clear();
-        module_name_str = PyModule_GetName(module);
-        if (unlikely(!module_name_str)) { goto modbad; }
-        module_name = PyUnicode_FromString(module_name_str);
-        if (unlikely(!module_name)) { goto modbad; }
-        module_dot = PyUnicode_Concat(module_name, __pyx_kp_u__30);
-        if (unlikely(!module_dot)) { goto modbad; }
-        full_name = PyUnicode_Concat(module_dot, name);
-        if (unlikely(!full_name)) { goto modbad; }
-        #if PY_VERSION_HEX < 0x030700A1 || (CYTHON_COMPILING_IN_PYPY && PYPY_VERSION_NUM  < 0x07030400)
-        {
-            PyObject *modules = PyImport_GetModuleDict();
-            if (unlikely(!modules))
-                goto modbad;
-            value = PyObject_GetItem(modules, full_name);
-        }
-        #else
-        value = PyImport_GetModule(full_name);
-        #endif
-      modbad:
-        Py_XDECREF(full_name);
-        Py_XDECREF(module_dot);
-        Py_XDECREF(module_name);
-    }
-    if (unlikely(!value)) {
-        PyErr_Format(PyExc_ImportError,
-        #if PY_MAJOR_VERSION < 3
-            "cannot import name %.230s", PyString_AS_STRING(name));
-        #else
-            "cannot import name %S", name);
-        #endif
-    }
-    return value;
-}
-
-/* FetchSharedCythonModule */
-static PyObject *__Pyx_FetchSharedCythonABIModule(void) {
-    PyObject *abi_module = PyImport_AddModule((char*) __PYX_ABI_MODULE_NAME);
-    if (unlikely(!abi_module)) return NULL;
-    Py_INCREF(abi_module);
-    return abi_module;
-}
-
-/* FetchCommonType */
-static int __Pyx_VerifyCachedType(PyObject *cached_type,
-                               const char *name,
-                               Py_ssize_t basicsize,
-                               Py_ssize_t expected_basicsize) {
-    if (!PyType_Check(cached_type)) {
-        PyErr_Format(PyExc_TypeError,
-            "Shared Cython type %.200s is not a type object", name);
-        return -1;
-    }
-    if (basicsize != expected_basicsize) {
-        PyErr_Format(PyExc_TypeError,
-            "Shared Cython type %.200s has the wrong size, try recompiling",
-            name);
-        return -1;
-    }
-    return 0;
-}
-#if !CYTHON_USE_TYPE_SPECS
-static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type) {
-    PyObject* abi_module;
-    const char* object_name;
-    PyTypeObject *cached_type = NULL;
-    abi_module = __Pyx_FetchSharedCythonABIModule();
-    if (!abi_module) return NULL;
-    object_name = strrchr(type->tp_name, '.');
-    object_name = object_name ? object_name+1 : type->tp_name;
-    cached_type = (PyTypeObject*) PyObject_GetAttrString(abi_module, object_name);
-    if (cached_type) {
-        if (__Pyx_VerifyCachedType(
-              (PyObject *)cached_type,
-              object_name,
-              cached_type->tp_basicsize,
-              type->tp_basicsize) < 0) {
-            goto bad;
-        }
-        goto done;
-    }
-    if (!PyErr_ExceptionMatches(PyExc_AttributeError)) goto bad;
-    PyErr_Clear();
-    if (PyType_Ready(type) < 0) goto bad;
-    if (PyObject_SetAttrString(abi_module, object_name, (PyObject *)type) < 0)
-        goto bad;
-    Py_INCREF(type);
-    cached_type = type;
-done:
-    Py_DECREF(abi_module);
-    return cached_type;
-bad:
-    Py_XDECREF(cached_type);
-    cached_type = NULL;
-    goto done;
-}
-#else
-static PyTypeObject *__Pyx_FetchCommonTypeFromSpec(PyObject *module, PyType_Spec *spec, PyObject *bases) {
-    PyObject *abi_module, *cached_type = NULL;
-    const char* object_name = strrchr(spec->name, '.');
-    object_name = object_name ? object_name+1 : spec->name;
-    abi_module = __Pyx_FetchSharedCythonABIModule();
-    if (!abi_module) return NULL;
-    cached_type = PyObject_GetAttrString(abi_module, object_name);
-    if (cached_type) {
-        Py_ssize_t basicsize;
-#if CYTHON_COMPILING_IN_LIMITED_API
-        PyObject *py_basicsize;
-        py_basicsize = PyObject_GetAttrString(cached_type, "__basicsize__");
-        if (unlikely(!py_basicsize)) goto bad;
-        basicsize = PyLong_AsSsize_t(py_basicsize);
-        Py_DECREF(py_basicsize);
-        py_basicsize = 0;
-        if (unlikely(basicsize == (Py_ssize_t)-1) && PyErr_Occurred()) goto bad;
-#else
-        basicsize = likely(PyType_Check(cached_type)) ? ((PyTypeObject*) cached_type)->tp_basicsize : -1;
-#endif
-        if (__Pyx_VerifyCachedType(
-              cached_type,
-              object_name,
-              basicsize,
-              spec->basicsize) < 0) {
-            goto bad;
-        }
-        goto done;
-    }
-    if (!PyErr_ExceptionMatches(PyExc_AttributeError)) goto bad;
-    PyErr_Clear();
-    CYTHON_UNUSED_VAR(module);
-    cached_type = __Pyx_PyType_FromModuleAndSpec(abi_module, spec, bases);
-    if (unlikely(!cached_type)) goto bad;
-    if (unlikely(__Pyx_fix_up_extension_type_from_spec(spec, (PyTypeObject *) cached_type) < 0)) goto bad;
-    if (PyObject_SetAttrString(abi_module, object_name, cached_type) < 0) goto bad;
-done:
-    Py_DECREF(abi_module);
-    assert(cached_type == NULL || PyType_Check(cached_type));
-    return (PyTypeObject *) cached_type;
-bad:
-    Py_XDECREF(cached_type);
-    cached_type = NULL;
-    goto done;
-}
-#endif
-
-/* PyVectorcallFastCallDict */
-#if CYTHON_METH_FASTCALL
-static PyObject *__Pyx_PyVectorcall_FastCallDict_kw(PyObject *func, __pyx_vectorcallfunc vc, PyObject *const *args, size_t nargs, PyObject *kw)
-{
-    PyObject *res = NULL;
-    PyObject *kwnames;
-    PyObject **newargs;
-    PyObject **kwvalues;
-    Py_ssize_t i, pos;
-    size_t j;
-    PyObject *key, *value;
-    unsigned long keys_are_strings;
-    Py_ssize_t nkw = PyDict_GET_SIZE(kw);
-    newargs = (PyObject **)PyMem_Malloc((nargs + (size_t)nkw) * sizeof(args[0]));
-    if (unlikely(newargs == NULL)) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    for (j = 0; j < nargs; j++) newargs[j] = args[j];
-    kwnames = PyTuple_New(nkw);
-    if (unlikely(kwnames == NULL)) {
-        PyMem_Free(newargs);
-        return NULL;
-    }
-    kwvalues = newargs + nargs;
-    pos = i = 0;
-    keys_are_strings = Py_TPFLAGS_UNICODE_SUBCLASS;
-    while (PyDict_Next(kw, &pos, &key, &value)) {
-        keys_are_strings &= Py_TYPE(key)->tp_flags;
-        Py_INCREF(key);
-        Py_INCREF(value);
-        PyTuple_SET_ITEM(kwnames, i, key);
-        kwvalues[i] = value;
-        i++;
-    }
-    if (unlikely(!keys_are_strings)) {
-        PyErr_SetString(PyExc_TypeError, "keywords must be strings");
-        goto cleanup;
-    }
-    res = vc(func, newargs, nargs, kwnames);
-cleanup:
-    Py_DECREF(kwnames);
-    for (i = 0; i < nkw; i++)
-        Py_DECREF(kwvalues[i]);
-    PyMem_Free(newargs);
-    return res;
-}
-static CYTHON_INLINE PyObject *__Pyx_PyVectorcall_FastCallDict(PyObject *func, __pyx_vectorcallfunc vc, PyObject *const *args, size_t nargs, PyObject *kw)
-{
-    if (likely(kw == NULL) || PyDict_GET_SIZE(kw) == 0) {
-        return vc(func, args, nargs, NULL);
-    }
-    return __Pyx_PyVectorcall_FastCallDict_kw(func, vc, args, nargs, kw);
-}
-#endif
-
-/* CythonFunctionShared */
-static CYTHON_INLINE void __Pyx__CyFunction_SetClassObj(__pyx_CyFunctionObject* f, PyObject* classobj) {
-#if PY_VERSION_HEX < 0x030900B1 || CYTHON_COMPILING_IN_LIMITED_API
-    __Pyx_Py_XDECREF_SET(
-        __Pyx_CyFunction_GetClassObj(f),
-            ((classobj) ? __Pyx_NewRef(classobj) : NULL));
-#else
-    __Pyx_Py_XDECREF_SET(
-        ((PyCMethodObject *) (f))->mm_class,
-        (PyTypeObject*)((classobj) ? __Pyx_NewRef(classobj) : NULL));
-#endif
-}
-static PyObject *
-__Pyx_CyFunction_get_doc(__pyx_CyFunctionObject *op, void *closure)
-{
-    CYTHON_UNUSED_VAR(closure);
-    if (unlikely(op->func_doc == NULL)) {
-#if CYTHON_COMPILING_IN_LIMITED_API
-        op->func_doc = PyObject_GetAttrString(op->func, "__doc__");
-        if (unlikely(!op->func_doc)) return NULL;
-#else
-        if (((PyCFunctionObject*)op)->m_ml->ml_doc) {
-#if PY_MAJOR_VERSION >= 3
-            op->func_doc = PyUnicode_FromString(((PyCFunctionObject*)op)->m_ml->ml_doc);
-#else
-            op->func_doc = PyString_FromString(((PyCFunctionObject*)op)->m_ml->ml_doc);
-#endif
-            if (unlikely(op->func_doc == NULL))
-                return NULL;
-        } else {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-#endif
-    }
-    Py_INCREF(op->func_doc);
-    return op->func_doc;
-}
-static int
-__Pyx_CyFunction_set_doc(__pyx_CyFunctionObject *op, PyObject *value, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    if (value == NULL) {
-        value = Py_None;
-    }
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->func_doc, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_name(__pyx_CyFunctionObject *op, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(op->func_name == NULL)) {
-#if CYTHON_COMPILING_IN_LIMITED_API
-        op->func_name = PyObject_GetAttrString(op->func, "__name__");
-#elif PY_MAJOR_VERSION >= 3
-        op->func_name = PyUnicode_InternFromString(((PyCFunctionObject*)op)->m_ml->ml_name);
-#else
-        op->func_name = PyString_InternFromString(((PyCFunctionObject*)op)->m_ml->ml_name);
-#endif
-        if (unlikely(op->func_name == NULL))
-            return NULL;
-    }
-    Py_INCREF(op->func_name);
-    return op->func_name;
-}
-static int
-__Pyx_CyFunction_set_name(__pyx_CyFunctionObject *op, PyObject *value, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-#if PY_MAJOR_VERSION >= 3
-    if (unlikely(value == NULL || !PyUnicode_Check(value)))
-#else
-    if (unlikely(value == NULL || !PyString_Check(value)))
-#endif
-    {
-        PyErr_SetString(PyExc_TypeError,
-                        "__name__ must be set to a string object");
-        return -1;
-    }
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->func_name, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_qualname(__pyx_CyFunctionObject *op, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    Py_INCREF(op->func_qualname);
-    return op->func_qualname;
-}
-static int
-__Pyx_CyFunction_set_qualname(__pyx_CyFunctionObject *op, PyObject *value, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-#if PY_MAJOR_VERSION >= 3
-    if (unlikely(value == NULL || !PyUnicode_Check(value)))
-#else
-    if (unlikely(value == NULL || !PyString_Check(value)))
-#endif
-    {
-        PyErr_SetString(PyExc_TypeError,
-                        "__qualname__ must be set to a string object");
-        return -1;
-    }
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->func_qualname, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_dict(__pyx_CyFunctionObject *op, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(op->func_dict == NULL)) {
-        op->func_dict = PyDict_New();
-        if (unlikely(op->func_dict == NULL))
-            return NULL;
-    }
-    Py_INCREF(op->func_dict);
-    return op->func_dict;
-}
-static int
-__Pyx_CyFunction_set_dict(__pyx_CyFunctionObject *op, PyObject *value, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(value == NULL)) {
-        PyErr_SetString(PyExc_TypeError,
-               "function's dictionary may not be deleted");
-        return -1;
-    }
-    if (unlikely(!PyDict_Check(value))) {
-        PyErr_SetString(PyExc_TypeError,
-               "setting function's dictionary to a non-dict");
-        return -1;
-    }
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->func_dict, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_globals(__pyx_CyFunctionObject *op, void *context)
-{
-    CYTHON_UNUSED_VAR(context);
-    Py_INCREF(op->func_globals);
-    return op->func_globals;
-}
-static PyObject *
-__Pyx_CyFunction_get_closure(__pyx_CyFunctionObject *op, void *context)
-{
-    CYTHON_UNUSED_VAR(op);
-    CYTHON_UNUSED_VAR(context);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-static PyObject *
-__Pyx_CyFunction_get_code(__pyx_CyFunctionObject *op, void *context)
-{
-    PyObject* result = (op->func_code) ? op->func_code : Py_None;
-    CYTHON_UNUSED_VAR(context);
-    Py_INCREF(result);
-    return result;
-}
-static int
-__Pyx_CyFunction_init_defaults(__pyx_CyFunctionObject *op) {
-    int result = 0;
-    PyObject *res = op->defaults_getter((PyObject *) op);
-    if (unlikely(!res))
-        return -1;
-    #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-    op->defaults_tuple = PyTuple_GET_ITEM(res, 0);
-    Py_INCREF(op->defaults_tuple);
-    op->defaults_kwdict = PyTuple_GET_ITEM(res, 1);
-    Py_INCREF(op->defaults_kwdict);
-    #else
-    op->defaults_tuple = __Pyx_PySequence_ITEM(res, 0);
-    if (unlikely(!op->defaults_tuple)) result = -1;
-    else {
-        op->defaults_kwdict = __Pyx_PySequence_ITEM(res, 1);
-        if (unlikely(!op->defaults_kwdict)) result = -1;
-    }
-    #endif
-    Py_DECREF(res);
-    return result;
-}
-static int
-__Pyx_CyFunction_set_defaults(__pyx_CyFunctionObject *op, PyObject* value, void *context) {
-    CYTHON_UNUSED_VAR(context);
-    if (!value) {
-        value = Py_None;
-    } else if (unlikely(value != Py_None && !PyTuple_Check(value))) {
-        PyErr_SetString(PyExc_TypeError,
-                        "__defaults__ must be set to a tuple object");
-        return -1;
-    }
-    PyErr_WarnEx(PyExc_RuntimeWarning, "changes to cyfunction.__defaults__ will not "
-                 "currently affect the values used in function calls", 1);
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->defaults_tuple, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_defaults(__pyx_CyFunctionObject *op, void *context) {
-    PyObject* result = op->defaults_tuple;
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(!result)) {
-        if (op->defaults_getter) {
-            if (unlikely(__Pyx_CyFunction_init_defaults(op) < 0)) return NULL;
-            result = op->defaults_tuple;
-        } else {
-            result = Py_None;
-        }
-    }
-    Py_INCREF(result);
-    return result;
-}
-static int
-__Pyx_CyFunction_set_kwdefaults(__pyx_CyFunctionObject *op, PyObject* value, void *context) {
-    CYTHON_UNUSED_VAR(context);
-    if (!value) {
-        value = Py_None;
-    } else if (unlikely(value != Py_None && !PyDict_Check(value))) {
-        PyErr_SetString(PyExc_TypeError,
-                        "__kwdefaults__ must be set to a dict object");
-        return -1;
-    }
-    PyErr_WarnEx(PyExc_RuntimeWarning, "changes to cyfunction.__kwdefaults__ will not "
-                 "currently affect the values used in function calls", 1);
-    Py_INCREF(value);
-    __Pyx_Py_XDECREF_SET(op->defaults_kwdict, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_kwdefaults(__pyx_CyFunctionObject *op, void *context) {
-    PyObject* result = op->defaults_kwdict;
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(!result)) {
-        if (op->defaults_getter) {
-            if (unlikely(__Pyx_CyFunction_init_defaults(op) < 0)) return NULL;
-            result = op->defaults_kwdict;
-        } else {
-            result = Py_None;
-        }
-    }
-    Py_INCREF(result);
-    return result;
-}
-static int
-__Pyx_CyFunction_set_annotations(__pyx_CyFunctionObject *op, PyObject* value, void *context) {
-    CYTHON_UNUSED_VAR(context);
-    if (!value || value == Py_None) {
-        value = NULL;
-    } else if (unlikely(!PyDict_Check(value))) {
-        PyErr_SetString(PyExc_TypeError,
-                        "__annotations__ must be set to a dict object");
-        return -1;
-    }
-    Py_XINCREF(value);
-    __Pyx_Py_XDECREF_SET(op->func_annotations, value);
-    return 0;
-}
-static PyObject *
-__Pyx_CyFunction_get_annotations(__pyx_CyFunctionObject *op, void *context) {
-    PyObject* result = op->func_annotations;
-    CYTHON_UNUSED_VAR(context);
-    if (unlikely(!result)) {
-        result = PyDict_New();
-        if (unlikely(!result)) return NULL;
-        op->func_annotations = result;
-    }
-    Py_INCREF(result);
-    return result;
-}
-static PyObject *
-__Pyx_CyFunction_get_is_coroutine(__pyx_CyFunctionObject *op, void *context) {
-    int is_coroutine;
-    CYTHON_UNUSED_VAR(context);
-    if (op->func_is_coroutine) {
-        return __Pyx_NewRef(op->func_is_coroutine);
-    }
-    is_coroutine = op->flags & __Pyx_CYFUNCTION_COROUTINE;
-#if PY_VERSION_HEX >= 0x03050000
-    if (is_coroutine) {
-        PyObject *module, *fromlist, *marker = __pyx_n_s_is_coroutine;
-        fromlist = PyList_New(1);
-        if (unlikely(!fromlist)) return NULL;
-        Py_INCREF(marker);
-#if CYTHON_ASSUME_SAFE_MACROS
-        PyList_SET_ITEM(fromlist, 0, marker);
-#else
-        if (unlikely(PyList_SetItem(fromlist, 0, marker) < 0)) {
-            Py_DECREF(marker);
-            Py_DECREF(fromlist);
-            return NULL;
-        }
-#endif
-        module = PyImport_ImportModuleLevelObject(__pyx_n_s_asyncio_coroutines, NULL, NULL, fromlist, 0);
-        Py_DECREF(fromlist);
-        if (unlikely(!module)) goto ignore;
-        op->func_is_coroutine = __Pyx_PyObject_GetAttrStr(module, marker);
-        Py_DECREF(module);
-        if (likely(op->func_is_coroutine)) {
-            return __Pyx_NewRef(op->func_is_coroutine);
-        }
-ignore:
-        PyErr_Clear();
-    }
-#endif
-    op->func_is_coroutine = __Pyx_PyBool_FromLong(is_coroutine);
-    return __Pyx_NewRef(op->func_is_coroutine);
-}
-#if CYTHON_COMPILING_IN_LIMITED_API
-static PyObject *
-__Pyx_CyFunction_get_module(__pyx_CyFunctionObject *op, void *context) {
-    CYTHON_UNUSED_VAR(context);
-    return PyObject_GetAttrString(op->func, "__module__");
-}
-static int
-__Pyx_CyFunction_set_module(__pyx_CyFunctionObject *op, PyObject* value, void *context) {
-    CYTHON_UNUSED_VAR(context);
-    return PyObject_SetAttrString(op->func, "__module__", value);
-}
-#endif
-static PyGetSetDef __pyx_CyFunction_getsets[] = {
-    {(char *) "func_doc", (getter)__Pyx_CyFunction_get_doc, (setter)__Pyx_CyFunction_set_doc, 0, 0},
-    {(char *) "__doc__",  (getter)__Pyx_CyFunction_get_doc, (setter)__Pyx_CyFunction_set_doc, 0, 0},
-    {(char *) "func_name", (getter)__Pyx_CyFunction_get_name, (setter)__Pyx_CyFunction_set_name, 0, 0},
-    {(char *) "__name__", (getter)__Pyx_CyFunction_get_name, (setter)__Pyx_CyFunction_set_name, 0, 0},
-    {(char *) "__qualname__", (getter)__Pyx_CyFunction_get_qualname, (setter)__Pyx_CyFunction_set_qualname, 0, 0},
-    {(char *) "func_dict", (getter)__Pyx_CyFunction_get_dict, (setter)__Pyx_CyFunction_set_dict, 0, 0},
-    {(char *) "__dict__", (getter)__Pyx_CyFunction_get_dict, (setter)__Pyx_CyFunction_set_dict, 0, 0},
-    {(char *) "func_globals", (getter)__Pyx_CyFunction_get_globals, 0, 0, 0},
-    {(char *) "__globals__", (getter)__Pyx_CyFunction_get_globals, 0, 0, 0},
-    {(char *) "func_closure", (getter)__Pyx_CyFunction_get_closure, 0, 0, 0},
-    {(char *) "__closure__", (getter)__Pyx_CyFunction_get_closure, 0, 0, 0},
-    {(char *) "func_code", (getter)__Pyx_CyFunction_get_code, 0, 0, 0},
-    {(char *) "__code__", (getter)__Pyx_CyFunction_get_code, 0, 0, 0},
-    {(char *) "func_defaults", (getter)__Pyx_CyFunction_get_defaults, (setter)__Pyx_CyFunction_set_defaults, 0, 0},
-    {(char *) "__defaults__", (getter)__Pyx_CyFunction_get_defaults, (setter)__Pyx_CyFunction_set_defaults, 0, 0},
-    {(char *) "__kwdefaults__", (getter)__Pyx_CyFunction_get_kwdefaults, (setter)__Pyx_CyFunction_set_kwdefaults, 0, 0},
-    {(char *) "__annotations__", (getter)__Pyx_CyFunction_get_annotations, (setter)__Pyx_CyFunction_set_annotations, 0, 0},
-    {(char *) "_is_coroutine", (getter)__Pyx_CyFunction_get_is_coroutine, 0, 0, 0},
-#if CYTHON_COMPILING_IN_LIMITED_API
-    {"__module__", (getter)__Pyx_CyFunction_get_module, (setter)__Pyx_CyFunction_set_module, 0, 0},
-#endif
-    {0, 0, 0, 0, 0}
-};
-static PyMemberDef __pyx_CyFunction_members[] = {
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    {(char *) "__module__", T_OBJECT, offsetof(PyCFunctionObject, m_module), 0, 0},
-#endif
-#if CYTHON_USE_TYPE_SPECS
-    {(char *) "__dictoffset__", T_PYSSIZET, offsetof(__pyx_CyFunctionObject, func_dict), READONLY, 0},
-#if CYTHON_METH_FASTCALL
-#if CYTHON_BACKPORT_VECTORCALL
-    {(char *) "__vectorcalloffset__", T_PYSSIZET, offsetof(__pyx_CyFunctionObject, func_vectorcall), READONLY, 0},
-#else
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    {(char *) "__vectorcalloffset__", T_PYSSIZET, offsetof(PyCFunctionObject, vectorcall), READONLY, 0},
-#endif
-#endif
-#endif
-#if PY_VERSION_HEX < 0x030500A0 || CYTHON_COMPILING_IN_LIMITED_API
-    {(char *) "__weaklistoffset__", T_PYSSIZET, offsetof(__pyx_CyFunctionObject, func_weakreflist), READONLY, 0},
-#else
-    {(char *) "__weaklistoffset__", T_PYSSIZET, offsetof(PyCFunctionObject, m_weakreflist), READONLY, 0},
-#endif
-#endif
-    {0, 0, 0,  0, 0}
-};
-static PyObject *
-__Pyx_CyFunction_reduce(__pyx_CyFunctionObject *m, PyObject *args)
-{
-    CYTHON_UNUSED_VAR(args);
-#if PY_MAJOR_VERSION >= 3
-    Py_INCREF(m->func_qualname);
-    return m->func_qualname;
-#else
-    return PyString_FromString(((PyCFunctionObject*)m)->m_ml->ml_name);
-#endif
-}
-static PyMethodDef __pyx_CyFunction_methods[] = {
-    {"__reduce__", (PyCFunction)__Pyx_CyFunction_reduce, METH_VARARGS, 0},
-    {0, 0, 0, 0}
-};
-#if PY_VERSION_HEX < 0x030500A0 || CYTHON_COMPILING_IN_LIMITED_API
-#define __Pyx_CyFunction_weakreflist(cyfunc) ((cyfunc)->func_weakreflist)
-#else
-#define __Pyx_CyFunction_weakreflist(cyfunc) (((PyCFunctionObject*)cyfunc)->m_weakreflist)
-#endif
-static PyObject *__Pyx_CyFunction_Init(__pyx_CyFunctionObject *op, PyMethodDef *ml, int flags, PyObject* qualname,
-                                       PyObject *closure, PyObject *module, PyObject* globals, PyObject* code) {
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    PyCFunctionObject *cf = (PyCFunctionObject*) op;
-#endif
-    if (unlikely(op == NULL))
-        return NULL;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    op->func = PyCFunction_NewEx(ml, (PyObject*)op, module);
-    if (unlikely(!op->func)) return NULL;
-#endif
-    op->flags = flags;
-    __Pyx_CyFunction_weakreflist(op) = NULL;
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    cf->m_ml = ml;
-    cf->m_self = (PyObject *) op;
-#endif
-    Py_XINCREF(closure);
-    op->func_closure = closure;
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    Py_XINCREF(module);
-    cf->m_module = module;
-#endif
-    op->func_dict = NULL;
-    op->func_name = NULL;
-    Py_INCREF(qualname);
-    op->func_qualname = qualname;
-    op->func_doc = NULL;
-#if PY_VERSION_HEX < 0x030900B1 || CYTHON_COMPILING_IN_LIMITED_API
-    op->func_classobj = NULL;
-#else
-    ((PyCMethodObject*)op)->mm_class = NULL;
-#endif
-    op->func_globals = globals;
-    Py_INCREF(op->func_globals);
-    Py_XINCREF(code);
-    op->func_code = code;
-    op->defaults_pyobjects = 0;
-    op->defaults_size = 0;
-    op->defaults = NULL;
-    op->defaults_tuple = NULL;
-    op->defaults_kwdict = NULL;
-    op->defaults_getter = NULL;
-    op->func_annotations = NULL;
-    op->func_is_coroutine = NULL;
-#if CYTHON_METH_FASTCALL
-    switch (ml->ml_flags & (METH_VARARGS | METH_FASTCALL | METH_NOARGS | METH_O | METH_KEYWORDS | METH_METHOD)) {
-    case METH_NOARGS:
-        __Pyx_CyFunction_func_vectorcall(op) = __Pyx_CyFunction_Vectorcall_NOARGS;
-        break;
-    case METH_O:
-        __Pyx_CyFunction_func_vectorcall(op) = __Pyx_CyFunction_Vectorcall_O;
-        break;
-    case METH_METHOD | METH_FASTCALL | METH_KEYWORDS:
-        __Pyx_CyFunction_func_vectorcall(op) = __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD;
-        break;
-    case METH_FASTCALL | METH_KEYWORDS:
-        __Pyx_CyFunction_func_vectorcall(op) = __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS;
-        break;
-    case METH_VARARGS | METH_KEYWORDS:
-        __Pyx_CyFunction_func_vectorcall(op) = NULL;
-        break;
-    default:
-        PyErr_SetString(PyExc_SystemError, "Bad call flags for CyFunction");
-        Py_DECREF(op);
-        return NULL;
-    }
-#endif
-    return (PyObject *) op;
-}
-static int
-__Pyx_CyFunction_clear(__pyx_CyFunctionObject *m)
-{
-    Py_CLEAR(m->func_closure);
-#if CYTHON_COMPILING_IN_LIMITED_API
-    Py_CLEAR(m->func);
-#else
-    Py_CLEAR(((PyCFunctionObject*)m)->m_module);
-#endif
-    Py_CLEAR(m->func_dict);
-    Py_CLEAR(m->func_name);
-    Py_CLEAR(m->func_qualname);
-    Py_CLEAR(m->func_doc);
-    Py_CLEAR(m->func_globals);
-    Py_CLEAR(m->func_code);
-#if !CYTHON_COMPILING_IN_LIMITED_API
-#if PY_VERSION_HEX < 0x030900B1
-    Py_CLEAR(__Pyx_CyFunction_GetClassObj(m));
-#else
-    {
-        PyObject *cls = (PyObject*) ((PyCMethodObject *) (m))->mm_class;
-        ((PyCMethodObject *) (m))->mm_class = NULL;
-        Py_XDECREF(cls);
-    }
-#endif
-#endif
-    Py_CLEAR(m->defaults_tuple);
-    Py_CLEAR(m->defaults_kwdict);
-    Py_CLEAR(m->func_annotations);
-    Py_CLEAR(m->func_is_coroutine);
-    if (m->defaults) {
-        PyObject **pydefaults = __Pyx_CyFunction_Defaults(PyObject *, m);
-        int i;
-        for (i = 0; i < m->defaults_pyobjects; i++)
-            Py_XDECREF(pydefaults[i]);
-        PyObject_Free(m->defaults);
-        m->defaults = NULL;
-    }
-    return 0;
-}
-static void __Pyx__CyFunction_dealloc(__pyx_CyFunctionObject *m)
-{
-    if (__Pyx_CyFunction_weakreflist(m) != NULL)
-        PyObject_ClearWeakRefs((PyObject *) m);
-    __Pyx_CyFunction_clear(m);
-    __Pyx_PyHeapTypeObject_GC_Del(m);
-}
-static void __Pyx_CyFunction_dealloc(__pyx_CyFunctionObject *m)
-{
-    PyObject_GC_UnTrack(m);
-    __Pyx__CyFunction_dealloc(m);
-}
-static int __Pyx_CyFunction_traverse(__pyx_CyFunctionObject *m, visitproc visit, void *arg)
-{
-    Py_VISIT(m->func_closure);
-#if CYTHON_COMPILING_IN_LIMITED_API
-    Py_VISIT(m->func);
-#else
-    Py_VISIT(((PyCFunctionObject*)m)->m_module);
-#endif
-    Py_VISIT(m->func_dict);
-    Py_VISIT(m->func_name);
-    Py_VISIT(m->func_qualname);
-    Py_VISIT(m->func_doc);
-    Py_VISIT(m->func_globals);
-    Py_VISIT(m->func_code);
-#if !CYTHON_COMPILING_IN_LIMITED_API
-    Py_VISIT(__Pyx_CyFunction_GetClassObj(m));
-#endif
-    Py_VISIT(m->defaults_tuple);
-    Py_VISIT(m->defaults_kwdict);
-    Py_VISIT(m->func_is_coroutine);
-    if (m->defaults) {
-        PyObject **pydefaults = __Pyx_CyFunction_Defaults(PyObject *, m);
-        int i;
-        for (i = 0; i < m->defaults_pyobjects; i++)
-            Py_VISIT(pydefaults[i]);
-    }
-    return 0;
-}
-static PyObject*
-__Pyx_CyFunction_repr(__pyx_CyFunctionObject *op)
-{
-#if PY_MAJOR_VERSION >= 3
-    return PyUnicode_FromFormat("<cyfunction %U at %p>",
-                                op->func_qualname, (void *)op);
-#else
-    return PyString_FromFormat("<cyfunction %s at %p>",
-                               PyString_AsString(op->func_qualname), (void *)op);
-#endif
-}
-static PyObject * __Pyx_CyFunction_CallMethod(PyObject *func, PyObject *self, PyObject *arg, PyObject *kw) {
-#if CYTHON_COMPILING_IN_LIMITED_API
-    PyObject *f = ((__pyx_CyFunctionObject*)func)->func;
-    PyObject *py_name = NULL;
-    PyCFunction meth;
-    int flags;
-    meth = PyCFunction_GetFunction(f);
-    if (unlikely(!meth)) return NULL;
-    flags = PyCFunction_GetFlags(f);
-    if (unlikely(flags < 0)) return NULL;
-#else
-    PyCFunctionObject* f = (PyCFunctionObject*)func;
-    PyCFunction meth = f->m_ml->ml_meth;
-    int flags = f->m_ml->ml_flags;
-#endif
-    Py_ssize_t size;
-    switch (flags & (METH_VARARGS | METH_KEYWORDS | METH_NOARGS | METH_O)) {
-    case METH_VARARGS:
-        if (likely(kw == NULL || PyDict_Size(kw) == 0))
-            return (*meth)(self, arg);
-        break;
-    case METH_VARARGS | METH_KEYWORDS:
-        return (*(PyCFunctionWithKeywords)(void*)meth)(self, arg, kw);
-    case METH_NOARGS:
-        if (likely(kw == NULL || PyDict_Size(kw) == 0)) {
-#if CYTHON_ASSUME_SAFE_MACROS
-            size = PyTuple_GET_SIZE(arg);
-#else
-            size = PyTuple_Size(arg);
-            if (unlikely(size < 0)) return NULL;
-#endif
-            if (likely(size == 0))
-                return (*meth)(self, NULL);
-#if CYTHON_COMPILING_IN_LIMITED_API
-            py_name = __Pyx_CyFunction_get_name((__pyx_CyFunctionObject*)func, NULL);
-            if (!py_name) return NULL;
-            PyErr_Format(PyExc_TypeError,
-                "%.200S() takes no arguments (%" CYTHON_FORMAT_SSIZE_T "d given)",
-                py_name, size);
-            Py_DECREF(py_name);
-#else
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes no arguments (%" CYTHON_FORMAT_SSIZE_T "d given)",
-                f->m_ml->ml_name, size);
-#endif
-            return NULL;
-        }
-        break;
-    case METH_O:
-        if (likely(kw == NULL || PyDict_Size(kw) == 0)) {
-#if CYTHON_ASSUME_SAFE_MACROS
-            size = PyTuple_GET_SIZE(arg);
-#else
-            size = PyTuple_Size(arg);
-            if (unlikely(size < 0)) return NULL;
-#endif
-            if (likely(size == 1)) {
-                PyObject *result, *arg0;
-                #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
-                arg0 = PyTuple_GET_ITEM(arg, 0);
-                #else
-                arg0 = __Pyx_PySequence_ITEM(arg, 0); if (unlikely(!arg0)) return NULL;
-                #endif
-                result = (*meth)(self, arg0);
-                #if !(CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS)
-                Py_DECREF(arg0);
-                #endif
-                return result;
-            }
-#if CYTHON_COMPILING_IN_LIMITED_API
-            py_name = __Pyx_CyFunction_get_name((__pyx_CyFunctionObject*)func, NULL);
-            if (!py_name) return NULL;
-            PyErr_Format(PyExc_TypeError,
-                "%.200S() takes exactly one argument (%" CYTHON_FORMAT_SSIZE_T "d given)",
-                py_name, size);
-            Py_DECREF(py_name);
-#else
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes exactly one argument (%" CYTHON_FORMAT_SSIZE_T "d given)",
-                f->m_ml->ml_name, size);
-#endif
-            return NULL;
-        }
-        break;
-    default:
-        PyErr_SetString(PyExc_SystemError, "Bad call flags for CyFunction");
-        return NULL;
-    }
-#if CYTHON_COMPILING_IN_LIMITED_API
-    py_name = __Pyx_CyFunction_get_name((__pyx_CyFunctionObject*)func, NULL);
-    if (!py_name) return NULL;
-    PyErr_Format(PyExc_TypeError, "%.200S() takes no keyword arguments",
-                 py_name);
-    Py_DECREF(py_name);
-#else
-    PyErr_Format(PyExc_TypeError, "%.200s() takes no keyword arguments",
-                 f->m_ml->ml_name);
-#endif
-    return NULL;
-}
-static CYTHON_INLINE PyObject *__Pyx_CyFunction_Call(PyObject *func, PyObject *arg, PyObject *kw) {
-    PyObject *self, *result;
-#if CYTHON_COMPILING_IN_LIMITED_API
-    self = PyCFunction_GetSelf(((__pyx_CyFunctionObject*)func)->func);
-    if (unlikely(!self) && PyErr_Occurred()) return NULL;
-#else
-    self = ((PyCFunctionObject*)func)->m_self;
-#endif
-    result = __Pyx_CyFunction_CallMethod(func, self, arg, kw);
-    return result;
-}
-static PyObject *__Pyx_CyFunction_CallAsMethod(PyObject *func, PyObject *args, PyObject *kw) {
-    PyObject *result;
-    __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *) func;
-#if CYTHON_METH_FASTCALL
-     __pyx_vectorcallfunc vc = __Pyx_CyFunction_func_vectorcall(cyfunc);
-    if (vc) {
-#if CYTHON_ASSUME_SAFE_MACROS
-        return __Pyx_PyVectorcall_FastCallDict(func, vc, &PyTuple_GET_ITEM(args, 0), (size_t)PyTuple_GET_SIZE(args), kw);
-#else
-        (void) &__Pyx_PyVectorcall_FastCallDict;
-        return PyVectorcall_Call(func, args, kw);
-#endif
-    }
-#endif
-    if ((cyfunc->flags & __Pyx_CYFUNCTION_CCLASS) && !(cyfunc->flags & __Pyx_CYFUNCTION_STATICMETHOD)) {
-        Py_ssize_t argc;
-        PyObject *new_args;
-        PyObject *self;
-#if CYTHON_ASSUME_SAFE_MACROS
-        argc = PyTuple_GET_SIZE(args);
-#else
-        argc = PyTuple_Size(args);
-        if (unlikely(!argc) < 0) return NULL;
-#endif
-        new_args = PyTuple_GetSlice(args, 1, argc);
-        if (unlikely(!new_args))
-            return NULL;
-        self = PyTuple_GetItem(args, 0);
-        if (unlikely(!self)) {
-            Py_DECREF(new_args);
-#if PY_MAJOR_VERSION > 2
-            PyErr_Format(PyExc_TypeError,
-                         "unbound method %.200S() needs an argument",
-                         cyfunc->func_qualname);
-#else
-            PyErr_SetString(PyExc_TypeError,
-                            "unbound method needs an argument");
-#endif
-            return NULL;
-        }
-        result = __Pyx_CyFunction_CallMethod(func, self, new_args, kw);
-        Py_DECREF(new_args);
-    } else {
-        result = __Pyx_CyFunction_Call(func, args, kw);
-    }
-    return result;
-}
-#if CYTHON_METH_FASTCALL
-static CYTHON_INLINE int __Pyx_CyFunction_Vectorcall_CheckArgs(__pyx_CyFunctionObject *cyfunc, Py_ssize_t nargs, PyObject *kwnames)
-{
-    int ret = 0;
-    if ((cyfunc->flags & __Pyx_CYFUNCTION_CCLASS) && !(cyfunc->flags & __Pyx_CYFUNCTION_STATICMETHOD)) {
-        if (unlikely(nargs < 1)) {
-            PyErr_Format(PyExc_TypeError, "%.200s() needs an argument",
-                         ((PyCFunctionObject*)cyfunc)->m_ml->ml_name);
-            return -1;
-        }
-        ret = 1;
-    }
-    if (unlikely(kwnames) && unlikely(PyTuple_GET_SIZE(kwnames))) {
-        PyErr_Format(PyExc_TypeError,
-                     "%.200s() takes no keyword arguments", ((PyCFunctionObject*)cyfunc)->m_ml->ml_name);
-        return -1;
-    }
-    return ret;
-}
-static PyObject * __Pyx_CyFunction_Vectorcall_NOARGS(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
-{
-    __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *)func;
-    PyMethodDef* def = ((PyCFunctionObject*)cyfunc)->m_ml;
-#if CYTHON_BACKPORT_VECTORCALL
-    Py_ssize_t nargs = (Py_ssize_t)nargsf;
-#else
-    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-#endif
-    PyObject *self;
-    switch (__Pyx_CyFunction_Vectorcall_CheckArgs(cyfunc, nargs, kwnames)) {
-    case 1:
-        self = args[0];
-        args += 1;
-        nargs -= 1;
-        break;
-    case 0:
-        self = ((PyCFunctionObject*)cyfunc)->m_self;
-        break;
-    default:
-        return NULL;
-    }
-    if (unlikely(nargs != 0)) {
-        PyErr_Format(PyExc_TypeError,
-            "%.200s() takes no arguments (%" CYTHON_FORMAT_SSIZE_T "d given)",
-            def->ml_name, nargs);
-        return NULL;
-    }
-    return def->ml_meth(self, NULL);
-}
-static PyObject * __Pyx_CyFunction_Vectorcall_O(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
-{
-    __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *)func;
-    PyMethodDef* def = ((PyCFunctionObject*)cyfunc)->m_ml;
-#if CYTHON_BACKPORT_VECTORCALL
-    Py_ssize_t nargs = (Py_ssize_t)nargsf;
-#else
-    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-#endif
-    PyObject *self;
-    switch (__Pyx_CyFunction_Vectorcall_CheckArgs(cyfunc, nargs, kwnames)) {
-    case 1:
-        self = args[0];
-        args += 1;
-        nargs -= 1;
-        break;
-    case 0:
-        self = ((PyCFunctionObject*)cyfunc)->m_self;
-        break;
-    default:
-        return NULL;
-    }
-    if (unlikely(nargs != 1)) {
-        PyErr_Format(PyExc_TypeError,
-            "%.200s() takes exactly one argument (%" CYTHON_FORMAT_SSIZE_T "d given)",
-            def->ml_name, nargs);
-        return NULL;
-    }
-    return def->ml_meth(self, args[0]);
-}
-static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
-{
-    __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *)func;
-    PyMethodDef* def = ((PyCFunctionObject*)cyfunc)->m_ml;
-#if CYTHON_BACKPORT_VECTORCALL
-    Py_ssize_t nargs = (Py_ssize_t)nargsf;
-#else
-    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-#endif
-    PyObject *self;
-    switch (__Pyx_CyFunction_Vectorcall_CheckArgs(cyfunc, nargs, NULL)) {
-    case 1:
-        self = args[0];
-        args += 1;
-        nargs -= 1;
-        break;
-    case 0:
-        self = ((PyCFunctionObject*)cyfunc)->m_self;
-        break;
-    default:
-        return NULL;
-    }
-    return ((_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames);
-}
-static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
-{
-    __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *)func;
-    PyMethodDef* def = ((PyCFunctionObject*)cyfunc)->m_ml;
-    PyTypeObject *cls = (PyTypeObject *) __Pyx_CyFunction_GetClassObj(cyfunc);
-#if CYTHON_BACKPORT_VECTORCALL
-    Py_ssize_t nargs = (Py_ssize_t)nargsf;
-#else
-    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-#endif
-    PyObject *self;
-    switch (__Pyx_CyFunction_Vectorcall_CheckArgs(cyfunc, nargs, NULL)) {
-    case 1:
-        self = args[0];
-        args += 1;
-        nargs -= 1;
-        break;
-    case 0:
-        self = ((PyCFunctionObject*)cyfunc)->m_self;
-        break;
-    default:
-        return NULL;
-    }
-    return ((__Pyx_PyCMethod)(void(*)(void))def->ml_meth)(self, cls, args, (size_t)nargs, kwnames);
-}
-#endif
-#if CYTHON_USE_TYPE_SPECS
-static PyType_Slot __pyx_CyFunctionType_slots[] = {
-    {Py_tp_dealloc, (void *)__Pyx_CyFunction_dealloc},
-    {Py_tp_repr, (void *)__Pyx_CyFunction_repr},
-    {Py_tp_call, (void *)__Pyx_CyFunction_CallAsMethod},
-    {Py_tp_traverse, (void *)__Pyx_CyFunction_traverse},
-    {Py_tp_clear, (void *)__Pyx_CyFunction_clear},
-    {Py_tp_methods, (void *)__pyx_CyFunction_methods},
-    {Py_tp_members, (void *)__pyx_CyFunction_members},
-    {Py_tp_getset, (void *)__pyx_CyFunction_getsets},
-    {Py_tp_descr_get, (void *)__Pyx_PyMethod_New},
-    {0, 0},
-};
-static PyType_Spec __pyx_CyFunctionType_spec = {
-    __PYX_TYPE_MODULE_PREFIX "cython_function_or_method",
-    sizeof(__pyx_CyFunctionObject),
-    0,
-#ifdef Py_TPFLAGS_METHOD_DESCRIPTOR
-    Py_TPFLAGS_METHOD_DESCRIPTOR |
-#endif
-#if (defined(_Py_TPFLAGS_HAVE_VECTORCALL) && CYTHON_METH_FASTCALL)
-    _Py_TPFLAGS_HAVE_VECTORCALL |
-#endif
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE,
-    __pyx_CyFunctionType_slots
-};
-#else
-static PyTypeObject __pyx_CyFunctionType_type = {
-    PyVarObject_HEAD_INIT(0, 0)
-    __PYX_TYPE_MODULE_PREFIX "cython_function_or_method",
-    sizeof(__pyx_CyFunctionObject),
-    0,
-    (destructor) __Pyx_CyFunction_dealloc,
-#if !CYTHON_METH_FASTCALL
-    0,
-#elif CYTHON_BACKPORT_VECTORCALL
-    (printfunc)offsetof(__pyx_CyFunctionObject, func_vectorcall),
-#else
-    offsetof(PyCFunctionObject, vectorcall),
-#endif
-    0,
-    0,
-#if PY_MAJOR_VERSION < 3
-    0,
-#else
-    0,
-#endif
-    (reprfunc) __Pyx_CyFunction_repr,
-    0,
-    0,
-    0,
-    0,
-    __Pyx_CyFunction_CallAsMethod,
-    0,
-    0,
-    0,
-    0,
-#ifdef Py_TPFLAGS_METHOD_DESCRIPTOR
-    Py_TPFLAGS_METHOD_DESCRIPTOR |
-#endif
-#if defined(_Py_TPFLAGS_HAVE_VECTORCALL) && CYTHON_METH_FASTCALL
-    _Py_TPFLAGS_HAVE_VECTORCALL |
-#endif
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE,
-    0,
-    (traverseproc) __Pyx_CyFunction_traverse,
-    (inquiry) __Pyx_CyFunction_clear,
-    0,
-#if PY_VERSION_HEX < 0x030500A0
-    offsetof(__pyx_CyFunctionObject, func_weakreflist),
-#else
-    offsetof(PyCFunctionObject, m_weakreflist),
-#endif
-    0,
-    0,
-    __pyx_CyFunction_methods,
-    __pyx_CyFunction_members,
-    __pyx_CyFunction_getsets,
-    0,
-    0,
-    __Pyx_PyMethod_New,
-    0,
-    offsetof(__pyx_CyFunctionObject, func_dict),
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-#if PY_VERSION_HEX >= 0x030400a1
-    0,
-#endif
-#if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800)
-    0,
-#endif
-#if __PYX_NEED_TP_PRINT_SLOT
-    0,
-#endif
-#if PY_VERSION_HEX >= 0x030C0000
-    0,
-#endif
-#if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
-    0,
-#endif
-};
-#endif
-static int __pyx_CyFunction_init(PyObject *module) {
-#if CYTHON_USE_TYPE_SPECS
-    __pyx_CyFunctionType = __Pyx_FetchCommonTypeFromSpec(module, &__pyx_CyFunctionType_spec, NULL);
-#else
-    CYTHON_UNUSED_VAR(module);
-    __pyx_CyFunctionType = __Pyx_FetchCommonType(&__pyx_CyFunctionType_type);
-#endif
-    if (unlikely(__pyx_CyFunctionType == NULL)) {
-        return -1;
-    }
-    return 0;
-}
-static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *func, size_t size, int pyobjects) {
-    __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
-    m->defaults = PyObject_Malloc(size);
-    if (unlikely(!m->defaults))
-        return PyErr_NoMemory();
-    memset(m->defaults, 0, size);
-    m->defaults_pyobjects = pyobjects;
-    m->defaults_size = size;
-    return m->defaults;
-}
-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsTuple(PyObject *func, PyObject *tuple) {
-    __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
-    m->defaults_tuple = tuple;
-    Py_INCREF(tuple);
-}
-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsKwDict(PyObject *func, PyObject *dict) {
-    __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
-    m->defaults_kwdict = dict;
-    Py_INCREF(dict);
-}
-static CYTHON_INLINE void __Pyx_CyFunction_SetAnnotationsDict(PyObject *func, PyObject *dict) {
-    __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;
-    m->func_annotations = dict;
-    Py_INCREF(dict);
-}
-
-/* CythonFunction */
-static PyObject *__Pyx_CyFunction_New(PyMethodDef *ml, int flags, PyObject* qualname,
-                                      PyObject *closure, PyObject *module, PyObject* globals, PyObject* code) {
-    PyObject *op = __Pyx_CyFunction_Init(
-        PyObject_GC_New(__pyx_CyFunctionObject, __pyx_CyFunctionType),
-        ml, flags, qualname, closure, module, globals, code
-    );
-    if (likely(op)) {
-        PyObject_GC_Track(op);
-    }
-    return op;
-}
-
-/* CLineInTraceback */
-#ifndef CYTHON_CLINE_IN_TRACEBACK
-static int __Pyx_CLineForTraceback(PyThreadState *tstate, int c_line) {
-    PyObject *use_cline;
-    PyObject *ptype, *pvalue, *ptraceback;
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyObject **cython_runtime_dict;
-#endif
-    CYTHON_MAYBE_UNUSED_VAR(tstate);
-    if (unlikely(!__pyx_cython_runtime)) {
-        return c_line;
-    }
-    __Pyx_ErrFetchInState(tstate, &ptype, &pvalue, &ptraceback);
-#if CYTHON_COMPILING_IN_CPYTHON
-    cython_runtime_dict = _PyObject_GetDictPtr(__pyx_cython_runtime);
-    if (likely(cython_runtime_dict)) {
-        __PYX_PY_DICT_LOOKUP_IF_MODIFIED(
-            use_cline, *cython_runtime_dict,
-            __Pyx_PyDict_GetItemStr(*cython_runtime_dict, __pyx_n_s_cline_in_traceback))
-    } else
-#endif
-    {
-      PyObject *use_cline_obj = __Pyx_PyObject_GetAttrStrNoError(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback);
-      if (use_cline_obj) {
-        use_cline = PyObject_Not(use_cline_obj) ? Py_False : Py_True;
-        Py_DECREF(use_cline_obj);
-      } else {
-        PyErr_Clear();
-        use_cline = NULL;
-      }
-    }
-    if (!use_cline) {
-        c_line = 0;
-        (void) PyObject_SetAttr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback, Py_False);
-    }
-    else if (use_cline == Py_False || (use_cline != Py_True && PyObject_Not(use_cline) != 0)) {
-        c_line = 0;
-    }
-    __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback);
-    return c_line;
-}
-#endif
-
-/* CodeObjectCache */
-#if !CYTHON_COMPILING_IN_LIMITED_API
-static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line) {
-    int start = 0, mid = 0, end = count - 1;
-    if (end >= 0 && code_line > entries[end].code_line) {
-        return count;
-    }
-    while (start < end) {
-        mid = start + (end - start) / 2;
-        if (code_line < entries[mid].code_line) {
-            end = mid;
-        } else if (code_line > entries[mid].code_line) {
-             start = mid + 1;
-        } else {
-            return mid;
-        }
-    }
-    if (code_line <= entries[mid].code_line) {
-        return mid;
-    } else {
-        return mid + 1;
-    }
-}
-static PyCodeObject *__pyx_find_code_object(int code_line) {
-    PyCodeObject* code_object;
-    int pos;
-    if (unlikely(!code_line) || unlikely(!__pyx_code_cache.entries)) {
-        return NULL;
-    }
-    pos = __pyx_bisect_code_objects(__pyx_code_cache.entries, __pyx_code_cache.count, code_line);
-    if (unlikely(pos >= __pyx_code_cache.count) || unlikely(__pyx_code_cache.entries[pos].code_line != code_line)) {
-        return NULL;
-    }
-    code_object = __pyx_code_cache.entries[pos].code_object;
-    Py_INCREF(code_object);
-    return code_object;
-}
-static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
-    int pos, i;
-    __Pyx_CodeObjectCacheEntry* entries = __pyx_code_cache.entries;
-    if (unlikely(!code_line)) {
-        return;
-    }
-    if (unlikely(!entries)) {
-        entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Malloc(64*sizeof(__Pyx_CodeObjectCacheEntry));
-        if (likely(entries)) {
-            __pyx_code_cache.entries = entries;
-            __pyx_code_cache.max_count = 64;
-            __pyx_code_cache.count = 1;
-            entries[0].code_line = code_line;
-            entries[0].code_object = code_object;
-            Py_INCREF(code_object);
-        }
-        return;
-    }
-    pos = __pyx_bisect_code_objects(__pyx_code_cache.entries, __pyx_code_cache.count, code_line);
-    if ((pos < __pyx_code_cache.count) && unlikely(__pyx_code_cache.entries[pos].code_line == code_line)) {
-        PyCodeObject* tmp = entries[pos].code_object;
-        entries[pos].code_object = code_object;
-        Py_DECREF(tmp);
-        return;
-    }
-    if (__pyx_code_cache.count == __pyx_code_cache.max_count) {
-        int new_max = __pyx_code_cache.max_count + 64;
-        entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Realloc(
-            __pyx_code_cache.entries, ((size_t)new_max) * sizeof(__Pyx_CodeObjectCacheEntry));
-        if (unlikely(!entries)) {
-            return;
-        }
-        __pyx_code_cache.entries = entries;
-        __pyx_code_cache.max_count = new_max;
-    }
-    for (i=__pyx_code_cache.count; i>pos; i--) {
-        entries[i] = entries[i-1];
-    }
-    entries[pos].code_line = code_line;
-    entries[pos].code_object = code_object;
-    __pyx_code_cache.count++;
-    Py_INCREF(code_object);
-}
-#endif
-
-/* AddTraceback */
-#include "compile.h"
-#include "frameobject.h"
-#include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
-  #ifndef Py_BUILD_CORE
-    #define Py_BUILD_CORE 1
-  #endif
-  #include "internal/pycore_frame.h"
-#endif
-#if CYTHON_COMPILING_IN_LIMITED_API
-static PyObject *__Pyx_PyCode_Replace_For_AddTraceback(PyObject *code, PyObject *scratch_dict,
-                                                       PyObject *firstlineno, PyObject *name) {
-    PyObject *replace = NULL;
-    if (unlikely(PyDict_SetItemString(scratch_dict, "co_firstlineno", firstlineno))) return NULL;
-    if (unlikely(PyDict_SetItemString(scratch_dict, "co_name", name))) return NULL;
-    replace = PyObject_GetAttrString(code, "replace");
-    if (likely(replace)) {
-        PyObject *result;
-        result = PyObject_Call(replace, __pyx_empty_tuple, scratch_dict);
-        Py_DECREF(replace);
-        return result;
-    }
-    #if __PYX_LIMITED_VERSION_HEX < 0x030780000
-    PyErr_Clear();
-    {
-        PyObject *compiled = NULL, *result = NULL;
-        if (unlikely(PyDict_SetItemString(scratch_dict, "code", code))) return NULL;
-        if (unlikely(PyDict_SetItemString(scratch_dict, "type", (PyObject*)(&PyType_Type)))) return NULL;
-        compiled = Py_CompileString(
-            "out = type(code)(\n"
-            "  code.co_argcount, code.co_kwonlyargcount, code.co_nlocals, code.co_stacksize,\n"
-            "  code.co_flags, code.co_code, code.co_consts, code.co_names,\n"
-            "  code.co_varnames, code.co_filename, co_name, co_firstlineno,\n"
-            "  code.co_lnotab)\n", "<dummy>", Py_file_input);
-        if (!compiled) return NULL;
-        result = PyEval_EvalCode(compiled, scratch_dict, scratch_dict);
-        Py_DECREF(compiled);
-        if (!result) PyErr_Print();
-        Py_DECREF(result);
-        result = PyDict_GetItemString(scratch_dict, "out");
-        if (result) Py_INCREF(result);
-        return result;
-    }
-    #endif
-}
-static void __Pyx_AddTraceback(const char *funcname, int c_line,
-                               int py_line, const char *filename) {
-    PyObject *code_object = NULL, *py_py_line = NULL, *py_funcname = NULL, *dict = NULL;
-    PyObject *replace = NULL, *getframe = NULL, *frame = NULL;
-    PyObject *exc_type, *exc_value, *exc_traceback;
-    int success = 0;
-    if (c_line) {
-        (void) __pyx_cfilenm;
-        (void) __Pyx_CLineForTraceback(__Pyx_PyThreadState_Current, c_line);
-    }
-    PyErr_Fetch(&exc_type, &exc_value, &exc_traceback);
-    code_object = Py_CompileString("_getframe()", filename, Py_eval_input);
-    if (unlikely(!code_object)) goto bad;
-    py_py_line = PyLong_FromLong(py_line);
-    if (unlikely(!py_py_line)) goto bad;
-    py_funcname = PyUnicode_FromString(funcname);
-    if (unlikely(!py_funcname)) goto bad;
-    dict = PyDict_New();
-    if (unlikely(!dict)) goto bad;
-    {
-        PyObject *old_code_object = code_object;
-        code_object = __Pyx_PyCode_Replace_For_AddTraceback(code_object, dict, py_py_line, py_funcname);
-        Py_DECREF(old_code_object);
-    }
-    if (unlikely(!code_object)) goto bad;
-    getframe = PySys_GetObject("_getframe");
-    if (unlikely(!getframe)) goto bad;
-    if (unlikely(PyDict_SetItemString(dict, "_getframe", getframe))) goto bad;
-    frame = PyEval_EvalCode(code_object, dict, dict);
-    if (unlikely(!frame) || frame == Py_None) goto bad;
-    success = 1;
-  bad:
-    PyErr_Restore(exc_type, exc_value, exc_traceback);
-    Py_XDECREF(code_object);
-    Py_XDECREF(py_py_line);
-    Py_XDECREF(py_funcname);
-    Py_XDECREF(dict);
-    Py_XDECREF(replace);
-    if (success) {
-        PyTraceBack_Here(
-            (struct _frame*)frame);
-    }
-    Py_XDECREF(frame);
-}
-#else
-static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
-            const char *funcname, int c_line,
-            int py_line, const char *filename) {
-    PyCodeObject *py_code = NULL;
-    PyObject *py_funcname = NULL;
-    #if PY_MAJOR_VERSION < 3
-    PyObject *py_srcfile = NULL;
-    py_srcfile = PyString_FromString(filename);
-    if (!py_srcfile) goto bad;
-    #endif
-    if (c_line) {
-        #if PY_MAJOR_VERSION < 3
-        py_funcname = PyString_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line);
-        if (!py_funcname) goto bad;
-        #else
-        py_funcname = PyUnicode_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line);
-        if (!py_funcname) goto bad;
-        funcname = PyUnicode_AsUTF8(py_funcname);
-        if (!funcname) goto bad;
-        #endif
-    }
-    else {
-        #if PY_MAJOR_VERSION < 3
-        py_funcname = PyString_FromString(funcname);
-        if (!py_funcname) goto bad;
-        #endif
-    }
-    #if PY_MAJOR_VERSION < 3
-    py_code = __Pyx_PyCode_New(
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        __pyx_empty_bytes, /*PyObject *code,*/
-        __pyx_empty_tuple, /*PyObject *consts,*/
-        __pyx_empty_tuple, /*PyObject *names,*/
-        __pyx_empty_tuple, /*PyObject *varnames,*/
-        __pyx_empty_tuple, /*PyObject *freevars,*/
-        __pyx_empty_tuple, /*PyObject *cellvars,*/
-        py_srcfile,   /*PyObject *filename,*/
-        py_funcname,  /*PyObject *name,*/
-        py_line,
-        __pyx_empty_bytes  /*PyObject *lnotab*/
-    );
-    Py_DECREF(py_srcfile);
-    #else
-    py_code = PyCode_NewEmpty(filename, funcname, py_line);
-    #endif
-    Py_XDECREF(py_funcname);  // XDECREF since it's only set on Py3 if cline
-    return py_code;
-bad:
-    Py_XDECREF(py_funcname);
-    #if PY_MAJOR_VERSION < 3
-    Py_XDECREF(py_srcfile);
-    #endif
-    return NULL;
-}
-static void __Pyx_AddTraceback(const char *funcname, int c_line,
-                               int py_line, const char *filename) {
-    PyCodeObject *py_code = 0;
-    PyFrameObject *py_frame = 0;
-    PyThreadState *tstate = __Pyx_PyThreadState_Current;
-    PyObject *ptype, *pvalue, *ptraceback;
-    if (c_line) {
-        c_line = __Pyx_CLineForTraceback(tstate, c_line);
-    }
-    py_code = __pyx_find_code_object(c_line ? -c_line : py_line);
-    if (!py_code) {
-        __Pyx_ErrFetchInState(tstate, &ptype, &pvalue, &ptraceback);
-        py_code = __Pyx_CreateCodeObjectForTraceback(
-            funcname, c_line, py_line, filename);
-        if (!py_code) {
-            /* If the code object creation fails, then we should clear the
-               fetched exception references and propagate the new exception */
-            Py_XDECREF(ptype);
-            Py_XDECREF(pvalue);
-            Py_XDECREF(ptraceback);
-            goto bad;
-        }
-        __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback);
-        __pyx_insert_code_object(c_line ? -c_line : py_line, py_code);
-    }
-    py_frame = PyFrame_New(
-        tstate,            /*PyThreadState *tstate,*/
-        py_code,           /*PyCodeObject *code,*/
-        __pyx_d,    /*PyObject *globals,*/
-        0                  /*PyObject *locals*/
-    );
-    if (!py_frame) goto bad;
-    __Pyx_PyFrame_SetLineNumber(py_frame, py_line);
-    PyTraceBack_Here(py_frame);
-bad:
-    Py_XDECREF(py_code);
-    Py_XDECREF(py_frame);
-}
-#endif
-
-/* CIntFromPyVerify */
-#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\
-    __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0)
-#define __PYX_VERIFY_RETURN_INT_EXC(target_type, func_type, func_value)\
-    __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 1)
-#define __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, exc)\
-    {\
-        func_type value = func_value;\
-        if (sizeof(target_type) < sizeof(func_type)) {\
-            if (unlikely(value != (func_type) (target_type) value)) {\
-                func_type zero = 0;\
-                if (exc && unlikely(value == (func_type)-1 && PyErr_Occurred()))\
-                    return (target_type) -1;\
-                if (is_unsigned && unlikely(value < zero))\
-                    goto raise_neg_overflow;\
-                else\
-                    goto raise_overflow;\
-            }\
-        }\
-        return (target_type) value;\
-    }
-
-/* CIntFromPy */
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_As_PY_LONG_LONG(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const PY_LONG_LONG neg_one = (PY_LONG_LONG) -1, const_zero = (PY_LONG_LONG) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(PY_LONG_LONG) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (PY_LONG_LONG) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(PY_LONG_LONG) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) >= 2 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((((PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(PY_LONG_LONG) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) >= 3 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((((((PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(PY_LONG_LONG) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) >= 4 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((((((((PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (PY_LONG_LONG) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(PY_LONG_LONG) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(PY_LONG_LONG, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(PY_LONG_LONG) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(PY_LONG_LONG, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(PY_LONG_LONG) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((PY_LONG_LONG)-1)*(((((PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(PY_LONG_LONG) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) ((((((PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((PY_LONG_LONG)-1)*(((((((PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(PY_LONG_LONG) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) ((((((((PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) (((PY_LONG_LONG)-1)*(((((((((PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(PY_LONG_LONG) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(PY_LONG_LONG, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT)) {
-                                return (PY_LONG_LONG) ((((((((((PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(PY_LONG_LONG) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(PY_LONG_LONG, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(PY_LONG_LONG) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(PY_LONG_LONG, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            PY_LONG_LONG val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (PY_LONG_LONG) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (PY_LONG_LONG) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (PY_LONG_LONG) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (PY_LONG_LONG) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (PY_LONG_LONG) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(PY_LONG_LONG) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((PY_LONG_LONG) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(PY_LONG_LONG) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((PY_LONG_LONG) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((PY_LONG_LONG) 1) << (sizeof(PY_LONG_LONG) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (PY_LONG_LONG) -1;
-        }
-    } else {
-        PY_LONG_LONG val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (PY_LONG_LONG) -1;
-        val = __Pyx_PyInt_As_PY_LONG_LONG(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to PY_LONG_LONG");
-    return (PY_LONG_LONG) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to PY_LONG_LONG");
-    return (PY_LONG_LONG) -1;
-}
-
-/* CIntFromPy */
-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const int neg_one = (int) -1, const_zero = (int) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(int) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (int) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 2 * PyLong_SHIFT)) {
-                                return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 3 * PyLong_SHIFT)) {
-                                return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) >= 4 * PyLong_SHIFT)) {
-                                return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (int) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(int) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(int) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(int) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                                return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                                return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
-                                return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) {
-                                return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(int) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(int) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            int val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (int) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (int) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (int) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (int) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (int) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(int) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((int) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(int) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((int) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((int) 1) << (sizeof(int) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (int) -1;
-        }
-    } else {
-        int val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (int) -1;
-        val = __Pyx_PyInt_As_int(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to int");
-    return (int) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to int");
-    return (int) -1;
-}
-
-/* CIntToPy */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const int neg_one = (int) -1, const_zero = (int) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-    if (is_unsigned) {
-        if (sizeof(int) < sizeof(long)) {
-            return PyInt_FromLong((long) value);
-        } else if (sizeof(int) <= sizeof(unsigned long)) {
-            return PyLong_FromUnsignedLong((unsigned long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {
-            return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);
-#endif
-        }
-    } else {
-        if (sizeof(int) <= sizeof(long)) {
-            return PyInt_FromLong((long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {
-            return PyLong_FromLongLong((PY_LONG_LONG) value);
-#endif
-        }
-    }
-    {
-        int one = 1; int little = (int)*(unsigned char *)&one;
-        unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API
-        return _PyLong_FromByteArray(bytes, sizeof(int),
-                                     little, !is_unsigned);
-#else
-        PyObject *from_bytes, *result = NULL;
-        PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
-        if (!from_bytes) return NULL;
-        py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(int));
-        if (!py_bytes) goto limited_bad;
-        order_str = PyUnicode_FromString(little ? "little" : "big");
-        if (!order_str) goto limited_bad;
-        arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
-        if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
-        result = PyObject_Call(from_bytes, arg_tuple, kwds);
-        limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
-        Py_XDECREF(kwds);
-        return result;
-#endif
-    }
-}
-
-/* CIntFromPy */
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_As_unsigned_PY_LONG_LONG(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG) -1, const_zero = (unsigned PY_LONG_LONG) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(unsigned PY_LONG_LONG) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (unsigned PY_LONG_LONG) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) >= 2 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) >= 3 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) >= 4 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (unsigned PY_LONG_LONG) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(unsigned PY_LONG_LONG) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned PY_LONG_LONG, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(unsigned PY_LONG_LONG) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned PY_LONG_LONG, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((unsigned PY_LONG_LONG)-1)*(((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) ((((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((unsigned PY_LONG_LONG)-1)*(((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) ((((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) (((unsigned PY_LONG_LONG)-1)*(((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(unsigned PY_LONG_LONG) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned PY_LONG_LONG, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT)) {
-                                return (unsigned PY_LONG_LONG) ((((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(unsigned PY_LONG_LONG) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned PY_LONG_LONG, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(unsigned PY_LONG_LONG) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned PY_LONG_LONG, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            unsigned PY_LONG_LONG val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (unsigned PY_LONG_LONG) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (unsigned PY_LONG_LONG) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (unsigned PY_LONG_LONG) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (unsigned PY_LONG_LONG) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (unsigned PY_LONG_LONG) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(unsigned PY_LONG_LONG) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((unsigned PY_LONG_LONG) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(unsigned PY_LONG_LONG) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((unsigned PY_LONG_LONG) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((unsigned PY_LONG_LONG) 1) << (sizeof(unsigned PY_LONG_LONG) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (unsigned PY_LONG_LONG) -1;
-        }
-    } else {
-        unsigned PY_LONG_LONG val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (unsigned PY_LONG_LONG) -1;
-        val = __Pyx_PyInt_As_unsigned_PY_LONG_LONG(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to unsigned PY_LONG_LONG");
-    return (unsigned PY_LONG_LONG) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to unsigned PY_LONG_LONG");
-    return (unsigned PY_LONG_LONG) -1;
-}
-
-/* CIntFromPy */
-static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const long neg_one = (long) -1, const_zero = (long) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(long) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(long, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (long) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 2 * PyLong_SHIFT)) {
-                                return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 3 * PyLong_SHIFT)) {
-                                return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) >= 4 * PyLong_SHIFT)) {
-                                return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (long) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(long) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(long) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(long) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(long) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(long) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            long val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (long) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (long) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (long) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (long) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (long) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(long) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((long) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(long) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((long) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((long) 1) << (sizeof(long) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (long) -1;
-        }
-    } else {
-        long val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (long) -1;
-        val = __Pyx_PyInt_As_long(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to long");
-    return (long) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to long");
-    return (long) -1;
-}
-
-/* CIntFromPy */
-static CYTHON_INLINE unsigned long __Pyx_PyInt_As_unsigned_long(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const unsigned long neg_one = (unsigned long) -1, const_zero = (unsigned long) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(unsigned long) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(unsigned long, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (unsigned long) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(unsigned long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(unsigned long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) >= 2 * PyLong_SHIFT)) {
-                                return (unsigned long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) >= 3 * PyLong_SHIFT)) {
-                                return (unsigned long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) >= 4 * PyLong_SHIFT)) {
-                                return (unsigned long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (unsigned long) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(unsigned long) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned long, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(unsigned long) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(unsigned long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(unsigned long) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (unsigned long) (((unsigned long)-1)*(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(unsigned long) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 2 * PyLong_SHIFT)) {
-                                return (unsigned long) ((((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(unsigned long) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (unsigned long) (((unsigned long)-1)*(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 3 * PyLong_SHIFT)) {
-                                return (unsigned long) ((((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(unsigned long) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (unsigned long) (((unsigned long)-1)*(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(unsigned long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(unsigned long) - 1 > 4 * PyLong_SHIFT)) {
-                                return (unsigned long) ((((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(unsigned long) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned long, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(unsigned long) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(unsigned long, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            unsigned long val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (unsigned long) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (unsigned long) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (unsigned long) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (unsigned long) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (unsigned long) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(unsigned long) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((unsigned long) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(unsigned long) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((unsigned long) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((unsigned long) 1) << (sizeof(unsigned long) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (unsigned long) -1;
-        }
-    } else {
-        unsigned long val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (unsigned long) -1;
-        val = __Pyx_PyInt_As_unsigned_long(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to unsigned long");
-    return (unsigned long) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to unsigned long");
-    return (unsigned long) -1;
-}
-
-/* CIntFromPy */
-static CYTHON_INLINE char __Pyx_PyInt_As_char(PyObject *x) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const char neg_one = (char) -1, const_zero = (char) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        if ((sizeof(char) < sizeof(long))) {
-            __PYX_VERIFY_RETURN_INT(char, long, PyInt_AS_LONG(x))
-        } else {
-            long val = PyInt_AS_LONG(x);
-            if (is_unsigned && unlikely(val < 0)) {
-                goto raise_neg_overflow;
-            }
-            return (char) val;
-        }
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (unlikely(__Pyx_PyLong_IsNeg(x))) {
-                goto raise_neg_overflow;
-            } else if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(char, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_DigitCount(x)) {
-                    case 2:
-                        if ((8 * sizeof(char) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) >= 2 * PyLong_SHIFT)) {
-                                return (char) (((((char)digits[1]) << PyLong_SHIFT) | (char)digits[0]));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(char) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) >= 3 * PyLong_SHIFT)) {
-                                return (char) (((((((char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0]));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(char) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) >= 4 * PyLong_SHIFT)) {
-                                return (char) (((((((((char)digits[3]) << PyLong_SHIFT) | (char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0]));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7
-            if (unlikely(Py_SIZE(x) < 0)) {
-                goto raise_neg_overflow;
-            }
-#else
-            {
-                int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                if (unlikely(result < 0))
-                    return (char) -1;
-                if (unlikely(result == 1))
-                    goto raise_neg_overflow;
-            }
-#endif
-            if ((sizeof(char) <= sizeof(unsigned long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(char, unsigned long, PyLong_AsUnsignedLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(char) <= sizeof(unsigned PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(char, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
-#endif
-            }
-        } else {
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (__Pyx_PyLong_IsCompact(x)) {
-                __PYX_VERIFY_RETURN_INT(char, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x))
-            } else {
-                const digit* digits = __Pyx_PyLong_Digits(x);
-                assert(__Pyx_PyLong_DigitCount(x) > 1);
-                switch (__Pyx_PyLong_SignedDigitCount(x)) {
-                    case -2:
-                        if ((8 * sizeof(char) - 1 > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 2 * PyLong_SHIFT)) {
-                                return (char) (((char)-1)*(((((char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                    case 2:
-                        if ((8 * sizeof(char) > 1 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 2 * PyLong_SHIFT)) {
-                                return (char) ((((((char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                    case -3:
-                        if ((8 * sizeof(char) - 1 > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 3 * PyLong_SHIFT)) {
-                                return (char) (((char)-1)*(((((((char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                    case 3:
-                        if ((8 * sizeof(char) > 2 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 3 * PyLong_SHIFT)) {
-                                return (char) ((((((((char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                    case -4:
-                        if ((8 * sizeof(char) - 1 > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 4 * PyLong_SHIFT)) {
-                                return (char) (((char)-1)*(((((((((char)digits[3]) << PyLong_SHIFT) | (char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                    case 4:
-                        if ((8 * sizeof(char) > 3 * PyLong_SHIFT)) {
-                            if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) {
-                                __PYX_VERIFY_RETURN_INT(char, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
-                            } else if ((8 * sizeof(char) - 1 > 4 * PyLong_SHIFT)) {
-                                return (char) ((((((((((char)digits[3]) << PyLong_SHIFT) | (char)digits[2]) << PyLong_SHIFT) | (char)digits[1]) << PyLong_SHIFT) | (char)digits[0])));
-                            }
-                        }
-                        break;
-                }
-            }
-#endif
-            if ((sizeof(char) <= sizeof(long))) {
-                __PYX_VERIFY_RETURN_INT_EXC(char, long, PyLong_AsLong(x))
-#ifdef HAVE_LONG_LONG
-            } else if ((sizeof(char) <= sizeof(PY_LONG_LONG))) {
-                __PYX_VERIFY_RETURN_INT_EXC(char, PY_LONG_LONG, PyLong_AsLongLong(x))
-#endif
-            }
-        }
-        {
-            char val;
-            PyObject *v = __Pyx_PyNumber_IntOrLong(x);
-#if PY_MAJOR_VERSION < 3
-            if (likely(v) && !PyLong_Check(v)) {
-                PyObject *tmp = v;
-                v = PyNumber_Long(tmp);
-                Py_DECREF(tmp);
-            }
-#endif
-            if (likely(v)) {
-                int ret = -1;
-#if !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray)
-                int one = 1; int is_little = (int)*(unsigned char *)&one;
-                unsigned char *bytes = (unsigned char *)&val;
-                ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                           bytes, sizeof(val),
-                                           is_little, !is_unsigned);
-#else
-                PyObject *stepval = NULL, *mask = NULL, *shift = NULL;
-                int bits, remaining_bits, is_negative = 0;
-                long idigit;
-                int chunk_size = (sizeof(long) < 8) ? 30 : 62;
-                if (unlikely(!PyLong_CheckExact(v))) {
-                    PyObject *tmp = v;
-                    v = PyNumber_Long(v);
-                    assert(PyLong_CheckExact(v));
-                    Py_DECREF(tmp);
-                    if (unlikely(!v)) return (char) -1;
-                }
-#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                if (Py_SIZE(x) == 0)
-                    return (char) 0;
-                is_negative = Py_SIZE(x) < 0;
-#else
-                {
-                    int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
-                    if (unlikely(result < 0))
-                        return (char) -1;
-                    is_negative = result == 1;
-                }
-#endif
-                if (is_unsigned && unlikely(is_negative)) {
-                    goto raise_neg_overflow;
-                } else if (is_negative) {
-                    stepval = PyNumber_Invert(v);
-                    if (unlikely(!stepval))
-                        return (char) -1;
-                } else {
-                    stepval = __Pyx_NewRef(v);
-                }
-                val = (char) 0;
-                mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done;
-                shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done;
-                for (bits = 0; bits < (int) sizeof(char) * 8 - chunk_size; bits += chunk_size) {
-                    PyObject *tmp, *digit;
-                    digit = PyNumber_And(stepval, mask);
-                    if (unlikely(!digit)) goto done;
-                    idigit = PyLong_AsLong(digit);
-                    Py_DECREF(digit);
-                    if (unlikely(idigit < 0)) goto done;
-                    tmp = PyNumber_Rshift(stepval, shift);
-                    if (unlikely(!tmp)) goto done;
-                    Py_DECREF(stepval); stepval = tmp;
-                    val |= ((char) idigit) << bits;
-                    #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-                    if (Py_SIZE(stepval) == 0)
-                        goto unpacking_done;
-                    #endif
-                }
-                idigit = PyLong_AsLong(stepval);
-                if (unlikely(idigit < 0)) goto done;
-                remaining_bits = ((int) sizeof(char) * 8) - bits - (is_unsigned ? 0 : 1);
-                if (unlikely(idigit >= (1L << remaining_bits)))
-                    goto raise_overflow;
-                val |= ((char) idigit) << bits;
-            #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000
-            unpacking_done:
-            #endif
-                if (!is_unsigned) {
-                    if (unlikely(val & (((char) 1) << (sizeof(char) * 8 - 1))))
-                        goto raise_overflow;
-                    if (is_negative)
-                        val = ~val;
-                }
-                ret = 0;
-            done:
-                Py_XDECREF(shift);
-                Py_XDECREF(mask);
-                Py_XDECREF(stepval);
-#endif
-                Py_DECREF(v);
-                if (likely(!ret))
-                    return val;
-            }
-            return (char) -1;
-        }
-    } else {
-        char val;
-        PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
-        if (!tmp) return (char) -1;
-        val = __Pyx_PyInt_As_char(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-raise_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "value too large to convert to char");
-    return (char) -1;
-raise_neg_overflow:
-    PyErr_SetString(PyExc_OverflowError,
-        "can't convert negative value to char");
-    return (char) -1;
-}
-
-/* CIntToPy */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint64_t(uint64_t value) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const uint64_t neg_one = (uint64_t) -1, const_zero = (uint64_t) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-    if (is_unsigned) {
-        if (sizeof(uint64_t) < sizeof(long)) {
-            return PyInt_FromLong((long) value);
-        } else if (sizeof(uint64_t) <= sizeof(unsigned long)) {
-            return PyLong_FromUnsignedLong((unsigned long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(uint64_t) <= sizeof(unsigned PY_LONG_LONG)) {
-            return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);
-#endif
-        }
-    } else {
-        if (sizeof(uint64_t) <= sizeof(long)) {
-            return PyInt_FromLong((long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(uint64_t) <= sizeof(PY_LONG_LONG)) {
-            return PyLong_FromLongLong((PY_LONG_LONG) value);
-#endif
-        }
-    }
-    {
-        int one = 1; int little = (int)*(unsigned char *)&one;
-        unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API
-        return _PyLong_FromByteArray(bytes, sizeof(uint64_t),
-                                     little, !is_unsigned);
-#else
-        PyObject *from_bytes, *result = NULL;
-        PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
-        if (!from_bytes) return NULL;
-        py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(uint64_t));
-        if (!py_bytes) goto limited_bad;
-        order_str = PyUnicode_FromString(little ? "little" : "big");
-        if (!order_str) goto limited_bad;
-        arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
-        if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
-        result = PyObject_Call(from_bytes, arg_tuple, kwds);
-        limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
-        Py_XDECREF(kwds);
-        return result;
-#endif
-    }
-}
-
-/* FormatTypeName */
-#if CYTHON_COMPILING_IN_LIMITED_API
-static __Pyx_TypeName
-__Pyx_PyType_GetName(PyTypeObject* tp)
-{
-    PyObject *name = __Pyx_PyObject_GetAttrStr((PyObject *)tp,
-                                               __pyx_n_s_name);
-    if (unlikely(name == NULL) || unlikely(!PyUnicode_Check(name))) {
-        PyErr_Clear();
-        Py_XDECREF(name);
-        name = __Pyx_NewRef(__pyx_n_s__62);
-    }
-    return name;
-}
-#endif
-
-/* CIntToPy */
-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    const long neg_one = (long) -1, const_zero = (long) 0;
-#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
-#pragma GCC diagnostic pop
-#endif
-    const int is_unsigned = neg_one > const_zero;
-    if (is_unsigned) {
-        if (sizeof(long) < sizeof(long)) {
-            return PyInt_FromLong((long) value);
-        } else if (sizeof(long) <= sizeof(unsigned long)) {
-            return PyLong_FromUnsignedLong((unsigned long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(long) <= sizeof(unsigned PY_LONG_LONG)) {
-            return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);
-#endif
-        }
-    } else {
-        if (sizeof(long) <= sizeof(long)) {
-            return PyInt_FromLong((long) value);
-#ifdef HAVE_LONG_LONG
-        } else if (sizeof(long) <= sizeof(PY_LONG_LONG)) {
-            return PyLong_FromLongLong((PY_LONG_LONG) value);
-#endif
-        }
-    }
-    {
-        int one = 1; int little = (int)*(unsigned char *)&one;
-        unsigned char *bytes = (unsigned char *)&value;
-#if !CYTHON_COMPILING_IN_LIMITED_API
-        return _PyLong_FromByteArray(bytes, sizeof(long),
-                                     little, !is_unsigned);
-#else
-        PyObject *from_bytes, *result = NULL;
-        PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL;
-        from_bytes = PyObject_GetAttrString((PyObject*)&PyInt_Type, "from_bytes");
-        if (!from_bytes) return NULL;
-        py_bytes = PyBytes_FromStringAndSize((char*)bytes, sizeof(long));
-        if (!py_bytes) goto limited_bad;
-        order_str = PyUnicode_FromString(little ? "little" : "big");
-        if (!order_str) goto limited_bad;
-        arg_tuple = PyTuple_Pack(2, py_bytes, order_str);
-        if (!arg_tuple) goto limited_bad;
-        kwds = PyDict_New();
-        if (!kwds) goto limited_bad;
-        if (PyDict_SetItemString(kwds, "signed", __Pyx_NewRef(!is_unsigned ? Py_True : Py_False))) goto limited_bad;
-        result = PyObject_Call(from_bytes, arg_tuple, kwds);
-        limited_bad:
-        Py_XDECREF(from_bytes);
-        Py_XDECREF(py_bytes);
-        Py_XDECREF(order_str);
-        Py_XDECREF(arg_tuple);
-        Py_XDECREF(kwds);
-        return result;
-#endif
-    }
-}
-
-/* FastTypeChecks */
-#if CYTHON_COMPILING_IN_CPYTHON
-static int __Pyx_InBases(PyTypeObject *a, PyTypeObject *b) {
-    while (a) {
-        a = __Pyx_PyType_GetSlot(a, tp_base, PyTypeObject*);
-        if (a == b)
-            return 1;
-    }
-    return b == &PyBaseObject_Type;
-}
-static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
-    PyObject *mro;
-    if (a == b) return 1;
-    mro = a->tp_mro;
-    if (likely(mro)) {
-        Py_ssize_t i, n;
-        n = PyTuple_GET_SIZE(mro);
-        for (i = 0; i < n; i++) {
-            if (PyTuple_GET_ITEM(mro, i) == (PyObject *)b)
-                return 1;
-        }
-        return 0;
-    }
-    return __Pyx_InBases(a, b);
-}
-static CYTHON_INLINE int __Pyx_IsAnySubtype2(PyTypeObject *cls, PyTypeObject *a, PyTypeObject *b) {
-    PyObject *mro;
-    if (cls == a || cls == b) return 1;
-    mro = cls->tp_mro;
-    if (likely(mro)) {
-        Py_ssize_t i, n;
-        n = PyTuple_GET_SIZE(mro);
-        for (i = 0; i < n; i++) {
-            PyObject *base = PyTuple_GET_ITEM(mro, i);
-            if (base == (PyObject *)a || base == (PyObject *)b)
-                return 1;
-        }
-        return 0;
-    }
-    return __Pyx_InBases(cls, a) || __Pyx_InBases(cls, b);
-}
-#if PY_MAJOR_VERSION == 2
-static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject* exc_type2) {
-    PyObject *exception, *value, *tb;
-    int res;
-    __Pyx_PyThreadState_declare
-    __Pyx_PyThreadState_assign
-    __Pyx_ErrFetch(&exception, &value, &tb);
-    res = exc_type1 ? PyObject_IsSubclass(err, exc_type1) : 0;
-    if (unlikely(res == -1)) {
-        PyErr_WriteUnraisable(err);
-        res = 0;
-    }
-    if (!res) {
-        res = PyObject_IsSubclass(err, exc_type2);
-        if (unlikely(res == -1)) {
-            PyErr_WriteUnraisable(err);
-            res = 0;
-        }
-    }
-    __Pyx_ErrRestore(exception, value, tb);
-    return res;
-}
-#else
-static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject *exc_type2) {
-    if (exc_type1) {
-        return __Pyx_IsAnySubtype2((PyTypeObject*)err, (PyTypeObject*)exc_type1, (PyTypeObject*)exc_type2);
-    } else {
-        return __Pyx_IsSubtype((PyTypeObject*)err, (PyTypeObject*)exc_type2);
-    }
-}
-#endif
-static int __Pyx_PyErr_GivenExceptionMatchesTuple(PyObject *exc_type, PyObject *tuple) {
-    Py_ssize_t i, n;
-    assert(PyExceptionClass_Check(exc_type));
-    n = PyTuple_GET_SIZE(tuple);
-#if PY_MAJOR_VERSION >= 3
-    for (i=0; i<n; i++) {
-        if (exc_type == PyTuple_GET_ITEM(tuple, i)) return 1;
-    }
-#endif
-    for (i=0; i<n; i++) {
-        PyObject *t = PyTuple_GET_ITEM(tuple, i);
-        #if PY_MAJOR_VERSION < 3
-        if (likely(exc_type == t)) return 1;
-        #endif
-        if (likely(PyExceptionClass_Check(t))) {
-            if (__Pyx_inner_PyErr_GivenExceptionMatches2(exc_type, NULL, t)) return 1;
-        } else {
-        }
-    }
-    return 0;
-}
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject* exc_type) {
-    if (likely(err == exc_type)) return 1;
-    if (likely(PyExceptionClass_Check(err))) {
-        if (likely(PyExceptionClass_Check(exc_type))) {
-            return __Pyx_inner_PyErr_GivenExceptionMatches2(err, NULL, exc_type);
-        } else if (likely(PyTuple_Check(exc_type))) {
-            return __Pyx_PyErr_GivenExceptionMatchesTuple(err, exc_type);
-        } else {
-        }
-    }
-    return PyErr_GivenExceptionMatches(err, exc_type);
-}
-static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *exc_type1, PyObject *exc_type2) {
-    assert(PyExceptionClass_Check(exc_type1));
-    assert(PyExceptionClass_Check(exc_type2));
-    if (likely(err == exc_type1 || err == exc_type2)) return 1;
-    if (likely(PyExceptionClass_Check(err))) {
-        return __Pyx_inner_PyErr_GivenExceptionMatches2(err, exc_type1, exc_type2);
-    }
-    return (PyErr_GivenExceptionMatches(err, exc_type1) || PyErr_GivenExceptionMatches(err, exc_type2));
-}
-#endif
-
-/* CheckBinaryVersion */
-static int __Pyx_check_binary_version(void) {
-    char ctversion[5];
-    int same=1, i, found_dot;
-    const char* rt_from_call = Py_GetVersion();
-    PyOS_snprintf(ctversion, 5, "%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION);
-    found_dot = 0;
-    for (i = 0; i < 4; i++) {
-        if (!ctversion[i]) {
-            same = (rt_from_call[i] < '0' || rt_from_call[i] > '9');
-            break;
-        }
-        if (rt_from_call[i] != ctversion[i]) {
-            same = 0;
-            break;
-        }
-    }
-    if (!same) {
-        char rtversion[5] = {'\0'};
-        char message[200];
-        for (i=0; i<4; ++i) {
-            if (rt_from_call[i] == '.') {
-                if (found_dot) break;
-                found_dot = 1;
-            } else if (rt_from_call[i] < '0' || rt_from_call[i] > '9') {
-                break;
-            }
-            rtversion[i] = rt_from_call[i];
-        }
-        PyOS_snprintf(message, sizeof(message),
-                      "compile time version %s of module '%.100s' "
-                      "does not match runtime version %s",
-                      ctversion, __Pyx_MODULE_NAME, rtversion);
-        return PyErr_WarnEx(NULL, message, 1);
-    }
-    return 0;
-}
-
-/* InitStrings */
-#if PY_MAJOR_VERSION >= 3
-static int __Pyx_InitString(__Pyx_StringTabEntry t, PyObject **str) {
-    if (t.is_unicode | t.is_str) {
-        if (t.intern) {
-            *str = PyUnicode_InternFromString(t.s);
-        } else if (t.encoding) {
-            *str = PyUnicode_Decode(t.s, t.n - 1, t.encoding, NULL);
-        } else {
-            *str = PyUnicode_FromStringAndSize(t.s, t.n - 1);
-        }
-    } else {
-        *str = PyBytes_FromStringAndSize(t.s, t.n - 1);
-    }
-    if (!*str)
-        return -1;
-    if (PyObject_Hash(*str) == -1)
-        return -1;
-    return 0;
-}
-#endif
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
-    while (t->p) {
-        #if PY_MAJOR_VERSION >= 3
-        __Pyx_InitString(*t, t->p);
-        #else
-        if (t->is_unicode) {
-            *t->p = PyUnicode_DecodeUTF8(t->s, t->n - 1, NULL);
-        } else if (t->intern) {
-            *t->p = PyString_InternFromString(t->s);
-        } else {
-            *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
-        }
-        if (!*t->p)
-            return -1;
-        if (PyObject_Hash(*t->p) == -1)
-            return -1;
-        #endif
-        ++t;
-    }
-    return 0;
-}
-
-static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char* c_str) {
-    return __Pyx_PyUnicode_FromStringAndSize(c_str, (Py_ssize_t)strlen(c_str));
-}
-static CYTHON_INLINE const char* __Pyx_PyObject_AsString(PyObject* o) {
-    Py_ssize_t ignore;
-    return __Pyx_PyObject_AsStringAndSize(o, &ignore);
-}
-#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
-#if !CYTHON_PEP393_ENABLED
-static const char* __Pyx_PyUnicode_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
-    char* defenc_c;
-    PyObject* defenc = _PyUnicode_AsDefaultEncodedString(o, NULL);
-    if (!defenc) return NULL;
-    defenc_c = PyBytes_AS_STRING(defenc);
-#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
-    {
-        char* end = defenc_c + PyBytes_GET_SIZE(defenc);
-        char* c;
-        for (c = defenc_c; c < end; c++) {
-            if ((unsigned char) (*c) >= 128) {
-                PyUnicode_AsASCIIString(o);
-                return NULL;
-            }
-        }
-    }
-#endif
-    *length = PyBytes_GET_SIZE(defenc);
-    return defenc_c;
-}
-#else
-static CYTHON_INLINE const char* __Pyx_PyUnicode_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
-    if (unlikely(__Pyx_PyUnicode_READY(o) == -1)) return NULL;
-#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
-    if (likely(PyUnicode_IS_ASCII(o))) {
-        *length = PyUnicode_GET_LENGTH(o);
-        return PyUnicode_AsUTF8(o);
-    } else {
-        PyUnicode_AsASCIIString(o);
-        return NULL;
-    }
-#else
-    return PyUnicode_AsUTF8AndSize(o, length);
-#endif
-}
-#endif
-#endif
-static CYTHON_INLINE const char* __Pyx_PyObject_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
-#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
-    if (
-#if PY_MAJOR_VERSION < 3 && __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
-            __Pyx_sys_getdefaultencoding_not_ascii &&
-#endif
-            PyUnicode_Check(o)) {
-        return __Pyx_PyUnicode_AsStringAndSize(o, length);
-    } else
-#endif
-#if (!CYTHON_COMPILING_IN_PYPY && !CYTHON_COMPILING_IN_LIMITED_API) || (defined(PyByteArray_AS_STRING) && defined(PyByteArray_GET_SIZE))
-    if (PyByteArray_Check(o)) {
-        *length = PyByteArray_GET_SIZE(o);
-        return PyByteArray_AS_STRING(o);
-    } else
-#endif
-    {
-        char* result;
-        int r = PyBytes_AsStringAndSize(o, &result, length);
-        if (unlikely(r < 0)) {
-            return NULL;
-        } else {
-            return result;
-        }
-    }
-}
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
-   int is_true = x == Py_True;
-   if (is_true | (x == Py_False) | (x == Py_None)) return is_true;
-   else return PyObject_IsTrue(x);
-}
-static CYTHON_INLINE int __Pyx_PyObject_IsTrueAndDecref(PyObject* x) {
-    int retval;
-    if (unlikely(!x)) return -1;
-    retval = __Pyx_PyObject_IsTrue(x);
-    Py_DECREF(x);
-    return retval;
-}
-static PyObject* __Pyx_PyNumber_IntOrLongWrongResultType(PyObject* result, const char* type_name) {
-    __Pyx_TypeName result_type_name = __Pyx_PyType_GetName(Py_TYPE(result));
-#if PY_MAJOR_VERSION >= 3
-    if (PyLong_Check(result)) {
-        if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-                "__int__ returned non-int (type " __Pyx_FMT_TYPENAME ").  "
-                "The ability to return an instance of a strict subclass of int is deprecated, "
-                "and may be removed in a future version of Python.",
-                result_type_name)) {
-            __Pyx_DECREF_TypeName(result_type_name);
-            Py_DECREF(result);
-            return NULL;
-        }
-        __Pyx_DECREF_TypeName(result_type_name);
-        return result;
-    }
-#endif
-    PyErr_Format(PyExc_TypeError,
-                 "__%.4s__ returned non-%.4s (type " __Pyx_FMT_TYPENAME ")",
-                 type_name, type_name, result_type_name);
-    __Pyx_DECREF_TypeName(result_type_name);
-    Py_DECREF(result);
-    return NULL;
-}
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_IntOrLong(PyObject* x) {
-#if CYTHON_USE_TYPE_SLOTS
-  PyNumberMethods *m;
-#endif
-  const char *name = NULL;
-  PyObject *res = NULL;
-#if PY_MAJOR_VERSION < 3
-  if (likely(PyInt_Check(x) || PyLong_Check(x)))
-#else
-  if (likely(PyLong_Check(x)))
-#endif
-    return __Pyx_NewRef(x);
-#if CYTHON_USE_TYPE_SLOTS
-  m = Py_TYPE(x)->tp_as_number;
-  #if PY_MAJOR_VERSION < 3
-  if (m && m->nb_int) {
-    name = "int";
-    res = m->nb_int(x);
-  }
-  else if (m && m->nb_long) {
-    name = "long";
-    res = m->nb_long(x);
-  }
-  #else
-  if (likely(m && m->nb_int)) {
-    name = "int";
-    res = m->nb_int(x);
-  }
-  #endif
-#else
-  if (!PyBytes_CheckExact(x) && !PyUnicode_CheckExact(x)) {
-    res = PyNumber_Int(x);
-  }
-#endif
-  if (likely(res)) {
-#if PY_MAJOR_VERSION < 3
-    if (unlikely(!PyInt_Check(res) && !PyLong_Check(res))) {
-#else
-    if (unlikely(!PyLong_CheckExact(res))) {
-#endif
-        return __Pyx_PyNumber_IntOrLongWrongResultType(res, name);
-    }
-  }
-  else if (!PyErr_Occurred()) {
-    PyErr_SetString(PyExc_TypeError,
-                    "an integer is required");
-  }
-  return res;
-}
-static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
-  Py_ssize_t ival;
-  PyObject *x;
-#if PY_MAJOR_VERSION < 3
-  if (likely(PyInt_CheckExact(b))) {
-    if (sizeof(Py_ssize_t) >= sizeof(long))
-        return PyInt_AS_LONG(b);
-    else
-        return PyInt_AsSsize_t(b);
-  }
-#endif
-  if (likely(PyLong_CheckExact(b))) {
-    #if CYTHON_USE_PYLONG_INTERNALS
-    if (likely(__Pyx_PyLong_IsCompact(b))) {
-        return __Pyx_PyLong_CompactValue(b);
-    } else {
-      const digit* digits = __Pyx_PyLong_Digits(b);
-      const Py_ssize_t size = __Pyx_PyLong_SignedDigitCount(b);
-      switch (size) {
-         case 2:
-           if (8 * sizeof(Py_ssize_t) > 2 * PyLong_SHIFT) {
-             return (Py_ssize_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-         case -2:
-           if (8 * sizeof(Py_ssize_t) > 2 * PyLong_SHIFT) {
-             return -(Py_ssize_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-         case 3:
-           if (8 * sizeof(Py_ssize_t) > 3 * PyLong_SHIFT) {
-             return (Py_ssize_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-         case -3:
-           if (8 * sizeof(Py_ssize_t) > 3 * PyLong_SHIFT) {
-             return -(Py_ssize_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-         case 4:
-           if (8 * sizeof(Py_ssize_t) > 4 * PyLong_SHIFT) {
-             return (Py_ssize_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-         case -4:
-           if (8 * sizeof(Py_ssize_t) > 4 * PyLong_SHIFT) {
-             return -(Py_ssize_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
-           }
-           break;
-      }
-    }
-    #endif
-    return PyLong_AsSsize_t(b);
-  }
-  x = PyNumber_Index(b);
-  if (!x) return -1;
-  ival = PyInt_AsSsize_t(x);
-  Py_DECREF(x);
-  return ival;
-}
-static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject* o) {
-  if (sizeof(Py_hash_t) == sizeof(Py_ssize_t)) {
-    return (Py_hash_t) __Pyx_PyIndex_AsSsize_t(o);
-#if PY_MAJOR_VERSION < 3
-  } else if (likely(PyInt_CheckExact(o))) {
-    return PyInt_AS_LONG(o);
-#endif
-  } else {
-    Py_ssize_t ival;
-    PyObject *x;
-    x = PyNumber_Index(o);
-    if (!x) return -1;
-    ival = PyInt_AsLong(x);
-    Py_DECREF(x);
-    return ival;
-  }
-}
-static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b) {
-  return b ? __Pyx_NewRef(Py_True) : __Pyx_NewRef(Py_False);
-}
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
-    return PyInt_FromSize_t(ival);
-}
-
-
-/* #### Code section: utility_code_pragmas_end ### */
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
-
-
-
-/* #### Code section: end ### */
-#endif /* Py_PYTHON_H */
diff --git a/libs/msgpack/_cmsgpack.pyx b/libs/msgpack/_cmsgpack.pyx
deleted file mode 100644
index 1faaac3aa..000000000
--- a/libs/msgpack/_cmsgpack.pyx
+++ /dev/null
@@ -1,11 +0,0 @@
-# coding: utf-8
-#cython: embedsignature=True, c_string_encoding=ascii, language_level=3
-from cpython.datetime cimport import_datetime, datetime_new
-import_datetime()
-
-import datetime
-cdef object utc = datetime.timezone.utc
-cdef object epoch = datetime_new(1970, 1, 1, 0, 0, 0, 0, tz=utc)
-
-include "_packer.pyx"
-include "_unpacker.pyx"
diff --git a/libs/msgpack/_packer.pyx b/libs/msgpack/_packer.pyx
deleted file mode 100644
index 3c398672b..000000000
--- a/libs/msgpack/_packer.pyx
+++ /dev/null
@@ -1,374 +0,0 @@
-# coding: utf-8
-
-from cpython cimport *
-from cpython.bytearray cimport PyByteArray_Check, PyByteArray_CheckExact
-from cpython.datetime cimport (
-    PyDateTime_CheckExact, PyDelta_CheckExact,
-    datetime_tzinfo, timedelta_days, timedelta_seconds, timedelta_microseconds,
-)
-
-cdef ExtType
-cdef Timestamp
-
-from .ext import ExtType, Timestamp
-
-
-cdef extern from "Python.h":
-
-    int PyMemoryView_Check(object obj)
-    char* PyUnicode_AsUTF8AndSize(object obj, Py_ssize_t *l) except NULL
-
-
-cdef extern from "pack.h":
-    struct msgpack_packer:
-        char* buf
-        size_t length
-        size_t buf_size
-        bint use_bin_type
-
-    int msgpack_pack_int(msgpack_packer* pk, int d)
-    int msgpack_pack_nil(msgpack_packer* pk)
-    int msgpack_pack_true(msgpack_packer* pk)
-    int msgpack_pack_false(msgpack_packer* pk)
-    int msgpack_pack_long(msgpack_packer* pk, long d)
-    int msgpack_pack_long_long(msgpack_packer* pk, long long d)
-    int msgpack_pack_unsigned_long_long(msgpack_packer* pk, unsigned long long d)
-    int msgpack_pack_float(msgpack_packer* pk, float d)
-    int msgpack_pack_double(msgpack_packer* pk, double d)
-    int msgpack_pack_array(msgpack_packer* pk, size_t l)
-    int msgpack_pack_map(msgpack_packer* pk, size_t l)
-    int msgpack_pack_raw(msgpack_packer* pk, size_t l)
-    int msgpack_pack_bin(msgpack_packer* pk, size_t l)
-    int msgpack_pack_raw_body(msgpack_packer* pk, char* body, size_t l)
-    int msgpack_pack_ext(msgpack_packer* pk, char typecode, size_t l)
-    int msgpack_pack_timestamp(msgpack_packer* x, long long seconds, unsigned long nanoseconds);
-    int msgpack_pack_unicode(msgpack_packer* pk, object o, long long limit)
-
-cdef extern from "buff_converter.h":
-    object buff_to_buff(char *, Py_ssize_t)
-
-cdef int DEFAULT_RECURSE_LIMIT=511
-cdef long long ITEM_LIMIT = (2**32)-1
-
-
-cdef inline int PyBytesLike_Check(object o):
-    return PyBytes_Check(o) or PyByteArray_Check(o)
-
-
-cdef inline int PyBytesLike_CheckExact(object o):
-    return PyBytes_CheckExact(o) or PyByteArray_CheckExact(o)
-
-
-cdef class Packer(object):
-    """
-    MessagePack Packer
-
-    Usage::
-
-        packer = Packer()
-        astream.write(packer.pack(a))
-        astream.write(packer.pack(b))
-
-    Packer's constructor has some keyword arguments:
-
-    :param default:
-        When specified, it should be callable.
-        Convert user type to builtin type that Packer supports.
-        See also simplejson's document.
-
-    :param bool use_single_float:
-        Use single precision float type for float. (default: False)
-
-    :param bool autoreset:
-        Reset buffer after each pack and return its content as `bytes`. (default: True).
-        If set this to false, use `bytes()` to get content and `.reset()` to clear buffer.
-
-    :param bool use_bin_type:
-        Use bin type introduced in msgpack spec 2.0 for bytes.
-        It also enables str8 type for unicode. (default: True)
-
-    :param bool strict_types:
-        If set to true, types will be checked to be exact. Derived classes
-        from serializeable types will not be serialized and will be
-        treated as unsupported type and forwarded to default.
-        Additionally tuples will not be serialized as lists.
-        This is useful when trying to implement accurate serialization
-        for python types.
-
-    :param bool datetime:
-        If set to true, datetime with tzinfo is packed into Timestamp type.
-        Note that the tzinfo is stripped in the timestamp.
-        You can get UTC datetime with `timestamp=3` option of the Unpacker.
-
-    :param str unicode_errors:
-        The error handler for encoding unicode. (default: 'strict')
-        DO NOT USE THIS!!  This option is kept for very specific usage.
-    """
-    cdef msgpack_packer pk
-    cdef object _default
-    cdef object _berrors
-    cdef const char *unicode_errors
-    cdef bint strict_types
-    cdef bint use_float
-    cdef bint autoreset
-    cdef bint datetime
-
-    def __cinit__(self):
-        cdef int buf_size = 1024*1024
-        self.pk.buf = <char*> PyMem_Malloc(buf_size)
-        if self.pk.buf == NULL:
-            raise MemoryError("Unable to allocate internal buffer.")
-        self.pk.buf_size = buf_size
-        self.pk.length = 0
-
-    def __init__(self, *, default=None,
-                 bint use_single_float=False, bint autoreset=True, bint use_bin_type=True,
-                 bint strict_types=False, bint datetime=False, unicode_errors=None):
-        self.use_float = use_single_float
-        self.strict_types = strict_types
-        self.autoreset = autoreset
-        self.datetime = datetime
-        self.pk.use_bin_type = use_bin_type
-        if default is not None:
-            if not PyCallable_Check(default):
-                raise TypeError("default must be a callable.")
-        self._default = default
-
-        self._berrors = unicode_errors
-        if unicode_errors is None:
-            self.unicode_errors = NULL
-        else:
-            self.unicode_errors = self._berrors
-
-    def __dealloc__(self):
-        PyMem_Free(self.pk.buf)
-        self.pk.buf = NULL
-
-    cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:
-        cdef long long llval
-        cdef unsigned long long ullval
-        cdef unsigned long ulval
-        cdef long longval
-        cdef float fval
-        cdef double dval
-        cdef char* rawval
-        cdef int ret
-        cdef dict d
-        cdef Py_ssize_t L
-        cdef int default_used = 0
-        cdef bint strict_types = self.strict_types
-        cdef Py_buffer view
-
-        if nest_limit < 0:
-            raise ValueError("recursion limit exceeded.")
-
-        while True:
-            if o is None:
-                ret = msgpack_pack_nil(&self.pk)
-            elif o is True:
-                ret = msgpack_pack_true(&self.pk)
-            elif o is False:
-                ret = msgpack_pack_false(&self.pk)
-            elif PyLong_CheckExact(o) if strict_types else PyLong_Check(o):
-                # PyInt_Check(long) is True for Python 3.
-                # So we should test long before int.
-                try:
-                    if o > 0:
-                        ullval = o
-                        ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
-                    else:
-                        llval = o
-                        ret = msgpack_pack_long_long(&self.pk, llval)
-                except OverflowError as oe:
-                    if not default_used and self._default is not None:
-                        o = self._default(o)
-                        default_used = True
-                        continue
-                    else:
-                        raise OverflowError("Integer value out of range")
-            elif PyInt_CheckExact(o) if strict_types else PyInt_Check(o):
-                longval = o
-                ret = msgpack_pack_long(&self.pk, longval)
-            elif PyFloat_CheckExact(o) if strict_types else PyFloat_Check(o):
-                if self.use_float:
-                   fval = o
-                   ret = msgpack_pack_float(&self.pk, fval)
-                else:
-                   dval = o
-                   ret = msgpack_pack_double(&self.pk, dval)
-            elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
-                L = Py_SIZE(o)
-                if L > ITEM_LIMIT:
-                    PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
-                rawval = o
-                ret = msgpack_pack_bin(&self.pk, L)
-                if ret == 0:
-                    ret = msgpack_pack_raw_body(&self.pk, rawval, L)
-            elif PyUnicode_CheckExact(o) if strict_types else PyUnicode_Check(o):
-                if self.unicode_errors == NULL:
-                    ret = msgpack_pack_unicode(&self.pk, o, ITEM_LIMIT);
-                    if ret == -2:
-                        raise ValueError("unicode string is too large")
-                else:
-                    o = PyUnicode_AsEncodedString(o, NULL, self.unicode_errors)
-                    L = Py_SIZE(o)
-                    if L > ITEM_LIMIT:
-                        raise ValueError("unicode string is too large")
-                    ret = msgpack_pack_raw(&self.pk, L)
-                    if ret == 0:
-                        rawval = o
-                        ret = msgpack_pack_raw_body(&self.pk, rawval, L)
-            elif PyDict_CheckExact(o):
-                d = <dict>o
-                L = len(d)
-                if L > ITEM_LIMIT:
-                    raise ValueError("dict is too large")
-                ret = msgpack_pack_map(&self.pk, L)
-                if ret == 0:
-                    for k, v in d.items():
-                        ret = self._pack(k, nest_limit-1)
-                        if ret != 0: break
-                        ret = self._pack(v, nest_limit-1)
-                        if ret != 0: break
-            elif not strict_types and PyDict_Check(o):
-                L = len(o)
-                if L > ITEM_LIMIT:
-                    raise ValueError("dict is too large")
-                ret = msgpack_pack_map(&self.pk, L)
-                if ret == 0:
-                    for k, v in o.items():
-                        ret = self._pack(k, nest_limit-1)
-                        if ret != 0: break
-                        ret = self._pack(v, nest_limit-1)
-                        if ret != 0: break
-            elif type(o) is ExtType if strict_types else isinstance(o, ExtType):
-                # This should be before Tuple because ExtType is namedtuple.
-                longval = o.code
-                rawval = o.data
-                L = len(o.data)
-                if L > ITEM_LIMIT:
-                    raise ValueError("EXT data is too large")
-                ret = msgpack_pack_ext(&self.pk, longval, L)
-                ret = msgpack_pack_raw_body(&self.pk, rawval, L)
-            elif type(o) is Timestamp:
-                llval = o.seconds
-                ulval = o.nanoseconds
-                ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
-            elif PyList_CheckExact(o) if strict_types else (PyTuple_Check(o) or PyList_Check(o)):
-                L = Py_SIZE(o)
-                if L > ITEM_LIMIT:
-                    raise ValueError("list is too large")
-                ret = msgpack_pack_array(&self.pk, L)
-                if ret == 0:
-                    for v in o:
-                        ret = self._pack(v, nest_limit-1)
-                        if ret != 0: break
-            elif PyMemoryView_Check(o):
-                if PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) != 0:
-                    raise ValueError("could not get buffer for memoryview")
-                L = view.len
-                if L > ITEM_LIMIT:
-                    PyBuffer_Release(&view);
-                    raise ValueError("memoryview is too large")
-                ret = msgpack_pack_bin(&self.pk, L)
-                if ret == 0:
-                    ret = msgpack_pack_raw_body(&self.pk, <char*>view.buf, L)
-                PyBuffer_Release(&view);
-            elif self.datetime and PyDateTime_CheckExact(o) and datetime_tzinfo(o) is not None:
-                delta = o - epoch
-                if not PyDelta_CheckExact(delta):
-                    raise ValueError("failed to calculate delta")
-                llval = timedelta_days(delta) * <long long>(24*60*60) + timedelta_seconds(delta)
-                ulval = timedelta_microseconds(delta) * 1000
-                ret = msgpack_pack_timestamp(&self.pk, llval, ulval)
-            elif not default_used and self._default:
-                o = self._default(o)
-                default_used = 1
-                continue
-            elif self.datetime and PyDateTime_CheckExact(o):
-                PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
-            else:
-                PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
-            return ret
-
-    cpdef pack(self, object obj):
-        cdef int ret
-        try:
-            ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
-        except:
-            self.pk.length = 0
-            raise
-        if ret:  # should not happen.
-            raise RuntimeError("internal error")
-        if self.autoreset:
-            buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
-            self.pk.length = 0
-            return buf
-
-    def pack_ext_type(self, typecode, data):
-        msgpack_pack_ext(&self.pk, typecode, len(data))
-        msgpack_pack_raw_body(&self.pk, data, len(data))
-
-    def pack_array_header(self, long long size):
-        if size > ITEM_LIMIT:
-            raise ValueError
-        cdef int ret = msgpack_pack_array(&self.pk, size)
-        if ret == -1:
-            raise MemoryError
-        elif ret:  # should not happen
-            raise TypeError
-        if self.autoreset:
-            buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
-            self.pk.length = 0
-            return buf
-
-    def pack_map_header(self, long long size):
-        if size > ITEM_LIMIT:
-            raise ValueError
-        cdef int ret = msgpack_pack_map(&self.pk, size)
-        if ret == -1:
-            raise MemoryError
-        elif ret:  # should not happen
-            raise TypeError
-        if self.autoreset:
-            buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
-            self.pk.length = 0
-            return buf
-
-    def pack_map_pairs(self, object pairs):
-        """
-        Pack *pairs* as msgpack map type.
-
-        *pairs* should be a sequence of pairs.
-        (`len(pairs)` and `for k, v in pairs:` should be supported.)
-        """
-        cdef int ret = msgpack_pack_map(&self.pk, len(pairs))
-        if ret == 0:
-            for k, v in pairs:
-                ret = self._pack(k)
-                if ret != 0: break
-                ret = self._pack(v)
-                if ret != 0: break
-        if ret == -1:
-            raise MemoryError
-        elif ret:  # should not happen
-            raise TypeError
-        if self.autoreset:
-            buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
-            self.pk.length = 0
-            return buf
-
-    def reset(self):
-        """Reset internal buffer.
-
-        This method is useful only when autoreset=False.
-        """
-        self.pk.length = 0
-
-    def bytes(self):
-        """Return internal buffer contents as bytes object"""
-        return PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
-
-    def getbuffer(self):
-        """Return view of internal buffer."""
-        return buff_to_buff(self.pk.buf, self.pk.length)
diff --git a/libs/msgpack/_unpacker.pyx b/libs/msgpack/_unpacker.pyx
deleted file mode 100644
index 56126f436..000000000
--- a/libs/msgpack/_unpacker.pyx
+++ /dev/null
@@ -1,547 +0,0 @@
-# coding: utf-8
-
-from cpython cimport *
-cdef extern from "Python.h":
-    ctypedef struct PyObject
-    object PyMemoryView_GetContiguous(object obj, int buffertype, char order)
-
-from libc.stdlib cimport *
-from libc.string cimport *
-from libc.limits cimport *
-from libc.stdint cimport uint64_t
-
-from .exceptions import (
-    BufferFull,
-    OutOfData,
-    ExtraData,
-    FormatError,
-    StackError,
-)
-from .ext import ExtType, Timestamp
-
-cdef object giga = 1_000_000_000
-
-
-cdef extern from "unpack.h":
-    ctypedef struct msgpack_user:
-        bint use_list
-        bint raw
-        bint has_pairs_hook # call object_hook with k-v pairs
-        bint strict_map_key
-        int timestamp
-        PyObject* object_hook
-        PyObject* list_hook
-        PyObject* ext_hook
-        PyObject* timestamp_t
-        PyObject *giga;
-        PyObject *utc;
-        char *unicode_errors
-        Py_ssize_t max_str_len
-        Py_ssize_t max_bin_len
-        Py_ssize_t max_array_len
-        Py_ssize_t max_map_len
-        Py_ssize_t max_ext_len
-
-    ctypedef struct unpack_context:
-        msgpack_user user
-        PyObject* obj
-        Py_ssize_t count
-
-    ctypedef int (*execute_fn)(unpack_context* ctx, const char* data,
-                               Py_ssize_t len, Py_ssize_t* off) except? -1
-    execute_fn unpack_construct
-    execute_fn unpack_skip
-    execute_fn read_array_header
-    execute_fn read_map_header
-    void unpack_init(unpack_context* ctx)
-    object unpack_data(unpack_context* ctx)
-    void unpack_clear(unpack_context* ctx)
-
-cdef inline init_ctx(unpack_context *ctx,
-                     object object_hook, object object_pairs_hook,
-                     object list_hook, object ext_hook,
-                     bint use_list, bint raw, int timestamp,
-                     bint strict_map_key,
-                     const char* unicode_errors,
-                     Py_ssize_t max_str_len, Py_ssize_t max_bin_len,
-                     Py_ssize_t max_array_len, Py_ssize_t max_map_len,
-                     Py_ssize_t max_ext_len):
-    unpack_init(ctx)
-    ctx.user.use_list = use_list
-    ctx.user.raw = raw
-    ctx.user.strict_map_key = strict_map_key
-    ctx.user.object_hook = ctx.user.list_hook = <PyObject*>NULL
-    ctx.user.max_str_len = max_str_len
-    ctx.user.max_bin_len = max_bin_len
-    ctx.user.max_array_len = max_array_len
-    ctx.user.max_map_len = max_map_len
-    ctx.user.max_ext_len = max_ext_len
-
-    if object_hook is not None and object_pairs_hook is not None:
-        raise TypeError("object_pairs_hook and object_hook are mutually exclusive.")
-
-    if object_hook is not None:
-        if not PyCallable_Check(object_hook):
-            raise TypeError("object_hook must be a callable.")
-        ctx.user.object_hook = <PyObject*>object_hook
-
-    if object_pairs_hook is None:
-        ctx.user.has_pairs_hook = False
-    else:
-        if not PyCallable_Check(object_pairs_hook):
-            raise TypeError("object_pairs_hook must be a callable.")
-        ctx.user.object_hook = <PyObject*>object_pairs_hook
-        ctx.user.has_pairs_hook = True
-
-    if list_hook is not None:
-        if not PyCallable_Check(list_hook):
-            raise TypeError("list_hook must be a callable.")
-        ctx.user.list_hook = <PyObject*>list_hook
-
-    if ext_hook is not None:
-        if not PyCallable_Check(ext_hook):
-            raise TypeError("ext_hook must be a callable.")
-        ctx.user.ext_hook = <PyObject*>ext_hook
-
-    if timestamp < 0 or 3 < timestamp:
-        raise ValueError("timestamp must be 0..3")
-
-    # Add Timestamp type to the user object so it may be used in unpack.h
-    ctx.user.timestamp = timestamp
-    ctx.user.timestamp_t = <PyObject*>Timestamp
-    ctx.user.giga = <PyObject*>giga
-    ctx.user.utc = <PyObject*>utc
-    ctx.user.unicode_errors = unicode_errors
-
-def default_read_extended_type(typecode, data):
-    raise NotImplementedError("Cannot decode extended type with typecode=%d" % typecode)
-
-cdef inline int get_data_from_buffer(object obj,
-                                     Py_buffer *view,
-                                     char **buf,
-                                     Py_ssize_t *buffer_len) except 0:
-    cdef object contiguous
-    cdef Py_buffer tmp
-    if PyObject_GetBuffer(obj, view, PyBUF_FULL_RO) == -1:
-        raise
-    if view.itemsize != 1:
-        PyBuffer_Release(view)
-        raise BufferError("cannot unpack from multi-byte object")
-    if PyBuffer_IsContiguous(view, b'A') == 0:
-        PyBuffer_Release(view)
-        # create a contiguous copy and get buffer
-        contiguous = PyMemoryView_GetContiguous(obj, PyBUF_READ, b'C')
-        PyObject_GetBuffer(contiguous, view, PyBUF_SIMPLE)
-        # view must hold the only reference to contiguous,
-        # so memory is freed when view is released
-        Py_DECREF(contiguous)
-    buffer_len[0] = view.len
-    buf[0] = <char*> view.buf
-    return 1
-
-
-def unpackb(object packed, *, object object_hook=None, object list_hook=None,
-            bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
-            unicode_errors=None,
-            object_pairs_hook=None, ext_hook=ExtType,
-            Py_ssize_t max_str_len=-1,
-            Py_ssize_t max_bin_len=-1,
-            Py_ssize_t max_array_len=-1,
-            Py_ssize_t max_map_len=-1,
-            Py_ssize_t max_ext_len=-1):
-    """
-    Unpack packed_bytes to object. Returns an unpacked object.
-
-    Raises ``ExtraData`` when *packed* contains extra bytes.
-    Raises ``ValueError`` when *packed* is incomplete.
-    Raises ``FormatError`` when *packed* is not valid msgpack.
-    Raises ``StackError`` when *packed* contains too nested.
-    Other exceptions can be raised during unpacking.
-
-    See :class:`Unpacker` for options.
-
-    *max_xxx_len* options are configured automatically from ``len(packed)``.
-    """
-    cdef unpack_context ctx
-    cdef Py_ssize_t off = 0
-    cdef int ret
-
-    cdef Py_buffer view
-    cdef char* buf = NULL
-    cdef Py_ssize_t buf_len
-    cdef const char* cerr = NULL
-
-    if unicode_errors is not None:
-        cerr = unicode_errors
-
-    get_data_from_buffer(packed, &view, &buf, &buf_len)
-
-    if max_str_len == -1:
-        max_str_len = buf_len
-    if max_bin_len == -1:
-        max_bin_len = buf_len
-    if max_array_len == -1:
-        max_array_len = buf_len
-    if max_map_len == -1:
-        max_map_len = buf_len//2
-    if max_ext_len == -1:
-        max_ext_len = buf_len
-
-    try:
-        init_ctx(&ctx, object_hook, object_pairs_hook, list_hook, ext_hook,
-                 use_list, raw, timestamp, strict_map_key, cerr,
-                 max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len)
-        ret = unpack_construct(&ctx, buf, buf_len, &off)
-    finally:
-        PyBuffer_Release(&view);
-
-    if ret == 1:
-        obj = unpack_data(&ctx)
-        if off < buf_len:
-            raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
-        return obj
-    unpack_clear(&ctx)
-    if ret == 0:
-        raise ValueError("Unpack failed: incomplete input")
-    elif ret == -2:
-        raise FormatError
-    elif ret == -3:
-        raise StackError
-    raise ValueError("Unpack failed: error = %d" % (ret,))
-
-
-cdef class Unpacker(object):
-    """Streaming unpacker.
-
-    Arguments:
-
-    :param file_like:
-        File-like object having `.read(n)` method.
-        If specified, unpacker reads serialized data from it and `.feed()` is not usable.
-
-    :param int read_size:
-        Used as `file_like.read(read_size)`. (default: `min(16*1024, max_buffer_size)`)
-
-    :param bool use_list:
-        If true, unpack msgpack array to Python list.
-        Otherwise, unpack to Python tuple. (default: True)
-
-    :param bool raw:
-        If true, unpack msgpack raw to Python bytes.
-        Otherwise, unpack to Python str by decoding with UTF-8 encoding (default).
-
-    :param int timestamp:
-        Control how timestamp type is unpacked:
-
-            0 - Timestamp
-            1 - float  (Seconds from the EPOCH)
-            2 - int  (Nanoseconds from the EPOCH)
-            3 - datetime.datetime  (UTC).
-
-    :param bool strict_map_key:
-        If true (default), only str or bytes are accepted for map (dict) keys.
-
-    :param object_hook:
-        When specified, it should be callable.
-        Unpacker calls it with a dict argument after unpacking msgpack map.
-        (See also simplejson)
-
-    :param object_pairs_hook:
-        When specified, it should be callable.
-        Unpacker calls it with a list of key-value pairs after unpacking msgpack map.
-        (See also simplejson)
-
-    :param str unicode_errors:
-        The error handler for decoding unicode. (default: 'strict')
-        This option should be used only when you have msgpack data which
-        contains invalid UTF-8 string.
-
-    :param int max_buffer_size:
-        Limits size of data waiting unpacked.  0 means 2**32-1.
-        The default value is 100*1024*1024 (100MiB).
-        Raises `BufferFull` exception when it is insufficient.
-        You should set this parameter when unpacking data from untrusted source.
-
-    :param int max_str_len:
-        Deprecated, use *max_buffer_size* instead.
-        Limits max length of str. (default: max_buffer_size)
-
-    :param int max_bin_len:
-        Deprecated, use *max_buffer_size* instead.
-        Limits max length of bin. (default: max_buffer_size)
-
-    :param int max_array_len:
-        Limits max length of array.
-        (default: max_buffer_size)
-
-    :param int max_map_len:
-        Limits max length of map.
-        (default: max_buffer_size//2)
-
-    :param int max_ext_len:
-        Deprecated, use *max_buffer_size* instead.
-        Limits max size of ext type.  (default: max_buffer_size)
-
-    Example of streaming deserialize from file-like object::
-
-        unpacker = Unpacker(file_like)
-        for o in unpacker:
-            process(o)
-
-    Example of streaming deserialize from socket::
-
-        unpacker = Unpacker()
-        while True:
-            buf = sock.recv(1024**2)
-            if not buf:
-                break
-            unpacker.feed(buf)
-            for o in unpacker:
-                process(o)
-
-    Raises ``ExtraData`` when *packed* contains extra bytes.
-    Raises ``OutOfData`` when *packed* is incomplete.
-    Raises ``FormatError`` when *packed* is not valid msgpack.
-    Raises ``StackError`` when *packed* contains too nested.
-    Other exceptions can be raised during unpacking.
-    """
-    cdef unpack_context ctx
-    cdef char* buf
-    cdef Py_ssize_t buf_size, buf_head, buf_tail
-    cdef object file_like
-    cdef object file_like_read
-    cdef Py_ssize_t read_size
-    # To maintain refcnt.
-    cdef object object_hook, object_pairs_hook, list_hook, ext_hook
-    cdef object unicode_errors
-    cdef Py_ssize_t max_buffer_size
-    cdef uint64_t stream_offset
-
-    def __cinit__(self):
-        self.buf = NULL
-
-    def __dealloc__(self):
-        PyMem_Free(self.buf)
-        self.buf = NULL
-
-    def __init__(self, file_like=None, *, Py_ssize_t read_size=0,
-                 bint use_list=True, bint raw=False, int timestamp=0, bint strict_map_key=True,
-                 object object_hook=None, object object_pairs_hook=None, object list_hook=None,
-                 unicode_errors=None, Py_ssize_t max_buffer_size=100*1024*1024,
-                 object ext_hook=ExtType,
-                 Py_ssize_t max_str_len=-1,
-                 Py_ssize_t max_bin_len=-1,
-                 Py_ssize_t max_array_len=-1,
-                 Py_ssize_t max_map_len=-1,
-                 Py_ssize_t max_ext_len=-1):
-        cdef const char *cerr=NULL
-
-        self.object_hook = object_hook
-        self.object_pairs_hook = object_pairs_hook
-        self.list_hook = list_hook
-        self.ext_hook = ext_hook
-
-        self.file_like = file_like
-        if file_like:
-            self.file_like_read = file_like.read
-            if not PyCallable_Check(self.file_like_read):
-                raise TypeError("`file_like.read` must be a callable.")
-
-        if not max_buffer_size:
-            max_buffer_size = INT_MAX
-        if max_str_len == -1:
-            max_str_len = max_buffer_size
-        if max_bin_len == -1:
-            max_bin_len = max_buffer_size
-        if max_array_len == -1:
-            max_array_len = max_buffer_size
-        if max_map_len == -1:
-            max_map_len = max_buffer_size//2
-        if max_ext_len == -1:
-            max_ext_len = max_buffer_size
-
-        if read_size > max_buffer_size:
-            raise ValueError("read_size should be less or equal to max_buffer_size")
-        if not read_size:
-            read_size = min(max_buffer_size, 1024**2)
-
-        self.max_buffer_size = max_buffer_size
-        self.read_size = read_size
-        self.buf = <char*>PyMem_Malloc(read_size)
-        if self.buf == NULL:
-            raise MemoryError("Unable to allocate internal buffer.")
-        self.buf_size = read_size
-        self.buf_head = 0
-        self.buf_tail = 0
-        self.stream_offset = 0
-
-        if unicode_errors is not None:
-            self.unicode_errors = unicode_errors
-            cerr = unicode_errors
-
-        init_ctx(&self.ctx, object_hook, object_pairs_hook, list_hook,
-                 ext_hook, use_list, raw, timestamp, strict_map_key, cerr,
-                 max_str_len, max_bin_len, max_array_len,
-                 max_map_len, max_ext_len)
-
-    def feed(self, object next_bytes):
-        """Append `next_bytes` to internal buffer."""
-        cdef Py_buffer pybuff
-        cdef char* buf
-        cdef Py_ssize_t buf_len
-
-        if self.file_like is not None:
-            raise AssertionError(
-                    "unpacker.feed() is not be able to use with `file_like`.")
-
-        get_data_from_buffer(next_bytes, &pybuff, &buf, &buf_len)
-        try:
-            self.append_buffer(buf, buf_len)
-        finally:
-            PyBuffer_Release(&pybuff)
-
-    cdef append_buffer(self, void* _buf, Py_ssize_t _buf_len):
-        cdef:
-            char* buf = self.buf
-            char* new_buf
-            Py_ssize_t head = self.buf_head
-            Py_ssize_t tail = self.buf_tail
-            Py_ssize_t buf_size = self.buf_size
-            Py_ssize_t new_size
-
-        if tail + _buf_len > buf_size:
-            if ((tail - head) + _buf_len) <= buf_size:
-                # move to front.
-                memmove(buf, buf + head, tail - head)
-                tail -= head
-                head = 0
-            else:
-                # expand buffer.
-                new_size = (tail-head) + _buf_len
-                if new_size > self.max_buffer_size:
-                    raise BufferFull
-                new_size = min(new_size*2, self.max_buffer_size)
-                new_buf = <char*>PyMem_Malloc(new_size)
-                if new_buf == NULL:
-                    # self.buf still holds old buffer and will be freed during
-                    # obj destruction
-                    raise MemoryError("Unable to enlarge internal buffer.")
-                memcpy(new_buf, buf + head, tail - head)
-                PyMem_Free(buf)
-
-                buf = new_buf
-                buf_size = new_size
-                tail -= head
-                head = 0
-
-        memcpy(buf + tail, <char*>(_buf), _buf_len)
-        self.buf = buf
-        self.buf_head = head
-        self.buf_size = buf_size
-        self.buf_tail = tail + _buf_len
-
-    cdef int read_from_file(self) except -1:
-        cdef Py_ssize_t remains = self.max_buffer_size - (self.buf_tail - self.buf_head)
-        if remains <= 0:
-            raise BufferFull
-
-        next_bytes = self.file_like_read(min(self.read_size, remains))
-        if next_bytes:
-            self.append_buffer(PyBytes_AsString(next_bytes), PyBytes_Size(next_bytes))
-        else:
-            self.file_like = None
-        return 0
-
-    cdef object _unpack(self, execute_fn execute, bint iter=0):
-        cdef int ret
-        cdef object obj
-        cdef Py_ssize_t prev_head
-
-        while 1:
-            prev_head = self.buf_head
-            if prev_head < self.buf_tail:
-                ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
-                self.stream_offset += self.buf_head - prev_head
-            else:
-                ret = 0
-
-            if ret == 1:
-                obj = unpack_data(&self.ctx)
-                unpack_init(&self.ctx)
-                return obj
-            elif ret == 0:
-                if self.file_like is not None:
-                    self.read_from_file()
-                    continue
-                if iter:
-                    raise StopIteration("No more data to unpack.")
-                else:
-                    raise OutOfData("No more data to unpack.")
-            elif ret == -2:
-                raise FormatError
-            elif ret == -3:
-                raise StackError
-            else:
-                raise ValueError("Unpack failed: error = %d" % (ret,))
-
-    def read_bytes(self, Py_ssize_t nbytes):
-        """Read a specified number of raw bytes from the stream"""
-        cdef Py_ssize_t nread
-        nread = min(self.buf_tail - self.buf_head, nbytes)
-        ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
-        self.buf_head += nread
-        if nread < nbytes and self.file_like is not None:
-            ret += self.file_like.read(nbytes - nread)
-            nread = len(ret)
-        self.stream_offset += nread
-        return ret
-
-    def unpack(self):
-        """Unpack one object
-
-        Raises `OutOfData` when there are no more bytes to unpack.
-        """
-        return self._unpack(unpack_construct)
-
-    def skip(self):
-        """Read and ignore one object, returning None
-
-        Raises `OutOfData` when there are no more bytes to unpack.
-        """
-        return self._unpack(unpack_skip)
-
-    def read_array_header(self):
-        """assuming the next object is an array, return its size n, such that
-        the next n unpack() calls will iterate over its contents.
-
-        Raises `OutOfData` when there are no more bytes to unpack.
-        """
-        return self._unpack(read_array_header)
-
-    def read_map_header(self):
-        """assuming the next object is a map, return its size n, such that the
-        next n * 2 unpack() calls will iterate over its key-value pairs.
-
-        Raises `OutOfData` when there are no more bytes to unpack.
-        """
-        return self._unpack(read_map_header)
-
-    def tell(self):
-        """Returns the current position of the Unpacker in bytes, i.e., the
-        number of bytes that were read from the input, also the starting
-        position of the next object.
-        """
-        return self.stream_offset
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return self._unpack(unpack_construct, 1)
-
-    # for debug.
-    #def _buf(self):
-    #    return PyString_FromStringAndSize(self.buf, self.buf_tail)
-
-    #def _off(self):
-    #    return self.buf_head
diff --git a/libs/msgpack/buff_converter.h b/libs/msgpack/buff_converter.h
deleted file mode 100644
index 86b4196df..000000000
--- a/libs/msgpack/buff_converter.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "Python.h"
-
-/* cython does not support this preprocessor check => write it in raw C */
-static PyObject *
-buff_to_buff(char *buff, Py_ssize_t size)
-{
-    return PyMemoryView_FromMemory(buff, size, PyBUF_READ);
-}
diff --git a/libs/msgpack/ext.py b/libs/msgpack/ext.py
index 02c2c4300..9694819a7 100644
--- a/libs/msgpack/ext.py
+++ b/libs/msgpack/ext.py
@@ -1,6 +1,6 @@
-from collections import namedtuple
 import datetime
 import struct
+from collections import namedtuple
 
 
 class ExtType(namedtuple("ExtType", "code data")):
@@ -157,7 +157,9 @@ class Timestamp:
         :rtype: `datetime.datetime`
         """
         utc = datetime.timezone.utc
-        return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(seconds=self.to_unix())
+        return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(
+            seconds=self.seconds, microseconds=self.nanoseconds // 1000
+        )
 
     @staticmethod
     def from_datetime(dt):
@@ -165,4 +167,4 @@ class Timestamp:
 
         :rtype: Timestamp
         """
-        return Timestamp.from_unix(dt.timestamp())
+        return Timestamp(seconds=int(dt.timestamp()), nanoseconds=dt.microsecond * 1000)
diff --git a/libs/msgpack/fallback.py b/libs/msgpack/fallback.py
index a174162af..b02e47cfb 100644
--- a/libs/msgpack/fallback.py
+++ b/libs/msgpack/fallback.py
@@ -1,27 +1,22 @@
 """Fallback pure Python implementation of msgpack"""
-from datetime import datetime as _DateTime
-import sys
-import struct
 
+import struct
+import sys
+from datetime import datetime as _DateTime
 
 if hasattr(sys, "pypy_version_info"):
-    # StringIO is slow on PyPy, StringIO is faster.  However: PyPy's own
-    # StringBuilder is fastest.
     from __pypy__ import newlist_hint
+    from __pypy__.builders import BytesBuilder
 
-    try:
-        from __pypy__.builders import BytesBuilder as StringBuilder
-    except ImportError:
-        from __pypy__.builders import StringBuilder
-    USING_STRINGBUILDER = True
+    _USING_STRINGBUILDER = True
 
-    class StringIO:
+    class BytesIO:
         def __init__(self, s=b""):
             if s:
-                self.builder = StringBuilder(len(s))
+                self.builder = BytesBuilder(len(s))
                 self.builder.append(s)
             else:
-                self.builder = StringBuilder()
+                self.builder = BytesBuilder()
 
         def write(self, s):
             if isinstance(s, memoryview):
@@ -34,17 +29,17 @@ if hasattr(sys, "pypy_version_info"):
             return self.builder.build()
 
 else:
-    USING_STRINGBUILDER = False
-    from io import BytesIO as StringIO
+    from io import BytesIO
 
-    newlist_hint = lambda size: []
+    _USING_STRINGBUILDER = False
+
+    def newlist_hint(size):
+        return []
 
 
-from .exceptions import BufferFull, OutOfData, ExtraData, FormatError, StackError
-
+from .exceptions import BufferFull, ExtraData, FormatError, OutOfData, StackError
 from .ext import ExtType, Timestamp
 
-
 EX_SKIP = 0
 EX_CONSTRUCT = 1
 EX_READ_ARRAY_HEADER = 2
@@ -231,6 +226,7 @@ class Unpacker:
     def __init__(
         self,
         file_like=None,
+        *,
         read_size=0,
         use_list=True,
         raw=False,
@@ -333,6 +329,7 @@ class Unpacker:
 
         # Use extend here: INPLACE_ADD += doesn't reliably typecast memoryview in jython
         self._buffer.extend(view)
+        view.release()
 
     def _consume(self):
         """Gets rid of the used parts of the buffer."""
@@ -649,32 +646,13 @@ class Packer:
         The error handler for encoding unicode. (default: 'strict')
         DO NOT USE THIS!!  This option is kept for very specific usage.
 
-    Example of streaming deserialize from file-like object::
-
-        unpacker = Unpacker(file_like)
-        for o in unpacker:
-            process(o)
-
-    Example of streaming deserialize from socket::
-
-        unpacker = Unpacker()
-        while True:
-            buf = sock.recv(1024**2)
-            if not buf:
-                break
-            unpacker.feed(buf)
-            for o in unpacker:
-                process(o)
-
-    Raises ``ExtraData`` when *packed* contains extra bytes.
-    Raises ``OutOfData`` when *packed* is incomplete.
-    Raises ``FormatError`` when *packed* is not valid msgpack.
-    Raises ``StackError`` when *packed* contains too nested.
-    Other exceptions can be raised during unpacking.
+    :param int buf_size:
+        Internal buffer size. This option is used only for C implementation.
     """
 
     def __init__(
         self,
+        *,
         default=None,
         use_single_float=False,
         autoreset=True,
@@ -682,17 +660,17 @@ class Packer:
         strict_types=False,
         datetime=False,
         unicode_errors=None,
+        buf_size=None,
     ):
         self._strict_types = strict_types
         self._use_float = use_single_float
         self._autoreset = autoreset
         self._use_bin_type = use_bin_type
-        self._buffer = StringIO()
+        self._buffer = BytesIO()
         self._datetime = bool(datetime)
         self._unicode_errors = unicode_errors or "strict"
-        if default is not None:
-            if not callable(default):
-                raise TypeError("default must be callable")
+        if default is not None and not callable(default):
+            raise TypeError("default must be callable")
         self._default = default
 
     def _pack(
@@ -823,18 +801,18 @@ class Packer:
         try:
             self._pack(obj)
         except:
-            self._buffer = StringIO()  # force reset
+            self._buffer = BytesIO()  # force reset
             raise
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_map_pairs(self, pairs):
         self._pack_map_pairs(len(pairs), pairs)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_array_header(self, n):
@@ -843,7 +821,7 @@ class Packer:
         self._pack_array_header(n)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_map_header(self, n):
@@ -852,7 +830,7 @@ class Packer:
         self._pack_map_header(n)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_ext_type(self, typecode, data):
@@ -941,11 +919,11 @@ class Packer:
 
         This method is useful only when autoreset=False.
         """
-        self._buffer = StringIO()
+        self._buffer = BytesIO()
 
     def getbuffer(self):
         """Return view of internal buffer."""
-        if USING_STRINGBUILDER:
+        if _USING_STRINGBUILDER:
             return memoryview(self.bytes())
         else:
             return self._buffer.getbuffer()
diff --git a/libs/msgpack/pack.h b/libs/msgpack/pack.h
deleted file mode 100644
index 2453428ca..000000000
--- a/libs/msgpack/pack.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * MessagePack for Python packing routine
- *
- * Copyright (C) 2009 Naoki INADA
- *
- *    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.
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "sysdep.h"
-#include <limits.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct msgpack_packer {
-    char *buf;
-    size_t length;
-    size_t buf_size;
-    bool use_bin_type;
-} msgpack_packer;
-
-typedef struct Packer Packer;
-
-static inline int msgpack_pack_write(msgpack_packer* pk, const char *data, size_t l)
-{
-    char* buf = pk->buf;
-    size_t bs = pk->buf_size;
-    size_t len = pk->length;
-
-    if (len + l > bs) {
-        bs = (len + l) * 2;
-        buf = (char*)PyMem_Realloc(buf, bs);
-        if (!buf) {
-            PyErr_NoMemory();
-            return -1;
-        }
-    }
-    memcpy(buf + len, data, l);
-    len += l;
-
-    pk->buf = buf;
-    pk->buf_size = bs;
-    pk->length = len;
-    return 0;
-}
-
-#define msgpack_pack_append_buffer(user, buf, len) \
-        return msgpack_pack_write(user, (const char*)buf, len)
-
-#include "pack_template.h"
-
-// return -2 when o is too long
-static inline int
-msgpack_pack_unicode(msgpack_packer *pk, PyObject *o, long long limit)
-{
-    assert(PyUnicode_Check(o));
-
-    Py_ssize_t len;
-    const char* buf = PyUnicode_AsUTF8AndSize(o, &len);
-    if (buf == NULL)
-        return -1;
-
-    if (len > limit) {
-        return -2;
-    }
-
-    int ret = msgpack_pack_raw(pk, len);
-    if (ret) return ret;
-
-    return msgpack_pack_raw_body(pk, buf, len);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libs/msgpack/pack_template.h b/libs/msgpack/pack_template.h
deleted file mode 100644
index 7d479b6d4..000000000
--- a/libs/msgpack/pack_template.h
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
- * MessagePack packing routine template
- *
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    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.
- */
-
-#if defined(__LITTLE_ENDIAN__)
-#define TAKE8_8(d)  ((uint8_t*)&d)[0]
-#define TAKE8_16(d) ((uint8_t*)&d)[0]
-#define TAKE8_32(d) ((uint8_t*)&d)[0]
-#define TAKE8_64(d) ((uint8_t*)&d)[0]
-#elif defined(__BIG_ENDIAN__)
-#define TAKE8_8(d)  ((uint8_t*)&d)[0]
-#define TAKE8_16(d) ((uint8_t*)&d)[1]
-#define TAKE8_32(d) ((uint8_t*)&d)[3]
-#define TAKE8_64(d) ((uint8_t*)&d)[7]
-#endif
-
-#ifndef msgpack_pack_append_buffer
-#error msgpack_pack_append_buffer callback is not defined
-#endif
-
-
-/*
- * Integer
- */
-
-#define msgpack_pack_real_uint8(x, d) \
-do { \
-    if(d < (1<<7)) { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_8(d), 1); \
-    } else { \
-        /* unsigned 8 */ \
-        unsigned char buf[2] = {0xcc, TAKE8_8(d)}; \
-        msgpack_pack_append_buffer(x, buf, 2); \
-    } \
-} while(0)
-
-#define msgpack_pack_real_uint16(x, d) \
-do { \
-    if(d < (1<<7)) { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_16(d), 1); \
-    } else if(d < (1<<8)) { \
-        /* unsigned 8 */ \
-        unsigned char buf[2] = {0xcc, TAKE8_16(d)}; \
-        msgpack_pack_append_buffer(x, buf, 2); \
-    } else { \
-        /* unsigned 16 */ \
-        unsigned char buf[3]; \
-        buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-        msgpack_pack_append_buffer(x, buf, 3); \
-    } \
-} while(0)
-
-#define msgpack_pack_real_uint32(x, d) \
-do { \
-    if(d < (1<<8)) { \
-        if(d < (1<<7)) { \
-            /* fixnum */ \
-            msgpack_pack_append_buffer(x, &TAKE8_32(d), 1); \
-        } else { \
-            /* unsigned 8 */ \
-            unsigned char buf[2] = {0xcc, TAKE8_32(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } \
-    } else { \
-        if(d < (1<<16)) { \
-            /* unsigned 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } else { \
-            /* unsigned 32 */ \
-            unsigned char buf[5]; \
-            buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
-            msgpack_pack_append_buffer(x, buf, 5); \
-        } \
-    } \
-} while(0)
-
-#define msgpack_pack_real_uint64(x, d) \
-do { \
-    if(d < (1ULL<<8)) { \
-        if(d < (1ULL<<7)) { \
-            /* fixnum */ \
-            msgpack_pack_append_buffer(x, &TAKE8_64(d), 1); \
-        } else { \
-            /* unsigned 8 */ \
-            unsigned char buf[2] = {0xcc, TAKE8_64(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } \
-    } else { \
-        if(d < (1ULL<<16)) { \
-            /* unsigned 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } else if(d < (1ULL<<32)) { \
-            /* unsigned 32 */ \
-            unsigned char buf[5]; \
-            buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
-            msgpack_pack_append_buffer(x, buf, 5); \
-        } else { \
-            /* unsigned 64 */ \
-            unsigned char buf[9]; \
-            buf[0] = 0xcf; _msgpack_store64(&buf[1], d); \
-            msgpack_pack_append_buffer(x, buf, 9); \
-        } \
-    } \
-} while(0)
-
-#define msgpack_pack_real_int8(x, d) \
-do { \
-    if(d < -(1<<5)) { \
-        /* signed 8 */ \
-        unsigned char buf[2] = {0xd0, TAKE8_8(d)}; \
-        msgpack_pack_append_buffer(x, buf, 2); \
-    } else { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_8(d), 1); \
-    } \
-} while(0)
-
-#define msgpack_pack_real_int16(x, d) \
-do { \
-    if(d < -(1<<5)) { \
-        if(d < -(1<<7)) { \
-            /* signed 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } else { \
-            /* signed 8 */ \
-            unsigned char buf[2] = {0xd0, TAKE8_16(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } \
-    } else if(d < (1<<7)) { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_16(d), 1); \
-    } else { \
-        if(d < (1<<8)) { \
-            /* unsigned 8 */ \
-            unsigned char buf[2] = {0xcc, TAKE8_16(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } else { \
-            /* unsigned 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } \
-    } \
-} while(0)
-
-#define msgpack_pack_real_int32(x, d) \
-do { \
-    if(d < -(1<<5)) { \
-        if(d < -(1<<15)) { \
-            /* signed 32 */ \
-            unsigned char buf[5]; \
-            buf[0] = 0xd2; _msgpack_store32(&buf[1], (int32_t)d); \
-            msgpack_pack_append_buffer(x, buf, 5); \
-        } else if(d < -(1<<7)) { \
-            /* signed 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } else { \
-            /* signed 8 */ \
-            unsigned char buf[2] = {0xd0, TAKE8_32(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } \
-    } else if(d < (1<<7)) { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_32(d), 1); \
-    } else { \
-        if(d < (1<<8)) { \
-            /* unsigned 8 */ \
-            unsigned char buf[2] = {0xcc, TAKE8_32(d)}; \
-            msgpack_pack_append_buffer(x, buf, 2); \
-        } else if(d < (1<<16)) { \
-            /* unsigned 16 */ \
-            unsigned char buf[3]; \
-            buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-            msgpack_pack_append_buffer(x, buf, 3); \
-        } else { \
-            /* unsigned 32 */ \
-            unsigned char buf[5]; \
-            buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
-            msgpack_pack_append_buffer(x, buf, 5); \
-        } \
-    } \
-} while(0)
-
-#define msgpack_pack_real_int64(x, d) \
-do { \
-    if(d < -(1LL<<5)) { \
-        if(d < -(1LL<<15)) { \
-            if(d < -(1LL<<31)) { \
-                /* signed 64 */ \
-                unsigned char buf[9]; \
-                buf[0] = 0xd3; _msgpack_store64(&buf[1], d); \
-                msgpack_pack_append_buffer(x, buf, 9); \
-            } else { \
-                /* signed 32 */ \
-                unsigned char buf[5]; \
-                buf[0] = 0xd2; _msgpack_store32(&buf[1], (int32_t)d); \
-                msgpack_pack_append_buffer(x, buf, 5); \
-            } \
-        } else { \
-            if(d < -(1<<7)) { \
-                /* signed 16 */ \
-                unsigned char buf[3]; \
-                buf[0] = 0xd1; _msgpack_store16(&buf[1], (int16_t)d); \
-                msgpack_pack_append_buffer(x, buf, 3); \
-            } else { \
-                /* signed 8 */ \
-                unsigned char buf[2] = {0xd0, TAKE8_64(d)}; \
-                msgpack_pack_append_buffer(x, buf, 2); \
-            } \
-        } \
-    } else if(d < (1<<7)) { \
-        /* fixnum */ \
-        msgpack_pack_append_buffer(x, &TAKE8_64(d), 1); \
-    } else { \
-        if(d < (1LL<<16)) { \
-            if(d < (1<<8)) { \
-                /* unsigned 8 */ \
-                unsigned char buf[2] = {0xcc, TAKE8_64(d)}; \
-                msgpack_pack_append_buffer(x, buf, 2); \
-            } else { \
-                /* unsigned 16 */ \
-                unsigned char buf[3]; \
-                buf[0] = 0xcd; _msgpack_store16(&buf[1], (uint16_t)d); \
-                msgpack_pack_append_buffer(x, buf, 3); \
-            } \
-        } else { \
-            if(d < (1LL<<32)) { \
-                /* unsigned 32 */ \
-                unsigned char buf[5]; \
-                buf[0] = 0xce; _msgpack_store32(&buf[1], (uint32_t)d); \
-                msgpack_pack_append_buffer(x, buf, 5); \
-            } else { \
-                /* unsigned 64 */ \
-                unsigned char buf[9]; \
-                buf[0] = 0xcf; _msgpack_store64(&buf[1], d); \
-                msgpack_pack_append_buffer(x, buf, 9); \
-            } \
-        } \
-    } \
-} while(0)
-
-
-static inline int msgpack_pack_uint8(msgpack_packer* x, uint8_t d)
-{
-    msgpack_pack_real_uint8(x, d);
-}
-
-static inline int msgpack_pack_uint16(msgpack_packer* x, uint16_t d)
-{
-    msgpack_pack_real_uint16(x, d);
-}
-
-static inline int msgpack_pack_uint32(msgpack_packer* x, uint32_t d)
-{
-    msgpack_pack_real_uint32(x, d);
-}
-
-static inline int msgpack_pack_uint64(msgpack_packer* x, uint64_t d)
-{
-    msgpack_pack_real_uint64(x, d);
-}
-
-static inline int msgpack_pack_int8(msgpack_packer* x, int8_t d)
-{
-    msgpack_pack_real_int8(x, d);
-}
-
-static inline int msgpack_pack_int16(msgpack_packer* x, int16_t d)
-{
-    msgpack_pack_real_int16(x, d);
-}
-
-static inline int msgpack_pack_int32(msgpack_packer* x, int32_t d)
-{
-    msgpack_pack_real_int32(x, d);
-}
-
-static inline int msgpack_pack_int64(msgpack_packer* x, int64_t d)
-{
-    msgpack_pack_real_int64(x, d);
-}
-
-
-//#ifdef msgpack_pack_inline_func_cint
-
-static inline int msgpack_pack_short(msgpack_packer* x, short d)
-{
-#if defined(SIZEOF_SHORT)
-#if SIZEOF_SHORT == 2
-    msgpack_pack_real_int16(x, d);
-#elif SIZEOF_SHORT == 4
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#elif defined(SHRT_MAX)
-#if SHRT_MAX == 0x7fff
-    msgpack_pack_real_int16(x, d);
-#elif SHRT_MAX == 0x7fffffff
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#else
-if(sizeof(short) == 2) {
-    msgpack_pack_real_int16(x, d);
-} else if(sizeof(short) == 4) {
-    msgpack_pack_real_int32(x, d);
-} else {
-    msgpack_pack_real_int64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_int(msgpack_packer* x, int d)
-{
-#if defined(SIZEOF_INT)
-#if SIZEOF_INT == 2
-    msgpack_pack_real_int16(x, d);
-#elif SIZEOF_INT == 4
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#elif defined(INT_MAX)
-#if INT_MAX == 0x7fff
-    msgpack_pack_real_int16(x, d);
-#elif INT_MAX == 0x7fffffff
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#else
-if(sizeof(int) == 2) {
-    msgpack_pack_real_int16(x, d);
-} else if(sizeof(int) == 4) {
-    msgpack_pack_real_int32(x, d);
-} else {
-    msgpack_pack_real_int64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_long(msgpack_packer* x, long d)
-{
-#if defined(SIZEOF_LONG)
-#if SIZEOF_LONG == 2
-    msgpack_pack_real_int16(x, d);
-#elif SIZEOF_LONG == 4
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#elif defined(LONG_MAX)
-#if LONG_MAX == 0x7fffL
-    msgpack_pack_real_int16(x, d);
-#elif LONG_MAX == 0x7fffffffL
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#else
-if(sizeof(long) == 2) {
-    msgpack_pack_real_int16(x, d);
-} else if(sizeof(long) == 4) {
-    msgpack_pack_real_int32(x, d);
-} else {
-    msgpack_pack_real_int64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_long_long(msgpack_packer* x, long long d)
-{
-#if defined(SIZEOF_LONG_LONG)
-#if SIZEOF_LONG_LONG == 2
-    msgpack_pack_real_int16(x, d);
-#elif SIZEOF_LONG_LONG == 4
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#elif defined(LLONG_MAX)
-#if LLONG_MAX == 0x7fffL
-    msgpack_pack_real_int16(x, d);
-#elif LLONG_MAX == 0x7fffffffL
-    msgpack_pack_real_int32(x, d);
-#else
-    msgpack_pack_real_int64(x, d);
-#endif
-
-#else
-if(sizeof(long long) == 2) {
-    msgpack_pack_real_int16(x, d);
-} else if(sizeof(long long) == 4) {
-    msgpack_pack_real_int32(x, d);
-} else {
-    msgpack_pack_real_int64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_unsigned_short(msgpack_packer* x, unsigned short d)
-{
-#if defined(SIZEOF_SHORT)
-#if SIZEOF_SHORT == 2
-    msgpack_pack_real_uint16(x, d);
-#elif SIZEOF_SHORT == 4
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#elif defined(USHRT_MAX)
-#if USHRT_MAX == 0xffffU
-    msgpack_pack_real_uint16(x, d);
-#elif USHRT_MAX == 0xffffffffU
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#else
-if(sizeof(unsigned short) == 2) {
-    msgpack_pack_real_uint16(x, d);
-} else if(sizeof(unsigned short) == 4) {
-    msgpack_pack_real_uint32(x, d);
-} else {
-    msgpack_pack_real_uint64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_unsigned_int(msgpack_packer* x, unsigned int d)
-{
-#if defined(SIZEOF_INT)
-#if SIZEOF_INT == 2
-    msgpack_pack_real_uint16(x, d);
-#elif SIZEOF_INT == 4
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#elif defined(UINT_MAX)
-#if UINT_MAX == 0xffffU
-    msgpack_pack_real_uint16(x, d);
-#elif UINT_MAX == 0xffffffffU
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#else
-if(sizeof(unsigned int) == 2) {
-    msgpack_pack_real_uint16(x, d);
-} else if(sizeof(unsigned int) == 4) {
-    msgpack_pack_real_uint32(x, d);
-} else {
-    msgpack_pack_real_uint64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_unsigned_long(msgpack_packer* x, unsigned long d)
-{
-#if defined(SIZEOF_LONG)
-#if SIZEOF_LONG == 2
-    msgpack_pack_real_uint16(x, d);
-#elif SIZEOF_LONG == 4
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#elif defined(ULONG_MAX)
-#if ULONG_MAX == 0xffffUL
-    msgpack_pack_real_uint16(x, d);
-#elif ULONG_MAX == 0xffffffffUL
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#else
-if(sizeof(unsigned long) == 2) {
-    msgpack_pack_real_uint16(x, d);
-} else if(sizeof(unsigned long) == 4) {
-    msgpack_pack_real_uint32(x, d);
-} else {
-    msgpack_pack_real_uint64(x, d);
-}
-#endif
-}
-
-static inline int msgpack_pack_unsigned_long_long(msgpack_packer* x, unsigned long long d)
-{
-#if defined(SIZEOF_LONG_LONG)
-#if SIZEOF_LONG_LONG == 2
-    msgpack_pack_real_uint16(x, d);
-#elif SIZEOF_LONG_LONG == 4
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#elif defined(ULLONG_MAX)
-#if ULLONG_MAX == 0xffffUL
-    msgpack_pack_real_uint16(x, d);
-#elif ULLONG_MAX == 0xffffffffUL
-    msgpack_pack_real_uint32(x, d);
-#else
-    msgpack_pack_real_uint64(x, d);
-#endif
-
-#else
-if(sizeof(unsigned long long) == 2) {
-    msgpack_pack_real_uint16(x, d);
-} else if(sizeof(unsigned long long) == 4) {
-    msgpack_pack_real_uint32(x, d);
-} else {
-    msgpack_pack_real_uint64(x, d);
-}
-#endif
-}
-
-//#undef msgpack_pack_inline_func_cint
-//#endif
-
-
-
-/*
- * Float
- */
-
-static inline int msgpack_pack_float(msgpack_packer* x, float d)
-{
-    unsigned char buf[5];
-    buf[0] = 0xca;
-
-#if PY_VERSION_HEX >= 0x030B00A7
-    PyFloat_Pack4(d, (char *)&buf[1], 0);
-#else
-    _PyFloat_Pack4(d, &buf[1], 0);
-#endif
-    msgpack_pack_append_buffer(x, buf, 5);
-}
-
-static inline int msgpack_pack_double(msgpack_packer* x, double d)
-{
-    unsigned char buf[9];
-    buf[0] = 0xcb;
-#if PY_VERSION_HEX >= 0x030B00A7
-    PyFloat_Pack8(d, (char *)&buf[1], 0);
-#else
-    _PyFloat_Pack8(d, &buf[1], 0);
-#endif
-    msgpack_pack_append_buffer(x, buf, 9);
-}
-
-
-/*
- * Nil
- */
-
-static inline int msgpack_pack_nil(msgpack_packer* x)
-{
-    static const unsigned char d = 0xc0;
-    msgpack_pack_append_buffer(x, &d, 1);
-}
-
-
-/*
- * Boolean
- */
-
-static inline int msgpack_pack_true(msgpack_packer* x)
-{
-    static const unsigned char d = 0xc3;
-    msgpack_pack_append_buffer(x, &d, 1);
-}
-
-static inline int msgpack_pack_false(msgpack_packer* x)
-{
-    static const unsigned char d = 0xc2;
-    msgpack_pack_append_buffer(x, &d, 1);
-}
-
-
-/*
- * Array
- */
-
-static inline int msgpack_pack_array(msgpack_packer* x, unsigned int n)
-{
-    if(n < 16) {
-        unsigned char d = 0x90 | n;
-        msgpack_pack_append_buffer(x, &d, 1);
-    } else if(n < 65536) {
-        unsigned char buf[3];
-        buf[0] = 0xdc; _msgpack_store16(&buf[1], (uint16_t)n);
-        msgpack_pack_append_buffer(x, buf, 3);
-    } else {
-        unsigned char buf[5];
-        buf[0] = 0xdd; _msgpack_store32(&buf[1], (uint32_t)n);
-        msgpack_pack_append_buffer(x, buf, 5);
-    }
-}
-
-
-/*
- * Map
- */
-
-static inline int msgpack_pack_map(msgpack_packer* x, unsigned int n)
-{
-    if(n < 16) {
-        unsigned char d = 0x80 | n;
-        msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
-    } else if(n < 65536) {
-        unsigned char buf[3];
-        buf[0] = 0xde; _msgpack_store16(&buf[1], (uint16_t)n);
-        msgpack_pack_append_buffer(x, buf, 3);
-    } else {
-        unsigned char buf[5];
-        buf[0] = 0xdf; _msgpack_store32(&buf[1], (uint32_t)n);
-        msgpack_pack_append_buffer(x, buf, 5);
-    }
-}
-
-
-/*
- * Raw
- */
-
-static inline int msgpack_pack_raw(msgpack_packer* x, size_t l)
-{
-    if (l < 32) {
-        unsigned char d = 0xa0 | (uint8_t)l;
-        msgpack_pack_append_buffer(x, &TAKE8_8(d), 1);
-    } else if (x->use_bin_type && l < 256) {  // str8 is new format introduced with bin.
-        unsigned char buf[2] = {0xd9, (uint8_t)l};
-        msgpack_pack_append_buffer(x, buf, 2);
-    } else if (l < 65536) {
-        unsigned char buf[3];
-        buf[0] = 0xda; _msgpack_store16(&buf[1], (uint16_t)l);
-        msgpack_pack_append_buffer(x, buf, 3);
-    } else {
-        unsigned char buf[5];
-        buf[0] = 0xdb; _msgpack_store32(&buf[1], (uint32_t)l);
-        msgpack_pack_append_buffer(x, buf, 5);
-    }
-}
-
-/*
- * bin
- */
-static inline int msgpack_pack_bin(msgpack_packer *x, size_t l)
-{
-    if (!x->use_bin_type) {
-        return msgpack_pack_raw(x, l);
-    }
-    if (l < 256) {
-        unsigned char buf[2] = {0xc4, (unsigned char)l};
-        msgpack_pack_append_buffer(x, buf, 2);
-    } else if (l < 65536) {
-        unsigned char buf[3] = {0xc5};
-        _msgpack_store16(&buf[1], (uint16_t)l);
-        msgpack_pack_append_buffer(x, buf, 3);
-    } else {
-        unsigned char buf[5] = {0xc6};
-        _msgpack_store32(&buf[1], (uint32_t)l);
-        msgpack_pack_append_buffer(x, buf, 5);
-    }
-}
-
-static inline int msgpack_pack_raw_body(msgpack_packer* x, const void* b, size_t l)
-{
-    if (l > 0) msgpack_pack_append_buffer(x, (const unsigned char*)b, l);
-    return 0;
-}
-
-/*
- * Ext
- */
-static inline int msgpack_pack_ext(msgpack_packer* x, char typecode, size_t l)
-{
-    if (l == 1) {
-        unsigned char buf[2];
-        buf[0] = 0xd4;
-        buf[1] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 2);
-    }
-    else if(l == 2) {
-        unsigned char buf[2];
-        buf[0] = 0xd5;
-        buf[1] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 2);
-    }
-    else if(l == 4) {
-        unsigned char buf[2];
-        buf[0] = 0xd6;
-        buf[1] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 2);
-    }
-    else if(l == 8) {
-        unsigned char buf[2];
-        buf[0] = 0xd7;
-        buf[1] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 2);
-    }
-    else if(l == 16) {
-        unsigned char buf[2];
-        buf[0] = 0xd8;
-        buf[1] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 2);
-    }
-    else if(l < 256) {
-        unsigned char buf[3];
-        buf[0] = 0xc7;
-        buf[1] = l;
-        buf[2] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 3);
-    } else if(l < 65536) {
-        unsigned char buf[4];
-        buf[0] = 0xc8;
-        _msgpack_store16(&buf[1], (uint16_t)l);
-        buf[3] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 4);
-    } else {
-        unsigned char buf[6];
-        buf[0] = 0xc9;
-        _msgpack_store32(&buf[1], (uint32_t)l);
-        buf[5] = (unsigned char)typecode;
-        msgpack_pack_append_buffer(x, buf, 6);
-    }
-
-}
-
-/*
- * Pack Timestamp extension type. Follows msgpack-c pack_template.h.
- */
-static inline int msgpack_pack_timestamp(msgpack_packer* x, int64_t seconds, uint32_t nanoseconds)
-{
-    if ((seconds >> 34) == 0) {
-        /* seconds is unsigned and fits in 34 bits */
-        uint64_t data64 = ((uint64_t)nanoseconds << 34) | (uint64_t)seconds;
-        if ((data64 & 0xffffffff00000000L) == 0) {
-            /* no nanoseconds and seconds is 32bits or smaller. timestamp32. */
-            unsigned char buf[4];
-            uint32_t data32 = (uint32_t)data64;
-            msgpack_pack_ext(x, -1, 4);
-            _msgpack_store32(buf, data32);
-            msgpack_pack_raw_body(x, buf, 4);
-        } else {
-            /* timestamp64 */
-            unsigned char buf[8];
-            msgpack_pack_ext(x, -1, 8);
-            _msgpack_store64(buf, data64);
-            msgpack_pack_raw_body(x, buf, 8);
-
-        }
-    } else {
-       /* seconds is signed or >34bits */
-       unsigned char buf[12];
-       _msgpack_store32(&buf[0], nanoseconds);
-       _msgpack_store64(&buf[4], seconds);
-       msgpack_pack_ext(x, -1, 12);
-       msgpack_pack_raw_body(x, buf, 12);
-    }
-    return 0;
-}
-
-
-#undef msgpack_pack_append_buffer
-
-#undef TAKE8_8
-#undef TAKE8_16
-#undef TAKE8_32
-#undef TAKE8_64
-
-#undef msgpack_pack_real_uint8
-#undef msgpack_pack_real_uint16
-#undef msgpack_pack_real_uint32
-#undef msgpack_pack_real_uint64
-#undef msgpack_pack_real_int8
-#undef msgpack_pack_real_int16
-#undef msgpack_pack_real_int32
-#undef msgpack_pack_real_int64
diff --git a/libs/msgpack/sysdep.h b/libs/msgpack/sysdep.h
deleted file mode 100644
index 70673004a..000000000
--- a/libs/msgpack/sysdep.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * MessagePack system dependencies
- *
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    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.
- */
-#ifndef MSGPACK_SYSDEP_H__
-#define MSGPACK_SYSDEP_H__
-
-#include <stdlib.h>
-#include <stddef.h>
-#if defined(_MSC_VER) && _MSC_VER < 1600
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif defined(_MSC_VER)  // && _MSC_VER >= 1600
-#include <stdint.h>
-#else
-#include <stdint.h>
-#include <stdbool.h>
-#endif
-
-#ifdef _WIN32
-#define _msgpack_atomic_counter_header <windows.h>
-typedef long _msgpack_atomic_counter_t;
-#define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr)
-#define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr)
-#elif defined(__GNUC__) && ((__GNUC__*10 + __GNUC_MINOR__) < 41)
-#define _msgpack_atomic_counter_header "gcc_atomic.h"
-#else
-typedef unsigned int _msgpack_atomic_counter_t;
-#define _msgpack_sync_decr_and_fetch(ptr) __sync_sub_and_fetch(ptr, 1)
-#define _msgpack_sync_incr_and_fetch(ptr) __sync_add_and_fetch(ptr, 1)
-#endif
-
-#ifdef _WIN32
-
-#ifdef __cplusplus
-/* numeric_limits<T>::min,max */
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-#endif
-
-#else /* _WIN32 */
-#include <arpa/inet.h> /* ntohs, ntohl */
-#endif
-
-#if !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define __LITTLE_ENDIAN__
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define __BIG_ENDIAN__
-#elif _WIN32
-#define __LITTLE_ENDIAN__
-#endif
-#endif
-
-
-#ifdef __LITTLE_ENDIAN__
-
-#ifdef _WIN32
-#  if defined(ntohs)
-#    define _msgpack_be16(x) ntohs(x)
-#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#    define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
-#  else
-#    define _msgpack_be16(x) ( \
-        ((((uint16_t)x) <<  8) ) | \
-        ((((uint16_t)x) >>  8) ) )
-#  endif
-#else
-#  define _msgpack_be16(x) ntohs(x)
-#endif
-
-#ifdef _WIN32
-#  if defined(ntohl)
-#    define _msgpack_be32(x) ntohl(x)
-#  elif defined(_byteswap_ulong) || defined(_MSC_VER)
-#    define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
-#  else
-#    define _msgpack_be32(x) \
-        ( ((((uint32_t)x) << 24)               ) | \
-          ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
-          ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
-          ((((uint32_t)x) >> 24)               ) )
-#  endif
-#else
-#  define _msgpack_be32(x) ntohl(x)
-#endif
-
-#if defined(_byteswap_uint64) || defined(_MSC_VER)
-#  define _msgpack_be64(x) (_byteswap_uint64(x))
-#elif defined(bswap_64)
-#  define _msgpack_be64(x) bswap_64(x)
-#elif defined(__DARWIN_OSSwapInt64)
-#  define _msgpack_be64(x) __DARWIN_OSSwapInt64(x)
-#else
-#define _msgpack_be64(x) \
-    ( ((((uint64_t)x) << 56)                         ) | \
-      ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
-      ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
-      ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
-      ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
-      ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
-      ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
-      ((((uint64_t)x) >> 56)                         ) )
-#endif
-
-#define _msgpack_load16(cast, from) ((cast)( \
-        (((uint16_t)((uint8_t*)(from))[0]) << 8) | \
-        (((uint16_t)((uint8_t*)(from))[1])     ) ))
-
-#define _msgpack_load32(cast, from) ((cast)( \
-        (((uint32_t)((uint8_t*)(from))[0]) << 24) | \
-        (((uint32_t)((uint8_t*)(from))[1]) << 16) | \
-        (((uint32_t)((uint8_t*)(from))[2]) <<  8) | \
-        (((uint32_t)((uint8_t*)(from))[3])      ) ))
-
-#define _msgpack_load64(cast, from) ((cast)( \
-        (((uint64_t)((uint8_t*)(from))[0]) << 56) | \
-        (((uint64_t)((uint8_t*)(from))[1]) << 48) | \
-        (((uint64_t)((uint8_t*)(from))[2]) << 40) | \
-        (((uint64_t)((uint8_t*)(from))[3]) << 32) | \
-        (((uint64_t)((uint8_t*)(from))[4]) << 24) | \
-        (((uint64_t)((uint8_t*)(from))[5]) << 16) | \
-        (((uint64_t)((uint8_t*)(from))[6]) << 8)  | \
-        (((uint64_t)((uint8_t*)(from))[7])     )  ))
-
-#else
-
-#define _msgpack_be16(x) (x)
-#define _msgpack_be32(x) (x)
-#define _msgpack_be64(x) (x)
-
-#define _msgpack_load16(cast, from) ((cast)( \
-        (((uint16_t)((uint8_t*)from)[0]) << 8) | \
-        (((uint16_t)((uint8_t*)from)[1])     ) ))
-
-#define _msgpack_load32(cast, from) ((cast)( \
-        (((uint32_t)((uint8_t*)from)[0]) << 24) | \
-        (((uint32_t)((uint8_t*)from)[1]) << 16) | \
-        (((uint32_t)((uint8_t*)from)[2]) <<  8) | \
-        (((uint32_t)((uint8_t*)from)[3])      ) ))
-
-#define _msgpack_load64(cast, from) ((cast)( \
-        (((uint64_t)((uint8_t*)from)[0]) << 56) | \
-        (((uint64_t)((uint8_t*)from)[1]) << 48) | \
-        (((uint64_t)((uint8_t*)from)[2]) << 40) | \
-        (((uint64_t)((uint8_t*)from)[3]) << 32) | \
-        (((uint64_t)((uint8_t*)from)[4]) << 24) | \
-        (((uint64_t)((uint8_t*)from)[5]) << 16) | \
-        (((uint64_t)((uint8_t*)from)[6]) << 8)  | \
-        (((uint64_t)((uint8_t*)from)[7])     )  ))
-#endif
-
-
-#define _msgpack_store16(to, num) \
-    do { uint16_t val = _msgpack_be16(num); memcpy(to, &val, 2); } while(0)
-#define _msgpack_store32(to, num) \
-    do { uint32_t val = _msgpack_be32(num); memcpy(to, &val, 4); } while(0)
-#define _msgpack_store64(to, num) \
-    do { uint64_t val = _msgpack_be64(num); memcpy(to, &val, 8); } while(0)
-
-/*
-#define _msgpack_load16(cast, from) \
-    ({ cast val; memcpy(&val, (char*)from, 2); _msgpack_be16(val); })
-#define _msgpack_load32(cast, from) \
-    ({ cast val; memcpy(&val, (char*)from, 4); _msgpack_be32(val); })
-#define _msgpack_load64(cast, from) \
-    ({ cast val; memcpy(&val, (char*)from, 8); _msgpack_be64(val); })
-*/
-
-
-#endif /* msgpack/sysdep.h */
diff --git a/libs/msgpack/unpack.h b/libs/msgpack/unpack.h
deleted file mode 100644
index 23aa62201..000000000
--- a/libs/msgpack/unpack.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * MessagePack for Python unpacking routine
- *
- * Copyright (C) 2009 Naoki INADA
- *
- *    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.
- */
-
-#define MSGPACK_EMBED_STACK_SIZE  (1024)
-#include "unpack_define.h"
-
-typedef struct unpack_user {
-    bool use_list;
-    bool raw;
-    bool has_pairs_hook;
-    bool strict_map_key;
-    int timestamp;
-    PyObject *object_hook;
-    PyObject *list_hook;
-    PyObject *ext_hook;
-    PyObject *timestamp_t;
-    PyObject *giga;
-    PyObject *utc;
-    const char *unicode_errors;
-    Py_ssize_t max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len;
-} unpack_user;
-
-typedef PyObject* msgpack_unpack_object;
-struct unpack_context;
-typedef struct unpack_context unpack_context;
-typedef int (*execute_fn)(unpack_context *ctx, const char* data, Py_ssize_t len, Py_ssize_t* off);
-
-static inline msgpack_unpack_object unpack_callback_root(unpack_user* u)
-{
-    return NULL;
-}
-
-static inline int unpack_callback_uint16(unpack_user* u, uint16_t d, msgpack_unpack_object* o)
-{
-    PyObject *p = PyInt_FromLong((long)d);
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-static inline int unpack_callback_uint8(unpack_user* u, uint8_t d, msgpack_unpack_object* o)
-{
-    return unpack_callback_uint16(u, d, o);
-}
-
-
-static inline int unpack_callback_uint32(unpack_user* u, uint32_t d, msgpack_unpack_object* o)
-{
-    PyObject *p = PyInt_FromSize_t((size_t)d);
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_uint64(unpack_user* u, uint64_t d, msgpack_unpack_object* o)
-{
-    PyObject *p;
-    if (d > LONG_MAX) {
-        p = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)d);
-    } else {
-        p = PyInt_FromLong((long)d);
-    }
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_int32(unpack_user* u, int32_t d, msgpack_unpack_object* o)
-{
-    PyObject *p = PyInt_FromLong(d);
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_int16(unpack_user* u, int16_t d, msgpack_unpack_object* o)
-{
-    return unpack_callback_int32(u, d, o);
-}
-
-static inline int unpack_callback_int8(unpack_user* u, int8_t d, msgpack_unpack_object* o)
-{
-    return unpack_callback_int32(u, d, o);
-}
-
-static inline int unpack_callback_int64(unpack_user* u, int64_t d, msgpack_unpack_object* o)
-{
-    PyObject *p;
-    if (d > LONG_MAX || d < LONG_MIN) {
-        p = PyLong_FromLongLong((PY_LONG_LONG)d);
-    } else {
-        p = PyInt_FromLong((long)d);
-    }
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_double(unpack_user* u, double d, msgpack_unpack_object* o)
-{
-    PyObject *p = PyFloat_FromDouble(d);
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_float(unpack_user* u, float d, msgpack_unpack_object* o)
-{
-    return unpack_callback_double(u, d, o);
-}
-
-static inline int unpack_callback_nil(unpack_user* u, msgpack_unpack_object* o)
-{ Py_INCREF(Py_None); *o = Py_None; return 0; }
-
-static inline int unpack_callback_true(unpack_user* u, msgpack_unpack_object* o)
-{ Py_INCREF(Py_True); *o = Py_True; return 0; }
-
-static inline int unpack_callback_false(unpack_user* u, msgpack_unpack_object* o)
-{ Py_INCREF(Py_False); *o = Py_False; return 0; }
-
-static inline int unpack_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
-{
-    if (n > u->max_array_len) {
-        PyErr_Format(PyExc_ValueError, "%u exceeds max_array_len(%zd)", n, u->max_array_len);
-        return -1;
-    }
-    PyObject *p = u->use_list ? PyList_New(n) : PyTuple_New(n);
-
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_array_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object o)
-{
-    if (u->use_list)
-        PyList_SET_ITEM(*c, current, o);
-    else
-        PyTuple_SET_ITEM(*c, current, o);
-    return 0;
-}
-
-static inline int unpack_callback_array_end(unpack_user* u, msgpack_unpack_object* c)
-{
-    if (u->list_hook) {
-        PyObject *new_c = PyObject_CallFunctionObjArgs(u->list_hook, *c, NULL);
-        if (!new_c)
-            return -1;
-        Py_DECREF(*c);
-        *c = new_c;
-    }
-    return 0;
-}
-
-static inline int unpack_callback_map(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
-{
-    if (n > u->max_map_len) {
-        PyErr_Format(PyExc_ValueError, "%u exceeds max_map_len(%zd)", n, u->max_map_len);
-        return -1;
-    }
-    PyObject *p;
-    if (u->has_pairs_hook) {
-        p = PyList_New(n); // Or use tuple?
-    }
-    else {
-        p = PyDict_New();
-    }
-    if (!p)
-        return -1;
-    *o = p;
-    return 0;
-}
-
-static inline int unpack_callback_map_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object k, msgpack_unpack_object v)
-{
-    if (u->strict_map_key && !PyUnicode_CheckExact(k) && !PyBytes_CheckExact(k)) {
-        PyErr_Format(PyExc_ValueError, "%.100s is not allowed for map key when strict_map_key=True", Py_TYPE(k)->tp_name);
-        return -1;
-    }
-    if (PyUnicode_CheckExact(k)) {
-        PyUnicode_InternInPlace(&k);
-    }
-    if (u->has_pairs_hook) {
-        msgpack_unpack_object item = PyTuple_Pack(2, k, v);
-        if (!item)
-            return -1;
-        Py_DECREF(k);
-        Py_DECREF(v);
-        PyList_SET_ITEM(*c, current, item);
-        return 0;
-    }
-    else if (PyDict_SetItem(*c, k, v) == 0) {
-        Py_DECREF(k);
-        Py_DECREF(v);
-        return 0;
-    }
-    return -1;
-}
-
-static inline int unpack_callback_map_end(unpack_user* u, msgpack_unpack_object* c)
-{
-    if (u->object_hook) {
-        PyObject *new_c = PyObject_CallFunctionObjArgs(u->object_hook, *c, NULL);
-        if (!new_c)
-            return -1;
-
-        Py_DECREF(*c);
-        *c = new_c;
-    }
-    return 0;
-}
-
-static inline int unpack_callback_raw(unpack_user* u, const char* b, const char* p, unsigned int l, msgpack_unpack_object* o)
-{
-    if (l > u->max_str_len) {
-        PyErr_Format(PyExc_ValueError, "%u exceeds max_str_len(%zd)", l, u->max_str_len);
-        return -1;
-    }
-
-    PyObject *py;
-
-    if (u->raw) {
-        py = PyBytes_FromStringAndSize(p, l);
-    } else {
-        py = PyUnicode_DecodeUTF8(p, l, u->unicode_errors);
-    }
-    if (!py)
-        return -1;
-    *o = py;
-    return 0;
-}
-
-static inline int unpack_callback_bin(unpack_user* u, const char* b, const char* p, unsigned int l, msgpack_unpack_object* o)
-{
-    if (l > u->max_bin_len) {
-        PyErr_Format(PyExc_ValueError, "%u exceeds max_bin_len(%zd)", l, u->max_bin_len);
-        return -1;
-    }
-
-    PyObject *py = PyBytes_FromStringAndSize(p, l);
-    if (!py)
-        return -1;
-    *o = py;
-    return 0;
-}
-
-typedef struct msgpack_timestamp {
-    int64_t tv_sec;
-    uint32_t tv_nsec;
-} msgpack_timestamp;
-
-/*
- * Unpack ext buffer to a timestamp. Pulled from msgpack-c timestamp.h.
- */
-static int unpack_timestamp(const char* buf, unsigned int buflen, msgpack_timestamp* ts) {
-    switch (buflen) {
-    case 4:
-        ts->tv_nsec = 0;
-        {
-            uint32_t v = _msgpack_load32(uint32_t, buf);
-            ts->tv_sec = (int64_t)v;
-        }
-        return 0;
-    case 8: {
-        uint64_t value =_msgpack_load64(uint64_t, buf);
-        ts->tv_nsec = (uint32_t)(value >> 34);
-        ts->tv_sec = value & 0x00000003ffffffffLL;
-        return 0;
-    }
-    case 12:
-        ts->tv_nsec = _msgpack_load32(uint32_t, buf);
-        ts->tv_sec = _msgpack_load64(int64_t, buf + 4);
-        return 0;
-    default:
-        return -1;
-    }
-}
-
-#include "datetime.h"
-
-static int unpack_callback_ext(unpack_user* u, const char* base, const char* pos,
-                               unsigned int length, msgpack_unpack_object* o)
-{
-    int8_t typecode = (int8_t)*pos++;
-    if (!u->ext_hook) {
-        PyErr_SetString(PyExc_AssertionError, "u->ext_hook cannot be NULL");
-        return -1;
-    }
-    if (length-1 > u->max_ext_len) {
-        PyErr_Format(PyExc_ValueError, "%u exceeds max_ext_len(%zd)", length, u->max_ext_len);
-        return -1;
-    }
-
-    PyObject *py = NULL;
-    // length also includes the typecode, so the actual data is length-1
-    if (typecode == -1) {
-        msgpack_timestamp ts;
-        if (unpack_timestamp(pos, length-1, &ts) < 0) {
-            return -1;
-        }
-
-        if (u->timestamp == 2) {  // int
-            PyObject *a = PyLong_FromLongLong(ts.tv_sec);
-            if (a == NULL) return -1;
-
-            PyObject *c = PyNumber_Multiply(a, u->giga);
-            Py_DECREF(a);
-            if (c == NULL) {
-                return -1;
-            }
-
-            PyObject *b = PyLong_FromUnsignedLong(ts.tv_nsec);
-            if (b == NULL) {
-                Py_DECREF(c);
-                return -1;
-            }
-
-            py = PyNumber_Add(c, b);
-            Py_DECREF(c);
-            Py_DECREF(b);
-        }
-        else if (u->timestamp == 0) {  // Timestamp
-            py = PyObject_CallFunction(u->timestamp_t, "(Lk)", ts.tv_sec, ts.tv_nsec);
-        }
-        else if (u->timestamp == 3) {  // datetime
-            // Calculate datetime using epoch + delta
-            // due to limitations PyDateTime_FromTimestamp on Windows with negative timestamps
-            PyObject *epoch = PyDateTimeAPI->DateTime_FromDateAndTime(1970, 1, 1, 0, 0, 0, 0, u->utc, PyDateTimeAPI->DateTimeType);
-            if (epoch == NULL) {
-                return -1;
-            }
-
-            PyObject* d = PyDelta_FromDSU(ts.tv_sec/(24*3600), ts.tv_sec%(24*3600), ts.tv_nsec / 1000);
-            if (d == NULL) {
-                Py_DECREF(epoch);
-                return -1;
-            }
-
-            py = PyNumber_Add(epoch, d);
-
-            Py_DECREF(epoch);
-            Py_DECREF(d);
-        }
-        else { // float
-            PyObject *a = PyFloat_FromDouble((double)ts.tv_nsec);
-            if (a == NULL) return -1;
-
-            PyObject *b = PyNumber_TrueDivide(a, u->giga);
-            Py_DECREF(a);
-            if (b == NULL) return -1;
-
-            PyObject *c = PyLong_FromLongLong(ts.tv_sec);
-            if (c == NULL) {
-                Py_DECREF(b);
-                return -1;
-            }
-
-            a = PyNumber_Add(b, c);
-            Py_DECREF(b);
-            Py_DECREF(c);
-            py = a;
-        }
-    } else {
-        py = PyObject_CallFunction(u->ext_hook, "(iy#)", (int)typecode, pos, (Py_ssize_t)length-1);
-    }
-    if (!py)
-        return -1;
-    *o = py;
-    return 0;
-}
-
-#include "unpack_template.h"
diff --git a/libs/msgpack/unpack_define.h b/libs/msgpack/unpack_define.h
deleted file mode 100644
index 0dd708d17..000000000
--- a/libs/msgpack/unpack_define.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * MessagePack unpacking routine template
- *
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    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.
- */
-#ifndef MSGPACK_UNPACK_DEFINE_H__
-#define MSGPACK_UNPACK_DEFINE_H__
-
-#include "msgpack/sysdep.h"
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#ifndef MSGPACK_EMBED_STACK_SIZE
-#define MSGPACK_EMBED_STACK_SIZE 32
-#endif
-
-
-// CS is first byte & 0x1f
-typedef enum {
-    CS_HEADER            = 0x00,  // nil
-
-    //CS_                = 0x01,
-    //CS_                = 0x02,  // false
-    //CS_                = 0x03,  // true
-
-    CS_BIN_8             = 0x04,
-    CS_BIN_16            = 0x05,
-    CS_BIN_32            = 0x06,
-
-    CS_EXT_8             = 0x07,
-    CS_EXT_16            = 0x08,
-    CS_EXT_32            = 0x09,
-
-    CS_FLOAT             = 0x0a,
-    CS_DOUBLE            = 0x0b,
-    CS_UINT_8            = 0x0c,
-    CS_UINT_16           = 0x0d,
-    CS_UINT_32           = 0x0e,
-    CS_UINT_64           = 0x0f,
-    CS_INT_8             = 0x10,
-    CS_INT_16            = 0x11,
-    CS_INT_32            = 0x12,
-    CS_INT_64            = 0x13,
-
-    //CS_FIXEXT1           = 0x14,
-    //CS_FIXEXT2           = 0x15,
-    //CS_FIXEXT4           = 0x16,
-    //CS_FIXEXT8           = 0x17,
-    //CS_FIXEXT16          = 0x18,
-
-    CS_RAW_8             = 0x19,
-    CS_RAW_16            = 0x1a,
-    CS_RAW_32            = 0x1b,
-    CS_ARRAY_16          = 0x1c,
-    CS_ARRAY_32          = 0x1d,
-    CS_MAP_16            = 0x1e,
-    CS_MAP_32            = 0x1f,
-
-    ACS_RAW_VALUE,
-    ACS_BIN_VALUE,
-    ACS_EXT_VALUE,
-} msgpack_unpack_state;
-
-
-typedef enum {
-    CT_ARRAY_ITEM,
-    CT_MAP_KEY,
-    CT_MAP_VALUE,
-} msgpack_container_type;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* msgpack/unpack_define.h */
diff --git a/libs/msgpack/unpack_template.h b/libs/msgpack/unpack_template.h
deleted file mode 100644
index 8b9fcc195..000000000
--- a/libs/msgpack/unpack_template.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * MessagePack unpacking routine template
- *
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    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.
- */
-
-#ifndef USE_CASE_RANGE
-#if !defined(_MSC_VER)
-#define USE_CASE_RANGE
-#endif
-#endif
-
-typedef struct unpack_stack {
-    PyObject* obj;
-    Py_ssize_t size;
-    Py_ssize_t count;
-    unsigned int ct;
-    PyObject* map_key;
-} unpack_stack;
-
-struct unpack_context {
-    unpack_user user;
-    unsigned int cs;
-    unsigned int trail;
-    unsigned int top;
-    /*
-    unpack_stack* stack;
-    unsigned int stack_size;
-    unpack_stack embed_stack[MSGPACK_EMBED_STACK_SIZE];
-    */
-    unpack_stack stack[MSGPACK_EMBED_STACK_SIZE];
-};
-
-
-static inline void unpack_init(unpack_context* ctx)
-{
-    ctx->cs = CS_HEADER;
-    ctx->trail = 0;
-    ctx->top = 0;
-    /*
-    ctx->stack = ctx->embed_stack;
-    ctx->stack_size = MSGPACK_EMBED_STACK_SIZE;
-    */
-    ctx->stack[0].obj = unpack_callback_root(&ctx->user);
-}
-
-/*
-static inline void unpack_destroy(unpack_context* ctx)
-{
-    if(ctx->stack_size != MSGPACK_EMBED_STACK_SIZE) {
-        free(ctx->stack);
-    }
-}
-*/
-
-static inline PyObject* unpack_data(unpack_context* ctx)
-{
-    return (ctx)->stack[0].obj;
-}
-
-static inline void unpack_clear(unpack_context *ctx)
-{
-    Py_CLEAR(ctx->stack[0].obj);
-}
-
-template <bool construct>
-static inline int unpack_execute(unpack_context* ctx, const char* data, Py_ssize_t len, Py_ssize_t* off)
-{
-    assert(len >= *off);
-
-    const unsigned char* p = (unsigned char*)data + *off;
-    const unsigned char* const pe = (unsigned char*)data + len;
-    const void* n = p;
-
-    unsigned int trail = ctx->trail;
-    unsigned int cs = ctx->cs;
-    unsigned int top = ctx->top;
-    unpack_stack* stack = ctx->stack;
-    /*
-    unsigned int stack_size = ctx->stack_size;
-    */
-    unpack_user* user = &ctx->user;
-
-    PyObject* obj = NULL;
-    unpack_stack* c = NULL;
-
-    int ret;
-
-#define construct_cb(name) \
-    construct && unpack_callback ## name
-
-#define push_simple_value(func) \
-    if(construct_cb(func)(user, &obj) < 0) { goto _failed; } \
-    goto _push
-#define push_fixed_value(func, arg) \
-    if(construct_cb(func)(user, arg, &obj) < 0) { goto _failed; } \
-    goto _push
-#define push_variable_value(func, base, pos, len) \
-    if(construct_cb(func)(user, \
-        (const char*)base, (const char*)pos, len, &obj) < 0) { goto _failed; } \
-    goto _push
-
-#define again_fixed_trail(_cs, trail_len) \
-    trail = trail_len; \
-    cs = _cs; \
-    goto _fixed_trail_again
-#define again_fixed_trail_if_zero(_cs, trail_len, ifzero) \
-    trail = trail_len; \
-    if(trail == 0) { goto ifzero; } \
-    cs = _cs; \
-    goto _fixed_trail_again
-
-#define start_container(func, count_, ct_) \
-    if(top >= MSGPACK_EMBED_STACK_SIZE) { ret = -3; goto _end; } \
-    if(construct_cb(func)(user, count_, &stack[top].obj) < 0) { goto _failed; } \
-    if((count_) == 0) { obj = stack[top].obj; \
-        if (construct_cb(func##_end)(user, &obj) < 0) { goto _failed; } \
-        goto _push; } \
-    stack[top].ct = ct_; \
-    stack[top].size  = count_; \
-    stack[top].count = 0; \
-    ++top; \
-    goto _header_again
-
-#define NEXT_CS(p)  ((unsigned int)*p & 0x1f)
-
-#ifdef USE_CASE_RANGE
-#define SWITCH_RANGE_BEGIN     switch(*p) {
-#define SWITCH_RANGE(FROM, TO) case FROM ... TO:
-#define SWITCH_RANGE_DEFAULT   default:
-#define SWITCH_RANGE_END       }
-#else
-#define SWITCH_RANGE_BEGIN     { if(0) {
-#define SWITCH_RANGE(FROM, TO) } else if(FROM <= *p && *p <= TO) {
-#define SWITCH_RANGE_DEFAULT   } else {
-#define SWITCH_RANGE_END       } }
-#endif
-
-    if(p == pe) { goto _out; }
-    do {
-        switch(cs) {
-        case CS_HEADER:
-            SWITCH_RANGE_BEGIN
-            SWITCH_RANGE(0x00, 0x7f)  // Positive Fixnum
-                push_fixed_value(_uint8, *(uint8_t*)p);
-            SWITCH_RANGE(0xe0, 0xff)  // Negative Fixnum
-                push_fixed_value(_int8, *(int8_t*)p);
-            SWITCH_RANGE(0xc0, 0xdf)  // Variable
-                switch(*p) {
-                case 0xc0:  // nil
-                    push_simple_value(_nil);
-                //case 0xc1:  // never used
-                case 0xc2:  // false
-                    push_simple_value(_false);
-                case 0xc3:  // true
-                    push_simple_value(_true);
-                case 0xc4:  // bin 8
-                    again_fixed_trail(NEXT_CS(p), 1);
-                case 0xc5:  // bin 16
-                    again_fixed_trail(NEXT_CS(p), 2);
-                case 0xc6:  // bin 32
-                    again_fixed_trail(NEXT_CS(p), 4);
-                case 0xc7:  // ext 8
-                    again_fixed_trail(NEXT_CS(p), 1);
-                case 0xc8:  // ext 16
-                    again_fixed_trail(NEXT_CS(p), 2);
-                case 0xc9:  // ext 32
-                    again_fixed_trail(NEXT_CS(p), 4);
-                case 0xca:  // float
-                case 0xcb:  // double
-                case 0xcc:  // unsigned int  8
-                case 0xcd:  // unsigned int 16
-                case 0xce:  // unsigned int 32
-                case 0xcf:  // unsigned int 64
-                case 0xd0:  // signed int  8
-                case 0xd1:  // signed int 16
-                case 0xd2:  // signed int 32
-                case 0xd3:  // signed int 64
-                    again_fixed_trail(NEXT_CS(p), 1 << (((unsigned int)*p) & 0x03));
-                case 0xd4:  // fixext 1
-                case 0xd5:  // fixext 2
-                case 0xd6:  // fixext 4
-                case 0xd7:  // fixext 8
-                    again_fixed_trail_if_zero(ACS_EXT_VALUE, 
-                                              (1 << (((unsigned int)*p) & 0x03))+1,
-                                              _ext_zero);
-                case 0xd8:  // fixext 16
-                    again_fixed_trail_if_zero(ACS_EXT_VALUE, 16+1, _ext_zero);
-                case 0xd9:  // str 8
-                    again_fixed_trail(NEXT_CS(p), 1);
-                case 0xda:  // raw 16
-                case 0xdb:  // raw 32
-                case 0xdc:  // array 16
-                case 0xdd:  // array 32
-                case 0xde:  // map 16
-                case 0xdf:  // map 32
-                    again_fixed_trail(NEXT_CS(p), 2 << (((unsigned int)*p) & 0x01));
-                default:
-                    ret = -2;
-                    goto _end;
-                }
-            SWITCH_RANGE(0xa0, 0xbf)  // FixRaw
-                again_fixed_trail_if_zero(ACS_RAW_VALUE, ((unsigned int)*p & 0x1f), _raw_zero);
-            SWITCH_RANGE(0x90, 0x9f)  // FixArray
-                start_container(_array, ((unsigned int)*p) & 0x0f, CT_ARRAY_ITEM);
-            SWITCH_RANGE(0x80, 0x8f)  // FixMap
-                start_container(_map, ((unsigned int)*p) & 0x0f, CT_MAP_KEY);
-
-            SWITCH_RANGE_DEFAULT
-                ret = -2;
-                goto _end;
-            SWITCH_RANGE_END
-            // end CS_HEADER
-
-
-        _fixed_trail_again:
-            ++p;
-
-        default:
-            if((size_t)(pe - p) < trail) { goto _out; }
-            n = p;  p += trail - 1;
-            switch(cs) {
-            case CS_EXT_8:
-                again_fixed_trail_if_zero(ACS_EXT_VALUE, *(uint8_t*)n+1, _ext_zero);
-            case CS_EXT_16:
-                again_fixed_trail_if_zero(ACS_EXT_VALUE,
-                                          _msgpack_load16(uint16_t,n)+1,
-                                          _ext_zero);
-            case CS_EXT_32:
-                again_fixed_trail_if_zero(ACS_EXT_VALUE,
-                                          _msgpack_load32(uint32_t,n)+1,
-                                          _ext_zero);
-            case CS_FLOAT: {
-                    double f;
-#if PY_VERSION_HEX >= 0x030B00A7
-                    f = PyFloat_Unpack4((const char*)n, 0);
-#else
-                    f = _PyFloat_Unpack4((unsigned char*)n, 0);
-#endif
-                    push_fixed_value(_float, f); }
-            case CS_DOUBLE: {
-                    double f;
-#if PY_VERSION_HEX >= 0x030B00A7
-                    f = PyFloat_Unpack8((const char*)n, 0);
-#else
-                    f = _PyFloat_Unpack8((unsigned char*)n, 0);
-#endif
-                    push_fixed_value(_double, f); }
-            case CS_UINT_8:
-                push_fixed_value(_uint8, *(uint8_t*)n);
-            case CS_UINT_16:
-                push_fixed_value(_uint16, _msgpack_load16(uint16_t,n));
-            case CS_UINT_32:
-                push_fixed_value(_uint32, _msgpack_load32(uint32_t,n));
-            case CS_UINT_64:
-                push_fixed_value(_uint64, _msgpack_load64(uint64_t,n));
-
-            case CS_INT_8:
-                push_fixed_value(_int8, *(int8_t*)n);
-            case CS_INT_16:
-                push_fixed_value(_int16, _msgpack_load16(int16_t,n));
-            case CS_INT_32:
-                push_fixed_value(_int32, _msgpack_load32(int32_t,n));
-            case CS_INT_64:
-                push_fixed_value(_int64, _msgpack_load64(int64_t,n));
-
-            case CS_BIN_8:
-                again_fixed_trail_if_zero(ACS_BIN_VALUE, *(uint8_t*)n, _bin_zero);
-            case CS_BIN_16:
-                again_fixed_trail_if_zero(ACS_BIN_VALUE, _msgpack_load16(uint16_t,n), _bin_zero);
-            case CS_BIN_32:
-                again_fixed_trail_if_zero(ACS_BIN_VALUE, _msgpack_load32(uint32_t,n), _bin_zero);
-            case ACS_BIN_VALUE:
-            _bin_zero:
-                push_variable_value(_bin, data, n, trail);
-
-            case CS_RAW_8:
-                again_fixed_trail_if_zero(ACS_RAW_VALUE, *(uint8_t*)n, _raw_zero);
-            case CS_RAW_16:
-                again_fixed_trail_if_zero(ACS_RAW_VALUE, _msgpack_load16(uint16_t,n), _raw_zero);
-            case CS_RAW_32:
-                again_fixed_trail_if_zero(ACS_RAW_VALUE, _msgpack_load32(uint32_t,n), _raw_zero);
-            case ACS_RAW_VALUE:
-            _raw_zero:
-                push_variable_value(_raw, data, n, trail);
-
-            case ACS_EXT_VALUE:
-            _ext_zero:
-                push_variable_value(_ext, data, n, trail);
-
-            case CS_ARRAY_16:
-                start_container(_array, _msgpack_load16(uint16_t,n), CT_ARRAY_ITEM);
-            case CS_ARRAY_32:
-                /* FIXME security guard */
-                start_container(_array, _msgpack_load32(uint32_t,n), CT_ARRAY_ITEM);
-
-            case CS_MAP_16:
-                start_container(_map, _msgpack_load16(uint16_t,n), CT_MAP_KEY);
-            case CS_MAP_32:
-                /* FIXME security guard */
-                start_container(_map, _msgpack_load32(uint32_t,n), CT_MAP_KEY);
-
-            default:
-                goto _failed;
-            }
-        }
-
-_push:
-    if(top == 0) { goto _finish; }
-    c = &stack[top-1];
-    switch(c->ct) {
-    case CT_ARRAY_ITEM:
-        if(construct_cb(_array_item)(user, c->count, &c->obj, obj) < 0) { goto _failed; }
-        if(++c->count == c->size) {
-            obj = c->obj;
-            if (construct_cb(_array_end)(user, &obj) < 0) { goto _failed; }
-            --top;
-            /*printf("stack pop %d\n", top);*/
-            goto _push;
-        }
-        goto _header_again;
-    case CT_MAP_KEY:
-        c->map_key = obj;
-        c->ct = CT_MAP_VALUE;
-        goto _header_again;
-    case CT_MAP_VALUE:
-        if(construct_cb(_map_item)(user, c->count, &c->obj, c->map_key, obj) < 0) { goto _failed; }
-        if(++c->count == c->size) {
-            obj = c->obj;
-            if (construct_cb(_map_end)(user, &obj) < 0) { goto _failed; }
-            --top;
-            /*printf("stack pop %d\n", top);*/
-            goto _push;
-        }
-        c->ct = CT_MAP_KEY;
-        goto _header_again;
-
-    default:
-        goto _failed;
-    }
-
-_header_again:
-        cs = CS_HEADER;
-        ++p;
-    } while(p != pe);
-    goto _out;
-
-
-_finish:
-    if (!construct)
-        unpack_callback_nil(user, &obj);
-    stack[0].obj = obj;
-    ++p;
-    ret = 1;
-    /*printf("-- finish --\n"); */
-    goto _end;
-
-_failed:
-    /*printf("** FAILED **\n"); */
-    ret = -1;
-    goto _end;
-
-_out:
-    ret = 0;
-    goto _end;
-
-_end:
-    ctx->cs = cs;
-    ctx->trail = trail;
-    ctx->top = top;
-    *off = p - (const unsigned char*)data;
-
-    return ret;
-#undef construct_cb
-}
-
-#undef SWITCH_RANGE_BEGIN
-#undef SWITCH_RANGE
-#undef SWITCH_RANGE_DEFAULT
-#undef SWITCH_RANGE_END
-#undef push_simple_value
-#undef push_fixed_value
-#undef push_variable_value
-#undef again_fixed_trail
-#undef again_fixed_trail_if_zero
-#undef start_container
-
-template <unsigned int fixed_offset, unsigned int var_offset>
-static inline int unpack_container_header(unpack_context* ctx, const char* data, Py_ssize_t len, Py_ssize_t* off)
-{
-    assert(len >= *off);
-    uint32_t size;
-    const unsigned char *const p = (unsigned char*)data + *off;
-
-#define inc_offset(inc) \
-    if (len - *off < inc) \
-        return 0; \
-    *off += inc;
-
-    switch (*p) {
-    case var_offset:
-        inc_offset(3);
-        size = _msgpack_load16(uint16_t, p + 1);
-        break;
-    case var_offset + 1:
-        inc_offset(5);
-        size = _msgpack_load32(uint32_t, p + 1);
-        break;
-#ifdef USE_CASE_RANGE
-    case fixed_offset + 0x0 ... fixed_offset + 0xf:
-#else
-    case fixed_offset + 0x0:
-    case fixed_offset + 0x1:
-    case fixed_offset + 0x2:
-    case fixed_offset + 0x3:
-    case fixed_offset + 0x4:
-    case fixed_offset + 0x5:
-    case fixed_offset + 0x6:
-    case fixed_offset + 0x7:
-    case fixed_offset + 0x8:
-    case fixed_offset + 0x9:
-    case fixed_offset + 0xa:
-    case fixed_offset + 0xb:
-    case fixed_offset + 0xc:
-    case fixed_offset + 0xd:
-    case fixed_offset + 0xe:
-    case fixed_offset + 0xf:
-#endif
-        ++*off;
-        size = ((unsigned int)*p) & 0x0f;
-        break;
-    default:
-        PyErr_SetString(PyExc_ValueError, "Unexpected type header on stream");
-        return -1;
-    }
-    unpack_callback_uint32(&ctx->user, size, &ctx->stack[0].obj);
-    return 1;
-}
-
-#undef SWITCH_RANGE_BEGIN
-#undef SWITCH_RANGE
-#undef SWITCH_RANGE_DEFAULT
-#undef SWITCH_RANGE_END
-
-static const execute_fn unpack_construct = &unpack_execute<true>;
-static const execute_fn unpack_skip = &unpack_execute<false>;
-static const execute_fn read_array_header = &unpack_container_header<0x90, 0xdc>;
-static const execute_fn read_map_header = &unpack_container_header<0x80, 0xde>;
-
-#undef NEXT_CS
-
-/* vim: set ts=4 sw=4 sts=4 expandtab  */
diff --git a/libs/platformdirs-4.2.0.dist-info/RECORD b/libs/platformdirs-4.2.0.dist-info/RECORD
deleted file mode 100644
index ea93ae82c..000000000
--- a/libs/platformdirs-4.2.0.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-platformdirs-4.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-platformdirs-4.2.0.dist-info/METADATA,sha256=X56m-b_JHiqOrUAm-s_dYgd76fm_XwHnBeFDa_a0PtQ,11366
-platformdirs-4.2.0.dist-info/RECORD,,
-platformdirs-4.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs-4.2.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-platformdirs-4.2.0.dist-info/licenses/LICENSE,sha256=KeD9YukphQ6G6yjD_czwzv30-pSHkBHP-z0NS-1tTbY,1089
-platformdirs/__init__.py,sha256=CAub30GCY26r5nDzxkh4xH4VmMtT6vO-pX0-uTZd3JQ,22134
-platformdirs/__main__.py,sha256=ybWxtmp6igI2xuyHUYRJVtaN4xoiP2WHG_8debtDBEo,1489
-platformdirs/android.py,sha256=NSxs_zcVet9BQVu0G92lAxrZLY68Od5OhPyVVakROQo,7582
-platformdirs/api.py,sha256=LYtB8bojKxtFO5vLQP_UgybhUNRB-U3qZkgOEU2Ymck,8940
-platformdirs/macos.py,sha256=IeKjw1o0W-PB6JyY7Nc-AK_8d5HbYvnmQuf7jib83FM,5572
-platformdirs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs/unix.py,sha256=0nWYC6vYOcqFtEdAQny95aQAFk6KCHFGIszpN7Q_WwU,10591
-platformdirs/version.py,sha256=zHPCgW3qJaxaiNpnv9yL0Rd88yr7i297-fD3SAuwRGg,411
-platformdirs/windows.py,sha256=N-ThMYOHeN2YfUOoceYGsuKHHx9YFv8eZbWC41707bQ,10008
diff --git a/libs/pygments-2.17.2.dist-info/INSTALLER b/libs/platformdirs-4.3.6.dist-info/INSTALLER
similarity index 100%
rename from libs/pygments-2.17.2.dist-info/INSTALLER
rename to libs/platformdirs-4.3.6.dist-info/INSTALLER
diff --git a/libs/platformdirs-4.2.0.dist-info/METADATA b/libs/platformdirs-4.3.6.dist-info/METADATA
similarity index 89%
rename from libs/platformdirs-4.2.0.dist-info/METADATA
rename to libs/platformdirs-4.3.6.dist-info/METADATA
index 96dea9bd3..91c59c9a2 100644
--- a/libs/platformdirs-4.2.0.dist-info/METADATA
+++ b/libs/platformdirs-4.3.6.dist-info/METADATA
@@ -1,11 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: platformdirs
-Version: 4.2.0
-Summary: A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".
+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/platformdirs/platformdirs
-Project-URL: Source, https://github.com/platformdirs/platformdirs
-Project-URL: Tracker, https://github.com/platformdirs/platformdirs/issues
+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
@@ -21,28 +22,37 @@ 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>=2023.9.10; extra == 'docs'
-Requires-Dist: proselint>=0.13; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints>=1.25.2; extra == 'docs'
-Requires-Dist: sphinx>=7.2.6; 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>=4.1; extra == 'test'
-Requires-Dist: pytest-mock>=3.12; extra == 'test'
-Requires-Dist: pytest>=7.4.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://github.com/platformdirs/platformdirs/actions/workflows/check.yml/badge.svg
+.. 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
diff --git a/libs/platformdirs-4.3.6.dist-info/RECORD b/libs/platformdirs-4.3.6.dist-info/RECORD
new file mode 100644
index 000000000..a4024095d
--- /dev/null
+++ b/libs/platformdirs-4.3.6.dist-info/RECORD
@@ -0,0 +1,15 @@
+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/pygments-2.17.2.dist-info/REQUESTED b/libs/platformdirs-4.3.6.dist-info/REQUESTED
similarity index 100%
rename from libs/pygments-2.17.2.dist-info/REQUESTED
rename to libs/platformdirs-4.3.6.dist-info/REQUESTED
diff --git a/libs/platformdirs-4.3.6.dist-info/WHEEL b/libs/platformdirs-4.3.6.dist-info/WHEEL
new file mode 100644
index 000000000..cdd68a497
--- /dev/null
+++ b/libs/platformdirs-4.3.6.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.25.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/platformdirs-4.2.0.dist-info/licenses/LICENSE b/libs/platformdirs-4.3.6.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/platformdirs-4.2.0.dist-info/licenses/LICENSE
rename to libs/platformdirs-4.3.6.dist-info/licenses/LICENSE
diff --git a/libs/platformdirs/__init__.py b/libs/platformdirs/__init__.py
index 75c8bff94..afe8351d2 100644
--- a/libs/platformdirs/__init__.py
+++ b/libs/platformdirs/__init__.py
@@ -1,6 +1,8 @@
 """
-Utilities for determining application-specific dirs. See <https://github.com/platformdirs/platformdirs> for details and
-usage.
+Utilities for determining application-specific dirs.
+
+See <https://github.com/platformdirs/platformdirs> for details and usage.
+
 """
 
 from __future__ import annotations
@@ -17,30 +19,34 @@ if TYPE_CHECKING:
     from pathlib import Path
     from typing import Literal
 
+if sys.platform == "win32":
+    from platformdirs.windows import Windows as _Result
+elif sys.platform == "darwin":
+    from platformdirs.macos import MacOS as _Result
+else:
+    from platformdirs.unix import Unix as _Result
+
 
 def _set_platform_dir_class() -> type[PlatformDirsABC]:
-    if sys.platform == "win32":
-        from platformdirs.windows import Windows as Result
-    elif sys.platform == "darwin":
-        from platformdirs.macos import MacOS as Result
-    else:
-        from platformdirs.unix import Unix as Result
-
     if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
         if os.getenv("SHELL") or os.getenv("PREFIX"):
-            return Result
+            return _Result
 
-        from platformdirs.android import _android_folder
+        from platformdirs.android import _android_folder  # noqa: PLC0415
 
         if _android_folder() is not None:
-            from platformdirs.android import Android
+            from platformdirs.android import Android  # noqa: PLC0415
 
-            return Android  # return to avoid redefinition of result
+            return Android  # return to avoid redefinition of a result
 
-    return Result
+    return _Result
 
 
-PlatformDirs = _set_platform_dir_class()  #: Currently active platform
+if TYPE_CHECKING:
+    # Work around mypy issue: https://github.com/python/mypy/issues/10962
+    PlatformDirs = _Result
+else:
+    PlatformDirs = _set_platform_dir_class()  #: Currently active platform
 AppDirs = PlatformDirs  #: Backwards compatibility with appdirs
 
 
@@ -507,7 +513,7 @@ def user_log_path(
 
 
 def user_documents_path() -> Path:
-    """:returns: documents path tied to the user"""
+    """:returns: documents a path tied to the user"""
     return PlatformDirs().user_documents_path
 
 
@@ -585,41 +591,41 @@ def site_runtime_path(
 
 
 __all__ = [
+    "AppDirs",
+    "PlatformDirs",
+    "PlatformDirsABC",
     "__version__",
     "__version_info__",
-    "PlatformDirs",
-    "AppDirs",
-    "PlatformDirsABC",
-    "user_data_dir",
-    "user_config_dir",
-    "user_cache_dir",
-    "user_state_dir",
-    "user_log_dir",
-    "user_documents_dir",
-    "user_downloads_dir",
-    "user_pictures_dir",
-    "user_videos_dir",
-    "user_music_dir",
-    "user_desktop_dir",
-    "user_runtime_dir",
-    "site_data_dir",
-    "site_config_dir",
     "site_cache_dir",
-    "site_runtime_dir",
-    "user_data_path",
-    "user_config_path",
-    "user_cache_path",
-    "user_state_path",
-    "user_log_path",
-    "user_documents_path",
-    "user_downloads_path",
-    "user_pictures_path",
-    "user_videos_path",
-    "user_music_path",
-    "user_desktop_path",
-    "user_runtime_path",
-    "site_data_path",
-    "site_config_path",
     "site_cache_path",
+    "site_config_dir",
+    "site_config_path",
+    "site_data_dir",
+    "site_data_path",
+    "site_runtime_dir",
     "site_runtime_path",
+    "user_cache_dir",
+    "user_cache_path",
+    "user_config_dir",
+    "user_config_path",
+    "user_data_dir",
+    "user_data_path",
+    "user_desktop_dir",
+    "user_desktop_path",
+    "user_documents_dir",
+    "user_documents_path",
+    "user_downloads_dir",
+    "user_downloads_path",
+    "user_log_dir",
+    "user_log_path",
+    "user_music_dir",
+    "user_music_path",
+    "user_pictures_dir",
+    "user_pictures_path",
+    "user_runtime_dir",
+    "user_runtime_path",
+    "user_state_dir",
+    "user_state_path",
+    "user_videos_dir",
+    "user_videos_path",
 ]
diff --git a/libs/platformdirs/__main__.py b/libs/platformdirs/__main__.py
index 4bf27c9c9..922c52135 100644
--- a/libs/platformdirs/__main__.py
+++ b/libs/platformdirs/__main__.py
@@ -24,7 +24,7 @@ PROPS = (
 
 
 def main() -> None:
-    """Run main entry point."""
+    """Run the main entry point."""
     app_name = "MyApp"
     app_author = "MyCompany"
 
diff --git a/libs/platformdirs/android.py b/libs/platformdirs/android.py
index 4acdb6383..7004a8524 100644
--- a/libs/platformdirs/android.py
+++ b/libs/platformdirs/android.py
@@ -6,17 +6,18 @@ import os
 import re
 import sys
 from functools import lru_cache
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from .api import PlatformDirsABC
 
 
 class Android(PlatformDirsABC):
     """
-    Follows the guidance `from here <https://android.stackexchange.com/a/216132>`_. 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 here <https://android.stackexchange.com/a/216132>`_.
+
+    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `version
+    <platformdirs.api.PlatformDirsABC.version>`, `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     """
 
     @property
@@ -44,7 +45,7 @@ class Android(PlatformDirsABC):
 
     @property
     def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g. e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>``"""
+        """: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")
 
     @property
@@ -116,16 +117,33 @@ class Android(PlatformDirsABC):
 
 
 @lru_cache(maxsize=1)
-def _android_folder() -> str | None:
+def _android_folder() -> str | None:  # noqa: C901
     """:return: base folder for the Android OS or None if it cannot be found"""
-    try:
-        # First try to get path to android app via pyjnius
-        from jnius import autoclass
+    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
+    if not TYPE_CHECKING:
+        try:
+            # First try to get a path to android app using python4android (if available)...
+            from android import mActivity  # noqa: PLC0415
 
-        context = autoclass("android.content.Context")
-        result: str | None = context.getFilesDir().getParentFile().getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        # if fails find an android folder looking path on the sys.path
+            context = cast("android.content.Context", mActivity.getApplicationContext())  # noqa: F821
+            result = context.getFilesDir().getParentFile().getAbsolutePath()
+        except Exception:  # noqa: BLE001
+            result = None
+    if result is None:
+        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
+
+            context = autoclass("android.content.Context")
+            result = context.getFilesDir().getParentFile().getAbsolutePath()
+        except Exception:  # noqa: BLE001
+            result = None
+    if result is None:
+        # and if that fails, too, find an android folder looking at path on the sys.path
+        # warning: only works for apps installed under /data, not adopted storage etc.
         pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
         for path in sys.path:
             if pattern.match(path):
@@ -133,6 +151,16 @@ def _android_folder() -> str | None:
                 break
         else:
             result = None
+    if result is None:
+        # one last try: find an android folder looking at path on the sys.path taking adopted storage paths into
+        # account
+        pattern = re.compile(r"/mnt/expand/[a-fA-F0-9-]{36}/(data|user/\d+)/(.+)/files")
+        for path in sys.path:
+            if pattern.match(path):
+                result = path.split("/files")[0]
+                break
+        else:
+            result = None
     return result
 
 
@@ -141,7 +169,7 @@ def _android_documents_folder() -> str:
     """:return: documents folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -157,7 +185,7 @@ def _android_downloads_folder() -> str:
     """:return: downloads folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -173,7 +201,7 @@ def _android_pictures_folder() -> str:
     """:return: pictures folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -189,7 +217,7 @@ def _android_videos_folder() -> str:
     """:return: videos folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -205,7 +233,7 @@ def _android_music_folder() -> str:
     """:return: music folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
diff --git a/libs/platformdirs/api.py b/libs/platformdirs/api.py
index 031a38a3d..18d660e4f 100644
--- a/libs/platformdirs/api.py
+++ b/libs/platformdirs/api.py
@@ -11,10 +11,10 @@ if TYPE_CHECKING:
     from typing import Iterator, Literal
 
 
-class PlatformDirsABC(ABC):
+class PlatformDirsABC(ABC):  # noqa: PLR0904
     """Abstract base class for platform directories."""
 
-    def __init__(  # noqa: PLR0913
+    def __init__(  # noqa: PLR0913, PLR0917
         self,
         appname: str | None = None,
         appauthor: str | None | Literal[False] = None,
@@ -34,34 +34,47 @@ class PlatformDirsABC(ABC):
         :param multipath: See `multipath`.
         :param opinion: See `opinion`.
         :param ensure_exists: See `ensure_exists`.
+
         """
         self.appname = appname  #: The name of application.
         self.appauthor = appauthor
         """
-        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.
+        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. 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>``.
+        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. That means that for users on a Windows network setup
-        for roaming profiles, this user data will be synced on login (see
-        `here <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>`_).
+        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>`_).
+
         """
         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.
+
         """
         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.
+
         By default, no directories are created.
+
         """
 
     def _append_app_name_and_version(self, *base: str) -> str:
@@ -78,6 +91,12 @@ class PlatformDirsABC(ABC):
         if self.ensure_exists:
             Path(path).mkdir(parents=True, exist_ok=True)
 
+    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]
+        return Path(directory)
+
     @property
     @abstractmethod
     def user_data_dir(self) -> str:
@@ -200,7 +219,7 @@ class PlatformDirsABC(ABC):
 
     @property
     def user_documents_path(self) -> Path:
-        """:return: documents path tied to the user"""
+        """:return: documents a path tied to the user"""
         return Path(self.user_documents_dir)
 
     @property
diff --git a/libs/platformdirs/macos.py b/libs/platformdirs/macos.py
index b7b48808c..e4b0391ab 100644
--- a/libs/platformdirs/macos.py
+++ b/libs/platformdirs/macos.py
@@ -4,17 +4,24 @@ from __future__ import annotations
 
 import os.path
 import sys
+from typing import TYPE_CHECKING
 
 from .api import PlatformDirsABC
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 class MacOS(PlatformDirsABC):
     """
-    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>`_.
+    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>`.
+
     """
 
     @property
@@ -28,7 +35,7 @@ class MacOS(PlatformDirsABC):
         :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,
+          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``
         """
@@ -39,6 +46,11 @@ class MacOS(PlatformDirsABC):
             return os.pathsep.join(path_list)
         return path_list[0]
 
+    @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``"""
+        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`"""
@@ -60,7 +72,7 @@ class MacOS(PlatformDirsABC):
         :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,
+          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``
         """
@@ -71,6 +83,11 @@ class MacOS(PlatformDirsABC):
             return os.pathsep.join(path_list)
         return path_list[0]
 
+    @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``"""
+        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`"""
diff --git a/libs/platformdirs/unix.py b/libs/platformdirs/unix.py
index ca4728e60..f1942e92e 100644
--- a/libs/platformdirs/unix.py
+++ b/libs/platformdirs/unix.py
@@ -6,13 +6,13 @@ import os
 import sys
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Iterator
+from typing import Iterator, NoReturn
 
 from .api import PlatformDirsABC
 
 if sys.platform == "win32":
 
-    def getuid() -> int:
+    def getuid() -> NoReturn:
         msg = "should only be used on Unix"
         raise RuntimeError(msg)
 
@@ -20,17 +20,17 @@ else:
     from os import getuid
 
 
-class Unix(PlatformDirsABC):
+class Unix(PlatformDirsABC):  # noqa: PLR0904
     """
-    On Unix/Linux, we follow the
-    `XDG Basedir Spec <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_. The spec allows
-    overriding directories with environment variables. The examples show 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>`.
+    On Unix/Linux, we follow the `XDG Basedir Spec <https://specifications.freedesktop.org/basedir-spec/basedir-spec-
+    latest.html>`_.
+
+    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
@@ -205,25 +205,19 @@ class Unix(PlatformDirsABC):
 
     @property
     def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
+        """:return: 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. Only return first item, even if ``multipath`` is set to ``True``"""
+        """:return: config path shared by the 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 first item, even if ``multipath`` is set to ``True``"""
+        """:return: 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 _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]
-        return Path(directory)
-
     def iter_config_dirs(self) -> Iterator[str]:
         """:yield: all user and site configuration directories."""
         yield self.user_config_dir
@@ -246,7 +240,12 @@ def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
 
 
 def _get_user_dirs_folder(key: str) -> str | None:
-    """Return directory from user-dirs.dirs config file. See https://freedesktop.org/wiki/Software/xdg-user-dirs/."""
+    """
+    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"
     if user_dirs_config_path.exists():
         parser = ConfigParser()
diff --git a/libs/platformdirs/version.py b/libs/platformdirs/version.py
index cc1e34568..afb49243e 100644
--- a/libs/platformdirs/version.py
+++ b/libs/platformdirs/version.py
@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.0'
-__version_tuple__ = version_tuple = (4, 2, 0)
+__version__ = version = '4.3.6'
+__version_tuple__ = version_tuple = (4, 3, 6)
diff --git a/libs/platformdirs/windows.py b/libs/platformdirs/windows.py
index c62d0c8d2..d7bc96091 100644
--- a/libs/platformdirs/windows.py
+++ b/libs/platformdirs/windows.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import ctypes
 import os
 import sys
 from functools import lru_cache
@@ -16,15 +15,13 @@ if TYPE_CHECKING:
 
 class Windows(PlatformDirsABC):
     """
-    `MSDN on where to store app data files
-    <http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120>`_.
-    Makes use of the
-    `appname <platformdirs.api.PlatformDirsABC.appname>`,
-    `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`,
-    `version <platformdirs.api.PlatformDirsABC.version>`,
-    `roaming <platformdirs.api.PlatformDirsABC.roaming>`,
-    `opinion <platformdirs.api.PlatformDirsABC.opinion>`,
-    `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    `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
+    <platformdirs.api.PlatformDirsABC.roaming>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
+    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     """
 
     @property
@@ -165,7 +162,7 @@ def get_win_folder_from_env_vars(csidl_name: str) -> str:
 
 
 def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
-    """Get folder for a CSIDL name that does not exist as an environment variable."""
+    """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
 
@@ -189,6 +186,7 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
 
     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.
+
     """
     shell_folder_name = {
         "CSIDL_APPDATA": "AppData",
@@ -205,7 +203,7 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
         raise ValueError(msg)
     if sys.platform != "win32":  # only needed for mypy type checker to know that this code runs only on Windows
         raise NotImplementedError
-    import winreg
+    import winreg  # noqa: PLC0415
 
     key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
     directory, _ = winreg.QueryValueEx(key, shell_folder_name)
@@ -218,6 +216,8 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
     # 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,
@@ -250,10 +250,15 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
 
 
 def _pick_get_win_folder() -> Callable[[str], str]:
-    if hasattr(ctypes, "windll"):
-        return get_win_folder_via_ctypes
     try:
-        import winreg  # noqa: F401
+        import ctypes  # noqa: PLC0415
+    except ImportError:
+        pass
+    else:
+        if hasattr(ctypes, "windll"):
+            return get_win_folder_via_ctypes
+    try:
+        import winreg  # noqa: PLC0415, F401
     except ImportError:
         return get_win_folder_from_env_vars
     else:
diff --git a/libs/plexapi/__init__.py b/libs/plexapi/__init__.py
new file mode 100644
index 000000000..1d4fb471e
--- /dev/null
+++ b/libs/plexapi/__init__.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+import logging
+import os
+from logging.handlers import RotatingFileHandler
+from platform import uname
+from uuid import getnode
+
+from plexapi.config import PlexConfig, reset_base_headers
+import plexapi.const as const
+from plexapi.utils import SecretsFilter
+
+# Load User Defined Config
+DEFAULT_CONFIG_PATH = os.path.expanduser('~/.config/plexapi/config.ini')
+CONFIG_PATH = os.environ.get('PLEXAPI_CONFIG_PATH', DEFAULT_CONFIG_PATH)
+CONFIG = PlexConfig(CONFIG_PATH)
+
+# PlexAPI Settings
+PROJECT = 'PlexAPI'
+VERSION = __version__ = const.__version__
+TIMEOUT = CONFIG.get('plexapi.timeout', 30, int)
+X_PLEX_CONTAINER_SIZE = CONFIG.get('plexapi.container_size', 100, int)
+X_PLEX_ENABLE_FAST_CONNECT = CONFIG.get('plexapi.enable_fast_connect', False, bool)
+
+# Plex Header Configuration
+X_PLEX_PROVIDES = CONFIG.get('header.provides', 'controller')
+X_PLEX_PLATFORM = CONFIG.get('header.platform', uname()[0])
+X_PLEX_PLATFORM_VERSION = CONFIG.get('header.platform_version', uname()[2])
+X_PLEX_PRODUCT = CONFIG.get('header.product', PROJECT)
+X_PLEX_VERSION = CONFIG.get('header.version', VERSION)
+X_PLEX_DEVICE = CONFIG.get('header.device', X_PLEX_PLATFORM)
+X_PLEX_DEVICE_NAME = CONFIG.get('header.device_name', uname()[1])
+X_PLEX_IDENTIFIER = CONFIG.get('header.identifier', str(hex(getnode())))
+X_PLEX_LANGUAGE = CONFIG.get('header.language', 'en')
+BASE_HEADERS = reset_base_headers()
+
+# Logging Configuration
+log = logging.getLogger('plexapi')
+logfile = CONFIG.get('log.path')
+logformat = CONFIG.get('log.format', '%(asctime)s %(module)12s:%(lineno)-4s %(levelname)-9s %(message)s')
+loglevel = CONFIG.get('log.level', 'INFO').upper()
+loghandler = logging.NullHandler()
+
+if logfile:  # pragma: no cover
+    logbackups = CONFIG.get('log.backup_count', 3, int)
+    logbytes = CONFIG.get('log.rotate_bytes', 512000, int)
+    loghandler = RotatingFileHandler(os.path.expanduser(logfile), 'a', logbytes, logbackups)
+
+loghandler.setFormatter(logging.Formatter(logformat))
+log.addHandler(loghandler)
+log.setLevel(loglevel)
+logfilter = SecretsFilter()
+if CONFIG.get('log.show_secrets', '').lower() != 'true':
+    log.addFilter(logfilter)
diff --git a/libs/plexapi/alert.py b/libs/plexapi/alert.py
new file mode 100644
index 000000000..2d6a18e8a
--- /dev/null
+++ b/libs/plexapi/alert.py
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+import json
+import socket
+from typing import Callable
+import threading
+
+from plexapi import log
+
+
+class AlertListener(threading.Thread):
+    """ Creates a websocket connection to the PlexServer to optionally receive alert notifications.
+        These often include messages from Plex about media scans as well as updates to currently running
+        Transcode Sessions. This class implements threading.Thread, therefore to start monitoring
+        alerts you must call .start() on the object once it's created. When calling
+        `PlexServer.startAlertListener()`, the thread will be started for you.
+
+        Known `state`-values for timeline entries, with identifier=`com.plexapp.plugins.library`:
+
+            :0: The item was created
+            :1: Reporting progress on item processing
+            :2: Matching the item
+            :3: Downloading the metadata
+            :4: Processing downloaded metadata
+            :5: The item processed
+            :9: The item deleted
+
+        When metadata agent is not set for the library processing ends with state=1.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): PlexServer this listener is connected to.
+            callback (func): Callback function to call on received messages. The callback function
+                will be sent a single argument 'data' which will contain a dictionary of data
+                received from the server. :samp:`def my_callback(data): ...`
+            callbackError (func): Callback function to call on errors. The callback function
+                will be sent a single argument 'error' which will contain the Error object.
+                :samp:`def my_callback(error): ...`
+            ws_socket (socket): Socket to use for the connection. If not specified, a new socket will be created.
+    """
+    key = '/:/websockets/notifications'
+
+    def __init__(self, server, callback: Callable = None, callbackError: Callable = None, ws_socket: socket = None):
+        super(AlertListener, self).__init__()
+        self.daemon = True
+        self._server = server
+        self._callback = callback
+        self._callbackError = callbackError
+        self._socket = ws_socket
+        self._ws = None
+
+    def run(self):
+        try:
+            import websocket
+        except ImportError:
+            log.warning("Can't use the AlertListener without websocket")
+            return
+        # create the websocket connection
+        url = self._server.url(self.key, includeToken=True).replace('http', 'ws')
+        log.info('Starting AlertListener: %s', url)
+
+        self._ws = websocket.WebSocketApp(url, on_message=self._onMessage, on_error=self._onError, socket=self._socket)
+
+        self._ws.run_forever()
+
+    def stop(self):
+        """ Stop the AlertListener thread. Once the notifier is stopped, it cannot be directly
+            started again. You must call :func:`~plexapi.server.PlexServer.startAlertListener`
+            from a PlexServer instance.
+        """
+        log.info('Stopping AlertListener.')
+        self._ws.close()
+
+    def _onMessage(self, *args):
+        """ Called when websocket message is received.
+
+            We are assuming the last argument in the tuple is the message.
+        """
+        message = args[-1]
+        try:
+            data = json.loads(message)['NotificationContainer']
+            log.debug('Alert: %s %s %s', *data)
+            if self._callback:
+                self._callback(data)
+        except Exception as err:  # pragma: no cover
+            log.error('AlertListener Msg Error: %s', err)
+
+    def _onError(self, *args):  # pragma: no cover
+        """ Called when websocket error is received.
+
+            We are assuming the last argument in the tuple is the message.
+        """
+        err = args[-1]
+        try:
+            log.error('AlertListener Error: %s', err)
+            if self._callbackError:
+                self._callbackError(err)
+        except Exception as err:  # pragma: no cover
+            log.error('AlertListener Error: Error: %s', err)
diff --git a/libs/plexapi/audio.py b/libs/plexapi/audio.py
new file mode 100644
index 000000000..05d38a9c7
--- /dev/null
+++ b/libs/plexapi/audio.py
@@ -0,0 +1,609 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from urllib.parse import quote_plus
+
+from typing import Any, Dict, List, Optional, TypeVar
+
+from plexapi import media, utils
+from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession
+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.playlist import Playlist
+
+
+TAudio = TypeVar("TAudio", bound="Audio")
+TTrack = TypeVar("TTrack", bound="Track")
+
+
+class Audio(PlexPartialObject, PlayedUnplayedMixin):
+    """ Base class for all audio objects including :class:`~plexapi.audio.Artist`,
+        :class:`~plexapi.audio.Album`, and :class:`~plexapi.audio.Track`.
+
+        Attributes:
+            addedAt (datetime): Datetime the item was added to the library.
+            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
+            artBlurHash (str): BlurHash string for artwork image.
+            distance (float): Sonic Distance of the item from the seed item.
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the artist, album, or track (plex://artist/5d07bcb0403c64029053ac4c).
+            images (List<:class:`~plexapi.media.Image`>): List of image objects.
+            index (int): Plex index number (often the track number).
+            key (str): API URL (/library/metadata/<ratingkey>).
+            lastRatedAt (datetime): Datetime the item was last rated.
+            lastViewedAt (datetime): Datetime the item was last played.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            listType (str): Hardcoded as 'audio' (useful for search filters).
+            moods (List<:class:`~plexapi.media.Mood`>): List of mood objects.
+            musicAnalysisVersion (int): The Plex music analysis version for the item.
+            ratingKey (int): Unique key identifying the item.
+            summary (str): Summary of the artist, album, or track.
+            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
+            thumbBlurHash (str): BlurHash string for thumbnail image.
+            title (str): Name of the artist, album, or track (Jason Mraz, We Sing, Lucky, etc.).
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'artist', 'album', or 'track'.
+            updatedAt (datetime): Datetime the item was updated.
+            userRating (float): Rating of the item (0.0 - 10.0) equaling (0 stars - 5 stars).
+            viewCount (int): Count of times the item was played.
+    """
+    METADATA_TYPE = 'track'
+
+    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'))
+        self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        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')
+        self.thumb = data.attrib.get('thumb')
+        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
+        self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort', self.title)
+        self.type = data.attrib.get('type')
+        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.userRating = utils.cast(float, data.attrib.get('userRating'))
+        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
+
+    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
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return self.title
+
+    @property
+    def hasSonicAnalysis(self):
+        """ Returns True if the audio has been sonically analyzed. """
+        return self.musicAnalysisVersion == 1
+
+    def sync(self, bitrate, client=None, clientId=None, limit=None, title=None):
+        """ Add current audio (artist, album or track) as sync item for specified device.
+            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
+                               module :mod:`~plexapi.sync`.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                limit (int): maximum count of items to sync, unlimited if `None`.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current media.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+        """
+
+        from plexapi.sync import SyncItem, Policy, MediaSettings
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self._defaultSyncTitle()
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.listType
+        sync_item.metadataType = self.METADATA_TYPE
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        section = self._server.library.sectionByID(self.librarySectionID)
+
+        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
+        sync_item.policy = Policy.create(limit)
+        sync_item.mediaSettings = MediaSettings.createMusic(bitrate)
+
+        return myplex.sync(sync_item, client=client, clientId=clientId)
+
+    def sonicallySimilar(
+        self: TAudio,
+        limit: Optional[int] = None,
+        maxDistance: Optional[float] = None,
+        **kwargs,
+    ) -> List[TAudio]:
+        """Returns a list of sonically similar audio items.
+
+        Parameters:
+            limit (int): Maximum count of items to return. Default 50 (server default)
+            maxDistance (float): Maximum distance between tracks, 0.0 - 1.0. Default 0.25 (server default).
+            **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.fetchItems`.
+
+        Returns:
+            List[:class:`~plexapi.audio.Audio`]: list of sonically similar audio items.
+        """
+
+        key = f"{self.key}/nearest"
+        params: Dict[str, Any] = {}
+        if limit is not None:
+            params['limit'] = limit
+        if maxDistance is not None:
+            params['maxDistance'] = maxDistance
+        key += utils.joinArgs(params)
+
+        return self.fetchItems(
+            key,
+            cls=type(self),
+            **kwargs,
+        )
+
+
+@utils.registerPlexObject
+class Artist(
+    Audio,
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, PosterMixin, ThemeMixin,
+    ArtistEditMixins
+):
+    """ Represents a single Artist.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'artist'
+            albumSort (int): Setting that indicates how albums are sorted for the artist
+                (-1 = Library default, 0 = Newest first, 1 = Oldest first, 2 = By name).
+            audienceRating (float): Audience rating.
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            countries (List<:class:`~plexapi.media.Country`>): List country objects.
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            locations (List<str>): List of folder paths where the artist is found on disk.
+            rating (float): Artist rating (7.9; 9.8; 8.1).
+            similar (List<:class:`~plexapi.media.Similar`>): List of similar objects.
+            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
+            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+    """
+    TAG = 'Directory'
+    TYPE = 'artist'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        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)
+
+    def __iter__(self):
+        for album in self.albums():
+            yield album
+
+    def album(self, title):
+        """ Returns the :class:`~plexapi.audio.Album` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the album to return.
+        """
+        return self.section().get(
+            title=title,
+            libtype='album',
+            filters={'artist.id': self.ratingKey}
+        )
+
+    def albums(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.audio.Album` objects by the artist. """
+        return self.section().search(
+            libtype='album',
+            filters={**kwargs.pop('filters', {}), 'artist.id': self.ratingKey},
+            **kwargs
+        )
+
+    def track(self, title=None, album=None, track=None):
+        """ Returns the :class:`~plexapi.audio.Track` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the track to return.
+                album (str): Album name (default: None; required if title not specified).
+                track (int): Track number (default: None; required if title not specified).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If title or album and track parameters are missing.
+        """
+        key = f'{self.key}/allLeaves'
+        if title is not None:
+            return self.fetchItem(key, Track, title__iexact=title)
+        elif album is not None and track is not None:
+            return self.fetchItem(key, Track, parentTitle__iexact=album, index=track)
+        raise BadRequest('Missing argument: title or album and track are required')
+
+    def tracks(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.audio.Track` objects by the artist. """
+        key = f'{self.key}/allLeaves'
+        return self.fetchItems(key, Track, **kwargs)
+
+    def get(self, title=None, album=None, track=None):
+        """ Alias of :func:`~plexapi.audio.Artist.track`. """
+        return self.track(title, album, track)
+
+    def download(self, savepath=None, keep_original_name=False, subfolders=False, **kwargs):
+        """ Download all tracks from the artist. See :func:`~plexapi.base.Playable.download` for details.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated.
+                subfolders (bool): True to separate tracks in to album folders.
+                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
+        """
+        filepaths = []
+        for track in self.tracks():
+            _savepath = os.path.join(savepath, track.parentTitle) if subfolders else savepath
+            filepaths += track.download(_savepath, keep_original_name, **kwargs)
+        return filepaths
+
+    def popularTracks(self):
+        """ Returns a list of :class:`~plexapi.audio.Track` popular tracks by the artist. """
+        filters = {
+            'album.subformat!': 'Compilation,Live',
+            'artist.id': self.ratingKey,
+            'group': 'title',
+            'ratingCount>>': 0,
+        }
+        return self.section().search(
+            libtype='track',
+            filters=filters,
+            sort='ratingCount:desc',
+            limit=100
+        )
+
+    def station(self):
+        """ Returns a :class:`~plexapi.playlist.Playlist` artist radio station or `None`. """
+        key = f'{self.key}?includeStations=1'
+        return next(iter(self.fetchItems(key, cls=Playlist, rtag="Stations")), None)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Artists' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Album(
+    Audio,
+    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
+    ArtMixin, PosterMixin, ThemeUrlMixin,
+    AlbumEditMixins
+):
+    """ Represents a single Album.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'album'
+            audienceRating (float): Audience rating.
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            formats (List<:class:`~plexapi.media.Format`>): List of format objects.
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            leafCount (int): Number of items in the album view.
+            loudnessAnalysisVersion (int): The Plex loudness analysis version level.
+            originallyAvailableAt (datetime): Datetime the album was released.
+            parentGuid (str): Plex GUID for the album artist (plex://artist/5d07bcb0403c64029053ac4c).
+            parentKey (str): API URL of the album artist (/library/metadata/<parentRatingKey>).
+            parentRatingKey (int): Unique key identifying the album artist.
+            parentTheme (str): URL to artist theme resource (/library/metadata/<parentRatingkey>/theme/<themeid>).
+            parentThumb (str): URL to album artist thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
+            parentTitle (str): Name of the album artist.
+            rating (float): Album rating (7.9; 9.8; 8.1).
+            studio (str): Studio that released the album.
+            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
+            subformats (List<:class:`~plexapi.media.Subformat`>): List of subformat objects.
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            viewedLeafCount (int): Number of items marked as played in the album view.
+            year (int): Year the album was released.
+    """
+    TAG = 'Directory'
+    TYPE = 'album'
+
+    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')
+        self.parentGuid = data.attrib.get('parentGuid')
+        self.parentKey = data.attrib.get('parentKey')
+        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self.parentTheme = data.attrib.get('parentTheme')
+        self.parentThumb = data.attrib.get('parentThumb')
+        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'))
+
+    def __iter__(self):
+        for track in self.tracks():
+            yield track
+
+    def track(self, title=None, track=None):
+        """ Returns the :class:`~plexapi.audio.Track` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the track to return.
+                track (int): Track number (default: None; required if title not specified).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If title or track parameter is missing.
+        """
+        key = f'{self.key}/children'
+        if title is not None and not isinstance(title, int):
+            return self.fetchItem(key, Track, title__iexact=title)
+        elif track is not None or isinstance(title, int):
+            if isinstance(title, int):
+                index = title
+            else:
+                index = track
+            return self.fetchItem(key, Track, parentTitle__iexact=self.title, index=index)
+        raise BadRequest('Missing argument: title or track is required')
+
+    def tracks(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.audio.Track` objects in the album. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key, Track, **kwargs)
+
+    def get(self, title=None, track=None):
+        """ Alias of :func:`~plexapi.audio.Album.track`. """
+        return self.track(title, track)
+
+    def artist(self):
+        """ Return the album's :class:`~plexapi.audio.Artist`. """
+        return self.fetchItem(self.parentKey)
+
+    def download(self, savepath=None, keep_original_name=False, **kwargs):
+        """ Download all tracks from the album. See :func:`~plexapi.base.Playable.download` for details.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated.
+                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
+        """
+        filepaths = []
+        for track in self.tracks():
+            filepaths += track.download(savepath, keep_original_name, **kwargs)
+        return filepaths
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return f'{self.parentTitle} - {self.title}'
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Albums' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Track(
+    Audio, Playable,
+    ExtrasMixin, RatingMixin,
+    ArtUrlMixin, PosterUrlMixin, ThemeUrlMixin,
+    TrackEditMixins
+):
+    """ Represents a single Track.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'track'
+            audienceRating (float): Audience rating.
+            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
+            chapterSource (str): Unknown
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            duration (int): Length of the track in milliseconds.
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            grandparentArt (str): URL to album artist artwork (/library/metadata/<grandparentRatingKey>/art/<artid>).
+            grandparentGuid (str): Plex GUID for the album artist (plex://artist/5d07bcb0403c64029053ac4c).
+            grandparentKey (str): API URL of the album artist (/library/metadata/<grandparentRatingKey>).
+            grandparentRatingKey (int): Unique key identifying the album artist.
+            grandparentTheme (str): URL to artist theme resource  (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
+                (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
+            grandparentThumb (str): URL to album artist thumbnail image
+                (/library/metadata/<grandparentRatingKey>/thumb/<thumbid>).
+            grandparentTitle (str): Name of the album artist for the track.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            media (List<:class:`~plexapi.media.Media`>): List of media objects.
+            originalTitle (str): The artist for the track.
+            parentGuid (str): Plex GUID for the album (plex://album/5d07cd8e403c640290f180f9).
+            parentIndex (int): Disc number of the track.
+            parentKey (str): API URL of the album (/library/metadata/<parentRatingKey>).
+            parentRatingKey (int): Unique key identifying the album.
+            parentThumb (str): URL to album thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
+            parentTitle (str): Name of the album for the track.
+            primaryExtraKey (str) API URL for the primary extra for the track.
+            rating (float): Track rating (7.9; 9.8; 8.1).
+            ratingCount (int): Number of listeners who have scrobbled this track, as reported by Last.fm.
+            skipCount (int): Number of times the track has been skipped.
+            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
+                (remote playlist item only).
+            viewOffset (int): View offset in milliseconds.
+            year (int): Year the track was released.
+    """
+    TAG = 'Track'
+    TYPE = 'track'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        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')
+        self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
+        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'))
+        self.parentKey = data.attrib.get('parentKey')
+        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self.parentThumb = data.attrib.get('parentThumb')
+        self.parentTitle = data.attrib.get('parentTitle')
+        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
+        self.rating = utils.cast(float, data.attrib.get('rating'))
+        self.ratingCount = utils.cast(int, data.attrib.get('ratingCount'))
+        self.skipCount = utils.cast(int, data.attrib.get('skipCount'))
+        self.sourceURI = data.attrib.get('source')  # remote playlist item
+        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
+        self.year = utils.cast(int, data.attrib.get('year'))
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the locations of the track.
+
+            Returns:
+                List<str> of file paths where the track is found on disk.
+        """
+        return [part.file for part in self.iterParts() if part]
+
+    @property
+    def trackNumber(self):
+        """ Returns the track number. """
+        return self.index
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        return f'{self.grandparentTitle} - {self.parentTitle} - {str(self.trackNumber).zfill(2)} - {self.title}'
+
+    def album(self):
+        """ Return the track's :class:`~plexapi.audio.Album`. """
+        return self.fetchItem(self.parentKey)
+
+    def artist(self):
+        """ Return the track's :class:`~plexapi.audio.Artist`. """
+        return self.fetchItem(self.grandparentKey)
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return f'{self.grandparentTitle} - {self.parentTitle} - {self.title}'
+
+    def _getWebURL(self, base=None):
+        """ Get the Plex Web URL with the correct parameters. """
+        return self._server._buildWebURL(base=base, endpoint='details', key=self.parentKey)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.parentGuid)
+        return str(Path('Metadata') / 'Albums' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+    def sonicAdventure(
+        self: TTrack,
+        to: TTrack,
+        **kwargs: Any,
+    ) -> list[TTrack]:
+        """Returns a sonic adventure from the current track to the specified track.
+
+        Parameters:
+            to (:class:`~plexapi.audio.Track`): The target track for the sonic adventure.
+            **kwargs: Additional options passed into :func:`~plexapi.library.MusicSection.sonicAdventure`.
+
+        Returns:
+            List[:class:`~plexapi.audio.Track`]: list of tracks in the sonic adventure.
+        """
+        return self.section().sonicAdventure(self, to, **kwargs)
+
+
+@utils.registerPlexObject
+class TrackSession(PlexSession, Track):
+    """ Represents a single Track session
+        loaded from :func:`~plexapi.server.PlexServer.sessions`.
+    """
+    _SESSIONTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Track._loadData(self, data)
+        PlexSession._loadData(self, data)
+
+
+@utils.registerPlexObject
+class TrackHistory(PlexHistory, Track):
+    """ Represents a single Track history entry
+        loaded from :func:`~plexapi.server.PlexServer.history`.
+    """
+    _HISTORYTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Track._loadData(self, data)
+        PlexHistory._loadData(self, data)
diff --git a/libs/plexapi/base.py b/libs/plexapi/base.py
new file mode 100644
index 000000000..675ac5d98
--- /dev/null
+++ b/libs/plexapi/base.py
@@ -0,0 +1,1138 @@
+# -*- coding: utf-8 -*-
+import re
+from typing import TYPE_CHECKING, Generic, Iterable, List, Optional, TypeVar, Union
+import weakref
+from functools import cached_property
+from urllib.parse import parse_qsl, urlencode, urlparse
+from xml.etree import ElementTree
+from xml.etree.ElementTree import Element
+
+from plexapi import CONFIG, X_PLEX_CONTAINER_SIZE, log, utils
+from plexapi.exceptions import BadRequest, NotFound, UnknownType, Unsupported
+
+if TYPE_CHECKING:
+    from plexapi.server import PlexServer
+
+PlexObjectT = TypeVar("PlexObjectT", bound='PlexObject')
+MediaContainerT = TypeVar("MediaContainerT", bound="MediaContainer")
+
+USER_DONT_RELOAD_FOR_KEYS = set()
+_DONT_RELOAD_FOR_KEYS = {'key', 'sourceURI'}
+OPERATORS = {
+    'exact': lambda v, q: v == q,
+    'iexact': lambda v, q: v.lower() == q.lower(),
+    'contains': lambda v, q: q in v,
+    'icontains': lambda v, q: q.lower() in v.lower(),
+    'ne': lambda v, q: v != q,
+    'in': lambda v, q: v in q,
+    'gt': lambda v, q: v > q,
+    'gte': lambda v, q: v >= q,
+    'lt': lambda v, q: v < q,
+    'lte': lambda v, q: v <= q,
+    'startswith': lambda v, q: v.startswith(q),
+    'istartswith': lambda v, q: v.lower().startswith(q.lower()),
+    'endswith': lambda v, q: v.endswith(q),
+    'iendswith': lambda v, q: v.lower().endswith(q.lower()),
+    'exists': lambda v, q: v is not None if q else v is None,
+    'regex': lambda v, q: bool(re.search(q, v)),
+    'iregex': lambda v, q: bool(re.search(q, v, flags=re.IGNORECASE)),
+}
+
+
+class PlexObject:
+    """ Base class for all Plex objects.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to (optional)
+            data (ElementTree): Response from PlexServer used to build this object (optional).
+            initpath (str): Relative path requested when retrieving specified `data` (optional).
+            parent (:class:`~plexapi.base.PlexObject`): The parent object that this object is built from (optional).
+    """
+    TAG = None      # xml element tag
+    TYPE = None     # xml element type
+    key = None      # plex relative url
+
+    def __init__(self, server, data, initpath=None, parent=None):
+        self._server = server
+        self._data = data
+        self._initpath = initpath or self.key
+        self._parent = weakref.ref(parent) if parent is not None else None
+        self._details_key = None
+
+        # Allow overwriting previous attribute values with `None` when manually reloading
+        self._overwriteNone = True
+        # Automatically reload the object when accessing a missing attribute
+        self._autoReload = CONFIG.get('plexapi.autoreload', True, bool)
+        # Attribute to save batch edits for a single API call
+        self._edits = None
+
+        if data is not None:
+            self._loadData(data)
+        self._details_key = self._buildDetailsKey()
+
+    def __repr__(self):
+        uid = self._clean(self.firstAttr('_baseurl', 'ratingKey', 'id', 'key', 'playQueueID', 'uri', 'type'))
+        name = self._clean(self.firstAttr('title', 'name', 'username', 'product', 'tag', 'value'))
+        return f"<{':'.join([p for p in [self.__class__.__name__, uid, name] if p])}>"
+
+    def __setattr__(self, attr, value):
+        overwriteNone = self.__dict__.get('_overwriteNone')
+        # Don't overwrite an attr with None unless it's a private variable or overwrite None is True
+        if value is not None or attr.startswith('_') or attr not in self.__dict__ or overwriteNone:
+            self.__dict__[attr] = value
+
+    def _clean(self, value):
+        """ Clean attr value for display in __repr__. """
+        if value:
+            value = str(value).replace('/library/metadata/', '')
+            value = value.replace('/children', '')
+            value = value.replace('/accounts/', '')
+            value = value.replace('/devices/', '')
+            return value.replace(' ', '-')[:20]
+
+    def _buildItem(self, elem, cls=None, initpath=None):
+        """ Factory function to build objects based on registered PLEXOBJECTS. """
+        # cls is specified, build the object and return
+        initpath = initpath or self._initpath
+        if cls is not None:
+            return cls(self._server, elem, initpath, parent=self)
+        # cls is not specified, try looking it up in PLEXOBJECTS
+        etype = elem.attrib.get('streamType', elem.attrib.get('tagType', elem.attrib.get('type')))
+        ehash = f'{elem.tag}.{etype}' if etype else elem.tag
+        if initpath == '/status/sessions':
+            ehash = f"{ehash}.session"
+        elif initpath.startswith('/status/sessions/history'):
+            ehash = f"{ehash}.history"
+        ecls = utils.getPlexObject(ehash, default=elem.tag)
+        # log.debug('Building %s as %s', elem.tag, ecls.__name__)
+        if ecls is not None:
+            return ecls(self._server, elem, initpath, parent=self)
+        raise UnknownType(f"Unknown library type <{elem.tag} type='{etype}'../>")
+
+    def _buildItemOrNone(self, elem, cls=None, initpath=None):
+        """ Calls :func:`~plexapi.base.PlexObject._buildItem` but returns
+            None if elem is an unknown type.
+        """
+        try:
+            return self._buildItem(elem, cls, initpath)
+        except UnknownType:
+            return None
+
+    def _buildDetailsKey(self, **kwargs):
+        """ Builds the details key with the XML include parameters.
+            All parameters are included by default with the option to override each parameter
+            or disable each parameter individually by setting it to False or 0.
+        """
+        details_key = self.key
+        params = {}
+
+        if details_key and hasattr(self, '_INCLUDES'):
+            for k, v in self._INCLUDES.items():
+                value = kwargs.pop(k, v)
+                if value not in [False, 0, '0']:
+                    params[k] = 1 if value is True else value
+
+        if details_key and hasattr(self, '_EXCLUDES'):
+            for k, v in self._EXCLUDES.items():
+                value = kwargs.pop(k, None)
+                if value is not None:
+                    params[k] = 1 if value is True else value
+
+        if params:
+            details_key += '?' + urlencode(sorted(params.items()))
+        return details_key
+
+    def _isChildOf(self, **kwargs):
+        """ Returns True if this object is a child of the given attributes.
+            This will search the parent objects all the way to the top.
+
+            Parameters:
+                **kwargs (dict): The attributes and values to search for in the parent objects.
+                    See all possible `**kwargs*` in :func:`~plexapi.base.PlexObject.fetchItem`.
+        """
+        obj = self
+        while obj and obj._parent is not None:
+            obj = obj._parent()
+            if obj and obj._checkAttrs(obj._data, **kwargs):
+                return True
+        return False
+
+    def _manuallyLoadXML(self, xml, cls=None):
+        """ Manually load an XML string as a :class:`~plexapi.base.PlexObject`.
+
+            Parameters:
+                xml (str): The XML string to load.
+                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
+                    items to be fetched, passing this in will help the parser ensure
+                    it only returns those items. By default we convert the xml elements
+                    with the best guess PlexObjects based on tag and type attrs.
+        """
+        elem = ElementTree.fromstring(xml)
+        return self._buildItemOrNone(elem, cls)
+
+    def fetchItems(
+        self,
+        ekey,
+        cls=None,
+        container_start=None,
+        container_size=None,
+        maxresults=None,
+        params=None,
+        **kwargs,
+    ):
+        """ Load the specified key to find and build all items with the specified tag
+            and attrs.
+
+            Parameters:
+                ekey (str or List<int>): API URL path in Plex to fetch items from. If a list of ints is passed
+                    in, the key will be translated to /library/metadata/<key1,key2,key3>. This allows
+                    fetching multiple items only knowing their key-ids.
+                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
+                    items to be fetched, passing this in will help the parser ensure
+                    it only returns those items. By default we convert the xml elements
+                    with the best guess PlexObjects based on tag and type attrs.
+                etag (str): Only fetch items with the specified tag.
+                container_start (None, int): offset to get a subset of the data
+                container_size (None, int): How many items in data
+                maxresults (int, optional): Only return the specified number of results.
+                params (dict, optional): Any additional params to add to the request.
+                **kwargs (dict): Optionally add XML attribute to filter the items.
+                    See the details below for more info.
+
+            **Filtering XML Attributes**
+
+            Any XML attribute can be filtered when fetching results. Filtering is done before
+            the Python objects are built to help keep things speedy. For example, passing in
+            ``viewCount=0`` will only return matching items where the view count is ``0``.
+            Note that case matters when specifying attributes. Attributes further down in the XML
+            tree can be filtered by *prepending* the attribute with each element tag ``Tag__``.
+
+            Examples:
+
+                .. code-block:: python
+
+                    fetchItem(ekey, viewCount=0)
+                    fetchItem(ekey, contentRating="PG")
+                    fetchItem(ekey, Genre__tag="Animation")
+                    fetchItem(ekey, Media__videoCodec="h265")
+                    fetchItem(ekey, Media__Part__container="mp4)
+
+            Note that because some attribute names are already used as arguments to this
+            function, such as ``tag``, you may still reference the attr tag by prepending an
+            underscore. For example, passing in ``_tag='foobar'`` will return all items where
+            ``tag='foobar'``.
+
+            **Using PlexAPI Operators**
+
+            Optionally, PlexAPI operators can be specified by *appending* it to the end of the
+            attribute for more complex lookups. For example, passing in ``viewCount__gte=0``
+            will return all items where ``viewCount >= 0``.
+
+            List of Available Operators:
+
+            * ``__contains``: Value contains specified arg.
+            * ``__endswith``: Value ends with specified arg.
+            * ``__exact``: Value matches specified arg.
+            * ``__exists`` (*bool*): Value is or is not present in the attrs.
+            * ``__gt``: Value is greater than specified arg.
+            * ``__gte``: Value is greater than or equal to specified arg.
+            * ``__icontains``: Case insensitive value contains specified arg.
+            * ``__iendswith``: Case insensitive value ends with specified arg.
+            * ``__iexact``: Case insensitive value matches specified arg.
+            * ``__in``: Value is in a specified list or tuple.
+            * ``__iregex``: Case insensitive value matches the specified regular expression.
+            * ``__istartswith``: Case insensitive value starts with specified arg.
+            * ``__lt``: Value is less than specified arg.
+            * ``__lte``: Value is less than or equal to specified arg.
+            * ``__regex``: Value matches the specified regular expression.
+            * ``__startswith``: Value starts with specified arg.
+
+            Examples:
+
+                .. code-block:: python
+
+                    fetchItem(ekey, viewCount__gte=0)
+                    fetchItem(ekey, Media__container__in=["mp4", "mkv"])
+                    fetchItem(ekey, guid__regex=r"com\\.plexapp\\.agents\\.(imdb|themoviedb)://|tt\\d+")
+                    fetchItem(ekey, guid__id__regex=r"(imdb|tmdb|tvdb)://")
+                    fetchItem(ekey, Media__Part__file__startswith="D:\\Movies")
+
+        """
+        if ekey is None:
+            raise BadRequest('ekey was not provided')
+
+        if isinstance(ekey, list) and all(isinstance(key, int) for key in ekey):
+            ekey = f'/library/metadata/{",".join(str(key) for key in ekey)}'
+
+        container_start = container_start or 0
+        container_size = container_size or X_PLEX_CONTAINER_SIZE
+        offset = container_start
+
+        if maxresults is not None:
+            container_size = min(container_size, maxresults)
+
+        results = MediaContainer[cls](self._server, Element('MediaContainer'), initpath=ekey)
+        headers = {}
+
+        while True:
+            headers['X-Plex-Container-Start'] = str(container_start)
+            headers['X-Plex-Container-Size'] = str(container_size)
+
+            data = self._server.query(ekey, headers=headers, params=params)
+            subresults = self.findItems(data, cls, ekey, **kwargs)
+            total_size = utils.cast(int, data.attrib.get('totalSize') or data.attrib.get('size')) or len(subresults)
+
+            if not subresults:
+                if offset > total_size:
+                    log.info('container_start is greater than the number of items')
+
+            librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+            if librarySectionID:
+                for item in subresults:
+                    item.librarySectionID = librarySectionID
+
+            results.extend(subresults)
+
+            container_start += container_size
+
+            if container_start > total_size:
+                break
+
+            wanted_number_of_items = total_size - offset
+            if maxresults is not None:
+                wanted_number_of_items = min(maxresults, wanted_number_of_items)
+                container_size = min(container_size, wanted_number_of_items - len(results))
+
+            if wanted_number_of_items <= len(results):
+                break
+
+        return results
+
+    def fetchItem(self, ekey, cls=None, **kwargs):
+        """ Load the specified key to find and build the first item with the
+            specified tag and attrs. If no tag or attrs are specified then
+            the first item in the result set is returned.
+
+            Parameters:
+                ekey (str or int): Path in Plex to fetch items from. If an int is passed
+                    in, the key will be translated to /library/metadata/<key>. This allows
+                    fetching an item only knowing its key-id.
+                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
+                    items to be fetched, passing this in will help the parser ensure
+                    it only returns those items. By default we convert the xml elements
+                    with the best guess PlexObjects based on tag and type attrs.
+                etag (str): Only fetch items with the specified tag.
+                **kwargs (dict): Optionally add XML attribute to filter the items.
+                    See :func:`~plexapi.base.PlexObject.fetchItems` for more details
+                    on how this is used.
+        """
+        if isinstance(ekey, int):
+            ekey = f'/library/metadata/{ekey}'
+
+        try:
+            return self.fetchItems(ekey, cls, **kwargs)[0]
+        except IndexError:
+            clsname = cls.__name__ if cls else 'None'
+            raise NotFound(f'Unable to find elem: cls={clsname}, attrs={kwargs}') from None
+
+    def findItems(self, data, cls=None, initpath=None, rtag=None, **kwargs):
+        """ Load the specified data to find and build all items with the specified tag
+            and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
+            on how this is used.
+        """
+        # filter on cls attrs if specified
+        if cls and cls.TAG and 'tag' not in kwargs:
+            kwargs['etag'] = cls.TAG
+        if cls and cls.TYPE and 'type' not in kwargs:
+            kwargs['type'] = cls.TYPE
+        # rtag to iter on a specific root tag using breadth-first search
+        if rtag:
+            data = next(utils.iterXMLBFS(data, rtag), Element('Empty'))
+        # loop through all data elements to find matches
+        items = MediaContainer[cls](self._server, data, initpath=initpath) if data.tag == 'MediaContainer' else []
+        for elem in data:
+            if self._checkAttrs(elem, **kwargs):
+                item = self._buildItemOrNone(elem, cls, initpath)
+                if item is not None:
+                    items.append(item)
+        return items
+
+    def findItem(self, data, cls=None, initpath=None, rtag=None, **kwargs):
+        """ Load the specified data to find and build the first items with the specified tag
+            and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
+            on how this is used.
+        """
+        try:
+            return self.findItems(data, cls, initpath, rtag, **kwargs)[0]
+        except IndexError:
+            return None
+
+    def firstAttr(self, *attrs):
+        """ Return the first attribute in attrs that is not None. """
+        for attr in attrs:
+            value = getattr(self, attr, None)
+            if value is not None:
+                return value
+
+    def listAttrs(self, data, attr, rtag=None, **kwargs):
+        """ Return a list of values from matching attribute. """
+        results = []
+        # rtag to iter on a specific root tag using breadth-first search
+        if rtag:
+            data = next(utils.iterXMLBFS(data, rtag), [])
+        for elem in data:
+            kwargs[f'{attr}__exists'] = True
+            if self._checkAttrs(elem, **kwargs):
+                results.append(elem.attrib.get(attr))
+        return results
+
+    def reload(self, key=None, **kwargs):
+        """ Reload the data for this object from self.key.
+
+            Parameters:
+                key (string, optional): Override the key to reload.
+                **kwargs (dict): A dictionary of XML include parameters to include/exclude or override.
+                    See :class:`~plexapi.base.PlexPartialObject` for all the available include parameters.
+                    Set parameter to True to include and False to exclude.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi.server import PlexServer
+                    plex = PlexServer('http://localhost:32400', token='xxxxxxxxxxxxxxxxxxxx')
+
+                    # Search results are partial objects.
+                    movie = plex.library.section('Movies').get('Cars')
+                    movie.isPartialObject()  # Returns True
+
+                    # Partial reload of the movie without a default include parameter.
+                    # The movie object will remain as a partial object.
+                    movie.reload(includeMarkers=False)
+                    movie.isPartialObject()  # Returns True
+
+                    # Full reload of the movie with all default include parameters.
+                    # The movie object will be a full object.
+                    movie.reload()
+                    movie.isFullObject()  # Returns True
+
+                    # Full reload of the movie with all default and extra include parameter.
+                    # Including `checkFiles` will tell the Plex server to check if the file
+                    # still exists and is accessible.
+                    # The movie object will be a full object.
+                    movie.reload(checkFiles=True)
+                    movie.isFullObject()  # Returns True
+
+        """
+        return self._reload(key=key, **kwargs)
+
+    def _reload(self, key=None, _overwriteNone=True, **kwargs):
+        """ Perform the actual reload. """
+        details_key = self._buildDetailsKey(**kwargs) if kwargs else self._details_key
+        key = key or details_key or self.key
+        if not key:
+            raise Unsupported('Cannot reload an object not built from a URL.')
+        self._initpath = key
+        data = self._server.query(key)
+        self._overwriteNone = _overwriteNone
+        self._loadData(data[0])
+        self._overwriteNone = True
+        return self
+
+    def _checkAttrs(self, elem, **kwargs):
+        attrsFound = {}
+        for attr, query in kwargs.items():
+            attr, op, operator = self._getAttrOperator(attr)
+            values = self._getAttrValue(elem, attr)
+            # special case query in (None, 0, '') to include missing attr
+            if op == 'exact' and not values and query in (None, 0, ''):
+                return True
+            # return if attr were looking for is missing
+            attrsFound[attr] = False
+            for value in values:
+                value = self._castAttrValue(op, query, value)
+                if operator(value, query):
+                    attrsFound[attr] = True
+                    break
+        # log.debug('Checking %s for %s found: %s', elem.tag, kwargs, attrsFound)
+        return all(attrsFound.values())
+
+    def _getAttrOperator(self, attr):
+        for op, operator in OPERATORS.items():
+            if attr.endswith(f'__{op}'):
+                attr = attr.rsplit('__', 1)[0]
+                return attr, op, operator
+        # default to exact match
+        return attr, 'exact', OPERATORS['exact']
+
+    def _getAttrValue(self, elem, attrstr, results=None):
+        # log.debug('Fetching %s in %s', attrstr, elem.tag)
+        parts = attrstr.split('__', 1)
+        attr = parts[0]
+        attrstr = parts[1] if len(parts) == 2 else None
+        if attrstr:
+            results = [] if results is None else results
+            for child in (c for c in elem if c.tag.lower() == attr.lower()):
+                results += self._getAttrValue(child, attrstr, results)
+            return [r for r in results if r is not None]
+        # check were looking for the tag
+        if attr.lower() == 'etag':
+            return [elem.tag]
+        # loop through attrs so we can perform case-insensitive match
+        for _attr, value in elem.attrib.items():
+            if attr.lower() == _attr.lower():
+                return [value]
+        return []
+
+    def _castAttrValue(self, op, query, value):
+        if op == 'exists':
+            return value
+        if isinstance(query, bool):
+            return bool(int(value))
+        if isinstance(query, int) and '.' in value:
+            return float(value)
+        if isinstance(query, int):
+            return int(value)
+        if isinstance(query, float):
+            return float(value)
+        return value
+
+    def _loadData(self, data):
+        raise NotImplementedError('Abstract method not implemented.')
+
+    @property
+    def _searchType(self):
+        return self.TYPE
+
+
+class PlexPartialObject(PlexObject):
+    """ Not all objects in the Plex listings return the complete list of elements
+        for the object. This object will allow you to assume each object is complete,
+        and if the specified value you request is None it will fetch the full object
+        automatically and update itself.
+    """
+    _INCLUDES = {
+        'checkFiles': 0,
+        'includeAllConcerts': 0,
+        'includeBandwidths': 1,
+        'includeChapters': 1,
+        'includeChildren': 0,
+        'includeConcerts': 0,
+        'includeExternalMedia': 0,
+        'includeExtras': 0,
+        'includeFields': 'thumbBlurHash,artBlurHash',
+        'includeGeolocation': 1,
+        'includeLoudnessRamps': 1,
+        'includeMarkers': 1,
+        'includeOnDeck': 0,
+        'includePopularLeaves': 0,
+        'includePreferences': 0,
+        'includeRelated': 0,
+        'includeRelatedCount': 0,
+        'includeReviews': 0,
+        'includeStations': 0,
+    }
+    _EXCLUDES = {
+        'excludeElements': (
+            'Media,Genre,Country,Guid,Rating,Collection,Director,Writer,Role,Producer,Similar,Style,Mood,Format'
+        ),
+        'excludeFields': 'summary,tagline',
+        'skipRefresh': 1,
+    }
+
+    def __eq__(self, other):
+        if isinstance(other, PlexPartialObject):
+            return self.key == other.key
+        return NotImplemented
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __iter__(self):
+        yield self
+
+    def __getattribute__(self, attr):
+        # Dragons inside.. :-/
+        value = super(PlexPartialObject, self).__getattribute__(attr)
+        # Check a few cases where we don't want to reload
+        if attr in _DONT_RELOAD_FOR_KEYS: return value
+        if attr in USER_DONT_RELOAD_FOR_KEYS: return value
+        if attr.startswith('_'): return value
+        if value not in (None, []): return value
+        if self.isFullObject(): return value
+        if isinstance(self, (PlexSession, PlexHistory)): return value
+        if self._autoReload is False: return value
+        # Log the reload.
+        clsname = self.__class__.__name__
+        title = self.__dict__.get('title', self.__dict__.get('name'))
+        objname = f"{clsname} '{title}'" if title else clsname
+        log.debug("Reloading %s for attr '%s'", objname, attr)
+        # Reload and return the value
+        self._reload(_overwriteNone=False)
+        return super(PlexPartialObject, self).__getattribute__(attr)
+
+    def analyze(self):
+        """ Tell Plex Media Server to performs analysis on it this item to gather
+            information. Analysis includes:
+
+            * Gather Media Properties: All of the media you add to a Library has
+                properties that are useful to know–whether it's a video file, a
+                music track, or one of your photos (container, codec, resolution, etc).
+            * Generate Default Artwork: Artwork will automatically be grabbed from a
+                video file. A background image will be pulled out as well as a
+                smaller image to be used for poster/thumbnail type purposes.
+            * Generate Video Preview Thumbnails: Video preview thumbnails are created,
+                if you have that feature enabled. Video preview thumbnails allow
+                graphical seeking in some Apps. It's also used in the Plex Web App Now
+                Playing screen to show a graphical representation of where playback
+                is. Video preview thumbnails creation is a CPU-intensive process akin
+                to transcoding the file.
+            * Generate intro video markers: Detects show intros, exposing the
+                'Skip Intro' button in clients.
+        """
+        key = f"/{self.key.lstrip('/')}/analyze"
+        self._server.query(key, method=self._server._session.put)
+
+    def isFullObject(self):
+        """ Returns True if this is already a full object. A full object means all attributes
+            were populated from the api path representing only this item. For example, the
+            search result for a movie often only contain a portion of the attributes a full
+            object (main url) for that movie would contain.
+        """
+        parsed_key = urlparse(self._details_key or self.key)
+        parsed_initpath = urlparse(self._initpath)
+        query_key = set(parse_qsl(parsed_key.query))
+        query_init = set(parse_qsl(parsed_initpath.query))
+        return not self.key or (parsed_key.path == parsed_initpath.path and query_key <= query_init)
+
+    def isPartialObject(self):
+        """ Returns True if this is not a full object. """
+        return not self.isFullObject()
+
+    def isLocked(self, field: str):
+        """ Returns True if the specified field is locked, otherwise False.
+
+            Parameters:
+                field (str): The name of the field.
+        """
+        return next((f.locked for f in self.fields if f.name == field), False)
+
+    def _edit(self, **kwargs):
+        """ Actually edit an object. """
+        if isinstance(self._edits, dict):
+            self._edits.update(kwargs)
+            return self
+
+        if 'type' not in kwargs:
+            kwargs['type'] = utils.searchType(self._searchType)
+
+        self.section()._edit(items=self, **kwargs)
+        return self
+
+    def edit(self, **kwargs):
+        """ Edit an object.
+            Note: This is a low level method and you need to know all the field/tag keys.
+            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
+            for individual field and tag editing methods.
+
+            Parameters:
+                kwargs (dict): Dict of settings to edit.
+
+            Example:
+
+                .. code-block:: python
+
+                    edits = {
+                        'type': 1,
+                        'id': movie.ratingKey,
+                        'title.value': 'A new title',
+                        'title.locked': 1,
+                        'summary.value': 'This is a summary.',
+                        'summary.locked': 1,
+                        'collection[0].tag.tag': 'A tag',
+                        'collection.locked': 1}
+                    }
+                    movie.edit(**edits)
+
+        """
+        return self._edit(**kwargs)
+
+    def batchEdits(self):
+        """ Enable batch editing mode to save API calls.
+            Must call :func:`~plexapi.base.PlexPartialObject.saveEdits` at the end to save all the edits.
+            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
+            for individual field and tag editing methods.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Batch editing multiple fields and tags in a single API call
+                    Movie.batchEdits()
+                    Movie.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline') \\
+                        .addCollection('New Collection').removeGenre('Action').addLabel('Favorite')
+                    Movie.saveEdits()
+
+        """
+        self._edits = {}
+        return self
+
+    def saveEdits(self):
+        """ Save all the batch edits. The object needs to be reloaded manually,
+            if required.
+            See :func:`~plexapi.base.PlexPartialObject.batchEdits` for details.
+        """
+        if not isinstance(self._edits, dict):
+            raise BadRequest('Batch editing mode not enabled. Must call `batchEdits()` first.')
+
+        edits = self._edits
+        self._edits = None
+        self._edit(**edits)
+        return self
+
+    def refresh(self):
+        """ Refreshing a Library or individual item causes the metadata for the item to be
+            refreshed, even if it already has metadata. You can think of refreshing as
+            "update metadata for the requested item even if it already has some". You should
+            refresh a Library or individual item if:
+
+            * You've changed the Library Metadata Agent.
+            * You've added "Local Media Assets" (such as artwork, theme music, external
+                subtitle files, etc.)
+            * You want to freshen the item posters, summary, etc.
+            * There's a problem with the poster image that's been downloaded.
+            * Items are missing posters or other downloaded information. This is possible if
+                the refresh process is interrupted (the Server is turned off, internet
+                connection dies, etc).
+        """
+        key = f'{self.key}/refresh'
+        self._server.query(key, method=self._server._session.put)
+
+    def section(self):
+        """ Returns the :class:`~plexapi.library.LibrarySection` this item belongs to. """
+        return self._server.library.sectionByID(self.librarySectionID)
+
+    def delete(self):
+        """ Delete a media element. This has to be enabled under settings > server > library in plex webui. """
+        try:
+            return self._server.query(self.key, method=self._server._session.delete)
+        except BadRequest:  # pragma: no cover
+            log.error('Failed to delete %s. This could be because you '
+                'have not allowed items to be deleted', self.key)
+            raise
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get Play History for a media item.
+
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        return self._server.history(maxresults=maxresults, mindate=mindate, ratingKey=self.ratingKey)
+
+    def _getWebURL(self, base=None):
+        """ Get the Plex Web URL with the correct parameters.
+            Private method to allow overriding parameters from subclasses.
+        """
+        return self._server._buildWebURL(base=base, endpoint='details', key=self.key)
+
+    def getWebURL(self, base=None):
+        """ Returns the Plex Web URL for a media item.
+
+            Parameters:
+                base (str): The base URL before the fragment (``#!``).
+                    Default is https://app.plex.tv/desktop.
+        """
+        return self._getWebURL(base=base)
+
+    def playQueue(self, *args, **kwargs):
+        """ Returns a new :class:`~plexapi.playqueue.PlayQueue` from this media item.
+            See :func:`~plexapi.playqueue.PlayQueue.create` for available parameters.
+        """
+        from plexapi.playqueue import PlayQueue
+        return PlayQueue.create(self._server, self, *args, **kwargs)
+
+
+class Playable:
+    """ This is a general place 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.
+
+        Attributes:
+            playlistItemID (int): Playlist item ID (only populated for :class:`~plexapi.playlist.Playlist` items).
+            playQueueItemID (int): PlayQueue item ID (only populated for :class:`~plexapi.playlist.PlayQueue` items).
+    """
+
+    def _loadData(self, data):
+        self.playlistItemID = utils.cast(int, data.attrib.get('playlistItemID'))    # playlist
+        self.playQueueItemID = utils.cast(int, data.attrib.get('playQueueItemID'))  # playqueue
+
+    def getStreamURL(self, **kwargs):
+        """ Returns a stream url that may be used by external applications such as VLC.
+
+            Parameters:
+                **kwargs (dict): optional parameters to manipulate the playback when accessing
+                    the stream. A few known parameters include: maxVideoBitrate, videoResolution
+                    offset, copyts, protocol, mediaIndex, partIndex, platform.
+
+            Raises:
+                :exc:`~plexapi.exceptions.Unsupported`: When the item doesn't support fetching a stream URL.
+        """
+        if self.TYPE not in ('movie', 'episode', 'track', 'clip'):
+            raise Unsupported(f'Fetching stream URL for {self.TYPE} is unsupported.')
+
+        mvb = kwargs.pop('maxVideoBitrate', None)
+        vr = kwargs.pop('videoResolution', '')
+        protocol = kwargs.pop('protocol', None)
+
+        params = {
+            'path': self.key,
+            'mediaIndex': kwargs.pop('mediaIndex', 0),
+            'partIndex': kwargs.pop('mediaIndex', 0),
+            'protocol': protocol,
+            'fastSeek': kwargs.pop('fastSeek', 1),
+            'copyts': kwargs.pop('copyts', 1),
+            'offset': kwargs.pop('offset', 0),
+            'maxVideoBitrate': max(mvb, 64) if mvb else None,
+            'videoResolution': vr if re.match(r'^\d+x\d+$', vr) else None,
+            'X-Plex-Platform': kwargs.pop('platform', 'Chrome')
+        }
+        params.update(kwargs)
+
+        # remove None values
+        params = {k: v for k, v in params.items() if v is not None}
+        streamtype = 'audio' if self.TYPE in ('track', 'album') else 'video'
+        ext = 'mpd' if protocol == 'dash' else 'm3u8'
+
+        return self._server.url(
+            f'/{streamtype}/:/transcode/universal/start.{ext}?{urlencode(params)}',
+            includeToken=True
+        )
+
+    def iterParts(self):
+        """ Iterates over the parts of this media item. """
+        for item in self.media:
+            for part in item.parts:
+                yield part
+
+    def videoStreams(self):
+        """ Returns a list of :class:`~plexapi.media.videoStream` objects for all MediaParts. """
+        if self.isPartialObject():
+            self.reload()
+        return sum((part.videoStreams() for part in self.iterParts()), [])
+
+    def audioStreams(self):
+        """ Returns a list of :class:`~plexapi.media.AudioStream` objects for all MediaParts. """
+        if self.isPartialObject():
+            self.reload()
+        return sum((part.audioStreams() for part in self.iterParts()), [])
+
+    def subtitleStreams(self):
+        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
+        if self.isPartialObject():
+            self.reload()
+        return sum((part.subtitleStreams() for part in self.iterParts()), [])
+
+    def lyricStreams(self):
+        """ Returns a list of :class:`~plexapi.media.LyricStream` objects for all MediaParts. """
+        if self.isPartialObject():
+            self.reload()
+        return sum((part.lyricStreams() for part in self.iterParts()), [])
+
+    def play(self, client):
+        """ Start playback on the specified client.
+
+            Parameters:
+                client (:class:`~plexapi.client.PlexClient`): Client to start playing on.
+        """
+        client.playMedia(self)
+
+    def download(self, savepath=None, keep_original_name=False, **kwargs):
+        """ Downloads the media item to the specified location. Returns a list of
+            filepaths that have been saved to disk.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated. See filenames below.
+                **kwargs (dict): Additional options passed into :func:`~plexapi.audio.Track.getStreamURL`
+                    to download a transcoded stream, otherwise the media item will be downloaded
+                    as-is and saved to disk.
+
+            **Filenames**
+
+            * Movie: ``<title> (<year>)``
+            * Episode: ``<show title> - s00e00 - <episode title>``
+            * Track: ``<artist title> - <album title> - 00 - <track title>``
+            * Photo: ``<photoalbum title> - <photo/clip title>`` or ``<photo/clip title>``
+        """
+        filepaths = []
+        parts = [i for i in self.iterParts() if i]
+
+        for part in parts:
+            if not keep_original_name:
+                filename = utils.cleanFilename(f'{self._prettyfilename()}.{part.container}')
+            else:
+                filename = part.file
+
+            if kwargs:
+                # So this seems to be a a lot slower but allows transcode.
+                kwargs['mediaIndex'] = self.media.index(part._parent())
+                kwargs['partIndex'] = part._parent().parts.index(part)
+                download_url = self.getStreamURL(**kwargs)
+            else:
+                download_url = self._server.url(f'{part.key}?download=1')
+
+            filepath = utils.download(
+                download_url,
+                self._server._token,
+                filename=filename,
+                savepath=savepath,
+                session=self._server._session
+            )
+
+            if filepath:
+                filepaths.append(filepath)
+
+        return filepaths
+
+    def updateProgress(self, time, state='stopped'):
+        """ Set the watched progress for this video.
+
+            Note that setting the time to 0 will not work.
+            Use :func:`~plexapi.mixins.PlayedUnplayedMixin.markPlayed` or
+            :func:`~plexapi.mixins.PlayedUnplayedMixin.markUnplayed` to achieve
+            that goal.
+
+            Parameters:
+                time (int): milliseconds watched
+                state (string): state of the video, default 'stopped'
+        """
+        key = f'/:/progress?key={self.ratingKey}&identifier=com.plexapp.plugins.library&time={time}&state={state}'
+        self._server.query(key)
+        return self
+
+    def updateTimeline(self, time, state='stopped', duration=None):
+        """ Set the timeline progress for this video.
+
+            Parameters:
+                time (int): milliseconds watched
+                state (string): state of the video, default 'stopped'
+                duration (int): duration of the item
+        """
+        durationStr = '&duration='
+        if duration is not None:
+            durationStr = durationStr + str(duration)
+        else:
+            durationStr = durationStr + str(self.duration)
+        key = (f'/:/timeline?ratingKey={self.ratingKey}&key={self.key}&'
+               f'identifier=com.plexapp.plugins.library&time={int(time)}&state={state}{durationStr}')
+        self._server.query(key)
+        return self
+
+
+class PlexSession(object):
+    """ This is a general place to store functions specific to media that is a Plex Session.
+
+        Attributes:
+            live (bool): True if this is a live tv session.
+            player (:class:`~plexapi.client.PlexClient`): PlexClient object for the session.
+            session (:class:`~plexapi.media.Session`): Session object for the session
+                if the session is using bandwidth (None otherwise).
+            sessionKey (int): The session key for the session.
+            transcodeSession (:class:`~plexapi.media.TranscodeSession`): TranscodeSession object
+                if item is being transcoded (None otherwise).
+    """
+
+    def _loadData(self, data):
+        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 []
+
+    @cached_property
+    def user(self):
+        """ Returns the :class:`~plexapi.myplex.MyPlexAccount` object (for admin)
+            or :class:`~plexapi.myplex.MyPlexUser` object (for users) for this session.
+        """
+        myPlexAccount = self._server.myPlexAccount()
+        if self._userId == 1:
+            return myPlexAccount
+
+        return myPlexAccount.user(self._username)
+
+    def reload(self):
+        """ Reload the data for the session.
+            Note: This will return the object as-is if the session is no longer active.
+        """
+        return self._reload()
+
+    def _reload(self, _autoReload=False, **kwargs):
+        """ Perform the actual reload. """
+        # Do not auto reload sessions
+        if _autoReload:
+            return self
+
+        key = self._initpath
+        data = self._server.query(key)
+        for elem in data:
+            if elem.attrib.get('sessionKey') == str(self.sessionKey):
+                self._loadData(elem)
+                break
+        return self
+
+    def source(self):
+        """ Return the source media object for the session. """
+        return self.fetchItem(self._details_key)
+
+    def stop(self, reason=''):
+        """ Stop playback for the session.
+
+            Parameters:
+                reason (str): Message displayed to the user for stopping playback.
+        """
+        params = {
+            'sessionId': self.session.id,
+            'reason': reason,
+        }
+        key = '/status/sessions/terminate'
+        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.
+
+        Attributes:
+            accountID (int): The associated :class:`~plexapi.server.SystemAccount` ID.
+            deviceID (int): The associated :class:`~plexapi.server.SystemDevice` ID.
+            historyKey (str): API URL (/status/sessions/history/<historyID>).
+            viewedAt (datetime): Datetime item was last watched.
+    """
+
+    def _loadData(self, data):
+        self.accountID = utils.cast(int, data.attrib.get('accountID'))
+        self.deviceID = utils.cast(int, data.attrib.get('deviceID'))
+        self.historyKey = data.attrib.get('historyKey')
+        self.viewedAt = utils.toDatetime(data.attrib.get('viewedAt'))
+
+    def _reload(self, **kwargs):
+        """ Reload the data for the history entry. """
+        raise NotImplementedError('History objects cannot be reloaded. Use source() to get the source media item.')
+
+    def source(self):
+        """ Return the source media object for the history entry
+            or None if the media no longer exists on the server.
+        """
+        return self.fetchItem(self._details_key) if self._details_key else None
+
+    def delete(self):
+        """ Delete the history entry. """
+        return self._server.query(self.historyKey, method=self._server._session.delete)
+
+
+class MediaContainer(
+    Generic[PlexObjectT],
+    List[PlexObjectT],
+    PlexObject,
+):
+    """ Represents a single MediaContainer.
+
+        Attributes:
+            TAG (str): 'MediaContainer'
+            allowSync (int): Sync/Download is allowed/disallowed for feature.
+            augmentationKey (str): API URL (/library/metadata/augmentations/<augmentationKey>).
+            identifier (str): "com.plexapp.plugins.library"
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            librarySectionUUID (str): :class:`~plexapi.library.LibrarySection` UUID.
+            mediaTagPrefix (str): "/system/bundle/media/flags/"
+            mediaTagVersion (int): Unknown
+            offset (int): The offset of current results.
+            size (int): The number of items in the hub.
+            totalSize (int): The total number of items for the query.
+
+    """
+    TAG = 'MediaContainer'
+
+    def __init__(
+        self,
+        server: "PlexServer",
+        data: Element,
+        *args: PlexObjectT,
+        initpath: Optional[str] = None,
+        parent: Optional[PlexObject] = None,
+    ) -> None:
+        # super calls Generic.__init__ which calls list.__init__ eventually
+        super().__init__(*args)
+        PlexObject.__init__(self, server, data, initpath, parent)
+
+    def extend(
+        self: MediaContainerT,
+        __iterable: Union[Iterable[PlexObjectT], MediaContainerT],
+    ) -> None:
+        curr_size = self.size if self.size is not None else len(self)
+        super().extend(__iterable)
+        # update size, totalSize, and offset
+        if not isinstance(__iterable, MediaContainer):
+            return
+
+        # prefer the totalSize of the new iterable even if it is smaller
+        self.totalSize = (
+            __iterable.totalSize
+            if __iterable.totalSize is not None
+            else self.totalSize
+        )  # ideally both should be equal
+
+        # the size of the new iterable is added to the current size
+        self.size = curr_size + (
+            __iterable.size if __iterable.size is not None else len(__iterable)
+        )
+
+        # the offset is the minimum of the two, prefering older values
+        if self.offset is not None and __iterable.offset is not None:
+            self.offset = min(self.offset, __iterable.offset)
+        else:
+            self.offset = (
+                self.offset if self.offset is not None else __iterable.offset
+            )
+
+        # for all other attributes, overwrite with the new iterable's values if previously None
+        for key in (
+            "allowSync",
+            "augmentationKey",
+            "identifier",
+            "librarySectionID",
+            "librarySectionTitle",
+            "librarySectionUUID",
+            "mediaTagPrefix",
+            "mediaTagVersion",
+        ):
+            if (not hasattr(self, key)) or (getattr(self, key) is None):
+                if not hasattr(__iterable, key):
+                    continue
+                setattr(self, key, getattr(__iterable, key))
+
+    def _loadData(self, data):
+        self._data = data
+        self.allowSync = utils.cast(int, data.attrib.get('allowSync'))
+        self.augmentationKey = data.attrib.get('augmentationKey')
+        self.identifier = data.attrib.get('identifier')
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.librarySectionUUID = data.attrib.get('librarySectionUUID')
+        self.mediaTagPrefix = data.attrib.get('mediaTagPrefix')
+        self.mediaTagVersion = data.attrib.get('mediaTagVersion')
+        self.offset = utils.cast(int, data.attrib.get("offset"))
+        self.size = utils.cast(int, data.attrib.get('size'))
+        self.totalSize = utils.cast(int, data.attrib.get("totalSize"))
diff --git a/libs/plexapi/client.py b/libs/plexapi/client.py
new file mode 100644
index 000000000..3d89e3dc6
--- /dev/null
+++ b/libs/plexapi/client.py
@@ -0,0 +1,638 @@
+# -*- coding: utf-8 -*-
+import time
+import weakref
+from xml.etree import ElementTree
+
+import requests
+
+from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
+from plexapi.base import PlexObject
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized, Unsupported
+from plexapi.playqueue import PlayQueue
+from requests.status_codes import _codes as codes
+
+DEFAULT_MTYPE = 'video'
+
+
+@utils.registerPlexObject
+class PlexClient(PlexObject):
+    """ Main class for interacting with a Plex client. This class can connect
+        directly to the client and control it or proxy commands through your
+        Plex Server. To better understand the Plex client API's read this page:
+        https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to (optional).
+            data (ElementTree): Response from PlexServer used to build this object (optional).
+            initpath (str): Path used to generate data.
+            baseurl (str): HTTP URL to connect directly to this client.
+            identifier (str): The resource/machine identifier for the desired client.
+                May be necessary when connecting to a specific proxied client (optional).
+            token (str): X-Plex-Token used for authentication (optional).
+            session (:class:`~requests.Session`): requests.Session object if you want more control (optional).
+            timeout (int): timeout in seconds on initial connect to client (default config.TIMEOUT).
+
+        Attributes:
+            TAG (str): 'Player'
+            key (str): '/resources'
+            device (str): Best guess on the type of device this is (PS, iPhone, Linux, etc).
+            deviceClass (str): Device class (pc, phone, etc).
+            machineIdentifier (str): Unique ID for this device.
+            model (str): Unknown
+            platform (str): Unknown
+            platformVersion (str): Description
+            product (str): Client Product (Plex for iOS, etc).
+            protocol (str): Always seems ot be 'plex'.
+            protocolCapabilities (list<str>): List of client capabilities (navigation, playback,
+                timeline, mirror, playqueues).
+            protocolVersion (str): Protocol version (1, future proofing?)
+            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
+            session (:class:`~requests.Session`): Session object used for connection.
+            state (str): Unknown
+            title (str): Name of this client (Johns iPhone, etc).
+            token (str): X-Plex-Token used for authentication
+            vendor (str): Unknown
+            version (str): Device version (4.6.1, etc).
+            _baseurl (str): HTTP address of the client.
+            _token (str): Token used to access this client.
+            _session (obj): Requests session object used to access this client.
+            _proxyThroughServer (bool): Set to True after calling
+                :func:`~plexapi.client.PlexClient.proxyThroughServer` (default False).
+    """
+    TAG = 'Player'
+    key = '/resources'
+
+    def __init__(self, server=None, data=None, initpath=None, baseurl=None,
+          identifier=None, token=None, connect=True, session=None, timeout=None,
+          parent=None):
+        super(PlexClient, self).__init__(server, data, initpath)
+        self._baseurl = baseurl.strip('/') if baseurl else None
+        self._clientIdentifier = identifier
+        self._token = logfilter.add_secret(token)
+        self._showSecrets = CONFIG.get('log.show_secrets', '').lower() == 'true'
+        server_session = server._session if server else None
+        self._session = session or server_session or requests.Session()
+        self._timeout = timeout or TIMEOUT
+        self._proxyThroughServer = False
+        self._commandId = 0
+        self._last_call = 0
+        self._timeline_cache = []
+        self._timeline_cache_timestamp = 0
+        self._parent = weakref.ref(parent) if parent is not None else None
+        if not any([data is not None, initpath, baseurl, token]):
+            self._baseurl = CONFIG.get('auth.client_baseurl', 'http://localhost:32433')
+            self._token = logfilter.add_secret(CONFIG.get('auth.client_token'))
+        if connect and self._baseurl:
+            self.connect(timeout=timeout)
+
+    def _nextCommandId(self):
+        self._commandId += 1
+        return self._commandId
+
+    def connect(self, timeout=None):
+        """ Alias of reload as any subsequent requests to this client will be
+            made directly to the device even if the object attributes were initially
+            populated from a PlexServer.
+        """
+        if not self.key:
+            raise Unsupported('Cannot reload an object not built from a URL.')
+        self._initpath = self.key
+        data = self.query(self.key, timeout=timeout)
+        if data is None:
+            raise NotFound(f"Client not found at {self._baseurl}")
+        if self._clientIdentifier:
+            client = next(
+                (
+                    x
+                    for x in data
+                    if x.attrib.get("machineIdentifier") == self._clientIdentifier
+                ),
+                None,
+            )
+            if client is None:
+                raise NotFound(
+                    f"Client with identifier {self._clientIdentifier} not found at {self._baseurl}"
+                )
+        else:
+            client = data[0]
+        self._loadData(client)
+        return self
+
+    def reload(self):
+        """ Alias to self.connect(). """
+        return self.connect()
+
+    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')
+        self.protocol = data.attrib.get('protocol')
+        self.protocolCapabilities = data.attrib.get('protocolCapabilities', '').split(',')
+        self.protocolVersion = data.attrib.get('protocolVersion')
+        self.platform = data.attrib.get('platform')
+        self.platformVersion = data.attrib.get('platformVersion')
+        self.title = data.attrib.get('title') or data.attrib.get('name')
+        # Active session details
+        # Since protocolCapabilities is missing from /sessions we can't really control this player without
+        # creating a client manually.
+        # Add this in next breaking release.
+        # if self._initpath == 'status/sessions':
+        self.device = data.attrib.get('device')         # session
+        self.profile = data.attrib.get('profile')       # session
+        self.model = data.attrib.get('model')           # session
+        self.state = data.attrib.get('state')           # session
+        self.vendor = data.attrib.get('vendor')         # session
+        self.version = data.attrib.get('version')       # session
+        self.local = utils.cast(bool, data.attrib.get('local', 0))  # session
+        self.relayed = utils.cast(bool, data.attrib.get('relayed', 0))  # session
+        self.secure = utils.cast(bool, data.attrib.get('secure', 0))  # session
+        self.address = data.attrib.get('address')       # session
+        self.remotePublicAddress = data.attrib.get('remotePublicAddress')
+        self.userID = data.attrib.get('userID')
+
+    def _headers(self, **kwargs):
+        """ Returns a dict of all default headers for Client requests. """
+        headers = BASE_HEADERS
+        if self._token:
+            headers['X-Plex-Token'] = self._token
+        headers.update(kwargs)
+        return headers
+
+    def proxyThroughServer(self, value=True, server=None):
+        """ Tells this PlexClient instance to proxy all future commands through the PlexServer.
+            Useful if you do not wish to connect directly to the Client device itself.
+
+            Parameters:
+                value (bool): Enable or disable proxying (optional, default True).
+
+            Raises:
+                :exc:`~plexapi.exceptions.Unsupported`: Cannot use client proxy with unknown server.
+        """
+        if server:
+            self._server = server
+        if value is True and not self._server:
+            raise Unsupported('Cannot use client proxy with unknown server.')
+        self._proxyThroughServer = value
+
+    def query(self, path, method=None, headers=None, timeout=None, **kwargs):
+        """ Main method used to handle HTTPS requests to the Plex client. This method helps
+            by encoding the response to utf-8 and parsing the returned XML into and
+            ElementTree object. Returns None if no data exists in the response.
+        """
+        url = self.url(path)
+        method = method or self._session.get
+        timeout = timeout or self._timeout
+        log.debug('%s %s', method.__name__.upper(), url)
+        headers = self._headers(**headers or {})
+        response = method(url, headers=headers, timeout=timeout, **kwargs)
+        if response.status_code not in (200, 201, 204):
+            codename = codes.get(response.status_code)[0]
+            errtext = response.text.replace('\n', ' ')
+            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
+            if response.status_code == 401:
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            else:
+                raise BadRequest(message)
+        data = utils.cleanXMLString(response.text).encode('utf8')
+        return ElementTree.fromstring(data) if data.strip() else None
+
+    def sendCommand(self, command, proxy=None, **params):
+        """ Convenience wrapper around :func:`~plexapi.client.PlexClient.query` to more easily
+            send simple commands to the client. Returns an ElementTree object containing
+            the response.
+
+            Parameters:
+                command (str): Command to be sent in for format '<controller>/<command>'.
+                proxy (bool): Set True to proxy this command through the PlexServer.
+                **params (dict): Additional GET parameters to include with the command.
+
+            Raises:
+                :exc:`~plexapi.exceptions.Unsupported`: When we detect the client doesn't support this capability.
+        """
+        command = command.strip('/')
+        controller = command.split('/')[0]
+        headers = {'X-Plex-Target-Client-Identifier': self.machineIdentifier}
+        if controller not in self.protocolCapabilities:
+            log.debug("Client %s doesn't support %s controller. What your trying might not work", self.title, controller)
+
+        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
+        t = time.time()
+        if command == 'timeline/poll':
+            self._last_call = t
+        elif t - self._last_call >= 80 and self.product in ('ptp', 'Plex Media Player'):
+            self._last_call = t
+            self.sendCommand(ClientTimeline.key, wait=0)
+
+        params['commandID'] = self._nextCommandId()
+        key = f'/player/{command}{utils.joinArgs(params)}'
+
+        try:
+            return query(key, headers=headers)
+        except ElementTree.ParseError:
+            # Workaround for players which don't return valid XML on successful commands
+            #   - Plexamp, Plex for Android: `b'OK'`
+            #   - Plex for Samsung: `b'<?xml version="1.0"?><Response code="200" status="OK">'`
+            if self.product in (
+                'Plexamp',
+                'Plex for Android (TV)',
+                'Plex for Android (Mobile)',
+                'Plex for Samsung',
+            ):
+                return
+            raise
+
+    def url(self, key, includeToken=False):
+        """ Build a URL string with proper token argument. Token will be appended to the URL
+            if either includeToken is True or CONFIG.log.show_secrets is 'true'.
+        """
+        if not self._baseurl:
+            raise BadRequest('PlexClient object missing baseurl.')
+        if self._token and (includeToken or self._showSecrets):
+            delim = '&' if '?' in key else '?'
+            return f'{self._baseurl}{key}{delim}X-Plex-Token={self._token}'
+        return f'{self._baseurl}{key}'
+
+    # ---------------------
+    # Navigation Commands
+    # These commands navigate around the user-interface.
+    def contextMenu(self):
+        """ Open the context menu on the client. """
+        self.sendCommand('navigation/contextMenu')
+
+    def goBack(self):
+        """ Navigate back one position. """
+        self.sendCommand('navigation/back')
+
+    def goToHome(self):
+        """ Go directly to the home screen. """
+        self.sendCommand('navigation/home')
+
+    def goToMusic(self):
+        """ Go directly to the playing music panel. """
+        self.sendCommand('navigation/music')
+
+    def moveDown(self):
+        """ Move selection down a position. """
+        self.sendCommand('navigation/moveDown')
+
+    def moveLeft(self):
+        """ Move selection left a position. """
+        self.sendCommand('navigation/moveLeft')
+
+    def moveRight(self):
+        """ Move selection right a position. """
+        self.sendCommand('navigation/moveRight')
+
+    def moveUp(self):
+        """ Move selection up a position. """
+        self.sendCommand('navigation/moveUp')
+
+    def nextLetter(self):
+        """ Jump to next letter in the alphabet. """
+        self.sendCommand('navigation/nextLetter')
+
+    def pageDown(self):
+        """ Move selection down a full page. """
+        self.sendCommand('navigation/pageDown')
+
+    def pageUp(self):
+        """ Move selection up a full page. """
+        self.sendCommand('navigation/pageUp')
+
+    def previousLetter(self):
+        """ Jump to previous letter in the alphabet. """
+        self.sendCommand('navigation/previousLetter')
+
+    def select(self):
+        """ Select element at the current position. """
+        self.sendCommand('navigation/select')
+
+    def toggleOSD(self):
+        """ Toggle the on screen display during playback. """
+        self.sendCommand('navigation/toggleOSD')
+
+    def goToMedia(self, media, **params):
+        """ Navigate directly to the specified media page.
+
+            Parameters:
+                media (:class:`~plexapi.media.Media`): Media object to navigate to.
+                **params (dict): Additional GET parameters to include with the command.
+        """
+        server_url = media._server._baseurl.split(':')
+        command = {
+            'machineIdentifier': media._server.machineIdentifier,
+            'address': server_url[1].strip('/'),
+            'port': server_url[-1],
+            'key': media.key,
+            'protocol': server_url[0],
+            **params,
+        }
+        token = media._server.createToken()
+        if token:
+            command["token"] = token
+
+        self.sendCommand("mirror/details", **command)
+
+    # -------------------
+    # Playback Commands
+    # Most of the playback commands take a mandatory mtype {'music','photo','video'} argument,
+    # to specify which media type to apply the command to, (except for playMedia). This
+    # is in case there are multiple things happening (e.g. music in the background, photo
+    # slideshow in the foreground).
+    def pause(self, mtype=DEFAULT_MTYPE):
+        """ Pause the currently playing media type.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/pause', type=mtype)
+
+    def play(self, mtype=DEFAULT_MTYPE):
+        """ Start playback for the specified media type.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/play', type=mtype)
+
+    def refreshPlayQueue(self, playQueueID, mtype=DEFAULT_MTYPE):
+        """ Refresh the specified Playqueue.
+
+            Parameters:
+                playQueueID (str): Playqueue ID.
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand(
+            'playback/refreshPlayQueue', playQueueID=playQueueID, type=mtype)
+
+    def seekTo(self, offset, mtype=DEFAULT_MTYPE):
+        """ Seek to the specified offset (ms) during playback.
+
+            Parameters:
+                offset (int): Position to seek to (milliseconds).
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/seekTo', offset=offset, type=mtype)
+
+    def skipNext(self, mtype=DEFAULT_MTYPE):
+        """ Skip to the next playback item.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/skipNext', type=mtype)
+
+    def skipPrevious(self, mtype=DEFAULT_MTYPE):
+        """ Skip to previous playback item.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/skipPrevious', type=mtype)
+
+    def skipTo(self, key, mtype=DEFAULT_MTYPE):
+        """ Skip to the playback item with the specified key.
+
+            Parameters:
+                key (str): Key of the media item to skip to.
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/skipTo', key=key, type=mtype)
+
+    def stepBack(self, mtype=DEFAULT_MTYPE):
+        """ Step backward a chunk of time in the current playback item.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/stepBack', type=mtype)
+
+    def stepForward(self, mtype=DEFAULT_MTYPE):
+        """ Step forward a chunk of time in the current playback item.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/stepForward', type=mtype)
+
+    def stop(self, mtype=DEFAULT_MTYPE):
+        """ Stop the currently playing item.
+
+            Parameters:
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.sendCommand('playback/stop', type=mtype)
+
+    def setRepeat(self, repeat, mtype=DEFAULT_MTYPE):
+        """ Enable repeat for the specified playback items.
+
+            Parameters:
+                repeat (int): Repeat mode (0=off, 1=repeatone, 2=repeatall).
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setParameters(repeat=repeat, mtype=mtype)
+
+    def setShuffle(self, shuffle, mtype=DEFAULT_MTYPE):
+        """ Enable shuffle for the specified playback items.
+
+            Parameters:
+                shuffle (int): Shuffle mode (0=off, 1=on)
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setParameters(shuffle=shuffle, mtype=mtype)
+
+    def setVolume(self, volume, mtype=DEFAULT_MTYPE):
+        """ Enable volume for the current playback item.
+
+            Parameters:
+                volume (int): Volume level (0-100).
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setParameters(volume=volume, mtype=mtype)
+
+    def setAudioStream(self, audioStreamID, mtype=DEFAULT_MTYPE):
+        """ Select the audio stream for the current playback item (only video).
+
+            Parameters:
+                audioStreamID (str): ID of the audio stream from the media object.
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setStreams(audioStreamID=audioStreamID, mtype=mtype)
+
+    def setSubtitleStream(self, subtitleStreamID, mtype=DEFAULT_MTYPE):
+        """ Select the subtitle stream for the current playback item (only video).
+
+            Parameters:
+                subtitleStreamID (str): ID of the subtitle stream from the media object.
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setStreams(subtitleStreamID=subtitleStreamID, mtype=mtype)
+
+    def setVideoStream(self, videoStreamID, mtype=DEFAULT_MTYPE):
+        """ Select the video stream for the current playback item (only video).
+
+            Parameters:
+                videoStreamID (str): ID of the video stream from the media object.
+                mtype (str): Media type to take action against (music, photo, video).
+        """
+        self.setStreams(videoStreamID=videoStreamID, mtype=mtype)
+
+    def playMedia(self, media, offset=0, **params):
+        """ Start playback of the specified media item. See also:
+
+            Parameters:
+                media (:class:`~plexapi.media.Media`): Media item to be played back
+                    (movie, music, photo, playlist, playqueue).
+                offset (int): Number of milliseconds at which to start playing with zero
+                    representing the beginning (default 0).
+                **params (dict): Optional additional parameters to include in the playback request. See
+                    also: https://github.com/plexinc/plex-media-player/wiki/Remote-control-API#modified-commands
+        """
+        server_url = media._server._baseurl.split(':')
+        server_port = server_url[-1].strip('/')
+
+        if hasattr(media, "playlistType"):
+            mediatype = media.playlistType
+        else:
+            if isinstance(media, PlayQueue):
+                mediatype = media.items[0].listType
+            else:
+                mediatype = media.listType
+
+        # mediatype must be in ["video", "music", "photo"]
+        if mediatype == "audio":
+            mediatype = "music"
+
+        playqueue = media if isinstance(media, PlayQueue) else media._server.createPlayQueue(media)
+        command = {
+            'providerIdentifier': 'com.plexapp.plugins.library',
+            'machineIdentifier': media._server.machineIdentifier,
+            'protocol': server_url[0],
+            'address': server_url[1].strip('/'),
+            'port': server_port,
+            'offset': offset,
+            'key': media.key or playqueue.selectedItem.key,
+            'type': mediatype,
+            'containerKey': f'/playQueues/{playqueue.playQueueID}?window=100&own=1',
+            **params,
+        }
+        token = media._server.createToken()
+        if token:
+            command["token"] = token
+
+        self.sendCommand("playback/playMedia", **command)
+
+    def setParameters(self, volume=None, shuffle=None, repeat=None, mtype=DEFAULT_MTYPE):
+        """ Set multiple playback parameters at once.
+
+            Parameters:
+                volume (int): Volume level (0-100; optional).
+                shuffle (int): Shuffle mode (0=off, 1=on; optional).
+                repeat (int): Repeat mode (0=off, 1=repeatone, 2=repeatall; optional).
+                mtype (str): Media type to take action against (optional music, photo, video).
+        """
+        params = {}
+        if repeat is not None:
+            params['repeat'] = repeat
+        if shuffle is not None:
+            params['shuffle'] = shuffle
+        if volume is not None:
+            params['volume'] = volume
+        if mtype is not None:
+            params['type'] = mtype
+        self.sendCommand('playback/setParameters', **params)
+
+    def setStreams(self, audioStreamID=None, subtitleStreamID=None, videoStreamID=None, mtype=DEFAULT_MTYPE):
+        """ Select multiple playback streams at once.
+
+            Parameters:
+                audioStreamID (str): ID of the audio stream from the media object.
+                subtitleStreamID (str): ID of the subtitle stream from the media object.
+                videoStreamID (str): ID of the video stream from the media object.
+                mtype (str): Media type to take action against (optional music, photo, video).
+        """
+        params = {}
+        if audioStreamID is not None:
+            params['audioStreamID'] = audioStreamID
+        if subtitleStreamID is not None:
+            params['subtitleStreamID'] = subtitleStreamID
+        if videoStreamID is not None:
+            params['videoStreamID'] = videoStreamID
+        if mtype is not None:
+            params['type'] = mtype
+        self.sendCommand('playback/setStreams', **params)
+
+    # -------------------
+    # Timeline Commands
+    def timelines(self, wait=0):
+        """Poll the client's timelines, create, and return timeline objects.
+           Some clients may not always respond to timeline requests, believe this
+           to be a Plex bug.
+        """
+        t = time.time()
+        if t - self._timeline_cache_timestamp > 1:
+            self._timeline_cache_timestamp = t
+            timelines = self.sendCommand(ClientTimeline.key, wait=wait) or []
+            self._timeline_cache = [ClientTimeline(self, data) for data in timelines]
+
+        return self._timeline_cache
+
+    @property
+    def timeline(self):
+        """Returns the active timeline object."""
+        return next((x for x in self.timelines() if x.state != 'stopped'), None)
+
+    def isPlayingMedia(self, includePaused=True):
+        """Returns True if any media is currently playing.
+
+            Parameters:
+                includePaused (bool): Set True to treat currently paused items
+                                      as playing (optional; default True).
+        """
+        state = getattr(self.timeline, "state", None)
+        return bool(state == 'playing' or (includePaused and state == 'paused'))
+
+
+class ClientTimeline(PlexObject):
+    """Get the timeline's attributes."""
+
+    key = 'timeline/poll'
+
+    def _loadData(self, data):
+        self._data = data
+        self.address = data.attrib.get('address')
+        self.audioStreamId = utils.cast(int, data.attrib.get('audioStreamId'))
+        self.autoPlay = utils.cast(bool, data.attrib.get('autoPlay'))
+        self.containerKey = data.attrib.get('containerKey')
+        self.controllable = data.attrib.get('controllable')
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.itemType = data.attrib.get('itemType')
+        self.key = data.attrib.get('key')
+        self.location = data.attrib.get('location')
+        self.machineIdentifier = data.attrib.get('machineIdentifier')
+        self.partCount = utils.cast(int, data.attrib.get('partCount'))
+        self.partIndex = utils.cast(int, data.attrib.get('partIndex'))
+        self.playQueueID = utils.cast(int, data.attrib.get('playQueueID'))
+        self.playQueueItemID = utils.cast(int, data.attrib.get('playQueueItemID'))
+        self.playQueueVersion = utils.cast(int, data.attrib.get('playQueueVersion'))
+        self.port = utils.cast(int, data.attrib.get('port'))
+        self.protocol = data.attrib.get('protocol')
+        self.providerIdentifier = data.attrib.get('providerIdentifier')
+        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self.repeat = utils.cast(int, data.attrib.get('repeat'))
+        self.seekRange = data.attrib.get('seekRange')
+        self.shuffle = utils.cast(bool, data.attrib.get('shuffle'))
+        self.state = data.attrib.get('state')
+        self.subtitleColor = data.attrib.get('subtitleColor')
+        self.subtitlePosition = data.attrib.get('subtitlePosition')
+        self.subtitleSize = utils.cast(int, data.attrib.get('subtitleSize'))
+        self.time = utils.cast(int, data.attrib.get('time'))
+        self.type = data.attrib.get('type')
+        self.volume = utils.cast(int, data.attrib.get('volume'))
diff --git a/libs/plexapi/collection.py b/libs/plexapi/collection.py
new file mode 100644
index 000000000..63ea83730
--- /dev/null
+++ b/libs/plexapi/collection.py
@@ -0,0 +1,579 @@
+# -*- 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.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
+
+
+@utils.registerPlexObject
+class Collection(
+    PlexPartialObject,
+    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
+    ArtMixin, PosterMixin, ThemeMixin,
+    CollectionEditMixins
+):
+    """ Represents a single Collection.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'collection'
+            addedAt (datetime): Datetime the collection was added to the library.
+            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
+            artBlurHash (str): BlurHash string for artwork image.
+            audienceRating (float): Audience rating.
+            childCount (int): Number of items in the collection.
+            collectionFilterBasedOnUser (int): Which user's activity is used for the collection filtering.
+            collectionMode (int): How the items in the collection are displayed.
+            collectionPublished (bool): True if the collection is published to the Plex homepage.
+            collectionSort (int): How to sort the items in the collection.
+            content (str): The filter URI string for smart collections.
+            contentRating (str) Content rating (PG-13; NR; TV-G).
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the collection (collection://XXXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX).
+            images (List<:class:`~plexapi.media.Image`>): List of image objects.
+            index (int): Plex index number for the collection.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            lastRatedAt (datetime): Datetime the collection was last rated.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            maxYear (int): Maximum year for the items in the collection.
+            minYear (int): Minimum year for the items in the collection.
+            rating (float): Collection rating (7.9; 9.8; 8.1).
+            ratingCount (int): The number of ratings.
+            ratingKey (int): Unique key identifying the collection.
+            smart (bool): True if the collection is a smart collection.
+            subtype (str): Media type of the items in the collection (movie, show, artist, or album).
+            summary (str): Summary of the collection.
+            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
+            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
+            thumbBlurHash (str): BlurHash string for thumbnail image.
+            title (str): Name of the collection.
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'collection'
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            updatedAt (datetime): Datetime the collection was updated.
+            userRating (float): Rating of the collection (0.0 - 10.0) equaling (0 stars - 5 stars).
+    """
+    TAG = 'Directory'
+    TYPE = 'collection'
+
+    def _loadData(self, data):
+        self._data = data
+        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
+        self.art = data.attrib.get('art')
+        self.artBlurHash = data.attrib.get('artBlurHash')
+        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
+        self.childCount = utils.cast(int, data.attrib.get('childCount'))
+        self.collectionFilterBasedOnUser = utils.cast(int, data.attrib.get('collectionFilterBasedOnUser', '0'))
+        self.collectionMode = utils.cast(int, data.attrib.get('collectionMode', '-1'))
+        self.collectionPublished = utils.cast(bool, data.attrib.get('collectionPublished', '0'))
+        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')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.maxYear = utils.cast(int, data.attrib.get('maxYear'))
+        self.minYear = utils.cast(int, data.attrib.get('minYear'))
+        self.rating = utils.cast(float, data.attrib.get('rating'))
+        self.ratingCount = utils.cast(int, data.attrib.get('ratingCount'))
+        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self.smart = utils.cast(bool, data.attrib.get('smart', '0'))
+        self.subtype = data.attrib.get('subtype')
+        self.summary = data.attrib.get('summary')
+        self.theme = data.attrib.get('theme')
+        self.thumb = data.attrib.get('thumb')
+        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
+        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
+
+    def __len__(self):  # pragma: no cover
+        return len(self.items())
+
+    def __iter__(self):  # pragma: no cover
+        for item in self.items():
+            yield item
+
+    def __contains__(self, other):  # pragma: no cover
+        return any(i.key == other.key for i in self.items())
+
+    def __getitem__(self, key):  # pragma: no cover
+        return self.items()[key]
+
+    @property
+    def listType(self):
+        """ Returns the listType for the collection. """
+        if self.isVideo:
+            return 'video'
+        elif self.isAudio:
+            return 'audio'
+        elif self.isPhoto:
+            return 'photo'
+        else:
+            raise Unsupported('Unexpected collection type')
+
+    @property
+    def metadataType(self):
+        """ Returns the type of metadata in the collection. """
+        return self.subtype
+
+    @property
+    def isVideo(self):
+        """ Returns True if this is a video collection. """
+        return self.subtype in {'movie', 'show', 'season', 'episode'}
+
+    @property
+    def isAudio(self):
+        """ Returns True if this is an audio collection. """
+        return self.subtype in {'artist', 'album', 'track'}
+
+    @property
+    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()
+
+    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
+
+    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):
+        """ Returns the item in the collection that matches the specified title.
+
+            Parameters:
+                title (str): Title of the item to return.
+
+            Raises:
+                :class:`plexapi.exceptions.NotFound`: When the item is not found in the collection.
+        """
+        for item in self.items():
+            if item.title.lower() == title.lower():
+                return item
+        raise NotFound(f'Item with title "{title}" not found in the collection')
+
+    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):
+        """ Returns the :class:`~plexapi.library.ManagedHub` for this collection. """
+        key = f'/hubs/sections/{self.librarySectionID}/manage?metadataItemId={self.ratingKey}'
+        data = self._server.query(key)
+        hub = self.findItem(data, cls=ManagedHub)
+        if hub is None:
+            hub = ManagedHub(self._server, data, parent=self)
+            hub.identifier = f'custom.collection.{self.librarySectionID}.{self.ratingKey}'
+            hub.title = self.title
+            hub._promoted = False
+        return hub
+
+    def get(self, title):
+        """ Alias to :func:`~plexapi.library.Collection.item`. """
+        return self.item(title)
+
+    def filterUserUpdate(self, user=None):
+        """ Update the collection filtering user advanced setting.
+
+            Parameters:
+                user (str): One of the following values:
+                    "admin" (Always the server admin user),
+                    "user" (User currently viewing the content)
+
+            Example:
+
+                .. code-block:: python
+
+                    collection.updateMode(user="user")
+
+        """
+        if not self.smart:
+            raise BadRequest('Cannot change collection filtering user for a non-smart collection.')
+
+        user_dict = {
+            'admin': 0,
+            'user': 1
+        }
+        key = user_dict.get(user)
+        if key is None:
+            raise BadRequest(f'Unknown collection filtering user: {user}. Options {list(user_dict)}')
+        return self.editAdvanced(collectionFilterBasedOnUser=key)
+
+    def modeUpdate(self, mode=None):
+        """ Update the collection mode advanced setting.
+
+            Parameters:
+                mode (str): One of the following values:
+                    "default" (Library default),
+                    "hide" (Hide Collection),
+                    "hideItems" (Hide Items in this Collection),
+                    "showItems" (Show this Collection and its Items)
+
+            Example:
+
+                .. code-block:: python
+
+                    collection.updateMode(mode="hide")
+
+        """
+        mode_dict = {
+            'default': -1,
+            'hide': 0,
+            'hideItems': 1,
+            'showItems': 2
+        }
+        key = mode_dict.get(mode)
+        if key is None:
+            raise BadRequest(f'Unknown collection mode: {mode}. Options {list(mode_dict)}')
+        return self.editAdvanced(collectionMode=key)
+
+    def sortUpdate(self, sort=None):
+        """ Update the collection order advanced setting.
+
+            Parameters:
+                sort (str): One of the following values:
+                    "release" (Order Collection by release dates),
+                    "alpha" (Order Collection alphabetically),
+                    "custom" (Custom collection order)
+
+            Example:
+
+                .. code-block:: python
+
+                    collection.sortUpdate(sort="alpha")
+
+        """
+        if self.smart:
+            raise BadRequest('Cannot change collection order for a smart collection.')
+
+        sort_dict = {
+            'release': 0,
+            'alpha': 1,
+            'custom': 2
+        }
+        key = sort_dict.get(sort)
+        if key is None:
+            raise BadRequest(f'Unknown sort dir: {sort}. Options: {list(sort_dict)}')
+        return self.editAdvanced(collectionSort=key)
+
+    def addItems(self, items):
+        """ Add items to the collection.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to be added to the collection.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to add items to a smart collection.
+        """
+        if self.smart:
+            raise BadRequest('Cannot add items to a smart collection.')
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        ratingKeys = []
+        for item in items:
+            if item.type != self.subtype:  # pragma: no cover
+                raise BadRequest(f'Can not mix media types when building a collection: {self.subtype} and {item.type}')
+            ratingKeys.append(str(item.ratingKey))
+
+        ratingKeys = ','.join(ratingKeys)
+        uri = f'{self._server._uriRoot()}/library/metadata/{ratingKeys}'
+
+        args = {'uri': uri}
+        key = f"{self.key}/items{utils.joinArgs(args)}"
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def removeItems(self, items):
+        """ Remove items from the collection.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to be removed from the collection.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to remove items from a smart collection.
+        """
+        if self.smart:
+            raise BadRequest('Cannot remove items from a smart collection.')
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        for item in items:
+            key = f'{self.key}/items/{item.ratingKey}'
+            self._server.query(key, method=self._server._session.delete)
+        return self
+
+    def moveItem(self, item, after=None):
+        """ Move an item to a new position in the collection.
+
+            Parameters:
+                item (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` object to be moved in the collection.
+                after (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` object to move the item after in the collection.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to move items in a smart collection.
+        """
+        if self.smart:
+            raise BadRequest('Cannot move items in a smart collection.')
+
+        key = f'{self.key}/items/{item.ratingKey}/move'
+
+        if after:
+            key += f'?after={after.ratingKey}'
+
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def updateFilters(self, libtype=None, limit=None, sort=None, filters=None, **kwargs):
+        """ Update the filters for a smart collection.
+
+            Parameters:
+                libtype (str): The specific type of content to filter
+                    (movie, show, season, episode, artist, album, track, photoalbum, photo, collection).
+                limit (int): Limit the number of items in the collection.
+                sort (str or list, optional): A string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): A dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                **kwargs (dict): Additional custom filters to apply to the search results.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying update filters for a regular collection.
+        """
+        if not self.smart:
+            raise BadRequest('Cannot update filters for a regular collection.')
+
+        section = self.section()
+        searchKey = section._buildSearchKey(
+            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
+        uri = f'{self._server._uriRoot()}{searchKey}'
+
+        args = {'uri': uri}
+        key = f"{self.key}/items{utils.joinArgs(args)}"
+        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()
+
+    @classmethod
+    def _create(cls, server, title, section, items):
+        """ Create a regular collection. """
+        if not items:
+            raise BadRequest('Must include items to add when creating new collection.')
+
+        if not isinstance(section, LibrarySection):
+            section = server.library.section(section)
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        itemType = items[0].type
+        ratingKeys = []
+        for item in items:
+            if item.type != itemType:  # pragma: no cover
+                raise BadRequest('Can not mix media types when building a collection.')
+            ratingKeys.append(str(item.ratingKey))
+
+        ratingKeys = ','.join(ratingKeys)
+        uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
+
+        args = {'uri': uri, 'type': utils.searchType(itemType), 'title': title, 'smart': 0, 'sectionId': section.key}
+        key = f"/library/collections{utils.joinArgs(args)}"
+        data = server.query(key, method=server._session.post)[0]
+        return cls(server, data, initpath=key)
+
+    @classmethod
+    def _createSmart(cls, server, title, section, limit=None, libtype=None, sort=None, filters=None, **kwargs):
+        """ Create a smart collection. """
+        if not isinstance(section, LibrarySection):
+            section = server.library.section(section)
+
+        libtype = libtype or section.TYPE
+
+        searchKey = section._buildSearchKey(
+            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
+        uri = f'{server._uriRoot()}{searchKey}'
+
+        args = {'uri': uri, 'type': utils.searchType(libtype), 'title': title, 'smart': 1, 'sectionId': section.key}
+        key = f"/library/collections{utils.joinArgs(args)}"
+        data = server.query(key, method=server._session.post)[0]
+        return cls(server, data, initpath=key)
+
+    @classmethod
+    def create(cls, server, title, section, items=None, smart=False, limit=None,
+               libtype=None, sort=None, filters=None, **kwargs):
+        """ Create a collection.
+
+            Parameters:
+                server (:class:`~plexapi.server.PlexServer`): Server to create the collection on.
+                title (str): Title of the collection.
+                section (:class:`~plexapi.library.LibrarySection`, str): The library section to create the collection in.
+                items (List): Regular collections only, list of :class:`~plexapi.audio.Audio`,
+                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the collection.
+                smart (bool): True to create a smart collection. Default False.
+                limit (int): Smart collections only, limit the number of items in the collection.
+                libtype (str): Smart collections only, the specific type of content to filter
+                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
+                sort (str or list, optional): Smart collections only, a string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): Smart collections only, a dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                **kwargs (dict): Smart collections only, additional custom filters to apply to the
+                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the collection.
+                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the collection.
+
+            Returns:
+                :class:`~plexapi.collection.Collection`: A new instance of the created Collection.
+        """
+        if smart:
+            if items:
+                raise BadRequest('Cannot create a smart collection with items.')
+            return cls._createSmart(server, title, section, limit, libtype, sort, filters, **kwargs)
+        else:
+            return cls._create(server, title, section, items)
+
+    def sync(self, videoQuality=None, photoResolution=None, audioBitrate=None, client=None, clientId=None, limit=None,
+             unwatched=False, title=None):
+        """ Add the collection as sync item for the specified device.
+            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
+                                    :mod:`~plexapi.sync` module. Used only when collection contains video.
+                photoResolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in
+                                       the module :mod:`~plexapi.sync`. Used only when collection contains photos.
+                audioBitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values
+                                    from the module :mod:`~plexapi.sync`. Used only when collection contains audio.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                limit (int): maximum count of items to sync, unlimited if `None`.
+                unwatched (bool): if `True` watched videos wouldn't be synced.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current photo.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When collection is not allowed to sync.
+                :exc:`~plexapi.exceptions.Unsupported`: When collection content is unsupported.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: A new instance of the created sync item.
+        """
+        if not self.section().allowSync:
+            raise BadRequest('The collection is not allowed to sync')
+
+        from plexapi.sync import SyncItem, Policy, MediaSettings
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self.title
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.listType
+        sync_item.metadataType = self.metadataType
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        key = quote_plus(f'{self.key}/children?excludeAllLeaves=1')
+        sync_item.location = f'library:///directory/{key}'
+        sync_item.policy = Policy.create(limit, unwatched)
+
+        if self.isVideo:
+            sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
+        elif self.isAudio:
+            sync_item.mediaSettings = MediaSettings.createMusic(audioBitrate)
+        elif self.isPhoto:
+            sync_item.mediaSettings = MediaSettings.createPhoto(photoResolution)
+        else:
+            raise Unsupported('Unsupported collection content')
+
+        return myplex.sync(sync_item, client=client, clientId=clientId)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Collections' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
diff --git a/libs/plexapi/config.py b/libs/plexapi/config.py
new file mode 100644
index 000000000..5cfa74c8e
--- /dev/null
+++ b/libs/plexapi/config.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+import os
+from collections import defaultdict
+from configparser import ConfigParser
+
+from plexapi import utils
+
+
+class PlexConfig(ConfigParser):
+    """ PlexAPI configuration object. Settings are stored in an INI file within the
+        user's home directory and can be overridden after importing plexapi by simply
+        setting the value. See the documentation section 'Configuration' for more
+        details on available options.
+
+        Parameters:
+            path (str): Path of the configuration file to load.
+    """
+
+    def __init__(self, path):
+        ConfigParser.__init__(self)
+        self.read(path)
+        self.data = self._asDict()
+
+    def get(self, key, default=None, cast=None):
+        """ Returns the specified configuration value or <default> if not found.
+
+            Parameters:
+                key (str): Configuration variable to load in the format '<section>.<variable>'.
+                default: Default value to use if key not found.
+                cast (func): Cast the value to the specified type before returning.
+        """
+        try:
+            # First: check environment variable is set
+            envkey = f"PLEXAPI_{key.upper().replace('.', '_')}"
+            value = os.environ.get(envkey)
+            if value is None:
+                # Second: check the config file has attr
+                section, name = key.lower().split('.')
+                value = self.data.get(section, {}).get(name, default)
+            return utils.cast(cast, value) if cast else value
+        except:  # noqa: E722
+            return default
+
+    def _asDict(self):
+        """ Returns all configuration values as a dictionary. """
+        config = defaultdict(dict)
+        for section in self._sections:
+            for name, value in self._sections[section].items():
+                if name != '__name__':
+                    config[section.lower()][name.lower()] = value
+        return dict(config)
+
+
+def reset_base_headers():
+    """ Convenience function returns a dict of all base X-Plex-* headers for session requests. """
+    import plexapi
+    return {
+        'X-Plex-Platform': plexapi.X_PLEX_PLATFORM,
+        'X-Plex-Platform-Version': plexapi.X_PLEX_PLATFORM_VERSION,
+        'X-Plex-Provides': plexapi.X_PLEX_PROVIDES,
+        'X-Plex-Product': plexapi.X_PLEX_PRODUCT,
+        'X-Plex-Version': plexapi.X_PLEX_VERSION,
+        'X-Plex-Device': plexapi.X_PLEX_DEVICE,
+        'X-Plex-Device-Name': plexapi.X_PLEX_DEVICE_NAME,
+        'X-Plex-Client-Identifier': plexapi.X_PLEX_IDENTIFIER,
+        'X-Plex-Language': plexapi.X_PLEX_LANGUAGE,
+        'X-Plex-Sync-Version': '2',
+        'X-Plex-Features': 'external-media',
+    }
diff --git a/libs/plexapi/const.py b/libs/plexapi/const.py
new file mode 100644
index 000000000..bc3e81aa3
--- /dev/null
+++ b/libs/plexapi/const.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+"""Constants used by plexapi."""
+
+# Library version
+MAJOR_VERSION = 4
+MINOR_VERSION = 16
+PATCH_VERSION = 1
+__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
new file mode 100644
index 000000000..182feb13d
--- /dev/null
+++ b/libs/plexapi/exceptions.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+
+class PlexApiException(Exception):
+    """ Base class for all PlexAPI exceptions. """
+    pass
+
+
+class BadRequest(PlexApiException):
+    """ An invalid request, generally a user error. """
+    pass
+
+
+class NotFound(PlexApiException):
+    """ Request media item or device is not found. """
+    pass
+
+
+class UnknownType(PlexApiException):
+    """ Unknown library type. """
+    pass
+
+
+class Unsupported(PlexApiException):
+    """ Unsupported client request. """
+    pass
+
+
+class Unauthorized(BadRequest):
+    """ Invalid username/password or token. """
+    pass
+
+
+class TwoFactorRequired(Unauthorized):
+    """ Two factor authentication required. """
+    pass
diff --git a/libs/plexapi/gdm.py b/libs/plexapi/gdm.py
new file mode 100644
index 000000000..b9edac087
--- /dev/null
+++ b/libs/plexapi/gdm.py
@@ -0,0 +1,151 @@
+"""
+Support for discovery using GDM (Good Day Mate), multicast protocol by Plex.
+
+# Licensed Apache 2.0
+# From https://github.com/home-assistant/netdisco/netdisco/gdm.py
+
+Inspired by:
+  hippojay's plexGDM: https://github.com/hippojay/script.plexbmc.helper/resources/lib/plexgdm.py
+  iBaa's PlexConnect: https://github.com/iBaa/PlexConnect/PlexAPI.py
+"""
+import socket
+import struct
+
+
+class GDM:
+    """Base class to discover GDM services.
+
+       Attributes:
+           entries (List<dict>): List of server and/or client data discovered.
+    """
+
+    def __init__(self):
+        self.entries = []
+
+    def scan(self, scan_for_clients=False):
+        """Scan the network."""
+        self.update(scan_for_clients)
+
+    def all(self, scan_for_clients=False):
+        """Return all found entries.
+
+        Will scan for entries if not scanned recently.
+        """
+        self.scan(scan_for_clients)
+        return list(self.entries)
+
+    def find_by_content_type(self, value):
+        """Return a list of entries that match the content_type."""
+        self.scan()
+        return [entry for entry in self.entries
+                if value in entry['data']['Content-Type']]
+
+    def find_by_data(self, values):
+        """Return a list of entries that match the search parameters."""
+        self.scan()
+        return [entry for entry in self.entries
+                if all(item in entry['data'].items()
+                       for item in values.items())]
+
+    def update(self, scan_for_clients):
+        """Scan for new GDM services.
+
+        Examples of the dict list assigned to self.entries by this function:
+
+            Server:
+
+                [{'data': {
+                     'Content-Type': 'plex/media-server',
+                     'Host': '53f4b5b6023d41182fe88a99b0e714ba.plex.direct',
+                     'Name': 'myfirstplexserver',
+                     'Port': '32400',
+                     'Resource-Identifier': '646ab0aa8a01c543e94ba975f6fd6efadc36b7',
+                     'Updated-At': '1585769946',
+                     'Version': '1.18.8.2527-740d4c206',
+                },
+                 'from': ('10.10.10.100', 32414)}]
+
+            Clients:
+
+                [{'data': {'Content-Type': 'plex/media-player',
+                     'Device-Class': 'stb',
+                     'Name': 'plexamp',
+                     'Port': '36000',
+                     'Product': 'Plexamp',
+                     'Protocol': 'plex',
+                     'Protocol-Capabilities': 'timeline,playback,playqueues,playqueues-creation',
+                     'Protocol-Version': '1',
+                     'Resource-Identifier': 'b6e57a3f-e0f8-494f-8884-f4b58501467e',
+                     'Version': '1.1.0',
+                },
+                 'from': ('10.10.10.101', 32412)}]
+        """
+
+        gdm_msg = 'M-SEARCH * HTTP/1.0'.encode('ascii')
+        gdm_timeout = 1
+
+        self.entries = []
+        known_responses = []
+
+        # setup socket for discovery -> multicast message
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.settimeout(gdm_timeout)
+
+        # Set the time-to-live for messages for local network
+        sock.setsockopt(socket.IPPROTO_IP,
+                        socket.IP_MULTICAST_TTL,
+                        struct.pack("B", gdm_timeout))
+
+        if scan_for_clients:
+            # setup socket for broadcast to Plex clients
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+            gdm_ip = '255.255.255.255'
+            gdm_port = 32412
+        else:
+            # setup socket for multicast to Plex server(s)
+            gdm_ip = '239.0.0.250'
+            gdm_port = 32414
+
+        try:
+            # Send data to the multicast group
+            sock.sendto(gdm_msg, (gdm_ip, gdm_port))
+
+            # Look for responses from all recipients
+            while True:
+                try:
+                    bdata, host = sock.recvfrom(1024)
+                    data = bdata.decode('utf-8')
+                    if '200 OK' in data.splitlines()[0]:
+                        ddata = {k: v.strip() for (k, v) in (
+                            line.split(':') for line in
+                            data.splitlines() if ':' in line)}
+                        identifier = ddata.get('Resource-Identifier')
+                        if identifier and identifier in known_responses:
+                            continue
+                        known_responses.append(identifier)
+                        self.entries.append({'data': ddata,
+                                             'from': host})
+                except socket.timeout:
+                    break
+        finally:
+            sock.close()
+
+
+def main():
+    """Test GDM discovery."""
+    from pprint import pprint
+
+    gdm = GDM()
+
+    pprint("Scanning GDM for servers...")
+    gdm.scan()
+    pprint(gdm.entries)
+
+    pprint("Scanning GDM for clients...")
+    gdm.scan(scan_for_clients=True)
+    pprint(gdm.entries)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/libs/plexapi/library.py b/libs/plexapi/library.py
new file mode 100644
index 000000000..6df8b6d2e
--- /dev/null
+++ b/libs/plexapi/library.py
@@ -0,0 +1,3326 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+import re
+from typing import Any, TYPE_CHECKING
+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.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:
+    from plexapi.audio import Track
+
+
+class Library(PlexObject):
+    """ Represents a PlexServer library. This contains all sections of media defined
+        in your Plex server including video, shows and audio.
+
+        Attributes:
+            key (str): '/library'
+            identifier (str): Unknown ('com.plexapp.plugins.library').
+            mediaTagVersion (str): Unknown (/system/bundle/media/flags/)
+            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to.
+            title1 (str): 'Plex Library' (not sure how useful this is).
+            title2 (str): Second title (this is blank on my setup).
+    """
+    key = '/library'
+
+    def _loadData(self, data):
+        self._data = data
+        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
+
+    def _loadSections(self):
+        """ Loads and caches all the library sections. """
+        key = '/library/sections'
+        sectionsByID = {}
+        sectionsByTitle = defaultdict(list)
+        libcls = {
+            'movie': MovieSection,
+            'show': ShowSection,
+            'artist': MusicSection,
+            'photo': PhotoSection,
+        }
+
+        for elem in self._server.query(key):
+            section = libcls.get(elem.attrib.get('type'), LibrarySection)(self._server, elem, initpath=key)
+            sectionsByID[section.key] = section
+            sectionsByTitle[section.title.lower().strip()].append(section)
+
+        self._sectionsByID = sectionsByID
+        self._sectionsByTitle = dict(sectionsByTitle)
+
+    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):
+        """ Returns the :class:`~plexapi.library.LibrarySection` that matches the specified title.
+            Note: Multiple library sections with the same title is ambiguous.
+            Use :func:`~plexapi.library.Library.sectionByID` instead for an exact match.
+
+            Parameters:
+                title (str): Title of the section to return.
+
+            Raises:
+                :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:
+            raise NotFound(f'Invalid library section: {title}') from None
+
+        if len(sections) > 1:
+            warnings.warn(
+                'Multiple library sections with the same title found, use "sectionByID" instead. '
+                'Returning the last section.'
+            )
+        return sections[-1]
+
+    def sectionByID(self, sectionID):
+        """ Returns the :class:`~plexapi.library.LibrarySection` that matches the specified sectionID.
+
+            Parameters:
+                sectionID (int): ID of the section to return.
+
+            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:
+            raise NotFound(f'Invalid library sectionID: {sectionID}') from None
+
+    def hubs(self, sectionID=None, identifier=None, **kwargs):
+        """ Returns a list of :class:`~plexapi.library.Hub` across all library sections.
+
+            Parameters:
+                sectionID (int or str or list, optional):
+                    IDs of the sections to limit results or "playlists".
+                identifier (str or list, optional):
+                    Names of identifiers to limit results.
+                    Available on `Hub` instances as the `hubIdentifier` attribute.
+                    Examples: 'home.continue' or 'home.ondeck'
+        """
+        if sectionID:
+            if not isinstance(sectionID, list):
+                sectionID = [sectionID]
+            kwargs['contentDirectoryID'] = ",".join(map(str, sectionID))
+        if identifier:
+            if not isinstance(identifier, list):
+                identifier = [identifier]
+            kwargs['identifier'] = ",".join(identifier)
+        key = f'/hubs{utils.joinArgs(kwargs)}'
+        return self.fetchItems(key)
+
+    def all(self, **kwargs):
+        """ Returns a list of all media from all library sections.
+            This may be a very large dataset to retrieve.
+        """
+        items = []
+        for section in self.sections():
+            for item in section.all(**kwargs):
+                items.append(item)
+        return items
+
+    def onDeck(self):
+        """ Returns a list of all media items on deck. """
+        return self.fetchItems('/library/onDeck')
+
+    def recentlyAdded(self):
+        """ Returns a list of all media items recently added. """
+        return self.fetchItems('/library/recentlyAdded')
+
+    def search(self, title=None, libtype=None, **kwargs):
+        """ Searching within a library section is much more powerful. It seems certain
+            attributes on the media objects can be targeted to filter this search down
+            a bit, but I haven't found the documentation for it.
+
+            Example: "studio=Comedy%20Central" or "year=1999" "title=Kung Fu" all work. Other items
+            such as actor=<id> seem to work, but require you already know the id of the actor.
+            TLDR: This is untested but seems to work. Use library section search when you can.
+        """
+        args = {}
+        if title:
+            args['title'] = title
+        if libtype:
+            args['type'] = utils.searchType(libtype)
+        for attr, value in kwargs.items():
+            args[attr] = value
+        key = f'/library/all{utils.joinArgs(args)}'
+        return self.fetchItems(key)
+
+    def cleanBundles(self):
+        """ Poster images and other metadata for items in your library are kept in "bundle"
+            packages. When you remove items from your library, these bundles aren't immediately
+            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.
+        """
+        self._server.query('/library/clean/bundles?async=1', method=self._server._session.put)
+        return self
+
+    def emptyTrash(self):
+        """ If a library has items in the Library Trash, use this option to empty the Trash. """
+        for section in self.sections():
+            section.emptyTrash()
+        return self
+
+    def optimize(self):
+        """ The Optimize option cleans up the server database from unused or fragmented data.
+            For example, if you have deleted or added an entire library or many items in a
+            library, you may like to optimize the database.
+        """
+        self._server.query('/library/optimize?async=1', method=self._server._session.put)
+        return self
+
+    def update(self):
+        """ Scan this library for new items."""
+        self._server.query('/library/sections/all/refresh')
+        return self
+
+    def cancelUpdate(self):
+        """ Cancel a library update. """
+        key = '/library/sections/all/refresh'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+    def refresh(self):
+        """ Forces a download of fresh media information from the internet.
+            This can take a long time. Any locked fields are not modified.
+        """
+        self._server.query('/library/sections/all/refresh?force=1')
+        return self
+
+    def deleteMediaPreviews(self):
+        """ Delete the preview thumbnails for the all sections. This cannot be
+            undone. Recreating media preview files can take hours or even days.
+        """
+        for section in self.sections():
+            section.deleteMediaPreviews()
+        return self
+
+    def add(self, name='', type='', agent='', scanner='', location='', language='en-US', *args, **kwargs):
+        """ Simplified add for the most common options.
+
+            Parameters:
+                name (str): Name of the library
+                agent (str): Example com.plexapp.agents.imdb
+                type (str): movie, show, # check me
+                location (str or list): /path/to/files, ["/path/to/files", "/path/to/morefiles"]
+                language (str): Four letter language code (e.g. en-US)
+                kwargs (dict): Advanced options should be passed as a dict. where the id is the key.
+
+            **Photo Preferences**
+
+                * **agent** (str): com.plexapp.agents.none
+                * **enableAutoPhotoTags** (bool): Tag photos. Default value false.
+                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
+                * **includeInGlobal** (bool): Include in dashboard. Default value true.
+                * **scanner** (str): Plex Photo Scanner
+
+            **Movie Preferences**
+
+                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.imdb, tv.plex.agents.movie,
+                  com.plexapp.agents.themoviedb
+                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
+                * **enableCinemaTrailers** (bool): Enable Cinema Trailers. Default value true.
+                * **includeInGlobal** (bool): Include in dashboard. Default value true.
+                * **scanner** (str): Plex Movie, Plex Movie Scanner, Plex Video Files Scanner, Plex Video Files
+
+            **IMDB Movie Options** (com.plexapp.agents.imdb)
+
+                * **title** (bool): Localized titles. Default value false.
+                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
+                * **only_trailers** (bool): Skip extras which aren't trailers. Default value false.
+                * **redband** (bool): Use red band (restricted audiences) trailers when available. Default value false.
+                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
+                * **cast_list** (int): Cast List Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
+                * **ratings** (int): Ratings Source, Default value 0 Possible options:
+                  0:Rotten Tomatoes, 1:IMDb, 2:The Movie Database.
+                * **summary** (int): Plot Summary Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
+                * **country** (int): Default value 46 Possible options 0:Argentina, 1:Australia, 2:Austria,
+                  3:Belgium, 4:Belize, 5:Bolivia, 6:Brazil, 7:Canada, 8:Chile, 9:Colombia, 10:Costa Rica,
+                  11:Czech Republic, 12:Denmark, 13:Dominican Republic, 14:Ecuador, 15:El Salvador,
+                  16:France, 17:Germany, 18:Guatemala, 19:Honduras, 20:Hong Kong SAR, 21:Ireland,
+                  22:Italy, 23:Jamaica, 24:Korea, 25:Liechtenstein, 26:Luxembourg, 27:Mexico, 28:Netherlands,
+                  29:New Zealand, 30:Nicaragua, 31:Panama, 32:Paraguay, 33:Peru, 34:Portugal,
+                  35:Peoples Republic of China, 36:Puerto Rico, 37:Russia, 38:Singapore, 39:South Africa,
+                  40:Spain, 41:Sweden, 42:Switzerland, 43:Taiwan, 44:Trinidad, 45:United Kingdom,
+                  46:United States, 47:Uruguay, 48:Venezuela.
+                * **collections** (bool): Use collection info from The Movie Database. Default value false.
+                * **localart** (bool): Prefer artwork based on library language. Default value true.
+                * **adult** (bool): Include adult content. Default value false.
+                * **usage** (bool): Send anonymous usage data to Plex. Default value true.
+
+            **TheMovieDB Movie Options** (com.plexapp.agents.themoviedb)
+
+                * **collections** (bool): Use collection info from The Movie Database. Default value false.
+                * **localart** (bool): Prefer artwork based on library language. Default value true.
+                * **adult** (bool): Include adult content. Default value false.
+                * **country** (int): Country (used for release date and content rating). Default value 47 Possible
+                  options 0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize, 6:Bolivia, 7:Brazil, 8:Canada,
+                  9:Chile, 10:Colombia, 11:Costa Rica, 12:Czech Republic, 13:Denmark, 14:Dominican Republic, 15:Ecuador,
+                  16:El Salvador, 17:France, 18:Germany, 19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland,
+                  23:Italy, 24:Jamaica, 25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands,
+                  30:New Zealand, 31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
+                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore, 40:South Africa, 41:Spain,
+                  42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad, 46:United Kingdom, 47:United States, 48:Uruguay,
+                  49:Venezuela.
+
+            **Show Preferences**
+
+                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.thetvdb, com.plexapp.agents.themoviedb,
+                  tv.plex.agents.series
+                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
+                * **episodeSort** (int): Episode order. Default -1 Possible options: 0:Oldest first, 1:Newest first.
+                * **flattenSeasons** (int): Seasons. Default value 0 Possible options: 0:Show,1:Hide.
+                * **includeInGlobal** (bool): Include in dashboard. Default value true.
+                * **scanner** (str): Plex TV Series, Plex Series Scanner
+
+            **TheTVDB Show Options** (com.plexapp.agents.thetvdb)
+
+                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
+                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
+
+            **TheMovieDB Show Options** (com.plexapp.agents.themoviedb)
+
+                * **collections** (bool): Use collection info from The Movie Database. Default value false.
+                * **localart** (bool): Prefer artwork based on library language. Default value true.
+                * **adult** (bool): Include adult content. Default value false.
+                * **country** (int): Country (used for release date and content rating). Default value 47 options
+                  0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize, 6:Bolivia, 7:Brazil, 8:Canada, 9:Chile,
+                  10:Colombia, 11:Costa Rica, 12:Czech Republic, 13:Denmark, 14:Dominican Republic, 15:Ecuador,
+                  16:El Salvador, 17:France, 18:Germany, 19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland,
+                  23:Italy, 24:Jamaica, 25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands,
+                  30:New Zealand, 31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
+                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore, 40:South Africa,
+                  41:Spain, 42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad, 46:United Kingdom, 47:United States,
+                  48:Uruguay, 49:Venezuela.
+
+            **Other Video Preferences**
+
+                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.imdb, com.plexapp.agents.themoviedb
+                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
+                * **enableCinemaTrailers** (bool): Enable Cinema Trailers. Default value true.
+                * **includeInGlobal** (bool): Include in dashboard. Default value true.
+                * **scanner** (str): Plex Movie Scanner, Plex Video Files Scanner
+
+            **IMDB Other Video Options** (com.plexapp.agents.imdb)
+
+                * **title** (bool): Localized titles. Default value false.
+                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
+                * **only_trailers** (bool): Skip extras which aren't trailers. Default value false.
+                * **redband** (bool): Use red band (restricted audiences) trailers when available. Default value false.
+                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
+                * **cast_list** (int): Cast List Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
+                * **ratings** (int): Ratings Source Default value 0 Possible options:
+                  0:Rotten Tomatoes,1:IMDb,2:The Movie Database.
+                * **summary** (int): Plot Summary Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
+                * **country** (int): Country: Default value 46 Possible options: 0:Argentina, 1:Australia, 2:Austria,
+                  3:Belgium, 4:Belize, 5:Bolivia, 6:Brazil, 7:Canada, 8:Chile, 9:Colombia, 10:Costa Rica,
+                  11:Czech Republic, 12:Denmark, 13:Dominican Republic, 14:Ecuador, 15:El Salvador, 16:France,
+                  17:Germany, 18:Guatemala, 19:Honduras, 20:Hong Kong SAR, 21:Ireland, 22:Italy, 23:Jamaica,
+                  24:Korea, 25:Liechtenstein, 26:Luxembourg, 27:Mexico, 28:Netherlands, 29:New Zealand, 30:Nicaragua,
+                  31:Panama, 32:Paraguay, 33:Peru, 34:Portugal, 35:Peoples Republic of China, 36:Puerto Rico,
+                  37:Russia, 38:Singapore, 39:South Africa, 40:Spain, 41:Sweden, 42:Switzerland, 43:Taiwan, 44:Trinidad,
+                  45:United Kingdom, 46:United States, 47:Uruguay, 48:Venezuela.
+                * **collections** (bool): Use collection info from The Movie Database. Default value false.
+                * **localart** (bool): Prefer artwork based on library language. Default value true.
+                * **adult** (bool): Include adult content. Default value false.
+                * **usage** (bool): Send anonymous usage data to Plex. Default value true.
+
+            **TheMovieDB Other Video Options** (com.plexapp.agents.themoviedb)
+
+                * **collections** (bool): Use collection info from The Movie Database. Default value false.
+                * **localart** (bool): Prefer artwork based on library language. Default value true.
+                * **adult** (bool): Include adult content. Default value false.
+                * **country** (int): Country (used for release date and content rating). Default
+                  value 47 Possible options 0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize,
+                  6:Bolivia, 7:Brazil, 8:Canada, 9:Chile, 10:Colombia, 11:Costa Rica, 12:Czech Republic,
+                  13:Denmark, 14:Dominican Republic, 15:Ecuador, 16:El Salvador, 17:France, 18:Germany,
+                  19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland, 23:Italy, 24:Jamaica,
+                  25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands, 30:New Zealand,
+                  31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
+                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore,
+                  40:South Africa, 41:Spain, 42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad,
+                  46:United Kingdom, 47:United States, 48:Uruguay, 49:Venezuela.
+        """
+        if isinstance(location, str):
+            location = [location]
+        locations = []
+        for path in location:
+            if not self._server.isBrowsable(path):
+                raise BadRequest(f'Path: {path} does not exist.')
+            locations.append(('location', path))
+
+        part = (f'/library/sections?name={quote_plus(name)}&type={type}&agent={agent}'
+                f'&scanner={quote_plus(scanner)}&language={language}&{urlencode(locations, doseq=True)}')
+        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)
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get Play History for all library Sections for the owner.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        hist = []
+        for section in self.sections():
+            hist.extend(section.history(maxresults=maxresults, mindate=mindate))
+        return hist
+
+    def tags(self, tag):
+        """ Returns a list of :class:`~plexapi.library.LibraryMediaTag` objects for the specified tag.
+
+            Parameters:
+                tag (str): Tag name (see :data:`~plexapi.utils.TAGTYPES`).
+        """
+        tagType = utils.tagType(tag)
+        data = self._server.query(f'/library/tags?type={tagType}')
+        return self.findItems(data)
+
+
+class LibrarySection(PlexObject):
+    """ Base class for a single library section.
+
+        Attributes:
+            agent (str): The metadata agent used for the library section (com.plexapp.agents.imdb, etc).
+            allowSync (bool): True if you allow syncing content from the library section.
+            art (str): Background artwork used to respresent the library section.
+            composite (str): Composite image used to represent the library section.
+            createdAt (datetime): Datetime the library section was created.
+            filters (bool): True if filters are available for the library section.
+            key (int): Key (or ID) of this library section.
+            language (str): Language represented in this section (en, xn, etc).
+            locations (List<str>): List of folder paths added to the library section.
+            refreshing (bool): True if this section is currently being refreshed.
+            scanner (str): Internal scanner used to find media (Plex Movie Scanner, Plex Premium Music Scanner, etc.)
+            thumb (str): Thumbnail image used to represent the library section.
+            title (str): Name of the library section.
+            type (str): Type of content section represents (movie, show, artist, photo).
+            updatedAt (datetime): Datetime the library section was last updated.
+            uuid (str): Unique id for the section (32258d7c-3e6c-4ac5-98ad-bad7a3b78c63)
+    """
+
+    def _loadData(self, data):
+        self._data = data
+        self.agent = data.attrib.get('agent')
+        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
+        self.art = data.attrib.get('art')
+        self.composite = data.attrib.get('composite')
+        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
+        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')
+        self.title = data.attrib.get('title')
+        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
+    def totalSize(self):
+        """ Returns the total number of items in the library for the default library type. """
+        return self.totalViewSize(includeCollections=False)
+
+    @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
+
+    @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
+
+    def __getattribute__(self, attr):
+        # Intercept to call EditFieldMixin and EditTagMixin methods
+        # based on the item type being batch multi-edited
+        value = super().__getattribute__(attr)
+        if attr.startswith('_'): return value
+        if callable(value) and 'Mixin' in value.__qualname__:
+            if not isinstance(self._edits, dict):
+                raise AttributeError("Must enable batchMultiEdit() to use this method")
+            elif not hasattr(self._edits['items'][0], attr):
+                raise AttributeError(
+                    f"Batch multi-editing '{self._edits['items'][0].__class__.__name__}' object has no attribute '{attr}'"
+                )
+        return value
+
+    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')
+        xpath = (
+            './MediaProvider[@identifier="com.plexapp.plugins.library"]'
+            '/Feature[@type="content"]'
+            f'/Directory[@id="{self.key}"]'
+        )
+        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'))
+
+    def totalViewSize(self, libtype=None, includeCollections=True):
+        """ Returns the total number of items in the library for a specified libtype.
+            The number of items for the default library type will be returned if no libtype is specified.
+            (e.g. Specify ``libtype='episode'`` for the total number of episodes
+            or ``libtype='albums'`` for the total number of albums.)
+
+            Parameters:
+                libtype (str, optional): The type of items to return the total number for (movie, show, season, episode,
+                    artist, album, track, photoalbum). Default is the main library type.
+                includeCollections (bool, optional): True or False to include collections in the total number.
+                    Default is True.
+        """
+        args = {
+            'includeCollections': int(bool(includeCollections)),
+            'X-Plex-Container-Start': 0,
+            'X-Plex-Container-Size': 0
+        }
+        if libtype is not None:
+            if libtype == 'photo':
+                args['clusterZoomLevel'] = 1
+            else:
+                args['type'] = utils.searchType(libtype)
+        part = f'/library/sections/{self.key}/all{utils.joinArgs(args)}'
+        data = self._server.query(part)
+        return utils.cast(int, data.attrib.get("totalSize"))
+
+    def delete(self):
+        """ Delete a library section. """
+        try:
+            return self._server.query(f'/library/sections/{self.key}', method=self._server._session.delete)
+        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):
+        """ Reload the data for the library section. """
+        self._server.library._loadSections()
+        newLibrary = self._server.library.sectionByID(self.key)
+        self.__dict__.update(newLibrary.__dict__)
+        return self
+
+    def edit(self, agent=None, **kwargs):
+        """ Edit a library. See :class:`~plexapi.library.Library` for example usage.
+
+            Parameters:
+                agent (str, optional): The library agent.
+                kwargs (dict): Dict of settings to edit.
+        """
+        if not agent:
+            agent = self.agent
+
+        locations = []
+        if kwargs.get('location'):
+            if isinstance(kwargs['location'], str):
+                kwargs['location'] = [kwargs['location']]
+            for path in kwargs.pop('location'):
+                if not self._server.isBrowsable(path):
+                    raise BadRequest(f'Path: {path} does not exist.')
+                locations.append(('location', path))
+
+        params = list(kwargs.items()) + locations
+
+        part = f'/library/sections/{self.key}?agent={agent}&{urlencode(params, doseq=True)}'
+        self._server.query(part, method=self._server._session.put)
+        return self
+
+    def addLocations(self, location):
+        """ Add a location to a library.
+
+            Parameters:
+                location (str or list): A single folder path, list of paths.
+
+            Example:
+
+                .. code-block:: python
+
+                    LibrarySection.addLocations('/path/1')
+                    LibrarySection.addLocations(['/path/1', 'path/2', '/path/3'])
+
+        """
+        locations = self.locations
+        if isinstance(location, str):
+            location = [location]
+        for path in location:
+            if not self._server.isBrowsable(path):
+                raise BadRequest(f'Path: {path} does not exist.')
+            locations.append(path)
+        return self.edit(location=locations)
+
+    def removeLocations(self, location):
+        """ Remove a location from a library.
+
+            Parameters:
+                location (str or list): A single folder path, list of paths.
+
+            Example:
+
+                .. code-block:: python
+
+                    LibrarySection.removeLocations('/path/1')
+                    LibrarySection.removeLocations(['/path/1', 'path/2', '/path/3'])
+
+        """
+        locations = self.locations
+        if isinstance(location, str):
+            location = [location]
+        for path in location:
+            if path in locations:
+                locations.remove(path)
+            else:
+                raise BadRequest(f'Path: {location} does not exist in the library.')
+        if len(locations) == 0:
+            raise BadRequest('You are unable to remove all locations from a library.')
+        return self.edit(location=locations)
+
+    def get(self, title, **kwargs):
+        """ Returns the media item with the specified title and kwargs.
+
+            Parameters:
+                title (str): Title of the item to return.
+                kwargs (dict): Additional search parameters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: The title is not found in the library.
+        """
+        try:
+            return self.search(title, limit=1, **kwargs)[0]
+        except IndexError:
+            msg = f"Unable to find item with title '{title}'"
+            if kwargs:
+                msg += f" and kwargs {kwargs}"
+            raise NotFound(msg) from None
+
+    def getGuid(self, guid):
+        """ Returns the media item with the specified external Plex, IMDB, TMDB, or TVDB ID.
+            Note: Only available for the Plex Movie and Plex TV Series agents.
+
+            Parameters:
+                guid (str): The external guid of the item to return.
+                    Examples: Plex ``plex://show/5d9c086c46115600200aa2fe``
+                    IMDB ``imdb://tt0944947``, TMDB ``tmdb://1399``, TVDB ``tvdb://121361``.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: The guid is not found in the library.
+
+            Example:
+
+                .. code-block:: python
+
+                    result1 = library.getGuid('plex://show/5d9c086c46115600200aa2fe')
+                    result2 = library.getGuid('imdb://tt0944947')
+                    result3 = library.getGuid('tmdb://1399')
+                    result4 = library.getGuid('tvdb://121361')
+
+                    # Alternatively, create your own guid lookup dictionary for faster performance
+                    guidLookup = {}
+                    for item in library.all():
+                        guidLookup[item.guid] = item
+                        guidLookup.update({guid.id: item for guid in item.guids})
+
+                    result1 = guidLookup['plex://show/5d9c086c46115600200aa2fe']
+                    result2 = guidLookup['imdb://tt0944947']
+                    result3 = guidLookup['tmdb://1399']
+                    result4 = guidLookup['tvdb://121361']
+
+        """
+
+        try:
+            if guid.startswith('plex://'):
+                result = self.search(guid=guid)[0]
+                return result
+            else:
+                dummy = self.search(maxresults=1)[0]
+                match = dummy.matches(agent=self.agent, title=guid.replace('://', '-'))
+                return self.search(guid=match[0].guid)[0]
+        except IndexError:
+            raise NotFound(f"Guid '{guid}' is not found in the library") from None
+
+    def all(self, libtype=None, **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`~plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        libtype = libtype or self.TYPE
+        return self.search(libtype=libtype, **kwargs)
+
+    def folders(self):
+        """ Returns a list of available :class:`~plexapi.library.Folder` for this library section.
+        """
+        key = f'/library/sections/{self.key}/folder'
+        return self.fetchItems(key, Folder)
+
+    def managedHubs(self):
+        """ Returns a list of available :class:`~plexapi.library.ManagedHub` for this library section.
+        """
+        key = f'/hubs/sections/{self.key}/manage'
+        return self.fetchItems(key, ManagedHub)
+
+    def resetManagedHubs(self):
+        """ Reset the managed hub customizations for this library section.
+        """
+        key = f'/hubs/sections/{self.key}/manage'
+        self._server.query(key, method=self._server._session.delete)
+
+    def hubs(self):
+        """ Returns a list of available :class:`~plexapi.library.Hub` for this library section.
+        """
+        key = f'/hubs/sections/{self.key}?includeStations=1'
+        return self.fetchItems(key)
+
+    def agents(self):
+        """ Returns a list of available :class:`~plexapi.media.Agent` for this library section.
+        """
+        return self._server.agents(self.type)
+
+    def settings(self):
+        """ Returns a list of all library settings. """
+        key = f'/library/sections/{self.key}/prefs'
+        data = self._server.query(key)
+        return self.findItems(data, cls=Setting)
+
+    def editAdvanced(self, **kwargs):
+        """ Edit a library's advanced settings. """
+        data = {}
+        idEnums = {}
+        key = 'prefs[{}]'
+
+        for setting in self.settings():
+            if setting.type != 'bool':
+                idEnums[setting.id] = setting.enumValues
+            else:
+                idEnums[setting.id] = {0: False, 1: True}
+
+        for settingID, value in kwargs.items():
+            try:
+                enums = idEnums[settingID]
+            except KeyError:
+                raise NotFound(f'{value} not found in {list(idEnums.keys())}')
+            if value in enums:
+                data[key.format(settingID)] = value
+            else:
+                raise NotFound(f'{value} not found in {enums}')
+
+        return self.edit(**data)
+
+    def defaultAdvanced(self):
+        """ Edit all of library's advanced settings to default. """
+        data = {}
+        key = 'prefs[{}]'
+        for setting in self.settings():
+            if setting.type == 'bool':
+                data[key.format(setting.id)] = int(setting.default)
+            else:
+                data[key.format(setting.id)] = setting.default
+
+        return self.edit(**data)
+
+    def _lockUnlockAllField(self, field, libtype=None, locked=True):
+        """ Lock or unlock a field for all items in the library. """
+        libtype = libtype or self.TYPE
+        args = {
+            'type': utils.searchType(libtype),
+            f'{field}.locked': int(locked)
+        }
+        key = f'/library/sections/{self.key}/all{utils.joinArgs(args)}'
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def lockAllField(self, field, libtype=None):
+        """ Lock a field for all items in the library.
+
+            Parameters:
+                field (str): The field to lock (e.g. thumb, rating, collection).
+                libtype (str, optional): The library type to lock (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo). Default is the main library type.
+        """
+        return self._lockUnlockAllField(field, libtype=libtype, locked=True)
+
+    def unlockAllField(self, field, libtype=None):
+        """ Unlock a field for all items in the library.
+
+            Parameters:
+                field (str): The field to unlock (e.g. thumb, rating, collection).
+                libtype (str, optional): The library type to lock (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo). Default is the main library type.
+        """
+        return self._lockUnlockAllField(field, libtype=libtype, locked=False)
+
+    def timeline(self):
+        """ Returns a timeline query for this library section. """
+        key = f'/library/sections/{self.key}/timeline'
+        data = self._server.query(key)
+        return LibraryTimeline(self, data)
+
+    def onDeck(self):
+        """ Returns a list of media items on deck from this library section. """
+        key = f'/library/sections/{self.key}/onDeck'
+        return self.fetchItems(key)
+
+    def continueWatching(self):
+        """ Return a list of media items in the library's Continue Watching hub. """
+        key = f'/hubs/sections/{self.key}/continueWatching/items'
+        return self.fetchItems(key)
+
+    def recentlyAdded(self, maxresults=50, libtype=None):
+        """ Returns a list of media items recently added from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo). Default is the main library type.
+        """
+        libtype = libtype or self.TYPE
+        return self.search(sort='addedAt:desc', maxresults=maxresults, libtype=libtype)
+
+    def firstCharacter(self):
+        key = f'/library/sections/{self.key}/firstCharacter'
+        return self.fetchItems(key, cls=FirstCharacter)
+
+    def analyze(self):
+        """ Run an analysis on all of the items in this library section. See
+            See :func:`~plexapi.base.PlexPartialObject.analyze` for more details.
+        """
+        key = f'/library/sections/{self.key}/analyze'
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def emptyTrash(self):
+        """ If a section has items in the Trash, use this option to empty the Trash. """
+        key = f'/library/sections/{self.key}/emptyTrash'
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def update(self, path=None):
+        """ Scan this section for new media.
+
+            Parameters:
+                path (str, optional): Full path to folder to scan.
+        """
+        key = f'/library/sections/{self.key}/refresh'
+        if path is not None:
+            key += f'?path={quote_plus(path)}'
+        self._server.query(key)
+        return self
+
+    def cancelUpdate(self):
+        """ Cancel update of this Library Section. """
+        key = f'/library/sections/{self.key}/refresh'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+    def refresh(self):
+        """ Forces a download of fresh media information from the internet.
+            This can take a long time. Any locked fields are not modified.
+        """
+        key = f'/library/sections/{self.key}/refresh?force=1'
+        self._server.query(key)
+        return self
+
+    def deleteMediaPreviews(self):
+        """ Delete the preview thumbnails for items in this library. This cannot
+            be undone. Recreating media preview files can take hours or even days.
+        """
+        key = f'/library/sections/{self.key}/indexes'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+    def _loadFilters(self):
+        """ Retrieves and caches the list of :class:`~plexapi.library.FilteringType` and
+            list of :class:`~plexapi.library.FilteringFieldType` for this library section.
+        """
+        _key = ('/library/sections/{key}/{filter}?includeMeta=1&includeAdvanced=1'
+                '&X-Plex-Container-Start=0&X-Plex-Container-Size=0')
+
+        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')
+
+        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'))
+
+        # 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))
+
+    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
+
+    def getFilterType(self, libtype=None):
+        """ Returns a :class:`~plexapi.library.FilteringType` for a specified libtype.
+
+            Parameters:
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection).
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unknown libtype for this library.
+        """
+        libtype = libtype or self.TYPE
+        try:
+            return next(f for f in self.filterTypes() if f.type == libtype)
+        except StopIteration:
+            availableLibtypes = [f.type for f in self.filterTypes()]
+            raise NotFound(f'Unknown libtype "{libtype}" for this library. '
+                           f'Available libtypes: {availableLibtypes}') from 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
+
+    def getFieldType(self, fieldType):
+        """ Returns a :class:`~plexapi.library.FilteringFieldType` for a specified fieldType.
+
+            Parameters:
+                fieldType (str): The data type for the field (tag, integer, string, boolean, date,
+                    subtitleLanguage, audioLanguage, resolution).
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unknown fieldType for this library.
+        """
+        try:
+            return next(f for f in self.fieldTypes() if f.type == fieldType)
+        except StopIteration:
+            availableFieldTypes = [f.type for f in self.fieldTypes()]
+            raise NotFound(f'Unknown field type "{fieldType}" for this library. '
+                           f'Available field types: {availableFieldTypes}') from None
+
+    def listFilters(self, libtype=None):
+        """ Returns a list of available :class:`~plexapi.library.FilteringFilter` for a specified libtype.
+            This is the list of options in the filter dropdown menu
+            (`screenshot <../_static/images/LibrarySection.listFilters.png>`__).
+
+            Parameters:
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection).
+
+            Example:
+
+                .. code-block:: python
+
+                    availableFilters = [f.filter for f in library.listFilters()]
+                    print("Available filter fields:", availableFilters)
+
+        """
+        return self.getFilterType(libtype).filters
+
+    def listSorts(self, libtype=None):
+        """ Returns a list of available :class:`~plexapi.library.FilteringSort` for a specified libtype.
+            This is the list of options in the sorting dropdown menu
+            (`screenshot <../_static/images/LibrarySection.listSorts.png>`__).
+
+            Parameters:
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection).
+
+            Example:
+
+                .. code-block:: python
+
+                    availableSorts = [f.key for f in library.listSorts()]
+                    print("Available sort fields:", availableSorts)
+
+        """
+        return self.getFilterType(libtype).sorts
+
+    def listFields(self, libtype=None):
+        """ Returns a list of available :class:`~plexapi.library.FilteringFields` for a specified libtype.
+            This is the list of options in the custom filter dropdown menu
+            (`screenshot <../_static/images/LibrarySection.search.png>`__).
+
+            Parameters:
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection).
+
+            Example:
+
+                .. code-block:: python
+
+                    availableFields = [f.key.split('.')[-1] for f in library.listFields()]
+                    print("Available fields:", availableFields)
+
+        """
+        return self.getFilterType(libtype).fields
+
+    def listOperators(self, fieldType):
+        """ Returns a list of available :class:`~plexapi.library.FilteringOperator` for a specified fieldType.
+            This is the list of options in the custom filter operator dropdown menu
+            (`screenshot <../_static/images/LibrarySection.search.png>`__).
+
+            Parameters:
+                fieldType (str): The data type for the field (tag, integer, string, boolean, date,
+                    subtitleLanguage, audioLanguage, resolution).
+
+            Example:
+
+                .. code-block:: python
+
+                    field = 'genre'  # Available filter field from listFields()
+                    filterField = next(f for f in library.listFields() if f.key.endswith(field))
+                    availableOperators = [o.key for o in library.listOperators(filterField.type)]
+                    print(f"Available operators for {field}:", availableOperators)
+
+        """
+        return self.getFieldType(fieldType).operators
+
+    def listFilterChoices(self, field, libtype=None):
+        """ Returns a list of available :class:`~plexapi.library.FilterChoice` for a specified
+            :class:`~plexapi.library.FilteringFilter` or filter field.
+            This is the list of available values for a custom filter
+            (`screenshot <../_static/images/LibrarySection.search.png>`__).
+
+            Parameters:
+                field (str): :class:`~plexapi.library.FilteringFilter` object,
+                    or the name of the field (genre, year, contentRating, etc.).
+                libtype (str, optional): The library type to filter (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: Invalid filter field.
+                :exc:`~plexapi.exceptions.NotFound`: Unknown filter field.
+
+            Example:
+
+                .. code-block:: python
+
+                    field = 'genre'  # Available filter field from listFilters()
+                    availableChoices = [f.title for f in library.listFilterChoices(field)]
+                    print(f"Available choices for {field}:", availableChoices)
+
+        """
+        if isinstance(field, str):
+            match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+)', field)
+            if not match:
+                raise BadRequest(f'Invalid filter field: {field}')
+            _libtype, field = match.groups()
+            libtype = _libtype or libtype or self.TYPE
+            try:
+                field = next(f for f in self.listFilters(libtype) if f.filter == field)
+            except StopIteration:
+                availableFilters = [f.filter for f in self.listFilters(libtype)]
+                raise NotFound(f'Unknown filter field "{field}" for libtype "{libtype}". '
+                               f'Available filters: {availableFilters}') from None
+
+        data = self._server.query(field.key)
+        return self.findItems(data, FilterChoice)
+
+    def _validateFilterField(self, field, values, libtype=None):
+        """ Validates a filter field and values are available as a custom filter for the library.
+            Returns the validated field and values as a URL encoded parameter string.
+        """
+        match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+)([!<>=&]*)', field)
+        if not match:
+            raise BadRequest(f'Invalid filter field: {field}')
+        _libtype, field, operator = match.groups()
+        libtype = _libtype or libtype or self.TYPE
+
+        try:
+            filterField = next(f for f in self.listFields(libtype) if f.key.split('.')[-1] == field)
+        except StopIteration:
+            for filterType in reversed(self.filterTypes()):
+                if filterType.type != libtype:
+                    filterField = next((f for f in filterType.fields if f.key.split('.')[-1] == field), None)
+                    if filterField:
+                        break
+            else:
+                availableFields = [f.key for f in self.listFields(libtype)]
+                raise NotFound(f'Unknown filter field "{field}" for libtype "{libtype}". '
+                               f'Available filter fields: {availableFields}') from None
+
+        field = filterField.key
+        operator = self._validateFieldOperator(filterField, operator)
+        result = self._validateFieldValue(filterField, values, libtype)
+
+        if operator == '&=':
+            args = {field: result}
+            return urlencode(args, doseq=True)
+        else:
+            args = {field + operator[:-1]: ','.join(result)}
+            return urlencode(args)
+
+    def _validateFieldOperator(self, filterField, operator):
+        """ Validates filter operator is in the available operators.
+            Returns the validated operator string.
+        """
+        fieldType = self.getFieldType(filterField.type)
+
+        and_operator = False
+        if operator in {'&', '&='}:
+            and_operator = True
+            operator = ''
+        if fieldType.type == 'string' and operator in {'=', '!='}:
+            operator += '='
+        operator = (operator[:-1] if operator[-1:] == '=' else operator) + '='
+
+        try:
+            next(o for o in fieldType.operators if o.key == operator)
+        except StopIteration:
+            availableOperators = [o.key for o in self.listOperators(filterField.type)]
+            raise NotFound(f'Unknown operator "{operator}" for filter field "{filterField.key}". '
+                           f'Available operators: {availableOperators}') from None
+
+        return '&=' if and_operator else operator
+
+    def _validateFieldValue(self, filterField, values, libtype=None):
+        """ Validates filter values are the correct datatype and in the available filter choices.
+            Returns the validated list of values.
+        """
+        if not isinstance(values, (list, tuple)):
+            values = [values]
+
+        fieldType = self.getFieldType(filterField.type)
+        results = []
+
+        try:
+            for value in values:
+                if fieldType.type == 'boolean':
+                    value = int(bool(value))
+                elif fieldType.type == 'date':
+                    value = self._validateFieldValueDate(value)
+                elif fieldType.type == 'integer':
+                    value = float(value) if '.' in str(value) else int(value)
+                elif fieldType.type == 'string':
+                    value = str(value)
+                elif fieldType.type in {'tag', 'subtitleLanguage', 'audioLanguage', 'resolution'}:
+                    value = self._validateFieldValueTag(value, filterField, libtype)
+                results.append(str(value))
+        except (ValueError, AttributeError):
+            raise BadRequest(f'Invalid value "{value}" for filter field "{filterField.key}", '
+                             f'value should be type {fieldType.type}') from None
+
+        return results
+
+    def _validateFieldValueDate(self, value):
+        """ Validates a filter date value. A filter date value can be a datetime object,
+            a relative date (e.g. -30d), or a date in YYYY-MM-DD format.
+        """
+        if isinstance(value, datetime):
+            return int(value.timestamp())
+        elif re.match(r'^-?\d+(mon|[smhdwy])$', value):
+            return '-' + value.lstrip('-')
+        else:
+            return int(utils.toDatetime(value, '%Y-%m-%d').timestamp())
+
+    def _validateFieldValueTag(self, value, filterField, libtype):
+        """ Validates a filter tag value. A filter tag value can be a :class:`~plexapi.library.FilterChoice` object,
+            a :class:`~plexapi.media.MediaTag` object, the exact name :attr:`MediaTag.tag` (*str*),
+            or the exact id :attr:`MediaTag.id` (*int*).
+        """
+        if isinstance(value, FilterChoice):
+            return value.key
+        if isinstance(value, (media.MediaTag, LibraryMediaTag)):
+            value = str(value.id or value.tag)
+        else:
+            value = str(value)
+        filterChoices = self.listFilterChoices(filterField.key, libtype)
+        matchValue = value.lower()
+        return next((f.key for f in filterChoices if matchValue in {f.key.lower(), f.title.lower()}), value)
+
+    def _validateSortFields(self, sort, libtype=None):
+        """ Validates a list of filter sort fields is available for the library. Sort fields can be a
+            list of :class:`~plexapi.library.FilteringSort` objects, or a comma separated string.
+            Returns the validated comma separated sort fields string.
+        """
+        if isinstance(sort, str):
+            sort = sort.split(',')
+
+        if not isinstance(sort, (list, tuple)):
+            sort = [sort]
+
+        validatedSorts = []
+        for _sort in sort:
+            validatedSorts.append(self._validateSortField(_sort, libtype))
+
+        return ','.join(validatedSorts)
+
+    def _validateSortField(self, sort, libtype=None):
+        """ Validates a filter sort field is available for the library. A sort field can be a
+            :class:`~plexapi.library.FilteringSort` object, or a string.
+            Returns the validated sort field string.
+        """
+        if isinstance(sort, FilteringSort):
+            return f'{libtype or self.TYPE}.{sort.key}:{sort.defaultDirection}'
+
+        match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+):?([a-zA-Z]*)', sort.strip())
+        if not match:
+            raise BadRequest(f'Invalid filter sort: {sort}')
+        _libtype, sortField, sortDir = match.groups()
+        libtype = _libtype or libtype or self.TYPE
+
+        try:
+            filterSort = next(f for f in self.listSorts(libtype) if f.key == sortField)
+        except StopIteration:
+            availableSorts = [f.key for f in self.listSorts(libtype)]
+            raise NotFound(f'Unknown sort field "{sortField}" for libtype "{libtype}". '
+                           f'Available sort fields: {availableSorts}') from None
+
+        sortField = libtype + '.' + filterSort.key
+
+        availableDirections = ['', 'asc', 'desc', 'nullsLast']
+        if sortDir not in availableDirections:
+            raise NotFound(f'Unknown sort direction "{sortDir}". Available sort directions: {availableDirections}')
+
+        return f'{sortField}:{sortDir}' if sortDir else sortField
+
+    def _validateAdvancedSearch(self, filters, libtype):
+        """ Validates an advanced search filter dictionary.
+            Returns the list of validated URL encoded parameter strings for the advanced search.
+        """
+        if not isinstance(filters, dict):
+            raise BadRequest('Filters must be a dictionary.')
+
+        validatedFilters = []
+
+        for field, values in filters.items():
+            if field.lower() in {'and', 'or'}:
+                if len(filters.items()) > 1:
+                    raise BadRequest('Multiple keys in the same dictionary with and/or is not allowed.')
+                if not isinstance(values, list):
+                    raise BadRequest('Value for and/or keys must be a list of dictionaries.')
+
+                validatedFilters.append('push=1')
+
+                for value in values:
+                    validatedFilters.extend(self._validateAdvancedSearch(value, libtype))
+                    validatedFilters.append(f'{field.lower()}=1')
+
+                del validatedFilters[-1]
+                validatedFilters.append('pop=1')
+
+            else:
+                validatedFilters.append(self._validateFilterField(field, values, libtype))
+
+        return validatedFilters
+
+    def _buildSearchKey(self, title=None, sort=None, libtype=None, limit=None, filters=None, returnKwargs=False, **kwargs):
+        """ Returns the validated and formatted search query API key
+            (``/library/sections/<sectionKey>/all?<params>``).
+        """
+        args = {}
+        filter_args = []
+
+        args['includeGuids'] = int(bool(kwargs.pop('includeGuids', True)))
+        for field, values in list(kwargs.items()):
+            if field.split('__')[-1] not in OPERATORS:
+                filter_args.append(self._validateFilterField(field, values, libtype))
+                del kwargs[field]
+        if title is not None:
+            if isinstance(title, (list, tuple)):
+                filter_args.append(self._validateFilterField('title', title, libtype))
+            else:
+                args['title'] = title
+        if filters is not None:
+            filter_args.extend(self._validateAdvancedSearch(filters, libtype))
+        if sort is not None:
+            args['sort'] = self._validateSortFields(sort, libtype)
+        if libtype is not None:
+            args['type'] = utils.searchType(libtype)
+        if limit is not None:
+            args['limit'] = limit
+
+        joined_args = utils.joinArgs(args).lstrip('?')
+        joined_filter_args = '&'.join(filter_args) if filter_args else ''
+        params = '&'.join([joined_args, joined_filter_args]).strip('&')
+        key = f'/library/sections/{self.key}/all?{params}'
+
+        if returnKwargs:
+            return key, kwargs
+        return key
+
+    def hubSearch(self, query, mediatype=None, limit=None):
+        """ Returns the hub search results for this library. See :func:`plexapi.server.PlexServer.search`
+            for details and parameters.
+        """
+        return self._server.search(query, mediatype, limit, sectionId=self.key)
+
+    def search(self, title=None, sort=None, maxresults=None, libtype=None,
+               container_start=None, container_size=None, limit=None, filters=None, **kwargs):
+        """ Search the library. The http requests will be batched in container_size. If you are only looking for the
+            first <num> results, it would be wise to set the maxresults option to that amount so the search doesn't iterate
+            over all results on the server.
+
+            Parameters:
+                title (str, optional): General string query to search for. Partial string matches are allowed.
+                sort (:class:`~plexapi.library.FilteringSort` or str or list, optional): A field to sort the results.
+                    See the details below for more info.
+                maxresults (int, optional): Only return the specified number of results.
+                libtype (str, optional): Return results of a specific type (movie, show, season, episode,
+                    artist, album, track, photoalbum, photo, collection) (e.g. ``libtype='episode'`` will only
+                    return :class:`~plexapi.video.Episode` objects)
+                container_start (int, optional): Default 0.
+                container_size (int, optional): Default X_PLEX_CONTAINER_SIZE in your config file.
+                limit (int, optional): Limit the number of results from the filter.
+                filters (dict, optional): A dictionary of advanced filters. See the details below for more info.
+                **kwargs (dict): Additional custom filters to apply to the search results.
+                    See the details below for more info.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When the sort or filter is invalid.
+                :exc:`~plexapi.exceptions.NotFound`: When applying an unknown sort or filter.
+
+            **Sorting Results**
+
+            The search results can be sorted by including the ``sort`` parameter.
+
+            * See :func:`~plexapi.library.LibrarySection.listSorts` to get a list of available sort fields.
+
+            The ``sort`` parameter can be a :class:`~plexapi.library.FilteringSort` object or a sort string in the
+            format ``field:dir``. The sort direction ``dir`` can be ``asc``, ``desc``, or ``nullsLast``. Omitting the
+            sort direction or using a :class:`~plexapi.library.FilteringSort` object will sort the results in the default
+            direction of the field. Multi-sorting on multiple fields can be achieved by using a comma separated list of
+            sort strings, or a list of :class:`~plexapi.library.FilteringSort` object or strings.
+
+            Examples:
+
+                .. code-block:: python
+
+                    library.search(sort="titleSort:desc")  # Sort title in descending order
+                    library.search(sort="titleSort")  # Sort title in the default order
+                    # Multi-sort by year in descending order, then by audience rating in descending order
+                    library.search(sort="year:desc,audienceRating:desc")
+                    library.search(sort=["year:desc", "audienceRating:desc"])
+
+            **Using Plex Filters**
+
+            Any of the available custom filters can be applied to the search results
+            (`screenshot <../_static/images/LibrarySection.search.png>`__).
+
+            * See :func:`~plexapi.library.LibrarySection.listFields` to get a list of all available fields.
+            * See :func:`~plexapi.library.LibrarySection.listOperators` to get a list of all available operators.
+            * See :func:`~plexapi.library.LibrarySection.listFilterChoices` to get a list of all available filter values.
+
+            The following filter fields are just some examples of the possible filters. The list is not exhaustive,
+            and not all filters apply to all library types.
+
+            * **actor** (:class:`~plexapi.media.MediaTag`): Search for the name of an actor.
+            * **addedAt** (*datetime*): Search for items added before or after a date. See operators below.
+            * **audioLanguage** (*str*): Search for a specific audio language (3 character code, e.g. jpn).
+            * **collection** (:class:`~plexapi.media.MediaTag`): Search for the name of a collection.
+            * **contentRating** (:class:`~plexapi.media.MediaTag`): Search for a specific content rating.
+            * **country** (:class:`~plexapi.media.MediaTag`): Search for the name of a country.
+            * **decade** (*int*): Search for a specific decade (e.g. 2000).
+            * **director** (:class:`~plexapi.media.MediaTag`): Search for the name of a director.
+            * **duplicate** (*bool*) Search for duplicate items.
+            * **genre** (:class:`~plexapi.media.MediaTag`): Search for a specific genre.
+            * **hdr** (*bool*): Search for HDR items.
+            * **inProgress** (*bool*): Search for in progress items.
+            * **label** (:class:`~plexapi.media.MediaTag`): Search for a specific label.
+            * **lastViewedAt** (*datetime*): Search for items watched before or after a date. See operators below.
+            * **mood** (:class:`~plexapi.media.MediaTag`): Search for a specific mood.
+            * **producer** (:class:`~plexapi.media.MediaTag`): Search for the name of a producer.
+            * **resolution** (*str*): Search for a specific resolution (e.g. 1080).
+            * **studio** (*str*): Search for the name of a studio.
+            * **style** (:class:`~plexapi.media.MediaTag`): Search for a specific style.
+            * **subtitleLanguage** (*str*): Search for a specific subtitle language (3 character code, e.g. eng)
+            * **unmatched** (*bool*): Search for unmatched items.
+            * **unwatched** (*bool*): Search for unwatched items.
+            * **userRating** (*int*): Search for items with a specific user rating.
+            * **writer** (:class:`~plexapi.media.MediaTag`): Search for the name of a writer.
+            * **year** (*int*): Search for a specific year.
+
+            Tag type filter values can be a :class:`~plexapi.library.FilterChoice` object,
+            :class:`~plexapi.media.MediaTag` object, the exact name :attr:`MediaTag.tag` (*str*),
+            or the exact id :attr:`MediaTag.id` (*int*).
+
+            Date type filter values can be a ``datetime`` object, a relative date using a one of the
+            available date suffixes (e.g. ``30d``) (*str*), or a date in ``YYYY-MM-DD`` (*str*) format.
+
+            Relative date suffixes:
+
+            * ``s``: ``seconds``
+            * ``m``: ``minutes``
+            * ``h``: ``hours``
+            * ``d``: ``days``
+            * ``w``: ``weeks``
+            * ``mon``: ``months``
+            * ``y``: ``years``
+
+            Multiple values can be ``OR`` together by providing a list of values.
+
+            Examples:
+
+                .. code-block:: python
+
+                    library.search(unwatched=True, year=2020, resolution="4k")
+                    library.search(actor="Arnold Schwarzenegger", decade=1990)
+                    library.search(contentRating="TV-G", genre="animation")
+                    library.search(genre=["animation", "comedy"])  # Genre is animation OR comedy
+                    library.search(studio=["Disney", "Pixar"])  # Studio contains Disney OR Pixar
+
+            **Using a** ``libtype`` **Prefix**
+
+            Some filters may be prefixed by the ``libtype`` separated by a ``.`` (e.g. ``show.collection``,
+            ``episode.title``, ``artist.style``, ``album.genre``, ``track.userRating``, etc.). This should not be
+            confused with the ``libtype`` parameter. If no ``libtype`` prefix is provided, then the default library
+            type is assumed. For example, in a TV show library ``viewCount`` is assumed to be ``show.viewCount``.
+            If you want to filter using episode view count then you must specify ``episode.viewCount`` explicitly.
+            In addition, if the filter does not exist for the default library type it will fallback to the most
+            specific ``libtype`` available. For example, ``show.unwatched`` does not exists so it will fallback to
+            ``episode.unwatched``. The ``libtype`` prefix cannot be included directly in the function parameters so
+            the filters must be provided as a filters dictionary.
+
+            Examples:
+
+                .. code-block:: python
+
+                    library.search(filters={"show.collection": "Documentary", "episode.inProgress": True})
+                    library.search(filters={"artist.genre": "pop", "album.decade": 2000})
+
+                    # The following three options are identical and will return Episode objects
+                    showLibrary.search(title="Winter is Coming", libtype='episode')
+                    showLibrary.search(libtype='episode', filters={"episode.title": "Winter is Coming"})
+                    showLibrary.searchEpisodes(title="Winter is Coming")
+
+                    # The following will search for the episode title but return Show objects
+                    showLibrary.search(filters={"episode.title": "Winter is Coming"})
+
+                    # The following will fallback to episode.unwatched
+                    showLibrary.search(unwatched=True)
+
+            **Using Plex Operators**
+
+            Operators can be appended to the filter field to narrow down results with more granularity.
+            The following is a list of possible operators depending on the data type of the filter being applied.
+            A special ``&`` operator can also be used to ``AND`` together a list of values.
+
+            Type: :class:`~plexapi.media.MediaTag` or *subtitleLanguage* or *audioLanguage*
+
+            * no operator: ``is``
+            * ``!``: ``is not``
+
+            Type: *int*
+
+            * no operator: ``is``
+            * ``!``: ``is not``
+            * ``>>``: ``is greater than``
+            * ``<<``: ``is less than``
+
+            Type: *str*
+
+            * no operator: ``contains``
+            * ``!``: ``does not contain``
+            * ``=``: ``is``
+            * ``!=``: ``is not``
+            * ``<``: ``begins with``
+            * ``>``: ``ends with``
+
+            Type: *bool*
+
+            * no operator: ``is true``
+            * ``!``: ``is false``
+
+            Type: *datetime*
+
+            * ``<<``: ``is before``
+            * ``>>``: ``is after``
+
+            Type: *resolution* or *guid*
+
+            * no operator: ``is``
+
+            Operators cannot be included directly in the function parameters so the filters
+            must be provided as a filters dictionary.
+
+            Examples:
+
+                .. code-block:: python
+
+                    # Genre is horror AND thriller
+                    library.search(filters={"genre&": ["horror", "thriller"]})
+
+                    # Director is not Steven Spielberg
+                    library.search(filters={"director!": "Steven Spielberg"})
+
+                    # Title starts with Marvel and added before 2021-01-01
+                    library.search(filters={"title<": "Marvel", "addedAt<<": "2021-01-01"})
+
+                    # Added in the last 30 days using relative dates
+                    library.search(filters={"addedAt>>": "30d"})
+
+                    # Collection is James Bond and user rating is greater than 8
+                    library.search(filters={"collection": "James Bond", "userRating>>": 8})
+
+            **Using Advanced Filters**
+
+            Any of the Plex filters described above can be combined into a single ``filters`` dictionary that mimics
+            the advanced filters used in Plex Web with a tree of ``and``/``or`` branches. Each level of the tree must
+            start with ``and`` (Match all of the following) or ``or`` (Match any of the following) as the dictionary
+            key, and a list of dictionaries with the desired filters as the dictionary value.
+
+            The following example matches `this <../_static/images/LibrarySection.search_filters.png>`__ advanced filter
+            in Plex Web.
+
+            Examples:
+
+                .. code-block:: python
+
+                    advancedFilters = {
+                        'and': [                            # Match all of the following in this list
+                            {
+                                'or': [                     # Match any of the following in this list
+                                    {'title': 'elephant'},
+                                    {'title': 'bunny'}
+                                ]
+                            },
+                            {'year>>': 1990},
+                            {'unwatched': True}
+                        ]
+                    }
+                    library.search(filters=advancedFilters)
+
+            **Using PlexAPI Operators**
+
+            For even more advanced filtering which cannot be achieved in Plex, the PlexAPI operators can be applied
+            to any XML attribute. See :func:`plexapi.base.PlexObject.fetchItems` for a list of operators and how they
+            are used. Note that using the Plex filters above will be faster since the filters are applied by the Plex
+            server before the results are returned to PlexAPI. Using the PlexAPI operators requires the Plex server
+            to return *all* results to allow PlexAPI to do the filtering. The Plex filters and the PlexAPI operators
+            can be used in conjunction with each other.
+
+            Examples:
+
+                .. code-block:: python
+
+                    library.search(summary__icontains="Christmas")
+                    library.search(duration__gt=7200000)
+                    library.search(audienceRating__lte=6.0, audienceRatingImage__startswith="rottentomatoes://")
+                    library.search(media__videoCodec__exact="h265")
+                    library.search(genre="holiday", viewCount__gte=3)
+
+        """
+        key, kwargs = self._buildSearchKey(
+            title=title, sort=sort, libtype=libtype, limit=limit, filters=filters, returnKwargs=True, **kwargs)
+        return self.fetchItems(
+            key, container_start=container_start, container_size=container_size, maxresults=maxresults, **kwargs)
+
+    def _locations(self):
+        """ Returns a list of :class:`~plexapi.library.Location` objects
+        """
+        return self.findItems(self._data, Location)
+
+    def sync(self, policy, mediaSettings, client=None, clientId=None, title=None, sort=None, libtype=None,
+             **kwargs):
+        """ Add current library section as sync item for specified device.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting
+            and :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                policy (:class:`~plexapi.sync.Policy`): policy of syncing the media (how many items to sync and process
+                                                       watched media or not), generated automatically when method
+                                                       called on specific LibrarySection object.
+                mediaSettings (:class:`~plexapi.sync.MediaSettings`): Transcoding settings used for the media, generated
+                                                                     automatically when method called on specific
+                                                                     LibrarySection object.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current media.
+                sort (str): formatted as `column:dir`; column can be any of {`addedAt`, `originallyAvailableAt`,
+                            `lastViewedAt`, `titleSort`, `rating`, `mediaHeight`, `duration`}. dir can be `asc` or
+                            `desc`.
+                libtype (str): Filter results to a specific libtype (`movie`, `show`, `episode`, `artist`, `album`,
+                               `track`).
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When the library is not allowed to sync.
+                :exc:`~plexapi.exceptions.BadRequest`: When the sort or filter is invalid.
+                :exc:`~plexapi.exceptions.NotFound`: When applying an unknown sort or filter.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi import myplex
+                    from plexapi.sync import Policy, MediaSettings, VIDEO_QUALITY_3_MBPS_720p
+
+                    c = myplex.MyPlexAccount()
+                    target = c.device('Plex Client')
+                    sync_items_wd = c.syncItems(target.clientIdentifier)
+                    srv = c.resource('Server Name').connect()
+                    section = srv.library.section('Movies')
+                    policy = Policy('count', unwatched=True, value=1)
+                    media_settings = MediaSettings.create(VIDEO_QUALITY_3_MBPS_720p)
+                    section.sync(target, policy, media_settings, title='Next best movie', sort='rating:desc')
+
+        """
+        from plexapi.sync import SyncItem
+
+        if not self.allowSync:
+            raise BadRequest('The requested library is not allowed to sync')
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self.title
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.CONTENT_TYPE
+        sync_item.metadataType = self.METADATA_TYPE
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        key = self._buildSearchKey(title=title, sort=sort, libtype=libtype, **kwargs)
+
+        sync_item.location = f'library://{self.uuid}/directory/{quote_plus(key)}'
+        sync_item.policy = policy
+        sync_item.mediaSettings = mediaSettings
+
+        return myplex.sync(client=client, clientId=clientId, sync_item=sync_item)
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get Play History for this library Section for the owner.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        return self._server.history(maxresults=maxresults, mindate=mindate, librarySectionID=self.key, accountID=1)
+
+    def createCollection(self, title, items=None, smart=False, limit=None,
+                         libtype=None, sort=None, filters=None, **kwargs):
+        """ Alias for :func:`~plexapi.server.PlexServer.createCollection` using this
+            :class:`~plexapi.library.LibrarySection`.
+        """
+        return self._server.createCollection(
+            title, section=self, items=items, smart=smart, limit=limit,
+            libtype=libtype, sort=sort, filters=filters, **kwargs)
+
+    def collection(self, title):
+        """ Returns the collection with the specified title.
+
+            Parameters:
+                title (str): Title of the item to return.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unable to find collection.
+        """
+        try:
+            return self.collections(title=title, title__iexact=title)[0]
+        except IndexError:
+            raise NotFound(f'Unable to find collection with title "{title}".') from None
+
+    def collections(self, **kwargs):
+        """ Returns a list of collections from this library section.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting.
+        """
+        return self.search(libtype='collection', **kwargs)
+
+    def createPlaylist(self, title, items=None, smart=False, limit=None,
+                       sort=None, filters=None, m3ufilepath=None, **kwargs):
+        """ Alias for :func:`~plexapi.server.PlexServer.createPlaylist` using this
+            :class:`~plexapi.library.LibrarySection`.
+        """
+        return self._server.createPlaylist(
+            title, section=self, items=items, smart=smart, limit=limit,
+            sort=sort, filters=filters, m3ufilepath=m3ufilepath, **kwargs)
+
+    def playlist(self, title):
+        """ Returns the playlist with the specified title.
+
+            Parameters:
+                title (str): Title of the item to return.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unable to find playlist.
+        """
+        try:
+            return self.playlists(title=title, title__iexact=title)[0]
+        except IndexError:
+            raise NotFound(f'Unable to find playlist with title "{title}".') from None
+
+    def playlists(self, sort=None, **kwargs):
+        """ Returns a list of playlists from this library section. """
+        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.
+
+            Parameters:
+                base (str): The base URL before the fragment (``#!``).
+                    Default is https://app.plex.tv/desktop.
+                tab (str): The library tab (recommended, library, collections, playlists, timeline).
+                key (str): A hub key.
+        """
+        params = {'source': self.key}
+        if tab is not None:
+            params['pivot'] = tab
+        if key is not None:
+            params['key'] = key
+            params['pageType'] = 'list'
+        return self._server._buildWebURL(base=base, **params)
+
+    def _validateItems(self, items):
+        """ Validates the specified items are from this library and of the same type. """
+        if items is None or items == []:
+            raise BadRequest('No items specified.')
+
+        if not isinstance(items, list):
+            items = [items]
+
+        itemType = items[0].type
+        for item in items:
+            if item.librarySectionID != self.key:
+                raise BadRequest(f'{item.title} is not from this library.')
+            elif item.type != itemType:
+                raise BadRequest(f'Cannot mix items of different type: {itemType} and {item.type}')
+
+        return items
+
+    def common(self, items):
+        """ Returns a :class:`~plexapi.library.Common` object for the specified items. """
+        params = {
+            'id': ','.join(str(item.ratingKey) for item in self._validateItems(items)),
+            'type': utils.searchType(items[0].type)
+        }
+        part = f'/library/sections/{self.key}/common{utils.joinArgs(params)}'
+        return self.fetchItem(part, cls=Common)
+
+    def _edit(self, items=None, **kwargs):
+        """ Actually edit multiple objects. """
+        if isinstance(self._edits, dict) and items is None:
+            self._edits.update(kwargs)
+            return self
+
+        kwargs['id'] = ','.join(str(item.ratingKey) for item in self._validateItems(items))
+        if 'type' not in kwargs:
+            kwargs['type'] = utils.searchType(items[0].type)
+
+        part = f'/library/sections/{self.key}/all{utils.joinArgs(kwargs)}'
+        self._server.query(part, method=self._server._session.put)
+        return self
+
+    def multiEdit(self, items, **kwargs):
+        """ Edit multiple objects at once.
+            Note: This is a low level method and you need to know all the field/tag keys.
+            See :class:`~plexapi.LibrarySection.batchMultiEdits` instead.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    :class:`~plexapi.photo.Photo`, or :class:`~plexapi.collection.Collection`
+                    objects to be edited.
+                kwargs (dict): Dict of settings to edit.
+        """
+        return self._edit(items, **kwargs)
+
+    def batchMultiEdits(self, items):
+        """ Enable batch multi-editing mode to save API calls.
+            Must call :func:`~plexapi.library.LibrarySection.saveMultiEdits` at the end to save all the edits.
+            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
+            for individual field and tag editing methods.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    :class:`~plexapi.photo.Photo`, or :class:`~plexapi.collection.Collection`
+                    objects to be edited.
+
+            Example:
+
+                .. code-block:: python
+
+                    movies = MovieSection.all()
+                    items = [movies[0], movies[3], movies[5]]
+
+                    # Batch multi-editing multiple fields and tags in a single API call
+                    MovieSection.batchMultiEdits(items)
+                    MovieSection.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline') \\
+                        .addCollection('New Collection').removeGenre('Action').addLabel('Favorite')
+                    MovieSection.saveMultiEdits()
+
+        """
+        self._edits = {'items': self._validateItems(items)}
+        return self
+
+    def saveMultiEdits(self):
+        """ Save all the batch multi-edits.
+            See :func:`~plexapi.library.LibrarySection.batchMultiEdits` for details.
+        """
+        if not isinstance(self._edits, dict):
+            raise BadRequest('Batch multi-editing mode not enabled. Must call `batchMultiEdits()` first.')
+
+        edits = self._edits
+        self._edits = None
+        self._edit(items=edits.pop('items'), **edits)
+        return self
+
+
+class MovieSection(LibrarySection, MovieEditMixins):
+    """ Represents a :class:`~plexapi.library.LibrarySection` section containing movies.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'movie'
+    """
+    TAG = 'Directory'
+    TYPE = 'movie'
+    METADATA_TYPE = 'movie'
+    CONTENT_TYPE = 'video'
+
+    def searchMovies(self, **kwargs):
+        """ Search for a movie. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='movie', **kwargs)
+
+    def recentlyAddedMovies(self, maxresults=50):
+        """ Returns a list of recently added movies from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='movie')
+
+    def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
+        """ Add current Movie library section as sync item for specified device.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
+            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
+                                    :mod:`~plexapi.sync` module.
+                limit (int): maximum count of movies to sync, unlimited if `None`.
+                unwatched (bool): if `True` watched videos wouldn't be synced.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi import myplex
+                    from plexapi.sync import VIDEO_QUALITY_3_MBPS_720p
+
+                    c = myplex.MyPlexAccount()
+                    target = c.device('Plex Client')
+                    sync_items_wd = c.syncItems(target.clientIdentifier)
+                    srv = c.resource('Server Name').connect()
+                    section = srv.library.section('Movies')
+                    section.sync(VIDEO_QUALITY_3_MBPS_720p, client=target, limit=1, unwatched=True,
+                                 title='Next best movie', sort='rating:desc')
+
+        """
+        from plexapi.sync import Policy, MediaSettings
+        kwargs['mediaSettings'] = MediaSettings.createVideo(videoQuality)
+        kwargs['policy'] = Policy.create(limit, unwatched)
+        return super(MovieSection, self).sync(**kwargs)
+
+
+class ShowSection(LibrarySection, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins):
+    """ Represents a :class:`~plexapi.library.LibrarySection` section containing tv shows.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'show'
+    """
+    TAG = 'Directory'
+    TYPE = 'show'
+    METADATA_TYPE = 'episode'
+    CONTENT_TYPE = 'video'
+
+    def searchShows(self, **kwargs):
+        """ Search for a show. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='show', **kwargs)
+
+    def searchSeasons(self, **kwargs):
+        """ Search for a season. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='season', **kwargs)
+
+    def searchEpisodes(self, **kwargs):
+        """ Search for an episode. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='episode', **kwargs)
+
+    def recentlyAddedShows(self, maxresults=50):
+        """ Returns a list of recently added shows from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='show')
+
+    def recentlyAddedSeasons(self, maxresults=50):
+        """ Returns a list of recently added seasons from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='season')
+
+    def recentlyAddedEpisodes(self, maxresults=50):
+        """ Returns a list of recently added episodes from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='episode')
+
+    def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
+        """ Add current Show library section as sync item for specified device.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
+            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
+                                    :mod:`~plexapi.sync` module.
+                limit (int): maximum count of episodes to sync, unlimited if `None`.
+                unwatched (bool): if `True` watched videos wouldn't be synced.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi import myplex
+                    from plexapi.sync import VIDEO_QUALITY_3_MBPS_720p
+
+                    c = myplex.MyPlexAccount()
+                    target = c.device('Plex Client')
+                    sync_items_wd = c.syncItems(target.clientIdentifier)
+                    srv = c.resource('Server Name').connect()
+                    section = srv.library.section('TV-Shows')
+                    section.sync(VIDEO_QUALITY_3_MBPS_720p, client=target, limit=1, unwatched=True,
+                                 title='Next unwatched episode')
+
+        """
+        from plexapi.sync import Policy, MediaSettings
+        kwargs['mediaSettings'] = MediaSettings.createVideo(videoQuality)
+        kwargs['policy'] = Policy.create(limit, unwatched)
+        return super(ShowSection, self).sync(**kwargs)
+
+
+class MusicSection(LibrarySection, ArtistEditMixins, AlbumEditMixins, TrackEditMixins):
+    """ Represents a :class:`~plexapi.library.LibrarySection` section containing music artists.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'artist'
+    """
+    TAG = 'Directory'
+    TYPE = 'artist'
+    METADATA_TYPE = 'track'
+    CONTENT_TYPE = 'audio'
+
+    def albums(self):
+        """ Returns a list of :class:`~plexapi.audio.Album` objects in this section. """
+        key = f'/library/sections/{self.key}/albums'
+        return self.fetchItems(key)
+
+    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)
+
+    def searchArtists(self, **kwargs):
+        """ Search for an artist. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='artist', **kwargs)
+
+    def searchAlbums(self, **kwargs):
+        """ Search for an album. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='album', **kwargs)
+
+    def searchTracks(self, **kwargs):
+        """ Search for a track. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='track', **kwargs)
+
+    def recentlyAddedArtists(self, maxresults=50):
+        """ Returns a list of recently added artists from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='artist')
+
+    def recentlyAddedAlbums(self, maxresults=50):
+        """ Returns a list of recently added albums from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='album')
+
+    def recentlyAddedTracks(self, maxresults=50):
+        """ Returns a list of recently added tracks from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        return self.recentlyAdded(maxresults=maxresults, libtype='track')
+
+    def sync(self, bitrate, limit=None, **kwargs):
+        """ Add current Music library section as sync item for specified device.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
+            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
+
+            Parameters:
+                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
+                               module :mod:`~plexapi.sync`.
+                limit (int): maximum count of tracks to sync, unlimited if `None`.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi import myplex
+                    from plexapi.sync import AUDIO_BITRATE_320_KBPS
+
+                    c = myplex.MyPlexAccount()
+                    target = c.device('Plex Client')
+                    sync_items_wd = c.syncItems(target.clientIdentifier)
+                    srv = c.resource('Server Name').connect()
+                    section = srv.library.section('Music')
+                    section.sync(AUDIO_BITRATE_320_KBPS, client=target, limit=100, sort='addedAt:desc',
+                                 title='New music')
+
+        """
+        from plexapi.sync import Policy, MediaSettings
+        kwargs['mediaSettings'] = MediaSettings.createMusic(bitrate)
+        kwargs['policy'] = Policy.create(limit)
+        return super(MusicSection, self).sync(**kwargs)
+
+    def sonicAdventure(
+            self,
+            start: Track | int,
+            end: Track | int,
+            **kwargs: Any,
+    ) -> list[Track]:
+        """ Returns a list of tracks from this library section that are part of a sonic adventure.
+            ID's should be of a track, other ID's will return an empty list or items itself or an error.
+
+            Parameters:
+                start (Track | int): The :class:`~plexapi.audio.Track` or ID of the first track in the sonic adventure.
+                end (Track | int): The :class:`~plexapi.audio.Track` or ID of the last track in the sonic adventure.
+                kwargs: Additional parameters to pass to :func:`~plexapi.base.PlexObject.fetchItems`.
+
+            Returns:
+                List[:class:`~plexapi.audio.Track`]: a list of tracks from this library section
+                that are part of a sonic adventure.
+        """
+        # can not use Track due to circular import
+        startID = start if isinstance(start, int) else start.ratingKey
+        endID = end if isinstance(end, int) else end.ratingKey
+
+        key = f"/library/sections/{self.key}/computePath?startID={startID}&endID={endID}"
+        return self.fetchItems(key, **kwargs)
+
+
+class PhotoSection(LibrarySection, PhotoalbumEditMixins, PhotoEditMixins):
+    """ Represents a :class:`~plexapi.library.LibrarySection` section containing photos.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'photo'
+    """
+    TAG = 'Directory'
+    TYPE = 'photo'
+    METADATA_TYPE = 'photo'
+    CONTENT_TYPE = 'photo'
+
+    def all(self, libtype=None, **kwargs):
+        """ Returns a list of all items from this library section.
+            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
+        """
+        libtype = libtype or 'photoalbum'
+        return self.search(libtype=libtype, **kwargs)
+
+    def collections(self, **kwargs):
+        raise NotImplementedError('Collections are not available for a Photo library.')
+
+    def searchAlbums(self, **kwargs):
+        """ Search for a photo album. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='photoalbum', **kwargs)
+
+    def searchPhotos(self, **kwargs):
+        """ Search for a photo. See :func:`~plexapi.library.LibrarySection.search` for usage. """
+        return self.search(libtype='photo', **kwargs)
+
+    def recentlyAddedAlbums(self, maxresults=50):
+        """ Returns a list of recently added photo albums from this library section.
+
+            Parameters:
+                maxresults (int): Max number of items to return (default 50).
+        """
+        # Use search() instead of recentlyAdded() because libtype=None
+        return self.search(sort='addedAt:desc', maxresults=maxresults)
+
+    def sync(self, resolution, limit=None, **kwargs):
+        """ Add current Music library section as sync item for specified device.
+            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
+            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
+
+            Parameters:
+                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
+                                  module :mod:`~plexapi.sync`.
+                limit (int): maximum count of tracks to sync, unlimited if `None`.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi import myplex
+                    from plexapi.sync import PHOTO_QUALITY_HIGH
+
+                    c = myplex.MyPlexAccount()
+                    target = c.device('Plex Client')
+                    sync_items_wd = c.syncItems(target.clientIdentifier)
+                    srv = c.resource('Server Name').connect()
+                    section = srv.library.section('Photos')
+                    section.sync(PHOTO_QUALITY_HIGH, client=target, limit=100, sort='addedAt:desc',
+                                 title='Fresh photos')
+
+        """
+        from plexapi.sync import Policy, MediaSettings
+        kwargs['mediaSettings'] = MediaSettings.createPhoto(resolution)
+        kwargs['policy'] = Policy.create(limit)
+        return super(PhotoSection, self).sync(**kwargs)
+
+
+@utils.registerPlexObject
+class LibraryTimeline(PlexObject):
+    """Represents a LibrarySection timeline.
+
+        Attributes:
+            TAG (str): 'LibraryTimeline'
+            size (int): Unknown
+            allowSync (bool): Unknown
+            art (str): Relative path to art image.
+            content (str): "secondary"
+            identifier (str): "com.plexapp.plugins.library"
+            latestEntryTime (int): Epoch timestamp
+            mediaTagPrefix (str): "/system/bundle/media/flags/"
+            mediaTagVersion (int): Unknown
+            thumb (str): Relative path to library thumb image.
+            title1 (str): Name of library section.
+            updateQueueSize (int): Number of items queued to update.
+            viewGroup (str): "secondary"
+            viewMode (int): Unknown
+    """
+    TAG = 'LibraryTimeline'
+
+    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')
+        self.content = data.attrib.get('content')
+        self.identifier = data.attrib.get('identifier')
+        self.latestEntryTime = utils.cast(int, data.attrib.get('latestEntryTime'))
+        self.mediaTagPrefix = data.attrib.get('mediaTagPrefix')
+        self.mediaTagVersion = utils.cast(int, data.attrib.get('mediaTagVersion'))
+        self.thumb = data.attrib.get('thumb')
+        self.title1 = data.attrib.get('title1')
+        self.updateQueueSize = utils.cast(int, data.attrib.get('updateQueueSize'))
+        self.viewGroup = data.attrib.get('viewGroup')
+        self.viewMode = utils.cast(int, data.attrib.get('viewMode'))
+
+
+@utils.registerPlexObject
+class Location(PlexObject):
+    """ Represents a single library Location.
+
+        Attributes:
+            TAG (str): 'Location'
+            id (int): Location path ID.
+            path (str): Path used for library..
+    """
+    TAG = 'Location'
+
+    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')
+
+
+@utils.registerPlexObject
+class Hub(PlexObject):
+    """ Represents a single Hub (or category) in the PlexServer search.
+
+        Attributes:
+            TAG (str): 'Hub'
+            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.
+            key (str): API URL for the hub.
+            more (bool): True if there are more items to load (call reload() 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.
+            type (str): The type of items in the hub.
+    """
+    TAG = 'Hub'
+
+    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.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)
+            self.more = False
+            self.size = len(self.items)
+
+    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
+
+
+class LibraryMediaTag(PlexObject):
+    """ Base class of library media tags.
+
+        Attributes:
+            TAG (str): 'Directory'
+            count (int): The number of items where this tag is found.
+            filter (str): The URL filter for the tag.
+            id (int): The id of the tag.
+            key (str): API URL (/library/section/<librarySectionID>/all?<filter>).
+            librarySectionID (int): The library section ID where the tag is found.
+            librarySectionKey (str): API URL for the library section (/library/section/<librarySectionID>)
+            librarySectionTitle (str): The library title where the tag is found.
+            librarySectionType (int): The library type where the tag is found.
+            reason (str): The reason for the search result.
+            reasonID (int): The reason ID for the search result.
+            reasonTitle (str): The reason title for the search result.
+            score (float): The score for the search result.
+            type (str): The type of search result (tag).
+            tag (str): The title of the tag.
+            tagKey (str): The Plex Discover ratingKey (guid) for people.
+            tagType (int): The type ID of the tag.
+            tagValue (int): The value of the tag.
+            thumb (str): The URL for the thumbnail of the tag (if available).
+    """
+    TAG = 'Directory'
+
+    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'))
+        self.key = data.attrib.get('key')
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.librarySectionType = utils.cast(int, data.attrib.get('librarySectionType'))
+        self.reason = data.attrib.get('reason')
+        self.reasonID = utils.cast(int, data.attrib.get('reasonID'))
+        self.reasonTitle = data.attrib.get('reasonTitle')
+        self.score = utils.cast(float, data.attrib.get('score'))
+        self.type = data.attrib.get('type')
+        self.tag = data.attrib.get('tag')
+        self.tagKey = data.attrib.get('tagKey')
+        self.tagType = utils.cast(int, data.attrib.get('tagType'))
+        self.tagValue = utils.cast(int, data.attrib.get('tagValue'))
+        self.thumb = data.attrib.get('thumb')
+
+    def items(self, *args, **kwargs):
+        """ Return the list of items within this tag. """
+        if not self.key:
+            raise BadRequest(f'Key is not defined for this tag: {self.tag}')
+        return self.fetchItems(self.key)
+
+
+@utils.registerPlexObject
+class Aperture(LibraryMediaTag):
+    """ Represents a single Aperture library media tag.
+
+        Attributes:
+            TAGTYPE (int): 202
+    """
+    TAGTYPE = 202
+
+
+@utils.registerPlexObject
+class Art(LibraryMediaTag):
+    """ Represents a single Art library media tag.
+
+        Attributes:
+            TAGTYPE (int): 313
+    """
+    TAGTYPE = 313
+
+
+@utils.registerPlexObject
+class Autotag(LibraryMediaTag):
+    """ Represents a single Autotag library media tag.
+
+        Attributes:
+            TAGTYPE (int): 207
+    """
+    TAGTYPE = 207
+
+
+@utils.registerPlexObject
+class Chapter(LibraryMediaTag):
+    """ Represents a single Chapter library media tag.
+
+        Attributes:
+            TAGTYPE (int): 9
+    """
+    TAGTYPE = 9
+
+
+@utils.registerPlexObject
+class Collection(LibraryMediaTag):
+    """ Represents a single Collection library media tag.
+
+        Attributes:
+            TAGTYPE (int): 2
+    """
+    TAGTYPE = 2
+
+
+@utils.registerPlexObject
+class Concert(LibraryMediaTag):
+    """ Represents a single Concert library media tag.
+
+        Attributes:
+            TAGTYPE (int): 306
+    """
+    TAGTYPE = 306
+
+
+@utils.registerPlexObject
+class Country(LibraryMediaTag):
+    """ Represents a single Country library media tag.
+
+        Attributes:
+            TAGTYPE (int): 8
+    """
+    TAGTYPE = 8
+
+
+@utils.registerPlexObject
+class Device(LibraryMediaTag):
+    """ Represents a single Device library media tag.
+
+        Attributes:
+            TAGTYPE (int): 206
+    """
+    TAGTYPE = 206
+
+
+@utils.registerPlexObject
+class Director(LibraryMediaTag):
+    """ Represents a single Director library media tag.
+
+        Attributes:
+            TAGTYPE (int): 4
+    """
+    TAGTYPE = 4
+
+
+@utils.registerPlexObject
+class Exposure(LibraryMediaTag):
+    """ Represents a single Exposure library media tag.
+
+        Attributes:
+            TAGTYPE (int): 203
+    """
+    TAGTYPE = 203
+
+
+@utils.registerPlexObject
+class Format(LibraryMediaTag):
+    """ Represents a single Format library media tag.
+
+        Attributes:
+            TAGTYPE (int): 302
+    """
+    TAGTYPE = 302
+
+
+@utils.registerPlexObject
+class Genre(LibraryMediaTag):
+    """ Represents a single Genre library media tag.
+
+        Attributes:
+            TAGTYPE (int): 1
+    """
+    TAGTYPE = 1
+
+
+@utils.registerPlexObject
+class Guid(LibraryMediaTag):
+    """ Represents a single Guid library media tag.
+
+        Attributes:
+            TAGTYPE (int): 314
+    """
+    TAGTYPE = 314
+
+
+@utils.registerPlexObject
+class ISO(LibraryMediaTag):
+    """ Represents a single ISO library media tag.
+
+        Attributes:
+            TAGTYPE (int): 204
+    """
+    TAGTYPE = 204
+
+
+@utils.registerPlexObject
+class Label(LibraryMediaTag):
+    """ Represents a single Label library media tag.
+
+        Attributes:
+            TAGTYPE (int): 11
+    """
+    TAGTYPE = 11
+
+
+@utils.registerPlexObject
+class Lens(LibraryMediaTag):
+    """ Represents a single Lens library media tag.
+
+        Attributes:
+            TAGTYPE (int): 205
+    """
+    TAGTYPE = 205
+
+
+@utils.registerPlexObject
+class Make(LibraryMediaTag):
+    """ Represents a single Make library media tag.
+
+        Attributes:
+            TAGTYPE (int): 200
+    """
+    TAGTYPE = 200
+
+
+@utils.registerPlexObject
+class Marker(LibraryMediaTag):
+    """ Represents a single Marker library media tag.
+
+        Attributes:
+            TAGTYPE (int): 12
+    """
+    TAGTYPE = 12
+
+
+@utils.registerPlexObject
+class MediaProcessingTarget(LibraryMediaTag):
+    """ Represents a single MediaProcessingTarget library media tag.
+
+        Attributes:
+            TAG (str): 'Tag'
+            TAGTYPE (int): 42
+    """
+    TAG = 'Tag'
+    TAGTYPE = 42
+
+
+@utils.registerPlexObject
+class Model(LibraryMediaTag):
+    """ Represents a single Model library media tag.
+
+        Attributes:
+            TAGTYPE (int): 201
+    """
+    TAGTYPE = 201
+
+
+@utils.registerPlexObject
+class Mood(LibraryMediaTag):
+    """ Represents a single Mood library media tag.
+
+        Attributes:
+            TAGTYPE (int): 300
+    """
+    TAGTYPE = 300
+
+
+@utils.registerPlexObject
+class Network(LibraryMediaTag):
+    """ Represents a single Network library media tag.
+
+        Attributes:
+            TAGTYPE (int): 319
+    """
+    TAGTYPE = 319
+
+
+@utils.registerPlexObject
+class Place(LibraryMediaTag):
+    """ Represents a single Place library media tag.
+
+        Attributes:
+            TAGTYPE (int): 400
+    """
+    TAGTYPE = 400
+
+
+@utils.registerPlexObject
+class Poster(LibraryMediaTag):
+    """ Represents a single Poster library media tag.
+
+        Attributes:
+            TAGTYPE (int): 312
+    """
+    TAGTYPE = 312
+
+
+@utils.registerPlexObject
+class Producer(LibraryMediaTag):
+    """ Represents a single Producer library media tag.
+
+        Attributes:
+            TAGTYPE (int): 7
+    """
+    TAGTYPE = 7
+
+
+@utils.registerPlexObject
+class RatingImage(LibraryMediaTag):
+    """ Represents a single RatingImage library media tag.
+
+        Attributes:
+            TAGTYPE (int): 316
+    """
+    TAGTYPE = 316
+
+
+@utils.registerPlexObject
+class Review(LibraryMediaTag):
+    """ Represents a single Review library media tag.
+
+        Attributes:
+            TAGTYPE (int): 10
+    """
+    TAGTYPE = 10
+
+
+@utils.registerPlexObject
+class Role(LibraryMediaTag):
+    """ Represents a single Role library media tag.
+
+        Attributes:
+            TAGTYPE (int): 6
+    """
+    TAGTYPE = 6
+
+
+@utils.registerPlexObject
+class Similar(LibraryMediaTag):
+    """ Represents a single Similar library media tag.
+
+        Attributes:
+            TAGTYPE (int): 305
+    """
+    TAGTYPE = 305
+
+
+@utils.registerPlexObject
+class Studio(LibraryMediaTag):
+    """ Represents a single Studio library media tag.
+
+        Attributes:
+            TAGTYPE (int): 318
+    """
+    TAGTYPE = 318
+
+
+@utils.registerPlexObject
+class Style(LibraryMediaTag):
+    """ Represents a single Style library media tag.
+
+        Attributes:
+            TAGTYPE (int): 301
+    """
+    TAGTYPE = 301
+
+
+@utils.registerPlexObject
+class Tag(LibraryMediaTag):
+    """ Represents a single Tag library media tag.
+
+        Attributes:
+            TAGTYPE (int): 0
+    """
+    TAGTYPE = 0
+
+
+@utils.registerPlexObject
+class Theme(LibraryMediaTag):
+    """ Represents a single Theme library media tag.
+
+        Attributes:
+            TAGTYPE (int): 317
+    """
+    TAGTYPE = 317
+
+
+@utils.registerPlexObject
+class Writer(LibraryMediaTag):
+    """ Represents a single Writer library media tag.
+
+        Attributes:
+            TAGTYPE (int): 5
+    """
+    TAGTYPE = 5
+
+
+class FilteringType(PlexObject):
+    """ Represents a single filtering Type object for a library.
+
+        Attributes:
+            TAG (str): 'Type'
+            active (bool): True if this filter type is currently active.
+            fields (List<:class:`~plexapi.library.FilteringField`>): List of field objects.
+            filters (List<:class:`~plexapi.library.FilteringFilter`>): List of filter objects.
+            key (str): The API URL path for the libtype filter.
+            sorts (List<:class:`~plexapi.library.FilteringSort`>): List of sort objects.
+            title (str): The title for the libtype filter.
+            type (str): The libtype for the filter.
+    """
+    TAG = 'Type'
+
+    def __repr__(self):
+        _type = self._clean(self.firstAttr('type'))
+        return f"<{':'.join([p for p in [self.__class__.__name__, _type] if p])}>"
+
+    def _loadData(self, data):
+        self._data = data
+        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()
+
+    def _manualFilters(self):
+        """ Manually add additional filters which are available
+            but not exposed on the Plex server.
+        """
+        # Filters: (filter, type, title)
+        additionalFilters = [
+        ]
+
+        if self.type == 'season':
+            additionalFilters.extend([
+                ('label', 'string', 'Labels')
+            ])
+        elif self.type == 'episode':
+            additionalFilters.extend([
+                ('label', 'string', 'Labels')
+            ])
+        elif self.type == 'artist':
+            additionalFilters.extend([
+                ('label', 'string', 'Labels')
+            ])
+        elif self.type == 'track':
+            additionalFilters.extend([
+                ('label', 'string', 'Labels')
+            ])
+        elif self.type == 'collection':
+            additionalFilters.extend([
+                ('label', 'string', 'Labels')
+            ])
+
+        manualFilters = []
+        for filterTag, filterType, filterTitle in additionalFilters:
+            filterKey = f'/library/sections/{self._librarySectionID}/{filterTag}?type={utils.searchType(self.type)}'
+            filterXML = (
+                f'<Filter filter="{filterTag}" '
+                f'filterType="{filterType}" '
+                f'key="{filterKey}" '
+                f'title="{filterTitle}" '
+                f'type="filter" />'
+            )
+            manualFilters.append(self._manuallyLoadXML(filterXML, FilteringFilter))
+
+        return manualFilters
+
+    def _manualSorts(self):
+        """ Manually add additional sorts which are available
+            but not exposed on the Plex server.
+        """
+        # Sorts: (key, dir, title)
+        additionalSorts = [
+            ('guid', 'asc', 'Guid'),
+            ('id', 'asc', 'Rating Key'),
+            ('index', 'asc', f'{self.type.capitalize()} Number'),
+            ('summary', 'asc', 'Summary'),
+            ('tagline', 'asc', 'Tagline'),
+            ('updatedAt', 'asc', 'Date Updated')
+        ]
+
+        if self.type == 'season':
+            additionalSorts.extend([
+                ('titleSort', 'asc', 'Title')
+            ])
+        elif self.type == 'track':
+            # Don't know what this is but it is valid
+            additionalSorts.extend([
+                ('absoluteIndex', 'asc', 'Absolute Index')
+            ])
+        elif self.type == 'photo':
+            additionalSorts.extend([
+                ('viewUpdatedAt', 'desc', 'View Updated At')
+            ])
+        elif self.type == 'collection':
+            additionalSorts.extend([
+                ('addedAt', 'asc', 'Date Added')
+            ])
+
+        manualSorts = []
+        for sortField, sortDir, sortTitle in additionalSorts:
+            sortXML = (
+                f'<Sort defaultDirection="{sortDir}" '
+                f'descKey="{sortField}:desc" '
+                f'key="{sortField}" '
+                f'title="{sortTitle}" />'
+            )
+            manualSorts.append(self._manuallyLoadXML(sortXML, FilteringSort))
+
+        return manualSorts
+
+    def _manualFields(self):
+        """ Manually add additional fields which are available
+            but not exposed on the Plex server.
+        """
+        # Fields: (key, type, title)
+        additionalFields = [
+            ('guid', 'guid', 'Guid'),
+            ('id', 'integer', 'Rating Key'),
+            ('index', 'integer', f'{self.type.capitalize()} Number'),
+            ('lastRatedAt', 'date', f'{self.type.capitalize()} Last Rated'),
+            ('updatedAt', 'date', 'Date Updated'),
+            ('group', 'string', 'SQL Group By Statement'),
+            ('having', 'string', 'SQL Having Clause')
+        ]
+
+        if self.type == 'movie':
+            additionalFields.extend([
+                ('audienceRating', 'integer', 'Audience Rating'),
+                ('rating', 'integer', 'Critic Rating'),
+                ('viewOffset', 'integer', 'View Offset')
+            ])
+        elif self.type == 'show':
+            additionalFields.extend([
+                ('audienceRating', 'integer', 'Audience Rating'),
+                ('originallyAvailableAt', 'date', 'Show Release Date'),
+                ('rating', 'integer', 'Critic Rating'),
+                ('unviewedLeafCount', 'integer', 'Episode Unplayed Count')
+            ])
+        elif self.type == 'season':
+            additionalFields.extend([
+                ('addedAt', 'date', 'Date Season Added'),
+                ('unviewedLeafCount', 'integer', 'Episode Unplayed Count'),
+                ('year', 'integer', 'Season Year'),
+                ('label', 'tag', 'Label')
+            ])
+        elif self.type == 'episode':
+            additionalFields.extend([
+                ('audienceRating', 'integer', 'Audience Rating'),
+                ('duration', 'integer', 'Duration'),
+                ('rating', 'integer', 'Critic Rating'),
+                ('viewOffset', 'integer', 'View Offset'),
+                ('label', 'tag', 'Label')
+            ])
+        elif self.type == 'artist':
+            additionalFields.extend([
+                ('label', 'tag', 'Label')
+            ])
+        elif self.type == 'track':
+            additionalFields.extend([
+                ('duration', 'integer', 'Duration'),
+                ('viewOffset', 'integer', 'View Offset'),
+                ('label', 'tag', 'Label'),
+                ('ratingCount', 'integer', 'Rating Count'),
+            ])
+        elif self.type == 'collection':
+            additionalFields.extend([
+                ('addedAt', 'date', 'Date Added'),
+                ('label', 'tag', 'Label')
+            ])
+
+        prefix = '' if self.type == 'movie' else self.type + '.'
+
+        manualFields = []
+        for field, fieldType, fieldTitle in additionalFields:
+            if field not in {'group', 'having'}:
+                field = f"{prefix}{field}"
+            fieldXML = (
+                f'<Field key="{field}" '
+                f'title="{fieldTitle}" '
+                f'type="{fieldType}"/>'
+            )
+
+            manualFields.append(self._manuallyLoadXML(fieldXML, FilteringField))
+
+        return manualFields
+
+
+class FilteringFilter(PlexObject):
+    """ Represents a single Filter object for a :class:`~plexapi.library.FilteringType`.
+
+        Attributes:
+            TAG (str): 'Filter'
+            filter (str): The key for the filter.
+            filterType (str): The :class:`~plexapi.library.FilteringFieldType` type (string, boolean, integer, date, etc).
+            key (str): The API URL path for the filter.
+            title (str): The title of the filter.
+            type (str): 'filter'
+    """
+    TAG = 'Filter'
+
+    def _loadData(self, data):
+        self._data = data
+        self.filter = data.attrib.get('filter')
+        self.filterType = data.attrib.get('filterType')
+        self.key = data.attrib.get('key')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+
+
+class FilteringSort(PlexObject):
+    """ Represents a single Sort object for a :class:`~plexapi.library.FilteringType`.
+
+        Attributes:
+            TAG (str): 'Sort'
+            active (bool): True if the sort is currently active.
+            activeDirection (str): The currently active sorting direction.
+            default (str): The currently active default sorting direction.
+            defaultDirection (str): The default sorting direction.
+            descKey (str): The URL key for sorting with desc.
+            firstCharacterKey (str): API URL path for first character endpoint.
+            key (str): The URL key for the sorting.
+            title (str): The title of the sorting.
+    """
+    TAG = 'Sort'
+
+    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')
+        self.defaultDirection = data.attrib.get('defaultDirection')
+        self.descKey = data.attrib.get('descKey')
+        self.firstCharacterKey = data.attrib.get('firstCharacterKey')
+        self.key = data.attrib.get('key')
+        self.title = data.attrib.get('title')
+
+
+class FilteringField(PlexObject):
+    """ Represents a single Field object for a :class:`~plexapi.library.FilteringType`.
+
+        Attributes:
+            TAG (str): 'Field'
+            key (str): The URL key for the filter field.
+            title (str): The title of the filter field.
+            type (str): The :class:`~plexapi.library.FilteringFieldType` type (string, boolean, integer, date, etc).
+            subType (str): The subtype of the filter (decade, rating, etc).
+    """
+    TAG = 'Field'
+
+    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')
+        self.subType = data.attrib.get('subType')
+
+
+class FilteringFieldType(PlexObject):
+    """ Represents a single FieldType for library filtering.
+
+        Attributes:
+            TAG (str): 'FieldType'
+            type (str): The filtering data type (string, boolean, integer, date, etc).
+            operators (List<:class:`~plexapi.library.FilteringOperator`>): List of operator objects.
+    """
+    TAG = 'FieldType'
+
+    def __repr__(self):
+        _type = self._clean(self.firstAttr('type'))
+        return f"<{':'.join([p for p in [self.__class__.__name__, _type] if p])}>"
+
+    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)
+
+
+class FilteringOperator(PlexObject):
+    """ Represents an single Operator for a :class:`~plexapi.library.FilteringFieldType`.
+
+        Attributes:
+            TAG (str): 'Operator'
+            key (str): The URL key for the operator.
+            title (str): The title of the operator.
+    """
+    TAG = 'Operator'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self.key = data.attrib.get('key')
+        self.title = data.attrib.get('title')
+
+
+class FilterChoice(PlexObject):
+    """ Represents a single FilterChoice object.
+        These objects are gathered when using filters while searching for library items and is the
+        object returned in the result set of :func:`~plexapi.library.LibrarySection.listFilterChoices`.
+
+        Attributes:
+            TAG (str): 'Directory'
+            fastKey (str): API URL path to quickly list all items with this filter choice.
+                (/library/sections/<section>/all?genre=<key>)
+            key (str): The id value of this filter choice.
+            thumb (str): Thumbnail URL for the filter choice.
+            title (str): The title of the filter choice.
+            type (str): The filter type (genre, contentRating, etc).
+    """
+    TAG = 'Directory'
+
+    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')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+
+    def items(self):
+        """ Returns a list of items for this filter choice. """
+        return self.fetchItems(self.fastKey)
+
+
+class ManagedHub(PlexObject):
+    """ Represents a Managed Hub (recommendation) inside a library.
+
+        Attributes:
+            TAG (str): 'Hub'
+            deletable (bool): True if the Hub can be deleted (promoted collection).
+            homeVisibility (str): Promoted home visibility (none, all, admin, or shared).
+            identifier (str): Hub identifier for the managed hub.
+            promotedToOwnHome (bool): Promoted to own home.
+            promotedToRecommended (bool): Promoted to recommended.
+            promotedToSharedHome (bool): Promoted to shared home.
+            recommendationsVisibility (str): Promoted recommendation visibility (none or all).
+            title (str): Title of managed hub.
+    """
+    TAG = 'Hub'
+
+    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')
+        self.promotedToOwnHome = utils.cast(bool, data.attrib.get('promotedToOwnHome', False))
+        self.promotedToRecommended = utils.cast(bool, data.attrib.get('promotedToRecommended', False))
+        self.promotedToSharedHome = utils.cast(bool, data.attrib.get('promotedToSharedHome', False))
+        self.recommendationsVisibility = data.attrib.get('recommendationsVisibility', 'none')
+        self.title = data.attrib.get('title')
+        self._promoted = True  # flag to indicate if this hub has been promoted on the list of managed recommendations
+
+        parent = self._parent()
+        self.librarySectionID = parent.key if isinstance(parent, LibrarySection) else parent.librarySectionID
+
+    def reload(self):
+        """ 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__)
+        return self
+
+    def move(self, after=None):
+        """ Move a managed hub to a new position in the library's Managed Recommendations.
+
+            Parameters:
+                after (obj): :class:`~plexapi.library.ManagedHub` object to move the item after in the collection.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to move a Hub that is not a Managed Recommendation.
+        """
+        if not self._promoted:
+            raise BadRequest('Collection must be a Managed Recommendation to be moved')
+        key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}/move'
+        if after:
+            key = f'{key}?after={after.identifier}'
+        self._server.query(key, method=self._server._session.put)
+
+    def remove(self):
+        """ Removes a managed hub from the library's Managed Recommendations.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to remove a Hub that is not a Managed Recommendation
+                    or when the Hub cannot be removed.
+        """
+        if not self._promoted:
+            raise BadRequest('Collection must be a Managed Recommendation to be removed')
+        if not self.deletable:
+            raise BadRequest(f'{self.title} managed hub cannot be removed' % self.title)
+        key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}'
+        self._server.query(key, method=self._server._session.delete)
+
+    def updateVisibility(self, recommended=None, home=None, shared=None):
+        """ Update the managed hub's visibility settings.
+
+            Parameters:
+                recommended (bool): True to make visible on your Library Recommended page. False to hide. Default None.
+                home (bool): True to make visible on your Home page. False to hide. Default None.
+                shared (bool): True to make visible on your Friends' Home page. False to hide. Default None.
+
+            Example:
+
+                .. code-block:: python
+
+                    managedHub.updateVisibility(recommended=True, home=True, shared=False).reload()
+                    # or using chained methods
+                    managedHub.promoteRecommended().promoteHome().demoteShared().reload()
+
+        """
+        params = {
+            'promotedToRecommended': int(self.promotedToRecommended),
+            'promotedToOwnHome': int(self.promotedToOwnHome),
+            'promotedToSharedHome': int(self.promotedToSharedHome),
+        }
+        if recommended is not None:
+            params['promotedToRecommended'] = int(recommended)
+        if home is not None:
+            params['promotedToOwnHome'] = int(home)
+        if shared is not None:
+            params['promotedToSharedHome'] = int(shared)
+
+        if not self._promoted:
+            params['metadataItemId'] = self.identifier.rsplit('.')[-1]
+            key = f'/hubs/sections/{self.librarySectionID}/manage'
+            self._server.query(key, method=self._server._session.post, params=params)
+        else:
+            key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}'
+            self._server.query(key, method=self._server._session.put, params=params)
+        return self.reload()
+
+    def promoteRecommended(self):
+        """ Show the managed hub on your Library Recommended Page. """
+        return self.updateVisibility(recommended=True)
+
+    def demoteRecommended(self):
+        """ Hide the managed hub on your Library Recommended Page. """
+        return self.updateVisibility(recommended=False)
+
+    def promoteHome(self):
+        """ Show the managed hub on your Home Page. """
+        return self.updateVisibility(home=True)
+
+    def demoteHome(self):
+        """ Hide the manged hub on your Home Page. """
+        return self.updateVisibility(home=False)
+
+    def promoteShared(self):
+        """ Show the managed hub on your Friends' Home Page. """
+        return self.updateVisibility(shared=True)
+
+    def demoteShared(self):
+        """ Hide the managed hub on your Friends' Home Page. """
+        return self.updateVisibility(shared=False)
+
+
+class Folder(PlexObject):
+    """ Represents a Folder inside a library.
+
+        Attributes:
+            key (str): Url key for folder.
+            title (str): Title of folder.
+    """
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self.key = data.attrib.get('key')
+        self.title = data.attrib.get('title')
+
+    def subfolders(self):
+        """ Returns a list of available :class:`~plexapi.library.Folder` for this folder.
+            Continue down subfolders until a mediaType is found.
+        """
+        if self.key.startswith('/library/metadata'):
+            return self.fetchItems(self.key)
+        else:
+            return self.fetchItems(self.key, Folder)
+
+    def allSubfolders(self):
+        """ Returns a list of all available :class:`~plexapi.library.Folder` for this folder.
+            Only returns :class:`~plexapi.library.Folder`.
+        """
+        folders = []
+        for folder in self.subfolders():
+            if not folder.key.startswith('/library/metadata'):
+                folders.append(folder)
+                while True:
+                    for subfolder in folder.subfolders():
+                        if not subfolder.key.startswith('/library/metadata'):
+                            folders.append(subfolder)
+                            continue
+                    break
+        return folders
+
+
+class FirstCharacter(PlexObject):
+    """ Represents a First Character element from a library.
+
+        Attributes:
+            key (str): Url key for character.
+            size (str): Total amount of library items starting with this character.
+            title (str): Character (#, !, A, B, C, ...).
+    """
+
+    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')
+
+
+@utils.registerPlexObject
+class Path(PlexObject):
+    """ Represents a single directory Path.
+
+        Attributes:
+            TAG (str): 'Path'
+            home (bool): True if the path is the home directory
+            key (str): API URL (/services/browse/<base64path>)
+            network (bool): True if path is a network location
+            path (str): Full path to folder
+            title (str): Folder name
+    """
+    TAG = 'Path'
+
+    def _loadData(self, data):
+        self.home = utils.cast(bool, data.attrib.get('home'))
+        self.key = data.attrib.get('key')
+        self.network = utils.cast(bool, data.attrib.get('network'))
+        self.path = data.attrib.get('path')
+        self.title = data.attrib.get('title')
+
+    def browse(self, includeFiles=True):
+        """ Alias for :func:`~plexapi.server.PlexServer.browse`. """
+        return self._server.browse(self, includeFiles)
+
+    def walk(self):
+        """ Alias for :func:`~plexapi.server.PlexServer.walk`. """
+        for path, paths, files in self._server.walk(self):
+            yield path, paths, files
+
+
+@utils.registerPlexObject
+class File(PlexObject):
+    """ Represents a single File.
+
+        Attributes:
+            TAG (str): 'File'
+            key (str): API URL (/services/browse/<base64path>)
+            path (str): Full path to file
+            title (str): File name
+    """
+    TAG = 'File'
+
+    def _loadData(self, data):
+        self.key = data.attrib.get('key')
+        self.path = data.attrib.get('path')
+        self.title = data.attrib.get('title')
+
+
+@utils.registerPlexObject
+class Common(PlexObject):
+    """ Represents a Common element from a library. This object lists common fields between multiple objects.
+
+        Attributes:
+            TAG (str): 'Common'
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            contentRating (str): Content rating of the items.
+            countries (List<:class:`~plexapi.media.Country`>): List of countries objects.
+            directors (List<:class:`~plexapi.media.Director`>): List of director objects.
+            editionTitle (str): Edition title of the items.
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            grandparentRatingKey (int): Grandparent rating key of the items.
+            grandparentTitle (str): Grandparent title of the items.
+            guid (str): Plex GUID of the items.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            index (int): Index of the items.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            mixedFields (List<str>): List of mixed fields.
+            moods (List<:class:`~plexapi.media.Mood`>): List of mood objects.
+            originallyAvailableAt (datetime): Datetime of the release date of the items.
+            parentRatingKey (int): Parent rating key of the items.
+            parentTitle (str): Parent title of the items.
+            producers (List<:class:`~plexapi.media.Producer`>): List of producer objects.
+            ratingKey (int): Rating key of the items.
+            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
+            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
+            studio (str): Studio name of the items.
+            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
+            summary (str): Summary of the items.
+            tagline (str): Tagline of the items.
+            tags (List<:class:`~plexapi.media.Tag`>): List of tag objects.
+            title (str): Title of the items.
+            titleSort (str): Title to use when sorting of the items.
+            type (str): Type of the media (common).
+            writers (List<:class:`~plexapi.media.Writer`>): List of writer objects.
+            year (int): Year of the items.
+    """
+    TAG = 'Common'
+
+    def _loadData(self, data):
+        self._data = data
+        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.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'))
+
+    def __repr__(self):
+        return '<%s:%s:%s>' % (
+            self.__class__.__name__,
+            self.commonType,
+            ','.join(str(key) for key in self.ratingKeys)
+        )
+
+    @property
+    def commonType(self):
+        """ Returns the media type of the common items. """
+        parsed_query = parse_qs(urlparse(self._initpath).query)
+        return utils.reverseSearchType(parsed_query['type'][0])
+
+    @property
+    def ratingKeys(self):
+        """ Returns a list of rating keys for the common items. """
+        parsed_query = parse_qs(urlparse(self._initpath).query)
+        return [int(value.strip()) for value in parsed_query['id'][0].split(',')]
+
+    def items(self):
+        """ Returns a list of the common items. """
+        return self._server.fetchItems(self.ratingKeys)
diff --git a/libs/plexapi/media.py b/libs/plexapi/media.py
new file mode 100644
index 000000000..9c6e3115b
--- /dev/null
+++ b/libs/plexapi/media.py
@@ -0,0 +1,1339 @@
+# -*- coding: utf-8 -*-
+import xml
+from pathlib import Path
+from urllib.parse import quote_plus
+
+from plexapi import log, settings, utils
+from plexapi.base import PlexObject
+from plexapi.exceptions import BadRequest
+from plexapi.utils import deprecated
+
+
+@utils.registerPlexObject
+class Media(PlexObject):
+    """ Container object for all MediaPart objects. Provides useful data about the
+        video or audio this media belong to such as video framerate, resolution, etc.
+
+        Attributes:
+            TAG (str): 'Media'
+            aspectRatio (float): The aspect ratio of the media (ex: 2.35).
+            audioChannels (int): The number of audio channels of the media (ex: 6).
+            audioCodec (str): The audio codec of the media (ex: ac3).
+            audioProfile (str): The audio profile of the media (ex: dts).
+            bitrate (int): The bitrate of the media (ex: 1624).
+            container (str): The container of the media (ex: avi).
+            duration (int): The duration of the media in milliseconds (ex: 6990483).
+            height (int): The height of the media in pixels (ex: 256).
+            id (int): The unique ID for this media on the server.
+            has64bitOffsets (bool): True if video has 64 bit offsets.
+            hasVoiceActivity (bool): True if video has voice activity analyzed.
+            optimizedForStreaming (bool): True if video is optimized for streaming.
+            parts (List<:class:`~plexapi.media.MediaPart`>): List of media part objects.
+            proxyType (int): Equals 42 for optimized versions.
+            target (str): The media version target name.
+            title (str): The title of the media.
+            videoCodec (str): The video codec of the media (ex: ac3).
+            videoFrameRate (str): The video frame rate of the media (ex: 24p).
+            videoProfile (str): The video profile of the media (ex: high).
+            videoResolution (str): The video resolution of the media (ex: sd).
+            width (int): The width of the video in pixels (ex: 608).
+
+            Photo_only_attributes: The following attributes are only available for photos.
+
+                * aperture (str): The aperture used to take the photo.
+                * exposure (str): The exposure used to take the photo.
+                * iso (int): The iso used to take the photo.
+                * lens (str): The lens used to take the photo.
+                * make (str): The make of the camera used to take the photo.
+                * model (str): The model of the camera used to take the photo.
+    """
+    TAG = 'Media'
+
+    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')
+        self.audioProfile = data.attrib.get('audioProfile')
+        self.bitrate = utils.cast(int, data.attrib.get('bitrate'))
+        self.container = data.attrib.get('container')
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.height = utils.cast(int, data.attrib.get('height'))
+        self.id = utils.cast(int, data.attrib.get('id'))
+        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')
+        self.title = data.attrib.get('title')
+        self.videoCodec = data.attrib.get('videoCodec')
+        self.videoFrameRate = data.attrib.get('videoFrameRate')
+        self.videoProfile = data.attrib.get('videoProfile')
+        self.videoResolution = data.attrib.get('videoResolution')
+        self.width = utils.cast(int, data.attrib.get('width'))
+        self.uuid = data.attrib.get('uuid')
+
+        # Photo only attributes
+        self.aperture = data.attrib.get('aperture')
+        self.exposure = data.attrib.get('exposure')
+        self.iso = utils.cast(int, data.attrib.get('iso'))
+        self.lens = data.attrib.get('lens')
+        self.make = data.attrib.get('make')
+        self.model = data.attrib.get('model')
+
+        parent = self._parent()
+        self._parentKey = parent.key
+
+    @property
+    def isOptimizedVersion(self):
+        """ Returns True if the media is a Plex optimized version. """
+        return self.proxyType == utils.SEARCHTYPES['optimizedVersion']
+
+    def delete(self):
+        part = f'{self._parentKey}/media/{self.id}'
+        try:
+            return self._server.query(part, method=self._server._session.delete)
+        except BadRequest:
+            log.error("Failed to delete %s. This could be because you haven't allowed items to be deleted", part)
+            raise
+
+
+@utils.registerPlexObject
+class MediaPart(PlexObject):
+    """ Represents a single media part (often a single file) for the media this belongs to.
+
+        Attributes:
+            TAG (str): 'Part'
+            accessible (bool): True if the file is accessible.
+                Requires reloading the media with ``checkFiles=True``.
+                Refer to :func:`~plexapi.base.PlexObject.reload`.
+            audioProfile (str): The audio profile of the file.
+            container (str): The container type of the file (ex: avi).
+            decision (str): Unknown.
+            deepAnalysisVersion (int): The Plex deep analysis version for the file.
+            duration (int): The duration of the file in milliseconds.
+            exists (bool): True if the file exists.
+                Requires reloading the media with ``checkFiles=True``.
+                Refer to :func:`~plexapi.base.PlexObject.reload`.
+            file (str): The path to this file on disk (ex: /media/Movies/Cars (2006)/Cars (2006).mkv)
+            has64bitOffsets (bool): True if the file has 64 bit offsets.
+            hasThumbnail (bool): True if the file (track) has an embedded thumbnail.
+            id (int): The unique ID for this media part on the server.
+            indexes (str, None): sd if the file has generated preview (BIF) thumbnails.
+            key (str): API URL (ex: /library/parts/46618/1389985872/file.mkv).
+            optimizedForStreaming (bool): True if the file is optimized for streaming.
+            packetLength (int): The packet length of the file.
+            requiredBandwidths (str): The required bandwidths to stream the file.
+            selected (bool): True if this media part is selected.
+            size (int): The size of the file in bytes (ex: 733884416).
+            streams (List<:class:`~plexapi.media.MediaPartStream`>): List of stream objects.
+            syncItemId (int): The unique ID for this media part if it is synced.
+            syncState (str): The sync state for this media part.
+            videoProfile (str): The video profile of the file.
+    """
+    TAG = 'Part'
+
+    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')
+        self.decision = data.attrib.get('decision')
+        self.deepAnalysisVersion = utils.cast(int, data.attrib.get('deepAnalysisVersion'))
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.exists = utils.cast(bool, data.attrib.get('exists'))
+        self.file = data.attrib.get('file')
+        self.has64bitOffsets = utils.cast(bool, data.attrib.get('has64bitOffsets'))
+        self.hasThumbnail = utils.cast(bool, data.attrib.get('hasThumbnail'))
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.indexes = data.attrib.get('indexes')
+        self.key = data.attrib.get('key')
+        self.optimizedForStreaming = utils.cast(bool, data.attrib.get('optimizedForStreaming'))
+        self.packetLength = utils.cast(int, data.attrib.get('packetLength'))
+        self.protocol = data.attrib.get('protocol')
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
+        self.selected = utils.cast(bool, data.attrib.get('selected'))
+        self.size = utils.cast(int, data.attrib.get('size'))
+        self.streams = self._buildStreams(data)
+        self.syncItemId = utils.cast(int, data.attrib.get('syncItemId'))
+        self.syncState = data.attrib.get('syncState')
+        self.videoProfile = data.attrib.get('videoProfile')
+
+    def _buildStreams(self, data):
+        """ Returns a list of :class:`~plexapi.media.MediaPartStream` objects in this MediaPart. """
+        return self.findItems(data)
+
+    @property
+    def hasPreviewThumbnails(self):
+        """ Returns True if the media part has generated preview (BIF) thumbnails. """
+        return self.indexes == 'sd'
+
+    def videoStreams(self):
+        """ Returns a list of :class:`~plexapi.media.VideoStream` objects in this MediaPart. """
+        return [stream for stream in self.streams if isinstance(stream, VideoStream)]
+
+    def audioStreams(self):
+        """ Returns a list of :class:`~plexapi.media.AudioStream` objects in this MediaPart. """
+        return [stream for stream in self.streams if isinstance(stream, AudioStream)]
+
+    def subtitleStreams(self):
+        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects in this MediaPart. """
+        return [stream for stream in self.streams if isinstance(stream, SubtitleStream)]
+
+    def lyricStreams(self):
+        """ Returns a list of :class:`~plexapi.media.LyricStream` objects in this MediaPart. """
+        return [stream for stream in self.streams if isinstance(stream, LyricStream)]
+
+    def setSelectedAudioStream(self, stream):
+        """ Set the selected :class:`~plexapi.media.AudioStream` for this MediaPart.
+
+            Parameters:
+                stream (:class:`~plexapi.media.AudioStream`): Audio stream to set as selected
+        """
+        key = f'/library/parts/{self.id}'
+        params = {'allParts': 1}
+
+        if isinstance(stream, AudioStream):
+            params['audioStreamID'] = stream.id
+        else:
+            params['audioStreamID'] = stream
+
+        self._server.query(key, method=self._server._session.put, params=params)
+        return self
+
+    def setSelectedSubtitleStream(self, stream):
+        """ Set the selected :class:`~plexapi.media.SubtitleStream` for this MediaPart.
+
+            Parameters:
+                stream (:class:`~plexapi.media.SubtitleStream`): Subtitle stream to set as selected.
+        """
+        key = f'/library/parts/{self.id}'
+        params = {'allParts': 1}
+
+        if isinstance(stream, SubtitleStream):
+            params['subtitleStreamID'] = stream.id
+        else:
+            params['subtitleStreamID'] = stream
+
+        self._server.query(key, method=self._server._session.put, params=params)
+        return self
+
+    def resetSelectedSubtitleStream(self):
+        """ Set the selected subtitle of this MediaPart to 'None'. """
+        key = f'/library/parts/{self.id}'
+        params = {'subtitleStreamID': 0, 'allParts': 1}
+
+        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.
+
+        Attributes:
+            bitrate (int): The bitrate of the stream.
+            codec (str): The codec of the stream (ex: srt, ac3, mpeg4).
+            default (bool): True if this is the default stream.
+            displayTitle (str): The display title of the stream.
+            extendedDisplayTitle (str): The extended display title of the stream.
+            key (str): API URL (/library/streams/<id>)
+            id (int): The unique ID for this stream on the server.
+            index (int): The index of the stream.
+            language (str): The language of the stream (ex: English, ไทย).
+            languageCode (str): The ASCII language code of the stream (ex: eng, tha).
+            languageTag (str): The two letter language tag of the stream (ex: en, fr).
+            requiredBandwidths (str): The required bandwidths to stream the file.
+            selected (bool): True if this stream is selected.
+            streamType (int): The stream type (1= :class:`~plexapi.media.VideoStream`,
+                2= :class:`~plexapi.media.AudioStream`, 3= :class:`~plexapi.media.SubtitleStream`).
+            title (str): The title of the stream.
+            type (int): Alias for streamType.
+    """
+
+    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')
+        self.default = utils.cast(bool, data.attrib.get('default'))
+        self.displayTitle = data.attrib.get('displayTitle')
+        self.extendedDisplayTitle = data.attrib.get('extendedDisplayTitle')
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.index = utils.cast(int, data.attrib.get('index', '-1'))
+        self.key = data.attrib.get('key')
+        self.language = data.attrib.get('language')
+        self.languageCode = data.attrib.get('languageCode')
+        self.languageTag = data.attrib.get('languageTag')
+        self.location = data.attrib.get('location')
+        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
+        self.selected = utils.cast(bool, data.attrib.get('selected', '0'))
+        self.streamType = utils.cast(int, data.attrib.get('streamType'))
+        self.title = data.attrib.get('title')
+        self.type = utils.cast(int, data.attrib.get('streamType'))
+
+
+@utils.registerPlexObject
+class VideoStream(MediaPartStream):
+    """ Represents a video stream within a :class:`~plexapi.media.MediaPart`.
+
+        Attributes:
+            TAG (str): 'Stream'
+            STREAMTYPE (int): 1
+            anamorphic (str): If the video is anamorphic.
+            bitDepth (int): The bit depth of the video stream (ex: 8).
+            cabac (int): The context-adaptive binary arithmetic coding.
+            chromaLocation (str): The chroma location of the video stream.
+            chromaSubsampling (str): The chroma subsampling of the video stream (ex: 4:2:0).
+            codecID (str): The codec ID (ex: XVID).
+            codedHeight (int): The coded height of the video stream in pixels.
+            codedWidth (int): The coded width of the video stream in pixels.
+            colorPrimaries (str): The color primaries of the video stream.
+            colorRange (str): The color range of the video stream.
+            colorSpace (str): The color space of the video stream (ex: bt2020).
+            colorTrc (str): The color trc of the video stream.
+            DOVIBLCompatID (int): Dolby Vision base layer compatibility ID.
+            DOVIBLPresent (bool): True if Dolby Vision base layer is present.
+            DOVIELPresent (bool): True if Dolby Vision enhancement layer is present.
+            DOVILevel (int): Dolby Vision level.
+            DOVIPresent (bool): True if Dolby Vision is present.
+            DOVIProfile (int): Dolby Vision profile.
+            DOVIRPUPresent (bool): True if Dolby Vision reference processing unit is present.
+            DOVIVersion (float): The Dolby Vision version.
+            duration (int): The duration of video stream in milliseconds.
+            frameRate (float): The frame rate of the video stream (ex: 23.976).
+            frameRateMode (str): The frame rate mode of the video stream.
+            hasScalingMatrix (bool): True if video stream has a scaling matrix.
+            height (int): The height of the video stream in pixels (ex: 1080).
+            level (int): The codec encoding level of the video stream (ex: 41).
+            profile (str): The profile of the video stream (ex: asp).
+            pixelAspectRatio (str): The pixel aspect ratio of the video stream.
+            pixelFormat (str): The pixel format of the video stream.
+            refFrames (int): The number of reference frames of the video stream.
+            scanType (str): The scan type of the video stream (ex: progressive).
+            streamIdentifier(int): The stream identifier of the video stream.
+            width (int): The width of the video stream in pixels (ex: 1920).
+    """
+    TAG = 'Stream'
+    STREAMTYPE = 1
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(VideoStream, self)._loadData(data)
+        self.anamorphic = data.attrib.get('anamorphic')
+        self.bitDepth = utils.cast(int, data.attrib.get('bitDepth'))
+        self.cabac = utils.cast(int, data.attrib.get('cabac'))
+        self.chromaLocation = data.attrib.get('chromaLocation')
+        self.chromaSubsampling = data.attrib.get('chromaSubsampling')
+        self.codecID = data.attrib.get('codecID')
+        self.codedHeight = utils.cast(int, data.attrib.get('codedHeight'))
+        self.codedWidth = utils.cast(int, data.attrib.get('codedWidth'))
+        self.colorPrimaries = data.attrib.get('colorPrimaries')
+        self.colorRange = data.attrib.get('colorRange')
+        self.colorSpace = data.attrib.get('colorSpace')
+        self.colorTrc = data.attrib.get('colorTrc')
+        self.DOVIBLCompatID = utils.cast(int, data.attrib.get('DOVIBLCompatID'))
+        self.DOVIBLPresent = utils.cast(bool, data.attrib.get('DOVIBLPresent'))
+        self.DOVIELPresent = utils.cast(bool, data.attrib.get('DOVIELPresent'))
+        self.DOVILevel = utils.cast(int, data.attrib.get('DOVILevel'))
+        self.DOVIPresent = utils.cast(bool, data.attrib.get('DOVIPresent'))
+        self.DOVIProfile = utils.cast(int, data.attrib.get('DOVIProfile'))
+        self.DOVIRPUPresent = utils.cast(bool, data.attrib.get('DOVIRPUPresent'))
+        self.DOVIVersion = utils.cast(float, data.attrib.get('DOVIVersion'))
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.frameRate = utils.cast(float, data.attrib.get('frameRate'))
+        self.frameRateMode = data.attrib.get('frameRateMode')
+        self.hasScalingMatrix = utils.cast(bool, data.attrib.get('hasScalingMatrix'))
+        self.height = utils.cast(int, data.attrib.get('height'))
+        self.level = utils.cast(int, data.attrib.get('level'))
+        self.profile = data.attrib.get('profile')
+        self.pixelAspectRatio = data.attrib.get('pixelAspectRatio')
+        self.pixelFormat = data.attrib.get('pixelFormat')
+        self.refFrames = utils.cast(int, data.attrib.get('refFrames'))
+        self.scanType = data.attrib.get('scanType')
+        self.streamIdentifier = utils.cast(int, data.attrib.get('streamIdentifier'))
+        self.width = utils.cast(int, data.attrib.get('width'))
+
+
+@utils.registerPlexObject
+class AudioStream(MediaPartStream):
+    """ Represents a audio stream within a :class:`~plexapi.media.MediaPart`.
+
+        Attributes:
+            TAG (str): 'Stream'
+            STREAMTYPE (int): 2
+            audioChannelLayout (str): The audio channel layout of the audio stream (ex: 5.1(side)).
+            bitDepth (int): The bit depth of the audio stream (ex: 16).
+            bitrateMode (str): The bitrate mode of the audio stream (ex: cbr).
+            channels (int): The number of audio channels of the audio stream (ex: 6).
+            duration (int): The duration of audio stream in milliseconds.
+            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.
+
+            Track_only_attributes: The following attributes are only available for tracks.
+
+                * albumGain (float): The gain for the album.
+                * albumPeak (float): The peak for the album.
+                * albumRange (float): The range for the album.
+                * endRamp (str): The end ramp for the track.
+                * gain (float): The gain for the track.
+                * loudness (float): The loudness for the track.
+                * lra (float): The lra for the track.
+                * peak (float): The peak for the track.
+                * startRamp (str): The start ramp for the track.
+    """
+    TAG = 'Stream'
+    STREAMTYPE = 2
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(AudioStream, self)._loadData(data)
+        self.audioChannelLayout = data.attrib.get('audioChannelLayout')
+        self.bitDepth = utils.cast(int, data.attrib.get('bitDepth'))
+        self.bitrateMode = data.attrib.get('bitrateMode')
+        self.channels = utils.cast(int, data.attrib.get('channels'))
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.profile = data.attrib.get('profile')
+        self.samplingRate = utils.cast(int, data.attrib.get('samplingRate'))
+        self.streamIdentifier = utils.cast(int, data.attrib.get('streamIdentifier'))
+
+        # Track only attributes
+        self.albumGain = utils.cast(float, data.attrib.get('albumGain'))
+        self.albumPeak = utils.cast(float, data.attrib.get('albumPeak'))
+        self.albumRange = utils.cast(float, data.attrib.get('albumRange'))
+        self.endRamp = data.attrib.get('endRamp')
+        self.gain = utils.cast(float, data.attrib.get('gain'))
+        self.loudness = utils.cast(float, data.attrib.get('loudness'))
+        self.lra = utils.cast(float, data.attrib.get('lra'))
+        self.peak = utils.cast(float, data.attrib.get('peak'))
+        self.startRamp = data.attrib.get('startRamp')
+
+    def setSelected(self):
+        """ Sets this audio stream as the selected audio stream.
+            Alias for :func:`~plexapi.media.MediaPart.setSelectedAudioStream`.
+        """
+        return self._parent().setSelectedAudioStream(self)
+
+    @deprecated('Use "setSelected" instead.')
+    def setDefault(self):
+        return self.setSelected()
+
+
+@utils.registerPlexObject
+class SubtitleStream(MediaPartStream):
+    """ Represents a audio stream within a :class:`~plexapi.media.MediaPart`.
+
+        Attributes:
+            TAG (str): 'Stream'
+            STREAMTYPE (int): 3
+            canAutoSync (bool): True if the subtitle stream can be auto synced.
+            container (str): The container of the subtitle stream.
+            forced (bool): True if this is a forced subtitle.
+            format (str): The format of the subtitle stream (ex: srt).
+            headerCompression (str): The header compression of the subtitle stream.
+            hearingImpaired (bool): True if this is a hearing impaired (SDH) subtitle.
+            perfectMatch (bool): True if the on-demand subtitle is a perfect match.
+            providerTitle (str): The provider title where the on-demand subtitle is downloaded from.
+            score (int): The match score (download count) of the on-demand subtitle.
+            sourceKey (str): The source key of the on-demand subtitle.
+            transient (str): Unknown.
+            userID (int): The user id of the user that downloaded the on-demand subtitle.
+    """
+    TAG = 'Stream'
+    STREAMTYPE = 3
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(SubtitleStream, self)._loadData(data)
+        self.canAutoSync = utils.cast(bool, data.attrib.get('canAutoSync'))
+        self.container = data.attrib.get('container')
+        self.forced = utils.cast(bool, data.attrib.get('forced', '0'))
+        self.format = data.attrib.get('format')
+        self.headerCompression = data.attrib.get('headerCompression')
+        self.hearingImpaired = utils.cast(bool, data.attrib.get('hearingImpaired', '0'))
+        self.perfectMatch = utils.cast(bool, data.attrib.get('perfectMatch'))
+        self.providerTitle = data.attrib.get('providerTitle')
+        self.score = utils.cast(int, data.attrib.get('score'))
+        self.sourceKey = data.attrib.get('sourceKey')
+        self.transient = data.attrib.get('transient')
+        self.userID = utils.cast(int, data.attrib.get('userID'))
+
+    def setSelected(self):
+        """ Sets this subtitle stream as the selected subtitle stream.
+            Alias for :func:`~plexapi.media.MediaPart.setSelectedSubtitleStream`.
+        """
+        return self._parent().setSelectedSubtitleStream(self)
+
+    @deprecated('Use "setSelected" instead.')
+    def setDefault(self):
+        return self.setSelected()
+
+
+@utils.registerPlexObject
+class LyricStream(MediaPartStream):
+    """ Represents a lyric stream within a :class:`~plexapi.media.MediaPart`.
+
+        Attributes:
+            TAG (str): 'Stream'
+            STREAMTYPE (int): 4
+            format (str): The format of the lyric stream (ex: lrc).
+            minLines (int): The minimum number of lines in the (timed) lyric stream.
+            provider (str): The provider of the lyric stream (ex: com.plexapp.agents.lyricfind).
+            timed (bool): True if the lyrics are timed to the track.
+    """
+    TAG = 'Stream'
+    STREAMTYPE = 4
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(LyricStream, self)._loadData(data)
+        self.format = data.attrib.get('format')
+        self.minLines = utils.cast(int, data.attrib.get('minLines'))
+        self.provider = data.attrib.get('provider')
+        self.timed = utils.cast(bool, data.attrib.get('timed', '0'))
+
+
+@utils.registerPlexObject
+class Session(PlexObject):
+    """ Represents a current session.
+
+        Attributes:
+            TAG (str): 'Session'
+            id (str): The unique identifier for the session.
+            bandwidth (int): The Plex streaming brain reserved bandwidth for the session.
+            location (str): The location of the session (lan, wan, or cellular)
+    """
+    TAG = 'Session'
+
+    def _loadData(self, data):
+        self.id = data.attrib.get('id')
+        self.bandwidth = utils.cast(int, data.attrib.get('bandwidth'))
+        self.location = data.attrib.get('location')
+
+
+@utils.registerPlexObject
+class TranscodeSession(PlexObject):
+    """ Represents a current transcode session.
+
+        Attributes:
+            TAG (str): 'TranscodeSession'
+            audioChannels (int): The number of audio channels of the transcoded media.
+            audioCodec (str): The audio codec of the transcoded media.
+            audioDecision (str): The transcode decision for the audio stream.
+            complete (bool): True if the transcode is complete.
+            container (str): The container of the transcoded media.
+            context (str): The context for the transcode session.
+            duration (int): The duration of the transcoded media in milliseconds.
+            height (int): The height of the transcoded media in pixels.
+            key (str): API URL (ex: /transcode/sessions/<id>).
+            maxOffsetAvailable (float): Unknown.
+            minOffsetAvailable (float): Unknown.
+            progress (float): The progress percentage of the transcode.
+            protocol (str): The protocol of the transcode.
+            remaining (int): Unknown.
+            size (int): The size of the transcoded media in bytes.
+            sourceAudioCodec (str): The audio codec of the source media.
+            sourceVideoCodec (str): The video codec of the source media.
+            speed (float): The speed of the transcode.
+            subtitleDecision (str): The transcode decision for the subtitle stream
+            throttled (bool): True if the transcode is throttled.
+            timestamp (int): The epoch timestamp when the transcode started.
+            transcodeHwDecoding (str): The hardware transcoding decoder engine.
+            transcodeHwDecodingTitle (str): The title of the hardware transcoding decoder engine.
+            transcodeHwEncoding (str): The hardware transcoding encoder engine.
+            transcodeHwEncodingTitle (str): The title of the hardware transcoding encoder engine.
+            transcodeHwFullPipeline (str): True if hardware decoding and encoding is being used for the transcode.
+            transcodeHwRequested (str): True if hardware transcoding was requested for the transcode.
+            videoCodec (str): The video codec of the transcoded media.
+            videoDecision (str): The transcode decision for the video stream.
+            width (str): The width of the transcoded media in pixels.
+    """
+    TAG = 'TranscodeSession'
+
+    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')
+        self.complete = utils.cast(bool, data.attrib.get('complete', '0'))
+        self.container = data.attrib.get('container')
+        self.context = data.attrib.get('context')
+        self.duration = utils.cast(int, data.attrib.get('duration'))
+        self.height = utils.cast(int, data.attrib.get('height'))
+        self.key = data.attrib.get('key')
+        self.maxOffsetAvailable = utils.cast(float, data.attrib.get('maxOffsetAvailable'))
+        self.minOffsetAvailable = utils.cast(float, data.attrib.get('minOffsetAvailable'))
+        self.progress = utils.cast(float, data.attrib.get('progress'))
+        self.protocol = data.attrib.get('protocol')
+        self.remaining = utils.cast(int, data.attrib.get('remaining'))
+        self.size = utils.cast(int, data.attrib.get('size'))
+        self.sourceAudioCodec = data.attrib.get('sourceAudioCodec')
+        self.sourceVideoCodec = data.attrib.get('sourceVideoCodec')
+        self.speed = utils.cast(float, data.attrib.get('speed'))
+        self.subtitleDecision = data.attrib.get('subtitleDecision')
+        self.throttled = utils.cast(bool, data.attrib.get('throttled', '0'))
+        self.timestamp = utils.cast(float, data.attrib.get('timeStamp'))
+        self.transcodeHwDecoding = data.attrib.get('transcodeHwDecoding')
+        self.transcodeHwDecodingTitle = data.attrib.get('transcodeHwDecodingTitle')
+        self.transcodeHwEncoding = data.attrib.get('transcodeHwEncoding')
+        self.transcodeHwEncodingTitle = data.attrib.get('transcodeHwEncodingTitle')
+        self.transcodeHwFullPipeline = utils.cast(bool, data.attrib.get('transcodeHwFullPipeline', '0'))
+        self.transcodeHwRequested = utils.cast(bool, data.attrib.get('transcodeHwRequested', '0'))
+        self.videoCodec = data.attrib.get('videoCodec')
+        self.videoDecision = data.attrib.get('videoDecision')
+        self.width = utils.cast(int, data.attrib.get('width'))
+
+
+@utils.registerPlexObject
+class TranscodeJob(PlexObject):
+    """ Represents an Optimizing job.
+        TrancodeJobs are the process for optimizing conversions.
+        Active or paused optimization items. Usually one item as a time."""
+    TAG = 'TranscodeJob'
+
+    def _loadData(self, data):
+        self._data = data
+        self.generatorID = data.attrib.get('generatorID')
+        self.key = data.attrib.get('key')
+        self.progress = data.attrib.get('progress')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.size = data.attrib.get('size')
+        self.targetTagID = data.attrib.get('targetTagID')
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+
+
+@utils.registerPlexObject
+class Optimized(PlexObject):
+    """ Represents a Optimized item.
+        Optimized items are optimized and queued conversions items."""
+    TAG = 'Item'
+
+    def _loadData(self, data):
+        self._data = data
+        self.id = data.attrib.get('id')
+        self.composite = data.attrib.get('composite')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.target = data.attrib.get('target')
+        self.targetTagID = data.attrib.get('targetTagID')
+
+    def items(self):
+        """ Returns a list of all :class:`~plexapi.media.Video` objects
+            in this optimized item.
+        """
+        key = f'{self._initpath}/{self.id}/items'
+        return self.fetchItems(key)
+
+    def remove(self):
+        """ Remove an Optimized item"""
+        key = f'{self._initpath}/{self.id}'
+        self._server.query(key, method=self._server._session.delete)
+
+    def rename(self, title):
+        """ Rename an Optimized item"""
+        key = f'{self._initpath}/{self.id}?Item[title]={title}'
+        self._server.query(key, method=self._server._session.put)
+
+    def reprocess(self, ratingKey):
+        """ Reprocess a removed Conversion item that is still a listed Optimize item"""
+        key = f'{self._initpath}/{self.id}/{ratingKey}/enable'
+        self._server.query(key, method=self._server._session.put)
+
+
+@utils.registerPlexObject
+class Conversion(PlexObject):
+    """ Represents a Conversion item.
+        Conversions are items queued for optimization or being actively optimized."""
+    TAG = 'Video'
+
+    def _loadData(self, data):
+        self._data = data
+        self.addedAt = data.attrib.get('addedAt')
+        self.art = data.attrib.get('art')
+        self.chapterSource = data.attrib.get('chapterSource')
+        self.contentRating = data.attrib.get('contentRating')
+        self.duration = data.attrib.get('duration')
+        self.generatorID = data.attrib.get('generatorID')
+        self.generatorType = data.attrib.get('generatorType')
+        self.guid = data.attrib.get('guid')
+        self.key = data.attrib.get('key')
+        self.lastViewedAt = data.attrib.get('lastViewedAt')
+        self.librarySectionID = data.attrib.get('librarySectionID')
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.originallyAvailableAt = data.attrib.get('originallyAvailableAt')
+        self.playQueueItemID = data.attrib.get('playQueueItemID')
+        self.playlistID = data.attrib.get('playlistID')
+        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
+        self.rating = data.attrib.get('rating')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.studio = data.attrib.get('studio')
+        self.summary = data.attrib.get('summary')
+        self.tagline = data.attrib.get('tagline')
+        self.target = data.attrib.get('target')
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.updatedAt = data.attrib.get('updatedAt')
+        self.userID = data.attrib.get('userID')
+        self.username = data.attrib.get('username')
+        self.viewOffset = data.attrib.get('viewOffset')
+        self.year = data.attrib.get('year')
+
+    def remove(self):
+        """ Remove Conversion from queue """
+        key = f'/playlists/{self.playlistID}/items/{self.generatorID}/{self.ratingKey}/disable'
+        self._server.query(key, method=self._server._session.put)
+
+    def move(self, after):
+        """ Move Conversion items position in queue
+            after (int): Place item after specified playQueueItemID. '-1' is the active conversion.
+
+                Example:
+                    Move 5th conversion Item to active conversion
+                        conversions[4].move('-1')
+
+                    Move 4th conversion Item to 3rd in conversion queue
+                        conversions[3].move(conversions[1].playQueueItemID)
+        """
+
+        key = f'{self._initpath}/items/{self.playQueueItemID}/move?after={after}'
+        self._server.query(key, method=self._server._session.put)
+
+
+class MediaTag(PlexObject):
+    """ Base class for media tags used for filtering and searching your library
+        items or navigating the metadata of media items in your library. Tags are
+        the construct used for things such as Country, Director, Genre, etc.
+
+        Attributes:
+            filter (str): The library filter for the tag.
+            id (id): 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
+                person for Directors and Roles (ex: Animation, Stephen Graham, etc).
+            tagKey (str): Plex GUID for the actor/actress for :class:`~plexapi.media.Role` only.
+            thumb (str): URL to thumbnail image for :class:`~plexapi.media.Role` only.
+    """
+
+    def __str__(self):
+        """ Returns the tag name. """
+        return self.tag
+
+    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')
+        self.role = data.attrib.get('role')
+        self.tag = data.attrib.get('tag')
+        self.tagKey = data.attrib.get('tagKey')
+        self.thumb = data.attrib.get('thumb')
+
+        parent = self._parent()
+        self._librarySectionID = utils.cast(int, parent._data.attrib.get('librarySectionID'))
+        self._librarySectionKey = parent._data.attrib.get('librarySectionKey')
+        self._librarySectionTitle = parent._data.attrib.get('librarySectionTitle')
+        self._parentType = parent.TYPE
+
+        if self._librarySectionKey and self.filter:
+            self.key = f'{self._librarySectionKey}/all?{self.filter}&type={utils.searchType(self._parentType)}'
+
+    def items(self):
+        """ Return the list of items within this tag. """
+        if not self.key:
+            raise BadRequest(f'Key is not defined for this tag: {self.tag}. Reload the parent object.')
+        return self.fetchItems(self.key)
+
+
+@utils.registerPlexObject
+class Collection(MediaTag):
+    """ Represents a single Collection media tag.
+
+        Attributes:
+            TAG (str): 'Collection'
+            FILTER (str): 'collection'
+    """
+    TAG = 'Collection'
+    FILTER = 'collection'
+
+    def collection(self):
+        """ Return the :class:`~plexapi.collection.Collection` object for this collection tag.
+        """
+        key = f'{self._librarySectionKey}/collections'
+        return self.fetchItem(key, etag='Directory', index=self.id)
+
+
+@utils.registerPlexObject
+class Country(MediaTag):
+    """ Represents a single Country media tag.
+
+        Attributes:
+            TAG (str): 'Country'
+            FILTER (str): 'country'
+    """
+    TAG = 'Country'
+    FILTER = 'country'
+
+
+@utils.registerPlexObject
+class Director(MediaTag):
+    """ Represents a single Director media tag.
+
+        Attributes:
+            TAG (str): 'Director'
+            FILTER (str): 'director'
+    """
+    TAG = 'Director'
+    FILTER = 'director'
+
+
+@utils.registerPlexObject
+class Format(MediaTag):
+    """ Represents a single Format media tag.
+
+        Attributes:
+            TAG (str): 'Format'
+            FILTER (str): 'format'
+    """
+    TAG = 'Format'
+    FILTER = 'format'
+
+
+@utils.registerPlexObject
+class Genre(MediaTag):
+    """ Represents a single Genre media tag.
+
+        Attributes:
+            TAG (str): 'Genre'
+            FILTER (str): 'genre'
+    """
+    TAG = 'Genre'
+    FILTER = 'genre'
+
+
+@utils.registerPlexObject
+class Label(MediaTag):
+    """ Represents a single Label media tag.
+
+        Attributes:
+            TAG (str): 'Label'
+            FILTER (str): 'label'
+    """
+    TAG = 'Label'
+    FILTER = 'label'
+
+
+@utils.registerPlexObject
+class Mood(MediaTag):
+    """ Represents a single Mood media tag.
+
+        Attributes:
+            TAG (str): 'Mood'
+            FILTER (str): 'mood'
+    """
+    TAG = 'Mood'
+    FILTER = 'mood'
+
+
+@utils.registerPlexObject
+class Producer(MediaTag):
+    """ Represents a single Producer media tag.
+
+        Attributes:
+            TAG (str): 'Producer'
+            FILTER (str): 'producer'
+    """
+    TAG = 'Producer'
+    FILTER = 'producer'
+
+
+@utils.registerPlexObject
+class Role(MediaTag):
+    """ Represents a single Role (actor/actress) media tag.
+
+        Attributes:
+            TAG (str): 'Role'
+            FILTER (str): 'role'
+    """
+    TAG = 'Role'
+    FILTER = 'role'
+
+
+@utils.registerPlexObject
+class Similar(MediaTag):
+    """ Represents a single Similar media tag.
+
+        Attributes:
+            TAG (str): 'Similar'
+            FILTER (str): 'similar'
+    """
+    TAG = 'Similar'
+    FILTER = 'similar'
+
+
+@utils.registerPlexObject
+class Style(MediaTag):
+    """ Represents a single Style media tag.
+
+        Attributes:
+            TAG (str): 'Style'
+            FILTER (str): 'style'
+    """
+    TAG = 'Style'
+    FILTER = 'style'
+
+
+@utils.registerPlexObject
+class Subformat(MediaTag):
+    """ Represents a single Subformat media tag.
+
+        Attributes:
+            TAG (str): 'Subformat'
+            FILTER (str): 'subformat'
+    """
+    TAG = 'Subformat'
+    FILTER = 'subformat'
+
+
+@utils.registerPlexObject
+class Tag(MediaTag):
+    """ Represents a single Tag media tag.
+
+        Attributes:
+            TAG (str): 'Tag'
+            FILTER (str): 'tag'
+    """
+    TAG = 'Tag'
+    FILTER = 'tag'
+
+
+@utils.registerPlexObject
+class Writer(MediaTag):
+    """ Represents a single Writer media tag.
+
+        Attributes:
+            TAG (str): 'Writer'
+            FILTER (str): 'writer'
+    """
+    TAG = 'Writer'
+    FILTER = 'writer'
+
+
+@utils.registerPlexObject
+class Guid(PlexObject):
+    """ Represents a single Guid media tag.
+
+        Attributes:
+            TAG (str): 'Guid'
+            id (id): The guid for external metadata sources (e.g. IMDB, TMDB, TVDB, MBID).
+    """
+    TAG = 'Guid'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self._data = data
+        self.id = data.attrib.get('id')
+
+
+@utils.registerPlexObject
+class Image(PlexObject):
+    """ Represents a single Image media tag.
+
+        Attributes:
+            TAG (str): 'Image'
+            alt (str): The alt text for the image.
+            type (str): The type of image (e.g. coverPoster, background, snapshot).
+            url (str): The API URL (/library/metadata/<ratingKey>/thumb/<thumbid>).
+    """
+    TAG = 'Image'
+
+    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')
+
+
+@utils.registerPlexObject
+class Rating(PlexObject):
+    """ Represents a single Rating media tag.
+
+        Attributes:
+            TAG (str): 'Rating'
+            image (str): The uri for the rating image
+                (e.g. ``imdb://image.rating``, ``rottentomatoes://image.rating.ripe``,
+                ``rottentomatoes://image.rating.upright``, ``themoviedb://image.rating``).
+            type (str): The type of rating (e.g. audience or critic).
+            value (float): The rating value.
+    """
+    TAG = 'Rating'
+
+    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'))
+
+
+@utils.registerPlexObject
+class Review(PlexObject):
+    """ Represents a single Review for a Movie.
+
+        Attributes:
+            TAG (str): 'Review'
+            filter (str): The library filter for the review.
+            id (int): The ID of the review.
+            image (str): The image uri for the review.
+            link (str): The url to the online review.
+            source (str): The source of the review.
+            tag (str): The name of the reviewer.
+            text (str): The text of the review.
+    """
+    TAG = 'Review'
+
+    def _loadData(self, data):
+        self._data = data
+        self.filter = data.attrib.get('filter')
+        self.id = utils.cast(int, data.attrib.get('id', 0))
+        self.image = data.attrib.get('image')
+        self.link = data.attrib.get('link')
+        self.source = data.attrib.get('source')
+        self.tag = data.attrib.get('tag')
+        self.text = data.attrib.get('text')
+
+
+@utils.registerPlexObject
+class UltraBlurColors(PlexObject):
+    """ Represents a single UltraBlurColors media tag.
+
+        Attributes:
+            TAG (str): 'UltraBlurColors'
+            bottomLeft (str): The bottom left hex color.
+            bottomRight (str): The bottom right hex color.
+            topLeft (str): The top left hex color.
+            topRight (str): The top right hex color.
+    """
+    TAG = 'UltraBlurColors'
+
+    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')
+        self.topRight = data.attrib.get('topRight')
+
+
+class BaseResource(PlexObject):
+    """ Base class for all Art, Poster, and Theme objects.
+
+        Attributes:
+            TAG (str): 'Photo' or 'Track'
+            key (str): API URL (/library/metadata/<ratingkey>).
+            provider (str): The source of the resource. 'local' for local files (e.g. theme.mp3),
+                None if uploaded or agent-/plugin-supplied.
+            ratingKey (str): Unique key identifying the resource.
+            selected (bool): True if the resource is currently selected.
+            thumb (str): The URL to retrieve the resource thumbnail.
+    """
+
+    def _loadData(self, data):
+        self._data = data
+        self.key = data.attrib.get('key')
+        self.provider = data.attrib.get('provider')
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.selected = utils.cast(bool, data.attrib.get('selected'))
+        self.thumb = data.attrib.get('thumb')
+
+    def select(self):
+        key = self._initpath[:-1]
+        data = f'{key}?url={quote_plus(self.ratingKey)}'
+        try:
+            self._server.query(data, method=self._server._session.put)
+        except xml.etree.ElementTree.ParseError:
+            pass
+
+    @property
+    def resourceFilepath(self):
+        """ Returns the file path to the resource in the Plex Media Server data directory.
+            Note: Returns the URL if the resource is not stored locally.
+        """
+        if self.ratingKey.startswith('media://'):
+            return str(Path('Media') / 'localhost' / self.ratingKey.split('://')[-1])
+        elif self.ratingKey.startswith('metadata://'):
+            return str(Path(self._parent().metadataDirectory) / 'Contents' / '_combined' / self.ratingKey.split('://')[-1])
+        elif self.ratingKey.startswith('upload://'):
+            return str(Path(self._parent().metadataDirectory) / 'Uploads' / self.ratingKey.split('://')[-1])
+        else:
+            return self.ratingKey
+
+
+class Art(BaseResource):
+    """ Represents a single Art object. """
+    TAG = 'Photo'
+
+
+class Logo(BaseResource):
+    """ Represents a single Logo object. """
+    TAG = 'Photo'
+
+
+class Poster(BaseResource):
+    """ Represents a single Poster object. """
+    TAG = 'Photo'
+
+
+class Theme(BaseResource):
+    """ Represents a single Theme object. """
+    TAG = 'Track'
+
+
+@utils.registerPlexObject
+class Chapter(PlexObject):
+    """ Represents a single Chapter media tag.
+
+        Attributes:
+            TAG (str): 'Chapter'
+            end (int): The end time of the chapter in milliseconds.
+            filter (str): The library filter for the chapter.
+            id (int): The ID of the chapter.
+            index (int): The index of the chapter.
+            tag (str): The name of the chapter.
+            title (str): The title of the chapter.
+            thumb (str): The URL to retrieve the chapter thumbnail.
+            start (int): The start time of the chapter in milliseconds.
+    """
+    TAG = 'Chapter'
+
+    def __repr__(self):
+        name = self._clean(self.firstAttr('tag'))
+        start = utils.millisecondToHumanstr(self._clean(self.firstAttr('start')))
+        end = utils.millisecondToHumanstr(self._clean(self.firstAttr('end')))
+        offsets = f'{start}-{end}'
+        return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
+
+    def _loadData(self, data):
+        self._data = data
+        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))
+        self.index = utils.cast(int, data.attrib.get('index'))
+        self.tag = data.attrib.get('tag')
+        self.title = self.tag
+        self.thumb = data.attrib.get('thumb')
+        self.start = utils.cast(int, data.attrib.get('startTimeOffset'))
+
+
+@utils.registerPlexObject
+class Marker(PlexObject):
+    """ Represents a single Marker media tag.
+
+        Attributes:
+            TAG (str): 'Marker'
+            end (int): The end time of the marker in milliseconds.
+            final (bool): True if the marker is the final credits marker.
+            id (int): The ID of the marker.
+            type (str): The type of marker.
+            start (int): The start time of the marker in milliseconds.
+            version (int): The Plex marker version.
+    """
+    TAG = 'Marker'
+
+    def __repr__(self):
+        name = self._clean(self.firstAttr('type'))
+        start = utils.millisecondToHumanstr(self._clean(self.firstAttr('start')))
+        end = utils.millisecondToHumanstr(self._clean(self.firstAttr('end')))
+        offsets = f'{start}-{end}'
+        return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
+
+    def _loadData(self, data):
+        self._data = data
+        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'))
+        self.type = data.attrib.get('type')
+        self.start = utils.cast(int, data.attrib.get('startTimeOffset'))
+
+        attributes = data.find('Attributes')
+        self.version = attributes.attrib.get('version')
+
+    @property
+    def first(self):
+        """ Returns True if the marker in the first credits marker. """
+        if self.type != 'credits':
+            return None
+        first = min(
+            (marker for marker in self._parent().markers if marker.type == 'credits'),
+            key=lambda m: m.start
+        )
+        return first == self
+
+
+@utils.registerPlexObject
+class Field(PlexObject):
+    """ Represents a single Field.
+
+        Attributes:
+            TAG (str): 'Field'
+            locked (bool): True if the field is locked.
+            name (str): The name of the field.
+    """
+    TAG = 'Field'
+
+    def _loadData(self, data):
+        self._data = data
+        self.locked = utils.cast(bool, data.attrib.get('locked'))
+        self.name = data.attrib.get('name')
+
+
+@utils.registerPlexObject
+class SearchResult(PlexObject):
+    """ Represents a single SearchResult.
+
+        Attributes:
+            TAG (str): 'SearchResult'
+    """
+    TAG = 'SearchResult'
+
+    def __repr__(self):
+        name = self._clean(self.firstAttr('name'))
+        score = self._clean(self.firstAttr('score'))
+        return f"<{':'.join([p for p in [self.__class__.__name__, name, score] if p])}>"
+
+    def _loadData(self, data):
+        self._data = data
+        self.guid = data.attrib.get('guid')
+        self.lifespanEnded = data.attrib.get('lifespanEnded')
+        self.name = data.attrib.get('name')
+        self.score = utils.cast(int, data.attrib.get('score'))
+        self.year = data.attrib.get('year')
+
+
+@utils.registerPlexObject
+class Agent(PlexObject):
+    """ Represents a single Agent.
+
+        Attributes:
+            TAG (str): 'Agent'
+    """
+    TAG = 'Agent'
+
+    def __repr__(self):
+        uid = self._clean(self.firstAttr('shortIdentifier'))
+        return f"<{':'.join([p for p in [self.__class__.__name__, uid] if p])}>"
+
+    def _loadData(self, data):
+        self._data = data
+        self.hasAttribution = data.attrib.get('hasAttribution')
+        self.hasPrefs = data.attrib.get('hasPrefs')
+        self.identifier = data.attrib.get('identifier')
+        self.name = data.attrib.get('name')
+        self.primary = data.attrib.get('primary')
+        self.shortIdentifier = self.identifier.rsplit('.', 1)[1]
+
+        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)
+
+    @property
+    @deprecated('use "languageCodes" instead')
+    def languageCode(self):
+        return self.languageCodes
+
+    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.
+
+        Attributes:
+            TAG (str): 'MediaType'
+    """
+    TAG = 'MediaType'
+
+    def __repr__(self):
+        uid = self._clean(self.firstAttr('name'))
+        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')
+        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
+
+
+@utils.registerPlexObject
+class Availability(PlexObject):
+    """ Represents a single online streaming service Availability.
+
+        Attributes:
+            TAG (str): 'Availability'
+            country (str): The streaming service country.
+            offerType (str): Subscription, buy, or rent from the streaming service.
+            platform (str): The platform slug for the streaming service.
+            platformColorThumb (str): Thumbnail icon for the streaming service.
+            platformInfo (str): The streaming service platform info.
+            platformUrl (str): The URL to the media on the streaming service.
+            price (float): The price to buy or rent from the streaming service.
+            priceDescription (str): The display price to buy or rent from the streaming service.
+            quality (str): The video quality on the streaming service.
+            title (str): The title of the streaming service.
+            url (str): The Plex availability URL.
+    """
+    TAG = 'Availability'
+
+    def __repr__(self):
+        return f'<{self.__class__.__name__}:{self.platform}:{self.offerType}>'
+
+    def _loadData(self, data):
+        self._data = data
+        self.country = data.attrib.get('country')
+        self.offerType = data.attrib.get('offerType')
+        self.platform = data.attrib.get('platform')
+        self.platformColorThumb = data.attrib.get('platformColorThumb')
+        self.platformInfo = data.attrib.get('platformInfo')
+        self.platformUrl = data.attrib.get('platformUrl')
+        self.price = utils.cast(float, data.attrib.get('price'))
+        self.priceDescription = data.attrib.get('priceDescription')
+        self.quality = data.attrib.get('quality')
+        self.title = data.attrib.get('title')
+        self.url = data.attrib.get('url')
diff --git a/libs/plexapi/mixins.py b/libs/plexapi/mixins.py
new file mode 100644
index 000000000..95f785fcc
--- /dev/null
+++ b/libs/plexapi/mixins.py
@@ -0,0 +1,1325 @@
+# -*- 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/myplex.py b/libs/plexapi/myplex.py
new file mode 100644
index 000000000..abcc9417e
--- /dev/null
+++ b/libs/plexapi/myplex.py
@@ -0,0 +1,2044 @@
+# -*- coding: utf-8 -*-
+import copy
+import html
+import threading
+import time
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
+from xml.etree import ElementTree
+
+import requests
+
+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.client import PlexClient
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized, TwoFactorRequired
+from plexapi.library import LibrarySection
+from plexapi.server import PlexServer
+from plexapi.sonos import PlexSonosClient
+from plexapi.sync import SyncItem, SyncList
+from requests.status_codes import _codes as codes
+
+
+class MyPlexAccount(PlexObject):
+    """ MyPlex account and profile information. This object represents the data found Account on
+        the myplex.tv servers at the url https://plex.tv/api/v2/user. You may create this object
+        directly by passing in your username & password (or token). There is also a convenience
+        method provided at :class:`~plexapi.server.PlexServer.myPlexAccount()` which will create
+        and return this object.
+
+        Parameters:
+            username (str): Plex login username if not using a token.
+            password (str): Plex login password if not using a token.
+            token (str): Plex authentication token instead of username and password.
+            session (requests.Session, optional): Use your own session object if you want to
+                cache the http responses from PMS.
+            timeout (int): timeout in seconds on initial connect to myplex (default config.TIMEOUT).
+            code (str): Two-factor authentication code to use when logging in with username and password.
+            remember (bool): Remember the account token for 14 days (Default True).
+
+        Attributes:
+            key (str): 'https://plex.tv/api/v2/user'
+            adsConsent (str): Unknown.
+            adsConsentReminderAt (str): Unknown.
+            adsConsentSetAt (str): Unknown.
+            anonymous (str): Unknown.
+            authToken (str): The account token.
+            backupCodesCreated (bool): If the two-factor authentication backup codes have been created.
+            confirmed (bool): If the account has been confirmed.
+            country (str): The account country.
+            email (str): The account email address.
+            emailOnlyAuth (bool): If login with email only is enabled.
+            experimentalFeatures (bool): If experimental features are enabled.
+            friendlyName (str): Your account full name.
+            entitlements (List<str>): List of devices your allowed to use with this account.
+            guest (bool): If the account is a Plex Home guest user.
+            hasPassword (bool): If the account has a password.
+            home (bool): If the account is a Plex Home user.
+            homeAdmin (bool): If the account is the Plex Home admin.
+            homeSize (int): The number of accounts in the Plex Home.
+            id (int): The Plex account ID.
+            joinedAt (datetime): Date the account joined Plex.
+            locale (str): the account locale
+            mailingListActive (bool): If you are subscribed to the Plex newsletter.
+            mailingListStatus (str): Your current mailing list status.
+            maxHomeSize (int): The maximum number of accounts allowed in the Plex Home.
+            pin (str): The hashed Plex Home PIN.
+            profileAutoSelectAudio (bool): If the account has automatically select audio and subtitle tracks enabled.
+            profileDefaultAudioLanguage (str): The preferred audio language for the account.
+            profileDefaultSubtitleLanguage (str): The preferred subtitle language for the account.
+            profileAutoSelectSubtitle (int): The auto-select subtitle mode
+                (0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
+            profileDefaultSubtitleAccessibility (int): The subtitles for the deaf or hard-of-hearing (SDH) searches mode
+                (0 = Prefer non-SDH subtitles, 1 = Prefer SDH subtitles, 2 = Only show SDH subtitles,
+                3 = Only shown non-SDH subtitles).
+            profileDefaultSubtitleForced (int): The forced subtitles searches mode
+                (0 = Prefer non-forced subtitles, 1 = Prefer forced subtitles, 2 = Only show forced subtitles,
+                3 = Only show non-forced subtitles).
+            protected (bool): If the account has a Plex Home PIN enabled.
+            rememberExpiresAt (datetime): Date the token expires.
+            restricted (bool): If the account is a Plex Home managed user.
+            roles: (List<str>) Lit of account roles. Plexpass membership listed here.
+            scrobbleTypes (List<int>): Unknown.
+            subscriptionActive (bool): If the account's Plex Pass subscription is active.
+            subscriptionDescription (str): Description of the Plex Pass subscription.
+            subscriptionFeatures: (List<str>) List of features allowed on your Plex Pass subscription.
+            subscriptionPaymentService (str): Payment service used for your Plex Pass subscription.
+            subscriptionPlan (str): Name of Plex Pass subscription plan.
+            subscriptionStatus (str): String representation of ``subscriptionActive``.
+            subscriptionSubscribedAt (datetime): Date the account subscribed to Plex Pass.
+            thumb (str): URL of the account thumbnail.
+            title (str): The title of the account (username or friendly name).
+            twoFactorEnabled (bool): If two-factor authentication is enabled.
+            username (str): The account username.
+            uuid (str): The account UUID.
+    """
+    FRIENDINVITE = 'https://plex.tv/api/servers/{machineId}/shared_servers'                     # post with data
+    HOMEUSERS = 'https://plex.tv/api/home/users'
+    HOMEUSERCREATE = 'https://plex.tv/api/home/users?title={title}'                             # post with data
+    EXISTINGUSER = 'https://plex.tv/api/home/users?invitedEmail={username}'                     # post with data
+    FRIENDSERVERS = 'https://plex.tv/api/servers/{machineId}/shared_servers/{serverId}'         # put with data
+    PLEXSERVERS = 'https://plex.tv/api/servers/{machineId}'                                     # get
+    FRIENDUPDATE = 'https://plex.tv/api/v2/sharings/{userId}'                                   # put with args, delete
+    HOMEUSER = 'https://plex.tv/api/home/users/{userId}'                                        # delete, put
+    MANAGEDHOMEUSER = 'https://plex.tv/api/v2/home/users/restricted/{userId}'                   # put
+    SIGNIN = 'https://plex.tv/api/v2/users/signin'                                              # post with auth
+    SIGNOUT = 'https://plex.tv/api/v2/users/signout'                                            # delete
+    WEBHOOKS = 'https://plex.tv/api/v2/user/webhooks'                                           # get, post with data
+    OPTOUTS = 'https://plex.tv/api/v2/user/{userUUID}/settings/opt_outs'                        # get
+    LINK = 'https://plex.tv/api/v2/pins/link'                                                   # put
+    VIEWSTATESYNC = 'https://plex.tv/api/v2/user/view_state_sync'                               # put
+    PING = 'https://plex.tv/api/v2/ping'
+    # Hub sections
+    VOD = 'https://vod.provider.plex.tv'                                                        # get
+    MUSIC = 'https://music.provider.plex.tv'                                                    # get
+    DISCOVER = 'https://discover.provider.plex.tv'
+    METADATA = 'https://metadata.provider.plex.tv'
+    key = 'https://plex.tv/api/v2/user'
+
+    def __init__(self, username=None, password=None, token=None, session=None, timeout=None, code=None, remember=True):
+        self._token = logfilter.add_secret(token or CONFIG.get('auth.server_token'))
+        self._session = session or requests.Session()
+        self._timeout = timeout or TIMEOUT
+        self._sonos_cache = []
+        self._sonos_cache_timestamp = 0
+        data, initpath = self._signin(username, password, code, remember, timeout)
+        super(MyPlexAccount, self).__init__(self, data, initpath)
+
+    def _signin(self, username, password, code, remember, timeout):
+        if self._token:
+            return self.query(self.key), self.key
+        payload = {
+            'login': username or CONFIG.get('auth.myplex_username'),
+            'password': password or CONFIG.get('auth.myplex_password'),
+            'rememberMe': remember
+        }
+        if code:
+            payload['verificationCode'] = code
+        data = self.query(self.SIGNIN, method=self._session.post, data=payload, timeout=timeout)
+        return data, self.SIGNIN
+
+    def signout(self):
+        """ Sign out of the Plex account. Invalidates the authentication token. """
+        return self.query(self.SIGNOUT, method=self._session.delete)
+
+    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 = []
+
+        self.adsConsent = data.attrib.get('adsConsent')
+        self.adsConsentReminderAt = data.attrib.get('adsConsentReminderAt')
+        self.adsConsentSetAt = data.attrib.get('adsConsentSetAt')
+        self.anonymous = data.attrib.get('anonymous')
+        self.authToken = self._token
+        self.backupCodesCreated = utils.cast(bool, data.attrib.get('backupCodesCreated'))
+        self.confirmed = utils.cast(bool, data.attrib.get('confirmed'))
+        self.country = data.attrib.get('country')
+        self.email = data.attrib.get('email')
+        self.emailOnlyAuth = utils.cast(bool, data.attrib.get('emailOnlyAuth'))
+        self.experimentalFeatures = utils.cast(bool, data.attrib.get('experimentalFeatures'))
+        self.friendlyName = data.attrib.get('friendlyName')
+        self.guest = utils.cast(bool, data.attrib.get('guest'))
+        self.hasPassword = utils.cast(bool, data.attrib.get('hasPassword'))
+        self.home = utils.cast(bool, data.attrib.get('home'))
+        self.homeAdmin = utils.cast(bool, data.attrib.get('homeAdmin'))
+        self.homeSize = utils.cast(int, data.attrib.get('homeSize'))
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.joinedAt = utils.toDatetime(data.attrib.get('joinedAt'))
+        self.locale = data.attrib.get('locale')
+        self.mailingListActive = utils.cast(bool, data.attrib.get('mailingListActive'))
+        self.mailingListStatus = data.attrib.get('mailingListStatus')
+        self.maxHomeSize = utils.cast(int, data.attrib.get('maxHomeSize'))
+        self.pin = data.attrib.get('pin')
+        self.protected = utils.cast(bool, data.attrib.get('protected'))
+        self.rememberExpiresAt = utils.toDatetime(data.attrib.get('rememberExpiresAt'))
+        self.restricted = utils.cast(bool, data.attrib.get('restricted'))
+        self.scrobbleTypes = [utils.cast(int, x) for x in data.attrib.get('scrobbleTypes').split(',')]
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.twoFactorEnabled = utils.cast(bool, data.attrib.get('twoFactorEnabled'))
+        self.username = data.attrib.get('username')
+        self.uuid = data.attrib.get('uuid')
+
+        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')
+        self.subscriptionSubscribedAt = utils.toDatetime(
+            subscription.attrib.get('subscribedAt') or None, '%Y-%m-%d %H:%M:%S %Z'
+        )
+
+        profile = data.find('profile')
+        self.profileAutoSelectAudio = utils.cast(bool, profile.attrib.get('autoSelectAudio'))
+        self.profileDefaultAudioLanguage = profile.attrib.get('defaultAudioLanguage')
+        self.profileDefaultSubtitleLanguage = profile.attrib.get('defaultSubtitleLanguage')
+        self.profileAutoSelectSubtitle = utils.cast(int, profile.attrib.get('autoSelectSubtitle'))
+        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')
+
+        self.services = None
+
+    @property
+    def authenticationToken(self):
+        """ Returns the authentication token for the account. Alias for ``authToken``. """
+        return self.authToken
+
+    def _reload(self, key=None, **kwargs):
+        """ Perform the actual reload. """
+        data = self.query(self.key)
+        self._loadData(data)
+        return self
+
+    def _headers(self, **kwargs):
+        """ Returns dict containing base headers for all requests to the server. """
+        headers = BASE_HEADERS.copy()
+        if self._token:
+            headers['X-Plex-Token'] = self._token
+        headers.update(kwargs)
+        return headers
+
+    def query(self, url, method=None, headers=None, timeout=None, **kwargs):
+        method = method or self._session.get
+        timeout = timeout or self._timeout
+        log.debug('%s %s %s', method.__name__.upper(), url, kwargs.get('json', ''))
+        headers = self._headers(**headers or {})
+        response = method(url, headers=headers, timeout=timeout, **kwargs)
+        if response.status_code not in (200, 201, 204):  # pragma: no cover
+            codename = codes.get(response.status_code)[0]
+            errtext = response.text.replace('\n', ' ')
+            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
+            if response.status_code == 401:
+                if "verification code" in response.text:
+                    raise TwoFactorRequired(message)
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            elif response.status_code == 422 and "Invalid token" in response.text:
+                raise Unauthorized(message)
+            else:
+                raise BadRequest(message)
+        if 'application/json' in response.headers.get('Content-Type', ''):
+            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
+
+    def ping(self):
+        """ Ping the Plex.tv API.
+            This will refresh the authentication token to prevent it from expiring.
+        """
+        pong = self.query(self.PING)
+        if pong is not None:
+            return utils.cast(bool, pong.text)
+        return False
+
+    def device(self, name=None, clientId=None):
+        """ Returns the :class:`~plexapi.myplex.MyPlexDevice` that matches the name specified.
+
+            Parameters:
+                name (str): Name to match against.
+                clientId (str): clientIdentifier to match against.
+        """
+        for device in self.devices():
+            if (name and device.name.lower() == name.lower() or device.clientIdentifier == clientId):
+                return device
+        raise NotFound(f'Unable to find device {name}')
+
+    def devices(self):
+        """ Returns a list of all :class:`~plexapi.myplex.MyPlexDevice` objects connected to the server. """
+        data = self.query(MyPlexDevice.key)
+        return [MyPlexDevice(self, elem) for elem in data]
+
+    def resource(self, name):
+        """ Returns the :class:`~plexapi.myplex.MyPlexResource` that matches the name specified.
+
+            Parameters:
+                name (str): Name  or machine identifier to match against.
+        """
+        for resource in self.resources():
+            if resource.name.lower() == name.lower() or resource.clientIdentifier == name:
+                return resource
+        raise NotFound(f'Unable to find resource {name}')
+
+    def resources(self):
+        """ Returns a list of all :class:`~plexapi.myplex.MyPlexResource` objects connected to the server. """
+        data = self.query(MyPlexResource.key)
+        return [MyPlexResource(self, elem) for elem in data]
+
+    def sonos_speakers(self):
+        if 'companions_sonos' not in self.subscriptionFeatures:
+            return []
+
+        t = time.time()
+        if t - self._sonos_cache_timestamp > 5:
+            self._sonos_cache_timestamp = t
+            data = self.query('https://sonos.plex.tv/resources')
+            self._sonos_cache = [PlexSonosClient(self, elem) for elem in data]
+
+        return self._sonos_cache
+
+    def sonos_speaker(self, name):
+        return next((x for x in self.sonos_speakers() if x.title.split("+")[0].strip() == name), None)
+
+    def sonos_speaker_by_id(self, identifier):
+        return next((x for x in self.sonos_speakers() if x.machineIdentifier.startswith(identifier)), None)
+
+    def inviteFriend(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
+                     allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
+        """ Share library content with the specified user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
+                    of the user to be added.
+                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
+                    containing the library sections to share.
+                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
+                    to be shared (default None). `sections` must be defined in order to update shared libraries.
+                allowSync (Bool): Set True to allow user to sync content.
+                allowCameraUpload (Bool): Set True to allow user to upload photos.
+                allowChannels (Bool): Set True to allow user to utilize installed channels.
+                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
+                    ex: `{'label':['foo']}`
+        """
+        username = user.username if isinstance(user, MyPlexUser) else user
+        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
+        sectionIds = self._getSectionIds(machineId, sections)
+        params = {
+            'server_id': machineId,
+            'shared_server': {'library_section_ids': sectionIds, 'invited_email': username},
+            'sharing_settings': {
+                'allowSync': ('1' if allowSync else '0'),
+                'allowCameraUpload': ('1' if allowCameraUpload else '0'),
+                'allowChannels': ('1' if allowChannels else '0'),
+                'filterMovies': self._filterDictToStr(filterMovies or {}),
+                'filterTelevision': self._filterDictToStr(filterTelevision or {}),
+                'filterMusic': self._filterDictToStr(filterMusic or {}),
+            },
+        }
+        headers = {'Content-Type': 'application/json'}
+        url = self.FRIENDINVITE.format(machineId=machineId)
+        return self.query(url, self._session.post, json=params, headers=headers)
+
+    def createHomeUser(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
+                       allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
+        """ Share library content with the specified user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
+                    of the user to be added.
+                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
+                    containing the library sections to share.
+                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
+                    to be shared (default None). `sections` must be defined in order to update shared libraries.
+                allowSync (Bool): Set True to allow user to sync content.
+                allowCameraUpload (Bool): Set True to allow user to upload photos.
+                allowChannels (Bool): Set True to allow user to utilize installed channels.
+                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
+                    ex: `{'label':['foo']}`
+        """
+        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
+        sectionIds = self._getSectionIds(server, sections)
+
+        headers = {'Content-Type': 'application/json'}
+        url = self.HOMEUSERCREATE.format(title=user)
+        # UserID needs to be created and referenced when adding sections
+        user_creation = self.query(url, self._session.post, headers=headers)
+        userIds = {}
+        for elem in user_creation.findall("."):
+            # Find userID
+            userIds['id'] = elem.attrib.get('id')
+        log.debug(userIds)
+        params = {
+            'server_id': machineId,
+            'shared_server': {'library_section_ids': sectionIds, 'invited_id': userIds['id']},
+            'sharing_settings': {
+                'allowSync': ('1' if allowSync else '0'),
+                'allowCameraUpload': ('1' if allowCameraUpload else '0'),
+                'allowChannels': ('1' if allowChannels else '0'),
+                'filterMovies': self._filterDictToStr(filterMovies or {}),
+                'filterTelevision': self._filterDictToStr(filterTelevision or {}),
+                'filterMusic': self._filterDictToStr(filterMusic or {}),
+            },
+        }
+        url = self.FRIENDINVITE.format(machineId=machineId)
+        library_assignment = self.query(url, self._session.post, json=params, headers=headers)
+        return user_creation, library_assignment
+
+    def createExistingUser(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
+                           allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
+        """ Share library content with the specified user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
+                    of the user to be added.
+                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
+                    containing the library sections to share.
+                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
+                    to be shared (default None). `sections` must be defined in order to update shared libraries.
+                allowSync (Bool): Set True to allow user to sync content.
+                allowCameraUpload (Bool): Set True to allow user to upload photos.
+                allowChannels (Bool): Set True to allow user to utilize installed channels.
+                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
+                    ex: `{'label':['foo']}`
+        """
+        headers = {'Content-Type': 'application/json'}
+        # If user already exists, carry over sections and settings.
+        if isinstance(user, MyPlexUser):
+            username = user.username
+        elif user in [_user.username for _user in self.users()]:
+            username = self.user(user).username
+        else:
+            # If user does not already exists, treat request as new request and include sections and settings.
+            newUser = user
+            url = self.EXISTINGUSER.format(username=newUser)
+            user_creation = self.query(url, self._session.post, headers=headers)
+            machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
+            sectionIds = self._getSectionIds(server, sections)
+            params = {
+                'server_id': machineId,
+                'shared_server': {'library_section_ids': sectionIds, 'invited_email': newUser},
+                'sharing_settings': {
+                    'allowSync': ('1' if allowSync else '0'),
+                    'allowCameraUpload': ('1' if allowCameraUpload else '0'),
+                    'allowChannels': ('1' if allowChannels else '0'),
+                    'filterMovies': self._filterDictToStr(filterMovies or {}),
+                    'filterTelevision': self._filterDictToStr(filterTelevision or {}),
+                    'filterMusic': self._filterDictToStr(filterMusic or {}),
+                },
+            }
+            url = self.FRIENDINVITE.format(machineId=machineId)
+            library_assignment = self.query(url, self._session.post, json=params, headers=headers)
+            return user_creation, library_assignment
+
+        url = self.EXISTINGUSER.format(username=username)
+        return self.query(url, self._session.post, headers=headers)
+
+    def removeFriend(self, user):
+        """ Remove the specified user from your friends.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
+                    username, or email of the user to be removed.
+        """
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        url = self.FRIENDUPDATE.format(userId=user.id)
+        return self.query(url, self._session.delete)
+
+    def removeHomeUser(self, user):
+        """ Remove the specified user from your home users.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
+                    username, or email of the user to be removed.
+        """
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        url = self.HOMEUSER.format(userId=user.id)
+        return self.query(url, self._session.delete)
+
+    def switchHomeUser(self, user, pin=None):
+        """ Returns a new :class:`~plexapi.myplex.MyPlexAccount` object switched to the given home user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
+                    username, or email of the home user to switch to.
+                pin (str): PIN for the home user (required if the home user has a PIN set).
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi.myplex import MyPlexAccount
+                    # Login to a Plex Home account
+                    account = MyPlexAccount('<USERNAME>', '<PASSWORD>')
+                    # Switch to a different Plex Home user
+                    userAccount = account.switchHomeUser('Username')
+
+        """
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        url = f'{self.HOMEUSERS}/{user.id}/switch'
+        params = {}
+        if pin:
+            params['pin'] = pin
+        data = self.query(url, self._session.post, params=params)
+        userToken = data.attrib.get('authenticationToken')
+        return MyPlexAccount(token=userToken, session=self._session)
+
+    def setPin(self, newPin, currentPin=None):
+        """ Set a new Plex Home PIN for the account.
+
+            Parameters:
+                newPin (str): New PIN to set for the account.
+                currentPin (str): Current PIN for the account (required to change the PIN).
+        """
+        url = self.HOMEUSER.format(userId=self.id)
+        params = {'pin': newPin}
+        if currentPin:
+            params['currentPin'] = currentPin
+        return self.query(url, self._session.put, params=params)
+
+    def removePin(self, currentPin):
+        """ Remove the Plex Home PIN for the account.
+
+            Parameters:
+                currentPin (str): Current PIN for the account (required to remove the PIN).
+        """
+        return self.setPin('', currentPin)
+
+    def setManagedUserPin(self, user, newPin):
+        """ Set a new Plex Home PIN for a managed home user. This must be done from the Plex Home admin account.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`
+                    or username of the managed home user.
+                newPin (str): New PIN to set for the managed home user.
+        """
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        url = self.MANAGEDHOMEUSER.format(userId=user.id)
+        params = {'pin': newPin}
+        return self.query(url, self._session.post, params=params)
+
+    def removeManagedUserPin(self, user):
+        """ Remove the Plex Home PIN for a managed home user. This must be done from the Plex Home admin account.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`
+                    or username of the managed home user.
+        """
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        url = self.MANAGEDHOMEUSER.format(userId=user.id)
+        params = {'removePin': 1}
+        return self.query(url, self._session.post, params=params)
+
+    def acceptInvite(self, user):
+        """ Accept a pending friend invite from the specified user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexInvite` or str): :class:`~plexapi.myplex.MyPlexInvite`,
+                    username, or email of the friend invite to accept.
+        """
+        invite = user if isinstance(user, MyPlexInvite) else self.pendingInvite(user, includeSent=False)
+        params = {
+            'friend': int(invite.friend),
+            'home': int(invite.home),
+            'server': int(invite.server)
+        }
+        url = MyPlexInvite.REQUESTS + f'/{invite.id}' + utils.joinArgs(params)
+        return self.query(url, self._session.put)
+
+    def cancelInvite(self, user):
+        """ Cancel a pending firend invite for the specified user.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexInvite` or str): :class:`~plexapi.myplex.MyPlexInvite`,
+                    username, or email of the friend invite to cancel.
+        """
+        invite = user if isinstance(user, MyPlexInvite) else self.pendingInvite(user, includeReceived=False)
+        params = {
+            'friend': int(invite.friend),
+            'home': int(invite.home),
+            'server': int(invite.server)
+        }
+        url = MyPlexInvite.REQUESTED + f'/{invite.id}' + utils.joinArgs(params)
+        return self.query(url, self._session.delete)
+
+    def updateFriend(self, user, server, sections=None, removeSections=False, allowSync=None, allowCameraUpload=None,
+                     allowChannels=None, filterMovies=None, filterTelevision=None, filterMusic=None):
+        """ Update the specified user's share settings.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
+                    of the user to be updated.
+                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
+                    containing the library sections to share.
+                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
+                    to be shared (default None). `sections` must be defined in order to update shared libraries.
+                removeSections (Bool): Set True to remove all shares. Supersedes sections.
+                allowSync (Bool): Set True to allow user to sync content.
+                allowCameraUpload (Bool): Set True to allow user to upload photos.
+                allowChannels (Bool): Set True to allow user to utilize installed channels.
+                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
+                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
+                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
+                    ex: `{'label':['foo']}`
+        """
+        # Update friend servers
+        response_filters = ''
+        response_servers = ''
+        user = user if isinstance(user, MyPlexUser) else self.user(user)
+        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
+        sectionIds = self._getSectionIds(machineId, sections)
+        headers = {'Content-Type': 'application/json'}
+        # Determine whether user has access to the shared server.
+        user_servers = [s for s in user.servers if s.machineIdentifier == machineId]
+        if user_servers and sectionIds:
+            serverId = user_servers[0].id
+            params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds}}
+            url = self.FRIENDSERVERS.format(machineId=machineId, serverId=serverId)
+        else:
+            params = {'server_id': machineId,
+                      'shared_server': {'library_section_ids': sectionIds, 'invited_id': user.id}}
+            url = self.FRIENDINVITE.format(machineId=machineId)
+        # Remove share sections, add shares to user without shares, or update shares
+        if not user_servers or sectionIds:
+            if removeSections is True:
+                response_servers = self.query(url, self._session.delete, json=params, headers=headers)
+            elif 'invited_id' in params.get('shared_server', ''):
+                response_servers = self.query(url, self._session.post, json=params, headers=headers)
+            else:
+                response_servers = self.query(url, self._session.put, json=params, headers=headers)
+        else:
+            log.warning('Section name, number of section object is required changing library sections')
+        # Update friend filters
+        url = self.FRIENDUPDATE.format(userId=user.id)
+        params = {}
+        if isinstance(allowSync, bool):
+            params['allowSync'] = '1' if allowSync else '0'
+        if isinstance(allowCameraUpload, bool):
+            params['allowCameraUpload'] = '1' if allowCameraUpload else '0'
+        if isinstance(allowChannels, bool):
+            params['allowChannels'] = '1' if allowChannels else '0'
+        if isinstance(filterMovies, dict):
+            params['filterMovies'] = self._filterDictToStr(filterMovies or {})  # '1' if allowChannels else '0'
+        if isinstance(filterTelevision, dict):
+            params['filterTelevision'] = self._filterDictToStr(filterTelevision or {})
+        if isinstance(allowChannels, dict):
+            params['filterMusic'] = self._filterDictToStr(filterMusic or {})
+        if params:
+            url += utils.joinArgs(params)
+            response_filters = self.query(url, self._session.put)
+        return response_servers, response_filters
+
+    def user(self, username):
+        """ Returns the :class:`~plexapi.myplex.MyPlexUser` that matches the specified username or email.
+
+            Parameters:
+                username (str): Username, email or id of the user to return.
+        """
+        username = str(username)
+        for user in self.users():
+            # Home users don't have email, username etc.
+            if username.lower() == user.title.lower():
+                return user
+
+            elif (user.username and user.email and user.id and username.lower() in
+                    (user.username.lower(), user.email.lower(), str(user.id))):
+                return user
+
+        raise NotFound(f'Unable to find user {username}')
+
+    def users(self):
+        """ Returns a list of all :class:`~plexapi.myplex.MyPlexUser` objects connected to your account.
+        """
+        elem = self.query(MyPlexUser.key)
+        return self.findItems(elem, cls=MyPlexUser)
+
+    def pendingInvite(self, username, includeSent=True, includeReceived=True):
+        """ Returns the :class:`~plexapi.myplex.MyPlexInvite` that matches the specified username or email.
+            Note: This can be a pending invite sent from your account or received to your account.
+
+            Parameters:
+                username (str): Username, email or id of the user to return.
+                includeSent (bool): True to include sent invites.
+                includeReceived (bool): True to include received invites.
+        """
+        username = str(username)
+        for invite in self.pendingInvites(includeSent, includeReceived):
+            if (invite.username and invite.email and invite.id and username.lower() in
+                    (invite.username.lower(), invite.email.lower(), str(invite.id))):
+                return invite
+
+        raise NotFound(f'Unable to find invite {username}')
+
+    def pendingInvites(self, includeSent=True, includeReceived=True):
+        """ Returns a list of all :class:`~plexapi.myplex.MyPlexInvite` objects connected to your account.
+            Note: This includes all pending invites sent from your account and received to your account.
+
+            Parameters:
+                includeSent (bool): True to include sent invites.
+                includeReceived (bool): True to include received invites.
+        """
+        invites = []
+        if includeSent:
+            elem = self.query(MyPlexInvite.REQUESTED)
+            invites += self.findItems(elem, cls=MyPlexInvite)
+        if includeReceived:
+            elem = self.query(MyPlexInvite.REQUESTS)
+            invites += self.findItems(elem, cls=MyPlexInvite)
+        return invites
+
+    def _getSectionIds(self, server, sections):
+        """ Converts a list of section objects or names to sectionIds needed for library sharing. """
+        if not sections: return []
+        # Get a list of all section ids for looking up each section.
+        allSectionIds = {}
+        machineIdentifier = server.machineIdentifier if isinstance(server, PlexServer) else server
+        url = self.PLEXSERVERS.format(machineId=machineIdentifier)
+        data = self.query(url, self._session.get)
+        for elem in data[0]:
+            _id = utils.cast(int, elem.attrib.get('id'))
+            _key = utils.cast(int, elem.attrib.get('key'))
+            _title = elem.attrib.get('title', '').lower()
+            allSectionIds[_id] = _id
+            allSectionIds[_key] = _id
+            allSectionIds[_title] = _id
+        log.debug(allSectionIds)
+        # Convert passed in section items to section ids from above lookup
+        sectionIds = []
+        for section in sections:
+            sectionKey = section.key if isinstance(section, LibrarySection) else section.lower()
+            sectionIds.append(allSectionIds[sectionKey])
+        return sectionIds
+
+    def _filterDictToStr(self, filterDict):
+        """ Converts friend filters to a string representation for transport. """
+        values = []
+        for key, vals in filterDict.items():
+            if key not in ('contentRating', 'label', 'contentRating!', 'label!'):
+                raise BadRequest(f'Unknown filter key: {key}')
+            values.append(f"{key}={'%2C'.join(vals)}")
+        return '|'.join(values)
+
+    def addWebhook(self, url):
+        # copy _webhooks and append url
+        urls = self._webhooks[:] + [url]
+        return self.setWebhooks(urls)
+
+    def deleteWebhook(self, url):
+        urls = copy.copy(self._webhooks)
+        if url not in urls:
+            raise BadRequest(f'Webhook does not exist: {url}')
+        urls.remove(url)
+        return self.setWebhooks(urls)
+
+    def setWebhooks(self, urls):
+        log.info('Setting webhooks: %s', urls)
+        data = {'urls[]': urls} if len(urls) else {'urls': ''}
+        data = self.query(self.WEBHOOKS, self._session.post, data=data)
+        self._webhooks = self.listAttrs(data, 'url', etag='webhook')
+        return self._webhooks
+
+    def webhooks(self):
+        data = self.query(self.WEBHOOKS)
+        self._webhooks = self.listAttrs(data, 'url', etag='webhook')
+        return self._webhooks
+
+    def optOut(self, playback=None, library=None):
+        """ Opt in or out of sharing stuff with plex.
+            See: https://www.plex.tv/about/privacy-legal/
+        """
+        params = {}
+        if playback is not None:
+            params['optOutPlayback'] = int(playback)
+        if library is not None:
+            params['optOutLibraryStats'] = int(library)
+        url = 'https://plex.tv/api/v2/user/privacy'
+        return self.query(url, method=self._session.put, data=params)
+
+    def syncItems(self, client=None, clientId=None):
+        """ Returns an instance of :class:`~plexapi.sync.SyncList` for specified client.
+
+            Parameters:
+                client (:class:`~plexapi.myplex.MyPlexDevice`): a client to query SyncItems for.
+                clientId (str): an identifier of a client to query SyncItems for.
+
+            If both `client` and `clientId` provided the client would be preferred.
+            If neither `client` nor `clientId` provided the clientId would be set to current clients's identifier.
+        """
+        if client:
+            clientId = client.clientIdentifier
+        elif clientId is None:
+            clientId = X_PLEX_IDENTIFIER
+
+        data = self.query(SyncList.key.format(clientId=clientId))
+
+        return SyncList(self, data)
+
+    def sync(self, sync_item, client=None, clientId=None):
+        """ Adds specified sync item for the client. It's always easier to use methods defined directly in the media
+            objects, e.g. :func:`~plexapi.video.Video.sync`, :func:`~plexapi.audio.Audio.sync`.
+
+            Parameters:
+                client (:class:`~plexapi.myplex.MyPlexDevice`): a client for which you need to add SyncItem to.
+                clientId (str): an identifier of a client for which you need to add SyncItem to.
+                sync_item (:class:`~plexapi.sync.SyncItem`): prepared SyncItem object with all fields set.
+
+            If both `client` and `clientId` provided the client would be preferred.
+            If neither `client` nor `clientId` provided the clientId would be set to current clients's identifier.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When client with provided clientId wasn't found.
+                :exc:`~plexapi.exceptions.BadRequest`: Provided client doesn't provides `sync-target`.
+        """
+        if not client and not clientId:
+            clientId = X_PLEX_IDENTIFIER
+
+        if not client:
+            for device in self.devices():
+                if device.clientIdentifier == clientId:
+                    client = device
+                    break
+
+            if not client:
+                raise BadRequest(f'Unable to find client by clientId={clientId}')
+
+        if 'sync-target' not in client.provides:
+            raise BadRequest("Received client doesn't provides sync-target")
+
+        params = {
+            'SyncItem[title]': sync_item.title,
+            'SyncItem[rootTitle]': sync_item.rootTitle,
+            'SyncItem[metadataType]': sync_item.metadataType,
+            'SyncItem[machineIdentifier]': sync_item.machineIdentifier,
+            'SyncItem[contentType]': sync_item.contentType,
+            'SyncItem[Policy][scope]': sync_item.policy.scope,
+            'SyncItem[Policy][unwatched]': str(int(sync_item.policy.unwatched)),
+            'SyncItem[Policy][value]': str(sync_item.policy.value if hasattr(sync_item.policy, 'value') else 0),
+            'SyncItem[Location][uri]': sync_item.location,
+            'SyncItem[MediaSettings][audioBoost]': str(sync_item.mediaSettings.audioBoost),
+            'SyncItem[MediaSettings][maxVideoBitrate]': str(sync_item.mediaSettings.maxVideoBitrate),
+            'SyncItem[MediaSettings][musicBitrate]': str(sync_item.mediaSettings.musicBitrate),
+            'SyncItem[MediaSettings][photoQuality]': str(sync_item.mediaSettings.photoQuality),
+            'SyncItem[MediaSettings][photoResolution]': sync_item.mediaSettings.photoResolution,
+            'SyncItem[MediaSettings][subtitleSize]': str(sync_item.mediaSettings.subtitleSize),
+            'SyncItem[MediaSettings][videoQuality]': str(sync_item.mediaSettings.videoQuality),
+            'SyncItem[MediaSettings][videoResolution]': sync_item.mediaSettings.videoResolution,
+        }
+
+        url = SyncList.key.format(clientId=client.clientIdentifier)
+        data = self.query(url, method=self._session.post, params=params)
+
+        return SyncItem(self, data, None, clientIdentifier=client.clientIdentifier)
+
+    def claimToken(self):
+        """ Returns a str, a new "claim-token", which you can use to register your new Plex Server instance to your
+            account.
+            See: https://hub.docker.com/r/plexinc/pms-docker/, https://www.plex.tv/claim/
+        """
+        response = self._session.get('https://plex.tv/api/claim/token.json', headers=self._headers(), timeout=TIMEOUT)
+        if response.status_code not in (200, 201, 204):  # 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 response.json()['token']
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get Play History for all library sections on all servers for the owner.
+
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        servers = [x for x in self.resources() if x.provides == 'server' and x.owned]
+        hist = []
+        for server in servers:
+            conn = server.connect()
+            hist.extend(conn.history(maxresults=maxresults, mindate=mindate, accountID=1))
+        return hist
+
+    def onlineMediaSources(self):
+        """ Returns a list of user account Online Media Sources settings :class:`~plexapi.myplex.AccountOptOut`
+        """
+        url = self.OPTOUTS.format(userUUID=self.uuid)
+        elem = self.query(url)
+        return self.findItems(elem, cls=AccountOptOut, etag='optOut')
+
+    def videoOnDemand(self):
+        """ Returns a list of VOD Hub items :class:`~plexapi.library.Hub`
+        """
+        data = self.query(f'{self.VOD}/hubs')
+        return self.findItems(data)
+
+    def tidal(self):
+        """ Returns a list of tidal Hub items :class:`~plexapi.library.Hub`
+        """
+        data = self.query(f'{self.MUSIC}/hubs')
+        return self.findItems(data)
+
+    def watchlist(self, filter=None, sort=None, libtype=None, maxresults=None, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Movie` and :class:`~plexapi.video.Show` items in the user's watchlist.
+            Note: The objects returned are from Plex's online metadata. To get the matching item on a Plex server,
+            search for the media using the guid.
+
+            Parameters:
+                filter (str, optional): 'available' or 'released' to only return items that are available or released,
+                    otherwise return all items.
+                sort (str, optional): In the format ``field:dir``. Available fields are ``watchlistedAt`` (Added At),
+                    ``titleSort`` (Title), ``originallyAvailableAt`` (Release Date), or ``rating`` (Critic Rating).
+                    ``dir`` can be ``asc`` or ``desc``.
+                libtype (str, optional): 'movie' or 'show' to only return movies or shows, otherwise return all items.
+                maxresults (int, optional): Only return the specified number of results.
+                **kwargs (dict): Additional custom filters to apply to the search results.
+
+
+            Example:
+
+                .. code-block:: python
+
+                    # Watchlist for released movies sorted by critic rating in descending order
+                    watchlist = account.watchlist(filter='released', sort='rating:desc', libtype='movie')
+                    item = watchlist[0]  # First item in the watchlist
+
+                    # Search for the item on a Plex server
+                    result = plex.library.search(guid=item.guid, libtype=item.type)
+
+        """
+        params = {
+            'includeCollections': 1,
+            'includeExternalMedia': 1
+        }
+
+        if not filter:
+            filter = 'all'
+        if sort:
+            params['sort'] = sort
+        if libtype:
+            params['type'] = utils.searchType(libtype)
+
+        params.update(kwargs)
+
+        key = f'{self.METADATA}/library/sections/watchlist/{filter}{utils.joinArgs(params)}'
+        return self._toOnlineMetadata(self.fetchItems(key, maxresults=maxresults), **kwargs)
+
+    def onWatchlist(self, item):
+        """ Returns True if the item is on the user's watchlist.
+
+            Parameters:
+                item (:class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`): Item to check
+                    if it is on the user's watchlist.
+        """
+        return bool(self.userState(item).watchlistedAt)
+
+    def addToWatchlist(self, items):
+        """ Add media items to the user's watchlist
+
+            Parameters:
+                items (List): List of :class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`
+                    objects to be added to the watchlist.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When trying to add invalid or existing
+                    media to the watchlist.
+        """
+        if not isinstance(items, list):
+            items = [items]
+
+        for item in 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)
+        return self
+
+    def removeFromWatchlist(self, items):
+        """ Remove media items from the user's watchlist
+
+            Parameters:
+                items (List): List of :class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`
+                    objects to be added to the watchlist.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When trying to remove invalid or non-existing
+                    media to the watchlist.
+        """
+        if not isinstance(items, list):
+            items = [items]
+
+        for item in 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)
+        return self
+
+    def userState(self, item):
+        """ Returns a :class:`~plexapi.myplex.UserState` object for the specified item.
+
+            Parameters:
+                item (:class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`): Item to return the user state.
+        """
+        ratingKey = item.guid.rsplit('/', 1)[-1]
+        data = self.query(f"{self.METADATA}/library/metadata/{ratingKey}/userState")
+        return self.findItem(data, cls=UserState)
+
+    def isPlayed(self, item):
+        """ Return True if the item is played on Discover.
+
+            Parameters:
+                item (:class:`~plexapi.video.Movie`,
+                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
+                :class:`~plexapi.video.Episode`): Object from searchDiscover().
+                Can be also result from Plex Movie or Plex TV Series agent.
+        """
+        userState = self.userState(item)
+        return bool(userState.viewCount > 0) if userState.viewCount else False
+
+    def markPlayed(self, item):
+        """ Mark the Plex object as played on Discover.
+
+            Parameters:
+                item (:class:`~plexapi.video.Movie`,
+                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
+                :class:`~plexapi.video.Episode`): Object from searchDiscover().
+                Can be also result from Plex Movie or Plex TV Series agent.
+        """
+        key = f'{self.METADATA}/actions/scrobble'
+        ratingKey = item.guid.rsplit('/', 1)[-1]
+        params = {'key': ratingKey, 'identifier': 'com.plexapp.plugins.library'}
+        self.query(key, params=params)
+        return self
+
+    def markUnplayed(self, item):
+        """ Mark the Plex object as unplayed on Discover.
+
+            Parameters:
+                item (:class:`~plexapi.video.Movie`,
+                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
+                :class:`~plexapi.video.Episode`): Object from searchDiscover().
+                Can be also result from Plex Movie or Plex TV Series agent.
+        """
+        key = f'{self.METADATA}/actions/unscrobble'
+        ratingKey = item.guid.rsplit('/', 1)[-1]
+        params = {'key': ratingKey, 'identifier': 'com.plexapp.plugins.library'}
+        self.query(key, params=params)
+        return self
+
+    def searchDiscover(self, query, limit=30, libtype=None, providers='discover'):
+        """ Search for movies and TV shows in Discover.
+            Returns a list of :class:`~plexapi.video.Movie` and :class:`~plexapi.video.Show` objects.
+
+            Parameters:
+                query (str): Search query.
+                limit (int, optional): Limit to the specified number of results. Default 30.
+                libtype (str, optional): 'movie' or 'show' to only return movies or shows, otherwise return all items.
+                providers (str, optional): 'discover' for default behavior
+                    or 'discover,PLEXAVOD' to also include the Plex ad-suported video service
+                    or 'discover,PLEXAVOD,PLEXTVOD' to also include the Plex video rental service
+        """
+        libtypes = {'movie': 'movies', 'show': 'tv'}
+        libtype = libtypes.get(libtype, 'movies,tv')
+
+        headers = {
+            'Accept': 'application/json'
+        }
+        params = {
+            'query': query,
+            'limit': limit,
+            'searchTypes': libtype,
+            'searchProviders': providers,
+            'includeMetadata': 1
+        }
+
+        data = self.query(f'{self.DISCOVER}/library/search', headers=headers, params=params)
+        searchResults = data['MediaContainer'].get('SearchResults', [])
+        searchResult = next((s.get('SearchResult', []) for s in searchResults if s.get('id') == 'external'), [])
+
+        results = []
+        for result in searchResult:
+            metadata = result['Metadata']
+            type = metadata['type']
+            if type == 'movie':
+                tag = 'Video'
+            elif type == 'show':
+                tag = 'Directory'
+            else:
+                continue
+            attrs = ''.join(f'{k}="{html.escape(str(v))}" ' for k, v in metadata.items())
+            xml = f'<{tag} {attrs}/>'
+            results.append(self._manuallyLoadXML(xml))
+
+        return self._toOnlineMetadata(results)
+
+    @property
+    def viewStateSync(self):
+        """ Returns True or False if syncing of watch state and ratings
+            is enabled or disabled, respectively, for the account.
+        """
+        headers = {'Accept': 'application/json'}
+        data = self.query(self.VIEWSTATESYNC, headers=headers)
+        return data.get('consent')
+
+    def enableViewStateSync(self):
+        """ Enable syncing of watch state and ratings for the account. """
+        self._updateViewStateSync(True)
+
+    def disableViewStateSync(self):
+        """ Disable syncing of watch state and ratings for the account. """
+        self._updateViewStateSync(False)
+
+    def _updateViewStateSync(self, consent):
+        """ Enable or disable syncing of watch state and ratings for the account.
+
+            Parameters:
+                consent (bool): True to enable, False to disable.
+        """
+        params = {'consent': consent}
+        self.query(self.VIEWSTATESYNC, method=self._session.put, params=params)
+
+    def link(self, pin):
+        """ Link a device to the account using a pin code.
+
+            Parameters:
+                pin (str): The 4 digit link pin code.
+        """
+        headers = {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Plex-Product': 'Plex SSO'
+        }
+        data = {'code': pin}
+        self.query(self.LINK, self._session.put, headers=headers, data=data)
+
+    def _toOnlineMetadata(self, objs, **kwargs):
+        """ Convert a list of media objects to online metadata objects. """
+        # Temporary workaround to allow reloading and browsing of online media objects
+        server = PlexServer(self.METADATA, self._token, session=self._session)
+
+        includeUserState = int(bool(kwargs.pop('includeUserState', True)))
+
+        if not isinstance(objs, list):
+            objs = [objs]
+
+        for obj in objs:
+            obj._server = server
+
+            # Parse details key to modify query string
+            url = urlsplit(obj._details_key)
+            query = dict(parse_qsl(url.query))
+            query['includeUserState'] = includeUserState
+            query.pop('includeFields', None)
+            obj._details_key = urlunsplit((url.scheme, url.netloc, url.path, urlencode(query), url.fragment))
+
+        return objs
+
+    def publicIP(self):
+        """ Returns your public IP address. """
+        return self.query('https://plex.tv/:/ip')
+
+    def geoip(self, ip_address):
+        """ Returns a :class:`~plexapi.myplex.GeoLocation` object with geolocation information
+            for an IP address using Plex's GeoIP database.
+
+            Parameters:
+                ip_address (str): IP address to lookup.
+        """
+        params = {'ip_address': ip_address}
+        data = self.query('https://plex.tv/api/v2/geoip', params=params)
+        return GeoLocation(self, data)
+
+
+class MyPlexUser(PlexObject):
+    """ This object represents non-signed in users such as friends and linked
+        accounts. NOTE: This should not be confused with the :class:`~plexapi.myplex.MyPlexAccount`
+        which is your specific account. The raw xml for the data presented here
+        can be found at: https://plex.tv/api/users/
+
+        Attributes:
+            TAG (str): 'User'
+            key (str): 'https://plex.tv/api/users/'
+            allowCameraUpload (bool): True if this user can upload images.
+            allowChannels (bool): True if this user has access to channels.
+            allowSync (bool): True if this user can sync.
+            email (str): User's email address (user@gmail.com).
+            filterAll (str): Unknown.
+            filterMovies (str): Unknown.
+            filterMusic (str): Unknown.
+            filterPhotos (str): Unknown.
+            filterTelevision (str): Unknown.
+            home (bool): Unknown.
+            id (int): User's Plex account ID.
+            protected (False): Unknown (possibly SSL enabled?).
+            recommendationsPlaylistId (str): Unknown.
+            restricted (str): Unknown.
+            servers (List<:class:`~plexapi.myplex.<MyPlexServerShare`>)): Servers shared with the user.
+            thumb (str): Link to the users avatar.
+            title (str): Seems to be an alias for username.
+            username (str): User's username.
+    """
+    TAG = 'User'
+    key = 'https://plex.tv/api/users/'
+
+    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'))
+        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
+        self.email = data.attrib.get('email')
+        self.filterAll = data.attrib.get('filterAll')
+        self.filterMovies = data.attrib.get('filterMovies')
+        self.filterMusic = data.attrib.get('filterMusic')
+        self.filterPhotos = data.attrib.get('filterPhotos')
+        self.filterTelevision = data.attrib.get('filterTelevision')
+        self.home = utils.cast(bool, data.attrib.get('home'))
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.protected = utils.cast(bool, data.attrib.get('protected'))
+        self.recommendationsPlaylistId = data.attrib.get('recommendationsPlaylistId')
+        self.restricted = data.attrib.get('restricted')
+        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
+
+    def get_token(self, machineIdentifier):
+        try:
+            for item in self._server.query(self._server.FRIENDINVITE.format(machineId=machineIdentifier)):
+                if utils.cast(int, item.attrib.get('userID')) == self.id:
+                    return item.attrib.get('accessToken')
+        except Exception:
+            log.exception('Failed to get access token for %s', self.title)
+
+    def server(self, name):
+        """ Returns the :class:`~plexapi.myplex.MyPlexServerShare` that matches the name specified.
+
+            Parameters:
+                name (str): Name of the server to return.
+        """
+        for server in self.servers:
+            if name.lower() == server.name.lower():
+                return server
+
+        raise NotFound(f'Unable to find server {name}')
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get all Play History for a user in all shared servers.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        hist = []
+        for server in self.servers:
+            hist.extend(server.history(maxresults=maxresults, mindate=mindate))
+        return hist
+
+
+class MyPlexInvite(PlexObject):
+    """ This object represents pending friend invites.
+
+        Attributes:
+            TAG (str): 'Invite'
+            createdAt (datetime): Datetime the user was invited.
+            email (str): User's email address (user@gmail.com).
+            friend (bool): True or False if the user is invited as a friend.
+            friendlyName (str): The user's friendly name.
+            home (bool): True or False if the user is invited to a Plex Home.
+            id (int): User's Plex account ID.
+            server (bool): True or False if the user is invited to any servers.
+            servers (List<:class:`~plexapi.myplex.<MyPlexServerShare`>)): Servers shared with the user.
+            thumb (str): Link to the users avatar.
+            username (str): User's username.
+    """
+    TAG = 'Invite'
+    REQUESTS = 'https://plex.tv/api/invites/requests'
+    REQUESTED = 'https://plex.tv/api/invites/requested'
+
+    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'))
+        self.friendlyName = data.attrib.get('friendlyName')
+        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
+
+
+class Section(PlexObject):
+    """ This refers to a shared section. The raw xml for the data presented here
+        can be found at: https://plex.tv/api/servers/{machineId}/shared_servers
+
+        Attributes:
+            TAG (str): section
+            id (int): The shared section ID
+            key (int): The shared library section key
+            shared (bool): If this section is shared with the user
+            title (str): Title of the section
+            type (str): movie, tvshow, artist
+
+    """
+    TAG = 'Section'
+
+    def _loadData(self, data):
+        self._data = data
+        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'))
+        self.title = data.attrib.get('title')
+        self.type = data.attrib.get('type')
+        self.sectionId = self.id  # For backwards compatibility
+        self.sectionKey = self.key  # For backwards compatibility
+
+    def history(self, maxresults=None, mindate=None):
+        """ Get all Play History for a user for this section in this shared server.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        server = self._server._server.resource(self._server.name).connect()
+        return server.history(maxresults=maxresults, mindate=mindate,
+                              accountID=self._server.accountID, librarySectionID=self.sectionKey)
+
+
+class MyPlexServerShare(PlexObject):
+    """ Represents a single user's server reference. Used for library sharing.
+
+        Attributes:
+            id (int): id for this share
+            serverId (str): what id plex uses for this.
+            machineIdentifier (str): The servers machineIdentifier
+            name (str): The servers name
+            lastSeenAt (datetime): Last connected to the server?
+            numLibraries (int): Total number of libraries
+            allLibraries (bool): True if all libraries is shared with this user.
+            owned (bool): 1 if the server is owned by the user
+            pending (bool): True if the invite is pending.
+
+    """
+    TAG = 'Server'
+
+    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'))
+        self.machineIdentifier = data.attrib.get('machineIdentifier')
+        self.name = data.attrib.get('name')
+        self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'))
+        self.numLibraries = utils.cast(int, data.attrib.get('numLibraries'))
+        self.allLibraries = utils.cast(bool, data.attrib.get('allLibraries'))
+        self.owned = utils.cast(bool, data.attrib.get('owned'))
+        self.pending = utils.cast(bool, data.attrib.get('pending'))
+
+    def section(self, name):
+        """ Returns the :class:`~plexapi.myplex.Section` that matches the name specified.
+
+            Parameters:
+                name (str): Name of the section to return.
+        """
+        for section in self.sections():
+            if name.lower() == section.title.lower():
+                return section
+
+        raise NotFound(f'Unable to find section {name}')
+
+    def sections(self):
+        """ Returns a list of all :class:`~plexapi.myplex.Section` objects shared with this user.
+        """
+        url = MyPlexAccount.FRIENDSERVERS.format(machineId=self.machineIdentifier, serverId=self.id)
+        data = self._server.query(url)
+        return self.findItems(data, Section, rtag='SharedServer')
+
+    def history(self, maxresults=9999999, mindate=None):
+        """ Get all Play History for a user in this shared server.
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from.
+        """
+        server = self._server.resource(self.name).connect()
+        return server.history(maxresults=maxresults, mindate=mindate, accountID=self.accountID)
+
+
+class MyPlexResource(PlexObject):
+    """ This object represents resources connected to your Plex server that can provide
+        content such as Plex Media Servers, iPhone or Android clients, etc. The raw xml
+        for the data presented here can be found at:
+        https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1
+
+        Attributes:
+            TAG (str): 'Device'
+            key (str): 'https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1'
+            accessToken (str): This resource's Plex access token.
+            clientIdentifier (str): Unique ID for this resource.
+            connections (list): List of :class:`~plexapi.myplex.ResourceConnection` objects
+                for this resource.
+            createdAt (datetime): Timestamp this resource first connected to your server.
+            device (str): Best guess on the type of device this is (PS, iPhone, Linux, etc).
+            dnsRebindingProtection (bool): True if the server had DNS rebinding protection.
+            home (bool): Unknown
+            httpsRequired (bool): True if the resource requires https.
+            lastSeenAt (datetime): Timestamp this resource last connected.
+            name (str): Descriptive name of this resource.
+            natLoopbackSupported (bool): True if the resource supports NAT loopback.
+            owned (bool): True if this resource is one of your own (you logged into it).
+            ownerId (int): ID of the user that owns this resource (shared resources only).
+            platform (str): OS the resource is running (Linux, Windows, Chrome, etc.)
+            platformVersion (str): Version of the platform.
+            presence (bool): True if the resource is online
+            product (str): Plex product (Plex Media Server, Plex for iOS, Plex Web, etc.)
+            productVersion (str): Version of the product.
+            provides (str): List of services this resource provides (client, server,
+                player, pubsub-player, etc.)
+            publicAddressMatches (bool): True if the public IP address matches the client's public IP address.
+            relay (bool): True if this resource has the Plex Relay enabled.
+            sourceTitle (str): Username of the user that owns this resource (shared resources only).
+            synced (bool): Unknown (possibly True if the resource has synced content?)
+    """
+    TAG = 'resource'
+    key = 'https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1'
+
+    # Default order to prioritize available resource connections
+    DEFAULT_LOCATION_ORDER = ['local', 'remote', 'relay']
+    DEFAULT_SCHEME_ORDER = ['https', 'http']
+
+    def _loadData(self, data):
+        self._data = data
+        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'))
+        self.home = utils.cast(bool, data.attrib.get('home'))
+        self.httpsRequired = utils.cast(bool, data.attrib.get('httpsRequired'))
+        self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'), "%Y-%m-%dT%H:%M:%SZ")
+        self.name = data.attrib.get('name')
+        self.natLoopbackSupported = utils.cast(bool, data.attrib.get('natLoopbackSupported'))
+        self.owned = utils.cast(bool, data.attrib.get('owned'))
+        self.ownerId = utils.cast(int, data.attrib.get('ownerId', 0))
+        self.platform = data.attrib.get('platform')
+        self.platformVersion = data.attrib.get('platformVersion')
+        self.presence = utils.cast(bool, data.attrib.get('presence'))
+        self.product = data.attrib.get('product')
+        self.productVersion = data.attrib.get('productVersion')
+        self.provides = data.attrib.get('provides')
+        self.publicAddressMatches = utils.cast(bool, data.attrib.get('publicAddressMatches'))
+        self.relay = utils.cast(bool, data.attrib.get('relay'))
+        self.sourceTitle = data.attrib.get('sourceTitle')
+        self.synced = utils.cast(bool, data.attrib.get('synced'))
+
+    def preferred_connections(
+        self,
+        ssl=None,
+        locations=None,
+        schemes=None,
+    ):
+        """ Returns a sorted list of the available connection addresses for this resource.
+            Often times there is more than one address specified for a server or client.
+            Default behavior will prioritize local connections before remote or relay and HTTPS before HTTP.
+
+            Parameters:
+                ssl (bool, optional): Set True to only connect to HTTPS connections. Set False to
+                    only connect to HTTP connections. Set None (default) to connect to any
+                    HTTP or HTTPS connection.
+        """
+        if locations is None:
+            locations = self.DEFAULT_LOCATION_ORDER[:]
+        if schemes is None:
+            schemes = self.DEFAULT_SCHEME_ORDER[:]
+
+        connections_dict = {location: {scheme: [] for scheme in schemes} for location in locations}
+        for connection in self.connections:
+            # Only check non-local connections unless we own the resource
+            if self.owned or (not self.owned and not connection.local):
+                location = 'relay' if connection.relay else ('local' if connection.local else 'remote')
+                if location not in locations:
+                    continue
+                if 'http' in schemes:
+                    connections_dict[location]['http'].append(connection.httpuri)
+                if 'https' in schemes:
+                    connections_dict[location]['https'].append(connection.uri)
+        if ssl is True: schemes.remove('http')
+        elif ssl is False: schemes.remove('https')
+        connections = []
+        for location in locations:
+            for scheme in schemes:
+                connections.extend(connections_dict[location][scheme])
+        return connections
+
+    def connect(
+        self,
+        ssl=None,
+        timeout=None,
+        locations=None,
+        schemes=None,
+    ):
+        """ Returns a new :class:`~plexapi.server.PlexServer` or :class:`~plexapi.client.PlexClient` object.
+            Uses `MyPlexResource.preferred_connections()` to generate the priority order of connection addresses.
+            After trying to connect to all available addresses for this resource and
+            assuming at least one connection was successful, the PlexServer object is built and returned.
+
+            Parameters:
+                ssl (bool, optional): Set True to only connect to HTTPS connections. Set False to
+                    only connect to HTTP connections. Set None (default) to connect to any
+                    HTTP or HTTPS connection.
+                timeout (int, optional): The timeout in seconds to attempt each connection.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: When unable to connect to any addresses for this resource.
+        """
+        if locations is None:
+            locations = self.DEFAULT_LOCATION_ORDER[:]
+        if schemes is None:
+            schemes = self.DEFAULT_SCHEME_ORDER[:]
+
+        connections = self.preferred_connections(ssl, locations, schemes)
+        # Try connecting to all known resource connections in parallel, but
+        # only return the first server (in order) that provides a response.
+        cls = PlexServer if 'server' in self.provides else PlexClient
+        listargs = [[cls, url, self.accessToken, self._server._session, timeout] for url in connections]
+        log.debug('Testing %s resource connections..', len(listargs))
+        results = utils.threaded(_connect, listargs)
+        return _chooseConnection('Resource', self.name, results)
+
+
+class ResourceConnection(PlexObject):
+    """ Represents a Resource Connection object found within the
+        :class:`~plexapi.myplex.MyPlexResource` objects.
+
+        Attributes:
+            TAG (str): 'Connection'
+            address (str): The connection IP address
+            httpuri (str): Full HTTP URL
+            ipv6 (bool): True if the address is IPv6
+            local (bool): True if the address is local
+            port (int): The connection port
+            protocol (str): HTTP or HTTPS
+            relay (bool): True if the address uses the Plex Relay
+            uri (str): Full connetion URL
+    """
+    TAG = 'connection'
+
+    def _loadData(self, data):
+        self._data = data
+        self.address = data.attrib.get('address')
+        self.ipv6 = utils.cast(bool, data.attrib.get('IPv6'))
+        self.local = utils.cast(bool, data.attrib.get('local'))
+        self.port = utils.cast(int, data.attrib.get('port'))
+        self.protocol = data.attrib.get('protocol')
+        self.relay = utils.cast(bool, data.attrib.get('relay'))
+        self.uri = data.attrib.get('uri')
+        self.httpuri = f'http://{self.address}:{self.port}'
+
+
+class MyPlexDevice(PlexObject):
+    """ This object represents resources connected to your Plex server that provide
+        playback ability from your Plex Server, iPhone or Android clients, Plex Web,
+        this API, etc. The raw xml for the data presented here can be found at:
+        https://plex.tv/devices.xml
+
+        Attributes:
+            TAG (str): 'Device'
+            key (str): 'https://plex.tv/devices.xml'
+            clientIdentifier (str): Unique ID for this resource.
+            connections (list): List of connection URIs for the device.
+            device (str): Best guess on the type of device this is (Linux, iPad, AFTB, etc).
+            id (str): MyPlex ID of the device.
+            model (str): Model of the device (bueller, Linux, x86_64, etc.)
+            name (str): Hostname of the device.
+            platform (str): OS the resource is running (Linux, Windows, Chrome, etc.)
+            platformVersion (str): Version of the platform.
+            product (str): Plex product (Plex Media Server, Plex for iOS, Plex Web, etc.)
+            productVersion (string): Version of the product.
+            provides (str): List of services this resource provides (client, controller,
+                sync-target, player, pubsub-player).
+            publicAddress (str): Public IP address.
+            screenDensity (str): Unknown
+            screenResolution (str): Screen resolution (750x1334, 1242x2208, etc.)
+            token (str): Plex authentication token for the device.
+            vendor (str): Device vendor (ubuntu, etc).
+            version (str): Unknown (1, 2, 1.3.3.3148-b38628e, 1.3.15, etc.)
+    """
+    TAG = 'Device'
+    key = 'https://plex.tv/devices.xml'
+
+    def _loadData(self, data):
+        self._data = data
+        self.name = data.attrib.get('name')
+        self.publicAddress = data.attrib.get('publicAddress')
+        self.product = data.attrib.get('product')
+        self.productVersion = data.attrib.get('productVersion')
+        self.platform = data.attrib.get('platform')
+        self.platformVersion = data.attrib.get('platformVersion')
+        self.device = data.attrib.get('device')
+        self.model = data.attrib.get('model')
+        self.vendor = data.attrib.get('vendor')
+        self.provides = data.attrib.get('provides')
+        self.clientIdentifier = data.attrib.get('clientIdentifier')
+        self.version = data.attrib.get('version')
+        self.id = data.attrib.get('id')
+        self.token = logfilter.add_secret(data.attrib.get('token'))
+        self.screenResolution = data.attrib.get('screenResolution')
+        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')
+
+    def connect(self, timeout=None):
+        """ Returns a new :class:`~plexapi.client.PlexClient` or :class:`~plexapi.server.PlexServer`
+            Sometimes there is more than one address specified for a server or client.
+            After trying to connect to all available addresses for this client and assuming
+            at least one connection was successful, the PlexClient object is built and returned.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: When unable to connect to any addresses for this device.
+        """
+        cls = PlexServer if 'server' in self.provides else PlexClient
+        listargs = [[cls, url, self.token, self._server._session, timeout] for url in self.connections]
+        log.debug('Testing %s device connections..', len(listargs))
+        results = utils.threaded(_connect, listargs)
+        return _chooseConnection('Device', self.name, results)
+
+    def delete(self):
+        """ Remove this device from your account. """
+        key = f'https://plex.tv/devices/{self.id}.xml'
+        self._server.query(key, self._server._session.delete)
+
+    def syncItems(self):
+        """ Returns an instance of :class:`~plexapi.sync.SyncList` for current device.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: when the device doesn't provides `sync-target`.
+        """
+        if 'sync-target' not in self.provides:
+            raise BadRequest('Requested syncList for device which do not provides sync-target')
+
+        return self._server.syncItems(client=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.
+        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.MyPlexPinLogin.checkLogin`.
+        - The threaded approach expects the developer to call
+          :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`.
+          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 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.
+
+        Attributes:
+            PINS (str): 'https://plex.tv/api/v2/pins'
+            CHECKPINS (str): 'https://plex.tv/api/v2/pins/{pinid}'
+            POLLINTERVAL (int): 1
+            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.
+    """
+    PINS = 'https://plex.tv/api/v2/pins'               # get
+    CHECKPINS = 'https://plex.tv/api/v2/pins/{pinid}'  # get
+    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._oauth = oauth
+        self._loginTimeout = None
+        self._callback = None
+        self._thread = None
+        self._abort = False
+        self._id = None
+        self._code = None
+        self._getCode()
+
+        self.finished = False
+        self.expired = False
+        self.token = None
+
+    @property
+    def pin(self):
+        """ Return the 4 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 "MyPlexPinLogin(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=None):
+        """ 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).
+
+            Raises:
+                :class:`RuntimeError`: If the thread is already running.
+                :class:`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._loginTimeout = timeout
+        self._callback = callback
+        self._abort = False
+        self.finished = False
+        self._thread = threading.Thread(target=self._pollLogin, name='plexapi.myplex.MyPlexPinLogin')
+        self._thread.start()
+
+    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.
+        """
+        if not self._thread or self._abort:
+            return False
+
+        self._thread.join()
+        if self.expired or not self.token:
+            return False
+
+        return True
+
+    def stop(self):
+        """ Stops the thread monitoring the PIN login state. """
+        if not self._thread or self._abort:
+            return
+
+        self._abort = True
+        self._thread.join()
+
+    def checkLogin(self):
+        """ Returns `True` if the PIN 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:
+            params = {'strong': True}
+        else:
+            params = None
+
+        response = self._query(url, self._session.post, params=params)
+        if response is None:
+            return None
+
+        self._id = response.attrib.get('id')
+        self._code = response.attrib.get('code')
+
+        return self._code
+
+    def _checkLogin(self):
+        if not self._id:
+            return False
+
+        if self.token:
+            return True
+
+        url = self.CHECKPINS.format(pinid=self._id)
+        response = self._query(url)
+        if response is None:
+            return False
+
+        token = response.attrib.get('authToken')
+        if not token:
+            return False
+
+        self.token = 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.token and self._callback:
+                self._callback(self.token)
+        finally:
+            self.finished = True
+
+    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)
+        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}')
+        data = response.text.encode('utf8')
+        return ElementTree.fromstring(data) if data.strip() else None
+
+
+def _connect(cls, url, token, session, timeout, results, i, job_is_done_event=None):
+    """ Connects to the specified cls with url and token. Stores the connection
+        information to results[i] in a threadsafe way.
+
+        Arguments:
+            cls: the class which is responsible for establishing connection, basically it's
+                 :class:`~plexapi.client.PlexClient` or :class:`~plexapi.server.PlexServer`
+            url (str): url which should be passed as `baseurl` argument to cls.__init__()
+            session (requests.Session): session which sould be passed as `session` argument to cls.__init()
+            token (str): authentication token which should be passed as `baseurl` argument to cls.__init__()
+            timeout (int): timeout which should be passed as `baseurl` argument to cls.__init__()
+            results (list): pre-filled list for results
+            i (int): index of current job, should be less than len(results)
+            job_is_done_event (:class:`~threading.Event`): is X_PLEX_ENABLE_FAST_CONNECT is True then the
+                  event would be set as soon the connection is established
+    """
+    starttime = time.time()
+    try:
+        device = cls(baseurl=url, token=token, session=session, timeout=timeout)
+        runtime = int(time.time() - starttime)
+        results[i] = (url, token, device, runtime)
+        if X_PLEX_ENABLE_FAST_CONNECT and job_is_done_event:
+            job_is_done_event.set()
+    except Exception as err:
+        runtime = int(time.time() - starttime)
+        log.error('%s: %s', url, err)
+        results[i] = (url, token, None, runtime)
+
+
+def _chooseConnection(ctype, name, results):
+    """ Chooses the first (best) connection from the given _connect results. """
+    # At this point we have a list of result tuples containing (url, token, PlexServer, runtime)
+    # or (url, token, None, runtime) in the case a connection could not be established.
+    for url, token, result, runtime in results:
+        okerr = 'OK' if result else 'ERR'
+        log.debug('%s connection %s (%ss): %s?X-Plex-Token=%s', ctype, okerr, runtime, url, token)
+    results = [r[2] for r in results if r and r[2] is not None]
+    if results:
+        log.debug('Connecting to %s: %s?X-Plex-Token=%s', ctype, results[0]._baseurl, results[0]._token)
+        return results[0]
+    raise NotFound(f'Unable to connect to {ctype.lower()}: {name}')
+
+
+class AccountOptOut(PlexObject):
+    """ Represents a single AccountOptOut
+        'https://plex.tv/api/v2/user/{userUUID}/settings/opt_outs'
+
+        Attributes:
+            TAG (str): optOut
+            key (str): Online Media Source key
+            value (str): Online Media Source opt_in, opt_out, or opt_out_managed
+    """
+    TAG = 'optOut'
+    CHOICES = {'opt_in', 'opt_out', 'opt_out_managed'}
+
+    def _loadData(self, data):
+        self.key = data.attrib.get('key')
+        self.value = data.attrib.get('value')
+
+    def _updateOptOut(self, option):
+        """ Sets the Online Media Sources option.
+
+            Parameters:
+                option (str): see CHOICES
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: ``option`` str not found in CHOICES.
+        """
+        if option not in self.CHOICES:
+            raise NotFound(f'{option} not found in available choices: {self.CHOICES}')
+        url = self._server.OPTOUTS.format(userUUID=self._server.uuid)
+        params = {'key': self.key, 'value': option}
+        self._server.query(url, method=self._server._session.post, params=params)
+        self.value = option  # assume query successful and set the value to option
+
+    def optIn(self):
+        """ Sets the Online Media Source to "Enabled". """
+        self._updateOptOut('opt_in')
+
+    def optOut(self):
+        """ Sets the Online Media Source to "Disabled". """
+        self._updateOptOut('opt_out')
+
+    def optOutManaged(self):
+        """ Sets the Online Media Source to "Disabled for Managed Users".
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When trying to opt out music.
+        """
+        if self.key == 'tv.plex.provider.music':
+            raise BadRequest(f'{self.key} does not have the option to opt out managed users.')
+        self._updateOptOut('opt_out_managed')
+
+
+class UserState(PlexObject):
+    """ Represents a single UserState
+
+        Attributes:
+            TAG (str): UserState
+            lastViewedAt (datetime): Datetime the item was last played.
+            ratingKey (str): Unique key identifying the item.
+            type (str): The media type of the item.
+            viewCount (int): Count of times the item was played.
+            viewedLeafCount (int): Number of items marked as played in the show/season.
+            viewOffset (int): Time offset in milliseconds from the start of the content
+            viewState (bool): True or False if the item has been played.
+            watchlistedAt (datetime): Datetime the item was added to the watchlist.
+    """
+    TAG = 'UserState'
+
+    def __repr__(self):
+        return f'<{self.__class__.__name__}:{self.ratingKey}>'
+
+    def _loadData(self, data):
+        self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
+        self.ratingKey = data.attrib.get('ratingKey')
+        self.type = data.attrib.get('type')
+        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
+        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount', 0))
+        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
+        self.viewState = data.attrib.get('viewState') == 'complete'
+        self.watchlistedAt = utils.toDatetime(data.attrib.get('watchlistedAt'))
+
+
+class GeoLocation(PlexObject):
+    """ Represents a signle IP address geolocation
+
+        Attributes:
+            TAG (str): location
+            city (str): City name
+            code (str): Country code
+            continentCode (str): Continent code
+            coordinates (Tuple<float>): Latitude and longitude
+            country (str): Country name
+            europeanUnionMember (bool): True if the country is a member of the European Union
+            inPrivacyRestrictedCountry (bool): True if the country is privacy restricted
+            postalCode (str): Postal code
+            subdivisions (str): Subdivision name
+            timezone (str): Timezone
+    """
+    TAG = 'location'
+
+    def _loadData(self, data):
+        self._data = data
+        self.city = data.attrib.get('city')
+        self.code = data.attrib.get('code')
+        self.continentCode = data.attrib.get('continent_code')
+        self.coordinates = tuple(
+            utils.cast(float, coord) for coord in (data.attrib.get('coordinates') or ',').split(','))
+        self.country = data.attrib.get('country')
+        self.postalCode = data.attrib.get('postal_code')
+        self.subdivisions = data.attrib.get('subdivisions')
+        self.timezone = data.attrib.get('time_zone')
+
+        europeanUnionMember = data.attrib.get('european_union_member')
+        self.europeanUnionMember = (
+            False if europeanUnionMember == 'Unknown' else utils.cast(bool, europeanUnionMember))
+
+        inPrivacyRestrictedCountry = data.attrib.get('in_privacy_restricted_country')
+        self.inPrivacyRestrictedCountry = (
+            False if inPrivacyRestrictedCountry == 'Unknown' else utils.cast(bool, inPrivacyRestrictedCountry))
diff --git a/libs/plexapi/photo.py b/libs/plexapi/photo.py
new file mode 100644
index 000000000..4347f31a8
--- /dev/null
+++ b/libs/plexapi/photo.py
@@ -0,0 +1,324 @@
+# -*- 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.exceptions import BadRequest
+from plexapi.mixins import (
+    RatingMixin,
+    ArtUrlMixin, ArtMixin, PosterUrlMixin, PosterMixin,
+    PhotoalbumEditMixins, PhotoEditMixins
+)
+
+
+@utils.registerPlexObject
+class Photoalbum(
+    PlexPartialObject,
+    RatingMixin,
+    ArtMixin, PosterMixin,
+    PhotoalbumEditMixins
+):
+    """ Represents a single Photoalbum (collection of photos).
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'photo'
+            addedAt (datetime): Datetime the photo album was added to the library.
+            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
+            composite (str): URL to composite image (/library/metadata/<ratingKey>/composite/<compositeid>)
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the photo album (local://229674).
+            images (List<:class:`~plexapi.media.Image`>): List of image objects.
+            index (sting): Plex index number for the photo album.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            lastRatedAt (datetime): Datetime the photo album was last rated.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            listType (str): Hardcoded as 'photo' (useful for search filters).
+            ratingKey (int): Unique key identifying the photo album.
+            summary (str): Summary of the photoalbum.
+            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
+            title (str): Name of the photo album. (Trip to Disney World)
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'photo'
+            updatedAt (datetime): Datetime the photo album was updated.
+            userRating (float): Rating of the photo album (0.0 - 10.0) equaling (0 stars - 5 stars).
+    """
+    TAG = 'Directory'
+    TYPE = 'photo'
+    _searchType = 'photoalbum'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        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'))
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.listType = 'photo'
+        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self.summary = data.attrib.get('summary')
+        self.thumb = data.attrib.get('thumb')
+        self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort', self.title)
+        self.type = data.attrib.get('type')
+        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.userRating = utils.cast(float, data.attrib.get('userRating'))
+
+    def album(self, title):
+        """ Returns the :class:`~plexapi.photo.Photoalbum` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the photo album to return.
+        """
+        key = f'{self.key}/children'
+        return self.fetchItem(key, Photoalbum, title__iexact=title)
+
+    def albums(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.photo.Photoalbum` objects in the album. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key, Photoalbum, **kwargs)
+
+    def photo(self, title):
+        """ Returns the :class:`~plexapi.photo.Photo` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the photo to return.
+        """
+        key = f'{self.key}/children'
+        return self.fetchItem(key, Photo, title__iexact=title)
+
+    def photos(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.photo.Photo` objects in the album. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key, Photo, **kwargs)
+
+    def clip(self, title):
+        """ Returns the :class:`~plexapi.video.Clip` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the clip to return.
+        """
+        key = f'{self.key}/children'
+        return self.fetchItem(key, video.Clip, title__iexact=title)
+
+    def clips(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Clip` objects in the album. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key, video.Clip, **kwargs)
+
+    def get(self, title):
+        """ Alias to :func:`~plexapi.photo.Photoalbum.photo`. """
+        return self.episode(title)
+
+    def download(self, savepath=None, keep_original_name=False, subfolders=False):
+        """ Download all photos and clips from the photo album. See :func:`~plexapi.base.Playable.download` for details.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated.
+                subfolders (bool): True to separate photos/clips in to photo album folders.
+        """
+        filepaths = []
+        for album in self.albums():
+            _savepath = os.path.join(savepath, album.title) if subfolders else savepath
+            filepaths += album.download(_savepath, keep_original_name)
+        for photo in self.photos() + self.clips():
+            filepaths += photo.download(savepath, keep_original_name)
+        return filepaths
+
+    def _getWebURL(self, base=None):
+        """ Get the Plex Web URL with the correct parameters. """
+        return self._server._buildWebURL(base=base, endpoint='details', key=self.key, legacy=1)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Photos' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Photo(
+    PlexPartialObject, Playable,
+    RatingMixin,
+    ArtUrlMixin, PosterUrlMixin,
+    PhotoEditMixins
+):
+    """ Represents a single Photo.
+
+        Attributes:
+            TAG (str): 'Photo'
+            TYPE (str): 'photo'
+            addedAt (datetime): Datetime the photo was added to the library.
+            createdAtAccuracy (str): Unknown (local).
+            createdAtTZOffset (int): Unknown (-25200).
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the photo (com.plexapp.agents.none://231714?lang=xn).
+            images (List<:class:`~plexapi.media.Image`>): List of image objects.
+            index (sting): Plex index number for the photo.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            lastRatedAt (datetime): Datetime the photo was last rated.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            listType (str): Hardcoded as 'photo' (useful for search filters).
+            media (List<:class:`~plexapi.media.Media`>): List of media objects.
+            originallyAvailableAt (datetime): Datetime the photo was added to Plex.
+            parentGuid (str): Plex GUID for the photo album (local://229674).
+            parentIndex (int): Plex index number for the photo album.
+            parentKey (str): API URL of the photo album (/library/metadata/<parentRatingKey>).
+            parentRatingKey (int): Unique key identifying the photo album.
+            parentThumb (str): URL to photo album thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
+            parentTitle (str): Name of the photo album for the photo.
+            ratingKey (int): Unique key identifying the photo.
+            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
+                (remote playlist item only).
+            summary (str): Summary of the photo.
+            tags (List<:class:`~plexapi.media.Tag`>): List of tag objects.
+            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
+            title (str): Name of the photo.
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'photo'
+            updatedAt (datetime): Datetime the photo was updated.
+            userRating (float): Rating of the photo (0.0 - 10.0) equaling (0 stars - 5 stars).
+            year (int): Year the photo was taken.
+    """
+    TAG = 'Photo'
+    TYPE = 'photo'
+    METADATA_TYPE = 'photo'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Playable._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'))
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        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'))
+        self.parentKey = data.attrib.get('parentKey')
+        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self.parentThumb = data.attrib.get('parentThumb')
+        self.parentTitle = data.attrib.get('parentTitle')
+        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)
+        self.type = data.attrib.get('type')
+        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.userRating = utils.cast(float, data.attrib.get('userRating'))
+        self.year = utils.cast(int, data.attrib.get('year'))
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        if self.parentTitle:
+            return f'{self.parentTitle} - {self.title}'
+        return self.title
+
+    def photoalbum(self):
+        """ Return the photo's :class:`~plexapi.photo.Photoalbum`. """
+        return self.fetchItem(self.parentKey)
+
+    def section(self):
+        """ Returns the :class:`~plexapi.library.LibrarySection` the item belongs to. """
+        if hasattr(self, 'librarySectionID'):
+            return self._server.library.sectionByID(self.librarySectionID)
+        elif self.parentKey:
+            return self._server.library.sectionByID(self.photoalbum().librarySectionID)
+        else:
+            raise BadRequest("Unable to get section for photo, can't find librarySectionID")
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the locations of the photo.
+
+            Returns:
+                List<str> of file paths where the photo is found on disk.
+        """
+        return [part.file for item in self.media for part in item.parts if part]
+
+    def sync(self, resolution, client=None, clientId=None, limit=None, title=None):
+        """ Add current photo as sync item for specified device.
+            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
+                                  module :mod:`~plexapi.sync`.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                limit (int): maximum count of items to sync, unlimited if `None`.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current photo.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+        """
+
+        from plexapi.sync import SyncItem, Policy, MediaSettings
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self.title
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.listType
+        sync_item.metadataType = self.METADATA_TYPE
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        section = self.section()
+
+        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
+        sync_item.policy = Policy.create(limit)
+        sync_item.mediaSettings = MediaSettings.createPhoto(resolution)
+
+        return myplex.sync(sync_item, client=client, clientId=clientId)
+
+    def _getWebURL(self, base=None):
+        """ Get the Plex Web URL with the correct parameters. """
+        return self._server._buildWebURL(base=base, endpoint='details', key=self.parentKey, legacy=1)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.parentGuid)
+        return str(Path('Metadata') / 'Photos' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class PhotoSession(PlexSession, Photo):
+    """ Represents a single Photo session
+        loaded from :func:`~plexapi.server.PlexServer.sessions`.
+    """
+    _SESSIONTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Photo._loadData(self, data)
+        PlexSession._loadData(self, data)
diff --git a/libs/plexapi/playlist.py b/libs/plexapi/playlist.py
new file mode 100644
index 000000000..e2c4da635
--- /dev/null
+++ b/libs/plexapi/playlist.py
@@ -0,0 +1,534 @@
+# -*- 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.exceptions import BadRequest, NotFound, Unsupported
+from plexapi.library import LibrarySection, MusicSection
+from plexapi.mixins import SmartFilterMixin, ArtMixin, PosterMixin, PlaylistEditMixins
+from plexapi.utils import deprecated
+
+
+@utils.registerPlexObject
+class Playlist(
+    PlexPartialObject, Playable,
+    SmartFilterMixin,
+    ArtMixin, PosterMixin,
+    PlaylistEditMixins
+):
+    """ Represents a single Playlist.
+
+        Attributes:
+            TAG (str): 'Playlist'
+            TYPE (str): 'playlist'
+            addedAt (datetime): Datetime the playlist was added to the server.
+            allowSync (bool): True if you allow syncing playlists.
+            composite (str): URL to composite image (/playlist/<ratingKey>/composite/<compositeid>)
+            content (str): The filter URI string for smart playlists.
+            duration (int): Duration of the playlist in milliseconds.
+            durationInSeconds (int): Duration of the playlist in seconds.
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the playlist (com.plexapp.agents.none://XXXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX).
+            icon (str): Icon URI string for smart playlists.
+            key (str): API URL (/playlist/<ratingkey>).
+            leafCount (int): Number of items in the playlist view.
+            librarySectionID (int): Library section identifier (radio only)
+            librarySectionKey (str): Library section key (radio only)
+            librarySectionTitle (str): Library section title (radio only)
+            playlistType (str): 'audio', 'video', or 'photo'
+            radio (bool): If this playlist represents a radio station
+            ratingKey (int): Unique key identifying the playlist.
+            smart (bool): True if the playlist is a smart playlist.
+            summary (str): Summary of the playlist.
+            title (str): Name of the playlist.
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'playlist'
+            updatedAt (datetime): Datetime the playlist was updated.
+    """
+    TAG = 'Playlist'
+    TYPE = 'playlist'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Playable._loadData(self, data)
+        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
+        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
+        self.composite = data.attrib.get('composite')  # url to thumbnail
+        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
+        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.playlistType = data.attrib.get('playlistType')
+        self.radio = utils.cast(bool, data.attrib.get('radio', 0))
+        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self.smart = utils.cast(bool, data.attrib.get('smart'))
+        self.summary = data.attrib.get('summary')
+        self.title = data.attrib.get('title')
+        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
+
+    def __len__(self):  # pragma: no cover
+        return len(self.items())
+
+    def __iter__(self):  # pragma: no cover
+        for item in self.items():
+            yield item
+
+    def __contains__(self, other):  # pragma: no cover
+        return any(i.key == other.key for i in self.items())
+
+    def __getitem__(self, key):  # pragma: no cover
+        return self.items()[key]
+
+    @property
+    def thumb(self):
+        """ Alias to self.composite. """
+        return self.composite
+
+    @property
+    def metadataType(self):
+        """ Returns the type of metadata in the playlist (movie, track, or photo). """
+        if self.isVideo:
+            return 'movie'
+        elif self.isAudio:
+            return 'track'
+        elif self.isPhoto:
+            return 'photo'
+        else:
+            raise Unsupported('Unexpected playlist type')
+
+    @property
+    def isVideo(self):
+        """ Returns True if this is a video playlist. """
+        return self.playlistType == 'video'
+
+    @property
+    def isAudio(self):
+        """ Returns True if this is an audio playlist. """
+        return self.playlistType == 'audio'
+
+    @property
+    def isPhoto(self):
+        """ Returns True if this is a photo playlist. """
+        return self.playlistType == 'photo'
+
+    def _getPlaylistItemID(self, item):
+        """ Match an item to a playlist item and return the item playlistItemID. """
+        for _item in self.items():
+            if _item.ratingKey == item.ratingKey:
+                return _item.playlistItemID
+        raise NotFound(f'Item with title "{item.title}" not found in the playlist')
+
+    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
+
+    def section(self):
+        """ Returns the :class:`~plexapi.library.LibrarySection` this smart playlist belongs to.
+
+            Raises:
+                :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):
+        """ Returns the item in the playlist that matches the specified title.
+
+            Parameters:
+                title (str): Title of the item to return.
+
+            Raises:
+                :class:`plexapi.exceptions.NotFound`: When the item is not found in the playlist.
+        """
+        for item in self.items():
+            if item.title.lower() == title.lower():
+                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. """
+        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
+        return self._items
+
+    def get(self, title):
+        """ Alias to :func:`~plexapi.playlist.Playlist.item`. """
+        return self.item(title)
+
+    def addItems(self, items):
+        """ Add items to the playlist.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to add items to a smart playlist.
+        """
+        if self.smart:
+            raise BadRequest('Cannot add items to a smart playlist.')
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        # Group items by server to maintain order when adding items from multiple servers
+        for server, _items in groupby(items, key=lambda item: item._server):
+
+            ratingKeys = []
+            for item in _items:
+                if item.listType != self.playlistType:  # pragma: no cover
+                    raise BadRequest(f'Can not mix media types when building a playlist: '
+                                     f'{self.playlistType} and {item.listType}')
+                ratingKeys.append(str(item.ratingKey))
+
+            ratingKeys = ','.join(ratingKeys)
+            uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
+
+            args = {'uri': uri}
+            key = f"{self.key}/items{utils.joinArgs(args)}"
+            self._server.query(key, method=self._server._session.put)
+
+        return self
+
+    @deprecated('use "removeItems" instead')
+    def removeItem(self, item):
+        self.removeItems(item)
+
+    def removeItems(self, items):
+        """ Remove items from the playlist.
+
+            Parameters:
+                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to be removed from the playlist.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to remove items from a smart playlist.
+                :class:`plexapi.exceptions.NotFound`: When the item does not exist in the playlist.
+        """
+        if self.smart:
+            raise BadRequest('Cannot remove items from a smart playlist.')
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        for item in items:
+            playlistItemID = self._getPlaylistItemID(item)
+            key = f'{self.key}/items/{playlistItemID}'
+            self._server.query(key, method=self._server._session.delete)
+        return self
+
+    def moveItem(self, item, after=None):
+        """ Move an item to a new position in the playlist.
+
+            Parameters:
+                items (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to be moved in the playlist.
+                after (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
+                    or :class:`~plexapi.photo.Photo` objects to move the item after in the playlist.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying to move items in a smart playlist.
+                :class:`plexapi.exceptions.NotFound`: When the item or item after does not exist in the playlist.
+        """
+        if self.smart:
+            raise BadRequest('Cannot move items in a smart playlist.')
+
+        playlistItemID = self._getPlaylistItemID(item)
+        key = f'{self.key}/items/{playlistItemID}/move'
+
+        if after:
+            afterPlaylistItemID = self._getPlaylistItemID(after)
+            key += f'?after={afterPlaylistItemID}'
+
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def updateFilters(self, limit=None, sort=None, filters=None, **kwargs):
+        """ Update the filters for a smart playlist.
+
+            Parameters:
+                limit (int): Limit the number of items in the playlist.
+                sort (str or list, optional): A string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): A dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                **kwargs (dict): Additional custom filters to apply to the search results.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When trying update filters for a regular playlist.
+        """
+        if not self.smart:
+            raise BadRequest('Cannot update filters for a regular playlist.')
+
+        section = self.section()
+        searchKey = section._buildSearchKey(
+            sort=sort, libtype=section.METADATA_TYPE, limit=limit, filters=filters, **kwargs)
+        uri = f'{self._server._uriRoot()}{searchKey}'
+
+        args = {'uri': uri}
+        key = f"{self.key}/items{utils.joinArgs(args)}"
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def _edit(self, **kwargs):
+        """ Actually edit the playlist. """
+        if isinstance(self._edits, dict):
+            self._edits.update(kwargs)
+            return self
+
+        key = f'{self.key}{utils.joinArgs(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)
+
+    @classmethod
+    def _create(cls, server, title, items):
+        """ Create a regular playlist. """
+        if not items:
+            raise BadRequest('Must include items to add when creating new playlist.')
+
+        if items and not isinstance(items, (list, tuple)):
+            items = [items]
+
+        listType = items[0].listType
+        ratingKeys = []
+        for item in items:
+            if item.listType != listType:  # pragma: no cover
+                raise BadRequest('Can not mix media types when building a playlist.')
+            ratingKeys.append(str(item.ratingKey))
+
+        ratingKeys = ','.join(ratingKeys)
+        uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
+
+        args = {'uri': uri, 'type': listType, 'title': title, 'smart': 0}
+        key = f"/playlists{utils.joinArgs(args)}"
+        data = server.query(key, method=server._session.post)[0]
+        return cls(server, data, initpath=key)
+
+    @classmethod
+    def _createSmart(cls, server, title, section, limit=None, libtype=None, sort=None, filters=None, **kwargs):
+        """ Create a smart playlist. """
+        if not isinstance(section, LibrarySection):
+            section = server.library.section(section)
+
+        libtype = libtype or section.METADATA_TYPE
+
+        searchKey = section._buildSearchKey(
+            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
+        uri = f'{server._uriRoot()}{searchKey}'
+
+        args = {'uri': uri, 'type': section.CONTENT_TYPE, 'title': title, 'smart': 1}
+        key = f"/playlists{utils.joinArgs(args)}"
+        data = server.query(key, method=server._session.post)[0]
+        return cls(server, data, initpath=key)
+
+    @classmethod
+    def _createFromM3U(cls, server, title, section, m3ufilepath):
+        """ Create a playlist from uploading an m3u file. """
+        if not isinstance(section, LibrarySection):
+            section = server.library.section(section)
+
+        if not isinstance(section, MusicSection):
+            raise BadRequest('Can only create playlists from m3u files in a music library.')
+
+        args = {'sectionID': section.key, 'path': m3ufilepath}
+        key = f"/playlists/upload{utils.joinArgs(args)}"
+        server.query(key, method=server._session.post)
+        try:
+            return server.playlists(sectionId=section.key, guid__endswith=m3ufilepath)[0].editTitle(title).reload()
+        except IndexError:
+            raise BadRequest('Failed to create playlist from m3u file.') from None
+
+    @classmethod
+    def create(cls, server, title, section=None, items=None, smart=False, limit=None,
+               libtype=None, sort=None, filters=None, m3ufilepath=None, **kwargs):
+        """ Create a playlist.
+
+            Parameters:
+                server (:class:`~plexapi.server.PlexServer`): Server to create the playlist on.
+                title (str): Title of the playlist.
+                section (:class:`~plexapi.library.LibrarySection`, str): Smart playlists and m3u import only,
+                    the library section to create the playlist in.
+                items (List): Regular playlists only, list of :class:`~plexapi.audio.Audio`,
+                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
+                smart (bool): True to create a smart playlist. Default False.
+                limit (int): Smart playlists only, limit the number of items in the playlist.
+                libtype (str): Smart playlists only, the specific type of content to filter
+                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
+                sort (str or list, optional): Smart playlists only, a string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): Smart playlists only, a dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                m3ufilepath (str): Music playlists only, the full file path to an m3u file to import.
+                    Note: This will overwrite any playlist previously created from the same m3u file.
+                **kwargs (dict): Smart playlists only, additional custom filters to apply to the
+                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the playlist.
+                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the playlist.
+                :class:`plexapi.exceptions.BadRequest`: When attempting to import m3u file into non-music library.
+                :class:`plexapi.exceptions.BadRequest`: When failed to import m3u file.
+
+            Returns:
+                :class:`~plexapi.playlist.Playlist`: A new instance of the created Playlist.
+        """
+        if m3ufilepath:
+            return cls._createFromM3U(server, title, section, m3ufilepath)
+        elif smart:
+            if items:
+                raise BadRequest('Cannot create a smart playlist with items.')
+            return cls._createSmart(server, title, section, limit, libtype, sort, filters, **kwargs)
+        else:
+            return cls._create(server, title, items)
+
+    def copyToUser(self, user):
+        """ Copy playlist to another user account.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): `MyPlexUser` object, username,
+                    email, or user id of the user to copy the playlist to.
+        """
+        userServer = self._server.switchUser(user)
+        return self.create(server=userServer, title=self.title, items=self.items())
+
+    def sync(self, videoQuality=None, photoResolution=None, audioBitrate=None, client=None, clientId=None, limit=None,
+             unwatched=False, title=None):
+        """ Add the playlist as a sync item for the specified device.
+            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
+                                    :mod:`~plexapi.sync` module. Used only when playlist contains video.
+                photoResolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in
+                                       the module :mod:`~plexapi.sync`. Used only when playlist contains photos.
+                audioBitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values
+                                    from the module :mod:`~plexapi.sync`. Used only when playlist contains audio.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                limit (int): maximum count of items to sync, unlimited if `None`.
+                unwatched (bool): if `True` watched videos wouldn't be synced.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current photo.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When playlist is not allowed to sync.
+                :exc:`~plexapi.exceptions.Unsupported`: When playlist content is unsupported.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: A new instance of the created sync item.
+        """
+        if not self.allowSync:
+            raise BadRequest('The playlist is not allowed to sync')
+
+        from plexapi.sync import SyncItem, Policy, MediaSettings
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self.title
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.playlistType
+        sync_item.metadataType = self.metadataType
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        sync_item.location = f'playlist:///{quote_plus(self.guid)}'
+        sync_item.policy = Policy.create(limit, unwatched)
+
+        if self.isVideo:
+            sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
+        elif self.isAudio:
+            sync_item.mediaSettings = MediaSettings.createMusic(audioBitrate)
+        elif self.isPhoto:
+            sync_item.mediaSettings = MediaSettings.createPhoto(photoResolution)
+        else:
+            raise Unsupported('Unsupported playlist content')
+
+        return myplex.sync(sync_item, client=client, clientId=clientId)
+
+    def _getWebURL(self, base=None):
+        """ Get the Plex Web URL with the correct parameters. """
+        return self._server._buildWebURL(base=base, endpoint='playlist', key=self.key)
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Playlists' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
diff --git a/libs/plexapi/playqueue.py b/libs/plexapi/playqueue.py
new file mode 100644
index 000000000..9835c0dd2
--- /dev/null
+++ b/libs/plexapi/playqueue.py
@@ -0,0 +1,319 @@
+# -*- coding: utf-8 -*-
+from urllib.parse import quote_plus
+
+from plexapi import utils
+from plexapi.base import PlexObject
+from plexapi.exceptions import BadRequest
+
+
+class PlayQueue(PlexObject):
+    """Control a PlayQueue.
+
+    Attributes:
+        TAG (str): 'PlayQueue'
+        TYPE (str): 'playqueue'
+        identifier (str): com.plexapp.plugins.library
+        items (list): List of :class:`~plexapi.base.Playable` or :class:`~plexapi.playlist.Playlist`
+        mediaTagPrefix (str): Fx /system/bundle/media/flags/
+        mediaTagVersion (int): Fx 1485957738
+        playQueueID (int): ID of the PlayQueue.
+        playQueueLastAddedItemID (int):
+            Defines where the "Up Next" region starts. Empty unless PlayQueue is modified after creation.
+        playQueueSelectedItemID (int): The queue item ID of the currently selected item.
+        playQueueSelectedItemOffset (int):
+            The offset of the selected item in the PlayQueue, from the beginning of the queue.
+        playQueueSelectedMetadataItemID (int): ID of the currently selected item, matches ratingKey.
+        playQueueShuffled (bool): True if shuffled.
+        playQueueSourceURI (str): Original URI used to create the PlayQueue.
+        playQueueTotalCount (int): How many items in the PlayQueue.
+        playQueueVersion (int): Version of the PlayQueue. Increments every time a change is made to the PlayQueue.
+        selectedItem (:class:`~plexapi.base.Playable`): Media object for the currently selected item.
+        _server (:class:`~plexapi.server.PlexServer`): PlexServer associated with the PlayQueue.
+        size (int): Alias for playQueueTotalCount.
+    """
+
+    TAG = "PlayQueue"
+    TYPE = "playqueue"
+
+    def _loadData(self, data):
+        self._data = data
+        self.identifier = data.attrib.get("identifier")
+        self.mediaTagPrefix = data.attrib.get("mediaTagPrefix")
+        self.mediaTagVersion = utils.cast(int, data.attrib.get("mediaTagVersion"))
+        self.playQueueID = utils.cast(int, data.attrib.get("playQueueID"))
+        self.playQueueLastAddedItemID = utils.cast(
+            int, data.attrib.get("playQueueLastAddedItemID")
+        )
+        self.playQueueSelectedItemID = utils.cast(
+            int, data.attrib.get("playQueueSelectedItemID")
+        )
+        self.playQueueSelectedItemOffset = utils.cast(
+            int, data.attrib.get("playQueueSelectedItemOffset")
+        )
+        self.playQueueSelectedMetadataItemID = utils.cast(
+            int, data.attrib.get("playQueueSelectedMetadataItemID")
+        )
+        self.playQueueShuffled = utils.cast(
+            bool, data.attrib.get("playQueueShuffled", 0)
+        )
+        self.playQueueSourceURI = data.attrib.get("playQueueSourceURI")
+        self.playQueueTotalCount = utils.cast(
+            int, data.attrib.get("playQueueTotalCount")
+        )
+        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]
+
+    def __getitem__(self, key):
+        if not self.items:
+            return None
+        return self.items[key]
+
+    def __len__(self):
+        return self.playQueueTotalCount
+
+    def __iter__(self):
+        yield from self.items
+
+    def __contains__(self, media):
+        """Returns True if the PlayQueue contains the provided media item."""
+        return any(x.playQueueItemID == media.playQueueItemID for x in self.items)
+
+    def getQueueItem(self, item):
+        """
+        Accepts a media item and returns a similar object from this PlayQueue.
+        Useful for looking up playQueueItemIDs using items obtained from the Library.
+        """
+        matches = [x for x in self.items if x == item]
+        if len(matches) == 1:
+            return matches[0]
+        elif len(matches) > 1:
+            raise BadRequest(
+                f"{item} occurs multiple times in this PlayQueue, provide exact item"
+            )
+        else:
+            raise BadRequest(f"{item} not valid for this PlayQueue")
+
+    @classmethod
+    def get(
+        cls,
+        server,
+        playQueueID,
+        own=False,
+        center=None,
+        window=50,
+        includeBefore=True,
+        includeAfter=True,
+    ):
+        """Retrieve an existing :class:`~plexapi.playqueue.PlayQueue` by identifier.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
+            playQueueID (int): Identifier of an existing PlayQueue.
+            own (bool, optional): If server should transfer ownership.
+            center (int, optional): The playQueueItemID of the center of the window. Does not change selectedItem.
+            window (int, optional): Number of items to return from each side of the center item.
+            includeBefore (bool, optional):
+                Include items before the center, defaults True. Does not include center if False.
+            includeAfter (bool, optional):
+                Include items after the center, defaults True. Does not include center if False.
+        """
+        args = {
+            "own": utils.cast(int, own),
+            "window": window,
+            "includeBefore": utils.cast(int, includeBefore),
+            "includeAfter": utils.cast(int, includeAfter),
+        }
+        if center:
+            args["center"] = center
+
+        path = f"/playQueues/{playQueueID}{utils.joinArgs(args)}"
+        data = server.query(path, method=server._session.get)
+        c = cls(server, data, initpath=path)
+        c._server = server
+        return c
+
+    @classmethod
+    def create(
+        cls,
+        server,
+        items,
+        startItem=None,
+        shuffle=0,
+        repeat=0,
+        includeChapters=1,
+        includeRelated=1,
+        continuous=0,
+    ):
+        """Create and return a new :class:`~plexapi.playqueue.PlayQueue`.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
+            items (:class:`~plexapi.base.PlexPartialObject`):
+                A media item or a list of media items.
+            startItem (:class:`~plexapi.base.Playable`, optional):
+                Media item in the PlayQueue where playback should begin.
+            shuffle (int, optional): Start the playqueue shuffled.
+            repeat (int, optional): Start the playqueue shuffled.
+            includeChapters (int, optional): include Chapters.
+            includeRelated (int, optional): include Related.
+            continuous (int, optional): include additional items after the initial item.
+                For a show this would be the next episodes, for a movie it does nothing.
+        """
+        args = {
+            "includeChapters": includeChapters,
+            "includeRelated": includeRelated,
+            "repeat": repeat,
+            "shuffle": shuffle,
+            "continuous": continuous,
+        }
+
+        if isinstance(items, list):
+            item_keys = ",".join(str(x.ratingKey) for x in items)
+            uri_args = quote_plus(f"/library/metadata/{item_keys}")
+            args["uri"] = f"library:///directory/{uri_args}"
+            args["type"] = items[0].listType
+        else:
+            if items.type == "playlist":
+                args["type"] = items.playlistType
+                args["playlistID"] = items.ratingKey
+            else:
+                args["type"] = items.listType
+            args["uri"] = f"server://{server.machineIdentifier}/{server.library.identifier}{items.key}"
+
+        if startItem:
+            args["key"] = startItem.key
+
+        path = f"/playQueues{utils.joinArgs(args)}"
+        data = server.query(path, method=server._session.post)
+        c = cls(server, data, initpath=path)
+        c._server = server
+        return c
+
+    @classmethod
+    def fromStationKey(cls, server, key):
+        """Create and return a new :class:`~plexapi.playqueue.PlayQueue`.
+
+        This is a convenience method to create a `PlayQueue` for
+        radio stations when only the `key` string is available.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
+            key (str): A station key as provided by :func:`~plexapi.library.LibrarySection.hubs()`
+                or :func:`~plexapi.audio.Artist.station()`
+
+        Example:
+
+            .. code-block:: python
+
+                from plexapi.playqueue import PlayQueue
+                music = server.library.section("Music")
+                artist = music.get("Artist Name")
+                station = artist.station()
+                key = station.key  # "/library/metadata/12855/station/8bd39616-dbdb-459e-b8da-f46d0b170af4?type=10"
+                pq = PlayQueue.fromStationKey(server, key)
+                client = server.clients()[0]
+                client.playMedia(pq)
+        """
+        args = {
+            "type": "audio",
+            "uri": f"server://{server.machineIdentifier}/{server.library.identifier}{key}"
+        }
+        path = f"/playQueues{utils.joinArgs(args)}"
+        data = server.query(path, method=server._session.post)
+        c = cls(server, data, initpath=path)
+        c._server = server
+        return c
+
+    def addItem(self, item, playNext=False, refresh=True):
+        """
+        Append the provided item to the "Up Next" section of the PlayQueue.
+        Items can only be added to the section immediately following the current playing item.
+
+        Parameters:
+            item (:class:`~plexapi.base.Playable` or :class:`~plexapi.playlist.Playlist`): Single media item or Playlist.
+            playNext (bool, optional): If True, add this item to the front of the "Up Next" section.
+                If False, the item will be appended to the end of the "Up Next" section.
+                Only has an effect if an item has already been added to the "Up Next" section.
+                See https://support.plex.tv/articles/202188298-play-queues/ for more details.
+            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
+        """
+        if refresh:
+            self.refresh()
+
+        args = {}
+        if item.type == "playlist":
+            args["playlistID"] = item.ratingKey
+        else:
+            uuid = item.section().uuid
+            args["uri"] = f"library://{uuid}/item{item.key}"
+
+        if playNext:
+            args["next"] = 1
+
+        path = f"/playQueues/{self.playQueueID}{utils.joinArgs(args)}"
+        data = self._server.query(path, method=self._server._session.put)
+        self._loadData(data)
+        return self
+
+    def moveItem(self, item, after=None, refresh=True):
+        """
+        Moves an item to the beginning of the PlayQueue.  If `after` is provided,
+        the item will be placed immediately after the specified item.
+
+        Parameters:
+            item (:class:`~plexapi.base.Playable`): An existing item in the PlayQueue to move.
+            afterItemID (:class:`~plexapi.base.Playable`, optional): A different item in the PlayQueue.
+                If provided, `item` will be placed in the PlayQueue after this item.
+            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
+        """
+        args = {}
+
+        if refresh:
+            self.refresh()
+
+        if item not in self:
+            item = self.getQueueItem(item)
+
+        if after:
+            if after not in self:
+                after = self.getQueueItem(after)
+            args["after"] = after.playQueueItemID
+
+        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)
+        return self
+
+    def removeItem(self, item, refresh=True):
+        """Remove an item from the PlayQueue.
+
+        Parameters:
+            item (:class:`~plexapi.base.Playable`): An existing item in the PlayQueue to move.
+            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
+        """
+        if refresh:
+            self.refresh()
+
+        if item not in self:
+            item = self.getQueueItem(item)
+
+        path = f"/playQueues/{self.playQueueID}/items/{item.playQueueItemID}"
+        data = self._server.query(path, method=self._server._session.delete)
+        self._loadData(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)
+        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)
+        return self
diff --git a/libs/plexapi/server.py b/libs/plexapi/server.py
new file mode 100644
index 000000000..1a1cf8355
--- /dev/null
+++ b/libs/plexapi/server.py
@@ -0,0 +1,1306 @@
+# -*- 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.client import PlexClient
+from plexapi.collection import Collection
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized
+from plexapi.library import Hub, Library, Path, File
+from plexapi.media import Conversion, Optimized
+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
+from plexapi import audio as _audio  # noqa: F401
+from plexapi import collection as _collection  # noqa: F401
+from plexapi import media as _media  # noqa: F401
+from plexapi import photo as _photo  # noqa: F401
+from plexapi import playlist as _playlist  # noqa: F401
+from plexapi import video as _video  # noqa: F401
+
+
+class PlexServer(PlexObject):
+    """ This is the main entry point to interacting with a Plex server. It allows you to
+        list connected clients, browse your library sections and perform actions such as
+        emptying trash. If you do not know the auth token required to access your Plex
+        server, or simply want to access your server with your username and password, you
+        can also create an PlexServer instance from :class:`~plexapi.myplex.MyPlexAccount`.
+
+        Parameters:
+            baseurl (str): Base url for to access the Plex Media Server (default: 'http://localhost:32400').
+            token (str): Required Plex authentication token to access the server.
+            session (requests.Session, optional): Use your own session object if you want to
+                cache the http responses from the server.
+            timeout (int, optional): Timeout in seconds on initial connection to the server
+                (default config.TIMEOUT).
+
+        Attributes:
+            allowCameraUpload (bool): True if server allows camera upload.
+            allowChannelAccess (bool): True if server allows channel access (iTunes?).
+            allowMediaDeletion (bool): True is server allows media to be deleted.
+            allowSharing (bool): True is server allows sharing.
+            allowSync (bool): True is server allows sync.
+            backgroundProcessing (bool): Unknown
+            certificate (bool): True if server has an HTTPS certificate.
+            companionProxy (bool): Unknown
+            diagnostics (bool): Unknown
+            eventStream (bool): Unknown
+            friendlyName (str): Human friendly name for this server.
+            hubSearch (bool): True if `Hub Search <https://www.plex.tv/blog
+                /seek-plex-shall-find-leveling-web-app/>`_ is enabled. I believe this
+                is enabled for everyone
+            machineIdentifier (str): Unique ID for this server (looks like an md5).
+            multiuser (bool): True if `multiusers <https://support.plex.tv/hc/en-us/articles
+                /200250367-Multi-User-Support>`_ are enabled.
+            myPlex (bool): Unknown (True if logged into myPlex?).
+            myPlexMappingState (str): Unknown (ex: mapped).
+            myPlexSigninState (str): Unknown (ex: ok).
+            myPlexSubscription (bool): True if you have a myPlex subscription.
+            myPlexUsername (str): Email address if signed into myPlex (user@example.com)
+            ownerFeatures (list): List of features allowed by the server owner. This may be based
+                on your PlexPass subscription. Features include: camera_upload, cloudsync,
+                content_filter, dvr, hardware_transcoding, home, lyrics, music_videos, pass,
+                photo_autotags, premium_music_metadata, session_bandwidth_restrictions, sync,
+                trailers, webhooks (and maybe more).
+            photoAutoTag (bool): True if photo `auto-tagging <https://support.plex.tv/hc/en-us
+                /articles/234976627-Auto-Tagging-of-Photos>`_ is enabled.
+            platform (str): Platform the server is hosted on (ex: Linux)
+            platformVersion (str): Platform version (ex: '6.1 (Build 7601)', '4.4.0-59-generic').
+            pluginHost (bool): Unknown
+            readOnlyLibraries (bool): Unknown
+            requestParametersInCookie (bool): Unknown
+            streamingBrainVersion (bool): Current `Streaming Brain <https://www.plex.tv/blog
+                /mcstreamy-brain-take-world-two-easy-steps/>`_ version.
+            sync (bool): True if `syncing to a device <https://support.plex.tv/hc/en-us/articles
+                /201053678-Sync-Media-to-a-Device>`_ is enabled.
+            transcoderActiveVideoSessions (int): Number of active video transcoding sessions.
+            transcoderAudio (bool): True if audio transcoding audio is available.
+            transcoderLyrics (bool): True if audio transcoding lyrics is available.
+            transcoderPhoto (bool): True if audio transcoding photos is available.
+            transcoderSubtitles (bool): True if audio transcoding subtitles is available.
+            transcoderVideo (bool): True if audio transcoding video is available.
+            transcoderVideoBitrates (bool): List of video bitrates.
+            transcoderVideoQualities (bool): List of video qualities.
+            transcoderVideoResolutions (bool): List of video resolutions.
+            updatedAt (int): Datetime the server was updated.
+            updater (bool): Unknown
+            version (str): Current Plex version (ex: 1.3.2.3112-1751929)
+            voiceSearch (bool): True if voice search is enabled. (is this Google Voice search?)
+            _baseurl (str): HTTP address of the client.
+            _token (str): Token used to access this client.
+            _session (obj): Requests session object used to access this client.
+    """
+    key = '/'
+
+    def __init__(self, baseurl=None, token=None, session=None, timeout=None):
+        self._baseurl = baseurl or CONFIG.get('auth.server_baseurl', 'http://localhost:32400')
+        self._baseurl = self._baseurl.rstrip('/')
+        self._token = logfilter.add_secret(token or CONFIG.get('auth.server_token'))
+        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'))
+        self.allowSharing = utils.cast(bool, data.attrib.get('allowSharing'))
+        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
+        self.backgroundProcessing = utils.cast(bool, data.attrib.get('backgroundProcessing'))
+        self.certificate = utils.cast(bool, data.attrib.get('certificate'))
+        self.companionProxy = utils.cast(bool, data.attrib.get('companionProxy'))
+        self.diagnostics = utils.toList(data.attrib.get('diagnostics'))
+        self.eventStream = utils.cast(bool, data.attrib.get('eventStream'))
+        self.friendlyName = data.attrib.get('friendlyName')
+        self.hubSearch = utils.cast(bool, data.attrib.get('hubSearch'))
+        self.machineIdentifier = data.attrib.get('machineIdentifier')
+        self.multiuser = utils.cast(bool, data.attrib.get('multiuser'))
+        self.myPlex = utils.cast(bool, data.attrib.get('myPlex'))
+        self.myPlexMappingState = data.attrib.get('myPlexMappingState')
+        self.myPlexSigninState = data.attrib.get('myPlexSigninState')
+        self.myPlexSubscription = utils.cast(bool, data.attrib.get('myPlexSubscription'))
+        self.myPlexUsername = data.attrib.get('myPlexUsername')
+        self.ownerFeatures = utils.toList(data.attrib.get('ownerFeatures'))
+        self.photoAutoTag = utils.cast(bool, data.attrib.get('photoAutoTag'))
+        self.platform = data.attrib.get('platform')
+        self.platformVersion = data.attrib.get('platformVersion')
+        self.pluginHost = utils.cast(bool, data.attrib.get('pluginHost'))
+        self.readOnlyLibraries = utils.cast(int, data.attrib.get('readOnlyLibraries'))
+        self.requestParametersInCookie = utils.cast(bool, data.attrib.get('requestParametersInCookie'))
+        self.streamingBrainVersion = data.attrib.get('streamingBrainVersion')
+        self.sync = utils.cast(bool, data.attrib.get('sync'))
+        self.transcoderActiveVideoSessions = int(data.attrib.get('transcoderActiveVideoSessions', 0))
+        self.transcoderAudio = utils.cast(bool, data.attrib.get('transcoderAudio'))
+        self.transcoderLyrics = utils.cast(bool, data.attrib.get('transcoderLyrics'))
+        self.transcoderPhoto = utils.cast(bool, data.attrib.get('transcoderPhoto'))
+        self.transcoderSubtitles = utils.cast(bool, data.attrib.get('transcoderSubtitles'))
+        self.transcoderVideo = utils.cast(bool, data.attrib.get('transcoderVideo'))
+        self.transcoderVideoBitrates = utils.toList(data.attrib.get('transcoderVideoBitrates'))
+        self.transcoderVideoQualities = utils.toList(data.attrib.get('transcoderVideoQualities'))
+        self.transcoderVideoResolutions = utils.toList(data.attrib.get('transcoderVideoResolutions'))
+        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.updater = utils.cast(bool, data.attrib.get('updater'))
+        self.version = data.attrib.get('version')
+        self.voiceSearch = utils.cast(bool, data.attrib.get('voiceSearch'))
+
+    def _headers(self, **kwargs):
+        """ Returns dict containing base headers for all requests to the server. """
+        headers = BASE_HEADERS.copy()
+        if self._token:
+            headers['X-Plex-Token'] = self._token
+        headers.update(kwargs)
+        return headers
+
+    def _uriRoot(self):
+        return f'server://{self.machineIdentifier}/com.plexapp.plugins.library'
+
+    @cached_property
+    def library(self):
+        """ Library to browse or search your media. """
+        try:
+            data = self.query(Library.key)
+        except BadRequest:
+            # Only the owner has access to /library
+            # so just return the library without the data.
+            data = self.query('/library/sections/')
+        return Library(self, data)
+
+    @cached_property
+    def settings(self):
+        """ Returns a list of all server settings. """
+        data = self.query(Settings.key)
+        return Settings(self, data)
+
+    def identity(self):
+        """ Returns the Plex server identity. """
+        data = self.query('/identity')
+        return Identity(self, data)
+
+    def account(self):
+        """ Returns the :class:`~plexapi.server.Account` object this server belongs to. """
+        data = self.query(Account.key)
+        return Account(self, data)
+
+    def claim(self, account):
+        """ Claim the Plex server using a :class:`~plexapi.myplex.MyPlexAccount`.
+            This will only work with an unclaimed server on localhost or the same subnet.
+
+            Parameters:
+                account (:class:`~plexapi.myplex.MyPlexAccount`): The account used to
+                    claim the server.
+        """
+        key = '/myplex/claim'
+        params = {'token': account.claimToken()}
+        data = self.query(key, method=self._session.post, params=params)
+        return Account(self, data)
+
+    def unclaim(self):
+        """ Unclaim the Plex server. This will remove the server from your
+            :class:`~plexapi.myplex.MyPlexAccount`.
+        """
+        data = self.query(Account.key, method=self._session.delete)
+        return Account(self, data)
+
+    @property
+    def activities(self):
+        """Returns all current PMS activities."""
+        activities = []
+        for elem in self.query(Activity.key):
+            activities.append(Activity(self, elem))
+        return activities
+
+    def agents(self, mediaType=None):
+        """ Returns a list of :class:`~plexapi.media.Agent` objects this server has available. """
+        key = '/system/agents'
+        if mediaType:
+            key += f'?mediaType={utils.searchType(mediaType)}'
+        return self.fetchItems(key)
+
+    def createToken(self, type='delegation', scope='all'):
+        """ Create a temp access token for the server. """
+        if not self._token:
+            # Handle unclaimed servers
+            return None
+        q = self.query(f'/security/token?type={type}&scope={scope}')
+        return q.attrib.get('token')
+
+    def switchUser(self, user, session=None, timeout=None):
+        """ Returns a new :class:`~plexapi.server.PlexServer` object logged in as the given username.
+            Note: Only the admin account can switch to other users.
+
+            Parameters:
+                user (:class:`~plexapi.myplex.MyPlexUser` or str): `MyPlexUser` object, username,
+                    email, or user id of the user to log in to the server.
+                session (requests.Session, optional): Use your own session object if you want to
+                    cache the http responses from the server. This will default to the same
+                    session as the admin account if no new session is provided.
+                timeout (int, optional): Timeout in seconds on initial connection to the server.
+                    This will default to the same timeout as the admin account if no new timeout
+                    is provided.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi.server import PlexServer
+                    # Login to the Plex server using the admin token
+                    plex = PlexServer('http://plexserver:32400', token='2ffLuB84dqLswk9skLos')
+                    # Login to the same Plex server using a different account
+                    userPlex = plex.switchUser("Username")
+
+        """
+        from plexapi.myplex import MyPlexUser
+        user = user if isinstance(user, MyPlexUser) else self.myPlexAccount().user(user)
+        userToken = user.get_token(self.machineIdentifier)
+        if session is None:
+            session = self._session
+        if timeout is None:
+            timeout = self._timeout
+        return PlexServer(self._baseurl, token=userToken, session=session, timeout=timeout)
+
+    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):
+        """ Returns the :class:`~plexapi.server.SystemAccount` object for the specified account ID.
+
+            Parameters:
+                accountID (int): The :class:`~plexapi.server.SystemAccount` ID.
+        """
+        try:
+            return next(account for account in self.systemAccounts() if account.id == accountID)
+        except StopIteration:
+            raise NotFound(f'Unknown account with accountID={accountID}') from None
+
+    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):
+        """ Returns the :class:`~plexapi.server.SystemDevice` object for the specified device ID.
+
+            Parameters:
+                deviceID (int): The :class:`~plexapi.server.SystemDevice` ID.
+        """
+        try:
+            return next(device for device in self.systemDevices() if device.id == deviceID)
+        except StopIteration:
+            raise NotFound(f'Unknown device with deviceID={deviceID}') from None
+
+    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
+        """
+        try:
+            ports = {}
+            account = self.myPlexAccount()
+            for device in account.devices():
+                if device.connections and ':' in device.connections[0][6:]:
+                    ports[device.clientIdentifier] = device.connections[0].split(':')[-1]
+            return ports
+        except Exception as err:
+            log.warning('Unable to fetch client ports from myPlex: %s', err)
+            return ports
+
+    def browse(self, path=None, includeFiles=True):
+        """ Browse the system file path using the Plex API.
+            Returns list of :class:`~plexapi.library.Path` and :class:`~plexapi.library.File` objects.
+
+            Parameters:
+                path (:class:`~plexapi.library.Path` or str, optional): Full path to browse.
+                includeFiles (bool): True to include files when browsing (Default).
+                                     False to only return folders.
+        """
+        if isinstance(path, Path):
+            key = path.key
+        elif path is not None:
+            base64path = utils.base64str(path)
+            key = f'/services/browse/{base64path}'
+        else:
+            key = '/services/browse'
+        key += f'?includeFiles={int(includeFiles)}'  # starting with PMS v1.32.7.7621 this must set explicitly
+        return self.fetchItems(key)
+
+    def walk(self, path=None):
+        """ Walk the system file tree using the Plex API similar to `os.walk`.
+            Yields a 3-tuple `(path, paths, files)` where
+            `path` is a string of the directory path,
+            `paths` is a list of :class:`~plexapi.library.Path` objects, and
+            `files` is a list of :class:`~plexapi.library.File` objects.
+
+            Parameters:
+                path (:class:`~plexapi.library.Path` or str, optional): Full path to walk.
+        """
+        paths = []
+        files = []
+        for item in self.browse(path):
+            if isinstance(item, Path):
+                paths.append(item)
+            elif isinstance(item, File):
+                files.append(item)
+
+        if isinstance(path, Path):
+            path = path.path
+
+        yield path or '', paths, files
+
+        for _path in paths:
+            for path, paths, files in self.walk(_path):
+                yield path, paths, files
+
+    def isBrowsable(self, path):
+        """ Returns True if the Plex server can browse the given path.
+
+            Parameters:
+                path (:class:`~plexapi.library.Path` or str): Full path to browse.
+        """
+        if isinstance(path, Path):
+            path = path.path
+        paths = [p.path for p in self.browse(os.path.dirname(path), includeFiles=False)]
+        return path in paths
+
+    def clients(self):
+        """ Returns list of all :class:`~plexapi.client.PlexClient` objects connected to server. """
+        items = []
+        ports = None
+        for elem in self.query('/clients'):
+            port = elem.attrib.get('port')
+            if not port:
+                log.warning('%s did not advertise a port, checking plex.tv.', elem.attrib.get('name'))
+                ports = self._myPlexClientPorts() if ports is None else ports
+                port = ports.get(elem.attrib.get('machineIdentifier'))
+            baseurl = f"http://{elem.attrib['host']}:{port}"
+            items.append(PlexClient(baseurl=baseurl, server=self,
+                                    token=self._token, data=elem, connect=False))
+
+        return items
+
+    def client(self, name):
+        """ Returns the :class:`~plexapi.client.PlexClient` that matches the specified name
+            or machine identifier.
+
+            Parameters:
+                name (str): Name or machine identifier of the client to return.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unknown client name.
+        """
+        for client in self.clients():
+            if client and (client.title == name or client.machineIdentifier == name):
+                return client
+
+        raise NotFound(f'Unknown client name: {name}')
+
+    def createCollection(self, title, section, items=None, smart=False, limit=None,
+                         libtype=None, sort=None, filters=None, **kwargs):
+        """ Creates and returns a new :class:`~plexapi.collection.Collection`.
+
+            Parameters:
+                title (str): Title of the collection.
+                section (:class:`~plexapi.library.LibrarySection`, str): The library section to create the collection in.
+                items (List): Regular collections only, list of :class:`~plexapi.audio.Audio`,
+                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the collection.
+                smart (bool): True to create a smart collection. Default False.
+                limit (int): Smart collections only, limit the number of items in the collection.
+                libtype (str): Smart collections only, the specific type of content to filter
+                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
+                sort (str or list, optional): Smart collections only, a string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): Smart collections only, a dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                **kwargs (dict): Smart collections only, additional custom filters to apply to the
+                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the collection.
+                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the collection.
+
+            Returns:
+                :class:`~plexapi.collection.Collection`: A new instance of the created Collection.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Create a regular collection
+                    movies = plex.library.section("Movies")
+                    movie1 = movies.get("Big Buck Bunny")
+                    movie2 = movies.get("Sita Sings the Blues")
+                    collection = plex.createCollection(
+                        title="Favorite Movies",
+                        section=movies,
+                        items=[movie1, movie2]
+                    )
+
+                    # Create a smart collection
+                    collection = plex.createCollection(
+                        title="Recently Aired Comedy TV Shows",
+                        section="TV Shows",
+                        smart=True,
+                        sort="episode.originallyAvailableAt:desc",
+                        filters={"episode.originallyAvailableAt>>": "4w", "genre": "comedy"}
+                    )
+
+        """
+        return Collection.create(
+            self, title, section, items=items, smart=smart, limit=limit,
+            libtype=libtype, sort=sort, filters=filters, **kwargs)
+
+    def createPlaylist(self, title, section=None, items=None, smart=False, limit=None,
+                       libtype=None, sort=None, filters=None, m3ufilepath=None, **kwargs):
+        """ Creates and returns a new :class:`~plexapi.playlist.Playlist`.
+
+            Parameters:
+                title (str): Title of the playlist.
+                section (:class:`~plexapi.library.LibrarySection`, str): Smart playlists and m3u import only,
+                    the library section to create the playlist in.
+                items (List): Regular playlists only, list of :class:`~plexapi.audio.Audio`,
+                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
+                smart (bool): True to create a smart playlist. Default False.
+                limit (int): Smart playlists only, limit the number of items in the playlist.
+                libtype (str): Smart playlists only, the specific type of content to filter
+                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
+                sort (str or list, optional): Smart playlists only, a string of comma separated sort fields
+                    or a list of sort fields in the format ``column:dir``.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                filters (dict): Smart playlists only, a dictionary of advanced filters.
+                    See :func:`~plexapi.library.LibrarySection.search` for more info.
+                m3ufilepath (str): Music playlists only, the full file path to an m3u file to import.
+                    Note: This will overwrite any playlist previously created from the same m3u file.
+                **kwargs (dict): Smart playlists only, additional custom filters to apply to the
+                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
+
+            Raises:
+                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the playlist.
+                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the playlist.
+                :class:`plexapi.exceptions.BadRequest`: When attempting to import m3u file into non-music library.
+                :class:`plexapi.exceptions.BadRequest`: When failed to import m3u file.
+
+            Returns:
+                :class:`~plexapi.playlist.Playlist`: A new instance of the created Playlist.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Create a regular playlist
+                    episodes = plex.library.section("TV Shows").get("Game of Thrones").episodes()
+                    playlist = plex.createPlaylist(
+                        title="GoT Episodes",
+                        items=episodes
+                    )
+
+                    # Create a smart playlist
+                    playlist = plex.createPlaylist(
+                        title="Top 10 Unwatched Movies",
+                        section="Movies",
+                        smart=True,
+                        limit=10,
+                        sort="audienceRating:desc",
+                        filters={"audienceRating>>": 8.0, "unwatched": True}
+                    )
+
+                    # Create a music playlist from an m3u file
+                    playlist = plex.createPlaylist(
+                        title="Favorite Tracks",
+                        section="Music",
+                        m3ufilepath="/path/to/playlist.m3u"
+                    )
+
+        """
+        return Playlist.create(
+            self, title, section=section, items=items, smart=smart, limit=limit,
+            libtype=libtype, sort=sort, filters=filters, m3ufilepath=m3ufilepath, **kwargs)
+
+    def createPlayQueue(self, item, **kwargs):
+        """ Creates and returns a new :class:`~plexapi.playqueue.PlayQueue`.
+
+            Parameters:
+                item (Media or Playlist): Media or playlist to add to PlayQueue.
+                kwargs (dict): See `~plexapi.playqueue.PlayQueue.create`.
+        """
+        return PlayQueue.create(self, item, **kwargs)
+
+    def downloadDatabases(self, savepath=None, unpack=False, showstatus=False):
+        """ Download databases.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                unpack (bool): Unpack the zip file.
+                showstatus(bool): Display a progressbar.
+        """
+        url = self.url('/diagnostics/databases')
+        filepath = utils.download(url, self._token, None, savepath, self._session, unpack=unpack, showstatus=showstatus)
+        return filepath
+
+    def downloadLogs(self, savepath=None, unpack=False, showstatus=False):
+        """ Download server logs.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                unpack (bool): Unpack the zip file.
+                showstatus(bool): Display a progressbar.
+        """
+        url = self.url('/diagnostics/logs')
+        filepath = utils.download(url, self._token, None, savepath, self._session, unpack=unpack, showstatus=showstatus)
+        return filepath
+
+    def butlerTasks(self):
+        """ Return a list of :class:`~plexapi.base.ButlerTask` objects. """
+        return self.fetchItems('/butler')
+
+    def runButlerTask(self, task):
+        """ Manually run a butler task immediately instead of waiting for the scheduled task to run.
+            Note: The butler task is run asynchronously. Check Plex Web to monitor activity.
+
+            Parameters:
+                task (str): The name of the task to run. (e.g. 'BackupDatabase')
+
+            Example:
+
+                .. code-block:: python
+
+                    availableTasks = [task.name for task in plex.butlerTasks()]
+                    print("Available butler tasks:", availableTasks)
+
+        """
+        validTasks = [_task.name for _task in self.butlerTasks()]
+        if task not in validTasks:
+            raise BadRequest(
+                f'Invalid butler task: {task}. Available tasks are: {validTasks}'
+            )
+        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.
+
+            Parameters:
+                force (bool): Force server to check for new releases
+                download (bool): Download if a update is available.
+        """
+        part = f'/updater/check?download={1 if download else 0}'
+        if force:
+            self.query(part, method=self._session.put)
+        releases = self.fetchItems('/updater/status')
+        if len(releases):
+            return releases[0]
+
+    def isLatest(self):
+        """ Returns True if the installed version of Plex Media Server is the latest. """
+        release = self.checkForUpdate(force=True)
+        return release is None
+
+    def canInstallUpdate(self):
+        """ Returns True if the newest version of Plex Media Server can be installed automatically.
+            (e.g. Windows and Mac can install updates automatically, but Docker and NAS devices cannot.)
+        """
+        release = self.query('/updater/status')
+        return utils.cast(bool, release.get('canInstall'))
+
+    def installUpdate(self):
+        """ Automatically install the newest version of Plex Media Server. """
+        # We can add this but dunno how useful this is since it sometimes
+        # requires user action using a gui.
+        part = '/updater/apply'
+        release = self.checkForUpdate(force=True, download=True)
+        if release and release.version != self.version:
+            # figure out what method this is..
+            return self.query(part, method=self._session.put)
+
+    def history(self, maxresults=None, mindate=None, ratingKey=None, accountID=None, librarySectionID=None):
+        """ Returns a list of media items from watched history. If there are many results, they will
+            be fetched from the server in batches of X_PLEX_CONTAINER_SIZE amounts. If you're only
+            looking for the first <num> results, it would be wise to set the maxresults option to that
+            amount so this functions doesn't iterate over all results on the server.
+
+            Parameters:
+                maxresults (int): Only return the specified number of results (optional).
+                mindate (datetime): Min datetime to return results from. This really helps speed
+                    up the result listing. For example: datetime.now() - timedelta(days=7)
+                ratingKey (int/str) Request history for a specific ratingKey item.
+                accountID (int/str) Request history for a specific account ID.
+                librarySectionID (int/str) Request history for a specific library section ID.
+        """
+        args = {'sort': 'viewedAt:desc'}
+        if ratingKey:
+            args['metadataItemID'] = ratingKey
+        if accountID:
+            args['accountID'] = accountID
+        if librarySectionID:
+            args['librarySectionID'] = librarySectionID
+        if mindate:
+            args['viewedAt>'] = int(mindate.timestamp())
+
+        key = f'/status/sessions/history/all{utils.joinArgs(args)}'
+        return self.fetchItems(key, maxresults=maxresults)
+
+    def playlists(self, playlistType=None, sectionId=None, title=None, sort=None, **kwargs):
+        """ Returns a list of all :class:`~plexapi.playlist.Playlist` objects on the server.
+
+            Parameters:
+                playlistType (str, optional): The type of playlists to return (audio, video, photo).
+                    Default returns all playlists.
+                sectionId (int, optional): The section ID (key) of the library to search within.
+                title (str, optional): General string query to search for. Partial string matches are allowed.
+                sort (str or list, optional): A string of comma separated sort fields in the format ``column:dir``.
+        """
+        args = {}
+        if playlistType is not None:
+            args['playlistType'] = playlistType
+        if sectionId is not None:
+            args['sectionID'] = sectionId
+        if title is not None:
+            args['title'] = title
+        if sort is not None:
+            args['sort'] = sort
+
+        key = f'/playlists{utils.joinArgs(args)}'
+        return self.fetchItems(key, **kwargs)
+
+    def playlist(self, title):
+        """ Returns the :class:`~plexapi.client.Playlist` that matches the specified title.
+
+            Parameters:
+                title (str): Title of the playlist to return.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotFound`: Unable to find playlist.
+        """
+        try:
+            return self.playlists(title=title, title__iexact=title)[0]
+        except IndexError:
+            raise NotFound(f'Unable to find playlist with title "{title}".') from None
+
+    def optimizedItems(self, removeAll=None):
+        """ Returns list of all :class:`~plexapi.media.Optimized` objects connected to server. """
+        if removeAll is True:
+            key = '/playlists/generators?type=42'
+            self.query(key, method=self._server._session.delete)
+        else:
+            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:
+            self.query('/:/prefs?BackgroundQueueIdlePaused=1', method=self._server._session.put)
+        elif pause is False:
+            self.query('/:/prefs?BackgroundQueueIdlePaused=0', method=self._server._session.put)
+        else:
+            return self.fetchItems('/playQueues/1', cls=Conversion)
+
+    def currentBackgroundProcess(self):
+        """ Returns list of all :class:`~plexapi.media.TranscodeJob` objects running or paused on server. """
+        return self.fetchItems('/status/sessions/background')
+
+    def query(self, key, method=None, headers=None, params=None, timeout=None, **kwargs):
+        """ Main method used to handle HTTPS requests to the Plex server. This method helps
+            by encoding the response to utf-8 and parsing the returned XML into and
+            ElementTree object. Returns None if no data exists in the response.
+        """
+        url = self.url(key)
+        method = method or self._session.get
+        timeout = timeout or self._timeout
+        log.debug('%s %s', method.__name__.upper(), url)
+        headers = self._headers(**headers or {})
+        response = method(url, headers=headers, params=params, timeout=timeout, **kwargs)
+        if response.status_code not in (200, 201, 204):
+            codename = codes.get(response.status_code)[0]
+            errtext = response.text.replace('\n', ' ')
+            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
+            if response.status_code == 401:
+                raise Unauthorized(message)
+            elif response.status_code == 404:
+                raise NotFound(message)
+            else:
+                raise BadRequest(message)
+        data = utils.cleanXMLString(response.text).encode('utf8')
+        return ElementTree.fromstring(data) if data.strip() else None
+
+    def search(self, query, mediatype=None, limit=None, sectionId=None):
+        """ Returns a list of media items or filter categories from the resulting
+            `Hub Search <https://www.plex.tv/blog/seek-plex-shall-find-leveling-web-app/>`_
+            against all items in your Plex library. This searches genres, actors, directors,
+            playlists, as well as all the obvious media titles. It performs spell-checking
+            against your search terms (because KUROSAWA is hard to spell). It also provides
+            contextual search results. So for example, if you search for 'Pernice', it’ll
+            return 'Pernice Brothers' as the artist result, but we’ll also go ahead and
+            return your most-listened to albums and tracks from the artist. If you type
+            'Arnold' you’ll get a result for the actor, but also the most recently added
+            movies he’s in.
+
+            Parameters:
+                query (str): Query to use when searching your library.
+                mediatype (str, optional): Limit your search to the specified media type.
+                    actor, album, artist, autotag, collection, director, episode, game, genre,
+                    movie, photo, photoalbum, place, playlist, shared, show, tag, track
+                limit (int, optional): Limit to the specified number of results per Hub.
+                sectionId (int, optional): The section ID (key) of the library to search within.
+        """
+        results = []
+        params = {
+            'query': query,
+            'includeCollections': 1,
+            'includeExternalMedia': 1}
+        if limit:
+            params['limit'] = limit
+        if sectionId:
+            params['sectionId'] = sectionId
+        key = f'/hubs/search?{urlencode(params)}'
+        for hub in self.fetchItems(key, Hub):
+            if mediatype:
+                if hub.type == mediatype:
+                    return hub.items
+            else:
+                results += hub.items
+        return results
+
+    def continueWatching(self):
+        """ Return a list of all items in the Continue Watching hub. """
+        return self.fetchItems('/hubs/continueWatching/items')
+
+    def sessions(self):
+        """ Returns a list of all active session (currently playing) media objects. """
+        return self.fetchItems('/status/sessions')
+
+    def transcodeSessions(self):
+        """ Returns a list of all active :class:`~plexapi.media.TranscodeSession` objects. """
+        return self.fetchItems('/transcode/sessions')
+
+    def startAlertListener(self, callback=None, callbackError=None):
+        """ Creates a websocket connection to the Plex Server to optionally receive
+            notifications. These often include messages from Plex about media scans
+            as well as updates to currently running Transcode Sessions.
+
+            Returns a new :class:`~plexapi.alert.AlertListener` object.
+
+            Note: ``websocket-client`` must be installed in order to use this feature.
+
+            .. code-block:: python
+
+                >> pip install websocket-client
+
+            Parameters:
+                callback (func): Callback function to call on received messages.
+                callbackError (func): Callback function to call on errors.
+
+            Raises:
+                :exc:`~plexapi.exception.Unsupported`: Websocket-client not installed.
+        """
+        notifier = AlertListener(self, callback, callbackError)
+        notifier.start()
+        return notifier
+
+    def transcodeImage(self, imageUrl, height, width,
+                       opacity=None, saturation=None, blur=None, background=None, blendColor=None,
+                       minSize=True, upscale=True, imageFormat=None):
+        """ Returns the URL for a transcoded image.
+
+            Parameters:
+                imageUrl (str): The URL to the image
+                    (eg. returned by :func:`~plexapi.mixins.PosterUrlMixin.thumbUrl`
+                    or :func:`~plexapi.mixins.ArtUrlMixin.artUrl`).
+                    The URL can be an online image.
+                height (int): Height to transcode the image to.
+                width (int): Width to transcode the image to.
+                opacity (int, optional): Change the opacity of the image (0 to 100)
+                saturation (int, optional): Change the saturation of the image (0 to 100).
+                blur (int, optional): The blur to apply to the image in pixels (e.g. 3).
+                background (str, optional): The background hex colour to apply behind the opacity (e.g. '000000').
+                blendColor (str, optional): The hex colour to blend the image with (e.g. '000000').
+                minSize (bool, optional): Maintain smallest dimension. Default True.
+                upscale (bool, optional): Upscale the image if required. Default True.
+                imageFormat (str, optional): 'jpeg' (default) or 'png'.
+        """
+        params = {
+            'url': imageUrl,
+            'height': height,
+            'width': width,
+            'minSize': int(bool(minSize)),
+            'upscale': int(bool(upscale))
+        }
+        if opacity is not None:
+            params['opacity'] = opacity
+        if saturation is not None:
+            params['saturation'] = saturation
+        if blur is not None:
+            params['blur'] = blur
+        if background is not None:
+            params['background'] = str(background).strip('#')
+        if blendColor is not None:
+            params['blendColor'] = str(blendColor).strip('#')
+        if imageFormat is not None:
+            params['format'] = imageFormat.lower()
+
+        key = f'/photo/:/transcode{utils.joinArgs(params)}'
+        return self.url(key, includeToken=True)
+
+    def url(self, key, includeToken=None):
+        """ Build a URL string with proper token argument.  Token will be appended to the URL
+            if either includeToken is True or CONFIG.log.show_secrets is 'true'.
+        """
+        if self._token and (includeToken or self._showSecrets):
+            delim = '&' if '?' in key else '?'
+            return f'{self._baseurl}{key}{delim}X-Plex-Token={self._token}'
+        return f'{self._baseurl}{key}'
+
+    def refreshSynclist(self):
+        """ Force PMS to download new SyncList from Plex.tv. """
+        return self.query('/sync/refreshSynclists', self._session.put)
+
+    def refreshContent(self):
+        """ Force PMS to refresh content for known SyncLists. """
+        return self.query('/sync/refreshContent', self._session.put)
+
+    def refreshSync(self):
+        """ Calls :func:`~plexapi.server.PlexServer.refreshSynclist` and
+            :func:`~plexapi.server.PlexServer.refreshContent`, just like the Plex Web UI does when you click 'refresh'.
+        """
+        self.refreshSynclist()
+        self.refreshContent()
+
+    def _allowMediaDeletion(self, toggle=False):
+        """ Toggle allowMediaDeletion.
+            Parameters:
+                toggle (bool): True enables Media Deletion
+                               False or None disable Media Deletion (Default)
+        """
+        if self.allowMediaDeletion and toggle is False:
+            log.debug('Plex is currently allowed to delete media. Toggling off.')
+        elif self.allowMediaDeletion and toggle is True:
+            log.debug('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
+            raise BadRequest('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
+        elif self.allowMediaDeletion is None and toggle is True:
+            log.debug('Plex is currently not allowed to delete media. Toggle set to allow.')
+        else:
+            log.debug('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
+            raise BadRequest('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
+        value = 1 if toggle is True else 0
+        return self.query(f'/:/prefs?allowMediaDeletion={value}', self._session.put)
+
+    def bandwidth(self, timespan=None, **kwargs):
+        """ Returns a list of :class:`~plexapi.server.StatisticsBandwidth` objects
+            with the Plex server dashboard bandwidth data.
+
+            Parameters:
+                timespan (str, optional): The timespan to bin the bandwidth data. Default is seconds.
+                    Available timespans: seconds, hours, days, weeks, months.
+                **kwargs (dict, optional): Any of the available filters that can be applied to the bandwidth data.
+                    The time frame (at) and bytes can also be filtered using less than or greater than (see examples below).
+
+                    * accountID (int): The :class:`~plexapi.server.SystemAccount` ID to filter.
+                    * at (datetime): The time frame to filter (inclusive). The time frame can be either:
+                        1. An exact time frame (e.g. Only December 1st 2020 `at=datetime(2020, 12, 1)`).
+                        2. Before a specific time (e.g. Before and including December 2020 `at<=datetime(2020, 12, 1)`).
+                        3. After a specific time (e.g. After and including January 2021 `at>=datetime(2021, 1, 1)`).
+                    * bytes (int): The amount of bytes to filter (inclusive). The bytes can be either:
+                        1. An exact number of bytes (not very useful) (e.g. `bytes=1024**3`).
+                        2. Less than or equal number of bytes (e.g. `bytes<=1024**3`).
+                        3. Greater than or equal number of bytes (e.g. `bytes>=1024**3`).
+                    * deviceID (int): The :class:`~plexapi.server.SystemDevice` ID to filter.
+                    * lan (bool): True to only retrieve local bandwidth, False to only retrieve remote bandwidth.
+                        Default returns all local and remote bandwidth.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When applying an invalid timespan or unknown filter.
+
+            Example:
+
+                .. code-block:: python
+
+                    from plexapi.server import PlexServer
+                    plex = PlexServer('http://localhost:32400', token='xxxxxxxxxxxxxxxxxxxx')
+
+                    # Filter bandwidth data for December 2020 and later, and more than 1 GB used.
+                    filters = {
+                        'at>': datetime(2020, 12, 1),
+                        'bytes>': 1024**3
+                    }
+
+                    # Retrieve bandwidth data in one day timespans.
+                    bandwidthData = plex.bandwidth(timespan='days', **filters)
+
+                    # Print out bandwidth usage for each account and device combination.
+                    for bandwidth in sorted(bandwidthData, key=lambda x: x.at):
+                        account = bandwidth.account()
+                        device = bandwidth.device()
+                        gigabytes = round(bandwidth.bytes / 1024**3, 3)
+                        local = 'local' if bandwidth.lan else 'remote'
+                        date = bandwidth.at.strftime('%Y-%m-%d')
+                        print(f'{account.name} used {gigabytes} GB of {local} bandwidth on {date} from {device.name}')
+
+        """
+        params = {}
+
+        if timespan is None:
+            params['timespan'] = 6  # Default to seconds
+        else:
+            timespans = {
+                'seconds': 6,
+                'hours': 4,
+                'days': 3,
+                'weeks': 2,
+                'months': 1
+            }
+            try:
+                params['timespan'] = timespans[timespan]
+            except KeyError:
+                raise BadRequest(f"Invalid timespan specified: {timespan}. "
+                                 f"Available timespans: {', '.join(timespans.keys())}")
+
+        filters = {'accountID', 'at', 'at<', 'at>', 'bytes', 'bytes<', 'bytes>', 'deviceID', 'lan'}
+
+        for key, value in kwargs.items():
+            if key not in filters:
+                raise BadRequest(f'Unknown filter: {key}={value}')
+            if key.startswith('at'):
+                try:
+                    value = utils.cast(int, value.timestamp())
+                except AttributeError:
+                    raise BadRequest(f'Time frame filter must be a datetime object: {key}={value}')
+            elif key.startswith('bytes') or key == 'lan':
+                value = utils.cast(int, value)
+            elif key == 'accountID':
+                if value == self.myPlexAccount().id:
+                    value = 1  # The admin account is accountID=1
+            params[key] = value
+
+        key = f'/statistics/bandwidth?{urlencode(params)}'
+        return self.fetchItems(key, StatisticsBandwidth)
+
+    def resources(self):
+        """ Returns a list of :class:`~plexapi.server.StatisticsResources` objects
+            with the Plex server dashboard resources data. """
+        key = '/statistics/resources?timespan=6'
+        return self.fetchItems(key, StatisticsResources)
+
+    def _buildWebURL(self, base=None, endpoint=None, **kwargs):
+        """ Build the Plex Web URL for the object.
+
+            Parameters:
+                base (str): The base URL before the fragment (``#!``).
+                    Default is https://app.plex.tv/desktop.
+                endpoint (str): The Plex Web URL endpoint.
+                    None for server, 'playlist' for playlists, 'details' for all other media types.
+                **kwargs (dict): Dictionary of URL parameters.
+        """
+        if base is None:
+            base = 'https://app.plex.tv/desktop/'
+
+        if endpoint:
+            return f'{base}#!/server/{self.machineIdentifier}/{endpoint}{utils.joinArgs(kwargs)}'
+        else:
+            return f'{base}#!/media/{self.machineIdentifier}/com.plexapp.plugins.library{utils.joinArgs(kwargs)}'
+
+    def getWebURL(self, base=None, playlistTab=None):
+        """ Returns the Plex Web URL for the server.
+
+            Parameters:
+                base (str): The base URL before the fragment (``#!``).
+                    Default is https://app.plex.tv/desktop.
+                playlistTab (str): The playlist tab (audio, video, photo). Only used for the playlist URL.
+        """
+        if playlistTab is not None:
+            params = {'source': 'playlists', 'pivot': f'playlists.{playlistTab}'}
+        else:
+            params = {'key': '/hubs', 'pageType': 'hub'}
+        return self._buildWebURL(base=base, **params)
+
+
+class Account(PlexObject):
+    """ Contains the locally cached MyPlex account information. The properties provided don't
+        match the :class:`~plexapi.myplex.MyPlexAccount` object very well. I believe this exists
+        because access to myplex is not required to get basic plex information. I can't imagine
+        object is terribly useful except unless you were needed this information while offline.
+
+        Parameters:
+            server (:class:`~plexapi.server.PlexServer`): PlexServer this account is connected to (optional)
+            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
+            privateAddress (str): Local IP address of the Plex server.
+            privatePort (str): Local port of the Plex server.
+            publicAddress (str): Public IP address of the Plex server.
+            publicPort (str): Public port of the Plex server.
+            signInState (str): Signin state for this account (ex: ok).
+            subscriptionActive (str): True if the account subscription is active.
+            subscriptionFeatures (str): List of features allowed by the server for this account.
+                This may be based on your PlexPass subscription. Features include: camera_upload,
+                cloudsync, content_filter, dvr, hardware_transcoding, home, lyrics, music_videos,
+                pass, photo_autotags, premium_music_metadata, session_bandwidth_restrictions,
+                sync, trailers, webhooks' (and maybe more).
+            subscriptionState (str): 'Active' if this subscription is active.
+            username (str): Plex account username (user@example.com).
+    """
+    key = '/myplex/account'
+
+    def _loadData(self, data):
+        self._data = data
+        self.authToken = data.attrib.get('authToken')
+        self.username = data.attrib.get('username')
+        self.mappingState = data.attrib.get('mappingState')
+        self.mappingError = data.attrib.get('mappingError')
+        self.mappingErrorMessage = data.attrib.get('mappingErrorMessage')
+        self.signInState = data.attrib.get('signInState')
+        self.publicAddress = data.attrib.get('publicAddress')
+        self.publicPort = data.attrib.get('publicPort')
+        self.privateAddress = data.attrib.get('privateAddress')
+        self.privatePort = data.attrib.get('privatePort')
+        self.subscriptionFeatures = utils.toList(data.attrib.get('subscriptionFeatures'))
+        self.subscriptionActive = utils.cast(bool, data.attrib.get('subscriptionActive'))
+        self.subscriptionState = data.attrib.get('subscriptionState')
+
+
+class Activity(PlexObject):
+    """A currently running activity on the PlexServer."""
+    key = '/activities'
+
+    def _loadData(self, data):
+        self._data = data
+        self.cancellable = utils.cast(bool, data.attrib.get('cancellable'))
+        self.progress = utils.cast(int, data.attrib.get('progress'))
+        self.title = data.attrib.get('title')
+        self.subtitle = data.attrib.get('subtitle')
+        self.type = data.attrib.get('type')
+        self.uuid = data.attrib.get('uuid')
+
+
+@utils.registerPlexObject
+class Release(PlexObject):
+    TAG = 'Release'
+    key = '/updater/status'
+
+    def _loadData(self, data):
+        self.download_key = data.attrib.get('key')
+        self.version = data.attrib.get('version')
+        self.added = data.attrib.get('added')
+        self.fixed = data.attrib.get('fixed')
+        self.downloadURL = data.attrib.get('downloadURL')
+        self.state = data.attrib.get('state')
+
+
+class SystemAccount(PlexObject):
+    """ Represents a single system account.
+
+        Attributes:
+            TAG (str): 'Account'
+            autoSelectAudio (bool): True or False if the account has automatic audio language enabled.
+            defaultAudioLanguage (str): The default audio language code for the account.
+            defaultSubtitleLanguage (str): The default subtitle language code for the account.
+            id (int): The Plex account ID.
+            key (str): API URL (/accounts/<id>)
+            name (str): The username of the account.
+            subtitleMode (bool): The subtitle mode for the account.
+            thumb (str): URL for the account thumbnail.
+    """
+    TAG = 'Account'
+
+    def _loadData(self, data):
+        self._data = data
+        self.autoSelectAudio = utils.cast(bool, data.attrib.get('autoSelectAudio'))
+        self.defaultAudioLanguage = data.attrib.get('defaultAudioLanguage')
+        self.defaultSubtitleLanguage = data.attrib.get('defaultSubtitleLanguage')
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.key = data.attrib.get('key')
+        self.name = data.attrib.get('name')
+        self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode'))
+        self.thumb = data.attrib.get('thumb')
+        # For backwards compatibility
+        self.accountID = self.id
+        self.accountKey = self.key
+
+
+class SystemDevice(PlexObject):
+    """ Represents a single system device.
+
+        Attributes:
+            TAG (str): 'Device'
+            clientIdentifier (str): The unique identifier for the device.
+            createdAt (datetime): Datetime the device was created.
+            id (int): The ID of the device (not the same as :class:`~plexapi.myplex.MyPlexDevice` ID).
+            key (str): API URL (/devices/<id>)
+            name (str): The name of the device.
+            platform (str): OS the device is running (Linux, Windows, Chrome, etc.)
+    """
+    TAG = 'Device'
+
+    def _loadData(self, data):
+        self._data = data
+        self.clientIdentifier = data.attrib.get('clientIdentifier')
+        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.key = f'/devices/{self.id}'
+        self.name = data.attrib.get('name')
+        self.platform = data.attrib.get('platform')
+
+
+class StatisticsBandwidth(PlexObject):
+    """ Represents a single statistics bandwidth data.
+
+        Attributes:
+            TAG (str): 'StatisticsBandwidth'
+            accountID (int): The associated :class:`~plexapi.server.SystemAccount` ID.
+            at (datetime): Datetime of the bandwidth data.
+            bytes (int): The total number of bytes for the specified time span.
+            deviceID (int): The associated :class:`~plexapi.server.SystemDevice` ID.
+            lan (bool): True or False whether the bandwidth is local or remote.
+            timespan (int): The time span for the bandwidth data.
+                1: months, 2: weeks, 3: days, 4: hours, 6: seconds.
+
+    """
+    TAG = 'StatisticsBandwidth'
+
+    def _loadData(self, data):
+        self._data = data
+        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'))
+        self.deviceID = utils.cast(int, data.attrib.get('deviceID'))
+        self.lan = utils.cast(bool, data.attrib.get('lan'))
+        self.timespan = utils.cast(int, data.attrib.get('timespan'))
+
+    def __repr__(self):
+        return '<{}>'.format(
+            ':'.join([p for p in [
+                self.__class__.__name__,
+                self._clean(self.accountID),
+                self._clean(self.deviceID),
+                self._clean(int(self.at.timestamp()))
+            ] if p])
+        )
+
+    def account(self):
+        """ Returns the :class:`~plexapi.server.SystemAccount` associated with the bandwidth data. """
+        return self._server.systemAccount(self.accountID)
+
+    def device(self):
+        """ Returns the :class:`~plexapi.server.SystemDevice` associated with the bandwidth data. """
+        return self._server.systemDevice(self.deviceID)
+
+
+class StatisticsResources(PlexObject):
+    """ Represents a single statistics resources data.
+
+        Attributes:
+            TAG (str): 'StatisticsResources'
+            at (datetime): Datetime of the resource data.
+            hostCpuUtilization (float): The system CPU usage %.
+            hostMemoryUtilization (float): The Plex Media Server CPU usage %.
+            processCpuUtilization (float): The system RAM usage %.
+            processMemoryUtilization (float): The Plex Media Server RAM usage %.
+            timespan (int): The time span for the resource data (6: seconds).
+    """
+    TAG = 'StatisticsResources'
+
+    def _loadData(self, data):
+        self._data = data
+        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'))
+        self.processCpuUtilization = utils.cast(float, data.attrib.get('processCpuUtilization'))
+        self.processMemoryUtilization = utils.cast(float, data.attrib.get('processMemoryUtilization'))
+        self.timespan = utils.cast(int, data.attrib.get('timespan'))
+
+    def __repr__(self):
+        return f"<{':'.join([p for p in [self.__class__.__name__, self._clean(int(self.at.timestamp()))] if p])}>"
+
+
+@utils.registerPlexObject
+class ButlerTask(PlexObject):
+    """ Represents a single scheduled butler task.
+
+        Attributes:
+            TAG (str): 'ButlerTask'
+            description (str): The description of the task.
+            enabled (bool): Whether the task is enabled.
+            interval (int): The interval the task is run in days.
+            name (str): The name of the task.
+            scheduleRandomized (bool): Whether the task schedule is randomized.
+            title (str): The title of the task.
+    """
+    TAG = 'ButlerTask'
+
+    def _loadData(self, data):
+        self._data = data
+        self.description = data.attrib.get('description')
+        self.enabled = utils.cast(bool, data.attrib.get('enabled'))
+        self.interval = utils.cast(int, data.attrib.get('interval'))
+        self.name = data.attrib.get('name')
+        self.scheduleRandomized = utils.cast(bool, data.attrib.get('scheduleRandomized'))
+        self.title = data.attrib.get('title')
+
+
+class Identity(PlexObject):
+    """ Represents a server identity.
+
+        Attributes:
+            claimed (bool): True or False if the server is claimed.
+            machineIdentifier (str): The Plex server machine identifier.
+            version (str): The Plex server version.
+    """
+
+    def __repr__(self):
+        return f"<{self.__class__.__name__}:{self.machineIdentifier}>"
+
+    def _loadData(self, data):
+        self._data = data
+        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
new file mode 100644
index 000000000..c191e3689
--- /dev/null
+++ b/libs/plexapi/settings.py
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+from collections import defaultdict
+from urllib.parse import quote
+
+from plexapi import log, utils
+from plexapi.base import PlexObject
+from plexapi.exceptions import BadRequest, NotFound
+
+
+class Settings(PlexObject):
+    """ Container class for all settings. Allows getting and setting PlexServer settings.
+
+        Attributes:
+            key (str): '/:/prefs'
+    """
+    key = '/:/prefs'
+
+    def __init__(self, server, data, initpath=None):
+        self._settings = {}
+        super(Settings, self).__init__(server, data, initpath)
+
+    def __getattr__(self, attr):
+        if attr.startswith('_'):
+            try:
+                return self.__dict__[attr]
+            except KeyError:
+                raise AttributeError
+        return self.get(attr).value
+
+    def __setattr__(self, attr, value):
+        if not attr.startswith('_'):
+            return self.get(attr).set(value)
+        self.__dict__[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)
+                continue
+            self._settings[id] = Setting(self._server, elem, self._initpath)
+
+    def all(self):
+        """ Returns a list of all :class:`~plexapi.settings.Setting` objects available. """
+        return [v for id, v in sorted(self._settings.items())]
+
+    def get(self, id):
+        """ Return the :class:`~plexapi.settings.Setting` object with the specified id. """
+        id = utils.lowerFirst(id)
+        if id in self._settings:
+            return self._settings[id]
+        raise NotFound(f'Invalid setting id: {id}')
+
+    def groups(self):
+        """ Returns a dict of lists for all :class:`~plexapi.settings.Setting`
+            objects grouped by setting group.
+        """
+        groups = defaultdict(list)
+        for setting in self.all():
+            groups[setting.group].append(setting)
+        return dict(groups)
+
+    def group(self, group):
+        """ Return a list of all :class:`~plexapi.settings.Setting` objects in the specified group.
+
+            Parameters:
+                group (str): Group to return all settings.
+        """
+        return self.groups().get(group, [])
+
+    def save(self):
+        """ Save any outstanding setting changes to the :class:`~plexapi.server.PlexServer`. This
+            performs a full reload() of Settings after complete.
+        """
+        params = {}
+        for setting in self.all():
+            if setting._setValue:
+                log.info('Saving PlexServer setting %s = %s', setting.id, setting._setValue)
+                params[setting.id] = quote(setting._setValue)
+        if not params:
+            raise BadRequest('No setting have been modified.')
+        querystr = '&'.join(f'{k}={v}' for k, v in params.items())
+        url = f'{self.key}?{querystr}'
+        self._server.query(url, self._server._session.put)
+        self.reload()
+
+
+class Setting(PlexObject):
+    """ Represents a single Plex setting.
+
+        Attributes:
+            id (str): Setting id (or name).
+            label (str): Short description of what this setting is.
+            summary (str): Long description of what this setting is.
+            type (str): Setting type (text, int, double, bool).
+            default (str): Default value for this setting.
+            value (str,bool,int,float): Current value for this setting.
+            hidden (bool): True if this is a hidden setting.
+            advanced (bool): True if this is an advanced setting.
+            group (str): Group name this setting is categorized as.
+            enumValues (list,dict): List or dictionary of valid values for this setting.
+    """
+    _bool_cast = lambda x: bool(x == 'true' or x == '1')
+    _bool_str = lambda x: str(x).lower()
+    TYPES = {
+        'bool': {'type': bool, 'cast': _bool_cast, 'tostr': _bool_str},
+        'double': {'type': float, 'cast': float, 'tostr': str},
+        'int': {'type': int, 'cast': int, 'tostr': str},
+        'text': {'type': str, 'cast': str, 'tostr': str},
+    }
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self.type = data.attrib.get('type')
+        self.advanced = utils.cast(bool, data.attrib.get('advanced'))
+        self.default = self._cast(data.attrib.get('default'))
+        self.enumValues = self._getEnumValues(data)
+        self.group = data.attrib.get('group')
+        self.hidden = utils.cast(bool, data.attrib.get('hidden'))
+        self.id = data.attrib.get('id')
+        self.label = data.attrib.get('label')
+        self.option = data.attrib.get('option')
+        self.secure = utils.cast(bool, data.attrib.get('secure'))
+        self.summary = data.attrib.get('summary')
+        self.value = self._cast(data.attrib.get('value'))
+        self._setValue = None
+
+    def _cast(self, value):
+        """ Cast the specific value to the type of this setting. """
+        if self.type != 'enum':
+            value = utils.cast(self.TYPES.get(self.type)['cast'], value)
+        return value
+
+    def _getEnumValues(self, data):
+        """ Returns a list or dictionary of values for this setting. """
+        enumstr = data.attrib.get('enumValues') or data.attrib.get('values')
+        if not enumstr:
+            return None
+        if ':' in enumstr:
+            d = {}
+            for kv in enumstr.split('|'):
+                try:
+                    k, v = kv.split(':')
+                    d[self._cast(k)] = v
+                except ValueError:
+                    d[self._cast(kv)] = kv
+            return d
+        return enumstr.split('|')
+
+    def set(self, value):
+        """ Set a new value for this setting. NOTE: You must call plex.settings.save() for before
+            any changes to setting values are persisted to the :class:`~plexapi.server.PlexServer`.
+        """
+        # check a few things up front
+        if not isinstance(value, self.TYPES[self.type]['type']):
+            badtype = type(value).__name__
+            raise BadRequest(f'Invalid value for {self.id}: a {self.type} is required, not {badtype}')
+        if self.enumValues and value not in self.enumValues:
+            raise BadRequest(f'Invalid value for {self.id}: {value} not in {list(self.enumValues)}')
+        # store value off to the side until we call settings.save()
+        tostr = self.TYPES[self.type]['tostr']
+        self._setValue = tostr(value)
+
+    def toUrl(self):
+        """Helper for urls"""
+        return f'{self.id}={self._value or self.value}'
+
+
+@utils.registerPlexObject
+class Preferences(Setting):
+    """ Represents a single Preferences.
+
+        Attributes:
+            TAG (str): 'Setting'
+            FILTER (str): 'preferences'
+    """
+    TAG = 'Setting'
+    FILTER = 'preferences'
+
+    def _default(self):
+        """ Set the default value for this setting."""
+        key = f'{self._initpath}/prefs?'
+        url = key + f'{self.id}={self.default}'
+        self._server.query(url, method=self._server._session.put)
diff --git a/libs/plexapi/sonos.py b/libs/plexapi/sonos.py
new file mode 100644
index 000000000..8f1295f44
--- /dev/null
+++ b/libs/plexapi/sonos.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import requests
+
+from plexapi import CONFIG, X_PLEX_IDENTIFIER, TIMEOUT
+from plexapi.client import PlexClient
+from plexapi.exceptions import BadRequest
+from plexapi.playqueue import PlayQueue
+
+
+class PlexSonosClient(PlexClient):
+    """ Class for interacting with a Sonos speaker via the Plex API. This class
+        makes requests to an external Plex API which then forwards the
+        Sonos-specific commands back to your Plex server & Sonos speakers. Use
+        of this feature requires an active Plex Pass subscription and Sonos
+        speakers linked to your Plex account. It also requires remote access to
+        be working properly.
+
+        More details on the Sonos integration are available here:
+        https://support.plex.tv/articles/218237558-requirements-for-using-plex-for-sonos/
+
+        The Sonos API emulates the Plex player control API closely:
+        https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
+
+        Parameters:
+            account (:class:`~plexapi.myplex.PlexAccount`): PlexAccount instance this
+                Sonos speaker is associated with.
+            data (ElementTree): Response from Plex Sonos API used to build this client.
+
+        Attributes:
+            deviceClass (str): "speaker"
+            lanIP (str): Local IP address of speaker.
+            machineIdentifier (str): Unique ID for this device.
+            platform (str): "Sonos"
+            platformVersion (str): Build version of Sonos speaker firmware.
+            product (str): "Sonos"
+            protocol (str): "plex"
+            protocolCapabilities (list<str>): List of client capabilities (timeline, playback,
+                playqueues, provider-playback)
+            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
+            session (:class:`~requests.Session`): Session object used for connection.
+            title (str): Name of this Sonos speaker.
+            token (str): X-Plex-Token used for authentication
+            _baseurl (str): Address of public Plex Sonos API endpoint.
+            _commandId (int): Counter for commands sent to Plex API.
+            _token (str): Token associated with linked Plex account.
+            _session (obj): Requests session object used to access this client.
+    """
+
+    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")
+        self.platform = data.attrib.get("platform")
+        self.platformVersion = data.attrib.get("platformVersion")
+        self.protocol = data.attrib.get("protocol")
+        self.protocolCapabilities = data.attrib.get("protocolCapabilities")
+        self.lanIP = data.attrib.get("lanIP")
+        self.title = data.attrib.get("title")
+        self._baseurl = "https://sonos.plex.tv"
+        self._commandId = 0
+        self._token = account._token
+        self._session = account._session or requests.Session()
+
+        # Dummy values for PlexClient inheritance
+        self._last_call = 0
+        self._proxyThroughServer = False
+        self._showSecrets = CONFIG.get("log.show_secrets", "").lower() == "true"
+        self._timeout = timeout or TIMEOUT
+
+    def playMedia(self, media, offset=0, **params):
+
+        if hasattr(media, "playlistType"):
+            mediatype = media.playlistType
+        else:
+            if isinstance(media, PlayQueue):
+                mediatype = media.items[0].listType
+            else:
+                mediatype = media.listType
+
+        if mediatype == "audio":
+            mediatype = "music"
+        else:
+            raise BadRequest("Sonos currently only supports music for playback")
+
+        server_protocol, server_address, server_port = media._server._baseurl.split(":")
+        server_address = server_address.strip("/")
+        server_port = server_port.strip("/")
+
+        playqueue = (
+            media
+            if isinstance(media, PlayQueue)
+            else media._server.createPlayQueue(media)
+        )
+        self.sendCommand(
+            "playback/playMedia",
+            **dict(
+                {
+                    "type": "music",
+                    "providerIdentifier": "com.plexapp.plugins.library",
+                    "containerKey": f"/playQueues/{playqueue.playQueueID}?own=1",
+                    "key": media.key,
+                    "offset": offset,
+                    "machineIdentifier": media._server.machineIdentifier,
+                    "protocol": server_protocol,
+                    "address": server_address,
+                    "port": server_port,
+                    "token": media._server.createToken(),
+                    "commandID": self._nextCommandId(),
+                    "X-Plex-Client-Identifier": X_PLEX_IDENTIFIER,
+                    "X-Plex-Token": media._server._token,
+                    "X-Plex-Target-Client-Identifier": self.machineIdentifier,
+                },
+                **params
+            )
+        )
diff --git a/libs/plexapi/sync.py b/libs/plexapi/sync.py
new file mode 100644
index 000000000..f57e89d96
--- /dev/null
+++ b/libs/plexapi/sync.py
@@ -0,0 +1,312 @@
+# -*- 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.
+
+.. code-block:: python
+
+    def init_sync():
+        import plexapi
+        plexapi.X_PLEX_PROVIDES = 'sync-target'
+        plexapi.BASE_HEADERS['X-Plex-Sync-Version'] = '2'
+        plexapi.BASE_HEADERS['X-Plex-Provides'] = plexapi.X_PLEX_PROVIDES
+
+        # mimic iPhone SE
+        plexapi.X_PLEX_PLATFORM = 'iOS'
+        plexapi.X_PLEX_PLATFORM_VERSION = '11.4.1'
+        plexapi.X_PLEX_DEVICE = 'iPhone'
+
+        plexapi.BASE_HEADERS['X-Plex-Platform'] = plexapi.X_PLEX_PLATFORM
+        plexapi.BASE_HEADERS['X-Plex-Platform-Version'] = plexapi.X_PLEX_PLATFORM_VERSION
+        plexapi.BASE_HEADERS['X-Plex-Device'] = plexapi.X_PLEX_DEVICE
+
+You have to fake platform/device/model because transcoding profiles are hardcoded in Plex, and you obviously have
+to explicitly specify that your app supports `sync-target`.
+"""
+import requests
+
+import plexapi
+from plexapi.base import PlexObject
+from plexapi.exceptions import NotFound, BadRequest
+
+
+class SyncItem(PlexObject):
+    """
+    Represents single sync item, for specified server and client. When you saying in the UI to sync "this" to "that"
+    you're basically creating a sync item.
+
+    Attributes:
+        id (int): unique id of the item.
+        clientIdentifier (str): an identifier of Plex Client device, to which the item is belongs.
+        machineIdentifier (str): the id of server which holds all this content.
+        version (int): current version of the item. Each time you modify the item (e.g. by changing amount if media to
+                       sync) the new version is created.
+        rootTitle (str): the title of library/media from which the sync item was created. E.g.:
+
+            * when you create an item for an episode 3 of season 3 of show Example, the value would be `Title of
+              Episode 3`
+            * when you create an item for a season 3 of show Example, the value would be `Season 3`
+            * when you set to sync all your movies in library named "My Movies" to value would be `My Movies`.
+
+        title (str): the title which you've set when created the sync item.
+        metadataType (str): the type of media which hides inside, can be `episode`, `movie`, etc.
+        contentType (str): basic type of the content: `video` or `audio`.
+        status (:class:`~plexapi.sync.Status`): current status of the sync.
+        mediaSettings (:class:`~plexapi.sync.MediaSettings`): media transcoding settings used for the item.
+        policy (:class:`~plexapi.sync.Policy`): the policy of which media to sync.
+        location (str): plex-style library url with all required filters / sorting.
+    """
+    TAG = 'SyncItem'
+
+    def __init__(self, server, data, initpath=None, clientIdentifier=None):
+        super(SyncItem, self).__init__(server, data, initpath)
+        self.clientIdentifier = clientIdentifier
+
+    def _loadData(self, data):
+        self._data = data
+        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')
+        self.title = data.attrib.get('title')
+        self.metadataType = data.attrib.get('metadataType')
+        self.contentType = data.attrib.get('contentType')
+        self.machineIdentifier = data.find('Server').get('machineIdentifier')
+        self.status = Status(**data.find('Status').attrib)
+        self.mediaSettings = MediaSettings(**data.find('MediaSettings').attrib)
+        self.policy = Policy(**data.find('Policy').attrib)
+        self.location = data.find('Location').attrib.get('uri', '')
+
+    def server(self):
+        """ Returns :class:`~plexapi.myplex.MyPlexResource` with server of current item. """
+        server = [s for s in self._server.resources() if s.clientIdentifier == self.machineIdentifier]
+        if len(server) == 0:
+            raise NotFound(f'Unable to find server with uuid {self.machineIdentifier}')
+        return server[0]
+
+    def getMedia(self):
+        """ Returns list of :class:`~plexapi.base.Playable` which belong to this sync item. """
+        server = self.server().connect()
+        key = f'/sync/items/{self.id}'
+        return server.fetchItems(key)
+
+    def markDownloaded(self, media):
+        """ Mark the file as downloaded (by the nature of Plex it will be marked as downloaded within
+            any SyncItem where it presented).
+
+            Parameters:
+                media (base.Playable): the media to be marked as downloaded.
+        """
+        url = f'/sync/{self.clientIdentifier}/item/{media.ratingKey}/downloaded'
+        media._server.query(url, method=requests.put)
+
+    def delete(self):
+        """ Removes current SyncItem """
+        url = SyncList.key.format(clientId=self.clientIdentifier)
+        url += '/' + str(self.id)
+        self._server.query(url, self._server._session.delete)
+
+
+class SyncList(PlexObject):
+    """ Represents a Mobile Sync state, specific for single client, within one SyncList may be presented
+        items from different servers.
+
+        Attributes:
+            clientId (str): an identifier of the client.
+            items (List<:class:`~plexapi.sync.SyncItem`>): list of registered items to sync.
+    """
+    key = 'https://plex.tv/devices/{clientId}/sync_items'
+    TAG = 'SyncList'
+
+    def _loadData(self, data):
+        self._data = data
+        self.clientId = data.attrib.get('clientIdentifier')
+        self.items = []
+
+        syncItems = data.find('SyncItems')
+        if syncItems:
+            for sync_item in syncItems.iter('SyncItem'):
+                item = SyncItem(self._server, sync_item, clientIdentifier=self.clientId)
+                self.items.append(item)
+
+
+class Status:
+    """ Represents a current status of specific :class:`~plexapi.sync.SyncItem`.
+
+        Attributes:
+            failureCode: unknown, never got one yet.
+            failure: unknown.
+            state (str): server-side status of the item, can be `completed`, `pending`, empty, and probably something
+                         else.
+            itemsCount (int): total items count.
+            itemsCompleteCount (int): count of transcoded and/or downloaded items.
+            itemsDownloadedCount (int): count of downloaded items.
+            itemsReadyCount (int): count of transcoded items, which can be downloaded.
+            totalSize (int): total size in bytes of complete items.
+            itemsSuccessfulCount (int): unknown, in my experience it always was equal to `itemsCompleteCount`.
+    """
+
+    def __init__(self, itemsCount, itemsCompleteCount, state, totalSize, itemsDownloadedCount, itemsReadyCount,
+                 itemsSuccessfulCount, failureCode, failure):
+        self.itemsDownloadedCount = plexapi.utils.cast(int, itemsDownloadedCount)
+        self.totalSize = plexapi.utils.cast(int, totalSize)
+        self.itemsReadyCount = plexapi.utils.cast(int, itemsReadyCount)
+        self.failureCode = failureCode
+        self.failure = failure
+        self.itemsSuccessfulCount = plexapi.utils.cast(int, itemsSuccessfulCount)
+        self.state = state
+        self.itemsCompleteCount = plexapi.utils.cast(int, itemsCompleteCount)
+        self.itemsCount = plexapi.utils.cast(int, itemsCount)
+
+    def __repr__(self):
+        d = dict(
+            itemsCount=self.itemsCount,
+            itemsCompleteCount=self.itemsCompleteCount,
+            itemsDownloadedCount=self.itemsDownloadedCount,
+            itemsReadyCount=self.itemsReadyCount,
+            itemsSuccessfulCount=self.itemsSuccessfulCount
+        )
+        return f'<{self.__class__.__name__}>:{d}'
+
+
+class MediaSettings:
+    """ Transcoding settings used for all media within :class:`~plexapi.sync.SyncItem`.
+
+        Attributes:
+            audioBoost (int): unknown.
+            maxVideoBitrate (int|str): maximum bitrate for video, may be empty string.
+            musicBitrate (int|str): maximum bitrate for music, may be an empty string.
+            photoQuality (int): photo quality on scale 0 to 100.
+            photoResolution (str): maximum photo resolution, formatted as WxH (e.g. `1920x1080`).
+            videoResolution (str): maximum video resolution, formatted as WxH (e.g. `1280x720`, may be empty).
+            subtitleSize (int): subtitle size on scale 0 to 100.
+            videoQuality (int): video quality on scale 0 to 100.
+    """
+
+    def __init__(self, maxVideoBitrate=4000, videoQuality=100, videoResolution='1280x720', audioBoost=100,
+                 musicBitrate=192, photoQuality=74, photoResolution='1920x1080', subtitleSize=100):
+        self.audioBoost = plexapi.utils.cast(int, audioBoost)
+        self.maxVideoBitrate = plexapi.utils.cast(int, maxVideoBitrate) if maxVideoBitrate != '' else ''
+        self.musicBitrate = plexapi.utils.cast(int, musicBitrate) if musicBitrate != '' else ''
+        self.photoQuality = plexapi.utils.cast(int, photoQuality) if photoQuality != '' else ''
+        self.photoResolution = photoResolution
+        self.videoResolution = videoResolution
+        self.subtitleSize = plexapi.utils.cast(int, subtitleSize) if subtitleSize != '' else ''
+        self.videoQuality = plexapi.utils.cast(int, videoQuality) if videoQuality != '' else ''
+
+    @staticmethod
+    def createVideo(videoQuality):
+        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided video quality value.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in this module.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When provided unknown video quality.
+        """
+        if videoQuality == VIDEO_QUALITY_ORIGINAL:
+            return MediaSettings('', '', '')
+        elif videoQuality < len(VIDEO_QUALITIES['bitrate']):
+            return MediaSettings(VIDEO_QUALITIES['bitrate'][videoQuality],
+                                 VIDEO_QUALITIES['videoQuality'][videoQuality],
+                                 VIDEO_QUALITIES['videoResolution'][videoQuality])
+        else:
+            raise BadRequest('Unexpected video quality')
+
+    @staticmethod
+    def createMusic(bitrate):
+        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided music quality value
+
+            Parameters:
+                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
+                               module
+        """
+        return MediaSettings(musicBitrate=bitrate)
+
+    @staticmethod
+    def createPhoto(resolution):
+        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided photo quality value.
+
+            Parameters:
+                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
+                                  module.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: When provided unknown video quality.
+        """
+        if resolution in PHOTO_QUALITIES:
+            return MediaSettings(photoQuality=PHOTO_QUALITIES[resolution], photoResolution=resolution)
+        else:
+            raise BadRequest('Unexpected photo quality')
+
+
+class Policy:
+    """ Policy of syncing the media (how many items to sync and process watched media or not).
+
+        Attributes:
+            scope (str): type of limitation policy, can be `count` or `all`.
+            value (int): amount of media to sync, valid only when `scope=count`.
+            unwatched (bool): True means disallow to sync watched media.
+    """
+
+    def __init__(self, scope, unwatched, value=0):
+        self.scope = scope
+        self.unwatched = plexapi.utils.cast(bool, unwatched)
+        self.value = plexapi.utils.cast(int, value)
+
+    @staticmethod
+    def create(limit=None, unwatched=False):
+        """ Creates a :class:`~plexapi.sync.Policy` object for provided options and automatically sets proper `scope`
+            value.
+
+            Parameters:
+                limit (int): limit items by count.
+                unwatched (bool): if True then watched items wouldn't be synced.
+
+            Returns:
+                :class:`~plexapi.sync.Policy`.
+        """
+        scope = 'all'
+        if limit is None:
+            limit = 0
+        else:
+            scope = 'count'
+
+        return Policy(scope, unwatched, limit)
+
+
+VIDEO_QUALITIES = {
+    'bitrate': [64, 96, 208, 320, 720, 1500, 2e3, 3e3, 4e3, 8e3, 1e4, 12e3, 2e4],
+    'videoResolution': ['220x128', '220x128', '284x160', '420x240', '576x320', '720x480', '1280x720', '1280x720',
+                        '1280x720', '1920x1080', '1920x1080', '1920x1080', '1920x1080'],
+    'videoQuality': [10, 20, 30, 30, 40, 60, 60, 75, 100, 60, 75, 90, 100],
+}
+
+VIDEO_QUALITY_0_2_MBPS = 2
+VIDEO_QUALITY_0_3_MBPS = 3
+VIDEO_QUALITY_0_7_MBPS = 4
+VIDEO_QUALITY_1_5_MBPS_480p = 5
+VIDEO_QUALITY_2_MBPS_720p = 6
+VIDEO_QUALITY_3_MBPS_720p = 7
+VIDEO_QUALITY_4_MBPS_720p = 8
+VIDEO_QUALITY_8_MBPS_1080p = 9
+VIDEO_QUALITY_10_MBPS_1080p = 10
+VIDEO_QUALITY_12_MBPS_1080p = 11
+VIDEO_QUALITY_20_MBPS_1080p = 12
+VIDEO_QUALITY_ORIGINAL = -1
+
+AUDIO_BITRATE_96_KBPS = 96
+AUDIO_BITRATE_128_KBPS = 128
+AUDIO_BITRATE_192_KBPS = 192
+AUDIO_BITRATE_320_KBPS = 320
+
+PHOTO_QUALITIES = {
+    '720x480': 24,
+    '1280x720': 49,
+    '1920x1080': 74,
+    '3840x2160': 99,
+}
+
+PHOTO_QUALITY_HIGHEST = PHOTO_QUALITY_2160p = '3840x2160'
+PHOTO_QUALITY_HIGH = PHOTO_QUALITY_1080p = '1920x1080'
+PHOTO_QUALITY_MEDIUM = PHOTO_QUALITY_720p = '1280x720'
+PHOTO_QUALITY_LOW = PHOTO_QUALITY_480p = '720x480'
diff --git a/libs/plexapi/utils.py b/libs/plexapi/utils.py
new file mode 100644
index 000000000..dd1cfc9ce
--- /dev/null
+++ b/libs/plexapi/utils.py
@@ -0,0 +1,720 @@
+# -*- coding: utf-8 -*-
+import base64
+import functools
+import json
+import logging
+import os
+import re
+import string
+import sys
+import time
+import unicodedata
+import warnings
+import zipfile
+from collections import deque
+from datetime import datetime, timedelta
+from getpass import getpass
+from hashlib import sha1
+from threading import Event, Thread
+from urllib.parse import quote
+
+import requests
+from requests.status_codes import _codes as codes
+
+from plexapi.exceptions import BadRequest, NotFound, Unauthorized
+
+try:
+    from tqdm import tqdm
+except ImportError:
+    tqdm = None
+
+log = logging.getLogger('plexapi')
+
+# Search Types - Plex uses these to filter specific media types when searching.
+SEARCHTYPES = {
+    'movie': 1,
+    'show': 2,
+    'season': 3,
+    'episode': 4,
+    'trailer': 5,
+    'comic': 6,
+    'person': 7,
+    'artist': 8,
+    'album': 9,
+    'track': 10,
+    'picture': 11,
+    'clip': 12,
+    'photo': 13,
+    'photoalbum': 14,
+    'playlist': 15,
+    'playlistFolder': 16,
+    'collection': 18,
+    'optimizedVersion': 42,
+    'userPlaylistItem': 1001,
+}
+REVERSESEARCHTYPES = {v: k for k, v in SEARCHTYPES.items()}
+
+# Tag Types - Plex uses these to filter specific tags when searching.
+TAGTYPES = {
+    'tag': 0,
+    'genre': 1,
+    'collection': 2,
+    'director': 4,
+    'writer': 5,
+    'role': 6,
+    'producer': 7,
+    'country': 8,
+    'chapter': 9,
+    'review': 10,
+    'label': 11,
+    'marker': 12,
+    'mediaProcessingTarget': 42,
+    'make': 200,
+    'model': 201,
+    'aperture': 202,
+    'exposure': 203,
+    'iso': 204,
+    'lens': 205,
+    'device': 206,
+    'autotag': 207,
+    'mood': 300,
+    'style': 301,
+    'format': 302,
+    'similar': 305,
+    'concert': 306,
+    'banner': 311,
+    'poster': 312,
+    'art': 313,
+    'guid': 314,
+    'ratingImage': 316,
+    'theme': 317,
+    'studio': 318,
+    'network': 319,
+    'showOrdering': 322,
+    'clearLogo': 323,
+    'place': 400,
+}
+REVERSETAGTYPES = {v: k for k, v in TAGTYPES.items()}
+
+# Plex Objects - Populated at runtime
+PLEXOBJECTS = {}
+
+
+class SecretsFilter(logging.Filter):
+    """ Logging filter to hide secrets. """
+
+    def __init__(self, secrets=None):
+        self.secrets = secrets or set()
+
+    def add_secret(self, secret):
+        if secret is not None and secret != '':
+            self.secrets.add(secret)
+        return secret
+
+    def filter(self, record):
+        cleanargs = list(record.args)
+        for i in range(len(cleanargs)):
+            if isinstance(cleanargs[i], str):
+                for secret in self.secrets:
+                    cleanargs[i] = cleanargs[i].replace(secret, '<hidden>')
+        record.args = tuple(cleanargs)
+        return True
+
+
+def registerPlexObject(cls):
+    """ Registry of library types we may come across when parsing XML. This allows us to
+        define a few helper functions to dynamically convert the XML into objects. See
+        buildItem() below for an example.
+    """
+    etype = getattr(cls, 'STREAMTYPE', getattr(cls, 'TAGTYPE', cls.TYPE))
+    ehash = f'{cls.TAG}.{etype}' if etype else cls.TAG
+    if getattr(cls, '_SESSIONTYPE', None):
+        ehash = f"{ehash}.session"
+    elif getattr(cls, '_HISTORYTYPE', None):
+        ehash = f"{ehash}.history"
+    if ehash in PLEXOBJECTS:
+        raise Exception(f'Ambiguous PlexObject definition {cls.__name__}(tag={cls.TAG}, type={etype}) '
+                        f'with {PLEXOBJECTS[ehash].__name__}')
+    PLEXOBJECTS[ehash] = cls
+    return cls
+
+
+def getPlexObject(ehash, default):
+    """ Return the PlexObject class for the specified ehash. This recursively looks up the class
+        with the highest specificity, falling back to the default class if not found.
+    """
+    cls = PLEXOBJECTS.get(ehash)
+    if cls is not None:
+        return cls
+    if '.' in ehash:
+        ehash = ehash.rsplit('.', 1)[0]
+        return getPlexObject(ehash, default=default)
+    return PLEXOBJECTS.get(default)
+
+
+def cast(func, value):
+    """ Cast the specified value to the specified type (returned by func). Currently this
+        only support str, int, float, bool. Should be extended if needed.
+
+        Parameters:
+            func (func): Callback function to used cast to type (int, bool, float).
+            value (any): value to be cast and returned.
+    """
+    if value is None:
+        return value
+    if func == bool:
+        if value in (1, True, "1", "true"):
+            return True
+        if value in (0, False, "0", "false"):
+            return False
+        raise ValueError(value)
+
+    if func in (int, float):
+        try:
+            return func(value)
+        except ValueError:
+            return float('nan')
+    return func(value)
+
+
+def joinArgs(args):
+    """ Returns a query string (uses for HTTP URLs) where only the value is URL encoded.
+        Example return value: '?genre=action&type=1337'.
+
+        Parameters:
+            args (dict): Arguments to include in query string.
+    """
+    if not args:
+        return ''
+    arglist = []
+    for key in sorted(args, key=lambda x: x.lower()):
+        value = str(args[key])
+        arglist.append(f"{key}={quote(value, safe='')}")
+    return f"?{'&'.join(arglist)}"
+
+
+def lowerFirst(s):
+    return s[0].lower() + s[1:]
+
+
+def rget(obj, attrstr, default=None, delim='.'):  # pragma: no cover
+    """ Returns the value at the specified attrstr location within a nested tree of
+        dicts, lists, tuples, functions, classes, etc. The lookup is done recursively
+        for each key in attrstr (split by by the delimiter) This function is heavily
+        influenced by the lookups used in Django templates.
+
+        Parameters:
+            obj (any): Object to start the lookup in (dict, obj, list, tuple, etc).
+            attrstr (str): String to lookup (ex: 'foo.bar.baz.value')
+            default (any): Default value to return if not found.
+            delim (str): Delimiter separating keys in attrstr.
+    """
+    try:
+        parts = attrstr.split(delim, 1)
+        attr = parts[0]
+        attrstr = parts[1] if len(parts) == 2 else None
+        if isinstance(obj, dict):
+            value = obj[attr]
+        elif isinstance(obj, list):
+            value = obj[int(attr)]
+        elif isinstance(obj, tuple):
+            value = obj[int(attr)]
+        elif isinstance(obj, object):
+            value = getattr(obj, attr)
+        if attrstr:
+            return rget(value, attrstr, default, delim)
+        return value
+    except:  # noqa: E722
+        return default
+
+
+def searchType(libtype):
+    """ Returns the integer value of the library string type.
+
+        Parameters:
+            libtype (str): LibType to lookup (See :data:`~plexapi.utils.SEARCHTYPES`)
+
+        Raises:
+            :exc:`~plexapi.exceptions.NotFound`: Unknown libtype
+    """
+    libtype = str(libtype)
+    try:
+        return SEARCHTYPES[libtype]
+    except KeyError:
+        if libtype in [str(k) for k in REVERSESEARCHTYPES]:
+            return libtype
+        raise NotFound(f'Unknown libtype: {libtype}') from None
+
+
+def reverseSearchType(libtype):
+    """ Returns the string value of the library type.
+
+        Parameters:
+            libtype (int): Integer value of the library type.
+
+        Raises:
+            :exc:`~plexapi.exceptions.NotFound`: Unknown libtype
+    """
+    try:
+        return REVERSESEARCHTYPES[int(libtype)]
+    except (KeyError, ValueError):
+        if libtype in SEARCHTYPES:
+            return libtype
+        raise NotFound(f'Unknown libtype: {libtype}') from None
+
+
+def tagType(tag):
+    """ Returns the integer value of the library tag type.
+
+        Parameters:
+            tag (str): Tag to lookup (See :data:`~plexapi.utils.TAGTYPES`)
+
+        Raises:
+            :exc:`~plexapi.exceptions.NotFound`: Unknown tag
+    """
+    tag = str(tag)
+    try:
+        return TAGTYPES[tag]
+    except KeyError:
+        if tag in [str(k) for k in REVERSETAGTYPES]:
+            return tag
+        raise NotFound(f'Unknown tag: {tag}') from None
+
+
+def reverseTagType(tag):
+    """ Returns the string value of the library tag type.
+
+        Parameters:
+            tag (int): Integer value of the library tag type.
+
+        Raises:
+            :exc:`~plexapi.exceptions.NotFound`: Unknown tag
+    """
+    try:
+        return REVERSETAGTYPES[int(tag)]
+    except (KeyError, ValueError):
+        if tag in TAGTYPES:
+            return tag
+        raise NotFound(f'Unknown tag: {tag}') from None
+
+
+def threaded(callback, listargs):
+    """ Returns the result of <callback> for each set of `*args` in listargs. Each call
+        to <callback> is called concurrently in their own separate threads.
+
+        Parameters:
+            callback (func): Callback function to apply to each set of `*args`.
+            listargs (list): List of lists; `*args` to pass each thread.
+    """
+    threads, results = [], []
+    job_is_done_event = Event()
+    for args in listargs:
+        args += [results, len(results)]
+        results.append(None)
+        threads.append(Thread(target=callback, args=args, kwargs=dict(job_is_done_event=job_is_done_event)))
+        threads[-1].daemon = True
+        threads[-1].start()
+    while not job_is_done_event.is_set():
+        if all(not t.is_alive() for t in threads):
+            break
+        time.sleep(0.05)
+
+    return [r for r in results if r is not None]
+
+
+def toDatetime(value, format=None):
+    """ Returns a datetime object from the specified value.
+
+        Parameters:
+            value (str): value to return as a datetime
+            format (str): Format to pass strftime (optional; if value is a str).
+    """
+    if value is not None:
+        if format:
+            try:
+                return datetime.strptime(value, format)
+            except ValueError:
+                log.info('Failed to parse "%s" to datetime as format "%s", defaulting to None', value, format)
+                return None
+        else:
+            try:
+                value = int(value)
+            except ValueError:
+                log.info('Failed to parse "%s" to datetime as timestamp, defaulting to None', value)
+                return None
+            try:
+                return datetime.fromtimestamp(value)
+            except (OSError, OverflowError, ValueError):
+                try:
+                    return datetime.fromtimestamp(0) + timedelta(seconds=value)
+                except OverflowError:
+                    log.info('Failed to parse "%s" to datetime as timestamp (out-of-bounds), defaulting to None', value)
+                    return None
+    return value
+
+
+def millisecondToHumanstr(milliseconds):
+    """ Returns human readable time duration [D day[s], ]HH:MM:SS.UUU from milliseconds.
+
+        Parameters:
+            milliseconds (str, int): time duration in milliseconds.
+    """
+    milliseconds = int(milliseconds)
+    if milliseconds < 0:
+        return '-' + millisecondToHumanstr(abs(milliseconds))
+    secs, ms = divmod(milliseconds, 1000)
+    mins, secs = divmod(secs, 60)
+    hours, mins = divmod(mins, 60)
+    days, hours = divmod(hours, 24)
+    return ('' if days == 0 else f'{days} day{"s" if days > 1 else ""}, ') + f'{hours:02d}:{mins:02d}:{secs:02d}.{ms:03d}'
+
+
+def toList(value, itemcast=None, delim=','):
+    """ Returns a list of strings from the specified value.
+
+        Parameters:
+            value (str): comma delimited string to convert to list.
+            itemcast (func): Function to cast each list item to (default str).
+            delim (str): string delimiter (optional; default ',').
+    """
+    value = value or ''
+    itemcast = itemcast or str
+    return [itemcast(item) for item in value.split(delim) if item != '']
+
+
+def cleanFilename(filename, replace='_'):
+    whitelist = f"-_.()[] {string.ascii_letters}{string.digits}"
+    cleaned_filename = unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').decode()
+    cleaned_filename = ''.join(c if c in whitelist else replace for c in cleaned_filename)
+    return cleaned_filename
+
+
+def downloadSessionImages(server, filename=None, height=150, width=150,
+                          opacity=100, saturation=100):  # pragma: no cover
+    """ Helper to download a bif image or thumb.url from plex.server.sessions.
+
+       Parameters:
+           filename (str): default to None,
+           height (int): Height of the image.
+           width (int): width of the image.
+           opacity (int): Opacity of the resulting image (possibly deprecated).
+           saturation (int): Saturating of the resulting image.
+
+       Returns:
+            {'hellowlol': {'filepath': '<filepath>', 'url': 'http://<url>'},
+            {'<username>': {filepath, url}}, ...
+    """
+    info = {}
+    for media in server.sessions():
+        url = None
+        for part in media.iterParts():
+            if media.thumb:
+                url = media.thumb
+            if part.indexes:  # always use bif images if available.
+                url = f'/library/parts/{part.id}/indexes/{part.indexes.lower()}/{media.viewOffset}'
+        if url:
+            if filename is None:
+                prettyname = media._prettyfilename()
+                filename = f'session_transcode_{media.usernames[0]}_{prettyname}_{int(time.time())}'
+            url = server.transcodeImage(url, height, width, opacity, saturation)
+            filepath = download(url, server._token, filename=filename)
+            info['username'] = {'filepath': filepath, 'url': url}
+    return info
+
+
+def download(url, token, filename=None, savepath=None, session=None, chunksize=4096,   # noqa: C901
+             unpack=False, mocked=False, showstatus=False):
+    """ Helper to download a thumb, videofile or other media item. Returns the local
+        path to the downloaded file.
+
+       Parameters:
+            url (str): URL where the content be reached.
+            token (str): Plex auth token to include in headers.
+            filename (str): Filename of the downloaded file, default None.
+            savepath (str): Defaults to current working dir.
+            chunksize (int): What chunksize read/write at the time.
+            mocked (bool): Helper to do everything except write the file.
+            unpack (bool): Unpack the zip file.
+            showstatus(bool): Display a progressbar.
+
+        Example:
+            >>> download(a_episode.getStreamURL(), a_episode.location)
+            /path/to/file
+    """
+    # fetch the data to be saved
+    session = session or requests.Session()
+    headers = {'X-Plex-Token': token}
+    response = session.get(url, headers=headers, stream=True)
+    if response.status_code not in (200, 201, 204):
+        codename = codes.get(response.status_code)[0]
+        errtext = response.text.replace('\n', ' ')
+        message = f'({response.status_code}) {codename}; {response.url} {errtext}'
+        if response.status_code == 401:
+            raise Unauthorized(message)
+        elif response.status_code == 404:
+            raise NotFound(message)
+        else:
+            raise BadRequest(message)
+
+    # make sure the savepath directory exists
+    savepath = savepath or os.getcwd()
+    os.makedirs(savepath, exist_ok=True)
+
+    # try getting filename from header if not specified in arguments (used for logs, db)
+    if not filename and response.headers.get('Content-Disposition'):
+        filename = re.findall(r'filename=\"(.+)\"', response.headers.get('Content-Disposition'))
+        filename = filename[0] if filename[0] else None
+
+    filename = os.path.basename(filename)
+    fullpath = os.path.join(savepath, filename)
+    # append file.ext from content-type if not already there
+    extension = os.path.splitext(fullpath)[-1]
+    if not extension:
+        contenttype = response.headers.get('content-type')
+        if contenttype and 'image' in contenttype:
+            fullpath += contenttype.split('/')[1]
+
+    # check this is a mocked download (testing)
+    if mocked:
+        log.debug('Mocked download %s', fullpath)
+        return fullpath
+
+    # save the file to disk
+    log.info('Downloading: %s', fullpath)
+    if showstatus and tqdm:  # pragma: no cover
+        total = int(response.headers.get('content-length', 0))
+        bar = tqdm(unit='B', unit_scale=True, total=total, desc=filename)
+
+    with open(fullpath, 'wb') as handle:
+        for chunk in response.iter_content(chunk_size=chunksize):
+            handle.write(chunk)
+            if showstatus and tqdm:
+                bar.update(len(chunk))
+
+    if showstatus and tqdm:  # pragma: no cover
+        bar.close()
+    # check we want to unzip the contents
+    if fullpath.endswith('zip') and unpack:
+        with zipfile.ZipFile(fullpath, 'r') as handle:
+            handle.extractall(savepath)
+
+    return fullpath
+
+
+def getMyPlexAccount(opts=None):  # pragma: no cover
+    """ Helper function tries to get a MyPlex Account instance by checking
+        the the following locations for a username and password. This is
+        useful to create user-friendly command line tools.
+        1. command-line options (opts).
+        2. environment variables and config.ini
+        3. Prompt on the command line.
+    """
+    from plexapi import CONFIG
+    from plexapi.myplex import MyPlexAccount
+    # 1. Check command-line options
+    if opts and opts.username and opts.password:
+        print(f'Authenticating with Plex.tv as {opts.username}..')
+        return MyPlexAccount(opts.username, opts.password)
+    # 2. Check Plexconfig (environment variables and config.ini)
+    config_username = CONFIG.get('auth.myplex_username')
+    config_password = CONFIG.get('auth.myplex_password')
+    if config_username and config_password:
+        print(f'Authenticating with Plex.tv as {config_username}..')
+        return MyPlexAccount(config_username, config_password)
+    config_token = CONFIG.get('auth.server_token')
+    if config_token:
+        print('Authenticating with Plex.tv with token')
+        return MyPlexAccount(token=config_token)
+    # 3. Prompt for username and password on the command line
+    username = input('What is your plex.tv username: ')
+    password = getpass('What is your plex.tv password: ')
+    print(f'Authenticating with Plex.tv as {username}..')
+    return MyPlexAccount(username, password)
+
+
+def createMyPlexDevice(headers, account, 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.
+            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:
+        raise BadRequest('The X-Plex-Client-Identifier header is required.')
+
+    clientIdentifier = headers['X-Plex-Client-Identifier']
+
+    pinlogin = MyPlexPinLogin(headers=headers)
+    pinlogin.run(timeout=timeout)
+    account.link(pinlogin.pin)
+    pinlogin.waitForLogin()
+
+    return account.device(clientId=clientIdentifier)
+
+
+def plexOAuth(headers, forwardUrl=None, timeout=120):  # pragma: no cover
+    """ Helper function for Plex OAuth login. Returns a new MyPlexAccount instance.
+
+        Parameters:
+            headers (dict): Provide the X-Plex- headers for the new device.
+                A unique X-Plex-Client-Identifier is required.
+            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.
+    """
+    from plexapi.myplex import MyPlexAccount, MyPlexPinLogin
+
+    if '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)
+    pinlogin.waitForLogin()
+
+    if pinlogin.token:
+        print('Login successful!')
+        return MyPlexAccount(token=pinlogin.token)
+    else:
+        print('Login 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.
+    """
+    # Return the first item if there is only one choice
+    if len(items) == 1:
+        return items[0]
+    # Print all choices to the command line
+    print()
+    for index, i in enumerate(items):
+        name = attr(i) if callable(attr) else getattr(i, attr)
+        print(f'  {index}: {name}')
+    print()
+    # Request choice from the user
+    while True:
+        try:
+            inp = input(f'{msg}: ')
+            if any(s in inp for s in (':', '::', '-')):
+                idx = slice(*map(lambda x: int(x.strip()) if x.strip() else None, inp.split(':')))
+                return items[idx]
+            else:
+                return items[int(inp)]
+
+        except (ValueError, IndexError):
+            pass
+
+
+def getAgentIdentifier(section, agent):
+    """ Return the full agent identifier from a short identifier, name, or confirm full identifier. """
+    agents = []
+    for ag in section.agents():
+        identifiers = [ag.identifier, ag.shortIdentifier, ag.name]
+        if agent in identifiers:
+            return ag.identifier
+        agents += identifiers
+    raise NotFound(f"Could not find \"{agent}\" in agents list ({', '.join(agents)})")
+
+
+def base64str(text):
+    return base64.b64encode(text.encode('utf-8')).decode('utf-8')
+
+
+def deprecated(message, stacklevel=2):
+    def decorator(func):
+        """This is a decorator which can be used to mark functions
+        as deprecated. It will result in a warning being emitted
+        when the function is used."""
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            msg = f'Call to deprecated function or method "{func.__name__}", {message}.'
+            warnings.warn(msg, category=DeprecationWarning, stacklevel=stacklevel)
+            log.warning(msg)
+            return func(*args, **kwargs)
+        return wrapper
+    return decorator
+
+
+def iterXMLBFS(root, tag=None):
+    """ Iterate through an XML tree using a breadth-first search.
+        If tag is specified, only return nodes with that tag.
+    """
+    queue = deque([root])
+    while queue:
+        node = queue.popleft()
+        if tag is None or node.tag == tag:
+            yield node
+        queue.extend(list(node))
+
+
+def toJson(obj, **kwargs):
+    """ Convert an object to a JSON string.
+
+        Parameters:
+            obj (object): The object to convert.
+            **kwargs (dict): Keyword arguments to pass to ``json.dumps()``.
+    """
+    def serialize(obj):
+        if isinstance(obj, datetime):
+            return obj.isoformat()
+        return {k: v for k, v in obj.__dict__.items() if not k.startswith('_')}
+    return json.dumps(obj, default=serialize, **kwargs)
+
+
+def openOrRead(file):
+    if hasattr(file, 'read'):
+        return file.read()
+    with open(file, 'rb') as f:
+        return f.read()
+
+
+def sha1hash(guid):
+    """ Return the SHA1 hash of a guid. """
+    return sha1(guid.encode('utf-8')).hexdigest()
+
+
+# https://stackoverflow.com/a/64570125
+_illegal_XML_characters = [
+    (0x00, 0x08),
+    (0x0B, 0x0C),
+    (0x0E, 0x1F),
+    (0x7F, 0x84),
+    (0x86, 0x9F),
+    (0xFDD0, 0xFDDF),
+    (0xFFFE, 0xFFFF),
+]
+if sys.maxunicode >= 0x10000:  # not narrow build
+    _illegal_XML_characters.extend(
+        [
+            (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),
+        ]
+    )
+_illegal_XML_ranges = [
+    fr'{chr(low)}-{chr(high)}'
+    for (low, high) in _illegal_XML_characters
+]
+_illegal_XML_re = re.compile(fr'[{"".join(_illegal_XML_ranges)}]')
+
+
+def cleanXMLString(s):
+    return _illegal_XML_re.sub('', s)
diff --git a/libs/plexapi/video.py b/libs/plexapi/video.py
new file mode 100644
index 000000000..9e4201b88
--- /dev/null
+++ b/libs/plexapi/video.py
@@ -0,0 +1,1278 @@
+# -*- 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.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
+)
+
+
+class Video(PlexPartialObject, PlayedUnplayedMixin):
+    """ Base class for all video objects including :class:`~plexapi.video.Movie`,
+        :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season`,
+        :class:`~plexapi.video.Episode`, and :class:`~plexapi.video.Clip`.
+
+        Attributes:
+            addedAt (datetime): Datetime the item was added to the library.
+            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
+            artBlurHash (str): BlurHash string for artwork image.
+            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
+            guid (str): Plex GUID for the movie, show, season, episode, or clip (plex://movie/5d776b59ad5437001f79c6f8).
+            images (List<:class:`~plexapi.media.Image`>): List of image objects.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            lastRatedAt (datetime): Datetime the item was last rated.
+            lastViewedAt (datetime): Datetime the item was last played.
+            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
+            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
+            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
+            listType (str): Hardcoded as 'video' (useful for search filters).
+            ratingKey (int): Unique key identifying the item.
+            summary (str): Summary of the movie, show, season, episode, or clip.
+            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
+            thumbBlurHash (str): BlurHash string for thumbnail image.
+            title (str): Name of the movie, show, season, episode, or clip.
+            titleSort (str): Title to use when sorting (defaults to title).
+            type (str): 'movie', 'show', 'season', 'episode', or 'clip'.
+            updatedAt (datetime): Datetime the item was updated.
+            userRating (float): Rating of the item (0.0 - 10.0) equaling (0 stars - 5 stars).
+            viewCount (int): Count of times the item was played.
+    """
+
+    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'))
+        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
+        self.librarySectionKey = data.attrib.get('librarySectionKey')
+        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
+        self.listType = 'video'
+        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
+        self.summary = data.attrib.get('summary')
+        self.thumb = data.attrib.get('thumb')
+        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
+        self.title = data.attrib.get('title')
+        self.titleSort = data.attrib.get('titleSort', self.title)
+        self.type = data.attrib.get('type')
+        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
+        self.userRating = utils.cast(float, data.attrib.get('userRating'))
+        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
+
+    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
+
+    def augmentation(self):
+        """ Returns a list of :class:`~plexapi.library.Hub` objects.
+            Augmentation returns hub items relating to online media sources
+            such as Tidal Music "Track from {item}" or "Soundtrack of {item}".
+            Plex Pass and linked Tidal account are required.
+        """
+        account = self._server.myPlexAccount()
+        tidalOptOut = next(
+            (service.value for service in account.onlineMediaSources()
+                if service.key == 'tv.plex.provider.music'),
+            None
+        )
+        if account.subscriptionStatus != 'Active' or tidalOptOut == 'opt_out':
+            raise BadRequest('Requires Plex Pass and Tidal Music enabled.')
+        data = self._server.query(self.key + '?asyncAugmentMetadata=1')
+        augmentationKey = data.attrib.get('augmentationKey')
+        return self.fetchItems(augmentationKey)
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return self.title
+
+    def uploadSubtitles(self, filepath):
+        """ Upload a subtitle file for the video.
+
+            Parameters:
+                filepath (str): Path to subtitle file.
+        """
+        url = f'{self.key}/subtitles'
+        filename = os.path.basename(filepath)
+        subFormat = os.path.splitext(filepath)[1][1:]
+        params = {
+            'title': filename,
+            'format': subFormat,
+        }
+        headers = {'Accept': 'text/plain, */*'}
+        with open(filepath, 'rb') as subfile:
+            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
+        return self
+
+    def searchSubtitles(self, language='en', hearingImpaired=0, forced=0):
+        """ Search for on-demand subtitles for the video.
+            See https://support.plex.tv/articles/subtitle-search/.
+
+            Parameters:
+                language (str, optional): Language code (ISO 639-1) of the subtitles to search for.
+                    Default 'en'.
+                hearingImpaired (int, optional): Search option for SDH subtitles.
+                    Default 0.
+                    (0 = Prefer non-SDH subtitles, 1 = Prefer SDH subtitles,
+                    2 = Only show SDH subtitles, 3 = Only show non-SDH subtitles)
+                forced (int, optional): Search option for forced subtitles.
+                    Default 0.
+                    (0 = Prefer non-forced subtitles, 1 = Prefer forced subtitles,
+                    2 = Only show forced subtitles, 3 = Only show non-forced subtitles)
+
+            Returns:
+                List<:class:`~plexapi.media.SubtitleStream`>: List of SubtitleStream objects.
+        """
+        params = {
+            'language': language,
+            'hearingImpaired': hearingImpaired,
+            'forced': forced,
+        }
+        key = f'{self.key}/subtitles{utils.joinArgs(params)}'
+        return self.fetchItems(key)
+
+    def downloadSubtitles(self, subtitleStream):
+        """ Download on-demand subtitles for the video.
+            See https://support.plex.tv/articles/subtitle-search/.
+
+            Note: This method is asynchronous and returns immediately before subtitles are fully downloaded.
+
+            Parameters:
+                subtitleStream (:class:`~plexapi.media.SubtitleStream`):
+                    Subtitle object returned from :func:`~plexapi.video.Video.searchSubtitles`.
+        """
+        key = f'{self.key}/subtitles'
+        params = {'key': subtitleStream.key}
+        self._server.query(key, self._server._session.put, params=params)
+        return self
+
+    def removeSubtitles(self, subtitleStream=None, streamID=None, streamTitle=None):
+        """ Remove an upload or downloaded subtitle from the video.
+
+            Note: If the subtitle file is located inside video directory it will be deleted.
+            Files outside of video directory are not affected.
+            Embedded subtitles cannot be removed.
+
+            Parameters:
+                subtitleStream (:class:`~plexapi.media.SubtitleStream`, optional): Subtitle object to remove.
+                streamID (int, optional): ID of the subtitle stream to remove.
+                streamTitle (str, optional): Title of the subtitle stream to remove.
+        """
+        if subtitleStream is None:
+            try:
+                subtitleStream = next(
+                    stream for stream in self.subtitleStreams()
+                    if streamID == stream.id or streamTitle == stream.title
+                )
+            except StopIteration:
+                raise BadRequest(f"Subtitle stream with ID '{streamID}' or title '{streamTitle}' not found.") from None
+
+        self._server.query(subtitleStream.key, self._server._session.delete)
+        return self
+
+    def optimize(self, title='', target='', deviceProfile='', videoQuality=None,
+                 locationID=-1, limit=None, unwatched=False):
+        """ Create an optimized version of the video.
+
+            Parameters:
+                title (str, optional): Title of the optimized video.
+                target (str, optional): Target quality profile:
+                    "Optimized for Mobile" ("mobile"), "Optimized for TV" ("tv"), "Original Quality" ("original"),
+                    or custom quality profile name (default  "Custom: {deviceProfile}").
+                deviceProfile (str, optional): Custom quality device profile:
+                    "Android", "iOS", "Universal Mobile", "Universal TV", "Windows Phone", "Windows", "Xbox One".
+                    Required if ``target`` is custom.
+                videoQuality (int, optional): Index of the quality profile, one of ``VIDEO_QUALITY_*``
+                    values defined in the :mod:`~plexapi.sync` module. Only used if ``target`` is custom.
+                locationID (int or :class:`~plexapi.library.Location`, optional): Default -1 for
+                    "In folder with original items", otherwise a :class:`~plexapi.library.Location` object or ID.
+                    See examples below.
+                limit (int, optional): Maximum count of items to optimize, unlimited if ``None``.
+                unwatched (bool, optional): ``True`` to only optimized unwatched videos.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: Unknown quality profile target
+                    or missing deviceProfile and videoQuality.
+                :exc:`~plexapi.exceptions.BadRequest`: Unknown location ID.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Optimize for mobile using defaults
+                    video.optimize(target="mobile")
+
+                    # Optimize for Android at 10 Mbps 1080p
+                    from plexapi.sync import VIDEO_QUALITY_10_MBPS_1080p
+                    video.optimize(deviceProfile="Android", videoQuality=sync.VIDEO_QUALITY_10_MBPS_1080p)
+
+                    # Optimize for iOS at original quality in library location
+                    from plexapi.sync import VIDEO_QUALITY_ORIGINAL
+                    locations = plex.library.section("Movies")._locations()
+                    video.optimize(deviceProfile="iOS", videoQuality=VIDEO_QUALITY_ORIGINAL, locationID=locations[0])
+
+                    # Optimize for tv the next 5 unwatched episodes
+                    show.optimize(target="tv", limit=5, unwatched=True)
+
+        """
+        from plexapi.library import Location
+        from plexapi.sync import Policy, MediaSettings
+
+        backgroundProcessing = self.fetchItem('/playlists?type=42')
+        key = f'{backgroundProcessing.key}/items'
+
+        tags = {t.tag.lower(): t.id for t in self._server.library.tags('mediaProcessingTarget')}
+        # Additional keys for shorthand values
+        tags['mobile'] = tags['optimized for mobile']
+        tags['tv'] = tags['optimized for tv']
+        tags['original'] = tags['original quality']
+
+        targetTagID = tags.get(target.lower(), '')
+        if not targetTagID and (not deviceProfile or videoQuality is None):
+            raise BadRequest('Unknown quality profile target or missing deviceProfile and videoQuality.')
+        if targetTagID:
+            target = ''
+        elif deviceProfile and not target:
+            target = f'Custom: {deviceProfile}'
+
+        section = self.section()
+        libraryLocationIDs = [-1] + [location.id for location in section._locations()]
+        if isinstance(locationID, Location):
+            locationID = locationID.id
+        if locationID not in libraryLocationIDs:
+            raise BadRequest(f'Unknown location ID "{locationID}" not in {libraryLocationIDs}')
+
+        if isinstance(self, (Show, Season)):
+            uri = f'library:///directory/{quote_plus(f"{self.key}/children")}'
+        else:
+            uri = f'library://{section.uuid}/item/{quote_plus(self.key)}'
+
+        policy = Policy.create(limit, unwatched)
+
+        params = {
+            'Item[type]': 42,
+            'Item[title]': title or self._defaultSyncTitle(),
+            'Item[target]': target,
+            'Item[targetTagID]': targetTagID,
+            'Item[locationID]': locationID,
+            'Item[Location][uri]': uri,
+            'Item[Policy][scope]': policy.scope,
+            'Item[Policy][value]': str(policy.value),
+            'Item[Policy][unwatched]': str(int(policy.unwatched)),
+        }
+
+        if deviceProfile:
+            params['Item[Device][profile]'] = deviceProfile
+
+        if videoQuality:
+            mediaSettings = MediaSettings.createVideo(videoQuality)
+            params['Item[MediaSettings][videoQuality]'] = mediaSettings.videoQuality
+            params['Item[MediaSettings][videoResolution]'] = mediaSettings.videoResolution
+            params['Item[MediaSettings][maxVideoBitrate]'] = mediaSettings.maxVideoBitrate
+            params['Item[MediaSettings][audioBoost]'] = ''
+            params['Item[MediaSettings][subtitleSize]'] = ''
+            params['Item[MediaSettings][musicBitrate]'] = ''
+            params['Item[MediaSettings][photoQuality]'] = ''
+            params['Item[MediaSettings][photoResolution]'] = ''
+
+        url = key + utils.joinArgs(params)
+        self._server.query(url, method=self._server._session.put)
+        return self
+
+    def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=False, title=None):
+        """ Add current video (movie, tv-show, season or episode) as sync item for specified device.
+            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
+
+            Parameters:
+                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
+                                    :mod:`~plexapi.sync` module.
+                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
+                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
+                limit (int): maximum count of items to sync, unlimited if `None`.
+                unwatched (bool): if `True` watched videos wouldn't be synced.
+                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
+                             generated from metadata of current media.
+
+            Returns:
+                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
+        """
+
+        from plexapi.sync import SyncItem, Policy, MediaSettings
+
+        myplex = self._server.myPlexAccount()
+        sync_item = SyncItem(self._server, None)
+        sync_item.title = title if title else self._defaultSyncTitle()
+        sync_item.rootTitle = self.title
+        sync_item.contentType = self.listType
+        sync_item.metadataType = self.METADATA_TYPE
+        sync_item.machineIdentifier = self._server.machineIdentifier
+
+        section = self._server.library.sectionByID(self.librarySectionID)
+
+        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
+        sync_item.policy = Policy.create(limit, unwatched)
+        sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
+
+        return myplex.sync(sync_item, client=client, clientId=clientId)
+
+
+@utils.registerPlexObject
+class Movie(
+    Video, Playable,
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
+    MovieEditMixins,
+    WatchlistMixin
+):
+    """ Represents a single Movie.
+
+        Attributes:
+            TAG (str): 'Video'
+            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.
+            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).
+            countries (List<:class:`~plexapi.media.Country`>): List of countries 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.).
+            enableCreditsMarkerGeneration (int): Setting that indicates if credits markers detection is enabled.
+                (-1 = Library default, 0 = Disabled)
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            languageOverride (str): Setting that indicates if a language is used to override metadata
+                (eg. en-CA, None = Library default).
+            markers (List<:class:`~plexapi.media.Marker`>): List of marker objects.
+            media (List<:class:`~plexapi.media.Media`>): List of media objects.
+            originallyAvailableAt (datetime): Datetime the movie was released.
+            originalTitle (str): Original title, often the foreign title (転々; 엽기적인 그녀).
+            primaryExtraKey (str) Primary extra key (/library/metadata/66351).
+            producers (List<:class:`~plexapi.media.Producer`>): List of producers objects.
+            rating (float): Movie critic rating (7.9; 9.8; 8.1).
+            ratingImage (str): Key to critic rating image (rottentomatoes://image.rating.rotten).
+            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
+            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
+            slug (str): The clean watch.plex.tv URL identifier for the movie.
+            similar (List<:class:`~plexapi.media.Similar`>): List of Similar objects.
+            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
+                (remote playlist item only).
+            studio (str): Studio that created movie (Di Bonaventura Pictures; 21 Laps Entertainment).
+            tagline (str): Movie tag line (Back 2 Work; Who says men can't change?).
+            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            useOriginalTitle (int): Setting that indicates if the original title is used for the movie
+                (-1 = Library default, 0 = No, 1 = Yes).
+            viewOffset (int): View offset in milliseconds.
+            writers (List<:class:`~plexapi.media.Writer`>): List of writers objects.
+            year (int): Year movie was released.
+    """
+    TAG = 'Video'
+    TYPE = 'movie'
+    METADATA_TYPE = 'movie'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Video._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'))
+
+    @property
+    def actors(self):
+        """ Alias to self.roles. """
+        return self.roles
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the locations of the movie.
+
+            Returns:
+                List<str> of file paths where the movie is found on disk.
+        """
+        return [part.file for part in self.iterParts() if part]
+
+    @property
+    def hasCreditsMarker(self):
+        """ Returns True if the movie has a credits marker. """
+        return any(marker.type == 'credits' for marker in self.markers)
+
+    @property
+    def hasVoiceActivity(self):
+        """ Returns True if any of the media has voice activity analyzed. """
+        return any(media.hasVoiceActivity for media in self.media)
+
+    @property
+    def hasPreviewThumbnails(self):
+        """ Returns True if any of the media parts has generated preview (BIF) thumbnails. """
+        return any(part.hasPreviewThumbnails for media in self.media for part in media.parts)
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        return f'{self.title} ({self.year})'
+
+    def reviews(self):
+        """ Returns a list of :class:`~plexapi.media.Review` objects. """
+        key = f'{self.key}?includeReviews=1'
+        return self.fetchItems(key, cls=media.Review, rtag='Video')
+
+    def editions(self):
+        """ Returns a list of :class:`~plexapi.video.Movie` objects
+            for other editions of the same movie.
+        """
+        filters = {
+            'guid': self.guid,
+            'id!': self.ratingKey
+        }
+        return self.section().search(filters=filters)
+
+    def removeFromContinueWatching(self):
+        """ Remove the movie from continue watching. """
+        key = '/actions/removeFromContinueWatching'
+        params = {'ratingKey': self.ratingKey}
+        self._server.query(key, params=params, method=self._server._session.put)
+        return self
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Movies' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Show(
+    Video,
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
+    ShowEditMixins,
+    WatchlistMixin
+):
+    """ Represents a single Show (including all seasons and episodes).
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'show'
+            audienceRating (float): Audience rating (TMDB or TVDB).
+            audienceRatingImage (str): Key to audience rating image (tmdb://image.rating).
+            audioLanguage (str): Setting that indicates the preferred audio language.
+            autoDeletionItemPolicyUnwatchedLibrary (int): Setting that indicates the number of unplayed
+                episodes to keep for the show (0 = All episodes, 5 = 5 latest episodes, 3 = 3 latest episodes,
+                1 = 1 latest episode, -3 = Episodes added in the past 3 days, -7 = Episodes added in the
+                past 7 days, -30 = Episodes added in the past 30 days).
+            autoDeletionItemPolicyWatchedLibrary (int): Setting that indicates if episodes are deleted
+                after being watched for the show (0 = Never, 1 = After a day, 7 = After a week,
+                100 = On next refresh).
+            childCount (int): Number of seasons (including Specials) in the show.
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            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.
+                (-1 = Library default, 0 = Disabled).
+            episodeSort (int): Setting that indicates how episodes are sorted for the show
+                (-1 = Library default, 0 = Oldest first, 1 = Newest first).
+            flattenSeasons (int): Setting that indicates if seasons are set to hidden for the show
+                (-1 = Library default, 0 = Hide, 1 = Show).
+            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            index (int): Plex index number for the show.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            languageOverride (str): Setting that indicates if a language is used to override metadata
+                (eg. en-CA, None = Library default).
+            leafCount (int): Number of items in the show view.
+            locations (List<str>): List of folder paths where the show is found on disk.
+            network (str): The network that distributed the show.
+            originallyAvailableAt (datetime): Datetime the show was released.
+            originalTitle (str): The original title of the show.
+            rating (float): Show rating (7.9; 9.8; 8.1).
+            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
+            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
+            seasonCount (int): Number of seasons (excluding Specials) in the show.
+            showOrdering (str): Setting that indicates the episode ordering for the show
+                (None = Library default, tmdbAiring = The Movie Database (Aired),
+                aired = TheTVDB (Aired), dvd = TheTVDB (DVD), absolute = TheTVDB (Absolute)).
+            similar (List<:class:`~plexapi.media.Similar`>): List of Similar objects.
+            slug (str): The clean watch.plex.tv URL identifier for the show.
+            studio (str): Studio that created show (Di Bonaventura Pictures; 21 Laps Entertainment).
+            subtitleLanguage (str): Setting that indicates the preferred subtitle language.
+            subtitleMode (int): Setting that indicates the auto-select subtitle mode.
+                (-1 = Account default, 0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
+            tagline (str): Show tag line.
+            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            useOriginalTitle (int): Setting that indicates if the original title is used for the show
+                (-1 = Library default, 0 = No, 1 = Yes).
+            viewedLeafCount (int): Number of items marked as played in the show view.
+            year (int): Year the show was released.
+    """
+    TAG = 'Directory'
+    TYPE = 'show'
+    METADATA_TYPE = 'episode'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Video._loadData(self, data)
+        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
+        self.audienceRatingImage = data.attrib.get('audienceRatingImage')
+        self.audioLanguage = data.attrib.get('audioLanguage', '')
+        self.autoDeletionItemPolicyUnwatchedLibrary = utils.cast(
+            int, data.attrib.get('autoDeletionItemPolicyUnwatchedLibrary', '0'))
+        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'))
+
+    def __iter__(self):
+        for season in self.seasons():
+            yield season
+
+    @property
+    def actors(self):
+        """ Alias to self.roles. """
+        return self.roles
+
+    @property
+    def isPlayed(self):
+        """ Returns True if the show is fully played. """
+        return bool(self.viewedLeafCount == self.leafCount)
+
+    def onDeck(self):
+        """ Returns show's On Deck :class:`~plexapi.video.Video` object or `None`.
+            If show is unwatched, return will likely be the first episode.
+        """
+        key = f'{self.key}?includeOnDeck=1'
+        return next(iter(self.fetchItems(key, cls=Episode, rtag='OnDeck')), None)
+
+    def season(self, title=None, season=None):
+        """ Returns the season with the specified title or number.
+
+            Parameters:
+                title (str): Title of the season to return.
+                season (int): Season number (default: None; required if title not specified).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If title or season parameter is missing.
+        """
+        key = f'{self.key}/children?excludeAllLeaves=1'
+        if title is not None and not isinstance(title, int):
+            return self.fetchItem(key, Season, title__iexact=title)
+        elif season is not None or isinstance(title, int):
+            if isinstance(title, int):
+                index = title
+            else:
+                index = season
+            return self.fetchItem(key, Season, index=index)
+        raise BadRequest('Missing argument: title or season is required')
+
+    def seasons(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Season` objects in the show. """
+        key = f'{self.key}/children?excludeAllLeaves=1'
+        return self.fetchItems(key, Season, container_size=self.childCount, **kwargs)
+
+    def episode(self, title=None, season=None, episode=None):
+        """ Find a episode using a title or season and episode.
+
+            Parameters:
+                title (str): Title of the episode to return
+                season (int): Season number (default: None; required if title not specified).
+                episode (int): Episode number (default: None; required if title not specified).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If title or season and episode parameters are missing.
+        """
+        key = f'{self.key}/allLeaves'
+        if title is not None:
+            return self.fetchItem(key, Episode, title__iexact=title)
+        elif season is not None and episode is not None:
+            return self.fetchItem(key, Episode, parentIndex=season, index=episode)
+        raise BadRequest('Missing argument: title or season and episode are required')
+
+    def episodes(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Episode` objects in the show. """
+        key = f'{self.key}/allLeaves'
+        return self.fetchItems(key, Episode, **kwargs)
+
+    def get(self, title=None, season=None, episode=None):
+        """ Alias to :func:`~plexapi.video.Show.episode`. """
+        return self.episode(title, season, episode)
+
+    def watched(self):
+        """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
+        return self.episodes(viewCount__gt=0)
+
+    def unwatched(self):
+        """ Returns list of unwatched :class:`~plexapi.video.Episode` objects. """
+        return self.episodes(viewCount=0)
+
+    def download(self, savepath=None, keep_original_name=False, subfolders=False, **kwargs):
+        """ Download all episodes from the show. See :func:`~plexapi.base.Playable.download` for details.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated.
+                subfolders (bool): True to separate episodes in to season folders.
+                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
+        """
+        filepaths = []
+        for episode in self.episodes():
+            _savepath = os.path.join(savepath, f'Season {str(episode.seasonNumber).zfill(2)}') if subfolders else savepath
+            filepaths += episode.download(_savepath, keep_original_name, **kwargs)
+        return filepaths
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Season(
+    Video,
+    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
+    SeasonEditMixins
+):
+    """ Represents a single Season.
+
+        Attributes:
+            TAG (str): 'Directory'
+            TYPE (str): 'season'
+            audienceRating (float): Audience rating.
+            audioLanguage (str): Setting that indicates the preferred audio language.
+            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            index (int): Season number.
+            key (str): API URL (/library/metadata/<ratingkey>).
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            leafCount (int): Number of items in the season view.
+            parentGuid (str): Plex GUID for the show (plex://show/5d9c086fe9d5a1001f4d9fe6).
+            parentIndex (int): Plex index number for the show.
+            parentKey (str): API URL of the show (/library/metadata/<parentRatingKey>).
+            parentRatingKey (int): Unique key identifying the show.
+            parentSlug (str): The clean watch.plex.tv URL identifier for the show.
+            parentStudio (str): Studio that created show.
+            parentTheme (str): URL to show theme resource (/library/metadata/<parentRatingkey>/theme/<themeid>).
+            parentThumb (str): URL to show thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
+            parentTitle (str): Name of the show for the season.
+            rating (float): Season rating (7.9; 9.8; 8.1).
+            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
+            subtitleLanguage (str): Setting that indicates the preferred subtitle language.
+            subtitleMode (int): Setting that indicates the auto-select subtitle mode.
+                (-1 = Series default, 0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            viewedLeafCount (int): Number of items marked as played in the season view.
+            year (int): Year the season was released.
+    """
+    TAG = 'Directory'
+    TYPE = 'season'
+    METADATA_TYPE = 'episode'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        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'))
+        self.parentKey = data.attrib.get('parentKey')
+        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self.parentSlug = data.attrib.get('parentSlug')
+        self.parentStudio = data.attrib.get('parentStudio')
+        self.parentTheme = data.attrib.get('parentTheme')
+        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'))
+
+    def __iter__(self):
+        for episode in self.episodes():
+            yield episode
+
+    def __repr__(self):
+        return '<{}>'.format(
+            ':'.join([p for p in [
+                self.__class__.__name__,
+                self.key.replace('/library/metadata/', '').replace('/children', ''),
+                f"{self.parentTitle.replace(' ', '-')[:20]}-{self.seasonNumber}",
+            ] if p])
+        )
+
+    @property
+    def isPlayed(self):
+        """ Returns True if the season is fully played. """
+        return bool(self.viewedLeafCount == self.leafCount)
+
+    @property
+    def seasonNumber(self):
+        """ Returns the season number. """
+        return self.index
+
+    def onDeck(self):
+        """ Returns season's On Deck :class:`~plexapi.video.Video` object or `None`.
+            Will only return a match if the show's On Deck episode is in this season.
+        """
+        key = f'{self.key}?includeOnDeck=1'
+        return next(iter(self.fetchItems(key, cls=Episode, rtag='OnDeck')), None)
+
+    def episode(self, title=None, episode=None):
+        """ Returns the episode with the given title or number.
+
+            Parameters:
+                title (str): Title of the episode to return.
+                episode (int): Episode number (default: None; required if title not specified).
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If title or episode parameter is missing.
+        """
+        key = f'{self.key}/children'
+        if title is not None and not isinstance(title, int):
+            return self.fetchItem(key, Episode, title__iexact=title)
+        elif episode is not None or isinstance(title, int):
+            if isinstance(title, int):
+                index = title
+            else:
+                index = episode
+            return self.fetchItem(key, Episode, parentIndex=self.index, index=index)
+        raise BadRequest('Missing argument: title or episode is required')
+
+    def episodes(self, **kwargs):
+        """ Returns a list of :class:`~plexapi.video.Episode` objects in the season. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key, Episode, **kwargs)
+
+    def get(self, title=None, episode=None):
+        """ Alias to :func:`~plexapi.video.Season.episode`. """
+        return self.episode(title, episode)
+
+    def show(self):
+        """ Return the season's :class:`~plexapi.video.Show`. """
+        return self.fetchItem(self.parentKey)
+
+    def watched(self):
+        """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
+        return self.episodes(viewCount__gt=0)
+
+    def unwatched(self):
+        """ Returns list of unwatched :class:`~plexapi.video.Episode` objects. """
+        return self.episodes(viewCount=0)
+
+    def download(self, savepath=None, keep_original_name=False, **kwargs):
+        """ Download all episodes from the season. See :func:`~plexapi.base.Playable.download` for details.
+
+            Parameters:
+                savepath (str): Defaults to current working dir.
+                keep_original_name (bool): True to keep the original filename otherwise
+                    a friendlier filename is generated.
+                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
+        """
+        filepaths = []
+        for episode in self.episodes():
+            filepaths += episode.download(savepath, keep_original_name, **kwargs)
+        return filepaths
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return f'{self.parentTitle} - {self.title}'
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.parentGuid)
+        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Episode(
+    Video, Playable,
+    ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
+    EpisodeEditMixins
+):
+    """ Represents a single Episode.
+
+        Attributes:
+            TAG (str): 'Video'
+            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.
+            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).
+            directors (List<:class:`~plexapi.media.Director`>): List of director objects.
+            duration (int): Duration of the episode in milliseconds.
+            grandparentArt (str): URL to show artwork (/library/metadata/<grandparentRatingKey>/art/<artid>).
+            grandparentGuid (str): Plex GUID for the show (plex://show/5d9c086fe9d5a1001f4d9fe6).
+            grandparentKey (str): API URL of the show (/library/metadata/<grandparentRatingKey>).
+            grandparentRatingKey (int): Unique key identifying the show.
+            grandparentSlug (str): The clean watch.plex.tv URL identifier for the show.
+            grandparentTheme (str): URL to show theme resource (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
+            grandparentThumb (str): URL to show thumbnail image (/library/metadata/<grandparentRatingKey>/thumb/<thumbid>).
+            grandparentTitle (str): Name of the show for the episode.
+            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
+            index (int): Episode number.
+            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
+            markers (List<:class:`~plexapi.media.Marker`>): List of marker objects.
+            media (List<:class:`~plexapi.media.Media`>): List of media objects.
+            originallyAvailableAt (datetime): Datetime the episode was released.
+            parentGuid (str): Plex GUID for the season (plex://season/5d9c09e42df347001e3c2a72).
+            parentIndex (int): Season number of episode.
+            parentKey (str): API URL of the season (/library/metadata/<parentRatingKey>).
+            parentRatingKey (int): Unique key identifying the season.
+            parentThumb (str): URL to season thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
+            parentTitle (str): Name of the season for the episode.
+            parentYear (int): Year the season was released.
+            producers (List<:class:`~plexapi.media.Producer`>): List of producers objects.
+            rating (float): Episode rating (7.9; 9.8; 8.1).
+            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
+            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
+            skipParent (bool): True if the show's seasons are set to hidden.
+            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
+                (remote playlist item only).
+            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
+            viewOffset (int): View offset in milliseconds.
+            writers (List<:class:`~plexapi.media.Writer`>): List of writers objects.
+            year (int): Year the episode was released.
+    """
+    TAG = 'Video'
+    TYPE = 'episode'
+    METADATA_TYPE = 'episode'
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Video._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')
+        self.grandparentKey = data.attrib.get('grandparentKey')
+        self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
+        self.grandparentSlug = data.attrib.get('grandparentSlug')
+        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.
+        # https://forums.plex.tv/t/parentratingkey-not-in-episode-xml-when-seasons-are-hidden/300553
+        # Use cached properties below to return the correct values if they are missing to avoid auto-reloading.
+        self._parentKey = data.attrib.get('parentKey')
+        self._parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
+        self._parentThumb = data.attrib.get('parentThumb')
+
+    @cached_property
+    def parentKey(self):
+        """ Returns the parentKey. Refer to the Episode attributes. """
+        if self._parentKey:
+            return self._parentKey
+        if self.parentRatingKey:
+            return f'/library/metadata/{self.parentRatingKey}'
+        return None
+
+    @cached_property
+    def parentRatingKey(self):
+        """ Returns the parentRatingKey. Refer to the Episode attributes. """
+        if self._parentRatingKey is not None:
+            return self._parentRatingKey
+        # Parse the parentRatingKey from the parentThumb
+        if self._parentThumb and self._parentThumb.startswith('/library/metadata/'):
+            return utils.cast(int, self._parentThumb.split('/')[3])
+        # Get the parentRatingKey from the season's ratingKey if available
+        if self._season:
+            return self._season.ratingKey
+        return None
+
+    @cached_property
+    def parentThumb(self):
+        """ Returns the parentThumb. Refer to the Episode attributes. """
+        if self._parentThumb:
+            return self._parentThumb
+        if self._season:
+            return self._season.thumb
+        return None
+
+    @cached_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:
+            return self.fetchItem(f'{self.grandparentKey}/children?excludeAllLeaves=1&index={self.parentIndex}')
+        return None
+
+    def __repr__(self):
+        return '<{}>'.format(
+            ':'.join([p for p in [
+                self.__class__.__name__,
+                self.key.replace('/library/metadata/', '').replace('/children', ''),
+                f"{self.grandparentTitle.replace(' ', '-')[:20]}-{self.seasonEpisode}",
+            ] if p])
+        )
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        return f'{self.grandparentTitle} - {self.seasonEpisode} - {self.title}'
+
+    @property
+    def actors(self):
+        """ Alias to self.roles. """
+        return self.roles
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the locations of the episode.
+
+            Returns:
+                List<str> of file paths where the episode is found on disk.
+        """
+        return [part.file for part in self.iterParts() if part]
+
+    @property
+    def episodeNumber(self):
+        """ Returns the episode number. """
+        return self.index
+
+    @cached_property
+    def seasonNumber(self):
+        """ Returns the episode's season number. """
+        if isinstance(self.parentIndex, int):
+            return self.parentIndex
+        elif self._season:
+            return self._season.index
+        return None
+
+    @property
+    def seasonEpisode(self):
+        """ Returns the s00e00 string containing the season and episode numbers. """
+        return f's{str(self.seasonNumber).zfill(2)}e{str(self.episodeNumber).zfill(2)}'
+
+    @property
+    def hasCommercialMarker(self):
+        """ Returns True if the episode has a commercial marker. """
+        return any(marker.type == 'commercial' for marker in self.markers)
+
+    @property
+    def hasIntroMarker(self):
+        """ Returns True if the episode has an intro marker. """
+        return any(marker.type == 'intro' for marker in self.markers)
+
+    @property
+    def hasCreditsMarker(self):
+        """ Returns True if the episode has a credits marker. """
+        return any(marker.type == 'credits' for marker in self.markers)
+
+    @property
+    def hasVoiceActivity(self):
+        """ Returns True if any of the media has voice activity analyzed. """
+        return any(media.hasVoiceActivity for media in self.media)
+
+    @property
+    def hasPreviewThumbnails(self):
+        """ Returns True if any of the media parts has generated preview (BIF) thumbnails. """
+        return any(part.hasPreviewThumbnails for media in self.media for part in media.parts)
+
+    def season(self):
+        """" Return the episode's :class:`~plexapi.video.Season`. """
+        return self.fetchItem(self.parentKey)
+
+    def show(self):
+        """" Return the episode's :class:`~plexapi.video.Show`. """
+        return self.fetchItem(self.grandparentKey)
+
+    def _defaultSyncTitle(self):
+        """ Returns str, default title for a new syncItem. """
+        return f'{self.grandparentTitle} - {self.parentTitle} - ({self.seasonEpisode}) {self.title}'
+
+    def removeFromContinueWatching(self):
+        """ Remove the movie from continue watching. """
+        key = '/actions/removeFromContinueWatching'
+        params = {'ratingKey': self.ratingKey}
+        self._server.query(key, params=params, method=self._server._session.put)
+        return self
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.grandparentGuid)
+        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+@utils.registerPlexObject
+class Clip(
+    Video, Playable,
+    ArtUrlMixin, PosterUrlMixin
+):
+    """ Represents a single Clip.
+
+        Attributes:
+            TAG (str): 'Video'
+            TYPE (str): 'clip'
+            duration (int): Duration of the clip in milliseconds.
+            extraType (int): Unknown.
+            index (int): Plex index number for the clip.
+            media (List<:class:`~plexapi.media.Media`>): List of media objects.
+            originallyAvailableAt (datetime): Datetime the clip was released.
+            skipDetails (int): Unknown.
+            subtype (str): Type of clip (trailer, behindTheScenes, sceneOrSample, etc.).
+            thumbAspectRatio (str): Aspect ratio of the thumbnail image.
+            viewOffset (int): View offset in milliseconds.
+            year (int): Year clip was released.
+    """
+    TAG = 'Video'
+    TYPE = 'clip'
+    METADATA_TYPE = 'clip'
+
+    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'))
+        self.subtype = data.attrib.get('subtype')
+        self.thumbAspectRatio = data.attrib.get('thumbAspectRatio')
+        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
+        self.year = utils.cast(int, data.attrib.get('year'))
+
+    @property
+    def locations(self):
+        """ This does not exist in plex xml response but is added to have a common
+            interface to get the locations of the clip.
+
+            Returns:
+                List<str> of file paths where the clip is found on disk.
+        """
+        return [part.file for part in self.iterParts() if part]
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        return self.title
+
+    @property
+    def metadataDirectory(self):
+        """ Returns the Plex Media Server data directory where the metadata is stored. """
+        guid_hash = utils.sha1hash(self.guid)
+        return str(Path('Metadata') / 'Movies' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
+
+
+class Extra(Clip):
+    """ Represents a single Extra (trailer, behindTheScenes, etc). """
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        super(Extra, self)._loadData(data)
+        parent = self._parent()
+        self.librarySectionID = parent.librarySectionID
+        self.librarySectionKey = parent.librarySectionKey
+        self.librarySectionTitle = parent.librarySectionTitle
+
+    def _prettyfilename(self):
+        """ Returns a filename for use in download. """
+        return f'{self.title} ({self.subtype})'
+
+
+@utils.registerPlexObject
+class MovieSession(PlexSession, Movie):
+    """ Represents a single Movie session
+        loaded from :func:`~plexapi.server.PlexServer.sessions`.
+    """
+    _SESSIONTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Movie._loadData(self, data)
+        PlexSession._loadData(self, data)
+
+
+@utils.registerPlexObject
+class EpisodeSession(PlexSession, Episode):
+    """ Represents a single Episode session
+        loaded from :func:`~plexapi.server.PlexServer.sessions`.
+    """
+    _SESSIONTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Episode._loadData(self, data)
+        PlexSession._loadData(self, data)
+
+
+@utils.registerPlexObject
+class ClipSession(PlexSession, Clip):
+    """ Represents a single Clip session
+        loaded from :func:`~plexapi.server.PlexServer.sessions`.
+    """
+    _SESSIONTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Clip._loadData(self, data)
+        PlexSession._loadData(self, data)
+
+
+@utils.registerPlexObject
+class MovieHistory(PlexHistory, Movie):
+    """ Represents a single Movie history entry
+        loaded from :func:`~plexapi.server.PlexServer.history`.
+    """
+    _HISTORYTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Movie._loadData(self, data)
+        PlexHistory._loadData(self, data)
+
+
+@utils.registerPlexObject
+class EpisodeHistory(PlexHistory, Episode):
+    """ Represents a single Episode history entry
+        loaded from :func:`~plexapi.server.PlexServer.history`.
+    """
+    _HISTORYTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Episode._loadData(self, data)
+        PlexHistory._loadData(self, data)
+
+
+@utils.registerPlexObject
+class ClipHistory(PlexHistory, Clip):
+    """ Represents a single Clip history entry
+        loaded from :func:`~plexapi.server.PlexServer.history`.
+    """
+    _HISTORYTYPE = True
+
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        Clip._loadData(self, data)
+        PlexHistory._loadData(self, data)
diff --git a/libs/pycountry-23.12.11.dist-info/METADATA b/libs/pycountry-23.12.11.dist-info/METADATA
deleted file mode 100644
index b64240387..000000000
--- a/libs/pycountry-23.12.11.dist-info/METADATA
+++ /dev/null
@@ -1,384 +0,0 @@
-Metadata-Version: 2.1
-Name: pycountry
-Version: 23.12.11
-Summary: ISO country, subdivision, language, currency and script definitions and their translations
-Home-page: https://github.com/flyingcircusio/pycountry
-License: LGPL 2.1
-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 :: GNU Lesser General Public License v2 (LGPLv2)
-Classifier: License :: Other/Proprietary 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: Topic :: Software Development :: Internationalization
-Classifier: Topic :: Software Development :: Localization
-Requires-Dist: importlib-resources (>=5.12.0,<6.0.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/flyingcircusio/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-23.12.11.dist-info/WHEEL b/libs/pycountry-23.12.11.dist-info/WHEEL
deleted file mode 100644
index d73ccaae8..000000000
--- a/libs/pycountry-23.12.11.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/pyparsing-3.1.1.dist-info/INSTALLER b/libs/pycountry-24.6.1.dist-info/INSTALLER
similarity index 100%
rename from libs/pyparsing-3.1.1.dist-info/INSTALLER
rename to libs/pycountry-24.6.1.dist-info/INSTALLER
diff --git a/libs/pycountry-23.12.11.dist-info/LICENSE.txt b/libs/pycountry-24.6.1.dist-info/LICENSE.txt
similarity index 100%
rename from libs/pycountry-23.12.11.dist-info/LICENSE.txt
rename to libs/pycountry-24.6.1.dist-info/LICENSE.txt
diff --git a/libs/pycountry-24.6.1.dist-info/METADATA b/libs/pycountry-24.6.1.dist-info/METADATA
new file mode 100644
index 000000000..67e077ff2
--- /dev/null
+++ b/libs/pycountry-24.6.1.dist-info/METADATA
@@ -0,0 +1,410 @@
+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-23.12.11.dist-info/RECORD b/libs/pycountry-24.6.1.dist-info/RECORD
similarity index 80%
rename from libs/pycountry-23.12.11.dist-info/RECORD
rename to libs/pycountry-24.6.1.dist-info/RECORD
index 7266a2f46..5d8fb037e 100644
--- a/libs/pycountry-23.12.11.dist-info/RECORD
+++ b/libs/pycountry-24.6.1.dist-info/RECORD
@@ -1,22 +1,23 @@
-pycountry-23.12.11.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pycountry-23.12.11.dist-info/LICENSE.txt,sha256=P6OcbhijpEEQgrZMFk3q4dj0ewOk1FMEwfCuR4Ym44I,24463
-pycountry-23.12.11.dist-info/METADATA,sha256=Dc1L4pmTWyoPheIg2zld-9UnODLSyealeDzkRnMntPo,12447
-pycountry-23.12.11.dist-info/RECORD,,
-pycountry-23.12.11.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycountry-23.12.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pycountry/__init__.py,sha256=X0f7dfQlqujBseP3BtDA-eZBCrnsGgaXtsjcDBlhoeU,10405
+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=B40tocOoaBiXZb5QmM6dVRMY0Svn48CxjpKC3VSBqDE,501099
+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=q9su9q6fA_T4dJbedKv4Vc_eF5YibPg3dMijzLbEh1k,6624
+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=P1BK5KYFH2Kw3YbS7vphv0h7DWYw6F37w383MnGzNuo,9088
+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
@@ -38,7 +39,7 @@ pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo,sha256=_MhjBaxHk5eg6-ntsvqEnmYxp5
 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=GtaVroRkKl7oE2xtbl9JkpmQg_Rv05S7VEfcgNKI4JQ,372
+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
@@ -48,14 +49,14 @@ pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo,sha256=V-M118MNtoP1d8Ieo28BjZUm8rN
 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=bwaktvBZcvbvkx1l02ohTVqmnq33vbPxxWTJD9sYgYA,201179
+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=3E_CW-5yV3xt_WynK55oMizgs02RW1ZndVRjg96fxEM,15126
+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
@@ -63,11 +64,11 @@ pycountry/locales/bn/LC_MESSAGES/iso3166-1.mo,sha256=ashBjzxU8D7XQxzZLsuAm2D6xke
 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=9hpOWieEpo7WN92mDiYkiZ9yPrTHCsBtnrCZtjNEJGU,1205
+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=jEvxwELGulN460FaLkNScwSOWNdZNuXo0uuNW7f9oBc,35713
+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
@@ -101,30 +102,30 @@ pycountry/locales/cs/LC_MESSAGES/iso3166-2.mo,sha256=NWMUzpPFs_inKaa8KiZWQ--HdMf
 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=ynS-61ix_-HDrgN_1OlI3d8Gq3Ni_woUc7NLo0lcnmU,371
+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=0M0IuL_4DIXfK_NFyRZld03OSJjK0VYavCfNF2VSeUI,35290
+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=idx3xlyb1T1hagZ-DLrhciv4djPbayMJM346cBmII5U,1419
+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=FUcYDSsV1gYD_nmpdjt0y7kwdSc-Z_EDcckvWVMH5Ho,135392
+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=3t9IxZYnnrzXU1ohY1xdfTEf26FseCBeiT1TJpuW8F4,910
+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=Gnl8NyRxGLaduVpBzeI9AnsNkMuE7WTW6Kx56u8YVPQ,219517
+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=ic_bOKkbqQOdF_3ed-zLzLbGZHjW015hmzjPpXFfNwk,395556
+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
@@ -136,31 +137,31 @@ pycountry/locales/el/LC_MESSAGES/iso3166-2.mo,sha256=3PIeh6MRCdG0AL_0VN10_pk7uht
 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=0pwBU3Xwsc5u0apiZOnkYvv-caqviuEdq8SWv5Ha6Ss,1951
-pycountry/locales/en/LC_MESSAGES/iso3166-2.mo,sha256=uyHc5LUT7RYopQqNmtGlsjc4HbTdfzoDJEnN-u9grDA,91227
+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=-35gyDeJofVX4DB7WHnoZiW8TxoJpQg7IixxOuqYvI8,47595
+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=sxvsdhKjdmeE4rea-qeF9DdJgm0ZVKBdhfWIDmyw2cM,5484
+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=DN45SxP9nlcxOfblhi490Xs-hzaMfS-e09ooFy052jU,23741
-pycountry/locales/es/LC_MESSAGES/iso3166-2.mo,sha256=ShtfXo10hiFcfIxfrhUroczLPBPuWLQwlz_5z84k7VM,15724
-pycountry/locales/es/LC_MESSAGES/iso3166-3.mo,sha256=Yr3SgIDe4qsM11mV-RXQ5OBUmS5smHVFaPXrXSxP7ZM,2796
-pycountry/locales/es/LC_MESSAGES/iso4217.mo,sha256=b927zNSR1veLwK9h7qCRJsqi6ajpchei8i8JD1t3ilU,8923
+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=OgLt_I00NIVq_qA2gw_NTk776lVlrpaGOuB014mJYmI,5140
+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=SAr0A2C10mjD-m7vUZNP-5vY_Ow1nUmsHy9_Z2Vmk6s,9145
-pycountry/locales/et/LC_MESSAGES/iso639-3.mo,sha256=EUktLfqMRKwIAaXG74ucjNgBObltxsXUyYkwNKDH9_c,30637
+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=1grbZtgFekKdgM1zogUM5gRy_-7YvVFn0of7QZQoivU,23772
+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
@@ -172,7 +173,7 @@ pycountry/locales/fa/LC_MESSAGES/iso639-3.mo,sha256=WWUyB1VwOCphybCzND1GPh42PsU2
 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=i59S_cHNleiY1xo9AloDT6ni6Cc2c8NUZzCkQEbaP34,5172
+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
@@ -181,18 +182,18 @@ pycountry/locales/fil/LC_MESSAGES/iso3166-1.mo,sha256=CYgq3YrtaoqSms_KiG-lw2ljv0
 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=qnf4fT8M7l-KW2sf7IrbV_xj2UnWoA47uK-9Ds6E17I,10249
-pycountry/locales/fr/LC_MESSAGES/iso3166-1.mo,sha256=rDnLY3J_MNSDZT_px0wweEBbli1DZIpX_C87ioRd7l4,24141
-pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo,sha256=V7ZyGqDp0_KwLTq-01tnQepUlF12AkgssfJ8gpu0cbg,166186
-pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo,sha256=321zzwh4N_rWewsn-Rt4Qv66VyD2JQhd65ODUqSCdVI,2725
-pycountry/locales/fr/LC_MESSAGES/iso4217.mo,sha256=6b8Mip9fqRKrhqm0ZANAle5ShqjouzYU4oidfhFkMBs,9303
-pycountry/locales/fr/LC_MESSAGES/iso639-3.mo,sha256=mVf-NKdvwa-42rTnezbXatBrHsC1XAPBgm9mQ5ct__0,407281
-pycountry/locales/fr/LC_MESSAGES/iso639-5.mo,sha256=ENkd_nil8vA7puUVO39CthxlHCX7YrYGIx71tinm_ps,7886
+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=xVG9mVs1Td2-EmxdxoLj87LYsiRjIQg5DIh_Yeat7yc,23756
-pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo,sha256=MqEBc_lThRdbfTksFVdbFpTJkUCba2ibJ5RgHGSiKlA,1048
+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=7m6B8IpluVljWNCnFb8A6UqTz5NbxWVae1r7X-GCHl8,7043
+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
@@ -217,7 +218,7 @@ pycountry/locales/haw/LC_MESSAGES/iso3166-1.mo,sha256=iRcwqDVb2jDSHf5H1PYWmS_0nW
 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=o5tqKY_6rOI4VzAMoz8T0VEPpZFNQA2KNiHwcb8OcIk,34323
+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
@@ -226,27 +227,27 @@ pycountry/locales/hi/LC_MESSAGES/iso639-3.mo,sha256=luMW2-6Pp3sTvB9buOB34UDI15WZ
 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=EaNUB5fL_tgJ0i-i6VQfphU2sOIlLFwJcv4q-7Wi-pA,26178
+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=txSMau67E6QmDCfhvw7SedSYmUuRrBOMs8_db7YxEd4,24519
-pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo,sha256=9XlgKSZ1Br-186TqV999gL49EKeDwKmmVm1oRye2WUE,69162
+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=0lXEeSi3WiSzGDGDAZwyjURrDF34c2bBOFo6voXxsLk,8986
+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=dohDBTa82xMp2vmapUIGhBhoHqkKuh8Ms1RQwYx3Zuc,23338
+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=KsOrneXHcgvbJsdpPDsPXdMmiabhD-3yOw1LY1C9NEU,165253
+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
@@ -261,29 +262,29 @@ pycountry/locales/is/LC_MESSAGES/iso639-3.mo,sha256=MoMDngccs6iCtwBXty1GnjaajKyV
 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=qHEAAOIUEaO2JgmIAHmeJZQ-pad2Z4_JfhSXWc3LNmo,163383
+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=iNoIG5Y_IrQac0E9ILcxcAmBH5jpdTaMrROf7-SYwI0,6606
+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=kdJ4XXosV3zXw1Azj3xS8RlYy9dNa-dYMQWb-uxgBoY,100171
+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=3868Kwh8wYkEELh0C1PkTfDsXXv0JhenThGm5s8ev5s,4520
+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=5Bj9NhVX1KqFfKyqfsm61j8G0NH9zYiEKveCBzry01Y,109788
+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=EygZLp9dodjOqg7YGOPBWIGRqnDhREqjU5uyX7N5riQ,572
+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
@@ -291,8 +292,10 @@ pycountry/locales/ki/LC_MESSAGES/iso3166-1.mo,sha256=mWIyJogZzDehTwYKmxXK8bdpdk2
 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=G-gEzuP1kjDjveAkXBO0TXVjFajYs2fQVGpu7Szz7Pk,35806
+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
@@ -300,10 +303,10 @@ pycountry/locales/kn/LC_MESSAGES/iso3166-1.mo,sha256=T6dtyPAolD3mTkF-nFzEyjyJSAn
 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=I6ZwXS7Y9Bu5KZyRSlGJmAjSBhwl_tk3FlGzIJVZxH0,24204
-pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo,sha256=890PtO_mXdVU7bfEcvjwYKnbQWN7zNIl7HuDpYxcDdI,3047
-pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo,sha256=9-ZP4qKD-oNuOrUCruDC2b46wQZJZ_6cS92AAaZCW9k,2577
-pycountry/locales/ko/LC_MESSAGES/iso4217.mo,sha256=RthDRr8ZMwCcRXYjzkM9rruCm03Uq_lyOEomXktNK1k,9975
+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
@@ -311,12 +314,13 @@ pycountry/locales/kw/LC_MESSAGES/iso3166-1.mo,sha256=Dxg932KVJl8zZ37knp-LOO-lYXo
 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=y-Yhj33mZLqJ1Q8O1O3rESl8dYZFArRcai0HvlYh-Ag,7253
-pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo,sha256=KlTdAL2BkPdhwaXPBZfU6PWbYfhj8j0rQu-Dsj6Fr9c,23186
-pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo,sha256=8x1feJ1SHiNxNBBCQ_mGDi_SQji3PWluO1dZlfl8g_M,75936
-pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo,sha256=wAI3qoLmkvflhNAEby-Ll9mJzdgRYfUaz5wFApKQCZc,2767
-pycountry/locales/lt/LC_MESSAGES/iso4217.mo,sha256=jlokRrlOg9eLfnyzojVruKR1jm_h1nCC7SsuiFWOxFg,7034
+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
@@ -338,7 +342,6 @@ pycountry/locales/mn/LC_MESSAGES/iso3166-1.mo,sha256=_xQUlpY_x_hWtWV8T8HMorrm24V
 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/mo/LC_MESSAGES/iso3166-1.mo,sha256=8AiYPq4bSuyBEGrJsLYmgB5O-Bn1AO6IiB0Z2eyO_30,1779
 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
@@ -351,18 +354,18 @@ pycountry/locales/mt/LC_MESSAGES/iso639-3.mo,sha256=KyLeF56ABhY1GES7FPy9CNYBpAl5
 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/LC_MESSAGES/iso15924.mo,sha256=ZEh0GY5fQesNRed0yWel58JmU-cVr7WiEWeYVPoRCKc,4069
-pycountry/locales/nb/LC_MESSAGES/iso3166-1.mo,sha256=1H22jNjjlcCda0k_dq8saRHzC5l11XRWmv7v62ep1uU,23349
-pycountry/locales/nb/LC_MESSAGES/iso3166-3.mo,sha256=1gHSXz1DOns2yeM9joeizjP0SUzUHiE0WrHXIYoSBo8,2713
-pycountry/locales/nb/LC_MESSAGES/iso4217.mo,sha256=XyDB11iBY7HYZw0hPntMaEEsPipm6Rlq-fK9He-aOC4,8569
-pycountry/locales/nb/LC_MESSAGES/iso639-3.mo,sha256=l6jiErTbYHJ4AFcfenmlPq9wQtDcy1PvA1SRItdyzKg,5570
-pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo,sha256=UlB7DBFdWL2ku3z-LqDr0bWyHgSXpiExSN-OWieMuKU,1294
+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=2HowSNa1sslqhJLQW2jJzArC7UH72Fh3YsmUB1j-XEI,213685
+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
@@ -379,16 +382,16 @@ pycountry/locales/nso/LC_MESSAGES/iso639-3.mo,sha256=lAzl_ZZmKdS4Xexh20QcVi1GUiA
 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=v6vW0CZXgjY-shtKtP_7CELs-DHwka0CC8Ri4j9PeNM,5714
+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=FmoDxroZjAiMPz1pWJx7tv0q3uLfzK6GhNzFlWO3MKA,807
+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=w_jtAb8Ybmc0vEvO2L7vLBQ2lNNaLi8jNqb4cDnPdik,30504
-pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo,sha256=qbf2U8jx3NSfBU-GJPH7wg951vRMJGSLs5-kfWRtoRQ,3356
+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
@@ -397,7 +400,7 @@ pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo,sha256=FBb09ZfgpfjYTvXwOKXQz7_Fzv
 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=Ph-5omy5NltI-SZa_7Any4zFCywvcbFLhobSGcwXJUo,188055
+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
@@ -413,19 +416,21 @@ pycountry/locales/pt/LC_MESSAGES/iso639-3.mo,sha256=56AzlSwKl3EY9LejPNhNxVJX2VsH
 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=TU7O7A8PkMY2fSX9sLH9s7WrSGymbeCV3ncabP1tnMI,2728
+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=77CAqAC7cA9FrFV4ptph8DuK0K82ak12qwWBPCEbQeo,8284
-pycountry/locales/ro/LC_MESSAGES/iso3166-1.mo,sha256=IYp0ZNOEWXrkcm1Tvaki35ZU3AXsv3l3IGQJo7An3v4,22866
-pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo,sha256=IqFOQHuItLBP4lvAPjTQTQhtTXa56OylW3AW9DYNTK4,27706
-pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo,sha256=cztiFO-61wRNWlDQbb4meoAOzhq6v81xg3o7quCUyL0,2818
-pycountry/locales/ro/LC_MESSAGES/iso4217.mo,sha256=c6BqUNLdWOWNowjvDxlE19lKucOKq2iMBPvxho9z7Xw,7042
+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=uDX7Vs23Lw1h_CGOCYqZKMDtIaPeDcdYwjyyL_weH-8,112174
+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
@@ -436,7 +441,7 @@ pycountry/locales/rw/LC_MESSAGES/iso4217.mo,sha256=p3aVUk8p6Wp0bHdh0bu_N-3HBbXOZ
 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=u9e2nOo2RjyXTVtykVBAMurbZrsYXPkqL0-4JkFjiro,104509
+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
@@ -446,14 +451,14 @@ pycountry/locales/si/LC_MESSAGES/iso15924.mo,sha256=r8OMAYoDUkZIV8uLQqsl3v6OOIq_
 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=ce9aOq1TPm0tHSoCFYa2zKrlUYeVCmBn1056eRJjAJ0,23531
-pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo,sha256=hanQwf7JHKwP32o2Cdny_MotQvZ7SacWidHEx6RYqP4,13211
-pycountry/locales/sk/LC_MESSAGES/iso3166-3.mo,sha256=NYUQd-3aBaXbt19o4qUTMb2a5-L3eGZX_QIpXkfxDKY,2690
+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=4FB1NERsHzi4e5sAaniAkJwSboy22Y1nuMkOFpX1d4Q,79740
+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
@@ -470,39 +475,43 @@ pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo,sha256=4s5zR0XhpAuw-SnXpaoJFUkt9jV
 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=IzECQVCqM1uETvct3rlhAyK0HO3MQDn7saxvgopCRSE,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=Bpvvy1jeNCiNatb3j_856sbMMoRY2LRg29YbX5ejEQ8,145300
+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=zxjWXiZ8dP-WBK4zZK-oMuR-t8FlQCxRIHhyCeRpS1Y,4031
+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=-zKRsrqd_Pg-_dLkfWhgtVkaCYE4Q3HUVFrw8-NgrAA,122426
+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=OzTuD58Z-_49CaJYZ4ctZxGBgP55i1lq_miHgLUAYQM,3277
+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=cHn5v6kcINzsFG3DiTCcpXim8-CyXgr6D2gaAz2MDJo,164336
+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/iso3166-1.mo,sha256=adTisxSLrrh6OwuT5EwWPVM_EfmB25T861NduVnLqGM,31984
-pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo,sha256=nvFcrMj6YBgZU-9n2_2WEbESA2xdjGTT_qRYXcXBNa0,4036
-pycountry/locales/ta/LC_MESSAGES/iso639-3.mo,sha256=L6VD_Mt7Xrl61O9lNwrwhnZ4LEUTJECpVN3gZPR1XBU,438383
+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=VLY_QdW1H_TFSx1RsyaXNXrhVY4EvI3AQcfk6yphnMg,83632
+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
@@ -518,7 +527,7 @@ pycountry/locales/tl/LC_MESSAGES/iso3166-1.mo,sha256=J1GKGeMDNvkJgjiMjbSNMUwNwp8
 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=1QwM68Xs2E8bfNZXgXpFzFlGf0lJxoLrDjRFi7OIPo8,77264
+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
@@ -536,7 +545,7 @@ pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo,sha256=XQVt-M9x-VTRB1iWsuOURL7SIwi
 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=P3N1yorg4KtUsOLprLuUoG7HKNNcr8sKw7Qfeg1X07g,265202
+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
@@ -549,7 +558,7 @@ pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo,sha256=3NgTS5O5xyhV4eGgQQQfgH1JZB1
 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=18C-kMFO0j0r1or7w-iYzC85pRhuVF9wYKaheSeIwvk,135733
+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
@@ -567,7 +576,7 @@ pycountry/locales/xh/LC_MESSAGES/iso639-3.mo,sha256=b7f1geW_5oIXnTcJdd5EzUHuaZ-o
 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=Xao0LO_dE2QqJX1arUHMIRe66Sk43I_YTvRUHFJql_k,117078
+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
@@ -579,7 +588,7 @@ pycountry/locales/zh_Hans/LC_MESSAGES/iso639-5.mo,sha256=HfSKsdJZGmr9k-E4OnfWDHP
 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=oZaRP5JLPJHtWp-JfrHNnLiq-A2Iu35umkSmXjmS72E,18281
+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
@@ -587,4 +596,4 @@ pycountry/locales/zu/LC_MESSAGES/iso3166-1.mo,sha256=MfXG5fBPOFvJHdiGFlSxSPPMijm
 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=sBGtsHN7Mfbq86k48HaEoyFdpZB4IoRXkdDqGEICYPA,15140
+pycountry/tests/test_general.py,sha256=HLy1GcvTAB1YyMK81XNFdDK1I4VNLrZ6VYCAfjpJ4Wk,15209
diff --git a/libs/pyparsing-3.1.1.dist-info/REQUESTED b/libs/pycountry-24.6.1.dist-info/REQUESTED
similarity index 100%
rename from libs/pyparsing-3.1.1.dist-info/REQUESTED
rename to libs/pycountry-24.6.1.dist-info/REQUESTED
diff --git a/libs/pycountry-24.6.1.dist-info/WHEEL b/libs/pycountry-24.6.1.dist-info/WHEEL
new file mode 100644
index 000000000..8b9b3a1bf
--- /dev/null
+++ b/libs/pycountry-24.6.1.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 1.9.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pycountry/COPYRIGHT.txt b/libs/pycountry/COPYRIGHT.txt
new file mode 100644
index 000000000..7b6d508a7
--- /dev/null
+++ b/libs/pycountry/COPYRIGHT.txt
@@ -0,0 +1,46 @@
+COPYRIGHT (c) 2008 - 2023, pycountry
+
+Pycountry is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or any later version.
+
+This project 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 Lesser General Public License for more details.
+
+Contributors:
+- Christian Theune (2008-2020, 2022)
+- Nate Schimmoller (2022-2023)
+- Zachary Ware (2016, 2023)
+- Alan Orth (2023)
+- Ashok Argent-Katwala (2020)
+- Bastien Vallet (2020)
+- Chris R Bunney 2020
+- Christian Zagrodnick (2012-2013)
+- Christoph Zwerschke (2013)
+- Jakub Wilk (2020)
+- Janis Kirsteins (2019)
+- Justin Ryan Wagner 2014
+- Kevin Deldycke (2014, 2016)
+- Louis Sautier (2020)
+- Lucas Wiman (2015)
+- Mario Vilas (2014)
+- Michael Howitz (2020)
+- Michał Bielawski (2021, 2023)
+- Michał Górny (2020)
+- Mike Taves (2023)
+- Pedro Ferreira (2013)
+- Stuart Prescott (2021)
+- Victor Mireyev (2016)
+- simon klemenc (2016)
+
+Additional Acknowledgements and Licensing Information:
+- Data in the /src/databases/ and /src/locales/ folders is sourced from the Debian iso-codes project, available at: https://salsa.debian.org/iso-codes-team/iso-codes. This data is used under the terms of the GNU Lesser General Public License Version 2.1 (February 1999).
+
+The Debian iso-codes project is a collection of code lists for different standards, maintained and made available under the GNU Lesser General Public License Version 2.1. We gratefully acknowledge the Debian iso-codes team and contributors for their work and for making this resource freely available.
+
+The full text of the GNU Lesser General Public License Version 2.1 can be found at: https://salsa.debian.org/iso-codes-team/iso-codes/-/blob/main/COPYING.
+
+For the full text of the GNU Lesser General Public License,
+see https://github.com/pycountry/pycountry/blob/main/LICENSE.txt.
diff --git a/libs/pycountry/__init__.py b/libs/pycountry/__init__.py
index 9075f8cc3..33c3b1d52 100644
--- a/libs/pycountry/__init__.py
+++ b/libs/pycountry/__init__.py
@@ -2,7 +2,7 @@
 
 import os.path
 import unicodedata
-from importlib import metadata as importlib_metadata
+from importlib import metadata as _importlib_metadata
 from typing import Dict, List, Optional, Type
 
 import pycountry.db
@@ -15,7 +15,7 @@ import pycountry.db
 try:
     import importlib_resources  # type: ignore
 except ModuleNotFoundError:
-    from importlib import resources as importlib_resources
+    from importlib import resources as importlib_resources  # type: ignore
 
 
 def resource_filename(package_or_requirement: str, resource_name: str) -> str:
@@ -26,8 +26,8 @@ def resource_filename(package_or_requirement: str, resource_name: str) -> str:
 
 def get_version(distribution_name: str) -> Optional[str]:
     try:
-        return importlib_metadata.version(distribution_name)
-    except importlib_metadata.PackageNotFoundError:
+        return _importlib_metadata.version(distribution_name)
+    except _importlib_metadata.PackageNotFoundError:
         return "n/a"
 
 
@@ -76,7 +76,6 @@ class ExistingCountries(pycountry.db.Database):
             self=subdivisions, query=query
         )
         for candidate in match_subdivions:
-            print(candidate)
             add_result(candidate.country, 49)
 
         # Prio 3: partial matches on country names
@@ -170,7 +169,10 @@ class SubdivisionHierarchy(pycountry.db.Data):
         super().__init__(**kw)
         self.country_code = self.code.split("-")[0]
         if self.parent_code is not None:
-            self.parent_code = f"{self.country_code}-{self.parent_code}"
+            # Split the parent_code to check if the country_code is already present
+            parts = self.parent_code.split("-")
+            if parts[0] != self.country_code:
+                self.parent_code = f"{self.country_code}-{self.parent_code}"
 
     @property
     def country(self):
diff --git a/libs/pycountry/databases/iso3166-2.json b/libs/pycountry/databases/iso3166-2.json
index 59b471bce..e16038b9a 100644
--- a/libs/pycountry/databases/iso3166-2.json
+++ b/libs/pycountry/databases/iso3166-2.json
@@ -733,7 +733,7 @@
     {
       "code": "AZ-BAB",
       "name": "Babək",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -769,7 +769,7 @@
     {
       "code": "AZ-CUL",
       "name": "Culfa",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -830,7 +830,7 @@
     {
       "code": "AZ-KAN",
       "name": "Kǝngǝrli",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -881,7 +881,7 @@
     {
       "code": "AZ-NV",
       "name": "Naxçıvan",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Municipality"
     },
     {
@@ -897,7 +897,7 @@
     {
       "code": "AZ-ORD",
       "name": "Ordubad",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -948,13 +948,13 @@
     {
       "code": "AZ-SAD",
       "name": "Sədərək",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
       "code": "AZ-SAH",
       "name": "Şahbuz",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -970,7 +970,7 @@
     {
       "code": "AZ-SAR",
       "name": "Şərur",
-      "parent": "NX",
+      "parent": "AZ-NX",
       "type": "Rayon"
     },
     {
@@ -1161,385 +1161,385 @@
     {
       "code": "BD-01",
       "name": "Bandarban",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-02",
       "name": "Barguna",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-03",
       "name": "Bogura",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-04",
       "name": "Brahmanbaria",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-05",
       "name": "Bagerhat",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-06",
       "name": "Barishal",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-07",
       "name": "Bhola",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-08",
       "name": "Cumilla",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-09",
       "name": "Chandpur",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-10",
       "name": "Chattogram",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-11",
       "name": "Cox's Bazar",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-12",
       "name": "Chuadanga",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-13",
       "name": "Dhaka",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-14",
       "name": "Dinajpur",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-15",
       "name": "Faridpur",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-16",
       "name": "Feni",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-17",
       "name": "Gopalganj",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-18",
       "name": "Gazipur",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-19",
       "name": "Gaibandha",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-20",
       "name": "Habiganj",
-      "parent": "G",
+      "parent": "BD-G",
       "type": "District"
     },
     {
       "code": "BD-21",
       "name": "Jamalpur",
-      "parent": "H",
+      "parent": "BD-H",
       "type": "District"
     },
     {
       "code": "BD-22",
       "name": "Jashore",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-23",
       "name": "Jhenaidah",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-24",
       "name": "Joypurhat",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-25",
       "name": "Jhalakathi",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-26",
       "name": "Kishoreganj",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-27",
       "name": "Khulna",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-28",
       "name": "Kurigram",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-29",
       "name": "Khagrachhari",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-30",
       "name": "Kushtia",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-31",
       "name": "Lakshmipur",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-32",
       "name": "Lalmonirhat",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-33",
       "name": "Manikganj",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-34",
       "name": "Mymensingh",
-      "parent": "H",
+      "parent": "BD-H",
       "type": "District"
     },
     {
       "code": "BD-35",
       "name": "Munshiganj",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-36",
       "name": "Madaripur",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-37",
       "name": "Magura",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-38",
       "name": "Moulvibazar",
-      "parent": "G",
+      "parent": "BD-G",
       "type": "District"
     },
     {
       "code": "BD-39",
       "name": "Meherpur",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-40",
       "name": "Narayanganj",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-41",
       "name": "Netrakona",
-      "parent": "H",
+      "parent": "BD-H",
       "type": "District"
     },
     {
       "code": "BD-42",
       "name": "Narsingdi",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-43",
       "name": "Narail",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-44",
       "name": "Natore",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-45",
       "name": "Chapai Nawabganj",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-46",
       "name": "Nilphamari",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-47",
       "name": "Noakhali",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-48",
       "name": "Naogaon",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-49",
       "name": "Pabna",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-50",
       "name": "Pirojpur",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-51",
       "name": "Patuakhali",
-      "parent": "A",
+      "parent": "BD-A",
       "type": "District"
     },
     {
       "code": "BD-52",
       "name": "Panchagarh",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-53",
       "name": "Rajbari",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-54",
       "name": "Rajshahi",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-55",
       "name": "Rangpur",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
       "code": "BD-56",
       "name": "Rangamati",
-      "parent": "B",
+      "parent": "BD-B",
       "type": "District"
     },
     {
       "code": "BD-57",
       "name": "Sherpur",
-      "parent": "H",
+      "parent": "BD-H",
       "type": "District"
     },
     {
       "code": "BD-58",
       "name": "Satkhira",
-      "parent": "D",
+      "parent": "BD-D",
       "type": "District"
     },
     {
       "code": "BD-59",
       "name": "Sirajganj",
-      "parent": "E",
+      "parent": "BD-E",
       "type": "District"
     },
     {
       "code": "BD-60",
       "name": "Sylhet",
-      "parent": "G",
+      "parent": "BD-G",
       "type": "District"
     },
     {
       "code": "BD-61",
       "name": "Sunamganj",
-      "parent": "G",
+      "parent": "BD-G",
       "type": "District"
     },
     {
       "code": "BD-62",
       "name": "Shariatpur",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-63",
       "name": "Tangail",
-      "parent": "C",
+      "parent": "BD-C",
       "type": "District"
     },
     {
       "code": "BD-64",
       "name": "Thakurgaon",
-      "parent": "F",
+      "parent": "BD-F",
       "type": "District"
     },
     {
@@ -1584,19 +1584,19 @@
     },
     {
       "code": "BE-BRU",
-      "name": "Brussels Hoofdstedelijk Gewest",
+      "name": "Bruxelles-Capitale, Région de",
       "type": "Region"
     },
     {
       "code": "BE-VAN",
       "name": "Antwerpen",
-      "parent": "VLG",
+      "parent": "BE-VLG",
       "type": "Province"
     },
     {
       "code": "BE-VBR",
       "name": "Vlaams-Brabant",
-      "parent": "VLG",
+      "parent": "BE-VLG",
       "type": "Province"
     },
     {
@@ -1607,19 +1607,19 @@
     {
       "code": "BE-VLI",
       "name": "Limburg",
-      "parent": "VLG",
+      "parent": "BE-VLG",
       "type": "Province"
     },
     {
       "code": "BE-VOV",
       "name": "Oost-Vlaanderen",
-      "parent": "VLG",
+      "parent": "BE-VLG",
       "type": "Province"
     },
     {
       "code": "BE-VWV",
       "name": "West-Vlaanderen",
-      "parent": "VLG",
+      "parent": "BE-VLG",
       "type": "Province"
     },
     {
@@ -1630,31 +1630,31 @@
     {
       "code": "BE-WBR",
       "name": "Brabant wallon",
-      "parent": "WAL",
+      "parent": "BE-WAL",
       "type": "Province"
     },
     {
       "code": "BE-WHT",
       "name": "Hainaut",
-      "parent": "WAL",
+      "parent": "BE-WAL",
       "type": "Province"
     },
     {
       "code": "BE-WLG",
       "name": "Liège",
-      "parent": "WAL",
+      "parent": "BE-WAL",
       "type": "Province"
     },
     {
       "code": "BE-WLX",
       "name": "Luxembourg",
-      "parent": "WAL",
+      "parent": "BE-WAL",
       "type": "Province"
     },
     {
       "code": "BE-WNA",
       "name": "Namur",
-      "parent": "WAL",
+      "parent": "BE-WAL",
       "type": "Province"
     },
     {
@@ -1725,271 +1725,271 @@
     {
       "code": "BF-BAL",
       "name": "Balé",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-BAM",
       "name": "Bam",
-      "parent": "05",
+      "parent": "BF-05",
       "type": "Province"
     },
     {
       "code": "BF-BAN",
       "name": "Banwa",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-BAZ",
       "name": "Bazèga",
-      "parent": "07",
+      "parent": "BF-07",
       "type": "Province"
     },
     {
       "code": "BF-BGR",
       "name": "Bougouriba",
-      "parent": "13",
+      "parent": "BF-13",
       "type": "Province"
     },
     {
       "code": "BF-BLG",
       "name": "Boulgou",
-      "parent": "04",
+      "parent": "BF-04",
       "type": "Province"
     },
     {
       "code": "BF-BLK",
       "name": "Boulkiemdé",
-      "parent": "06",
+      "parent": "BF-06",
       "type": "Province"
     },
     {
       "code": "BF-COM",
       "name": "Comoé",
-      "parent": "02",
+      "parent": "BF-02",
       "type": "Province"
     },
     {
       "code": "BF-GAN",
       "name": "Ganzourgou",
-      "parent": "11",
+      "parent": "BF-11",
       "type": "Province"
     },
     {
       "code": "BF-GNA",
       "name": "Gnagna",
-      "parent": "08",
+      "parent": "BF-08",
       "type": "Province"
     },
     {
       "code": "BF-GOU",
       "name": "Gourma",
-      "parent": "08",
+      "parent": "BF-08",
       "type": "Province"
     },
     {
       "code": "BF-HOU",
       "name": "Houet",
-      "parent": "09",
+      "parent": "BF-09",
       "type": "Province"
     },
     {
       "code": "BF-IOB",
       "name": "Ioba",
-      "parent": "13",
+      "parent": "BF-13",
       "type": "Province"
     },
     {
       "code": "BF-KAD",
       "name": "Kadiogo",
-      "parent": "03",
+      "parent": "BF-03",
       "type": "Province"
     },
     {
       "code": "BF-KEN",
       "name": "Kénédougou",
-      "parent": "09",
+      "parent": "BF-09",
       "type": "Province"
     },
     {
       "code": "BF-KMD",
       "name": "Komondjari",
-      "parent": "08",
+      "parent": "BF-08",
       "type": "Province"
     },
     {
       "code": "BF-KMP",
       "name": "Kompienga",
-      "parent": "08",
+      "parent": "BF-08",
       "type": "Province"
     },
     {
       "code": "BF-KOP",
       "name": "Koulpélogo",
-      "parent": "04",
+      "parent": "BF-04",
       "type": "Province"
     },
     {
       "code": "BF-KOS",
       "name": "Kossi",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-KOT",
       "name": "Kouritenga",
-      "parent": "04",
+      "parent": "BF-04",
       "type": "Province"
     },
     {
       "code": "BF-KOW",
       "name": "Kourwéogo",
-      "parent": "11",
+      "parent": "BF-11",
       "type": "Province"
     },
     {
       "code": "BF-LER",
       "name": "Léraba",
-      "parent": "02",
+      "parent": "BF-02",
       "type": "Province"
     },
     {
       "code": "BF-LOR",
       "name": "Loroum",
-      "parent": "10",
+      "parent": "BF-10",
       "type": "Province"
     },
     {
       "code": "BF-MOU",
       "name": "Mouhoun",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-NAM",
       "name": "Namentenga",
-      "parent": "05",
+      "parent": "BF-05",
       "type": "Province"
     },
     {
       "code": "BF-NAO",
       "name": "Nahouri",
-      "parent": "07",
+      "parent": "BF-07",
       "type": "Province"
     },
     {
       "code": "BF-NAY",
       "name": "Nayala",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-NOU",
       "name": "Noumbiel",
-      "parent": "13",
+      "parent": "BF-13",
       "type": "Province"
     },
     {
       "code": "BF-OUB",
       "name": "Oubritenga",
-      "parent": "11",
+      "parent": "BF-11",
       "type": "Province"
     },
     {
       "code": "BF-OUD",
       "name": "Oudalan",
-      "parent": "12",
+      "parent": "BF-12",
       "type": "Province"
     },
     {
       "code": "BF-PAS",
       "name": "Passoré",
-      "parent": "10",
+      "parent": "BF-10",
       "type": "Province"
     },
     {
       "code": "BF-PON",
       "name": "Poni",
-      "parent": "13",
+      "parent": "BF-13",
       "type": "Province"
     },
     {
       "code": "BF-SEN",
       "name": "Séno",
-      "parent": "12",
+      "parent": "BF-12",
       "type": "Province"
     },
     {
       "code": "BF-SIS",
       "name": "Sissili",
-      "parent": "06",
+      "parent": "BF-06",
       "type": "Province"
     },
     {
       "code": "BF-SMT",
       "name": "Sanmatenga",
-      "parent": "05",
+      "parent": "BF-05",
       "type": "Province"
     },
     {
       "code": "BF-SNG",
       "name": "Sanguié",
-      "parent": "06",
+      "parent": "BF-06",
       "type": "Province"
     },
     {
       "code": "BF-SOM",
       "name": "Soum",
-      "parent": "12",
+      "parent": "BF-12",
       "type": "Province"
     },
     {
       "code": "BF-SOR",
       "name": "Sourou",
-      "parent": "01",
+      "parent": "BF-01",
       "type": "Province"
     },
     {
       "code": "BF-TAP",
       "name": "Tapoa",
-      "parent": "08",
+      "parent": "BF-08",
       "type": "Province"
     },
     {
       "code": "BF-TUI",
       "name": "Tuy",
-      "parent": "09",
+      "parent": "BF-09",
       "type": "Province"
     },
     {
       "code": "BF-YAG",
       "name": "Yagha",
-      "parent": "12",
+      "parent": "BF-12",
       "type": "Province"
     },
     {
       "code": "BF-YAT",
       "name": "Yatenga",
-      "parent": "10",
+      "parent": "BF-10",
       "type": "Province"
     },
     {
       "code": "BF-ZIR",
       "name": "Ziro",
-      "parent": "06",
+      "parent": "BF-06",
       "type": "Province"
     },
     {
       "code": "BF-ZON",
       "name": "Zondoma",
-      "parent": "10",
+      "parent": "BF-10",
       "type": "Province"
     },
     {
       "code": "BF-ZOU",
       "name": "Zoundwéogo",
-      "parent": "07",
+      "parent": "BF-07",
       "type": "Province"
     },
     {
@@ -3159,7 +3159,7 @@
     },
     {
       "code": "CF-KG",
-      "name": "Kemö-Gïrïbïngï",
+      "name": "Kémo-Gribingui",
       "type": "Prefecture"
     },
     {
@@ -3279,7 +3279,7 @@
     },
     {
       "code": "CH-BE",
-      "name": "Bern",
+      "name": "Berne",
       "type": "Canton"
     },
     {
@@ -3294,7 +3294,7 @@
     },
     {
       "code": "CH-FR",
-      "name": "Freiburg",
+      "name": "Fribourg",
       "type": "Canton"
     },
     {
@@ -3699,7 +3699,7 @@
     },
     {
       "code": "CN-NX",
-      "name": "Ningxia Huizi Zizhiqu",
+      "name": "Ningxia Huizu Zizhiqu",
       "type": "Autonomous region"
     },
     {
@@ -4050,79 +4050,79 @@
     {
       "code": "CV-BR",
       "name": "Brava",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-BV",
       "name": "Boa Vista",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-CA",
       "name": "Santa Catarina",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-CF",
       "name": "Santa Catarina do Fogo",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-CR",
       "name": "Santa Cruz",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-MA",
       "name": "Maio",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-MO",
       "name": "Mosteiros",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-PA",
       "name": "Paul",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-PN",
       "name": "Porto Novo",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-PR",
       "name": "Praia",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-RB",
       "name": "Ribeira Brava",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-RG",
       "name": "Ribeira Grande",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-RS",
       "name": "Ribeira Grande de Santiago",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
@@ -4133,55 +4133,55 @@
     {
       "code": "CV-SD",
       "name": "São Domingos",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-SF",
       "name": "São Filipe",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-SL",
       "name": "Sal",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-SM",
       "name": "São Miguel",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-SO",
       "name": "São Lourenço dos Órgãos",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-SS",
       "name": "São Salvador do Mundo",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-SV",
       "name": "São Vicente",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
       "code": "CV-TA",
       "name": "Tarrafal",
-      "parent": "S",
+      "parent": "CV-S",
       "type": "Municipality"
     },
     {
       "code": "CV-TS",
       "name": "Tarrafal de São Nicolau",
-      "parent": "B",
+      "parent": "CV-B",
       "type": "Municipality"
     },
     {
@@ -4227,73 +4227,73 @@
     {
       "code": "CZ-201",
       "name": "Benešov",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-202",
       "name": "Beroun",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-203",
       "name": "Kladno",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-204",
       "name": "Kolín",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-205",
       "name": "Kutná Hora",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-206",
       "name": "Mělník",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-207",
       "name": "Mladá Boleslav",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-208",
       "name": "Nymburk",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-209",
       "name": "Praha-východ",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-20A",
       "name": "Praha-západ",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-20B",
       "name": "Příbram",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
       "code": "CZ-20C",
       "name": "Rakovník",
-      "parent": "20",
+      "parent": "CZ-20",
       "type": "District"
     },
     {
@@ -4304,43 +4304,43 @@
     {
       "code": "CZ-311",
       "name": "České Budějovice",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-312",
       "name": "Český Krumlov",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-313",
       "name": "Jindřichův Hradec",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-314",
       "name": "Písek",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-315",
       "name": "Prachatice",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-316",
       "name": "Strakonice",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
       "code": "CZ-317",
       "name": "Tábor",
-      "parent": "31",
+      "parent": "CZ-31",
       "type": "District"
     },
     {
@@ -4351,43 +4351,43 @@
     {
       "code": "CZ-321",
       "name": "Domažlice",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-322",
       "name": "Klatovy",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-323",
       "name": "Plzeň-město",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-324",
       "name": "Plzeň-jih",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-325",
       "name": "Plzeň-sever",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-326",
       "name": "Rokycany",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
       "code": "CZ-327",
       "name": "Tachov",
-      "parent": "32",
+      "parent": "CZ-32",
       "type": "District"
     },
     {
@@ -4398,19 +4398,19 @@
     {
       "code": "CZ-411",
       "name": "Cheb",
-      "parent": "41",
+      "parent": "CZ-41",
       "type": "District"
     },
     {
       "code": "CZ-412",
       "name": "Karlovy Vary",
-      "parent": "41",
+      "parent": "CZ-41",
       "type": "District"
     },
     {
       "code": "CZ-413",
       "name": "Sokolov",
-      "parent": "41",
+      "parent": "CZ-41",
       "type": "District"
     },
     {
@@ -4421,43 +4421,43 @@
     {
       "code": "CZ-421",
       "name": "Děčín",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-422",
       "name": "Chomutov",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-423",
       "name": "Litoměřice",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-424",
       "name": "Louny",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-425",
       "name": "Most",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-426",
       "name": "Teplice",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
       "code": "CZ-427",
       "name": "Ústí nad Labem",
-      "parent": "42",
+      "parent": "CZ-42",
       "type": "District"
     },
     {
@@ -4468,25 +4468,25 @@
     {
       "code": "CZ-511",
       "name": "Česká Lípa",
-      "parent": "51",
+      "parent": "CZ-51",
       "type": "District"
     },
     {
       "code": "CZ-512",
       "name": "Jablonec nad Nisou",
-      "parent": "51",
+      "parent": "CZ-51",
       "type": "District"
     },
     {
       "code": "CZ-513",
       "name": "Liberec",
-      "parent": "51",
+      "parent": "CZ-51",
       "type": "District"
     },
     {
       "code": "CZ-514",
       "name": "Semily",
-      "parent": "51",
+      "parent": "CZ-51",
       "type": "District"
     },
     {
@@ -4497,31 +4497,31 @@
     {
       "code": "CZ-521",
       "name": "Hradec Králové",
-      "parent": "52",
+      "parent": "CZ-52",
       "type": "District"
     },
     {
       "code": "CZ-522",
       "name": "Jičín",
-      "parent": "52",
+      "parent": "CZ-52",
       "type": "District"
     },
     {
       "code": "CZ-523",
       "name": "Náchod",
-      "parent": "52",
+      "parent": "CZ-52",
       "type": "District"
     },
     {
       "code": "CZ-524",
       "name": "Rychnov nad Kněžnou",
-      "parent": "52",
+      "parent": "CZ-52",
       "type": "District"
     },
     {
       "code": "CZ-525",
       "name": "Trutnov",
-      "parent": "52",
+      "parent": "CZ-52",
       "type": "District"
     },
     {
@@ -4532,25 +4532,25 @@
     {
       "code": "CZ-531",
       "name": "Chrudim",
-      "parent": "53",
+      "parent": "CZ-53",
       "type": "District"
     },
     {
       "code": "CZ-532",
       "name": "Pardubice",
-      "parent": "53",
+      "parent": "CZ-53",
       "type": "District"
     },
     {
       "code": "CZ-533",
       "name": "Svitavy",
-      "parent": "53",
+      "parent": "CZ-53",
       "type": "District"
     },
     {
       "code": "CZ-534",
       "name": "Ústí nad Orlicí",
-      "parent": "53",
+      "parent": "CZ-53",
       "type": "District"
     },
     {
@@ -4561,31 +4561,31 @@
     {
       "code": "CZ-631",
       "name": "Havlíčkův Brod",
-      "parent": "63",
+      "parent": "CZ-63",
       "type": "District"
     },
     {
       "code": "CZ-632",
       "name": "Jihlava",
-      "parent": "63",
+      "parent": "CZ-63",
       "type": "District"
     },
     {
       "code": "CZ-633",
       "name": "Pelhřimov",
-      "parent": "63",
+      "parent": "CZ-63",
       "type": "District"
     },
     {
       "code": "CZ-634",
       "name": "Třebíč",
-      "parent": "63",
+      "parent": "CZ-63",
       "type": "District"
     },
     {
       "code": "CZ-635",
       "name": "Žďár nad Sázavou",
-      "parent": "63",
+      "parent": "CZ-63",
       "type": "District"
     },
     {
@@ -4596,43 +4596,43 @@
     {
       "code": "CZ-641",
       "name": "Blansko",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-642",
       "name": "Brno-město",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-643",
       "name": "Brno-venkov",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-644",
       "name": "Břeclav",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-645",
       "name": "Hodonín",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-646",
       "name": "Vyškov",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
       "code": "CZ-647",
       "name": "Znojmo",
-      "parent": "64",
+      "parent": "CZ-64",
       "type": "District"
     },
     {
@@ -4643,31 +4643,31 @@
     {
       "code": "CZ-711",
       "name": "Jeseník",
-      "parent": "71",
+      "parent": "CZ-71",
       "type": "District"
     },
     {
       "code": "CZ-712",
       "name": "Olomouc",
-      "parent": "71",
+      "parent": "CZ-71",
       "type": "District"
     },
     {
       "code": "CZ-713",
       "name": "Prostějov",
-      "parent": "71",
+      "parent": "CZ-71",
       "type": "District"
     },
     {
       "code": "CZ-714",
       "name": "Přerov",
-      "parent": "71",
+      "parent": "CZ-71",
       "type": "District"
     },
     {
       "code": "CZ-715",
       "name": "Šumperk",
-      "parent": "71",
+      "parent": "CZ-71",
       "type": "District"
     },
     {
@@ -4678,25 +4678,25 @@
     {
       "code": "CZ-721",
       "name": "Kroměříž",
-      "parent": "72",
+      "parent": "CZ-72",
       "type": "District"
     },
     {
       "code": "CZ-722",
       "name": "Uherské Hradiště",
-      "parent": "72",
+      "parent": "CZ-72",
       "type": "District"
     },
     {
       "code": "CZ-723",
       "name": "Vsetín",
-      "parent": "72",
+      "parent": "CZ-72",
       "type": "District"
     },
     {
       "code": "CZ-724",
       "name": "Zlín",
-      "parent": "72",
+      "parent": "CZ-72",
       "type": "District"
     },
     {
@@ -4707,37 +4707,37 @@
     {
       "code": "CZ-801",
       "name": "Bruntál",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
       "code": "CZ-802",
       "name": "Frýdek-Místek",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
       "code": "CZ-803",
       "name": "Karviná",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
       "code": "CZ-804",
       "name": "Nový Jičín",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
       "code": "CZ-805",
       "name": "Opava",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
       "code": "CZ-806",
       "name": "Ostrava-město",
-      "parent": "80",
+      "parent": "CZ-80",
       "type": "District"
     },
     {
@@ -4842,7 +4842,7 @@
     },
     {
       "code": "DJ-OB",
-      "name": "Awbūk",
+      "name": "Obock",
       "type": "Region"
     },
     {
@@ -4928,193 +4928,193 @@
     {
       "code": "DO-01",
       "name": "Distrito Nacional (Santo Domingo)",
-      "parent": "40",
+      "parent": "DO-40",
       "type": "District"
     },
     {
       "code": "DO-02",
       "name": "Azua",
-      "parent": "41",
+      "parent": "DO-41",
       "type": "Province"
     },
     {
       "code": "DO-03",
       "name": "Baoruco",
-      "parent": "38",
+      "parent": "DO-38",
       "type": "Province"
     },
     {
       "code": "DO-04",
       "name": "Barahona",
-      "parent": "38",
+      "parent": "DO-38",
       "type": "Province"
     },
     {
       "code": "DO-05",
       "name": "Dajabón",
-      "parent": "34",
+      "parent": "DO-34",
       "type": "Province"
     },
     {
       "code": "DO-06",
       "name": "Duarte",
-      "parent": "33",
+      "parent": "DO-33",
       "type": "Province"
     },
     {
       "code": "DO-07",
       "name": "Elías Piña",
-      "parent": "37",
+      "parent": "DO-37",
       "type": "Province"
     },
     {
       "code": "DO-08",
       "name": "El Seibo",
-      "parent": "42",
+      "parent": "DO-42",
       "type": "Province"
     },
     {
       "code": "DO-09",
       "name": "Espaillat",
-      "parent": "35",
+      "parent": "DO-35",
       "type": "Province"
     },
     {
       "code": "DO-10",
       "name": "Independencia",
-      "parent": "38",
+      "parent": "DO-38",
       "type": "Province"
     },
     {
       "code": "DO-11",
       "name": "La Altagracia",
-      "parent": "42",
+      "parent": "DO-42",
       "type": "Province"
     },
     {
       "code": "DO-12",
       "name": "La Romana",
-      "parent": "42",
+      "parent": "DO-42",
       "type": "Province"
     },
     {
       "code": "DO-13",
       "name": "La Vega",
-      "parent": "36",
+      "parent": "DO-36",
       "type": "Province"
     },
     {
       "code": "DO-14",
       "name": "María Trinidad Sánchez",
-      "parent": "33",
+      "parent": "DO-33",
       "type": "Province"
     },
     {
       "code": "DO-15",
       "name": "Monte Cristi",
-      "parent": "34",
+      "parent": "DO-34",
       "type": "Province"
     },
     {
       "code": "DO-16",
       "name": "Pedernales",
-      "parent": "38",
+      "parent": "DO-38",
       "type": "Province"
     },
     {
       "code": "DO-17",
       "name": "Peravia",
-      "parent": "41",
+      "parent": "DO-41",
       "type": "Province"
     },
     {
       "code": "DO-18",
       "name": "Puerto Plata",
-      "parent": "35",
+      "parent": "DO-35",
       "type": "Province"
     },
     {
       "code": "DO-19",
       "name": "Hermanas Mirabal",
-      "parent": "33",
+      "parent": "DO-33",
       "type": "Province"
     },
     {
       "code": "DO-20",
       "name": "Samaná",
-      "parent": "33",
+      "parent": "DO-33",
       "type": "Province"
     },
     {
       "code": "DO-21",
       "name": "San Cristóbal",
-      "parent": "41",
+      "parent": "DO-41",
       "type": "Province"
     },
     {
       "code": "DO-22",
       "name": "San Juan",
-      "parent": "37",
+      "parent": "DO-37",
       "type": "Province"
     },
     {
       "code": "DO-23",
       "name": "San Pedro de Macorís",
-      "parent": "39",
+      "parent": "DO-39",
       "type": "Province"
     },
     {
       "code": "DO-24",
       "name": "Sánchez Ramírez",
-      "parent": "36",
+      "parent": "DO-36",
       "type": "Province"
     },
     {
       "code": "DO-25",
       "name": "Santiago",
-      "parent": "35",
+      "parent": "DO-35",
       "type": "Province"
     },
     {
       "code": "DO-26",
       "name": "Santiago Rodríguez",
-      "parent": "34",
+      "parent": "DO-34",
       "type": "Province"
     },
     {
       "code": "DO-27",
       "name": "Valverde",
-      "parent": "34",
+      "parent": "DO-34",
       "type": "Province"
     },
     {
       "code": "DO-28",
       "name": "Monseñor Nouel",
-      "parent": "36",
+      "parent": "DO-36",
       "type": "Province"
     },
     {
       "code": "DO-29",
       "name": "Monte Plata",
-      "parent": "39",
+      "parent": "DO-39",
       "type": "Province"
     },
     {
       "code": "DO-30",
       "name": "Hato Mayor",
-      "parent": "39",
+      "parent": "DO-39",
       "type": "Province"
     },
     {
       "code": "DO-31",
       "name": "San José de Ocoa",
-      "parent": "41",
+      "parent": "DO-41",
       "type": "Province"
     },
     {
       "code": "DO-32",
       "name": "Santo Domingo",
-      "parent": "40",
+      "parent": "DO-40",
       "type": "Province"
     },
     {
@@ -5407,6 +5407,56 @@
       "name": "Relizane",
       "type": "Province"
     },
+    {
+      "code": "DZ-49",
+      "name": "Timimoun",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-50",
+      "name": "Bordj Badji Mokhtar",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-51",
+      "name": "Ouled Djellal",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-52",
+      "name": "Béni Abbès",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-53",
+      "name": "In Salah",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-54",
+      "name": "In Guezzam",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-55",
+      "name": "Touggourt",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-56",
+      "name": "Djanet",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-57",
+      "name": "El Meghaier",
+      "type": "Province"
+    },
+    {
+      "code": "DZ-58",
+      "name": "El Meniaa",
+      "type": "Province"
+    },
     {
       "code": "EC-A",
       "name": "Azuay",
@@ -5530,151 +5580,151 @@
     {
       "code": "EE-130",
       "name": "Alutaguse",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Rural municipality"
     },
     {
       "code": "EE-141",
       "name": "Anija",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-142",
       "name": "Antsla",
-      "parent": "87",
+      "parent": "EE-87",
       "type": "Rural municipality"
     },
     {
       "code": "EE-171",
       "name": "Elva",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-184",
       "name": "Haapsalu",
-      "parent": "56",
+      "parent": "EE-56",
       "type": "Urban municipality"
     },
     {
       "code": "EE-191",
       "name": "Haljala",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-198",
       "name": "Harku",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-205",
       "name": "Hiiumaa",
-      "parent": "39",
+      "parent": "EE-39",
       "type": "Rural municipality"
     },
     {
       "code": "EE-214",
       "name": "Häädemeeste",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
       "code": "EE-245",
       "name": "Jõelähtme",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-247",
       "name": "Jõgeva",
-      "parent": "50",
+      "parent": "EE-50",
       "type": "Rural municipality"
     },
     {
       "code": "EE-251",
       "name": "Jõhvi",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Rural municipality"
     },
     {
       "code": "EE-255",
       "name": "Järva",
-      "parent": "52",
+      "parent": "EE-52",
       "type": "Rural municipality"
     },
     {
       "code": "EE-272",
       "name": "Kadrina",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-283",
       "name": "Kambja",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-284",
       "name": "Kanepi",
-      "parent": "64",
+      "parent": "EE-64",
       "type": "Rural municipality"
     },
     {
       "code": "EE-291",
       "name": "Kastre",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-293",
       "name": "Kehtna",
-      "parent": "71",
+      "parent": "EE-71",
       "type": "Rural municipality"
     },
     {
       "code": "EE-296",
       "name": "Keila",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Urban municipality"
     },
     {
       "code": "EE-303",
       "name": "Kihnu",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
       "code": "EE-305",
       "name": "Kiili",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-317",
       "name": "Kohila",
-      "parent": "71",
+      "parent": "EE-71",
       "type": "Rural municipality"
     },
     {
       "code": "EE-321",
       "name": "Kohtla-Järve",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Urban municipality"
     },
     {
       "code": "EE-338",
       "name": "Kose",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-353",
       "name": "Kuusalu",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
@@ -5690,43 +5740,43 @@
     {
       "code": "EE-424",
       "name": "Loksa",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Urban municipality"
     },
     {
       "code": "EE-430",
       "name": "Lääneranna",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
       "code": "EE-431",
       "name": "Lääne-Harju",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-432",
       "name": "Luunja",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-441",
       "name": "Lääne-Nigula",
-      "parent": "56",
+      "parent": "EE-56",
       "type": "Rural municipality"
     },
     {
       "code": "EE-442",
       "name": "Lüganuse",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Rural municipality"
     },
     {
       "code": "EE-446",
       "name": "Maardu",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Urban municipality"
     },
     {
@@ -5737,19 +5787,19 @@
     {
       "code": "EE-478",
       "name": "Muhu",
-      "parent": "74",
+      "parent": "EE-74",
       "type": "Rural municipality"
     },
     {
       "code": "EE-480",
       "name": "Mulgi",
-      "parent": "84",
+      "parent": "EE-84",
       "type": "Rural municipality"
     },
     {
       "code": "EE-486",
       "name": "Mustvee",
-      "parent": "50",
+      "parent": "EE-50",
       "type": "Rural municipality"
     },
     {
@@ -5760,19 +5810,19 @@
     {
       "code": "EE-503",
       "name": "Märjamaa",
-      "parent": "71",
+      "parent": "EE-71",
       "type": "Rural municipality"
     },
     {
       "code": "EE-511",
       "name": "Narva",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Urban municipality"
     },
     {
       "code": "EE-514",
       "name": "Narva-Jõesuu",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Urban municipality"
     },
     {
@@ -5783,13 +5833,13 @@
     {
       "code": "EE-528",
       "name": "Nõo",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-557",
       "name": "Otepää",
-      "parent": "81",
+      "parent": "EE-81",
       "type": "Rural municipality"
     },
     {
@@ -5800,13 +5850,13 @@
     {
       "code": "EE-567",
       "name": "Paide",
-      "parent": "52",
+      "parent": "EE-52",
       "type": "Urban municipality"
     },
     {
       "code": "EE-586",
       "name": "Peipsiääre",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
@@ -5817,31 +5867,31 @@
     {
       "code": "EE-615",
       "name": "Põhja-Sakala",
-      "parent": "84",
+      "parent": "EE-84",
       "type": "Rural municipality"
     },
     {
       "code": "EE-618",
       "name": "Põltsamaa",
-      "parent": "50",
+      "parent": "EE-50",
       "type": "Rural municipality"
     },
     {
       "code": "EE-622",
       "name": "Põlva",
-      "parent": "64",
+      "parent": "EE-64",
       "type": "Rural municipality"
     },
     {
       "code": "EE-624",
       "name": "Pärnu",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Urban municipality"
     },
     {
       "code": "EE-638",
       "name": "Põhja-Pärnumaa",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
@@ -5852,31 +5902,31 @@
     {
       "code": "EE-651",
       "name": "Raasiku",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-653",
       "name": "Rae",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-661",
       "name": "Rakvere",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-663",
       "name": "Rakvere",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Urban municipality"
     },
     {
       "code": "EE-668",
       "name": "Rapla",
-      "parent": "71",
+      "parent": "EE-71",
       "type": "Rural municipality"
     },
     {
@@ -5887,19 +5937,19 @@
     {
       "code": "EE-689",
       "name": "Ruhnu",
-      "parent": "74",
+      "parent": "EE-74",
       "type": "Rural municipality"
     },
     {
       "code": "EE-698",
       "name": "Rõuge",
-      "parent": "87",
+      "parent": "EE-87",
       "type": "Rural municipality"
     },
     {
       "code": "EE-708",
       "name": "Räpina",
-      "parent": "64",
+      "parent": "EE-64",
       "type": "Rural municipality"
     },
     {
@@ -5910,37 +5960,37 @@
     {
       "code": "EE-712",
       "name": "Saarde",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
       "code": "EE-714",
       "name": "Saaremaa",
-      "parent": "74",
+      "parent": "EE-74",
       "type": "Rural municipality"
     },
     {
       "code": "EE-719",
       "name": "Saku",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-726",
       "name": "Saue",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-732",
       "name": "Setomaa",
-      "parent": "87",
+      "parent": "EE-87",
       "type": "Rural municipality"
     },
     {
       "code": "EE-735",
       "name": "Sillamäe",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Urban municipality"
     },
     {
@@ -5951,7 +6001,7 @@
     {
       "code": "EE-784",
       "name": "Tallinn",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Urban municipality"
     },
     {
@@ -5962,31 +6012,31 @@
     {
       "code": "EE-792",
       "name": "Tapa",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-793",
       "name": "Tartu",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Urban municipality"
     },
     {
       "code": "EE-796",
       "name": "Tartu",
-      "parent": "79",
+      "parent": "EE-79",
       "type": "Rural municipality"
     },
     {
       "code": "EE-803",
       "name": "Toila",
-      "parent": "45",
+      "parent": "EE-45",
       "type": "Rural municipality"
     },
     {
       "code": "EE-809",
       "name": "Tori",
-      "parent": "68",
+      "parent": "EE-68",
       "type": "Rural municipality"
     },
     {
@@ -5997,13 +6047,13 @@
     {
       "code": "EE-824",
       "name": "Tõrva",
-      "parent": "81",
+      "parent": "EE-81",
       "type": "Rural municipality"
     },
     {
       "code": "EE-834",
       "name": "Türi",
-      "parent": "52",
+      "parent": "EE-52",
       "type": "Rural municipality"
     },
     {
@@ -6014,7 +6064,7 @@
     {
       "code": "EE-855",
       "name": "Valga",
-      "parent": "81",
+      "parent": "EE-81",
       "type": "Rural municipality"
     },
     {
@@ -6025,55 +6075,55 @@
     {
       "code": "EE-890",
       "name": "Viimsi",
-      "parent": "37",
+      "parent": "EE-37",
       "type": "Rural municipality"
     },
     {
       "code": "EE-897",
       "name": "Viljandi",
-      "parent": "84",
+      "parent": "EE-84",
       "type": "Urban municipality"
     },
     {
       "code": "EE-899",
       "name": "Viljandi",
-      "parent": "84",
+      "parent": "EE-84",
       "type": "Rural municipality"
     },
     {
       "code": "EE-901",
       "name": "Vinni",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-903",
       "name": "Viru-Nigula",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
       "code": "EE-907",
       "name": "Vormsi",
-      "parent": "56",
+      "parent": "EE-56",
       "type": "Rural municipality"
     },
     {
       "code": "EE-917",
       "name": "Võru",
-      "parent": "87",
+      "parent": "EE-87",
       "type": "Rural municipality"
     },
     {
       "code": "EE-919",
       "name": "Võru",
-      "parent": "87",
+      "parent": "EE-87",
       "type": "Urban municipality"
     },
     {
       "code": "EE-928",
       "name": "Väike-Maarja",
-      "parent": "60",
+      "parent": "EE-60",
       "type": "Rural municipality"
     },
     {
@@ -6244,19 +6294,19 @@
     {
       "code": "ES-A",
       "name": "Alacant*",
-      "parent": "VC",
+      "parent": "ES-VC",
       "type": "Province"
     },
     {
       "code": "ES-AB",
       "name": "Albacete",
-      "parent": "CM",
+      "parent": "ES-CM",
       "type": "Province"
     },
     {
       "code": "ES-AL",
       "name": "Almería",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
@@ -6277,43 +6327,43 @@
     {
       "code": "ES-AV",
       "name": "Ávila",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-B",
       "name": "Barcelona [Barcelona]",
-      "parent": "CT",
+      "parent": "ES-CT",
       "type": "Province"
     },
     {
       "code": "ES-BA",
       "name": "Badajoz",
-      "parent": "EX",
+      "parent": "ES-EX",
       "type": "Province"
     },
     {
       "code": "ES-BI",
       "name": "Bizkaia",
-      "parent": "PV",
+      "parent": "ES-PV",
       "type": "Province"
     },
     {
       "code": "ES-BU",
       "name": "Burgos",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-C",
       "name": "A Coruña [La Coruña]",
-      "parent": "GA",
+      "parent": "ES-GA",
       "type": "Province"
     },
     {
       "code": "ES-CA",
       "name": "Cádiz",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
@@ -6324,7 +6374,7 @@
     {
       "code": "ES-CC",
       "name": "Cáceres",
-      "parent": "EX",
+      "parent": "ES-EX",
       "type": "Province"
     },
     {
@@ -6350,19 +6400,19 @@
     {
       "code": "ES-CO",
       "name": "Córdoba",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
       "code": "ES-CR",
       "name": "Ciudad Real",
-      "parent": "CM",
+      "parent": "ES-CM",
       "type": "Province"
     },
     {
       "code": "ES-CS",
       "name": "Castelló*",
-      "parent": "VC",
+      "parent": "ES-VC",
       "type": "Province"
     },
     {
@@ -6373,7 +6423,7 @@
     {
       "code": "ES-CU",
       "name": "Cuenca",
-      "parent": "CM",
+      "parent": "ES-CM",
       "type": "Province"
     },
     {
@@ -6389,37 +6439,37 @@
     {
       "code": "ES-GC",
       "name": "Las Palmas",
-      "parent": "CN",
+      "parent": "ES-CN",
       "type": "Province"
     },
     {
       "code": "ES-GI",
       "name": "Girona [Gerona]",
-      "parent": "CT",
+      "parent": "ES-CT",
       "type": "Province"
     },
     {
       "code": "ES-GR",
       "name": "Granada",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
       "code": "ES-GU",
       "name": "Guadalajara",
-      "parent": "CM",
+      "parent": "ES-CM",
       "type": "Province"
     },
     {
       "code": "ES-H",
       "name": "Huelva",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
       "code": "ES-HU",
       "name": "Huesca",
-      "parent": "AR",
+      "parent": "ES-AR",
       "type": "Province"
     },
     {
@@ -6430,43 +6480,43 @@
     {
       "code": "ES-J",
       "name": "Jaén",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
       "code": "ES-L",
       "name": "Lleida [Lérida]",
-      "parent": "CT",
+      "parent": "ES-CT",
       "type": "Province"
     },
     {
       "code": "ES-LE",
       "name": "León",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-LO",
       "name": "La Rioja",
-      "parent": "RI",
+      "parent": "ES-RI",
       "type": "Province"
     },
     {
       "code": "ES-LU",
       "name": "Lugo [Lugo]",
-      "parent": "GA",
+      "parent": "ES-GA",
       "type": "Province"
     },
     {
       "code": "ES-M",
       "name": "Madrid",
-      "parent": "MD",
+      "parent": "ES-MD",
       "type": "Province"
     },
     {
       "code": "ES-MA",
       "name": "Málaga",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
@@ -6487,13 +6537,13 @@
     {
       "code": "ES-MU",
       "name": "Murcia",
-      "parent": "MC",
+      "parent": "ES-MC",
       "type": "Province"
     },
     {
       "code": "ES-NA",
       "name": "Nafarroa*",
-      "parent": "NC",
+      "parent": "ES-NC",
       "type": "Province"
     },
     {
@@ -6504,31 +6554,31 @@
     {
       "code": "ES-O",
       "name": "Asturias",
-      "parent": "AS",
+      "parent": "ES-AS",
       "type": "Province"
     },
     {
       "code": "ES-OR",
       "name": "Ourense [Orense]",
-      "parent": "GA",
+      "parent": "ES-GA",
       "type": "Province"
     },
     {
       "code": "ES-P",
       "name": "Palencia",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-PM",
       "name": "Illes Balears [Islas Baleares]",
-      "parent": "IB",
+      "parent": "ES-IB",
       "type": "Province"
     },
     {
       "code": "ES-PO",
       "name": "Pontevedra [Pontevedra]",
-      "parent": "GA",
+      "parent": "ES-GA",
       "type": "Province"
     },
     {
@@ -6544,73 +6594,73 @@
     {
       "code": "ES-S",
       "name": "Cantabria",
-      "parent": "CB",
+      "parent": "ES-CB",
       "type": "Province"
     },
     {
       "code": "ES-SA",
       "name": "Salamanca",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-SE",
       "name": "Sevilla",
-      "parent": "AN",
+      "parent": "ES-AN",
       "type": "Province"
     },
     {
       "code": "ES-SG",
       "name": "Segovia",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-SO",
       "name": "Soria",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
       "code": "ES-SS",
       "name": "Gipuzkoa",
-      "parent": "PV",
+      "parent": "ES-PV",
       "type": "Province"
     },
     {
       "code": "ES-T",
       "name": "Tarragona [Tarragona]",
-      "parent": "CT",
+      "parent": "ES-CT",
       "type": "Province"
     },
     {
       "code": "ES-TE",
       "name": "Teruel",
-      "parent": "AR",
+      "parent": "ES-AR",
       "type": "Province"
     },
     {
       "code": "ES-TF",
       "name": "Santa Cruz de Tenerife",
-      "parent": "CN",
+      "parent": "ES-CN",
       "type": "Province"
     },
     {
       "code": "ES-TO",
       "name": "Toledo",
-      "parent": "CM",
+      "parent": "ES-CM",
       "type": "Province"
     },
     {
       "code": "ES-V",
       "name": "Valencia",
-      "parent": "VC",
+      "parent": "ES-VC",
       "type": "Province"
     },
     {
       "code": "ES-VA",
       "name": "Valladolid",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
@@ -6621,19 +6671,19 @@
     {
       "code": "ES-VI",
       "name": "Araba*",
-      "parent": "PV",
+      "parent": "ES-PV",
       "type": "Province"
     },
     {
       "code": "ES-Z",
       "name": "Zaragoza",
-      "parent": "AR",
+      "parent": "ES-AR",
       "type": "Province"
     },
     {
       "code": "ES-ZA",
       "name": "Zamora",
-      "parent": "CL",
+      "parent": "ES-CL",
       "type": "Province"
     },
     {
@@ -6676,6 +6726,11 @@
       "name": "Oromia",
       "type": "Regional state"
     },
+    {
+      "code": "ET-SI",
+      "name": "Sidama",
+      "type": "Regional state"
+    },
     {
       "code": "ET-SN",
       "name": "Southern Nations, Nationalities and Peoples",
@@ -6686,6 +6741,11 @@
       "name": "Somali",
       "type": "Regional state"
     },
+    {
+      "code": "ET-SW",
+      "name": "Southwest Ethiopia Peoples",
+      "type": "Regional state"
+    },
     {
       "code": "ET-TI",
       "name": "Tigrai",
@@ -6693,7 +6753,7 @@
     },
     {
       "code": "FI-01",
-      "name": "Åland",
+      "name": "Landskapet Åland",
       "type": "Region"
     },
     {
@@ -6789,85 +6849,85 @@
     {
       "code": "FJ-01",
       "name": "Ba",
-      "parent": "W",
+      "parent": "FJ-W",
       "type": "Province"
     },
     {
       "code": "FJ-02",
       "name": "Bua",
-      "parent": "N",
+      "parent": "FJ-N",
       "type": "Province"
     },
     {
       "code": "FJ-03",
       "name": "Cakaudrove",
-      "parent": "N",
+      "parent": "FJ-N",
       "type": "Province"
     },
     {
       "code": "FJ-04",
       "name": "Kadavu",
-      "parent": "E",
+      "parent": "FJ-E",
       "type": "Province"
     },
     {
       "code": "FJ-05",
       "name": "Lau",
-      "parent": "E",
+      "parent": "FJ-E",
       "type": "Province"
     },
     {
       "code": "FJ-06",
       "name": "Lomaiviti",
-      "parent": "E",
+      "parent": "FJ-E",
       "type": "Province"
     },
     {
       "code": "FJ-07",
       "name": "Macuata",
-      "parent": "N",
+      "parent": "FJ-N",
       "type": "Province"
     },
     {
       "code": "FJ-08",
       "name": "Nadroga and Navosa",
-      "parent": "W",
+      "parent": "FJ-W",
       "type": "Province"
     },
     {
       "code": "FJ-09",
       "name": "Naitasiri",
-      "parent": "C",
+      "parent": "FJ-C",
       "type": "Province"
     },
     {
       "code": "FJ-10",
       "name": "Namosi",
-      "parent": "C",
+      "parent": "FJ-C",
       "type": "Province"
     },
     {
       "code": "FJ-11",
       "name": "Ra",
-      "parent": "W",
+      "parent": "FJ-W",
       "type": "Province"
     },
     {
       "code": "FJ-12",
       "name": "Rewa",
-      "parent": "C",
+      "parent": "FJ-C",
       "type": "Province"
     },
     {
       "code": "FJ-13",
       "name": "Serua",
-      "parent": "C",
+      "parent": "FJ-C",
       "type": "Province"
     },
     {
       "code": "FJ-14",
       "name": "Tailevu",
-      "parent": "C",
+      "parent": "FJ-C",
       "type": "Province"
     },
     {
@@ -6918,115 +6978,115 @@
     {
       "code": "FR-01",
       "name": "Ain",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-02",
       "name": "Aisne",
-      "parent": "HDF",
+      "parent": "FR-HDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-03",
       "name": "Allier",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-04",
       "name": "Alpes-de-Haute-Provence",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-05",
       "name": "Hautes-Alpes",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-06",
       "name": "Alpes-Maritimes",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-07",
       "name": "Ardèche",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-08",
       "name": "Ardennes",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-09",
       "name": "Ariège",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-10",
       "name": "Aube",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-11",
       "name": "Aude",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-12",
       "name": "Aveyron",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-13",
       "name": "Bouches-du-Rhône",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-14",
       "name": "Calvados",
-      "parent": "NOR",
+      "parent": "FR-NOR",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-15",
       "name": "Cantal",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-16",
       "name": "Charente",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-17",
       "name": "Charente-Maritime",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-18",
       "name": "Cher",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-19",
       "name": "Corrèze",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
@@ -7037,494 +7097,501 @@
     {
       "code": "FR-21",
       "name": "Côte-d'Or",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-22",
       "name": "Côtes-d'Armor",
-      "parent": "BRE",
+      "parent": "FR-BRE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-23",
       "name": "Creuse",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-24",
       "name": "Dordogne",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-25",
       "name": "Doubs",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-26",
       "name": "Drôme",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-27",
       "name": "Eure",
-      "parent": "NOR",
+      "parent": "FR-NOR",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-28",
       "name": "Eure-et-Loir",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-29",
       "name": "Finistère",
-      "parent": "BRE",
+      "parent": "FR-BRE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-2A",
       "name": "Corse-du-Sud",
-      "parent": "20R",
+      "parent": "FR-20R",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-2B",
       "name": "Haute-Corse",
-      "parent": "20R",
+      "parent": "FR-20R",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-30",
       "name": "Gard",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-31",
       "name": "Haute-Garonne",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-32",
       "name": "Gers",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-33",
       "name": "Gironde",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-34",
       "name": "Hérault",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-35",
       "name": "Ille-et-Vilaine",
-      "parent": "BRE",
+      "parent": "FR-BRE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-36",
       "name": "Indre",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-37",
       "name": "Indre-et-Loire",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-38",
       "name": "Isère",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-39",
       "name": "Jura",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-40",
       "name": "Landes",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-41",
       "name": "Loir-et-Cher",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-42",
       "name": "Loire",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-43",
       "name": "Haute-Loire",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-44",
       "name": "Loire-Atlantique",
-      "parent": "PDL",
+      "parent": "FR-PDL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-45",
       "name": "Loiret",
-      "parent": "CVL",
+      "parent": "FR-CVL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-46",
       "name": "Lot",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-47",
       "name": "Lot-et-Garonne",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-48",
       "name": "Lozère",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-49",
       "name": "Maine-et-Loire",
-      "parent": "PDL",
+      "parent": "FR-PDL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-50",
       "name": "Manche",
-      "parent": "NOR",
+      "parent": "FR-NOR",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-51",
       "name": "Marne",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-52",
       "name": "Haute-Marne",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-53",
       "name": "Mayenne",
-      "parent": "PDL",
+      "parent": "FR-PDL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-54",
       "name": "Meurthe-et-Moselle",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-55",
       "name": "Meuse",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-56",
       "name": "Morbihan",
-      "parent": "BRE",
+      "parent": "FR-BRE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-57",
       "name": "Moselle",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-58",
       "name": "Nièvre",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-59",
       "name": "Nord",
-      "parent": "HDF",
+      "parent": "FR-HDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-60",
       "name": "Oise",
-      "parent": "HDF",
+      "parent": "FR-HDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-61",
       "name": "Orne",
-      "parent": "NOR",
+      "parent": "FR-NOR",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-62",
       "name": "Pas-de-Calais",
-      "parent": "HDF",
+      "parent": "FR-HDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-63",
       "name": "Puy-de-Dôme",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-64",
       "name": "Pyrénées-Atlantiques",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-65",
       "name": "Hautes-Pyrénées",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-66",
       "name": "Pyrénées-Orientales",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-67",
       "name": "Bas-Rhin",
-      "parent": "GES",
+      "parent": "FR-6AE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-68",
       "name": "Haut-Rhin",
-      "parent": "GES",
+      "parent": "FR-6AE",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-69",
       "name": "Rhône",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
+    {
+      "code": "FR-69M",
+      "name": "Métropole de Lyon",
+      "parent": "FR-ARA",
+      "type": "Metropolitan collectivity with special status"
+    },
+    {
+      "code": "FR-6AE",
+      "name": "Alsace",
+      "parent": "FR-GES",
+      "type": "European collectivity"
+    },
     {
       "code": "FR-70",
       "name": "Haute-Saône",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-71",
       "name": "Saône-et-Loire",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-72",
       "name": "Sarthe",
-      "parent": "PDL",
+      "parent": "FR-PDL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-73",
       "name": "Savoie",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-74",
       "name": "Haute-Savoie",
-      "parent": "ARA",
+      "parent": "FR-ARA",
       "type": "Metropolitan department"
     },
     {
-      "code": "FR-75",
+      "code": "FR-75C",
       "name": "Paris",
-      "parent": "IDF",
-      "type": "Metropolitan department"
+      "parent": "FR-IDF",
+      "type": "Metropolitan collectivity with special status"
     },
     {
       "code": "FR-76",
       "name": "Seine-Maritime",
-      "parent": "NOR",
+      "parent": "FR-NOR",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-77",
       "name": "Seine-et-Marne",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-78",
       "name": "Yvelines",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-79",
       "name": "Deux-Sèvres",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-80",
       "name": "Somme",
-      "parent": "HDF",
+      "parent": "FR-HDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-81",
       "name": "Tarn",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-82",
       "name": "Tarn-et-Garonne",
-      "parent": "OCC",
+      "parent": "FR-OCC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-83",
       "name": "Var",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-84",
       "name": "Vaucluse",
-      "parent": "PAC",
+      "parent": "FR-PAC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-85",
       "name": "Vendée",
-      "parent": "PDL",
+      "parent": "FR-PDL",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-86",
       "name": "Vienne",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-87",
       "name": "Haute-Vienne",
-      "parent": "NAQ",
+      "parent": "FR-NAQ",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-88",
       "name": "Vosges",
-      "parent": "GES",
+      "parent": "FR-GES",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-89",
       "name": "Yonne",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-90",
       "name": "Territoire de Belfort",
-      "parent": "BFC",
+      "parent": "FR-BFC",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-91",
       "name": "Essonne",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-92",
       "name": "Hauts-de-Seine",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-93",
       "name": "Seine-Saint-Denis",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-94",
       "name": "Val-de-Marne",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-95",
       "name": "Val-d'Oise",
-      "parent": "IDF",
+      "parent": "FR-IDF",
       "type": "Metropolitan department"
     },
     {
       "code": "FR-971",
       "name": "Guadeloupe",
-      "parent": "GP",
-      "type": "Overseas department"
+      "type": "Overseas departmental collectivity"
     },
     {
       "code": "FR-972",
       "name": "Martinique",
-      "parent": "MQ",
-      "type": "Overseas department"
+      "type": "Overseas unique territorial collectivity"
     },
     {
       "code": "FR-973",
       "name": "Guyane (française)",
-      "parent": "GF",
-      "type": "Overseas department"
+      "type": "Overseas unique territorial collectivity"
     },
     {
       "code": "FR-974",
       "name": "La Réunion",
-      "parent": "RE",
-      "type": "Overseas department"
+      "type": "Overseas departmental collectivity"
     },
     {
       "code": "FR-976",
       "name": "Mayotte",
-      "parent": "YT",
-      "type": "Overseas department"
+      "type": "Overseas departmental collectivity"
     },
     {
       "code": "FR-ARA",
@@ -7561,16 +7628,6 @@
       "name": "Grand-Est",
       "type": "Metropolitan region"
     },
-    {
-      "code": "FR-GF",
-      "name": "Guyane (française)",
-      "type": "Overseas region"
-    },
-    {
-      "code": "FR-GP",
-      "name": "Guadeloupe",
-      "type": "Overseas region"
-    },
     {
       "code": "FR-HDF",
       "name": "Hauts-de-France",
@@ -7586,11 +7643,6 @@
       "name": "Saint-Martin",
       "type": "Overseas collectivity"
     },
-    {
-      "code": "FR-MQ",
-      "name": "Martinique",
-      "type": "Overseas region"
-    },
     {
       "code": "FR-NAQ",
       "name": "Nouvelle-Aquitaine",
@@ -7631,11 +7683,6 @@
       "name": "Saint-Pierre-et-Miquelon",
       "type": "Overseas collectivity"
     },
-    {
-      "code": "FR-RE",
-      "name": "La Réunion",
-      "type": "Overseas region"
-    },
     {
       "code": "FR-TF",
       "name": "Terres australes françaises",
@@ -7646,11 +7693,6 @@
       "name": "Wallis-et-Futuna",
       "type": "Overseas collectivity"
     },
-    {
-      "code": "FR-YT",
-      "name": "Mayotte",
-      "type": "Overseas region"
-    },
     {
       "code": "GA-1",
       "name": "Estuaire",
@@ -7814,7 +7856,7 @@
       "code": "GB-BKM",
       "name": "Buckinghamshire",
       "parent": "GB-ENG",
-      "type": "Two-tier county"
+      "type": "Unitary authority"
     },
     {
       "code": "GB-BNE",
@@ -8505,16 +8547,16 @@
       "type": "District"
     },
     {
-      "code": "GB-NSM",
-      "name": "North Somerset",
+      "code": "GB-NNH",
+      "name": "North Northamptonshire",
       "parent": "GB-ENG",
       "type": "Unitary authority"
     },
     {
-      "code": "GB-NTH",
-      "name": "Northamptonshire",
+      "code": "GB-NSM",
+      "name": "North Somerset",
       "parent": "GB-ENG",
-      "type": "Two-tier county"
+      "type": "Unitary authority"
     },
     {
       "code": "GB-NTL",
@@ -8952,6 +8994,12 @@
       "parent": "GB-ENG",
       "type": "London borough"
     },
+    {
+      "code": "GB-WNH",
+      "name": "West Northamptonshire",
+      "parent": "GB-ENG",
+      "type": "Unitary authority"
+    },
     {
       "code": "GB-WNM",
       "name": "Windsor and Maidenhead",
@@ -9250,19 +9298,19 @@
     {
       "code": "GN-BE",
       "name": "Beyla",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
       "code": "GN-BF",
       "name": "Boffa",
-      "parent": "B",
+      "parent": "GN-B",
       "type": "Prefecture"
     },
     {
       "code": "GN-BK",
       "name": "Boké",
-      "parent": "B",
+      "parent": "GN-B",
       "type": "Prefecture"
     },
     {
@@ -9273,7 +9321,7 @@
     {
       "code": "GN-CO",
       "name": "Coyah",
-      "parent": "D",
+      "parent": "GN-D",
       "type": "Prefecture"
     },
     {
@@ -9284,25 +9332,25 @@
     {
       "code": "GN-DB",
       "name": "Dabola",
-      "parent": "F",
+      "parent": "GN-F",
       "type": "Prefecture"
     },
     {
       "code": "GN-DI",
       "name": "Dinguiraye",
-      "parent": "F",
+      "parent": "GN-F",
       "type": "Prefecture"
     },
     {
       "code": "GN-DL",
       "name": "Dalaba",
-      "parent": "M",
+      "parent": "GN-M",
       "type": "Prefecture"
     },
     {
       "code": "GN-DU",
       "name": "Dubréka",
-      "parent": "D",
+      "parent": "GN-D",
       "type": "Prefecture"
     },
     {
@@ -9313,31 +9361,31 @@
     {
       "code": "GN-FA",
       "name": "Faranah",
-      "parent": "F",
+      "parent": "GN-F",
       "type": "Prefecture"
     },
     {
       "code": "GN-FO",
       "name": "Forécariah",
-      "parent": "D",
+      "parent": "GN-D",
       "type": "Prefecture"
     },
     {
       "code": "GN-FR",
       "name": "Fria",
-      "parent": "B",
+      "parent": "GN-B",
       "type": "Prefecture"
     },
     {
       "code": "GN-GA",
       "name": "Gaoual",
-      "parent": "B",
+      "parent": "GN-B",
       "type": "Prefecture"
     },
     {
       "code": "GN-GU",
       "name": "Guékédou",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
@@ -9348,43 +9396,43 @@
     {
       "code": "GN-KA",
       "name": "Kankan",
-      "parent": "K",
+      "parent": "GN-K",
       "type": "Prefecture"
     },
     {
       "code": "GN-KB",
       "name": "Koubia",
-      "parent": "L",
+      "parent": "GN-L",
       "type": "Prefecture"
     },
     {
       "code": "GN-KD",
       "name": "Kindia",
-      "parent": "D",
+      "parent": "GN-D",
       "type": "Prefecture"
     },
     {
       "code": "GN-KE",
       "name": "Kérouané",
-      "parent": "K",
+      "parent": "GN-K",
       "type": "Prefecture"
     },
     {
       "code": "GN-KN",
       "name": "Koundara",
-      "parent": "B",
+      "parent": "GN-B",
       "type": "Prefecture"
     },
     {
       "code": "GN-KO",
       "name": "Kouroussa",
-      "parent": "K",
+      "parent": "GN-K",
       "type": "Prefecture"
     },
     {
       "code": "GN-KS",
       "name": "Kissidougou",
-      "parent": "F",
+      "parent": "GN-F",
       "type": "Prefecture"
     },
     {
@@ -9395,19 +9443,19 @@
     {
       "code": "GN-LA",
       "name": "Labé",
-      "parent": "L",
+      "parent": "GN-L",
       "type": "Prefecture"
     },
     {
       "code": "GN-LE",
       "name": "Lélouma",
-      "parent": "L",
+      "parent": "GN-L",
       "type": "Prefecture"
     },
     {
       "code": "GN-LO",
       "name": "Lola",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
@@ -9418,25 +9466,25 @@
     {
       "code": "GN-MC",
       "name": "Macenta",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
       "code": "GN-MD",
       "name": "Mandiana",
-      "parent": "K",
+      "parent": "GN-K",
       "type": "Prefecture"
     },
     {
       "code": "GN-ML",
       "name": "Mali",
-      "parent": "L",
+      "parent": "GN-L",
       "type": "Prefecture"
     },
     {
       "code": "GN-MM",
       "name": "Mamou",
-      "parent": "M",
+      "parent": "GN-M",
       "type": "Prefecture"
     },
     {
@@ -9447,95 +9495,95 @@
     {
       "code": "GN-NZ",
       "name": "Nzérékoré",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
       "code": "GN-PI",
       "name": "Pita",
-      "parent": "M",
+      "parent": "GN-M",
       "type": "Prefecture"
     },
     {
       "code": "GN-SI",
       "name": "Siguiri",
-      "parent": "K",
+      "parent": "GN-K",
       "type": "Prefecture"
     },
     {
       "code": "GN-TE",
       "name": "Télimélé",
-      "parent": "D",
+      "parent": "GN-D",
       "type": "Prefecture"
     },
     {
       "code": "GN-TO",
       "name": "Tougué",
-      "parent": "L",
+      "parent": "GN-L",
       "type": "Prefecture"
     },
     {
       "code": "GN-YO",
       "name": "Yomou",
-      "parent": "N",
+      "parent": "GN-N",
       "type": "Prefecture"
     },
     {
       "code": "GQ-AN",
       "name": "Annobon",
-      "parent": "I",
+      "parent": "GQ-I",
       "type": "Province"
     },
     {
       "code": "GQ-BN",
       "name": "Bioko Nord",
-      "parent": "I",
+      "parent": "GQ-I",
       "type": "Province"
     },
     {
       "code": "GQ-BS",
       "name": "Bioko Sud",
-      "parent": "I",
+      "parent": "GQ-I",
       "type": "Province"
     },
     {
       "code": "GQ-C",
-      "name": "Região Continental",
+      "name": "Région Continentale",
       "type": "Region"
     },
     {
       "code": "GQ-CS",
       "name": "Centro Sud",
-      "parent": "C",
+      "parent": "GQ-C",
       "type": "Province"
     },
     {
       "code": "GQ-DJ",
       "name": "Djibloho",
-      "parent": "C",
+      "parent": "GQ-C",
       "type": "Province"
     },
     {
       "code": "GQ-I",
-      "name": "Região Insular",
+      "name": "Région Insulaire",
       "type": "Region"
     },
     {
       "code": "GQ-KN",
       "name": "Kié-Ntem",
-      "parent": "C",
+      "parent": "GQ-C",
       "type": "Province"
     },
     {
       "code": "GQ-LI",
-      "name": "Litoral",
-      "parent": "C",
+      "name": "Littoral",
+      "parent": "GQ-C",
       "type": "Province"
     },
     {
       "code": "GQ-WN",
       "name": "Wele-Nzas",
-      "parent": "C",
+      "parent": "GQ-C",
       "type": "Province"
     },
     {
@@ -9609,131 +9657,131 @@
       "type": "Administrative region"
     },
     {
-      "code": "GT-AV",
-      "name": "Alta Verapaz",
-      "type": "Department"
-    },
-    {
-      "code": "GT-BV",
-      "name": "Baja Verapaz",
-      "type": "Department"
-    },
-    {
-      "code": "GT-CM",
-      "name": "Chimaltenango",
-      "type": "Department"
-    },
-    {
-      "code": "GT-CQ",
-      "name": "Chiquimula",
-      "type": "Department"
-    },
-    {
-      "code": "GT-ES",
-      "name": "Escuintla",
-      "type": "Department"
-    },
-    {
-      "code": "GT-GU",
+      "code": "GT-01",
       "name": "Guatemala",
       "type": "Department"
     },
     {
-      "code": "GT-HU",
-      "name": "Huehuetenango",
-      "type": "Department"
-    },
-    {
-      "code": "GT-IZ",
-      "name": "Izabal",
-      "type": "Department"
-    },
-    {
-      "code": "GT-JA",
-      "name": "Jalapa",
-      "type": "Department"
-    },
-    {
-      "code": "GT-JU",
-      "name": "Jutiapa",
-      "type": "Department"
-    },
-    {
-      "code": "GT-PE",
-      "name": "Petén",
-      "type": "Department"
-    },
-    {
-      "code": "GT-PR",
+      "code": "GT-02",
       "name": "El Progreso",
       "type": "Department"
     },
     {
-      "code": "GT-QC",
-      "name": "Quiché",
-      "type": "Department"
-    },
-    {
-      "code": "GT-QZ",
-      "name": "Quetzaltenango",
-      "type": "Department"
-    },
-    {
-      "code": "GT-RE",
-      "name": "Retalhuleu",
-      "type": "Department"
-    },
-    {
-      "code": "GT-SA",
+      "code": "GT-03",
       "name": "Sacatepéquez",
       "type": "Department"
     },
     {
-      "code": "GT-SM",
-      "name": "San Marcos",
+      "code": "GT-04",
+      "name": "Chimaltenango",
       "type": "Department"
     },
     {
-      "code": "GT-SO",
-      "name": "Sololá",
+      "code": "GT-05",
+      "name": "Escuintla",
       "type": "Department"
     },
     {
-      "code": "GT-SR",
+      "code": "GT-06",
       "name": "Santa Rosa",
       "type": "Department"
     },
     {
-      "code": "GT-SU",
-      "name": "Suchitepéquez",
+      "code": "GT-07",
+      "name": "Sololá",
       "type": "Department"
     },
     {
-      "code": "GT-TO",
+      "code": "GT-08",
       "name": "Totonicapán",
       "type": "Department"
     },
     {
-      "code": "GT-ZA",
+      "code": "GT-09",
+      "name": "Quetzaltenango",
+      "type": "Department"
+    },
+    {
+      "code": "GT-10",
+      "name": "Suchitepéquez",
+      "type": "Department"
+    },
+    {
+      "code": "GT-11",
+      "name": "Retalhuleu",
+      "type": "Department"
+    },
+    {
+      "code": "GT-12",
+      "name": "San Marcos",
+      "type": "Department"
+    },
+    {
+      "code": "GT-13",
+      "name": "Huehuetenango",
+      "type": "Department"
+    },
+    {
+      "code": "GT-14",
+      "name": "Quiché",
+      "type": "Department"
+    },
+    {
+      "code": "GT-15",
+      "name": "Baja Verapaz",
+      "type": "Department"
+    },
+    {
+      "code": "GT-16",
+      "name": "Alta Verapaz",
+      "type": "Department"
+    },
+    {
+      "code": "GT-17",
+      "name": "Petén",
+      "type": "Department"
+    },
+    {
+      "code": "GT-18",
+      "name": "Izabal",
+      "type": "Department"
+    },
+    {
+      "code": "GT-19",
       "name": "Zacapa",
       "type": "Department"
     },
+    {
+      "code": "GT-20",
+      "name": "Chiquimula",
+      "type": "Department"
+    },
+    {
+      "code": "GT-21",
+      "name": "Jalapa",
+      "type": "Department"
+    },
+    {
+      "code": "GT-22",
+      "name": "Jutiapa",
+      "type": "Department"
+    },
     {
       "code": "GW-BA",
       "name": "Bafatá",
-      "parent": "L",
+      "parent": "GW-L",
       "type": "Region"
     },
     {
       "code": "GW-BL",
       "name": "Bolama / Bijagós",
-      "parent": "S",
+      "parent": "GW-S",
       "type": "Region"
     },
     {
       "code": "GW-BM",
       "name": "Biombo",
-      "parent": "N",
+      "parent": "GW-N",
       "type": "Region"
     },
     {
@@ -9744,13 +9792,13 @@
     {
       "code": "GW-CA",
       "name": "Cacheu",
-      "parent": "N",
+      "parent": "GW-N",
       "type": "Region"
     },
     {
       "code": "GW-GA",
       "name": "Gabú",
-      "parent": "L",
+      "parent": "GW-L",
       "type": "Region"
     },
     {
@@ -9766,13 +9814,13 @@
     {
       "code": "GW-OI",
       "name": "Oio",
-      "parent": "N",
+      "parent": "GW-N",
       "type": "Region"
     },
     {
       "code": "GW-QU",
       "name": "Quinara",
-      "parent": "S",
+      "parent": "GW-S",
       "type": "Region"
     },
     {
@@ -9783,7 +9831,7 @@
     {
       "code": "GW-TO",
       "name": "Tombali",
-      "parent": "S",
+      "parent": "GW-S",
       "type": "Region"
     },
     {
@@ -10043,7 +10091,7 @@
     },
     {
       "code": "HT-GA",
-      "name": "Grandans",
+      "name": "Grande’Anse",
       "type": "Department"
     },
     {
@@ -10058,7 +10106,7 @@
     },
     {
       "code": "HT-NI",
-      "name": "Nip",
+      "name": "Nippes",
       "type": "Department"
     },
     {
@@ -10068,17 +10116,17 @@
     },
     {
       "code": "HT-OU",
-      "name": "Lwès",
+      "name": "Ouest",
       "type": "Department"
     },
     {
       "code": "HT-SD",
-      "name": "Sid",
+      "name": "Sud",
       "type": "Department"
     },
     {
       "code": "HT-SE",
-      "name": "Sidès",
+      "name": "Sud-Est",
       "type": "Department"
     },
     {
@@ -10113,7 +10161,7 @@
     },
     {
       "code": "HU-CS",
-      "name": "Csongrád",
+      "name": "Csongrád-Csanád",
       "type": "County"
     },
     {
@@ -10299,67 +10347,67 @@
     {
       "code": "ID-AC",
       "name": "Aceh",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-BA",
       "name": "Bali",
-      "parent": "NU",
+      "parent": "ID-NU",
       "type": "Province"
     },
     {
       "code": "ID-BB",
       "name": "Kepulauan Bangka Belitung",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-BE",
       "name": "Bengkulu",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-BT",
       "name": "Banten",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Province"
     },
     {
       "code": "ID-GO",
       "name": "Gorontalo",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
       "code": "ID-JA",
       "name": "Jambi",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-JB",
       "name": "Jawa Barat",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Province"
     },
     {
       "code": "ID-JI",
       "name": "Jawa Timur",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Province"
     },
     {
       "code": "ID-JK",
       "name": "Jakarta Raya",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Capital district"
     },
     {
       "code": "ID-JT",
       "name": "Jawa Tengah",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Province"
     },
     {
@@ -10375,49 +10423,49 @@
     {
       "code": "ID-KB",
       "name": "Kalimantan Barat",
-      "parent": "KA",
+      "parent": "ID-KA",
       "type": "Province"
     },
     {
       "code": "ID-KI",
       "name": "Kalimantan Timur",
-      "parent": "KA",
+      "parent": "ID-KA",
       "type": "Province"
     },
     {
       "code": "ID-KR",
       "name": "Kepulauan Riau",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-KS",
       "name": "Kalimantan Selatan",
-      "parent": "KA",
+      "parent": "ID-KA",
       "type": "Province"
     },
     {
       "code": "ID-KT",
       "name": "Kalimantan Tengah",
-      "parent": "KA",
+      "parent": "ID-KA",
       "type": "Province"
     },
     {
       "code": "ID-KU",
       "name": "Kalimantan Utara",
-      "parent": "KA",
+      "parent": "ID-KA",
       "type": "Province"
     },
     {
       "code": "ID-LA",
       "name": "Lampung",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-MA",
       "name": "Maluku",
-      "parent": "ML",
+      "parent": "ID-ML",
       "type": "Province"
     },
     {
@@ -10428,19 +10476,19 @@
     {
       "code": "ID-MU",
       "name": "Maluku Utara",
-      "parent": "ML",
+      "parent": "ID-ML",
       "type": "Province"
     },
     {
       "code": "ID-NB",
       "name": "Nusa Tenggara Barat",
-      "parent": "NU",
+      "parent": "ID-NU",
       "type": "Province"
     },
     {
       "code": "ID-NT",
       "name": "Nusa Tenggara Timur",
-      "parent": "NU",
+      "parent": "ID-NU",
       "type": "Province"
     },
     {
@@ -10451,13 +10499,25 @@
     {
       "code": "ID-PA",
       "name": "Papua",
-      "parent": "PP",
+      "parent": "ID-PP",
       "type": "Province"
     },
     {
       "code": "ID-PB",
       "name": "Papua Barat",
-      "parent": "PP",
+      "parent": "ID-PP",
+      "type": "Province"
+    },
+    {
+      "code": "ID-PD",
+      "name": "Papua Barat Daya",
+      "parent": "ID-PP",
+      "type": "Province"
+    },
+    {
+      "code": "ID-PE",
+      "name": "Papua Pengunungan",
+      "parent": "ID-PP",
       "type": "Province"
     },
     {
@@ -10465,28 +10525,40 @@
       "name": "Papua",
       "type": "Geographical unit"
     },
+    {
+      "code": "ID-PS",
+      "name": "Papua Selatan",
+      "parent": "ID-PP",
+      "type": "Province"
+    },
+    {
+      "code": "ID-PT",
+      "name": "Papua Tengah",
+      "parent": "ID-PP",
+      "type": "Province"
+    },
     {
       "code": "ID-RI",
       "name": "Riau",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-SA",
       "name": "Sulawesi Utara",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
       "code": "ID-SB",
       "name": "Sumatera Barat",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-SG",
       "name": "Sulawesi Tenggara",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
@@ -10502,37 +10574,37 @@
     {
       "code": "ID-SN",
       "name": "Sulawesi Selatan",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
       "code": "ID-SR",
       "name": "Sulawesi Barat",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
       "code": "ID-SS",
       "name": "Sumatera Selatan",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-ST",
       "name": "Sulawesi Tengah",
-      "parent": "SL",
+      "parent": "ID-SL",
       "type": "Province"
     },
     {
       "code": "ID-SU",
       "name": "Sumatera Utara",
-      "parent": "SM",
+      "parent": "ID-SM",
       "type": "Province"
     },
     {
       "code": "ID-YO",
       "name": "Yogyakarta",
-      "parent": "JW",
+      "parent": "ID-JW",
       "type": "Special region"
     },
     {
@@ -10543,61 +10615,61 @@
     {
       "code": "IE-CE",
       "name": "Clare",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
       "code": "IE-CN",
       "name": "Cavan",
-      "parent": "U",
+      "parent": "IE-U",
       "type": "County"
     },
     {
       "code": "IE-CO",
       "name": "Cork",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
       "code": "IE-CW",
       "name": "Carlow",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-D",
       "name": "Dublin",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-DL",
       "name": "Donegal",
-      "parent": "U",
+      "parent": "IE-U",
       "type": "County"
     },
     {
       "code": "IE-G",
       "name": "Galway",
-      "parent": "C",
+      "parent": "IE-C",
       "type": "County"
     },
     {
       "code": "IE-KE",
       "name": "Kildare",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-KK",
       "name": "Kilkenny",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-KY",
       "name": "Kerry",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
@@ -10608,31 +10680,31 @@
     {
       "code": "IE-LD",
       "name": "Longford",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-LH",
       "name": "Louth",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-LK",
       "name": "Limerick",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
       "code": "IE-LM",
       "name": "Leitrim",
-      "parent": "C",
+      "parent": "IE-C",
       "type": "County"
     },
     {
       "code": "IE-LS",
       "name": "Laois",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
@@ -10643,43 +10715,43 @@
     {
       "code": "IE-MH",
       "name": "Meath",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-MN",
       "name": "Monaghan",
-      "parent": "U",
+      "parent": "IE-U",
       "type": "County"
     },
     {
       "code": "IE-MO",
       "name": "Mayo",
-      "parent": "C",
+      "parent": "IE-C",
       "type": "County"
     },
     {
       "code": "IE-OY",
       "name": "Offaly",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-RN",
       "name": "Roscommon",
-      "parent": "C",
+      "parent": "IE-C",
       "type": "County"
     },
     {
       "code": "IE-SO",
       "name": "Sligo",
-      "parent": "C",
+      "parent": "IE-C",
       "type": "County"
     },
     {
       "code": "IE-TA",
       "name": "Tipperary",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
@@ -10690,25 +10762,25 @@
     {
       "code": "IE-WD",
       "name": "Waterford",
-      "parent": "M",
+      "parent": "IE-M",
       "type": "County"
     },
     {
       "code": "IE-WH",
       "name": "Westmeath",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-WW",
       "name": "Wicklow",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
       "code": "IE-WX",
       "name": "Wexford",
-      "parent": "L",
+      "parent": "IE-L",
       "type": "County"
     },
     {
@@ -10766,16 +10838,16 @@
       "name": "Bihār",
       "type": "State"
     },
+    {
+      "code": "IN-CG",
+      "name": "Chhattīsgarh",
+      "type": "State"
+    },
     {
       "code": "IN-CH",
       "name": "Chandīgarh",
       "type": "Union territory"
     },
-    {
-      "code": "IN-CT",
-      "name": "Chhattīsgarh",
-      "type": "State"
-    },
     {
       "code": "IN-DH",
       "name": "Dādra and Nagar Haveli and Damān and Diu",
@@ -10867,7 +10939,7 @@
       "type": "State"
     },
     {
-      "code": "IN-OR",
+      "code": "IN-OD",
       "name": "Odisha",
       "type": "State"
     },
@@ -10891,11 +10963,6 @@
       "name": "Sikkim",
       "type": "State"
     },
-    {
-      "code": "IN-TG",
-      "name": "Telangāna",
-      "type": "State"
-    },
     {
       "code": "IN-TN",
       "name": "Tamil Nādu",
@@ -10907,15 +10974,20 @@
       "type": "State"
     },
     {
-      "code": "IN-UP",
-      "name": "Uttar Pradesh",
+      "code": "IN-TS",
+      "name": "Telangāna",
       "type": "State"
     },
     {
-      "code": "IN-UT",
+      "code": "IN-UK",
       "name": "Uttarākhand",
       "type": "State"
     },
+    {
+      "code": "IN-UP",
+      "name": "Uttar Pradesh",
+      "type": "State"
+    },
     {
       "code": "IN-WB",
       "name": "West Bengal",
@@ -10929,6 +11001,7 @@
     {
       "code": "IQ-AR",
       "name": "Arbīl",
+      "parent": "IQ-KR",
       "type": "Governorate"
     },
     {
@@ -10949,6 +11022,7 @@
     {
       "code": "IQ-DA",
       "name": "Dahūk",
+      "parent": "IQ-KR",
       "type": "Governorate"
     },
     {
@@ -10971,6 +11045,11 @@
       "name": "Kirkūk",
       "type": "Governorate"
     },
+    {
+      "code": "IQ-KR",
+      "name": "Herêm-î Kurdistan",
+      "type": "Region"
+    },
     {
       "code": "IQ-MA",
       "name": "Maysān",
@@ -11004,6 +11083,7 @@
     {
       "code": "IQ-SU",
       "name": "As Sulaymānīyah",
+      "parent": "IQ-KR",
       "type": "Governorate"
     },
     {
@@ -11206,436 +11286,388 @@
       "name": "Suðurland",
       "type": "Region"
     },
-    {
-      "code": "IS-AKH",
-      "name": "Akrahreppur",
-      "parent": "5",
-      "type": "Municipality"
-    },
     {
       "code": "IS-AKN",
       "name": "Akraneskaupstaður",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-AKU",
       "name": "Akureyrarbær",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-ARN",
       "name": "Árneshreppur",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-ASA",
       "name": "Ásahreppur",
-      "parent": "8",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-BFJ",
-      "name": "Borgarfjarðarhreppur",
-      "parent": "7",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-BLA",
       "name": "Bláskógabyggð",
-      "parent": "8",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-BLO",
-      "name": "Blönduósbær",
-      "parent": "5",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-BOG",
       "name": "Borgarbyggð",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-BOL",
       "name": "Bolungarvíkurkaupstaður",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-DAB",
       "name": "Dalabyggð",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-DAV",
       "name": "Dalvíkurbyggð",
-      "parent": "6",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-DJU",
-      "name": "Djúpavogshreppur",
-      "parent": "7",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-EOM",
       "name": "Eyja- og Miklaholtshreppur",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-EYF",
       "name": "Eyjafjarðarsveit",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-FJD",
       "name": "Fjarðabyggð",
-      "parent": "7",
+      "parent": "IS-7",
       "type": "Municipality"
     },
     {
       "code": "IS-FJL",
       "name": "Fjallabyggð",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-FLA",
       "name": "Flóahreppur",
-      "parent": "8",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-FLD",
-      "name": "Fljótsdalshérað",
-      "parent": "7",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-FLR",
       "name": "Fljótsdalshreppur",
-      "parent": "7",
+      "parent": "IS-7",
       "type": "Municipality"
     },
     {
       "code": "IS-GAR",
       "name": "Garðabær",
-      "parent": "1",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-GOG",
       "name": "Grímsnes- og Grafningshreppur",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-GRN",
       "name": "Grindavíkurbær",
-      "parent": "2",
+      "parent": "IS-2",
       "type": "Municipality"
     },
     {
       "code": "IS-GRU",
       "name": "Grundarfjarðarbær",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-GRY",
       "name": "Grýtubakkahreppur",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-HAF",
       "name": "Hafnarfjarðarkaupstaður",
-      "parent": "1",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-HEL",
-      "name": "Helgafellssveit",
-      "parent": "3",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-HRG",
       "name": "Hörgársveit",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-HRU",
       "name": "Hrunamannahreppur",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
-      "code": "IS-HUT",
-      "name": "Húnavatnshreppur",
-      "parent": "5",
+      "code": "IS-HUG",
+      "name": "Húnabyggð",
+      "parent": "IS-5",
       "type": "Municipality"
     },
     {
       "code": "IS-HUV",
       "name": "Húnaþing vestra",
-      "parent": "5",
+      "parent": "IS-5",
       "type": "Municipality"
     },
     {
       "code": "IS-HVA",
       "name": "Hvalfjarðarsveit",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-HVE",
       "name": "Hveragerðisbær",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-ISA",
       "name": "Ísafjarðarbær",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-KAL",
       "name": "Kaldrananeshreppur",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-KJO",
       "name": "Kjósarhreppur",
-      "parent": "1",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-KOP",
       "name": "Kópavogsbær",
-      "parent": "1",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-LAN",
       "name": "Langanesbyggð",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-MOS",
       "name": "Mosfellsbær",
-      "parent": "1",
+      "parent": "IS-1",
+      "type": "Municipality"
+    },
+    {
+      "code": "IS-MUL",
+      "name": "Múlaþing",
+      "parent": "IS-7",
       "type": "Municipality"
     },
     {
       "code": "IS-MYR",
       "name": "Mýrdalshreppur",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-NOR",
       "name": "Norðurþing",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-RGE",
       "name": "Rangárþing eystra",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-RGY",
       "name": "Rangárþing ytra",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-RHH",
       "name": "Reykhólahreppur",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-RKN",
       "name": "Reykjanesbær",
-      "parent": "2",
+      "parent": "IS-2",
       "type": "Municipality"
     },
     {
       "code": "IS-RKV",
       "name": "Reykjavíkurborg",
-      "parent": "1",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-SBH",
-      "name": "Svalbarðshreppur",
-      "parent": "6",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-SBT",
       "name": "Svalbarðsstrandarhreppur",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-SDN",
       "name": "Suðurnesjabær",
-      "parent": "2",
+      "parent": "IS-2",
       "type": "Municipality"
     },
     {
       "code": "IS-SDV",
       "name": "Súðavíkurhreppur",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-SEL",
       "name": "Seltjarnarnesbær",
-      "parent": "1",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-SEY",
-      "name": "Seyðisfjarðarkaupstaður",
-      "parent": "7",
+      "parent": "IS-1",
       "type": "Municipality"
     },
     {
       "code": "IS-SFA",
       "name": "Sveitarfélagið Árborg",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-SHF",
       "name": "Sveitarfélagið Hornafjörður",
-      "parent": "7",
+      "parent": "IS-7",
       "type": "Municipality"
     },
     {
       "code": "IS-SKF",
       "name": "Skaftárhreppur",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-SKG",
       "name": "Skagabyggð",
-      "parent": "5",
+      "parent": "IS-5",
       "type": "Municipality"
     },
     {
       "code": "IS-SKO",
       "name": "Skorradalshreppur",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
-      "code": "IS-SKU",
-      "name": "Skútustaðahreppur",
-      "parent": "6",
+      "code": "IS-SKR",
+      "name": "Skagafjörður",
+      "parent": "IS-5",
       "type": "Municipality"
     },
     {
       "code": "IS-SNF",
       "name": "Snæfellsbær",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-SOG",
       "name": "Skeiða- og Gnúpverjahreppur",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-SOL",
       "name": "Sveitarfélagið Ölfus",
-      "parent": "8",
-      "type": "Municipality"
-    },
-    {
-      "code": "IS-SSF",
-      "name": "Sveitarfélagið Skagafjörður",
-      "parent": "5",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-SSS",
       "name": "Sveitarfélagið Skagaströnd",
-      "parent": "5",
+      "parent": "IS-5",
       "type": "Municipality"
     },
     {
       "code": "IS-STR",
       "name": "Strandabyggð",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-STY",
       "name": "Stykkishólmsbær",
-      "parent": "3",
+      "parent": "IS-3",
       "type": "Municipality"
     },
     {
       "code": "IS-SVG",
       "name": "Sveitarfélagið Vogar",
-      "parent": "2",
+      "parent": "IS-2",
       "type": "Municipality"
     },
     {
       "code": "IS-TAL",
       "name": "Tálknafjarðarhreppur",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-THG",
       "name": "Þingeyjarsveit",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-TJO",
       "name": "Tjörneshreppur",
-      "parent": "6",
+      "parent": "IS-6",
       "type": "Municipality"
     },
     {
       "code": "IS-VEM",
       "name": "Vestmannaeyjabær",
-      "parent": "8",
+      "parent": "IS-8",
       "type": "Municipality"
     },
     {
       "code": "IS-VER",
       "name": "Vesturbyggð",
-      "parent": "4",
+      "parent": "IS-4",
       "type": "Municipality"
     },
     {
       "code": "IS-VOP",
       "name": "Vopnafjarðarhreppur",
-      "parent": "7",
+      "parent": "IS-7",
       "type": "Municipality"
     },
     {
@@ -11741,637 +11773,637 @@
     {
       "code": "IT-AG",
       "name": "Agrigento",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-AL",
       "name": "Alessandria",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-AN",
       "name": "Ancona",
-      "parent": "57",
+      "parent": "IT-57",
       "type": "Province"
     },
     {
       "code": "IT-AP",
       "name": "Ascoli Piceno",
-      "parent": "57",
+      "parent": "IT-57",
       "type": "Province"
     },
     {
       "code": "IT-AQ",
       "name": "L'Aquila",
-      "parent": "65",
+      "parent": "IT-65",
       "type": "Province"
     },
     {
       "code": "IT-AR",
       "name": "Arezzo",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-AT",
       "name": "Asti",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-AV",
       "name": "Avellino",
-      "parent": "72",
+      "parent": "IT-72",
       "type": "Province"
     },
     {
       "code": "IT-BA",
       "name": "Bari",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-BG",
       "name": "Bergamo",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-BI",
       "name": "Biella",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-BL",
       "name": "Belluno",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-BN",
       "name": "Benevento",
-      "parent": "72",
+      "parent": "IT-72",
       "type": "Province"
     },
     {
       "code": "IT-BO",
       "name": "Bologna",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-BR",
       "name": "Brindisi",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Province"
     },
     {
       "code": "IT-BS",
       "name": "Brescia",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-BT",
       "name": "Barletta-Andria-Trani",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Province"
     },
     {
       "code": "IT-BZ",
       "name": "Bolzano",
-      "parent": "32",
+      "parent": "IT-32",
       "type": "Autonomous province"
     },
     {
       "code": "IT-CA",
       "name": "Cagliari",
-      "parent": "88",
+      "parent": "IT-88",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-CB",
       "name": "Campobasso",
-      "parent": "67",
+      "parent": "IT-67",
       "type": "Province"
     },
     {
       "code": "IT-CE",
       "name": "Caserta",
-      "parent": "72",
+      "parent": "IT-72",
       "type": "Province"
     },
     {
       "code": "IT-CH",
       "name": "Chieti",
-      "parent": "65",
+      "parent": "IT-65",
       "type": "Province"
     },
     {
       "code": "IT-CL",
       "name": "Caltanissetta",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-CN",
       "name": "Cuneo",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-CO",
       "name": "Como",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-CR",
       "name": "Cremona",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-CS",
       "name": "Cosenza",
-      "parent": "78",
+      "parent": "IT-78",
       "type": "Province"
     },
     {
       "code": "IT-CT",
       "name": "Catania",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-CZ",
       "name": "Catanzaro",
-      "parent": "78",
+      "parent": "IT-78",
       "type": "Province"
     },
     {
       "code": "IT-EN",
       "name": "Enna",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-FC",
       "name": "Forlì-Cesena",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-FE",
       "name": "Ferrara",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-FG",
       "name": "Foggia",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Province"
     },
     {
       "code": "IT-FI",
       "name": "Firenze",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-FM",
       "name": "Fermo",
-      "parent": "57",
+      "parent": "IT-57",
       "type": "Province"
     },
     {
       "code": "IT-FR",
       "name": "Frosinone",
-      "parent": "62",
+      "parent": "IT-62",
       "type": "Province"
     },
     {
       "code": "IT-GE",
       "name": "Genova",
-      "parent": "42",
+      "parent": "IT-42",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-GO",
       "name": "Gorizia",
-      "parent": "36",
+      "parent": "IT-36",
       "type": "Decentralized regional entity"
     },
     {
       "code": "IT-GR",
       "name": "Grosseto",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-IM",
       "name": "Imperia",
-      "parent": "42",
+      "parent": "IT-42",
       "type": "Province"
     },
     {
       "code": "IT-IS",
       "name": "Isernia",
-      "parent": "67",
+      "parent": "IT-67",
       "type": "Province"
     },
     {
       "code": "IT-KR",
       "name": "Crotone",
-      "parent": "78",
+      "parent": "IT-78",
       "type": "Province"
     },
     {
       "code": "IT-LC",
       "name": "Lecco",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-LE",
       "name": "Lecce",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Province"
     },
     {
       "code": "IT-LI",
       "name": "Livorno",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-LO",
       "name": "Lodi",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-LT",
       "name": "Latina",
-      "parent": "62",
+      "parent": "IT-62",
       "type": "Province"
     },
     {
       "code": "IT-LU",
       "name": "Lucca",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-MB",
       "name": "Monza e Brianza",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-MC",
       "name": "Macerata",
-      "parent": "57",
+      "parent": "IT-57",
       "type": "Province"
     },
     {
       "code": "IT-ME",
       "name": "Messina",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-MI",
       "name": "Milano",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-MN",
       "name": "Mantova",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-MO",
       "name": "Modena",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-MS",
       "name": "Massa-Carrara",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-MT",
       "name": "Matera",
-      "parent": "77",
+      "parent": "IT-77",
       "type": "Province"
     },
     {
       "code": "IT-NA",
       "name": "Napoli",
-      "parent": "72",
+      "parent": "IT-72",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-NO",
       "name": "Novara",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-NU",
       "name": "Nuoro",
-      "parent": "88",
+      "parent": "IT-88",
       "type": "Province"
     },
     {
       "code": "IT-OR",
       "name": "Oristano",
-      "parent": "88",
+      "parent": "IT-88",
       "type": "Province"
     },
     {
       "code": "IT-PA",
       "name": "Palermo",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-PC",
       "name": "Piacenza",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-PD",
       "name": "Padova",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-PE",
       "name": "Pescara",
-      "parent": "65",
+      "parent": "IT-65",
       "type": "Province"
     },
     {
       "code": "IT-PG",
       "name": "Perugia",
-      "parent": "55",
+      "parent": "IT-55",
       "type": "Province"
     },
     {
       "code": "IT-PI",
       "name": "Pisa",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-PN",
       "name": "Pordenone",
-      "parent": "36",
+      "parent": "IT-36",
       "type": "Decentralized regional entity"
     },
     {
       "code": "IT-PO",
       "name": "Prato",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-PR",
       "name": "Parma",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-PT",
       "name": "Pistoia",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-PU",
       "name": "Pesaro e Urbino",
-      "parent": "57",
+      "parent": "IT-57",
       "type": "Province"
     },
     {
       "code": "IT-PV",
       "name": "Pavia",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-PZ",
       "name": "Potenza",
-      "parent": "77",
+      "parent": "IT-77",
       "type": "Province"
     },
     {
       "code": "IT-RA",
       "name": "Ravenna",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-RC",
       "name": "Reggio Calabria",
-      "parent": "78",
+      "parent": "IT-78",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-RE",
       "name": "Reggio Emilia",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-RG",
       "name": "Ragusa",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-RI",
       "name": "Rieti",
-      "parent": "62",
+      "parent": "IT-62",
       "type": "Province"
     },
     {
       "code": "IT-RM",
       "name": "Roma",
-      "parent": "62",
+      "parent": "IT-62",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-RN",
       "name": "Rimini",
-      "parent": "45",
+      "parent": "IT-45",
       "type": "Province"
     },
     {
       "code": "IT-RO",
       "name": "Rovigo",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-SA",
       "name": "Salerno",
-      "parent": "72",
+      "parent": "IT-72",
       "type": "Province"
     },
     {
       "code": "IT-SI",
       "name": "Siena",
-      "parent": "52",
+      "parent": "IT-52",
       "type": "Province"
     },
     {
       "code": "IT-SO",
       "name": "Sondrio",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-SP",
       "name": "La Spezia",
-      "parent": "42",
+      "parent": "IT-42",
       "type": "Province"
     },
     {
       "code": "IT-SR",
       "name": "Siracusa",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-SS",
       "name": "Sassari",
-      "parent": "88",
+      "parent": "IT-88",
       "type": "Province"
     },
     {
       "code": "IT-SU",
       "name": "Sud Sardegna",
-      "parent": "88",
+      "parent": "IT-88",
       "type": "Province"
     },
     {
       "code": "IT-SV",
       "name": "Savona",
-      "parent": "42",
+      "parent": "IT-42",
       "type": "Province"
     },
     {
       "code": "IT-TA",
       "name": "Taranto",
-      "parent": "75",
+      "parent": "IT-75",
       "type": "Province"
     },
     {
       "code": "IT-TE",
       "name": "Teramo",
-      "parent": "65",
+      "parent": "IT-65",
       "type": "Province"
     },
     {
       "code": "IT-TN",
       "name": "Trento",
-      "parent": "32",
+      "parent": "IT-32",
       "type": "Autonomous province"
     },
     {
       "code": "IT-TO",
       "name": "Torino",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-TP",
       "name": "Trapani",
-      "parent": "82",
+      "parent": "IT-82",
       "type": "Free municipal consortium"
     },
     {
       "code": "IT-TR",
       "name": "Terni",
-      "parent": "55",
+      "parent": "IT-55",
       "type": "Province"
     },
     {
       "code": "IT-TS",
       "name": "Trieste",
-      "parent": "36",
+      "parent": "IT-36",
       "type": "Decentralized regional entity"
     },
     {
       "code": "IT-TV",
       "name": "Treviso",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-UD",
       "name": "Udine",
-      "parent": "36",
+      "parent": "IT-36",
       "type": "Decentralized regional entity"
     },
     {
       "code": "IT-VA",
       "name": "Varese",
-      "parent": "25",
+      "parent": "IT-25",
       "type": "Province"
     },
     {
       "code": "IT-VB",
       "name": "Verbano-Cusio-Ossola",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-VC",
       "name": "Vercelli",
-      "parent": "21",
+      "parent": "IT-21",
       "type": "Province"
     },
     {
       "code": "IT-VE",
       "name": "Venezia",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Metropolitan city"
     },
     {
       "code": "IT-VI",
       "name": "Vicenza",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-VR",
       "name": "Verona",
-      "parent": "34",
+      "parent": "IT-34",
       "type": "Province"
     },
     {
       "code": "IT-VT",
       "name": "Viterbo",
-      "parent": "62",
+      "parent": "IT-62",
       "type": "Province"
     },
     {
       "code": "IT-VV",
       "name": "Vibo Valentia",
-      "parent": "78",
+      "parent": "IT-78",
       "type": "Province"
     },
     {
@@ -13161,12 +13193,12 @@
     },
     {
       "code": "KM-A",
-      "name": "Andjouân",
+      "name": "Anjouan",
       "type": "Island"
     },
     {
       "code": "KM-G",
-      "name": "Andjazîdja",
+      "name": "Grande Comore",
       "type": "Island"
     },
     {
@@ -13177,85 +13209,85 @@
     {
       "code": "KN-01",
       "name": "Christ Church Nichola Town",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-02",
       "name": "Saint Anne Sandy Point",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-03",
       "name": "Saint George Basseterre",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-04",
       "name": "Saint George Gingerland",
-      "parent": "N",
+      "parent": "KN-N",
       "type": "Parish"
     },
     {
       "code": "KN-05",
       "name": "Saint James Windward",
-      "parent": "N",
+      "parent": "KN-N",
       "type": "Parish"
     },
     {
       "code": "KN-06",
       "name": "Saint John Capisterre",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-07",
       "name": "Saint John Figtree",
-      "parent": "N",
+      "parent": "KN-N",
       "type": "Parish"
     },
     {
       "code": "KN-08",
       "name": "Saint Mary Cayon",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-09",
       "name": "Saint Paul Capisterre",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-10",
       "name": "Saint Paul Charlestown",
-      "parent": "N",
+      "parent": "KN-N",
       "type": "Parish"
     },
     {
       "code": "KN-11",
       "name": "Saint Peter Basseterre",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-12",
       "name": "Saint Thomas Lowland",
-      "parent": "N",
+      "parent": "KN-N",
       "type": "Parish"
     },
     {
       "code": "KN-13",
       "name": "Saint Thomas Middle Island",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
       "code": "KN-15",
       "name": "Trinity Palmetto Point",
-      "parent": "K",
+      "parent": "KN-K",
       "type": "Parish"
     },
     {
@@ -13328,6 +13360,11 @@
       "name": "Nampho",
       "type": "Metropolitan city"
     },
+    {
+      "code": "KP-15",
+      "name": "Kaeseong",
+      "type": "Metropolitan city"
+    },
     {
       "code": "KR-11",
       "name": "Seoul-teukbyeolsi",
@@ -13370,8 +13407,8 @@
     },
     {
       "code": "KR-42",
-      "name": "Gangwon-do",
-      "type": "Province"
+      "name": "Gangwon-teukbyeoljachido",
+      "type": "Special self-governing province"
     },
     {
       "code": "KR-43",
@@ -13444,90 +13481,105 @@
       "type": "Governorate"
     },
     {
-      "code": "KZ-AKM",
+      "code": "KZ-10",
+      "name": "Abajskaja oblast’",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-11",
       "name": "Akmolinskaja oblast'",
       "type": "Region"
     },
     {
-      "code": "KZ-AKT",
+      "code": "KZ-15",
       "name": "Aktjubinskaja oblast'",
       "type": "Region"
     },
     {
-      "code": "KZ-ALA",
-      "name": "Almaty",
-      "type": "City"
-    },
-    {
-      "code": "KZ-ALM",
+      "code": "KZ-19",
       "name": "Almatinskaja oblast'",
       "type": "Region"
     },
     {
-      "code": "KZ-AST",
-      "name": "Nur-Sultan",
-      "type": "City"
-    },
-    {
-      "code": "KZ-ATY",
+      "code": "KZ-23",
       "name": "Atyrauskaja oblast'",
       "type": "Region"
     },
     {
-      "code": "KZ-KAR",
-      "name": "Karagandinskaja oblast'",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-KUS",
-      "name": "Kostanajskaja oblast'",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-KZY",
-      "name": "Kyzylordinskaja oblast'",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-MAN",
-      "name": "Mangghystaū oblysy",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-PAV",
-      "name": "Pavlodar oblysy",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-SEV",
-      "name": "Severo-Kazahstanskaja oblast'",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-SHY",
-      "name": "Shymkent",
-      "type": "City"
-    },
-    {
-      "code": "KZ-VOS",
-      "name": "Shyghys Qazaqstan oblysy",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-YUZ",
-      "name": "Turkestankaya oblast'",
-      "type": "Region"
-    },
-    {
-      "code": "KZ-ZAP",
+      "code": "KZ-27",
       "name": "Batys Qazaqstan oblysy",
       "type": "Region"
     },
     {
-      "code": "KZ-ZHA",
+      "code": "KZ-31",
       "name": "Zhambyl oblysy",
       "type": "Region"
     },
+    {
+      "code": "KZ-33",
+      "name": "Zhetisū oblysy",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-35",
+      "name": "Karagandinskaja oblast'",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-39",
+      "name": "Kostanajskaja oblast'",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-43",
+      "name": "Kyzylordinskaja oblast'",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-47",
+      "name": "Mangghystaū oblysy",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-55",
+      "name": "Pavlodar oblysy",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-59",
+      "name": "Severo-Kazahstanskaja oblast'",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-61",
+      "name": "Turkestankaya oblast'",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-62",
+      "name": "Ulytauskaja oblast’",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-63",
+      "name": "Shyghys Qazaqstan oblysy",
+      "type": "Region"
+    },
+    {
+      "code": "KZ-71",
+      "name": "Astana",
+      "type": "City"
+    },
+    {
+      "code": "KZ-75",
+      "name": "Almaty",
+      "type": "City"
+    },
+    {
+      "code": "KZ-79",
+      "name": "Shymkent",
+      "type": "City"
+    },
     {
       "code": "LA-AT",
       "name": "Attapu",
@@ -13771,19 +13823,19 @@
     {
       "code": "LK-11",
       "name": "Colombo",
-      "parent": "1",
+      "parent": "LK-1",
       "type": "District"
     },
     {
       "code": "LK-12",
       "name": "Gampaha",
-      "parent": "1",
+      "parent": "LK-1",
       "type": "District"
     },
     {
       "code": "LK-13",
       "name": "Kalutara",
-      "parent": "1",
+      "parent": "LK-1",
       "type": "District"
     },
     {
@@ -13794,19 +13846,19 @@
     {
       "code": "LK-21",
       "name": "Kandy",
-      "parent": "2",
+      "parent": "LK-2",
       "type": "District"
     },
     {
       "code": "LK-22",
       "name": "Matale",
-      "parent": "2",
+      "parent": "LK-2",
       "type": "District"
     },
     {
       "code": "LK-23",
       "name": "Nuwara Eliya",
-      "parent": "2",
+      "parent": "LK-2",
       "type": "District"
     },
     {
@@ -13817,19 +13869,19 @@
     {
       "code": "LK-31",
       "name": "Galle",
-      "parent": "3",
+      "parent": "LK-3",
       "type": "District"
     },
     {
       "code": "LK-32",
       "name": "Matara",
-      "parent": "3",
+      "parent": "LK-3",
       "type": "District"
     },
     {
       "code": "LK-33",
       "name": "Hambantota",
-      "parent": "3",
+      "parent": "LK-3",
       "type": "District"
     },
     {
@@ -13840,31 +13892,31 @@
     {
       "code": "LK-41",
       "name": "Jaffna",
-      "parent": "4",
+      "parent": "LK-4",
       "type": "District"
     },
     {
       "code": "LK-42",
       "name": "Kilinochchi",
-      "parent": "4",
+      "parent": "LK-4",
       "type": "District"
     },
     {
       "code": "LK-43",
       "name": "Mannar",
-      "parent": "4",
+      "parent": "LK-4",
       "type": "District"
     },
     {
       "code": "LK-44",
       "name": "Vavuniya",
-      "parent": "4",
+      "parent": "LK-4",
       "type": "District"
     },
     {
       "code": "LK-45",
       "name": "Mullaittivu",
-      "parent": "4",
+      "parent": "LK-4",
       "type": "District"
     },
     {
@@ -13875,19 +13927,19 @@
     {
       "code": "LK-51",
       "name": "Batticaloa",
-      "parent": "5",
+      "parent": "LK-5",
       "type": "District"
     },
     {
       "code": "LK-52",
       "name": "Ampara",
-      "parent": "5",
+      "parent": "LK-5",
       "type": "District"
     },
     {
       "code": "LK-53",
       "name": "Trincomalee",
-      "parent": "5",
+      "parent": "LK-5",
       "type": "District"
     },
     {
@@ -13898,13 +13950,13 @@
     {
       "code": "LK-61",
       "name": "Kurunegala",
-      "parent": "6",
+      "parent": "LK-6",
       "type": "District"
     },
     {
       "code": "LK-62",
       "name": "Puttalam",
-      "parent": "6",
+      "parent": "LK-6",
       "type": "District"
     },
     {
@@ -13915,13 +13967,13 @@
     {
       "code": "LK-71",
       "name": "Anuradhapura",
-      "parent": "7",
+      "parent": "LK-7",
       "type": "District"
     },
     {
       "code": "LK-72",
       "name": "Polonnaruwa",
-      "parent": "7",
+      "parent": "LK-7",
       "type": "District"
     },
     {
@@ -13932,13 +13984,13 @@
     {
       "code": "LK-81",
       "name": "Badulla",
-      "parent": "8",
+      "parent": "LK-8",
       "type": "District"
     },
     {
       "code": "LK-82",
       "name": "Monaragala",
-      "parent": "8",
+      "parent": "LK-8",
       "type": "District"
     },
     {
@@ -13949,13 +14001,13 @@
     {
       "code": "LK-91",
       "name": "Ratnapura",
-      "parent": "9",
+      "parent": "LK-9",
       "type": "District"
     },
     {
       "code": "LK-92",
       "name": "Kegalla",
-      "parent": "9",
+      "parent": "LK-9",
       "type": "District"
     },
     {
@@ -14086,301 +14138,361 @@
     {
       "code": "LT-01",
       "name": "Akmenė",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-02",
       "name": "Alytaus miestas",
+      "parent": "LT-AL",
       "type": "City municipality"
     },
     {
       "code": "LT-03",
       "name": "Alytus",
+      "parent": "LT-AL",
       "type": "District municipality"
     },
     {
       "code": "LT-04",
       "name": "Anykščiai",
+      "parent": "LT-UT",
       "type": "District municipality"
     },
     {
       "code": "LT-05",
-      "name": "Birštono",
+      "name": "Birštonas",
+      "parent": "LT-KU",
       "type": "Municipality"
     },
     {
       "code": "LT-06",
       "name": "Biržai",
+      "parent": "LT-PN",
       "type": "District municipality"
     },
     {
       "code": "LT-07",
       "name": "Druskininkai",
+      "parent": "LT-AL",
       "type": "Municipality"
     },
     {
       "code": "LT-08",
       "name": "Elektrėnai",
+      "parent": "LT-VL",
       "type": "Municipality"
     },
     {
       "code": "LT-09",
       "name": "Ignalina",
+      "parent": "LT-UT",
       "type": "District municipality"
     },
     {
       "code": "LT-10",
       "name": "Jonava",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-11",
       "name": "Joniškis",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-12",
       "name": "Jurbarkas",
+      "parent": "LT-TA",
       "type": "District municipality"
     },
     {
       "code": "LT-13",
       "name": "Kaišiadorys",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-14",
-      "name": "Kalvarijos",
+      "name": "Kalvarija",
+      "parent": "LT-MR",
       "type": "Municipality"
     },
     {
       "code": "LT-15",
       "name": "Kauno miestas",
+      "parent": "LT-KU",
       "type": "City municipality"
     },
     {
       "code": "LT-16",
       "name": "Kaunas",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-17",
       "name": "Kazlų Rūdos",
+      "parent": "LT-MR",
       "type": "Municipality"
     },
     {
       "code": "LT-18",
       "name": "Kėdainiai",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-19",
       "name": "Kelmė",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-20",
       "name": "Klaipėdos miestas",
+      "parent": "LT-KL",
       "type": "City municipality"
     },
     {
       "code": "LT-21",
       "name": "Klaipėda",
+      "parent": "LT-KL",
       "type": "District municipality"
     },
     {
       "code": "LT-22",
       "name": "Kretinga",
+      "parent": "LT-KL",
       "type": "District municipality"
     },
     {
       "code": "LT-23",
       "name": "Kupiškis",
+      "parent": "LT-PN",
       "type": "District municipality"
     },
     {
       "code": "LT-24",
       "name": "Lazdijai",
+      "parent": "LT-AL",
       "type": "District municipality"
     },
     {
       "code": "LT-25",
       "name": "Marijampolė",
+      "parent": "LT-MR",
       "type": "District municipality"
     },
     {
       "code": "LT-26",
       "name": "Mažeikiai",
+      "parent": "LT-TE",
       "type": "District municipality"
     },
     {
       "code": "LT-27",
       "name": "Molėtai",
+      "parent": "LT-UT",
       "type": "District municipality"
     },
     {
       "code": "LT-28",
       "name": "Neringa",
+      "parent": "LT-KL",
       "type": "Municipality"
     },
     {
       "code": "LT-29",
       "name": "Pagėgiai",
+      "parent": "LT-TA",
       "type": "Municipality"
     },
     {
       "code": "LT-30",
       "name": "Pakruojis",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-31",
       "name": "Palangos miestas",
+      "parent": "LT-KL",
       "type": "City municipality"
     },
     {
       "code": "LT-32",
       "name": "Panevėžio miestas",
+      "parent": "LT-PN",
       "type": "City municipality"
     },
     {
       "code": "LT-33",
       "name": "Panevėžys",
+      "parent": "LT-PN",
       "type": "District municipality"
     },
     {
       "code": "LT-34",
       "name": "Pasvalys",
+      "parent": "LT-PN",
       "type": "District municipality"
     },
     {
       "code": "LT-35",
       "name": "Plungė",
+      "parent": "LT-TE",
       "type": "District municipality"
     },
     {
       "code": "LT-36",
       "name": "Prienai",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-37",
       "name": "Radviliškis",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-38",
       "name": "Raseiniai",
+      "parent": "LT-KU",
       "type": "District municipality"
     },
     {
       "code": "LT-39",
-      "name": "Rietavo",
+      "name": "Rietavas",
+      "parent": "LT-TE",
       "type": "Municipality"
     },
     {
       "code": "LT-40",
       "name": "Rokiškis",
+      "parent": "LT-PN",
       "type": "District municipality"
     },
     {
       "code": "LT-41",
       "name": "Šakiai",
+      "parent": "LT-MR",
       "type": "District municipality"
     },
     {
       "code": "LT-42",
       "name": "Šalčininkai",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-43",
       "name": "Šiaulių miestas",
+      "parent": "LT-SA",
       "type": "City municipality"
     },
     {
       "code": "LT-44",
       "name": "Šiauliai",
+      "parent": "LT-SA",
       "type": "District municipality"
     },
     {
       "code": "LT-45",
       "name": "Šilalė",
+      "parent": "LT-TA",
       "type": "District municipality"
     },
     {
       "code": "LT-46",
       "name": "Šilutė",
+      "parent": "LT-KL",
       "type": "District municipality"
     },
     {
       "code": "LT-47",
       "name": "Širvintos",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-48",
       "name": "Skuodas",
+      "parent": "LT-KL",
       "type": "District municipality"
     },
     {
       "code": "LT-49",
       "name": "Švenčionys",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-50",
       "name": "Tauragė",
+      "parent": "LT-TA",
       "type": "District municipality"
     },
     {
       "code": "LT-51",
       "name": "Telšiai",
+      "parent": "LT-TE",
       "type": "District municipality"
     },
     {
       "code": "LT-52",
       "name": "Trakai",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-53",
       "name": "Ukmergė",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-54",
       "name": "Utena",
+      "parent": "LT-UT",
       "type": "District municipality"
     },
     {
       "code": "LT-55",
       "name": "Varėna",
+      "parent": "LT-AL",
       "type": "District municipality"
     },
     {
       "code": "LT-56",
       "name": "Vilkaviškis",
+      "parent": "LT-MR",
       "type": "District municipality"
     },
     {
       "code": "LT-57",
       "name": "Vilniaus miestas",
+      "parent": "LT-VL",
       "type": "City municipality"
     },
     {
       "code": "LT-58",
       "name": "Vilnius",
+      "parent": "LT-VL",
       "type": "District municipality"
     },
     {
       "code": "LT-59",
       "name": "Visaginas",
+      "parent": "LT-UT",
       "type": "Municipality"
     },
     {
       "code": "LT-60",
       "name": "Zarasai",
+      "parent": "LT-UT",
       "type": "District municipality"
     },
     {
@@ -14440,7 +14552,7 @@
     },
     {
       "code": "LU-CL",
-      "name": "Clerf",
+      "name": "Clervaux",
       "type": "Canton"
     },
     {
@@ -14455,7 +14567,7 @@
     },
     {
       "code": "LU-ES",
-      "name": "Esch an der Alzette",
+      "name": "Esch-sur-Alzette",
       "type": "Canton"
     },
     {
@@ -14485,7 +14597,7 @@
     },
     {
       "code": "LU-VD",
-      "name": "Veianen",
+      "name": "Vianden",
       "type": "Canton"
     },
     {
@@ -14493,76 +14605,21 @@
       "name": "Wiltz",
       "type": "Canton"
     },
-    {
-      "code": "LV-001",
-      "name": "Aglonas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-002",
       "name": "Aizkraukles novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-003",
-      "name": "Aizputes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-004",
-      "name": "Aknīstes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-005",
-      "name": "Alojas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-006",
-      "name": "Alsungas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-007",
       "name": "Alūksnes novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-008",
-      "name": "Amatas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-009",
-      "name": "Apes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-010",
-      "name": "Auces novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-011",
       "name": "Ādažu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-012",
-      "name": "Babītes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-013",
-      "name": "Baldones novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-014",
-      "name": "Baltinavas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-015",
       "name": "Balvu novads",
@@ -14573,126 +14630,21 @@
       "name": "Bauskas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-017",
-      "name": "Beverīnas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-018",
-      "name": "Brocēnu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-019",
-      "name": "Burtnieku novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-020",
-      "name": "Carnikavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-021",
-      "name": "Cesvaines novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-022",
       "name": "Cēsu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-023",
-      "name": "Ciblas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-024",
-      "name": "Dagdas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-025",
-      "name": "Daugavpils novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-026",
       "name": "Dobeles novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-027",
-      "name": "Dundagas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-028",
-      "name": "Durbes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-029",
-      "name": "Engures novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-030",
-      "name": "Ērgļu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-031",
-      "name": "Garkalnes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-032",
-      "name": "Grobiņas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-033",
       "name": "Gulbenes novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-034",
-      "name": "Iecavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-035",
-      "name": "Ikšķiles novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-036",
-      "name": "Ilūkstes novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-037",
-      "name": "Inčukalna novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-038",
-      "name": "Jaunjelgavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-039",
-      "name": "Jaunpiebalgas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-040",
-      "name": "Jaunpils novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-041",
       "name": "Jelgavas novads",
@@ -14703,81 +14655,31 @@
       "name": "Jēkabpils novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-043",
-      "name": "Kandavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-044",
-      "name": "Kārsavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-045",
-      "name": "Kocēnu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-046",
-      "name": "Kokneses novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-047",
       "name": "Krāslavas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-048",
-      "name": "Krimuldas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-049",
-      "name": "Krustpils novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-050",
       "name": "Kuldīgas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-051",
-      "name": "Ķeguma novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-052",
       "name": "Ķekavas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-053",
-      "name": "Lielvārdes novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-054",
       "name": "Limbažu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-055",
-      "name": "Līgatnes novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-056",
       "name": "Līvānu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-057",
-      "name": "Lubānas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-058",
       "name": "Ludzas novads",
@@ -14788,41 +14690,11 @@
       "name": "Madonas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-060",
-      "name": "Mazsalacas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-061",
-      "name": "Mālpils novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-062",
       "name": "Mārupes novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-063",
-      "name": "Mērsraga novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-064",
-      "name": "Naukšēnu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-065",
-      "name": "Neretas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-066",
-      "name": "Nīcas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-067",
       "name": "Ogres novads",
@@ -14833,96 +14705,21 @@
       "name": "Olaines novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-069",
-      "name": "Ozolnieku novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-070",
-      "name": "Pārgaujas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-071",
-      "name": "Pāvilostas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-072",
-      "name": "Pļaviņu novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-073",
       "name": "Preiļu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-074",
-      "name": "Priekules novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-075",
-      "name": "Priekuļu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-076",
-      "name": "Raunas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-077",
       "name": "Rēzeknes novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-078",
-      "name": "Riebiņu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-079",
-      "name": "Rojas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-080",
       "name": "Ropažu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-081",
-      "name": "Rucavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-082",
-      "name": "Rugāju novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-083",
-      "name": "Rundāles novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-084",
-      "name": "Rūjienas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-085",
-      "name": "Salas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-086",
-      "name": "Salacgrīvas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-087",
       "name": "Salaspils novads",
@@ -14938,61 +14735,26 @@
       "name": "Saulkrastu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-090",
-      "name": "Sējas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-091",
       "name": "Siguldas novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-092",
-      "name": "Skrīveru novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-093",
-      "name": "Skrundas novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-094",
       "name": "Smiltenes novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-095",
-      "name": "Stopiņu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-096",
-      "name": "Strenču novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-097",
       "name": "Talsu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-098",
-      "name": "Tērvetes novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-099",
       "name": "Tukuma novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-100",
-      "name": "Vaiņodes novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-101",
       "name": "Valkas novads",
@@ -15003,90 +14765,60 @@
       "name": "Varakļānu novads",
       "type": "Municipality"
     },
-    {
-      "code": "LV-103",
-      "name": "Vārkavas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-104",
-      "name": "Vecpiebalgas novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-105",
-      "name": "Vecumnieku novads",
-      "type": "Municipality"
-    },
     {
       "code": "LV-106",
       "name": "Ventspils novads",
       "type": "Municipality"
     },
     {
-      "code": "LV-107",
-      "name": "Viesītes novads",
+      "code": "LV-111",
+      "name": "Augšdaugavas novads",
       "type": "Municipality"
     },
     {
-      "code": "LV-108",
-      "name": "Viļakas novads",
+      "code": "LV-112",
+      "name": "Dienvidkurzemes Novads",
       "type": "Municipality"
     },
     {
-      "code": "LV-109",
-      "name": "Viļānu novads",
-      "type": "Municipality"
-    },
-    {
-      "code": "LV-110",
-      "name": "Zilupes novads",
+      "code": "LV-113",
+      "name": "Valmieras Novads",
       "type": "Municipality"
     },
     {
       "code": "LV-DGV",
       "name": "Daugavpils",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-JEL",
       "name": "Jelgava",
-      "type": "Republican city"
-    },
-    {
-      "code": "LV-JKB",
-      "name": "Jēkabpils",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-JUR",
       "name": "Jūrmala",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-LPX",
       "name": "Liepāja",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-REZ",
       "name": "Rēzekne",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-RIX",
       "name": "Rīga",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LV-VEN",
       "name": "Ventspils",
-      "type": "Republican city"
-    },
-    {
-      "code": "LV-VMR",
-      "name": "Valmiera",
-      "type": "Republican city"
+      "type": "State city"
     },
     {
       "code": "LY-BA",
@@ -15261,451 +14993,451 @@
     {
       "code": "MA-AGD",
       "name": "Agadir-Ida-Ou-Tanane",
-      "parent": "09",
+      "parent": "MA-09",
       "type": "Prefecture"
     },
     {
       "code": "MA-AOU",
       "name": "Aousserd (EH)",
-      "parent": "12",
+      "parent": "MA-12",
       "type": "Province"
     },
     {
       "code": "MA-ASZ",
       "name": "Assa-Zag (EH-partial)",
-      "parent": "10",
+      "parent": "MA-10",
       "type": "Province"
     },
     {
       "code": "MA-AZI",
       "name": "Azilal",
-      "parent": "05",
+      "parent": "MA-05",
       "type": "Province"
     },
     {
       "code": "MA-BEM",
       "name": "Béni Mellal",
-      "parent": "05",
+      "parent": "MA-05",
       "type": "Province"
     },
     {
       "code": "MA-BER",
       "name": "Berkane",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-BES",
       "name": "Benslimane",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-BOD",
       "name": "Boujdour (EH)",
-      "parent": "11",
+      "parent": "MA-11",
       "type": "Province"
     },
     {
       "code": "MA-BOM",
       "name": "Boulemane",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-BRR",
       "name": "Berrechid",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-CAS",
       "name": "Casablanca",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Prefecture"
     },
     {
       "code": "MA-CHE",
       "name": "Chefchaouen",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-CHI",
       "name": "Chichaoua",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-CHT",
       "name": "Chtouka-Ait Baha",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-DRI",
       "name": "Driouch",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-ERR",
       "name": "Errachidia",
-      "parent": "08",
+      "parent": "MA-08",
       "type": "Province"
     },
     {
       "code": "MA-ESI",
       "name": "Essaouira",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-ESM",
       "name": "Es-Semara (EH-partial)",
-      "parent": "11",
+      "parent": "MA-11",
       "type": "Province"
     },
     {
       "code": "MA-FAH",
       "name": "Fahs-Anjra",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-FES",
       "name": "Fès",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Prefecture"
     },
     {
       "code": "MA-FIG",
       "name": "Figuig",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-FQH",
       "name": "Fquih Ben Salah",
-      "parent": "05",
+      "parent": "MA-05",
       "type": "Province"
     },
     {
       "code": "MA-GUE",
       "name": "Guelmim",
-      "parent": "10",
+      "parent": "MA-10",
       "type": "Province"
     },
     {
       "code": "MA-GUF",
       "name": "Guercif",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-HAJ",
       "name": "El Hajeb",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-HAO",
       "name": "Al Haouz",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-HOC",
       "name": "Al Hoceïma",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-IFR",
       "name": "Ifrane",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-INE",
       "name": "Inezgane-Ait Melloul",
-      "parent": "09",
+      "parent": "MA-09",
       "type": "Prefecture"
     },
     {
       "code": "MA-JDI",
       "name": "El Jadida",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-JRA",
       "name": "Jerada",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-KEN",
       "name": "Kénitra",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Province"
     },
     {
       "code": "MA-KES",
       "name": "El Kelâa des Sraghna",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-KHE",
       "name": "Khémisset",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Province"
     },
     {
       "code": "MA-KHN",
       "name": "Khénifra",
-      "parent": "05",
+      "parent": "MA-05",
       "type": "Province"
     },
     {
       "code": "MA-KHO",
       "name": "Khouribga",
-      "parent": "05",
+      "parent": "MA-05",
       "type": "Province"
     },
     {
       "code": "MA-LAA",
       "name": "Laâyoune (EH)",
-      "parent": "11",
+      "parent": "MA-11",
       "type": "Province"
     },
     {
       "code": "MA-LAR",
       "name": "Larache",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-MAR",
       "name": "Marrakech",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Prefecture"
     },
     {
       "code": "MA-MDF",
       "name": "M’diq-Fnideq",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Prefecture"
     },
     {
       "code": "MA-MED",
       "name": "Médiouna",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-MEK",
       "name": "Meknès",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Prefecture"
     },
     {
       "code": "MA-MID",
       "name": "Midelt",
-      "parent": "08",
+      "parent": "MA-08",
       "type": "Province"
     },
     {
       "code": "MA-MOH",
       "name": "Mohammadia",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Prefecture"
     },
     {
       "code": "MA-MOU",
       "name": "Moulay Yacoub",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-NAD",
       "name": "Nador",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-NOU",
       "name": "Nouaceur",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Province"
     },
     {
       "code": "MA-OUA",
       "name": "Ouarzazate",
-      "parent": "08",
+      "parent": "MA-08",
       "type": "Province"
     },
     {
       "code": "MA-OUD",
       "name": "Oued Ed-Dahab (EH)",
-      "parent": "12",
+      "parent": "MA-12",
       "type": "Province"
     },
     {
       "code": "MA-OUJ",
       "name": "Oujda-Angad",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Prefecture"
     },
     {
       "code": "MA-OUZ",
       "name": "Ouezzane",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-RAB",
       "name": "Rabat",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Prefecture"
     },
     {
       "code": "MA-REH",
       "name": "Rehamna",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-SAF",
       "name": "Safi",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-SAL",
       "name": "Salé",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Prefecture"
     },
     {
       "code": "MA-SEF",
       "name": "Sefrou",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-SET",
       "name": "Settat",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-SIB",
       "name": "Sidi Bennour",
-      "parent": "06",
+      "parent": "MA-06",
       "type": "Province"
     },
     {
       "code": "MA-SIF",
       "name": "Sidi Ifni",
-      "parent": "10",
+      "parent": "MA-10",
       "type": "Province"
     },
     {
       "code": "MA-SIK",
       "name": "Sidi Kacem",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Province"
     },
     {
       "code": "MA-SIL",
       "name": "Sidi Slimane",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Province"
     },
     {
       "code": "MA-SKH",
       "name": "Skhirate-Témara",
-      "parent": "04",
+      "parent": "MA-04",
       "type": "Prefecture"
     },
     {
       "code": "MA-TAF",
       "name": "Tarfaya (EH-partial)",
-      "parent": "11",
+      "parent": "MA-11",
       "type": "Province"
     },
     {
       "code": "MA-TAI",
       "name": "Taourirt",
-      "parent": "02",
+      "parent": "MA-02",
       "type": "Province"
     },
     {
       "code": "MA-TAO",
       "name": "Taounate",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-TAR",
       "name": "Taroudannt",
-      "parent": "09",
+      "parent": "MA-09",
       "type": "Province"
     },
     {
       "code": "MA-TAT",
       "name": "Tata",
-      "parent": "09",
+      "parent": "MA-09",
       "type": "Province"
     },
     {
       "code": "MA-TAZ",
       "name": "Taza",
-      "parent": "03",
+      "parent": "MA-03",
       "type": "Province"
     },
     {
       "code": "MA-TET",
       "name": "Tétouan",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Province"
     },
     {
       "code": "MA-TIN",
       "name": "Tinghir",
-      "parent": "08",
+      "parent": "MA-08",
       "type": "Province"
     },
     {
       "code": "MA-TIZ",
       "name": "Tiznit",
-      "parent": "09",
+      "parent": "MA-09",
       "type": "Province"
     },
     {
       "code": "MA-TNG",
       "name": "Tanger-Assilah",
-      "parent": "01",
+      "parent": "MA-01",
       "type": "Prefecture"
     },
     {
       "code": "MA-TNT",
       "name": "Tan-Tan (EH-partial)",
-      "parent": "10",
+      "parent": "MA-10",
       "type": "Province"
     },
     {
       "code": "MA-YUS",
       "name": "Youssoufia",
-      "parent": "07",
+      "parent": "MA-07",
       "type": "Province"
     },
     {
       "code": "MA-ZAG",
       "name": "Zagora",
-      "parent": "08",
+      "parent": "MA-08",
       "type": "Province"
     },
     {
@@ -16098,6 +15830,11 @@
       "name": "Tuzi",
       "type": "Municipality"
     },
+    {
+      "code": "ME-25",
+      "name": "Zeta",
+      "type": "Municipality"
+    },
     {
       "code": "MG-A",
       "name": "Toamasina",
@@ -16131,61 +15868,61 @@
     {
       "code": "MH-ALK",
       "name": "Ailuk",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-ALL",
       "name": "Ailinglaplap",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-ARN",
       "name": "Arno",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-AUR",
       "name": "Aur",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-EBO",
       "name": "Ebon",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-ENI",
       "name": "Enewetak & Ujelang",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-JAB",
       "name": "Jabat",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-JAL",
       "name": "Jaluit",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-KIL",
       "name": "Bikini & Kili",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-KWA",
       "name": "Kwajalein",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
@@ -16196,61 +15933,61 @@
     {
       "code": "MH-LAE",
       "name": "Lae",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-LIB",
       "name": "Lib",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-LIK",
       "name": "Likiep",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-MAJ",
       "name": "Majuro",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-MAL",
       "name": "Maloelap",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-MEJ",
       "name": "Mejit",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-MIL",
       "name": "Mili",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-NMK",
       "name": "Namdrik",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-NMU",
       "name": "Namu",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-RON",
       "name": "Rongelap",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
@@ -16261,25 +15998,25 @@
     {
       "code": "MH-UJA",
       "name": "Ujae",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-UTI",
       "name": "Utrik",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
       "code": "MH-WTH",
       "name": "Wotho",
-      "parent": "L",
+      "parent": "MH-L",
       "type": "Municipality"
     },
     {
       "code": "MH-WTJ",
       "name": "Wotje",
-      "parent": "T",
+      "parent": "MH-T",
       "type": "Municipality"
     },
     {
@@ -17505,13 +17242,13 @@
     {
       "code": "MW-BA",
       "name": "Balaka",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-BL",
       "name": "Blantyre",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
@@ -17522,91 +17259,91 @@
     {
       "code": "MW-CK",
       "name": "Chikwawa",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-CR",
       "name": "Chiradzulu",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-CT",
       "name": "Chitipa",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
       "code": "MW-DE",
       "name": "Dedza",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-DO",
       "name": "Dowa",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-KR",
       "name": "Karonga",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
       "code": "MW-KS",
       "name": "Kasungu",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-LI",
       "name": "Lilongwe",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-LK",
       "name": "Likoma",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
       "code": "MW-MC",
       "name": "Mchinji",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-MG",
       "name": "Mangochi",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-MH",
       "name": "Machinga",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-MU",
       "name": "Mulanje",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-MW",
       "name": "Mwanza",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-MZ",
       "name": "Mzimba",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
@@ -17617,49 +17354,49 @@
     {
       "code": "MW-NB",
       "name": "Nkhata Bay",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
       "code": "MW-NE",
       "name": "Neno",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-NI",
       "name": "Ntchisi",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-NK",
       "name": "Nkhotakota",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-NS",
       "name": "Nsanje",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-NU",
       "name": "Ntcheu",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-PH",
       "name": "Phalombe",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-RU",
       "name": "Rumphi",
-      "parent": "N",
+      "parent": "MW-N",
       "type": "District"
     },
     {
@@ -17670,19 +17407,19 @@
     {
       "code": "MW-SA",
       "name": "Salima",
-      "parent": "C",
+      "parent": "MW-C",
       "type": "District"
     },
     {
       "code": "MW-TH",
       "name": "Thyolo",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
       "code": "MW-ZO",
       "name": "Zomba",
-      "parent": "S",
+      "parent": "MW-S",
       "type": "District"
     },
     {
@@ -17718,7 +17455,7 @@
     {
       "code": "MX-CMX",
       "name": "Ciudad de México",
-      "type": "Federal district"
+      "type": "Federal entity"
     },
     {
       "code": "MX-COA",
@@ -18515,110 +18252,19 @@
       "name": "Romssa ja Finnmárkku",
       "type": "County"
     },
-    {
-      "code": "NP-1",
-      "name": "Central",
-      "type": "Development region"
-    },
-    {
-      "code": "NP-2",
-      "name": "Mid Western",
-      "type": "Development region"
-    },
-    {
-      "code": "NP-3",
-      "name": "Western",
-      "type": "Development region"
-    },
-    {
-      "code": "NP-4",
-      "name": "Eastern",
-      "type": "Development region"
-    },
-    {
-      "code": "NP-5",
-      "name": "Far Western",
-      "type": "Development region"
-    },
-    {
-      "code": "NP-BA",
-      "name": "Bagmati",
-      "parent": "1",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-BH",
-      "name": "Bheri",
-      "parent": "2",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-DH",
-      "name": "Dhawalagiri",
-      "parent": "3",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-GA",
-      "name": "Gandaki",
-      "parent": "3",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-JA",
-      "name": "Janakpur",
-      "parent": "1",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-KA",
-      "name": "Karnali",
-      "parent": "2",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-KO",
-      "name": "Kosi",
-      "parent": "4",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-LU",
-      "name": "Lumbini",
-      "parent": "3",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-MA",
-      "name": "Mahakali",
-      "parent": "5",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-ME",
-      "name": "Mechi",
-      "parent": "4",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-NA",
-      "name": "Narayani",
-      "parent": "1",
-      "type": "Zone"
-    },
     {
       "code": "NP-P1",
-      "name": "Province 1",
+      "name": "Koshi",
       "type": "Province"
     },
     {
       "code": "NP-P2",
-      "name": "Province 2",
+      "name": "Madhesh",
       "type": "Province"
     },
     {
       "code": "NP-P3",
-      "name": "Bāgmatī",
+      "name": "Bagmati",
       "type": "Province"
     },
     {
@@ -18628,7 +18274,7 @@
     },
     {
       "code": "NP-P5",
-      "name": "Province 5",
+      "name": "Lumbini",
       "type": "Province"
     },
     {
@@ -18638,27 +18284,9 @@
     },
     {
       "code": "NP-P7",
-      "name": "Sudūr Pashchim",
+      "name": "Sudurpashchim",
       "type": "Province"
     },
-    {
-      "code": "NP-RA",
-      "name": "Rapti",
-      "parent": "2",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-SA",
-      "name": "Sagarmatha",
-      "parent": "4",
-      "type": "Zone"
-    },
-    {
-      "code": "NP-SE",
-      "name": "Seti",
-      "parent": "5",
-      "type": "Zone"
-    },
     {
       "code": "NR-01",
       "name": "Aiwo",
@@ -18766,7 +18394,7 @@
     },
     {
       "code": "NZ-MWT",
-      "name": "Manawatu-Wanganui",
+      "name": "Manawatū-Whanganui",
       "type": "Region"
     },
     {
@@ -18801,7 +18429,7 @@
     },
     {
       "code": "NZ-WGN",
-      "name": "Wellington",
+      "name": "Greater Wellington",
       "type": "Region"
     },
     {
@@ -18931,7 +18559,12 @@
     },
     {
       "code": "PA-NB",
-      "name": "Ngöbe-Buglé",
+      "name": "Ngäbe-Buglé",
+      "type": "Indigenous region"
+    },
+    {
+      "code": "PA-NT",
+      "name": "Naso Tjër Di",
       "type": "Indigenous region"
     },
     {
@@ -19262,487 +18895,493 @@
     {
       "code": "PH-ABR",
       "name": "Abra",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-AGN",
       "name": "Agusan del Norte",
-      "parent": "13",
+      "parent": "PH-13",
       "type": "Province"
     },
     {
       "code": "PH-AGS",
       "name": "Agusan del Sur",
-      "parent": "13",
+      "parent": "PH-13",
       "type": "Province"
     },
     {
       "code": "PH-AKL",
       "name": "Aklan",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-ALB",
       "name": "Albay",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-ANT",
       "name": "Antique",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-APA",
       "name": "Apayao",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-AUR",
       "name": "Aurora",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-BAN",
       "name": "Bataan",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-BAS",
       "name": "Basilan",
-      "parent": "09",
+      "parent": "PH-09",
       "type": "Province"
     },
     {
       "code": "PH-BEN",
       "name": "Benguet",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-BIL",
       "name": "Biliran",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-BOH",
       "name": "Bohol",
-      "parent": "07",
+      "parent": "PH-07",
       "type": "Province"
     },
     {
       "code": "PH-BTG",
       "name": "Batangas",
-      "parent": "40",
+      "parent": "PH-40",
       "type": "Province"
     },
     {
       "code": "PH-BTN",
       "name": "Batanes",
-      "parent": "02",
+      "parent": "PH-02",
       "type": "Province"
     },
     {
       "code": "PH-BUK",
       "name": "Bukidnon",
-      "parent": "10",
+      "parent": "PH-10",
       "type": "Province"
     },
     {
       "code": "PH-BUL",
       "name": "Bulacan",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-CAG",
       "name": "Cagayan",
-      "parent": "02",
+      "parent": "PH-02",
       "type": "Province"
     },
     {
       "code": "PH-CAM",
       "name": "Camiguin",
-      "parent": "10",
+      "parent": "PH-10",
       "type": "Province"
     },
     {
       "code": "PH-CAN",
       "name": "Camarines Norte",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-CAP",
       "name": "Capiz",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-CAS",
       "name": "Camarines Sur",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-CAT",
       "name": "Catanduanes",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-CAV",
       "name": "Cavite",
-      "parent": "40",
+      "parent": "PH-40",
       "type": "Province"
     },
     {
       "code": "PH-CEB",
       "name": "Cebu",
-      "parent": "07",
+      "parent": "PH-07",
       "type": "Province"
     },
     {
       "code": "PH-COM",
       "name": "Davao de Oro",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-DAO",
       "name": "Davao Oriental",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-DAS",
       "name": "Davao del Sur",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-DAV",
       "name": "Davao del Norte",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-DIN",
       "name": "Dinagat Islands",
-      "parent": "13",
+      "parent": "PH-13",
       "type": "Province"
     },
     {
       "code": "PH-DVO",
       "name": "Davao Occidental",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-EAS",
       "name": "Eastern Samar",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-GUI",
       "name": "Guimaras",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-IFU",
       "name": "Ifugao",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-ILI",
       "name": "Iloilo",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-ILN",
       "name": "Ilocos Norte",
-      "parent": "01",
+      "parent": "PH-01",
       "type": "Province"
     },
     {
       "code": "PH-ILS",
       "name": "Ilocos Sur",
-      "parent": "01",
+      "parent": "PH-01",
       "type": "Province"
     },
     {
       "code": "PH-ISA",
       "name": "Isabela",
-      "parent": "02",
+      "parent": "PH-02",
       "type": "Province"
     },
     {
       "code": "PH-KAL",
       "name": "Kalinga",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-LAG",
       "name": "Laguna",
-      "parent": "40",
+      "parent": "PH-40",
       "type": "Province"
     },
     {
       "code": "PH-LAN",
       "name": "Lanao del Norte",
-      "parent": "12",
+      "parent": "PH-12",
       "type": "Province"
     },
     {
       "code": "PH-LAS",
       "name": "Lanao del Sur",
-      "parent": "14",
+      "parent": "PH-14",
       "type": "Province"
     },
     {
       "code": "PH-LEY",
       "name": "Leyte",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-LUN",
       "name": "La Union",
-      "parent": "01",
+      "parent": "PH-01",
       "type": "Province"
     },
     {
       "code": "PH-MAD",
       "name": "Marinduque",
-      "parent": "41",
-      "type": "Province"
-    },
-    {
-      "code": "PH-MAG",
-      "name": "Maguindanao",
-      "parent": "14",
+      "parent": "PH-41",
       "type": "Province"
     },
     {
       "code": "PH-MAS",
       "name": "Masbate",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-MDC",
       "name": "Mindoro Occidental",
-      "parent": "41",
+      "parent": "PH-41",
       "type": "Province"
     },
     {
       "code": "PH-MDR",
       "name": "Mindoro Oriental",
-      "parent": "41",
+      "parent": "PH-41",
+      "type": "Province"
+    },
+    {
+      "code": "PH-MGN",
+      "name": "Maguindanao del Norte",
+      "parent": "PH-14",
+      "type": "Province"
+    },
+    {
+      "code": "PH-MGS",
+      "name": "Maguindanao del Sur",
+      "parent": "PH-14",
       "type": "Province"
     },
     {
       "code": "PH-MOU",
       "name": "Mountain Province",
-      "parent": "15",
+      "parent": "PH-15",
       "type": "Province"
     },
     {
       "code": "PH-MSC",
       "name": "Misamis Occidental",
-      "parent": "10",
+      "parent": "PH-10",
       "type": "Province"
     },
     {
       "code": "PH-MSR",
       "name": "Misamis Oriental",
-      "parent": "10",
+      "parent": "PH-10",
       "type": "Province"
     },
     {
       "code": "PH-NCO",
       "name": "Cotabato",
-      "parent": "12",
+      "parent": "PH-12",
       "type": "Province"
     },
     {
       "code": "PH-NEC",
       "name": "Negros Occidental",
-      "parent": "06",
+      "parent": "PH-06",
       "type": "Province"
     },
     {
       "code": "PH-NER",
       "name": "Negros Oriental",
-      "parent": "07",
+      "parent": "PH-07",
       "type": "Province"
     },
     {
       "code": "PH-NSA",
       "name": "Northern Samar",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-NUE",
       "name": "Nueva Ecija",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-NUV",
       "name": "Nueva Vizcaya",
-      "parent": "02",
+      "parent": "PH-02",
       "type": "Province"
     },
     {
       "code": "PH-PAM",
       "name": "Pampanga",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-PAN",
       "name": "Pangasinan",
-      "parent": "01",
+      "parent": "PH-01",
       "type": "Province"
     },
     {
       "code": "PH-PLW",
       "name": "Palawan",
-      "parent": "41",
+      "parent": "PH-41",
       "type": "Province"
     },
     {
       "code": "PH-QUE",
       "name": "Quezon",
-      "parent": "40",
+      "parent": "PH-40",
       "type": "Province"
     },
     {
       "code": "PH-QUI",
       "name": "Quirino",
-      "parent": "02",
+      "parent": "PH-02",
       "type": "Province"
     },
     {
       "code": "PH-RIZ",
       "name": "Rizal",
-      "parent": "40",
+      "parent": "PH-40",
       "type": "Province"
     },
     {
       "code": "PH-ROM",
       "name": "Romblon",
-      "parent": "41",
+      "parent": "PH-41",
       "type": "Province"
     },
     {
       "code": "PH-SAR",
       "name": "Sarangani",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-SCO",
       "name": "South Cotabato",
-      "parent": "11",
+      "parent": "PH-11",
       "type": "Province"
     },
     {
       "code": "PH-SIG",
       "name": "Siquijor",
-      "parent": "07",
+      "parent": "PH-07",
       "type": "Province"
     },
     {
       "code": "PH-SLE",
       "name": "Southern Leyte",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-SLU",
       "name": "Sulu",
-      "parent": "14",
+      "parent": "PH-14",
       "type": "Province"
     },
     {
       "code": "PH-SOR",
       "name": "Sorsogon",
-      "parent": "05",
+      "parent": "PH-05",
       "type": "Province"
     },
     {
       "code": "PH-SUK",
       "name": "Sultan Kudarat",
-      "parent": "12",
+      "parent": "PH-12",
       "type": "Province"
     },
     {
       "code": "PH-SUN",
       "name": "Surigao del Norte",
-      "parent": "13",
+      "parent": "PH-13",
       "type": "Province"
     },
     {
       "code": "PH-SUR",
       "name": "Surigao del Sur",
-      "parent": "13",
+      "parent": "PH-13",
       "type": "Province"
     },
     {
       "code": "PH-TAR",
       "name": "Tarlac",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-TAW",
       "name": "Tawi-Tawi",
-      "parent": "14",
+      "parent": "PH-14",
       "type": "Province"
     },
     {
       "code": "PH-WSA",
       "name": "Samar",
-      "parent": "08",
+      "parent": "PH-08",
       "type": "Province"
     },
     {
       "code": "PH-ZAN",
       "name": "Zamboanga del Norte",
-      "parent": "09",
+      "parent": "PH-09",
       "type": "Province"
     },
     {
       "code": "PH-ZAS",
       "name": "Zamboanga del Sur",
-      "parent": "09",
+      "parent": "PH-09",
       "type": "Province"
     },
     {
       "code": "PH-ZMB",
       "name": "Zambales",
-      "parent": "03",
+      "parent": "PH-03",
       "type": "Province"
     },
     {
       "code": "PH-ZSI",
       "name": "Zamboanga Sibugay",
-      "parent": "09",
+      "parent": "PH-09",
       "type": "Province"
     },
     {
@@ -19787,7 +19426,7 @@
     },
     {
       "code": "PL-04",
-      "name": "Kujawsko-pomorskie",
+      "name": "Kujawsko-Pomorskie",
       "type": "Voivodship"
     },
     {
@@ -19847,7 +19486,7 @@
     },
     {
       "code": "PL-28",
-      "name": "Warmińsko-mazurskie",
+      "name": "Warmińsko-Mazurskie",
       "type": "Voivodship"
     },
     {
@@ -20468,43 +20107,43 @@
     {
       "code": "RS-01",
       "name": "Severnobački okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-02",
       "name": "Srednjebanatski okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-03",
       "name": "Severnobanatski okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-04",
       "name": "Južnobanatski okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-05",
       "name": "Zapadnobački okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-06",
       "name": "Južnobački okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
       "code": "RS-07",
       "name": "Sremski okrug",
-      "parent": "VO",
+      "parent": "RS-VO",
       "type": "District"
     },
     {
@@ -20595,31 +20234,31 @@
     {
       "code": "RS-25",
       "name": "Kosovski okrug",
-      "parent": "KM",
+      "parent": "RS-KM",
       "type": "District"
     },
     {
       "code": "RS-26",
       "name": "Pećki okrug",
-      "parent": "KM",
+      "parent": "RS-KM",
       "type": "District"
     },
     {
       "code": "RS-27",
       "name": "Prizrenski okrug",
-      "parent": "KM",
+      "parent": "RS-KM",
       "type": "District"
     },
     {
       "code": "RS-28",
       "name": "Kosovsko-Mitrovački okrug",
-      "parent": "KM",
+      "parent": "RS-KM",
       "type": "District"
     },
     {
       "code": "RS-29",
       "name": "Kosovsko-Pomoravski okrug",
-      "parent": "KM",
+      "parent": "RS-KM",
       "type": "District"
     },
     {
@@ -21610,7 +21249,7 @@
     {
       "code": "SI-011",
       "name": "Celje",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-012",
@@ -21774,7 +21413,7 @@
     },
     {
       "code": "SI-044",
-      "name": "Kanal",
+      "name": "Kanal ob Soči",
       "type": "Municipality"
     },
     {
@@ -21805,7 +21444,7 @@
     {
       "code": "SI-050",
       "name": "Koper",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-051",
@@ -21815,7 +21454,7 @@
     {
       "code": "SI-052",
       "name": "Kranj",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-053",
@@ -21825,7 +21464,7 @@
     {
       "code": "SI-054",
       "name": "Krško",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-055",
@@ -21860,7 +21499,7 @@
     {
       "code": "SI-061",
       "name": "Ljubljana",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-062",
@@ -21905,7 +21544,7 @@
     {
       "code": "SI-070",
       "name": "Maribor",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-071",
@@ -21955,7 +21594,7 @@
     {
       "code": "SI-080",
       "name": "Murska Sobota",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-081",
@@ -21975,12 +21614,12 @@
     {
       "code": "SI-084",
       "name": "Nova Gorica",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-085",
       "name": "Novo Mesto",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-086",
@@ -22035,7 +21674,7 @@
     {
       "code": "SI-096",
       "name": "Ptuj",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-097",
@@ -22115,7 +21754,7 @@
     {
       "code": "SI-112",
       "name": "Slovenj Gradec",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-113",
@@ -22220,7 +21859,7 @@
     {
       "code": "SI-133",
       "name": "Velenje",
-      "type": "Municipality"
+      "type": "Urban municipality"
     },
     {
       "code": "SI-134",
@@ -22534,7 +22173,7 @@
     },
     {
       "code": "SI-197",
-      "name": "Kosanjevica na Krki",
+      "name": "Kostanjevica na Krki",
       "type": "Municipality"
     },
     {
@@ -23184,7 +22823,7 @@
     },
     {
       "code": "TD-BA",
-      "name": "Al Baţḩā’",
+      "name": "Batha",
       "type": "Province"
     },
     {
@@ -23229,7 +22868,7 @@
     },
     {
       "code": "TD-LC",
-      "name": "Al Buḩayrah",
+      "name": "Lac",
       "type": "Province"
     },
     {
@@ -23264,7 +22903,7 @@
     },
     {
       "code": "TD-ND",
-      "name": "Madīnat Injamīnā",
+      "name": "Ville de Ndjamena",
       "type": "Province"
     },
     {
@@ -23289,7 +22928,7 @@
     },
     {
       "code": "TD-TI",
-      "name": "Tibastī",
+      "name": "Tibesti",
       "type": "Province"
     },
     {
@@ -24900,811 +24539,811 @@
     {
       "code": "UG-101",
       "name": "Kalangala",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-102",
       "name": "Kampala",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "City"
     },
     {
       "code": "UG-103",
       "name": "Kiboga",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-104",
       "name": "Luwero",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-105",
       "name": "Masaka",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-106",
       "name": "Mpigi",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-107",
       "name": "Mubende",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-108",
       "name": "Mukono",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-109",
       "name": "Nakasongola",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-110",
       "name": "Rakai",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-111",
       "name": "Sembabule",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-112",
       "name": "Kayunga",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-113",
       "name": "Wakiso",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-114",
       "name": "Lyantonde",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-115",
       "name": "Mityana",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-116",
       "name": "Nakaseke",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-117",
       "name": "Buikwe",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-118",
       "name": "Bukomansibi",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-119",
       "name": "Butambala",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-120",
       "name": "Buvuma",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-121",
       "name": "Gomba",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-122",
       "name": "Kalungu",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-123",
       "name": "Kyankwanzi",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-124",
       "name": "Lwengo",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-125",
       "name": "Kyotera",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-126",
       "name": "Kasanda",
-      "parent": "C",
+      "parent": "UG-C",
       "type": "District"
     },
     {
       "code": "UG-201",
       "name": "Bugiri",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-202",
       "name": "Busia",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-203",
       "name": "Iganga",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-204",
       "name": "Jinja",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-205",
       "name": "Kamuli",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-206",
       "name": "Kapchorwa",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-207",
       "name": "Katakwi",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-208",
       "name": "Kumi",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-209",
       "name": "Mbale",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-210",
       "name": "Pallisa",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-211",
       "name": "Soroti",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-212",
       "name": "Tororo",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-213",
       "name": "Kaberamaido",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-214",
       "name": "Mayuge",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-215",
       "name": "Sironko",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-216",
       "name": "Amuria",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-217",
       "name": "Budaka",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-218",
       "name": "Bududa",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-219",
       "name": "Bukedea",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-220",
       "name": "Bukwo",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-221",
       "name": "Butaleja",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-222",
       "name": "Kaliro",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-223",
       "name": "Manafwa",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-224",
       "name": "Namutumba",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-225",
       "name": "Bulambuli",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-226",
       "name": "Buyende",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-227",
       "name": "Kibuku",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-228",
       "name": "Kween",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-229",
       "name": "Luuka",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-230",
       "name": "Namayingo",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-231",
       "name": "Ngora",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-232",
       "name": "Serere",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-233",
       "name": "Butebo",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-234",
       "name": "Namisindwa",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-235",
       "name": "Bugweri",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-236",
       "name": "Kapelebyong",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-237",
       "name": "Kalaki",
-      "parent": "E",
+      "parent": "UG-E",
       "type": "District"
     },
     {
       "code": "UG-301",
       "name": "Adjumani",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-302",
       "name": "Apac",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-303",
       "name": "Arua",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-304",
       "name": "Gulu",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-305",
       "name": "Kitgum",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-306",
       "name": "Kotido",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-307",
       "name": "Lira",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-308",
       "name": "Moroto",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-309",
       "name": "Moyo",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-310",
       "name": "Nebbi",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-311",
       "name": "Nakapiripirit",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-312",
       "name": "Pader",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-313",
       "name": "Yumbe",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-314",
       "name": "Abim",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-315",
       "name": "Amolatar",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-316",
       "name": "Amuru",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-317",
       "name": "Dokolo",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-318",
       "name": "Kaabong",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-319",
       "name": "Koboko",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-320",
       "name": "Maracha",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-321",
       "name": "Oyam",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-322",
       "name": "Agago",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-323",
       "name": "Alebtong",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-324",
       "name": "Amudat",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-325",
       "name": "Kole",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-326",
       "name": "Lamwo",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-327",
       "name": "Napak",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-328",
       "name": "Nwoya",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-329",
       "name": "Otuke",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-330",
       "name": "Zombo",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-331",
       "name": "Omoro",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-332",
       "name": "Pakwach",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-333",
       "name": "Kwania",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-334",
       "name": "Nabilatuk",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-335",
       "name": "Karenga",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-336",
       "name": "Madi-Okollo",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-337",
       "name": "Obongi",
-      "parent": "N",
+      "parent": "UG-N",
       "type": "District"
     },
     {
       "code": "UG-401",
       "name": "Bundibugyo",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-402",
       "name": "Bushenyi",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-403",
       "name": "Hoima",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-404",
       "name": "Kabale",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-405",
       "name": "Kabarole",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-406",
       "name": "Kasese",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-407",
       "name": "Kibaale",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-408",
       "name": "Kisoro",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-409",
       "name": "Masindi",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-410",
       "name": "Mbarara",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-411",
       "name": "Ntungamo",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-412",
       "name": "Rukungiri",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-413",
       "name": "Kamwenge",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-414",
       "name": "Kanungu",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-415",
       "name": "Kyenjojo",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-416",
       "name": "Buliisa",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-417",
       "name": "Ibanda",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-418",
       "name": "Isingiro",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-419",
       "name": "Kiruhura",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-420",
       "name": "Buhweju",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-421",
       "name": "Kiryandongo",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-422",
       "name": "Kyegegwa",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-423",
       "name": "Mitooma",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-424",
       "name": "Ntoroko",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-425",
       "name": "Rubirizi",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-426",
       "name": "Sheema",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-427",
       "name": "Kagadi",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-428",
       "name": "Kakumiro",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-429",
       "name": "Rubanda",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-430",
       "name": "Bunyangabu",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-431",
       "name": "Rukiga",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-432",
       "name": "Kikuube",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-433",
       "name": "Kazo",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-434",
       "name": "Kitagwenda",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
       "code": "UG-435",
       "name": "Rwampara",
-      "parent": "W",
+      "parent": "UG-W",
       "type": "District"
     },
     {
diff --git a/libs/pycountry/db.py b/libs/pycountry/db.py
index bfc0f28ff..08f24e8c9 100644
--- a/libs/pycountry/db.py
+++ b/libs/pycountry/db.py
@@ -1,7 +1,6 @@
 import json
 import logging
 import threading
-import warnings
 from typing import Any, Iterator, List, Optional, Type, Union
 
 logger = logging.getLogger("pycountry.db")
@@ -14,7 +13,7 @@ class Data:
     def __getattr__(self, key):
         if key in self._fields:
             return self._fields[key]
-        raise AttributeError()
+        raise AttributeError(key)
 
     def __setattr__(self, key: str, value: str) -> None:
         if key != "_fields":
@@ -36,26 +35,7 @@ class Data:
 
 
 class Country(Data):
-    def __getattr__(self, key):
-        if key in ("common_name", "official_name"):
-            # First try to get the common_name or official_name
-            value = self._fields.get(key)
-            if value is not None:
-                return value
-            # Fall back to name if common_name or official_name is not found
-            name = self._fields.get("name")
-            if name is not None:
-                warning_message = (
-                    f"Country's {key} not found. Country name provided instead."
-                )
-                warnings.warn(warning_message, UserWarning)
-                return name
-            raise AttributeError()
-        else:
-            # For other keys, simply return the value or raise an error
-            if key in self._fields:
-                return self._fields[key]
-            raise AttributeError()
+    pass
 
 
 class Subdivision(Data):
@@ -174,9 +154,9 @@ class Database:
         return len(self.objects)
 
     @lazy_load
-    def get(self, **kw: Optional[str]) -> Optional[Any]:
-        kw.setdefault("default", None)
-        default = kw.pop("default")
+    def get(
+        self, *, default: Optional[Any] = None, **kw: Optional[str]
+    ) -> Optional[Any]:
         if len(kw) != 1:
             raise TypeError("Only one criteria may be given")
         field, value = kw.popitem()
diff --git a/libs/pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo
index cac1369ce..27643b8de 100644
Binary files a/libs/pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso639-5.mo
index 35e674f24..4708f3291 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso639-5.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 9090bfe4e..ccd9fc0ed 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/bg/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo
index 6d63848e9..958264c18 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/bn/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/bn/LC_MESSAGES/iso639-5.mo
index fe07f5dc2..87024da6c 100644
Binary files a/libs/pycountry/locales/bn/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/bn/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo
index 521bd3e20..f6ac138f7 100644
Binary files a/libs/pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/cs/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/cs/LC_MESSAGES/iso639-5.mo
index 0ac09896f..134e17b44 100644
Binary files a/libs/pycountry/locales/cs/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/cs/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo
index f734a6095..7cd1e36f2 100644
Binary files a/libs/pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/cy/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/cy/LC_MESSAGES/iso639-5.mo
index 680f8bc2e..563106c24 100644
Binary files a/libs/pycountry/locales/cy/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/cy/LC_MESSAGES/iso639-5.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 9436c84f4..71471b21b 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/iso639-5.mo b/libs/pycountry/locales/da/LC_MESSAGES/iso639-5.mo
index 1412ce29b..1a0e9ac6e 100644
Binary files a/libs/pycountry/locales/da/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/da/LC_MESSAGES/iso639-5.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 9644eb247..a4fb7d8ae 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/iso639-3.mo b/libs/pycountry/locales/de/LC_MESSAGES/iso639-3.mo
index 785468c99..c48f5d092 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/el/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/el/LC_MESSAGES/iso639-5.mo
index b1132b43e..7eea0aa3e 100644
Binary files a/libs/pycountry/locales/el/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/el/LC_MESSAGES/iso639-5.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 27d0974aa..c8a4213b1 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/iso3166-2.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo
index 882d9e1a0..2a3351dd5 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/iso639-5.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso639-5.mo
index 78cccb2da..566c6a261 100644
Binary files a/libs/pycountry/locales/eo/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/eo/LC_MESSAGES/iso639-5.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 0fb63f1e3..6a8cbefa6 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 af2796588..02967c2d3 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/iso3166-3.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-3.mo
index 0b6c06c39..38b5758d9 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo
index f61e004b8..94e820e5b 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/et/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/et/LC_MESSAGES/iso3166-2.mo
index 4d83a0359..a91e2cf3d 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 fdf3a009f..d30ce6683 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 8abc1c210..ccf9c094b 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/iso3166-2.mo b/libs/pycountry/locales/eu/LC_MESSAGES/iso3166-2.mo
index d392b04f4..301a8bc11 100644
Binary files a/libs/pycountry/locales/eu/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/eu/LC_MESSAGES/iso3166-2.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 5d38c806e..c4444d1ab 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/fr/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso15924.mo
index 9dd0aee69..62b78b184 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-1.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-1.mo
index 1aebf77b5..65516dd1c 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-1.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 75067973a..e55fc69c8 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/iso3166-3.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo
index 47db7f43d..3e76d0c1f 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo
index 71762ddcb..a73aa850d 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 d3b01dc41..d80573746 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/fr/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso639-5.mo
index a9c44785a..3e6f04de0 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-1.mo
index 40cb73034..ca89847bb 100644
Binary files a/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-1.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 50d85f5c5..7e3ac265f 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/fur/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/fur/LC_MESSAGES/iso639-5.mo
index 9deaced73..6323898b1 100644
Binary files a/libs/pycountry/locales/fur/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/fur/LC_MESSAGES/iso639-5.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 865ecff8a..c16da1986 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/hr/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-2.mo
index 525394971..ab220d1bb 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-2.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 156f5898e..36a7cf923 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 d01ef2761..b1b580d56 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/iso4217.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso4217.mo
index f993b94a0..0da2c7d5d 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/ia/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ia/LC_MESSAGES/iso3166-1.mo
index 575eab346..2c051683b 100644
Binary files a/libs/pycountry/locales/ia/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ia/LC_MESSAGES/iso3166-1.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 bd9609669..81ff7c71c 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/it/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso3166-2.mo
index 82b1b0941..ce7307026 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/iso639-5.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso639-5.mo
index 77fae9659..90e46bcb8 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso639-5.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 b802733cc..4d483138e 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/ka/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ka/LC_MESSAGES/iso15924.mo
index a7178ff42..124d5a494 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 2836e6389..76e9a5bcc 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/kab/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo
index e62f25f52..3c7467b12 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/km/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/km/LC_MESSAGES/iso3166-1.mo
index cc2790dc3..476ae0177 100644
Binary files a/libs/pycountry/locales/km/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/km/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
new file mode 100644
index 000000000..0bd63b419
Binary files /dev/null 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
new file mode 100644
index 000000000..e152336c1
Binary files /dev/null and b/libs/pycountry/locales/km/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-1.mo
index c28914401..175b07183 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-1.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 2fe2e1910..c9b613abc 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/iso3166-3.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo
index 49efe1146..e36ab74d8 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo
index 38d3a86eb..1080a48bd 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/lt/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso15924.mo
index b9e3ec99b..b1faf8371 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 a266cc967..694745b41 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 fc7a5feb3..500b1ac0c 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/iso3166-3.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo
index 53abac483..dacbd3905 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo
index 3119dd8bf..1ac600b9d 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-5.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 000000000..295c09360
Binary files /dev/null and b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-1.mo
deleted file mode 100644
index 14669e58a..000000000
Binary files a/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-1.mo and /dev/null differ
diff --git a/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-3.mo
deleted file mode 100644
index 723c29906..000000000
Binary files a/libs/pycountry/locales/nb/LC_MESSAGES/iso3166-3.mo and /dev/null differ
diff --git a/libs/pycountry/locales/nb/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo
similarity index 100%
rename from libs/pycountry/locales/nb/LC_MESSAGES/iso15924.mo
rename to libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo
new file mode 100644
index 000000000..6e66f986b
Binary files /dev/null and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo
index 1c14d8bec..016ffa9d4 100644
Binary files a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo
new file mode 100644
index 000000000..1346d45a9
Binary files /dev/null and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/nb/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo
similarity index 100%
rename from libs/pycountry/locales/nb/LC_MESSAGES/iso4217.mo
rename to libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo
diff --git a/libs/pycountry/locales/nb/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-3.mo
similarity index 100%
rename from libs/pycountry/locales/nb/LC_MESSAGES/iso639-3.mo
rename to libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-3.mo
diff --git a/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo
index 9f7f5c431..474d5a380 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/oc/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo
index 104f4788e..e038825f9 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/iso639-5.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso639-5.mo
index f5e67e31d..ceae31108 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/pa/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-1.mo
index 0cfa8717b..7efeea06a 100644
Binary files a/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo
index 79747ee53..6a5967fd4 100644
Binary files a/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/pa/LC_MESSAGES/iso3166-3.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 1cbaa1cd9..bf32f4427 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/pt_BR/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-3.mo
index 10d88320c..b2e3b7be8 100644
Binary files a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo
index a2c408a91..8402eea4c 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-1.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-1.mo
index 29f77b15d..1392dc229 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-1.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 d406681b5..d6e45254c 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/iso3166-3.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo
index d2cd0fd61..db1382d1b 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo
index 35791d706..d27a289c1 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-5.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 000000000..ba535226c
Binary files /dev/null and b/libs/pycountry/locales/ro/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/mo/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo
similarity index 100%
rename from libs/pycountry/locales/mo/LC_MESSAGES/iso3166-1.mo
rename to libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo
index 85c53898b..63fa853e1 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/sc/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo
index e309952cc..6f7eeeb9d 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/sk/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-1.mo
index be3d7bf16..16f61cde9 100644
Binary files a/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-1.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 fff578898..6ffeb35af 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/iso3166-3.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-3.mo
index 2b7469998..cc312a861 100644
Binary files a/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-3.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 0c90f8402..67e5bc37e 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/sq/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso639-5.mo
index 0bceb3c94..be035d481 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso639-5.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 2c3982044..0d8bf7629 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/iso639-5.mo b/libs/pycountry/locales/sr/LC_MESSAGES/iso639-5.mo
index 5f58881eb..a0d81f854 100644
Binary files a/libs/pycountry/locales/sr/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/sr/LC_MESSAGES/iso639-5.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 8709edcdc..2531403a8 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/iso639-5.mo b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.mo
index 8ac6a0fdf..d48694283 100644
Binary files a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.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 fedbcc924..f5e228709 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/ta/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso15924.mo
new file mode 100644
index 000000000..d71800501
Binary files /dev/null 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 d4d82b659..0e98c7f3b 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
new file mode 100644
index 000000000..c27fdce88
Binary files /dev/null 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 79004b039..257950a8c 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
new file mode 100644
index 000000000..a3a66cdb5
Binary files /dev/null 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 ac05cb8ef..b12c0f0e6 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/ta/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 000000000..39ae6fcb9
Binary files /dev/null and b/libs/pycountry/locales/ta/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/th/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/th/LC_MESSAGES/iso3166-2.mo
index f04a15e19..b556ec94f 100644
Binary files a/libs/pycountry/locales/th/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/th/LC_MESSAGES/iso3166-2.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 4f56cf185..4cf52fb94 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/uk/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo
index 640d0a7e7..b0a01825f 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/vi/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo
index 097e9a0e1..89ff1505a 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/zh_CN/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo
index 192ddd0fb..0f8e8ebb0 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_TW/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso3166-2.mo
index 5977793ec..331d34cbb 100644
Binary files a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/tests/test_general.py b/libs/pycountry/tests/test_general.py
index 7930c5e1d..7039f1d89 100644
--- a/libs/pycountry/tests/test_general.py
+++ b/libs/pycountry/tests/test_general.py
@@ -1,28 +1,28 @@
 import gettext
 import os.path
 import re
+from importlib import metadata as _importlib_metadata
 from unittest.mock import patch
 
-import importlib_metadata
 import pytest
 
 import pycountry
 import pycountry.db
 
 
-@pytest.fixture(autouse=True, scope="session")
-def logging():
-    import logging
-
-    logging.basicConfig(level=logging.DEBUG)
+@pytest.fixture
+def countries():
+    pycountry.countries._clear()
+    yield pycountry.countries
+    pycountry.countries._clear()
 
 
-def test_country_list():
+def test_country_list(countries):
     assert len(pycountry.countries) == 249
     assert isinstance(list(pycountry.countries)[0], pycountry.db.Data)
 
 
-def test_country_fuzzy_search():
+def test_country_fuzzy_search(countries):
     results = pycountry.countries.search_fuzzy("England")
     assert len(results) == 1
     assert results[0] == pycountry.countries.get(alpha_2="GB")
@@ -63,13 +63,13 @@ def test_country_fuzzy_search():
     assert results[0] == pycountry.countries.get(alpha_2="US")
 
 
-def test_historic_country_fuzzy_search():
+def test_historic_country_fuzzy_search(countries):
     results = pycountry.historic_countries.search_fuzzy("burma")
     assert len(results) == 1
     assert results[0] == pycountry.historic_countries.get(alpha_4="BUMM")
 
 
-def test_germany_has_all_attributes():
+def test_germany_has_all_attributes(countries):
     germany = pycountry.countries.get(alpha_2="DE")
     assert germany.alpha_2 == "DE"
     assert germany.alpha_3 == "DEU"
@@ -78,15 +78,17 @@ def test_germany_has_all_attributes():
     assert germany.official_name == "Federal Republic of Germany"
 
 
-def test_missing_common_official_use_same():
+def test_missing_common_official(countries):
     aruba = pycountry.countries.get(alpha_2="AW")
     assert aruba.alpha_2 == "AW"
     assert aruba.name == "Aruba"
-    assert aruba.official_name == "Aruba"
-    assert aruba.common_name == "Aruba"
+    with pytest.raises(AttributeError, match="official_name"):
+        aruba.official_name
+    with pytest.raises(AttributeError, match="common_name"):
+        aruba.common_name
 
 
-def test_missing_common_official_use_different():
+def test_missing_common_official_use_different(countries):
     vietnam = pycountry.countries.get(alpha_2="VN")
     assert vietnam.alpha_2 == "VN"
     assert vietnam.name == "Viet Nam"
@@ -94,14 +96,14 @@ def test_missing_common_official_use_different():
     assert vietnam.common_name == "Vietnam"
 
 
-def test_country_missing_attribute():
+def test_country_missing_attribute(countries):
     germany = pycountry.countries.get(alpha_2="DE")
     with pytest.raises(AttributeError):
         _ = germany.foo
 
 
-def test_subdivisions_directly_accessible():
-    assert len(pycountry.subdivisions) == 5127
+def test_subdivisions_directly_accessible(countries):
+    assert len(pycountry.subdivisions) == 5046
     assert isinstance(list(pycountry.subdivisions)[0], pycountry.db.Data)
 
     de_st = pycountry.subdivisions.get(code="DE-ST")
@@ -179,8 +181,7 @@ def test_locales():
     german = gettext.translation(
         "iso3166-1", pycountry.LOCALES_DIR, languages=["de"]
     )
-    german.install()
-    assert _("Germany") == "Deutschland"
+    assert german.gettext("Germany") == "Deutschland"
 
 
 def test_removed_countries():
@@ -192,7 +193,7 @@ def test_removed_countries():
     assert ussr.withdrawal_date == "1992-08-30"
 
 
-def test_repr():
+def test_repr(countries):
     assert re.match(
         "Country\\(alpha_2=u?'DE', "
         "alpha_3=u?'DEU', "
@@ -204,7 +205,7 @@ def test_repr():
     )
 
 
-def test_dict():
+def test_dict(countries):
     country = pycountry.countries.get(alpha_2="DE")
     exp = {
         "alpha_2": "DE",
@@ -217,13 +218,13 @@ def test_dict():
     assert dict(country) == exp
 
 
-def test_dir():
+def test_dir(countries):
     germany = pycountry.countries.get(alpha_2="DE")
     for n in "alpha_2", "alpha_3", "name", "numeric", "official_name":
         assert n in dir(germany)
 
 
-def test_get():
+def test_get(countries):
     c = pycountry.countries
     with pytest.raises(TypeError):
         c.get(alpha_2="DE", alpha_3="DEU")
@@ -233,7 +234,7 @@ def test_get():
     assert c.get(alpha_2="Foo", default=tracer) is tracer
 
 
-def test_lookup():
+def test_lookup(countries):
     c = pycountry.countries
     g = c.get(alpha_2="DE")
     assert g == c.get(alpha_2="de")
@@ -281,6 +282,10 @@ def test_subdivision_empty_list():
 
 
 def test_has_version_attribute():
+    try:
+        _importlib_metadata.distribution("pycountry")
+    except _importlib_metadata.PackageNotFoundError:
+        pytest.skip("pycountry not installed correctly, you're on your own")
     assert pycountry.__version__ != "n/a"
     assert len(pycountry.__version__) >= 5
     assert "." in pycountry.__version__
@@ -290,7 +295,7 @@ def test_is_instance_of_language():
     assert isinstance(pycountry.languages, pycountry.Languages)
 
 
-def test_is_instance_of_country():
+def test_is_instance_of_country(countries):
     united_states = pycountry.countries.get(alpha_2="US")
     class_name = united_states.__class__.__name__
     assert class_name == "Country"
@@ -308,8 +313,7 @@ def test_is_instance_of_currency():
     assert isinstance(pycountry.currencies, pycountry.Currencies)
 
 
-def test_add_entry():
-    pycountry.countries._clear()
+def test_add_entry(countries):
     assert pycountry.countries.get(alpha_2="XK") is None
 
     pycountry.countries.add_entry(
@@ -320,8 +324,7 @@ def test_add_entry():
     assert isinstance(country, pycountry.countries.data_class)
 
 
-def test_remove_entry():
-    pycountry.countries._clear()
+def test_remove_entry(countries):
     assert pycountry.countries.get(alpha_2="DE") is not None
 
     pycountry.countries.remove_entry(alpha_2="DE")
@@ -329,7 +332,12 @@ def test_remove_entry():
     assert pycountry.countries.get(alpha_2="DE") is None
 
 
-def test_no_results_lookup_error():
+def test_remove_non_existent_entry():
+    with pytest.raises(KeyError, match="not found"):
+        pycountry.countries.remove_entry(name="Not A Real Country")
+
+
+def test_no_results_lookup_error(countries):
     try:
         import importlib_resources  # type: ignore
     except ModuleNotFoundError:
@@ -374,16 +382,16 @@ def test_subdivision_partial_match():
     assert results[0].name == "Massachusetts"
 
 
-def non_country_attribute_error(self):
-    with self.assertRaises(AttributeError):
-        english = pycountry.languages.get(name="English")
-        result = english.official_name
+def test_non_country_attribute_error():
+    english = pycountry.languages.get(name="English")
+    with pytest.raises(AttributeError):
+        english.official_name
 
 
-def country_attribute_error(self):
-    with self.assertRaises(AttributeError):
-        canada = pycountry.countries.get(alpha_2="CA")
-        result = canada.maple_syrup
+def test_country_attribute_error(countries):
+    canada = pycountry.countries.get(alpha_2="CA")
+    with pytest.raises(AttributeError):
+        canada.maple_syrup
 
 
 def test_with_accents():
@@ -408,7 +416,9 @@ def test_special_characters():
 
 def test_unicode_characters():
     assert pycountry.remove_accents("你好") == "你好"  # Chinese characters
-    assert pycountry.remove_accents("こんにちは") == "こんにちは"  # Japanese characters
+    assert (
+        pycountry.remove_accents("こんにちは") == "こんにちは"
+    )  # Japanese characters
 
 
 def test_subdivision_search_fuzzy_non_existent_subdivision():
@@ -427,10 +437,10 @@ def test_subdivision_match_non():
 
 
 def test_get_version_with_package_not_found():
-    # Mock importlib_metadata.version to raise PackageNotFoundError
+    # Mock importlib.metadata.version to raise PackageNotFoundError
     with patch(
-        "importlib_metadata.version",
-        side_effect=importlib_metadata.PackageNotFoundError,
+        "importlib.metadata.version",
+        side_effect=_importlib_metadata.PackageNotFoundError,
     ):
         # Call get_version with a package name that doesn't exist
         result = pycountry.get_version("non_existent_package")
@@ -449,23 +459,10 @@ def test_all_subdivisions_have_name_attribute():
     assert all_have_name_attr
 
 
-def test_remove_countries():
-    # Test case 1: Removing an existing entry
-    kw1 = {"name": "United States"}
-    try:
-        pycountry.countries.remove_entry(**kw1)
-    except KeyError as e:
-        assert False, f"Unexpected KeyError for 'United States': {e}"
-
-    # Test case 2: Removing a non-existing entry
-    kw2 = {"name": "Non Existent Country"}
-    try:
-        pycountry.countries.remove_entry(**kw2)
-    except KeyError as e:
-        assert "not found and cannot be removed" in str(
-            e
-        )  # Check the error message
-    else:
-        assert (
-            False
-        ), "Expected KeyError for 'Non Existent Country', but no exception was raised"
+def test_subdivisions_with_missing_parents():
+    result = [
+        (i.code, i.parent_code)
+        for i in pycountry.subdivisions
+        if i.parent_code and not i.parent
+    ]
+    assert result == []
diff --git a/libs/pygments-2.17.2.dist-info/RECORD b/libs/pygments-2.17.2.dist-info/RECORD
deleted file mode 100644
index 892198d91..000000000
--- a/libs/pygments-2.17.2.dist-info/RECORD
+++ /dev/null
@@ -1,330 +0,0 @@
-../../bin/pygmentize,sha256=iP3M-_dI6wQP1Gtg8ZvtFWFDy3x82yIJIrmsdlQpEe0,238
-pygments-2.17.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pygments-2.17.2.dist-info/METADATA,sha256=SzSKqyc7mGVvDuK4xDB80dRx0GlXqOzdEvawDK8I5_I,2594
-pygments-2.17.2.dist-info/RECORD,,
-pygments-2.17.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygments-2.17.2.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-pygments-2.17.2.dist-info/entry_points.txt,sha256=uUXw-XhMKBEX4pWcCtpuTTnPhL3h7OEE2jWi51VQsa8,53
-pygments-2.17.2.dist-info/licenses/AUTHORS,sha256=cUCMJk6AMKjudR92zZ_3Xw5mWGswskPFQYpU1G8YRDY,10281
-pygments-2.17.2.dist-info/licenses/LICENSE,sha256=qdZvHVJt8C4p3Oc0NtNOVuhjL0bCdbvf_HBWnogvnxc,1331
-pygments/__init__.py,sha256=hOVi3FwWurc1Cj57aJQyr1tCiZ6dVM9842eYXkFPmYk,2959
-pygments/__main__.py,sha256=xVzk7wG94kskOfLT6ORXWRPRZZ0IAavOeRCtGXn2yEM,348
-pygments/cmdline.py,sha256=5BDrKb_cOcvzp0Ps8rr4rFIO8kYb15JDlEiRKpoTwWE,23530
-pygments/console.py,sha256=2wZ5W-U6TudJD1_NLUwjclMpbomFM91lNv11_60sfGY,1697
-pygments/filter.py,sha256=j5aLM9a9wSx6eH1oy473oSkJ02hGWNptBlVo4s1g_30,1938
-pygments/filters/__init__.py,sha256=q8r8GfK3dO021TSHJdpwNwh6RHKbAL7ceCzohavWaN0,40338
-pygments/formatter.py,sha256=Yz01yT1NSQXTF8GvsLxJSmez7ErTVOsxm3M6GVPuH-w,4154
-pygments/formatters/__init__.py,sha256=1gAF21t8FGApDXpDpx5bqU0MrqI7xlPFnPMg2uXn0Qk,5395
-pygments/formatters/_mapping.py,sha256=1Cw37FuQlNacnxRKmtlPX4nyLoX9_ttko5ZwscNUZZ4,4176
-pygments/formatters/bbcode.py,sha256=7zcNcnoNj-dCyJlrHnmtq0V2o8ZGD14N5anFV4FQ5PE,3290
-pygments/formatters/groff.py,sha256=va2xlSCN-e_i0c_Dz0dg3HV9Ajt9G45PXaCi7CEsLdg,5070
-pygments/formatters/html.py,sha256=1L0qBhYhHomeqDUWQ5QCPdabhBwj5IL_boetQtrXtF4,35640
-pygments/formatters/img.py,sha256=h0_7rBECMiz5Ylu3mc84C59NqQiycsZanBPgh_jJujo,23116
-pygments/formatters/irc.py,sha256=Jkze75ztayIkhNijfnFIsqOUR-Yz5fwEQM_oeWdOnRU,4945
-pygments/formatters/latex.py,sha256=48gMb8ziYgyQVJ4Ofx8x3Ka2l0RBomgYgn5zjeQK_vM,19303
-pygments/formatters/other.py,sha256=RzJhlXeYHyLxiC5vESy41WUK0FOqJPxvMiR6Von0z5Q,5025
-pygments/formatters/pangomarkup.py,sha256=0i4H7NLsxcxzFCJU5ONDJmhlLvsSLCnaFn-FXA5SMQk,2200
-pygments/formatters/rtf.py,sha256=8xghaGMBBXq2XNj-ZWNzYAeX_GqIDMqUBiJLDCulzNI,4990
-pygments/formatters/svg.py,sha256=VxjE-iqarQXJEFRissuLbsooXUCVXWgObQ7c4ub-5zg,7299
-pygments/formatters/terminal.py,sha256=P_dr7GLyRTIKg8LEceCOr5B5eGzGQBELA3JQOMvZ8VA,4626
-pygments/formatters/terminal256.py,sha256=_xYtNUUTAie5Bh7S98nrt7XIlLUURzDykosP7tT7044,11717
-pygments/lexer.py,sha256=cu7IkXm_shKdfmXXrlLybxRZS_RRBJoabOwQZqLPUO4,35044
-pygments/lexers/__init__.py,sha256=udsJXdefyhwUUfisC3E2bjWh3cANTE0ZXeXBiKtk8Dc,12113
-pygments/lexers/_ada_builtins.py,sha256=Z5IiSpdugeKU4H-SEczWPYG6EO0e-R7lwP7thfORooU,1543
-pygments/lexers/_asy_builtins.py,sha256=qn1PmuijZ0P5Mkd1hWmH1arUt03wGWR7QNZf7ACBcCQ,27287
-pygments/lexers/_cl_builtins.py,sha256=n0Y1jei9ssrZ58Ev4GMxDTspYXU58TyAhLJzBApLttE,13994
-pygments/lexers/_cocoa_builtins.py,sha256=LvaPwfjM2r73yJwTMNu1SiDKzWWqzhJBjN_kivnYsyo,105182
-pygments/lexers/_csound_builtins.py,sha256=IY2H0Eg8iBFdmWwecXGwDC41Glrw_bWLenQCtp6DHzg,18414
-pygments/lexers/_css_builtins.py,sha256=IuSVV88A8b37-XsXGF4_6P6XF5Wv3wd3SxYOS1fOGyU,12446
-pygments/lexers/_julia_builtins.py,sha256=evrvUJjAKN8bCeBooXqAeGnWRc0qBqG_W2TMRPWq7Q4,11883
-pygments/lexers/_lasso_builtins.py,sha256=9Ld87CsxAB9UTV77I9W6s_bv4p-kc2grOnc8Ew7cy3s,134510
-pygments/lexers/_lilypond_builtins.py,sha256=rVmINQYq3iQ9-5W_jGrwW4Q9OX_zEX37I-pn5i8Ya1c,108094
-pygments/lexers/_lua_builtins.py,sha256=x8gSOJzBlwMFH9XFxwgF0-3kMn066YRQTLJyM_fl22s,8116
-pygments/lexers/_mapping.py,sha256=2CBllobKB9Dso9kbkaq_IWTvD3Z2JOqx_HsJ6tBLDXY,68026
-pygments/lexers/_mql_builtins.py,sha256=j2K4s3Ye_tYEfJEyUKxvqR3ns_ZOLHGaiPDhkGRk40k,24713
-pygments/lexers/_mysql_builtins.py,sha256=8LqPsM38R2Et1U8sg-oy09aedb-jO1DgVGmssDUw6kg,25842
-pygments/lexers/_openedge_builtins.py,sha256=ZK0Vwj0PfCtg5WpOXCvI0OUnozrNbQxY_HNB_JhAXQc,49398
-pygments/lexers/_php_builtins.py,sha256=ns_E12wFe4Ce3EP38B0DRhAnhHTrdh7WfhjnDWgnJJ4,107930
-pygments/lexers/_postgres_builtins.py,sha256=LQbzTa5ICPqTspfBk7_4JV6bkjB5lz7uuWAUNRj6W4E,13355
-pygments/lexers/_qlik_builtins.py,sha256=zc-fq_8mXsR_XVzTEXFRjGbuwdACJ3O9QrMiEGfuKxQ,12595
-pygments/lexers/_scheme_builtins.py,sha256=ZdZg6-MK7Zt2qqOSBUS5D9YzULtlJIuUxvk39r-HTNc,32564
-pygments/lexers/_scilab_builtins.py,sha256=ib-wZROxsKBi-csMVlGBFHpzDzkT0FPn2wZZN29_9Rw,52413
-pygments/lexers/_sourcemod_builtins.py,sha256=nV2ZcNTvMY7x4oQ2niSNV1XTH9bkXbcAt2-A6ODs55k,26781
-pygments/lexers/_stan_builtins.py,sha256=gl_po01tnvV_tGj31jKHqaSnybhow9ElvFjYU4vWdIs,13445
-pygments/lexers/_stata_builtins.py,sha256=hIGKIkcalQetIwOoN30uflOYgYIOlG3mJ6H6f82edro,27227
-pygments/lexers/_tsql_builtins.py,sha256=wDKfDkftAUjPQW1RPjAwsaLE6VZeTCyCy21z44Uz7Vc,15460
-pygments/lexers/_usd_builtins.py,sha256=H7AYHzkaizd4mFrMtjvI913cX9YdK4qs9JrOlIdcl7c,1658
-pygments/lexers/_vbscript_builtins.py,sha256=EhzEYIk-DBIuU0sMg_davSSL1w-o3enlT1S9uzljZfM,4225
-pygments/lexers/_vim_builtins.py,sha256=BG929NCy6g3LHhpj8R_ueUWqLbuIt0kyCJhxR1Q5SJo,57066
-pygments/lexers/actionscript.py,sha256=lVrwbX2OYnN-KMGd4j3y0z-bWHdNxDDcf8peFMo9x2E,11676
-pygments/lexers/ada.py,sha256=3PAvDXPLpvlpLCSSVl3k1RcBPm7M2LzI3ZU1MJDPqD4,5320
-pygments/lexers/agile.py,sha256=C5m07vIsCir2Amrv0QK0Ah1HbTcjBOBwMdF-x2r__6E,876
-pygments/lexers/algebra.py,sha256=1yoBL6pH_qSVrdg3gVbMJ7HuZbshKL-Kj50meG37XPk,9874
-pygments/lexers/ambient.py,sha256=u333k5mScy3cUUDQEJdxMQvOEX16aqpTd1DiJeTYzqE,2606
-pygments/lexers/amdgpu.py,sha256=f46YvzV1sD3eEfcdkRYIjkS1YTtHyVJT5T2awL48dlo,1670
-pygments/lexers/ampl.py,sha256=lfHAA0ZG4Dv38l5wTYi6InlXXXJ65FaXLjZU0tR_sWw,4177
-pygments/lexers/apdlexer.py,sha256=EbgslrWGNFYOa8a-fN-PMv4_pCv3Kbdo7TIHN_DCXAg,30766
-pygments/lexers/apl.py,sha256=f4QwKpfzMiUPRXCzmcBfN99TV2YVKyNzZ09Ey0bubYc,3405
-pygments/lexers/archetype.py,sha256=pps0tkPaK1VPJePJg0HyaGfTTwEpApgJ-qg9MJ9a6yE,11469
-pygments/lexers/arrow.py,sha256=wnI3F9Zo9HaYImF2pgksdosy3hkztFyA5GGycbtQoIM,3565
-pygments/lexers/arturo.py,sha256=wIFytTnZAkKVtHVjKK5FK2XLRie_hcv8YSs1Z2UAFlA,11417
-pygments/lexers/asc.py,sha256=Nb2PHQZW1351-vrLctIRX_70znhx8CgGk75y7b4fhEA,1658
-pygments/lexers/asm.py,sha256=2sSPg4tLOPzUTQoTAh8pL5tWbdS_KmqQSr9BTQLVRt0,41243
-pygments/lexers/asn1.py,sha256=z01NTnFPFgV0KQydmXvFArjcl-bLDf8TRjm3EQXy-kU,4263
-pygments/lexers/automation.py,sha256=Zgal7cKSlj0SaHAXx98gHjNM1tvCVIO2UykseFquNy4,19815
-pygments/lexers/bare.py,sha256=0WEBxv-FSgow1RFZzaXGFo00iwklIF5FpjJZDOOWbDo,3021
-pygments/lexers/basic.py,sha256=cxZ7oKq924j8_gDolL_IDV4CSN2vXKk6S7DIw2WlTc8,27923
-pygments/lexers/bdd.py,sha256=JsA-W_-oICZKrZS1i7NNYrRmDRVf3iuI1PufUdMkQhU,1652
-pygments/lexers/berry.py,sha256=swc0EY-bEf0wNFUhfvdkgWmP-PXV8PGvhNagqtsUqmA,3211
-pygments/lexers/bibtex.py,sha256=jzuo9lEZHPKzAAMpIeIWkNTr5I1LO-TMn1V9SdyHT1o,4723
-pygments/lexers/blueprint.py,sha256=iVyI00gQ72PIbgq2WknVxNOeCbRcIycm24AHiLE5Fg0,6189
-pygments/lexers/boa.py,sha256=bi5ZlPV61Xehq8bmSdFyqt3BN1jC03pB4t5Foa4vKPw,3915
-pygments/lexers/bqn.py,sha256=fJORpq60UhtW0N38GnmYqAskQ_O6QZtc_tw4XcZ4D5I,3338
-pygments/lexers/business.py,sha256=-QHRTWCdabWV8SIbKZ1oLH5NQ3-blSPES8jjIbEvD_I,28112
-pygments/lexers/c_cpp.py,sha256=17O7tZfnDIQqjnFEajHVcqoWf3CpP8LoWlB2x8avwGE,17946
-pygments/lexers/c_like.py,sha256=uWObWqxC4d-ZyyzEG2yajKZgpq4iINyAcqw7LMnnxZU,29206
-pygments/lexers/capnproto.py,sha256=fE3wK-3ZBzPsDaFf9EkE1dnGDRhJbcCqjyBXRm8GlD4,2175
-pygments/lexers/carbon.py,sha256=JaO3sPeH8yKZwj38tCUuirz1fSF70S0koSqu1_MH8VY,3222
-pygments/lexers/cddl.py,sha256=PZS6611__hY36NZj8n9Q__JMXNLSm_aMWLpC51axc-M,5182
-pygments/lexers/chapel.py,sha256=1oFt0h0Rh7JnF2qw1QtT0XzkUanV-Xb9Xi9B9ZcHaIA,5157
-pygments/lexers/clean.py,sha256=afJe0orU7Ux_pmmrbSNYPLrTCkY_z0MJTmhUBqPtyJU,6395
-pygments/lexers/comal.py,sha256=9IwxfxVBVMn7Uj2xo-WCr7RhLRDrDe6wjTdAi5hWT2g,3156
-pygments/lexers/compiled.py,sha256=xv8krgoDgd07QDXVPaa5uip1kl9tBprkGT1K5-DwiWE,1407
-pygments/lexers/configs.py,sha256=GMP8JUB4KQ65_dFFf5Pz5TyNXFI5f1zZsSeq9lujyZs,50077
-pygments/lexers/console.py,sha256=17k4Ngrs0EsaJg90ud6dle-I1SvjoOiYJ-xuGpLesTI,4148
-pygments/lexers/cplint.py,sha256=HrKuhRKjK-atw1FKT_zu4FJjlHOM5BppRzoxisXbpZM,1390
-pygments/lexers/crystal.py,sha256=rxxZp0E3v_r9TuWweALiZO_4IKIGIg5GCJjPq6ZwdZk,15757
-pygments/lexers/csound.py,sha256=yuzpCdZuHDmr2eaNodglDrCgX1W62xtQvjitnHlXC6s,16994
-pygments/lexers/css.py,sha256=lZKXESVwZRYTjjRkyB4cYpXk9CHcVxU_embzFRtPhhY,25322
-pygments/lexers/d.py,sha256=f1dFv2mAXqLKSJQ59m66u1Mj9us3fDskxltlrJ8EBmM,9875
-pygments/lexers/dalvik.py,sha256=0Ii9KIUWT5FkJkLKuUcHoHPhav4eEHqsWZL2_ikP1ZU,4607
-pygments/lexers/data.py,sha256=ig8DAJK5Q8hkKojQ9RjaWMsH8jiNbuzwaBaT-MYc9Vo,27032
-pygments/lexers/dax.py,sha256=od3D5zfaryI5MO93E_OA-TUpekAcjXv73l6kNit57oI,8099
-pygments/lexers/devicetree.py,sha256=4GKiuZC5bYwG_gIl30fZH8VV2zo4cqwdemQrQgWH7ZQ,4020
-pygments/lexers/diff.py,sha256=VAyAFRFmyMH865rEJ37I3TpyrpLUoEMU95durw6HLRc,5278
-pygments/lexers/dns.py,sha256=-l1X7-R3AKDif65JIvL_Tc_dJdIjaOBq38-hQf17ZWg,3781
-pygments/lexers/dotnet.py,sha256=VjJWh7vslMNIoQdPFNUlAZI0ExuLFV6EdrywYaIjqQU,37623
-pygments/lexers/dsls.py,sha256=FVNXP98f5RV-h_qiCtW-qynf3QZ-eD4NudpJY6cLiV4,36786
-pygments/lexers/dylan.py,sha256=PbrnXZc9paqmkOVJjsoAxfs5-s0MA080Vzoiu3nZum8,10319
-pygments/lexers/ecl.py,sha256=Cezl6tWf-a8hMEEUfJqYI3EPf6sSS3kRz0GiOuFIQ4Y,6372
-pygments/lexers/eiffel.py,sha256=PXeBFx3xSibTrVSDA0JqE_yskLWWynnaLp9O7FV57_4,2691
-pygments/lexers/elm.py,sha256=rKpECJmTDNmAQZu6YCX9r-TAoP3v7apL2HRcutG6zlk,3153
-pygments/lexers/elpi.py,sha256=Lid861rWNCGfv839gD8E2JEP8HkhO0gCWGWKuc0so3I,6710
-pygments/lexers/email.py,sha256=EB3YvRDEP6_B6B1wzq0vS4_zrBX52zdyXxiNI3KHgxs,4742
-pygments/lexers/erlang.py,sha256=EhFx_0D9w85DCJR9FyUprFPiaDvJps3xy-Kn4whWcjs,19170
-pygments/lexers/esoteric.py,sha256=V--w2W-Jyl4yB8A00f4GikVeZXe_5lWHE0RMnfuoLTY,10396
-pygments/lexers/ezhil.py,sha256=xu9wMEESVWCLgNitSS0IS855TSJ3Yb2KXBrxmYqHKSo,3273
-pygments/lexers/factor.py,sha256=iVSIZaT7-qAI41wP__p2XjTSyREBSyAErPLVGP4bMeU,19531
-pygments/lexers/fantom.py,sha256=0DylUHKCeBMfQK4QczavL5ugyPTV0u5H0Lk0YTv6_mU,10197
-pygments/lexers/felix.py,sha256=fJsd0mNaSwkjU32-103-9XDzzz2lj-ONPiW8JkZAqxM,9646
-pygments/lexers/fift.py,sha256=ISH11Bvz15ZsMjTMdLDsHFx2HYgpGyDUlvi1CN8MC8Q,1621
-pygments/lexers/floscript.py,sha256=UYPHl2Ygez7RfBPTU00hUMXrU10mB996vz6rFisAmTs,2668
-pygments/lexers/forth.py,sha256=PzfXkhpusFIGVwrzVsqLgljlybN92OeU0_E3rHup2m0,7194
-pygments/lexers/fortran.py,sha256=3DAkofXNVP5xci45AisWy3Ja3snhJm6lgGa3o0BnSko,10346
-pygments/lexers/foxpro.py,sha256=XmVcWgw70vh31gri3LhfrB2YQ-RhkUkBKly0xHt8VQs,26212
-pygments/lexers/freefem.py,sha256=e_YjjHZu8PzQBykLzhpY2RJHjCnLxnlmoGj-5RinP6c,26914
-pygments/lexers/func.py,sha256=h6IHCdydWKpQcamC1XAGJjaGK-UDvh9iM0ZuWQK05dQ,3622
-pygments/lexers/functional.py,sha256=IpvPKomRGDqGs_MZZjkX5niMGZO9s5X1Dk0HDyO9zWM,674
-pygments/lexers/futhark.py,sha256=NwNYLxQ1feJwtPjG54VmSmo_ZtcTqtlzr0QQppmxWUM,3732
-pygments/lexers/gcodelexer.py,sha256=H754t2DKkgJYF-mzm4uI9dqc0qE02fjlZZfXM0eg6Lc,826
-pygments/lexers/gdscript.py,sha256=DFvf9eJgJic5DUHt2lrJksSu5X6eXRfrh30t5yAVSzY,7543
-pygments/lexers/go.py,sha256=8DSgsTlGjQ1QkGw0k1FY8Hzur9B1QOWTIA642qb9RHY,3784
-pygments/lexers/grammar_notation.py,sha256=SNQNggmjYCC0yRN2m2r_33X2pa8bw0AxLJsG1G5FjdQ,7980
-pygments/lexers/graph.py,sha256=oPWnai1DbOqoS7yIKquCdzZztA6QI8j6R1JJ_gCvJEs,4109
-pygments/lexers/graphics.py,sha256=AqhzeSjpQwk1Vrj_OT5jKDJMonB90Sr01mM3q90WGVg,39026
-pygments/lexers/graphql.py,sha256=swH3nnESkgFynenBJDjzzKaSKkOGQ9rbm-kFs2-AvIM,5602
-pygments/lexers/graphviz.py,sha256=_yJaR2CW--2ljvnPdNjsVOvosPoUJw0pb3Of33nWBtk,1935
-pygments/lexers/gsql.py,sha256=7GDWo1Wvt5UmJhAC8HQND1kbdONBRE1YhdawBzgGrHA,3991
-pygments/lexers/haskell.py,sha256=RkYEh9-amHeRS0-dU5Nyz4RL4KKJz27PsWhNpf-C7NA,32898
-pygments/lexers/haxe.py,sha256=W4ILlVNk1D6USMa2Kkr00IFaoqtUIxd5cO8_xWzo23k,30976
-pygments/lexers/hdl.py,sha256=xA5YnwhgaOTzvLpE1VIP8j7l5LM2FjkpssZyMe3sPtY,22520
-pygments/lexers/hexdump.py,sha256=QLvXzWmo2_xqHMy55OTXUB15CokyQLMzHvmXuwMj6z8,3603
-pygments/lexers/html.py,sha256=IvmbMYuuHsOdkOOBv7DVZL7ouONLfd9fVtjRFICAYD0,20260
-pygments/lexers/idl.py,sha256=bhS43u_ycIVN-dxlL0rkVDW0Kunuv4nCgMiw4CrEVTk,15450
-pygments/lexers/igor.py,sha256=YFdGLAgqoSnp6wpk23bwbgj7uVSRbyqG4r3Xr7ht8xQ,31658
-pygments/lexers/inferno.py,sha256=0pRpoR7W1Kp8q_9mxY43rYw_RYef3ruJ6xV1LwYbz3A,3136
-pygments/lexers/installers.py,sha256=5_jhlzWYi_6LMEr8BnpbjgiScZ_G3Q7AH6fTG4WrPRc,13178
-pygments/lexers/int_fiction.py,sha256=CkGFrMPiZZ6aQ607E4yfZDTcYpz1pdrbd4azyx7XVX8,57119
-pygments/lexers/iolang.py,sha256=ieom-sc8xdXbHi4g5LDofvLduKZdVBSOEwXocKmQU2g,1906
-pygments/lexers/j.py,sha256=Kd0Rga_1uwU_YhfXebvGuHKpOXM2SVH0_x_CqkCJVCk,4854
-pygments/lexers/javascript.py,sha256=y4ve9s2jq4UaTr9PhkNERIlu2DpbP_l64N_r2JJOBV0,62859
-pygments/lexers/jmespath.py,sha256=3P4_YQXh4IoohDQhoh0pquyFuUHVd88g7KYmVYg3NoM,2059
-pygments/lexers/jslt.py,sha256=cvH2LIuUnkhaqhfWvkIjS7sSx2FpXSEvl3rOF47d6Y0,3701
-pygments/lexers/jsonnet.py,sha256=CiJT00Tp0lBg9j_1EW-d6_poumtHoP2TmEQVDlf3cTs,5635
-pygments/lexers/jsx.py,sha256=XFQ5J3VU1Ys-yjxRTurUH-gYdpIkf4TV87zvtsH5b-o,2234
-pygments/lexers/julia.py,sha256=F5zuRm7OSZQeV1na7lasypEDGreLAzOdfaKmH1HIxgE,11646
-pygments/lexers/jvm.py,sha256=nyRvIF12oTZRmU0qDhgOQx8AsUgoZj1zMU8tDGyOP8U,72929
-pygments/lexers/kuin.py,sha256=AVUDd6JAy1jClIYeQDPcV-O7xGfb7x7fojN7hb7ANHU,11406
-pygments/lexers/kusto.py,sha256=Jqk2xx0vVfZa5uFq5KGZgUReZ7FHhQ5HvT6BeRGzmng,3478
-pygments/lexers/ldap.py,sha256=VCA0OKkzBuvSKHOpF9SvlA8C1tfRvahu0MNhz-4LpBQ,6553
-pygments/lexers/lean.py,sha256=8Uxhngca57NnJp1JCabEVxB6SUgzQVEUEMmmlmbc8XQ,4297
-pygments/lexers/lilypond.py,sha256=_A5P7PaITP8COXG8dy9nS7CzfdKY2UOe1XLGtucuip4,9753
-pygments/lexers/lisp.py,sha256=LkuudA1P9cZRzGqV30C-5YicArLoP9UIBul0Hif41v4,144398
-pygments/lexers/macaulay2.py,sha256=aEdFzjrP7RXP5BcRA3OQic94umhvq1uGxUFMu5OC7KM,32171
-pygments/lexers/make.py,sha256=rWYMowE5zF6mYA3VrJhJ-S_n214-OtWeXdjJDKjXAok,7694
-pygments/lexers/markup.py,sha256=sQLkkKS6d40Fe43z-vFR2bvWuNTJvuJ54F-FZKkgzNo,60257
-pygments/lexers/math.py,sha256=Wl6lU1VWevtQXymt6jdDeuz9LEMiPKl1On3Zm3QXQ8M,676
-pygments/lexers/matlab.py,sha256=WplG578_mB6sHlDDfgY83SMadCcqD_sN5Jb593rSr6w,132852
-pygments/lexers/maxima.py,sha256=tLSjeDIBZKHRoMludgF7oBdz1xTAHyvIEG6BshyBXyM,2716
-pygments/lexers/meson.py,sha256=ij0CgbEULfqLMcY_BQ7PxmCwWOYLc9XZwtrALFSinEA,4337
-pygments/lexers/mime.py,sha256=-wj3pvAQzNTC8fTZk9AV4Q-LIQhMUocet-j2kqGj5gs,7538
-pygments/lexers/minecraft.py,sha256=ht5QXort_Zh978JtW8FFedZohg5vvs0QhfgtnAoTJbw,13810
-pygments/lexers/mips.py,sha256=JBfvOPp5HTGp6b0kynkjzuJOTRAdTsJJdjPWLAtu1fo,4604
-pygments/lexers/ml.py,sha256=acMqr9VqV_79-o8rrlc8PSZYYc1Qmyolo3f18Vx81ig,35315
-pygments/lexers/modeling.py,sha256=3KxuIs1-lb_FN921kCCgjq84R69ATEp6K1EQyWaxp7M,13524
-pygments/lexers/modula2.py,sha256=z-4QbG4Bgjd-0ONC9SadglqCW2QmIMl-60b_n35V-70,53073
-pygments/lexers/monte.py,sha256=pKPKOkwxcGzJLVisA-H7xJJW9JUh2SsXyDi32mF5nSQ,6290
-pygments/lexers/mosel.py,sha256=_JeaaK5Jn0r7JcuLl62u1sl6uInkrP9g4EosCf9Z-IQ,9187
-pygments/lexers/ncl.py,sha256=O6CckyU8yABKmx8xmj4q6E2isWORmvNO7Xl1JX5NwVQ,63962
-pygments/lexers/nimrod.py,sha256=O_8dxk9x3vlYFPYjpe8iqQcCrcZmNnBE_Ld1lzO7xVI,6416
-pygments/lexers/nit.py,sha256=Ghja_AX8DIg_KA-rmvgmL76kZI-lq3pARMiebYi9Nqw,2726
-pygments/lexers/nix.py,sha256=J1hm-r4NWD_LfEkCIOZqvvE1UhXBRF2zJi60OaxoS_o,4398
-pygments/lexers/oberon.py,sha256=LgYgzGPus7w1lJLUAu2cmIRQGEgQiid34QH5Upa7Uro,4169
-pygments/lexers/objective.py,sha256=VoUeZYa1aO5rU69dDpv4Ob5FOYyr3nm-eJ3m0kuti0U,22961
-pygments/lexers/ooc.py,sha256=BEj7kfOimF_Qi62R-B8bmYGy_5QIE1jS20NfrnNE9Ss,2982
-pygments/lexers/openscad.py,sha256=JF4cUk6rAsH9BlXDdkdXMSlKajpghtOm0Ny-QikoiZ0,3701
-pygments/lexers/other.py,sha256=oXVtTELCPFxwuJxN5j_iYrt0Q9Aonq-GkotncUFPpeE,1744
-pygments/lexers/parasail.py,sha256=MxO40OTg_5z_EnMyb6weQHjhtzL1WgSwfjCXc0zl82Y,2720
-pygments/lexers/parsers.py,sha256=JiQT3IMsf2f0JLbiDpupZNSsHnMUH57OoAr0D_3AvbY,25904
-pygments/lexers/pascal.py,sha256=EHZi_mh4V7LuGXtcbTQnrrfqDDXcGyVwDvJmN8XRcps,30880
-pygments/lexers/pawn.py,sha256=fNq73VwQoXeKiRFKYIKzzOClcUb2eLPJIhymlnxKZlg,8146
-pygments/lexers/perl.py,sha256=82_7saaR3qBFlSnWYyEtkir7uvXTeUZqFUhjdkdTTXs,39170
-pygments/lexers/phix.py,sha256=48JEQK_0ijjipwDl1F-ik0B_CGUMsZOvXlvXzIqHVmk,23252
-pygments/lexers/php.py,sha256=b4sVWZTMq0t2GMlaFmzYWJna9WuDQFIm-vdqXkb89xo,13040
-pygments/lexers/pointless.py,sha256=dUATlYVUZkbggQ6PUymDKhB0UKqDo-KCf0Fp_EjWsTM,1975
-pygments/lexers/pony.py,sha256=k03DAhS-_G8SZsfXZOjF5YkQaMQ28_uy68_CMaxuUC4,3244
-pygments/lexers/praat.py,sha256=rTl5GSoJ58LQxRf_Ek0A1H4iCm2IVQFxEwSvbMki7tw,12677
-pygments/lexers/procfile.py,sha256=naQZcdvxVUjT56R0U6_YpgNCgfmNE9Xjzx9uQesl-Cg,1156
-pygments/lexers/prolog.py,sha256=TzWkSYjxU-5JAFl4ng3ksANbyMIvDyXWdR5ISsBZaKs,12506
-pygments/lexers/promql.py,sha256=Qw0VXIJGRkw6ZiSzvtR0KFiWmPuyI9xxXgDl_l3cHmc,4715
-pygments/lexers/prql.py,sha256=MXk1v0Pv-zaDVWZHVf3RvDZNPjI65PF-s7a0hUUrVwU,8748
-pygments/lexers/ptx.py,sha256=ws5ghGmtTLaJ2zamWUixCbdkzbjnxdwZyI4t3mgrdSg,4502
-pygments/lexers/python.py,sha256=fp-pcvS7KQJ7_pxYbn4s0ONPFOFcWERRw4F2e-CP_A0,53400
-pygments/lexers/q.py,sha256=Vw36x6rIp2U1b8GUtUbMlcD0MVqW3unCZEMBEt-PflQ,6932
-pygments/lexers/qlik.py,sha256=gCAQCe1Tuy_cMI4n51Sb8fG50L73AgmUMEWMmZRHeJg,3665
-pygments/lexers/qvt.py,sha256=IjHyopkDochlQt_fIf7Mrxw84pIg-gj4BkDHtEiKb_U,6072
-pygments/lexers/r.py,sha256=xMSNpNN3Hm0W51-TEfvzPeOGtobM2nIjGVmIoVydlfU,6185
-pygments/lexers/rdf.py,sha256=RNIBJhBKMwpxlHzF2pnKJPUoOjbiPmoFZDajDd4mSzE,15981
-pygments/lexers/rebol.py,sha256=TMT3JlXoWvJbZwZdLuekwgv584HEP1mfsD2g9Oqj0IU,18248
-pygments/lexers/resource.py,sha256=KxxQJi9NPmghpa1mekxUFBd8eaiSB9pV_F4Eds4kK0k,2902
-pygments/lexers/ride.py,sha256=0mT89oluoz5lUT8ar6uPiSwTIBwyMc6oHYnrM5QY7Vo,5056
-pygments/lexers/rita.py,sha256=gPbMhlCyS_ekzXIKboXGEmtGZlSSUx0k6qcuWEHuM6s,1128
-pygments/lexers/rnc.py,sha256=SjXKJWNifTTWQC9NlcWNmdhkln0REEpEvaY6nVy6n4w,1973
-pygments/lexers/roboconf.py,sha256=HY0dSPJxg7knQ-cM6YotX8EoVjuQi-LeKYKeWpQyF94,1962
-pygments/lexers/robotframework.py,sha256=MJ4cnUDZWDrXCpYi-kJLqe1HpzJ24DMtNswDeuSnVCc,18449
-pygments/lexers/ruby.py,sha256=9Oext9bqwC7E4SE3fAB4Ldd9_9Tbq7D4D94RQA-8bcc,22672
-pygments/lexers/rust.py,sha256=Oq5bFgf_hcOLxiBLhzPArUFXgg3Ude_xpeKPC3g-HDI,8216
-pygments/lexers/sas.py,sha256=u0vkPLehX7UERsKIkooC4IFJdTf44L2_Qqdpx1De7wk,9400
-pygments/lexers/savi.py,sha256=3A563B-Wzp5AGZG0ruSQiPbe-c3uYGwCPUmnPJSEKOk,4645
-pygments/lexers/scdoc.py,sha256=_UKS5VZZ4eaVpxmSr6L_P8Or8gAt9mImX4HWuw1TGlo,2525
-pygments/lexers/scripting.py,sha256=EkXKzWLg-jpsV8rep2YW6fDsCDz-d3fY1qv1QVE7MI8,70014
-pygments/lexers/sgf.py,sha256=Oa3SNL31wN8rhY0gby61kbPxttvRQJTRN38CSMUiMJE,1986
-pygments/lexers/shell.py,sha256=oC115DNmEzPYPdKN5jNUz-gV44c_qVb2Y5OfGO3gQ_U,36466
-pygments/lexers/sieve.py,sha256=lLcCLdvj-AeudiG2xq2zTN16v0zSEXK5vcr1keg0TxA,2441
-pygments/lexers/slash.py,sha256=_soPrmF1ylAw7IWfRHTMMUdifwy4oNV5FpYMBQsVSyM,8482
-pygments/lexers/smalltalk.py,sha256=9UNqjCWOay3nb5BVqN2Muw-Ci63WnscW6xJcGnNWVq4,7206
-pygments/lexers/smithy.py,sha256=FMvWXKvjF_hUNqI7BmZYbVRrPg5_AnnzORHPp3skcXs,2660
-pygments/lexers/smv.py,sha256=VyWuTjtAhaZmu6oZG3Om_kU3NhorVz9ivzeu_mfRjwo,2773
-pygments/lexers/snobol.py,sha256=Wp7ViMnddy79tWJjsgSB9kIPFh_OhaM4Y2tZjWDuvMI,2732
-pygments/lexers/solidity.py,sha256=Mhmypb5WzxGdBaQpySae9NbiFJllkEezditjHajd7RA,3127
-pygments/lexers/sophia.py,sha256=0gARv0DbMi7DWUc793pd4f7IKxSeOlkjk_eez8tLihs,3330
-pygments/lexers/special.py,sha256=SDWqBKmWmKyvi8VNfPpW1V4g7ergad4RfUumDh6bNrk,3414
-pygments/lexers/spice.py,sha256=hzAwtzocM0GYjZasqsX1Uv6jYkwgkm9wIvadpkyw2tw,2735
-pygments/lexers/sql.py,sha256=IirBrDuksw3Osvexob90XCmH7HRIcaBBgDyK1ay6BuA,42107
-pygments/lexers/srcinfo.py,sha256=x_6DsZ0mKVbI_v_G5bLBQl0WyFwj3tXmOqfHIB6zve4,1693
-pygments/lexers/stata.py,sha256=-IRfLl_rpuOiKs0Vnpc6OEKuA6AXbklW6RBGc7xzGEM,6416
-pygments/lexers/supercollider.py,sha256=Ua4RbmCRYPz7PcT1uyloAbfKc9kZim7nAKr55E26scY,3698
-pygments/lexers/tal.py,sha256=fXEJmSU74ImOyCVnEIW1Qa7rWKIiDHKmDlpIW3OUp-w,2898
-pygments/lexers/tcl.py,sha256=STjHSlVeWo-Eg4tKqn_7m3_3efcmHP0WCoL1_PK5tt0,5513
-pygments/lexers/teal.py,sha256=t8eOzrIiImVuUtkBlSPl9Y4olrCAZ21SQB-T67WZasQ,3523
-pygments/lexers/templates.py,sha256=Eawt5MXOe1V2RB_vhp6097GQMjoKHPSEWHKifhdMazw,72610
-pygments/lexers/teraterm.py,sha256=71NiLefy40L6R4B-qy-ho8Uy4kAQqsi7iLxexCDS5rU,9719
-pygments/lexers/testing.py,sha256=Ue93uh36l7JKc0cUDnLmk-E221b5y7qt6xXHvaJRxt4,10767
-pygments/lexers/text.py,sha256=ntF8QwsuhsqyQdxMB6H7MYP7o8A7xSxHe0UMTZLKSK8,1029
-pygments/lexers/textedit.py,sha256=xVU-3K5-0KEkb0pJ4hJjrjpnz9hJaIuLQOxfk9nLWjM,7609
-pygments/lexers/textfmts.py,sha256=d5g8AWDK5_MXMnPhj6t7T7SOLsk6wPptRmgnAdbAnUc,15310
-pygments/lexers/theorem.py,sha256=Bfz9807spH0L4Ql0_0u0HDfT4t5Z2PPk71a9JquXllo,16659
-pygments/lexers/thingsdb.py,sha256=FwelchVBXKf3nc78UgA9SyJbHta3EMdrLnQizIxS5SE,4228
-pygments/lexers/tlb.py,sha256=sQCsK3j8zqGVI_KCuursmOr4JIs3sfpqF_wPpQpyKM0,1377
-pygments/lexers/tls.py,sha256=KfI8y7abYZzC_jRwvti_foAAUrWSmpjdQ3RGPcP8yps,1541
-pygments/lexers/tnt.py,sha256=uvdcsw5NRZjbFouXBET3-w8I7LG9hqzMXiK6s_GK2ZY,10457
-pygments/lexers/trafficscript.py,sha256=GDl_7cSFit1anVH7KNH0qVts1eHcp_GGxpzIYWZabeg,1474
-pygments/lexers/typoscript.py,sha256=nIAUIlbL5sVqpTEt34YdUGDNmu60a7itBYaaUMuzAIs,8207
-pygments/lexers/ul4.py,sha256=XOm5dWiWtWN3RQMpA5VHvl1J1jg014SK27aJnVjq1C0,8956
-pygments/lexers/unicon.py,sha256=4MDnwsgXzLlm0zaDqYr9uHFNspgCzQRNzyxClVQ-RMI,18512
-pygments/lexers/urbi.py,sha256=3CkxfMOqpSVZpOq7_4YrWcmjq4B3CF_IDGIxAsedWQ0,6037
-pygments/lexers/usd.py,sha256=7FiS_KV1Q9Cvf51fAHmMqr5QDz1OtjqTkp1S-8VyQTw,3513
-pygments/lexers/varnish.py,sha256=LYL6rhIw-ApJRT4qkxFaxG71OPbHsiFv4mtfr0m1OPY,7273
-pygments/lexers/verification.py,sha256=1C1ntqvZmrCtzHV9eDIga1LtQ4jpAlb6GnWkNucEJXQ,3885
-pygments/lexers/verifpal.py,sha256=DF0nQlrw_Xt23OOFpOC8_LRpYWXlon1S7yxj6egbtDY,2662
-pygments/lexers/vip.py,sha256=Mn8ZSUVLuGgqt1CMshXFelS3p8DBqUOyqFrZyWBGblc,5713
-pygments/lexers/vyper.py,sha256=VFiOxo9JhrPQKFtWDOjWz6HccIwjAxEH42GzSkM7LhA,5595
-pygments/lexers/web.py,sha256=lscit_NgXsHDL8sjvNvAFriPBe24cz0b2rBGFFpYlv8,894
-pygments/lexers/webassembly.py,sha256=HGFp4qMAK0ejx0omrThEtIvl_ArKOeS7b4yZkipqmIo,5699
-pygments/lexers/webidl.py,sha256=VeqO7i3Y-e0ObtLxn1sniGmL_CvOWekaP2XyUFzDlLQ,10517
-pygments/lexers/webmisc.py,sha256=veICtUXL33effcYDX8_FU1F0Q5FfZfzcC2Tyu5SYT9A,40549
-pygments/lexers/wgsl.py,sha256=Mffgj3x5tFwsKWihw2kbhSmhvGNEgQc_pJi6C3mEQxc,11920
-pygments/lexers/whiley.py,sha256=SbbftaItSgIdczzT8qOV8mH1m6dD3aM2EvRk4ila6Co,4018
-pygments/lexers/wowtoc.py,sha256=o_01SGTJ3jecVHEpkhqHdwI66XQVi8wNeajVYPbd4Bo,4021
-pygments/lexers/wren.py,sha256=I3LaIzy3aa0aDXJd9PJp-SiJtgJHktISHdQ_zQuMHLY,3239
-pygments/lexers/x10.py,sha256=p3VwQg70e8ZR2iwR2kY-yojTyD_s3xVJMLTCWrpz6Hc,1920
-pygments/lexers/xorg.py,sha256=rXKVNQiiniNoaM4VTkLFj106NLddCBo1BV45BTxT1HE,902
-pygments/lexers/yang.py,sha256=rx08okYvJgWMe6jMRkt-ysEuaTi85X5DE0Q5EHb-Ehg,4500
-pygments/lexers/yara.py,sha256=nFwPtmuAhe5qrm_PKldVnWAiFZaLeipgi5q3-r1VGwE,2428
-pygments/lexers/zig.py,sha256=B5QZGfEoNkoAG5EZxHk28MZ1n2Q1Gvx11kcvTQ6N5X8,3953
-pygments/modeline.py,sha256=eF2vO4LpOGoPvIKKkbPfnyut8hT4UiebZPpb-BYGQdI,986
-pygments/plugin.py,sha256=k_gtJHBriDDWiNinQ-h_qnDUm7EnPLuXaTGH3Cd5pZw,2579
-pygments/regexopt.py,sha256=jg1ALogcYGU96TQS9isBl6dCrvw5y5--BP_K-uFk_8s,3072
-pygments/scanner.py,sha256=b_nu5_f3HCgSdp5S_aNRBQ1MSCm4ZjDwec2OmTRickw,3092
-pygments/sphinxext.py,sha256=lGw97r5LQrBvectMNzL03wRECrjs1HRXm8K_l7T-Ink,7687
-pygments/style.py,sha256=b9L0ePngJbdJHc2GN0lZQ-OGReVS2LLJ7Cw0CtqvYkc,6408
-pygments/styles/__init__.py,sha256=_vD3kixWMGVuBQrA1Wz_rJEtkk891W0ED55i8EQBhCA,2006
-pygments/styles/_mapping.py,sha256=8nY9bcEF1Zw9Xu0bmqffqYEHHbNZvCQHit2OVlJWHyk,3251
-pygments/styles/abap.py,sha256=u-QuTC6mQKq4YJA4mktCQn2cMElWwpkoX3S7usbYOOA,749
-pygments/styles/algol.py,sha256=P3QKhfOzlVAqrU92sjhnaR7EqCOQUOw7Lk_I9epKbtY,2262
-pygments/styles/algol_nu.py,sha256=Os4S0FUDMQ905O3RrLVRYsjv7ApV6TpFrfwKnw-hZgQ,2283
-pygments/styles/arduino.py,sha256=_CvgHN31uKDQ47rvw5Eorgcxyl5KpRQhG_YEtGEIfxo,4557
-pygments/styles/autumn.py,sha256=ddeg2OP2N0Hnnf1EtTCtta_l1MEc84Jlz-q0u6DVYMk,2195
-pygments/styles/borland.py,sha256=K9ChZUYeVCV_UneC-GuwbbFuGsbuJPQmXU4M5iO9-QA,1611
-pygments/styles/bw.py,sha256=m_aaUcKZcoFKfCMxhtxzSCI_XmHeUjUw5vdZPjvZp-g,1406
-pygments/styles/colorful.py,sha256=8ycjohgVnpMiMlSxJcS4ElGPEr7YzGFpS4HTfLqZabQ,2832
-pygments/styles/default.py,sha256=fiD-OIbpCjq-SUtd3x3ubmkVN8n7aBV47fwoDrTeEkU,2588
-pygments/styles/dracula.py,sha256=5LyWUmUN5wy2MhHuyEcObpZ6aMaLpRYAPCG7_Z0MCE4,2182
-pygments/styles/emacs.py,sha256=z_apN0G3CxBJWCTuHgqLf4gnG2OQpEqPUNmM2MIcze8,2535
-pygments/styles/friendly.py,sha256=c_OakSvJVxD5vVFQFrz20aVJzVHIhW3cojQ76CImxsc,2604
-pygments/styles/friendly_grayscale.py,sha256=H6bsSnmHqa4rUAhoqPk12ngQb8-HS9LnKewwk5bSDg8,2828
-pygments/styles/fruity.py,sha256=rrQJF7-5gZ0iZDViYu4t6DrjW4GIcx6IlHh51us-JcA,1324
-pygments/styles/gh_dark.py,sha256=OMSwHFnAN9rcjwYUEL2TlS95noWjW37OaUPhyaveIiE,3590
-pygments/styles/gruvbox.py,sha256=91-MOfqqoXrYOvB3x2vYZ3kvF_nS34oqNpoqD7k4Yc4,3387
-pygments/styles/igor.py,sha256=KIrBo4BV-IAz-zBK4r0gxnbrIWSHFe_Ys6uSubeBQ4c,737
-pygments/styles/inkpot.py,sha256=Oua26UQVLXsZbSfofyz7Z8aKSiJ9hTufA3xF6HkYjGo,2404
-pygments/styles/lightbulb.py,sha256=HCZY-h-CNbZyUogI5gGQR_d4hmFmqxLxYNJ8qcZSFls,3172
-pygments/styles/lilypond.py,sha256=JC12xZ3EJB5ND8EHcTadfGmgnbayGq8lBOPZuR2vUy0,2066
-pygments/styles/lovelace.py,sha256=qt0CG-FIIVxfmZpw-pETZwFngAwMpnq_GeSAvmR25ak,3178
-pygments/styles/manni.py,sha256=BThefwUCUSUI5fmB2qtPobguGlyoNMYkWBFg7nkNyTA,2443
-pygments/styles/material.py,sha256=8irDX9ETp9BZ3IltoRLYOTLexTmaz031ei7uyvu5GNo,4201
-pygments/styles/monokai.py,sha256=gTGDMnNuK8ZHXqVcl5I3ioIFlbiwPDmRy17v-GetpVI,5184
-pygments/styles/murphy.py,sha256=JE9fBt-6MF3H6UEYtEJWK7p_t3Lz4FusSbnPynNu42M,2805
-pygments/styles/native.py,sha256=rVBWq-wBg2vAeAs_i_VNlxgWzg-ebVforTXzeBX2Jo4,2043
-pygments/styles/nord.py,sha256=O_nt2GrMK5OsQR08Ae9wURzZx5bcGysoxgmWbq8xcqc,5391
-pygments/styles/onedark.py,sha256=5RqvEWfEqF8o2w0N_8l-U-ofiYSXtHSUzktXMwAoAIo,1719
-pygments/styles/paraiso_dark.py,sha256=lDd5uQE79wvBhGmrpLS3KInpR0snFxWwDm_0O2xTmKY,5662
-pygments/styles/paraiso_light.py,sha256=P5PklTqMUL6pcoGqOqWKBl27tzPO96ESU-g6-KrdgaQ,5668
-pygments/styles/pastie.py,sha256=dUVoOajWDL7gHb2M1sKSvIpt1NFyAsESYPaRevuRVWo,2525
-pygments/styles/perldoc.py,sha256=ptWUIhA3fhY_an_Vv_Ol0iFxdoMmBmKVmC2jsJsvlak,2230
-pygments/styles/rainbow_dash.py,sha256=wjVs3914IzAV23dnOR5xLGlM4UuC1vDd6J4ioTWiJDY,2540
-pygments/styles/rrt.py,sha256=UwKeTcYEtEpOR_o14zudapplTxTyBX1DPqw2I9RUywc,964
-pygments/styles/sas.py,sha256=VnKRcJVldq2KlnEO8pI7SFOatbaE4z0i0w6_qZtOU94,1440
-pygments/styles/solarized.py,sha256=mZLB6gjn_Y-6K_0paNVJXI9lZxPa9HvkQMpBRMSY62Q,4247
-pygments/styles/staroffice.py,sha256=RM9KTvM7wRed5KW4KZ9nBeKThrDexqqLS3Zn2Oh7H6s,831
-pygments/styles/stata_dark.py,sha256=OgzjDFI0NbH4lmEc4SxcfUsQPhBgkh5Ph1sJ_4x28tM,1257
-pygments/styles/stata_light.py,sha256=ZcdDnLhzMwz31Hhzby-Y8J_UAAZ0BPPgMErHqySRA9Q,1289
-pygments/styles/tango.py,sha256=_95xGiUpuKIJVNbxfhkPMzw19vweKUPfZsAPcIBKz-k,7137
-pygments/styles/trac.py,sha256=91bi_zjoF5M4e0NrF_p77Yka2A6fSEmxUmdVs2IuRQM,1981
-pygments/styles/vim.py,sha256=7DM6buIf9yTyqvyAVGKMow9Inml3rjipaZ9R8MaimDI,2019
-pygments/styles/vs.py,sha256=wGIgZm7zHBEcU7MLmVAehH9Jw_uxVf1GWvqJsznzq1c,1130
-pygments/styles/xcode.py,sha256=-lDW8y3hEXcJceSdr9bO_TVVRIxn_hQeVfBwWRzkU_Q,1504
-pygments/styles/zenburn.py,sha256=Hgd-HGeCwaNcD-VZ-wbsEL_nv2A11uOXVqHXq-KSy3k,2203
-pygments/token.py,sha256=DXVQcLULVn05LG63bagiqJd2FH3UzheVUBmdQeXn1U8,6226
-pygments/unistring.py,sha256=FaUfG14NBJEKLQoY9qj6JYeXrpYcLmKulghdxOGFaOc,63223
-pygments/util.py,sha256=AEVY0qonyyEMgv4Do2dINrrqUAwUk2XYSqHM650uzek,10230
diff --git a/libs/pysubs2-1.7.2.dist-info/INSTALLER b/libs/pygments-2.19.1.dist-info/INSTALLER
similarity index 100%
rename from libs/pysubs2-1.7.2.dist-info/INSTALLER
rename to libs/pygments-2.19.1.dist-info/INSTALLER
diff --git a/libs/pygments-2.17.2.dist-info/METADATA b/libs/pygments-2.19.1.dist-info/METADATA
similarity index 90%
rename from libs/pygments-2.17.2.dist-info/METADATA
rename to libs/pygments-2.19.1.dist-info/METADATA
index a2327aa98..8671c6d8f 100644
--- a/libs/pygments-2.17.2.dist-info/METADATA
+++ b/libs/pygments-2.19.1.dist-info/METADATA
@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Pygments
-Version: 2.17.2
+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
@@ -22,19 +22,18 @@ 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: 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.7
+Requires-Python: >=3.8
 Provides-Extra: plugins
-Requires-Dist: importlib-metadata; (python_version < '3.8') and extra == 'plugins'
 Provides-Extra: windows-terminal
 Requires-Dist: colorama>=0.4.6; extra == 'windows-terminal'
 Description-Content-Type: text/x-rst
@@ -55,5 +54,5 @@ are:
   formats that PIL supports and ANSI sequences
 * it is usable as a command-line tool and as a library
 
-Copyright 2006-2023 by the Pygments team, see ``AUTHORS``.
+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
new file mode 100644
index 000000000..4801085a7
--- /dev/null
+++ b/libs/pygments-2.19.1.dist-info/RECORD
@@ -0,0 +1,346 @@
+../../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/pysubs2-1.7.2.dist-info/REQUESTED b/libs/pygments-2.19.1.dist-info/REQUESTED
similarity index 100%
rename from libs/pysubs2-1.7.2.dist-info/REQUESTED
rename to libs/pygments-2.19.1.dist-info/REQUESTED
diff --git a/libs/pygments-2.19.1.dist-info/WHEEL b/libs/pygments-2.19.1.dist-info/WHEEL
new file mode 100644
index 000000000..12228d414
--- /dev/null
+++ b/libs/pygments-2.19.1.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.27.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pygments-2.17.2.dist-info/entry_points.txt b/libs/pygments-2.19.1.dist-info/entry_points.txt
similarity index 100%
rename from libs/pygments-2.17.2.dist-info/entry_points.txt
rename to libs/pygments-2.19.1.dist-info/entry_points.txt
diff --git a/libs/pygments-2.17.2.dist-info/licenses/AUTHORS b/libs/pygments-2.19.1.dist-info/licenses/AUTHORS
similarity index 94%
rename from libs/pygments-2.17.2.dist-info/licenses/AUTHORS
rename to libs/pygments-2.19.1.dist-info/licenses/AUTHORS
index 0e9f51271..811c66ae1 100644
--- a/libs/pygments-2.17.2.dist-info/licenses/AUTHORS
+++ b/libs/pygments-2.19.1.dist-info/licenses/AUTHORS
@@ -42,13 +42,17 @@ Other contributors, listed alphabetically, are:
 * Frits van Bommel -- assembler lexers
 * Pierre Bourdon -- bugfixes
 * Martijn Braam -- Kernel log lexer, BARE lexer
+* JD Browne, Google LLC -- GoogleSQL lexer
 * Matthias Bussonnier -- ANSI style handling for terminal-256 formatter
 * chebee7i -- Python traceback lexer improvements
 * Hiram Chirino -- Scaml and Jade lexers
 * Mauricio Caceres -- SAS and Stata lexers.
+* Michael Camilleri, John Gabriele, sogaiu -- Janet lexer
+* Daren Chandisingh -- Gleam lexer
 * Ian Cooper -- VGL lexer
 * David Corbett -- Inform, Jasmin, JSGF, Snowball, and TADS 3 lexers
 * Leaf Corcoran -- MoonScript lexer
+* Fraser Cormack -- TableGen lexer
 * Gabriel Corona -- ASN.1 lexer
 * Christopher Creutzig -- MuPAD lexer
 * Daniël W. Crompton -- Pike lexer
@@ -68,6 +72,7 @@ Other contributors, listed alphabetically, are:
 * Paweł Fertyk -- GDScript lexer, HTML formatter improvements
 * Michael Ficarra -- CPSA lexer
 * James H. Fisher -- PostScript lexer
+* Amanda Fitch, Google LLC -- GoogleSQL lexer
 * William S. Fulton -- SWIG lexer
 * Carlos Galdino -- Elixir and Elixir Console lexers
 * Michael Galloy -- IDL lexer
@@ -115,6 +120,8 @@ Other contributors, listed alphabetically, are:
   MSDOS session, BC, WDiff
 * Brian R. Jackson -- Tea lexer
 * Christian Jann -- ShellSession lexer
+* Jonas Camillus Jeppesen -- Line numbers and line highlighting for 
+  RTF-formatter
 * Dennis Kaarsemaker -- sources.list lexer
 * Dmitri Kabak -- Inferno Limbo lexer
 * Igor Kalnitsky -- vhdl lexer
@@ -136,6 +143,7 @@ Other contributors, listed alphabetically, are:
 * Jon Larimer, Google Inc. -- Smali lexer
 * Olov Lassus -- Dart lexer
 * Matt Layman -- TAP lexer
+* Dan Lazin, Google LLC -- GoogleSQL lexer
 * Kristian Lyngstøl -- Varnish lexers
 * Sylvestre Ledru -- Scilab lexer
 * Chee Sing Lee -- Flatline lexer
@@ -195,6 +203,7 @@ Other contributors, listed alphabetically, are:
 * Kashif Rasul -- CUDA lexer
 * Nathan Reed -- HLSL lexer
 * Justin Reidy -- MXML lexer
+* Jonathon Reinhart, Google LLC -- Soong lexer
 * Norman Richards -- JSON lexer
 * Corey Richardson -- Rust lexer updates
 * Fabrizio Riguzzi -- cplint leder
@@ -248,6 +257,7 @@ Other contributors, listed alphabetically, are:
 * Matthias Vallentin -- Bro lexer
 * Benoît Vinot -- AMPL lexer
 * Linh Vu Hong -- RSL lexer
+* Taavi Väänänen -- Debian control lexer
 * Immanuel Washington -- Smithy lexer
 * Nathan Weizenbaum -- Haml and Sass lexers
 * Nathan Whetsell -- Csound lexers
@@ -259,6 +269,7 @@ Other contributors, listed alphabetically, are:
 * Enrique Zamudio -- Ceylon lexer
 * Alex Zimin -- Nemerle lexer
 * Rob Zimmerman -- Kal lexer
+* Evgenii Zheltonozhskii -- Maple lexer
 * Vincent Zurczak -- Roboconf lexer
 * Hubert Gruniaux -- C and C++ lexer improvements
 * Thomas Symalla -- AMDGPU Lexer
@@ -274,6 +285,7 @@ Other contributors, listed alphabetically, are:
 * vanillajonathan -- PRQL lexer
 * Nikolay Antipov -- OpenSCAD lexer
 * Markus Meyer, Nextron Systems -- YARA lexer
-
+* Hannes Römer -- Mojo lexer
+* Jan Frederik Schaefer -- PDDL lexer
 
 Many thanks for all contributions!
diff --git a/libs/pygments-2.17.2.dist-info/licenses/LICENSE b/libs/pygments-2.19.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/pygments-2.17.2.dist-info/licenses/LICENSE
rename to libs/pygments-2.19.1.dist-info/licenses/LICENSE
diff --git a/libs/pygments/__init__.py b/libs/pygments/__init__.py
index 6b77c465c..d33a15630 100644
--- a/libs/pygments/__init__.py
+++ b/libs/pygments/__init__.py
@@ -21,12 +21,12 @@
     .. _Pygments master branch:
        https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.17.2'
+__version__ = '2.19.1'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/libs/pygments/__main__.py b/libs/pygments/__main__.py
index 5eb2c747a..4890a6c76 100644
--- a/libs/pygments/__main__.py
+++ b/libs/pygments/__main__.py
@@ -4,7 +4,7 @@
 
     Main entry point for ``python -m pygments``.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/cmdline.py b/libs/pygments/cmdline.py
index 435231e65..2878fd55a 100644
--- a/libs/pygments/cmdline.py
+++ b/libs/pygments/cmdline.py
@@ -4,7 +4,7 @@
 
     Command line interface.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -68,19 +68,19 @@ def _print_help(what, name):
     try:
         if what == 'lexer':
             cls = get_lexer_by_name(name)
-            print("Help on the %s lexer:" % cls.name)
+            print(f"Help on the {cls.name} lexer:")
             print(dedent(cls.__doc__))
         elif what == 'formatter':
             cls = find_formatter_class(name)
-            print("Help on the %s formatter:" % cls.name)
+            print(f"Help on the {cls.name} formatter:")
             print(dedent(cls.__doc__))
         elif what == 'filter':
             cls = find_filter_class(name)
-            print("Help on the %s filter:" % name)
+            print(f"Help on the {name} filter:")
             print(dedent(cls.__doc__))
         return 0
     except (AttributeError, ValueError):
-        print("%s not found!" % what, file=sys.stderr)
+        print(f"{what} not found!", file=sys.stderr)
         return 1
 
 
@@ -97,7 +97,7 @@ def _print_list(what):
             info.append(tup)
         info.sort()
         for i in info:
-            print(('* %s\n    %s %s') % i)
+            print(('* {}\n    {} {}').format(*i))
 
     elif what == 'formatter':
         print()
@@ -112,7 +112,7 @@ def _print_list(what):
             info.append(tup)
         info.sort()
         for i in info:
-            print(('* %s\n    %s %s') % i)
+            print(('* {}\n    {} {}').format(*i))
 
     elif what == 'filter':
         print()
@@ -122,7 +122,7 @@ def _print_list(what):
         for name in get_all_filters():
             cls = find_filter_class(name)
             print("* " + name + ':')
-            print("    %s" % docstring_headline(cls))
+            print(f"    {docstring_headline(cls)}")
 
     elif what == 'style':
         print()
@@ -132,7 +132,7 @@ def _print_list(what):
         for name in get_all_styles():
             cls = get_style_by_name(name)
             print("* " + name + ':')
-            print("    %s" % docstring_headline(cls))
+            print(f"    {docstring_headline(cls)}")
 
 
 def _print_list_as_json(requested_items):
@@ -185,8 +185,8 @@ def main_inner(parser, argns):
         return 0
 
     if argns.V:
-        print('Pygments version %s, (c) 2006-2023 by Georg Brandl, Matthäus '
-              'Chajdas and contributors.' % __version__)
+        print(f'Pygments version {__version__}, (c) 2006-2024 by Georg Brandl, Matthäus '
+              'Chajdas and contributors.')
         return 0
 
     def is_only_option(opt):
@@ -659,7 +659,7 @@ def main(args=sys.argv):
         msg = info[-1].strip()
         if len(info) >= 3:
             # extract relevant file and position info
-            msg += '\n   (f%s)' % info[-2].split('\n')[0].strip()[1:]
+            msg += '\n   (f{})'.format(info[-2].split('\n')[0].strip()[1:])
         print(file=sys.stderr)
         print('*** Error while highlighting:', file=sys.stderr)
         print(msg, file=sys.stderr)
diff --git a/libs/pygments/console.py b/libs/pygments/console.py
index deb4937f7..ee1ac27a2 100644
--- a/libs/pygments/console.py
+++ b/libs/pygments/console.py
@@ -4,7 +4,7 @@
 
     Format colored console output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,12 +27,12 @@ light_colors = ["brightblack", "brightred", "brightgreen", "brightyellow", "brig
                 "brightmagenta", "brightcyan", "white"]
 
 x = 30
-for d, l in zip(dark_colors, light_colors):
-    codes[d] = esc + "%im" % x
-    codes[l] = esc + "%im" % (60 + x)
+for dark, light in zip(dark_colors, light_colors):
+    codes[dark] = esc + "%im" % x
+    codes[light] = esc + "%im" % (60 + x)
     x += 1
 
-del d, l, x
+del dark, light, x
 
 codes["white"] = codes["bold"]
 
diff --git a/libs/pygments/filter.py b/libs/pygments/filter.py
index dafa08d15..5efff438d 100644
--- a/libs/pygments/filter.py
+++ b/libs/pygments/filter.py
@@ -4,7 +4,7 @@
 
     Module that implements the default filter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -62,8 +62,7 @@ class FunctionFilter(Filter):
 
     def __init__(self, **options):
         if not hasattr(self, 'function'):
-            raise TypeError('%r used without bound function' %
-                            self.__class__.__name__)
+            raise TypeError(f'{self.__class__.__name__!r} used without bound function')
         Filter.__init__(self, **options)
 
     def filter(self, lexer, stream):
diff --git a/libs/pygments/filters/__init__.py b/libs/pygments/filters/__init__.py
index 8bd53745c..2fed761a0 100644
--- a/libs/pygments/filters/__init__.py
+++ b/libs/pygments/filters/__init__.py
@@ -5,7 +5,7 @@
     Module containing filter lookup functions and default
     filters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -39,7 +39,7 @@ def get_filter_by_name(filtername, **options):
     if cls:
         return cls(**options)
     else:
-        raise ClassNotFound('filter %r not found' % filtername)
+        raise ClassNotFound(f'filter {filtername!r} not found')
 
 
 def get_all_filters():
@@ -79,9 +79,9 @@ class CodeTagFilter(Filter):
         Filter.__init__(self, **options)
         tags = get_list_opt(options, 'codetags',
                             ['XXX', 'TODO', 'FIXME', 'BUG', 'NOTE'])
-        self.tag_re = re.compile(r'\b(%s)\b' % '|'.join([
+        self.tag_re = re.compile(r'\b({})\b'.format('|'.join([
             re.escape(tag) for tag in tags if tag
-        ]))
+        ])))
 
     def filter(self, lexer, stream):
         regex = self.tag_re
diff --git a/libs/pygments/formatter.py b/libs/pygments/formatter.py
index 87183abbb..a20d3039d 100644
--- a/libs/pygments/formatter.py
+++ b/libs/pygments/formatter.py
@@ -4,7 +4,7 @@
 
     Base formatter class.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -122,3 +122,8 @@ class Formatter:
             # wrap the outfile in a StreamWriter
             outfile = codecs.lookup(self.encoding)[3](outfile)
         return self.format_unencoded(tokensource, outfile)
+
+    # Allow writing Formatter[str] or Formatter[bytes]. That's equivalent to
+    # Formatter. This helps when using third-party type stubs from typeshed.
+    def __class_getitem__(cls, name):
+        return cls
diff --git a/libs/pygments/formatters/__init__.py b/libs/pygments/formatters/__init__.py
index 6e482a1b7..b24931cd1 100644
--- a/libs/pygments/formatters/__init__.py
+++ b/libs/pygments/formatters/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments formatters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -77,7 +77,7 @@ def get_formatter_by_name(_alias, **options):
     """
     cls = find_formatter_class(_alias)
     if cls is None:
-        raise ClassNotFound("no formatter found for name %r" % _alias)
+        raise ClassNotFound(f"no formatter found for name {_alias!r}")
     return cls(**options)
 
 
@@ -103,17 +103,16 @@ def load_formatter_from_file(filename, formattername="CustomFormatter", **option
             exec(f.read(), custom_namespace)
         # Retrieve the class `formattername` from that namespace
         if formattername not in custom_namespace:
-            raise ClassNotFound('no valid %s class found in %s' %
-                                (formattername, filename))
+            raise ClassNotFound(f'no valid {formattername} class found in {filename}')
         formatter_class = custom_namespace[formattername]
         # And finally instantiate it with the options
         return formatter_class(**options)
     except OSError as err:
-        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+        raise ClassNotFound(f'cannot read {filename}: {err}')
     except ClassNotFound:
         raise
     except Exception as err:
-        raise ClassNotFound('error when loading custom formatter: %s' % err)
+        raise ClassNotFound(f'error when loading custom formatter: {err}')
 
 
 def get_formatter_for_filename(fn, **options):
@@ -135,7 +134,7 @@ def get_formatter_for_filename(fn, **options):
         for filename in cls.filenames:
             if _fn_matches(fn, filename):
                 return cls(**options)
-    raise ClassNotFound("no formatter found for file name %r" % fn)
+    raise ClassNotFound(f"no formatter found for file name {fn!r}")
 
 
 class _automodule(types.ModuleType):
diff --git a/libs/pygments/formatters/_mapping.py b/libs/pygments/formatters/_mapping.py
old mode 100755
new mode 100644
diff --git a/libs/pygments/formatters/bbcode.py b/libs/pygments/formatters/bbcode.py
index 9ce4ebc5a..339edf9dc 100644
--- a/libs/pygments/formatters/bbcode.py
+++ b/libs/pygments/formatters/bbcode.py
@@ -4,7 +4,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -60,7 +60,7 @@ class BBCodeFormatter(Formatter):
         for ttype, ndef in self.style:
             start = end = ''
             if ndef['color']:
-                start += '[color=#%s]' % ndef['color']
+                start += '[color=#{}]'.format(ndef['color'])
                 end = '[/color]' + end
             if ndef['bold']:
                 start += '[b]'
diff --git a/libs/pygments/formatters/groff.py b/libs/pygments/formatters/groff.py
index 687fd5496..028fec4ea 100644
--- a/libs/pygments/formatters/groff.py
+++ b/libs/pygments/formatters/groff.py
@@ -4,7 +4,7 @@
 
     Formatter for groff output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -63,7 +63,7 @@ class GroffFormatter(Formatter):
         for ttype, ndef in self.style:
             start = end = ''
             if ndef['color']:
-                start += '\\m[%s]' % ndef['color']
+                start += '\\m[{}]'.format(ndef['color'])
                 end = '\\m[]' + end
             if ndef['bold']:
                 start += bold
@@ -72,7 +72,7 @@ class GroffFormatter(Formatter):
                 start += italic
                 end = regular + end
             if ndef['bgcolor']:
-                start += '\\M[%s]' % ndef['bgcolor']
+                start += '\\M[{}]'.format(ndef['bgcolor'])
                 end = '\\M[]' + end
 
             self.styles[ttype] = start, end
diff --git a/libs/pygments/formatters/html.py b/libs/pygments/formatters/html.py
index df2469e2a..4ef183681 100644
--- a/libs/pygments/formatters/html.py
+++ b/libs/pygments/formatters/html.py
@@ -4,7 +4,7 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -44,7 +44,15 @@ def webify(color):
     if color.startswith('calc') or color.startswith('var'):
         return color
     else:
-        return '#' + color
+        # Check if the color can be shortened from 6 to 3 characters
+        color = color.upper()
+        if (len(color) == 6 and
+            (    color[0] == color[1]
+             and color[2] == color[3]
+             and color[4] == color[5])):
+            return f'#{color[0]}{color[2]}{color[4]}'
+        else:
+            return f'#{color}'
 
 
 def _get_ttype_class(ttype):
@@ -62,7 +70,7 @@ def _get_ttype_class(ttype):
 CSSFILE_TEMPLATE = '''\
 /*
 generated by Pygments <https://pygments.org/>
-Copyright 2006-2023 by the Pygments team.
+Copyright 2006-2025 by the Pygments team.
 Licensed under the BSD license, see LICENSE for details.
 */
 %(styledefs)s
@@ -73,7 +81,7 @@ DOC_HEADER = '''\
    "http://www.w3.org/TR/html4/strict.dtd">
 <!--
 generated by Pygments <https://pygments.org/>
-Copyright 2006-2023 by the Pygments team.
+Copyright 2006-2025 by the Pygments team.
 Licensed under the BSD license, see LICENSE for details.
 -->
 <html>
@@ -488,7 +496,7 @@ class HtmlFormatter(Formatter):
             name = self._get_css_class(ttype)
             style = ''
             if ndef['color']:
-                style += 'color: %s; ' % webify(ndef['color'])
+                style += 'color: {}; '.format(webify(ndef['color']))
             if ndef['bold']:
                 style += 'font-weight: bold; '
             if ndef['italic']:
@@ -496,9 +504,9 @@ class HtmlFormatter(Formatter):
             if ndef['underline']:
                 style += 'text-decoration: underline; '
             if ndef['bgcolor']:
-                style += 'background-color: %s; ' % webify(ndef['bgcolor'])
+                style += 'background-color: {}; '.format(webify(ndef['bgcolor']))
             if ndef['border']:
-                style += 'border: 1px solid %s; ' % webify(ndef['border'])
+                style += 'border: 1px solid {}; '.format(webify(ndef['border']))
             if style:
                 t2c[ttype] = name
                 # save len(ttype) to enable ordering the styles by
@@ -530,7 +538,7 @@ class HtmlFormatter(Formatter):
         styles.sort()
 
         lines = [
-            '%s { %s } /* %s */' % (prefix(cls), style, repr(ttype)[6:])
+            f'{prefix(cls)} {{ {style} }} /* {repr(ttype)[6:]} */'
             for (level, ttype, cls, style) in styles
         ]
 
@@ -548,24 +556,24 @@ class HtmlFormatter(Formatter):
             if Text in self.ttype2class:
                 text_style = ' ' + self.class2style[self.ttype2class[Text]][0]
             lines.insert(
-                0, '%s{ background: %s;%s }' % (
+                0, '{}{{ background: {};{} }}'.format(
                     prefix(''), bg_color, text_style
                 )
             )
         if hl_color is not None:
             lines.insert(
-                0, '%s { background-color: %s }' % (prefix('hll'), hl_color)
+                0, '{} {{ background-color: {} }}'.format(prefix('hll'), hl_color)
             )
 
         return lines
 
     def get_linenos_style_defs(self):
         lines = [
-            'pre { %s }' % self._pre_style,
-            'td.linenos .normal { %s }' % self._linenos_style,
-            'span.linenos { %s }' % self._linenos_style,
-            'td.linenos .special { %s }' % self._linenos_special_style,
-            'span.linenos.special { %s }' % self._linenos_special_style,
+            f'pre {{ {self._pre_style} }}',
+            f'td.linenos .normal {{ {self._linenos_style} }}',
+            f'span.linenos {{ {self._linenos_style} }}',
+            f'td.linenos .special {{ {self._linenos_special_style} }}',
+            f'span.linenos.special {{ {self._linenos_special_style} }}',
         ]
 
         return lines
@@ -594,17 +602,15 @@ class HtmlFormatter(Formatter):
 
     @property
     def _linenos_style(self):
-        return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % (
-            self.style.line_number_color,
-            self.style.line_number_background_color
-        )
+        color = self.style.line_number_color
+        background_color = self.style.line_number_background_color
+        return f'color: {color}; background-color: {background_color}; padding-left: 5px; padding-right: 5px;'
 
     @property
     def _linenos_special_style(self):
-        return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % (
-            self.style.line_number_special_color,
-            self.style.line_number_special_background_color
-        )
+        color = self.style.line_number_special_color
+        background_color = self.style.line_number_special_background_color
+        return f'color: {color}; background-color: {background_color}; padding-left: 5px; padding-right: 5px;'
 
     def _decodeifneeded(self, value):
         if isinstance(value, bytes):
@@ -685,9 +691,9 @@ class HtmlFormatter(Formatter):
 
             if nocls:
                 if special_line:
-                    style = ' style="%s"' % self._linenos_special_style
+                    style = f' style="{self._linenos_special_style}"'
                 else:
-                    style = ' style="%s"' % self._linenos_style
+                    style = f' style="{self._linenos_style}"'
             else:
                 if special_line:
                     style = ' class="special"'
@@ -695,7 +701,7 @@ class HtmlFormatter(Formatter):
                     style = ' class="normal"'
 
             if style:
-                line = '<span%s>%s</span>' % (style, line)
+                line = f'<span{style}>{line}</span>'
 
             lines.append(line)
 
@@ -744,9 +750,9 @@ class HtmlFormatter(Formatter):
 
             if nocls:
                 if special_line:
-                    style = ' style="%s"' % self._linenos_special_style
+                    style = f' style="{self._linenos_special_style}"'
                 else:
-                    style = ' style="%s"' % self._linenos_style
+                    style = f' style="{self._linenos_style}"'
             else:
                 if special_line:
                     style = ' class="linenos special"'
@@ -754,7 +760,7 @@ class HtmlFormatter(Formatter):
                     style = ' class="linenos"'
 
             if style:
-                linenos = '<span%s>%s</span>' % (style, line)
+                linenos = f'<span{style}>{line}</span>'
             else:
                 linenos = line
 
@@ -791,13 +797,13 @@ class HtmlFormatter(Formatter):
         style = []
         if (self.noclasses and not self.nobackground and
                 self.style.background_color is not None):
-            style.append('background: %s' % (self.style.background_color,))
+            style.append(f'background: {self.style.background_color}')
         if self.cssstyles:
             style.append(self.cssstyles)
         style = '; '.join(style)
 
-        yield 0, ('<div' + (self.cssclass and ' class="%s"' % self.cssclass) +
-                  (style and (' style="%s"' % style)) + '>')
+        yield 0, ('<div' + (self.cssclass and f' class="{self.cssclass}"') +
+                  (style and (f' style="{style}"')) + '>')
         yield from inner
         yield 0, '</div>\n'
 
@@ -814,7 +820,7 @@ class HtmlFormatter(Formatter):
 
         # the empty span here is to keep leading empty lines from being
         # ignored by HTML parsers
-        yield 0, ('<pre' + (style and ' style="%s"' % style) + '><span></span>')
+        yield 0, ('<pre' + (style and f' style="{style}"') + '><span></span>')
         yield from inner
         yield 0, '</pre>'
 
@@ -843,18 +849,18 @@ class HtmlFormatter(Formatter):
             try:
                 cspan = self.span_element_openers[ttype]
             except KeyError:
-                title = ' title="%s"' % '.'.join(ttype) if self.debug_token_types else ''
+                title = ' title="{}"'.format('.'.join(ttype)) if self.debug_token_types else ''
                 if nocls:
                     css_style = self._get_css_inline_styles(ttype)
                     if css_style:
                         css_style = self.class2style[css_style][0]
-                        cspan = '<span style="%s"%s>' % (css_style, title)
+                        cspan = f'<span style="{css_style}"{title}>'
                     else:
                         cspan = ''
                 else:
                     css_class = self._get_css_classes(ttype)
                     if css_class:
-                        cspan = '<span class="%s"%s>' % (css_class, title)
+                        cspan = f'<span class="{css_class}"{title}>'
                     else:
                         cspan = ''
                 self.span_element_openers[ttype] = cspan
@@ -927,11 +933,10 @@ class HtmlFormatter(Formatter):
                 if self.noclasses:
                     style = ''
                     if self.style.highlight_color is not None:
-                        style = (' style="background-color: %s"' %
-                                 (self.style.highlight_color,))
-                    yield 1, '<span%s>%s</span>' % (style, value)
+                        style = (f' style="background-color: {self.style.highlight_color}"')
+                    yield 1, f'<span{style}>{value}</span>'
                 else:
-                    yield 1, '<span class="hll">%s</span>' % value
+                    yield 1, f'<span class="hll">{value}</span>'
             else:
                 yield 1, value
 
diff --git a/libs/pygments/formatters/img.py b/libs/pygments/formatters/img.py
index dcf09da97..de4e9ffab 100644
--- a/libs/pygments/formatters/img.py
+++ b/libs/pygments/formatters/img.py
@@ -4,7 +4,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
@@ -90,7 +90,7 @@ class FontManager:
             self._create_nix()
 
     def _get_nix_font_path(self, name, style):
-        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
+        proc = subprocess.Popen(['fc-list', f"{name}:style={style}", 'file'],
                                 stdout=subprocess.PIPE, stderr=None)
         stdout, _ = proc.communicate()
         if proc.returncode == 0:
@@ -110,8 +110,7 @@ class FontManager:
                 self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
                 break
         else:
-            raise FontNotFound('No usable fonts named: "%s"' %
-                               self.font_name)
+            raise FontNotFound(f'No usable fonts named: "{self.font_name}"')
         for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
             for stylename in STYLES[style]:
                 path = self._get_nix_font_path(self.font_name, stylename)
@@ -133,7 +132,8 @@ class FontManager:
                          '/Library/Fonts/', '/System/Library/Fonts/'):
             font_map.update(
                 (os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
-                for f in os.listdir(font_dir)
+                for _, _, files in os.walk(font_dir)
+                for f in files
                 if f.lower().endswith(('ttf', 'ttc')))
 
         for name in STYLES['NORMAL']:
@@ -142,8 +142,7 @@ class FontManager:
                 self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
                 break
         else:
-            raise FontNotFound('No usable fonts named: "%s"' %
-                               self.font_name)
+            raise FontNotFound(f'No usable fonts named: "{self.font_name}"')
         for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
             for stylename in STYLES[style]:
                 path = self._get_mac_font_path(font_map, self.font_name, stylename)
@@ -160,15 +159,14 @@ class FontManager:
         for suffix in ('', ' (TrueType)'):
             for style in styles:
                 try:
-                    valname = '%s%s%s' % (basename, style and ' '+style, suffix)
+                    valname = '{}{}{}'.format(basename, style and ' '+style, suffix)
                     val, _ = _winreg.QueryValueEx(key, valname)
                     return val
                 except OSError:
                     continue
         else:
             if fail:
-                raise FontNotFound('Font %s (%s) not found in registry' %
-                                   (basename, styles[0]))
+                raise FontNotFound(f'Font {basename} ({styles[0]}) not found in registry')
             return None
 
     def _create_win(self):
@@ -633,7 +631,11 @@ class ImageFormatter(Formatter):
                                fill=self.hl_color)
         for pos, value, font, text_fg, text_bg in self.drawables:
             if text_bg:
-                text_size = draw.textsize(text=value, font=font)
+                # see deprecations https://pillow.readthedocs.io/en/stable/releasenotes/9.2.0.html#font-size-and-offset-methods
+                if hasattr(draw, 'textsize'):
+                    text_size = draw.textsize(text=value, font=font)
+                else:
+                    text_size = font.getbbox(value)[2:]
                 draw.rectangle([pos[0], pos[1], pos[0] + text_size[0], pos[1] + text_size[1]], fill=text_bg)
             draw.text(pos, value, font=font, fill=text_fg)
         im.save(outfile, self.image_format.upper())
diff --git a/libs/pygments/formatters/irc.py b/libs/pygments/formatters/irc.py
index 334aeef49..d6ca0699c 100644
--- a/libs/pygments/formatters/irc.py
+++ b/libs/pygments/formatters/irc.py
@@ -4,7 +4,7 @@
 
     Formatter for IRC output
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/formatters/latex.py b/libs/pygments/formatters/latex.py
index b130bfaf6..f14234a64 100644
--- a/libs/pygments/formatters/latex.py
+++ b/libs/pygments/formatters/latex.py
@@ -4,7 +4,7 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,21 +23,21 @@ def escape_tex(text, commandprefix):
     return text.replace('\\', '\x00'). \
                 replace('{', '\x01'). \
                 replace('}', '\x02'). \
-                replace('\x00', r'\%sZbs{}' % commandprefix). \
-                replace('\x01', r'\%sZob{}' % commandprefix). \
-                replace('\x02', r'\%sZcb{}' % commandprefix). \
-                replace('^', r'\%sZca{}' % commandprefix). \
-                replace('_', r'\%sZus{}' % commandprefix). \
-                replace('&', r'\%sZam{}' % commandprefix). \
-                replace('<', r'\%sZlt{}' % commandprefix). \
-                replace('>', r'\%sZgt{}' % commandprefix). \
-                replace('#', r'\%sZsh{}' % commandprefix). \
-                replace('%', r'\%sZpc{}' % commandprefix). \
-                replace('$', r'\%sZdl{}' % commandprefix). \
-                replace('-', r'\%sZhy{}' % commandprefix). \
-                replace("'", r'\%sZsq{}' % commandprefix). \
-                replace('"', r'\%sZdq{}' % commandprefix). \
-                replace('~', r'\%sZti{}' % commandprefix)
+                replace('\x00', rf'\{commandprefix}Zbs{{}}'). \
+                replace('\x01', rf'\{commandprefix}Zob{{}}'). \
+                replace('\x02', rf'\{commandprefix}Zcb{{}}'). \
+                replace('^', rf'\{commandprefix}Zca{{}}'). \
+                replace('_', rf'\{commandprefix}Zus{{}}'). \
+                replace('&', rf'\{commandprefix}Zam{{}}'). \
+                replace('<', rf'\{commandprefix}Zlt{{}}'). \
+                replace('>', rf'\{commandprefix}Zgt{{}}'). \
+                replace('#', rf'\{commandprefix}Zsh{{}}'). \
+                replace('%', rf'\{commandprefix}Zpc{{}}'). \
+                replace('$', rf'\{commandprefix}Zdl{{}}'). \
+                replace('-', rf'\{commandprefix}Zhy{{}}'). \
+                replace("'", rf'\{commandprefix}Zsq{{}}'). \
+                replace('"', rf'\{commandprefix}Zdq{{}}'). \
+                replace('~', rf'\{commandprefix}Zti{{}}')
 
 
 DOC_TEMPLATE = r'''
@@ -304,17 +304,14 @@ class LatexFormatter(Formatter):
             if ndef['mono']:
                 cmndef += r'\let\$$@ff=\textsf'
             if ndef['color']:
-                cmndef += (r'\def\$$@tc##1{\textcolor[rgb]{%s}{##1}}' %
-                           rgbcolor(ndef['color']))
+                cmndef += (r'\def\$$@tc##1{{\textcolor[rgb]{{{}}}{{##1}}}}'.format(rgbcolor(ndef['color'])))
             if ndef['border']:
-                cmndef += (r'\def\$$@bc##1{{\setlength{\fboxsep}{\string -\fboxrule}'
-                           r'\fcolorbox[rgb]{%s}{%s}{\strut ##1}}}' %
-                           (rgbcolor(ndef['border']),
+                cmndef += (r'\def\$$@bc##1{{{{\setlength{{\fboxsep}}{{\string -\fboxrule}}'
+                           r'\fcolorbox[rgb]{{{}}}{{{}}}{{\strut ##1}}}}}}'.format(rgbcolor(ndef['border']),
                             rgbcolor(ndef['bgcolor'])))
             elif ndef['bgcolor']:
-                cmndef += (r'\def\$$@bc##1{{\setlength{\fboxsep}{0pt}'
-                           r'\colorbox[rgb]{%s}{\strut ##1}}}' %
-                           rgbcolor(ndef['bgcolor']))
+                cmndef += (r'\def\$$@bc##1{{{{\setlength{{\fboxsep}}{{0pt}}'
+                           r'\colorbox[rgb]{{{}}}{{\strut ##1}}}}}}'.format(rgbcolor(ndef['bgcolor'])))
             if cmndef == '':
                 continue
             cmndef = cmndef.replace('$$', cp)
@@ -329,7 +326,7 @@ class LatexFormatter(Formatter):
         cp = self.commandprefix
         styles = []
         for name, definition in self.cmd2def.items():
-            styles.append(r'\@namedef{%s@tok@%s}{%s}' % (cp, name, definition))
+            styles.append(rf'\@namedef{{{cp}@tok@{name}}}{{{definition}}}')
         return STYLE_TEMPLATE % {'cp': self.commandprefix,
                                  'styles': '\n'.join(styles)}
 
@@ -410,10 +407,10 @@ class LatexFormatter(Formatter):
                 spl = value.split('\n')
                 for line in spl[:-1]:
                     if line:
-                        outfile.write("\\%s{%s}{%s}" % (cp, styleval, line))
+                        outfile.write(f"\\{cp}{{{styleval}}}{{{line}}}")
                     outfile.write('\n')
                 if spl[-1]:
-                    outfile.write("\\%s{%s}{%s}" % (cp, styleval, spl[-1]))
+                    outfile.write(f"\\{cp}{{{styleval}}}{{{spl[-1]}}}")
             else:
                 outfile.write(value)
 
diff --git a/libs/pygments/formatters/other.py b/libs/pygments/formatters/other.py
index 800476437..6b0eecacb 100644
--- a/libs/pygments/formatters/other.py
+++ b/libs/pygments/formatters/other.py
@@ -4,7 +4,7 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -74,8 +74,7 @@ class RawTokenFormatter(Formatter):
             try:
                 colorize(self.error_color, '')
             except KeyError:
-                raise ValueError("Invalid color %r specified" %
-                                 self.error_color)
+                raise ValueError(f"Invalid color {self.error_color!r} specified")
 
     def format(self, tokensource, outfile):
         try:
@@ -147,7 +146,7 @@ class TestcaseFormatter(Formatter):
         outbuf = []
         for ttype, value in tokensource:
             rawbuf.append(value)
-            outbuf.append('%s(%s, %r),\n' % (indentation, ttype, value))
+            outbuf.append(f'{indentation}({ttype}, {value!r}),\n')
 
         before = TESTCASE_BEFORE % (''.join(rawbuf),)
         during = ''.join(outbuf)
diff --git a/libs/pygments/formatters/pangomarkup.py b/libs/pygments/formatters/pangomarkup.py
index 50872fe24..812520944 100644
--- a/libs/pygments/formatters/pangomarkup.py
+++ b/libs/pygments/formatters/pangomarkup.py
@@ -4,7 +4,7 @@
 
     Formatter for Pango markup output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -45,7 +45,7 @@ class PangoMarkupFormatter(Formatter):
             start = ''
             end = ''
             if style['color']:
-                start += '<span fgcolor="#%s">' % style['color']
+                start += '<span fgcolor="#{}">'.format(style['color'])
                 end = '</span>' + end
             if style['bold']:
                 start += '<b>'
diff --git a/libs/pygments/formatters/rtf.py b/libs/pygments/formatters/rtf.py
index d3a83fa60..fe0968db7 100644
--- a/libs/pygments/formatters/rtf.py
+++ b/libs/pygments/formatters/rtf.py
@@ -4,12 +4,14 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+from collections import OrderedDict
 from pygments.formatter import Formatter
-from pygments.util import get_int_opt, surrogatepair
+from pygments.style import _ansimap
+from pygments.util import get_bool_opt, get_int_opt, get_list_opt, surrogatepair
 
 
 __all__ = ['RtfFormatter']
@@ -42,6 +44,59 @@ class RtfFormatter(Formatter):
         default is 24 half-points, giving a size 12 font.
 
         .. versionadded:: 2.0
+
+    `linenos`
+        Turn on line numbering (default: ``False``).
+
+        .. versionadded:: 2.18
+
+    `lineno_fontsize`
+        Font size for line numbers. Size is specified in half points
+        (default: `fontsize`). 
+
+        .. versionadded:: 2.18
+
+    `lineno_padding`
+        Number of spaces between the (inline) line numbers and the
+        source code (default: ``2``).
+
+        .. versionadded:: 2.18
+
+    `linenostart`
+        The line number for the first line (default: ``1``).
+
+        .. versionadded:: 2.18
+
+    `linenostep`
+        If set to a number n > 1, only every nth line number is printed.
+
+        .. versionadded:: 2.18
+
+    `lineno_color`
+        Color for line numbers specified as a hex triplet, e.g. ``'5e5e5e'``. 
+        Defaults to the style's line number color if it is a hex triplet, 
+        otherwise ansi bright black.
+
+        .. versionadded:: 2.18
+
+    `hl_lines`
+        Specify a list of lines to be highlighted, as line numbers separated by
+        spaces, e.g. ``'3 7 8'``. The line numbers are relative to the input 
+        (i.e. the first line is line 1) unless `hl_linenostart` is set.
+
+        .. versionadded:: 2.18
+
+    `hl_color`
+        Color for highlighting the lines specified in `hl_lines`, specified as 
+        a hex triplet (default: style's `highlight_color`).
+
+        .. versionadded:: 2.18
+
+    `hl_linenostart`
+        If set to ``True`` line numbers in `hl_lines` are specified
+        relative to `linenostart` (default ``False``).
+
+        .. versionadded:: 2.18
     """
     name = 'RTF'
     aliases = ['rtf']
@@ -62,6 +117,40 @@ class RtfFormatter(Formatter):
         Formatter.__init__(self, **options)
         self.fontface = options.get('fontface') or ''
         self.fontsize = get_int_opt(options, 'fontsize', 0)
+        self.linenos = get_bool_opt(options, 'linenos', False)
+        self.lineno_fontsize = get_int_opt(options, 'lineno_fontsize',
+                                           self.fontsize)
+        self.lineno_padding = get_int_opt(options, 'lineno_padding', 2)
+        self.linenostart = abs(get_int_opt(options, 'linenostart', 1))
+        self.linenostep = abs(get_int_opt(options, 'linenostep', 1))
+        self.hl_linenostart = get_bool_opt(options, 'hl_linenostart', False)
+
+        self.hl_color = options.get('hl_color', '')
+        if not self.hl_color:
+            self.hl_color = self.style.highlight_color
+
+        self.hl_lines = []
+        for lineno in get_list_opt(options, 'hl_lines', []):
+            try:
+                lineno = int(lineno)
+                if self.hl_linenostart:
+                    lineno = lineno - self.linenostart + 1
+                self.hl_lines.append(lineno)
+            except ValueError:
+                pass
+
+        self.lineno_color = options.get('lineno_color', '')
+        if not self.lineno_color:
+            if  self.style.line_number_color == 'inherit':
+                # style color is the css value 'inherit'
+                # default to ansi bright-black
+                self.lineno_color = _ansimap['ansibrightblack']
+            else:
+                # style color is assumed to be a hex triplet as other
+                # colors in pygments/style.py
+                self.lineno_color = self.style.line_number_color
+
+        self.color_mapping = self._create_color_mapping()
 
     def _escape(self, text):
         return text.replace('\\', '\\\\') \
@@ -90,43 +179,145 @@ class RtfFormatter(Formatter):
                 # Force surrogate pairs
                 buf.append('{\\u%d}{\\u%d}' % surrogatepair(cn))
 
-        return ''.join(buf).replace('\n', '\\par\n')
+        return ''.join(buf).replace('\n', '\\par')
 
-    def format_unencoded(self, tokensource, outfile):
-        # rtf 1.8 header
-        outfile.write('{\\rtf1\\ansi\\uc0\\deff0'
-                      '{\\fonttbl{\\f0\\fmodern\\fprq1\\fcharset0%s;}}'
-                      '{\\colortbl;' % (self.fontface and
-                                        ' ' + self._escape(self.fontface) or
-                                        ''))
+    @staticmethod
+    def hex_to_rtf_color(hex_color):
+        if hex_color[0] == "#":
+            hex_color = hex_color[1:]
 
-        # convert colors and save them in a mapping to access them later.
-        color_mapping = {}
+        return '\\red%d\\green%d\\blue%d;' % (
+                        int(hex_color[0:2], 16),
+                        int(hex_color[2:4], 16),
+                        int(hex_color[4:6], 16)
+                    )
+
+    def _split_tokens_on_newlines(self, tokensource):
+        """
+        Split tokens containing newline characters into multiple token
+        each representing a line of the input file. Needed for numbering
+        lines of e.g. multiline comments.
+        """
+        for ttype, value in tokensource:
+            if value == '\n':
+                yield (ttype, value)
+            elif "\n" in value:
+                lines = value.split("\n")
+                for line in lines[:-1]:
+                    yield (ttype, line+"\n")
+                if lines[-1]:
+                    yield (ttype, lines[-1])
+            else:
+                yield (ttype, value)
+
+    def _create_color_mapping(self):
+        """
+        Create a mapping of style hex colors to index/offset in
+        the RTF color table.
+        """
+        color_mapping = OrderedDict()
         offset = 1
+
+        if self.linenos:
+            color_mapping[self.lineno_color] = offset
+            offset += 1
+
+        if self.hl_lines:
+            color_mapping[self.hl_color] = offset
+            offset += 1
+
         for _, style in self.style:
             for color in style['color'], style['bgcolor'], style['border']:
                 if color and color not in color_mapping:
                     color_mapping[color] = offset
-                    outfile.write('\\red%d\\green%d\\blue%d;' % (
-                        int(color[0:2], 16),
-                        int(color[2:4], 16),
-                        int(color[4:6], 16)
-                    ))
                     offset += 1
-        outfile.write('}\\f0 ')
+
+        return color_mapping
+
+    @property
+    def _lineno_template(self):
+        if self.lineno_fontsize != self.fontsize:
+            return '{{\\fs{} \\cf{} %s{}}}'.format(self.lineno_fontsize,
+                          self.color_mapping[self.lineno_color],
+                          " " * self.lineno_padding)
+
+        return '{{\\cf{} %s{}}}'.format(self.color_mapping[self.lineno_color],
+                      " " * self.lineno_padding)
+
+    @property
+    def _hl_open_str(self):
+        return rf'{{\highlight{self.color_mapping[self.hl_color]} '
+
+    @property
+    def _rtf_header(self):
+        lines = []
+        # rtf 1.8 header
+        lines.append('{\\rtf1\\ansi\\uc0\\deff0'
+                     '{\\fonttbl{\\f0\\fmodern\\fprq1\\fcharset0%s;}}'
+                     % (self.fontface and ' '
+                        + self._escape(self.fontface) or ''))
+
+        # color table
+        lines.append('{\\colortbl;')
+        for color, _ in self.color_mapping.items():
+            lines.append(self.hex_to_rtf_color(color))
+        lines.append('}')
+
+        # font and fontsize
+        lines.append('\\f0\\sa0')
         if self.fontsize:
-            outfile.write('\\fs%d' % self.fontsize)
+            lines.append('\\fs%d' % self.fontsize)
+
+        # ensure Libre Office Writer imports and renders consecutive
+        # space characters the same width, needed for line numbering.
+        # https://bugs.documentfoundation.org/show_bug.cgi?id=144050
+        lines.append('\\dntblnsbdb')
+
+        return lines
+
+    def format_unencoded(self, tokensource, outfile):
+        for line in self._rtf_header:
+            outfile.write(line + "\n")
+
+        tokensource = self._split_tokens_on_newlines(tokensource)
+
+        # first pass of tokens to count lines, needed for line numbering
+        if self.linenos:
+            line_count = 0
+            tokens = [] # for copying the token source generator
+            for ttype, value in tokensource:
+                tokens.append((ttype, value))
+                if value.endswith("\n"):
+                    line_count += 1
+
+            # width of line number strings (for padding with spaces)
+            linenos_width = len(str(line_count+self.linenostart-1))
+
+            tokensource = tokens
 
         # highlight stream
+        lineno = 1
+        start_new_line = True
         for ttype, value in tokensource:
+            if start_new_line and lineno in self.hl_lines:
+                outfile.write(self._hl_open_str)
+
+            if start_new_line and self.linenos:
+                if (lineno-self.linenostart+1)%self.linenostep == 0:
+                    current_lineno = lineno + self.linenostart - 1
+                    lineno_str = str(current_lineno).rjust(linenos_width)
+                else:
+                    lineno_str = "".rjust(linenos_width)
+                outfile.write(self._lineno_template % lineno_str)
+
             while not self.style.styles_token(ttype) and ttype.parent:
                 ttype = ttype.parent
             style = self.style.style_for_token(ttype)
             buf = []
             if style['bgcolor']:
-                buf.append('\\cb%d' % color_mapping[style['bgcolor']])
+                buf.append('\\cb%d' % self.color_mapping[style['bgcolor']])
             if style['color']:
-                buf.append('\\cf%d' % color_mapping[style['color']])
+                buf.append('\\cf%d' % self.color_mapping[style['color']])
             if style['bold']:
                 buf.append('\\b')
             if style['italic']:
@@ -135,12 +326,24 @@ class RtfFormatter(Formatter):
                 buf.append('\\ul')
             if style['border']:
                 buf.append('\\chbrdr\\chcfpat%d' %
-                           color_mapping[style['border']])
+                           self.color_mapping[style['border']])
             start = ''.join(buf)
             if start:
-                outfile.write('{%s ' % start)
+                outfile.write(f'{{{start} ')
             outfile.write(self._escape_text(value))
             if start:
                 outfile.write('}')
+            start_new_line = False
 
-        outfile.write('}')
+            # complete line of input
+            if value.endswith("\n"):
+                # close line highlighting
+                if lineno in self.hl_lines:
+                    outfile.write('}')
+                # newline in RTF file after closing }
+                outfile.write("\n")
+
+                start_new_line = True
+                lineno += 1
+
+        outfile.write('}\n')
diff --git a/libs/pygments/formatters/svg.py b/libs/pygments/formatters/svg.py
index e3cd26955..7a8ec9ad2 100644
--- a/libs/pygments/formatters/svg.py
+++ b/libs/pygments/formatters/svg.py
@@ -4,7 +4,7 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -60,11 +60,11 @@ class SvgFormatter(Formatter):
 
     `linenostep`
         If set to a number n > 1, only every nth line number is printed.
-        
+
     `linenowidth`
         Maximum width devoted to line numbers (default: ``3*ystep``, sufficient
-        for up to 4-digit line numbers. Increase width for longer code blocks).  
-        
+        for up to 4-digit line numbers. Increase width for longer code blocks).
+
     `xoffset`
         Starting offset in X direction, defaults to ``0``.
 
@@ -97,10 +97,11 @@ class SvgFormatter(Formatter):
         self.fontsize = options.get('fontsize', '14px')
         self.xoffset = get_int_opt(options, 'xoffset', 0)
         fs = self.fontsize.strip()
-        if fs.endswith('px'): fs = fs[:-2].strip()
+        if fs.endswith('px'):
+            fs = fs[:-2].strip()
         try:
             int_fs = int(fs)
-        except:
+        except ValueError:
             int_fs = 20
         self.yoffset = get_int_opt(options, 'yoffset', int_fs)
         self.ystep = get_int_opt(options, 'ystep', int_fs + 5)
@@ -122,30 +123,27 @@ class SvgFormatter(Formatter):
         y = self.yoffset
         if not self.nowrap:
             if self.encoding:
-                outfile.write('<?xml version="1.0" encoding="%s"?>\n' %
-                              self.encoding)
+                outfile.write(f'<?xml version="1.0" encoding="{self.encoding}"?>\n')
             else:
                 outfile.write('<?xml version="1.0"?>\n')
             outfile.write('<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" '
                           '"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/'
                           'svg10.dtd">\n')
             outfile.write('<svg xmlns="http://www.w3.org/2000/svg">\n')
-            outfile.write('<g font-family="%s" font-size="%s">\n' %
-                          (self.fontfamily, self.fontsize))
-        
-        counter = self.linenostart 
+            outfile.write(f'<g font-family="{self.fontfamily}" font-size="{self.fontsize}">\n')
+
+        counter = self.linenostart
         counter_step = self.linenostep
         counter_style = self._get_style(Comment)
         line_x = x
-        
+
         if self.linenos:
             if counter % counter_step == 0:
-                outfile.write('<text x="%s" y="%s" %s text-anchor="end">%s</text>' %
-                    (x+self.linenowidth,y,counter_style,counter))
+                outfile.write(f'<text x="{x+self.linenowidth}" y="{y}" {counter_style} text-anchor="end">{counter}</text>')
             line_x += self.linenowidth + self.ystep
             counter += 1
 
-        outfile.write('<text x="%s" y="%s" xml:space="preserve">' % (line_x, y))
+        outfile.write(f'<text x="{line_x}" y="{y}" xml:space="preserve">')
         for ttype, value in tokensource:
             style = self._get_style(ttype)
             tspan = style and '<tspan' + style + '>' or ''
@@ -159,11 +157,10 @@ class SvgFormatter(Formatter):
                 y += self.ystep
                 outfile.write('</text>\n')
                 if self.linenos and counter % counter_step == 0:
-                    outfile.write('<text x="%s" y="%s" text-anchor="end" %s>%s</text>' %
-                        (x+self.linenowidth,y,counter_style,counter))
-                
+                    outfile.write(f'<text x="{x+self.linenowidth}" y="{y}" text-anchor="end" {counter_style}>{counter}</text>')
+
                 counter += 1
-                outfile.write('<text x="%s" y="%s" ' 'xml:space="preserve">' % (line_x,y))
+                outfile.write(f'<text x="{line_x}" y="{y}" ' 'xml:space="preserve">')
             outfile.write(tspan + parts[-1] + tspanend)
         outfile.write('</text>')
 
diff --git a/libs/pygments/formatters/terminal.py b/libs/pygments/formatters/terminal.py
index 636f3503d..511c20087 100644
--- a/libs/pygments/formatters/terminal.py
+++ b/libs/pygments/formatters/terminal.py
@@ -4,7 +4,7 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/formatters/terminal256.py b/libs/pygments/formatters/terminal256.py
index dba5b63e2..2504b4ae6 100644
--- a/libs/pygments/formatters/terminal256.py
+++ b/libs/pygments/formatters/terminal256.py
@@ -10,7 +10,7 @@
 
     Formatter version 1.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexer.py b/libs/pygments/lexer.py
index eb5403e79..453d675a3 100644
--- a/libs/pygments/lexer.py
+++ b/libs/pygments/lexer.py
@@ -4,7 +4,7 @@
 
     Base lexer classes.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -67,10 +67,12 @@ class Lexer(metaclass=LexerMeta):
        :no-value:
     .. autoattribute:: priority
 
-    Lexers included in Pygments should have an additional attribute:
+    Lexers included in Pygments should have two additional attributes:
 
     .. autoattribute:: url
        :no-value:
+    .. autoattribute:: version_added
+       :no-value:
 
     Lexers included in Pygments may have additional attributes:
 
@@ -130,9 +132,12 @@ class Lexer(metaclass=LexerMeta):
     priority = 0
 
     #: URL of the language specification/definition. Used in the Pygments
-    #: documentation.
+    #: documentation. Set to an empty string to disable.
     url = None
 
+    #: Version of Pygments in which the lexer was added.
+    version_added = None
+
     #: Example file name. Relative to the ``tests/examplefiles`` directory.
     #: This is used by the documentation generator to show an example.
     _example = None
@@ -169,10 +174,9 @@ class Lexer(metaclass=LexerMeta):
 
     def __repr__(self):
         if self.options:
-            return '<pygments.lexers.%s with %r>' % (self.__class__.__name__,
-                                                     self.options)
+            return f'<pygments.lexers.{self.__class__.__name__} with {self.options!r}>'
         else:
-            return '<pygments.lexers.%s>' % self.__class__.__name__
+            return f'<pygments.lexers.{self.__class__.__name__}>'
 
     def add_filter(self, filter_, **options):
         """
@@ -506,7 +510,7 @@ class RegexLexerMeta(LexerMeta):
     def _process_token(cls, token):
         """Preprocess the token component of a token definition."""
         assert type(token) is _TokenType or callable(token), \
-            'token type must be simple type or callable, not %r' % (token,)
+            f'token type must be simple type or callable, not {token!r}'
         return token
 
     def _process_new_state(cls, new_state, unprocessed, processed):
@@ -522,14 +526,14 @@ class RegexLexerMeta(LexerMeta):
             elif new_state[:5] == '#pop:':
                 return -int(new_state[5:])
             else:
-                assert False, 'unknown new state %r' % new_state
+                assert False, f'unknown new state {new_state!r}'
         elif isinstance(new_state, combined):
             # combine a new state from existing ones
             tmp_state = '_tmp_%d' % cls._tmpname
             cls._tmpname += 1
             itokens = []
             for istate in new_state:
-                assert istate != new_state, 'circular state ref %r' % istate
+                assert istate != new_state, f'circular state ref {istate!r}'
                 itokens.extend(cls._process_state(unprocessed,
                                                   processed, istate))
             processed[tmp_state] = itokens
@@ -542,12 +546,12 @@ class RegexLexerMeta(LexerMeta):
                     'unknown new state ' + istate
             return new_state
         else:
-            assert False, 'unknown new state def %r' % new_state
+            assert False, f'unknown new state def {new_state!r}'
 
     def _process_state(cls, unprocessed, processed, state):
         """Preprocess a single state definition."""
-        assert type(state) is str, "wrong state name %r" % state
-        assert state[0] != '#', "invalid state name %r" % state
+        assert isinstance(state, str), f"wrong state name {state!r}"
+        assert state[0] != '#', f"invalid state name {state!r}"
         if state in processed:
             return processed[state]
         tokens = processed[state] = []
@@ -555,7 +559,7 @@ class RegexLexerMeta(LexerMeta):
         for tdef in unprocessed[state]:
             if isinstance(tdef, include):
                 # it's a state reference
-                assert tdef != state, "circular state reference %r" % state
+                assert tdef != state, f"circular state reference {state!r}"
                 tokens.extend(cls._process_state(unprocessed, processed,
                                                  str(tdef)))
                 continue
@@ -569,13 +573,12 @@ class RegexLexerMeta(LexerMeta):
                 tokens.append((re.compile('').match, None, new_state))
                 continue
 
-            assert type(tdef) is tuple, "wrong rule def %r" % tdef
+            assert type(tdef) is tuple, f"wrong rule def {tdef!r}"
 
             try:
                 rex = cls._process_regex(tdef[0], rflags, state)
             except Exception as err:
-                raise ValueError("uncompilable regex %r in state %r of %r: %s" %
-                                 (tdef[0], state, cls, err)) from err
+                raise ValueError(f"uncompilable regex {tdef[0]!r} in state {state!r} of {cls!r}: {err}") from err
 
             token = cls._process_token(tdef[1])
 
@@ -736,7 +739,7 @@ class RegexLexer(Lexer, metaclass=RegexLexerMeta):
                         elif new_state == '#push':
                             statestack.append(statestack[-1])
                         else:
-                            assert False, "wrong state def: %r" % new_state
+                            assert False, f"wrong state def: {new_state!r}"
                         statetokens = tokendefs[statestack[-1]]
                     break
             else:
@@ -768,8 +771,7 @@ class LexerContext:
         self.stack = stack or ['root']
 
     def __repr__(self):
-        return 'LexerContext(%r, %r, %r)' % (
-            self.text, self.pos, self.stack)
+        return f'LexerContext({self.text!r}, {self.pos!r}, {self.stack!r})'
 
 
 class ExtendedRegexLexer(RegexLexer):
@@ -824,7 +826,7 @@ class ExtendedRegexLexer(RegexLexer):
                         elif new_state == '#push':
                             ctx.stack.append(ctx.stack[-1])
                         else:
-                            assert False, "wrong state def: %r" % new_state
+                            assert False, f"wrong state def: {new_state!r}"
                         statetokens = tokendefs[ctx.stack[-1]]
                     break
             else:
diff --git a/libs/pygments/lexers/__init__.py b/libs/pygments/lexers/__init__.py
index 5701be7b6..da5100095 100644
--- a/libs/pygments/lexers/__init__.py
+++ b/libs/pygments/lexers/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -93,7 +93,7 @@ def find_lexer_class_by_name(_alias):
     .. versionadded:: 2.2
     """
     if not _alias:
-        raise ClassNotFound('no lexer for alias %r found' % _alias)
+        raise ClassNotFound(f'no lexer for alias {_alias!r} found')
     # lookup builtin lexers
     for module_name, name, aliases, _, _ in LEXERS.values():
         if _alias.lower() in aliases:
@@ -104,7 +104,7 @@ def find_lexer_class_by_name(_alias):
     for cls in find_plugin_lexers():
         if _alias.lower() in cls.aliases:
             return cls
-    raise ClassNotFound('no lexer for alias %r found' % _alias)
+    raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
 
 def get_lexer_by_name(_alias, **options):
@@ -117,7 +117,7 @@ def get_lexer_by_name(_alias, **options):
     found.
     """
     if not _alias:
-        raise ClassNotFound('no lexer for alias %r found' % _alias)
+        raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
     # lookup builtin lexers
     for module_name, name, aliases, _, _ in LEXERS.values():
@@ -129,7 +129,7 @@ def get_lexer_by_name(_alias, **options):
     for cls in find_plugin_lexers():
         if _alias.lower() in cls.aliases:
             return cls(**options)
-    raise ClassNotFound('no lexer for alias %r found' % _alias)
+    raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
 
 def load_lexer_from_file(filename, lexername="CustomLexer", **options):
@@ -154,17 +154,16 @@ def load_lexer_from_file(filename, lexername="CustomLexer", **options):
             exec(f.read(), custom_namespace)
         # Retrieve the class `lexername` from that namespace
         if lexername not in custom_namespace:
-            raise ClassNotFound('no valid %s class found in %s' %
-                                (lexername, filename))
+            raise ClassNotFound(f'no valid {lexername} class found in {filename}')
         lexer_class = custom_namespace[lexername]
         # And finally instantiate it with the options
         return lexer_class(**options)
     except OSError as err:
-        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+        raise ClassNotFound(f'cannot read {filename}: {err}')
     except ClassNotFound:
         raise
     except Exception as err:
-        raise ClassNotFound('error when loading custom lexer: %s' % err)
+        raise ClassNotFound(f'error when loading custom lexer: {err}')
 
 
 def find_lexer_class_for_filename(_fn, code=None):
@@ -225,7 +224,7 @@ def get_lexer_for_filename(_fn, code=None, **options):
     """
     res = find_lexer_class_for_filename(_fn, code)
     if not res:
-        raise ClassNotFound('no lexer for filename %r found' % _fn)
+        raise ClassNotFound(f'no lexer for filename {_fn!r} found')
     return res(**options)
 
 
@@ -245,7 +244,7 @@ def get_lexer_for_mimetype(_mime, **options):
     for cls in find_plugin_lexers():
         if _mime in cls.mimetypes:
             return cls(**options)
-    raise ClassNotFound('no lexer for mimetype %r found' % _mime)
+    raise ClassNotFound(f'no lexer for mimetype {_mime!r} found')
 
 
 def _iter_lexerclasses(plugins=True):
@@ -280,7 +279,7 @@ def guess_lexer_for_filename(_fn, _text, **options):
                 matching_lexers.add(lexer)
                 primary[lexer] = False
     if not matching_lexers:
-        raise ClassNotFound('no lexer for filename %r found' % fn)
+        raise ClassNotFound(f'no lexer for filename {fn!r} found')
     if len(matching_lexers) == 1:
         return matching_lexers.pop()(**options)
     result = []
diff --git a/libs/pygments/lexers/_ada_builtins.py b/libs/pygments/lexers/_ada_builtins.py
index 24f9b197b..a2491fb38 100644
--- a/libs/pygments/lexers/_ada_builtins.py
+++ b/libs/pygments/lexers/_ada_builtins.py
@@ -4,7 +4,7 @@
 
     Ada builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_asy_builtins.py b/libs/pygments/lexers/_asy_builtins.py
index c4a362ca6..976e1bc62 100644
--- a/libs/pygments/lexers/_asy_builtins.py
+++ b/libs/pygments/lexers/_asy_builtins.py
@@ -9,7 +9,7 @@
     TODO: perl/python script in Asymptote SVN similar to asy-list.pl but only
     for function and variable names.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_cl_builtins.py b/libs/pygments/lexers/_cl_builtins.py
index beb7b4d6f..6e4516d68 100644
--- a/libs/pygments/lexers/_cl_builtins.py
+++ b/libs/pygments/lexers/_cl_builtins.py
@@ -4,7 +4,7 @@
 
     ANSI Common Lisp builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_cocoa_builtins.py b/libs/pygments/lexers/_cocoa_builtins.py
index 4b7dc1ad4..ef0a9682f 100644
--- a/libs/pygments/lexers/_cocoa_builtins.py
+++ b/libs/pygments/lexers/_cocoa_builtins.py
@@ -7,7 +7,7 @@
 
     File may be also used as standalone generator for above.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -41,7 +41,7 @@ if __name__ == '__main__':  # pragma: no cover
                 with open(headerFilePath, encoding='utf-8') as f:
                     content = f.read()
             except UnicodeDecodeError:
-                print("Decoding error for file: {0}".format(headerFilePath))
+                print(f"Decoding error for file: {headerFilePath}")
                 continue
                 
             res = re.findall(r'(?<=@interface )\w+', content)
diff --git a/libs/pygments/lexers/_csound_builtins.py b/libs/pygments/lexers/_csound_builtins.py
index 5f3730684..3431819ed 100644
--- a/libs/pygments/lexers/_csound_builtins.py
+++ b/libs/pygments/lexers/_csound_builtins.py
@@ -2,7 +2,7 @@
     pygments.lexers._csound_builtins
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_css_builtins.py b/libs/pygments/lexers/_css_builtins.py
index fff992425..72953195a 100644
--- a/libs/pygments/lexers/_css_builtins.py
+++ b/libs/pygments/lexers/_css_builtins.py
@@ -4,7 +4,7 @@
 
     This file is autogenerated by scripts/get_css_properties.py
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_googlesql_builtins.py b/libs/pygments/lexers/_googlesql_builtins.py
new file mode 100644
index 000000000..13ef3a2b0
--- /dev/null
+++ b/libs/pygments/lexers/_googlesql_builtins.py
@@ -0,0 +1,918 @@
+"""
+    pygments.lexers._googlesql_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Autogenerated data files for the GoogleSQL lexer.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+constants = [
+    'FALSE',
+    'NULL',
+    'TRUE',
+    'UNKNOWN',
+]
+
+# Everything below this line is auto-generated from the GoogleSQL source code.
+# ----------------------------------------------------------------------------
+
+functionnames = [
+    'ABS',
+    'ACOS',
+    'ACOSH',
+    'AEAD.DECRYPT_BYTES',
+    'AEAD.DECRYPT_STRING',
+    'AEAD.ENCRYPT',
+    'AEAD.ENVELOPE_DECRYPT_BYTES',
+    'AEAD.ENVELOPE_DECRYPT_STRING',
+    'AEAD.ENVELOPE_ENCRYPT',
+    'ALL_DIFFERENT',
+    'ANON_AVG',
+    'ANON_COUNT',
+    'ANON_COUNT',
+    'ANON_PERCENTILE_CONT',
+    'ANON_QUANTILES',
+    'ANON_STDDEV_POP',
+    'ANON_SUM',
+    'ANON_VAR_POP',
+    'ANY_VALUE',
+    'APPROX_COSINE_DISTANCE',
+    'APPROX_COUNT_DISTINCT',
+    'APPROX_DOT_PRODUCT',
+    'APPROX_EUCLIDEAN_DISTANCE',
+    'APPROX_QUANTILES',
+    'APPROX_TOP_COUNT',
+    'APPROX_TOP_SUM',
+    'ARRAY[KEY()]',
+    'ARRAY[SAFE_KEY()]',
+    'ARRAY_AGG',
+    'ARRAY_AVG',
+    'ARRAY_CONCAT',
+    'ARRAY_CONCAT_AGG',
+    'ARRAY_FILTER',
+    'ARRAY_FIND',
+    'ARRAY_FIND_ALL',
+    'ARRAY_FIRST',
+    'ARRAY_FIRST_N',
+    'ARRAY_INCLUDES',
+    'ARRAY_INCLUDES_ALL',
+    'ARRAY_INCLUDES_ANY',
+    'ARRAY_IS_DISTINCT',
+    'ARRAY_LAST',
+    'ARRAY_LAST_N',
+    'ARRAY_LENGTH',
+    'ARRAY_MAX',
+    'ARRAY_MIN',
+    'ARRAY_OFFSET',
+    'ARRAY_OFFSETS',
+    'ARRAY_REMOVE_FIRST_N',
+    'ARRAY_REMOVE_LAST_N',
+    'ARRAY_REVERSE',
+    'ARRAY_SLICE',
+    'ARRAY_SUM',
+    'ARRAY_TO_STRING',
+    'ARRAY_TRANSFORM',
+    'ARRAY_ZIP',
+    'ASCII',
+    'ASIN',
+    'ASINH',
+    'ATAN',
+    'ATAN2',
+    'ATANH',
+    'AVG',
+    'BIT_AND',
+    'BIT_COUNT',
+    'BIT_OR',
+    'BIT_XOR',
+    'BOOL',
+    'BOOL_ARRAY',
+    'BYTE_LENGTH',
+    'CASE',
+    'CAST',
+    'CBRT',
+    'CEIL',
+    'CEILING',
+    'CHARACTER_LENGTH',
+    'CHAR_LENGTH',
+    'CHR',
+    'COALESCE',
+    'CODE_POINTS_TO_BYTES',
+    'CODE_POINTS_TO_STRING',
+    'COLLATE',
+    'CONCAT',
+    'CORR',
+    'COS',
+    'COSH',
+    'COSINE_DISTANCE',
+    'COT',
+    'COTH',
+    'COUNT',
+    'COUNT(*)',
+    'COUNTIF',
+    'COVAR_POP',
+    'COVAR_SAMP',
+    'CSC',
+    'CSCH',
+    'CUME_DIST',
+    'CURRENT_DATE',
+    'CURRENT_DATETIME',
+    'CURRENT_TIME',
+    'CURRENT_TIMESTAMP',
+    'D3A_COUNT.EXTRACT',
+    'D3A_COUNT.INIT',
+    'D3A_COUNT.MERGE',
+    'D3A_COUNT.MERGE_PARTIAL',
+    'D3A_COUNT.TO_HLL',
+    'DATE',
+    'DATETIME',
+    'DATETIME_ADD',
+    'DATETIME_BUCKET',
+    'DATETIME_DIFF',
+    'DATETIME_SUB',
+    'DATETIME_TRUNC',
+    'DATE_ADD',
+    'DATE_BUCKET',
+    'DATE_DIFF',
+    'DATE_FROM_UNIX_DATE',
+    'DATE_SUB',
+    'DATE_TRUNC',
+    'DENSE_RANK',
+    'DESTINATION_NODE_ID',
+    'DETERMINISTIC_DECRYPT_BYTES',
+    'DETERMINISTIC_DECRYPT_STRING',
+    'DETERMINISTIC_ENCRYPT',
+    'DIV',
+    'DOT_PRODUCT',
+    'EDGES',
+    'EDIT_DISTANCE',
+    'ELEMENTWISE_AVG',
+    'ELEMENTWISE_SUM',
+    'ELEMENT_DEFINITION_NAME',
+    'ELEMENT_ID',
+    'ENDS_WITH',
+    'ENUM_VALUE_DESCRIPTOR_PROTO',
+    'ERROR',
+    'EUCLIDEAN_DISTANCE',
+    'EXP',
+    'EXTRACT',
+    'EXTRACT_FOR_DP_APPROX_COUNT_DISTINCT',
+    'FARM_FINGERPRINT',
+    'FILTER_FIELDS',
+    'FIRST_VALUE',
+    'FLATTEN',
+    'FLOAT32',
+    'FLOAT32_ARRAY',
+    'FLOAT64',
+    'FLOAT64_ARRAY',
+    'FLOOR',
+    'FORMAT',
+    'FORMAT_DATE',
+    'FORMAT_DATETIME',
+    'FORMAT_TIME',
+    'FORMAT_TIMESTAMP',
+    'FROM_BASE32',
+    'FROM_BASE64',
+    'FROM_HEX',
+    'GENERATE_ARRAY',
+    'GENERATE_DATE_ARRAY',
+    'GENERATE_RANGE_ARRAY',
+    'GENERATE_TIMESTAMP_ARRAY',
+    'GENERATE_UUID',
+    'GREATEST',
+    'GROUPING',
+    'HLL_COUNT.EXTRACT',
+    'HLL_COUNT.INIT',
+    'HLL_COUNT.MERGE',
+    'HLL_COUNT.MERGE_PARTIAL',
+    'IEEE_DIVIDE',
+    'IF',
+    'IFERROR',
+    'IFNULL',
+    'IN UNNEST',
+    'INITCAP',
+    'INIT_FOR_DP_APPROX_COUNT_DISTINCT',
+    'INSTR',
+    'INT64',
+    'INT64_ARRAY',
+    'IS DESTINATION OF',
+    'IS DISTINCT FROM',
+    'IS NOT DISTINCT FROM',
+    'IS SOURCE OF',
+    'ISERROR',
+    'IS_ACYCLIC',
+    'IS_INF',
+    'IS_NAN',
+    'IS_SIMPLE',
+    'IS_TRAIL',
+    'JSON_ARRAY',
+    'JSON_ARRAY_APPEND',
+    'JSON_ARRAY_INSERT',
+    'JSON_CONTAINS',
+    'JSON_EXTRACT',
+    'JSON_EXTRACT_ARRAY',
+    'JSON_EXTRACT_SCALAR',
+    'JSON_EXTRACT_STRING_ARRAY',
+    'JSON_KEYS',
+    'JSON_OBJECT',
+    'JSON_QUERY',
+    'JSON_QUERY_ARRAY',
+    'JSON_REMOVE',
+    'JSON_SET',
+    'JSON_STRIP_NULLS',
+    'JSON_TYPE',
+    'JSON_VALUE',
+    'JSON_VALUE_ARRAY',
+    'JUSTIFY_DAYS',
+    'JUSTIFY_HOURS',
+    'JUSTIFY_INTERVAL',
+    'KEYS.ADD_KEY_FROM_RAW_BYTES',
+    'KEYS.KEYSET_CHAIN',
+    'KEYS.KEYSET_FROM_JSON',
+    'KEYS.KEYSET_LENGTH',
+    'KEYS.KEYSET_TO_JSON',
+    'KEYS.NEW_KEYSET',
+    'KEYS.NEW_WRAPPED_KEYSET',
+    'KEYS.REWRAP_KEYSET',
+    'KEYS.ROTATE_KEYSET',
+    'KEYS.ROTATE_WRAPPED_KEYSET',
+    'KLL_QUANTILES.EXTRACT_FLOAT64',
+    'KLL_QUANTILES.EXTRACT_INT64',
+    'KLL_QUANTILES.EXTRACT_POINT_FLOAT64',
+    'KLL_QUANTILES.EXTRACT_POINT_INT64',
+    'KLL_QUANTILES.INIT_FLOAT64',
+    'KLL_QUANTILES.INIT_INT64',
+    'KLL_QUANTILES.MERGE_FLOAT64',
+    'KLL_QUANTILES.MERGE_INT64',
+    'KLL_QUANTILES.MERGE_PARTIAL',
+    'KLL_QUANTILES.MERGE_POINT_FLOAT64',
+    'KLL_QUANTILES.MERGE_POINT_INT64',
+    'L1_NORM',
+    'L2_NORM',
+    'LABELS',
+    'LAG',
+    'LAST_DAY',
+    'LAST_VALUE',
+    'LAX_BOOL',
+    'LAX_BOOL_ARRAY',
+    'LAX_FLOAT32',
+    'LAX_FLOAT32_ARRAY',
+    'LAX_FLOAT64',
+    'LAX_FLOAT64_ARRAY',
+    'LAX_INT64',
+    'LAX_INT64_ARRAY',
+    'LAX_STRING',
+    'LAX_STRING_ARRAY',
+    'LEAD',
+    'LEAST',
+    'LEFT',
+    'LENGTH',
+    'LIKE ALL',
+    'LIKE ALL UNNEST',
+    'LIKE ANY',
+    'LIKE ANY UNNEST',
+    'LN',
+    'LOG',
+    'LOG10',
+    'LOGICAL_AND',
+    'LOGICAL_OR',
+    'LOWER',
+    'LPAD',
+    'LTRIM',
+    'MAKE_INTERVAL',
+    'MANHATTAN_DISTANCE',
+    'MAP_CARDINALITY',
+    'MAP_CONTAINS_KEY',
+    'MAP_DELETE',
+    'MAP_EMPTY',
+    'MAP_ENTRIES_SORTED',
+    'MAP_ENTRIES_UNSORTED',
+    'MAP_FILTER',
+    'MAP_FROM_ARRAY',
+    'MAP_GET',
+    'MAP_INSERT',
+    'MAP_INSERT_OR_REPLACE',
+    'MAP_KEYS_SORTED',
+    'MAP_KEYS_UNSORTED',
+    'MAP_REPLACE',
+    'MAP_VALUES_SORTED',
+    'MAP_VALUES_SORTED_BY_KEY',
+    'MAP_VALUES_UNSORTED',
+    'MAX',
+    'MD5',
+    'MERGE_PARTIAL_FOR_DP_APPROX_COUNT_DISTINCT',
+    'MIN',
+    'MOD',
+    'NET.HOST',
+    'NET.IPV4_FROM_INT64',
+    'NET.IPV4_TO_INT64',
+    'NET.IP_FROM_STRING',
+    'NET.IP_NET_MASK',
+    'NET.IP_TO_STRING',
+    'NET.IP_TRUNC',
+    'NET.PUBLIC_SUFFIX',
+    'NET.REG_DOMAIN',
+    'NET.SAFE_IP_FROM_STRING',
+    'NEW_UUID',
+    'NODES',
+    'NORMALIZE',
+    'NORMALIZE_AND_CASEFOLD',
+    'NOT LIKE ALL',
+    'NOT LIKE ALL UNNEST',
+    'NOT LIKE ANY',
+    'NOT LIKE ANY UNNEST',
+    'NTH_VALUE',
+    'NTILE',
+    'NULLIF',
+    'NULLIFERROR',
+    'NULLIFZERO',
+    'OCTET_LENGTH',
+    'OFFSET',
+    'ORDINAL',
+    'PARSE_BIGNUMERIC',
+    'PARSE_DATE',
+    'PARSE_DATETIME',
+    'PARSE_JSON',
+    'PARSE_NUMERIC',
+    'PARSE_TIME',
+    'PARSE_TIMESTAMP',
+    'PATH',
+    'PATH_FIRST',
+    'PATH_LAST',
+    'PATH_LENGTH',
+    'PERCENTILE_CONT',
+    'PERCENTILE_DISC',
+    'PERCENT_RANK',
+    'PI',
+    'PIVOT',
+    'PI_BIGNUMERIC',
+    'PI_NUMERIC',
+    'POW',
+    'POWER',
+    'PROPERTY_EXISTS',
+    'PROPERTY_NAMES',
+    'PROTO_MAP_CONTAINS_KEY',
+    'PROTO_MODIFY_MAP',
+    'RAND',
+    'RANGE',
+    'RANGE_BUCKET',
+    'RANGE_CONTAINS',
+    'RANGE_END',
+    'RANGE_INTERSECT',
+    'RANGE_IS_END_UNBOUNDED',
+    'RANGE_IS_START_UNBOUNDED',
+    'RANGE_OVERLAPS',
+    'RANGE_START',
+    'RANK',
+    'REGEXP_CONTAINS',
+    'REGEXP_EXTRACT',
+    'REGEXP_EXTRACT_ALL',
+    'REGEXP_INSTR',
+    'REGEXP_REPLACE',
+    'REGEXP_SUBSTR',
+    'REPEAT',
+    'REPLACE',
+    'REVERSE',
+    'RIGHT',
+    'ROUND',
+    'ROW_NUMBER',
+    'RPAD',
+    'RTRIM',
+    'S2_CELLIDFROMPOINT',
+    'S2_COVERINGCELLIDS',
+    'SAFE_ADD',
+    'SAFE_CONVERT_BYTES_TO_STRING',
+    'SAFE_DIVIDE',
+    'SAFE_MULTIPLY',
+    'SAFE_NEGATE',
+    'SAFE_OFFSET',
+    'SAFE_ORDINAL',
+    'SAFE_SUBTRACT',
+    'SAFE_TO_JSON',
+    'SAME',
+    'SEC',
+    'SECH',
+    'SESSION_USER',
+    'SHA1',
+    'SHA256',
+    'SHA512',
+    'SIGN',
+    'SIN',
+    'SINH',
+    'SOUNDEX',
+    'SOURCE_NODE_ID',
+    'SPLIT',
+    'SPLIT_SUBSTR',
+    'SQRT',
+    'STARTS_WITH',
+    'STDDEV',
+    'STDDEV_POP',
+    'STDDEV_SAMP',
+    'STRING',
+    'STRING_AGG',
+    'STRING_ARRAY',
+    'STRPOS',
+    'ST_ANGLE',
+    'ST_AREA',
+    'ST_ASBINARY',
+    'ST_ASGEOJSON',
+    'ST_ASKML',
+    'ST_ASTEXT',
+    'ST_AZIMUTH',
+    'ST_BOUNDARY',
+    'ST_BOUNDINGBOX',
+    'ST_BUFFER',
+    'ST_BUFFERWITHTOLERANCE',
+    'ST_CENTROID',
+    'ST_CENTROID_AGG',
+    'ST_CLOSESTPOINT',
+    'ST_CLUSTERDBSCAN',
+    'ST_CONTAINS',
+    'ST_CONVEXHULL',
+    'ST_COVEREDBY',
+    'ST_COVERS',
+    'ST_DIFFERENCE',
+    'ST_DIMENSION',
+    'ST_DISJOINT',
+    'ST_DISTANCE',
+    'ST_DUMP',
+    'ST_DUMPPOINTS',
+    'ST_DWITHIN',
+    'ST_ENDPOINT',
+    'ST_EQUALS',
+    'ST_EXTENT',
+    'ST_EXTERIORRING',
+    'ST_GEOGFROM',
+    'ST_GEOGFROMGEOJSON',
+    'ST_GEOGFROMKML',
+    'ST_GEOGFROMTEXT',
+    'ST_GEOGFROMWKB',
+    'ST_GEOGPOINT',
+    'ST_GEOGPOINTFROMGEOHASH',
+    'ST_GEOHASH',
+    'ST_GEOMETRYTYPE',
+    'ST_HAUSDORFFDISTANCE',
+    'ST_HAUSDORFFDWITHIN',
+    'ST_INTERIORRINGS',
+    'ST_INTERSECTION',
+    'ST_INTERSECTS',
+    'ST_INTERSECTSBOX',
+    'ST_ISCLOSED',
+    'ST_ISCOLLECTION',
+    'ST_ISEMPTY',
+    'ST_ISRING',
+    'ST_LENGTH',
+    'ST_LINEINTERPOLATEPOINT',
+    'ST_LINELOCATEPOINT',
+    'ST_LINESUBSTRING',
+    'ST_MAKELINE',
+    'ST_MAKEPOLYGON',
+    'ST_MAKEPOLYGONORIENTED',
+    'ST_MAXDISTANCE',
+    'ST_NEAREST_NEIGHBORS',
+    'ST_NPOINTS',
+    'ST_NUMGEOMETRIES',
+    'ST_NUMPOINTS',
+    'ST_PERIMETER',
+    'ST_POINTN',
+    'ST_SIMPLIFY',
+    'ST_SNAPTOGRID',
+    'ST_STARTPOINT',
+    'ST_TOUCHES',
+    'ST_UNARYUNION',
+    'ST_UNION',
+    'ST_UNION_AGG',
+    'ST_WITHIN',
+    'ST_X',
+    'ST_Y',
+    'SUBSTR',
+    'SUBSTRING',
+    'SUM',
+    'TAN',
+    'TANH',
+    'TIME',
+    'TIMESTAMP',
+    'TIMESTAMP_ADD',
+    'TIMESTAMP_BUCKET',
+    'TIMESTAMP_DIFF',
+    'TIMESTAMP_FROM_UNIX_MICROS',
+    'TIMESTAMP_FROM_UNIX_MILLIS',
+    'TIMESTAMP_FROM_UNIX_SECONDS',
+    'TIMESTAMP_MICROS',
+    'TIMESTAMP_MILLIS',
+    'TIMESTAMP_SECONDS',
+    'TIMESTAMP_SUB',
+    'TIMESTAMP_TRUNC',
+    'TIME_ADD',
+    'TIME_DIFF',
+    'TIME_SUB',
+    'TIME_TRUNC',
+    'TO_BASE32',
+    'TO_BASE64',
+    'TO_CODE_POINTS',
+    'TO_HEX',
+    'TO_JSON',
+    'TO_JSON_STRING',
+    'TRANSLATE',
+    'TRIM',
+    'TRUNC',
+    'TYPEOF',
+    'UNICODE',
+    'UNIX_DATE',
+    'UNIX_MICROS',
+    'UNIX_MILLIS',
+    'UNIX_SECONDS',
+    'UNNEST',
+    'UNPIVOT',
+    'UPPER',
+    'VARIANCE',
+    'VAR_POP',
+    'VAR_SAMP',
+    'ZEROIFNULL',
+]
+
+keywords = [
+    'ABORT',
+    'ACCESS',
+    'ACTION',
+    'ACYCLIC',
+    'ADD',
+    'AFTER',
+    'AGGREGATE',
+    'ALL',
+    'ALTER',
+    'ALWAYS',
+    'ANALYZE',
+    'AND',
+    'ANY',
+    'APPROX',
+    'ARE',
+    'AS',
+    'ASC',
+    'ASCENDING',
+    'ASSERT',
+    'ASSERT_ROWS_MODIFIED',
+    'AT',
+    'BATCH',
+    'BEGIN',
+    'BETWEEN',
+    'BIGDECIMAL',
+    'BREAK',
+    'BY',
+    'CALL',
+    'CASCADE',
+    'CASE',
+    'CAST',
+    'CHECK',
+    'CLAMPED',
+    'CLONE',
+    'CLUSTER',
+    'COLLATE',
+    'COLUMN',
+    'COLUMNS',
+    'COMMIT',
+    'CONFLICT',
+    'CONNECTION',
+    'CONSTANT',
+    'CONSTRAINT',
+    'CONTAINS',
+    'CONTINUE',
+    'COPY',
+    'CORRESPONDING',
+    'CREATE',
+    'CROSS',
+    'CUBE',
+    'CURRENT',
+    'CYCLE',
+    'DATA',
+    'DATABASE',
+    'DAY',
+    'DAYOFWEEK',
+    'DAYOFYEAR',
+    'DECIMAL',
+    'DECLARE',
+    'DEFAULT',
+    'DEFINE',
+    'DEFINER',
+    'DELETE',
+    'DELETION',
+    'DEPTH',
+    'DESC',
+    'DESCENDING',
+    'DESCRIBE',
+    'DESCRIPTOR',
+    'DESTINATION',
+    'DETERMINISTIC',
+    'DISTINCT',
+    'DO',
+    'DROP',
+    'EDGE',
+    'ELSE',
+    'ELSEIF',
+    'END',
+    'ENFORCED',
+    'ERROR',
+    'ESCAPE',
+    'EXCEPT',
+    'EXCEPTION',
+    'EXCLUDE',
+    'EXECUTE',
+    'EXISTS',
+    'EXPLAIN',
+    'EXPORT',
+    'EXTEND',
+    'EXTERNAL',
+    'EXTRACT',
+    'FALSE',
+    'FETCH',
+    'FIELD',
+    'FILES',
+    'FILL',
+    'FILTER',
+    'FIRST',
+    'FOLLOWING',
+    'FOR',
+    'FOREIGN',
+    'FORK',
+    'FORMAT',
+    'FRIDAY',
+    'FROM',
+    'FULL',
+    'FUNCTION',
+    'GENERATED',
+    'GRANT',
+    'GRAPH',
+    'GRAPH_TABLE',
+    'GROUP',
+    'GROUPING',
+    'GROUPS',
+    'GROUP_ROWS',
+    'HAS',
+    'HASH',
+    'HAVING',
+    'HIDDEN',
+    'HOUR',
+    'IDENTITY',
+    'IF',
+    'IGNORE',
+    'IMMEDIATE',
+    'IMMUTABLE',
+    'IMPORT',
+    'IN',
+    'INCLUDE',
+    'INCREMENT',
+    'INDEX',
+    'INNER',
+    'INOUT',
+    'INPUT',
+    'INSERT',
+    'INTERLEAVE',
+    'INTERSECT',
+    'INTO',
+    'INVOKER',
+    'IS',
+    'ISOLATION',
+    'ISOWEEK ',
+    'ISOYEAR',
+    'ITERATE',
+    'JOIN',
+    'KEY',
+    'LABEL',
+    'LABELED',
+    'LANGUAGE',
+    'LAST',
+    'LATERAL',
+    'LEAVE',
+    'LEFT',
+    'LET',
+    'LEVEL',
+    'LIKE',
+    'LIMIT',
+    'LOAD',
+    'LOG',
+    'LOOKUP',
+    'LOOP',
+    'MACRO',
+    'MATCH',
+    'MATCHED',
+    'MATCH_RECOGNIZE',
+    'MATERIALIZED',
+    'MAX',
+    'MAXVALUE',
+    'MEASURES',
+    'MERGE',
+    'MESSAGE',
+    'METADATA',
+    'MICROSECOND',
+    'MILLISECOND',
+    'MIN',
+    'MINUTE',
+    'MINVALUE',
+    'MODEL',
+    'MODULE',
+    'MONDAY',
+    'MONTH',
+    'NAME',
+    'NANOSECOND',
+    'NATURAL',
+    'NEW',
+    'NEXT',
+    'NO',
+    'NODE',
+    'NOT',
+    'NOTHING',
+    'NULL',
+    'NULLS',
+    'NULL_FILTERED',
+    'OF',
+    'OFFSET',
+    'ON',
+    'ONEOF_CASE',
+    'ONLY',
+    'OPTIONAL',
+    'OPTIONS',
+    'OR',
+    'ORDER',
+    'OUT',
+    'OUTER',
+    'OUTPUT',
+    'OVER',
+    'OVERWRITE',
+    'PARENT',
+    'PARTITION',
+    'PARTITIONS',
+    'PAST',
+    'PATH',
+    'PATHS',
+    'PATTERN',
+    'PERCENT',
+    'PIVOT',
+    'POLICIES',
+    'POLICY',
+    'PRECEDING',
+    'PRIMARY',
+    'PRIVATE',
+    'PRIVILEGE',
+    'PRIVILEGES',
+    'PROCEDURE',
+    'PROJECT',
+    'PROPERTIES',
+    'PROPERTY',
+    'PUBLIC',
+    'QUALIFY',
+    'QUARTER',
+    'RAISE',
+    'RAW',
+    'READ',
+    'RECURSIVE',
+    'REFERENCES',
+    'REMOTE',
+    'REMOVE',
+    'RENAME',
+    'REPEAT',
+    'REPEATABLE',
+    'REPLACE',
+    'REPLACE_FIELDS',
+    'REPLICA',
+    'REPORT',
+    'RESPECT',
+    'RESTRICT',
+    'RESTRICTION',
+    'RETURN',
+    'RETURNS',
+    'REVOKE',
+    'RIGHT',
+    'ROLLBACK',
+    'ROLLUP',
+    'ROW',
+    'ROWS',
+    'RUN',
+    'SAFE_CAST',
+    'SATURDAY',
+    'SCHEMA',
+    'SEARCH',
+    'SECOND ',
+    'SECURITY',
+    'SELECT',
+    'SEQUENCE',
+    'SET',
+    'SETS',
+    'SHORTEST',
+    'SHOW',
+    'SIMPLE',
+    'SKIP',
+    'SNAPSHOT',
+    'SOME',
+    'SOURCE',
+    'SQL',
+    'STABLE',
+    'START',
+    'STATIC_DESCRIBE',
+    'STORED',
+    'STORING',
+    'STRICT',
+    'SUNDAY',
+    'SYSTEM',
+    'SYSTEM_TIME',
+    'TABLE',
+    'TABLES',
+    'TABLESAMPLE',
+    'TARGET',
+    'TEMP',
+    'TEMPORARY',
+    'THEN',
+    'THURSDAY',
+    'TO',
+    'TRAIL',
+    'TRANSACTION',
+    'TRANSFORM',
+    'TREAT',
+    'TRUE',
+    'TRUNCATE',
+    'TUESDAY',
+    'TYPE',
+    'UNBOUNDED',
+    'UNDROP',
+    'UNION',
+    'UNIQUE',
+    'UNKNOWN',
+    'UNNEST',
+    'UNPIVOT',
+    'UNTIL',
+    'UPDATE',
+    'USING',
+    'VALUE',
+    'VALUES',
+    'VECTOR',
+    'VIEW',
+    'VIEWS',
+    'VOLATILE',
+    'WALK',
+    'WEDNESDAY',
+    'WEEK',
+    'WEIGHT',
+    'WHEN',
+    'WHERE',
+    'WHILE',
+    'WINDOW',
+    'WITH',
+    'WITHIN',
+    'WRITE',
+    'YEAR',
+    'ZONE',
+]
+
+operators = [
+    '!=',
+    '&',
+    '*',
+    '+',
+    '-',
+    '/',
+    '<',
+    '<<',
+    '<=',
+    '=',
+    '>',
+    '>=',
+    '>>',
+    '^',
+    '|',
+    '||',
+    '~',
+]
+
+types = [
+    'ARRAY',
+    'BIGNUMERIC',
+    'BOOL',
+    'BYTES',
+    'DATE',
+    'DATETIME',
+    'DOUBLE',
+    'ENUM',
+    'EXTENDED',
+    'FLOAT',
+    'GEOGRAPHY',
+    'GRAPH_ELEMENT',
+    'GRAPH_PATH',
+    'INT32',
+    'INT64',
+    'INTERVAL',
+    'JSON',
+    'MAP',
+    'MEASURE',
+    'NUMERIC',
+    'PROTO',
+    'RANGE',
+    'STRING',
+    'STRUCT',
+    'TIME',
+    'TIMESTAMP',
+    'TIMESTAMP_PICOS',
+    'TOKENLIST',
+    'UINT32',
+    'UINT64',
+    'UUID',
+]
diff --git a/libs/pygments/lexers/_julia_builtins.py b/libs/pygments/lexers/_julia_builtins.py
index 5d3c96fb8..2849afe58 100644
--- a/libs/pygments/lexers/_julia_builtins.py
+++ b/libs/pygments/lexers/_julia_builtins.py
@@ -4,7 +4,7 @@
 
     Julia builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_lasso_builtins.py b/libs/pygments/lexers/_lasso_builtins.py
index 1fbe68193..a559847e3 100644
--- a/libs/pygments/lexers/_lasso_builtins.py
+++ b/libs/pygments/lexers/_lasso_builtins.py
@@ -4,7 +4,7 @@
 
     Built-in Lasso types, traits, methods, and members.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_lilypond_builtins.py b/libs/pygments/lexers/_lilypond_builtins.py
index 013c85ca3..b00dbbfd4 100644
--- a/libs/pygments/lexers/_lilypond_builtins.py
+++ b/libs/pygments/lexers/_lilypond_builtins.py
@@ -4,7 +4,7 @@
 
     LilyPond builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_lua_builtins.py b/libs/pygments/lexers/_lua_builtins.py
index 8170d5e82..e0977a0a4 100644
--- a/libs/pygments/lexers/_lua_builtins.py
+++ b/libs/pygments/lexers/_lua_builtins.py
@@ -10,7 +10,7 @@
 
     Run with `python -I` to regenerate.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -230,7 +230,7 @@ if __name__ == '__main__':  # pragma: no cover
                 return m.groups()[0]
 
     def get_lua_functions(version):
-        f = urlopen('http://www.lua.org/manual/%s/' % version)
+        f = urlopen(f'http://www.lua.org/manual/{version}/')
         r = re.compile(r'^<A HREF="manual.html#pdf-(?!lua|LUA)([^:]+)">\1</A>')
         functions = []
         for line in f:
@@ -258,14 +258,14 @@ if __name__ == '__main__':  # pragma: no cover
 
         with open(filename, 'w', encoding='utf-8') as fp:
             fp.write(header)
-            fp.write('MODULES = %s\n\n' % pprint.pformat(modules))
+            fp.write(f'MODULES = {pprint.pformat(modules)}\n\n')
             fp.write(footer)
 
     def run():
         version = get_newest_version()
         functions = set()
         for v in ('5.2', version):
-            print('> Downloading function index for Lua %s' % v)
+            print(f'> Downloading function index for Lua {v}')
             f = get_lua_functions(v)
             print('> %d functions found, %d new:' %
                   (len(f), len(set(f) - functions)))
@@ -275,7 +275,7 @@ if __name__ == '__main__':  # pragma: no cover
 
         modules = {}
         for full_function_name in functions:
-            print('>> %s' % full_function_name)
+            print(f'>> {full_function_name}')
             m = get_function_module(full_function_name)
             modules.setdefault(m, []).append(full_function_name)
         modules = {k: tuple(v) for k, v in modules.items()}
diff --git a/libs/pygments/lexers/_luau_builtins.py b/libs/pygments/lexers/_luau_builtins.py
new file mode 100644
index 000000000..9e06b07b9
--- /dev/null
+++ b/libs/pygments/lexers/_luau_builtins.py
@@ -0,0 +1,62 @@
+"""
+    pygments.lexers._luau_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Includes the builtins for Luau and Roblox.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+LUAU_BUILTINS = {
+	'bit32',
+	'buffer',
+	'coroutine',
+	'debug',
+	'math',
+	'os',
+	'string',
+	'table',
+	'utf8',
+}
+
+ROBLOX_BUILTINS = {
+	'task',
+
+	'Axes',
+	'BrickColor',
+	'CatalogSearchParams',
+	'CFrame',
+	'Color3',
+	'ColorSequence',
+	'ColorSequenceKeypoint',
+	'DateTime',
+	'DockWidgetPluginGuiInfo',
+	'Faces',
+	'FloatCurveKey',
+	'Font',
+	'Instance',
+	'NumberRange',
+	'NumberSequence',
+	'NumberSequenceKeypoint',
+	'OverlapParams',
+	'PathWaypoint',
+	'PhysicalProperties',
+	'Random',
+	'Ray',
+	'RaycastParams',
+	'RaycastResult',
+	'RBXScriptConnection',
+	'RBXScriptSignal',
+	'Rect',
+	'Region3',
+	'Region3int16',
+	'SharedTable',
+	'TweenInfo',
+	'UDim',
+	'UDim2',
+	'Vector2',
+	'Vector2int16',
+	'Vector3',
+	'Vector3int16',
+}
\ No newline at end of file
diff --git a/libs/pygments/lexers/_mapping.py b/libs/pygments/lexers/_mapping.py
index aaec80232..cfc534d40 100644
--- a/libs/pygments/lexers/_mapping.py
+++ b/libs/pygments/lexers/_mapping.py
@@ -46,7 +46,7 @@ LEXERS = {
     'BSTLexer': ('pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
     'BareLexer': ('pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
     'BaseMakefileLexer': ('pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
-    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
+    'BashLexer': ('pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell', 'openrc'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
     'BashSessionLexer': ('pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
     'BatchLexer': ('pygments.lexers.shell', 'Batchfile', ('batch', 'bat', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
     'BddLexer': ('pygments.lexers.bdd', 'Bdd', ('bdd',), ('*.feature',), ('text/x-bdd',)),
@@ -93,6 +93,7 @@ LEXERS = {
     'ClojureScriptLexer': ('pygments.lexers.jvm', 'ClojureScript', ('clojurescript', 'cljs'), ('*.cljs',), ('text/x-clojurescript', 'application/x-clojurescript')),
     'CobolFreeformatLexer': ('pygments.lexers.business', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
     'CobolLexer': ('pygments.lexers.business', 'COBOL', ('cobol',), ('*.cob', '*.COB', '*.cpy', '*.CPY'), ('text/x-cobol',)),
+    'CodeQLLexer': ('pygments.lexers.codeql', 'CodeQL', ('codeql', 'ql'), ('*.ql', '*.qll'), ()),
     'CoffeeScriptLexer': ('pygments.lexers.javascript', 'CoffeeScript', ('coffeescript', 'coffee-script', 'coffee'), ('*.coffee',), ('text/coffeescript',)),
     'ColdfusionCFCLexer': ('pygments.lexers.templates', 'Coldfusion CFC', ('cfc',), ('*.cfc',), ()),
     'ColdfusionHtmlLexer': ('pygments.lexers.templates', 'Coldfusion HTML', ('cfm',), ('*.cfm', '*.cfml'), ('application/x-coldfusion',)),
@@ -127,8 +128,9 @@ LEXERS = {
     'Dasm16Lexer': ('pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
     'DaxLexer': ('pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
+    'DebianSourcesLexer': ('pygments.lexers.installers', 'Debian Sources file', ('debian.sources',), ('*.sources',), ()),
     'DelphiLexer': ('pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
-    'DesktopLexer': ('pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ()),
+    'DesktopLexer': ('pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ('application/x-desktop',)),
     'DevicetreeLexer': ('pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     'DgLexer': ('pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     'DiffLexer': ('pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
@@ -155,9 +157,9 @@ LEXERS = {
     'ErbLexer': ('pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
     'ErlangLexer': ('pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
     'ErlangShellLexer': ('pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
-    'EvoqueHtmlLexer': ('pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), ('*.html',), ('text/html+evoque',)),
+    'EvoqueHtmlLexer': ('pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), (), ('text/html+evoque',)),
     'EvoqueLexer': ('pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
-    'EvoqueXmlLexer': ('pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
+    'EvoqueXmlLexer': ('pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), (), ('application/xml+evoque',)),
     'ExeclineLexer': ('pygments.lexers.shell', 'execline', ('execline',), ('*.exec',), ()),
     'EzhilLexer': ('pygments.lexers.ezhil', 'Ezhil', ('ezhil',), ('*.n',), ('text/x-ezhil',)),
     'FSharpLexer': ('pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi', '*.fsx'), ('text/x-fsharp',)),
@@ -189,10 +191,12 @@ LEXERS = {
     'GenshiTextLexer': ('pygments.lexers.templates', 'Genshi Text', ('genshitext',), (), ('application/x-genshi-text', 'text/x-genshi')),
     'GettextLexer': ('pygments.lexers.textfmts', 'Gettext Catalog', ('pot', 'po'), ('*.pot', '*.po'), ('application/x-gettext', 'text/x-gettext', 'text/gettext')),
     'GherkinLexer': ('pygments.lexers.testing', 'Gherkin', ('gherkin', 'cucumber'), ('*.feature',), ('text/x-gherkin',)),
+    'GleamLexer': ('pygments.lexers.gleam', 'Gleam', ('gleam',), ('*.gleam',), ('text/x-gleam',)),
     'GnuplotLexer': ('pygments.lexers.graphics', 'Gnuplot', ('gnuplot',), ('*.plot', '*.plt'), ('text/x-gnuplot',)),
     'GoLexer': ('pygments.lexers.go', 'Go', ('go', 'golang'), ('*.go',), ('text/x-gosrc',)),
     'GoloLexer': ('pygments.lexers.jvm', 'Golo', ('golo',), ('*.golo',), ()),
     'GoodDataCLLexer': ('pygments.lexers.business', 'GoodData-CL', ('gooddata-cl',), ('*.gdc',), ('text/x-gooddata-cl',)),
+    'GoogleSqlLexer': ('pygments.lexers.sql', 'GoogleSQL', ('googlesql', 'zetasql'), ('*.googlesql', '*.googlesql.sql'), ('text/x-google-sql', 'text/x-google-sql-aux')),
     'GosuLexer': ('pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
     'GosuTemplateLexer': ('pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
     'GraphQLLexer': ('pygments.lexers.graphql', 'GraphQL', ('graphql',), ('*.graphql',), ()),
@@ -204,6 +208,7 @@ LEXERS = {
     'HamlLexer': ('pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
     'HandlebarsHtmlLexer': ('pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
     'HandlebarsLexer': ('pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
+    'HareLexer': ('pygments.lexers.hare', 'Hare', ('hare',), ('*.ha',), ('text/x-hare',)),
     'HaskellLexer': ('pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
     'HaxeLexer': ('pygments.lexers.haxe', 'Haxe', ('haxe', 'hxsl', 'hx'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
     'HexdumpLexer': ('pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
@@ -216,8 +221,8 @@ LEXERS = {
     'HtmlSmartyLexer': ('pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
     'HttpLexer': ('pygments.lexers.textfmts', 'HTTP', ('http',), (), ()),
     'HxmlLexer': ('pygments.lexers.haxe', 'Hxml', ('haxeml', 'hxml'), ('*.hxml',), ()),
-    'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
-    'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
+    'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang', 'hy'), ('*.hy',), ('text/x-hy', 'application/x-hy')),
+    'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris',), ('*.hyb',), ('text/x-hybris', 'application/x-hybris')),
     'IDLLexer': ('pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
     'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     'IdrisLexer': ('pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
@@ -234,6 +239,7 @@ LEXERS = {
     'JMESPathLexer': ('pygments.lexers.jmespath', 'JMESPath', ('jmespath', 'jp'), ('*.jp',), ()),
     'JSLTLexer': ('pygments.lexers.jslt', 'JSLT', ('jslt',), ('*.jslt',), ('text/x-jslt',)),
     'JagsLexer': ('pygments.lexers.modeling', 'JAGS', ('jags',), ('*.jag', '*.bug'), ()),
+    'JanetLexer': ('pygments.lexers.lisp', 'Janet', ('janet',), ('*.janet', '*.jdn'), ('text/x-janet', 'application/x-janet')),
     'JasminLexer': ('pygments.lexers.jvm', 'Jasmin', ('jasmin', 'jasminxt'), ('*.j',), ()),
     'JavaLexer': ('pygments.lexers.jvm', 'Java', ('java',), ('*.java',), ('text/x-java',)),
     'JavascriptDjangoLexer': ('pygments.lexers.templates', 'JavaScript+Django/Jinja', ('javascript+django', 'js+django', 'javascript+jinja', 'js+jinja'), ('*.js.j2', '*.js.jinja2'), ('application/x-javascript+django', 'application/x-javascript+jinja', 'text/x-javascript+django', 'text/x-javascript+jinja', 'text/javascript+django', 'text/javascript+jinja')),
@@ -245,6 +251,7 @@ LEXERS = {
     'JavascriptUL4Lexer': ('pygments.lexers.ul4', 'Javascript+UL4', ('js+ul4',), ('*.jsul4',), ()),
     'JclLexer': ('pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
     'JsgfLexer': ('pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
+    'Json5Lexer': ('pygments.lexers.json5', 'JSON5', ('json5',), ('*.json5',), ()),
     'JsonBareObjectLexer': ('pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
     'JsonLexer': ('pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock'), ('application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq')),
@@ -271,6 +278,7 @@ LEXERS = {
     'LdaprcLexer': ('pygments.lexers.ldap', 'LDAP configuration file', ('ldapconf', 'ldaprc'), ('.ldaprc', 'ldaprc', 'ldap.conf'), ('text/x-ldapconf',)),
     'LdifLexer': ('pygments.lexers.ldap', 'LDIF', ('ldif',), ('*.ldif',), ('text/x-ldif',)),
     'Lean3Lexer': ('pygments.lexers.lean', 'Lean', ('lean', 'lean3'), ('*.lean',), ('text/x-lean', 'text/x-lean3')),
+    'Lean4Lexer': ('pygments.lexers.lean', 'Lean4', ('lean4',), ('*.lean',), ('text/x-lean4',)),
     'LessCssLexer': ('pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
     'LighttpdConfLexer': ('pygments.lexers.configs', 'Lighttpd configuration file', ('lighttpd', 'lighty'), ('lighttpd.conf',), ('text/x-lighttpd-conf',)),
     'LilyPondLexer': ('pygments.lexers.lilypond', 'LilyPond', ('lilypond',), ('*.ly',), ()),
@@ -287,6 +295,7 @@ LEXERS = {
     'LogosLexer': ('pygments.lexers.objective', 'Logos', ('logos',), ('*.x', '*.xi', '*.xm', '*.xmi'), ('text/x-logos',)),
     'LogtalkLexer': ('pygments.lexers.prolog', 'Logtalk', ('logtalk',), ('*.lgt', '*.logtalk'), ('text/x-logtalk',)),
     'LuaLexer': ('pygments.lexers.scripting', 'Lua', ('lua',), ('*.lua', '*.wlua'), ('text/x-lua', 'application/x-lua')),
+    'LuauLexer': ('pygments.lexers.scripting', 'Luau', ('luau',), ('*.luau',), ()),
     'MCFunctionLexer': ('pygments.lexers.minecraft', 'MCFunction', ('mcfunction', 'mcf'), ('*.mcfunction',), ('text/mcfunction',)),
     'MCSchemaLexer': ('pygments.lexers.minecraft', 'MCSchema', ('mcschema',), ('*.mcschema',), ('text/mcschema',)),
     'MIMELexer': ('pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
@@ -300,6 +309,7 @@ LEXERS = {
     'MakoJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Mako', ('javascript+mako', 'js+mako'), (), ('application/x-javascript+mako', 'text/x-javascript+mako', 'text/javascript+mako')),
     'MakoLexer': ('pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
     'MakoXmlLexer': ('pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
+    'MapleLexer': ('pygments.lexers.maple', 'Maple', ('maple',), ('*.mpl', '*.mi', '*.mm'), ('text/x-maple',)),
     'MaqlLexer': ('pygments.lexers.business', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
     'MarkdownLexer': ('pygments.lexers.markup', 'Markdown', ('markdown', 'md'), ('*.md', '*.markdown'), ('text/x-markdown',)),
     'MaskLexer': ('pygments.lexers.javascript', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
@@ -314,6 +324,7 @@ LEXERS = {
     'ModelicaLexer': ('pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
     'Modula2Lexer': ('pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
     'MoinWikiLexer': ('pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
+    'MojoLexer': ('pygments.lexers.mojo', 'Mojo', ('mojo', '🔥'), ('*.mojo', '*.🔥'), ('text/x-mojo', 'application/x-mojo')),
     'MonkeyLexer': ('pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
     'MonteLexer': ('pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
     'MoonScriptLexer': ('pygments.lexers.scripting', 'MoonScript', ('moonscript', 'moon'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
@@ -350,6 +361,7 @@ LEXERS = {
     'NotmuchLexer': ('pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
     'NuSMVLexer': ('pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
     'NumPyLexer': ('pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
+    'NumbaIRLexer': ('pygments.lexers.numbair', 'Numba_IR', ('numba_ir', 'numbair'), ('*.numba_ir',), ('text/x-numba_ir', 'text/x-numbair')),
     'ObjdumpLexer': ('pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
     'ObjectiveCLexer': ('pygments.lexers.objective', 'Objective-C', ('objective-c', 'objectivec', 'obj-c', 'objc'), ('*.m', '*.h'), ('text/x-objective-c',)),
     'ObjectiveCppLexer': ('pygments.lexers.objective', 'Objective-C++', ('objective-c++', 'objectivec++', 'obj-c++', 'objc++'), ('*.mm', '*.hh'), ('text/x-objective-c++',)),
@@ -362,11 +374,13 @@ LEXERS = {
     'OpaLexer': ('pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     'OpenEdgeLexer': ('pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
     'OpenScadLexer': ('pygments.lexers.openscad', 'OpenSCAD', ('openscad',), ('*.scad',), ('application/x-openscad',)),
+    'OrgLexer': ('pygments.lexers.markup', 'Org Mode', ('org', 'orgmode', 'org-mode'), ('*.org',), ('text/org',)),
     'OutputLexer': ('pygments.lexers.special', 'Text output', ('output',), (), ()),
     'PacmanConfLexer': ('pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     'PanLexer': ('pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
     'ParaSailLexer': ('pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
     'PawnLexer': ('pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
+    'PddlLexer': ('pygments.lexers.pddl', 'PDDL', ('pddl',), ('*.pddl',), ()),
     'PegLexer': ('pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
     'Perl6Lexer': ('pygments.lexers.perl', 'Perl6', ('perl6', 'pl6', 'raku'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod', '*.rakutest', '*.rakudoc'), ('text/x-perl6', 'application/x-perl6')),
     'PerlLexer': ('pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t', '*.perl'), ('text/x-perl', 'application/x-perl')),
@@ -390,6 +404,7 @@ LEXERS = {
     'ProcfileLexer': ('pygments.lexers.procfile', 'Procfile', ('procfile',), ('Procfile',), ()),
     'PrologLexer': ('pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
     'PromQLLexer': ('pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
+    'PromelaLexer': ('pygments.lexers.c_like', 'Promela', ('promela',), ('*.pml', '*.prom', '*.prm', '*.promela', '*.pr', '*.pm'), ('text/x-promela',)),
     'PropertiesLexer': ('pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     'ProtoBufLexer': ('pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
     'PrqlLexer': ('pygments.lexers.prql', 'PRQL', ('prql',), ('*.prql',), ('application/prql', 'application/x-prql')),
@@ -400,8 +415,8 @@ LEXERS = {
     'PyPyLogLexer': ('pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
     'Python2Lexer': ('pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
-    'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonConsoleLexer': ('pygments.lexers.python', 'Python console session', ('pycon', 'python-console'), (), ('text/x-python-doctest',)),
+    'PythonLexer': ('pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
     'QBasicLexer': ('pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -428,6 +443,7 @@ LEXERS = {
     'RedLexer': ('pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
     'RedcodeLexer': ('pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
     'RegeditLexer': ('pygments.lexers.configs', 'reg', ('registry',), ('*.reg',), ('text/x-windows-registry',)),
+    'RegoLexer': ('pygments.lexers.rego', 'Rego', ('rego',), ('*.rego',), ('text/x-rego',)),
     'ResourceLexer': ('pygments.lexers.resource', 'ResourceBundle', ('resourcebundle', 'resource'), (), ()),
     'RexxLexer': ('pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
     'RhtmlLexer': ('pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
@@ -473,6 +489,7 @@ LEXERS = {
     'SnobolLexer': ('pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
     'SnowballLexer': ('pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
     'SolidityLexer': ('pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
+    'SoongLexer': ('pygments.lexers.soong', 'Soong', ('androidbp', 'bp', 'soong'), ('Android.bp',), ()),
     'SophiaLexer': ('pygments.lexers.sophia', 'Sophia', ('sophia',), ('*.aes',), ()),
     'SourcePawnLexer': ('pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
     'SourcesListLexer': ('pygments.lexers.installers', 'Debian Sourcelist', ('debsources', 'sourceslist', 'sources.list'), ('sources.list',), ()),
@@ -494,6 +511,8 @@ LEXERS = {
     'TAPLexer': ('pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
     'TNTLexer': ('pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
     'TOMLLexer': ('pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
+    'TableGenLexer': ('pygments.lexers.tablegen', 'TableGen', ('tablegen', 'td'), ('*.td',), ()),
+    'TactLexer': ('pygments.lexers.tact', 'Tact', ('tact',), ('*.tact',), ()),
     'Tads3Lexer': ('pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TalLexer': ('pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
     'TasmLexer': ('pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
@@ -516,6 +535,7 @@ LEXERS = {
     'TodotxtLexer': ('pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
     'TransactSqlLexer': ('pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     'TreetopLexer': ('pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
+    'TsxLexer': ('pygments.lexers.jsx', 'TSX', ('tsx',), ('*.tsx',), ('text/typescript-tsx',)),
     'TurtleLexer': ('pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
     'TwigHtmlLexer': ('pygments.lexers.templates', 'HTML+Twig', ('html+twig',), ('*.twig',), ('text/html+twig',)),
     'TwigLexer': ('pygments.lexers.templates', 'Twig', ('twig',), (), ('application/x-twig',)),
@@ -523,6 +543,7 @@ LEXERS = {
     'TypoScriptCssDataLexer': ('pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
     'TypoScriptHtmlDataLexer': ('pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
     'TypoScriptLexer': ('pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
+    'TypstLexer': ('pygments.lexers.typst', 'Typst', ('typst',), ('*.typ',), ('text/x-typst',)),
     'UL4Lexer': ('pygments.lexers.ul4', 'UL4', ('ul4',), ('*.ul4',), ()),
     'UcodeLexer': ('pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
     'UniconLexer': ('pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
@@ -537,7 +558,7 @@ LEXERS = {
     'VGLLexer': ('pygments.lexers.dsls', 'VGL', ('vgl',), ('*.rpf',), ()),
     'ValaLexer': ('pygments.lexers.c_like', 'Vala', ('vala', 'vapi'), ('*.vala', '*.vapi'), ('text/x-vala',)),
     'VbNetAspxLexer': ('pygments.lexers.dotnet', 'aspx-vb', ('aspx-vb',), ('*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd'), ()),
-    'VbNetLexer': ('pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
+    'VbNetLexer': ('pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas', 'visual-basic', 'visualbasic'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
     'VelocityHtmlLexer': ('pygments.lexers.templates', 'HTML+Velocity', ('html+velocity',), (), ('text/html+velocity',)),
     'VelocityLexer': ('pygments.lexers.templates', 'Velocity', ('velocity',), ('*.vm', '*.fhtml'), ()),
     'VelocityXmlLexer': ('pygments.lexers.templates', 'XML+Velocity', ('xml+velocity',), (), ('application/xml+velocity',)),
@@ -547,6 +568,7 @@ LEXERS = {
     'VimLexer': ('pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
     'VisualPrologGrammarLexer': ('pygments.lexers.vip', 'Visual Prolog Grammar', ('visualprologgrammar',), ('*.vipgrm',), ()),
     'VisualPrologLexer': ('pygments.lexers.vip', 'Visual Prolog', ('visualprolog',), ('*.pro', '*.cl', '*.i', '*.pack', '*.ph'), ()),
+    'VueLexer': ('pygments.lexers.html', 'Vue', ('vue',), ('*.vue',), ()),
     'VyperLexer': ('pygments.lexers.vyper', 'Vyper', ('vyper',), ('*.vy',), ()),
     'WDiffLexer': ('pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
     'WatLexer': ('pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
diff --git a/libs/pygments/lexers/_mql_builtins.py b/libs/pygments/lexers/_mql_builtins.py
index 3b89f1db7..181c25d55 100644
--- a/libs/pygments/lexers/_mql_builtins.py
+++ b/libs/pygments/lexers/_mql_builtins.py
@@ -4,7 +4,7 @@
 
     Builtins for the MqlLexer.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 types = (
diff --git a/libs/pygments/lexers/_mysql_builtins.py b/libs/pygments/lexers/_mysql_builtins.py
index d25ed9c7c..d4a9099ed 100644
--- a/libs/pygments/lexers/_mysql_builtins.py
+++ b/libs/pygments/lexers/_mysql_builtins.py
@@ -6,7 +6,7 @@
 
     Run with `python -I` to update.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -1321,10 +1321,10 @@ if __name__ == '__main__':  # pragma: no cover
             data = f.read()
 
         # Line to start/end inserting
-        re_match = re.compile(r'^%s\s*=\s*\($.*?^\s*\)$' % field_name, re.M | re.S)
+        re_match = re.compile(rf'^{field_name}\s*=\s*\($.*?^\s*\)$', re.M | re.S)
         m = re_match.search(data)
         if not m:
-            raise ValueError('Could not find an existing definition for %s' % field_name)
+            raise ValueError(f'Could not find an existing definition for {field_name}')
 
         new_block = format_lines(field_name, content)
         data = data[:m.start()] + new_block + data[m.end():]
diff --git a/libs/pygments/lexers/_openedge_builtins.py b/libs/pygments/lexers/_openedge_builtins.py
index 7fdfb4104..33a1333e4 100644
--- a/libs/pygments/lexers/_openedge_builtins.py
+++ b/libs/pygments/lexers/_openedge_builtins.py
@@ -4,7 +4,7 @@
 
     Builtin list for the OpenEdgeLexer.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_php_builtins.py b/libs/pygments/lexers/_php_builtins.py
index 5366e7511..19825fa2d 100644
--- a/libs/pygments/lexers/_php_builtins.py
+++ b/libs/pygments/lexers/_php_builtins.py
@@ -7,7 +7,7 @@
 
     Run with `python -I` to regenerate.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -3299,7 +3299,7 @@ if __name__ == '__main__':  # pragma: no cover
         download = urlretrieve(PHP_MANUAL_URL)
         with tarfile.open(download[0]) as tar:
             tar.extractall()
-        yield from glob.glob("%s%s" % (PHP_MANUAL_DIR, PHP_REFERENCE_GLOB))
+        yield from glob.glob(f"{PHP_MANUAL_DIR}{PHP_REFERENCE_GLOB}")
         os.remove(download[0])
 
     def regenerate(filename, modules):
@@ -3311,7 +3311,7 @@ if __name__ == '__main__':  # pragma: no cover
 
         with open(filename, 'w', encoding='utf-8') as fp:
             fp.write(header)
-            fp.write('MODULES = %s\n\n' % pprint.pformat(modules))
+            fp.write(f'MODULES = {pprint.pformat(modules)}\n\n')
             fp.write(footer)
 
     def run():
diff --git a/libs/pygments/lexers/_postgres_builtins.py b/libs/pygments/lexers/_postgres_builtins.py
index ecc2a7eef..80bc728e9 100644
--- a/libs/pygments/lexers/_postgres_builtins.py
+++ b/libs/pygments/lexers/_postgres_builtins.py
@@ -6,7 +6,7 @@
 
     Run with `python -I` to update itself.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -683,7 +683,8 @@ if __name__ == '__main__':  # pragma: no cover
                         for t in tmp.split(']') if "(" not in t]:
                 for t in tmp.split(','):
                     t = t.strip()
-                    if not t: continue
+                    if not t:
+                        continue
                     dt.add(" ".join(t.split()))
 
         dt = list(dt)
@@ -724,11 +725,10 @@ if __name__ == '__main__':  # pragma: no cover
             data = f.read()
 
         # Line to start/end inserting
-        re_match = re.compile(r'^%s\s*=\s*\($.*?^\s*\)$' % constname, re.M | re.S)
+        re_match = re.compile(rf'^{constname}\s*=\s*\($.*?^\s*\)$', re.M | re.S)
         m = re_match.search(data)
         if not m:
-            raise ValueError('Could not find existing definition for %s' %
-                             (constname,))
+            raise ValueError(f'Could not find existing definition for {constname}')
 
         new_block = format_lines(constname, content)
         data = data[:m.start()] + new_block + data[m.end():]
diff --git a/libs/pygments/lexers/_qlik_builtins.py b/libs/pygments/lexers/_qlik_builtins.py
index 697c12462..c2fe0cf4b 100644
--- a/libs/pygments/lexers/_qlik_builtins.py
+++ b/libs/pygments/lexers/_qlik_builtins.py
@@ -4,7 +4,7 @@
 
     Qlik builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_scheme_builtins.py b/libs/pygments/lexers/_scheme_builtins.py
index 8f2de9dba..c35a533d1 100644
--- a/libs/pygments/lexers/_scheme_builtins.py
+++ b/libs/pygments/lexers/_scheme_builtins.py
@@ -4,7 +4,7 @@
 
     Scheme builtins.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_scilab_builtins.py b/libs/pygments/lexers/_scilab_builtins.py
index f2adba858..af49b46a8 100644
--- a/libs/pygments/lexers/_scilab_builtins.py
+++ b/libs/pygments/lexers/_scilab_builtins.py
@@ -4,7 +4,7 @@
 
     Builtin list for the ScilabLexer.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -3060,10 +3060,10 @@ if __name__ == '__main__':  # pragma: no cover
     def extract_completion(var_type):
         s = subprocess.Popen(['scilab', '-nwni'], stdin=subprocess.PIPE,
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        output = s.communicate('''\
+        output = s.communicate(f'''\
 fd = mopen("/dev/stderr", "wt");
-mputl(strcat(completion("", "%s"), "||"), fd);
-mclose(fd)\n''' % var_type)
+mputl(strcat(completion("", "{var_type}"), "||"), fd);
+mclose(fd)\n''')
         if '||' not in output[1]:
             raise Exception(output[0])
         # Invalid DISPLAY causes this to be output:
diff --git a/libs/pygments/lexers/_sourcemod_builtins.py b/libs/pygments/lexers/_sourcemod_builtins.py
index 02d3e779d..c98478c6f 100644
--- a/libs/pygments/lexers/_sourcemod_builtins.py
+++ b/libs/pygments/lexers/_sourcemod_builtins.py
@@ -8,7 +8,7 @@
 
     Run with `python -I` to regenerate.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -1136,13 +1136,13 @@ if __name__ == '__main__':  # pragma: no cover
 
     def run():
         version = get_version()
-        print('> Downloading function index for SourceMod %s' % version)
+        print(f'> Downloading function index for SourceMod {version}')
         functions = get_sm_functions()
         print('> %d functions found:' % len(functions))
 
         functionlist = []
         for full_function_name in functions:
-            print('>> %s' % full_function_name)
+            print(f'>> {full_function_name}')
             functionlist.append(full_function_name)
 
         regenerate(__file__, functionlist)
diff --git a/libs/pygments/lexers/_stan_builtins.py b/libs/pygments/lexers/_stan_builtins.py
index 23f7fa603..8db10c32a 100644
--- a/libs/pygments/lexers/_stan_builtins.py
+++ b/libs/pygments/lexers/_stan_builtins.py
@@ -5,7 +5,7 @@
     This file contains the names of functions for Stan used by
     ``pygments.lexers.math.StanLexer. This is for Stan language version 2.29.0.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_stata_builtins.py b/libs/pygments/lexers/_stata_builtins.py
index 16251cff2..6a36f0429 100644
--- a/libs/pygments/lexers/_stata_builtins.py
+++ b/libs/pygments/lexers/_stata_builtins.py
@@ -4,7 +4,7 @@
 
     Builtins for Stata
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_tsql_builtins.py b/libs/pygments/lexers/_tsql_builtins.py
index 96b16bf4a..6fa1a1f19 100644
--- a/libs/pygments/lexers/_tsql_builtins.py
+++ b/libs/pygments/lexers/_tsql_builtins.py
@@ -4,7 +4,7 @@
 
     These are manually translated lists from https://msdn.microsoft.com.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_usd_builtins.py b/libs/pygments/lexers/_usd_builtins.py
index d891ad03d..b0530a209 100644
--- a/libs/pygments/lexers/_usd_builtins.py
+++ b/libs/pygments/lexers/_usd_builtins.py
@@ -4,7 +4,7 @@
 
     A collection of known USD-related keywords, attributes, and types.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_vbscript_builtins.py b/libs/pygments/lexers/_vbscript_builtins.py
index e7e96e690..b1ae0ef02 100644
--- a/libs/pygments/lexers/_vbscript_builtins.py
+++ b/libs/pygments/lexers/_vbscript_builtins.py
@@ -5,7 +5,7 @@
     These are manually translated lists from
     http://www.indusoft.com/pdf/VBScript%20Reference.pdf.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/_vim_builtins.py b/libs/pygments/lexers/_vim_builtins.py
index ccc8740f4..abbbf993a 100644
--- a/libs/pygments/lexers/_vim_builtins.py
+++ b/libs/pygments/lexers/_vim_builtins.py
@@ -4,7 +4,7 @@
 
     This file is autogenerated by scripts/get_vimkw.py
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/lexers/actionscript.py b/libs/pygments/lexers/actionscript.py
index e0e94a52e..3a6ba4291 100644
--- a/libs/pygments/lexers/actionscript.py
+++ b/libs/pygments/lexers/actionscript.py
@@ -4,7 +4,7 @@
 
     Lexers for ActionScript and MXML.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['ActionScriptLexer', 'ActionScript3Lexer', 'MxmlLexer']
 class ActionScriptLexer(RegexLexer):
     """
     For ActionScript source code.
-
-    .. versionadded:: 0.9
     """
 
     name = 'ActionScript'
@@ -29,6 +27,8 @@ class ActionScriptLexer(RegexLexer):
     filenames = ['*.as']
     mimetypes = ['application/x-actionscript', 'text/x-actionscript',
                  'text/actionscript']
+    url = 'https://en.wikipedia.org/wiki/ActionScript'
+    version_added = '0.9'
 
     flags = re.DOTALL
     tokens = {
@@ -118,8 +118,6 @@ class ActionScriptLexer(RegexLexer):
 class ActionScript3Lexer(RegexLexer):
     """
     For ActionScript 3 source code.
-
-    .. versionadded:: 0.11
     """
 
     name = 'ActionScript 3'
@@ -128,6 +126,7 @@ class ActionScript3Lexer(RegexLexer):
     filenames = ['*.as']
     mimetypes = ['application/x-actionscript3', 'text/x-actionscript3',
                  'text/actionscript3']
+    version_added = '0.11'
 
     identifier = r'[$a-zA-Z_]\w*'
     typeidentifier = identifier + r'(?:\.<\w+>)?'
@@ -205,14 +204,13 @@ class MxmlLexer(RegexLexer):
     """
     For MXML markup.
     Nested AS3 in <script> tags is highlighted by the appropriate lexer.
-
-    .. versionadded:: 1.1
     """
     flags = re.MULTILINE | re.DOTALL
     name = 'MXML'
     aliases = ['mxml']
     filenames = ['*.mxml']
-    mimetimes = ['text/xml', 'application/xml']
+    url = 'https://en.wikipedia.org/wiki/MXML'
+    version_added = '1.1'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/ada.py b/libs/pygments/lexers/ada.py
index 6a5e64406..cb286ca7c 100644
--- a/libs/pygments/lexers/ada.py
+++ b/libs/pygments/lexers/ada.py
@@ -4,7 +4,7 @@
 
     Lexers for Ada family languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,14 @@ __all__ = ['AdaLexer']
 class AdaLexer(RegexLexer):
     """
     For Ada source code.
-
-    .. versionadded:: 1.3
     """
 
     name = 'Ada'
     aliases = ['ada', 'ada95', 'ada2005']
     filenames = ['*.adb', '*.ads', '*.ada']
     mimetypes = ['text/x-ada']
+    url = 'https://www.adaic.org'
+    version_added = '1.3'
 
     flags = re.MULTILINE | re.IGNORECASE
 
diff --git a/libs/pygments/lexers/agile.py b/libs/pygments/lexers/agile.py
index c0c1a457a..cb22a13bf 100644
--- a/libs/pygments/lexers/agile.py
+++ b/libs/pygments/lexers/agile.py
@@ -4,10 +4,12 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
+
 from pygments.lexers.lisp import SchemeLexer
 from pygments.lexers.jvm import IokeLexer, ClojureLexer
 from pygments.lexers.python import PythonLexer, PythonConsoleLexer, \
diff --git a/libs/pygments/lexers/algebra.py b/libs/pygments/lexers/algebra.py
index 95f17540e..a899cfea8 100644
--- a/libs/pygments/lexers/algebra.py
+++ b/libs/pygments/lexers/algebra.py
@@ -4,7 +4,7 @@
 
     Lexers for computer algebra systems.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,13 +21,12 @@ __all__ = ['GAPLexer', 'GAPConsoleLexer', 'MathematicaLexer', 'MuPADLexer',
 class GAPLexer(RegexLexer):
     """
     For GAP source code.
-
-    .. versionadded:: 2.0
     """
     name = 'GAP'
     url = 'https://www.gap-system.org'
     aliases = ['gap']
     filenames = ['*.g', '*.gd', '*.gi', '*.gap']
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -92,12 +91,13 @@ class GAPLexer(RegexLexer):
 class GAPConsoleLexer(Lexer):
     """
     For GAP console sessions. Modeled after JuliaConsoleLexer.
-
-    .. versionadded:: 2.14
     """
     name = 'GAP session'
     aliases = ['gap-console', 'gap-repl']
     filenames = ['*.tst']
+    url = 'https://www.gap-system.org'
+    version_added = '2.14'
+    _example = "gap-repl/euclidean.tst"
 
     def get_tokens_unprocessed(self, text):
         gaplexer = GAPLexer(**self.options)
@@ -149,8 +149,6 @@ class GAPConsoleLexer(Lexer):
 class MathematicaLexer(RegexLexer):
     """
     Lexer for Mathematica source code.
-
-    .. versionadded:: 2.0
     """
     name = 'Mathematica'
     url = 'http://www.wolfram.com/mathematica/'
@@ -160,6 +158,7 @@ class MathematicaLexer(RegexLexer):
                  'application/vnd.wolfram.mathematica',
                  'application/vnd.wolfram.mathematica.package',
                  'application/vnd.wolfram.cdf']
+    version_added = '2.0'
 
     # http://reference.wolfram.com/mathematica/guide/Syntax.html
     operators = (
@@ -171,7 +170,7 @@ class MathematicaLexer(RegexLexer):
     punctuation = (",", ";", "(", ")", "[", "]", "{", "}")
 
     def _multi_escape(entries):
-        return '(%s)' % ('|'.join(re.escape(entry) for entry in entries))
+        return '({})'.format('|'.join(re.escape(entry) for entry in entries))
 
     tokens = {
         'root': [
@@ -198,13 +197,12 @@ class MuPADLexer(RegexLexer):
     """
     A MuPAD lexer.
     Contributed by Christopher Creutzig <christopher@creutzig.de>.
-
-    .. versionadded:: 0.8
     """
     name = 'MuPAD'
     url = 'http://www.mupad.com'
     aliases = ['mupad']
     filenames = ['*.mu']
+    version_added = '0.8'
 
     tokens = {
         'root': [
@@ -270,13 +268,12 @@ class MuPADLexer(RegexLexer):
 class BCLexer(RegexLexer):
     """
     A BC lexer.
-
-    .. versionadded:: 2.1
     """
     name = 'BC'
     url = 'https://www.gnu.org/software/bc/'
     aliases = ['bc']
     filenames = ['*.bc']
+    version_added = '2.1'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/ambient.py b/libs/pygments/lexers/ambient.py
index deba0f3b0..3862eb0d9 100644
--- a/libs/pygments/lexers/ambient.py
+++ b/libs/pygments/lexers/ambient.py
@@ -4,7 +4,7 @@
 
     Lexers for AmbientTalk language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ __all__ = ['AmbientTalkLexer']
 class AmbientTalkLexer(RegexLexer):
     """
     Lexer for AmbientTalk source code.
-
-    .. versionadded:: 2.0
     """
     name = 'AmbientTalk'
     url = 'https://code.google.com/p/ambienttalk'
     filenames = ['*.at']
     aliases = ['ambienttalk', 'ambienttalk/2', 'at']
     mimetypes = ['text/x-ambienttalk']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/amdgpu.py b/libs/pygments/lexers/amdgpu.py
index 860dfd442..c97ad617e 100644
--- a/libs/pygments/lexers/amdgpu.py
+++ b/libs/pygments/lexers/amdgpu.py
@@ -4,7 +4,7 @@
 
     Lexers for the AMDGPU ISA assembly.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,12 +19,12 @@ __all__ = ['AMDGPULexer']
 class AMDGPULexer(RegexLexer):
     """
     For AMD GPU assembly.
-
-    .. versionadded:: 2.8
     """
     name = 'AMDGPU'
     aliases = ['amdgpu']
     filenames = ['*.isa']
+    url = 'https://gpuopen.com/amd-isa-documentation'
+    version_added = '2.8'
 
     flags = re.IGNORECASE
 
diff --git a/libs/pygments/lexers/ampl.py b/libs/pygments/lexers/ampl.py
index b5abcacfc..bc4082b1b 100644
--- a/libs/pygments/lexers/ampl.py
+++ b/libs/pygments/lexers/ampl.py
@@ -4,7 +4,7 @@
 
     Lexers for the AMPL language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,12 @@ __all__ = ['AmplLexer']
 class AmplLexer(RegexLexer):
     """
     For AMPL source code.
-
-    .. versionadded:: 2.2
     """
     name = 'Ampl'
     url = 'http://ampl.com/'
     aliases = ['ampl']
     filenames = ['*.run']
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/apdlexer.py b/libs/pygments/lexers/apdlexer.py
index a50219c3b..98beedfbe 100644
--- a/libs/pygments/lexers/apdlexer.py
+++ b/libs/pygments/lexers/apdlexer.py
@@ -4,7 +4,7 @@
 
     Lexers for ANSYS Parametric Design Language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,12 +20,13 @@ __all__ = ['apdlexer']
 class apdlexer(RegexLexer):
     """
     For APDL source code.
-
-    .. versionadded:: 2.9
     """
     name = 'ANSYS parametric design language'
     aliases = ['ansys', 'apdl']
     filenames = ['*.ans']
+    url = 'https://www.ansys.com'
+    version_added = '2.9'
+
     flags = re.IGNORECASE
 
     # list of elements
diff --git a/libs/pygments/lexers/apl.py b/libs/pygments/lexers/apl.py
index 815184da1..a2ee3f475 100644
--- a/libs/pygments/lexers/apl.py
+++ b/libs/pygments/lexers/apl.py
@@ -4,7 +4,7 @@
 
     Lexers for APL.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['APLLexer']
 class APLLexer(RegexLexer):
     """
     A simple APL lexer.
-
-    .. versionadded:: 2.0
     """
     name = 'APL'
     url = 'https://en.m.wikipedia.org/wiki/APL_(programming_language)'
@@ -28,6 +26,7 @@ class APLLexer(RegexLexer):
         '*.apl', '*.aplf', '*.aplo', '*.apln',  
         '*.aplc', '*.apli', '*.dyalog',
     ]
+    version_added = '2.0'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/archetype.py b/libs/pygments/lexers/archetype.py
index e8312d78e..47f34af9e 100644
--- a/libs/pygments/lexers/archetype.py
+++ b/libs/pygments/lexers/archetype.py
@@ -2,18 +2,14 @@
     pygments.lexers.archetype
     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Lexer for Archetype-related syntaxes, including:
-
-    - ODIN syntax <https://github.com/openEHR/odin>
-    - ADL syntax <http://www.openehr.org/releases/trunk/architecture/am/adl2.pdf>
-    - cADL sub-syntax of ADL
+    Lexer for Archetype-related syntaxes, including ODIN, ADL and cADL.
 
     For uses of this syntax, see the openEHR archetypes <http://www.openEHR.org/ckm>
 
     Contributed by Thomas Beale <https://github.com/wolandscat>,
     <https://bitbucket.org/thomas_beale>.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -139,13 +135,13 @@ class AtomsLexer(RegexLexer):
 class OdinLexer(AtomsLexer):
     """
     Lexer for ODIN syntax.
-
-    .. versionadded:: 2.1
     """
     name = 'ODIN'
     aliases = ['odin']
     filenames = ['*.odin']
     mimetypes = ['text/odin']
+    url = 'https://github.com/openEHR/odin'
+    version_added = '2.1'
 
     tokens = {
         'path': [
@@ -188,12 +184,12 @@ class OdinLexer(AtomsLexer):
 class CadlLexer(AtomsLexer):
     """
     Lexer for cADL syntax.
-
-    .. versionadded:: 2.1
     """
     name = 'cADL'
     aliases = ['cadl']
     filenames = ['*.cadl']
+    url = 'https://specifications.openehr.org/releases/AM/latest/ADL2.html#_cadl_constraint_adl'
+    version_added = '2.1'
 
     tokens = {
         'path': [
@@ -253,13 +249,13 @@ class CadlLexer(AtomsLexer):
 class AdlLexer(AtomsLexer):
     """
     Lexer for ADL syntax.
-
-    .. versionadded:: 2.1
     """
 
     name = 'ADL'
     aliases = ['adl']
     filenames = ['*.adl', '*.adls', '*.adlf', '*.adlx']
+    url = 'https://specifications.openehr.org/releases/AM/latest/ADL2.html'
+    version_added = '2.1'
 
     tokens = {
         'whitespace': [
diff --git a/libs/pygments/lexers/arrow.py b/libs/pygments/lexers/arrow.py
index 894b64d31..e686cf1b6 100644
--- a/libs/pygments/lexers/arrow.py
+++ b/libs/pygments/lexers/arrow.py
@@ -4,7 +4,7 @@
 
     Lexer for Arrow.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,13 @@ DECL = TYPES + r'(\s+)' + IDENT
 class ArrowLexer(RegexLexer):
     """
     Lexer for Arrow
-
-    .. versionadded:: 2.7
     """
 
     name = 'Arrow'
     url = 'https://pypi.org/project/py-arrow-lang/'
     aliases = ['arrow']
     filenames = ['*.arw']
+    version_added = '2.7'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/arturo.py b/libs/pygments/lexers/arturo.py
index 72258248f..82fc08983 100644
--- a/libs/pygments/lexers/arturo.py
+++ b/libs/pygments/lexers/arturo.py
@@ -4,7 +4,7 @@
 
     Lexer for the Arturo language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -24,14 +24,13 @@ class ArturoLexer(RegexLexer):
 
     See `Arturo's Github <https://github.com/arturo-lang/arturo>`_
     and `Arturo's Website <https://arturo-lang.io/>`_.
-
-    .. versionadded:: 2.14.0
     """
 
     name = 'Arturo'
     aliases = ['arturo', 'art']
     filenames = ['*.art']
     url = 'https://arturo-lang.io/'
+    version_added = '2.14'
 
     def __init__(self, **options):
         self.handle_annotateds = get_bool_opt(options, 'handle_annotateds',
diff --git a/libs/pygments/lexers/asc.py b/libs/pygments/lexers/asc.py
index e261f4115..243c996af 100644
--- a/libs/pygments/lexers/asc.py
+++ b/libs/pygments/lexers/asc.py
@@ -4,7 +4,7 @@
 
     Lexer for various ASCII armored files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
@@ -19,8 +19,6 @@ class AscLexer(RegexLexer):
     """
     Lexer for ASCII armored files, containing `-----BEGIN/END ...-----` wrapped
     base64 data.
-
-    .. versionadded:: 2.10
     """
     name = 'ASCII armored'
     aliases = ['asc', 'pem']
@@ -32,6 +30,8 @@ class AscLexer(RegexLexer):
     ]
     mimetypes = ['application/pgp-keys', 'application/pgp-encrypted',
                  'application/pgp-signature', 'application/pem-certificate-chain']
+    url = 'https://www.openpgp.org'
+    version_added = '2.10'
 
     flags = re.MULTILINE
 
diff --git a/libs/pygments/lexers/asm.py b/libs/pygments/lexers/asm.py
index 0035c723f..74f4a5a8e 100644
--- a/libs/pygments/lexers/asm.py
+++ b/libs/pygments/lexers/asm.py
@@ -4,7 +4,7 @@
 
     Lexers for assembly languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,6 +31,8 @@ class GasLexer(RegexLexer):
     aliases = ['gas', 'asm']
     filenames = ['*.s', '*.S']
     mimetypes = ['text/x-gas']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = ''
 
     #: optional Comment or Whitespace
     string = r'"(\\"|[^"])*"'
@@ -167,6 +169,8 @@ class ObjdumpLexer(RegexLexer):
     aliases = ['objdump']
     filenames = ['*.objdump']
     mimetypes = ['text/x-objdump']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = ''
 
     tokens = _objdump_lexer_tokens(GasLexer)
 
@@ -179,6 +183,8 @@ class DObjdumpLexer(DelegatingLexer):
     aliases = ['d-objdump']
     filenames = ['*.d-objdump']
     mimetypes = ['text/x-d-objdump']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(DLexer, ObjdumpLexer, **options)
@@ -192,6 +198,8 @@ class CppObjdumpLexer(DelegatingLexer):
     aliases = ['cpp-objdump', 'c++-objdumb', 'cxx-objdump']
     filenames = ['*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump']
     mimetypes = ['text/x-cpp-objdump']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(CppLexer, ObjdumpLexer, **options)
@@ -205,6 +213,9 @@ class CObjdumpLexer(DelegatingLexer):
     aliases = ['c-objdump']
     filenames = ['*.c-objdump']
     mimetypes = ['text/x-c-objdump']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = ''
+
 
     def __init__(self, **options):
         super().__init__(CLexer, ObjdumpLexer, **options)
@@ -213,13 +224,13 @@ class CObjdumpLexer(DelegatingLexer):
 class HsailLexer(RegexLexer):
     """
     For HSAIL assembly code.
-
-    .. versionadded:: 2.2
     """
     name = 'HSAIL'
     aliases = ['hsail', 'hsa']
     filenames = ['*.hsail']
     mimetypes = ['text/x-hsail']
+    url = 'https://en.wikipedia.org/wiki/Heterogeneous_System_Architecture#HSA_Intermediate_Layer'
+    version_added = '2.2'
 
     string = r'"[^"]*?"'
     identifier = r'[a-zA-Z_][\w.]*'
@@ -354,6 +365,7 @@ class LlvmLexer(RegexLexer):
     aliases = ['llvm']
     filenames = ['*.ll']
     mimetypes = ['text/x-llvm']
+    version_added = ''
 
     #: optional Comment or Whitespace
     string = r'"[^"]*?"'
@@ -378,7 +390,7 @@ class LlvmLexer(RegexLexer):
             (r'!\d+', Name.Variable.Anonymous),
             (r'c?' + string, String),
 
-            (r'0[xX][a-fA-F0-9]+', Number),
+            (r'0[xX][KLMHR]?[a-fA-F0-9]+', Number),
             (r'-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?', Number),
 
             (r'[=<>{}\[\]()*.,!]|x\b', Punctuation)
@@ -453,24 +465,25 @@ class LlvmLexer(RegexLexer):
                 'singleImpl', 'singleImplName', 'sitofp', 'sizeM1',
                 'sizeM1BitWidth', 'sle', 'slt', 'source_filename',
                 'speculatable', 'speculative_load_hardening', 'spir_func',
-                'spir_kernel', 'srem', 'sret', 'ssp', 'sspreq', 'sspstrong',
-                'store', 'strictfp', 'sub', 'summaries', 'summary', 'swiftcc',
-                'swifterror', 'swiftself', 'switch', 'syncscope', 'tail',
-                'tailcc', 'target', 'thread_local', 'to', 'token', 'triple',
-                'true', 'trunc', 'type', 'typeCheckedLoadConstVCalls',
-                'typeCheckedLoadVCalls', 'typeid', 'typeidCompatibleVTable',
-                'typeIdInfo', 'typeTestAssumeConstVCalls',
-                'typeTestAssumeVCalls', 'typeTestRes', 'typeTests', 'udiv',
-                'ueq', 'uge', 'ugt', 'uitofp', 'ule', 'ult', 'umax', 'umin',
-                'undef', 'une', 'uniformRetVal', 'uniqueRetVal', 'unknown',
-                'unnamed_addr', 'uno', 'unordered', 'unreachable', 'unsat',
-                'unwind', 'urem', 'uselistorder', 'uselistorder_bb', 'uwtable',
-                'va_arg', 'varFlags', 'variable', 'vcall_visibility',
-                'vFuncId', 'virtFunc', 'virtualConstProp', 'void', 'volatile',
-                'vscale', 'vTableFuncs', 'weak', 'weak_odr', 'webkit_jscc',
-                'win64cc', 'within', 'wpdRes', 'wpdResolutions', 'writeonly',
-                'x', 'x86_64_sysvcc', 'x86_fastcallcc', 'x86_intrcc',
-                'x86_mmx', 'x86_regcallcc', 'x86_stdcallcc', 'x86_thiscallcc',
+                'spir_kernel', 'splat', 'srem', 'sret', 'ssp', 'sspreq',
+                'sspstrong', 'store', 'strictfp', 'sub', 'summaries',
+                'summary', 'swiftcc', 'swifterror', 'swiftself', 'switch',
+                'syncscope', 'tail', 'tailcc', 'target', 'thread_local', 'to',
+                'token', 'triple', 'true', 'trunc', 'type',
+                'typeCheckedLoadConstVCalls', 'typeCheckedLoadVCalls',
+                'typeid', 'typeidCompatibleVTable', 'typeIdInfo',
+                'typeTestAssumeConstVCalls', 'typeTestAssumeVCalls',
+                'typeTestRes', 'typeTests', 'udiv', 'ueq', 'uge', 'ugt',
+                'uitofp', 'ule', 'ult', 'umax', 'umin', 'undef', 'une',
+                'uniformRetVal', 'uniqueRetVal', 'unknown', 'unnamed_addr',
+                'uno', 'unordered', 'unreachable', 'unsat', 'unwind', 'urem',
+                'uselistorder', 'uselistorder_bb', 'uwtable', 'va_arg',
+                'varFlags', 'variable', 'vcall_visibility', 'vFuncId',
+                'virtFunc', 'virtualConstProp', 'void', 'volatile', 'vscale',
+                'vTableFuncs', 'weak', 'weak_odr', 'webkit_jscc', 'win64cc',
+                'within', 'wpdRes', 'wpdResolutions', 'writeonly', 'x',
+                'x86_64_sysvcc', 'x86_fastcallcc', 'x86_intrcc', 'x86_mmx',
+                'x86_regcallcc', 'x86_stdcallcc', 'x86_thiscallcc',
                 'x86_vectorcallcc', 'xchg', 'xor', 'zeroext',
                 'zeroinitializer', 'zext', 'immarg', 'willreturn'),
                 suffix=r'\b'), Keyword),
@@ -490,14 +503,13 @@ class LlvmLexer(RegexLexer):
 class LlvmMirBodyLexer(RegexLexer):
     """
     For LLVM MIR examples without the YAML wrapper.
-
-    .. versionadded:: 2.6
     """
     name = 'LLVM-MIR Body'
     url = 'https://llvm.org/docs/MIRLangRef.html'
     aliases = ['llvm-mir-body']
     filenames = []
     mimetypes = []
+    version_added = '2.6'
 
     tokens = {
         'root': [
@@ -635,13 +647,12 @@ class LlvmMirLexer(RegexLexer):
     machine specific intermediate representation. It allows LLVM's developers to
     see the state of the compilation process at various points, as well as test
     individual pieces of the compiler.
-
-    .. versionadded:: 2.6
     """
     name = 'LLVM-MIR'
     url = 'https://llvm.org/docs/MIRLangRef.html'
     aliases = ['llvm-mir']
     filenames = ['*.mir']
+    version_added = '2.6'
 
     tokens = {
         'root': [
@@ -715,6 +726,8 @@ class NasmLexer(RegexLexer):
     aliases = ['nasm']
     filenames = ['*.asm', '*.ASM', '*.nasm']
     mimetypes = ['text/x-nasm']
+    url = 'https://nasm.us'
+    version_added = ''
 
     # Tasm uses the same file endings, but TASM is not as common as NASM, so
     # we prioritize NASM higher by default
@@ -746,7 +759,7 @@ class NasmLexer(RegexLexer):
             (r'^\s*%', Comment.Preproc, 'preproc'),
             include('whitespace'),
             (identifier + ':', Name.Label),
-            (r'(%s)(\s+)(equ)' % identifier,
+            (rf'({identifier})(\s+)(equ)',
                 bygroups(Name.Constant, Whitespace, Keyword.Declaration),
                 'instruction-args'),
             (directives, Keyword, 'instruction-args'),
@@ -796,13 +809,13 @@ class NasmLexer(RegexLexer):
 class NasmObjdumpLexer(ObjdumpLexer):
     """
     For the output of ``objdump -d -M intel``.
-
-    .. versionadded:: 2.0
     """
     name = 'objdump-nasm'
     aliases = ['objdump-nasm']
     filenames = ['*.objdump-intel']
     mimetypes = ['text/x-nasm-objdump']
+    url = 'https://www.gnu.org/software/binutils'
+    version_added = '2.0'
 
     tokens = _objdump_lexer_tokens(NasmLexer)
 
@@ -815,6 +828,8 @@ class TasmLexer(RegexLexer):
     aliases = ['tasm']
     filenames = ['*.asm', '*.ASM', '*.tasm']
     mimetypes = ['text/x-tasm']
+    url = 'https://en.wikipedia.org/wiki/Turbo_Assembler'
+    version_added = ''
 
     identifier = r'[@a-z$._?][\w$.?#@~]*'
     hexn = r'(?:0x[0-9a-f]+|$0[0-9a-f]*|[0-9]+[0-9a-f]*h)'
@@ -844,7 +859,7 @@ class TasmLexer(RegexLexer):
             include('whitespace'),
             (identifier + ':', Name.Label),
             (directives, Keyword, 'instruction-args'),
-            (r'(%s)(\s+)(%s)' % (identifier, datatype),
+            (rf'({identifier})(\s+)({datatype})',
                 bygroups(Name.Constant, Whitespace, Keyword.Declaration),
                 'instruction-args'),
             (declkw, Keyword.Declaration, 'instruction-args'),
@@ -896,12 +911,12 @@ class TasmLexer(RegexLexer):
 class Ca65Lexer(RegexLexer):
     """
     For ca65 assembler sources.
-
-    .. versionadded:: 1.6
     """
     name = 'ca65 assembler'
     aliases = ['ca65']
     filenames = ['*.s']
+    url = 'https://cc65.github.io'
+    version_added = '1.6'
 
     flags = re.IGNORECASE
 
@@ -935,14 +950,13 @@ class Ca65Lexer(RegexLexer):
 class Dasm16Lexer(RegexLexer):
     """
     For DCPU-16 Assembly.
-
-    .. versionadded:: 2.4
     """
     name = 'DASM16'
     url = 'http://0x10c.com/doc/dcpu-16.txt'
     aliases = ['dasm16']
     filenames = ['*.dasm16', '*.dasm']
     mimetypes = ['text/x-dasm16']
+    version_added = '2.4'
 
     INSTRUCTIONS = [
         'SET',
diff --git a/libs/pygments/lexers/asn1.py b/libs/pygments/lexers/asn1.py
index 30632cb4d..6c7861bdb 100644
--- a/libs/pygments/lexers/asn1.py
+++ b/libs/pygments/lexers/asn1.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for ASN.1.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -118,8 +118,6 @@ class Asn1Lexer(RegexLexer):
 
     """
     Lexer for ASN.1 module definition
-
-    .. versionadded:: 2.16
     """
 
     flags = re.MULTILINE
@@ -128,6 +126,7 @@ class Asn1Lexer(RegexLexer):
     aliases = ['asn1']
     filenames = ["*.asn1"]
     url = "https://www.itu.int/ITU-T/studygroups/com17/languages/X.680-0207.pdf"
+    version_added = '2.16'
 
     tokens = {
        'root': [
diff --git a/libs/pygments/lexers/automation.py b/libs/pygments/lexers/automation.py
index f0f7c5b94..4e9c67811 100644
--- a/libs/pygments/lexers/automation.py
+++ b/libs/pygments/lexers/automation.py
@@ -4,7 +4,7 @@
 
     Lexers for automation scripting languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['AutohotkeyLexer', 'AutoItLexer']
 class AutohotkeyLexer(RegexLexer):
     """
     For autohotkey source code.
-
-    .. versionadded:: 1.4
     """
     name = 'autohotkey'
     url = 'http://www.autohotkey.com/'
     aliases = ['autohotkey', 'ahk']
     filenames = ['*.ahk', '*.ahkl']
     mimetypes = ['text/x-autohotkey']
+    version_added = '1.4'
 
     tokens = {
         'root': [
@@ -199,14 +198,13 @@ class AutoItLexer(RegexLexer):
 
     AutoIt is a freeware BASIC-like scripting language
     designed for automating the Windows GUI and general scripting
-
-    .. versionadded:: 1.6
     """
     name = 'AutoIt'
     url = 'http://www.autoitscript.com/site/autoit/'
     aliases = ['autoit']
     filenames = ['*.au3']
     mimetypes = ['text/x-autoit']
+    version_added = '1.6'
 
     # Keywords, functions, macros from au3.keywords.properties
     # which can be found in AutoIt installed directory, e.g.
@@ -337,15 +335,15 @@ class AutoItLexer(RegexLexer):
             include('garbage'),
         ],
         'commands': [
-            (r'(?i)(\s*)(%s)\b' % '|'.join(keywords),
+            (r'(?i)(\s*)({})\b'.format('|'.join(keywords)),
              bygroups(Text, Name.Builtin)),
         ],
         'builtInFunctions': [
-            (r'(?i)(%s)\b' % '|'.join(functions),
+            (r'(?i)({})\b'.format('|'.join(functions)),
              Name.Function),
         ],
         'builtInMarcros': [
-            (r'(?i)(%s)\b' % '|'.join(macros),
+            (r'(?i)({})\b'.format('|'.join(macros)),
              Name.Variable.Global),
         ],
         'labels': [
diff --git a/libs/pygments/lexers/bare.py b/libs/pygments/lexers/bare.py
index fce5ae073..d7167dc41 100644
--- a/libs/pygments/lexers/bare.py
+++ b/libs/pygments/lexers/bare.py
@@ -4,7 +4,7 @@
 
     Lexer for the BARE schema.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,13 +17,12 @@ __all__ = ['BareLexer']
 class BareLexer(RegexLexer):
     """
     For BARE schema source.
-
-    .. versionadded:: 2.7
     """
     name = 'BARE'
     url = 'https://baremessages.org'
     filenames = ['*.bare']
     aliases = ['bare']
+    version_added = '2.7'
 
     keywords = [
         'type',
diff --git a/libs/pygments/lexers/basic.py b/libs/pygments/lexers/basic.py
index 8837dacba..7c9123de7 100644
--- a/libs/pygments/lexers/basic.py
+++ b/libs/pygments/lexers/basic.py
@@ -4,7 +4,7 @@
 
     Lexers for BASIC like languages (other than VB.net).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,8 +23,6 @@ __all__ = ['BlitzBasicLexer', 'BlitzMaxLexer', 'MonkeyLexer', 'CbmBasicV2Lexer',
 class BlitzMaxLexer(RegexLexer):
     """
     For BlitzMax source code.
-
-    .. versionadded:: 1.4
     """
 
     name = 'BlitzMax'
@@ -32,14 +30,14 @@ class BlitzMaxLexer(RegexLexer):
     aliases = ['blitzmax', 'bmax']
     filenames = ['*.bmx']
     mimetypes = ['text/x-bmx']
+    version_added = '1.4'
 
     bmax_vopwords = r'\b(Shl|Shr|Sar|Mod)\b'
     bmax_sktypes = r'@{1,2}|[!#$%]'
     bmax_lktypes = r'\b(Int|Byte|Short|Float|Double|Long)\b'
     bmax_name = r'[a-z_]\w*'
-    bmax_var = (r'(%s)(?:(?:([ \t]*)(%s)|([ \t]*:[ \t]*\b(?:Shl|Shr|Sar|Mod)\b)'
-                r'|([ \t]*)(:)([ \t]*)(?:%s|(%s)))(?:([ \t]*)(Ptr))?)') % \
-        (bmax_name, bmax_sktypes, bmax_lktypes, bmax_name)
+    bmax_var = (rf'({bmax_name})(?:(?:([ \t]*)({bmax_sktypes})|([ \t]*:[ \t]*\b(?:Shl|Shr|Sar|Mod)\b)'
+                rf'|([ \t]*)(:)([ \t]*)(?:{bmax_lktypes}|({bmax_name})))(?:([ \t]*)(Ptr))?)')
     bmax_func = bmax_var + r'?((?:[ \t]|\.\.\n)*)([(])'
 
     flags = re.MULTILINE | re.IGNORECASE
@@ -60,16 +58,14 @@ class BlitzMaxLexer(RegexLexer):
             (r'\$[0-9a-f]+', Number.Hex),
             (r'\%[10]+', Number.Bin),
             # Other
-            (r'(?:(?:(:)?([ \t]*)(:?%s|([+\-*/&|~]))|Or|And|Not|[=<>^]))' %
-             (bmax_vopwords), Operator),
+            (rf'(?:(?:(:)?([ \t]*)(:?{bmax_vopwords}|([+\-*/&|~]))|Or|And|Not|[=<>^]))', Operator),
             (r'[(),.:\[\]]', Punctuation),
             (r'(?:#[\w \t]*)', Name.Label),
             (r'(?:\?[\w \t]*)', Comment.Preproc),
             # Identifiers
-            (r'\b(New)\b([ \t]?)([(]?)(%s)' % (bmax_name),
+            (rf'\b(New)\b([ \t]?)([(]?)({bmax_name})',
              bygroups(Keyword.Reserved, Whitespace, Punctuation, Name.Class)),
-            (r'\b(Import|Framework|Module)([ \t]+)(%s\.%s)' %
-             (bmax_name, bmax_name),
+            (rf'\b(Import|Framework|Module)([ \t]+)({bmax_name}\.{bmax_name})',
              bygroups(Keyword.Reserved, Whitespace, Keyword.Namespace)),
             (bmax_func, bygroups(Name.Function, Whitespace, Keyword.Type,
                                  Operator, Whitespace, Punctuation, Whitespace,
@@ -78,7 +74,7 @@ class BlitzMaxLexer(RegexLexer):
             (bmax_var, bygroups(Name.Variable, Whitespace, Keyword.Type, Operator,
                                 Whitespace, Punctuation, Whitespace, Keyword.Type,
                                 Name.Class, Whitespace, Keyword.Type)),
-            (r'\b(Type|Extends)([ \t]+)(%s)' % (bmax_name),
+            (rf'\b(Type|Extends)([ \t]+)({bmax_name})',
              bygroups(Keyword.Reserved, Whitespace, Name.Class)),
             # Keywords
             (r'\b(Ptr)\b', Keyword.Type),
@@ -102,7 +98,7 @@ class BlitzMaxLexer(RegexLexer):
                 'RestoreData'), prefix=r'\b', suffix=r'\b'),
              Keyword.Reserved),
             # Final resolve (for variable names and such)
-            (r'(%s)' % (bmax_name), Name.Variable),
+            (rf'({bmax_name})', Name.Variable),
         ],
         'string': [
             (r'""', String.Double),
@@ -115,8 +111,6 @@ class BlitzMaxLexer(RegexLexer):
 class BlitzBasicLexer(RegexLexer):
     """
     For BlitzBasic source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'BlitzBasic'
@@ -124,11 +118,11 @@ class BlitzBasicLexer(RegexLexer):
     aliases = ['blitzbasic', 'b3d', 'bplus']
     filenames = ['*.bb', '*.decls']
     mimetypes = ['text/x-bb']
+    version_added = '2.0'
 
     bb_sktypes = r'@{1,2}|[#$%]'
     bb_name = r'[a-z]\w*'
-    bb_var = (r'(%s)(?:([ \t]*)(%s)|([ \t]*)([.])([ \t]*)(?:(%s)))?') % \
-             (bb_name, bb_sktypes, bb_name)
+    bb_var = (rf'({bb_name})(?:([ \t]*)({bb_sktypes})|([ \t]*)([.])([ \t]*)(?:({bb_name})))?')
 
     flags = re.MULTILINE | re.IGNORECASE
     tokens = {
@@ -153,21 +147,21 @@ class BlitzBasicLexer(RegexLexer):
              Operator),
             (r'([+\-*/~=<>^])', Operator),
             (r'[(),:\[\]\\]', Punctuation),
-            (r'\.([ \t]*)(%s)' % bb_name, Name.Label),
+            (rf'\.([ \t]*)({bb_name})', Name.Label),
             # Identifiers
-            (r'\b(New)\b([ \t]+)(%s)' % (bb_name),
+            (rf'\b(New)\b([ \t]+)({bb_name})',
              bygroups(Keyword.Reserved, Whitespace, Name.Class)),
-            (r'\b(Gosub|Goto)\b([ \t]+)(%s)' % (bb_name),
+            (rf'\b(Gosub|Goto)\b([ \t]+)({bb_name})',
              bygroups(Keyword.Reserved, Whitespace, Name.Label)),
-            (r'\b(Object)\b([ \t]*)([.])([ \t]*)(%s)\b' % (bb_name),
+            (rf'\b(Object)\b([ \t]*)([.])([ \t]*)({bb_name})\b',
              bygroups(Operator, Whitespace, Punctuation, Whitespace, Name.Class)),
-            (r'\b%s\b([ \t]*)(\()' % bb_var,
+            (rf'\b{bb_var}\b([ \t]*)(\()',
              bygroups(Name.Function, Whitespace, Keyword.Type, Whitespace, Punctuation,
                       Whitespace, Name.Class, Whitespace, Punctuation)),
-            (r'\b(Function)\b([ \t]+)%s' % bb_var,
+            (rf'\b(Function)\b([ \t]+){bb_var}',
              bygroups(Keyword.Reserved, Whitespace, Name.Function, Whitespace, Keyword.Type,
                       Whitespace, Punctuation, Whitespace, Name.Class)),
-            (r'\b(Type)([ \t]+)(%s)' % (bb_name),
+            (rf'\b(Type)([ \t]+)({bb_name})',
              bygroups(Keyword.Reserved, Whitespace, Name.Class)),
             # Keywords
             (r'\b(Pi|True|False|Null)\b', Keyword.Constant),
@@ -194,17 +188,15 @@ class BlitzBasicLexer(RegexLexer):
 
 class MonkeyLexer(RegexLexer):
     """
-    For
-    `Monkey <https://en.wikipedia.org/wiki/Monkey_(programming_language)>`_
-    source code.
-
-    .. versionadded:: 1.6
+    For Monkey source code.
     """
 
     name = 'Monkey'
     aliases = ['monkey']
     filenames = ['*.monkey']
     mimetypes = ['text/x-monkey']
+    url = 'https://blitzresearch.itch.io/monkeyx'
+    version_added = '1.6'
 
     name_variable = r'[a-z_]\w*'
     name_function = r'[A-Z]\w*'
@@ -238,7 +230,7 @@ class MonkeyLexer(RegexLexer):
             (r'\$[0-9a-fA-Z]+', Number.Hex),
             (r'\%[10]+', Number.Bin),
             # Native data types
-            (r'\b%s\b' % keyword_type, Keyword.Type),
+            (rf'\b{keyword_type}\b', Keyword.Type),
             # Exception handling
             (r'(?i)\b(?:Try|Catch|Throw)\b', Keyword.Reserved),
             (r'Throwable', Name.Exception),
@@ -274,21 +266,21 @@ class MonkeyLexer(RegexLexer):
             (r'(?i)(?:Not|Mod|Shl|Shr|And|Or)', Operator.Word),
             (r'[(){}!#,.:]', Punctuation),
             # catch the rest
-            (r'%s\b' % name_constant, Name.Constant),
-            (r'%s\b' % name_function, Name.Function),
-            (r'%s\b' % name_variable, Name.Variable),
+            (rf'{name_constant}\b', Name.Constant),
+            (rf'{name_function}\b', Name.Function),
+            (rf'{name_variable}\b', Name.Variable),
         ],
         'funcname': [
-            (r'(?i)%s\b' % name_function, Name.Function),
+            (rf'(?i){name_function}\b', Name.Function),
             (r':', Punctuation, 'classname'),
             (r'\s+', Whitespace),
             (r'\(', Punctuation, 'variables'),
             (r'\)', Punctuation, '#pop')
         ],
         'classname': [
-            (r'%s\.' % name_module, Name.Namespace),
-            (r'%s\b' % keyword_type, Keyword.Type),
-            (r'%s\b' % name_class, Name.Class),
+            (rf'{name_module}\.', Name.Namespace),
+            (rf'{keyword_type}\b', Keyword.Type),
+            (rf'{name_class}\b', Name.Class),
             # array (of given size)
             (r'(\[)(\s*)(\d*)(\s*)(\])',
              bygroups(Punctuation, Whitespace, Number.Integer, Whitespace, Punctuation)),
@@ -300,9 +292,9 @@ class MonkeyLexer(RegexLexer):
             default('#pop')
         ],
         'variables': [
-            (r'%s\b' % name_constant, Name.Constant),
-            (r'%s\b' % name_variable, Name.Variable),
-            (r'%s' % keyword_type_special, Keyword.Type),
+            (rf'{name_constant}\b', Name.Constant),
+            (rf'{name_variable}\b', Name.Variable),
+            (rf'{keyword_type_special}', Keyword.Type),
             (r'\s+', Whitespace),
             (r':', Punctuation, 'classname'),
             (r',', Punctuation, '#push'),
@@ -325,12 +317,12 @@ class MonkeyLexer(RegexLexer):
 class CbmBasicV2Lexer(RegexLexer):
     """
     For CBM BASIC V2 sources.
-
-    .. versionadded:: 1.6
     """
     name = 'CBM BASIC V2'
     aliases = ['cbmbas']
     filenames = ['*.bas']
+    url = 'https://en.wikipedia.org/wiki/Commodore_BASIC'
+    version_added = '1.6'
 
     flags = re.IGNORECASE
 
@@ -362,17 +354,15 @@ class CbmBasicV2Lexer(RegexLexer):
 
 class QBasicLexer(RegexLexer):
     """
-    For
-    `QBasic <http://en.wikipedia.org/wiki/QBasic>`_
-    source code.
-
-    .. versionadded:: 2.0
+    For QBasic source code.
     """
 
     name = 'QBasic'
     aliases = ['qbasic', 'basic']
     filenames = ['*.BAS', '*.bas']
     mimetypes = ['text/basic']
+    url = 'https://en.wikipedia.org/wiki/QBasic'
+    version_added = '2.0'
 
     declarations = ('DATA', 'LET')
 
@@ -475,26 +465,26 @@ class QBasicLexer(RegexLexer):
         # can't use regular \b because of X$()
         # XXX: use words() here
         'declarations': [
-            (r'\b(%s)(?=\(|\b)' % '|'.join(map(re.escape, declarations)),
+            (r'\b({})(?=\(|\b)'.format('|'.join(map(re.escape, declarations))),
              Keyword.Declaration),
         ],
         'functions': [
-            (r'\b(%s)(?=\(|\b)' % '|'.join(map(re.escape, functions)),
+            (r'\b({})(?=\(|\b)'.format('|'.join(map(re.escape, functions))),
              Keyword.Reserved),
         ],
         'metacommands': [
-            (r'\b(%s)(?=\(|\b)' % '|'.join(map(re.escape, metacommands)),
+            (r'\b({})(?=\(|\b)'.format('|'.join(map(re.escape, metacommands))),
              Keyword.Constant),
         ],
         'operators': [
-            (r'\b(%s)(?=\(|\b)' % '|'.join(map(re.escape, operators)), Operator.Word),
+            (r'\b({})(?=\(|\b)'.format('|'.join(map(re.escape, operators))), Operator.Word),
         ],
         'statements': [
-            (r'\b(%s)\b' % '|'.join(map(re.escape, statements)),
+            (r'\b({})\b'.format('|'.join(map(re.escape, statements))),
              Keyword.Reserved),
         ],
         'keywords': [
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
         ],
     }
 
@@ -506,12 +496,13 @@ class QBasicLexer(RegexLexer):
 class VBScriptLexer(RegexLexer):
     """
     VBScript is scripting language that is modeled on Visual Basic.
-
-    .. versionadded:: 2.4
     """
     name = 'VBScript'
     aliases = ['vbscript']
     filenames = ['*.vbs', '*.VBS']
+    url = 'https://learn.microsoft.com/en-us/previous-versions/t0aew7h6(v=vs.85)'
+    version_added = '2.4'
+
     flags = re.IGNORECASE
 
     tokens = {
@@ -573,8 +564,6 @@ class BBCBasicLexer(RegexLexer):
     """
     BBC Basic was supplied on the BBC Micro, and later Acorn RISC OS.
     It is also used by BBC Basic For Windows.
-
-    .. versionadded:: 2.4
     """
     base_keywords = ['OTHERWISE', 'AND', 'DIV', 'EOR', 'MOD', 'OR', 'ERROR',
                      'LINE', 'OFF', 'STEP', 'SPC', 'TAB', 'ELSE', 'THEN',
@@ -607,6 +596,8 @@ class BBCBasicLexer(RegexLexer):
     name = 'BBC Basic'
     aliases = ['bbcbasic']
     filenames = ['*.bbc']
+    url = 'https://www.bbcbasic.co.uk/bbcbasic.html'
+    version_added = '2.4'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/bdd.py b/libs/pygments/lexers/bdd.py
index 8cf47f8de..6ddb6056d 100644
--- a/libs/pygments/lexers/bdd.py
+++ b/libs/pygments/lexers/bdd.py
@@ -3,9 +3,8 @@
     ~~~~~~~~~~~~~~~~~~~
 
     Lexer for BDD(Behavior-driven development).
-    More information: https://en.wikipedia.org/wiki/Behavior-driven_development
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +18,14 @@ class BddLexer(RegexLexer):
     """
     Lexer for BDD(Behavior-driven development), which highlights not only
     keywords, but also comments, punctuations, strings, numbers, and variables.
-
-    .. versionadded:: 2.11
     """
 
     name = 'Bdd'
     aliases = ['bdd']
     filenames = ['*.feature']
     mimetypes = ['text/x-bdd']
+    url = 'https://en.wikipedia.org/wiki/Behavior-driven_development'
+    version_added = '2.11'
 
     step_keywords = (r'Given|When|Then|Add|And|Feature|Scenario Outline|'
                      r'Scenario|Background|Examples|But')
diff --git a/libs/pygments/lexers/berry.py b/libs/pygments/lexers/berry.py
index e078fa167..5f772b1ad 100644
--- a/libs/pygments/lexers/berry.py
+++ b/libs/pygments/lexers/berry.py
@@ -4,7 +4,7 @@
 
     Lexer for Berry.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,14 +17,14 @@ __all__ = ['BerryLexer']
 
 class BerryLexer(RegexLexer):
     """
-    For `berry <http://github.com/berry-lang/berry>`_ source code.
-
-    .. versionadded:: 2.12.0
+    For Berry source code.
     """
     name = 'Berry'
     aliases = ['berry', 'be']
     filenames = ['*.be']
     mimetypes = ['text/x-berry', 'application/x-berry']
+    url = 'https://berry-lang.github.io'
+    version_added = '2.12'
 
     _name = r'\b[^\W\d]\w*'
 
diff --git a/libs/pygments/lexers/bibtex.py b/libs/pygments/lexers/bibtex.py
index 34883cd83..32cc40ae7 100644
--- a/libs/pygments/lexers/bibtex.py
+++ b/libs/pygments/lexers/bibtex.py
@@ -4,7 +4,7 @@
 
     Lexers for BibTeX bibliography data and styles
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,15 +21,15 @@ __all__ = ['BibTeXLexer', 'BSTLexer']
 class BibTeXLexer(ExtendedRegexLexer):
     """
     A lexer for BibTeX bibliography data format.
-
-    .. versionadded:: 2.2
     """
 
     name = 'BibTeX'
     aliases = ['bibtex', 'bib']
     filenames = ['*.bib']
     mimetypes = ["text/x-bibtex"]
+    version_added = '2.2'
     flags = re.IGNORECASE
+    url = 'https://texfaq.org/FAQ-BibTeXing'
 
     ALLOWED_CHARS = r'@!$&*+\-./:;<>?\[\\\]^`|~'
     IDENTIFIER = '[{}][{}]*'.format('a-z_' + ALLOWED_CHARS, r'\w' + ALLOWED_CHARS)
@@ -116,14 +116,14 @@ class BibTeXLexer(ExtendedRegexLexer):
 class BSTLexer(RegexLexer):
     """
     A lexer for BibTeX bibliography styles.
-
-    .. versionadded:: 2.2
     """
 
     name = 'BST'
     aliases = ['bst', 'bst-pybtex']
     filenames = ['*.bst']
+    version_added = '2.2'
     flags = re.IGNORECASE | re.MULTILINE
+    url = 'https://texfaq.org/FAQ-BibTeXing'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/blueprint.py b/libs/pygments/lexers/blueprint.py
index ec5c6188e..59f9c42a4 100644
--- a/libs/pygments/lexers/blueprint.py
+++ b/libs/pygments/lexers/blueprint.py
@@ -4,7 +4,7 @@
 
     Lexer for the Blueprint UI markup language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -28,8 +28,6 @@ __all__ = ["BlueprintLexer"]
 class BlueprintLexer(RegexLexer):
     """
     For Blueprint UI markup.
-
-    .. versionadded:: 2.16
     """
 
     name = "Blueprint"
@@ -37,6 +35,7 @@ class BlueprintLexer(RegexLexer):
     filenames = ["*.blp"]
     mimetypes = ["text/x-blueprint"]
     url = "https://gitlab.gnome.org/jwestman/blueprint-compiler"
+    version_added = '2.16'
 
     flags = re.IGNORECASE
     tokens = {
diff --git a/libs/pygments/lexers/boa.py b/libs/pygments/lexers/boa.py
index f7baf3cd2..6f4e8cdaf 100644
--- a/libs/pygments/lexers/boa.py
+++ b/libs/pygments/lexers/boa.py
@@ -4,7 +4,7 @@
 
     Lexers for the Boa language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,13 +17,13 @@ __all__ = ['BoaLexer']
 
 class BoaLexer(RegexLexer):
     """
-    Lexer for the `Boa <http://boa.cs.iastate.edu/docs/>`_ language.
-
-    .. versionadded:: 2.4
+    Lexer for the Boa language.
     """
     name = 'Boa'
     aliases = ['boa']
     filenames = ['*.boa']
+    url = 'https://boa.cs.iastate.edu/docs'
+    version_added = '2.4'
 
     reserved = words(
         ('input', 'output', 'of', 'weight', 'before', 'after', 'stop',
diff --git a/libs/pygments/lexers/bqn.py b/libs/pygments/lexers/bqn.py
index af84b4d04..083f69b61 100644
--- a/libs/pygments/lexers/bqn.py
+++ b/libs/pygments/lexers/bqn.py
@@ -4,7 +4,7 @@
 
     Lexer for BQN.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,17 @@ __all__ = ['BQNLexer']
 class BQNLexer(RegexLexer):
     """
     A simple BQN lexer.
-
-    .. versionadded:: 2.16
     """
     name = 'BQN'
     url = 'https://mlochbaum.github.io/BQN/index.html'
     aliases = ['bqn']
     filenames = ['*.bqn']
     mimetypes = []
+    version_added = '2.16'
+
+    # An inter_word_char. Necessary because \w matches all alphanumeric
+    # Unicode characters, including ones (e.g., 𝕊) that BQN treats special.
+    _iwc = r'((?=[^𝕎𝕏𝔽𝔾𝕊𝕨𝕩𝕗𝕘𝕤𝕣])\w)'
 
     tokens = {
         'root': [
@@ -58,34 +61,35 @@ class BQNLexer(RegexLexer):
             # ===================
             # Since this token type is important in BQN, it is not included in
             # the punctuation token type but rather in the following one
-            (r'[\(\)]', String.Regex), 
+            (r'[\(\)]', String.Regex),
             #
             # Numbers
             # =======
             # Includes the numeric literals and the Nothing character
-            (r'¯?([0-9]+\.?[0-9]+|[0-9]+)([Ee][¯]?[0-9]+)?|¯|∞|π|·', Number),
+            (r'¯?[0-9](([0-9]|_)*\.?([0-9]|_)+|([0-9]|_)*)([Ee][¯]?([0-9]|_)+)?|¯|∞|π|·', Number),
             #
             # Variables
             # =========
-            (r'\b[a-z]\w*\b', Name.Variable),
+            (r'[a-z]' + _iwc + r'*', Name.Variable),
+            #
+            # 2-Modifiers
+            # ===========
+            # Needs to come before the 1-modifiers due to _𝕣 and _𝕣_
+            (r'[∘○⊸⟜⌾⊘◶⎉⚇⍟⎊]', Name.Property),
+            (r'_(𝕣|[a-zA-Z0-9]+)_', Name.Property),
             #
             # 1-Modifiers
             # ===========
             (r'[˙˜˘¨⌜⁼´˝`𝕣]', Name.Attribute),
-            (r'\b_[a-zA-Z0-9]+\b', Name.Attribute),
-            #
-            # 2-Modifiers
-            # ===========
-            (r'[∘○⊸⟜⌾⊘◶⎉⚇⍟⎊]', Name.Property),
-            (r'\b_[a-zA-Z0-9]+_\b', Name.Property),
+            (r'_(𝕣|[a-zA-Z0-9]+)', Name.Attribute),
             #
             # Functions
             # =========
             # The monadic or dyadic function primitives and function
             # operands and arguments, along with function self-reference
-            (r'[+\-×÷\*√⌊⌈∧∨¬|≤<>≥=≠≡≢⊣⊢⥊∾≍⋈↑↓↕«»⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔!𝕎𝕏𝔽𝔾𝕊]',
+            (r'[+\-×÷\⋆√⌊⌈∧∨¬|≤<>≥=≠≡≢⊣⊢⥊∾≍⋈↑↓↕«»⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔!𝕎𝕏𝔽𝔾𝕊]',
              Operator),
-            (r'[A-Z]\w*|•\w+\b', Operator),
+            (r'[A-Z]' + _iwc + r'*|•' + _iwc + r'+', Operator),
             #
             # Constant
             # ========
@@ -103,8 +107,6 @@ class BQNLexer(RegexLexer):
             # ================
             (r'[;:?𝕨𝕩𝕗𝕘𝕤]', Name.Entity),
             #
-            
+
         ],
     }
-
-    
diff --git a/libs/pygments/lexers/business.py b/libs/pygments/lexers/business.py
index d2f2dd3ae..73adb8709 100644
--- a/libs/pygments/lexers/business.py
+++ b/libs/pygments/lexers/business.py
@@ -4,7 +4,7 @@
 
     Lexers for "business-oriented" languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,13 +23,14 @@ __all__ = ['CobolLexer', 'CobolFreeformatLexer', 'ABAPLexer', 'OpenEdgeLexer',
 class CobolLexer(RegexLexer):
     """
     Lexer for OpenCOBOL code.
-
-    .. versionadded:: 1.6
     """
     name = 'COBOL'
     aliases = ['cobol']
     filenames = ['*.cob', '*.COB', '*.cpy', '*.CPY']
     mimetypes = ['text/x-cobol']
+    url = 'https://en.wikipedia.org/wiki/COBOL'
+    version_added = '1.6'
+
     flags = re.IGNORECASE | re.MULTILINE
 
     # Data Types: by PICTURE and USAGE
@@ -221,13 +222,14 @@ class CobolLexer(RegexLexer):
 class CobolFreeformatLexer(CobolLexer):
     """
     Lexer for Free format OpenCOBOL code.
-
-    .. versionadded:: 1.6
     """
     name = 'COBOLFree'
     aliases = ['cobolfree']
     filenames = ['*.cbl', '*.CBL']
     mimetypes = []
+    url = 'https://opencobol.add1tocobol.com'
+    version_added = '1.6'
+
     flags = re.IGNORECASE | re.MULTILINE
 
     tokens = {
@@ -240,13 +242,13 @@ class CobolFreeformatLexer(CobolLexer):
 class ABAPLexer(RegexLexer):
     """
     Lexer for ABAP, SAP's integrated language.
-
-    .. versionadded:: 1.1
     """
     name = 'ABAP'
     aliases = ['abap']
     filenames = ['*.abap', '*.ABAP']
     mimetypes = ['text/x-abap']
+    url = 'https://community.sap.com/topics/abap'
+    version_added = '1.1'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -448,15 +450,14 @@ class ABAPLexer(RegexLexer):
 
 class OpenEdgeLexer(RegexLexer):
     """
-    Lexer for `OpenEdge ABL (formerly Progress)
-    <http://web.progress.com/en/openedge/abl.html>`_ source code.
-
-    .. versionadded:: 1.5
+    Lexer for OpenEdge ABL (formerly Progress) source code.
     """
     name = 'OpenEdge ABL'
     aliases = ['openedge', 'abl', 'progress']
     filenames = ['*.p', '*.cls']
     mimetypes = ['text/x-openedge', 'application/x-openedge']
+    url = 'https://www.progress.com/openedge/features/abl'
+    version_added = '1.5'
 
     types = (r'(?i)(^|(?<=[^\w\-]))(CHARACTER|CHAR|CHARA|CHARAC|CHARACT|CHARACTE|'
              r'COM-HANDLE|DATE|DATETIME|DATETIME-TZ|'
@@ -517,20 +518,20 @@ class OpenEdgeLexer(RegexLexer):
 
 class GoodDataCLLexer(RegexLexer):
     """
-    Lexer for `GoodData-CL
-    <https://github.com/gooddata/GoodData-CL/raw/master/cli/src/main/resources/\
-com/gooddata/processor/COMMANDS.txt>`_
-    script files.
-
-    .. versionadded:: 1.4
+    Lexer for GoodData-CL script files.
     """
 
     name = 'GoodData-CL'
     aliases = ['gooddata-cl']
     filenames = ['*.gdc']
     mimetypes = ['text/x-gooddata-cl']
+    url = 'https://github.com/gooddata/GoodData-CL'
+    version_added = '1.4'
 
     flags = re.IGNORECASE
+
+    # Syntax:
+    # https://github.com/gooddata/GoodData-CL/raw/master/cli/src/main/resources/com/gooddata/processor/COMMANDS.txt
     tokens = {
         'root': [
             # Comments
@@ -564,17 +565,15 @@ com/gooddata/processor/COMMANDS.txt>`_
 
 class MaqlLexer(RegexLexer):
     """
-    Lexer for `GoodData MAQL
-    <https://secure.gooddata.com/docs/html/advanced.metric.tutorial.html>`_
-    scripts.
-
-    .. versionadded:: 1.4
+    Lexer for GoodData MAQL scripts.
     """
 
     name = 'MAQL'
     aliases = ['maql']
     filenames = ['*.maql']
     mimetypes = ['text/x-gooddata-maql', 'application/x-gooddata-maql']
+    url = 'https://help.gooddata.com/doc/enterprise/en/dashboards-and-insights/maql-analytical-query-language'
+    version_added = '1.4'
 
     flags = re.IGNORECASE
     tokens = {
diff --git a/libs/pygments/lexers/c_cpp.py b/libs/pygments/lexers/c_cpp.py
index ba6702f56..399f2bc4f 100644
--- a/libs/pygments/lexers/c_cpp.py
+++ b/libs/pygments/lexers/c_cpp.py
@@ -4,7 +4,7 @@
 
     Lexers for C/C++ languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -294,6 +294,8 @@ class CLexer(CFamilyLexer):
     aliases = ['c']
     filenames = ['*.c', '*.h', '*.idc', '*.x[bp]m']
     mimetypes = ['text/x-chdr', 'text/x-csrc', 'image/x-xbitmap', 'image/x-xpixmap']
+    url = 'https://en.wikipedia.org/wiki/C_(programming_language)'
+    version_added = ''
     priority = 0.1
 
     tokens = {
@@ -347,6 +349,7 @@ class CppLexer(CFamilyLexer):
                  '*.cc', '*.hh', '*.cxx', '*.hxx',
                  '*.C', '*.H', '*.cp', '*.CPP', '*.tpp']
     mimetypes = ['text/x-c++hdr', 'text/x-c++src']
+    version_added = ''
     priority = 0.1
 
     tokens = {
diff --git a/libs/pygments/lexers/c_like.py b/libs/pygments/lexers/c_like.py
index a7379c9bb..1ba269e82 100644
--- a/libs/pygments/lexers/c_like.py
+++ b/libs/pygments/lexers/c_like.py
@@ -4,7 +4,7 @@
 
     Lexers for other C-like languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,19 +20,18 @@ from pygments.lexers import _mql_builtins
 
 __all__ = ['PikeLexer', 'NesCLexer', 'ClayLexer', 'ECLexer', 'ValaLexer',
            'CudaLexer', 'SwigLexer', 'MqlLexer', 'ArduinoLexer', 'CharmciLexer',
-           'OmgIdlLexer']
+           'OmgIdlLexer', 'PromelaLexer']
 
 
 class PikeLexer(CppLexer):
     """
     For `Pike <http://pike.lysator.liu.se/>`_ source code.
-
-    .. versionadded:: 2.0
     """
     name = 'Pike'
     aliases = ['pike']
     filenames = ['*.pike', '*.pmod']
     mimetypes = ['text/x-pike']
+    version_added = '2.0'
 
     tokens = {
         'statements': [
@@ -68,13 +67,12 @@ class NesCLexer(CLexer):
     """
     For `nesC <https://github.com/tinyos/nesc>`_ source code with preprocessor
     directives.
-
-    .. versionadded:: 2.0
     """
     name = 'nesC'
     aliases = ['nesc']
     filenames = ['*.nc']
     mimetypes = ['text/x-nescsrc']
+    version_added = '2.0'
 
     tokens = {
         'statements': [
@@ -95,14 +93,15 @@ class NesCLexer(CLexer):
 
 class ClayLexer(RegexLexer):
     """
-    For `Clay <http://claylabs.com/clay/>`_ source.
-
-    .. versionadded:: 2.0
+    For Clay source.
     """
     name = 'Clay'
     filenames = ['*.clay']
     aliases = ['clay']
     mimetypes = ['text/x-clay']
+    url = 'http://claylabs.com/clay'
+    version_added = '2.0'
+
     tokens = {
         'root': [
             (r'\s+', Whitespace),
@@ -147,13 +146,13 @@ class ClayLexer(RegexLexer):
 class ECLexer(CLexer):
     """
     For eC source code with preprocessor directives.
-
-    .. versionadded:: 1.5
     """
     name = 'eC'
     aliases = ['ec']
     filenames = ['*.ec', '*.eh']
     mimetypes = ['text/x-echdr', 'text/x-ecsrc']
+    url = 'https://ec-lang.org'
+    version_added = '1.5'
 
     tokens = {
         'statements': [
@@ -180,13 +179,13 @@ class ECLexer(CLexer):
 class ValaLexer(RegexLexer):
     """
     For Vala source code with preprocessor directives.
-
-    .. versionadded:: 1.1
     """
     name = 'Vala'
     aliases = ['vala', 'vapi']
     filenames = ['*.vala', '*.vapi']
     mimetypes = ['text/x-vala']
+    url = 'https://vala.dev'
+    version_added = '1.1'
 
     tokens = {
         'whitespace': [
@@ -277,15 +276,14 @@ class ValaLexer(RegexLexer):
 
 class CudaLexer(CLexer):
     """
-    For NVIDIA `CUDA™ <http://developer.nvidia.com/category/zone/cuda-zone>`_
-    source.
-
-    .. versionadded:: 1.6
+    For NVIDIA CUDA™ source.
     """
     name = 'CUDA'
     filenames = ['*.cu', '*.cuh']
     aliases = ['cuda', 'cu']
     mimetypes = ['text/x-cuda']
+    url = 'https://developer.nvidia.com/category/zone/cuda-zone'
+    version_added = '1.6'
 
     function_qualifiers = {'__device__', '__global__', '__host__',
                            '__noinline__', '__forceinline__'}
@@ -326,13 +324,12 @@ class CudaLexer(CLexer):
 class SwigLexer(CppLexer):
     """
     For `SWIG <http://www.swig.org/>`_ source code.
-
-    .. versionadded:: 2.0
     """
     name = 'SWIG'
     aliases = ['swig']
     filenames = ['*.swg', '*.i']
     mimetypes = ['text/swig']
+    version_added = '2.0'
     priority = 0.04  # Lower than C/C++ and Objective C/C++
 
     tokens = {
@@ -393,13 +390,12 @@ class MqlLexer(CppLexer):
     """
     For `MQL4 <http://docs.mql4.com/>`_ and
     `MQL5 <http://www.mql5.com/en/docs>`_ source code.
-
-    .. versionadded:: 2.0
     """
     name = 'MQL'
     aliases = ['mql', 'mq4', 'mq5', 'mql4', 'mql5']
     filenames = ['*.mq4', '*.mq5', '*.mqh']
     mimetypes = ['text/x-mql']
+    version_added = '2.0'
 
     tokens = {
         'statements': [
@@ -420,14 +416,13 @@ class ArduinoLexer(CppLexer):
 
     This is an extension of the CppLexer, as the Arduino® Language is a superset
     of C++
-
-    .. versionadded:: 2.1
     """
 
     name = 'Arduino'
     aliases = ['arduino']
     filenames = ['*.ino']
     mimetypes = ['text/x-arduino']
+    version_added = '2.1'
 
     # Language sketch main structure functions
     structure = {'setup', 'loop'}
@@ -545,13 +540,12 @@ class ArduinoLexer(CppLexer):
 class CharmciLexer(CppLexer):
     """
     For `Charm++ <https://charm.cs.illinois.edu>`_ interface files (.ci).
-
-    .. versionadded:: 2.4
     """
 
     name = 'Charmci'
     aliases = ['charmci']
     filenames = ['*.ci']
+    version_added = '2.4'
 
     mimetypes = []
 
@@ -575,8 +569,6 @@ class CharmciLexer(CppLexer):
 class OmgIdlLexer(CLexer):
     """
     Lexer for Object Management Group Interface Definition Language.
-
-    .. versionadded:: 2.9
     """
 
     name = 'OMG Interface Definition Language'
@@ -584,6 +576,7 @@ class OmgIdlLexer(CLexer):
     aliases = ['omg-idl']
     filenames = ['*.idl', '*.pidl']
     mimetypes = []
+    version_added = '2.9'
 
     scoped_name = r'((::)?\w+)+'
 
@@ -664,3 +657,82 @@ class OmgIdlLexer(CLexer):
             include('annotation_appl'),
         ],
     }
+
+
+class PromelaLexer(CLexer):
+    """
+    For the Promela language used with SPIN.
+    """
+    
+    name = 'Promela'
+    aliases = ['promela']
+    filenames = ['*.pml', '*.prom', '*.prm', '*.promela', '*.pr', '*.pm']
+    mimetypes = ['text/x-promela']
+    url = 'https://spinroot.com/spin/whatispin.html'
+    version_added = '2.18'
+
+    # Promela's language reference:
+    # https://spinroot.com/spin/Man/promela.html
+    # Promela's grammar definition:
+    # https://spinroot.com/spin/Man/grammar.html
+
+    tokens = {
+        'statements': [
+            (r'(\[\]|<>|/\\|\\/)|(U|W|V)\b', Operator), # LTL Operators
+            (r'@', Punctuation), #remoterefs
+            (r'(\.)([a-zA-Z_]\w*)', bygroups(Operator, Name.Attribute)),
+            inherit
+        ],
+        'types': [
+            # Predefined (data types)
+            (words((
+                'bit', 'bool', 'byte', 'pid', 'short', 'int', 'unsigned'),
+                suffix=r'\b'),
+             Keyword.Type),
+        ],
+        'keywords': [
+            # ControlFlow
+            (words((
+                'atomic', 'break', 'd_step', 'do', 'od', 'for', 'in', 'goto',
+                'if', 'fi', 'unless'), suffix=r'\b'),
+             Keyword),
+            # BasicStatements
+            (words((
+                'assert', 'get_priority', 'printf', 'printm', 'set_priority'),
+                suffix=r'\b'),
+             Name.Function),
+            # Embedded C Code
+            (words((
+                'c_code', 'c_decl', 'c_expr', 'c_state', 'c_track'),
+                suffix=r'\b'),
+             Keyword),
+            # Predefined (local/global variables)
+            (words((
+                '_', '_last', '_nr_pr', '_pid', '_priority', 'else', 'np_',
+                'STDIN'), suffix=r'\b'),
+             Name.Builtin),
+            # Predefined (functions)
+            (words((
+                'empty', 'enabled', 'eval', 'full', 'len', 'nempty', 'nfull',
+                'pc_value'), suffix=r'\b'),
+             Name.Function),
+            # Predefined (operators)
+            (r'run\b', Operator.Word),
+            # Declarators
+            (words((
+                'active', 'chan', 'D_proctype', 'hidden', 'init', 'local',
+                'mtype', 'never', 'notrace', 'proctype', 'show', 'trace',
+                'typedef', 'xr', 'xs'), suffix=r'\b'),
+             Keyword.Declaration),
+            # Declarators (suffixes)
+            (words((
+                'priority', 'provided'), suffix=r'\b'),
+             Keyword),
+            # MetaTerms (declarators)
+            (words((
+                'inline', 'ltl', 'select'), suffix=r'\b'),
+             Keyword.Declaration),
+            # MetaTerms (keywords)
+            (r'skip\b', Keyword),
+        ],
+    }
diff --git a/libs/pygments/lexers/capnproto.py b/libs/pygments/lexers/capnproto.py
index 04237f70d..333760e15 100644
--- a/libs/pygments/lexers/capnproto.py
+++ b/libs/pygments/lexers/capnproto.py
@@ -4,7 +4,7 @@
 
     Lexers for the Cap'n Proto schema language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,13 +17,12 @@ __all__ = ['CapnProtoLexer']
 class CapnProtoLexer(RegexLexer):
     """
     For Cap'n Proto source.
-
-    .. versionadded:: 2.2
     """
     name = 'Cap\'n Proto'
     url = 'https://capnproto.org'
     filenames = ['*.capnp']
     aliases = ['capnp']
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/carbon.py b/libs/pygments/lexers/carbon.py
index 758e8af36..702b37bc8 100644
--- a/libs/pygments/lexers/carbon.py
+++ b/libs/pygments/lexers/carbon.py
@@ -4,12 +4,12 @@
 
     Lexers for the Carbon programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
 
-from pygments.lexer import RegexLexer, bygroups, words
+from pygments.lexer import RegexLexer, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Whitespace
 
@@ -19,14 +19,13 @@ __all__ = ['CarbonLexer']
 class CarbonLexer(RegexLexer):
     """
     For Carbon source.
-
-    .. versionadded:: 2.15
     """
     name = 'Carbon'
     url = 'https://github.com/carbon-language/carbon-lang'
     filenames = ['*.carbon']
     aliases = ['carbon']
     mimetypes = ['text/x-carbon']
+    version_added = '2.15'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/cddl.py b/libs/pygments/lexers/cddl.py
index bd7f54aef..fa0c85f10 100644
--- a/libs/pygments/lexers/cddl.py
+++ b/libs/pygments/lexers/cddl.py
@@ -8,7 +8,7 @@
     More information:
     https://datatracker.ietf.org/doc/rfc8610/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,13 @@ __all__ = ['CddlLexer']
 class CddlLexer(RegexLexer):
     """
     Lexer for CDDL definitions.
-
-    .. versionadded:: 2.8
     """
     name = "CDDL"
     url = 'https://datatracker.ietf.org/doc/rfc8610/'
     aliases = ["cddl"]
     filenames = ["*.cddl"]
     mimetypes = ["text/x-cddl"]
+    version_added = '2.8'
 
     _prelude_types = [
         "any",
@@ -108,10 +107,10 @@ class CddlLexer(RegexLexer):
         "root": [
             include("commentsandwhitespace"),
             # tag types
-            (r"#(\d\.{uint})?".format(uint=_re_uint), Keyword.Type),  # type or any
+            (rf"#(\d\.{_re_uint})?", Keyword.Type),  # type or any
             # occurrence
             (
-                r"({uint})?(\*)({uint})?".format(uint=_re_uint),
+                rf"({_re_uint})?(\*)({_re_uint})?",
                 bygroups(Number, Operator, Number),
             ),
             (r"\?|\+", Operator),  # occurrence
@@ -119,8 +118,8 @@ class CddlLexer(RegexLexer):
             (r"(\.\.\.|\.\.)", Operator),  # rangeop
             (words(_controls, suffix=r"\b"), Operator.Word),  # ctlops
             # into choice op
-            (r"&(?=\s*({groupname}|\())".format(groupname=_re_id), Operator),
-            (r"~(?=\s*{})".format(_re_id), Operator),  # unwrap op
+            (rf"&(?=\s*({_re_id}|\())", Operator),
+            (rf"~(?=\s*{_re_id})", Operator),  # unwrap op
             (r"//|/(?!/)", Operator),  # double und single slash
             (r"=>|/==|/=|=", Operator),
             (r"[\[\]{}\(\),<>:]", Punctuation),
@@ -131,7 +130,7 @@ class CddlLexer(RegexLexer):
             # Barewords as member keys (must be matched before values, types, typenames,
             # groupnames).
             # Token type is String as barewords are always interpreted as such.
-            (r"({bareword})(\s*)(:)".format(bareword=_re_id),
+            (rf"({_re_id})(\s*)(:)",
              bygroups(String, Whitespace, Punctuation)),
             # predefined types
             (words(_prelude_types, prefix=r"(?![\-_$@])\b", suffix=r"\b(?![\-_$@])"),
@@ -144,7 +143,7 @@ class CddlLexer(RegexLexer):
             (r"0x[0-9a-fA-F]+(\.[0-9a-fA-F]+)?p[+-]?\d+", Number.Hex),  # hexfloat
             (r"0x[0-9a-fA-F]+", Number.Hex),  # hex
             # Float
-            (r"{int}(?=(\.\d|e[+-]?\d))(?:\.\d+)?(?:e[+-]?\d+)?".format(int=_re_int),
+            (rf"{_re_int}(?=(\.\d|e[+-]?\d))(?:\.\d+)?(?:e[+-]?\d+)?",
              Number.Float),
             # Int
             (_re_int, Number.Integer),
diff --git a/libs/pygments/lexers/chapel.py b/libs/pygments/lexers/chapel.py
index 9af5f0e38..955a1579a 100644
--- a/libs/pygments/lexers/chapel.py
+++ b/libs/pygments/lexers/chapel.py
@@ -4,7 +4,7 @@
 
     Lexer for the Chapel language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,12 @@ __all__ = ['ChapelLexer']
 class ChapelLexer(RegexLexer):
     """
     For Chapel source.
-
-    .. versionadded:: 2.0
     """
     name = 'Chapel'
     url = 'https://chapel-lang.org/'
     filenames = ['*.chpl']
     aliases = ['chapel', 'chpl']
+    version_added = '2.0'
     # mimetypes = ['text/x-chapel']
 
     known_types = ('bool', 'bytes', 'complex', 'imag', 'int', 'locale',
diff --git a/libs/pygments/lexers/clean.py b/libs/pygments/lexers/clean.py
index 73d93e0d2..f96e74373 100644
--- a/libs/pygments/lexers/clean.py
+++ b/libs/pygments/lexers/clean.py
@@ -4,7 +4,7 @@
 
     Lexer for the Clean language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,7 @@ class CleanLexer(ExtendedRegexLexer):
     url = 'http://clean.cs.ru.nl/Clean'
     aliases = ['clean']
     filenames = ['*.icl', '*.dcl']
+    version_added = ''
 
     keywords = (
         'case', 'ccall', 'class', 'code', 'code inline', 'derive', 'export',
diff --git a/libs/pygments/lexers/codeql.py b/libs/pygments/lexers/codeql.py
new file mode 100644
index 000000000..3d06bec6c
--- /dev/null
+++ b/libs/pygments/lexers/codeql.py
@@ -0,0 +1,80 @@
+"""
+    pygments.lexers.codeql
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for CodeQL query language.
+
+    The grammar is originating from:
+    https://github.com/github/vscode-codeql/blob/main/syntaxes/README.md
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+__all__ = ['CodeQLLexer']
+
+import re
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+class CodeQLLexer(RegexLexer):
+    name = 'CodeQL'
+    aliases = ['codeql', 'ql']
+    filenames = ['*.ql', '*.qll']
+    mimetypes = []
+    url = 'https://github.com/github/codeql'
+    version_added = '2.19'
+
+    flags = re.MULTILINE | re.UNICODE
+
+    tokens = {
+        'root': [
+            # Whitespace and comments
+            (r'\s+', Whitespace),
+            (r'//.*?\n', Comment.Single),
+            (r'/\*', Comment.Multiline, 'multiline-comments'),
+
+             # Keywords
+            (words((
+                'module', 'import', 'class', 'extends', 'implements',
+                'predicate', 'select', 'where', 'from', 'as', 'and', 'or', 'not',
+                'in', 'if', 'then', 'else', 'exists', 'forall', 'instanceof',
+                'private', 'predicate', 'abstract', 'cached', 'external',
+                'final', 'library', 'override', 'query'
+            ), suffix=r'\b'), Keyword.Builtin),
+
+            # Special Keywords
+            (words(('this'),                # class related keywords
+                   prefix=r'\b', suffix=r'\b\??:?'), Name.Builtin.Pseudo),
+
+            # Types
+            (words((
+                'boolean', 'date', 'float', 'int', 'string'
+            ), suffix=r'\b'), Keyword.Type),
+
+            # Literals
+            (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
+            (r'[0-9]+\.[0-9]+', Number.Float),
+            (r'[0-9]+', Number.Integer),
+            
+            # Operators
+            (r'<=|>=|<|>|=|!=|\+|-|\*|/', Operator),
+
+            # Punctuation
+            (r'[.,;:\[\]{}()]+', Punctuation),
+
+            # Identifiers
+            (r'@[a-zA-Z_]\w*', Name.Variable),  # Variables with @ prefix
+            (r'[A-Z][a-zA-Z0-9_]*', Name.Class),  # Types and classes
+            (r'[a-z][a-zA-Z0-9_]*', Name.Variable),  # Variables and predicates
+        ],
+        'multiline-comments': [
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline),
+        ],
+
+    }
\ No newline at end of file
diff --git a/libs/pygments/lexers/comal.py b/libs/pygments/lexers/comal.py
index 666595503..3c89a59ea 100644
--- a/libs/pygments/lexers/comal.py
+++ b/libs/pygments/lexers/comal.py
@@ -4,7 +4,7 @@
 
     Lexer for COMAL-80.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,7 @@ class Comal80Lexer(RegexLexer):
     url = 'https://en.wikipedia.org/wiki/COMAL'
     aliases = ['comal', 'comal80']
     filenames = ['*.cml', '*.comal']
+    version_added = ''
     flags = re.IGNORECASE
     #
     # COMAL allows for some strange characters in names which we list here so
diff --git a/libs/pygments/lexers/compiled.py b/libs/pygments/lexers/compiled.py
index fe27425b7..5e0cc188c 100644
--- a/libs/pygments/lexers/compiled.py
+++ b/libs/pygments/lexers/compiled.py
@@ -4,10 +4,11 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.jvm import JavaLexer, ScalaLexer
 from pygments.lexers.c_cpp import CLexer, CppLexer
 from pygments.lexers.d import DLexer
diff --git a/libs/pygments/lexers/configs.py b/libs/pygments/lexers/configs.py
index 6c5e5425a..5e7f47b6d 100644
--- a/libs/pygments/lexers/configs.py
+++ b/libs/pygments/lexers/configs.py
@@ -4,7 +4,7 @@
 
     Lexers for configuration file formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -36,21 +36,32 @@ class IniLexer(RegexLexer):
         '*.ini', '*.cfg', '*.inf', '.editorconfig',
     ]
     mimetypes = ['text/x-ini', 'text/inf']
+    url = 'https://en.wikipedia.org/wiki/INI_file'
+    version_added = ''
 
     tokens = {
         'root': [
             (r'\s+', Whitespace),
             (r'[;#].*', Comment.Single),
             (r'(\[.*?\])([ \t]*)$', bygroups(Keyword, Whitespace)),
-            (r'(.*?)([  \t]*)([=:])([ \t]*)([^;#\n]*)(\\)(\s+)',
+            (r'''(.*?)([ \t]*)([=:])([ \t]*)(["'])''',
+             bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String),
+             "quoted_value"),
+            (r'(.*?)([ \t]*)([=:])([ \t]*)([^;#\n]*)(\\)(\s+)',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String,
                       Text, Whitespace),
              "value"),
-            (r'(.*?)([ \t]*)([=:])([  \t]*)([^ ;#\n]*(?: +[^ ;#\n]+)*)',
+            (r'(.*?)([ \t]*)([=:])([ \t]*)([^ ;#\n]*(?: +[^ ;#\n]+)*)',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String)),
             # standalone option, supported by some INI parsers
             (r'(.+?)$', Name.Attribute),
         ],
+        'quoted_value': [
+            (r'''([^"'\n]*)(["'])(\s*)''',
+             bygroups(String, String, Whitespace), "#pop"),
+            (r'[;#].*', Comment.Single),
+            (r'$', String, "#pop"),
+        ],
         'value': [     # line continuation
             (r'\s+', Whitespace),
             (r'(\s*)(.*)(\\)([ \t]*)',
@@ -71,14 +82,14 @@ class IniLexer(RegexLexer):
 class DesktopLexer(RegexLexer):
     """
     Lexer for .desktop files.
-
-    .. versionadded:: 2.16
     """
 
     name = 'Desktop file'
     url = "https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html"
     aliases = ['desktop']
     filenames = ['*.desktop']
+    mimetypes = ['application/x-desktop']
+    version_added = '2.16'
 
     tokens = {
         'root': [
@@ -101,8 +112,6 @@ class DesktopLexer(RegexLexer):
 class SystemdLexer(RegexLexer):
     """
     Lexer for systemd unit files.
-
-    .. versionadded:: 2.16
     """
 
     name = 'Systemd'
@@ -112,6 +121,7 @@ class SystemdLexer(RegexLexer):
         '*.service', '*.socket', '*.device', '*.mount', '*.automount',
         '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope',
     ]
+    version_added = '2.16'
 
     tokens = {
         'root': [
@@ -146,8 +156,6 @@ class SystemdLexer(RegexLexer):
 class RegeditLexer(RegexLexer):
     """
     Lexer for Windows Registry files produced by regedit.
-
-    .. versionadded:: 1.6
     """
 
     name = 'reg'
@@ -155,6 +163,7 @@ class RegeditLexer(RegexLexer):
     aliases = ['registry']
     filenames = ['*.reg']
     mimetypes = ['text/x-windows-registry']
+    version_added = '1.6'
 
     tokens = {
         'root': [
@@ -191,14 +200,14 @@ class PropertiesLexer(RegexLexer):
     Lexer for configuration files in Java's properties format.
 
     Note: trailing whitespace counts as part of the value as per spec
-
-    .. versionadded:: 1.4
     """
 
     name = 'Properties'
     aliases = ['properties', 'jproperties']
     filenames = ['*.properties']
     mimetypes = ['text/x-java-properties']
+    url = 'https://en.wikipedia.org/wiki/.properties'
+    version_added = '1.4'
 
     tokens = {
         'root': [
@@ -258,29 +267,30 @@ def _rx_indent(level):
     if level == 1:
         level_repeat = ''
     else:
-        level_repeat = '{%s}' % level
-    return r'(?:\t| %s\t| {%s})%s.*\n' % (space_repeat, tab_width, level_repeat)
+        level_repeat = f'{{{level}}}'
+    return rf'(?:\t| {space_repeat}\t| {{{tab_width}}}){level_repeat}.*\n'
 
 
 class KconfigLexer(RegexLexer):
     """
     For Linux-style Kconfig files.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Kconfig'
     aliases = ['kconfig', 'menuconfig', 'linux-config', 'kernel-config']
+    version_added = '1.6'
     # Adjust this if new kconfig file names appear in your environment
     filenames = ['Kconfig*', '*Config.in*', 'external.in*',
                  'standard-modules.in']
     mimetypes = ['text/x-kconfig']
+    url = 'https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html'
+
     # No re.MULTILINE, indentation-aware help text needs line-by-line handling
     flags = 0
 
     def call_indent(level):
         # If indentation >= {level} is detected, enter state 'indent{level}'
-        return (_rx_indent(level), String.Doc, 'indent%s' % level)
+        return (_rx_indent(level), String.Doc, f'indent{level}')
 
     def do_indent(level):
         # Print paragraphs of indentation level >= {level} as String.Doc,
@@ -342,8 +352,6 @@ class KconfigLexer(RegexLexer):
 class Cfengine3Lexer(RegexLexer):
     """
     Lexer for CFEngine3 policy files.
-
-    .. versionadded:: 1.5
     """
 
     name = 'CFEngine3'
@@ -351,6 +359,7 @@ class Cfengine3Lexer(RegexLexer):
     aliases = ['cfengine3', 'cf3']
     filenames = ['*.cf']
     mimetypes = []
+    version_added = '1.5'
 
     tokens = {
         'root': [
@@ -405,14 +414,14 @@ class ApacheConfLexer(RegexLexer):
     """
     Lexer for configuration files following the Apache config file
     format.
-
-    .. versionadded:: 0.6
     """
 
     name = 'ApacheConf'
     aliases = ['apacheconf', 'aconf', 'apache']
     filenames = ['.htaccess', 'apache.conf', 'apache2.conf']
     mimetypes = ['text/x-apacheconf']
+    url = 'https://httpd.apache.org/docs/current/configuring.html'
+    version_added = '0.6'
     flags = re.MULTILINE | re.IGNORECASE
 
     tokens = {
@@ -447,8 +456,6 @@ class ApacheConfLexer(RegexLexer):
 class SquidConfLexer(RegexLexer):
     """
     Lexer for squid configuration files.
-
-    .. versionadded:: 0.9
     """
 
     name = 'SquidConf'
@@ -456,6 +463,7 @@ class SquidConfLexer(RegexLexer):
     aliases = ['squidconf', 'squid.conf', 'squid']
     filenames = ['squid.conf']
     mimetypes = ['text/x-squidconf']
+    version_added = '0.9'
     flags = re.IGNORECASE
 
     keywords = (
@@ -577,14 +585,13 @@ class SquidConfLexer(RegexLexer):
 class NginxConfLexer(RegexLexer):
     """
     Lexer for Nginx configuration files.
-
-    .. versionadded:: 0.11
     """
     name = 'Nginx configuration file'
     url = 'http://nginx.net/'
     aliases = ['nginx']
     filenames = ['nginx.conf']
     mimetypes = ['text/x-nginx-conf']
+    version_added = '0.11'
 
     tokens = {
         'root': [
@@ -624,14 +631,13 @@ class NginxConfLexer(RegexLexer):
 class LighttpdConfLexer(RegexLexer):
     """
     Lexer for Lighttpd configuration files.
-
-    .. versionadded:: 0.11
     """
     name = 'Lighttpd configuration file'
     url = 'http://lighttpd.net/'
     aliases = ['lighttpd', 'lighty']
     filenames = ['lighttpd.conf']
     mimetypes = ['text/x-lighttpd-conf']
+    version_added = '0.11'
 
     tokens = {
         'root': [
@@ -653,14 +659,13 @@ class LighttpdConfLexer(RegexLexer):
 class DockerLexer(RegexLexer):
     """
     Lexer for Docker configuration files.
-
-    .. versionadded:: 2.0
     """
     name = 'Docker'
     url = 'http://docker.io'
     aliases = ['docker', 'dockerfile']
     filenames = ['Dockerfile', '*.docker']
     mimetypes = ['text/x-dockerfile-config']
+    version_added = '2.0'
 
     _keywords = (r'(?:MAINTAINER|EXPOSE|WORKDIR|USER|STOPSIGNAL)')
     _bash_keywords = (r'(?:RUN|CMD|ENTRYPOINT|ENV|ARG|LABEL|ADD|COPY)')
@@ -672,15 +677,15 @@ class DockerLexer(RegexLexer):
             (r'#.*', Comment),
             (r'(FROM)([ \t]*)(\S*)([ \t]*)(?:(AS)([ \t]*)(\S*))?',
              bygroups(Keyword, Whitespace, String, Whitespace, Keyword, Whitespace, String)),
-            (r'(ONBUILD)(\s+)(%s)' % (_lb,), bygroups(Keyword, Whitespace, using(BashLexer))),
-            (r'(HEALTHCHECK)(\s+)((%s--\w+=\w+%s)*)' % (_lb, _lb),
+            (rf'(ONBUILD)(\s+)({_lb})', bygroups(Keyword, Whitespace, using(BashLexer))),
+            (rf'(HEALTHCHECK)(\s+)(({_lb}--\w+=\w+{_lb})*)',
                 bygroups(Keyword, Whitespace, using(BashLexer))),
-            (r'(VOLUME|ENTRYPOINT|CMD|SHELL)(\s+)(%s)(\[.*?\])' % (_lb,),
+            (rf'(VOLUME|ENTRYPOINT|CMD|SHELL)(\s+)({_lb})(\[.*?\])',
                 bygroups(Keyword, Whitespace, using(BashLexer), using(JsonLexer))),
-            (r'(LABEL|ENV|ARG)(\s+)((%s\w+=\w+%s)*)' % (_lb, _lb),
+            (rf'(LABEL|ENV|ARG)(\s+)(({_lb}\w+=\w+{_lb})*)',
                 bygroups(Keyword, Whitespace, using(BashLexer))),
-            (r'(%s|VOLUME)\b(\s+)(.*)' % (_keywords), bygroups(Keyword, Whitespace, String)),
-            (r'(%s)(\s+)' % (_bash_keywords,), bygroups(Keyword, Whitespace)),
+            (rf'({_keywords}|VOLUME)\b(\s+)(.*)', bygroups(Keyword, Whitespace, String)),
+            (rf'({_bash_keywords})(\s+)', bygroups(Keyword, Whitespace)),
             (r'(.*\\\n)*.+', using(BashLexer)),
         ]
     }
@@ -689,8 +694,6 @@ class DockerLexer(RegexLexer):
 class TerraformLexer(ExtendedRegexLexer):
     """
     Lexer for terraformi ``.tf`` files.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Terraform'
@@ -698,6 +701,7 @@ class TerraformLexer(ExtendedRegexLexer):
     aliases = ['terraform', 'tf', 'hcl']
     filenames = ['*.tf', '*.hcl']
     mimetypes = ['application/x-tf', 'application/x-terraform']
+    version_added = '2.1'
 
     classes = ('backend', 'data', 'module', 'output', 'provider',
                'provisioner', 'resource', 'variable')
@@ -861,13 +865,13 @@ class TermcapLexer(RegexLexer):
     Lexer for termcap database source.
 
     This is very simple and minimal.
-
-    .. versionadded:: 2.1
     """
     name = 'Termcap'
     aliases = ['termcap']
     filenames = ['termcap', 'termcap.src']
     mimetypes = []
+    url = 'https://en.wikipedia.org/wiki/Termcap'
+    version_added = '2.1'
 
     # NOTE:
     #   * multiline with trailing backslash
@@ -908,13 +912,13 @@ class TerminfoLexer(RegexLexer):
     Lexer for terminfo database source.
 
     This is very simple and minimal.
-
-    .. versionadded:: 2.1
     """
     name = 'Terminfo'
     aliases = ['terminfo']
     filenames = ['terminfo', 'terminfo.src']
     mimetypes = []
+    url = 'https://en.wikipedia.org/wiki/Terminfo'
+    version_added = '2.1'
 
     # NOTE:
     #   * multiline with leading whitespace
@@ -954,8 +958,6 @@ class PkgConfigLexer(RegexLexer):
     """
     Lexer for pkg-config
     (see also `manual page <http://linux.die.net/man/1/pkg-config>`_).
-
-    .. versionadded:: 2.1
     """
 
     name = 'PkgConfig'
@@ -963,6 +965,7 @@ class PkgConfigLexer(RegexLexer):
     aliases = ['pkgconfig']
     filenames = ['*.pc']
     mimetypes = []
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -1023,8 +1026,6 @@ class PacmanConfLexer(RegexLexer):
         VerbosePkgLists
 
     These are flags to switch on.
-
-    .. versionadded:: 2.1
     """
 
     name = 'PacmanConf'
@@ -1032,6 +1033,7 @@ class PacmanConfLexer(RegexLexer):
     aliases = ['pacmanconf']
     filenames = ['pacman.conf']
     mimetypes = []
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -1069,13 +1071,12 @@ class PacmanConfLexer(RegexLexer):
 class AugeasLexer(RegexLexer):
     """
     Lexer for Augeas.
-
-    .. versionadded:: 2.4
     """
     name = 'Augeas'
     url = 'http://augeas.net'
     aliases = ['augeas']
     filenames = ['*.aug']
+    version_added = '2.4'
 
     tokens = {
         'root': [
@@ -1114,8 +1115,6 @@ class AugeasLexer(RegexLexer):
 class TOMLLexer(RegexLexer):
     """
     Lexer for TOML, a simple language for config files.
-
-    .. versionadded:: 2.4
     """
 
     name = 'TOML'
@@ -1123,6 +1122,7 @@ class TOMLLexer(RegexLexer):
     filenames = ['*.toml', 'Pipfile', 'poetry.lock']
     mimetypes = ['application/toml']
     url = 'https://toml.io'
+    version_added = '2.4'
 
     # Based on the TOML spec: https://toml.io/en/v1.0.0
 
@@ -1284,8 +1284,6 @@ class NestedTextLexer(RegexLexer):
     """
     Lexer for *NextedText*, a human-friendly data format.
 
-    .. versionadded:: 2.9
-
     .. versionchanged:: 2.16
         Added support for *NextedText* v3.0.
     """
@@ -1294,6 +1292,7 @@ class NestedTextLexer(RegexLexer):
     url = 'https://nestedtext.org'
     aliases = ['nestedtext', 'nt']
     filenames = ['*.nt']
+    version_added = '2.9'
 
     tokens = {
         'root': [
@@ -1366,14 +1365,13 @@ class NestedTextLexer(RegexLexer):
 class SingularityLexer(RegexLexer):
     """
     Lexer for Singularity definition files.
-
-    .. versionadded:: 2.6
     """
 
     name = 'Singularity'
     url = 'https://www.sylabs.io/guides/3.0/user-guide/definition_files.html'
     aliases = ['singularity']
     filenames = ['*.def', 'Singularity']
+    version_added = '2.6'
     flags = re.IGNORECASE | re.MULTILINE | re.DOTALL
 
     _headers = r'^(\s*)(bootstrap|from|osversion|mirrorurl|include|registry|namespace|includecmd)(:)'
@@ -1415,13 +1413,13 @@ class UnixConfigLexer(RegexLexer):
     * ``/etc/group``
     * ``/etc/passwd``
     * ``/etc/shadow``
-
-    .. versionadded:: 2.12
     """
 
     name = 'Unix/Linux config files'
     aliases = ['unixconfig', 'linuxconfig']
     filenames = []
+    url = 'https://en.wikipedia.org/wiki/Configuration_file#Unix_and_Unix-like_operating_systems'
+    version_added = '2.12'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/console.py b/libs/pygments/lexers/console.py
index ac498d58b..d66cbaa95 100644
--- a/libs/pygments/lexers/console.py
+++ b/libs/pygments/lexers/console.py
@@ -4,7 +4,7 @@
 
     Lexers for misc console output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,13 +19,13 @@ class VCTreeStatusLexer(RegexLexer):
     """
     For colorizing output of version control status commands, like "hg
     status" or "svn status".
-
-    .. versionadded:: 2.0
     """
     name = 'VCTreeStatus'
     aliases = ['vctreestatus']
     filenames = []
     mimetypes = []
+    url = ""
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -45,13 +45,13 @@ class VCTreeStatusLexer(RegexLexer):
 class PyPyLogLexer(RegexLexer):
     """
     Lexer for PyPy log files.
-
-    .. versionadded:: 1.5
     """
     name = "PyPy Log"
     aliases = ["pypylog", "pypy"]
     filenames = ["*.pypylog"]
     mimetypes = ['application/x-pypylog']
+    url = 'pypy.org'
+    version_added = '1.5'
 
     tokens = {
         "root": [
diff --git a/libs/pygments/lexers/cplint.py b/libs/pygments/lexers/cplint.py
index 8a48c013f..f8424252e 100644
--- a/libs/pygments/lexers/cplint.py
+++ b/libs/pygments/lexers/cplint.py
@@ -4,7 +4,7 @@
 
     Lexer for the cplint language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,13 @@ class CplintLexer(PrologLexer):
     """
     Lexer for cplint files, including CP-logic, Logic Programs with Annotated
     Disjunctions, Distributional Clauses syntax, ProbLog, DTProbLog.
-
-    .. versionadded:: 2.12
     """
     name = 'cplint'
     url = 'https://cplint.eu'
     aliases = ['cplint']
     filenames = ['*.ecl', '*.prolog', '*.pro', '*.pl', '*.P', '*.lpad', '*.cpl']
     mimetypes = ['text/x-cplint']
+    version_added = '2.12'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/crystal.py b/libs/pygments/lexers/crystal.py
index e4df8b1dd..f5da4f84c 100644
--- a/libs/pygments/lexers/crystal.py
+++ b/libs/pygments/lexers/crystal.py
@@ -4,7 +4,7 @@
 
     Lexer for Crystal.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,8 +27,6 @@ CRYSTAL_OPERATORS = [
 class CrystalLexer(ExtendedRegexLexer):
     """
     For Crystal source code.
-
-    .. versionadded:: 2.2
     """
 
     name = 'Crystal'
@@ -36,6 +34,7 @@ class CrystalLexer(ExtendedRegexLexer):
     aliases = ['cr', 'crystal']
     filenames = ['*.cr']
     mimetypes = ['text/x-crystal']
+    version_added = '2.2'
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -107,7 +106,7 @@ class CrystalLexer(ExtendedRegexLexer):
                                 ('backtick', String.Backtick, '`'):
             states['simple-'+name] = [
                 include('string-escaped' if name == 'sym' else 'string-intp-escaped'),
-                (r'[^\\%s#]+' % end, ttype),
+                (rf'[^\\{end}#]+', ttype),
                 (r'[\\#]', ttype),
                 (end, ttype, '#pop'),
             ]
diff --git a/libs/pygments/lexers/csound.py b/libs/pygments/lexers/csound.py
index 64f03cff3..403b66f96 100644
--- a/libs/pygments/lexers/csound.py
+++ b/libs/pygments/lexers/csound.py
@@ -4,7 +4,7 @@
 
     Lexers for Csound languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -136,13 +136,12 @@ class CsoundLexer(RegexLexer):
 class CsoundScoreLexer(CsoundLexer):
     """
     For `Csound <https://csound.com>`_ scores.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Csound Score'
     aliases = ['csound-score', 'csound-sco']
     filenames = ['*.sco']
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -202,13 +201,12 @@ class CsoundScoreLexer(CsoundLexer):
 class CsoundOrchestraLexer(CsoundLexer):
     """
     For `Csound <https://csound.com>`_ orchestras.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Csound Orchestra'
     aliases = ['csound', 'csound-orc']
     filenames = ['*.orc', '*.udo']
+    version_added = '2.1'
 
     user_defined_opcodes = set()
 
@@ -411,14 +409,14 @@ class CsoundOrchestraLexer(CsoundLexer):
 
 class CsoundDocumentLexer(RegexLexer):
     """
-    For `Csound <https://csound.com>`_ documents.
-
-    .. versionadded:: 2.1
+    For Csound documents.
     """
 
     name = 'Csound Document'
     aliases = ['csound-document', 'csound-csd']
     filenames = ['*.csd']
+    url = 'https://csound.com'
+    version_added = '2.1'
 
     # These tokens are based on those in XmlLexer in pygments/lexers/html.py. Making
     # CsoundDocumentLexer a subclass of XmlLexer rather than RegexLexer may seem like a
diff --git a/libs/pygments/lexers/css.py b/libs/pygments/lexers/css.py
index d8a961f04..97897db65 100644
--- a/libs/pygments/lexers/css.py
+++ b/libs/pygments/lexers/css.py
@@ -4,7 +4,7 @@
 
     Lexers for CSS and related stylesheet formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -96,7 +96,7 @@ _keyword_values = (
     'padding-box', 'page', 'pan-down', 'pan-left', 'pan-right', 'pan-up',
     'pan-x', 'pan-y', 'paused', 'petite-caps', 'pixelated', 'pointer',
     'preserve-3d', 'progress', 'proximity', 'relative', 'repeat',
-    'repeat no-repeat', 'repeat-x', 'repeat-y', 'reverse', 'ridge', 'right',
+    'repeat no-repeat', 'repeat-x', 'repeat-y', 'reverse', 'revert', 'ridge', 'right',
     'round', 'row', 'row-resize', 'row-reverse', 'rtl', 'ruby', 'ruby-base',
     'ruby-base-container', 'ruby-text', 'ruby-text-container', 'run-in',
     'running', 's-resize', 'sans-serif', 'saturation', 'scale-down', 'screen',
@@ -178,6 +178,7 @@ class CssLexer(RegexLexer):
     aliases = ['css']
     filenames = ['*.css']
     mimetypes = ['text/css']
+    version_added = ''
 
     tokens = {
         'root': [
@@ -445,8 +446,6 @@ def _starts_block(token, state):
 class SassLexer(ExtendedRegexLexer):
     """
     For Sass stylesheets.
-
-    .. versionadded:: 1.3
     """
 
     name = 'Sass'
@@ -454,6 +453,7 @@ class SassLexer(ExtendedRegexLexer):
     aliases = ['sass']
     filenames = ['*.sass']
     mimetypes = ['text/x-sass']
+    version_added = '1.3'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -535,6 +535,7 @@ class ScssLexer(RegexLexer):
     aliases = ['scss']
     filenames = ['*.scss']
     mimetypes = ['text/x-scss']
+    version_added = ''
 
     flags = re.IGNORECASE | re.DOTALL
     tokens = {
@@ -579,8 +580,6 @@ class ScssLexer(RegexLexer):
 class LessCssLexer(CssLexer):
     """
     For LESS styleshets.
-
-    .. versionadded:: 2.1
     """
 
     name = 'LessCss'
@@ -588,6 +587,7 @@ class LessCssLexer(CssLexer):
     aliases = ['less']
     filenames = ['*.less']
     mimetypes = ['text/x-less-css']
+    version_added = '2.1'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/d.py b/libs/pygments/lexers/d.py
index db9020d48..a0b56e9ca 100644
--- a/libs/pygments/lexers/d.py
+++ b/libs/pygments/lexers/d.py
@@ -4,7 +4,7 @@
 
     Lexers for D languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['DLexer', 'CrocLexer', 'MiniDLexer']
 class DLexer(RegexLexer):
     """
     For D source.
-
-    .. versionadded:: 1.2
     """
     name = 'D'
     url = 'https://dlang.org/'
     filenames = ['*.d', '*.di']
     aliases = ['d']
     mimetypes = ['text/x-dsrc']
+    version_added = '1.2'
 
     tokens = {
         'root': [
@@ -194,6 +193,7 @@ class CrocLexer(RegexLexer):
     filenames = ['*.croc']
     aliases = ['croc']
     mimetypes = ['text/x-crocsrc']
+    version_added = ''
 
     tokens = {
         'root': [
@@ -256,3 +256,4 @@ class MiniDLexer(CrocLexer):
     filenames = []  # don't lex .md as MiniD, reserve for Markdown
     aliases = ['minid']
     mimetypes = ['text/x-minidsrc']
+    version_added = ''
diff --git a/libs/pygments/lexers/dalvik.py b/libs/pygments/lexers/dalvik.py
index eb97bd511..1ac332bfa 100644
--- a/libs/pygments/lexers/dalvik.py
+++ b/libs/pygments/lexers/dalvik.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for Dalvik VM-related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,14 +21,13 @@ class SmaliLexer(RegexLexer):
     """
     For Smali (Android/Dalvik) assembly
     code.
-
-    .. versionadded:: 1.6
     """
     name = 'Smali'
     url = 'http://code.google.com/p/smali/'
     aliases = ['smali']
     filenames = ['*.smali']
     mimetypes = ['text/smali']
+    version_added = '1.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/data.py b/libs/pygments/lexers/data.py
index afb5f7e59..f43203252 100644
--- a/libs/pygments/lexers/data.py
+++ b/libs/pygments/lexers/data.py
@@ -4,7 +4,7 @@
 
     Lexers for data file format.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,8 +31,6 @@ class YamlLexer(ExtendedRegexLexer):
     """
     Lexer for YAML, a human-friendly data serialization
     language.
-
-    .. versionadded:: 0.11
     """
 
     name = 'YAML'
@@ -40,6 +38,7 @@ class YamlLexer(ExtendedRegexLexer):
     aliases = ['yaml']
     filenames = ['*.yaml', '*.yml']
     mimetypes = ['text/x-yaml']
+    version_added = '0.11'
 
     def something(token_class):
         """Do not produce empty tokens."""
@@ -443,8 +442,6 @@ class JsonLexer(Lexer):
     This allows users to highlight JSON as it is used in the wild.
 
     No validation is performed on the input JSON document.
-
-    .. versionadded:: 1.5
     """
 
     name = 'JSON'
@@ -452,6 +449,7 @@ class JsonLexer(Lexer):
     aliases = ['json', 'json-object']
     filenames = ['*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock']
     mimetypes = ['application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq']
+    version_added = '1.5'
 
     # No validation of integers, floats, or constants is done.
     # As long as the characters are members of the following
@@ -704,8 +702,6 @@ class JsonBareObjectLexer(JsonLexer):
     """
     For JSON data structures (with missing object curly braces).
 
-    .. versionadded:: 2.2
-
     .. deprecated:: 2.8.0
 
        Behaves the same as `JsonLexer` now.
@@ -715,13 +711,12 @@ class JsonBareObjectLexer(JsonLexer):
     aliases = []
     filenames = []
     mimetypes = []
+    version_added = '2.2'
 
 
 class JsonLdLexer(JsonLexer):
     """
     For JSON-LD linked data.
-
-    .. versionadded:: 2.0
     """
 
     name = 'JSON-LD'
@@ -729,9 +724,10 @@ class JsonLdLexer(JsonLexer):
     aliases = ['jsonld', 'json-ld']
     filenames = ['*.jsonld']
     mimetypes = ['application/ld+json']
+    version_added = '2.0'
 
     json_ld_keywords = {
-        '"@%s"' % keyword
+        f'"@{keyword}"'
         for keyword in (
             'base',
             'container',
diff --git a/libs/pygments/lexers/dax.py b/libs/pygments/lexers/dax.py
index 39618c3bb..9c333947e 100644
--- a/libs/pygments/lexers/dax.py
+++ b/libs/pygments/lexers/dax.py
@@ -4,7 +4,7 @@
 
     Lexer for LilyPond.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,13 @@ class DaxLexer(RegexLexer):
     """
     Lexer for Power BI DAX
     Referenced from: https://github.com/sql-bi/SyntaxHighlighterBrushDax
-
-    .. versionadded:: 2.15
     """
     name = 'Dax'
     aliases = ['dax']
     filenames = ['*.dax']
     url = 'https://learn.microsoft.com/en-us/dax/dax-function-reference'
     mimetypes = []
+    version_added = '2.15'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/devicetree.py b/libs/pygments/lexers/devicetree.py
index 9221464f7..a9b0b7aa4 100644
--- a/libs/pygments/lexers/devicetree.py
+++ b/libs/pygments/lexers/devicetree.py
@@ -4,7 +4,7 @@
 
     Lexers for Devicetree language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['DevicetreeLexer']
 class DevicetreeLexer(RegexLexer):
     """
     Lexer for Devicetree files.
-
-    .. versionadded:: 2.7
     """
 
     name = 'Devicetree'
@@ -27,6 +25,7 @@ class DevicetreeLexer(RegexLexer):
     aliases = ['devicetree', 'dts']
     filenames = ['*.dts', '*.dtsi']
     mimetypes = ['text/x-c']
+    version_added = '2.7'
 
     #: optional Whitespace or /*...*/ style comment
     _ws = r'\s*(?:/[*][^*/]*?[*]/\s*)*'
diff --git a/libs/pygments/lexers/diff.py b/libs/pygments/lexers/diff.py
index 0ab85bfbf..ed7007f5b 100644
--- a/libs/pygments/lexers/diff.py
+++ b/libs/pygments/lexers/diff.py
@@ -4,7 +4,7 @@
 
     Lexers for diff/patch formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,8 @@ class DiffLexer(RegexLexer):
     aliases = ['diff', 'udiff']
     filenames = ['*.diff', '*.patch']
     mimetypes = ['text/x-diff', 'text/x-patch']
+    url = 'https://en.wikipedia.org/wiki/Diff'
+    version_added = ''
 
     tokens = {
         'root': [
@@ -57,13 +59,13 @@ class DarcsPatchLexer(RegexLexer):
     DarcsPatchLexer is a lexer for the various versions of the darcs patch
     format.  Examples of this format are derived by commands such as
     ``darcs annotate --patch`` and ``darcs send``.
-
-    .. versionadded:: 0.10
     """
 
     name = 'Darcs Patch'
     aliases = ['dpatch']
     filenames = ['*.dpatch', '*.darcspatch']
+    url = 'https://darcs.net'
+    version_added = '0.10'
 
     DPATCH_KEYWORDS = ('hunk', 'addfile', 'adddir', 'rmfile', 'rmdir', 'move',
                        'replace')
@@ -83,7 +85,7 @@ class DarcsPatchLexer(RegexLexer):
             (r'New patches:', Generic.Heading),
             (r'Context:', Generic.Heading),
             (r'Patch bundle hash:', Generic.Heading),
-            (r'(\s*)(%s)(.*)(\n)' % '|'.join(DPATCH_KEYWORDS),
+            (r'(\s*)({})(.*)(\n)'.format('|'.join(DPATCH_KEYWORDS)),
                 bygroups(Whitespace, Keyword, Text, Whitespace)),
             (r'\+', Generic.Inserted, "insert"),
             (r'-', Generic.Deleted, "delete"),
@@ -119,8 +121,6 @@ class WDiffLexer(RegexLexer):
     * It only works with normal output (without options like ``-l``).
     * If the target files contain "[-", "-]", "{+", or "+}",
       especially they are unbalanced, the lexer will get confused.
-
-    .. versionadded:: 2.2
     """
 
     name = 'WDiff'
@@ -128,6 +128,7 @@ class WDiffLexer(RegexLexer):
     aliases = ['wdiff']
     filenames = ['*.wdiff']
     mimetypes = []
+    version_added = '2.2'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/dns.py b/libs/pygments/lexers/dns.py
index 18cab3192..3fb91f571 100644
--- a/libs/pygments/lexers/dns.py
+++ b/libs/pygments/lexers/dns.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for DNS
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,8 +31,6 @@ class DnsZoneLexer(RegexLexer):
 
     """
     Lexer for DNS zone file
-
-    .. versionadded:: 2.16
     """
 
     flags = re.MULTILINE
@@ -42,6 +40,7 @@ class DnsZoneLexer(RegexLexer):
     filenames = [ "*.zone" ]
     url = "https://datatracker.ietf.org/doc/html/rfc1035"
     mimetypes = ['text/dns']
+    version_added = '2.16'
 
     tokens = {
        'root': [
@@ -73,16 +72,16 @@ class DnsZoneLexer(RegexLexer):
         'values': [
             (r'\n', Whitespace, "#pop"),
             (r'\(', Punctuation, 'nested'),
-            include('simple-values'),
+            include('simple-value'),
         ],
         # Parsing nested values (...):
         'nested': [
             (r'\)', Punctuation, "#pop"),
-            include('simple-values'),
+            include('multiple-simple-values'),
         ],
         # Parsing values:
-        'simple-values': [
-            (r'(;.*)(\n)', bygroups(Comment.Single, Whitespace)),
+        'simple-value': [
+            (r'(;.*)', bygroups(Comment.Single)),
             (r'[ \t]+', Whitespace),
             (r"@\b", Operator),
             ('"', String, 'string'),
@@ -90,6 +89,10 @@ class DnsZoneLexer(RegexLexer):
             (r'([0-9]+[smhdw]?)([ \t]+)', bygroups(Number.Integer, Whitespace)),
             (r'\S+', Literal),
         ],
+        'multiple-simple-values': [
+            include('simple-value'),
+            (r'[\n]+', Whitespace),
+        ],
         'include': [
             (r'([ \t]+)([^ \t\n]+)([ \t]+)([-\._a-zA-Z]+)([ \t]+)(;.*)?$',
              bygroups(Whitespace, Comment.PreprocFile, Whitespace, Name, Whitespace, Comment.Single), '#pop'),
diff --git a/libs/pygments/lexers/dotnet.py b/libs/pygments/lexers/dotnet.py
index 5c488dd97..2254a8b2e 100644
--- a/libs/pygments/lexers/dotnet.py
+++ b/libs/pygments/lexers/dotnet.py
@@ -4,7 +4,7 @@
 
     Lexers for .net languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
@@ -50,6 +50,7 @@ class CSharpLexer(RegexLexer):
     aliases = ['csharp', 'c#', 'cs']
     filenames = ['*.cs']
     mimetypes = ['text/x-csharp']  # inferred
+    version_added = ''
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -73,6 +74,7 @@ class CSharpLexer(RegexLexer):
     for levelname, cs_ident in levels.items():
         tokens[levelname] = {
             'root': [
+                include('numbers'),
                 # method names
                 (r'^([ \t]*)((?:' + cs_ident + r'(?:\[\])?\s+)+?)'  # return type
                  r'(' + cs_ident + ')'                            # method name
@@ -105,18 +107,29 @@ class CSharpLexer(RegexLexer):
                           Comment.Preproc, Whitespace)),
                 (r'\b(extern)(\s+)(alias)\b', bygroups(Keyword, Whitespace,
                  Keyword)),
-                (r'(abstract|as|async|await|base|break|by|case|catch|'
-                 r'checked|const|continue|default|delegate|'
-                 r'do|else|enum|event|explicit|extern|false|finally|'
-                 r'fixed|for|foreach|goto|if|implicit|in|interface|'
-                 r'internal|is|let|lock|new|null|on|operator|'
-                 r'out|override|params|private|protected|public|readonly|'
-                 r'ref|return|sealed|sizeof|stackalloc|static|'
-                 r'switch|this|throw|true|try|typeof|'
-                 r'unchecked|unsafe|virtual|void|while|'
-                 r'get|set|new|partial|yield|add|remove|value|alias|ascending|'
-                 r'descending|from|group|into|orderby|select|thenby|where|'
-                 r'join|equals)\b', Keyword),
+                (words((
+                    'abstract', 'as', 'async', 'await', 'base', 'break', 'by',
+                    'case', 'catch', 'checked', 'const', 'continue', 'default',
+                    'delegate', 'do', 'else', 'enum', 'event', 'explicit',
+                    'extern', 'false', 'finally', 'fixed', 'for', 'foreach',
+                    'goto', 'if', 'implicit', 'in', 'interface', 'internal',
+                    'is', 'let', 'lock', 'new', 'null', 'on', 'operator',
+                    'out', 'override', 'params', 'private', 'protected',
+                    'public', 'readonly', 'ref', 'return', 'sealed', 'sizeof',
+                    'stackalloc', 'static', 'switch', 'this', 'throw', 'true',
+                    'try', 'typeof', 'unchecked', 'unsafe', 'virtual', 'void',
+                    'while', 'get', 'set', 'new', 'partial', 'yield', 'add',
+                    'remove', 'value', 'alias', 'ascending', 'descending',
+                    'from', 'group', 'into', 'orderby', 'select', 'thenby',
+                    'where', 'join', 'equals', 'record', 'allows',
+                    'and', 'init', 'managed', 'nameof', 'nint', 'not',
+                    'notnull', 'nuint', 'or', 'scoped', 'unmanaged', 'when',
+                    'with'
+                ), suffix=r'\b'), Keyword),
+                # version 1: assumes that 'file' is the only contextual keyword
+                # that is a class modifier
+                (r'(file)(\s+)(record|class|abstract|enum|new|sealed|static)\b',
+                   bygroups(Keyword, Whitespace, Keyword)),
                 (r'(global)(::)', bygroups(Keyword, Punctuation)),
                 (r'(bool|byte|char|decimal|double|dynamic|float|int|long|object|'
                  r'sbyte|short|string|uint|ulong|ushort|var)\b\??', Keyword.Type),
@@ -124,6 +137,21 @@ class CSharpLexer(RegexLexer):
                 (r'(namespace|using)(\s+)', bygroups(Keyword, Whitespace), 'namespace'),
                 (cs_ident, Name),
             ],
+            'numbers_int': [
+                (r"0[xX][0-9a-fA-F]+(([uU][lL]?)|[lL][uU]?)?", Number.Hex),
+                (r"0[bB][01]+(([uU][lL]?)|[lL][uU]?)?", Number.Bin),
+                (r"[0-9]+(([uU][lL]?)|[lL][uU]?)?", Number.Integer),
+            ],
+            'numbers_float': [
+                (r"([0-9]+\.[0-9]+([eE][+-]?[0-9]+)?[fFdDmM]?)|"
+                 r"(\.[0-9]+([eE][+-]?[0-9]+)?[fFdDmM]?)|"
+                 r"([0-9]+([eE][+-]?[0-9]+)[fFdDmM]?)|"
+                 r"([0-9]+[fFdDmM])", Number.Float),
+            ],
+            'numbers': [
+                include('numbers_float'),
+                include('numbers_int'),
+            ],
             'class': [
                 (cs_ident, Name.Class, '#pop'),
                 default('#pop'),
@@ -164,8 +192,6 @@ class NemerleLexer(RegexLexer):
         ``Lo`` category has more than 40,000 characters in it!
 
       The default value is ``basic``.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Nemerle'
@@ -173,6 +199,7 @@ class NemerleLexer(RegexLexer):
     aliases = ['nemerle']
     filenames = ['*.n']
     mimetypes = ['text/x-nemerle']  # inferred
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -333,6 +360,7 @@ class BooLexer(RegexLexer):
     aliases = ['boo']
     filenames = ['*.boo']
     mimetypes = ['text/x-boo']
+    version_added = ''
 
     tokens = {
         'root': [
@@ -399,9 +427,10 @@ class VbNetLexer(RegexLexer):
 
     name = 'VB.net'
     url = 'https://docs.microsoft.com/en-us/dotnet/visual-basic/'
-    aliases = ['vb.net', 'vbnet', 'lobas', 'oobas', 'sobas']
+    aliases = ['vb.net', 'vbnet', 'lobas', 'oobas', 'sobas', 'visual-basic', 'visualbasic']
     filenames = ['*.vb', '*.bas']
     mimetypes = ['text/x-vbnet', 'text/x-vba']  # (?)
+    version_added = ''
 
     uni_name = '[_' + uni.combine('Ll', 'Lt', 'Lm', 'Nl') + ']' + \
                '[' + uni.combine('Ll', 'Lt', 'Lm', 'Nl', 'Nd', 'Pc',
@@ -510,6 +539,7 @@ class GenericAspxLexer(RegexLexer):
     name = 'aspx-gen'
     filenames = []
     mimetypes = []
+    url = 'https://dotnet.microsoft.com/en-us/apps/aspnet'
 
     flags = re.DOTALL
 
@@ -535,6 +565,8 @@ class CSharpAspxLexer(DelegatingLexer):
     aliases = ['aspx-cs']
     filenames = ['*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd']
     mimetypes = []
+    url = 'https://dotnet.microsoft.com/en-us/apps/aspnet'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(CSharpLexer, GenericAspxLexer, **options)
@@ -555,6 +587,8 @@ class VbNetAspxLexer(DelegatingLexer):
     aliases = ['aspx-vb']
     filenames = ['*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd']
     mimetypes = []
+    url = 'https://dotnet.microsoft.com/en-us/apps/aspnet'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(VbNetLexer, GenericAspxLexer, **options)
@@ -570,8 +604,6 @@ class VbNetAspxLexer(DelegatingLexer):
 class FSharpLexer(RegexLexer):
     """
     For the F# language (version 3.0).
-
-    .. versionadded:: 1.5
     """
 
     name = 'F#'
@@ -579,6 +611,7 @@ class FSharpLexer(RegexLexer):
     aliases = ['fsharp', 'f#']
     filenames = ['*.fs', '*.fsi', '*.fsx']
     mimetypes = ['text/x-fsharp']
+    version_added = '1.5'
 
     keywords = [
         'abstract', 'as', 'assert', 'base', 'begin', 'class', 'default',
@@ -649,12 +682,12 @@ class FSharpLexer(RegexLexer):
              bygroups(Keyword, Whitespace, Name.Class)),
             (r'\b(member|override)(\s+)(\w+)(\.)(\w+)',
              bygroups(Keyword, Whitespace, Name, Punctuation, Name.Function)),
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
             (r'``([^`\n\r\t]|`[^`\n\r\t])+``', Name),
-            (r'(%s)' % '|'.join(keyopts), Operator),
-            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
-            (r'\b(%s)\b' % '|'.join(word_operators), Operator.Word),
-            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
+            (r'({})'.format('|'.join(keyopts)), Operator),
+            (rf'({infix_syms}|{prefix_syms})?{operators}', Operator),
+            (r'\b({})\b'.format('|'.join(word_operators)), Operator.Word),
+            (r'\b({})\b'.format('|'.join(primitives)), Keyword.Type),
             (r'(#)([ \t]*)(if|endif|else|line|nowarn|light|\d+)\b(.*?)(\n)',
              bygroups(Comment.Preproc, Whitespace, Comment.Preproc,
                       Comment.Preproc, Whitespace)),
@@ -733,21 +766,20 @@ class XppLexer(RegexLexer):
 
     """
     For X++ source code. This is based loosely on the CSharpLexer
-
-    .. versionadded:: 2.15
     """
 
     name = 'X++'
     url = 'https://learn.microsoft.com/en-us/dynamics365/fin-ops-core/dev-itpro/dev-ref/xpp-language-reference'
     aliases = ['xpp', 'x++']
     filenames = ['*.xpp']
+    version_added = '2.15'
 
     flags = re.MULTILINE
 
     XPP_CHARS = ('@?(?:_|[^' +
                  uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl') + '])' +
                  '[^' + uni.allexcept('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl',
-                                      'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*');
+                                      'Nd', 'Pc', 'Cf', 'Mn', 'Mc') + ']*')
     # Temporary, see
     # https://github.com/thatch/regexlint/pull/49
     XPP_CHARS = XPP_CHARS.replace('\x00', '\x01')
diff --git a/libs/pygments/lexers/dsls.py b/libs/pygments/lexers/dsls.py
index 37a5ff6c3..d30c11249 100644
--- a/libs/pygments/lexers/dsls.py
+++ b/libs/pygments/lexers/dsls.py
@@ -4,7 +4,7 @@
 
     Lexers for various domain-specific languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,14 +23,13 @@ __all__ = ['ProtoBufLexer', 'ZeekLexer', 'PuppetLexer', 'RslLexer',
 class ProtoBufLexer(RegexLexer):
     """
     Lexer for Protocol Buffer definition files.
-
-    .. versionadded:: 1.4
     """
 
     name = 'Protocol Buffer'
     url = 'https://developers.google.com/protocol-buffers/'
     aliases = ['protobuf', 'proto']
     filenames = ['*.proto']
+    version_added = '1.4'
 
     tokens = {
         'root': [
@@ -85,14 +84,13 @@ class ProtoBufLexer(RegexLexer):
 class ThriftLexer(RegexLexer):
     """
     For Thrift interface definitions.
-
-    .. versionadded:: 2.1
     """
     name = 'Thrift'
     url = 'https://thrift.apache.org/'
     aliases = ['thrift']
     filenames = ['*.thrift']
     mimetypes = ['application/x-thrift']
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -191,13 +189,12 @@ class ThriftLexer(RegexLexer):
 class ZeekLexer(RegexLexer):
     """
     For Zeek scripts.
-
-    .. versionadded:: 2.5
     """
     name = 'Zeek'
     url = 'https://www.zeek.org/'
     aliases = ['zeek', 'bro']
     filenames = ['*.zeek', '*.bro']
+    version_added = '2.5'
 
     _hex = r'[0-9a-fA-F]'
     _float = r'((\d*\.?\d+)|(\d+\.?\d*))([eE][-+]?\d+)?'
@@ -353,13 +350,12 @@ BroLexer = ZeekLexer
 class PuppetLexer(RegexLexer):
     """
     For Puppet configuration DSL.
-
-    .. versionadded:: 1.6
     """
     name = 'Puppet'
     url = 'https://puppet.com/'
     aliases = ['puppet']
     filenames = ['*.pp']
+    version_added = '1.6'
 
     tokens = {
         'root': [
@@ -443,14 +439,13 @@ class RslLexer(RegexLexer):
     RSL is the formal specification
     language used in RAISE (Rigorous Approach to Industrial Software Engineering)
     method.
-
-    .. versionadded:: 2.0
     """
     name = 'RSL'
     url = 'http://en.wikipedia.org/wiki/RAISE'
     aliases = ['rsl']
     filenames = ['*.rsl']
     mimetypes = ['text/rsl']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -505,13 +500,12 @@ class RslLexer(RegexLexer):
 class MscgenLexer(RegexLexer):
     """
     For Mscgen files.
-
-    .. versionadded:: 1.6
     """
     name = 'Mscgen'
     url = 'http://www.mcternan.me.uk/mscgen/'
     aliases = ['mscgen', 'msc']
     filenames = ['*.msc']
+    version_added = '1.6'
 
     _var = r'(\w+|"(?:\\"|[^"])*")'
 
@@ -555,13 +549,12 @@ class MscgenLexer(RegexLexer):
 class VGLLexer(RegexLexer):
     """
     For SampleManager VGL source code.
-
-    .. versionadded:: 1.6
     """
     name = 'VGL'
     url = 'http://www.thermoscientific.com/samplemanager'
     aliases = ['vgl']
     filenames = ['*.rpf']
+    version_added = '1.6'
 
     flags = re.MULTILINE | re.DOTALL | re.IGNORECASE
 
@@ -589,8 +582,6 @@ class VGLLexer(RegexLexer):
 class AlloyLexer(RegexLexer):
     """
     For Alloy source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Alloy'
@@ -598,6 +589,7 @@ class AlloyLexer(RegexLexer):
     aliases = ['alloy']
     filenames = ['*.als']
     mimetypes = ['text/x-alloy']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -660,14 +652,13 @@ class PanLexer(RegexLexer):
     Lexer for pan source files.
 
     Based on tcsh lexer.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Pan'
     url = 'https://github.com/quattor/pan/'
     aliases = ['pan']
     filenames = ['*.pan']
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -727,14 +718,13 @@ class PanLexer(RegexLexer):
 class CrmshLexer(RegexLexer):
     """
     Lexer for crmsh configuration files for Pacemaker clusters.
-
-    .. versionadded:: 2.1
     """
     name = 'Crmsh'
     url = 'http://crmsh.github.io/'
     aliases = ['crmsh', 'pcmk']
     filenames = ['*.crmsh', '*.pcmk']
     mimetypes = []
+    version_added = '2.1'
 
     elem = words((
         'node', 'primitive', 'group', 'clone', 'ms', 'location',
@@ -773,7 +763,7 @@ class CrmshLexer(RegexLexer):
             (sub, Keyword),
             (acl, Keyword),
             # binary operators
-            (r'(?:%s:)?(%s)(?![\w#$-])' % (val_qual, bin_ops), Operator.Word),
+            (rf'(?:{val_qual}:)?({bin_ops})(?![\w#$-])', Operator.Word),
             # other operators
             (bin_rel, Operator.Word),
             (un_ops, Operator.Word),
@@ -781,11 +771,11 @@ class CrmshLexer(RegexLexer):
             # builtin attributes (e.g. #uname)
             (r'#[a-z]+(?![\w#$-])', Name.Builtin),
             # acl_mod:blah
-            (r'(%s)(:)("(?:""|[^"])*"|\S+)' % acl_mod,
+            (rf'({acl_mod})(:)("(?:""|[^"])*"|\S+)',
              bygroups(Keyword, Punctuation, Name)),
             # rsc_id[:(role|action)]
             # NB: this matches all other identifiers
-            (r'([\w#$-]+)(?:(:)(%s))?(?![\w#$-])' % rsc_role_action,
+            (rf'([\w#$-]+)(?:(:)({rsc_role_action}))?(?![\w#$-])',
              bygroups(Name, Punctuation, Operator.Word)),
             # punctuation
             (r'(\\(?=\n)|[\[\](){}/:@])', Punctuation),
@@ -797,14 +787,13 @@ class CrmshLexer(RegexLexer):
 class FlatlineLexer(RegexLexer):
     """
     Lexer for Flatline expressions.
-
-    .. versionadded:: 2.2
     """
     name = 'Flatline'
     url = 'https://github.com/bigmlcom/flatline'
     aliases = ['flatline']
     filenames = []
     mimetypes = ['text/x-flatline']
+    version_added = '2.2'
 
     special_forms = ('let',)
 
@@ -874,14 +863,13 @@ class FlatlineLexer(RegexLexer):
 class SnowballLexer(ExtendedRegexLexer):
     """
     Lexer for Snowball source code.
-
-    .. versionadded:: 2.2
     """
 
     name = 'Snowball'
     url = 'https://snowballstem.org/'
     aliases = ['snowball']
     filenames = ['*.sbl']
+    version_added = '2.2'
 
     _ws = r'\n\r\t '
 
@@ -897,8 +885,8 @@ class SnowballLexer(ExtendedRegexLexer):
         def callback(lexer, match, ctx):
             s = match.start()
             text = match.group()
-            string = re.compile(r'([^%s]*)(.)' % re.escape(lexer._start)).match
-            escape = re.compile(r'([^%s]*)(.)' % re.escape(lexer._end)).match
+            string = re.compile(rf'([^{re.escape(lexer._start)}]*)(.)').match
+            escape = re.compile(rf'([^{re.escape(lexer._end)}]*)(.)').match
             pos = 0
             do_string = do_string_first
             while pos < len(text):
@@ -934,7 +922,7 @@ class SnowballLexer(ExtendedRegexLexer):
             include('root1'),
         ],
         'root1': [
-            (r'[%s]+' % _ws, Whitespace),
+            (rf'[{_ws}]+', Whitespace),
             (r'\d+', Number.Integer),
             (r"'", String.Single, 'string'),
             (r'[()]', Punctuation),
@@ -957,9 +945,9 @@ class SnowballLexer(ExtendedRegexLexer):
             (words(('size', 'limit', 'cursor', 'maxint', 'minint'),
                    suffix=r'\b'),
              Name.Builtin),
-            (r'(stringdef\b)([%s]*)([^%s]+)' % (_ws, _ws),
+            (rf'(stringdef\b)([{_ws}]*)([^{_ws}]+)',
              bygroups(Keyword.Reserved, Whitespace, String.Escape)),
-            (r'(stringescapes\b)([%s]*)(.)([%s]*)(.)' % (_ws, _ws),
+            (rf'(stringescapes\b)([{_ws}]*)(.)([{_ws}]*)(.)',
              _stringescapes),
             (r'[A-Za-z]\w*', Name),
         ],
diff --git a/libs/pygments/lexers/dylan.py b/libs/pygments/lexers/dylan.py
index f5aa73ab7..2109bd52c 100644
--- a/libs/pygments/lexers/dylan.py
+++ b/libs/pygments/lexers/dylan.py
@@ -4,7 +4,7 @@
 
     Lexers for the Dylan language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,8 +21,6 @@ __all__ = ['DylanLexer', 'DylanConsoleLexer', 'DylanLidLexer']
 class DylanLexer(RegexLexer):
     """
     For the Dylan language.
-
-    .. versionadded:: 0.7
     """
 
     name = 'Dylan'
@@ -30,6 +28,7 @@ class DylanLexer(RegexLexer):
     aliases = ['dylan']
     filenames = ['*.dylan', '*.dyl', '*.intr']
     mimetypes = ['text/x-dylan']
+    version_added = '0.7'
 
     flags = re.IGNORECASE
 
@@ -214,15 +213,14 @@ class DylanLexer(RegexLexer):
 class DylanLidLexer(RegexLexer):
     """
     For Dylan LID (Library Interchange Definition) files.
-
-    .. versionadded:: 1.6
     """
 
     name = 'DylanLID'
     aliases = ['dylan-lid', 'lid']
     filenames = ['*.lid', '*.hdp']
     mimetypes = ['text/x-dylan-lid']
-
+    url = 'http://www.opendylan.org/'
+    version_added = '1.6'
     flags = re.IGNORECASE
 
     tokens = {
@@ -244,15 +242,15 @@ class DylanConsoleLexer(Lexer):
     """
     For Dylan interactive console output.
 
-    This is based on a copy of the RubyConsoleLexer.
-
-    .. versionadded:: 1.6
+    This is based on a copy of the ``RubyConsoleLexer``.
     """
     name = 'Dylan session'
     aliases = ['dylan-console', 'dylan-repl']
     filenames = ['*.dylan-console']
     mimetypes = ['text/x-dylan-console']
-    _example = 'dylan-console/console'
+    url = 'http://www.opendylan.org/'
+    version_added = '1.6'
+    _example = 'dylan-console/console.dylan-console'
 
     _prompt_re = re.compile(r'\?| ')
 
diff --git a/libs/pygments/lexers/ecl.py b/libs/pygments/lexers/ecl.py
index 7e93e0cb5..f1ee3bf17 100644
--- a/libs/pygments/lexers/ecl.py
+++ b/libs/pygments/lexers/ecl.py
@@ -4,7 +4,7 @@
 
     Lexers for the ECL language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['ECLLexer']
 class ECLLexer(RegexLexer):
     """
     Lexer for the declarative big-data ECL language.
-
-    .. versionadded:: 1.5
     """
 
     name = 'ECL'
@@ -29,6 +27,7 @@ class ECLLexer(RegexLexer):
     aliases = ['ecl']
     filenames = ['*.ecl']
     mimetypes = ['application/x-ecl']
+    version_added = '1.5'
 
     flags = re.IGNORECASE | re.MULTILINE
 
diff --git a/libs/pygments/lexers/eiffel.py b/libs/pygments/lexers/eiffel.py
index 8a5a55950..691c71873 100644
--- a/libs/pygments/lexers/eiffel.py
+++ b/libs/pygments/lexers/eiffel.py
@@ -4,7 +4,7 @@
 
     Lexer for the Eiffel language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['EiffelLexer']
 class EiffelLexer(RegexLexer):
     """
     For Eiffel source code.
-
-    .. versionadded:: 2.0
     """
     name = 'Eiffel'
     url = 'https://www.eiffel.com'
     aliases = ['eiffel']
     filenames = ['*.e']
     mimetypes = ['text/x-eiffel']
+    version_added = '2.0'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/elm.py b/libs/pygments/lexers/elm.py
index 0e7ac3fab..cebbbf002 100644
--- a/libs/pygments/lexers/elm.py
+++ b/libs/pygments/lexers/elm.py
@@ -4,7 +4,7 @@
 
     Lexer for the Elm programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['ElmLexer']
 class ElmLexer(RegexLexer):
     """
     For Elm source code.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Elm'
@@ -27,6 +25,7 @@ class ElmLexer(RegexLexer):
     aliases = ['elm']
     filenames = ['*.elm']
     mimetypes = ['text/x-elm']
+    version_added = '2.1'
 
     validName = r'[a-z_][a-zA-Z0-9_\']*'
 
diff --git a/libs/pygments/lexers/elpi.py b/libs/pygments/lexers/elpi.py
index 6fc8b502d..5e4b1e5a0 100644
--- a/libs/pygments/lexers/elpi.py
+++ b/libs/pygments/lexers/elpi.py
@@ -4,22 +4,21 @@
 
     Lexer for the `Elpi <http://github.com/LPCIC/elpi>`_ programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from pygments.lexer import RegexLexer, bygroups, include
+from pygments.lexer import RegexLexer, bygroups, include, using
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation
 
 __all__ = ['ElpiLexer']
 
+from pygments.lexers.theorem import CoqLexer
 
 class ElpiLexer(RegexLexer):
     """
     Lexer for the Elpi programming language.
-
-    .. versionadded:: 2.11
     """
 
     name = 'Elpi'
@@ -27,19 +26,20 @@ class ElpiLexer(RegexLexer):
     aliases = ['elpi']
     filenames = ['*.elpi']
     mimetypes = ['text/x-elpi']
+    version_added = '2.11'
 
     lcase_re = r"[a-z]"
     ucase_re = r"[A-Z]"
     digit_re = r"[0-9]"
     schar2_re = r"([+*^?/<>`'@#~=&!])"
-    schar_re = r"({}|-|\$|_)".format(schar2_re)
-    idchar_re = r"({}|{}|{}|{})".format(lcase_re,ucase_re,digit_re,schar_re)
-    idcharstarns_re = r"({}*(\.({}|{}){}*)*)".format(idchar_re, lcase_re, ucase_re, idchar_re)
-    symbchar_re = r"({}|{}|{}|{}|:)".format(lcase_re, ucase_re, digit_re, schar_re)
-    constant_re = r"({}{}*|{}{}|{}{}*|_{}+)".format(ucase_re, idchar_re, lcase_re, idcharstarns_re, schar2_re, symbchar_re, idchar_re)
+    schar_re = rf"({schar2_re}|-|\$|_)"
+    idchar_re = rf"({lcase_re}|{ucase_re}|{digit_re}|{schar_re})"
+    idcharstarns_re = rf"({idchar_re}*(\.({lcase_re}|{ucase_re}){idchar_re}*)*)"
+    symbchar_re = rf"({lcase_re}|{ucase_re}|{digit_re}|{schar_re}|:)"
+    constant_re = rf"({ucase_re}{idchar_re}*|{lcase_re}{idcharstarns_re}|{schar2_re}{symbchar_re}*|_{idchar_re}+)"
     symbol_re = r"(,|<=>|->|:-|;|\?-|->|&|=>|\bas\b|\buvar\b|<|=<|=|==|>=|>|\bi<|\bi=<|\bi>=|\bi>|\bis\b|\br<|\br=<|\br>=|\br>|\bs<|\bs=<|\bs>=|\bs>|@|::|\[\]|`->|`:|`:=|\^|-|\+|\bi-|\bi\+|r-|r\+|/|\*|\bdiv\b|\bi\*|\bmod\b|\br\*|~|\bi~|\br~)"
-    escape_re = r"\(({}|{})\)".format(constant_re,symbol_re)
-    const_sym_re = r"({}|{}|{})".format(constant_re,symbol_re,escape_re)
+    escape_re = rf"\(({constant_re}|{symbol_re})\)"
+    const_sym_re = rf"({constant_re}|{symbol_re}|{escape_re})"
 
     tokens = {
         'root': [
@@ -52,37 +52,40 @@ class ElpiLexer(RegexLexer):
             (r"(:before|:after|:if|:name)(\s*)(\")",
              bygroups(Keyword.Mode, Text.Whitespace, String.Double),
              'elpi-string'),
-            (r"(:index)(\s*\()", bygroups(Keyword.Mode, Text.Whitespace),
+            (r"(:index)(\s*)(\()", bygroups(Keyword.Mode, Text.Whitespace, Punctuation),
              'elpi-indexing-expr'),
-            (r"\b(external pred|pred)(\s+)({})".format(const_sym_re),
+            (rf"\b(external pred|pred)(\s+)({const_sym_re})",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
              'elpi-pred-item'),
-            (r"\b(external type|type)(\s+)(({}(,\s*)?)+)".format(const_sym_re),
+            (rf"\b(external type|type)(\s+)(({const_sym_re}(,\s*)?)+)",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
              'elpi-type'),
-            (r"\b(kind)(\s+)(({}|,)+)".format(const_sym_re),
+            (rf"\b(kind)(\s+)(({const_sym_re}|,)+)",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
              'elpi-type'),
-            (r"\b(typeabbrev)(\s+)({})".format(const_sym_re),
+            (rf"\b(typeabbrev)(\s+)({const_sym_re})",
+             bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
+             'elpi-type'),
+            (r"\b(typeabbrev)(\s+)(\([^)]+\))",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
              'elpi-type'),
             (r"\b(accumulate)(\s+)(\")",
              bygroups(Keyword.Declaration, Text.Whitespace, String.Double),
              'elpi-string'),
-            (r"\b(accumulate|namespace|local)(\s+)({})".format(constant_re),
+            (rf"\b(accumulate|namespace|local)(\s+)({constant_re})",
              bygroups(Keyword.Declaration, Text.Whitespace, Text)),
-            (r"\b(shorten)(\s+)({}\.)".format(constant_re),
+            (rf"\b(shorten)(\s+)({constant_re}\.)",
              bygroups(Keyword.Declaration, Text.Whitespace, Text)),
             (r"\b(pi|sigma)(\s+)([a-zA-Z][A-Za-z0-9_ ]*)(\\)",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Variable, Text)),
-            (r"\b(constraint)(\s+)(({}(\s+)?)+)".format(const_sym_re),
+            (rf"\b(constraint)(\s+)(({const_sym_re}(\s+)?)+)",
              bygroups(Keyword.Declaration, Text.Whitespace, Name.Function),
              'elpi-chr-rule-start'),
 
-            (r"(?=[A-Z_]){}".format(constant_re), Name.Variable),
-            (r"(?=[a-z_]){}\\".format(constant_re), Name.Variable),
+            (rf"(?=[A-Z_]){constant_re}", Name.Variable),
+            (rf"(?=[a-z_])({constant_re}|_)\\", Name.Variable),
             (r"_", Name.Variable),
-            (r"({}|!|=>|;)".format(symbol_re), Keyword.Declaration),
+            (rf"({symbol_re}|!|=>|;)", Keyword.Declaration),
             (constant_re, Text),
             (r"\[|\]|\||=>", Keyword.Declaration),
             (r'"', String.Double, 'elpi-string'),
@@ -90,23 +93,19 @@ class ElpiLexer(RegexLexer):
             (r'\'', String.Double, 'elpi-tick'),
             (r'\{\{', Punctuation, 'elpi-quote'),
             (r'\{[^\{]', Text, 'elpi-spill'),
-            (r"\(", Text, 'elpi-in-parens'),
+            (r"\(", Punctuation, 'elpi-in-parens'),
             (r'\d[\d_]*', Number.Integer),
             (r'-?\d[\d_]*(.[\d_]*)?([eE][+\-]?\d[\d_]*)', Number.Float),
             (r"[\+\*\-/\^\.]", Operator),
         ],
         '_elpi-comment': [
             (r'%[^\n]*\n', Comment),
-            (r'/\*', Comment, 'elpi-multiline-comment'),
+            (r'/(?:\\\n)?[*](?:[^*]|[*](?!(?:\\\n)?/))*[*](?:\\\n)?/', Comment),
             (r"\s+", Text.Whitespace),
         ],
-        'elpi-multiline-comment': [
-            (r'\*/', Comment, '#pop'),
-            (r'.', Comment)
-        ],
         'elpi-indexing-expr':[
             (r'[0-9 _]+', Number.Integer),
-            (r'\)', Text, '#pop'),
+            (r'\)', Punctuation, '#pop'),
         ],
         'elpi-type': [
             (r"(ctype\s+)(\")", bygroups(Keyword.Type, String.Double), 'elpi-string'),
@@ -117,13 +116,13 @@ class ElpiLexer(RegexLexer):
             include('_elpi-comment'),
         ],
         'elpi-chr-rule-start': [
-            (r"\{", Text, 'elpi-chr-rule'),
+            (r"\{", Punctuation, 'elpi-chr-rule'),
             include('_elpi-comment'),
         ],
         'elpi-chr-rule': [
            (r"\brule\b", Keyword.Declaration),
            (r"\\", Keyword.Declaration),
-           (r"\}", Text, '#pop:2'),
+           (r"\}", Punctuation, '#pop:2'),
            include('elpi'),
         ],
         'elpi-pred-item': [
@@ -153,11 +152,15 @@ class ElpiLexer(RegexLexer):
             (r'"', String.Double, '#pop'),
         ],
         'elpi-quote': [
-            (r'\{\{', Punctuation, '#push'),
             (r'\}\}', Punctuation, '#pop'),
-            (r"(lp:)((?=[A-Z_]){})".format(constant_re), bygroups(Keyword, Name.Variable)),
-            (r"[^l\}]+", Text),
-            (r"l|\}", Text),
+            (r"\s+", Text.Whitespace),
+            (r"(lp:)(\{\{)", bygroups(Number, Punctuation), 'elpi-quote-exit'),
+            (rf"(lp:)((?=[A-Z_]){constant_re})", bygroups(Number, Name.Variable)),
+            (r"((?!lp:|\}\}).)+", using(CoqLexer)),
+        ],
+        'elpi-quote-exit': [
+            include('elpi'),
+            (r'\}\}', Punctuation, '#pop'),
         ],
         'elpi-spill': [
             (r'\{[^\{]', Text, '#push'),
@@ -165,9 +168,8 @@ class ElpiLexer(RegexLexer):
             include('elpi'),
         ],
         'elpi-in-parens': [
-            (r"\(", Operator, '#push'),
-            (r"\)", Operator, '#pop'),
+            (r"\(", Punctuation, '#push'),
             include('elpi'),
+            (r"\)", Punctuation, '#pop'),
         ],
-
     }
diff --git a/libs/pygments/lexers/email.py b/libs/pygments/lexers/email.py
index 36a8a95d9..ea071c800 100644
--- a/libs/pygments/lexers/email.py
+++ b/libs/pygments/lexers/email.py
@@ -4,7 +4,7 @@
 
     Lexer for the raw E-mail.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -119,14 +119,14 @@ class EmailLexer(DelegatingLexer):
     `highlight-X-header`
         Highlight the fields of ``X-`` user-defined email header. (default:
         ``False``).
-
-    .. versionadded:: 2.5
     """
 
     name = "E-mail"
     aliases = ["email", "eml"]
     filenames = ["*.eml"]
     mimetypes = ["message/rfc822"]
+    url = "https://en.wikipedia.org/wiki/Email#Message_format"
+    version_added = '2.5'
 
     def __init__(self, **options):
         super().__init__(EmailHeaderLexer, MIMELexer, Comment, **options)
diff --git a/libs/pygments/lexers/erlang.py b/libs/pygments/lexers/erlang.py
index e484664a1..120f5049f 100644
--- a/libs/pygments/lexers/erlang.py
+++ b/libs/pygments/lexers/erlang.py
@@ -4,7 +4,7 @@
 
     Lexers for Erlang.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,8 +22,6 @@ __all__ = ['ErlangLexer', 'ErlangShellLexer', 'ElixirConsoleLexer',
 class ErlangLexer(RegexLexer):
     """
     For the Erlang functional programming language.
-
-    .. versionadded:: 0.9
     """
 
     name = 'Erlang'
@@ -31,6 +29,7 @@ class ErlangLexer(RegexLexer):
     aliases = ['erlang']
     filenames = ['*.erl', '*.hrl', '*.es', '*.escript']
     mimetypes = ['text/x-erlang']
+    version_added = '0.9'
 
     keywords = (
         'after', 'begin', 'case', 'catch', 'cond', 'end', 'fun', 'if',
@@ -150,13 +149,13 @@ class ErlangLexer(RegexLexer):
 class ErlangShellLexer(Lexer):
     """
     Shell sessions in erl (for Erlang code).
-
-    .. versionadded:: 1.1
     """
     name = 'Erlang erl session'
     aliases = ['erl']
     filenames = ['*.erl-sh']
     mimetypes = ['text/x-erl-shellsession']
+    url = 'https://www.erlang.org/'
+    version_added = '1.1'
 
     _prompt_re = re.compile(r'(?:\([\w@_.]+\))?\d+>(?=\s|\Z)')
 
@@ -191,10 +190,10 @@ class ErlangShellLexer(Lexer):
 def gen_elixir_string_rules(name, symbol, token):
     states = {}
     states['string_' + name] = [
-        (r'[^#%s\\]+' % (symbol,), token),
+        (rf'[^#{symbol}\\]+', token),
         include('escapes'),
         (r'\\.', token),
-        (r'(%s)' % (symbol,), bygroups(token), "#pop"),
+        (rf'({symbol})', bygroups(token), "#pop"),
         include('interpol')
     ]
     return states
@@ -203,32 +202,31 @@ def gen_elixir_string_rules(name, symbol, token):
 def gen_elixir_sigstr_rules(term, term_class, token, interpol=True):
     if interpol:
         return [
-            (r'[^#%s\\]+' % (term_class,), token),
+            (rf'[^#{term_class}\\]+', token),
             include('escapes'),
             (r'\\.', token),
-            (r'%s[a-zA-Z]*' % (term,), token, '#pop'),
+            (rf'{term}[a-zA-Z]*', token, '#pop'),
             include('interpol')
         ]
     else:
         return [
-            (r'[^%s\\]+' % (term_class,), token),
+            (rf'[^{term_class}\\]+', token),
             (r'\\.', token),
-            (r'%s[a-zA-Z]*' % (term,), token, '#pop'),
+            (rf'{term}[a-zA-Z]*', token, '#pop'),
         ]
 
 
 class ElixirLexer(RegexLexer):
     """
     For the Elixir language.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Elixir'
-    url = 'http://elixir-lang.org'
+    url = 'https://elixir-lang.org'
     aliases = ['elixir', 'ex', 'exs']
     filenames = ['*.ex', '*.eex', '*.exs', '*.leex']
     mimetypes = ['text/x-elixir']
+    version_added = '1.5'
 
     KEYWORD = ('fn', 'do', 'end', 'after', 'else', 'rescue', 'catch')
     KEYWORD_OPERATOR = ('not', 'and', 'or', 'when', 'in')
@@ -303,9 +301,9 @@ class ElixirLexer(RegexLexer):
 
         for term, name in triquotes:
             states['sigils'] += [
-                (r'(~[a-z])(%s)' % (term,), bygroups(token, String.Heredoc),
+                (rf'(~[a-z])({term})', bygroups(token, String.Heredoc),
                     (name + '-end', name + '-intp')),
-                (r'(~[A-Z])(%s)' % (term,), bygroups(token, String.Heredoc),
+                (rf'(~[A-Z])({term})', bygroups(token, String.Heredoc),
                     (name + '-end', name + '-no-intp')),
             ]
 
@@ -337,12 +335,12 @@ class ElixirLexer(RegexLexer):
     op3_re = "|".join(re.escape(s) for s in OPERATORS3)
     op2_re = "|".join(re.escape(s) for s in OPERATORS2)
     op1_re = "|".join(re.escape(s) for s in OPERATORS1)
-    ops_re = r'(?:%s|%s|%s)' % (op3_re, op2_re, op1_re)
+    ops_re = rf'(?:{op3_re}|{op2_re}|{op1_re})'
     punctuation_re = "|".join(re.escape(s) for s in PUNCTUATION)
     alnum = r'\w'
-    name_re = r'(?:\.\.\.|[a-z_]%s*[!?]?)' % alnum
-    modname_re = r'[A-Z]%(alnum)s*(?:\.[A-Z]%(alnum)s*)*' % {'alnum': alnum}
-    complex_name_re = r'(?:%s|%s|%s)' % (name_re, modname_re, ops_re)
+    name_re = rf'(?:\.\.\.|[a-z_]{alnum}*[!?]?)'
+    modname_re = rf'[A-Z]{alnum}*(?:\.[A-Z]{alnum}*)*'
+    complex_name_re = rf'(?:{name_re}|{modname_re}|{ops_re})'
     special_atom_re = r'(?:\.\.\.|<<>>|%\{\}|%|\{\})'
 
     long_hex_char_re = r'(\\x\{)([\da-fA-F]+)(\})'
@@ -375,7 +373,7 @@ class ElixirLexer(RegexLexer):
             (r":'", String.Symbol, 'string_single_atom'),
 
             # [keywords: ...]
-            (r'(%s|%s)(:)(?=\s|\n)' % (special_atom_re, complex_name_re),
+            (rf'({special_atom_re}|{complex_name_re})(:)(?=\s|\n)',
                 bygroups(String.Symbol, Punctuation)),
 
             # @attributes
@@ -383,7 +381,7 @@ class ElixirLexer(RegexLexer):
 
             # identifiers
             (name_re, Name),
-            (r'(%%?)(%s)' % (modname_re,), bygroups(Punctuation, Name.Class)),
+            (rf'(%?)({modname_re})', bygroups(Punctuation, Name.Class)),
 
             # operators and punctuation
             (op3_re, Operator),
@@ -484,13 +482,13 @@ class ElixirConsoleLexer(Lexer):
         [1,2,3]
         iex> length [head | tail]
         3
-
-    .. versionadded:: 1.5
     """
 
     name = 'Elixir iex session'
     aliases = ['iex']
     mimetypes = ['text/x-elixir-shellsession']
+    url = 'https://elixir-lang.org'
+    version_added = '1.5'
 
     _prompt_re = re.compile(r'(iex|\.{3})((?:\([\w@_.]+\))?\d+|\(\d+\))?> ')
 
diff --git a/libs/pygments/lexers/esoteric.py b/libs/pygments/lexers/esoteric.py
index ccc280541..fe3825c35 100644
--- a/libs/pygments/lexers/esoteric.py
+++ b/libs/pygments/lexers/esoteric.py
@@ -4,7 +4,7 @@
 
     Lexers for esoteric languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,7 @@ class BrainfuckLexer(RegexLexer):
     aliases = ['brainfuck', 'bf']
     filenames = ['*.bf', '*.b']
     mimetypes = ['application/x-brainfuck']
+    version_added = ''
 
     tokens = {
         'common': [
@@ -76,14 +77,13 @@ class BrainfuckLexer(RegexLexer):
 class BefungeLexer(RegexLexer):
     """
     Lexer for the esoteric Befunge language.
-
-    .. versionadded:: 0.7
     """
     name = 'Befunge'
     url = 'http://en.wikipedia.org/wiki/Befunge'
     aliases = ['befunge']
     filenames = ['*.befunge']
     mimetypes = ['application/x-befunge']
+    version_added = '0.7'
 
     tokens = {
         'root': [
@@ -106,18 +106,17 @@ class BefungeLexer(RegexLexer):
 class CAmkESLexer(RegexLexer):
     """
     Basic lexer for the input language for the CAmkES component platform.
-
-    .. versionadded:: 2.1
     """
     name = 'CAmkES'
     url = 'https://sel4.systems/CAmkES/'
     aliases = ['camkes', 'idl4']
     filenames = ['*.camkes', '*.idl4']
+    version_added = '2.1'
 
     tokens = {
         'root': [
             # C pre-processor directive
-            (r'^(\s*)(#.*)(\n)', bygroups(Whitespace, Comment.Preproc, 
+            (r'^(\s*)(#.*)(\n)', bygroups(Whitespace, Comment.Preproc,
                 Whitespace)),
 
             # Whitespace, comments
@@ -181,13 +180,12 @@ class CapDLLexer(RegexLexer):
     shadow type names, but these instances are currently incorrectly
     highlighted as types. Supporting this would need a stateful lexer that is
     considered unnecessarily complex for now.
-
-    .. versionadded:: 2.2
     """
     name = 'CapDL'
     url = 'https://ssrg.nicta.com.au/publications/nictaabstracts/Kuz_KLW_10.abstract.pml'
     aliases = ['capdl']
     filenames = ['*.cdl']
+    version_added = '2.2'
 
     tokens = {
         'root': [
@@ -235,12 +233,12 @@ class RedcodeLexer(RegexLexer):
     """
     A simple Redcode lexer based on ICWS'94.
     Contributed by Adam Blinkinsop <blinks@acm.org>.
-
-    .. versionadded:: 0.8
     """
     name = 'Redcode'
     aliases = ['redcode']
     filenames = ['*.cw']
+    url = 'https://en.wikipedia.org/wiki/Core_War'
+    version_added = '0.8'
 
     opcodes = ('DAT', 'MOV', 'ADD', 'SUB', 'MUL', 'DIV', 'MOD',
                'JMP', 'JMZ', 'JMN', 'DJN', 'CMP', 'SLT', 'SPL',
@@ -254,8 +252,8 @@ class RedcodeLexer(RegexLexer):
             (r';.*$', Comment.Single),
             # Lexemes:
             #  Identifiers
-            (r'\b(%s)\b' % '|'.join(opcodes), Name.Function),
-            (r'\b(%s)\b' % '|'.join(modifiers), Name.Decorator),
+            (r'\b({})\b'.format('|'.join(opcodes)), Name.Function),
+            (r'\b({})\b'.format('|'.join(modifiers)), Name.Decorator),
             (r'[A-Za-z_]\w+', Name),
             #  Operators
             (r'[-+*/%]', Operator),
@@ -276,6 +274,7 @@ class AheuiLexer(RegexLexer):
     url = 'http://aheui.github.io/'
     aliases = ['aheui']
     filenames = ['*.aheui']
+    version_added = ''
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/ezhil.py b/libs/pygments/lexers/ezhil.py
index 49478ea00..aeb71ab0c 100644
--- a/libs/pygments/lexers/ezhil.py
+++ b/libs/pygments/lexers/ezhil.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for Ezhil language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ __all__ = ['EzhilLexer']
 class EzhilLexer(RegexLexer):
     """
     Lexer for Ezhil, a Tamil script-based programming language.
-
-    .. versionadded:: 2.1
     """
     name = 'Ezhil'
     url = 'http://ezhillang.org'
     aliases = ['ezhil']
     filenames = ['*.n']
     mimetypes = ['text/x-ezhil']
+    version_added = '2.1'
     # Refer to tamil.utf8.tamil_letters from open-tamil for a stricter version of this.
     # This much simpler version is close enough, and includes combining marks.
     _TALETTERS = '[a-zA-Z_]|[\u0b80-\u0bff]'
diff --git a/libs/pygments/lexers/factor.py b/libs/pygments/lexers/factor.py
index aa0cd2d85..2ec3f9be2 100644
--- a/libs/pygments/lexers/factor.py
+++ b/libs/pygments/lexers/factor.py
@@ -4,7 +4,7 @@
 
     Lexers for the Factor language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['FactorLexer']
 class FactorLexer(RegexLexer):
     """
     Lexer for the Factor language.
-
-    .. versionadded:: 1.4
     """
     name = 'Factor'
     url = 'http://factorcode.org'
     aliases = ['factor']
     filenames = ['*.factor']
     mimetypes = ['text/x-factor']
+    version_added = '1.4'
 
     builtin_kernel = words((
         '-rot', '2bi', '2bi@', '2bi*', '2curry', '2dip', '2drop', '2dup', '2keep', '2nip',
diff --git a/libs/pygments/lexers/fantom.py b/libs/pygments/lexers/fantom.py
index 7182d8184..7228554ba 100644
--- a/libs/pygments/lexers/fantom.py
+++ b/libs/pygments/lexers/fantom.py
@@ -4,7 +4,7 @@
 
     Lexer for the Fantom language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,13 +21,13 @@ __all__ = ['FantomLexer']
 class FantomLexer(RegexLexer):
     """
     For Fantom source code.
-
-    .. versionadded:: 1.5
     """
     name = 'Fantom'
     aliases = ['fan']
     filenames = ['*.fan']
     mimetypes = ['application/x-fantom']
+    url = 'https://www.fantom.org'
+    version_added = '1.5'
 
     # often used regexes
     def s(str):
diff --git a/libs/pygments/lexers/felix.py b/libs/pygments/lexers/felix.py
index 5e34f056e..a42ac0805 100644
--- a/libs/pygments/lexers/felix.py
+++ b/libs/pygments/lexers/felix.py
@@ -4,7 +4,7 @@
 
     Lexer for the Felix language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,8 +19,6 @@ __all__ = ['FelixLexer']
 class FelixLexer(RegexLexer):
     """
     For Felix source code.
-
-    .. versionadded:: 1.2
     """
 
     name = 'Felix'
@@ -28,6 +26,7 @@ class FelixLexer(RegexLexer):
     aliases = ['felix', 'flx']
     filenames = ['*.flx', '*.flxh']
     mimetypes = ['text/x-felix']
+    version_added = '1.2'
 
     preproc = (
         'elif', 'else', 'endif', 'if', 'ifdef', 'ifndef',
@@ -128,13 +127,13 @@ class FelixLexer(RegexLexer):
 
             # IntegerLiteral
             # -- Binary
-            (r'0[Bb][01_]+%s' % decimal_suffixes, Number.Bin),
+            (rf'0[Bb][01_]+{decimal_suffixes}', Number.Bin),
             # -- Octal
-            (r'0[0-7_]+%s' % decimal_suffixes, Number.Oct),
+            (rf'0[0-7_]+{decimal_suffixes}', Number.Oct),
             # -- Hexadecimal
-            (r'0[xX][0-9a-fA-F_]+%s' % decimal_suffixes, Number.Hex),
+            (rf'0[xX][0-9a-fA-F_]+{decimal_suffixes}', Number.Hex),
             # -- Decimal
-            (r'(0|[1-9][0-9_]*)%s' % decimal_suffixes, Number.Integer),
+            (rf'(0|[1-9][0-9_]*){decimal_suffixes}', Number.Integer),
 
             # Strings
             ('([rR][cC]?|[cC][rR])"""', String, 'tdqs'),
@@ -153,8 +152,8 @@ class FelixLexer(RegexLexer):
             (r'[a-zA-Z_]\w*:>', Name.Label),
 
             # Identifiers
-            (r'(%s)\b' % '|'.join(name_builtins), Name.Builtin),
-            (r'(%s)\b' % '|'.join(name_pseudo), Name.Builtin.Pseudo),
+            (r'({})\b'.format('|'.join(name_builtins)), Name.Builtin),
+            (r'({})\b'.format('|'.join(name_pseudo)), Name.Builtin.Pseudo),
             (r'[a-zA-Z_]\w*', Name),
         ],
         'whitespace': [
@@ -169,7 +168,7 @@ class FelixLexer(RegexLexer):
             (r'#', Comment.Preproc, 'macro'),
         ],
         'operators': [
-            (r'(%s)\b' % '|'.join(operator_words), Operator.Word),
+            (r'({})\b'.format('|'.join(operator_words)), Operator.Word),
             (r'!=|==|<<|>>|\|\||&&|[-~+/*%=<>&^|.$]', Operator),
         ],
         'comment': [
diff --git a/libs/pygments/lexers/fift.py b/libs/pygments/lexers/fift.py
index 027175b14..1263236c9 100644
--- a/libs/pygments/lexers/fift.py
+++ b/libs/pygments/lexers/fift.py
@@ -4,7 +4,7 @@
 
     Lexers for fift.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,6 +23,7 @@ class FiftLexer(RegexLexer):
     aliases = ['fift', 'fif']
     filenames = ['*.fif']
     url = 'https://ton-blockchain.github.io/docs/fiftbase.pdf'
+    version_added = ''
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/floscript.py b/libs/pygments/lexers/floscript.py
index 6cc2971a2..9c7eaab5a 100644
--- a/libs/pygments/lexers/floscript.py
+++ b/libs/pygments/lexers/floscript.py
@@ -4,7 +4,7 @@
 
     Lexer for FloScript
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['FloScriptLexer']
 class FloScriptLexer(RegexLexer):
     """
     For FloScript configuration language source code.
-
-    .. versionadded:: 2.4
     """
 
     name = 'FloScript'
     url = 'https://github.com/ioflo/ioflo'
     aliases = ['floscript', 'flo']
     filenames = ['*.flo']
+    version_added = '2.4'
 
     def innerstring_rules(ttype):
         return [
diff --git a/libs/pygments/lexers/forth.py b/libs/pygments/lexers/forth.py
index 7feeaef53..51f75affb 100644
--- a/libs/pygments/lexers/forth.py
+++ b/libs/pygments/lexers/forth.py
@@ -4,7 +4,7 @@
 
     Lexer for the Forth language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,14 +21,13 @@ __all__ = ['ForthLexer']
 class ForthLexer(RegexLexer):
     """
     Lexer for Forth files.
-
-    .. versionadded:: 2.2
     """
     name = 'Forth'
     url = 'https://www.forth.com/forth/'
     aliases = ['forth']
     filenames = ['*.frt', '*.fs']
     mimetypes = ['application/x-forth']
+    version_added = '2.2'
 
     flags = re.IGNORECASE | re.MULTILINE
 
diff --git a/libs/pygments/lexers/fortran.py b/libs/pygments/lexers/fortran.py
index cee254f74..a6230f024 100644
--- a/libs/pygments/lexers/fortran.py
+++ b/libs/pygments/lexers/fortran.py
@@ -4,7 +4,7 @@
 
     Lexers for Fortran languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ __all__ = ['FortranLexer', 'FortranFixedLexer']
 class FortranLexer(RegexLexer):
     """
     Lexer for FORTRAN 90 code.
-
-    .. versionadded:: 0.10
     """
     name = 'Fortran'
     url = 'https://fortran-lang.org/'
     aliases = ['fortran', 'f90']
     filenames = ['*.f03', '*.f90', '*.F03', '*.F90']
     mimetypes = ['text/x-fortran']
+    version_added = '0.10'
     flags = re.IGNORECASE | re.MULTILINE
 
     # Data Types: INTEGER, REAL, COMPLEX, LOGICAL, CHARACTER and DOUBLE PRECISION
@@ -173,12 +172,12 @@ class FortranLexer(RegexLexer):
 class FortranFixedLexer(RegexLexer):
     """
     Lexer for fixed format Fortran.
-
-    .. versionadded:: 2.1
     """
     name = 'FortranFixed'
     aliases = ['fortranfixed']
     filenames = ['*.f', '*.F']
+    url = 'https://fortran-lang.org/'
+    version_added = '2.1'
 
     flags = re.IGNORECASE
 
diff --git a/libs/pygments/lexers/foxpro.py b/libs/pygments/lexers/foxpro.py
index 9d8d951c5..3e7c05697 100644
--- a/libs/pygments/lexers/foxpro.py
+++ b/libs/pygments/lexers/foxpro.py
@@ -4,7 +4,7 @@
 
     Simple lexer for Microsoft Visual FoxPro source code.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,14 @@ class FoxProLexer(RegexLexer):
 
     FoxPro syntax allows to shorten all keywords and function names
     to 4 characters.  Shortened forms are not recognized by this lexer.
-
-    .. versionadded:: 1.6
     """
 
     name = 'FoxPro'
     aliases = ['foxpro', 'vfp', 'clipper', 'xbase']
     filenames = ['*.PRG', '*.prg']
+    version_added = '1.6'
     mimetype = []
+    url = 'https://learn.microsoft.com/en-us/previous-versions/visualstudio/foxpro'
 
     flags = re.IGNORECASE | re.MULTILINE
 
diff --git a/libs/pygments/lexers/freefem.py b/libs/pygments/lexers/freefem.py
index eab6cbfff..87b066b1a 100644
--- a/libs/pygments/lexers/freefem.py
+++ b/libs/pygments/lexers/freefem.py
@@ -4,7 +4,7 @@
 
     Lexer for FreeFem++ language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,8 +21,6 @@ class FreeFemLexer(CppLexer):
 
     This is an extension of the CppLexer, as the FreeFem Language is a superset
     of C++.
-
-    .. versionadded:: 2.4
     """
 
     name = 'Freefem'
@@ -30,6 +28,7 @@ class FreeFemLexer(CppLexer):
     aliases = ['freefem']
     filenames = ['*.edp']
     mimetypes = ['text/x-freefem']
+    version_added = '2.4'
 
     # Language operators
     operators = {'+', '-', '*', '.*', '/', './', '%', '^', '^-1', ':', '\''}
diff --git a/libs/pygments/lexers/func.py b/libs/pygments/lexers/func.py
index 871f04058..d8c912a3e 100644
--- a/libs/pygments/lexers/func.py
+++ b/libs/pygments/lexers/func.py
@@ -4,7 +4,7 @@
 
     Lexers for FunC.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,6 +23,8 @@ class FuncLexer(RegexLexer):
     name = 'FunC'
     aliases = ['func', 'fc']
     filenames = ['*.fc', '*.func']
+    url = 'https://docs.ton.org/develop/func/overview'
+    version_added = ''
 
     # 1. Does not start from "
     # 2. Can start from ` and end with `, containing any character
diff --git a/libs/pygments/lexers/functional.py b/libs/pygments/lexers/functional.py
index 6189dd2cc..6a051d8fd 100644
--- a/libs/pygments/lexers/functional.py
+++ b/libs/pygments/lexers/functional.py
@@ -4,10 +4,11 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.lisp import SchemeLexer, CommonLispLexer, RacketLexer, \
     NewLispLexer, ShenLexer
 from pygments.lexers.haskell import HaskellLexer, LiterateHaskellLexer, \
diff --git a/libs/pygments/lexers/futhark.py b/libs/pygments/lexers/futhark.py
index b0efa88af..dd2efe83e 100644
--- a/libs/pygments/lexers/futhark.py
+++ b/libs/pygments/lexers/futhark.py
@@ -4,7 +4,7 @@
 
     Lexer for the Futhark language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,13 @@ __all__ = ['FutharkLexer']
 class FutharkLexer(RegexLexer):
     """
     A Futhark lexer
-
-    .. versionadded:: 2.8
     """
     name = 'Futhark'
     url = 'https://futhark-lang.org/'
     aliases = ['futhark']
     filenames = ['*.fut']
     mimetypes = ['text/x-futhark']
+    version_added = '2.8'
 
     num_types = ('i8', 'i16', 'i32', 'i64', 'u8', 'u16', 'u32', 'u64', 'f32', 'f64')
 
@@ -42,7 +41,7 @@ class FutharkLexer(RegexLexer):
              'DC[1-4]', 'NAK', 'SYN', 'ETB', 'CAN',
              'EM', 'SUB', 'ESC', '[FGRU]S', 'SP', 'DEL')
 
-    num_postfix = r'(%s)?' % '|'.join(num_types)
+    num_postfix = r'({})?'.format('|'.join(num_types))
 
     identifier_re = '[a-zA-Z_][a-zA-Z_0-9\']*'
 
@@ -53,12 +52,12 @@ class FutharkLexer(RegexLexer):
             (r'--(.*?)$', Comment.Single),
             (r'\s+', Whitespace),
             (r'\(\)', Punctuation),
-            (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
-            (r'\b(%s)(?!\')\b' % '|'.join(num_types + other_types), Keyword.Type),
+            (r'\b({})(?!\')\b'.format('|'.join(reserved)), Keyword.Reserved),
+            (r'\b({})(?!\')\b'.format('|'.join(num_types + other_types)), Keyword.Type),
 
             # Identifiers
             (r'#\[([a-zA-Z_\(\) ]*)\]', Comment.Preproc),
-            (r'[#!]?(%s\.)*%s' % (identifier_re, identifier_re), Name),
+            (rf'[#!]?({identifier_re}\.)*{identifier_re}', Name),
 
             (r'\\', Operator),
             (r'[-+/%=!><|&*^][-+/%=!><|&*^.]*', Operator),
diff --git a/libs/pygments/lexers/gcodelexer.py b/libs/pygments/lexers/gcodelexer.py
index c3a4a58a9..9e968bd6b 100644
--- a/libs/pygments/lexers/gcodelexer.py
+++ b/libs/pygments/lexers/gcodelexer.py
@@ -4,7 +4,7 @@
 
     Lexers for the G Code Language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,12 +17,12 @@ __all__ = ['GcodeLexer']
 class GcodeLexer(RegexLexer):
     """
     For gcode source code.
-
-    .. versionadded:: 2.9
     """
     name = 'g-code'
     aliases = ['gcode']
     filenames = ['*.gcode']
+    url = 'https://en.wikipedia.org/wiki/G-code'
+    version_added = '2.9'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/gdscript.py b/libs/pygments/lexers/gdscript.py
index 0f4f6d431..6dfe58976 100644
--- a/libs/pygments/lexers/gdscript.py
+++ b/libs/pygments/lexers/gdscript.py
@@ -7,7 +7,7 @@
     Modified by Daniel J. Ramirez <djrmuv@gmail.com> based on the original
     python.py.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,6 +31,7 @@ class GDScriptLexer(RegexLexer):
     aliases = ["gdscript", "gd"]
     filenames = ["*.gd"]
     mimetypes = ["text/x-gdscript", "application/x-gdscript"]
+    version_added = ''
 
     def innerstring_rules(ttype):
         return [
diff --git a/libs/pygments/lexers/gleam.py b/libs/pygments/lexers/gleam.py
new file mode 100644
index 000000000..19047e13e
--- /dev/null
+++ b/libs/pygments/lexers/gleam.py
@@ -0,0 +1,74 @@
+"""
+    pygments.lexers.gleam
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Gleam programming language.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words, bygroups
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['GleamLexer']
+
+
+class GleamLexer(RegexLexer):
+    """
+    Lexer for the Gleam programming language (version 1.0.0).
+    """
+
+    name = 'Gleam'
+    url = 'https://gleam.run/'
+    filenames = ['*.gleam']
+    aliases = ['gleam']
+    mimetypes = ['text/x-gleam']
+    version_added = '2.19'
+
+    keywords = words((
+        'as', 'assert', 'auto', 'case', 'const', 'delegate', 'derive', 'echo',
+        'else', 'fn', 'if', 'implement', 'import', 'let', 'macro', 'opaque',
+        'panic', 'pub', 'test', 'todo', 'type', 'use',
+    ), suffix=r'\b')
+
+    tokens = {
+        'root': [
+            # Comments
+            (r'(///.*?)(\n)', bygroups(String.Doc, Whitespace)),
+            (r'(//.*?)(\n)', bygroups(Comment.Single, Whitespace)),
+
+            # Keywords
+            (keywords, Keyword),
+            (r'([a-zA-Z_]+)(\.)', bygroups(Keyword, Punctuation)),
+
+            # Punctuation
+            (r'[()\[\]{}:;,@]+', Punctuation),
+            (r'(#|!=|!|==|\|>|\|\||\||\->|<\-|&&|<<|>>|\.\.|\.|=)', Punctuation),
+
+            # Operators
+            (r'(<>|\+\.?|\-\.?|\*\.?|/\.?|%\.?|<=\.?|>=\.?|<\.?|>\.?|=)', Operator),
+
+            # Strings
+            (r'"(\\"|[^"])*"', String),
+
+            # Identifiers
+            (r'\b(let)(\s+)(\w+)', bygroups(Keyword, Whitespace, Name.Variable)),
+            (r'\b(fn)(\s+)(\w+)', bygroups(Keyword, Whitespace, Name.Function)),
+            (r'[a-zA-Z_/]\w*', Name),
+
+            # numbers
+            (r'(\d+(_\d+)*\.(?!\.)(\d+(_\d+)*)?|\.\d+(_\d+)*)([eEf][+-]?[0-9]+)?', Number.Float),
+            (r'\d+(_\d+)*[eEf][+-]?[0-9]+', Number.Float),
+            (r'0[xX][a-fA-F0-9]+(_[a-fA-F0-9]+)*(\.([a-fA-F0-9]+(_[a-fA-F0-9]+)*)?)?p[+-]?\d+', Number.Float),
+            (r'0[bB][01]+(_[01]+)*', Number.Bin),
+            (r'0[oO][0-7]+(_[0-7]+)*', Number.Oct),
+            (r'0[xX][a-fA-F0-9]+(_[a-fA-F0-9]+)*', Number.Hex),
+            (r'\d+(_\d+)*', Number.Integer),
+
+            # Whitespace
+            (r'\s+', Whitespace),
+
+        ],
+    }
diff --git a/libs/pygments/lexers/go.py b/libs/pygments/lexers/go.py
index fe4a1846d..77a0fbce9 100644
--- a/libs/pygments/lexers/go.py
+++ b/libs/pygments/lexers/go.py
@@ -4,7 +4,7 @@
 
     Lexers for the Google Go language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['GoLexer']
 class GoLexer(RegexLexer):
     """
     For Go source.
-
-    .. versionadded:: 1.2
     """
     name = 'Go'
     url = 'https://go.dev/'
     filenames = ['*.go']
     aliases = ['go', 'golang']
     mimetypes = ['text/x-gosrc']
+    version_added = '1.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/grammar_notation.py b/libs/pygments/lexers/grammar_notation.py
index 792713341..45274fd14 100644
--- a/libs/pygments/lexers/grammar_notation.py
+++ b/libs/pygments/lexers/grammar_notation.py
@@ -4,7 +4,7 @@
 
     Lexers for grammar notations like BNF.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -39,14 +39,14 @@ class BnfLexer(RegexLexer):
 
     Though these decision making might cause too minimal highlighting
     and you might be disappointed, but it is reasonable for us.
-
-    .. versionadded:: 2.1
     """
 
     name = 'BNF'
     aliases = ['bnf']
     filenames = ['*.bnf']
     mimetypes = ['text/x-bnf']
+    url = 'https://en.wikipedia.org/wiki/Backus%E2%80%93Naur_form'
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -68,8 +68,6 @@ class AbnfLexer(RegexLexer):
     Lexer for IETF 7405 ABNF.
 
     (Updates `5234 <http://www.ietf.org/rfc/rfc5234.txt>`_) grammars.
-
-    .. versionadded:: 2.1
     """
 
     name = 'ABNF'
@@ -77,6 +75,7 @@ class AbnfLexer(RegexLexer):
     aliases = ['abnf']
     filenames = ['*.abnf']
     mimetypes = ['text/x-abnf']
+    version_added = '2.1'
 
     _core_rules = (
         'ALPHA', 'BIT', 'CHAR', 'CR', 'CRLF', 'CTL', 'DIGIT',
@@ -133,14 +132,13 @@ class AbnfLexer(RegexLexer):
 class JsgfLexer(RegexLexer):
     """
     For JSpeech Grammar Format grammars.
-
-    .. versionadded:: 2.2
     """
     name = 'JSGF'
     url = 'https://www.w3.org/TR/jsgf/'
     aliases = ['jsgf']
     filenames = ['*.jsgf']
     mimetypes = ['application/jsgf', 'application/x-jsgf', 'text/jsgf']
+    version_added = '2.2'
 
     tokens = {
         'root': [
@@ -224,8 +222,6 @@ class PegLexer(RegexLexer):
     * A single `a-z` character immediately before a string, or
       multiple `a-z` characters following a string, are part of the
       string (e.g., `r"..."` or `"..."ilmsuxa`).
-
-    .. versionadded:: 2.6
     """
 
     name = 'PEG'
@@ -233,6 +229,7 @@ class PegLexer(RegexLexer):
     aliases = ['peg']
     filenames = ['*.peg']
     mimetypes = ['text/x-peg']
+    version_added = '2.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/graph.py b/libs/pygments/lexers/graph.py
index 753df361c..01d75743a 100644
--- a/libs/pygments/lexers/graph.py
+++ b/libs/pygments/lexers/graph.py
@@ -4,7 +4,7 @@
 
     Lexers for graph query languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,13 +23,12 @@ class CypherLexer(RegexLexer):
     For Cypher Query Language
 
     For the Cypher version in Neo4j 3.3
-
-    .. versionadded:: 2.0
     """
     name = 'Cypher'
     url = 'https://neo4j.com/docs/developer-manual/3.3/cypher/'
     aliases = ['cypher']
     filenames = ['*.cyp', '*.cypher']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.IGNORECASE
 
diff --git a/libs/pygments/lexers/graphics.py b/libs/pygments/lexers/graphics.py
index 8c112f5e8..400be4fd8 100644
--- a/libs/pygments/lexers/graphics.py
+++ b/libs/pygments/lexers/graphics.py
@@ -4,7 +4,7 @@
 
     Lexers for computer graphics and plotting related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,13 @@ __all__ = ['GLShaderLexer', 'PostScriptLexer', 'AsymptoteLexer', 'GnuplotLexer',
 class GLShaderLexer(RegexLexer):
     """
     GLSL (OpenGL Shader) lexer.
-
-    .. versionadded:: 1.1
     """
     name = 'GLSL'
     aliases = ['glsl']
     filenames = ['*.vert', '*.frag', '*.geo']
     mimetypes = ['text/x-glslsrc']
+    url = 'https://www.khronos.org/api/opengl'
+    version_added = '1.1'
 
     tokens = {
         'root': [
@@ -151,13 +151,13 @@ class GLShaderLexer(RegexLexer):
 class HLSLShaderLexer(RegexLexer):
     """
     HLSL (Microsoft Direct3D Shader) lexer.
-
-    .. versionadded:: 2.3
     """
     name = 'HLSL'
     aliases = ['hlsl']
     filenames = ['*.hlsl', '*.hlsli']
     mimetypes = ['text/x-hlsl']
+    url = 'https://learn.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl'
+    version_added = '2.3'
 
     tokens = {
         'root': [
@@ -305,20 +305,19 @@ class HLSLShaderLexer(RegexLexer):
 class PostScriptLexer(RegexLexer):
     """
     Lexer for PostScript files.
-
-    .. versionadded:: 1.4
     """
     name = 'PostScript'
     url = 'https://en.wikipedia.org/wiki/PostScript'
     aliases = ['postscript', 'postscr']
     filenames = ['*.ps', '*.eps']
     mimetypes = ['application/postscript']
+    version_added = '1.4'
 
     delimiter = r'()<>\[\]{}/%\s'
-    delimiter_end = r'(?=[%s])' % delimiter
+    delimiter_end = rf'(?=[{delimiter}])'
 
-    valid_name_chars = r'[^%s]' % delimiter
-    valid_name = r"%s+%s" % (valid_name_chars, delimiter_end)
+    valid_name_chars = rf'[^{delimiter}]'
+    valid_name = rf"{valid_name_chars}+{delimiter_end}"
 
     tokens = {
         'root': [
@@ -343,7 +342,7 @@ class PostScriptLexer(RegexLexer):
             (r'(\-|\+)?[0-9]+' + delimiter_end, Number.Integer),
 
             # References
-            (r'\/%s' % valid_name, Name.Variable),
+            (rf'\/{valid_name}', Name.Variable),
 
             # Names
             (valid_name, Name.Function),      # Anything else is executed
@@ -400,14 +399,13 @@ class PostScriptLexer(RegexLexer):
 class AsymptoteLexer(RegexLexer):
     """
     For Asymptote source code.
-
-    .. versionadded:: 1.2
     """
     name = 'Asymptote'
     url = 'http://asymptote.sf.net/'
     aliases = ['asymptote', 'asy']
     filenames = ['*.asy']
     mimetypes = ['text/x-asymptote']
+    version_added = '1.2'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//.*?\n|/\*.*?\*/)+'
@@ -528,8 +526,6 @@ def _shortened_many(*words):
 class GnuplotLexer(RegexLexer):
     """
     For Gnuplot plotting scripts.
-
-    .. versionadded:: 0.11
     """
 
     name = 'Gnuplot'
@@ -537,6 +533,7 @@ class GnuplotLexer(RegexLexer):
     aliases = ['gnuplot']
     filenames = ['*.plot', '*.plt']
     mimetypes = ['text/x-gnuplot']
+    version_added = '0.11'
 
     tokens = {
         'root': [
@@ -689,14 +686,13 @@ class GnuplotLexer(RegexLexer):
 class PovrayLexer(RegexLexer):
     """
     For Persistence of Vision Raytracer files.
-
-    .. versionadded:: 0.11
     """
     name = 'POVRay'
     url = 'http://www.povray.org/'
     aliases = ['pov']
     filenames = ['*.pov', '*.inc']
     mimetypes = ['text/x-povray']
+    version_added = '0.11'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/graphql.py b/libs/pygments/lexers/graphql.py
index b17e4a6c8..7de5b6e7c 100644
--- a/libs/pygments/lexers/graphql.py
+++ b/libs/pygments/lexers/graphql.py
@@ -8,7 +8,7 @@
     More information:
     https://graphql.org/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -57,13 +57,12 @@ KEYWORDS = (
 class GraphQLLexer(RegexLexer):
     """
     Lexer for GraphQL syntax
-
-    .. versionadded:: 2.16
     """
     name = "GraphQL"
     aliases = ["graphql"]
     filenames = ["*.graphql"]
     url = "https://graphql.org"
+    version_added = '2.16'
 
     tokens = {
         "ignored_tokens": [
diff --git a/libs/pygments/lexers/graphviz.py b/libs/pygments/lexers/graphviz.py
index 1e4ba0243..6b4841554 100644
--- a/libs/pygments/lexers/graphviz.py
+++ b/libs/pygments/lexers/graphviz.py
@@ -4,7 +4,7 @@
 
     Lexer for the DOT language (graphviz).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,13 @@ __all__ = ['GraphvizLexer']
 class GraphvizLexer(RegexLexer):
     """
     For graphviz DOT graph description language.
-
-    .. versionadded:: 2.8
     """
     name = 'Graphviz'
     url = 'https://www.graphviz.org/doc/info/lang.html'
     aliases = ['graphviz', 'dot']
     filenames = ['*.gv', '*.dot']
     mimetypes = ['text/x-graphviz', 'text/vnd.graphviz']
+    version_added = '2.8'
     tokens = {
         'root': [
             (r'\s+', Whitespace),
diff --git a/libs/pygments/lexers/gsql.py b/libs/pygments/lexers/gsql.py
old mode 100755
new mode 100644
index 222ee7029..9ff187889
--- a/libs/pygments/lexers/gsql.py
+++ b/libs/pygments/lexers/gsql.py
@@ -4,7 +4,7 @@
 
     Lexers for TigerGraph GSQL graph query language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,14 +21,13 @@ class GSQLLexer(RegexLexer):
 
     """
     For GSQL queries (version 3.x).
-
-    .. versionadded:: 2.10
     """
 
     name = 'GSQL'
     url = 'https://docs.tigergraph.com/dev/gsql-ref'
     aliases = ['gsql']
     filenames = ['*.gsql']
+    version_added = '2.10'
 
     flags = re.MULTILINE | re.IGNORECASE
 
diff --git a/libs/pygments/lexers/hare.py b/libs/pygments/lexers/hare.py
new file mode 100644
index 000000000..56548d5e5
--- /dev/null
+++ b/libs/pygments/lexers/hare.py
@@ -0,0 +1,73 @@
+"""
+    pygments.lexers.hare
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the Hare language.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, words
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Punctuation, Whitespace
+
+__all__ = ['HareLexer']
+
+class HareLexer(RegexLexer):
+    """
+    Lexer for the Hare programming language.
+    """
+    name = 'Hare'
+    url = 'https://harelang.org/'
+    aliases = ['hare']
+    filenames = ['*.ha']
+    mimetypes = ['text/x-hare']
+    version_added = '2.19'
+
+    _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)+'
+    _ws1 = r'\s*(?:/[*].*?[*]/\s*)?'
+
+    tokens = {
+        'whitespace': [
+            (r'^use.*;', Comment.Preproc),
+            (r'@[a-z]+', Comment.Preproc),
+            (r'\n', Whitespace),
+            (r'\s+', Whitespace),
+            (r'//.*?$', Comment.Single),
+        ],
+        'statements': [
+            (r'"', String, 'string'),
+            (r'`[^`]*`', String),
+            (r"'(\\.|\\[0-7]{1,3}|\\x[a-fA-F0-9]{1,2}|[^\\\'\n])'", String.Char),
+            (r'(\d+\.\d*|\.\d+|\d+)[eE][+-]?\d+[LlUu]*', Number.Float),
+            (r'(\d+\.\d*|\.\d+|\d+[fF])[fF]?', Number.Float),
+            (r'0x[0-9a-fA-F]+[LlUu]*', Number.Hex),
+            (r'0o[0-7]+[LlUu]*', Number.Oct),
+            (r'\d+[zui]?(\d+)?', Number.Integer),
+            (r'[~!%^&*+=|?:<>/-]', Operator),
+            (words(('as', 'is', '=>', '..', '...')), Operator),
+            (r'[()\[\],.{};]+', Punctuation),
+            (words(('abort', 'align', 'alloc', 'append', 'assert', 'case',
+                'const', 'def', 'defer', 'delete', 'else', 'enum', 'export',
+                'fn', 'for', 'free', 'if', 'let', 'len', 'match', 'offset',
+                'return', 'static', 'struct', 'switch', 'type', 'union',
+                'yield', 'vastart', 'vaarg', 'vaend'),
+                suffix=r'\b'), Keyword),
+            (r'(bool|int|uint|uintptr|u8|u16|u32|u64|i8|i16|i32|i64|f32|f64|null|done|never|void|nullable|rune|size|valist)\b',
+             Keyword.Type),
+            (r'(true|false|null)\b', Name.Builtin),
+            (r'[a-zA-Z_]\w*', Name),
+        ],
+        'string': [
+            (r'"', String, '#pop'),
+            (r'\\([\\abfnrtv"\']|x[a-fA-F0-9]{2,4}|'
+             r'u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8}|[0-7]{1,3})', String.Escape),
+            (r'[^\\"\n]+', String),  # all other characters
+            (r'\\', String),  # stray backslash
+        ],
+        'root': [
+            include('whitespace'),
+            include('statements'),
+        ],
+    }
diff --git a/libs/pygments/lexers/haskell.py b/libs/pygments/lexers/haskell.py
index 2c5fa1344..0a9f2c15a 100644
--- a/libs/pygments/lexers/haskell.py
+++ b/libs/pygments/lexers/haskell.py
@@ -4,7 +4,7 @@
 
     Lexers for Haskell and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -24,14 +24,13 @@ __all__ = ['HaskellLexer', 'HspecLexer', 'IdrisLexer', 'AgdaLexer', 'CryptolLexe
 class HaskellLexer(RegexLexer):
     """
     A Haskell lexer based on the lexemes defined in the Haskell 98 Report.
-
-    .. versionadded:: 0.8
     """
     name = 'Haskell'
     url = 'https://www.haskell.org/'
     aliases = ['haskell', 'hs']
     filenames = ['*.hs']
     mimetypes = ['text/x-haskell']
+    version_added = '0.8'
 
     reserved = ('case', 'class', 'data', 'default', 'deriving', 'do', 'else',
                 'family', 'if', 'in', 'infix[lr]?', 'instance',
@@ -53,7 +52,7 @@ class HaskellLexer(RegexLexer):
             (r'\bimport\b', Keyword.Reserved, 'import'),
             (r'\bmodule\b', Keyword.Reserved, 'module'),
             (r'\berror\b', Name.Exception),
-            (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
+            (r'\b({})(?!\')\b'.format('|'.join(reserved)), Keyword.Reserved),
             (r"'[^\\]'", String.Char),  # this has to come before the TH quote
             (r'^[_' + uni.Ll + r'][\w\']*', Name.Function),
             (r"'?[_" + uni.Ll + r"][\w']*", Name),
@@ -157,14 +156,13 @@ class HaskellLexer(RegexLexer):
 class HspecLexer(HaskellLexer):
     """
     A Haskell lexer with support for Hspec constructs.
-
-    .. versionadded:: 2.4.0
     """
 
     name = 'Hspec'
     aliases = ['hspec']
     filenames = ['*Spec.hs']
     mimetypes = []
+    version_added = '2.4'
 
     tokens = {
         'root': [
@@ -181,14 +179,13 @@ class IdrisLexer(RegexLexer):
     A lexer for the dependently typed programming language Idris.
 
     Based on the Haskell and Agda Lexer.
-
-    .. versionadded:: 2.0
     """
     name = 'Idris'
     url = 'https://www.idris-lang.org/'
     aliases = ['idris', 'idr']
     filenames = ['*.idr']
     mimetypes = ['text/x-idris']
+    version_added = '2.0'
 
     reserved = ('case', 'class', 'data', 'default', 'using', 'do', 'else',
                 'if', 'in', 'infix[lr]?', 'instance', 'rewrite', 'auto',
@@ -211,7 +208,7 @@ class IdrisLexer(RegexLexer):
     tokens = {
         'root': [
             # Comments
-            (r'^(\s*)(%%(%s))' % '|'.join(directives),
+            (r'^(\s*)(%({}))'.format('|'.join(directives)),
              bygroups(Whitespace, Keyword.Reserved)),
             (r'(\s*)(--(?![!#$%&*+./<=>?@^|_~:\\]).*?)$', bygroups(Whitespace, Comment.Single)),
             (r'(\s*)(\|{3}.*?)$', bygroups(Whitespace, Comment.Single)),
@@ -220,7 +217,7 @@ class IdrisLexer(RegexLexer):
             (r'^(\s*)([^\s(){}]+)(\s*)(:)(\s*)',
              bygroups(Whitespace, Name.Function, Whitespace, Operator.Word, Whitespace)),
             #  Identifiers
-            (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
+            (r'\b({})(?!\')\b'.format('|'.join(reserved)), Keyword.Reserved),
             (r'(import|module)(\s+)', bygroups(Keyword.Reserved, Whitespace), 'module'),
             (r"('')?[A-Z][\w\']*", Keyword.Type),
             (r'[a-z][\w\']*', Text),
@@ -292,8 +289,6 @@ class AgdaLexer(RegexLexer):
     """
     For the Agda dependently typed functional programming language and
     proof assistant.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Agda'
@@ -301,14 +296,15 @@ class AgdaLexer(RegexLexer):
     aliases = ['agda']
     filenames = ['*.agda']
     mimetypes = ['text/x-agda']
+    version_added = '2.0'
 
     reserved = (
         'abstract', 'codata', 'coinductive', 'constructor', 'data', 'do',
         'eta-equality', 'field', 'forall', 'hiding', 'in', 'inductive', 'infix',
         'infixl', 'infixr', 'instance', 'interleaved', 'let', 'macro', 'mutual',
-        'no-eta-equality', 'open', 'overlap', 'pattern', 'postulate', 'primitive',
+        'no-eta-equality', 'opaque', 'open', 'overlap', 'pattern', 'postulate', 'primitive',
         'private', 'quote', 'quoteTerm', 'record', 'renaming', 'rewrite',
-        'syntax', 'tactic', 'unquote', 'unquoteDecl', 'unquoteDef', 'using',
+        'syntax', 'tactic', 'unfolding', 'unquote', 'unquoteDecl', 'unquoteDef', 'using',
         'variable', 'where', 'with',
     )
 
@@ -325,7 +321,7 @@ class AgdaLexer(RegexLexer):
             (r'\{!', Comment.Directive, 'hole'),
             # Lexemes:
             #  Identifiers
-            (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
+            (r'\b({})(?!\')\b'.format('|'.join(reserved)), Keyword.Reserved),
             (r'(import|module)(\s+)', bygroups(Keyword.Reserved, Whitespace),
              'module'),
             (r'\b(Set|Prop)[\u2080-\u2089]*\b', Keyword.Type),
@@ -365,13 +361,13 @@ class AgdaLexer(RegexLexer):
 class CryptolLexer(RegexLexer):
     """
     FIXME: A Cryptol2 lexer based on the lexemes defined in the Haskell 98 Report.
-
-    .. versionadded:: 2.0
     """
     name = 'Cryptol'
     aliases = ['cryptol', 'cry']
     filenames = ['*.cry']
     mimetypes = ['text/x-cryptol']
+    url = 'https://www.cryptol.net'
+    version_added = '2.0'
 
     reserved = ('Arith', 'Bit', 'Cmp', 'False', 'Inf', 'True', 'else',
                 'export', 'extern', 'fin', 'if', 'import', 'inf', 'lg2',
@@ -394,7 +390,7 @@ class CryptolLexer(RegexLexer):
             (r'\bimport\b', Keyword.Reserved, 'import'),
             (r'\bmodule\b', Keyword.Reserved, 'module'),
             (r'\berror\b', Name.Exception),
-            (r'\b(%s)(?!\')\b' % '|'.join(reserved), Keyword.Reserved),
+            (r'\b({})(?!\')\b'.format('|'.join(reserved)), Keyword.Reserved),
             (r'^[_a-z][\w\']*', Name.Function),
             (r"'?[_a-z][\w']*", Name),
             (r"('')?[A-Z][\w\']*", Keyword.Type),
@@ -573,13 +569,13 @@ class LiterateHaskellLexer(LiterateLexer):
         If given, must be ``"bird"`` or ``"latex"``.  If not given, the style
         is autodetected: if the first non-whitespace character in the source
         is a backslash or percent character, LaTeX is assumed, else Bird.
-
-    .. versionadded:: 0.9
     """
     name = 'Literate Haskell'
     aliases = ['literate-haskell', 'lhaskell', 'lhs']
     filenames = ['*.lhs']
     mimetypes = ['text/x-literate-haskell']
+    url = 'https://wiki.haskell.org/Literate_programming'
+    version_added = '0.9'
 
     def __init__(self, **options):
         hslexer = HaskellLexer(**options)
@@ -596,13 +592,13 @@ class LiterateIdrisLexer(LiterateLexer):
         If given, must be ``"bird"`` or ``"latex"``.  If not given, the style
         is autodetected: if the first non-whitespace character in the source
         is a backslash or percent character, LaTeX is assumed, else Bird.
-
-    .. versionadded:: 2.0
     """
     name = 'Literate Idris'
     aliases = ['literate-idris', 'lidris', 'lidr']
     filenames = ['*.lidr']
     mimetypes = ['text/x-literate-idris']
+    url = 'https://idris2.readthedocs.io/en/latest/reference/literate.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         hslexer = IdrisLexer(**options)
@@ -619,13 +615,13 @@ class LiterateAgdaLexer(LiterateLexer):
         If given, must be ``"bird"`` or ``"latex"``.  If not given, the style
         is autodetected: if the first non-whitespace character in the source
         is a backslash or percent character, LaTeX is assumed, else Bird.
-
-    .. versionadded:: 2.0
     """
     name = 'Literate Agda'
     aliases = ['literate-agda', 'lagda']
     filenames = ['*.lagda']
     mimetypes = ['text/x-literate-agda']
+    url = 'https://agda.readthedocs.io/en/latest/tools/literate-programming.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         agdalexer = AgdaLexer(**options)
@@ -642,13 +638,13 @@ class LiterateCryptolLexer(LiterateLexer):
         If given, must be ``"bird"`` or ``"latex"``.  If not given, the style
         is autodetected: if the first non-whitespace character in the source
         is a backslash or percent character, LaTeX is assumed, else Bird.
-
-    .. versionadded:: 2.0
     """
     name = 'Literate Cryptol'
     aliases = ['literate-cryptol', 'lcryptol', 'lcry']
     filenames = ['*.lcry']
     mimetypes = ['text/x-literate-cryptol']
+    url = 'https://www.cryptol.net'
+    version_added = '2.0'
 
     def __init__(self, **options):
         crylexer = CryptolLexer(**options)
@@ -658,8 +654,6 @@ class LiterateCryptolLexer(LiterateLexer):
 class KokaLexer(RegexLexer):
     """
     Lexer for the Koka language.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Koka'
@@ -667,6 +661,7 @@ class KokaLexer(RegexLexer):
     aliases = ['koka']
     filenames = ['*.kk', '*.kki']
     mimetypes = ['text/x-koka']
+    version_added = '1.6'
 
     keywords = [
         'infix', 'infixr', 'infixl',
@@ -726,7 +721,7 @@ class KokaLexer(RegexLexer):
              'alias-type'),
             (r'(struct)(\s+)([a-z]\w*)?', bygroups(Keyword, Whitespace, tokenTypeDef),
              'struct-type'),
-            ((r'(%s)' % '|'.join(typeStartKeywords)) +
+            ((r'({})'.format('|'.join(typeStartKeywords))) +
              r'(\s+)([a-z]\w*)?', bygroups(Keyword, Whitespace, tokenTypeDef),
              'type'),
 
@@ -748,9 +743,9 @@ class KokaLexer(RegexLexer):
              bygroups(Keyword, Whitespace, Keyword, Whitespace, Keyword, Whitespace, Name.Function)),
 
             # keywords
-            (r'(%s)' % '|'.join(typekeywords) + boundary, Keyword.Type),
-            (r'(%s)' % '|'.join(keywords) + boundary, Keyword),
-            (r'(%s)' % '|'.join(builtin) + boundary, Keyword.Pseudo),
+            (r'({})'.format('|'.join(typekeywords)) + boundary, Keyword.Type),
+            (r'({})'.format('|'.join(keywords)) + boundary, Keyword),
+            (r'({})'.format('|'.join(builtin)) + boundary, Keyword.Pseudo),
             (r'::?|:=|\->|[=.]' + sboundary, Keyword),
 
             # names
@@ -811,8 +806,8 @@ class KokaLexer(RegexLexer):
             include('whitespace'),
 
             # keywords
-            (r'(%s)' % '|'.join(typekeywords) + boundary, Keyword),
-            (r'(?=((%s)' % '|'.join(keywords) + boundary + '))',
+            (r'({})'.format('|'.join(typekeywords)) + boundary, Keyword),
+            (r'(?=(({})'.format('|'.join(keywords)) + boundary + '))',
              Keyword, '#pop'),  # need to match because names overlap...
 
             # kinds
diff --git a/libs/pygments/lexers/haxe.py b/libs/pygments/lexers/haxe.py
index 6e99b10bc..66bd2a350 100644
--- a/libs/pygments/lexers/haxe.py
+++ b/libs/pygments/lexers/haxe.py
@@ -4,7 +4,7 @@
 
     Lexers for Haxe and related stuff.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,8 +21,6 @@ __all__ = ['HaxeLexer', 'HxmlLexer']
 class HaxeLexer(ExtendedRegexLexer):
     """
     For Haxe source code.
-
-    .. versionadded:: 1.3
     """
 
     name = 'Haxe'
@@ -30,6 +28,7 @@ class HaxeLexer(ExtendedRegexLexer):
     aliases = ['haxe', 'hxsl', 'hx']
     filenames = ['*.hx', '*.hxsl']
     mimetypes = ['text/haxe', 'text/x-haxe', 'text/x-hx']
+    version_added = '1.3'
 
     # keywords extracted from lexer.mll in the haxe compiler source
     keyword = (r'(?:function|class|static|var|if|else|while|do|for|'
@@ -898,13 +897,12 @@ class HaxeLexer(ExtendedRegexLexer):
 class HxmlLexer(RegexLexer):
     """
     Lexer for haXe build files.
-
-    .. versionadded:: 1.6
     """
     name = 'Hxml'
     url = 'https://haxe.org/manual/compiler-usage-hxml.html'
     aliases = ['haxeml', 'hxml']
     filenames = ['*.hxml']
+    version_added = '1.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/hdl.py b/libs/pygments/lexers/hdl.py
index 319ec9310..d22b66ff6 100644
--- a/libs/pygments/lexers/hdl.py
+++ b/libs/pygments/lexers/hdl.py
@@ -4,7 +4,7 @@
 
     Lexers for hardware descriptor languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,13 @@ __all__ = ['VerilogLexer', 'SystemVerilogLexer', 'VhdlLexer']
 class VerilogLexer(RegexLexer):
     """
     For verilog source code with preprocessor directives.
-
-    .. versionadded:: 1.4
     """
     name = 'verilog'
     aliases = ['verilog', 'v']
     filenames = ['*.v']
     mimetypes = ['text/x-verilog']
+    url = 'https://en.wikipedia.org/wiki/Verilog'
+    version_added = '1.4'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)+'
@@ -147,13 +147,13 @@ class SystemVerilogLexer(RegexLexer):
     """
     Extends verilog lexer to recognise all SystemVerilog keywords from IEEE
     1800-2009 standard.
-
-    .. versionadded:: 1.5
     """
     name = 'systemverilog'
     aliases = ['systemverilog', 'sv']
     filenames = ['*.sv', '*.svh']
     mimetypes = ['text/x-systemverilog']
+    url = 'https://en.wikipedia.org/wiki/SystemVerilog'
+    version_added = '1.5'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//.*?\n|/[*].*?[*]/)+'
@@ -373,13 +373,13 @@ class SystemVerilogLexer(RegexLexer):
 class VhdlLexer(RegexLexer):
     """
     For VHDL source code.
-
-    .. versionadded:: 1.5
     """
     name = 'vhdl'
     aliases = ['vhdl']
     filenames = ['*.vhdl', '*.vhd']
     mimetypes = ['text/x-vhdl']
+    url = 'https://en.wikipedia.org/wiki/VHDL'
+    version_added = '1.5'
     flags = re.MULTILINE | re.IGNORECASE
 
     tokens = {
@@ -387,6 +387,7 @@ class VhdlLexer(RegexLexer):
             (r'\s+', Whitespace),
             (r'(\\)(\n)', bygroups(String.Escape, Whitespace)),  # line continuation
             (r'--.*?$', Comment.Single),
+            (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
             (r"'(U|X|0|1|Z|W|L|H|-)'", String.Char),
             (r'[~!%^&*+=|?:<>/-]', Operator),
             (r"'[a-z_]\w*", Name.Attribute),
diff --git a/libs/pygments/lexers/hexdump.py b/libs/pygments/lexers/hexdump.py
index 9672fd4dc..4da4edb6a 100644
--- a/libs/pygments/lexers/hexdump.py
+++ b/libs/pygments/lexers/hexdump.py
@@ -4,7 +4,7 @@
 
     Lexers for hexadecimal dumps.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,11 +33,11 @@ class HexdumpLexer(RegexLexer):
     * ``od -t x1z FILE``
     * ``xxd FILE``
     * ``DEBUG.EXE FILE.COM`` and entering ``d`` to the prompt.
-
-    .. versionadded:: 2.1
     """
     name = 'Hexdump'
     aliases = ['hexdump']
+    url = 'https://en.wikipedia.org/wiki/Hex_dump'
+    version_added = '2.1'
 
     hd = r'[0-9A-Ha-h]'
 
diff --git a/libs/pygments/lexers/html.py b/libs/pygments/lexers/html.py
index 27fb7534c..66ba6609f 100644
--- a/libs/pygments/lexers/html.py
+++ b/libs/pygments/lexers/html.py
@@ -4,14 +4,14 @@
 
     Lexers for HTML, XML and related markup.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, bygroups, \
-    default, using
+    default, using, inherit, this
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Punctuation, Whitespace
 from pygments.util import looks_like_xml, html_doctype_matches
@@ -22,7 +22,7 @@ from pygments.lexers.css import CssLexer, _indentation, _starts_block
 from pygments.lexers.ruby import RubyLexer
 
 __all__ = ['HtmlLexer', 'DtdLexer', 'XmlLexer', 'XsltLexer', 'HamlLexer',
-           'ScamlLexer', 'PugLexer', 'UrlEncodedLexer']
+           'ScamlLexer', 'PugLexer', 'VueLexer', 'UrlEncodedLexer']
 
 
 class HtmlLexer(RegexLexer):
@@ -36,6 +36,7 @@ class HtmlLexer(RegexLexer):
     aliases = ['html']
     filenames = ['*.html', '*.htm', '*.xhtml', '*.xslt']
     mimetypes = ['text/html', 'application/xhtml+xml']
+    version_added = ''
 
     flags = re.IGNORECASE | re.DOTALL
     tokens = {
@@ -106,8 +107,6 @@ class HtmlLexer(RegexLexer):
 class DtdLexer(RegexLexer):
     """
     A lexer for DTDs (Document Type Definitions).
-
-    .. versionadded:: 1.5
     """
 
     flags = re.MULTILINE | re.DOTALL
@@ -116,6 +115,8 @@ class DtdLexer(RegexLexer):
     aliases = ['dtd']
     filenames = ['*.dtd']
     mimetypes = ['application/xml-dtd']
+    url = 'https://en.wikipedia.org/wiki/Document_type_definition'
+    version_added = '1.5'
 
     tokens = {
         'root': [
@@ -204,6 +205,8 @@ class XmlLexer(RegexLexer):
                  '*.wsdl', '*.wsf']
     mimetypes = ['text/xml', 'application/xml', 'image/svg+xml',
                  'application/rss+xml', 'application/atom+xml']
+    url = 'https://www.w3.org/XML'
+    version_added = ''
 
     tokens = {
         'root': [
@@ -238,14 +241,14 @@ class XmlLexer(RegexLexer):
 class XsltLexer(XmlLexer):
     """
     A lexer for XSLT.
-
-    .. versionadded:: 0.10
     """
 
     name = 'XSLT'
     aliases = ['xslt']
     filenames = ['*.xsl', '*.xslt', '*.xpl']  # xpl is XProc
     mimetypes = ['application/xsl+xml', 'application/xslt+xml']
+    url = 'https://www.w3.org/TR/xslt-30'
+    version_added = '0.10'
 
     EXTRA_KEYWORDS = {
         'apply-imports', 'apply-templates', 'attribute',
@@ -275,14 +278,14 @@ class XsltLexer(XmlLexer):
 class HamlLexer(ExtendedRegexLexer):
     """
     For Haml markup.
-
-    .. versionadded:: 1.3
     """
 
     name = 'Haml'
     aliases = ['haml']
     filenames = ['*.haml']
     mimetypes = ['text/x-haml']
+    url = 'https://haml.info'
+    version_added = '1.3'
 
     flags = re.IGNORECASE
     # Haml can include " |\n" anywhere,
@@ -385,15 +388,15 @@ class HamlLexer(ExtendedRegexLexer):
 
 class ScamlLexer(ExtendedRegexLexer):
     """
-    For `Scaml markup <http://scalate.fusesource.org/>`_.  Scaml is Haml for Scala.
-
-    .. versionadded:: 1.4
+    For Scaml markup.  Scaml is Haml for Scala.
     """
 
     name = 'Scaml'
     aliases = ['scaml']
     filenames = ['*.scaml']
     mimetypes = ['text/x-scaml']
+    url = 'https://scalate.github.io/scalate/'
+    version_added = '1.4'
 
     flags = re.IGNORECASE
     # Scaml does not yet support the " |\n" notation to
@@ -500,14 +503,14 @@ class PugLexer(ExtendedRegexLexer):
     For Pug markup.
     Pug is a variant of Scaml, see:
     http://scalate.fusesource.org/documentation/scaml-reference.html
-
-    .. versionadded:: 1.4
     """
 
     name = 'Pug'
     aliases = ['pug', 'jade']
     filenames = ['*.pug', '*.jade']
     mimetypes = ['text/x-pug', 'text/x-jade']
+    url = 'https://pugjs.org'
+    version_added = '1.4'
 
     flags = re.IGNORECASE
     _dot = r'.'
@@ -608,16 +611,60 @@ JadeLexer = PugLexer  # compat
 class UrlEncodedLexer(RegexLexer):
     """
     Lexer for urlencoded data
-
-    .. versionadded:: 2.16
     """
 
     name = 'urlencoded'
     aliases = ['urlencoded']
     mimetypes = ['application/x-www-form-urlencoded']
+    url = 'https://en.wikipedia.org/wiki/Percent-encoding'
+    version_added = '2.16'
 
     tokens = {
         'root': [
             ('([^&=]*)(=)([^=&]*)(&?)', bygroups(Name.Tag, Operator, String, Punctuation)),
         ],
     }
+    
+
+class VueLexer(HtmlLexer):
+    """
+    For Vue Single-File Component.
+    """
+
+    name = 'Vue'
+    url = 'https://vuejs.org/api/sfc-spec.html'
+    aliases = ['vue']
+    filenames = ['*.vue']
+    mimetypes = []
+    version_added = '2.19'
+
+    flags = re.IGNORECASE | re.DOTALL
+    tokens = {
+        'root': [
+            (r'(\{\{)(.*?)(\}\})', bygroups(Comment.Preproc,
+             using(JavascriptLexer), Comment.Preproc)),
+            ('[^<&{]+', Text),
+            inherit,
+        ],
+        'tag': [
+            (r'\s+', Text),
+            (r'((?:[@:]|v-)(?:[.\w:-]|\[[^\]]*?\])+\s*)(=)(\s*)',
+             bygroups(using(this, state=['name']), Operator, Text),
+             'attr-directive'),
+            (r'([\w:-]+\s*)(=)(\s*)', bygroups(Name.Attribute, Operator, Text),
+             'attr'),
+            (r'[\w:-]+', Name.Attribute),
+            (r'(/?)(\s*)(>)', bygroups(Punctuation, Text, Punctuation), '#pop'),
+        ],
+        'name': [
+            (r'[\w-]+', Name.Attribute),
+            (r'[:@.]', Punctuation),
+            (r'(\[)([^\]]*?)(\])', bygroups(Comment.Preproc,
+             using(JavascriptLexer), Comment.Preproc)),
+        ],
+        'attr-directive': [
+            (r'(["\'])(.*?)(\1)', bygroups(String,
+             using(JavascriptLexer), String), '#pop'),
+            (r'[^\s>]+', using(JavascriptLexer), '#pop'),
+        ],
+    }
diff --git a/libs/pygments/lexers/idl.py b/libs/pygments/lexers/idl.py
index c4d8b3180..21b8d3130 100644
--- a/libs/pygments/lexers/idl.py
+++ b/libs/pygments/lexers/idl.py
@@ -4,7 +4,7 @@
 
     Lexers for IDL.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ __all__ = ['IDLLexer']
 class IDLLexer(RegexLexer):
     """
     Pygments Lexer for IDL (Interactive Data Language).
-
-    .. versionadded:: 1.6
     """
     name = 'IDL'
     url = 'https://www.l3harrisgeospatial.com/Software-Technology/IDL'
     aliases = ['idl']
     filenames = ['*.pro']
     mimetypes = ['text/idl']
+    version_added = '1.6'
 
     flags = re.IGNORECASE | re.MULTILINE
 
diff --git a/libs/pygments/lexers/igor.py b/libs/pygments/lexers/igor.py
index b25badbb1..136c5b892 100644
--- a/libs/pygments/lexers/igor.py
+++ b/libs/pygments/lexers/igor.py
@@ -4,7 +4,7 @@
 
     Lexers for Igor Pro.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,15 +19,14 @@ __all__ = ['IgorLexer']
 class IgorLexer(RegexLexer):
     """
     Pygments Lexer for Igor Pro procedure files (.ipf).
-    See http://www.wavemetrics.com/ and http://www.igorexchange.com/.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Igor'
     aliases = ['igor', 'igorpro']
     filenames = ['*.ipf']
     mimetypes = ['text/ipf']
+    url = 'http://www.wavemetrics.com'
+    version_added = '2.0'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -39,7 +38,7 @@ class IgorLexer(RegexLexer):
     types = (
         'variable', 'string', 'constant', 'strconstant', 'NVAR', 'SVAR', 'WAVE',
         'STRUCT', 'dfref', 'funcref', 'char', 'uchar', 'int16', 'uint16', 'int32',
-        'uint32', 'int64', 'uint64', 'float', 'double'
+        'uint32', 'int64', 'uint64', 'float', 'double', 'int'
     )
     keywords = (
         'override', 'ThreadSafe', 'MultiThread', 'static',  'Proc',
diff --git a/libs/pygments/lexers/inferno.py b/libs/pygments/lexers/inferno.py
index ce1fe036d..b5caf55a0 100644
--- a/libs/pygments/lexers/inferno.py
+++ b/libs/pygments/lexers/inferno.py
@@ -4,7 +4,7 @@
 
     Lexers for Inferno os and all the related stuff.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -24,14 +24,13 @@ class LimboLexer(RegexLexer):
     TODO:
         - maybe implement better var declaration highlighting
         - some simple syntax error highlighting
-
-    .. versionadded:: 2.0
     """
     name = 'Limbo'
     url = 'http://www.vitanuova.com/inferno/limbo.html'
     aliases = ['limbo']
     filenames = ['*.b']
     mimetypes = ['text/limbo']
+    version_added = '2.0'
 
     tokens = {
         'whitespace': [
diff --git a/libs/pygments/lexers/installers.py b/libs/pygments/lexers/installers.py
index dcf8bdfb9..3f12a25b2 100644
--- a/libs/pygments/lexers/installers.py
+++ b/libs/pygments/lexers/installers.py
@@ -4,7 +4,7 @@
 
     Lexers for installer/packager DSLs and formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -14,21 +14,21 @@ from pygments.lexer import RegexLexer, include, bygroups, using, this, default
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Punctuation, Generic, Number, Whitespace
 
-__all__ = ['NSISLexer', 'RPMSpecLexer', 'SourcesListLexer',
+__all__ = ['NSISLexer', 'RPMSpecLexer',
+           'DebianSourcesLexer', 'SourcesListLexer',
            'DebianControlLexer']
 
 
 class NSISLexer(RegexLexer):
     """
     For NSIS scripts.
-
-    .. versionadded:: 1.6
     """
     name = 'NSIS'
     url = 'http://nsis.sourceforge.net/'
     aliases = ['nsis', 'nsi', 'nsh']
     filenames = ['*.nsi', '*.nsh']
     mimetypes = ['text/x-nsis']
+    version_added = '1.6'
 
     flags = re.IGNORECASE
 
@@ -147,14 +147,14 @@ class NSISLexer(RegexLexer):
 class RPMSpecLexer(RegexLexer):
     """
     For RPM ``.spec`` files.
-
-    .. versionadded:: 1.6
     """
 
     name = 'RPMSpec'
     aliases = ['spec']
     filenames = ['*.spec']
     mimetypes = ['text/x-rpm-spec']
+    url = 'https://rpm-software-management.github.io/rpm/manual/spec.html'
+    version_added = '1.6'
 
     _directives = ('(?:package|prep|build|install|clean|check|pre[a-z]*|'
                    'post[a-z]*|trigger[a-z]*|files)')
@@ -218,17 +218,41 @@ class RPMSpecLexer(RegexLexer):
     }
 
 
+class DebianSourcesLexer(RegexLexer):
+    """
+    Lexer that highlights debian.sources files.
+    """
+
+    name = 'Debian Sources file'
+    aliases = ['debian.sources']
+    filenames = ['*.sources']
+    version_added = '2.19'
+    url = 'https://manpages.debian.org/bookworm/apt/sources.list.5.en.html#THE_DEB_AND_DEB-SRC_TYPES:_GENERAL_FORMAT'
+
+    tokens = {
+        'root': [
+            (r'^(Signed-By)(:)(\s*)', bygroups(Keyword, Punctuation, Whitespace), 'signed-by'),
+            (r'^([a-zA-Z\-0-9\.]*?)(:)(\s*)(.*?)$',
+             bygroups(Keyword, Punctuation, Whitespace, String)),
+        ],
+        'signed-by': [
+            (r' -----END PGP PUBLIC KEY BLOCK-----\n', Text, '#pop'),
+            (r'.+\n', Text),
+        ],        
+    }
+
+
 class SourcesListLexer(RegexLexer):
     """
     Lexer that highlights debian sources.list files.
-
-    .. versionadded:: 0.7
     """
 
     name = 'Debian Sourcelist'
     aliases = ['debsources', 'sourceslist', 'sources.list']
     filenames = ['sources.list']
+    version_added = '0.7'
     mimetype = ['application/x-debian-sourceslist']
+    url = 'https://wiki.debian.org/SourcesList'
 
     tokens = {
         'root': [
@@ -269,36 +293,36 @@ class SourcesListLexer(RegexLexer):
 class DebianControlLexer(RegexLexer):
     """
     Lexer for Debian ``control`` files and ``apt-cache show <pkg>`` outputs.
-
-    .. versionadded:: 0.9
     """
     name = 'Debian Control file'
     url = 'https://www.debian.org/doc/debian-policy/ch-controlfields.html'
     aliases = ['debcontrol', 'control']
     filenames = ['control']
+    version_added = '0.9'
 
     tokens = {
         'root': [
             (r'^(Description)', Keyword, 'description'),
-            (r'^(Maintainer|Uploaders)(:\s*)', bygroups(Keyword, Text),
+            (r'^(Maintainer|Uploaders|Changed-By)(:)(\s*)',
+             bygroups(Keyword, Punctuation, Whitespace),
              'maintainer'),
-            (r'^((?:Build-|Pre-)?Depends(?:-Indep|-Arch)?)(:\s*)',
-             bygroups(Keyword, Text), 'depends'),
-            (r'^(Recommends|Suggests|Enhances)(:\s*)', bygroups(Keyword, Text),
-             'depends'),
-            (r'^((?:Python-)?Version)(:\s*)(\S+)$',
-             bygroups(Keyword, Text, Number)),
-            (r'^((?:Installed-)?Size)(:\s*)(\S+)$',
-             bygroups(Keyword, Text, Number)),
-            (r'^(MD5Sum|SHA1|SHA256)(:\s*)(\S+)$',
-             bygroups(Keyword, Text, Number)),
-            (r'^([a-zA-Z\-0-9\.]*?)(:\s*)(.*?)$',
-             bygroups(Keyword, Whitespace, String)),
+            (r'^((?:Build-|Pre-)?Depends(?:-Indep|-Arch)?)(:)(\s*)',
+             bygroups(Keyword, Punctuation, Whitespace), 'package_list'),
+            (r'^(Recommends|Suggests|Enhances|Breaks|Replaces|Provides|Conflicts)(:)(\s*)',
+             bygroups(Keyword, Punctuation, Whitespace), 'package_list'),
+            (r'^((?:Python-)?Version)(:)(\s*)(\S+)$',
+             bygroups(Keyword, Punctuation, Whitespace, Number)),
+            (r'^((?:Installed-)?Size)(:)(\s*)(\S+)$',
+             bygroups(Keyword, Punctuation, Whitespace, Number)),
+            (r'^(MD5Sum|SHA1|SHA256)(:)(\s*)(\S+)$',
+             bygroups(Keyword, Punctuation, Whitespace, Number)),
+            (r'^([a-zA-Z\-0-9\.]*?)(:)(\s*)(.*?)$',
+             bygroups(Keyword, Punctuation, Whitespace, String)),
         ],
         'maintainer': [
             (r'<[^>]+>$', Generic.Strong, '#pop'),
             (r'<[^>]+>', Generic.Strong),
-            (r',\n?', Text),
+            (r',\n?', Whitespace),
             (r'[^,<]+$', Text, '#pop'),
             (r'[^,<]+', Text),
         ],
@@ -309,19 +333,20 @@ class DebianControlLexer(RegexLexer):
             (r' .*\n', Text),
             default('#pop'),
         ],
-        'depends': [
-            (r'(\$)(\{)(\w+\s*:\s*\w+)(\})',
-             bygroups(Operator, Text, Name.Entity, Text)),
-            (r'\(', Text, 'depend_vers'),
+        'package_list': [
+            (r'(\$)(\{)(\w+)(\s*)(:)(\s*)(\w+)(\})',
+             bygroups(Operator, Punctuation, Name.Entity, Whitespace,
+                      Punctuation, Whitespace, Text, Punctuation)),
+            (r'\(', Punctuation, 'package_list_vers'),
             (r'\|', Operator),
-            (r',\n', Text),
-            (r'\n', Text, '#pop'),
+            (r'\n\s', Whitespace),
+            (r'\n', Whitespace, '#pop'),
             (r'[,\s]', Text),
             (r'[+.a-zA-Z0-9-]+', Name.Function),
             (r'\[.*?\]', Name.Entity),
         ],
-        'depend_vers': [
-            (r'\)', Text, '#pop'),
-            (r'([><=]+)(\s*)([^)]+)', bygroups(Operator, Text, Number)),
+        'package_list_vers': [
+            (r'\)', Punctuation, '#pop'),
+            (r'([><=]+)(\s*)([^)]+)', bygroups(Operator, Whitespace, Number)),
         ]
     }
diff --git a/libs/pygments/lexers/int_fiction.py b/libs/pygments/lexers/int_fiction.py
index 4f4d55d6c..b142c5449 100644
--- a/libs/pygments/lexers/int_fiction.py
+++ b/libs/pygments/lexers/int_fiction.py
@@ -4,7 +4,7 @@
 
     Lexers for interactive fiction languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,13 @@ __all__ = ['Inform6Lexer', 'Inform6TemplateLexer', 'Inform7Lexer',
 class Inform6Lexer(RegexLexer):
     """
     For Inform 6 source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Inform 6'
     url = 'http://inform-fiction.org/'
     aliases = ['inform6', 'i6']
     filenames = ['*.inf']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -45,13 +44,13 @@ class Inform6Lexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'\A(!%%[^%s]*[%s])+' % (_newline, _newline), Comment.Preproc,
+            (rf'\A(!%[^{_newline}]*[{_newline}])+', Comment.Preproc,
              'directive'),
             default('directive')
         ],
         '_whitespace': [
             (r'\s+', Text),
-            (r'![^%s]*' % _newline, Comment.Single)
+            (rf'![^{_newline}]*', Comment.Single)
         ],
         'default': [
             include('_whitespace'),
@@ -65,20 +64,20 @@ class Inform6Lexer(RegexLexer):
         '_expression': [
             include('_whitespace'),
             (r'(?=sp\b)', Text, '#pop'),
-            (r'(?=[%s%s$0-9#a-zA-Z_])' % (_dquote, _squote), Text,
+            (rf'(?=[{_dquote}{_squote}$0-9#a-zA-Z_])', Text,
              ('#pop', 'value')),
-            (r'\+\+|[%s]{1,2}(?!>)|~~?' % _dash, Operator),
-            (r'(?=[()\[%s,?@{:;])' % _dash, Text, '#pop')
+            (rf'\+\+|[{_dash}]{{1,2}}(?!>)|~~?', Operator),
+            (rf'(?=[()\[{_dash},?@{{:;])', Text, '#pop')
         ],
         'expression': [
             include('_whitespace'),
             (r'\(', Punctuation, ('expression', '_expression')),
             (r'\)', Punctuation, '#pop'),
             (r'\[', Punctuation, ('#pop', 'statements', 'locals')),
-            (r'>(?=(\s+|(![^%s]*))*[>;])' % _newline, Punctuation),
-            (r'\+\+|[%s]{2}(?!>)' % _dash, Operator),
+            (rf'>(?=(\s+|(![^{_newline}]*))*[>;])', Punctuation),
+            (rf'\+\+|[{_dash}]{{2}}(?!>)', Operator),
             (r',', Punctuation, '_expression'),
-            (r'&&?|\|\|?|[=~><]?=|[%s]{1,2}>?|\.\.?[&#]?|::|[<>+*/%%]' % _dash,
+            (rf'&&?|\|\|?|[=~><]?=|[{_dash}]{{1,2}}>?|\.\.?[&#]?|::|[<>+*/%]',
              Operator, '_expression'),
             (r'(has|hasnt|in|notin|ofclass|or|provides)\b', Operator.Word,
              '_expression'),
@@ -90,7 +89,7 @@ class Inform6Lexer(RegexLexer):
         '_assembly-expression': [
             (r'\(', Punctuation, ('#push', '_expression')),
             (r'[\[\]]', Punctuation),
-            (r'[%s]>' % _dash, Punctuation, '_expression'),
+            (rf'[{_dash}]>', Punctuation, '_expression'),
             (r'sp\b', Keyword.Pseudo),
             (r';', Punctuation, '#pop:3'),
             include('expression')
@@ -117,25 +116,25 @@ class Inform6Lexer(RegexLexer):
         'value': [
             include('_whitespace'),
             # Strings
-            (r'[%s][^@][%s]' % (_squote, _squote), String.Char, '#pop'),
-            (r'([%s])(@\{[0-9a-fA-F]*\})([%s])' % (_squote, _squote),
+            (rf'[{_squote}][^@][{_squote}]', String.Char, '#pop'),
+            (rf'([{_squote}])(@\{{[0-9a-fA-F]*\}})([{_squote}])',
              bygroups(String.Char, String.Escape, String.Char), '#pop'),
-            (r'([%s])(@.{2})([%s])' % (_squote, _squote),
+            (rf'([{_squote}])(@.{{2}})([{_squote}])',
              bygroups(String.Char, String.Escape, String.Char), '#pop'),
-            (r'[%s]' % _squote, String.Single, ('#pop', 'dictionary-word')),
-            (r'[%s]' % _dquote, String.Double, ('#pop', 'string')),
+            (rf'[{_squote}]', String.Single, ('#pop', 'dictionary-word')),
+            (rf'[{_dquote}]', String.Double, ('#pop', 'string')),
             # Numbers
-            (r'\$[<>]?[+%s][0-9]*\.?[0-9]*([eE][+%s]?[0-9]+)?' % (_dash, _dash),
+            (rf'\$[<>]?[+{_dash}][0-9]*\.?[0-9]*([eE][+{_dash}]?[0-9]+)?',
              Number.Float, '#pop'),
             (r'\$[0-9a-fA-F]+', Number.Hex, '#pop'),
             (r'\$\$[01]+', Number.Bin, '#pop'),
             (r'[0-9]+', Number.Integer, '#pop'),
             # Values prefixed by hashes
-            (r'(##|#a\$)(%s)' % _name, bygroups(Operator, Name), '#pop'),
-            (r'(#g\$)(%s)' % _name,
+            (rf'(##|#a\$)({_name})', bygroups(Operator, Name), '#pop'),
+            (rf'(#g\$)({_name})',
              bygroups(Operator, Name.Variable.Global), '#pop'),
             (r'#[nw]\$', Operator, ('#pop', 'obsolete-dictionary-word')),
-            (r'(#r\$)(%s)' % _name, bygroups(Operator, Name.Function), '#pop'),
+            (rf'(#r\$)({_name})', bygroups(Operator, Name.Function), '#pop'),
             (r'#', Name.Builtin, ('#pop', 'system-constant')),
             # System functions
             (words((
@@ -182,32 +181,31 @@ class Inform6Lexer(RegexLexer):
         ],
         # Strings
         'dictionary-word': [
-            (r'[~^]+', String.Escape),
-            (r'[^~^\\@({%s]+' % _squote, String.Single),
-            (r'[({]', String.Single),
+            (rf'[~^]+|//[^{_squote}]*', String.Escape),
+            (rf'[^~^/\\@({{{_squote}]+', String.Single),
+            (r'[/({]', String.Single),
             (r'@\{[0-9a-fA-F]*\}', String.Escape),
             (r'@.{2}', String.Escape),
-            (r'[%s]' % _squote, String.Single, '#pop')
+            (rf'[{_squote}]', String.Single, '#pop')
         ],
         'string': [
             (r'[~^]+', String.Escape),
-            (r'[^~^\\@({%s]+' % _dquote, String.Double),
+            (rf'[^~^\\@({{{_dquote}]+', String.Double),
             (r'[({]', String.Double),
             (r'\\', String.Escape),
-            (r'@(\\\s*[%s]\s*)*@((\\\s*[%s]\s*)*[0-9])*' %
-             (_newline, _newline), String.Escape),
-            (r'@(\\\s*[%s]\s*)*[({]((\\\s*[%s]\s*)*[0-9a-zA-Z_])*'
-             r'(\\\s*[%s]\s*)*[)}]' % (_newline, _newline, _newline),
+            (rf'@(\\\s*[{_newline}]\s*)*@((\\\s*[{_newline}]\s*)*[0-9])*', String.Escape),
+            (rf'@(\\\s*[{_newline}]\s*)*[({{]((\\\s*[{_newline}]\s*)*[0-9a-zA-Z_])*'
+             rf'(\\\s*[{_newline}]\s*)*[)}}]',
              String.Escape),
-            (r'@(\\\s*[%s]\s*)*.(\\\s*[%s]\s*)*.' % (_newline, _newline),
+            (rf'@(\\\s*[{_newline}]\s*)*.(\\\s*[{_newline}]\s*)*.',
              String.Escape),
-            (r'[%s]' % _dquote, String.Double, '#pop')
+            (rf'[{_dquote}]', String.Double, '#pop')
         ],
         'plain-string': [
-            (r'[^~^\\({\[\]%s]+' % _dquote, String.Double),
+            (rf'[^~^\\({{\[\]{_dquote}]+', String.Double),
             (r'[~^({\[\]]', String.Double),
             (r'\\', String.Escape),
-            (r'[%s]' % _dquote, String.Double, '#pop')
+            (rf'[{_dquote}]', String.Double, '#pop')
         ],
         # Names
         '_constant': [
@@ -326,7 +324,7 @@ class Inform6Lexer(RegexLexer):
             default('#pop')
         ],
         '_object-head': [
-            (r'[%s]>' % _dash, Punctuation),
+            (rf'[{_dash}]>', Punctuation),
             (r'(class|has|private|with)\b', Keyword.Declaration, '#pop'),
             include('_global')
         ],
@@ -356,7 +354,7 @@ class Inform6Lexer(RegexLexer):
             include('_whitespace'),
             (r';', Punctuation, '#pop'),
             (r'[/*]', Punctuation),
-            (r'[%s]>' % _dash, Punctuation, 'value'),
+            (rf'[{_dash}]>', Punctuation, 'value'),
             (r'(noun|scope)\b', Keyword, '=routine'),
             default('_directive-keyword')
         ],
@@ -376,12 +374,12 @@ class Inform6Lexer(RegexLexer):
         # Include, Link, Message
         'diagnostic': [
             include('_whitespace'),
-            (r'[%s]' % _dquote, String.Double, ('#pop', 'message-string')),
+            (rf'[{_dquote}]', String.Double, ('#pop', 'message-string')),
             default(('#pop', 'before-plain-string?', 'directive-keyword?'))
         ],
         'before-plain-string?': [
             include('_whitespace'),
-            (r'[%s]' % _dquote, String.Double, ('#pop', 'plain-string')),
+            (rf'[{_dquote}]', String.Double, ('#pop', 'plain-string')),
             default('#pop')
         ],
         'message-string': [
@@ -400,7 +398,7 @@ class Inform6Lexer(RegexLexer):
                 'terminating', 'time', 'topic', 'warning', 'with'), suffix=r'\b'),
              Keyword, '#pop'),
             (r'static\b', Keyword),
-            (r'[%s]{1,2}>|[+=]' % _dash, Punctuation, '#pop')
+            (rf'[{_dash}]{{1,2}}>|[+=]', Punctuation, '#pop')
         ],
         '_directive-keyword': [
             include('_directive-keyword!'),
@@ -413,7 +411,7 @@ class Inform6Lexer(RegexLexer):
         'property-keyword*': [
             include('_whitespace'),
             (words(('additive', 'individual', 'long'),
-                suffix=r'\b(?=(\s*|(![^%s]*[%s]))*[_a-zA-Z])' % (_newline, _newline)),
+                suffix=rf'\b(?=(\s*|(![^{_newline}]*[{_newline}]))*[_a-zA-Z])'),
              Keyword),
             default('#pop')
         ],
@@ -445,7 +443,7 @@ class Inform6Lexer(RegexLexer):
             (r'(jump|save|restore)\b', Keyword, ('default', 'label?')),
             (r'objectloop\b', Keyword,
              ('_keyword-expression', 'variable?', '(?')),
-            (r'print(_ret)?\b|(?=[%s])' % _dquote, Keyword, 'print-list'),
+            (rf'print(_ret)?\b|(?=[{_dquote}])', Keyword, 'print-list'),
             (r'\.', Name.Label, 'label?'),
             (r'@', Keyword, 'opcode'),
             (r'#(?![agrnw]\$|#)', Punctuation, 'directive'),
@@ -459,9 +457,9 @@ class Inform6Lexer(RegexLexer):
             (r'(bold|fixed|from|near|off|on|reverse|roman|to|underline)\b',
              Keyword, '#pop'),
             (r'(a|A|an|address|char|name|number|object|property|string|the|'
-             r'The)\b(?=(\s+|(![^%s]*))*\))' % _newline, Keyword.Pseudo,
+             rf'The)\b(?=(\s+|(![^{_newline}]*))*\))', Keyword.Pseudo,
              '#pop'),
-            (r'%s(?=(\s+|(![^%s]*))*\))' % (_name, _newline), Name.Function,
+            (rf'{_name}(?=(\s+|(![^{_newline}]*))*\))', Name.Function,
              '#pop'),
             default('#pop')
         ],
@@ -490,7 +488,8 @@ class Inform6Lexer(RegexLexer):
         # Assembly
         'opcode': [
             include('_whitespace'),
-            (r'[%s]' % _dquote, String.Double, ('operands', 'plain-string')),
+            (rf'[{_dquote}]', String.Double, ('operands', 'plain-string')),
+            (rf'[{_dash}]{{1,2}}>', Punctuation, 'operands'),
             (_name, Keyword, 'operands')
         ],
         'operands': [
@@ -543,21 +542,20 @@ class Inform6Lexer(RegexLexer):
 class Inform7Lexer(RegexLexer):
     """
     For Inform 7 source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Inform 7'
     url = 'http://inform7.com/'
     aliases = ['inform7', 'i7']
     filenames = ['*.ni', '*.i7x']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.DOTALL
 
     _dash = Inform6Lexer._dash
     _dquote = Inform6Lexer._dquote
     _newline = Inform6Lexer._newline
-    _start = r'\A|(?<=[%s])' % _newline
+    _start = rf'\A|(?<=[{_newline}])'
 
     # There are three variants of Inform 7, differing in how to
     # interpret at signs and braces in I6T. In top-level inclusions, at
@@ -571,47 +569,46 @@ class Inform7Lexer(RegexLexer):
         tokens[level] = {
             '+i6-root': list(Inform6Lexer.tokens['root']),
             '+i6t-root': [  # For Inform6TemplateLexer
-                (r'[^%s]*' % Inform6Lexer._newline, Comment.Preproc,
+                (rf'[^{Inform6Lexer._newline}]*', Comment.Preproc,
                  ('directive', '+p'))
             ],
             'root': [
                 (r'(\|?\s)+', Text),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'[%s]' % _dquote, Generic.Heading,
+                (rf'[{_dquote}]', Generic.Heading,
                  ('+main', '+titling', '+titling-string')),
                 default(('+main', '+heading?'))
             ],
             '+titling-string': [
-                (r'[^%s]+' % _dquote, Generic.Heading),
-                (r'[%s]' % _dquote, Generic.Heading, '#pop')
+                (rf'[^{_dquote}]+', Generic.Heading),
+                (rf'[{_dquote}]', Generic.Heading, '#pop')
             ],
             '+titling': [
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'[^%s.;:|%s]+' % (_dquote, _newline), Generic.Heading),
-                (r'[%s]' % _dquote, Generic.Heading, '+titling-string'),
-                (r'[%s]{2}|(?<=[\s%s])\|[\s%s]' % (_newline, _dquote, _dquote),
+                (rf'[^{_dquote}.;:|{_newline}]+', Generic.Heading),
+                (rf'[{_dquote}]', Generic.Heading, '+titling-string'),
+                (rf'[{_newline}]{{2}}|(?<=[\s{_dquote}])\|[\s{_dquote}]',
                  Text, ('#pop', '+heading?')),
-                (r'[.;:]|(?<=[\s%s])\|' % _dquote, Text, '#pop'),
-                (r'[|%s]' % _newline, Generic.Heading)
+                (rf'[.;:]|(?<=[\s{_dquote}])\|', Text, '#pop'),
+                (rf'[|{_newline}]', Generic.Heading)
             ],
             '+main': [
-                (r'(?i)[^%s:a\[(|%s]+' % (_dquote, _newline), Text),
-                (r'[%s]' % _dquote, String.Double, '+text'),
+                (rf'(?i)[^{_dquote}:a\[(|{_newline}]+', Text),
+                (rf'[{_dquote}]', String.Double, '+text'),
                 (r':', Text, '+phrase-definition'),
                 (r'(?i)\bas\b', Text, '+use-option'),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'(\([%s])(.*?)([%s]\))' % (_dash, _dash),
+                (rf'(\([{_dash}])(.*?)([{_dash}]\))',
                  bygroups(Punctuation,
                           using(this, state=('+i6-root', 'directive'),
                                 i6t='+i6t-not-inline'), Punctuation)),
-                (r'(%s|(?<=[\s;:.%s]))\|\s|[%s]{2,}' %
-                 (_start, _dquote, _newline), Text, '+heading?'),
-                (r'(?i)[a(|%s]' % _newline, Text)
+                (rf'({_start}|(?<=[\s;:.{_dquote}]))\|\s|[{_newline}]{{2,}}', Text, '+heading?'),
+                (rf'(?i)[a(|{_newline}]', Text)
             ],
             '+phrase-definition': [
                 (r'\s+', Text),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'(\([%s])(.*?)([%s]\))' % (_dash, _dash),
+                (rf'(\([{_dash}])(.*?)([{_dash}]\))',
                  bygroups(Punctuation,
                           using(this, state=('+i6-root', 'directive',
                                              'default', 'statements'),
@@ -621,7 +618,7 @@ class Inform7Lexer(RegexLexer):
             '+use-option': [
                 (r'\s+', Text),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'(\([%s])(.*?)([%s]\))' % (_dash, _dash),
+                (rf'(\([{_dash}])(.*?)([{_dash}]\))',
                  bygroups(Punctuation,
                           using(this, state=('+i6-root', 'directive'),
                                 i6t='+i6t-use-option'), Punctuation), '#pop'),
@@ -633,16 +630,16 @@ class Inform7Lexer(RegexLexer):
                 (r'\]', Comment.Multiline, '#pop')
             ],
             '+text': [
-                (r'[^\[%s]+' % _dquote, String.Double),
+                (rf'[^\[{_dquote}]+', String.Double),
                 (r'\[.*?\]', String.Interpol),
-                (r'[%s]' % _dquote, String.Double, '#pop')
+                (rf'[{_dquote}]', String.Double, '#pop')
             ],
             '+heading?': [
                 (r'(\|?\s)+', Text),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'[%s]{4}\s+' % _dash, Text, '+documentation-heading'),
-                (r'[%s]{1,3}' % _dash, Text),
-                (r'(?i)(volume|book|part|chapter|section)\b[^%s]*' % _newline,
+                (rf'[{_dash}]{{4}}\s+', Text, '+documentation-heading'),
+                (rf'[{_dash}]{{1,3}}', Text),
+                (rf'(?i)(volume|book|part|chapter|section)\b[^{_newline}]*',
                  Generic.Heading, '#pop'),
                 default('#pop')
             ],
@@ -655,25 +652,24 @@ class Inform7Lexer(RegexLexer):
             '+documentation-heading2': [
                 (r'\s+', Text),
                 (r'\[', Comment.Multiline, '+comment'),
-                (r'[%s]{4}\s' % _dash, Text, '+documentation'),
+                (rf'[{_dash}]{{4}}\s', Text, '+documentation'),
                 default('#pop:2')
             ],
             '+documentation': [
-                (r'(?i)(%s)\s*(chapter|example)\s*:[^%s]*' %
-                 (_start, _newline), Generic.Heading),
-                (r'(?i)(%s)\s*section\s*:[^%s]*' % (_start, _newline),
+                (rf'(?i)({_start})\s*(chapter|example)\s*:[^{_newline}]*', Generic.Heading),
+                (rf'(?i)({_start})\s*section\s*:[^{_newline}]*',
                  Generic.Subheading),
-                (r'((%s)\t.*?[%s])+' % (_start, _newline),
+                (rf'(({_start})\t.*?[{_newline}])+',
                  using(this, state='+main')),
-                (r'[^%s\[]+|[%s\[]' % (_newline, _newline), Text),
+                (rf'[^{_newline}\[]+|[{_newline}\[]', Text),
                 (r'\[', Comment.Multiline, '+comment'),
             ],
             '+i6t-not-inline': [
-                (r'(%s)@c( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@c( .*?)?([{_newline}]|\Z)',
                  Comment.Preproc),
-                (r'(%s)@([%s]+|Purpose:)[^%s]*' % (_start, _dash, _newline),
+                (rf'({_start})@([{_dash}]+|Purpose:)[^{_newline}]*',
                  Comment.Preproc),
-                (r'(%s)@p( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@p( .*?)?([{_newline}]|\Z)',
                  Generic.Heading, '+p')
             ],
             '+i6t-use-option': [
@@ -686,12 +682,12 @@ class Inform7Lexer(RegexLexer):
                           Punctuation))
             ],
             '+i6t': [
-                (r'(\{[%s])(![^}]*)(\}?)' % _dash,
+                (rf'(\{{[{_dash}])(![^}}]*)(\}}?)',
                  bygroups(Punctuation, Comment.Single, Punctuation)),
-                (r'(\{[%s])(lines)(:)([^}]*)(\}?)' % _dash,
+                (rf'(\{{[{_dash}])(lines)(:)([^}}]*)(\}}?)',
                  bygroups(Punctuation, Keyword, Punctuation, Text,
                           Punctuation), '+lines'),
-                (r'(\{[%s])([^:}]*)(:?)([^}]*)(\}?)' % _dash,
+                (rf'(\{{[{_dash}])([^:}}]*)(:?)([^}}]*)(\}}?)',
                  bygroups(Punctuation, Keyword, Punctuation, Text,
                           Punctuation)),
                 (r'(\(\+)(.*?)(\+\)|\Z)',
@@ -700,25 +696,25 @@ class Inform7Lexer(RegexLexer):
             ],
             '+p': [
                 (r'[^@]+', Comment.Preproc),
-                (r'(%s)@c( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@c( .*?)?([{_newline}]|\Z)',
                  Comment.Preproc, '#pop'),
-                (r'(%s)@([%s]|Purpose:)' % (_start, _dash), Comment.Preproc),
-                (r'(%s)@p( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@([{_dash}]|Purpose:)', Comment.Preproc),
+                (rf'({_start})@p( .*?)?([{_newline}]|\Z)',
                  Generic.Heading),
                 (r'@', Comment.Preproc)
             ],
             '+lines': [
-                (r'(%s)@c( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@c( .*?)?([{_newline}]|\Z)',
                  Comment.Preproc),
-                (r'(%s)@([%s]|Purpose:)[^%s]*' % (_start, _dash, _newline),
+                (rf'({_start})@([{_dash}]|Purpose:)[^{_newline}]*',
                  Comment.Preproc),
-                (r'(%s)@p( .*?)?([%s]|\Z)' % (_start, _newline),
+                (rf'({_start})@p( .*?)?([{_newline}]|\Z)',
                  Generic.Heading, '+p'),
-                (r'(%s)@\w*[ %s]' % (_start, _newline), Keyword),
-                (r'![^%s]*' % _newline, Comment.Single),
-                (r'(\{)([%s]endlines)(\})' % _dash,
+                (rf'({_start})@\w*[ {_newline}]', Keyword),
+                (rf'![^{_newline}]*', Comment.Single),
+                (rf'(\{{)([{_dash}]endlines)(\}})',
                  bygroups(Punctuation, Keyword, Punctuation), '#pop'),
-                (r'[^@!{]+?([%s]|\Z)|.' % _newline, Text)
+                (rf'[^@!{{]+?([{_newline}]|\Z)|.', Text)
             ]
         }
         # Inform 7 can include snippets of Inform 6 template language,
@@ -747,13 +743,12 @@ class Inform7Lexer(RegexLexer):
 class Inform6TemplateLexer(Inform7Lexer):
     """
     For Inform 6 template code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Inform 6 template'
     aliases = ['i6t']
     filenames = ['*.i6t']
+    version_added = '2.0'
 
     def get_tokens_unprocessed(self, text, stack=('+i6t-root',)):
         return Inform7Lexer.get_tokens_unprocessed(self, text, stack)
@@ -767,6 +762,8 @@ class Tads3Lexer(RegexLexer):
     name = 'TADS 3'
     aliases = ['tads3']
     filenames = ['*.t']
+    url = 'https://www.tads.org'
+    version_added = ''
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -778,55 +775,50 @@ class Tads3Lexer(RegexLexer):
     _no_quote = r'(?=\s|\\?>)'
     _operator = (r'(?:&&|\|\||\+\+|--|\?\?|::|[.,@\[\]~]|'
                  r'(?:[=+\-*/%!&|^]|<<?|>>?>?)=?)')
-    _ws = r'(?:\\|\s|%s|%s)' % (_comment_single, _comment_multiline)
-    _ws_pp = r'(?:\\\n|[^\S\n]|%s|%s)' % (_comment_single, _comment_multiline)
+    _ws = rf'(?:\\|\s|{_comment_single}|{_comment_multiline})'
+    _ws_pp = rf'(?:\\\n|[^\S\n]|{_comment_single}|{_comment_multiline})'
 
     def _make_string_state(triple, double, verbatim=None, _escape=_escape):
         if verbatim:
-            verbatim = ''.join(['(?:%s|%s)' % (re.escape(c.lower()),
-                                               re.escape(c.upper()))
+            verbatim = ''.join([f'(?:{re.escape(c.lower())}|{re.escape(c.upper())})'
                                 for c in verbatim])
         char = r'"' if double else r"'"
         token = String.Double if double else String.Single
-        escaped_quotes = r'+|%s(?!%s{2})' % (char, char) if triple else r''
-        prefix = '%s%s' % ('t' if triple else '', 'd' if double else 's')
-        tag_state_name = '%sqt' % prefix
+        escaped_quotes = rf'+|{char}(?!{char}{{2}})' if triple else r''
+        prefix = '{}{}'.format('t' if triple else '', 'd' if double else 's')
+        tag_state_name = f'{prefix}qt'
         state = []
         if triple:
             state += [
-                (r'%s{3,}' % char, token, '#pop'),
-                (r'\\%s+' % char, String.Escape),
+                (rf'{char}{{3,}}', token, '#pop'),
+                (rf'\\{char}+', String.Escape),
                 (char, token)
             ]
         else:
             state.append((char, token, '#pop'))
         state += [
             include('s/verbatim'),
-            (r'[^\\<&{}%s]+' % char, token)
+            (rf'[^\\<&{{}}{char}]+', token)
         ]
         if verbatim:
             # This regex can't use `(?i)` because escape sequences are
             # case-sensitive. `<\XMP>` works; `<\xmp>` doesn't.
-            state.append((r'\\?<(/|\\\\|(?!%s)\\)%s(?=[\s=>])' %
-                          (_escape, verbatim),
-                          Name.Tag, ('#pop', '%sqs' % prefix, tag_state_name)))
+            state.append((rf'\\?<(/|\\\\|(?!{_escape})\\){verbatim}(?=[\s=>])',
+                          Name.Tag, ('#pop', f'{prefix}qs', tag_state_name)))
         else:
             state += [
-                (r'\\?<!([^><\\%s]|<(?!<)|\\%s%s|%s|\\.)*>?' %
-                 (char, char, escaped_quotes, _escape), Comment.Multiline),
+                (rf'\\?<!([^><\\{char}]|<(?!<)|\\{char}{escaped_quotes}|{_escape}|\\.)*>?', Comment.Multiline),
                 (r'(?i)\\?<listing(?=[\s=>]|\\>)', Name.Tag,
-                 ('#pop', '%sqs/listing' % prefix, tag_state_name)),
+                 ('#pop', f'{prefix}qs/listing', tag_state_name)),
                 (r'(?i)\\?<xmp(?=[\s=>]|\\>)', Name.Tag,
-                 ('#pop', '%sqs/xmp' % prefix, tag_state_name)),
-                (r'\\?<([^\s=><\\%s]|<(?!<)|\\%s%s|%s|\\.)*' %
-                 (char, char, escaped_quotes, _escape), Name.Tag,
+                 ('#pop', f'{prefix}qs/xmp', tag_state_name)),
+                (rf'\\?<([^\s=><\\{char}]|<(?!<)|\\{char}{escaped_quotes}|{_escape}|\\.)*', Name.Tag,
                  tag_state_name),
                 include('s/entity')
             ]
         state += [
             include('s/escape'),
-            (r'\{([^}<\\%s]|<(?!<)|\\%s%s|%s|\\.)*\}' %
-             (char, char, escaped_quotes, _escape), String.Interpol),
+            (rf'\{{([^}}<\\{char}]|<(?!<)|\\{char}{escaped_quotes}|{_escape}|\\.)*\}}', String.Interpol),
             (r'[\\&{}<]', token)
         ]
         return state
@@ -834,22 +826,20 @@ class Tads3Lexer(RegexLexer):
     def _make_tag_state(triple, double, _escape=_escape):
         char = r'"' if double else r"'"
         quantifier = r'{3,}' if triple else r''
-        state_name = '%s%sqt' % ('t' if triple else '', 'd' if double else 's')
+        state_name = '{}{}qt'.format('t' if triple else '', 'd' if double else 's')
         token = String.Double if double else String.Single
-        escaped_quotes = r'+|%s(?!%s{2})' % (char, char) if triple else r''
+        escaped_quotes = rf'+|{char}(?!{char}{{2}})' if triple else r''
         return [
-            (r'%s%s' % (char, quantifier), token, '#pop:2'),
+            (rf'{char}{quantifier}', token, '#pop:2'),
             (r'(\s|\\\n)+', Text),
             (r'(=)(\\?")', bygroups(Punctuation, String.Double),
-             'dqs/%s' % state_name),
+             f'dqs/{state_name}'),
             (r"(=)(\\?')", bygroups(Punctuation, String.Single),
-             'sqs/%s' % state_name),
-            (r'=', Punctuation, 'uqs/%s' % state_name),
+             f'sqs/{state_name}'),
+            (r'=', Punctuation, f'uqs/{state_name}'),
             (r'\\?>', Name.Tag, '#pop'),
-            (r'\{([^}<\\%s]|<(?!<)|\\%s%s|%s|\\.)*\}' %
-             (char, char, escaped_quotes, _escape), String.Interpol),
-            (r'([^\s=><\\%s]|<(?!<)|\\%s%s|%s|\\.)+' %
-             (char, char, escaped_quotes, _escape), Name.Attribute),
+            (rf'\{{([^}}<\\{char}]|<(?!<)|\\{char}{escaped_quotes}|{_escape}|\\.)*\}}', String.Interpol),
+            (rf'([^\s=><\\{char}]|<(?!<)|\\{char}{escaped_quotes}|{_escape}|\\.)+', Name.Attribute),
             include('s/escape'),
             include('s/verbatim'),
             include('s/entity'),
@@ -863,16 +853,15 @@ class Tads3Lexer(RegexLexer):
         host_char = r'"' if host_double else r"'"
         host_quantifier = r'{3,}' if host_triple else r''
         host_token = String.Double if host_double else String.Single
-        escaped_quotes = (r'+|%s(?!%s{2})' % (host_char, host_char)
+        escaped_quotes = (rf'+|{host_char}(?!{host_char}{{2}})'
                           if host_triple else r'')
         return [
-            (r'%s%s' % (host_char, host_quantifier), host_token, '#pop:3'),
-            (r'%s%s' % (r'' if token is String.Other else r'\\?', terminator),
+            (rf'{host_char}{host_quantifier}', host_token, '#pop:3'),
+            (r'{}{}'.format(r'' if token is String.Other else r'\\?', terminator),
              token, '#pop'),
             include('s/verbatim'),
             include('s/entity'),
-            (r'\{([^}<\\%s]|<(?!<)|\\%s%s|%s|\\.)*\}' %
-             (host_char, host_char, escaped_quotes, _escape), String.Interpol),
+            (rf'\{{([^}}<\\{host_char}]|<(?!<)|\\{host_char}{escaped_quotes}|{_escape}|\\.)*\}}', String.Interpol),
             (r'([^\s"\'<%s{}\\&])+' % (r'>' if token is String.Other else r''),
              token),
             include('s/escape'),
@@ -888,7 +877,7 @@ class Tads3Lexer(RegexLexer):
              r'delegated|do|else|for|foreach|finally|goto|if|inherited|'
              r'invokee|local|nil|new|operator|replaced|return|self|switch|'
              r'targetobj|targetprop|throw|true|try|while)\b)', Text, 'block'),
-            (r'(%s)(%s*)(\()' % (_name, _ws),
+            (rf'({_name})({_ws}*)(\()',
              bygroups(Name.Function, using(this, state='whitespace'),
                       Punctuation),
              ('block?/root', 'more/parameters', 'main/parameters')),
@@ -911,24 +900,24 @@ class Tads3Lexer(RegexLexer):
             (r'\{', Punctuation, '#push'),
             (r'\}', Punctuation, '#pop'),
             (r':', Punctuation, ('classes', 'class')),
-            (r'(%s?)(%s*)(\()' % (_name, _ws),
+            (rf'({_name}?)({_ws}*)(\()',
              bygroups(Name.Function, using(this, state='whitespace'),
                       Punctuation),
              ('block?', 'more/parameters', 'main/parameters')),
-            (r'(%s)(%s*)(\{)' % (_name, _ws),
+            (rf'({_name})({_ws}*)(\{{)',
              bygroups(Name.Function, using(this, state='whitespace'),
                       Punctuation), 'block'),
-            (r'(%s)(%s*)(:)' % (_name, _ws),
+            (rf'({_name})({_ws}*)(:)',
              bygroups(Name.Variable, using(this, state='whitespace'),
                       Punctuation),
              ('object-body/no-braces', 'classes', 'class')),
             include('whitespace'),
-            (r'->|%s' % _operator, Punctuation, 'main'),
+            (rf'->|{_operator}', Punctuation, 'main'),
             default('main/object-body')
         ],
         'main/object-body': [
             include('main/basic'),
-            (r'(%s)(%s*)(=?)' % (_name, _ws),
+            (rf'({_name})({_ws}*)(=?)',
              bygroups(Name.Variable, using(this, state='whitespace'),
                       Punctuation), ('#pop', 'more', 'main')),
             default('#pop:2')
@@ -951,7 +940,7 @@ class Tads3Lexer(RegexLexer):
             (r'\{', Punctuation, '#push'),
             (r'\}', Punctuation, '#pop'),
             (r'default\b', Keyword.Reserved),
-            (r'(%s)(%s*)(:)' % (_name, _ws),
+            (rf'({_name})({_ws}*)(:)',
              bygroups(Name.Label, using(this, state='whitespace'),
                       Punctuation)),
             include('whitespace')
@@ -986,23 +975,23 @@ class Tads3Lexer(RegexLexer):
             (r'R"', String.Regex, ('#pop', 'dqr')),
             (r"R'", String.Regex, ('#pop', 'sqr')),
             # Two-token keywords
-            (r'(extern)(%s+)(object\b)' % _ws,
+            (rf'(extern)({_ws}+)(object\b)',
              bygroups(Keyword.Reserved, using(this, state='whitespace'),
                       Keyword.Reserved)),
-            (r'(function|method)(%s*)(\()' % _ws,
+            (rf'(function|method)({_ws}*)(\()',
              bygroups(Keyword.Reserved, using(this, state='whitespace'),
                       Punctuation),
              ('#pop', 'block?', 'more/parameters', 'main/parameters')),
-            (r'(modify)(%s+)(grammar\b)' % _ws,
+            (rf'(modify)({_ws}+)(grammar\b)',
              bygroups(Keyword.Reserved, using(this, state='whitespace'),
                       Keyword.Reserved),
              ('#pop', 'object-body/no-braces', ':', 'grammar')),
-            (r'(new)(%s+(?=(?:function|method)\b))' % _ws,
+            (rf'(new)({_ws}+(?=(?:function|method)\b))',
              bygroups(Keyword.Reserved, using(this, state='whitespace'))),
-            (r'(object)(%s+)(template\b)' % _ws,
+            (rf'(object)({_ws}+)(template\b)',
              bygroups(Keyword.Reserved, using(this, state='whitespace'),
                       Keyword.Reserved), ('#pop', 'template')),
-            (r'(string)(%s+)(template\b)' % _ws,
+            (rf'(string)({_ws}+)(template\b)',
              bygroups(Keyword, using(this, state='whitespace'),
                       Keyword.Reserved), ('#pop', 'function-name')),
             # Keywords
@@ -1039,7 +1028,7 @@ class Tads3Lexer(RegexLexer):
             (r'self\b', Name.Builtin.Pseudo, '#pop'),
             (r'template\b', Keyword.Reserved, ('#pop', 'template')),
             # Operators
-            (r'(__objref|defined)(%s*)(\()' % _ws,
+            (rf'(__objref|defined)({_ws}*)(\()',
              bygroups(Operator.Word, using(this, state='whitespace'),
                       Operator), ('#pop', 'more/__objref', 'main')),
             (r'delegated\b', Operator.Word),
@@ -1065,7 +1054,7 @@ class Tads3Lexer(RegexLexer):
             include('whitespace'),
             (_operator, Operator, 'main'),
             (r'\?', Operator, ('main', 'more/conditional', 'main')),
-            (r'(is|not)(%s+)(in\b)' % _ws,
+            (rf'(is|not)({_ws}+)(in\b)',
              bygroups(Operator.Word, using(this, state='whitespace'),
                       Operator.Word)),
             (r'[^\s!"%-_a-z{-~]+', Error)  # Averts an infinite loop
@@ -1112,9 +1101,9 @@ class Tads3Lexer(RegexLexer):
         ],
         # Parameter list
         'main/parameters': [
-            (r'(%s)(%s*)(?=:)' % (_name, _ws),
+            (rf'({_name})({_ws}*)(?=:)',
              bygroups(Name.Variable, using(this, state='whitespace')), '#pop'),
-            (r'(%s)(%s+)(%s)' % (_name, _ws, _name),
+            (rf'({_name})({_ws}+)({_name})',
              bygroups(Name.Class, using(this, state='whitespace'),
                       Name.Variable), '#pop'),
             (r'\[+', Punctuation),
@@ -1123,7 +1112,7 @@ class Tads3Lexer(RegexLexer):
             default('#pop')
         ],
         'more/parameters': [
-            (r'(:)(%s*(?=[?=,:)]))' % _ws,
+            (rf'(:)({_ws}*(?=[?=,:)]))',
              bygroups(Punctuation, using(this, state='whitespace'))),
             (r'[?\]]+', Punctuation),
             (r'[:)]', Punctuation, ('#pop', 'multimethod?')),
@@ -1181,10 +1170,10 @@ class Tads3Lexer(RegexLexer):
         'grammar-rules': [
             include('string'),
             include('whitespace'),
-            (r'(\[)(%s*)(badness)' % _ws,
+            (rf'(\[)({_ws}*)(badness)',
              bygroups(Punctuation, using(this, state='whitespace'), Keyword),
              'main'),
-            (r'->|%s|[()]' % _operator, Punctuation),
+            (rf'->|{_operator}|[()]', Punctuation),
             (_name, Name.Constant),
             default('#pop:2')
         ],
@@ -1193,7 +1182,7 @@ class Tads3Lexer(RegexLexer):
         ],
         'function-name': [
             (r'(<<([^>]|>>>|>(?!>))*>>)+', String.Interpol),
-            (r'(?=%s?%s*[({])' % (_name, _ws), Text, '#pop'),
+            (rf'(?={_name}?{_ws}*[({{])', Text, '#pop'),
             (_name, Name.Function, '#pop'),
             include('whitespace')
         ],
@@ -1219,7 +1208,7 @@ class Tads3Lexer(RegexLexer):
             include('string'),
             (r'inherited\b', Keyword.Reserved),
             include('whitespace'),
-            (r'->|\?|%s' % _operator, Punctuation),
+            (rf'->|\?|{_operator}', Punctuation),
             (_name, Name.Variable)
         ],
 
@@ -1259,11 +1248,11 @@ class Tads3Lexer(RegexLexer):
 
         # Whitespace and comments
         'whitespace': [
-            (r'^%s*#(%s|[^\n]|(?<=\\)\n)*\n?' % (_ws_pp, _comment_multiline),
+            (rf'^{_ws_pp}*#({_comment_multiline}|[^\n]|(?<=\\)\n)*\n?',
              Comment.Preproc),
             (_comment_single, Comment.Single),
             (_comment_multiline, Comment.Multiline),
-            (r'\\+\n+%s*#?|\n+|([^\S\n]|\\)+' % _ws_pp, Text)
+            (rf'\\+\n+{_ws_pp}*#?|\n+|([^\S\n]|\\)+', Text)
         ],
 
         # Strings
@@ -1274,15 +1263,15 @@ class Tads3Lexer(RegexLexer):
             (r"'", String.Single, 'sqs')
         ],
         's/escape': [
-            (r'\{\{|\}\}|%s' % _escape, String.Escape)
+            (rf'\{{\{{|\}}\}}|{_escape}', String.Escape)
         ],
         's/verbatim': [
             (r'<<\s*(as\s+decreasingly\s+likely\s+outcomes|cycling|else|end|'
              r'first\s+time|one\s+of|only|or|otherwise|'
              r'(sticky|(then\s+)?(purely\s+)?at)\s+random|stopping|'
              r'(then\s+)?(half\s+)?shuffled|\|\|)\s*>>', String.Interpol),
-            (r'<<(%%(_(%s|\\?.)|[\-+ ,#]|\[\d*\]?)*\d*\.?\d*(%s|\\?.)|'
-             r'\s*((else|otherwise)\s+)?(if|unless)\b)?' % (_escape, _escape),
+            (rf'<<(%(_({_escape}|\\?.)|[\-+ ,#]|\[\d*\]?)*\d*\.?\d*({_escape}|\\?.)|'
+             r'\s*((else|otherwise)\s+)?(if|unless)\b)?',
              String.Interpol, ('block/embed', 'more/embed', 'main'))
         ],
         's/entity': [
@@ -1345,23 +1334,22 @@ class Tads3Lexer(RegexLexer):
     }
 
     def get_tokens_unprocessed(self, text, **kwargs):
-        pp = r'^%s*#%s*' % (self._ws_pp, self._ws_pp)
+        pp = rf'^{self._ws_pp}*#{self._ws_pp}*'
         if_false_level = 0
         for index, token, value in (
             RegexLexer.get_tokens_unprocessed(self, text, **kwargs)):
             if if_false_level == 0:  # Not in a false #if
                 if (token is Comment.Preproc and
-                    re.match(r'%sif%s+(0|nil)%s*$\n?' %
-                             (pp, self._ws_pp, self._ws_pp), value)):
+                    re.match(rf'{pp}if{self._ws_pp}+(0|nil){self._ws_pp}*$\n?', value)):
                     if_false_level = 1
             else:  # In a false #if
                 if token is Comment.Preproc:
                     if (if_false_level == 1 and
-                          re.match(r'%sel(if|se)\b' % pp, value)):
+                          re.match(rf'{pp}el(if|se)\b', value)):
                         if_false_level = 0
-                    elif re.match(r'%sif' % pp, value):
+                    elif re.match(rf'{pp}if', value):
                         if_false_level += 1
-                    elif re.match(r'%sendif\b' % pp, value):
+                    elif re.match(rf'{pp}endif\b', value):
                         if_false_level -= 1
                 else:
                     token = Comment
diff --git a/libs/pygments/lexers/iolang.py b/libs/pygments/lexers/iolang.py
index 268fbde61..0269384fa 100644
--- a/libs/pygments/lexers/iolang.py
+++ b/libs/pygments/lexers/iolang.py
@@ -4,7 +4,7 @@
 
     Lexers for the Io language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['IoLexer']
 class IoLexer(RegexLexer):
     """
     For Io (a small, prototype-based programming language) source.
-
-    .. versionadded:: 0.10
     """
     name = 'Io'
     url = 'http://iolanguage.com/'
     filenames = ['*.io']
     aliases = ['io']
     mimetypes = ['text/x-iosrc']
+    version_added = '0.10'
     tokens = {
         'root': [
             (r'\n', Whitespace),
diff --git a/libs/pygments/lexers/j.py b/libs/pygments/lexers/j.py
index e99363cb0..1eb418e1c 100644
--- a/libs/pygments/lexers/j.py
+++ b/libs/pygments/lexers/j.py
@@ -4,7 +4,7 @@
 
     Lexer for the J programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['JLexer']
 class JLexer(RegexLexer):
     """
     For J source code.
-
-    .. versionadded:: 2.1
     """
 
     name = 'J'
@@ -27,6 +25,7 @@ class JLexer(RegexLexer):
     aliases = ['j']
     filenames = ['*.ijs']
     mimetypes = ['text/x-j']
+    version_added = '2.1'
 
     validName = r'\b[a-zA-Z]\w*'
 
diff --git a/libs/pygments/lexers/javascript.py b/libs/pygments/lexers/javascript.py
index bc5e2e43c..d361b6e71 100644
--- a/libs/pygments/lexers/javascript.py
+++ b/libs/pygments/lexers/javascript.py
@@ -4,7 +4,7 @@
 
     Lexers for JavaScript and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -41,6 +41,7 @@ class JavascriptLexer(RegexLexer):
     filenames = ['*.js', '*.jsm', '*.mjs', '*.cjs']
     mimetypes = ['application/javascript', 'application/x-javascript',
                  'text/x-javascript', 'text/javascript']
+    version_added = ''
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -118,6 +119,8 @@ class JavascriptLexer(RegexLexer):
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String.Double),
             (r"'(\\\\|\\[^\\]|[^'\\])*'", String.Single),
             (r'`', String.Backtick, 'interp'),
+            # private identifier
+            (r'#[a-zA-Z_]\w*', Name),
         ],
         'interp': [
             (r'`', String.Backtick, '#pop'),
@@ -137,8 +140,6 @@ class JavascriptLexer(RegexLexer):
 class TypeScriptLexer(JavascriptLexer):
     """
     For TypeScript source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'TypeScript'
@@ -146,6 +147,7 @@ class TypeScriptLexer(JavascriptLexer):
     aliases = ['typescript', 'ts']
     filenames = ['*.ts']
     mimetypes = ['application/x-typescript', 'text/x-typescript']
+    version_added = '1.6'
 
     # Higher priority than the TypoScriptLexer, as TypeScript is far more
     # common these days
@@ -168,6 +170,8 @@ class TypeScriptLexer(JavascriptLexer):
             # Match stuff like: Decorators
             (r'@' + JS_IDENT, Keyword.Declaration),
             inherit,
+            # private identifier
+            (r'#[a-zA-Z_]\w*', Name),
         ],
     }
 
@@ -175,8 +179,6 @@ class TypeScriptLexer(JavascriptLexer):
 class KalLexer(RegexLexer):
     """
     For Kal source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Kal'
@@ -184,6 +186,7 @@ class KalLexer(RegexLexer):
     aliases = ['kal']
     filenames = ['*.kal']
     mimetypes = ['text/kal', 'application/kal']
+    version_added = '2.0'
 
     flags = re.DOTALL
     tokens = {
@@ -309,8 +312,6 @@ class KalLexer(RegexLexer):
 class LiveScriptLexer(RegexLexer):
     """
     For LiveScript source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'LiveScript'
@@ -318,6 +319,7 @@ class LiveScriptLexer(RegexLexer):
     aliases = ['livescript', 'live-script']
     filenames = ['*.ls']
     mimetypes = ['text/livescript']
+    version_added = '1.6'
 
     flags = re.DOTALL
     tokens = {
@@ -422,8 +424,6 @@ class LiveScriptLexer(RegexLexer):
 class DartLexer(RegexLexer):
     """
     For Dart source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Dart'
@@ -431,6 +431,7 @@ class DartLexer(RegexLexer):
     aliases = ['dart']
     filenames = ['*.dart']
     mimetypes = ['text/x-dart']
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -537,15 +538,16 @@ class LassoLexer(RegexLexer):
     `requiredelimiters`
         If given and ``True``, only highlight code between delimiters as Lasso
         (default: ``False``).
-
-    .. versionadded:: 1.6
     """
 
     name = 'Lasso'
     aliases = ['lasso', 'lassoscript']
     filenames = ['*.lasso', '*.lasso[89]']
+    version_added = '1.6'
     alias_filenames = ['*.incl', '*.inc', '*.las']
     mimetypes = ['text/x-lasso']
+    url = 'https://www.lassosoft.com'
+
     flags = re.IGNORECASE | re.DOTALL | re.MULTILINE
 
     tokens = {
@@ -790,14 +792,14 @@ class LassoLexer(RegexLexer):
 class ObjectiveJLexer(RegexLexer):
     """
     For Objective-J source code with preprocessor directives.
-
-    .. versionadded:: 1.3
     """
 
     name = 'Objective-J'
     aliases = ['objective-j', 'objectivej', 'obj-j', 'objj']
     filenames = ['*.j']
     mimetypes = ['text/x-objective-j']
+    url = 'https://www.cappuccino.dev/learn/objective-j.html'
+    version_added = '1.3'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//[^\n]*\n|/[*](?:[^*]|[*][^/])*[*]/)*'
@@ -1013,8 +1015,6 @@ class ObjectiveJLexer(RegexLexer):
 class CoffeeScriptLexer(RegexLexer):
     """
     For CoffeeScript source code.
-
-    .. versionadded:: 1.3
     """
 
     name = 'CoffeeScript'
@@ -1022,6 +1022,7 @@ class CoffeeScriptLexer(RegexLexer):
     aliases = ['coffeescript', 'coffee-script', 'coffee']
     filenames = ['*.coffee']
     mimetypes = ['text/coffeescript']
+    version_added = '1.3'
 
     _operator_re = (
         r'\+\+|~|&&|\band\b|\bor\b|\bis\b|\bisnt\b|\bnot\b|\?|:|'
@@ -1127,14 +1128,13 @@ class CoffeeScriptLexer(RegexLexer):
 class MaskLexer(RegexLexer):
     """
     For Mask markup.
-
-    .. versionadded:: 2.0
     """
     name = 'Mask'
     url = 'https://github.com/atmajs/MaskJS'
     aliases = ['mask']
     filenames = ['*.mask']
     mimetypes = ['text/x-mask']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.IGNORECASE | re.DOTALL
     tokens = {
@@ -1255,6 +1255,8 @@ class EarlGreyLexer(RegexLexer):
     aliases = ['earl-grey', 'earlgrey', 'eg']
     filenames = ['*.eg']
     mimetypes = ['text/x-earl-grey']
+    url = 'https://github.com/breuleux/earl-grey'
+    version_added = ''
 
     tokens = {
         'root': [
@@ -1461,8 +1463,6 @@ class EarlGreyLexer(RegexLexer):
 class JuttleLexer(RegexLexer):
     """
     For Juttle source code.
-
-    .. versionadded:: 2.2
     """
 
     name = 'Juttle'
@@ -1471,6 +1471,7 @@ class JuttleLexer(RegexLexer):
     filenames = ['*.juttle']
     mimetypes = ['application/juttle', 'application/x-juttle',
                  'text/x-juttle', 'text/juttle']
+    version_added = '2.2'
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -1548,6 +1549,8 @@ class NodeConsoleLexer(Lexer):
     name = 'Node.js REPL console session'
     aliases = ['nodejsrepl', ]
     mimetypes = ['text/x-nodejsrepl', ]
+    url = 'https://nodejs.org'
+    version_added = ''
 
     def get_tokens_unprocessed(self, text):
         jslexer = JavascriptLexer(**self.options)
diff --git a/libs/pygments/lexers/jmespath.py b/libs/pygments/lexers/jmespath.py
index 74aa57274..67374c28c 100644
--- a/libs/pygments/lexers/jmespath.py
+++ b/libs/pygments/lexers/jmespath.py
@@ -4,7 +4,7 @@
 
     Lexers for the JMESPath language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,6 +23,7 @@ class JMESPathLexer(RegexLexer):
     url = 'https://jmespath.org'
     filenames = ['*.jp']
     aliases = ['jmespath', 'jp']
+    version_added = ''
 
     tokens = {
         'string': [
diff --git a/libs/pygments/lexers/jslt.py b/libs/pygments/lexers/jslt.py
index 0d79f8b18..f2cc5df5f 100644
--- a/libs/pygments/lexers/jslt.py
+++ b/libs/pygments/lexers/jslt.py
@@ -4,7 +4,7 @@
 
     Lexers for the JSLT language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,13 @@ _WORD_END = r'(?=[^0-9A-Z_a-z-])'
 class JSLTLexer(RegexLexer):
     """
     For JSLT source.
-
-    .. versionadded:: 2.10
     """
     name = 'JSLT'
     url = 'https://github.com/schibsted/jslt'
     filenames = ['*.jslt']
     aliases = ['jslt']
     mimetypes = ['text/x-jslt']
+    version_added = '2.10'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/json5.py b/libs/pygments/lexers/json5.py
new file mode 100644
index 000000000..35d769c31
--- /dev/null
+++ b/libs/pygments/lexers/json5.py
@@ -0,0 +1,83 @@
+"""
+    pygments.lexers.json5
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for Json5 file format.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import include, RegexLexer, words
+from pygments.token import Comment, Keyword, Name, Number, Punctuation, \
+    String, Whitespace
+
+__all__ = ['Json5Lexer']
+
+
+def string_rules(quote_mark):
+    return [
+        (rf"[^{quote_mark}\\]+", String),
+        (r"\\.", String.Escape),
+        (r"\\", Punctuation),
+        (quote_mark, String, '#pop'),
+    ]
+
+
+def quoted_field_name(quote_mark):
+    return [
+        (rf'([^{quote_mark}\\]|\\.)*{quote_mark}',
+         Name.Variable, ('#pop', 'object_value'))
+    ]
+
+
+class Json5Lexer(RegexLexer):
+    """Lexer for JSON5 data structures."""
+
+    name = 'JSON5'
+    aliases = ['json5']
+    filenames = ['*.json5']
+    url = "https://json5.org"
+    version_added = '2.19'
+    tokens = {
+        '_comments': [
+            (r'(//|#).*\n', Comment.Single),
+            (r'/\*\*([^/]|/(?!\*))*\*/', String.Doc),
+            (r'/\*([^/]|/(?!\*))*\*/', Comment),
+        ],
+        'root': [
+            include('_comments'),
+            (r"'", String, 'singlestring'),
+            (r'"', String, 'doublestring'),
+            (r'[+-]?0[xX][0-9a-fA-F]+', Number.Hex),
+            (r'[+-.]?[0-9]+[.]?[0-9]?([eE][-]?[0-9]+)?', Number.Float),
+            (r'\{', Punctuation, 'object'),
+            (r'\[', Punctuation, 'array'),
+            (words(['false', 'Infinity', '+Infinity', '-Infinity', 'NaN',
+                    'null', 'true',], suffix=r'\b'), Keyword),
+            (r'\s+', Whitespace),
+            (r':', Punctuation),
+        ],
+        'singlestring': string_rules("'"),
+        'doublestring': string_rules('"'),
+        'array': [
+            (r',', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+            include('root'),
+        ],
+        'object': [
+            (r'\s+', Whitespace),
+            (r'\}', Punctuation, '#pop'),
+            (r'\b([^:]+)', Name.Variable, 'object_value'),
+            (r'"', Name.Variable, 'double_field_name'),
+            (r"'", Name.Variable, 'single_field_name'),
+            include('_comments'),
+        ],
+        'double_field_name': quoted_field_name('"'),
+        'single_field_name': quoted_field_name("'"),
+        'object_value': [
+            (r',', Punctuation, '#pop'),
+            (r'\}', Punctuation, '#pop:2'),
+            include('root'),
+        ],
+    }
diff --git a/libs/pygments/lexers/jsonnet.py b/libs/pygments/lexers/jsonnet.py
index 3905f8871..f9aa5953f 100644
--- a/libs/pygments/lexers/jsonnet.py
+++ b/libs/pygments/lexers/jsonnet.py
@@ -4,7 +4,7 @@
 
     Lexer for Jsonnet data templating language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,7 +20,7 @@ jsonnet_function_token = jsonnet_token + r'(?=\()'
 
 def string_rules(quote_mark):
     return [
-        (r"[^{}\\]".format(quote_mark), String),
+        (rf"[^{quote_mark}\\]", String),
         (r"\\.", String.Escape),
         (quote_mark, String, '#pop'),
     ]
@@ -28,7 +28,7 @@ def string_rules(quote_mark):
 
 def quoted_field_name(quote_mark):
     return [
-        (r'([^{quote}\\]|\\.)*{quote}'.format(quote=quote_mark),
+        (rf'([^{quote_mark}\\]|\\.)*{quote_mark}',
          Name.Variable, 'field_separator')
     ]
 
@@ -40,6 +40,7 @@ class JsonnetLexer(RegexLexer):
     aliases = ['jsonnet']
     filenames = ['*.jsonnet', '*.libsonnet']
     url = "https://jsonnet.org"
+    version_added = ''
     tokens = {
         # Not used by itself
         '_comments': [
diff --git a/libs/pygments/lexers/jsx.py b/libs/pygments/lexers/jsx.py
index 90cecc027..6124d8c00 100644
--- a/libs/pygments/lexers/jsx.py
+++ b/libs/pygments/lexers/jsx.py
@@ -2,26 +2,62 @@
     pygments.lexers.jsx
     ~~~~~~~~~~~~~~~~~~~
 
-    Lexers for JSX (React).
+    Lexers for JSX (React) and TSX (TypeScript flavor).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 
 from pygments.lexer import bygroups, default, include, inherit
-from pygments.lexers.javascript import JavascriptLexer
+from pygments.lexers.javascript import JavascriptLexer, TypeScriptLexer
 from pygments.token import Name, Operator, Punctuation, String, Text, \
     Whitespace
 
-__all__ = ['JsxLexer']
+__all__ = ['JsxLexer', 'TsxLexer']
+
+_JSX_RULES = {
+    "jsx": [
+        (r"</?>", Punctuation),  # JSXFragment <>|</>
+        (r"(<)(\w+)(\.?)", bygroups(Punctuation, Name.Tag, Punctuation), "tag"),
+        (
+            r"(</)(\w+)(>)",
+            bygroups(Punctuation, Name.Tag, Punctuation),
+        ),
+        (
+            r"(</)(\w+)",
+            bygroups(Punctuation, Name.Tag),
+            "fragment",
+        ),  # Same for React.Context
+    ],
+    "tag": [
+        (r"\s+", Whitespace),
+        (r"([\w-]+)(\s*)(=)(\s*)", bygroups(Name.Attribute, Whitespace, Operator, Whitespace), "attr"),
+        (r"[{}]+", Punctuation),
+        (r"[\w\.]+", Name.Attribute),
+        (r"(/?)(\s*)(>)", bygroups(Punctuation, Text, Punctuation), "#pop"),
+    ],
+    "fragment": [
+        (r"(.)(\w+)", bygroups(Punctuation, Name.Attribute)),
+        (r"(>)", bygroups(Punctuation), "#pop"),
+    ],
+    "attr": [
+        (r"\{", Punctuation, "expression"),
+        (r'".*?"', String, "#pop"),
+        (r"'.*?'", String, "#pop"),
+        default("#pop"),
+    ],
+    "expression": [
+        (r"\{", Punctuation, "#push"),
+        (r"\}", Punctuation, "#pop"),
+        include("root"),
+    ],
+}
 
 
 class JsxLexer(JavascriptLexer):
     """For JavaScript Syntax Extension (JSX).
-
-    .. versionadded:: 2.17
     """
 
     name = "JSX"
@@ -29,6 +65,7 @@ class JsxLexer(JavascriptLexer):
     filenames = ["*.jsx", "*.react"]
     mimetypes = ["text/jsx", "text/typescript-jsx"]
     url = "https://facebook.github.io/jsx/"
+    version_added = '2.17'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -38,39 +75,26 @@ class JsxLexer(JavascriptLexer):
             include("jsx"),
             inherit,
         ],
-        "jsx": [
-            (r"</?>", Punctuation),  # JSXFragment <>|</>
-            (r"(<)(\w+)(\.?)", bygroups(Punctuation, Name.Tag, Punctuation), "tag"),
-            (
-                r"(</)(\w+)(>)",
-                bygroups(Punctuation, Name.Tag, Punctuation),
-            ),
-            (
-                r"(</)(\w+)",
-                bygroups(Punctuation, Name.Tag),
-                "fragment",
-            ),  # Same for React.Context
+    **_JSX_RULES}
+
+
+class TsxLexer(TypeScriptLexer):
+    """For TypeScript with embedded JSX
+    """
+
+    name = "TSX"
+    aliases = ["tsx"]
+    filenames = ["*.tsx"]
+    mimetypes = ["text/typescript-tsx"]
+    url = "https://www.typescriptlang.org/docs/handbook/jsx.html"
+    version_added = '2.19'
+
+    flags = re.MULTILINE | re.DOTALL
+
+    # Use same tokens as `TypescriptLexer`, but with tags and attributes support
+    tokens = {
+        "root": [
+            include("jsx"),
+            inherit,
         ],
-        "tag": [
-            (r"\s+", Whitespace),
-            (r"([\w-]+)(\s*)(=)(\s*)", bygroups(Name.Attribute, Whitespace, Operator, Whitespace), "attr"),
-            (r"[{}]+", Punctuation),
-            (r"[\w\.]+", Name.Attribute),
-            (r"(/?)(\s*)(>)", bygroups(Punctuation, Text, Punctuation), "#pop"),
-        ],
-        "fragment": [
-            (r"(.)(\w+)", bygroups(Punctuation, Name.Attribute)),
-            (r"(>)", bygroups(Punctuation), "#pop"),
-        ],
-        "attr": [
-            (r"\{", Punctuation, "expression"),
-            (r'".*?"', String, "#pop"),
-            (r"'.*?'", String, "#pop"),
-            default("#pop"),
-        ],
-        "expression": [
-            (r"\{", Punctuation, "#push"),
-            (r"\}", Punctuation, "#pop"),
-            include("root"),
-        ],
-    }
+    **_JSX_RULES}
diff --git a/libs/pygments/lexers/julia.py b/libs/pygments/lexers/julia.py
index 9975ca0f8..77d8bafcd 100644
--- a/libs/pygments/lexers/julia.py
+++ b/libs/pygments/lexers/julia.py
@@ -4,7 +4,7 @@
 
     Lexers for the Julia language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,8 +27,6 @@ operator_suffixes = r'[²³¹ʰʲʳʷʸˡˢˣᴬᴮᴰᴱᴳᴴᴵᴶᴷᴸᴹ
 class JuliaLexer(RegexLexer):
     """
     For Julia source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Julia'
@@ -36,6 +34,7 @@ class JuliaLexer(RegexLexer):
     aliases = ['julia', 'jl']
     filenames = ['*.jl']
     mimetypes = ['text/x-julia', 'application/x-julia']
+    version_added = '1.6'
 
     tokens = {
         'root': [
@@ -247,11 +246,12 @@ class JuliaLexer(RegexLexer):
 class JuliaConsoleLexer(Lexer):
     """
     For Julia console sessions. Modeled after MatlabSessionLexer.
-
-    .. versionadded:: 1.6
     """
     name = 'Julia console'
     aliases = ['jlcon', 'julia-repl']
+    url = 'https://julialang.org/'
+    version_added = '1.6'
+    _example = "jlcon/console"
 
     def get_tokens_unprocessed(self, text):
         jllexer = JuliaLexer(**self.options)
diff --git a/libs/pygments/lexers/jvm.py b/libs/pygments/lexers/jvm.py
index 9b4f8d65f..3ca257a95 100644
--- a/libs/pygments/lexers/jvm.py
+++ b/libs/pygments/lexers/jvm.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for JVM languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,6 +33,7 @@ class JavaLexer(RegexLexer):
     aliases = ['java']
     filenames = ['*.java']
     mimetypes = ['text/x-java']
+    version_added = ''
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -49,7 +50,7 @@ class JavaLexer(RegexLexer):
              r'if|goto|instanceof|new|return|switch|this|throw|try|while)\b',
              Keyword),
             # method names
-            (r'((?:(?:[^\W\d]|\$)[\w.\[\]$<>]*\s+)+?)'  # return arguments
+            (r'((?:(?:[^\W\d]|\$)[\w.\[\]$<>?]*\s+)+?)'  # return arguments
              r'((?:[^\W\d]|\$)[\w$]*)'                  # method name
              r'(\s*)(\()',                              # signature start
              bygroups(using(this), Name.Function, Whitespace, Punctuation)),
@@ -118,8 +119,6 @@ class JavaLexer(RegexLexer):
 class AspectJLexer(JavaLexer):
     """
     For AspectJ source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'AspectJ'
@@ -127,6 +126,7 @@ class AspectJLexer(JavaLexer):
     aliases = ['aspectj']
     filenames = ['*.aj']
     mimetypes = ['text/x-aspectj']
+    version_added = '1.6'
 
     aj_keywords = {
         'aspect', 'pointcut', 'privileged', 'call', 'execution',
@@ -165,21 +165,22 @@ class ScalaLexer(RegexLexer):
     aliases = ['scala']
     filenames = ['*.scala']
     mimetypes = ['text/x-scala']
+    version_added = ''
 
     flags = re.MULTILINE | re.DOTALL
 
     opchar = '[!#%&*\\-\\/:?@^' + uni.combine('Sm', 'So') + ']'
     letter = '[_\\$' + uni.combine('Ll', 'Lu', 'Lo', 'Nl', 'Lt') + ']'
     upperLetter = '[' + uni.combine('Lu', 'Lt') + ']'
-    letterOrDigit = '(?:%s|[0-9])' % letter
-    letterOrDigitNoDollarSign = '(?:%s|[0-9])' % letter.replace('\\$', '')
-    alphaId = '%s+' % letter
-    simpleInterpolatedVariable  = '%s%s*' % (letter, letterOrDigitNoDollarSign)
-    idrest = '%s%s*(?:(?<=_)%s+)?' % (letter, letterOrDigit, opchar)
-    idUpper = '%s%s*(?:(?<=_)%s+)?' % (upperLetter, letterOrDigit, opchar)
-    plainid = '(?:%s|%s+)' % (idrest, opchar)
+    letterOrDigit = f'(?:{letter}|[0-9])'
+    letterOrDigitNoDollarSign = '(?:{}|[0-9])'.format(letter.replace('\\$', ''))
+    alphaId = f'{letter}+'
+    simpleInterpolatedVariable  = f'{letter}{letterOrDigitNoDollarSign}*'
+    idrest = f'{letter}{letterOrDigit}*(?:(?<=_){opchar}+)?'
+    idUpper = f'{upperLetter}{letterOrDigit}*(?:(?<=_){opchar}+)?'
+    plainid = f'(?:{idrest}|{opchar}+)'
     backQuotedId = r'`[^`]+`'
-    anyId = r'(?:%s|%s)' % (plainid, backQuotedId)
+    anyId = rf'(?:{plainid}|{backQuotedId})'
     notStartOfComment = r'(?!//|/\*)'
     endOfLineMaybeWithComment = r'(?=\s*(//|$))'
 
@@ -256,7 +257,7 @@ class ScalaLexer(RegexLexer):
              r'(def|val|var|given|type|class|trait|object|enum)\b)', Keyword),
         ],
         'annotations': [
-            (r'@%s' % idrest, Name.Decorator),
+            (rf'@{idrest}', Name.Decorator),
         ],
         'using': [
             # using is a soft keyword, can only be used in the first position of
@@ -264,29 +265,26 @@ class ScalaLexer(RegexLexer):
             (r'(\()(\s*)(using)(\s)', bygroups(Punctuation, Whitespace, Keyword, Whitespace)),
         ],
         'declarations': [
-            (r'\b(def)\b(\s*)%s(%s)?' % (notStartOfComment, anyId),
+            (rf'\b(def)\b(\s*){notStartOfComment}({anyId})?',
              bygroups(Keyword, Whitespace, Name.Function)),
-            (r'\b(trait)\b(\s*)%s(%s)?' % (notStartOfComment, anyId),
+            (rf'\b(trait)\b(\s*){notStartOfComment}({anyId})?',
                 bygroups(Keyword, Whitespace, Name.Class)),
-            (r'\b(?:(case)(\s+))?(class|object|enum)\b(\s*)%s(%s)?' %
-                (notStartOfComment, anyId),
+            (rf'\b(?:(case)(\s+))?(class|object|enum)\b(\s*){notStartOfComment}({anyId})?',
                 bygroups(Keyword, Whitespace, Keyword, Whitespace, Name.Class)),
-            (r'(?<!\.)\b(type)\b(\s*)%s(%s)?' % (notStartOfComment, anyId),
+            (rf'(?<!\.)\b(type)\b(\s*){notStartOfComment}({anyId})?',
                 bygroups(Keyword, Whitespace, Name.Class)),
             (r'\b(val|var)\b', Keyword.Declaration),
-            (r'\b(package)(\s+)(object)\b(\s*)%s(%s)?' %
-                (notStartOfComment, anyId),
+            (rf'\b(package)(\s+)(object)\b(\s*){notStartOfComment}({anyId})?',
                 bygroups(Keyword, Whitespace, Keyword, Whitespace, Name.Namespace)),
             (r'\b(package)(\s+)', bygroups(Keyword, Whitespace), 'package'),
-            (r'\b(given)\b(\s*)(%s)' % idUpper,
+            (rf'\b(given)\b(\s*)({idUpper})',
                 bygroups(Keyword, Whitespace, Name.Class)),
-            (r'\b(given)\b(\s*)(%s)?' % anyId, 
+            (rf'\b(given)\b(\s*)({anyId})?',
                 bygroups(Keyword, Whitespace, Name)),
         ],
         'inheritance': [
             (r'\b(extends|with|derives)\b(\s*)'
-             r'(%s|%s|(?=\([^\)]+=>)|(?=%s)|(?="))?' %
-                (idUpper, backQuotedId, plainid),
+             rf'({idUpper}|{backQuotedId}|(?=\([^\)]+=>)|(?={plainid})|(?="))?',
                 bygroups(Keyword, Whitespace, Name.Class)),
         ],
         'extension': [
@@ -296,10 +294,9 @@ class ScalaLexer(RegexLexer):
             # end is a soft keyword, should only be highlighted in certain cases
             (r'\b(end)(\s+)(if|while|for|match|new|extension|val|var)\b',
                 bygroups(Keyword, Whitespace, Keyword)),
-            (r'\b(end)(\s+)(%s)%s' % (idUpper, endOfLineMaybeWithComment),
+            (rf'\b(end)(\s+)({idUpper}){endOfLineMaybeWithComment}',
                 bygroups(Keyword, Whitespace, Name.Class)),
-            (r'\b(end)(\s+)(%s|%s)?%s' %
-                (backQuotedId, plainid, endOfLineMaybeWithComment),
+            (rf'\b(end)(\s+)({backQuotedId}|{plainid})?{endOfLineMaybeWithComment}',
                 bygroups(Keyword, Whitespace, Name.Namespace)),
         ],
         'punctuation': [
@@ -310,10 +307,10 @@ class ScalaLexer(RegexLexer):
             (words(keywords, prefix=r'\b', suffix=r'\b'), Keyword),
         ],
         'operators': [
-            (r'(%s{2,})(\s+)' % opchar, bygroups(Operator, Whitespace)),
+            (rf'({opchar}{{2,}})(\s+)', bygroups(Operator, Whitespace)),
             (r'/(?![/*])', Operator),
             (words(operators), Operator),
-            (r'(?<!%s)(!|&&|\|\|)(?!%s)' % (opchar, opchar), Operator),
+            (rf'(?<!{opchar})(!|&&|\|\|)(?!{opchar})', Operator),
         ],
         'constants': [
             (r'\b(this|super)\b', Name.Builtin.Pseudo),
@@ -336,7 +333,7 @@ class ScalaLexer(RegexLexer):
             (r'raw"(\\\\|\\"|[^"])*"', String),
         ],
         'symbols': [
-            (r"('%s)(?!')" % plainid, String.Symbol),
+            (rf"('{plainid})(?!')", String.Symbol),
         ],
         'singleton-type': [
             (r'(\.)(type)\b', bygroups(Punctuation, Keyword)),
@@ -344,7 +341,7 @@ class ScalaLexer(RegexLexer):
         'inline': [
             # inline is a soft modifier, only highlighted if followed by if,
             # match or parameters.
-            (r'\b(inline)(?=\s+(%s|%s)\s*:)' % (plainid, backQuotedId),
+            (rf'\b(inline)(?=\s+({plainid}|{backQuotedId})\s*:)',
                 Keyword),
             (r'\b(inline)\b(?=(?:.(?!\b(?:val|def|given)\b))*\b(if|match)\b)',
                 Keyword),
@@ -427,7 +424,7 @@ class ScalaLexer(RegexLexer):
         # Helpers
         'qualified-name': [
             (idUpper, Name.Class),
-            (r'(%s)(\.)' % anyId, bygroups(Name.Namespace, Punctuation)),
+            (rf'({anyId})(\.)', bygroups(Name.Namespace, Punctuation)),
             (r'\.', Punctuation),
             (anyId, Name),
             (r'[^\S\n]+', Whitespace),
@@ -435,7 +432,7 @@ class ScalaLexer(RegexLexer):
         'interpolated-string-common': [
             (r'[^"$\\]+', String),
             (r'\$\$', String.Escape),
-            (r'(\$)(%s)' % simpleInterpolatedVariable,
+            (rf'(\$)({simpleInterpolatedVariable})',
                 bygroups(String.Interpol, Name)),
             (r'\$\{', String.Interpol, 'interpolated-string-brace'),
             (r'\\.', String),
@@ -446,14 +443,14 @@ class ScalaLexer(RegexLexer):
 class GosuLexer(RegexLexer):
     """
     For Gosu source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Gosu'
     aliases = ['gosu']
     filenames = ['*.gs', '*.gsx', '*.gsp', '*.vark']
     mimetypes = ['text/x-gosu']
+    url = 'https://gosu-lang.github.io'
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -525,14 +522,14 @@ class GosuLexer(RegexLexer):
 class GosuTemplateLexer(Lexer):
     """
     For Gosu templates.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Gosu Template'
     aliases = ['gst']
     filenames = ['*.gst']
     mimetypes = ['text/x-gosu-template']
+    url = 'https://gosu-lang.github.io'
+    version_added = '1.5'
 
     def get_tokens_unprocessed(self, text):
         lexer = GosuLexer()
@@ -543,8 +540,6 @@ class GosuTemplateLexer(Lexer):
 class GroovyLexer(RegexLexer):
     """
     For Groovy source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Groovy'
@@ -552,6 +547,7 @@ class GroovyLexer(RegexLexer):
     aliases = ['groovy']
     filenames = ['*.groovy','*.gradle']
     mimetypes = ['text/x-groovy']
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -622,14 +618,13 @@ class IokeLexer(RegexLexer):
     """
     For Ioke (a strongly typed, dynamic,
     prototype based programming language) source.
-
-    .. versionadded:: 1.4
     """
     name = 'Ioke'
     url = 'https://ioke.org/'
     filenames = ['*.ik']
     aliases = ['ioke', 'ik']
     mimetypes = ['text/x-iokesrc']
+    version_added = '1.4'
     tokens = {
         'interpolatableText': [
             (r'(\\b|\\e|\\t|\\n|\\f|\\r|\\"|\\\\|\\#|\\\Z|\\u[0-9a-fA-F]{1,4}'
@@ -813,14 +808,13 @@ class IokeLexer(RegexLexer):
 class ClojureLexer(RegexLexer):
     """
     Lexer for Clojure source code.
-
-    .. versionadded:: 0.11
     """
     name = 'Clojure'
     url = 'http://clojure.org/'
     aliases = ['clojure', 'clj']
     filenames = ['*.clj', '*.cljc']
     mimetypes = ['text/x-clojure', 'application/x-clojure']
+    version_added = '0.11'
 
     special_forms = (
         '.', 'def', 'do', 'fn', 'if', 'let', 'new', 'quote', 'var', 'loop'
@@ -954,14 +948,13 @@ class ClojureLexer(RegexLexer):
 class ClojureScriptLexer(ClojureLexer):
     """
     Lexer for ClojureScript source code.
-
-    .. versionadded:: 2.0
     """
     name = 'ClojureScript'
     url = 'http://clojure.org/clojurescript'
     aliases = ['clojurescript', 'cljs']
     filenames = ['*.cljs']
     mimetypes = ['text/x-clojurescript', 'application/x-clojurescript']
+    version_added = '2.0'
 
 
 class TeaLangLexer(RegexLexer):
@@ -1014,8 +1007,6 @@ class TeaLangLexer(RegexLexer):
 class CeylonLexer(RegexLexer):
     """
     For Ceylon source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Ceylon'
@@ -1023,6 +1014,7 @@ class CeylonLexer(RegexLexer):
     aliases = ['ceylon']
     filenames = ['*.ceylon']
     mimetypes = ['text/x-ceylon']
+    version_added = '1.6'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -1094,8 +1086,6 @@ class CeylonLexer(RegexLexer):
 class KotlinLexer(RegexLexer):
     """
     For Kotlin source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Kotlin'
@@ -1103,6 +1093,7 @@ class KotlinLexer(RegexLexer):
     aliases = ['kotlin']
     filenames = ['*.kt', '*.kts']
     mimetypes = ['text/x-kotlin']
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -1250,8 +1241,6 @@ class KotlinLexer(RegexLexer):
 class XtendLexer(RegexLexer):
     """
     For Xtend source code.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Xtend'
@@ -1259,6 +1248,7 @@ class XtendLexer(RegexLexer):
     aliases = ['xtend']
     filenames = ['*.xtend']
     mimetypes = ['text/x-xtend']
+    version_added = '1.6'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -1279,7 +1269,7 @@ class XtendLexer(RegexLexer):
              Keyword),
             (r'(def|abstract|const|enum|extends|final|implements|native|private|'
              r'protected|public|static|strictfp|super|synchronized|throws|'
-             r'transient|volatile)\b', Keyword.Declaration),
+             r'transient|volatile|val|var)\b', Keyword.Declaration),
             (r'(boolean|byte|char|double|float|int|long|short|void)\b',
              Keyword.Type),
             (r'(package)(\s+)', bygroups(Keyword.Namespace, Whitespace)),
@@ -1316,8 +1306,6 @@ class XtendLexer(RegexLexer):
 class PigLexer(RegexLexer):
     """
     For Pig Latin source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Pig'
@@ -1325,6 +1313,7 @@ class PigLexer(RegexLexer):
     aliases = ['pig']
     filenames = ['*.pig']
     mimetypes = ['text/x-pig']
+    version_added = '2.0'
 
     flags = re.MULTILINE | re.IGNORECASE
 
@@ -1384,14 +1373,13 @@ class PigLexer(RegexLexer):
 class GoloLexer(RegexLexer):
     """
     For Golo source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Golo'
     url = 'http://golo-lang.org/'
     filenames = ['*.golo']
     aliases = ['golo']
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -1498,21 +1486,20 @@ class GoloLexer(RegexLexer):
 class JasminLexer(RegexLexer):
     """
     For Jasmin assembly code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Jasmin'
     url = 'http://jasmin.sourceforge.net/'
     aliases = ['jasmin', 'jasminxt']
     filenames = ['*.j']
+    version_added = '2.0'
 
     _whitespace = r' \n\t\r'
-    _ws = r'(?:[%s]+)' % _whitespace
-    _separator = r'%s:=' % _whitespace
-    _break = r'(?=[%s]|$)' % _separator
-    _name = r'[^%s]+' % _separator
-    _unqualified_name = r'(?:[^%s.;\[/]+)' % _separator
+    _ws = rf'(?:[{_whitespace}]+)'
+    _separator = rf'{_whitespace}:='
+    _break = rf'(?=[{_separator}]|$)'
+    _name = rf'[^{_separator}]+'
+    _unqualified_name = rf'(?:[^{_separator}.;\[/]+)'
 
     tokens = {
         'default': [
@@ -1523,36 +1510,36 @@ class JasminLexer(RegexLexer):
             (r':', Punctuation, 'label'),
             (_ws, Whitespace),
             (r';.*', Comment.Single),
-            (r'(\$[-+])?0x-?[\da-fA-F]+%s' % _break, Number.Hex),
-            (r'(\$[-+]|\+)?-?\d+%s' % _break, Number.Integer),
+            (rf'(\$[-+])?0x-?[\da-fA-F]+{_break}', Number.Hex),
+            (rf'(\$[-+]|\+)?-?\d+{_break}', Number.Integer),
             (r'-?(\d+\.\d*|\.\d+)([eE][-+]?\d+)?[fFdD]?'
-             r'[\x00-\x08\x0b\x0c\x0e-\x1f]*%s' % _break, Number.Float),
-            (r'\$%s' % _name, Name.Variable),
+             rf'[\x00-\x08\x0b\x0c\x0e-\x1f]*{_break}', Number.Float),
+            (rf'\${_name}', Name.Variable),
 
             # Directives
-            (r'\.annotation%s' % _break, Keyword.Reserved, 'annotation'),
+            (rf'\.annotation{_break}', Keyword.Reserved, 'annotation'),
             (r'(\.attribute|\.bytecode|\.debug|\.deprecated|\.enclosing|'
              r'\.interface|\.line|\.signature|\.source|\.stack|\.var|abstract|'
              r'annotation|bridge|class|default|enum|field|final|fpstrict|'
              r'interface|native|private|protected|public|signature|static|'
-             r'synchronized|synthetic|transient|varargs|volatile)%s' % _break,
+             rf'synchronized|synthetic|transient|varargs|volatile){_break}',
              Keyword.Reserved),
-            (r'\.catch%s' % _break, Keyword.Reserved, 'caught-exception'),
+            (rf'\.catch{_break}', Keyword.Reserved, 'caught-exception'),
             (r'(\.class|\.implements|\.inner|\.super|inner|invisible|'
-             r'invisibleparam|outer|visible|visibleparam)%s' % _break,
+             rf'invisibleparam|outer|visible|visibleparam){_break}',
              Keyword.Reserved, 'class/convert-dots'),
-            (r'\.field%s' % _break, Keyword.Reserved,
+            (rf'\.field{_break}', Keyword.Reserved,
              ('descriptor/convert-dots', 'field')),
-            (r'(\.end|\.limit|use)%s' % _break, Keyword.Reserved,
+            (rf'(\.end|\.limit|use){_break}', Keyword.Reserved,
              'no-verification'),
-            (r'\.method%s' % _break, Keyword.Reserved, 'method'),
-            (r'\.set%s' % _break, Keyword.Reserved, 'var'),
-            (r'\.throws%s' % _break, Keyword.Reserved, 'exception'),
-            (r'(from|offset|to|using)%s' % _break, Keyword.Reserved, 'label'),
-            (r'is%s' % _break, Keyword.Reserved,
+            (rf'\.method{_break}', Keyword.Reserved, 'method'),
+            (rf'\.set{_break}', Keyword.Reserved, 'var'),
+            (rf'\.throws{_break}', Keyword.Reserved, 'exception'),
+            (rf'(from|offset|to|using){_break}', Keyword.Reserved, 'label'),
+            (rf'is{_break}', Keyword.Reserved,
              ('descriptor/convert-dots', 'var')),
-            (r'(locals|stack)%s' % _break, Keyword.Reserved, 'verification'),
-            (r'method%s' % _break, Keyword.Reserved, 'enclosing-method'),
+            (rf'(locals|stack){_break}', Keyword.Reserved, 'verification'),
+            (rf'method{_break}', Keyword.Reserved, 'enclosing-method'),
 
             # Instructions
             (words((
@@ -1578,14 +1565,14 @@ class JasminLexer(RegexLexer):
                 'lstore_1', 'lstore_2', 'lstore_3', 'lstore_w', 'lsub', 'lushr', 'lxor',
                 'monitorenter', 'monitorexit', 'nop', 'pop', 'pop2', 'ret', 'ret_w', 'return', 'saload',
                 'sastore', 'sipush', 'swap'), suffix=_break), Keyword.Reserved),
-            (r'(anewarray|checkcast|instanceof|ldc|ldc_w|new)%s' % _break,
+            (rf'(anewarray|checkcast|instanceof|ldc|ldc_w|new){_break}',
              Keyword.Reserved, 'class/no-dots'),
             (r'invoke(dynamic|interface|nonvirtual|special|'
-             r'static|virtual)%s' % _break, Keyword.Reserved,
+             rf'static|virtual){_break}', Keyword.Reserved,
              'invocation'),
-            (r'(getfield|putfield)%s' % _break, Keyword.Reserved,
+            (rf'(getfield|putfield){_break}', Keyword.Reserved,
              ('descriptor/no-dots', 'field')),
-            (r'(getstatic|putstatic)%s' % _break, Keyword.Reserved,
+            (rf'(getstatic|putstatic){_break}', Keyword.Reserved,
              ('descriptor/no-dots', 'static')),
             (words((
                 'goto', 'goto_w', 'if_acmpeq', 'if_acmpne', 'if_icmpeq',
@@ -1593,9 +1580,9 @@ class JasminLexer(RegexLexer):
                 'ifeq', 'ifge', 'ifgt', 'ifle', 'iflt', 'ifne', 'ifnonnull',
                 'ifnull', 'jsr', 'jsr_w'), suffix=_break),
              Keyword.Reserved, 'label'),
-            (r'(multianewarray|newarray)%s' % _break, Keyword.Reserved,
+            (rf'(multianewarray|newarray){_break}', Keyword.Reserved,
              'descriptor/convert-dots'),
-            (r'tableswitch%s' % _break, Keyword.Reserved, 'table')
+            (rf'tableswitch{_break}', Keyword.Reserved, 'table')
         ],
         'quote': [
             (r"'", String.Single, '#pop'),
@@ -1612,25 +1599,25 @@ class JasminLexer(RegexLexer):
             (r'\n+', Whitespace),
             (r"'", String.Single, 'quote'),
             include('default'),
-            (r'(%s)([ \t\r]*)(:)' % _name,
+            (rf'({_name})([ \t\r]*)(:)',
              bygroups(Name.Label, Whitespace, Punctuation)),
             (_name, String.Other)
         ],
         'annotation': [
             (r'\n', Whitespace, ('#pop', 'annotation-body')),
-            (r'default%s' % _break, Keyword.Reserved,
+            (rf'default{_break}', Keyword.Reserved,
              ('#pop', 'annotation-default')),
             include('default')
         ],
         'annotation-body': [
             (r'\n+', Whitespace),
-            (r'\.end%s' % _break, Keyword.Reserved, '#pop'),
+            (rf'\.end{_break}', Keyword.Reserved, '#pop'),
             include('default'),
             (_name, String.Other, ('annotation-items', 'descriptor/no-dots'))
         ],
         'annotation-default': [
             (r'\n+', Whitespace),
-            (r'\.end%s' % _break, Keyword.Reserved, '#pop'),
+            (rf'\.end{_break}', Keyword.Reserved, '#pop'),
             include('default'),
             default(('annotation-items', 'descriptor/no-dots'))
         ],
@@ -1640,42 +1627,42 @@ class JasminLexer(RegexLexer):
             (_name, String.Other)
         ],
         'caught-exception': [
-            (r'all%s' % _break, Keyword, '#pop'),
+            (rf'all{_break}', Keyword, '#pop'),
             include('exception')
         ],
         'class/convert-dots': [
             include('default'),
-            (r'(L)((?:%s[/.])*)(%s)(;)' % (_unqualified_name, _name),
+            (rf'(L)((?:{_unqualified_name}[/.])*)({_name})(;)',
              bygroups(Keyword.Type, Name.Namespace, Name.Class, Punctuation),
              '#pop'),
-            (r'((?:%s[/.])*)(%s)' % (_unqualified_name, _name),
+            (rf'((?:{_unqualified_name}[/.])*)({_name})',
              bygroups(Name.Namespace, Name.Class), '#pop')
         ],
         'class/no-dots': [
             include('default'),
             (r'\[+', Punctuation, ('#pop', 'descriptor/no-dots')),
-            (r'(L)((?:%s/)*)(%s)(;)' % (_unqualified_name, _name),
+            (rf'(L)((?:{_unqualified_name}/)*)({_name})(;)',
              bygroups(Keyword.Type, Name.Namespace, Name.Class, Punctuation),
              '#pop'),
-            (r'((?:%s/)*)(%s)' % (_unqualified_name, _name),
+            (rf'((?:{_unqualified_name}/)*)({_name})',
              bygroups(Name.Namespace, Name.Class), '#pop')
         ],
         'descriptor/convert-dots': [
             include('default'),
             (r'\[+', Punctuation),
-            (r'(L)((?:%s[/.])*)(%s?)(;)' % (_unqualified_name, _name),
+            (rf'(L)((?:{_unqualified_name}[/.])*)({_name}?)(;)',
              bygroups(Keyword.Type, Name.Namespace, Name.Class, Punctuation),
              '#pop'),
-            (r'[^%s\[)L]+' % _separator, Keyword.Type, '#pop'),
+            (rf'[^{_separator}\[)L]+', Keyword.Type, '#pop'),
             default('#pop')
         ],
         'descriptor/no-dots': [
             include('default'),
             (r'\[+', Punctuation),
-            (r'(L)((?:%s/)*)(%s)(;)' % (_unqualified_name, _name),
+            (rf'(L)((?:{_unqualified_name}/)*)({_name})(;)',
              bygroups(Keyword.Type, Name.Namespace, Name.Class, Punctuation),
              '#pop'),
-            (r'[^%s\[)L]+' % _separator, Keyword.Type, '#pop'),
+            (rf'[^{_separator}\[)L]+', Keyword.Type, '#pop'),
             default('#pop')
         ],
         'descriptors/convert-dots': [
@@ -1684,26 +1671,24 @@ class JasminLexer(RegexLexer):
         ],
         'enclosing-method': [
             (_ws, Whitespace),
-            (r'(?=[^%s]*\()' % _separator, Text, ('#pop', 'invocation')),
+            (rf'(?=[^{_separator}]*\()', Text, ('#pop', 'invocation')),
             default(('#pop', 'class/convert-dots'))
         ],
         'exception': [
             include('default'),
-            (r'((?:%s[/.])*)(%s)' % (_unqualified_name, _name),
+            (rf'((?:{_unqualified_name}[/.])*)({_name})',
              bygroups(Name.Namespace, Name.Exception), '#pop')
         ],
         'field': [
-            (r'static%s' % _break, Keyword.Reserved, ('#pop', 'static')),
+            (rf'static{_break}', Keyword.Reserved, ('#pop', 'static')),
             include('default'),
-            (r'((?:%s[/.](?=[^%s]*[/.]))*)(%s[/.])?(%s)' %
-             (_unqualified_name, _separator, _unqualified_name, _name),
+            (rf'((?:{_unqualified_name}[/.](?=[^{_separator}]*[/.]))*)({_unqualified_name}[/.])?({_name})',
              bygroups(Name.Namespace, Name.Class, Name.Variable.Instance),
              '#pop')
         ],
         'invocation': [
             include('default'),
-            (r'((?:%s[/.](?=[^%s(]*[/.]))*)(%s[/.])?(%s)(\()' %
-             (_unqualified_name, _separator, _unqualified_name, _name),
+            (rf'((?:{_unqualified_name}[/.](?=[^{_separator}(]*[/.]))*)({_unqualified_name}[/.])?({_name})(\()',
              bygroups(Name.Namespace, Name.Class, Name.Function, Punctuation),
              ('#pop', 'descriptor/convert-dots', 'descriptors/convert-dots',
               'descriptor/convert-dots'))
@@ -1714,23 +1699,22 @@ class JasminLexer(RegexLexer):
         ],
         'method': [
             include('default'),
-            (r'(%s)(\()' % _name, bygroups(Name.Function, Punctuation),
+            (rf'({_name})(\()', bygroups(Name.Function, Punctuation),
              ('#pop', 'descriptor/convert-dots', 'descriptors/convert-dots',
               'descriptor/convert-dots'))
         ],
         'no-verification': [
-            (r'(locals|method|stack)%s' % _break, Keyword.Reserved, '#pop'),
+            (rf'(locals|method|stack){_break}', Keyword.Reserved, '#pop'),
             include('default')
         ],
         'static': [
             include('default'),
-            (r'((?:%s[/.](?=[^%s]*[/.]))*)(%s[/.])?(%s)' %
-             (_unqualified_name, _separator, _unqualified_name, _name),
+            (rf'((?:{_unqualified_name}[/.](?=[^{_separator}]*[/.]))*)({_unqualified_name}[/.])?({_name})',
              bygroups(Name.Namespace, Name.Class, Name.Variable.Class), '#pop')
         ],
         'table': [
             (r'\n+', Whitespace),
-            (r'default%s' % _break, Keyword.Reserved, '#pop'),
+            (rf'default{_break}', Keyword.Reserved, '#pop'),
             include('default'),
             (_name, Name.Label)
         ],
@@ -1740,10 +1724,9 @@ class JasminLexer(RegexLexer):
         ],
         'verification': [
             include('default'),
-            (r'(Double|Float|Integer|Long|Null|Top|UninitializedThis)%s' %
-             _break, Keyword, '#pop'),
-            (r'Object%s' % _break, Keyword, ('#pop', 'class/no-dots')),
-            (r'Uninitialized%s' % _break, Keyword, ('#pop', 'label'))
+            (rf'(Double|Float|Integer|Long|Null|Top|UninitializedThis){_break}', Keyword, '#pop'),
+            (rf'Object{_break}', Keyword, ('#pop', 'class/no-dots')),
+            (rf'Uninitialized{_break}', Keyword, ('#pop', 'label'))
         ]
     }
 
@@ -1763,8 +1746,6 @@ class JasminLexer(RegexLexer):
 class SarlLexer(RegexLexer):
     """
     For SARL source code.
-
-    .. versionadded:: 2.4
     """
 
     name = 'SARL'
@@ -1772,6 +1753,7 @@ class SarlLexer(RegexLexer):
     aliases = ['sarl']
     filenames = ['*.sarl']
     mimetypes = ['text/x-sarl']
+    version_added = '2.4'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/kuin.py b/libs/pygments/lexers/kuin.py
index aeb9cad2d..686a1c7ec 100644
--- a/libs/pygments/lexers/kuin.py
+++ b/libs/pygments/lexers/kuin.py
@@ -4,7 +4,7 @@
 
     Lexers for the Kuin language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,12 @@ __all__ = ['KuinLexer']
 class KuinLexer(RegexLexer):
     """
     For Kuin source code.
-
-    .. versionadded:: 2.9
     """
     name = 'Kuin'
     url = 'https://github.com/kuina/Kuin'
     aliases = ['kuin']
     filenames = ['*.kn']
+    version_added = '2.9'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/kusto.py b/libs/pygments/lexers/kusto.py
index 9f30fd675..ce32d5eee 100644
--- a/libs/pygments/lexers/kusto.py
+++ b/libs/pygments/lexers/kusto.py
@@ -4,7 +4,7 @@
 
     Lexers for Kusto Query Language (KQL).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -43,14 +43,13 @@ KUSTO_PUNCTUATION = [
 
 class KustoLexer(RegexLexer):
     """For Kusto Query Language source code.
-
-    .. versionadded:: 2.17
     """
 
     name = "Kusto"
     aliases = ["kql", "kusto"]
     filenames = ["*.kql", "*.kusto", ".csl"]
     url = "https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query"
+    version_added = '2.17'
 
     tokens = {
         "root": [
diff --git a/libs/pygments/lexers/ldap.py b/libs/pygments/lexers/ldap.py
index a669f7900..65473da67 100644
--- a/libs/pygments/lexers/ldap.py
+++ b/libs/pygments/lexers/ldap.py
@@ -4,7 +4,7 @@
 
     Pygments lexers for LDAP.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,8 +22,6 @@ class LdifLexer(RegexLexer):
 
     """
     Lexer for LDIF
-
-    .. versionadded:: 2.17
     """
 
     name = 'LDIF'
@@ -31,6 +29,7 @@ class LdifLexer(RegexLexer):
     filenames = ['*.ldif']
     mimetypes = ["text/x-ldif"]
     url = "https://datatracker.ietf.org/doc/html/rfc2849"
+    version_added = '2.17'
 
     tokens = {
         'root': [
@@ -106,8 +105,6 @@ class LdifLexer(RegexLexer):
 class LdaprcLexer(RegexLexer):
     """
     Lexer for OpenLDAP configuration files.
-
-    .. versionadded:: 2.17
     """
 
     name = 'LDAP configuration file'
@@ -115,6 +112,7 @@ class LdaprcLexer(RegexLexer):
     filenames = ['.ldaprc', 'ldaprc', 'ldap.conf']
     mimetypes = ["text/x-ldapconf"]
     url = 'https://www.openldap.org/software//man.cgi?query=ldap.conf&sektion=5&apropos=0&manpath=OpenLDAP+2.4-Release'
+    version_added = '2.17'
 
     _sasl_keywords = r'SASL_(?:MECH|REALM|AUTHCID|AUTHZID|CBINDING)'
     _tls_keywords = r'TLS_(?:CACERT|CACERTDIR|CERT|ECNAME|KEY|CIPHER_SUITE|PROTOCOL_MIN|RANDFILE|CRLFILE)'
diff --git a/libs/pygments/lexers/lean.py b/libs/pygments/lexers/lean.py
index d16cd73c5..76af11fe9 100644
--- a/libs/pygments/lexers/lean.py
+++ b/libs/pygments/lexers/lean.py
@@ -4,32 +4,38 @@
 
     Lexers for the Lean theorem prover.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+
 import re
 
-from pygments.lexer import RegexLexer, default, words, include
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Generic, Whitespace
+from pygments.lexer import RegexLexer, words, include
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Generic, Whitespace
 
-__all__ = ['Lean3Lexer']
+__all__ = ['Lean3Lexer', 'Lean4Lexer']
 
 class Lean3Lexer(RegexLexer):
     """
     For the Lean 3 theorem prover.
-
-    .. versionadded:: 2.0
     """
     name = 'Lean'
     url = 'https://leanprover-community.github.io/lean3'
     aliases = ['lean', 'lean3']
     filenames = ['*.lean']
     mimetypes = ['text/x-lean', 'text/x-lean3']
+    version_added = '2.0'
+
+    # from https://github.com/leanprover/vscode-lean/blob/1589ca3a65e394b3789409707febbd2d166c9344/syntaxes/lean.json#L186C20-L186C217
+    _name_segment = (
+        "(?![λΠΣ])[_a-zA-Zα-ωΑ-Ωϊ-ϻἀ-῾℀-⅏𝒜-𝖟]"
+        "(?:(?![λΠΣ])[_a-zA-Zα-ωΑ-Ωϊ-ϻἀ-῾℀-⅏𝒜-𝖟0-9'ⁿ-₉ₐ-ₜᵢ-ᵪ])*")
+    _name = _name_segment + r"(\." + _name_segment + r")*"
 
     tokens = {
         'expression': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'/--', String.Doc, 'docstring'),
             (r'/-', Comment, 'comment'),
             (r'--.*?$', Comment.Single),
@@ -43,9 +49,8 @@ class Lean3Lexer(RegexLexer):
             (words((
                 '(', ')', ':', '{', '}', '[', ']', '⟨', '⟩', '‹', '›', '⦃', '⦄', ':=', ',',
             )), Operator),
-            (r'[A-Za-z_\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2100-\u214f]'
-             r'[.A-Za-z_\'\u03b1-\u03ba\u03bc-\u03fb\u1f00-\u1ffe\u2070-\u2079'
-             r'\u207f-\u2089\u2090-\u209c\u2100-\u214f0-9]*', Name),
+            (_name, Name),
+            (r'``?' + _name, String.Symbol),
             (r'0x[A-Za-z0-9]+', Number.Integer),
             (r'0b[01]+', Number.Integer),
             (r'\d+', Number.Integer),
@@ -102,13 +107,13 @@ class Lean3Lexer(RegexLexer):
             include('expression'),
         ],
         'comment': [
-            (r'[^/-]', Comment.Multiline),
+            (r'[^/-]+', Comment.Multiline),
             (r'/-', Comment.Multiline, '#push'),
             (r'-/', Comment.Multiline, '#pop'),
             (r'[/-]', Comment.Multiline)
         ],
         'docstring': [
-            (r'[^/-]', String.Doc),
+            (r'[^/-]+', String.Doc),
             (r'-/', String.Doc, '#pop'),
             (r'[/-]', String.Doc)
         ],
@@ -119,4 +124,118 @@ class Lean3Lexer(RegexLexer):
         ],
     }
 
+    def analyse_text(text):
+        if re.search(r'^import [a-z]', text, re.MULTILINE):
+            return 0.1
+
+
 LeanLexer = Lean3Lexer
+
+
+class Lean4Lexer(RegexLexer):
+    """
+    For the Lean 4 theorem prover.
+    """
+    
+    name = 'Lean4'
+    url = 'https://github.com/leanprover/lean4'
+    aliases = ['lean4']
+    filenames = ['*.lean']
+    mimetypes = ['text/x-lean4']
+    version_added = '2.18'
+
+    # same as Lean3Lexer, with `!` and `?` allowed
+    _name_segment = (
+        "(?![λΠΣ])[_a-zA-Zα-ωΑ-Ωϊ-ϻἀ-῾℀-⅏𝒜-𝖟]"
+        "(?:(?![λΠΣ])[_a-zA-Zα-ωΑ-Ωϊ-ϻἀ-῾℀-⅏𝒜-𝖟0-9'ⁿ-₉ₐ-ₜᵢ-ᵪ!?])*")
+    _name = _name_segment + r"(\." + _name_segment + r")*"
+
+    keywords1 = (
+        'import', 'unif_hint',
+        'renaming', 'inline', 'hiding', 'lemma', 'variable',
+        'theorem', 'axiom', 'inductive', 'structure', 'universe', 'alias',
+        '#help',  'precedence', 'postfix', 'prefix',
+        'infix', 'infixl', 'infixr', 'notation', '#eval',
+        '#check', '#reduce', '#exit', 'end', 'private', 'using', 'namespace',
+        'instance', 'section', 'protected',
+        'export', 'set_option', 'extends', 'open', 'example',
+        '#print', 'opaque',
+        'def', 'macro', 'elab', 'syntax', 'macro_rules', '#reduce', 'where',
+        'abbrev', 'noncomputable', 'class', 'attribute', '#synth', 'mutual',
+        'scoped', 'local',
+    )
+
+    keywords2 = (
+        'forall', 'fun', 'obtain', 'from', 'have', 'show', 'assume',
+        'let', 'if', 'else', 'then', 'by', 'in', 'with',
+        'calc', 'match', 'nomatch', 'do', 'at',
+    )
+
+    keywords3 = (
+        # Sorts
+        'Type', 'Prop', 'Sort',
+    )
+
+    operators = (
+        '!=', '#', '&', '&&', '*', '+', '-', '/', '@', '!',
+        '-.', '->', '.', '..', '...', '::', ':>', ';', ';;', '<',
+        '<-', '=', '==', '>', '_', '|', '||', '~', '=>', '<=', '>=',
+        '/\\', '\\/', '∀', 'Π', 'λ', '↔', '∧', '∨', '≠', '≤', '≥',
+        '¬', '⁻¹', '⬝', '▸', '→', '∃', '≈', '×', '⌞',
+        '⌟', '≡', '⟨', '⟩', "↦",
+    )
+
+    punctuation = ('(', ')', ':', '{', '}', '[', ']', '⦃', '⦄',
+                   ':=', ',')
+
+    tokens = {
+        'expression': [
+            (r'\s+', Whitespace),
+            (r'/--', String.Doc, 'docstring'),
+            (r'/-', Comment, 'comment'),
+            (r'--.*$', Comment.Single),
+            (words(keywords3, prefix=r'\b', suffix=r'\b'), Keyword.Type),
+            (words(('sorry', 'admit'), prefix=r'\b', suffix=r'\b'), Generic.Error),
+            (words(operators), Name.Builtin.Pseudo),
+            (words(punctuation), Operator),
+            (_name_segment, Name),
+            (r'``?' + _name, String.Symbol),
+            (r'(?<=\.)\d+', Number),
+            (r'(\d+\.\d*)([eE][+-]?[0-9]+)?', Number.Float),
+            (r'\d+', Number.Integer),
+            (r'"', String.Double, 'string'),
+            (r'[~?][a-z][\w\']*:', Name.Variable),
+            (r'\S', Name.Builtin.Pseudo),
+        ],
+        'root': [
+            (words(keywords1, prefix=r'\b', suffix=r'\b'), Keyword.Namespace),
+            (words(keywords2, prefix=r'\b', suffix=r'\b'), Keyword),
+            (r'@\[', Keyword.Declaration, 'attribute'),
+            include('expression')
+        ],
+        'attribute': [
+            (r'\]', Keyword.Declaration, '#pop'),
+            include('expression'),
+        ],
+        'comment': [
+            # Multiline Comments
+            (r'[^/-]+', Comment.Multiline),
+            (r'/-', Comment.Multiline, '#push'),
+            (r'-/', Comment.Multiline, '#pop'),
+            (r'[/-]', Comment.Multiline)
+        ],
+        'docstring': [
+            (r'[^/-]+', String.Doc),
+            (r'-/', String.Doc, '#pop'),
+            (r'[/-]', String.Doc)
+        ],
+        'string': [
+            (r'[^\\"]+', String.Double),
+            (r'\\[n"\\\n]', String.Escape),
+            ('"', String.Double, '#pop'),
+        ],
+    }
+
+    def analyse_text(text):
+        if re.search(r'^import [A-Z]', text, re.MULTILINE):
+            return 0.1
diff --git a/libs/pygments/lexers/lilypond.py b/libs/pygments/lexers/lilypond.py
index 6b4ed20d9..03c34ae59 100644
--- a/libs/pygments/lexers/lilypond.py
+++ b/libs/pygments/lexers/lilypond.py
@@ -4,7 +4,7 @@
 
     Lexer for LilyPond.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -51,14 +51,13 @@ class LilyPondLexer(SchemeLexer):
     .. important::
 
        This lexer is meant to be used in conjunction with the ``lilypond`` style.
-
-    .. versionadded:: 2.11
     """
     name = 'LilyPond'
     url = 'https://lilypond.org'
     aliases = ['lilypond']
     filenames = ['*.ly']
     mimetypes = []
+    version_added = '2.11'
 
     flags = re.DOTALL | re.MULTILINE
 
diff --git a/libs/pygments/lexers/lisp.py b/libs/pygments/lexers/lisp.py
index 966b6063a..2c970d939 100644
--- a/libs/pygments/lexers/lisp.py
+++ b/libs/pygments/lexers/lisp.py
@@ -4,7 +4,7 @@
 
     Lexers for Lispy languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,7 +20,7 @@ from pygments.lexers._scheme_builtins import scheme_keywords, scheme_builtins
 
 __all__ = ['SchemeLexer', 'CommonLispLexer', 'HyLexer', 'RacketLexer',
            'NewLispLexer', 'EmacsLispLexer', 'ShenLexer', 'CPSALexer',
-           'XtlangLexer', 'FennelLexer']
+           'XtlangLexer', 'FennelLexer', 'JanetLexer']
 
 
 class SchemeLexer(RegexLexer):
@@ -31,14 +31,13 @@ class SchemeLexer(RegexLexer):
     at http://paste.lisp.org/ to cover as much syntax as possible.
 
     It supports the full Scheme syntax as defined in R5RS.
-
-    .. versionadded:: 0.6
     """
     name = 'Scheme'
     url = 'http://www.scheme-reports.org/'
     aliases = ['scheme', 'scm']
     filenames = ['*.scm', '*.ss']
     mimetypes = ['text/x-scheme', 'application/x-scheme']
+    version_added = '0.6'
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -296,14 +295,13 @@ class SchemeLexer(RegexLexer):
 class CommonLispLexer(RegexLexer):
     """
     A Common Lisp lexer.
-
-    .. versionadded:: 0.9
     """
     name = 'Common Lisp'
     url = 'https://lisp-lang.org/'
     aliases = ['common-lisp', 'cl', 'lisp']
     filenames = ['*.cl', '*.lisp']
     mimetypes = ['text/x-common-lisp']
+    version_added = '0.9'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -316,7 +314,7 @@ class CommonLispLexer(RegexLexer):
 
     # symbol token, reverse-engineered from hyperspec
     # Take a deep breath...
-    symbol = r'(\|[^|]+\||(?:%s)(?:%s)*)' % (nonmacro, constituent)
+    symbol = rf'(\|[^|]+\||(?:{nonmacro})(?:{constituent})*)'
 
     def __init__(self, **options):
         from pygments.lexers._cl_builtins import BUILTIN_FUNCTIONS, \
@@ -485,14 +483,13 @@ class CommonLispLexer(RegexLexer):
 class HyLexer(RegexLexer):
     """
     Lexer for Hy source code.
-
-    .. versionadded:: 2.0
     """
     name = 'Hy'
     url = 'http://hylang.org/'
-    aliases = ['hylang']
+    aliases = ['hylang', 'hy']
     filenames = ['*.hy']
     mimetypes = ['text/x-hy', 'application/x-hy']
+    version_added = '2.0'
 
     special_forms = (
         'cond', 'for', '->', '->>', 'car',
@@ -522,7 +519,7 @@ class HyLexer(RegexLexer):
     # valid names for identifiers
     # well, names can only not consist fully of numbers
     # but this should be good enough for now
-    valid_name = r'(?!#)[\w!$%*+<=>?/.#:-]+'
+    valid_name = r"[^ \t\n\r\f\v()[\]{};\"'`~]+"
 
     def _multi_escape(entries):
         return words(entries, suffix=' ')
@@ -534,8 +531,7 @@ class HyLexer(RegexLexer):
             (r';.*$', Comment.Single),
 
             # whitespaces - usually not relevant
-            (r',+', Text),
-            (r'\s+', Whitespace),
+            (r'[ \t\n\r\f\v]+', Whitespace),
 
             # numbers
             (r'-?\d+\.\d+', Number.Float),
@@ -601,8 +597,6 @@ class RacketLexer(RegexLexer):
     """
     Lexer for Racket source code (formerly
     known as PLT Scheme).
-
-    .. versionadded:: 1.6
     """
 
     name = 'Racket'
@@ -610,6 +604,7 @@ class RacketLexer(RegexLexer):
     aliases = ['racket', 'rkt']
     filenames = ['*.rkt', '*.rktd', '*.rktl']
     mimetypes = ['text/x-racket', 'application/x-racket']
+    version_added = '1.6'
 
     # Generated by example.rkt
     _keywords = (
@@ -1391,19 +1386,17 @@ class RacketLexer(RegexLexer):
     _opening_parenthesis = r'[([{]'
     _closing_parenthesis = r'[)\]}]'
     _delimiters = r'()[\]{}",\'`;\s'
-    _symbol = r'(?:\|[^|]*\||\\[\w\W]|[^|\\%s]+)+' % _delimiters
+    _symbol = rf'(?:\|[^|]*\||\\[\w\W]|[^|\\{_delimiters}]+)+'
     _exact_decimal_prefix = r'(?:#e)?(?:#d)?(?:#e)?'
     _exponent = r'(?:[defls][-+]?\d+)'
     _inexact_simple_no_hashes = r'(?:\d+(?:/\d+|\.\d*)?|\.\d+)'
-    _inexact_simple = (r'(?:%s|(?:\d+#+(?:\.#*|/\d+#*)?|\.\d+#+|'
-                       r'\d+(?:\.\d*#+|/\d+#+)))' % _inexact_simple_no_hashes)
-    _inexact_normal_no_hashes = r'(?:%s%s?)' % (_inexact_simple_no_hashes,
-                                                _exponent)
-    _inexact_normal = r'(?:%s%s?)' % (_inexact_simple, _exponent)
+    _inexact_simple = (rf'(?:{_inexact_simple_no_hashes}|(?:\d+#+(?:\.#*|/\d+#*)?|\.\d+#+|'
+                       r'\d+(?:\.\d*#+|/\d+#+)))')
+    _inexact_normal_no_hashes = rf'(?:{_inexact_simple_no_hashes}{_exponent}?)'
+    _inexact_normal = rf'(?:{_inexact_simple}{_exponent}?)'
     _inexact_special = r'(?:(?:inf|nan)\.[0f])'
-    _inexact_real = r'(?:[-+]?%s|[-+]%s)' % (_inexact_normal,
-                                             _inexact_special)
-    _inexact_unsigned = r'(?:%s|%s)' % (_inexact_normal, _inexact_special)
+    _inexact_real = rf'(?:[-+]?{_inexact_normal}|[-+]{_inexact_special})'
+    _inexact_unsigned = rf'(?:{_inexact_normal}|{_inexact_special})'
 
     tokens = {
         'root': [
@@ -1423,36 +1416,29 @@ class RacketLexer(RegexLexer):
             # onto Pygments token types; some judgment calls here.
 
             # #d or no prefix
-            (r'(?i)%s[-+]?\d+(?=[%s])' % (_exact_decimal_prefix, _delimiters),
+            (rf'(?i){_exact_decimal_prefix}[-+]?\d+(?=[{_delimiters}])',
              Number.Integer, '#pop'),
-            (r'(?i)%s[-+]?(\d+(\.\d*)?|\.\d+)([deflst][-+]?\d+)?(?=[%s])' %
-             (_exact_decimal_prefix, _delimiters), Number.Float, '#pop'),
-            (r'(?i)%s[-+]?(%s([-+]%s?i)?|[-+]%s?i)(?=[%s])' %
-             (_exact_decimal_prefix, _inexact_normal_no_hashes,
-              _inexact_normal_no_hashes, _inexact_normal_no_hashes,
-              _delimiters), Number, '#pop'),
+            (rf'(?i){_exact_decimal_prefix}[-+]?(\d+(\.\d*)?|\.\d+)([deflst][-+]?\d+)?(?=[{_delimiters}])', Number.Float, '#pop'),
+            (rf'(?i){_exact_decimal_prefix}[-+]?({_inexact_normal_no_hashes}([-+]{_inexact_normal_no_hashes}?i)?|[-+]{_inexact_normal_no_hashes}?i)(?=[{_delimiters}])', Number, '#pop'),
 
             # Inexact without explicit #i
-            (r'(?i)(#d)?(%s([-+]%s?i)?|[-+]%s?i|%s@%s)(?=[%s])' %
-             (_inexact_real, _inexact_unsigned, _inexact_unsigned,
-              _inexact_real, _inexact_real, _delimiters), Number.Float,
+            (rf'(?i)(#d)?({_inexact_real}([-+]{_inexact_unsigned}?i)?|[-+]{_inexact_unsigned}?i|{_inexact_real}@{_inexact_real})(?=[{_delimiters}])', Number.Float,
              '#pop'),
 
             # The remaining extflonums
-            (r'(?i)(([-+]?%st[-+]?\d+)|[-+](inf|nan)\.t)(?=[%s])' %
-             (_inexact_simple, _delimiters), Number.Float, '#pop'),
+            (rf'(?i)(([-+]?{_inexact_simple}t[-+]?\d+)|[-+](inf|nan)\.t)(?=[{_delimiters}])', Number.Float, '#pop'),
 
             # #b
-            (r'(?iu)(#[ei])?#b%s' % _symbol, Number.Bin, '#pop'),
+            (rf'(?iu)(#[ei])?#b{_symbol}', Number.Bin, '#pop'),
 
             # #o
-            (r'(?iu)(#[ei])?#o%s' % _symbol, Number.Oct, '#pop'),
+            (rf'(?iu)(#[ei])?#o{_symbol}', Number.Oct, '#pop'),
 
             # #x
-            (r'(?iu)(#[ei])?#x%s' % _symbol, Number.Hex, '#pop'),
+            (rf'(?iu)(#[ei])?#x{_symbol}', Number.Hex, '#pop'),
 
             # #i is always inexact, i.e. float
-            (r'(?iu)(#d)?#i%s' % _symbol, Number.Float, '#pop'),
+            (rf'(?iu)(#d)?#i{_symbol}', Number.Float, '#pop'),
 
             # Strings and characters
             (r'#?"', String.Double, ('#pop', 'string')),
@@ -1465,7 +1451,7 @@ class RacketLexer(RegexLexer):
             (r'#(true|false|[tTfF])', Name.Constant, '#pop'),
 
             # Keyword argument names (e.g. #:keyword)
-            (r'#:%s' % _symbol, Keyword.Declaration, '#pop'),
+            (rf'#:{_symbol}', Keyword.Declaration, '#pop'),
 
             # Reader extensions
             (r'(#lang |#!)(\S+)',
@@ -1473,8 +1459,8 @@ class RacketLexer(RegexLexer):
             (r'#reader', Keyword.Namespace, 'quoted-datum'),
 
             # Other syntax
-            (r"(?i)\.(?=[%s])|#c[is]|#['`]|#,@?" % _delimiters, Operator),
-            (r"'|#[s&]|#hash(eqv?)?|#\d*(?=%s)" % _opening_parenthesis,
+            (rf"(?i)\.(?=[{_delimiters}])|#c[is]|#['`]|#,@?", Operator),
+            (rf"'|#[s&]|#hash(eqv?)?|#\d*(?={_opening_parenthesis})",
              Operator, ('#pop', 'quoted-datum'))
         ],
         'datum*': [
@@ -1488,15 +1474,15 @@ class RacketLexer(RegexLexer):
         ],
         'unquoted-datum': [
             include('datum'),
-            (r'quote(?=[%s])' % _delimiters, Keyword,
+            (rf'quote(?=[{_delimiters}])', Keyword,
              ('#pop', 'quoted-datum')),
             (r'`', Operator, ('#pop', 'quasiquoted-datum')),
-            (r'quasiquote(?=[%s])' % _delimiters, Keyword,
+            (rf'quasiquote(?=[{_delimiters}])', Keyword,
              ('#pop', 'quasiquoted-datum')),
             (_opening_parenthesis, Punctuation, ('#pop', 'unquoted-list')),
-            (words(_keywords, suffix='(?=[%s])' % _delimiters),
+            (words(_keywords, suffix=f'(?=[{_delimiters}])'),
              Keyword, '#pop'),
-            (words(_builtins, suffix='(?=[%s])' % _delimiters),
+            (words(_builtins, suffix=f'(?=[{_delimiters}])'),
              Name.Builtin, '#pop'),
             (_symbol, Name, '#pop'),
             include('datum*')
@@ -1508,7 +1494,7 @@ class RacketLexer(RegexLexer):
         'quasiquoted-datum': [
             include('datum'),
             (r',@?', Operator, ('#pop', 'unquoted-datum')),
-            (r'unquote(-splicing)?(?=[%s])' % _delimiters, Keyword,
+            (rf'unquote(-splicing)?(?=[{_delimiters}])', Keyword,
              ('#pop', 'unquoted-datum')),
             (_opening_parenthesis, Punctuation, ('#pop', 'quasiquoted-list')),
             include('datum*')
@@ -1543,8 +1529,6 @@ class RacketLexer(RegexLexer):
 class NewLispLexer(RegexLexer):
     """
     For newLISP source code (version 10.3.0).
-
-    .. versionadded:: 1.5
     """
 
     name = 'NewLisp'
@@ -1552,6 +1536,7 @@ class NewLispLexer(RegexLexer):
     aliases = ['newlisp']
     filenames = ['*.lsp', '*.nl', '*.kif']
     mimetypes = ['text/x-newlisp', 'application/x-newlisp']
+    version_added = '1.5'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -1676,13 +1661,13 @@ class EmacsLispLexer(RegexLexer):
     """
     An ELisp lexer, parsing a stream and outputting the tokens
     needed to highlight elisp code.
-
-    .. versionadded:: 2.1
     """
     name = 'EmacsLisp'
     aliases = ['emacs-lisp', 'elisp', 'emacs']
     filenames = ['*.el']
     mimetypes = ['text/x-elisp', 'application/x-elisp']
+    url = 'https://www.gnu.org/software/emacs'
+    version_added = '2.1'
 
     flags = re.MULTILINE
 
@@ -1695,7 +1680,7 @@ class EmacsLispLexer(RegexLexer):
 
     # symbol token, reverse-engineered from hyperspec
     # Take a deep breath...
-    symbol = r'((?:%s)(?:%s)*)' % (nonmacro, constituent)
+    symbol = rf'((?:{nonmacro})(?:{constituent})*)'
 
     macros = {
         'atomic-change-group', 'case', 'block', 'cl-block', 'cl-callf', 'cl-callf2',
@@ -2308,7 +2293,7 @@ class EmacsLispLexer(RegexLexer):
         ],
         'string': [
             (r'[^"\\`]+', String),
-            (r'`%s\'' % symbol, String.Symbol),
+            (rf'`{symbol}\'', String.Symbol),
             (r'`', String),
             (r'\\.', String),
             (r'\\\n', String),
@@ -2320,14 +2305,13 @@ class EmacsLispLexer(RegexLexer):
 class ShenLexer(RegexLexer):
     """
     Lexer for Shen source code.
-
-    .. versionadded:: 2.1
     """
     name = 'Shen'
     url = 'http://shenlanguage.org/'
     aliases = ['shen']
     filenames = ['*.shen']
     mimetypes = ['text/x-shen', 'application/x-shen']
+    version_added = '2.1'
 
     DECLARATIONS = (
         'datatype', 'define', 'defmacro', 'defprolog', 'defcc',
@@ -2375,9 +2359,9 @@ class ShenLexer(RegexLexer):
     MAPPINGS.update((s, Keyword) for s in SPECIAL_FORMS)
 
     valid_symbol_chars = r'[\w!$%*+,<=>?/.\'@&#:-]'
-    valid_name = '%s+' % valid_symbol_chars
-    symbol_name = r'[a-z!$%%*+,<=>?/.\'@&#_-]%s*' % valid_symbol_chars
-    variable = r'[A-Z]%s*' % valid_symbol_chars
+    valid_name = f'{valid_symbol_chars}+'
+    symbol_name = rf'[a-z!$%*+,<=>?/.\'@&#_-]{valid_symbol_chars}*'
+    variable = rf'[A-Z]{valid_symbol_chars}*'
 
     tokens = {
         'string': [
@@ -2485,13 +2469,13 @@ class ShenLexer(RegexLexer):
 class CPSALexer(RegexLexer):
     """
     A CPSA lexer based on the CPSA language as of version 2.2.12
-
-    .. versionadded:: 2.1
     """
     name = 'CPSA'
     aliases = ['cpsa']
     filenames = ['*.cpsa']
     mimetypes = []
+    url = 'https://web.cs.wpi.edu/~guttman/cs564/cpsauser.html'
+    version_added = '2.1'
 
     # list of known keywords and builtins taken form vim 6.4 scheme.vim
     # syntax file.
@@ -2566,14 +2550,13 @@ class XtlangLexer(RegexLexer):
     This is a mixture of Scheme and xtlang, really. Keyword lists are
     taken from the Extempore Emacs mode
     (https://github.com/extemporelang/extempore-emacs-mode)
-
-    .. versionadded:: 2.2
     """
     name = 'xtlang'
     url = 'http://extempore.moso.com.au'
     aliases = ['extempore']
     filenames = ['*.xtm']
     mimetypes = []
+    version_added = '2.2'
 
     common_keywords = (
         'lambda', 'define', 'if', 'else', 'cond', 'and',
@@ -2769,13 +2752,12 @@ class FennelLexer(RegexLexer):
 
     Fennel compiles to Lua, so all the Lua builtins are recognized as well
     as the special forms that are particular to the Fennel compiler.
-
-    .. versionadded:: 2.3
     """
     name = 'Fennel'
     url = 'https://fennel-lang.org'
     aliases = ['fennel', 'fnl']
     filenames = ['*.fnl']
+    version_added = '2.3'
 
     # this list is current as of Fennel version 0.10.0.
     special_forms = (
@@ -2846,3 +2828,319 @@ class FennelLexer(RegexLexer):
             (r'#', Punctuation),
         ]
     }
+
+
+class JanetLexer(RegexLexer):
+    """A lexer for the Janet programming language.
+    """
+    name = 'Janet'
+    url =  'https://janet-lang.org/'
+    aliases = ['janet']
+    filenames = ['*.janet', '*.jdn']
+    mimetypes = ['text/x-janet', 'application/x-janet']
+    version_added = '2.18'
+
+    # XXX: gets too slow
+    #flags = re.MULTILINE | re.VERBOSE
+
+    special_forms = (
+        'break', 'def', 'do', 'fn', 'if', 'quote', 'quasiquote', 'splice',
+        'set', 'unquote', 'upscope', 'var', 'while'
+    )
+
+    builtin_macros = (
+        '%=', '*=', '++', '+=', '--', '-=', '->', '->>', '-?>',
+        '-?>>', '/=', 'and', 'as->', 'as-macro', 'as?->',
+        'assert', 'case', 'catseq', 'chr', 'comment', 'compif',
+        'comptime', 'compwhen', 'cond', 'coro', 'def-',
+        'default', 'defdyn', 'defer', 'defmacro', 'defmacro-',
+        'defn', 'defn-', 'delay', 'doc', 'each', 'eachk',
+        'eachp', 'edefer', 'ev/do-thread', 'ev/gather',
+        'ev/spawn', 'ev/spawn-thread', 'ev/with-deadline',
+        'ffi/defbind', 'fiber-fn', 'for', 'forever', 'forv',
+        'generate', 'if-let', 'if-not', 'if-with', 'import',
+        'juxt', 'label', 'let', 'loop', 'match', 'or', 'prompt',
+        'protect', 'repeat', 'seq', 'short-fn', 'tabseq',
+        'toggle', 'tracev', 'try', 'unless', 'use', 'var-',
+        'varfn', 'when', 'when-let', 'when-with', 'with',
+        'with-dyns', 'with-syms', 'with-vars',
+        # obsolete builtin macros
+        'eachy'
+    )
+
+    builtin_functions = (
+        '%', '*', '+', '-', '/', '<', '<=', '=', '>', '>=',
+        'abstract?', 'accumulate', 'accumulate2', 'all',
+        'all-bindings', 'all-dynamics', 'any?', 'apply',
+        'array', 'array/clear', 'array/concat', 'array/ensure',
+        'array/fill', 'array/insert', 'array/new',
+        'array/new-filled', 'array/peek', 'array/pop',
+        'array/push', 'array/remove', 'array/slice',
+        'array/trim', 'array/weak', 'array?', 'asm',
+        'bad-compile', 'bad-parse', 'band', 'blshift', 'bnot',
+        'boolean?', 'bor', 'brshift', 'brushift', 'buffer',
+        'buffer/bit', 'buffer/bit-clear', 'buffer/bit-set',
+        'buffer/bit-toggle', 'buffer/blit', 'buffer/clear',
+        'buffer/fill', 'buffer/format', 'buffer/from-bytes',
+        'buffer/new', 'buffer/new-filled', 'buffer/popn',
+        'buffer/push', 'buffer/push-at', 'buffer/push-byte',
+        'buffer/push-string', 'buffer/push-word',
+        'buffer/slice', 'buffer/trim', 'buffer?', 'bxor',
+        'bytes?', 'cancel', 'cfunction?', 'cli-main', 'cmp',
+        'comp', 'compare', 'compare<', 'compare<=', 'compare=',
+        'compare>', 'compare>=', 'compile', 'complement',
+        'count', 'curenv', 'debug', 'debug/arg-stack',
+        'debug/break', 'debug/fbreak', 'debug/lineage',
+        'debug/stack', 'debug/stacktrace', 'debug/step',
+        'debug/unbreak', 'debug/unfbreak', 'debugger',
+        'debugger-on-status', 'dec', 'deep-not=', 'deep=',
+        'defglobal', 'describe', 'dictionary?', 'disasm',
+        'distinct', 'div', 'doc*', 'doc-format', 'doc-of',
+        'dofile', 'drop', 'drop-until', 'drop-while', 'dyn',
+        'eflush', 'empty?', 'env-lookup', 'eprin', 'eprinf',
+        'eprint', 'eprintf', 'error', 'errorf',
+        'ev/acquire-lock', 'ev/acquire-rlock',
+        'ev/acquire-wlock', 'ev/all-tasks', 'ev/call',
+        'ev/cancel', 'ev/capacity', 'ev/chan', 'ev/chan-close',
+        'ev/chunk', 'ev/close', 'ev/count', 'ev/deadline',
+        'ev/full', 'ev/give', 'ev/give-supervisor', 'ev/go',
+        'ev/lock', 'ev/read', 'ev/release-lock',
+        'ev/release-rlock', 'ev/release-wlock', 'ev/rselect',
+        'ev/rwlock', 'ev/select', 'ev/sleep', 'ev/take',
+        'ev/thread', 'ev/thread-chan', 'ev/write', 'eval',
+        'eval-string', 'even?', 'every?', 'extreme', 'false?',
+        'ffi/align', 'ffi/call', 'ffi/calling-conventions',
+        'ffi/close', 'ffi/context', 'ffi/free', 'ffi/jitfn',
+        'ffi/lookup', 'ffi/malloc', 'ffi/native',
+        'ffi/pointer-buffer', 'ffi/pointer-cfunction',
+        'ffi/read', 'ffi/signature', 'ffi/size', 'ffi/struct',
+        'ffi/trampoline', 'ffi/write', 'fiber/can-resume?',
+        'fiber/current', 'fiber/getenv', 'fiber/last-value',
+        'fiber/maxstack', 'fiber/new', 'fiber/root',
+        'fiber/setenv', 'fiber/setmaxstack', 'fiber/status',
+        'fiber?', 'file/close', 'file/flush', 'file/lines',
+        'file/open', 'file/read', 'file/seek', 'file/tell',
+        'file/temp', 'file/write', 'filter', 'find',
+        'find-index', 'first', 'flatten', 'flatten-into',
+        'flush', 'flycheck', 'freeze', 'frequencies',
+        'from-pairs', 'function?', 'gccollect', 'gcinterval',
+        'gcsetinterval', 'gensym', 'get', 'get-in', 'getline',
+        'getproto', 'group-by', 'has-key?', 'has-value?',
+        'hash', 'idempotent?', 'identity', 'import*', 'in',
+        'inc', 'index-of', 'indexed?', 'int/s64',
+        'int/to-bytes', 'int/to-number', 'int/u64', 'int?',
+        'interleave', 'interpose', 'invert', 'juxt*', 'keep',
+        'keep-syntax', 'keep-syntax!', 'keys', 'keyword',
+        'keyword/slice', 'keyword?', 'kvs', 'last', 'length',
+        'lengthable?', 'load-image', 'macex', 'macex1',
+        'maclintf', 'make-env', 'make-image', 'map', 'mapcat',
+        'marshal', 'math/abs', 'math/acos', 'math/acosh',
+        'math/asin', 'math/asinh', 'math/atan', 'math/atan2',
+        'math/atanh', 'math/cbrt', 'math/ceil', 'math/cos',
+        'math/cosh', 'math/erf', 'math/erfc', 'math/exp',
+        'math/exp2', 'math/expm1', 'math/floor', 'math/gamma',
+        'math/gcd', 'math/hypot', 'math/lcm', 'math/log',
+        'math/log-gamma', 'math/log10', 'math/log1p',
+        'math/log2', 'math/next', 'math/pow', 'math/random',
+        'math/rng', 'math/rng-buffer', 'math/rng-int',
+        'math/rng-uniform', 'math/round', 'math/seedrandom',
+        'math/sin', 'math/sinh', 'math/sqrt', 'math/tan',
+        'math/tanh', 'math/trunc', 'max', 'max-of', 'mean',
+        'memcmp', 'merge', 'merge-into', 'merge-module', 'min',
+        'min-of', 'mod', 'module/add-paths',
+        'module/expand-path', 'module/find', 'module/value',
+        'nan?', 'nat?', 'native', 'neg?', 'net/accept',
+        'net/accept-loop', 'net/address', 'net/address-unpack',
+        'net/chunk', 'net/close', 'net/connect', 'net/flush',
+        'net/listen', 'net/localname', 'net/peername',
+        'net/read', 'net/recv-from', 'net/send-to',
+        'net/server', 'net/setsockopt', 'net/shutdown',
+        'net/write', 'next', 'nil?', 'not', 'not=', 'number?',
+        'odd?', 'one?', 'os/arch', 'os/cd', 'os/chmod',
+        'os/clock', 'os/compiler', 'os/cpu-count',
+        'os/cryptorand', 'os/cwd', 'os/date', 'os/dir',
+        'os/environ', 'os/execute', 'os/exit', 'os/getenv',
+        'os/isatty', 'os/link', 'os/lstat', 'os/mkdir',
+        'os/mktime', 'os/open', 'os/perm-int', 'os/perm-string',
+        'os/pipe', 'os/posix-exec', 'os/posix-fork',
+        'os/proc-close', 'os/proc-kill', 'os/proc-wait',
+        'os/readlink', 'os/realpath', 'os/rename', 'os/rm',
+        'os/rmdir', 'os/setenv', 'os/shell', 'os/sigaction',
+        'os/sleep', 'os/spawn', 'os/stat', 'os/strftime',
+        'os/symlink', 'os/time', 'os/touch', 'os/umask',
+        'os/which', 'pairs', 'parse', 'parse-all',
+        'parser/byte', 'parser/clone', 'parser/consume',
+        'parser/eof', 'parser/error', 'parser/flush',
+        'parser/has-more', 'parser/insert', 'parser/new',
+        'parser/produce', 'parser/state', 'parser/status',
+        'parser/where', 'partial', 'partition', 'partition-by',
+        'peg/compile', 'peg/find', 'peg/find-all', 'peg/match',
+        'peg/replace', 'peg/replace-all', 'pos?', 'postwalk',
+        'pp', 'prewalk', 'prin', 'prinf', 'print', 'printf',
+        'product', 'propagate', 'put', 'put-in', 'quit',
+        'range', 'reduce', 'reduce2', 'repl', 'require',
+        'resume', 'return', 'reverse', 'reverse!',
+        'run-context', 'sandbox', 'scan-number', 'setdyn',
+        'signal', 'slice', 'slurp', 'some', 'sort', 'sort-by',
+        'sorted', 'sorted-by', 'spit', 'string',
+        'string/ascii-lower', 'string/ascii-upper',
+        'string/bytes', 'string/check-set', 'string/find',
+        'string/find-all', 'string/format', 'string/from-bytes',
+        'string/has-prefix?', 'string/has-suffix?',
+        'string/join', 'string/repeat', 'string/replace',
+        'string/replace-all', 'string/reverse', 'string/slice',
+        'string/split', 'string/trim', 'string/triml',
+        'string/trimr', 'string?', 'struct', 'struct/getproto',
+        'struct/proto-flatten', 'struct/to-table',
+        'struct/with-proto', 'struct?', 'sum', 'symbol',
+        'symbol/slice', 'symbol?', 'table', 'table/clear',
+        'table/clone', 'table/getproto', 'table/new',
+        'table/proto-flatten', 'table/rawget', 'table/setproto',
+        'table/to-struct', 'table/weak', 'table/weak-keys',
+        'table/weak-values', 'table?', 'take', 'take-until',
+        'take-while', 'thaw', 'trace', 'true?', 'truthy?',
+        'tuple', 'tuple/brackets', 'tuple/setmap',
+        'tuple/slice', 'tuple/sourcemap', 'tuple/type',
+        'tuple?', 'type', 'unmarshal', 'untrace', 'update',
+        'update-in', 'values', 'varglobal', 'walk',
+        'warn-compile', 'xprin', 'xprinf', 'xprint', 'xprintf',
+        'yield', 'zero?', 'zipcoll',
+        # obsolete builtin functions
+        'tarray/buffer', 'tarray/copy-bytes', 'tarray/length',
+        'tarray/new', 'tarray/properties', 'tarray/slice',
+        'tarray/swap-bytes', 'thread/close', 'thread/current',
+        'thread/exit', 'thread/new', 'thread/receive',
+        'thread/send'
+    )
+
+    builtin_variables = (
+        'debugger-env', 'default-peg-grammar', 'janet/build',
+        'janet/config-bits', 'janet/version', 'load-image-dict',
+        'make-image-dict', 'math/-inf', 'math/e', 'math/inf',
+        'math/int-max', 'math/int-min', 'math/int32-max',
+        'math/int32-min', 'math/nan', 'math/pi', 'module/cache',
+        'module/loaders', 'module/loading', 'module/paths',
+        'root-env', 'stderr', 'stdin', 'stdout'
+    )
+
+    constants = (
+        'false', 'nil', 'true'
+    )
+
+    # XXX: this form not usable to pass to `suffix=`
+    #_token_end = r'''
+    #  (?=            # followed by one of:
+    #      \s           # whitespace
+    #    | \#           # comment
+    #    | [)\]]        # end delimiters
+    #    | $            # end of file
+    #  )
+    #'''
+
+    # ...so, express it like this
+    _token_end = r'(?=\s|#|[)\]]|$)'
+
+    _first_char = r'[a-zA-Z!$%&*+\-./<=>?@^_]'
+    _rest_char = rf'([0-9:]|{_first_char})'
+
+    valid_name = rf'{_first_char}({_rest_char})*'
+
+    _radix_unit = r'[0-9a-zA-Z][0-9a-zA-Z_]*'
+
+    # exponent marker, optional sign, one or more alphanumeric
+    _radix_exp = r'&[+-]?[0-9a-zA-Z]+'
+
+    # 2af3__bee_
+    _hex_unit = r'[0-9a-fA-F][0-9a-fA-F_]*'
+
+    # 12_000__
+    _dec_unit = r'[0-9][0-9_]*'
+
+    # E-23
+    # lower or uppercase e, optional sign, one or more digits
+    _dec_exp = r'[eE][+-]?[0-9]+'
+
+    tokens = {
+        'root': [
+            (r'#.*$', Comment.Single),
+
+            (r'\s+', Whitespace),
+
+            # radix number
+            (rf'''(?x)
+                  [+-]? [0-9]{{1,2}} r {_radix_unit} \. ({_radix_unit})?
+                  ({_radix_exp})?
+               ''',
+             Number),
+
+            (rf'''(?x)
+                  [+-]? [0-9]{{1,2}} r (\.)? {_radix_unit}
+                  ({_radix_exp})?
+               ''',
+             Number),
+
+            # hex number
+            (rf'(?x) [+-]? 0x {_hex_unit} \. ({_hex_unit})?',
+             Number.Hex),
+
+            (rf'(?x) [+-]? 0x (\.)? {_hex_unit}',
+             Number.Hex),
+
+            # decimal number
+            (rf'(?x) [+-]? {_dec_unit} \. ({_dec_unit})? ({_dec_exp})?',
+             Number.Float),
+
+            (rf'(?x) [+-]? (\.)? {_dec_unit} ({_dec_exp})?',
+             Number.Float),
+
+            # strings and buffers
+            (r'@?"', String, 'string'),
+
+            # long-strings and long-buffers
+            #
+            #   non-empty content enclosed by a pair of n-backticks
+            #   with optional leading @
+            (r'@?(`+)(.|\n)+?\1', String),
+
+            # things that hang out on front
+            #
+            #   ' ~ , ; |
+            (r"['~,;|]", Operator),
+
+            # collection delimiters
+            #
+            #   @( ( )
+            #   @[ [ ]
+            #   @{ { }
+            (r'@?[(\[{]|[)\]}]', Punctuation),
+
+            # constants
+            (words(constants, suffix=_token_end), Keyword.Constants),
+
+            # keywords
+            (rf'(:({_rest_char})+|:)', Name.Constant),
+
+            # symbols
+            (words(builtin_variables, suffix=_token_end),
+             Name.Variable.Global),
+
+            (words(special_forms, prefix=r'(?<=\()', suffix=_token_end),
+             Keyword.Reserved),
+
+            (words(builtin_macros, prefix=r'(?<=\()', suffix=_token_end),
+             Name.Builtin),
+
+            (words(builtin_functions, prefix=r'(?<=\()', suffix=_token_end),
+             Name.Function),
+
+            # other symbols
+            (valid_name, Name.Variable),
+        ],
+        'string': [
+            (r'\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{6})', String.Escape),
+            (r'\\x[0-9a-fA-F]{2}', String.Escape),
+            (r'\\.', String.Escape),
+            (r'"', String, '#pop'),
+            (r'[^\\"]+', String),
+        ]
+    }
diff --git a/libs/pygments/lexers/macaulay2.py b/libs/pygments/lexers/macaulay2.py
index a624890d8..77b841d83 100644
--- a/libs/pygments/lexers/macaulay2.py
+++ b/libs/pygments/lexers/macaulay2.py
@@ -4,7 +4,7 @@
 
     Lexer for Macaulay2.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -13,9 +13,11 @@ from pygments.token import Comment, Keyword, Name, String, Text
 
 __all__ = ['Macaulay2Lexer']
 
-# Auto-generated for Macaulay2-1.22. Do not modify this file manually.
+# Auto-generated for Macaulay2-1.24.11. Do not modify this file manually.
 
 M2KEYWORDS = (
+    "SPACE",
+    "TEST",
     "and",
     "break",
     "catch",
@@ -37,10 +39,10 @@ M2KEYWORDS = (
     "or",
     "return",
     "shield",
-    "SPACE",
     "step",
     "symbol",
     "then",
+    "threadLocal",
     "threadVariable",
     "throw",
     "time",
@@ -53,51 +55,52 @@ M2KEYWORDS = (
     )
 
 M2DATATYPES = (
+    "ANCHOR",
     "Adjacent",
     "AffineVariety",
     "Analyzer",
-    "ANCHOR",
     "AngleBarList",
     "Array",
     "AssociativeExpression",
+    "AtomicInt",
+    "BLOCKQUOTE",
+    "BODY",
+    "BOLD",
+    "BR",
+    "BUTTON",
     "Bag",
     "BasicList",
     "BettiTally",
     "BinaryOperation",
-    "BLOCKQUOTE",
-    "BODY",
-    "BOLD",
     "Boolean",
-    "BR",
-    "BUTTON",
-    "CacheFunction",
-    "CacheTable",
     "CC",
     "CDATA",
+    "CODE",
+    "COMMENT",
+    "CacheFunction",
+    "CacheTable",
     "ChainComplex",
     "ChainComplexMap",
-    "CODE",
     "CoherentSheaf",
     "Command",
-    "COMMENT",
     "CompiledFunction",
     "CompiledFunctionBody",
     "CompiledFunctionClosure",
     "ComplexField",
     "Constant",
-    "Database",
     "DD",
+    "DIV",
+    "DL",
+    "DT",
+    "Database",
     "Descent",
     "Describe",
     "Dictionary",
     "DirectSum",
-    "DIV",
     "Divide",
-    "DL",
     "DocumentTag",
-    "DT",
-    "Eliminate",
     "EM",
+    "Eliminate",
     "EngineRing",
     "Equation",
     "ExampleItem",
@@ -116,7 +119,6 @@ M2DATATYPES = (
     "GradedModuleMap",
     "GroebnerBasis",
     "GroebnerBasisOptions",
-    "HashTable",
     "HEAD",
     "HEADER1",
     "HEADER2",
@@ -124,20 +126,23 @@ M2DATATYPES = (
     "HEADER4",
     "HEADER5",
     "HEADER6",
-    "HeaderType",
-    "Holder",
     "HR",
     "HREF",
     "HTML",
+    "HashTable",
+    "HeaderType",
+    "Holder",
     "Hybrid",
     "Hypertext",
     "HypertextContainer",
     "HypertextParagraph",
     "HypertextVoid",
-    "Ideal",
     "IMG",
-    "ImmutableType",
     "INDENT",
+    "INPUT",
+    "ITALIC",
+    "Ideal",
+    "ImmutableType",
     "IndeterminateNumber",
     "IndexedVariable",
     "IndexedVariableTable",
@@ -145,9 +150,7 @@ M2DATATYPES = (
     "InexactFieldFamily",
     "InexactNumber",
     "InfiniteNumber",
-    "INPUT",
     "IntermediateMarkUpType",
-    "ITALIC",
     "Iterator",
     "KBD",
     "Keyword",
@@ -155,17 +158,17 @@ M2DATATYPES = (
     "LATER",
     "LI",
     "LINK",
-    "List",
     "LITERAL",
+    "List",
     "LocalDictionary",
     "LowerBound",
+    "MENU",
+    "META",
     "Manipulator",
     "MapExpression",
     "MarkUpType",
     "Matrix",
     "MatrixExpression",
-    "MENU",
-    "META",
     "MethodFunction",
     "MethodFunctionBinary",
     "MethodFunctionSingle",
@@ -189,14 +192,14 @@ M2DATATYPES = (
     "Option",
     "OptionTable",
     "OrderedMonoid",
-    "Package",
     "PARA",
+    "PRE",
+    "Package",
     "Parenthesize",
     "Parser",
     "Partition",
     "PolynomialRing",
     "Power",
-    "PRE",
     "Product",
     "ProductOrder",
     "Program",
@@ -204,8 +207,11 @@ M2DATATYPES = (
     "ProjectiveHilbertPolynomial",
     "ProjectiveVariety",
     "Pseudocode",
+    "PseudocodeClosure",
     "QQ",
     "QuotientRing",
+    "RR",
+    "RRi",
     "RealField",
     "Resolution",
     "Ring",
@@ -213,49 +219,48 @@ M2DATATYPES = (
     "RingFamily",
     "RingMap",
     "RowExpression",
-    "RR",
-    "RRi",
     "SAMP",
     "SCRIPT",
+    "SMALL",
+    "SPAN",
+    "STRONG",
+    "STYLE",
+    "SUB",
+    "SUBSECTION",
+    "SUP",
     "ScriptedFunctor",
     "SelfInitializingType",
     "Sequence",
     "Set",
     "SheafExpression",
+    "SheafMap",
     "SheafOfRings",
-    "SMALL",
-    "SPAN",
     "SparseMonomialVectorExpression",
     "SparseVectorExpression",
     "String",
-    "STRONG",
-    "STYLE",
-    "SUB",
     "Subscript",
-    "SUBSECTION",
     "Sum",
     "SumOfTwists",
-    "SUP",
     "Superscript",
     "Symbol",
     "SymbolBody",
     "TABLE",
-    "Table",
-    "Tally",
-    "Task",
     "TD",
-    "TensorProduct",
-    "TestInput",
     "TEX",
     "TH",
-    "Thing",
-    "Time",
     "TITLE",
     "TO",
     "TO2",
     "TOH",
     "TR",
     "TT",
+    "Table",
+    "Tally",
+    "Task",
+    "TensorProduct",
+    "TestInput",
+    "Thing",
+    "Time",
     "Type",
     "UL",
     "URL",
@@ -267,11 +272,35 @@ M2DATATYPES = (
     "VirtualTally",
     "VisibleList",
     "WrapperType",
-    "ZeroExpression",
-    "ZZ"
+    "ZZ",
+    "ZeroExpression"
     )
 
 M2FUNCTIONS = (
+    "BesselJ",
+    "BesselY",
+    "Beta",
+    "Digamma",
+    "EXAMPLE",
+    "End",
+    "Fano",
+    "GCstats",
+    "GF",
+    "Gamma",
+    "Grassmannian",
+    "Hom",
+    "LLL",
+    "LUdecomposition",
+    "M2CODE",
+    "NNParser",
+    "Proj",
+    "QQParser",
+    "QRDecomposition",
+    "SVD",
+    "SYNOPSIS",
+    "Schubert",
+    "Spec",
+    "ZZParser",
     "about",
     "abs",
     "accumulate",
@@ -283,7 +312,6 @@ M2FUNCTIONS = (
     "addDependencyTask",
     "addEndFunction",
     "addHook",
-    "addStartFunction",
     "addStartTask",
     "adjoint",
     "agm",
@@ -314,10 +342,10 @@ M2FUNCTIONS = (
     "assert",
     "associatedGradedRing",
     "associatedPrimes",
+    "atEndOfFile",
     "atan",
     "atan2",
     "atanh",
-    "atEndOfFile",
     "autoload",
     "baseFilename",
     "baseName",
@@ -325,23 +353,22 @@ M2FUNCTIONS = (
     "basis",
     "beginDocumentation",
     "benchmark",
-    "BesselJ",
-    "BesselY",
-    "Beta",
     "betti",
     "between",
     "binomial",
     "borel",
     "cacheValue",
     "cancelTask",
+    "canonicalBundle",
     "capture",
     "ceiling",
     "centerString",
     "chainComplex",
     "changeBase",
+    "changeDirectory",
     "char",
-    "characters",
     "charAnalyzer",
+    "characters",
     "check",
     "checkDegrees",
     "chi",
@@ -359,16 +386,17 @@ M2FUNCTIONS = (
     "cokernel",
     "collectGarbage",
     "columnAdd",
-    "columnate",
     "columnMult",
     "columnPermute",
     "columnRankProfile",
     "columnSwap",
+    "columnate",
     "combine",
     "commandInterpreter",
-    "commonest",
     "commonRing",
+    "commonest",
     "comodule",
+    "compareExchange",
     "complement",
     "complete",
     "components",
@@ -427,7 +455,6 @@ M2FUNCTIONS = (
     "dictionary",
     "diff",
     "difference",
-    "Digamma",
     "dim",
     "directSum",
     "disassemble",
@@ -447,7 +474,6 @@ M2FUNCTIONS = (
     "eint",
     "elements",
     "eliminate",
-    "End",
     "endPackage",
     "entries",
     "erase",
@@ -457,8 +483,8 @@ M2FUNCTIONS = (
     "euler",
     "eulers",
     "even",
-    "EXAMPLE",
     "examples",
+    "exchange",
     "exec",
     "exp",
     "expectedReesIdeal",
@@ -471,7 +497,6 @@ M2FUNCTIONS = (
     "extend",
     "exteriorPower",
     "factor",
-    "Fano",
     "fileExecutable",
     "fileExists",
     "fileLength",
@@ -504,14 +529,12 @@ M2FUNCTIONS = (
     "fromDual",
     "functionBody",
     "futureParser",
-    "Gamma",
     "gb",
     "gbRemove",
     "gbSnapshot",
     "gcd",
     "gcdCoefficients",
     "gcdLLL",
-    "GCstats",
     "genera",
     "generateAssertions",
     "generator",
@@ -522,16 +545,16 @@ M2FUNCTIONS = (
     "gens",
     "genus",
     "get",
-    "getc",
     "getChangeMatrix",
-    "getenv",
     "getGlobalSymbol",
+    "getIOThreadMode",
     "getNetFile",
     "getNonUnit",
     "getPrimeWithRootOfUnity",
     "getSymbol",
     "getWWW",
-    "GF",
+    "getc",
+    "getenv",
     "globalAssign",
     "globalAssignFunction",
     "globalAssignment",
@@ -541,11 +564,11 @@ M2FUNCTIONS = (
     "gramm",
     "graphIdeal",
     "graphRing",
-    "Grassmannian",
     "groebnerBasis",
     "groupID",
     "hash",
     "hashTable",
+    "headlines",
     "heft",
     "height",
     "hermite",
@@ -553,7 +576,6 @@ M2FUNCTIONS = (
     "hilbertPolynomial",
     "hilbertSeries",
     "hold",
-    "Hom",
     "homogenize",
     "homology",
     "homomorphism",
@@ -581,11 +603,11 @@ M2FUNCTIONS = (
     "input",
     "insert",
     "installAssignmentMethod",
-    "installedPackages",
     "installHilbertFunction",
     "installMethod",
     "installMinprimes",
     "installPackage",
+    "installedPackages",
     "instance",
     "instances",
     "integralClosure",
@@ -602,15 +624,14 @@ M2FUNCTIONS = (
     "inverseSystem",
     "irreducibleCharacteristicSeries",
     "irreducibleDecomposition",
-    "isAffineRing",
     "isANumber",
+    "isAffineRing",
     "isBorel",
-    "isc",
     "isCanceled",
     "isCommutative",
     "isConstant",
-    "isDirectory",
     "isDirectSum",
+    "isDirectory",
     "isEmpty",
     "isField",
     "isFinite",
@@ -624,9 +645,10 @@ M2FUNCTIONS = (
     "isInputFile",
     "isIsomorphic",
     "isIsomorphism",
+    "isLLL",
+    "isLiftable",
     "isLinearType",
     "isListener",
-    "isLLL",
     "isMember",
     "isModule",
     "isMonomialIdeal",
@@ -638,6 +660,7 @@ M2FUNCTIONS = (
     "isPrimary",
     "isPrime",
     "isPrimitive",
+    "isProjective",
     "isPseudoprime",
     "isQuotientModule",
     "isQuotientOf",
@@ -648,6 +671,7 @@ M2FUNCTIONS = (
     "isRegularFile",
     "isRing",
     "isSkewCommutative",
+    "isSmooth",
     "isSorted",
     "isSquareFree",
     "isStandardGradedPolynomialRing",
@@ -658,8 +682,10 @@ M2FUNCTIONS = (
     "isSurjective",
     "isTable",
     "isUnit",
+    "isVeryAmple",
     "isWellDefined",
     "isWeylAlgebra",
+    "isc",
     "iterator",
     "jacobian",
     "jacobianDual",
@@ -688,7 +714,6 @@ M2FUNCTIONS = (
     "linkFile",
     "listForm",
     "listSymbols",
-    "LLL",
     "lngamma",
     "load",
     "loadPackage",
@@ -699,8 +724,6 @@ M2FUNCTIONS = (
     "log1p",
     "lookup",
     "lookupCount",
-    "LUdecomposition",
-    "M2CODE",
     "makeDirectory",
     "makeDocumentTag",
     "makePackageIndex",
@@ -723,6 +746,8 @@ M2FUNCTIONS = (
     "methods",
     "midpoint",
     "min",
+    "minPosition",
+    "minPres",
     "mingens",
     "mingle",
     "minimalBetti",
@@ -732,8 +757,6 @@ M2FUNCTIONS = (
     "minimize",
     "minimizeFilename",
     "minors",
-    "minPosition",
-    "minPres",
     "minprimes",
     "minus",
     "mkdir",
@@ -743,8 +766,8 @@ M2FUNCTIONS = (
     "monoid",
     "monomialCurveIdeal",
     "monomialIdeal",
-    "monomials",
     "monomialSubideal",
+    "monomials",
     "moveFile",
     "multidegree",
     "multidoc",
@@ -764,24 +787,23 @@ M2FUNCTIONS = (
     "newPackage",
     "newRing",
     "next",
-    "nextkey",
     "nextPrime",
-    "NNParser",
+    "nextkey",
     "nonspaceAnalyzer",
     "norm",
     "normalCone",
     "notImplemented",
-    "nullhomotopy",
     "nullParser",
     "nullSpace",
+    "nullhomotopy",
+    "numColumns",
+    "numRows",
     "number",
     "numcols",
-    "numColumns",
     "numerator",
     "numeric",
     "numericInterval",
     "numgens",
-    "numRows",
     "numrows",
     "odd",
     "oeis",
@@ -795,9 +817,9 @@ M2FUNCTIONS = (
     "openListener",
     "openOut",
     "openOutAppend",
+    "optP",
     "optionalSignParser",
     "options",
-    "optP",
     "orP",
     "override",
     "pack",
@@ -806,6 +828,7 @@ M2FUNCTIONS = (
     "pad",
     "pager",
     "pairs",
+    "parallelApply",
     "parent",
     "part",
     "partition",
@@ -834,21 +857,20 @@ M2FUNCTIONS = (
     "primaryComponent",
     "primaryDecomposition",
     "print",
-    "printerr",
     "printString",
+    "printerr",
     "processID",
     "product",
     "profile",
-    "Proj",
     "projectiveHilbertPolynomial",
     "promote",
     "protect",
     "prune",
-    "pseudocode",
     "pseudoRemainder",
+    "pseudocode",
+    "pullback",
     "pushForward",
-    "QQParser",
-    "QRDecomposition",
+    "pushout",
     "quotient",
     "quotientRemainder",
     "radical",
@@ -857,23 +879,24 @@ M2FUNCTIONS = (
     "randomKRationalPoint",
     "randomMutableMatrix",
     "rank",
+    "rays",
     "read",
     "readDirectory",
-    "readlink",
     "readPackage",
+    "readlink",
     "realPart",
     "realpath",
     "recursionDepth",
-    "reducedRowEchelonForm",
     "reduceHilbert",
+    "reducedRowEchelonForm",
     "reductionNumber",
     "reesAlgebra",
     "reesAlgebraIdeal",
     "reesIdeal",
+    "regSeqInIdeal",
     "regex",
     "regexQuote",
     "registerFinalizer",
-    "regSeqInIdeal",
     "regularity",
     "regularizedBeta",
     "regularizedGamma",
@@ -916,13 +939,15 @@ M2FUNCTIONS = (
     "scanValues",
     "schedule",
     "schreyerOrder",
-    "Schubert",
     "searchPath",
     "sec",
     "sech",
     "seeParsing",
     "select",
     "selectInSubring",
+    "selectKeys",
+    "selectPairs",
+    "selectValues",
     "selectVariables",
     "separate",
     "separateRegexp",
@@ -937,8 +962,11 @@ M2FUNCTIONS = (
     "setRandomSeed",
     "setup",
     "setupEmacs",
+    "setupLift",
+    "setupPromote",
     "sheaf",
     "sheafHom",
+    "sheafMap",
     "show",
     "showHtml",
     "showTex",
@@ -956,7 +984,6 @@ M2FUNCTIONS = (
     "sortColumns",
     "source",
     "span",
-    "Spec",
     "specialFiber",
     "specialFiberIdeal",
     "splice",
@@ -968,6 +995,7 @@ M2FUNCTIONS = (
     "standardPairs",
     "stashValue",
     "status",
+    "store",
     "style",
     "sub",
     "sublists",
@@ -981,7 +1009,6 @@ M2FUNCTIONS = (
     "sum",
     "super",
     "support",
-    "SVD",
     "switch",
     "sylvesterMatrix",
     "symbolBody",
@@ -992,7 +1019,6 @@ M2FUNCTIONS = (
     "symmetricKernel",
     "symmetricPower",
     "synonym",
-    "SYNOPSIS",
     "syz",
     "syzygyScheme",
     "table",
@@ -1009,7 +1035,6 @@ M2FUNCTIONS = (
     "tensorAssociativity",
     "terminalParser",
     "terms",
-    "TEST",
     "testHunekeQuestion",
     "tests",
     "tex",
@@ -1023,14 +1048,14 @@ M2FUNCTIONS = (
     "toField",
     "toList",
     "toLower",
-    "top",
-    "topCoefficients",
-    "topComponents",
     "toRR",
     "toRRi",
     "toSequence",
     "toString",
     "toUpper",
+    "top",
+    "topCoefficients",
+    "topComponents",
     "trace",
     "transpose",
     "trim",
@@ -1044,6 +1069,7 @@ M2FUNCTIONS = (
     "uniform",
     "uninstallAllPackages",
     "uninstallPackage",
+    "union",
     "unique",
     "uniquePermutations",
     "unsequence",
@@ -1070,15 +1096,17 @@ M2FUNCTIONS = (
     "wrap",
     "youngest",
     "zero",
-    "zeta",
-    "ZZParser"
+    "zeta"
     )
 
 M2CONSTANTS = (
+    "A1BrouwerDegrees",
+    "AbstractSimplicialComplexes",
     "AbstractToricVarieties",
     "Acknowledgement",
     "AdditionalPaths",
     "AdjointIdeal",
+    "AdjunctionForSurfaces",
     "AfterEval",
     "AfterNoPrint",
     "AfterPrint",
@@ -1097,6 +1125,7 @@ M2CONSTANTS = (
     "AuxiliaryFiles",
     "backtrace",
     "Bareiss",
+    "Base",
     "BaseFunction",
     "baseRings",
     "BaseRow",
@@ -1138,6 +1167,7 @@ M2CONSTANTS = (
     "CharacteristicClasses",
     "CheckDocumentation",
     "Chordal",
+    "cite",
     "Classic",
     "clearAll",
     "clearOutput",
@@ -1279,6 +1309,7 @@ M2CONSTANTS = (
     "globalAssignmentHooks",
     "GlobalHookStore",
     "GlobalReleaseHook",
+    "GlobalSectionLimit",
     "Gorenstein",
     "GradedLieAlgebras",
     "GraphicalModels",
@@ -1381,6 +1412,7 @@ M2CONSTANTS = (
     "LongPolynomial",
     "M0nbar",
     "Macaulay2Doc",
+    "Maintainer",
     "MakeDocumentation",
     "MakeHTML",
     "MakeInfo",
@@ -1389,6 +1421,7 @@ M2CONSTANTS = (
     "MapleInterface",
     "Markov",
     "MatchingFields",
+    "MatrixSchubert",
     "Matroids",
     "maxAllowableThreads",
     "maxExponent",
@@ -1415,6 +1448,9 @@ M2CONSTANTS = (
     "MonomialOrder",
     "Monomials",
     "MonomialSize",
+    "Msolve",
+    "MultigradedBGG",
+    "MultigradedImplicitization",
     "MultiGradedRationalMap",
     "MultiplicitySequence",
     "MultiplierIdeals",
@@ -1448,7 +1484,10 @@ M2CONSTANTS = (
     "NumericalImplicitization",
     "NumericalLinearAlgebra",
     "NumericalSchubertCalculus",
+    "NumericalSemigroups",
     "NumericSolutions",
+    "numTBBThreads",
+    "OIGroebnerBases",
     "OldPolyhedra",
     "OldToricVectorBundles",
     "OnlineLookup",
@@ -1471,15 +1510,19 @@ M2CONSTANTS = (
     "PackageTemplate",
     "PairLimit",
     "PairsRemaining",
+    "ParallelF4",
+    "ParallelizeByDegree",
     "Parametrization",
     "Parsing",
     "path",
     "PencilsOfQuadrics",
     "Permanents",
+    "Permutations",
     "PHCpack",
     "PhylogeneticTrees",
     "pi",
     "PieriMaps",
+    "PlaneCurveLinearSeries",
     "PlaneCurveSingularities",
     "Points",
     "Polyhedra",
@@ -1515,9 +1558,12 @@ M2CONSTANTS = (
     "pruningMap",
     "PseudomonomialPrimaryDecomposition",
     "Pullback",
+    "pullbackMaps",
     "PushForward",
+    "pushoutMaps",
     "Python",
     "QthPower",
+    "QuadraticIdealExamplesByRoos",
     "Quasidegrees",
     "QuaternaryQuartics",
     "QuillenSuslin",
@@ -1568,6 +1614,7 @@ M2CONSTANTS = (
     "Reverse",
     "RevLex",
     "Right",
+    "RInterface",
     "rootPath",
     "rootURI",
     "RunDirectory",
@@ -1575,10 +1622,13 @@ M2CONSTANTS = (
     "RunExternalM2",
     "SagbiGbDetection",
     "Saturation",
+    "SaturationMap",
     "Schubert2",
     "SchurComplexes",
     "SchurFunctors",
     "SchurRings",
+    "SchurVeronese",
+    "SCMAlgebras",
     "scriptCommandLine",
     "SCSCP",
     "SectionRing",
@@ -1647,6 +1697,7 @@ M2CONSTANTS = (
     "TangentCone",
     "TateOnProducts",
     "TensorComplexes",
+    "TerraciniLoci",
     "Test",
     "testExample",
     "TestIdeals",
@@ -1654,6 +1705,7 @@ M2CONSTANTS = (
     "Text",
     "ThinSincereQuivers",
     "ThreadedGB",
+    "Threads",
     "Threshold",
     "Topcom",
     "topLevelMode",
@@ -1664,6 +1716,7 @@ M2CONSTANTS = (
     "ToricTopology",
     "ToricVectorBundles",
     "Torsion",
+    "TorsionFree",
     "TotalPairs",
     "Tree",
     "TriangularSets",
@@ -1672,6 +1725,7 @@ M2CONSTANTS = (
     "Trim",
     "Triplets",
     "Tropical",
+    "TropicalToric",
     "true",
     "Truncate",
     "Truncations",
@@ -1690,9 +1744,11 @@ M2CONSTANTS = (
     "UseHilbertFunction",
     "UserMode",
     "UseSyzygies",
+    "Valuations",
     "Variable",
     "VariableBaseName",
     "Variables",
+    "Varieties",
     "Vasconcelos",
     "VectorFields",
     "VectorGraphics",
@@ -1706,9 +1762,11 @@ M2CONSTANTS = (
     "viewHelp",
     "VirtualResolutions",
     "Visualize",
+    "VNumber",
     "WebApp",
     "Weights",
     "WeylAlgebra",
+    "WeylAlgebras",
     "WeylGroups",
     "WhitneyStratifications",
     "Wrap",
@@ -1722,6 +1780,7 @@ class Macaulay2Lexer(RegexLexer):
     url = 'https://macaulay2.com/'
     aliases = ['macaulay2']
     filenames = ['*.m2']
+    version_added = '2.12'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/make.py b/libs/pygments/lexers/make.py
index 0f54ab693..3940a0090 100644
--- a/libs/pygments/lexers/make.py
+++ b/libs/pygments/lexers/make.py
@@ -4,7 +4,7 @@
 
     Lexers for Makefiles and similar.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,6 +31,8 @@ class MakefileLexer(Lexer):
     aliases = ['make', 'makefile', 'mf', 'bsdmake']
     filenames = ['*.mak', '*.mk', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile']
     mimetypes = ['text/x-makefile']
+    url = 'https://en.wikipedia.org/wiki/Make_(software)'
+    version_added = ''
 
     r_special = re.compile(
         r'^(?:'
@@ -67,14 +69,14 @@ class MakefileLexer(Lexer):
 class BaseMakefileLexer(RegexLexer):
     """
     Lexer for simple Makefiles (no preprocessing).
-
-    .. versionadded:: 0.10
     """
 
     name = 'Base Makefile'
     aliases = ['basemake']
     filenames = []
     mimetypes = []
+    url = 'https://en.wikipedia.org/wiki/Make_(software)'
+    version_added = '0.10'
 
     tokens = {
         'root': [
@@ -129,14 +131,13 @@ class BaseMakefileLexer(RegexLexer):
 class CMakeLexer(RegexLexer):
     """
     Lexer for CMake files.
-
-    .. versionadded:: 1.2
     """
     name = 'CMake'
     url = 'https://cmake.org/documentation/'
     aliases = ['cmake']
     filenames = ['*.cmake', 'CMakeLists.txt']
     mimetypes = ['text/x-cmake']
+    version_added = '1.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/maple.py b/libs/pygments/lexers/maple.py
new file mode 100644
index 000000000..c744e7e1a
--- /dev/null
+++ b/libs/pygments/lexers/maple.py
@@ -0,0 +1,291 @@
+"""
+    pygments.lexers.maple
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Maple.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import words, bygroups, ExtendedRegexLexer
+from pygments.token import Comment, Name, String, Whitespace, Operator, Punctuation, Number, Keyword
+
+__all__ = ['MapleLexer']
+
+
+class MapleLexer(ExtendedRegexLexer):
+    """
+    Lexer for Maple.
+    """
+
+    name = 'Maple'
+    aliases = ['maple']
+    filenames = ['*.mpl', '*.mi', '*.mm']
+    mimetypes = ['text/x-maple']
+    url = 'https://www.maplesoft.com/products/Maple/'
+    version_added = '2.19'
+
+    keywords = ('and',
+                'assuming',
+                'break',
+                'by',
+                'catch',
+                'description',
+                'do',
+                'done',
+                'elif',
+                'else',
+                'end',
+                'error',
+                'export',
+                'fi',
+                'finally',
+                'for',
+                'from',
+                'global',
+                'if',
+                'implies',
+                'in',
+                'intersect',
+                'local',
+                'minus',
+                'mod',
+                'module',
+                'next',
+                'not',
+                'od',
+                'option',
+                'options',
+                'or',
+                'proc',
+                'quit',
+                'read',
+                'return',
+                'save',
+                'stop',
+                'subset',
+                'then',
+                'to',
+                'try',
+                'union',
+                'use',
+                'uses',
+                'while',
+                'xor')
+
+    builtins = ('abs',
+                'add',
+                'addressof',
+                'anames',
+                'and',
+                'andmap',
+                'andseq',
+                'appendto',
+                'Array',
+                'array',
+                'ArrayOptions',
+                'assemble',
+                'ASSERT',
+                'assign',
+                'assigned',
+                'attributes',
+                'cat',
+                'ceil',
+                'coeff',
+                'coeffs',
+                'conjugate',
+                'convert',
+                'CopySign',
+                'DEBUG',
+                'debugopts',
+                'Default0',
+                'DefaultOverflow',
+                'DefaultUnderflow',
+                'degree',
+                'denom',
+                'diff',
+                'disassemble',
+                'divide',
+                'done',
+                'entries',
+                'EqualEntries',
+                'eval',
+                'evalb',
+                'evalf',
+                'evalhf',
+                'evalindets',
+                'evaln',
+                'expand',
+                'exports',
+                'factorial',
+                'floor',
+                'frac',
+                'frem',
+                'FromInert',
+                'frontend',
+                'gc',
+                'genpoly',
+                'has',
+                'hastype',
+                'hfarray',
+                'icontent',
+                'igcd',
+                'ilcm',
+                'ilog10',
+                'Im',
+                'implies',
+                'indets',
+                'indices',
+                'intersect',
+                'iolib',
+                'iquo',
+                'irem',
+                'iroot',
+                'iroot',
+                'isqrt',
+                'kernelopts',
+                'lcoeff',
+                'ldegree',
+                'length',
+                'lexorder',
+                'lhs',
+                'lowerbound',
+                'lprint',
+                'macro',
+                'map',
+                'max',
+                'maxnorm',
+                'member',
+                'membertype',
+                'min',
+                'minus',
+                'mod',
+                'modp',
+                'modp1',
+                'modp2',
+                'mods',
+                'mul',
+                'NextAfter',
+                'nops',
+                'normal',
+                'not',
+                'numboccur',
+                'numelems',
+                'numer',
+                'NumericClass',
+                'NumericEvent',
+                'NumericEventHandler',
+                'NumericStatus',
+                'op',
+                'or',
+                'order',
+                'OrderedNE',
+                'ormap',
+                'orseq',
+                'parse',
+                'piecewise',
+                'pointto',
+                'print',
+                'quit',
+                'Re',
+                'readlib',
+                'Record',
+                'remove',
+                'rhs',
+                'round',
+                'rtable',
+                'rtable_elems',
+                'rtable_eval',
+                'rtable_indfns',
+                'rtable_num_elems',
+                'rtable_options',
+                'rtable_redim',
+                'rtable_scanblock',
+                'rtable_set_indfn',
+                'rtable_split_unit',
+                'savelib',
+                'Scale10',
+                'Scale2',
+                'SDMPolynom',
+                'searchtext',
+                'SearchText',
+                'select',
+                'selectremove',
+                'seq',
+                'series',
+                'setattribute',
+                'SFloatExponent',
+                'SFloatMantissa',
+                'sign',
+                'sort',
+                'ssystem',
+                'stop',
+                'String',
+                'subs',
+                'subset',
+                'subsindets',
+                'subsop',
+                'substring',
+                'system',
+                'table',
+                'taylor',
+                'tcoeff',
+                'time',
+                'timelimit',
+                'ToInert',
+                'traperror',
+                'trunc',
+                'type',
+                'typematch',
+                'unames',
+                'unassign',
+                'union',
+                'Unordered',
+                'upperbound',
+                'userinfo',
+                'writeto',
+                'xor',
+                'xormap',
+                'xorseq')
+
+    def delayed_callback(self, match, ctx):
+        yield match.start(1), Punctuation, match.group(1)  # quote
+
+        ctx.pos = match.start(2)
+        orig_end = ctx.end
+        ctx.end = match.end(2)
+
+        yield from self.get_tokens_unprocessed(context=ctx)
+        yield match.end(2), Punctuation, match.group(1)  # quote
+
+        ctx.pos = match.end()
+        ctx.end = orig_end
+
+    tokens = {
+        'root': [
+            (r'#.*\n', Comment.Single),
+            (r'\(\*', Comment.Multiline, 'comment'),
+            (r'"(\\.|.|\s)*?"', String),
+            (r"('+)((.|\n)*?)\1", delayed_callback),
+            (r'`(\\`|.)*?`', Name),
+            (words(keywords, prefix=r'\b', suffix=r'\b'), Keyword),
+            (words(builtins, prefix=r'\b', suffix=r'\b'), Name.Builtin),
+            (r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            (r'(:=|\*\*|@@|<=|>=|<>|->|::|\.\.|&\+|[\+\-\*\.\^\$/@&,:=<>%~])', Operator),
+            (r'[;^!@$\(\)\[\]{}|_\\#?]+', Punctuation),
+            (r'(\d+)(\.\.)', bygroups(Number.Integer, Punctuation)),
+            (r'(\d*\.\d+|\d+\.\d*)([eE][+-]?\d+)?', Number.Float),
+            (r'\d+', Number.Integer),
+            (r'\s+', Whitespace),
+        ],
+        'comment': [
+            (r'.*\(\*', Comment.Multiline, '#push'),
+            (r'.*\*\)', Comment.Multiline, '#pop'),
+            (r'.*\n', Comment.Multiline),
+        ]
+    }
+
+    def analyse_text(text):
+        if ':=' in text:
+            return 0.1
\ No newline at end of file
diff --git a/libs/pygments/lexers/markup.py b/libs/pygments/lexers/markup.py
index bb4c7cecf..acc270b15 100644
--- a/libs/pygments/lexers/markup.py
+++ b/libs/pygments/lexers/markup.py
@@ -4,7 +4,7 @@
 
     Lexers for non-HTML markup languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,25 +19,26 @@ from pygments.lexers.data import JsonLexer
 from pygments.lexer import RegexLexer, DelegatingLexer, include, bygroups, \
     using, this, do_insertions, default, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
-    Number, Punctuation, Generic, Other, Whitespace
+    Number, Punctuation, Generic, Other, Whitespace, Literal
 from pygments.util import get_bool_opt, ClassNotFound
 
 __all__ = ['BBCodeLexer', 'MoinWikiLexer', 'RstLexer', 'TexLexer', 'GroffLexer',
            'MozPreprocHashLexer', 'MozPreprocPercentLexer',
            'MozPreprocXulLexer', 'MozPreprocJavascriptLexer',
-           'MozPreprocCssLexer', 'MarkdownLexer', 'TiddlyWiki5Lexer', 'WikitextLexer']
+           'MozPreprocCssLexer', 'MarkdownLexer', 'OrgLexer', 'TiddlyWiki5Lexer',
+           'WikitextLexer']
 
 
 class BBCodeLexer(RegexLexer):
     """
     A lexer that highlights BBCode(-like) syntax.
-
-    .. versionadded:: 0.6
     """
 
     name = 'BBCode'
     aliases = ['bbcode']
     mimetypes = ['text/x-bbcode']
+    url = 'https://www.bbcode.org/'
+    version_added = '0.6'
 
     tokens = {
         'root': [
@@ -64,14 +65,15 @@ class BBCodeLexer(RegexLexer):
 class MoinWikiLexer(RegexLexer):
     """
     For MoinMoin (and Trac) Wiki markup.
-
-    .. versionadded:: 0.7
     """
 
     name = 'MoinMoin/Trac Wiki markup'
     aliases = ['trac-wiki', 'moin']
     filenames = []
     mimetypes = ['text/x-trac-wiki']
+    url = 'https://moinmo.in'
+    version_added = '0.7'
+
     flags = re.MULTILINE | re.IGNORECASE
 
     tokens = {
@@ -110,8 +112,6 @@ class RstLexer(RegexLexer):
     """
     For reStructuredText markup.
 
-    .. versionadded:: 0.7
-
     Additional options accepted:
 
     `handlecodeblocks`
@@ -127,6 +127,7 @@ class RstLexer(RegexLexer):
     aliases = ['restructuredtext', 'rst', 'rest']
     filenames = ['*.rst', '*.rest']
     mimetypes = ["text/x-rst", "text/prs.fallenstein.rst"]
+    version_added = '0.7'
     flags = re.MULTILINE
 
     def _handle_sourcecode(self, match):
@@ -172,9 +173,7 @@ class RstLexer(RegexLexer):
     # from docutils.parsers.rst.states
     closers = '\'")]}>\u2019\u201d\xbb!?'
     unicode_delimiters = '\u2010\u2011\u2012\u2013\u2014\u00a0'
-    end_string_suffix = (r'((?=$)|(?=[-/:.,; \n\x00%s%s]))'
-                         % (re.escape(unicode_delimiters),
-                            re.escape(closers)))
+    end_string_suffix = (rf'((?=$)|(?=[-/:.,; \n\x00{re.escape(unicode_delimiters)}{re.escape(closers)}]))')
 
     tokens = {
         'root': [
@@ -222,7 +221,7 @@ class RstLexer(RegexLexer):
              bygroups(Punctuation, Text, Name.Tag, Text, Operator.Word,
                       Punctuation, Text, using(this, state='inline'))),
             # Comments
-            (r'^ *\.\..*(\n( +.*\n|\n)+)?', Comment.Preproc),
+            (r'^ *\.\..*(\n( +.*\n|\n)+)?', Comment),
             # Field list marker
             (r'^( *)(:(?:\\\\|\\:|[^:\n])+:(?=\s))([ \t]*)',
              bygroups(Text, Name.Class, Text)),
@@ -283,6 +282,8 @@ class TexLexer(RegexLexer):
     aliases = ['tex', 'latex']
     filenames = ['*.tex', '*.aux', '*.toc']
     mimetypes = ['text/x-tex', 'text/x-latex']
+    url = 'https://tug.org'
+    version_added = ''
 
     tokens = {
         'general': [
@@ -295,13 +296,13 @@ class TexLexer(RegexLexer):
             (r'\\\(', String, 'inlinemath'),
             (r'\$\$', String.Backtick, 'displaymath'),
             (r'\$', String, 'inlinemath'),
-            (r'\\([a-zA-Z]+|.)', Keyword, 'command'),
+            (r'\\([a-zA-Z@_:]+|\S?)', Keyword, 'command'),
             (r'\\$', Keyword),
             include('general'),
             (r'[^\\$%&_^{}]+', Text),
         ],
         'math': [
-            (r'\\([a-zA-Z]+|.)', Name.Variable),
+            (r'\\([a-zA-Z]+|\S?)', Name.Variable),
             include('general'),
             (r'[0-9]+', Number),
             (r'[-=!+*/()\[\]]', Operator),
@@ -336,14 +337,14 @@ class GroffLexer(RegexLexer):
     """
     Lexer for the (g)roff typesetting language, supporting groff
     extensions. Mainly useful for highlighting manpage sources.
-
-    .. versionadded:: 0.6
     """
 
     name = 'Groff'
     aliases = ['groff', 'nroff', 'man']
     filenames = ['*.[1-9]', '*.man', '*.1p', '*.3pm']
     mimetypes = ['application/x-troff', 'text/troff']
+    url = 'https://www.gnu.org/software/groff'
+    version_added = '0.6'
 
     tokens = {
         'root': [
@@ -393,13 +394,13 @@ class MozPreprocHashLexer(RegexLexer):
     Lexer for Mozilla Preprocessor files (with '#' as the marker).
 
     Other data is left untouched.
-
-    .. versionadded:: 2.0
     """
     name = 'mozhashpreproc'
     aliases = [name]
     filenames = []
     mimetypes = []
+    url = 'https://firefox-source-docs.mozilla.org/build/buildsystem/preprocessor.html'
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -434,13 +435,13 @@ class MozPreprocPercentLexer(MozPreprocHashLexer):
     Lexer for Mozilla Preprocessor files (with '%' as the marker).
 
     Other data is left untouched.
-
-    .. versionadded:: 2.0
     """
     name = 'mozpercentpreproc'
     aliases = [name]
     filenames = []
     mimetypes = []
+    url = 'https://firefox-source-docs.mozilla.org/build/buildsystem/preprocessor.html'
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -454,13 +455,13 @@ class MozPreprocXulLexer(DelegatingLexer):
     """
     Subclass of the `MozPreprocHashLexer` that highlights unlexed data with the
     `XmlLexer`.
-
-    .. versionadded:: 2.0
     """
     name = "XUL+mozpreproc"
     aliases = ['xul+mozpreproc']
     filenames = ['*.xul.in']
     mimetypes = []
+    url = 'https://firefox-source-docs.mozilla.org/build/buildsystem/preprocessor.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, MozPreprocHashLexer, **options)
@@ -470,13 +471,13 @@ class MozPreprocJavascriptLexer(DelegatingLexer):
     """
     Subclass of the `MozPreprocHashLexer` that highlights unlexed data with the
     `JavascriptLexer`.
-
-    .. versionadded:: 2.0
     """
     name = "Javascript+mozpreproc"
     aliases = ['javascript+mozpreproc']
     filenames = ['*.js.in']
     mimetypes = []
+    url = 'https://firefox-source-docs.mozilla.org/build/buildsystem/preprocessor.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, MozPreprocHashLexer, **options)
@@ -486,13 +487,13 @@ class MozPreprocCssLexer(DelegatingLexer):
     """
     Subclass of the `MozPreprocHashLexer` that highlights unlexed data with the
     `CssLexer`.
-
-    .. versionadded:: 2.0
     """
     name = "CSS+mozpreproc"
     aliases = ['css+mozpreproc']
     filenames = ['*.css.in']
     mimetypes = []
+    url = 'https://firefox-source-docs.mozilla.org/build/buildsystem/preprocessor.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(CssLexer, MozPreprocPercentLexer, **options)
@@ -501,14 +502,13 @@ class MozPreprocCssLexer(DelegatingLexer):
 class MarkdownLexer(RegexLexer):
     """
     For Markdown markup.
-
-    .. versionadded:: 2.2
     """
     name = 'Markdown'
     url = 'https://daringfireball.net/projects/markdown/'
     aliases = ['markdown', 'md']
     filenames = ['*.md', '*.markdown']
     mimetypes = ["text/x-markdown"]
+    version_added = '2.2'
     flags = re.MULTILINE
 
     def _handle_codeblock(self, match):
@@ -618,18 +618,125 @@ class MarkdownLexer(RegexLexer):
         self.handlecodeblocks = get_bool_opt(options, 'handlecodeblocks', True)
         RegexLexer.__init__(self, **options)
 
+class OrgLexer(RegexLexer):
+    """
+    For Org Mode markup.
+    """
+    name = 'Org Mode'
+    url = 'https://orgmode.org'
+    aliases = ['org', 'orgmode', 'org-mode']
+    filenames = ['*.org']
+    mimetypes = ["text/org"]
+    version_added = '2.18'
+
+    def _inline(start, end):
+        return rf'(?<!\w){start}(.|\n(?!\n))+?{end}(?!\w)'
+
+    tokens = {
+        'root': [
+            (r'^# .*', Comment.Single),
+
+            # Headings
+            (r'^(\* )(COMMENT)( .*)',
+             bygroups(Generic.Heading, Comment.Preproc, Generic.Heading)),
+            (r'^(\*\*+ )(COMMENT)( .*)',
+             bygroups(Generic.Subheading, Comment.Preproc, Generic.Subheading)),
+            (r'^(\* )(DONE)( .*)',
+             bygroups(Generic.Heading, Generic.Deleted, Generic.Heading)),
+            (r'^(\*\*+ )(DONE)( .*)',
+             bygroups(Generic.Subheading, Generic.Deleted, Generic.Subheading)),
+            (r'^(\* )(TODO)( .*)',
+             bygroups(Generic.Heading, Generic.Error, Generic.Heading)),
+            (r'^(\*\*+ )(TODO)( .*)',
+             bygroups(Generic.Subheading, Generic.Error, Generic.Subheading)),
+
+            (r'^(\* .+?)( :[a-zA-Z0-9_@:]+:)?$', bygroups(Generic.Heading, Generic.Emph)),
+            (r'^(\*\*+ .+?)( :[a-zA-Z0-9_@:]+:)?$', bygroups(Generic.Subheading, Generic.Emph)),
+
+            # Unordered lists items, including TODO items and description items
+            (r'^(?:( *)([+-] )|( +)(\* ))(\[[ X-]\])?(.+ ::)?',
+             bygroups(Whitespace, Keyword, Whitespace, Keyword, Generic.Prompt, Name.Label)),
+
+            # Ordered list items
+            (r'^( *)([0-9]+[.)])( \[@[0-9]+\])?', bygroups(Whitespace, Keyword, Generic.Emph)),
+
+            # Dynamic blocks
+            (r'(?i)^( *#\+begin: *)((?:.|\n)*?)(^ *#\+end: *$)',
+             bygroups(Operator.Word, using(this), Operator.Word)),
+
+            # Comment blocks
+            (r'(?i)^( *#\+begin_comment *\n)((?:.|\n)*?)(^ *#\+end_comment *$)',
+             bygroups(Operator.Word, Comment.Multiline, Operator.Word)),
+
+            # Source code blocks
+            # TODO: language-dependent syntax highlighting (see Markdown lexer)
+            (r'(?i)^( *#\+begin_src .*)((?:.|\n)*?)(^ *#\+end_src *$)',
+             bygroups(Operator.Word, Text, Operator.Word)),
+
+            # Other blocks
+            (r'(?i)^( *#\+begin_\w+)( *\n)((?:.|\n)*?)(^ *#\+end_\w+)( *$)',
+             bygroups(Operator.Word, Whitespace, Text, Operator.Word, Whitespace)),
+
+            # Keywords
+            (r'^(#\+\w+:)(.*)$', bygroups(Name.Namespace, Text)),
+
+            # Properties and drawers
+            (r'(?i)^( *:\w+: *\n)((?:.|\n)*?)(^ *:end: *$)',
+             bygroups(Name.Decorator, Comment.Special, Name.Decorator)),
+
+            # Line break operator
+            (r'\\\\$', Operator),
+
+            # Deadline, Scheduled, CLOSED
+            (r'(?i)^( *(?:DEADLINE|SCHEDULED): )(<.+?> *)$',
+             bygroups(Generic.Error, Literal.Date)),
+            (r'(?i)^( *CLOSED: )(\[.+?\] *)$',
+             bygroups(Generic.Deleted, Literal.Date)),
+
+            # Bold
+            (_inline(r'\*', r'\*+'), Generic.Strong),
+            # Italic
+            (_inline(r'/', r'/'), Generic.Emph),
+            # Verbatim
+            (_inline(r'=', r'='), String), # TODO token
+            # Code
+            (_inline(r'~', r'~'), String),
+            # Strikethrough
+            (_inline(r'\+', r'\+'), Generic.Deleted),
+            # Underline
+            (_inline(r'_', r'_+'), Generic.EmphStrong),
+
+            # Dates
+            (r'<.+?>', Literal.Date),
+            # Macros
+            (r'\{\{\{.+?\}\}\}', Comment.Preproc),
+            # Footnotes
+            (r'(?<!\[)\[fn:.+?\]', Name.Tag),
+            # Links
+            (r'(?s)(\[\[)(.*?)(\]\[)(.*?)(\]\])',
+             bygroups(Punctuation, Name.Attribute, Punctuation, Name.Tag, Punctuation)),
+            (r'(?s)(\[\[)(.+?)(\]\])', bygroups(Punctuation, Name.Attribute, Punctuation)),
+            (r'(<<)(.+?)(>>)', bygroups(Punctuation, Name.Attribute, Punctuation)),
+
+            # Tables
+            (r'^( *)(\|[ -].*?[ -]\|)$', bygroups(Whitespace, String)),
+
+            # Any other text
+            (r'[^#*+\-0-9:\\/=~_<{\[|\n]+', Text),
+            (r'[#*+\-0-9:\\/=~_<{\[|\n]', Text),
+        ],
+    }
 
 class TiddlyWiki5Lexer(RegexLexer):
     """
     For TiddlyWiki5 markup.
-
-    .. versionadded:: 2.7
     """
     name = 'tiddler'
     url = 'https://tiddlywiki.com/#TiddlerFiles'
     aliases = ['tid']
     filenames = ['*.tid']
     mimetypes = ["text/vnd.tiddlywiki"]
+    version_added = '2.7'
     flags = re.MULTILINE
 
     def _handle_codeblock(self, match):
@@ -786,19 +893,18 @@ class WikitextLexer(RegexLexer):
     installations, so we only highlight common syntaxes (built-in or from
     popular extensions), and also assume templates produce no unbalanced
     syntaxes.
-
-    .. versionadded:: 2.15
     """
     name = 'Wikitext'
     url = 'https://www.mediawiki.org/wiki/Wikitext'
     aliases = ['wikitext', 'mediawiki']
     filenames = []
     mimetypes = ['text/x-wiki']
+    version_added = '2.15'
     flags = re.MULTILINE
 
     def nowiki_tag_rules(tag_name):
         return [
-            (r'(?i)(</)({})(\s*)(>)'.format(tag_name), bygroups(Punctuation,
+            (rf'(?i)(</)({tag_name})(\s*)(>)', bygroups(Punctuation,
              Name.Tag, Whitespace, Punctuation), '#pop'),
             include('entity'),
             include('text'),
@@ -806,15 +912,15 @@ class WikitextLexer(RegexLexer):
 
     def plaintext_tag_rules(tag_name):
         return [
-            (r'(?si)(.*?)(</)({})(\s*)(>)'.format(tag_name), bygroups(Text,
+            (rf'(?si)(.*?)(</)({tag_name})(\s*)(>)', bygroups(Text,
              Punctuation, Name.Tag, Whitespace, Punctuation), '#pop'),
         ]
 
-    def delegate_tag_rules(tag_name, lexer):
+    def delegate_tag_rules(tag_name, lexer, **lexer_kwargs):
         return [
-            (r'(?i)(</)({})(\s*)(>)'.format(tag_name), bygroups(Punctuation,
+            (rf'(?i)(</)({tag_name})(\s*)(>)', bygroups(Punctuation,
              Name.Tag, Whitespace, Punctuation), '#pop'),
-            (r'(?si).+?(?=</{}\s*>)'.format(tag_name), using(lexer)),
+            (rf'(?si).+?(?=</{tag_name}\s*>)', using(lexer, **lexer_kwargs)),
         ]
 
     def text_rules(token):
@@ -946,8 +1052,6 @@ class WikitextLexer(RegexLexer):
         'sh-latn', 'sh-cyrl',
         # KuConverter.php
         'ku', 'ku-arab', 'ku-latn',
-        # KkConverter.php
-        'kk', 'kk-cyrl', 'kk-latn', 'kk-arab', 'kk-kz', 'kk-tr', 'kk-cn',
         # IuConverter.php
         'iu', 'ike-cans', 'ike-latn',
         # GanConverter.php
@@ -1020,7 +1124,7 @@ class WikitextLexer(RegexLexer):
             (r'(?i)\b(?:{}){}{}*'.format('|'.join(protocols),
              link_address, link_char_class), Name.Label),
             # Magic links
-            (r'\b(?:RFC|PMID){}+[0-9]+\b'.format(nbsp_char),
+            (rf'\b(?:RFC|PMID){nbsp_char}+[0-9]+\b',
              Name.Function.Magic),
             (r"""(?x)
                 \bISBN {nbsp_char}
@@ -1035,7 +1139,7 @@ class WikitextLexer(RegexLexer):
         'redirect-inner': [
             (r'(\]\])(\s*?\n)', bygroups(Punctuation, Whitespace), '#pop'),
             (r'(\#)([^#]*?)', bygroups(Punctuation, Name.Label)),
-            (r'(?i)[{}]+'.format(title_char), Name.Tag),
+            (rf'(?i)[{title_char}]+', Name.Tag),
         ],
         'list': [
             # Description lists
@@ -1062,9 +1166,9 @@ class WikitextLexer(RegexLexer):
                 r"""(?xi)
                 (\[\[)
                     (File|Image) (:)
-                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*)
-                    (?: (\#) ([%s]*?) )?
-                """ % (title_char, f'{title_char}#'),
+                    ((?: [{}] | \{{{{2,3}}[^{{}}]*?\}}{{2,3}} | <!--[\s\S]*?--> )*)
+                    (?: (\#) ([{}]*?) )?
+                """.format(title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
                          using(this, state=['wikilink-name']), Punctuation, Name.Label),
                 'medialink-inner'
@@ -1072,24 +1176,24 @@ class WikitextLexer(RegexLexer):
             # Wikilinks
             (
                 r"""(?xi)
-                (\[\[)(?!%s) # Should not contain URLs
-                    (?: ([%s]*) (:))?
-                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*?)
-                    (?: (\#) ([%s]*?) )?
+                (\[\[)(?!{}) # Should not contain URLs
+                    (?: ([{}]*) (:))?
+                    ((?: [{}] | \{{{{2,3}}[^{{}}]*?\}}{{2,3}} | <!--[\s\S]*?--> )*?)
+                    (?: (\#) ([{}]*?) )?
                 (\]\])
-                """ % ('|'.join(protocols), title_char.replace('/', ''),
+                """.format('|'.join(protocols), title_char.replace('/', ''),
                        title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
                          using(this, state=['wikilink-name']), Punctuation, Name.Label, Punctuation)
             ),
             (
                 r"""(?xi)
-                (\[\[)(?!%s)
-                    (?: ([%s]*) (:))?
-                    ((?: [%s] | \{{2,3}[^{}]*?\}{2,3} | <!--[\s\S]*?--> )*?)
-                    (?: (\#) ([%s]*?) )?
+                (\[\[)(?!{})
+                    (?: ([{}]*) (:))?
+                    ((?: [{}] | \{{{{2,3}}[^{{}}]*?\}}{{2,3}} | <!--[\s\S]*?--> )*?)
+                    (?: (\#) ([{}]*?) )?
                     (\|)
-                """ % ('|'.join(protocols), title_char.replace('/', ''),
+                """.format('|'.join(protocols), title_char.replace('/', ''),
                        title_char, f'{title_char}#'),
                 bygroups(Punctuation, Name.Namespace,  Punctuation,
                          using(this, state=['wikilink-name']), Punctuation, Name.Label, Punctuation),
@@ -1192,7 +1296,7 @@ class WikitextLexer(RegexLexer):
                 r"""(?xi)
                 (-\{{) # Use {{ to escape format()
                     ([^|]) (\|)
-                    (?: 
+                    (?:
                         (?: ([^;]*?) (=>))?
                         (\s* (?:{variants}) \s*) (:)
                     )?
@@ -1322,9 +1426,9 @@ class WikitextLexer(RegexLexer):
                 'parameter-inner',
             ),
             # Magic variables
-            (r'(?i)(\{\{)(\s*)(%s)(\s*)(\}\})' % '|'.join(magic_vars_i),
+            (r'(?i)(\{{\{{)(\s*)({})(\s*)(\}}\}})'.format('|'.join(magic_vars_i)),
              bygroups(Punctuation, Whitespace, Name.Function, Whitespace, Punctuation)),
-            (r'(\{\{)(\s*)(%s)(\s*)(\}\})' % '|'.join(magic_vars),
+            (r'(\{{\{{)(\s*)({})(\s*)(\}}\}})'.format('|'.join(magic_vars)),
                 bygroups(Punctuation, Whitespace, Name.Function, Whitespace, Punctuation)),
             # Parser functions & templates
             (r'\{\{', Punctuation, 'template-begin-space'),
@@ -1350,17 +1454,17 @@ class WikitextLexer(RegexLexer):
             (r'\s+', Whitespace),
             # Parser functions
             (
-                r'(?i)(\#[%s]*?|%s)(:)' % (title_char,
+                r'(?i)(\#[{}]*?|{})(:)'.format(title_char,
                                            '|'.join(parser_functions_i)),
                 bygroups(Name.Function, Punctuation), ('#pop', 'template-inner')
             ),
             (
-                r'(%s)(:)' % ('|'.join(parser_functions)),
+                r'({})(:)'.format('|'.join(parser_functions)),
                 bygroups(Name.Function, Punctuation), ('#pop', 'template-inner')
             ),
             # Templates
             (
-                r'(?i)([%s]*?)(:)' % title_char,
+                rf'(?i)([{title_char}]*?)(:)',
                 bygroups(Name.Namespace, Punctuation), ('#pop', 'template-name')
             ),
             default(('#pop', 'template-name'),),
@@ -1539,9 +1643,9 @@ class WikitextLexer(RegexLexer):
         'tag-gallery': plaintext_tag_rules('gallery'),
         'tag-graph': plaintext_tag_rules('graph'),
         'tag-rss': plaintext_tag_rules('rss'),
-        'tag-math': delegate_tag_rules('math', TexLexer),
-        'tag-chem': delegate_tag_rules('chem', TexLexer),
-        'tag-ce': delegate_tag_rules('ce', TexLexer),
+        'tag-math': delegate_tag_rules('math', TexLexer, state='math'),
+        'tag-chem': delegate_tag_rules('chem', TexLexer, state='math'),
+        'tag-ce': delegate_tag_rules('ce', TexLexer, state='math'),
         'tag-templatedata': delegate_tag_rules('templatedata', JsonLexer),
         'text-italic': text_rules(Generic.Emph),
         'text-bold': text_rules(Generic.Strong),
diff --git a/libs/pygments/lexers/math.py b/libs/pygments/lexers/math.py
index 530f8539c..b225ffcf9 100644
--- a/libs/pygments/lexers/math.py
+++ b/libs/pygments/lexers/math.py
@@ -4,10 +4,11 @@
 
     Just export lexers that were contained in this module.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.python import NumPyLexer
 from pygments.lexers.matlab import MatlabLexer, MatlabSessionLexer, \
     OctaveLexer, ScilabLexer
diff --git a/libs/pygments/lexers/matlab.py b/libs/pygments/lexers/matlab.py
index 753a6efcf..8eeffc9d2 100644
--- a/libs/pygments/lexers/matlab.py
+++ b/libs/pygments/lexers/matlab.py
@@ -4,7 +4,7 @@
 
     Lexers for Matlab and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,15 +23,15 @@ __all__ = ['MatlabLexer', 'MatlabSessionLexer', 'OctaveLexer', 'ScilabLexer']
 class MatlabLexer(RegexLexer):
     """
     For Matlab source code.
-
-    .. versionadded:: 0.10
     """
     name = 'Matlab'
     aliases = ['matlab']
     filenames = ['*.m']
     mimetypes = ['text/matlab']
+    url = 'https://www.mathworks.com/products/matlab.html'
+    version_added = '0.10'
 
-    _operators = r'-|==|~=|<=|>=|<|>|&&|&|~|\|\|?|\.\*|\*|\+|\.\^|\.\\|\./|/|\\'
+    _operators = r'-|==|~=|<=|>=|<|>|&&|&|~|\|\|?|\.\*|\*|\+|\.\^|\^|\.\\|\./|/|\\'
 
     tokens = {
         'expressions': [
@@ -41,8 +41,8 @@ class MatlabLexer(RegexLexer):
             # numbers (must come before punctuation to handle `.5`; cannot use
             # `\b` due to e.g. `5. + .5`).  The negative lookahead on operators
             # avoids including the dot in `1./x` (the dot is part of `./`).
-            (r'(?<!\w)((\d+\.\d+)|(\d*\.\d+)|(\d+\.(?!%s)))'
-             r'([eEf][+-]?\d+)?(?!\w)' % _operators, Number.Float),
+            (rf'(?<!\w)((\d+\.\d+)|(\d*\.\d+)|(\d+\.(?!{_operators})))'
+             r'([eEf][+-]?\d+)?(?!\w)', Number.Float),
             (r'\b\d+[eEf][+-]?[0-9]+\b', Number.Float),
             (r'\b\d+\b', Number.Integer),
 
@@ -2665,7 +2665,7 @@ class MatlabLexer(RegexLexer):
             # `cd ./ foo`.).  Here, the regex checks that the first word in the
             # line is not followed by <spaces> and then
             # (equal | open-parenthesis | <operator><space> | <space>).
-            (r'(?:^|(?<=;))(\s*)(\w+)(\s+)(?!=|\(|%s\s|\s)' % _operators,
+            (rf'(?:^|(?<=;))(\s*)(\w+)(\s+)(?!=|\(|{_operators}\s|\s)',
              bygroups(Whitespace, Name, Whitespace), 'commandargs'),
 
             include('expressions')
@@ -2742,11 +2742,12 @@ class MatlabSessionLexer(Lexer):
     """
     For Matlab sessions.  Modeled after PythonConsoleLexer.
     Contributed by Ken Schutte <kschutte@csail.mit.edu>.
-
-    .. versionadded:: 0.10
     """
     name = 'Matlab session'
     aliases = ['matlabsession']
+    url = 'https://www.mathworks.com/products/matlab.html'
+    version_added = '0.10'
+    _example = "matlabsession/matlabsession_sample.txt"
 
     def get_tokens_unprocessed(self, text):
         mlexer = MatlabLexer(**self.options)
@@ -2811,14 +2812,13 @@ class MatlabSessionLexer(Lexer):
 class OctaveLexer(RegexLexer):
     """
     For GNU Octave source code.
-
-    .. versionadded:: 1.5
     """
     name = 'Octave'
     url = 'https://www.gnu.org/software/octave/index'
     aliases = ['octave']
     filenames = ['*.m']
     mimetypes = ['text/octave']
+    version_added = '1.5'
 
     # These lists are generated automatically.
     # Run the following in bash shell:
@@ -3175,7 +3175,7 @@ class OctaveLexer(RegexLexer):
             # operators in Octave but not Matlab requiring escape for re:
             (r'\*=|\+=|\^=|\/=|\\=|\*\*|\+\+|\.\*\*', Operator),
             # operators requiring escape for re:
-            (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator),
+            (r'\.\*|\*|\+|\.\^|\^|\.\\|\.\/|\/|\\', Operator),
 
 
             # punctuation:
@@ -3229,14 +3229,13 @@ class OctaveLexer(RegexLexer):
 class ScilabLexer(RegexLexer):
     """
     For Scilab source code.
-
-    .. versionadded:: 1.5
     """
     name = 'Scilab'
     url = 'https://www.scilab.org/'
     aliases = ['scilab']
     filenames = ['*.sci', '*.sce', '*.tst']
     mimetypes = ['text/scilab']
+    version_added = '1.5'
 
     tokens = {
         'root': [
@@ -3261,7 +3260,7 @@ class ScilabLexer(RegexLexer):
             # operators:
             (r'-|==|~=|<|>|<=|>=|&&|&|~|\|\|?', Operator),
             # operators requiring escape for re:
-            (r'\.\*|\*|\+|\.\^|\.\\|\.\/|\/|\\', Operator),
+            (r'\.\*|\*|\+|\.\^|\^|\.\\|\.\/|\/|\\', Operator),
 
             # punctuation:
             (r'[\[\](){}@.,=:;]+', Punctuation),
diff --git a/libs/pygments/lexers/maxima.py b/libs/pygments/lexers/maxima.py
index 4c6dc7962..a98308837 100644
--- a/libs/pygments/lexers/maxima.py
+++ b/libs/pygments/lexers/maxima.py
@@ -6,7 +6,7 @@
 
     Derived from pygments/lexers/algebra.py.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,13 +22,12 @@ class MaximaLexer(RegexLexer):
     """
     A Maxima lexer.
     Derived from pygments.lexers.MuPADLexer.
-
-    .. versionadded:: 2.11
     """
     name = 'Maxima'
     url = 'http://maxima.sourceforge.net'
     aliases = ['maxima', 'macsyma']
     filenames = ['*.mac', '*.max']
+    version_added = '2.11'
 
     keywords = ('if', 'then', 'else', 'elseif',
                 'do', 'while', 'repeat', 'until',
diff --git a/libs/pygments/lexers/meson.py b/libs/pygments/lexers/meson.py
index f74f7191a..6f2c6da37 100644
--- a/libs/pygments/lexers/meson.py
+++ b/libs/pygments/lexers/meson.py
@@ -4,7 +4,7 @@
 
     Pygments lexer for the Meson build system
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,8 +22,6 @@ class MesonLexer(RegexLexer):
     https://mesonbuild.com/Syntax.html#grammar for version 0.58.
     Some of those definitions are improperly transcribed, so the Meson++
     implementation was also checked: https://github.com/dcbaker/meson-plus-plus.
-
-    .. versionadded:: 2.10
     """
 
     # TODO String interpolation @VARNAME@ inner matches
@@ -34,6 +32,7 @@ class MesonLexer(RegexLexer):
     aliases = ['meson', 'meson.build']
     filenames = ['meson.build', 'meson_options.txt']
     mimetypes = ['text/x-meson']
+    version_added = '2.10'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/mime.py b/libs/pygments/lexers/mime.py
index 8bf16f74f..45f27f428 100644
--- a/libs/pygments/lexers/mime.py
+++ b/libs/pygments/lexers/mime.py
@@ -4,7 +4,7 @@
 
     Lexer for Multipurpose Internet Mail Extensions (MIME) data.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -46,8 +46,6 @@ class MIMELexer(RegexLexer):
     `Content-Transfer-Encoding`
         Treat the data as a specific encoding. Or this lexer would try to parse
         from header by default. (default: None)
-
-    .. versionadded:: 2.5
     """
 
     name = "MIME"
@@ -55,6 +53,8 @@ class MIMELexer(RegexLexer):
     mimetypes = ["multipart/mixed",
                  "multipart/related",
                  "multipart/alternative"]
+    url = 'https://en.wikipedia.org/wiki/MIME'
+    version_added = '2.5'
 
     def __init__(self, **options):
         super().__init__(**options)
@@ -95,7 +95,7 @@ class MIMELexer(RegexLexer):
             return
 
         # find boundary
-        bdry_pattern = r"^--%s(--)?\n" % re.escape(self.boundary)
+        bdry_pattern = rf"^--{re.escape(self.boundary)}(--)?\n"
         bdry_matcher = re.compile(bdry_pattern, re.MULTILINE)
 
         # some data has prefix text before first boundary
diff --git a/libs/pygments/lexers/minecraft.py b/libs/pygments/lexers/minecraft.py
index 11faa0009..fe5e9f87c 100644
--- a/libs/pygments/lexers/minecraft.py
+++ b/libs/pygments/lexers/minecraft.py
@@ -3,19 +3,19 @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Lexers for Minecraft related languages.
-    
+
     SNBT. A data communication format used in Minecraft.
     wiki: https://minecraft.wiki/w/NBT_format
-    
+
     MCFunction. The Function file for Minecraft Data packs and Add-ons.
     official: https://learn.microsoft.com/en-us/minecraft/creator/documents/functionsintroduction
     wiki: https://minecraft.wiki/w/Function
-    
+
     MCSchema. A kind of data Schema for Minecraft Add-on Development.
     official: https://learn.microsoft.com/en-us/minecraft/creator/reference/content/schemasreference/
     community example: https://www.mcbe-dev.net/addons/data-driven/manifest.html
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -28,8 +28,6 @@ __all__ = ['SNBTLexer', 'MCFunctionLexer', 'MCSchemaLexer']
 
 class SNBTLexer(RegexLexer):
     """Lexer for stringified NBT, a data format used in Minecraft
-
-    .. versionadded:: 2.12.0
     """
 
     name = "SNBT"
@@ -37,6 +35,7 @@ class SNBTLexer(RegexLexer):
     aliases = ["snbt"]
     filenames = ["*.snbt"]
     mimetypes = ["text/snbt"]
+    version_added = '2.12'
 
     tokens = {
         "root": [
@@ -102,8 +101,6 @@ class SNBTLexer(RegexLexer):
 class MCFunctionLexer(RegexLexer):
     """Lexer for the mcfunction scripting language used in Minecraft
     Modelled somewhat after the `GitHub mcfunction grammar <https://github.com/Arcensoth/language-mcfunction>`_.
-
-    .. versionadded:: 2.12.0
     """
 
     name = "MCFunction"
@@ -111,6 +108,7 @@ class MCFunctionLexer(RegexLexer):
     aliases = ["mcfunction", "mcf"]
     filenames = ["*.mcfunction"]
     mimetypes = ["text/mcfunction"]
+    version_added = '2.12'
 
     # Used to denotate the start of a block comment, borrowed from Github's mcfunction
     _block_comment_prefix = "[>!]"
@@ -218,26 +216,26 @@ class MCFunctionLexer(RegexLexer):
         "selectors": [
             (r"@[a-z]", Name.Variable),
         ],
- 
+
 
         ## Generic Property Container
         # There are several, differing instances where the language accepts
         #  specific contained keys or contained key, value pairings.
-        # 
+        #
         # Property Maps:
         # - Starts with either `[` or `{`
         # - Key separated by `:` or `=`
         # - Deliminated by `,`
-        # 
+        #
         # Property Lists:
         # - Starts with `[`
         # - Deliminated by `,`
-        # 
+        #
         # For simplicity, these patterns match a generic, nestable structure
         #  which follow a key, value pattern. For normal lists, there's only keys.
         # This allow some "illegal" structures, but we'll accept those for
         #  sake of simplicity
-        # 
+        #
         # Examples:
         # - `[facing=up, powered=true]` (blockstate)
         # - `[name="hello world", nbt={key: 1b}]` (selector + nbt)
@@ -298,7 +296,7 @@ class MCFunctionLexer(RegexLexer):
         ],
         "property.delimiter": [
             include("whitespace"),
-            
+
             (r"[:=]!?", Punctuation, "property.value"),
             (r",", Punctuation),
 
@@ -321,15 +319,14 @@ class MCFunctionLexer(RegexLexer):
 
 class MCSchemaLexer(RegexLexer):
     """Lexer for Minecraft Add-ons data Schemas, an interface structure standard used in Minecraft
-
-    .. versionadded:: 2.14.0
     """
-    
+
     name = 'MCSchema'
     url = 'https://learn.microsoft.com/en-us/minecraft/creator/reference/content/schemasreference/'
     aliases = ['mcschema']
     filenames = ['*.mcschema']
     mimetypes = ['text/mcschema']
+    version_added = '2.14'
 
     tokens = {
         'commentsandwhitespace': [
@@ -360,35 +357,35 @@ class MCSchemaLexer(RegexLexer):
         'root': [
             (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
             include('commentsandwhitespace'),
-            
+
             # keywords for optional word and field types
             (r'(?<=: )opt', Operator.Word),
             (r'(?<=\s)[\w-]*(?=(\s+"|\n))', Keyword.Declaration),
-            
+
             # numeric literals
             (r'0[bB][01]+', Number.Bin),
             (r'0[oO]?[0-7]+', Number.Oct),
             (r'0[xX][0-9a-fA-F]+', Number.Hex),
             (r'\d+', Number.Integer),
             (r'(\.\d+|\d+\.\d*|\d+)([eE][-+]?\d+)?', Number.Float),
-            
+
             # possible punctuations
             (r'\.\.\.|=>', Punctuation),
             (r'\+\+|--|~|\?\?=?|\?|:|\\(?=\n)|'
              r'(<<|>>>?|==?|!=?|(?:\*\*|\|\||&&|[-<>+*%&|^/]))=?', Operator, 'slashstartsregex'),
             (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
             (r'[})\].]', Punctuation),
-            
+
             # strings
             (r"'", String.Single, 'singlestring'),
             (r'"', String.Double, 'doublestring'),
-            
+
             # title line
             (r'[\w-]*?(?=:\{?\n)', String.Symbol),
             # title line with a version code, formatted
             # `major.minor.patch-prerelease+buildmeta`
             (r'([\w-]*?)(:)(\d+)(?:(\.)(\d+)(?:(\.)(\d+)(?:(\-)((?:[^\W_]|-)*(?:\.(?:[^\W_]|-)*)*))?(?:(\+)((?:[^\W_]|-)+(?:\.(?:[^\W_]|-)+)*))?)?)?(?=:\{?\n)', bygroups(String.Symbol, Operator, Number.Integer, Operator, Number.Integer, Operator, Number.Integer, Operator, String, Operator, String)),
-            
+
             (r'.*\n', Text),
         ]
     }
diff --git a/libs/pygments/lexers/mips.py b/libs/pygments/lexers/mips.py
index 257605d7e..531f1b876 100644
--- a/libs/pygments/lexers/mips.py
+++ b/libs/pygments/lexers/mips.py
@@ -4,7 +4,7 @@
 
     Lexers for MIPS assembly.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -24,10 +24,12 @@ class MIPSLexer(RegexLexer):
 
     name = 'MIPS'
     aliases = ['mips']
+    version_added = ''
     # TODO: add '*.s' and '*.asm', which will require designing an analyse_text
     # method for this lexer and refactoring those from Gas and Nasm in order to
     # have relatively reliable detection
     filenames = ['*.mips', '*.MIPS']
+    url = 'https://mips.com'
 
     keywords = [
         # Arithmetic insturctions
diff --git a/libs/pygments/lexers/ml.py b/libs/pygments/lexers/ml.py
index 3dfa6d934..48a08da1c 100644
--- a/libs/pygments/lexers/ml.py
+++ b/libs/pygments/lexers/ml.py
@@ -4,7 +4,7 @@
 
     Lexers for ML family languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,14 @@ __all__ = ['SMLLexer', 'OcamlLexer', 'OpaLexer', 'ReasonLexer', 'FStarLexer']
 class SMLLexer(RegexLexer):
     """
     For the Standard ML language.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Standard ML'
     aliases = ['sml']
     filenames = ['*.sml', '*.sig', '*.fun']
     mimetypes = ['text/x-standardml', 'application/x-standardml']
+    url = 'https://en.wikipedia.org/wiki/Standard_ML'
+    version_added = '1.5'
 
     alphanumid_reserved = {
         # Core
@@ -121,7 +121,7 @@ class SMLLexer(RegexLexer):
 
         'core': [
             # Punctuation that doesn't overlap symbolic identifiers
-            (r'(%s)' % '|'.join(re.escape(z) for z in nonid_reserved),
+            (r'({})'.format('|'.join(re.escape(z) for z in nonid_reserved)),
              Punctuation),
 
             # Special constants: strings, floats, numbers in decimal and hex
@@ -137,8 +137,8 @@ class SMLLexer(RegexLexer):
 
             # Labels
             (r'#\s*[1-9][0-9]*', Name.Label),
-            (r'#\s*(%s)' % alphanumid_re, Name.Label),
-            (r'#\s+(%s)' % symbolicid_re, Name.Label),
+            (rf'#\s*({alphanumid_re})', Name.Label),
+            (rf'#\s+({symbolicid_re})', Name.Label),
             # Some reserved words trigger a special, local lexer state change
             (r'\b(datatype|abstype)\b(?!\')', Keyword.Reserved, 'dname'),
             (r'\b(exception)\b(?!\')', Keyword.Reserved, 'ename'),
@@ -148,14 +148,14 @@ class SMLLexer(RegexLexer):
 
             # Regular identifiers, long and otherwise
             (r'\'[\w\']*', Name.Decorator),
-            (r'(%s)(\.)' % alphanumid_re, long_id_callback, "dotted"),
-            (r'(%s)' % alphanumid_re, id_callback),
-            (r'(%s)' % symbolicid_re, id_callback),
+            (rf'({alphanumid_re})(\.)', long_id_callback, "dotted"),
+            (rf'({alphanumid_re})', id_callback),
+            (rf'({symbolicid_re})', id_callback),
         ],
         'dotted': [
-            (r'(%s)(\.)' % alphanumid_re, long_id_callback),
-            (r'(%s)' % alphanumid_re, end_id_callback, "#pop"),
-            (r'(%s)' % symbolicid_re, end_id_callback, "#pop"),
+            (rf'({alphanumid_re})(\.)', long_id_callback),
+            (rf'({alphanumid_re})', end_id_callback, "#pop"),
+            (rf'({symbolicid_re})', end_id_callback, "#pop"),
             (r'\s+', Error),
             (r'\S+', Error),
         ],
@@ -208,7 +208,7 @@ class SMLLexer(RegexLexer):
         'string': stringy(String.Double),
 
         'breakout': [
-            (r'(?=\b(%s)\b(?!\'))' % '|'.join(alphanumid_reserved), Text, '#pop'),
+            (r'(?=\b({})\b(?!\'))'.format('|'.join(alphanumid_reserved)), Text, '#pop'),
         ],
 
         # Dealing with what comes after module system keywords
@@ -216,7 +216,7 @@ class SMLLexer(RegexLexer):
             include('whitespace'),
             include('breakout'),
 
-            (r'(%s)' % alphanumid_re, Name.Namespace),
+            (rf'({alphanumid_re})', Name.Namespace),
             default('#pop'),
         ],
 
@@ -226,8 +226,8 @@ class SMLLexer(RegexLexer):
             (r'\'[\w\']*', Name.Decorator),
             (r'\(', Punctuation, 'tyvarseq'),
 
-            (r'(%s)' % alphanumid_re, Name.Function, '#pop'),
-            (r'(%s)' % symbolicid_re, Name.Function, '#pop'),
+            (rf'({alphanumid_re})', Name.Function, '#pop'),
+            (rf'({symbolicid_re})', Name.Function, '#pop'),
 
             # Ignore interesting function declarations like "fun (x + y) = ..."
             default('#pop'),
@@ -239,12 +239,12 @@ class SMLLexer(RegexLexer):
             (r'\'[\w\']*', Name.Decorator),
             (r'\(', Punctuation, 'tyvarseq'),
 
-            (r'(%s)(\s*)(=(?!%s))' % (alphanumid_re, symbolicid_re),
+            (rf'({alphanumid_re})(\s*)(=(?!{symbolicid_re}))',
              bygroups(Name.Variable, Text, Punctuation), '#pop'),
-            (r'(%s)(\s*)(=(?!%s))' % (symbolicid_re, symbolicid_re),
+            (rf'({symbolicid_re})(\s*)(=(?!{symbolicid_re}))',
              bygroups(Name.Variable, Text, Punctuation), '#pop'),
-            (r'(%s)' % alphanumid_re, Name.Variable, '#pop'),
-            (r'(%s)' % symbolicid_re, Name.Variable, '#pop'),
+            (rf'({alphanumid_re})', Name.Variable, '#pop'),
+            (rf'({symbolicid_re})', Name.Variable, '#pop'),
 
             # Ignore interesting patterns like 'val (x, y)'
             default('#pop'),
@@ -257,10 +257,10 @@ class SMLLexer(RegexLexer):
 
             (r'\'[\w\']*', Name.Decorator),
             (r'\(', Punctuation, 'tyvarseq'),
-            (r'=(?!%s)' % symbolicid_re, Punctuation, ('#pop', 'typbind')),
+            (rf'=(?!{symbolicid_re})', Punctuation, ('#pop', 'typbind')),
 
-            (r'(%s)' % alphanumid_re, Keyword.Type),
-            (r'(%s)' % symbolicid_re, Keyword.Type),
+            (rf'({alphanumid_re})', Keyword.Type),
+            (rf'({symbolicid_re})', Keyword.Type),
             (r'\S+', Error, '#pop'),
         ],
 
@@ -284,11 +284,11 @@ class SMLLexer(RegexLexer):
             (r'\(', Punctuation, 'tyvarseq'),
             (r'(=)(\s*)(datatype)',
              bygroups(Punctuation, Text, Keyword.Reserved), '#pop'),
-            (r'=(?!%s)' % symbolicid_re, Punctuation,
+            (rf'=(?!{symbolicid_re})', Punctuation,
              ('#pop', 'datbind', 'datcon')),
 
-            (r'(%s)' % alphanumid_re, Keyword.Type),
-            (r'(%s)' % symbolicid_re, Keyword.Type),
+            (rf'({alphanumid_re})', Keyword.Type),
+            (rf'({symbolicid_re})', Keyword.Type),
             (r'\S+', Error, '#pop'),
         ],
 
@@ -300,9 +300,9 @@ class SMLLexer(RegexLexer):
             (r'\b(withtype)\b(?!\')', Keyword.Reserved, ('#pop', 'tname')),
             (r'\b(of)\b(?!\')', Keyword.Reserved),
 
-            (r'(\|)(\s*)(%s)' % alphanumid_re,
+            (rf'(\|)(\s*)({alphanumid_re})',
              bygroups(Punctuation, Text, Name.Class)),
-            (r'(\|)(\s+)(%s)' % symbolicid_re,
+            (rf'(\|)(\s+)({symbolicid_re})',
              bygroups(Punctuation, Text, Name.Class)),
 
             include('breakout'),
@@ -314,20 +314,20 @@ class SMLLexer(RegexLexer):
         'ename': [
             include('whitespace'),
 
-            (r'(and\b)(\s+)(%s)' % alphanumid_re,
+            (rf'(and\b)(\s+)({alphanumid_re})',
              bygroups(Keyword.Reserved, Text, Name.Class)),
-            (r'(and\b)(\s*)(%s)' % symbolicid_re,
+            (rf'(and\b)(\s*)({symbolicid_re})',
              bygroups(Keyword.Reserved, Text, Name.Class)),
             (r'\b(of)\b(?!\')', Keyword.Reserved),
-            (r'(%s)|(%s)' % (alphanumid_re, symbolicid_re), Name.Class),
+            (rf'({alphanumid_re})|({symbolicid_re})', Name.Class),
 
             default('#pop'),
         ],
 
         'datcon': [
             include('whitespace'),
-            (r'(%s)' % alphanumid_re, Name.Class, '#pop'),
-            (r'(%s)' % symbolicid_re, Name.Class, '#pop'),
+            (rf'({alphanumid_re})', Name.Class, '#pop'),
+            (rf'({symbolicid_re})', Name.Class, '#pop'),
             (r'\S+', Error, '#pop'),
         ],
 
@@ -355,8 +355,6 @@ class SMLLexer(RegexLexer):
 class OcamlLexer(RegexLexer):
     """
     For the OCaml language.
-
-    .. versionadded:: 0.7
     """
 
     name = 'OCaml'
@@ -364,6 +362,7 @@ class OcamlLexer(RegexLexer):
     aliases = ['ocaml']
     filenames = ['*.ml', '*.mli', '*.mll', '*.mly']
     mimetypes = ['text/x-ocaml']
+    version_added = '0.7'
 
     keywords = (
         'and', 'as', 'assert', 'begin', 'class', 'constraint', 'do', 'done',
@@ -399,11 +398,11 @@ class OcamlLexer(RegexLexer):
             (r'\b([A-Z][\w\']*)(?=\s*\.)', Name.Namespace, 'dotted'),
             (r'\b([A-Z][\w\']*)', Name.Class),
             (r'\(\*(?![)])', Comment, 'comment'),
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
-            (r'(%s)' % '|'.join(keyopts[::-1]), Operator),
-            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
-            (r'\b(%s)\b' % '|'.join(word_operators), Operator.Word),
-            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
+            (r'({})'.format('|'.join(keyopts[::-1])), Operator),
+            (rf'({infix_syms}|{prefix_syms})?{operators}', Operator),
+            (r'\b({})\b'.format('|'.join(word_operators)), Operator.Word),
+            (r'\b({})\b'.format('|'.join(primitives)), Keyword.Type),
 
             (r"[^\W\d][\w']*", Name),
 
@@ -448,14 +447,14 @@ class OcamlLexer(RegexLexer):
 class OpaLexer(RegexLexer):
     """
     Lexer for the Opa language.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Opa'
     aliases = ['opa']
     filenames = ['*.opa']
     mimetypes = ['text/x-opa']
+    url = 'http://opalang.org'
+    version_added = '1.5'
 
     # most of these aren't strictly keywords
     # but if you color only real keywords, you might just
@@ -557,8 +556,8 @@ class OpaLexer(RegexLexer):
             # way to syntactic distinguish binding constructions
             # unfortunately, this colors the equal in {x=2} too
             (r'=(?!'+op_re+r')', Keyword),
-            (r'(%s)+' % op_re, Operator),
-            (r'(%s)+' % punc_re, Operator),
+            (rf'({op_re})+', Operator),
+            (rf'({punc_re})+', Operator),
 
             # coercions
             (r':', Operator, 'type'),
@@ -771,8 +770,6 @@ class OpaLexer(RegexLexer):
 class ReasonLexer(RegexLexer):
     """
     For the ReasonML language.
-
-    .. versionadded:: 2.6
     """
 
     name = 'ReasonML'
@@ -780,6 +777,7 @@ class ReasonLexer(RegexLexer):
     aliases = ['reasonml', 'reason']
     filenames = ['*.re', '*.rei']
     mimetypes = ['text/x-reasonml']
+    version_added = '2.6'
 
     keywords = (
         'as', 'assert', 'begin', 'class', 'constraint', 'do', 'done', 'downto',
@@ -815,11 +813,11 @@ class ReasonLexer(RegexLexer):
             (r'\b([A-Z][\w\']*)', Name.Class),
             (r'//.*?\n', Comment.Single),
             (r'\/\*(?!/)', Comment.Multiline, 'comment'),
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
-            (r'(%s)' % '|'.join(keyopts[::-1]), Operator.Word),
-            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
-            (r'\b(%s)\b' % '|'.join(word_operators), Operator.Word),
-            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
+            (r'({})'.format('|'.join(keyopts[::-1])), Operator.Word),
+            (rf'({infix_syms}|{prefix_syms})?{operators}', Operator),
+            (r'\b({})\b'.format('|'.join(word_operators)), Operator.Word),
+            (r'\b({})\b'.format('|'.join(primitives)), Keyword.Type),
 
             (r"[^\W\d][\w']*", Name),
 
@@ -864,7 +862,6 @@ class ReasonLexer(RegexLexer):
 class FStarLexer(RegexLexer):
     """
     For the F* language.
-    .. versionadded:: 2.7
     """
 
     name = 'FStar'
@@ -872,6 +869,7 @@ class FStarLexer(RegexLexer):
     aliases = ['fstar']
     filenames = ['*.fst', '*.fsti']
     mimetypes = ['text/x-fstar']
+    version_added = '2.7'
 
     keywords = (
         'abstract', 'attributes', 'noeq', 'unopteq', 'and'
@@ -912,12 +910,12 @@ class FStarLexer(RegexLexer):
             (r'\b([A-Z][\w\']*)', Name.Class),
             (r'\(\*(?![)])', Comment, 'comment'),
             (r'\/\/.+$', Comment),
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
-            (r'\b(%s)\b' % '|'.join(assume_keywords), Name.Exception),
-            (r'\b(%s)\b' % '|'.join(decl_keywords), Keyword.Declaration),
-            (r'(%s)' % '|'.join(keyopts[::-1]), Operator),
-            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
-            (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
+            (r'\b({})\b'.format('|'.join(assume_keywords)), Name.Exception),
+            (r'\b({})\b'.format('|'.join(decl_keywords)), Keyword.Declaration),
+            (r'({})'.format('|'.join(keyopts[::-1])), Operator),
+            (rf'({infix_syms}|{prefix_syms})?{operators}', Operator),
+            (r'\b({})\b'.format('|'.join(primitives)), Keyword.Type),
 
             (r"[^\W\d][\w']*", Name),
 
diff --git a/libs/pygments/lexers/modeling.py b/libs/pygments/lexers/modeling.py
index e24768072..d681e7f3b 100644
--- a/libs/pygments/lexers/modeling.py
+++ b/libs/pygments/lexers/modeling.py
@@ -4,7 +4,7 @@
 
     Lexers for modeling languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,14 +23,13 @@ __all__ = ['ModelicaLexer', 'BugsLexer', 'JagsLexer', 'StanLexer']
 class ModelicaLexer(RegexLexer):
     """
     For Modelica source code.
-
-    .. versionadded:: 1.1
     """
     name = 'Modelica'
     url = 'http://www.modelica.org/'
     aliases = ['modelica']
     filenames = ['*.mo']
     mimetypes = ['text/x-modelica']
+    version_added = '1.1'
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -100,13 +99,13 @@ class BugsLexer(RegexLexer):
     """
     Pygments Lexer for OpenBugs and WinBugs
     models.
-
-    .. versionadded:: 1.6
     """
 
     name = 'BUGS'
     aliases = ['bugs', 'winbugs', 'openbugs']
     filenames = ['*.bug']
+    url = 'https://www.mrc-bsu.cam.ac.uk/software/bugs/openbugs'
+    version_added = '1.6'
 
     _FUNCTIONS = (
         # Scalar functions
@@ -166,8 +165,7 @@ class BugsLexer(RegexLexer):
             # Reserved Words
             (r'(for|in)(?![\w.])', Keyword.Reserved),
             # Built-in Functions
-            (r'(%s)(?=\s*\()'
-             % r'|'.join(_FUNCTIONS + _DISTRIBUTIONS),
+            (r'({})(?=\s*\()'.format(r'|'.join(_FUNCTIONS + _DISTRIBUTIONS)),
              Name.Builtin),
             # Regular variable names
             (r'[A-Za-z][\w.]*', Name),
@@ -195,13 +193,13 @@ class BugsLexer(RegexLexer):
 class JagsLexer(RegexLexer):
     """
     Pygments Lexer for JAGS.
-
-    .. versionadded:: 1.6
     """
 
     name = 'JAGS'
     aliases = ['jags']
     filenames = ['*.jag', '*.bug']
+    url = 'https://mcmc-jags.sourceforge.io'
+    version_added = '1.6'
 
     # JAGS
     _FUNCTIONS = (
@@ -215,7 +213,7 @@ class JagsLexer(RegexLexer):
         # Truncation/Censoring (should I include)
         'T', 'I')
     # Distributions with density, probability and quartile functions
-    _DISTRIBUTIONS = tuple('[dpq]%s' % x for x in
+    _DISTRIBUTIONS = tuple(f'[dpq]{x}' for x in
                            ('bern', 'beta', 'dchiqsqr', 'ddexp', 'dexp',
                             'df', 'gamma', 'gen.gamma', 'logis', 'lnorm',
                             'negbin', 'nchisqr', 'norm', 'par', 'pois', 'weib'))
@@ -251,9 +249,9 @@ class JagsLexer(RegexLexer):
             (r'(for|in)(?![\w.])', Keyword.Reserved),
             # Builtins
             # Need to use lookahead because . is a valid char
-            (r'(%s)(?=\s*\()' % r'|'.join(_FUNCTIONS
+            (r'({})(?=\s*\()'.format(r'|'.join(_FUNCTIONS
                                           + _DISTRIBUTIONS
-                                          + _OTHER_DISTRIBUTIONS),
+                                          + _OTHER_DISTRIBUTIONS)),
              Name.Builtin),
             # Names
             include('names'),
@@ -286,13 +284,13 @@ class StanLexer(RegexLexer):
     The Stan modeling language is specified in the *Stan Modeling Language
     User's Guide and Reference Manual, v2.17.0*,
     `pdf <https://github.com/stan-dev/stan/releases/download/v2.17.0/stan-reference-2.17.0.pdf>`__.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Stan'
     aliases = ['stan']
     filenames = ['*.stan']
+    url = 'https://mc-stan.org'
+    version_added = '1.6'
 
     tokens = {
         'whitespace': [
@@ -310,19 +308,18 @@ class StanLexer(RegexLexer):
             # block start
             include('whitespace'),
             # Block start
-            (r'(%s)(\s*)(\{)' %
-             r'|'.join(('functions', 'data', r'transformed\s+?data',
+            (r'({})(\s*)(\{{)'.format(r'|'.join(('functions', 'data', r'transformed\s+?data',
                         'parameters', r'transformed\s+parameters',
-                        'model', r'generated\s+quantities')),
+                        'model', r'generated\s+quantities'))),
              bygroups(Keyword.Namespace, Text, Punctuation)),
             # target keyword
             (r'target\s*\+=', Keyword),
             # Reserved Words
-            (r'(%s)\b' % r'|'.join(_stan_builtins.KEYWORDS), Keyword),
+            (r'({})\b'.format(r'|'.join(_stan_builtins.KEYWORDS)), Keyword),
             # Truncation
             (r'T(?=\s*\[)', Keyword),
             # Data types
-            (r'(%s)\b' % r'|'.join(_stan_builtins.TYPES), Keyword.Type),
+            (r'({})\b'.format(r'|'.join(_stan_builtins.TYPES)), Keyword.Type),
              # < should be punctuation, but elsewhere I can't tell if it is in
              # a range constraint
             (r'(<)(\s*)(upper|lower|offset|multiplier)(\s*)(=)',
@@ -332,12 +329,12 @@ class StanLexer(RegexLexer):
             # Punctuation
             (r"[;,\[\]()]", Punctuation),
             # Builtin
-            (r'(%s)(?=\s*\()' % '|'.join(_stan_builtins.FUNCTIONS), Name.Builtin),
-            (r'(~)(\s*)(%s)(?=\s*\()' % '|'.join(_stan_builtins.DISTRIBUTIONS),
+            (r'({})(?=\s*\()'.format('|'.join(_stan_builtins.FUNCTIONS)), Name.Builtin),
+            (r'(~)(\s*)({})(?=\s*\()'.format('|'.join(_stan_builtins.DISTRIBUTIONS)),
                 bygroups(Operator, Whitespace, Name.Builtin)),
             # Special names ending in __, like lp__
             (r'[A-Za-z]\w*__\b', Name.Builtin.Pseudo),
-            (r'(%s)\b' % r'|'.join(_stan_builtins.RESERVED), Keyword.Reserved),
+            (r'({})\b'.format(r'|'.join(_stan_builtins.RESERVED)), Keyword.Reserved),
             # user-defined functions
             (r'[A-Za-z]\w*(?=\s*\()]', Name.Function),
             # Imaginary Literals
diff --git a/libs/pygments/lexers/modula2.py b/libs/pygments/lexers/modula2.py
index 8bd4765aa..713f4722f 100644
--- a/libs/pygments/lexers/modula2.py
+++ b/libs/pygments/lexers/modula2.py
@@ -4,7 +4,7 @@
 
     Multi-Dialect Lexer for Modula-2.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -153,8 +153,6 @@ class Modula2Lexer(RegexLexer):
     ``$ pygmentize -O full,dialect=m2r10,treat_stdlib_adts_as_builtins=Off ...``
         Render standard library ADTs as ordinary library types.
 
-    .. versionadded:: 1.3
-
     .. versionchanged:: 2.1
        Added multi-dialect support.
     """
@@ -163,6 +161,7 @@ class Modula2Lexer(RegexLexer):
     aliases = ['modula2', 'm2']
     filenames = ['*.def', '*.mod']
     mimetypes = ['text/x-modula2']
+    version_added = '1.3'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/mojo.py b/libs/pygments/lexers/mojo.py
new file mode 100644
index 000000000..4df18c4f9
--- /dev/null
+++ b/libs/pygments/lexers/mojo.py
@@ -0,0 +1,707 @@
+"""
+    pygments.lexers.mojo
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Mojo and related languages.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import keyword
+
+from pygments import unistring as uni
+from pygments.lexer import (
+    RegexLexer,
+    bygroups,
+    combined,
+    default,
+    include,
+    this,
+    using,
+    words,
+)
+from pygments.token import (
+    Comment,
+    # Error,
+    Keyword,
+    Name,
+    Number,
+    Operator,
+    Punctuation,
+    String,
+    Text,
+    Whitespace,
+)
+from pygments.util import shebang_matches
+
+__all__ = ["MojoLexer"]
+
+
+class MojoLexer(RegexLexer):
+    """
+    For Mojo source code (version 24.2.1).
+    """
+
+    name = "Mojo"
+    url = "https://docs.modular.com/mojo/"
+    aliases = ["mojo", "🔥"]
+    filenames = [
+        "*.mojo",
+        "*.🔥",
+    ]
+    mimetypes = [
+        "text/x-mojo",
+        "application/x-mojo",
+    ]
+    version_added = "2.18"
+
+    uni_name = f"[{uni.xid_start}][{uni.xid_continue}]*"
+
+    def innerstring_rules(ttype):
+        return [
+            # the old style '%s' % (...) string formatting (still valid in Py3)
+            (
+                r"%(\(\w+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?"
+                "[hlL]?[E-GXc-giorsaux%]",
+                String.Interpol,
+            ),
+            # the new style '{}'.format(...) string formatting
+            (
+                r"\{"
+                r"((\w+)((\.\w+)|(\[[^\]]+\]))*)?"  # field name
+                r"(\![sra])?"  # conversion
+                r"(\:(.?[<>=\^])?[-+ ]?#?0?(\d+)?,?(\.\d+)?[E-GXb-gnosx%]?)?"
+                r"\}",
+                String.Interpol,
+            ),
+            # backslashes, quotes and formatting signs must be parsed one at a time
+            (r'[^\\\'"%{\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            # unhandled string formatting sign
+            (r"%|(\{{1,2})", ttype),
+            # newlines are an error (use "nl" state)
+        ]
+
+    def fstring_rules(ttype):
+        return [
+            # Assuming that a '}' is the closing brace after format specifier.
+            # Sadly, this means that we won't detect syntax error. But it's
+            # more important to parse correct syntax correctly, than to
+            # highlight invalid syntax.
+            (r"\}", String.Interpol),
+            (r"\{", String.Interpol, "expr-inside-fstring"),
+            # backslashes, quotes and formatting signs must be parsed one at a time
+            (r'[^\\\'"{}\n]+', ttype),
+            (r'[\'"\\]', ttype),
+            # newlines are an error (use "nl" state)
+        ]
+
+    tokens = {
+        "root": [
+            (r"\s+", Whitespace),
+            (
+                r'^(\s*)([rRuUbB]{,2})("""(?:.|\n)*?""")',
+                bygroups(Whitespace, String.Affix, String.Doc),
+            ),
+            (
+                r"^(\s*)([rRuUbB]{,2})('''(?:.|\n)*?''')",
+                bygroups(Whitespace, String.Affix, String.Doc),
+            ),
+            (r"\A#!.+$", Comment.Hashbang),
+            (r"#.*$", Comment.Single),
+            (r"\\\n", Whitespace),
+            (r"\\", Whitespace),
+            include("keywords"),
+            include("soft-keywords"),
+            # In the original PR, all the below here used ((?:\s|\\\s)+) to
+            # designate whitespace, but I can't find any example of this being
+            # needed in the example file, so we're replacing it with `\s+`.
+            (
+                r"(alias)(\s+)",
+                bygroups(Keyword, Whitespace),
+                "varname",  # TODO varname the right fit?
+            ),
+            (r"(var)(\s+)", bygroups(Keyword, Whitespace), "varname"),
+            (r"(def)(\s+)", bygroups(Keyword, Whitespace), "funcname"),
+            (r"(fn)(\s+)", bygroups(Keyword, Whitespace), "funcname"),
+            (
+                r"(class)(\s+)",
+                bygroups(Keyword, Whitespace),
+                "classname",
+            ),  # not implemented yet
+            (r"(struct)(\s+)", bygroups(Keyword, Whitespace), "structname"),
+            (r"(trait)(\s+)", bygroups(Keyword, Whitespace), "structname"),
+            (r"(from)(\s+)", bygroups(Keyword.Namespace, Whitespace), "fromimport"),
+            (r"(import)(\s+)", bygroups(Keyword.Namespace, Whitespace), "import"),
+            include("expr"),
+        ],
+        "expr": [
+            # raw f-strings
+            (
+                '(?i)(rf|fr)(""")',
+                bygroups(String.Affix, String.Double),
+                combined("rfstringescape", "tdqf"),
+            ),
+            (
+                "(?i)(rf|fr)(''')",
+                bygroups(String.Affix, String.Single),
+                combined("rfstringescape", "tsqf"),
+            ),
+            (
+                '(?i)(rf|fr)(")',
+                bygroups(String.Affix, String.Double),
+                combined("rfstringescape", "dqf"),
+            ),
+            (
+                "(?i)(rf|fr)(')",
+                bygroups(String.Affix, String.Single),
+                combined("rfstringescape", "sqf"),
+            ),
+            # non-raw f-strings
+            (
+                '([fF])(""")',
+                bygroups(String.Affix, String.Double),
+                combined("fstringescape", "tdqf"),
+            ),
+            (
+                "([fF])(''')",
+                bygroups(String.Affix, String.Single),
+                combined("fstringescape", "tsqf"),
+            ),
+            (
+                '([fF])(")',
+                bygroups(String.Affix, String.Double),
+                combined("fstringescape", "dqf"),
+            ),
+            (
+                "([fF])(')",
+                bygroups(String.Affix, String.Single),
+                combined("fstringescape", "sqf"),
+            ),
+            # raw bytes and strings
+            ('(?i)(rb|br|r)(""")', bygroups(String.Affix, String.Double), "tdqs"),
+            ("(?i)(rb|br|r)(''')", bygroups(String.Affix, String.Single), "tsqs"),
+            ('(?i)(rb|br|r)(")', bygroups(String.Affix, String.Double), "dqs"),
+            ("(?i)(rb|br|r)(')", bygroups(String.Affix, String.Single), "sqs"),
+            # non-raw strings
+            (
+                '([uU]?)(""")',
+                bygroups(String.Affix, String.Double),
+                combined("stringescape", "tdqs"),
+            ),
+            (
+                "([uU]?)(''')",
+                bygroups(String.Affix, String.Single),
+                combined("stringescape", "tsqs"),
+            ),
+            (
+                '([uU]?)(")',
+                bygroups(String.Affix, String.Double),
+                combined("stringescape", "dqs"),
+            ),
+            (
+                "([uU]?)(')",
+                bygroups(String.Affix, String.Single),
+                combined("stringescape", "sqs"),
+            ),
+            # non-raw bytes
+            (
+                '([bB])(""")',
+                bygroups(String.Affix, String.Double),
+                combined("bytesescape", "tdqs"),
+            ),
+            (
+                "([bB])(''')",
+                bygroups(String.Affix, String.Single),
+                combined("bytesescape", "tsqs"),
+            ),
+            (
+                '([bB])(")',
+                bygroups(String.Affix, String.Double),
+                combined("bytesescape", "dqs"),
+            ),
+            (
+                "([bB])(')",
+                bygroups(String.Affix, String.Single),
+                combined("bytesescape", "sqs"),
+            ),
+            (r"[^\S\n]+", Text),
+            include("numbers"),
+            (r"!=|==|<<|>>|:=|[-~+/*%=<>&^|.]", Operator),
+            (r"([]{}:\(\),;[])+", Punctuation),
+            (r"(in|is|and|or|not)\b", Operator.Word),
+            include("expr-keywords"),
+            include("builtins"),
+            include("magicfuncs"),
+            include("magicvars"),
+            include("name"),
+        ],
+        "expr-inside-fstring": [
+            (r"[{([]", Punctuation, "expr-inside-fstring-inner"),
+            # without format specifier
+            (
+                r"(=\s*)?"  # debug (https://bugs.python.org/issue36817)
+                r"(\![sraf])?"  # conversion
+                r"\}",
+                String.Interpol,
+                "#pop",
+            ),
+            # with format specifier
+            # we'll catch the remaining '}' in the outer scope
+            (
+                r"(=\s*)?"  # debug (https://bugs.python.org/issue36817)
+                r"(\![sraf])?"  # conversion
+                r":",
+                String.Interpol,
+                "#pop",
+            ),
+            (r"\s+", Whitespace),  # allow new lines
+            include("expr"),
+        ],
+        "expr-inside-fstring-inner": [
+            (r"[{([]", Punctuation, "expr-inside-fstring-inner"),
+            (r"[])}]", Punctuation, "#pop"),
+            (r"\s+", Whitespace),  # allow new lines
+            include("expr"),
+        ],
+        "expr-keywords": [
+            # Based on https://docs.python.org/3/reference/expressions.html
+            (
+                words(
+                    (
+                        "async for",  # TODO https://docs.modular.com/mojo/roadmap#no-async-for-or-async-with
+                        "async with",  # TODO https://docs.modular.com/mojo/roadmap#no-async-for-or-async-with
+                        "await",
+                        "else",
+                        "for",
+                        "if",
+                        "lambda",
+                        "yield",
+                        "yield from",
+                    ),
+                    suffix=r"\b",
+                ),
+                Keyword,
+            ),
+            (words(("True", "False", "None"), suffix=r"\b"), Keyword.Constant),
+        ],
+        "keywords": [
+            (
+                words(
+                    (
+                        "assert",
+                        "async",
+                        "await",
+                        "borrowed",
+                        "break",
+                        "continue",
+                        "del",
+                        "elif",
+                        "else",
+                        "except",
+                        "finally",
+                        "for",
+                        "global",
+                        "if",
+                        "lambda",
+                        "pass",
+                        "raise",
+                        "nonlocal",
+                        "return",
+                        "try",
+                        "while",
+                        "yield",
+                        "yield from",
+                        "as",
+                        "with",
+                    ),
+                    suffix=r"\b",
+                ),
+                Keyword,
+            ),
+            (words(("True", "False", "None"), suffix=r"\b"), Keyword.Constant),
+        ],
+        "soft-keywords": [
+            # `match`, `case` and `_` soft keywords
+            (
+                r"(^[ \t]*)"  # at beginning of line + possible indentation
+                r"(match|case)\b"  # a possible keyword
+                r"(?![ \t]*(?:"  # not followed by...
+                r"[:,;=^&|@~)\]}]|(?:" +  # characters and keywords that mean this isn't
+                # pattern matching (but None/True/False is ok)
+                r"|".join(k for k in keyword.kwlist if k[0].islower())
+                + r")\b))",
+                bygroups(Whitespace, Keyword),
+                "soft-keywords-inner",
+            ),
+        ],
+        "soft-keywords-inner": [
+            # optional `_` keyword
+            (r"(\s+)([^\n_]*)(_\b)", bygroups(Whitespace, using(this), Keyword)),
+            default("#pop"),
+        ],
+        "builtins": [
+            (
+                words(
+                    (
+                        "__import__",
+                        "abs",
+                        "aiter",
+                        "all",
+                        "any",
+                        "bin",
+                        "bool",
+                        "bytearray",
+                        "breakpoint",
+                        "bytes",
+                        "callable",
+                        "chr",
+                        "classmethod",
+                        "compile",
+                        "complex",
+                        "delattr",
+                        "dict",
+                        "dir",
+                        "divmod",
+                        "enumerate",
+                        "eval",
+                        "filter",
+                        "float",
+                        "format",
+                        "frozenset",
+                        "getattr",
+                        "globals",
+                        "hasattr",
+                        "hash",
+                        "hex",
+                        "id",
+                        "input",
+                        "int",
+                        "isinstance",
+                        "issubclass",
+                        "iter",
+                        "len",
+                        "list",
+                        "locals",
+                        "map",
+                        "max",
+                        "memoryview",
+                        "min",
+                        "next",
+                        "object",
+                        "oct",
+                        "open",
+                        "ord",
+                        "pow",
+                        "print",
+                        "property",
+                        "range",
+                        "repr",
+                        "reversed",
+                        "round",
+                        "set",
+                        "setattr",
+                        "slice",
+                        "sorted",
+                        "staticmethod",
+                        "str",
+                        "sum",
+                        "super",
+                        "tuple",
+                        "type",
+                        "vars",
+                        "zip",
+                        # Mojo builtin types: https://docs.modular.com/mojo/stdlib/builtin/
+                        "AnyType",
+                        "Coroutine",
+                        "DType",
+                        "Error",
+                        "Int",
+                        "List",
+                        "ListLiteral",
+                        "Scalar",
+                        "Int8",
+                        "UInt8",
+                        "Int16",
+                        "UInt16",
+                        "Int32",
+                        "UInt32",
+                        "Int64",
+                        "UInt64",
+                        "BFloat16",
+                        "Float16",
+                        "Float32",
+                        "Float64",
+                        "SIMD",
+                        "String",
+                        "Tensor",
+                        "Tuple",
+                        "Movable",
+                        "Copyable",
+                        "CollectionElement",
+                    ),
+                    prefix=r"(?<!\.)",
+                    suffix=r"\b",
+                ),
+                Name.Builtin,
+            ),
+            (r"(?<!\.)(self|Ellipsis|NotImplemented|cls)\b", Name.Builtin.Pseudo),
+            (
+                words(
+                    ("Error",),
+                    prefix=r"(?<!\.)",
+                    suffix=r"\b",
+                ),
+                Name.Exception,
+            ),
+        ],
+        "magicfuncs": [
+            (
+                words(
+                    (
+                        "__abs__",
+                        "__add__",
+                        "__aenter__",
+                        "__aexit__",
+                        "__aiter__",
+                        "__and__",
+                        "__anext__",
+                        "__await__",
+                        "__bool__",
+                        "__bytes__",
+                        "__call__",
+                        "__complex__",
+                        "__contains__",
+                        "__del__",
+                        "__delattr__",
+                        "__delete__",
+                        "__delitem__",
+                        "__dir__",
+                        "__divmod__",
+                        "__enter__",
+                        "__eq__",
+                        "__exit__",
+                        "__float__",
+                        "__floordiv__",
+                        "__format__",
+                        "__ge__",
+                        "__get__",
+                        "__getattr__",
+                        "__getattribute__",
+                        "__getitem__",
+                        "__gt__",
+                        "__hash__",
+                        "__iadd__",
+                        "__iand__",
+                        "__ifloordiv__",
+                        "__ilshift__",
+                        "__imatmul__",
+                        "__imod__",
+                        "__imul__",
+                        "__index__",
+                        "__init__",
+                        "__instancecheck__",
+                        "__int__",
+                        "__invert__",
+                        "__ior__",
+                        "__ipow__",
+                        "__irshift__",
+                        "__isub__",
+                        "__iter__",
+                        "__itruediv__",
+                        "__ixor__",
+                        "__le__",
+                        "__len__",
+                        "__length_hint__",
+                        "__lshift__",
+                        "__lt__",
+                        "__matmul__",
+                        "__missing__",
+                        "__mod__",
+                        "__mul__",
+                        "__ne__",
+                        "__neg__",
+                        "__new__",
+                        "__next__",
+                        "__or__",
+                        "__pos__",
+                        "__pow__",
+                        "__prepare__",
+                        "__radd__",
+                        "__rand__",
+                        "__rdivmod__",
+                        "__repr__",
+                        "__reversed__",
+                        "__rfloordiv__",
+                        "__rlshift__",
+                        "__rmatmul__",
+                        "__rmod__",
+                        "__rmul__",
+                        "__ror__",
+                        "__round__",
+                        "__rpow__",
+                        "__rrshift__",
+                        "__rshift__",
+                        "__rsub__",
+                        "__rtruediv__",
+                        "__rxor__",
+                        "__set__",
+                        "__setattr__",
+                        "__setitem__",
+                        "__str__",
+                        "__sub__",
+                        "__subclasscheck__",
+                        "__truediv__",
+                        "__xor__",
+                    ),
+                    suffix=r"\b",
+                ),
+                Name.Function.Magic,
+            ),
+        ],
+        "magicvars": [
+            (
+                words(
+                    (
+                        "__annotations__",
+                        "__bases__",
+                        "__class__",
+                        "__closure__",
+                        "__code__",
+                        "__defaults__",
+                        "__dict__",
+                        "__doc__",
+                        "__file__",
+                        "__func__",
+                        "__globals__",
+                        "__kwdefaults__",
+                        "__module__",
+                        "__mro__",
+                        "__name__",
+                        "__objclass__",
+                        "__qualname__",
+                        "__self__",
+                        "__slots__",
+                        "__weakref__",
+                    ),
+                    suffix=r"\b",
+                ),
+                Name.Variable.Magic,
+            ),
+        ],
+        "numbers": [
+            (
+                r"(\d(?:_?\d)*\.(?:\d(?:_?\d)*)?|(?:\d(?:_?\d)*)?\.\d(?:_?\d)*)"
+                r"([eE][+-]?\d(?:_?\d)*)?",
+                Number.Float,
+            ),
+            (r"\d(?:_?\d)*[eE][+-]?\d(?:_?\d)*j?", Number.Float),
+            (r"0[oO](?:_?[0-7])+", Number.Oct),
+            (r"0[bB](?:_?[01])+", Number.Bin),
+            (r"0[xX](?:_?[a-fA-F0-9])+", Number.Hex),
+            (r"\d(?:_?\d)*", Number.Integer),
+        ],
+        "name": [
+            (r"@" + uni_name, Name.Decorator),
+            (r"@", Operator),  # new matrix multiplication operator
+            (uni_name, Name),
+        ],
+        "varname": [
+            (uni_name, Name.Variable, "#pop"),
+        ],
+        "funcname": [
+            include("magicfuncs"),
+            (uni_name, Name.Function, "#pop"),
+            default("#pop"),
+        ],
+        "classname": [
+            (uni_name, Name.Class, "#pop"),
+        ],
+        "structname": [
+            (uni_name, Name.Struct, "#pop"),
+        ],
+        "import": [
+            (r"(\s+)(as)(\s+)", bygroups(Whitespace, Keyword, Whitespace)),
+            (r"\.", Name.Namespace),
+            (uni_name, Name.Namespace),
+            (r"(\s*)(,)(\s*)", bygroups(Whitespace, Operator, Whitespace)),
+            default("#pop"),  # all else: go back
+        ],
+        "fromimport": [
+            (r"(\s+)(import)\b", bygroups(Whitespace, Keyword.Namespace), "#pop"),
+            (r"\.", Name.Namespace),
+            # if None occurs here, it's "raise x from None", since None can
+            # never be a module name
+            (r"None\b", Keyword.Constant, "#pop"),
+            (uni_name, Name.Namespace),
+            default("#pop"),
+        ],
+        "rfstringescape": [
+            (r"\{\{", String.Escape),
+            (r"\}\}", String.Escape),
+        ],
+        "fstringescape": [
+            include("rfstringescape"),
+            include("stringescape"),
+        ],
+        "bytesescape": [
+            (r'\\([\\abfnrtv"\']|\n|x[a-fA-F0-9]{2}|[0-7]{1,3})', String.Escape)
+        ],
+        "stringescape": [
+            (r"\\(N\{.*?\}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8})", String.Escape),
+            include("bytesescape"),
+        ],
+        "fstrings-single": fstring_rules(String.Single),
+        "fstrings-double": fstring_rules(String.Double),
+        "strings-single": innerstring_rules(String.Single),
+        "strings-double": innerstring_rules(String.Double),
+        "dqf": [
+            (r'"', String.Double, "#pop"),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include("fstrings-double"),
+        ],
+        "sqf": [
+            (r"'", String.Single, "#pop"),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include("fstrings-single"),
+        ],
+        "dqs": [
+            (r'"', String.Double, "#pop"),
+            (r'\\\\|\\"|\\\n', String.Escape),  # included here for raw strings
+            include("strings-double"),
+        ],
+        "sqs": [
+            (r"'", String.Single, "#pop"),
+            (r"\\\\|\\'|\\\n", String.Escape),  # included here for raw strings
+            include("strings-single"),
+        ],
+        "tdqf": [
+            (r'"""', String.Double, "#pop"),
+            include("fstrings-double"),
+            (r"\n", String.Double),
+        ],
+        "tsqf": [
+            (r"'''", String.Single, "#pop"),
+            include("fstrings-single"),
+            (r"\n", String.Single),
+        ],
+        "tdqs": [
+            (r'"""', String.Double, "#pop"),
+            include("strings-double"),
+            (r"\n", String.Double),
+        ],
+        "tsqs": [
+            (r"'''", String.Single, "#pop"),
+            include("strings-single"),
+            (r"\n", String.Single),
+        ],
+    }
+
+    def analyse_text(text):
+        # TODO supported?
+        if shebang_matches(text, r"mojo?"):
+            return 1.0
+        if "import " in text[:1000]:
+            return 0.9
+        return 0
diff --git a/libs/pygments/lexers/monte.py b/libs/pygments/lexers/monte.py
index 18f5a036c..c01d2dc6c 100644
--- a/libs/pygments/lexers/monte.py
+++ b/libs/pygments/lexers/monte.py
@@ -4,7 +4,7 @@
 
     Lexer for the Monte programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -78,13 +78,12 @@ _safeScope = [
 class MonteLexer(RegexLexer):
     """
     Lexer for the Monte programming language.
-
-    .. versionadded:: 2.2
     """
     name = 'Monte'
     url = 'https://monte.readthedocs.io/'
     aliases = ['monte']
     filenames = ['*.mt']
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/mosel.py b/libs/pygments/lexers/mosel.py
index f3c86cc57..426c9a145 100644
--- a/libs/pygments/lexers/mosel.py
+++ b/libs/pygments/lexers/mosel.py
@@ -5,7 +5,7 @@
     Lexers for the mosel language.
     http://www.fico.com/en/products/fico-xpress-optimization
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -391,12 +391,12 @@ FUNCTIONS = (
 class MoselLexer(RegexLexer):
     """
     For the Mosel optimization language.
-
-    .. versionadded:: 2.6
     """
     name = 'Mosel'
     aliases = ['mosel']
     filenames = ['*.mos']
+    url = 'https://www.fico.com/fico-xpress-optimization/docs/latest/mosel/mosel_lang/dhtml/moselreflang.html'
+    version_added = '2.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/ncl.py b/libs/pygments/lexers/ncl.py
index b1ec1454b..d2f476087 100644
--- a/libs/pygments/lexers/ncl.py
+++ b/libs/pygments/lexers/ncl.py
@@ -4,7 +4,7 @@
 
     Lexers for NCAR Command Language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,14 @@ __all__ = ['NCLLexer']
 class NCLLexer(RegexLexer):
     """
     Lexer for NCL code.
-
-    .. versionadded:: 2.2
     """
     name = 'NCL'
     aliases = ['ncl']
     filenames = ['*.ncl']
     mimetypes = ['text/ncl']
+    url = 'https://www.ncl.ucar.edu'
+    version_added = '2.2'
+
     flags = re.MULTILINE
 
     tokens = {
diff --git a/libs/pygments/lexers/nimrod.py b/libs/pygments/lexers/nimrod.py
index 11f5b936d..365a8dcca 100644
--- a/libs/pygments/lexers/nimrod.py
+++ b/libs/pygments/lexers/nimrod.py
@@ -4,7 +4,7 @@
 
     Lexer for the Nim language (formerly known as Nimrod).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['NimrodLexer']
 class NimrodLexer(RegexLexer):
     """
     For Nim source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Nimrod'
@@ -29,6 +27,7 @@ class NimrodLexer(RegexLexer):
     aliases = ['nimrod', 'nim']
     filenames = ['*.nim', '*.nimrod']
     mimetypes = ['text/x-nim']
+    version_added = '1.5'
 
     flags = re.MULTILINE | re.IGNORECASE
 
@@ -97,15 +96,15 @@ class NimrodLexer(RegexLexer):
             ("'", String.Char, 'chars'),
 
             # Keywords
-            (r'(%s)\b' % underscorize(opWords), Operator.Word),
+            (rf'({underscorize(opWords)})\b', Operator.Word),
             (r'(proc|func|method|macro|template)(\s)(?![(\[\]])',
              bygroups(Keyword, Text.Whitespace), 'funcname'),
-            (r'(%s)\b' % underscorize(keywords), Keyword),
-            (r'(%s)\b' % underscorize(['from', 'import', 'include', 'export']),
+            (rf'({underscorize(keywords)})\b', Keyword),
+            (r'({})\b'.format(underscorize(['from', 'import', 'include', 'export'])),
              Keyword.Namespace),
             (r'(v_?a_?r)\b', Keyword.Declaration),
-            (r'(%s)\b' % underscorize(types), Name.Builtin),
-            (r'(%s)\b' % underscorize(keywordsPseudo), Keyword.Pseudo),
+            (rf'({underscorize(types)})\b', Name.Builtin),
+            (rf'({underscorize(keywordsPseudo)})\b', Keyword.Pseudo),
 
             # Identifiers
             (r'\b((?![_\d])\w)(((?!_)\w)|(_(?!_)\w))*', Name),
diff --git a/libs/pygments/lexers/nit.py b/libs/pygments/lexers/nit.py
index b4e85f304..2d2122c1f 100644
--- a/libs/pygments/lexers/nit.py
+++ b/libs/pygments/lexers/nit.py
@@ -4,7 +4,7 @@
 
     Lexer for the Nit language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['NitLexer']
 class NitLexer(RegexLexer):
     """
     For nit source.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Nit'
     url = 'http://nitlanguage.org'
     aliases = ['nit']
     filenames = ['*.nit']
+    version_added = '2.0'
     tokens = {
         'root': [
             (r'#.*?$', Comment.Single),
diff --git a/libs/pygments/lexers/nix.py b/libs/pygments/lexers/nix.py
index 7ab59bb8c..3fa88c65a 100644
--- a/libs/pygments/lexers/nix.py
+++ b/libs/pygments/lexers/nix.py
@@ -4,7 +4,7 @@
 
     Lexers for the NixOS Nix language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['NixLexer']
 class NixLexer(RegexLexer):
     """
     For the Nix language.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Nix'
@@ -29,6 +27,7 @@ class NixLexer(RegexLexer):
     aliases = ['nixos', 'nix']
     filenames = ['*.nix']
     mimetypes = ['text/x-nix']
+    version_added = '2.0'
 
     keywords = ['rec', 'with', 'let', 'in', 'inherit', 'assert', 'if',
                 'else', 'then', '...']
@@ -51,10 +50,10 @@ class NixLexer(RegexLexer):
             (r'\s+', Text),
 
             # keywords
-            ('(%s)' % '|'.join(re.escape(entry) + '\\b' for entry in keywords), Keyword),
+            ('({})'.format('|'.join(re.escape(entry) + '\\b' for entry in keywords)), Keyword),
 
             # highlight the builtins
-            ('(%s)' % '|'.join(re.escape(entry) + '\\b' for entry in builtins),
+            ('({})'.format('|'.join(re.escape(entry) + '\\b' for entry in builtins)),
              Name.Builtin),
 
             (r'\b(true|false|null)\b', Name.Constant),
@@ -71,7 +70,7 @@ class NixLexer(RegexLexer):
             (r'\<[\w.+-]+(\/[\w.+-]+)*\>', Literal),
 
             # operators
-            ('(%s)' % '|'.join(re.escape(entry) for entry in operators),
+            ('({})'.format('|'.join(re.escape(entry) for entry in operators)),
              Operator),
 
             # word operators
@@ -80,7 +79,7 @@ class NixLexer(RegexLexer):
             (r'\{', Punctuation, 'block'),
 
             # punctuations
-            ('(%s)' % '|'.join(re.escape(entry) for entry in punctuations), Punctuation),
+            ('({})'.format('|'.join(re.escape(entry) for entry in punctuations)), Punctuation),
 
             # strings
             (r'"', String.Double, 'doublequote'),
diff --git a/libs/pygments/lexers/numbair.py b/libs/pygments/lexers/numbair.py
new file mode 100644
index 000000000..435863e13
--- /dev/null
+++ b/libs/pygments/lexers/numbair.py
@@ -0,0 +1,63 @@
+"""
+    pygments.lexers.numbair
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for other Numba Intermediate Representation.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, bygroups, words
+from pygments.token import Whitespace, Name, String,  Punctuation, Keyword, \
+    Operator, Number
+
+__all__ = ["NumbaIRLexer"]
+
+class NumbaIRLexer(RegexLexer):
+    """
+    Lexer for Numba IR
+    """
+    name = 'Numba_IR'
+    url = "https://numba.readthedocs.io/en/stable/developer/architecture.html#stage-2-generate-the-numba-ir"
+    aliases = ['numba_ir', 'numbair']
+    filenames = ['*.numba_ir']
+    mimetypes = ['text/x-numba_ir', 'text/x-numbair']
+    version_added = '2.19'
+
+    identifier = r'\$[a-zA-Z0-9._]+'
+    fun_or_var = r'([a-zA-Z_]+[a-zA-Z0-9]*)'
+
+    tokens = {
+        'root' : [
+            (r'(label)(\ [0-9]+)(:)$',
+                bygroups(Keyword, Name.Label, Punctuation)),
+
+            (r'=', Operator),
+            include('whitespace'),
+            include('keyword'),
+
+            (identifier, Name.Variable),
+            (fun_or_var + r'(\()',
+                bygroups(Name.Function, Punctuation)),
+            (fun_or_var + r'(\=)',
+                bygroups(Name.Attribute, Punctuation)),
+            (fun_or_var, Name.Constant),
+            (r'[0-9]+', Number),
+
+            # <built-in function some>
+            (r'<[^>\n]*>', String),
+
+            (r'[=<>{}\[\]()*.,!\':]|x\b', Punctuation)
+        ],
+
+        'keyword':[
+            (words((
+                'del', 'jump', 'call', 'branch',
+            ), suffix=' '), Keyword),
+        ],
+
+        'whitespace': [
+            (r'(\n|\s)+', Whitespace),
+        ],
+    }
diff --git a/libs/pygments/lexers/oberon.py b/libs/pygments/lexers/oberon.py
index 3aaa76330..61f3c2d28 100644
--- a/libs/pygments/lexers/oberon.py
+++ b/libs/pygments/lexers/oberon.py
@@ -4,7 +4,7 @@
 
     Lexers for Oberon family languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,13 @@ __all__ = ['ComponentPascalLexer']
 class ComponentPascalLexer(RegexLexer):
     """
     For Component Pascal source code.
-
-    .. versionadded:: 2.1
     """
     name = 'Component Pascal'
     aliases = ['componentpascal', 'cp']
     filenames = ['*.cp', '*.cps']
     mimetypes = ['text/x-component-pascal']
+    url = 'https://blackboxframework.org'
+    version_added = '2.1'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/objective.py b/libs/pygments/lexers/objective.py
index 2e4332adf..899c2c44c 100644
--- a/libs/pygments/lexers/objective.py
+++ b/libs/pygments/lexers/objective.py
@@ -4,7 +4,7 @@
 
     Lexers for Objective-C family languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -13,7 +13,7 @@ import re
 from pygments.lexer import RegexLexer, include, bygroups, using, this, words, \
     inherit, default
 from pygments.token import Text, Keyword, Name, String, Operator, \
-    Number, Punctuation, Literal, Comment
+    Number, Punctuation, Literal, Comment, Whitespace
 
 from pygments.lexers.c_cpp import CLexer, CppLexer
 
@@ -201,6 +201,7 @@ class ObjectiveCLexer(objective(CLexer)):
     aliases = ['objective-c', 'objectivec', 'obj-c', 'objc']
     filenames = ['*.m', '*.h']
     mimetypes = ['text/x-objective-c']
+    version_added = ''
     priority = 0.05    # Lower than C
 
 
@@ -213,20 +214,20 @@ class ObjectiveCppLexer(objective(CppLexer)):
     aliases = ['objective-c++', 'objectivec++', 'obj-c++', 'objc++']
     filenames = ['*.mm', '*.hh']
     mimetypes = ['text/x-objective-c++']
+    version_added = ''
     priority = 0.05    # Lower than C++
 
 
 class LogosLexer(ObjectiveCppLexer):
     """
     For Logos + Objective-C source code with preprocessor directives.
-
-    .. versionadded:: 1.6
     """
 
     name = 'Logos'
     aliases = ['logos']
     filenames = ['*.x', '*.xi', '*.xm', '*.xmi']
     mimetypes = ['text/x-logos']
+    version_added = '1.6'
     priority = 0.25
 
     tokens = {
@@ -283,20 +284,19 @@ class LogosLexer(ObjectiveCppLexer):
 class SwiftLexer(RegexLexer):
     """
     For Swift source.
-
-    .. versionadded:: 2.0
     """
     name = 'Swift'
     url = 'https://www.swift.org/'
     filenames = ['*.swift']
     aliases = ['swift']
     mimetypes = ['text/x-swift']
+    version_added = '2.0'
 
     tokens = {
         'root': [
             # Whitespace and Comments
             (r'\n', Text),
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'//', Comment.Single, 'comment-single'),
             (r'/\*', Comment.Multiline, 'comment-multi'),
             (r'#(if|elseif|else|endif|available)\b', Comment.Preproc, 'preproc'),
@@ -403,6 +403,7 @@ class SwiftLexer(RegexLexer):
              r'\.[0-9_]*|[eE][+\-]?[0-9_]+)', Number.Float),
             (r'[0-9][0-9_]*', Number.Integer),
             # String Literal
+            (r'"""', String, 'string-multi'),
             (r'"', String, 'string'),
 
             # Operators and Punctuation
@@ -436,11 +437,11 @@ class SwiftLexer(RegexLexer):
              r'|#(?:file|line|column|function))\b', Keyword.Constant),
             (r'import\b', Keyword.Declaration, 'module'),
             (r'(class|enum|extension|struct|protocol)(\s+)([a-zA-Z_]\w*)',
-             bygroups(Keyword.Declaration, Text, Name.Class)),
+             bygroups(Keyword.Declaration, Whitespace, Name.Class)),
             (r'(func)(\s+)([a-zA-Z_]\w*)',
-             bygroups(Keyword.Declaration, Text, Name.Function)),
+             bygroups(Keyword.Declaration, Whitespace, Name.Function)),
             (r'(var|let)(\s+)([a-zA-Z_]\w*)', bygroups(Keyword.Declaration,
-             Text, Name.Variable)),
+             Whitespace, Name.Variable)),
             (words((
                 'actor', 'associatedtype', 'class', 'deinit', 'enum', 'extension', 'func', 'import',
                 'init', 'internal', 'let', 'operator', 'private', 'protocol', 'public',
@@ -454,31 +455,38 @@ class SwiftLexer(RegexLexer):
 
         # Nested
         'comment-single': [
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
             include('comment'),
-            (r'[^\n]', Comment.Single)
+            (r'[^\n]+', Comment.Single)
         ],
         'comment-multi': [
             include('comment'),
-            (r'[^*/]', Comment.Multiline),
+            (r'[^*/]+', Comment.Multiline),
             (r'/\*', Comment.Multiline, '#push'),
             (r'\*/', Comment.Multiline, '#pop'),
-            (r'[*/]', Comment.Multiline)
+            (r'[*/]+', Comment.Multiline)
         ],
         'module': [
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
             (r'[a-zA-Z_]\w*', Name.Class),
             include('root')
         ],
         'preproc': [
-            (r'\n', Text, '#pop'),
+            (r'\n', Whitespace, '#pop'),
             include('keywords'),
             (r'[A-Za-z]\w*', Comment.Preproc),
             include('root')
         ],
         'string': [
-            (r'\\\(', String.Interpol, 'string-intp'),
             (r'"', String, '#pop'),
+            include("string-common"),
+        ],
+        'string-multi': [
+            (r'"""', String, '#pop'),
+            include("string-common"),
+        ],
+        'string-common': [
+            (r'\\\(', String.Interpol, 'string-intp'),
             (r"""\\['"\\nrt]|\\x[0-9a-fA-F]{2}|\\[0-7]{1,3}"""
              r"""|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}""", String.Escape),
             (r'[^\\"]+', String),
diff --git a/libs/pygments/lexers/ooc.py b/libs/pygments/lexers/ooc.py
index c4600eaee..8a990801a 100644
--- a/libs/pygments/lexers/ooc.py
+++ b/libs/pygments/lexers/ooc.py
@@ -4,7 +4,7 @@
 
     Lexers for the Ooc language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['OocLexer']
 class OocLexer(RegexLexer):
     """
     For Ooc source code
-
-    .. versionadded:: 1.2
     """
     name = 'Ooc'
-    url = 'http://ooc-lang.org/'
+    url = 'https://ooc-lang.github.io/'
     aliases = ['ooc']
     filenames = ['*.ooc']
     mimetypes = ['text/x-ooc']
+    version_added = '1.2'
 
     tokens = {
         'root': [
@@ -43,7 +42,7 @@ class OocLexer(RegexLexer):
             (r'(func)((?:[ \t]|\\\n)+)(~[a-z_]\w*)',
              bygroups(Keyword, Text, Name.Function)),
             (r'\bfunc\b', Keyword),
-            # Note: %= and ^= not listed on http://ooc-lang.org/syntax
+            # Note: %= not listed on https://ooc-lang.github.io/docs/lang/operators/
             (r'//.*', Comment),
             (r'(?s)/\*.*?\*/', Comment.Multiline),
             (r'(==?|\+=?|-[=>]?|\*=?|/=?|:=|!=?|%=?|\?|>{1,3}=?|<{1,3}=?|\.\.|'
diff --git a/libs/pygments/lexers/openscad.py b/libs/pygments/lexers/openscad.py
index de8fdaf61..b06de227c 100644
--- a/libs/pygments/lexers/openscad.py
+++ b/libs/pygments/lexers/openscad.py
@@ -4,7 +4,7 @@
 
     Lexers for the OpenSCAD languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,14 +16,13 @@ __all__ = ['OpenScadLexer']
 
 class OpenScadLexer(RegexLexer):
     """For openSCAD code.
-
-    .. versionadded:: 2.16
     """
     name = "OpenSCAD"
     url = "https://openscad.org/"
     aliases = ["openscad"]
     filenames = ["*.scad"]
     mimetypes = ["application/x-openscad"]
+    version_added = '2.16'
 
     tokens = {
         "root": [
diff --git a/libs/pygments/lexers/other.py b/libs/pygments/lexers/other.py
index f2c07d7ed..2b7dfb4ab 100644
--- a/libs/pygments/lexers/other.py
+++ b/libs/pygments/lexers/other.py
@@ -4,10 +4,11 @@
 
     Just export lexer classes previously contained in this module.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.sql import SqlLexer, MySqlLexer, SqliteConsoleLexer
 from pygments.lexers.shell import BashLexer, BashSessionLexer, BatchLexer, \
     TcshLexer
diff --git a/libs/pygments/lexers/parasail.py b/libs/pygments/lexers/parasail.py
index 5a7238ec7..150d6a9c4 100644
--- a/libs/pygments/lexers/parasail.py
+++ b/libs/pygments/lexers/parasail.py
@@ -4,7 +4,7 @@
 
     Lexer for ParaSail.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['ParaSailLexer']
 class ParaSailLexer(RegexLexer):
     """
     For ParaSail source code.
-
-    .. versionadded:: 2.1
     """
 
     name = 'ParaSail'
@@ -29,6 +27,7 @@ class ParaSailLexer(RegexLexer):
     aliases = ['parasail']
     filenames = ['*.psi', '*.psl']
     mimetypes = ['text/x-parasail']
+    version_added = '2.1'
 
     flags = re.MULTILINE
 
diff --git a/libs/pygments/lexers/parsers.py b/libs/pygments/lexers/parsers.py
index 0415ac6a7..7a4ed9d1d 100644
--- a/libs/pygments/lexers/parsers.py
+++ b/libs/pygments/lexers/parsers.py
@@ -4,7 +4,7 @@
 
     Lexers for parser generators.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -38,14 +38,13 @@ class RagelLexer(RegexLexer):
     :class:`RagelEmbeddedLexer` instead (or one of the
     language-specific subclasses).
 
-    .. versionadded:: 1.1
-
     """
 
     name = 'Ragel'
     url = 'http://www.colm.net/open-source/ragel/'
     aliases = ['ragel']
     filenames = []
+    version_added = '1.1'
 
     tokens = {
         'whitespace': [
@@ -133,13 +132,13 @@ class RagelEmbeddedLexer(RegexLexer):
 
     This will only highlight Ragel statements. If you want host language
     highlighting then call the language-specific Ragel lexer.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Embedded Ragel'
     aliases = ['ragel-em']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     tokens = {
         'root': [
@@ -213,13 +212,13 @@ class RagelEmbeddedLexer(RegexLexer):
 class RagelRubyLexer(DelegatingLexer):
     """
     A lexer for Ragel in a Ruby host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in Ruby Host'
     aliases = ['ragel-ruby', 'ragel-rb']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(RubyLexer, RagelEmbeddedLexer, **options)
@@ -231,13 +230,13 @@ class RagelRubyLexer(DelegatingLexer):
 class RagelCLexer(DelegatingLexer):
     """
     A lexer for Ragel in a C host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in C Host'
     aliases = ['ragel-c']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(CLexer, RagelEmbeddedLexer, **options)
@@ -249,13 +248,13 @@ class RagelCLexer(DelegatingLexer):
 class RagelDLexer(DelegatingLexer):
     """
     A lexer for Ragel in a D host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in D Host'
     aliases = ['ragel-d']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(DLexer, RagelEmbeddedLexer, **options)
@@ -267,13 +266,13 @@ class RagelDLexer(DelegatingLexer):
 class RagelCppLexer(DelegatingLexer):
     """
     A lexer for Ragel in a C++ host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in CPP Host'
     aliases = ['ragel-cpp']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(CppLexer, RagelEmbeddedLexer, **options)
@@ -285,13 +284,13 @@ class RagelCppLexer(DelegatingLexer):
 class RagelObjectiveCLexer(DelegatingLexer):
     """
     A lexer for Ragel in an Objective C host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in Objective C Host'
     aliases = ['ragel-objc']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(ObjectiveCLexer, RagelEmbeddedLexer, **options)
@@ -303,13 +302,13 @@ class RagelObjectiveCLexer(DelegatingLexer):
 class RagelJavaLexer(DelegatingLexer):
     """
     A lexer for Ragel in a Java host file.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Ragel in Java Host'
     aliases = ['ragel-java']
     filenames = ['*.rl']
+    url = 'http://www.colm.net/open-source/ragel/'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(JavaLexer, RagelEmbeddedLexer, **options)
@@ -320,18 +319,16 @@ class RagelJavaLexer(DelegatingLexer):
 
 class AntlrLexer(RegexLexer):
     """
-    Generic `ANTLR`_ Lexer.
+    Generic ANTLR Lexer.
     Should not be called directly, instead
     use DelegatingLexer for your target language.
-
-    .. versionadded:: 1.1
-
-    .. _ANTLR: http://www.antlr.org/
     """
 
     name = 'ANTLR'
     aliases = ['antlr']
     filenames = []
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     _id = r'[A-Za-z]\w*'
     _TOKEN_REF = r'[A-Z]\w*'
@@ -516,13 +513,13 @@ class AntlrLexer(RegexLexer):
 class AntlrCppLexer(DelegatingLexer):
     """
     ANTLR with C++ Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With CPP Target'
     aliases = ['antlr-cpp']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(CppLexer, AntlrLexer, **options)
@@ -535,13 +532,13 @@ class AntlrCppLexer(DelegatingLexer):
 class AntlrObjectiveCLexer(DelegatingLexer):
     """
     ANTLR with Objective-C Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With ObjectiveC Target'
     aliases = ['antlr-objc']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(ObjectiveCLexer, AntlrLexer, **options)
@@ -554,13 +551,13 @@ class AntlrObjectiveCLexer(DelegatingLexer):
 class AntlrCSharpLexer(DelegatingLexer):
     """
     ANTLR with C# Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With C# Target'
     aliases = ['antlr-csharp', 'antlr-c#']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(CSharpLexer, AntlrLexer, **options)
@@ -573,13 +570,13 @@ class AntlrCSharpLexer(DelegatingLexer):
 class AntlrPythonLexer(DelegatingLexer):
     """
     ANTLR with Python Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With Python Target'
     aliases = ['antlr-python']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(PythonLexer, AntlrLexer, **options)
@@ -592,13 +589,13 @@ class AntlrPythonLexer(DelegatingLexer):
 class AntlrJavaLexer(DelegatingLexer):
     """
     ANTLR with Java Target
-
-    .. versionadded:: 1.
     """
 
     name = 'ANTLR With Java Target'
     aliases = ['antlr-java']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(JavaLexer, AntlrLexer, **options)
@@ -611,13 +608,13 @@ class AntlrJavaLexer(DelegatingLexer):
 class AntlrRubyLexer(DelegatingLexer):
     """
     ANTLR with Ruby Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With Ruby Target'
     aliases = ['antlr-ruby', 'antlr-rb']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(RubyLexer, AntlrLexer, **options)
@@ -630,13 +627,13 @@ class AntlrRubyLexer(DelegatingLexer):
 class AntlrPerlLexer(DelegatingLexer):
     """
     ANTLR with Perl Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With Perl Target'
     aliases = ['antlr-perl']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(PerlLexer, AntlrLexer, **options)
@@ -649,13 +646,13 @@ class AntlrPerlLexer(DelegatingLexer):
 class AntlrActionScriptLexer(DelegatingLexer):
     """
     ANTLR with ActionScript Target
-
-    .. versionadded:: 1.1
     """
 
     name = 'ANTLR With ActionScript Target'
     aliases = ['antlr-actionscript', 'antlr-as']
     filenames = ['*.G', '*.g']
+    url = 'https://www.antlr.org'
+    version_added = '1.1'
 
     def __init__(self, **options):
         from pygments.lexers.actionscript import ActionScriptLexer
@@ -737,14 +734,14 @@ class TreetopBaseLexer(RegexLexer):
 
 class TreetopLexer(DelegatingLexer):
     """
-    A lexer for `Treetop <http://treetop.rubyforge.org/>`_ grammars.
-
-    .. versionadded:: 1.6
+    A lexer for Treetop grammars.
     """
 
     name = 'Treetop'
     aliases = ['treetop']
     filenames = ['*.treetop', '*.tt']
+    url = 'https://cjheath.github.io/treetop'
+    version_added = '1.6'
 
     def __init__(self, **options):
         super().__init__(RubyLexer, TreetopBaseLexer, **options)
@@ -753,16 +750,16 @@ class TreetopLexer(DelegatingLexer):
 class EbnfLexer(RegexLexer):
     """
     Lexer for `ISO/IEC 14977 EBNF
-    <http://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_Form>`_
+    <https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_Form>`_
     grammars.
-
-    .. versionadded:: 2.0
     """
 
     name = 'EBNF'
     aliases = ['ebnf']
     filenames = ['*.ebnf']
     mimetypes = ['text/x-ebnf']
+    url = 'https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_Form'
+    version_added = '2.0'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/pascal.py b/libs/pygments/lexers/pascal.py
index 34df19215..5f40dcc86 100644
--- a/libs/pygments/lexers/pascal.py
+++ b/libs/pygments/lexers/pascal.py
@@ -4,7 +4,7 @@
 
     Lexers for Pascal family languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -12,12 +12,12 @@ import re
 
 from pygments.lexer import Lexer
 from pygments.util import get_bool_opt, get_list_opt
-from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
+from pygments.token import Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Error, Whitespace
 from pygments.scanner import Scanner
 
 # compatibility import
-from pygments.lexers.modula2 import Modula2Lexer
+from pygments.lexers.modula2 import Modula2Lexer # noqa: F401
 
 __all__ = ['DelphiLexer', 'PortugolLexer']
 
@@ -29,6 +29,7 @@ class PortugolLexer(Lexer):
     filenames = ['*.alg', '*.portugol']
     mimetypes = []
     url = "https://www.apoioinformatica.inf.br/produtos/visualg/linguagem"
+    version_added = ''
 
     def __init__(self, **options):
         Lexer.__init__(self, **options)
@@ -60,6 +61,8 @@ class DelphiLexer(Lexer):
     aliases = ['delphi', 'pas', 'pascal', 'objectpascal']
     filenames = ['*.pas', '*.dpr']
     mimetypes = ['text/x-pascal']
+    url = 'https://www.embarcadero.com/products/delphi'
+    version_added = ''
 
     TURBO_PASCAL_KEYWORDS = (
         'absolute', 'and', 'array', 'asm', 'begin', 'break', 'case',
diff --git a/libs/pygments/lexers/pawn.py b/libs/pygments/lexers/pawn.py
index 36b48fcbf..99d9c963d 100644
--- a/libs/pygments/lexers/pawn.py
+++ b/libs/pygments/lexers/pawn.py
@@ -4,7 +4,7 @@
 
     Lexers for the Pawn languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,13 +19,13 @@ __all__ = ['SourcePawnLexer', 'PawnLexer']
 class SourcePawnLexer(RegexLexer):
     """
     For SourcePawn source code with preprocessor directives.
-
-    .. versionadded:: 1.6
     """
     name = 'SourcePawn'
     aliases = ['sp']
     filenames = ['*.sp']
     mimetypes = ['text/x-sourcepawn']
+    url = 'https://github.com/alliedmodders/sourcepawn'
+    version_added = '1.6'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//.*?\n|/\*.*?\*/)+'
@@ -129,14 +129,14 @@ class SourcePawnLexer(RegexLexer):
 class PawnLexer(RegexLexer):
     """
     For Pawn source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Pawn'
     aliases = ['pawn']
     filenames = ['*.p', '*.pwn', '*.inc']
     mimetypes = ['text/x-pawn']
+    url = 'https://www.compuphase.com/pawn/pawn.htm'
+    version_added = '2.0'
 
     #: optional Comment or Whitespace
     _ws = r'(?:\s|//.*?\n|/[*][\w\W]*?[*]/)+'
diff --git a/libs/pygments/lexers/pddl.py b/libs/pygments/lexers/pddl.py
new file mode 100644
index 000000000..77aa75362
--- /dev/null
+++ b/libs/pygments/lexers/pddl.py
@@ -0,0 +1,82 @@
+"""
+    pygments.lexers.pddl
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for the Planning Domain Definition Language.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+
+from pygments.lexer import RegexLexer, words, include
+from pygments.token import Punctuation, Keyword, Whitespace, Name, Comment, \
+    Operator, Number
+
+
+__all__ = ['PddlLexer']
+
+
+class PddlLexer(RegexLexer):
+    """
+    A PDDL lexer.
+
+    It should support up to PDDL 3.1.
+    """
+
+    name = 'PDDL'
+    aliases = ['pddl']
+    filenames = ['*.pddl']
+    # there doesn't really seem to be a PDDL homepage.
+    url = 'https://en.wikipedia.org/wiki/Planning_Domain_Definition_Language'
+    version_added = '2.19'
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            (r';.*$', Comment.Singleline),
+            include('keywords'),
+            include('builtins'),
+            (r'[()]', Punctuation),
+            (r'[=/*+><-]', Operator),
+            (r'[a-zA-Z][a-zA-Z0-9_-]*', Name),
+            (r'\?[a-zA-Z][a-zA-Z0-9_-]*', Name.Variable),
+            (r'[0-9]+\.[0-9]+', Number.Float),
+            (r'[0-9]+', Number.Integer),
+        ],
+        'keywords': [
+            (words((
+                ':requirements', ':types', ':constants',
+                ':predicates', ':functions', ':action', ':agent',
+                ':parameters', ':precondition', ':effect',
+                ':durative-action', ':duration', ':condition',
+                ':derived', ':domain', ':objects', ':init',
+                ':goal', ':metric', ':length', ':serial', ':parallel',
+                # the following are requirements
+                ':strips', ':typing', ':negative-preconditions',
+                ':disjunctive-preconditions', ':equality',
+                ':existential-preconditions', ':universal-preconditions',
+                ':conditional-effects', ':fluents', ':numeric-fluents',
+                ':object-fluents', ':adl', ':durative-actions',
+                ':continuous-effects', ':derived-predicates',
+                ':time-intial-literals', ':preferences',
+                ':constraints', ':action-costs', ':multi-agent',
+                ':unfactored-privacy', ':factored-privacy',
+                ':non-deterministic'
+                ), suffix=r'\b'), Keyword)
+        ],
+        'builtins': [
+            (words((
+                'define', 'domain', 'object', 'either', 'and',
+                'forall', 'preference', 'imply', 'or', 'exists',
+                'not', 'when', 'assign', 'scale-up', 'scale-down',
+                'increase', 'decrease', 'at', 'over', 'start',
+                'end', 'all', 'problem', 'always', 'sometime',
+                'within', 'at-most-once', 'sometime-after',
+                'sometime-before', 'always-within', 'hold-during',
+                'hold-after', 'minimize', 'maximize',
+                'total-time', 'is-violated'), suffix=r'\b'),
+                Name.Builtin)
+        ]
+    }
+
diff --git a/libs/pygments/lexers/perl.py b/libs/pygments/lexers/perl.py
index 88c6486a6..33f91f580 100644
--- a/libs/pygments/lexers/perl.py
+++ b/libs/pygments/lexers/perl.py
@@ -4,7 +4,7 @@
 
     Lexers for Perl, Raku and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -29,6 +29,7 @@ class PerlLexer(RegexLexer):
     aliases = ['perl', 'pl']
     filenames = ['*.pl', '*.pm', '*.t', '*.perl']
     mimetypes = ['text/x-perl', 'application/x-perl']
+    version_added = ''
 
     flags = re.DOTALL | re.MULTILINE
     # TODO: give this to a perl guy who knows how to parse perl...
@@ -225,8 +226,6 @@ class PerlLexer(RegexLexer):
 class Perl6Lexer(ExtendedRegexLexer):
     """
     For Raku (a.k.a. Perl 6) source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Perl6'
@@ -236,6 +235,7 @@ class Perl6Lexer(ExtendedRegexLexer):
                  '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod',
                  '*.rakutest', '*.rakudoc']
     mimetypes = ['text/x-perl6', 'application/x-perl6']
+    version_added = '2.0'
     flags = re.MULTILINE | re.DOTALL
 
     PERL6_IDENTIFIER_RANGE = r"['\w:-]"
diff --git a/libs/pygments/lexers/phix.py b/libs/pygments/lexers/phix.py
index fb08b1dc7..f0b03775e 100644
--- a/libs/pygments/lexers/phix.py
+++ b/libs/pygments/lexers/phix.py
@@ -4,7 +4,7 @@
 
     Lexers for Phix.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,8 +21,6 @@ class PhixLexer(RegexLexer):
     """
     Pygments Lexer for Phix files (.exw).
     See http://phix.x10.mx
-
-    .. versionadded:: 2.14.0
     """
 
     name = 'Phix'
@@ -30,6 +28,7 @@ class PhixLexer(RegexLexer):
     aliases = ['phix']
     filenames = ['*.exw']
     mimetypes = ['text/x-phix']
+    version_added = '2.14'
 
     flags = re.MULTILINE    # nb: **NOT** re.DOTALL! (totally spanners comment handling)
 
diff --git a/libs/pygments/lexers/php.py b/libs/pygments/lexers/php.py
index a0a0021aa..82d4aeb3d 100644
--- a/libs/pygments/lexers/php.py
+++ b/libs/pygments/lexers/php.py
@@ -4,7 +4,7 @@
 
     Lexers for PHP and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -25,14 +25,13 @@ class ZephirLexer(RegexLexer):
 
     Zephir is a compiled high level language aimed
     to the creation of C-extensions for PHP.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Zephir'
     url = 'http://zephir-lang.com/'
     aliases = ['zephir']
     filenames = ['*.zep']
+    version_added = '2.0'
 
     zephir_keywords = ['fetch', 'echo', 'isset', 'empty']
     zephir_type = ['bit', 'bits', 'string']
@@ -97,12 +96,11 @@ class PsyshConsoleLexer(Lexer):
         => Closure($name): string {#2371 …3}
         >>> $greeting('World')
         => "Hello, World"
-
-    .. versionadded:: 2.7
     """
     name = 'PsySH console session for PHP'
     url = 'https://psysh.org/'
     aliases = ['psysh']
+    version_added = '2.7'
 
     def __init__(self, **options):
         options['startinline'] = True
@@ -172,6 +170,7 @@ class PhpLexer(RegexLexer):
     aliases = ['php', 'php3', 'php4', 'php5']
     filenames = ['*.php', '*.php[345]', '*.inc']
     mimetypes = ['text/x-php']
+    version_added = ''
 
     # Note that a backslash is included, PHP uses a backslash as a namespace
     # separator.
diff --git a/libs/pygments/lexers/pointless.py b/libs/pygments/lexers/pointless.py
index eb73b2a79..adedb757d 100644
--- a/libs/pygments/lexers/pointless.py
+++ b/libs/pygments/lexers/pointless.py
@@ -4,7 +4,7 @@
 
     Lexers for Pointless.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['PointlessLexer']
 class PointlessLexer(RegexLexer):
     """
     For Pointless source code.
-
-    .. versionadded:: 2.7
     """
 
     name = 'Pointless'
     url = 'https://ptls.dev'
     aliases = ['pointless']
     filenames = ['*.ptls']
+    version_added = '2.7'
 
     ops = words([
         "+", "-", "*", "/", "**", "%", "+=", "-=", "*=",
diff --git a/libs/pygments/lexers/pony.py b/libs/pygments/lexers/pony.py
index 03adc5fd0..055423a46 100644
--- a/libs/pygments/lexers/pony.py
+++ b/libs/pygments/lexers/pony.py
@@ -4,7 +4,7 @@
 
     Lexers for Pony and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,13 @@ __all__ = ['PonyLexer']
 class PonyLexer(RegexLexer):
     """
     For Pony source code.
-
-    .. versionadded:: 2.4
     """
 
     name = 'Pony'
     aliases = ['pony']
     filenames = ['*.pony']
+    url = 'https://www.ponylang.io'
+    version_added = '2.4'
 
     _caps = r'(iso|trn|ref|val|box|tag)'
 
diff --git a/libs/pygments/lexers/praat.py b/libs/pygments/lexers/praat.py
index c8533a65c..054f5b61e 100644
--- a/libs/pygments/lexers/praat.py
+++ b/libs/pygments/lexers/praat.py
@@ -4,7 +4,7 @@
 
     Lexer for Praat
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['PraatLexer']
 class PraatLexer(RegexLexer):
     """
     For Praat scripts.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Praat'
     url = 'http://www.praat.org'
     aliases = ['praat']
     filenames = ['*.praat', '*.proc', '*.psc']
+    version_added = '2.1'
 
     keywords = (
         'if', 'then', 'else', 'elsif', 'elif', 'endif', 'fi', 'for', 'from', 'to',
diff --git a/libs/pygments/lexers/procfile.py b/libs/pygments/lexers/procfile.py
index 4f9b59c35..32619804f 100644
--- a/libs/pygments/lexers/procfile.py
+++ b/libs/pygments/lexers/procfile.py
@@ -4,7 +4,7 @@
 
     Lexer for Procfile file format.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,12 @@ class ProcfileLexer(RegexLexer):
 
     The format is used to run processes on Heroku or is used by Foreman or
     Honcho tools.
-
-    .. versionadded:: 2.10
     """
     name = 'Procfile'
     url = 'https://devcenter.heroku.com/articles/procfile#procfile-format'
     aliases = ['procfile']
     filenames = ['Procfile']
+    version_added = '2.10'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/prolog.py b/libs/pygments/lexers/prolog.py
index 37c1e9c7e..7bf951c1c 100644
--- a/libs/pygments/lexers/prolog.py
+++ b/libs/pygments/lexers/prolog.py
@@ -4,7 +4,7 @@
 
     Lexers for Prolog and Prolog-like languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -25,6 +25,8 @@ class PrologLexer(RegexLexer):
     aliases = ['prolog']
     filenames = ['*.ecl', '*.prolog', '*.pro', '*.pl']
     mimetypes = ['text/x-prolog']
+    url = 'https://en.wikipedia.org/wiki/Prolog'
+    version_added = ''
 
     tokens = {
         'root': [
@@ -89,8 +91,6 @@ class PrologLexer(RegexLexer):
 class LogtalkLexer(RegexLexer):
     """
     For Logtalk source code.
-
-    .. versionadded:: 0.10
     """
 
     name = 'Logtalk'
@@ -98,6 +98,7 @@ class LogtalkLexer(RegexLexer):
     aliases = ['logtalk']
     filenames = ['*.lgt', '*.logtalk']
     mimetypes = ['text/x-logtalk']
+    version_added = '0.10'
 
     tokens = {
         'root': [
@@ -148,7 +149,7 @@ class LogtalkLexer(RegexLexer):
             # Control constructs
             (r'(ca(ll|tch)|throw)(?=[(])', Keyword),
             (r'(fa(il|lse)|true|(instantiation|system)_error)\b', Keyword),
-            (r'(type|domain|existence|permission|representation|evaluation|resource|syntax)_error(?=[(])', Keyword),
+            (r'(uninstantiation|type|domain|existence|permission|representation|evaluation|resource|syntax)_error(?=[(])', Keyword),
             # All solutions
             (r'((bag|set)of|f(ind|or)all)(?=[(])', Keyword),
             # Multi-threading predicates
@@ -229,13 +230,13 @@ class LogtalkLexer(RegexLexer):
             (r'[?@]', Operator),
             # Existential quantifier
             (r'\^', Operator),
-            # Strings
-            (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
             # Punctuation
             (r'[()\[\],.|]', Text),
             # Atoms
             (r"[a-z][a-zA-Z0-9_]*", Text),
             (r"'", String, 'quoted_atom'),
+            # Double-quoted terms
+            (r'"', String, 'double_quoted_term'),
         ],
 
         'quoted_atom': [
@@ -246,6 +247,14 @@ class LogtalkLexer(RegexLexer):
             (r'\\', String),
         ],
 
+        'double_quoted_term': [
+            (r'""', String),
+            (r'"', String, '#pop'),
+            (r'\\([\\abfnrtv"\']|(x[a-fA-F0-9]+|[0-7]+)\\)', String.Escape),
+            (r'[^\\"\n]+', String),
+            (r'\\', String),
+        ],
+
         'directive': [
             # Conditional compilation directives
             (r'(el)?if(?=[(])', Keyword, 'root'),
@@ -279,8 +288,8 @@ class LogtalkLexer(RegexLexer):
             # Atoms
             (r"[a-z][a-zA-Z0-9_]*", Text),
             (r"'", String, 'quoted_atom'),
-            # Strings
-            (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
+            # Double-quoted terms
+            (r'"', String, 'double_quoted_term'),
             # End of entity-opening directive
             (r'([)]\.)', Text, 'root'),
             # Scope operator
diff --git a/libs/pygments/lexers/promql.py b/libs/pygments/lexers/promql.py
index b6d2d666a..cad3c254a 100644
--- a/libs/pygments/lexers/promql.py
+++ b/libs/pygments/lexers/promql.py
@@ -4,7 +4,7 @@
 
     Lexer for Prometheus Query Language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -29,6 +29,7 @@ class PromQLLexer(RegexLexer):
     url = 'https://prometheus.io/docs/prometheus/latest/querying/basics/'
     aliases = ["promql"]
     filenames = ["*.promql"]
+    version_added = ''
 
     base_keywords = (
         words(
diff --git a/libs/pygments/lexers/prql.py b/libs/pygments/lexers/prql.py
index 4c2f12ef3..ee95d2d47 100644
--- a/libs/pygments/lexers/prql.py
+++ b/libs/pygments/lexers/prql.py
@@ -4,7 +4,7 @@
 
     Lexer for the PRQL query language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,8 +19,6 @@ class PrqlLexer(RegexLexer):
     """
     For PRQL source code.
 
-    .. versionadded:: 2.17
-
     grammar: https://github.com/PRQL/prql/tree/main/grammars
     """
 
@@ -29,6 +27,7 @@ class PrqlLexer(RegexLexer):
     aliases = ['prql']
     filenames = ['*.prql']
     mimetypes = ['application/prql', 'application/x-prql']
+    version_added = '2.17'
 
     builtinTypes = words((
         "bool",
diff --git a/libs/pygments/lexers/ptx.py b/libs/pygments/lexers/ptx.py
index 218d69465..784ca13a6 100644
--- a/libs/pygments/lexers/ptx.py
+++ b/libs/pygments/lexers/ptx.py
@@ -4,7 +4,7 @@
 
     Lexer for other PTX language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,13 @@ class PtxLexer(RegexLexer):
     """
     For NVIDIA `PTX <https://docs.nvidia.com/cuda/parallel-thread-execution/>`_
     source.
-
-    .. versionadded:: 2.16
     """
     name = 'PTX'
     url = "https://docs.nvidia.com/cuda/parallel-thread-execution/"
     filenames = ['*.ptx']
     aliases = ['ptx']
     mimetypes = ['text/x-ptx']
+    version_added = '2.16'
 
     #: optional Comment or Whitespace
     string = r'"[^"]*?"'
diff --git a/libs/pygments/lexers/python.py b/libs/pygments/lexers/python.py
index cdb88ab43..805f6ff2a 100644
--- a/libs/pygments/lexers/python.py
+++ b/libs/pygments/lexers/python.py
@@ -4,15 +4,14 @@
 
     Lexers for Python and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-import re
 import keyword
 
-from pygments.lexer import DelegatingLexer, Lexer, RegexLexer, include, \
-    bygroups, using, default, words, combined, do_insertions, this, line_re
+from pygments.lexer import DelegatingLexer, RegexLexer, include, \
+    bygroups, using, default, words, combined, this
 from pygments.util import get_bool_opt, shebang_matches
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Other, Error, Whitespace
@@ -27,8 +26,6 @@ class PythonLexer(RegexLexer):
     """
     For Python source code (version 3.x).
 
-    .. versionadded:: 0.10
-
     .. versionchanged:: 2.5
        This is now the default ``PythonLexer``.  It is still available as the
        alias ``Python3Lexer``.
@@ -36,7 +33,7 @@ class PythonLexer(RegexLexer):
 
     name = 'Python'
     url = 'https://www.python.org'
-    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark']
+    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi']
     filenames = [
         '*.py',
         '*.pyw',
@@ -61,8 +58,9 @@ class PythonLexer(RegexLexer):
     ]
     mimetypes = ['text/x-python', 'application/x-python',
                  'text/x-python3', 'application/x-python3']
+    version_added = '0.10'
 
-    uni_name = "[%s][%s]*" % (uni.xid_start, uni.xid_continue)
+    uni_name = f"[{uni.xid_start}][{uni.xid_continue}]*"
 
     def innerstring_rules(ttype):
         return [
@@ -111,11 +109,11 @@ class PythonLexer(RegexLexer):
             (r'\\', Text),
             include('keywords'),
             include('soft-keywords'),
-            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'fromimport'),
-            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'import'),
             include('expr'),
         ],
@@ -224,7 +222,8 @@ class PythonLexer(RegexLexer):
              r'(match|case)\b'         # a possible keyword
              r'(?![ \t]*(?:'           # not followed by...
              r'[:,;=^&|@~)\]}]|(?:' +  # characters and keywords that mean this isn't
-             r'|'.join(keyword.kwlist) + r')\b))',                 # pattern matching
+                                       # pattern matching (but None/True/False is ok)
+             r'|'.join(k for k in keyword.kwlist if k[0].islower()) + r')\b))',
              bygroups(Text, Keyword), 'soft-keywords-inner'),
         ],
         'soft-keywords-inner': [
@@ -330,14 +329,14 @@ class PythonLexer(RegexLexer):
             (uni_name, Name.Class, '#pop'),
         ],
         'import': [
-            (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
+            (r'(\s+)(as)(\s+)', bygroups(Whitespace, Keyword, Whitespace)),
             (r'\.', Name.Namespace),
             (uni_name, Name.Namespace),
-            (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
+            (r'(\s*)(,)(\s*)', bygroups(Whitespace, Operator, Whitespace)),
             default('#pop')  # all else: go back
         ],
         'fromimport': [
-            (r'(\s+)(import)\b', bygroups(Text, Keyword.Namespace), '#pop'),
+            (r'(\s+)(import)\b', bygroups(Whitespace, Keyword.Namespace), '#pop'),
             (r'\.', Name.Namespace),
             # if None occurs here, it's "raise x from None", since None can
             # never be a module name
@@ -429,6 +428,7 @@ class Python2Lexer(RegexLexer):
     aliases = ['python2', 'py2']
     filenames = []  # now taken over by PythonLexer (3.x)
     mimetypes = ['text/x-python2', 'application/x-python2']
+    version_added = ''
 
     def innerstring_rules(ttype):
         return [
@@ -459,11 +459,11 @@ class Python2Lexer(RegexLexer):
             (r'(in|is|and|or|not)\b', Operator.Word),
             (r'!=|==|<<|>>|[-~+/*%=<>&^|.]', Operator),
             include('keywords'),
-            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'fromimport'),
-            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'import'),
             include('builtins'),
             include('magicfuncs'),
@@ -635,9 +635,10 @@ class Python2Lexer(RegexLexer):
     def analyse_text(text):
         return shebang_matches(text, r'pythonw?2(\.\d)?')
 
+
 class _PythonConsoleLexerBase(RegexLexer):
     name = 'Python console session'
-    aliases = ['pycon']
+    aliases = ['pycon', 'python-console']
     mimetypes = ['text/x-python-doctest']
 
     """Auxiliary lexer for `PythonConsoleLexer`.
@@ -671,6 +672,7 @@ class _PythonConsoleLexerBase(RegexLexer):
         ],
     }
 
+
 class PythonConsoleLexer(DelegatingLexer):
     """
     For Python console output or doctests, such as:
@@ -696,8 +698,10 @@ class PythonConsoleLexer(DelegatingLexer):
     """
 
     name = 'Python console session'
-    aliases = ['pycon']
+    aliases = ['pycon', 'python-console']
     mimetypes = ['text/x-python-doctest']
+    url = 'https://python.org'
+    version_added = ''
 
     def __init__(self, **options):
         python3 = get_bool_opt(options, 'python3', True)
@@ -717,12 +721,11 @@ class PythonConsoleLexer(DelegatingLexer):
                 super().__init__(pylexer, _PythonConsoleLexerBase, Other.Code, **options)
         super().__init__(tblexer, _ReplaceInnerCode, Other.Traceback, **options)
 
+
 class PythonTracebackLexer(RegexLexer):
     """
     For Python 3.x tracebacks, with support for chained exceptions.
 
-    .. versionadded:: 1.0
-
     .. versionchanged:: 2.5
        This is now the default ``PythonTracebackLexer``.  It is still available
        as the alias ``Python3TracebackLexer``.
@@ -732,6 +735,8 @@ class PythonTracebackLexer(RegexLexer):
     aliases = ['pytb', 'py3tb']
     filenames = ['*.pytb', '*.py3tb']
     mimetypes = ['text/x-python-traceback', 'text/x-python3-traceback']
+    url = 'https://python.org'
+    version_added = '1.0'
 
     tokens = {
         'root': [
@@ -778,8 +783,6 @@ class Python2TracebackLexer(RegexLexer):
     """
     For Python tracebacks.
 
-    .. versionadded:: 0.7
-
     .. versionchanged:: 2.5
        This class has been renamed from ``PythonTracebackLexer``.
        ``PythonTracebackLexer`` now refers to the Python 3 variant.
@@ -789,6 +792,8 @@ class Python2TracebackLexer(RegexLexer):
     aliases = ['py2tb']
     filenames = ['*.py2tb']
     mimetypes = ['text/x-python2-traceback']
+    url = 'https://python.org'
+    version_added = '0.7'
 
     tokens = {
         'root': [
@@ -825,8 +830,6 @@ class Python2TracebackLexer(RegexLexer):
 class CythonLexer(RegexLexer):
     """
     For Pyrex and Cython source code.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Cython'
@@ -834,6 +837,7 @@ class CythonLexer(RegexLexer):
     aliases = ['cython', 'pyx', 'pyrex']
     filenames = ['*.pyx', '*.pxd', '*.pxi']
     mimetypes = ['text/x-cython', 'application/x-cython']
+    version_added = '1.1'
 
     tokens = {
         'root': [
@@ -850,16 +854,16 @@ class CythonLexer(RegexLexer):
              bygroups(Punctuation, Keyword.Type, Punctuation)),
             (r'!=|==|<<|>>|[-~+/*%=<>&^|.?]', Operator),
             (r'(from)(\d+)(<=)(\s+)(<)(\d+)(:)',
-             bygroups(Keyword, Number.Integer, Operator, Name, Operator,
+             bygroups(Keyword, Number.Integer, Operator, Whitespace, Operator,
                       Name, Punctuation)),
             include('keywords'),
-            (r'(def|property)(\s+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(cp?def)(\s+)', bygroups(Keyword, Text), 'cdef'),
+            (r'(def|property)(\s+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(cp?def)(\s+)', bygroups(Keyword, Whitespace), 'cdef'),
             # (should actually start a block with only cdefs)
             (r'(cdef)(:)', bygroups(Keyword, Punctuation)),
-            (r'(class|struct)(\s+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)(\s+)', bygroups(Keyword, Text), 'fromimport'),
-            (r'(c?import)(\s+)', bygroups(Keyword, Text), 'import'),
+            (r'(class|struct)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)(\s+)', bygroups(Keyword, Whitespace), 'fromimport'),
+            (r'(c?import)(\s+)', bygroups(Keyword, Whitespace), 'import'),
             include('builtins'),
             include('backtick'),
             ('(?:[rR]|[uU][rR]|[rR][uU])"""', String, 'tdqs'),
@@ -937,9 +941,9 @@ class CythonLexer(RegexLexer):
             (r'(public|readonly|extern|api|inline)\b', Keyword.Reserved),
             (r'(struct|enum|union|class)\b', Keyword),
             (r'([a-zA-Z_]\w*)(\s*)(?=[(:#=]|$)',
-             bygroups(Name.Function, Text), '#pop'),
+             bygroups(Name.Function, Whitespace), '#pop'),
             (r'([a-zA-Z_]\w*)(\s*)(,)',
-             bygroups(Name.Function, Text, Punctuation)),
+             bygroups(Name.Function, Whitespace, Punctuation)),
             (r'from\b', Keyword, '#pop'),
             (r'as\b', Keyword),
             (r':', Punctuation, '#pop'),
@@ -951,13 +955,13 @@ class CythonLexer(RegexLexer):
             (r'[a-zA-Z_]\w*', Name.Class, '#pop')
         ],
         'import': [
-            (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
+            (r'(\s+)(as)(\s+)', bygroups(Whitespace, Keyword, Whitespace)),
             (r'[a-zA-Z_][\w.]*', Name.Namespace),
-            (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
+            (r'(\s*)(,)(\s*)', bygroups(Whitespace, Operator, Whitespace)),
             default('#pop')  # all else: go back
         ],
         'fromimport': [
-            (r'(\s+)(c?import)\b', bygroups(Text, Keyword), '#pop'),
+            (r'(\s+)(c?import)\b', bygroups(Whitespace, Keyword), '#pop'),
             (r'[a-zA-Z_.][\w.]*', Name.Namespace),
             # ``cdef foo from "header"``, or ``for foo from 0 < i < 10``
             default('#pop'),
@@ -1007,13 +1011,13 @@ class DgLexer(RegexLexer):
     Lexer for dg,
     a functional and object-oriented programming language
     running on the CPython 3 VM.
-
-    .. versionadded:: 1.6
     """
     name = 'dg'
     aliases = ['dg']
     filenames = ['*.dg']
     mimetypes = ['text/x-dg']
+    url = 'http://pyos.github.io/dg'
+    version_added = '1.6'
 
     tokens = {
         'root': [
@@ -1104,13 +1108,12 @@ class DgLexer(RegexLexer):
 class NumPyLexer(PythonLexer):
     """
     A Python lexer recognizing Numerical Python builtins.
-
-    .. versionadded:: 0.10
     """
 
     name = 'NumPy'
     url = 'https://numpy.org/'
     aliases = ['numpy']
+    version_added = '0.10'
 
     # override the mimetypes to not inherit them from python
     mimetypes = []
diff --git a/libs/pygments/lexers/q.py b/libs/pygments/lexers/q.py
index e5c159137..bfa8017e6 100644
--- a/libs/pygments/lexers/q.py
+++ b/libs/pygments/lexers/q.py
@@ -4,7 +4,7 @@
 
     Lexer for the Q programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,14 +17,14 @@ __all__ = ["KLexer", "QLexer"]
 
 class KLexer(RegexLexer):
     """
-    For `K <https://code.kx.com/>`_ source code.
-
-    .. versionadded:: 2.12
+    For K source code.
     """
 
     name = "K"
     aliases = ["k"]
     filenames = ["*.k"]
+    url = "https://code.kx.com"
+    version_added = '2.12'
 
     tokens = {
         "whitespace": [
@@ -152,13 +152,12 @@ class KLexer(RegexLexer):
 class QLexer(KLexer):
     """
     For `Q <https://code.kx.com/>`_ source code.
-
-    .. versionadded:: 2.12
     """
 
     name = "Q"
     aliases = ["q"]
     filenames = ["*.q"]
+    version_added = '2.12'
 
     tokens = {
         "root": [
diff --git a/libs/pygments/lexers/qlik.py b/libs/pygments/lexers/qlik.py
index b265b6016..a29f89f35 100644
--- a/libs/pygments/lexers/qlik.py
+++ b/libs/pygments/lexers/qlik.py
@@ -4,7 +4,7 @@
 
     Lexer for the qlik scripting language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,13 +22,13 @@ __all__ = ["QlikLexer"]
 class QlikLexer(RegexLexer):
     """
     Lexer for qlik code, including .qvs files
-
-    .. versionadded:: 2.12
     """
 
     name = "Qlik"
     aliases = ["qlik", "qlikview", "qliksense", "qlikscript"]
     filenames = ["*.qvs", "*.qvw"]
+    url = "https://qlik.com"
+    version_added = '2.12'
 
     flags = re.IGNORECASE
 
diff --git a/libs/pygments/lexers/qvt.py b/libs/pygments/lexers/qvt.py
index dc329f7ca..302d1b6ed 100644
--- a/libs/pygments/lexers/qvt.py
+++ b/libs/pygments/lexers/qvt.py
@@ -4,7 +4,7 @@
 
     Lexer for QVT Operational language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,11 +18,11 @@ __all__ = ['QVToLexer']
 
 class QVToLexer(RegexLexer):
     """
-    For the `QVT Operational Mapping language <http://www.omg.org/spec/QVT/1.1/>`_.
+    For the QVT Operational Mapping language.
 
     Reference for implementing this: «Meta Object Facility (MOF) 2.0
     Query/View/Transformation Specification», Version 1.1 - January 2011
-    (http://www.omg.org/spec/QVT/1.1/), see §8.4, «Concrete Syntax» in
+    (https://www.omg.org/spec/QVT/1.1/), see §8.4, «Concrete Syntax» in
     particular.
 
     Notable tokens assignments:
@@ -41,6 +41,8 @@ class QVToLexer(RegexLexer):
     name = 'QVTO'
     aliases = ['qvto', 'qvt']
     filenames = ['*.qvto']
+    url = 'https://www.omg.org/spec/QVT/1.1'
+    version_added = ''
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/r.py b/libs/pygments/lexers/r.py
index ed62fa2e3..d3f65ba2d 100644
--- a/libs/pygments/lexers/r.py
+++ b/libs/pygments/lexers/r.py
@@ -4,7 +4,7 @@
 
     Lexers for the R/S languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -28,6 +28,9 @@ class RConsoleLexer(Lexer):
     name = 'RConsole'
     aliases = ['rconsole', 'rout']
     filenames = ['*.Rout']
+    url = 'https://www.r-project.org'
+    version_added = ''
+    _example = "rconsole/r-console-transcript.Rout"
 
     def get_tokens_unprocessed(self, text):
         slexer = SLexer(**self.options)
@@ -67,8 +70,6 @@ class RConsoleLexer(Lexer):
 class SLexer(RegexLexer):
     """
     For S, S-plus, and R source code.
-
-    .. versionadded:: 0.10
     """
 
     name = 'S'
@@ -76,6 +77,8 @@ class SLexer(RegexLexer):
     filenames = ['*.S', '*.R', '.Rhistory', '.Rprofile', '.Renviron']
     mimetypes = ['text/S-plus', 'text/S', 'text/x-r-source', 'text/x-r',
                  'text/x-R', 'text/x-r-history', 'text/x-r-profile']
+    url = 'https://www.r-project.org'
+    version_added = '0.10'
 
     valid_name = r'`[^`\\]*(?:\\.[^`\\]*)*`|(?:[a-zA-Z]|\.[A-Za-z_.])[\w.]*|\.'
     tokens = {
@@ -85,6 +88,9 @@ class SLexer(RegexLexer):
         'valid_name': [
             (valid_name, Name),
         ],
+        'function_name': [
+            (rf'({valid_name})\s*(?=\()', Name.Function),
+        ],
         'punctuation': [
             (r'\[{1,2}|\]{1,2}|\(|\)|;|,', Punctuation),
         ],
@@ -94,7 +100,7 @@ class SLexer(RegexLexer):
              Keyword.Reserved),
         ],
         'operators': [
-            (r'<<?-|->>?|-|==|<=|>=|<|>|&&?|!=|\|\|?|\?', Operator),
+            (r'<<?-|->>?|-|==|<=|>=|\|>|<|>|&&?|!=|\|\|?|\?', Operator),
             (r'\*|\+|\^|/|!|%[^%]*%|=|~|\$|@|:{1,3}', Operator),
         ],
         'builtin_symbols': [
@@ -118,15 +124,15 @@ class SLexer(RegexLexer):
             (r'\'', String, 'string_squote'),
             (r'\"', String, 'string_dquote'),
             include('builtin_symbols'),
+            include('keywords'),
+            include('function_name'),
             include('valid_name'),
             include('numbers'),
-            include('keywords'),
             include('punctuation'),
             include('operators'),
         ],
         'root': [
             # calls:
-            (r'(%s)\s*(?=\()' % valid_name, Name.Function),
             include('statements'),
             # blocks:
             (r'\{|\}', Punctuation),
@@ -159,13 +165,13 @@ class RdLexer(RegexLexer):
     than the macros. A description of Rd syntax is found in `Writing R
     Extensions <http://cran.r-project.org/doc/manuals/R-exts.html>`_
     and `Parsing Rd files <http://developer.r-project.org/parseRd.pdf>`_.
-
-    .. versionadded:: 1.6
     """
     name = 'Rd'
     aliases = ['rd']
     filenames = ['*.Rd']
     mimetypes = ['text/x-r-doc']
+    url = 'http://cran.r-project.org/doc/manuals/R-exts.html'
+    version_added = '1.6'
 
     # To account for verbatim / LaTeX-like / and R-like areas
     # would require parsing.
diff --git a/libs/pygments/lexers/rdf.py b/libs/pygments/lexers/rdf.py
index c4fb998c4..4930c1b38 100644
--- a/libs/pygments/lexers/rdf.py
+++ b/libs/pygments/lexers/rdf.py
@@ -4,7 +4,7 @@
 
     Lexers for semantic web and RDF query languages and markup.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,14 @@ __all__ = ['SparqlLexer', 'TurtleLexer', 'ShExCLexer']
 
 class SparqlLexer(RegexLexer):
     """
-    Lexer for `SPARQL <https://www.w3.org/TR/sparql11-query/>`_ query language.
-
-    .. versionadded:: 2.0
+    Lexer for SPARQL query language.
     """
     name = 'SPARQL'
     aliases = ['sparql']
     filenames = ['*.rq', '*.sparql']
     mimetypes = ['application/sparql-query']
+    url = 'https://www.w3.org/TR/sparql11-query'
+    version_added = '2.0'
 
     # character group definitions ::
 
@@ -177,14 +177,14 @@ class SparqlLexer(RegexLexer):
 
 class TurtleLexer(RegexLexer):
     """
-    Lexer for `Turtle <http://www.w3.org/TR/turtle/>`_ data language.
-
-    .. versionadded:: 2.1
+    Lexer for Turtle data language.
     """
     name = 'Turtle'
     aliases = ['turtle']
     filenames = ['*.ttl']
     mimetypes = ['text/turtle', 'application/x-turtle']
+    url = 'https://www.w3.org/TR/turtle'
+    version_added = '2.1'
 
     # character group definitions ::
     PN_CHARS_BASE_GRP = ('a-zA-Z'
@@ -243,10 +243,10 @@ class TurtleLexer(RegexLexer):
             (r'\s+', Text),
 
             # Base / prefix
-            (r'(@base|BASE)(\s+)%(IRIREF)s(\s*)(\.?)' % patterns,
+            (r'(@base|BASE)(\s+){IRIREF}(\s*)(\.?)'.format(**patterns),
              bygroups(Keyword, Whitespace, Name.Variable, Whitespace,
                       Punctuation)),
-            (r'(@prefix|PREFIX)(\s+)%(PNAME_NS)s(\s+)%(IRIREF)s(\s*)(\.?)' % patterns,
+            (r'(@prefix|PREFIX)(\s+){PNAME_NS}(\s+){IRIREF}(\s*)(\.?)'.format(**patterns),
              bygroups(Keyword, Whitespace, Name.Namespace, Whitespace,
                       Name.Variable, Whitespace, Punctuation)),
 
@@ -254,7 +254,7 @@ class TurtleLexer(RegexLexer):
             (r'(?<=\s)a(?=\s)', Keyword.Type),
 
             # IRIREF
-            (r'%(IRIREF)s' % patterns, Name.Variable),
+            (r'{IRIREF}'.format(**patterns), Name.Variable),
 
             # PrefixedName
             (r'(' + PN_PREFIX + r')?(\:)(' + PN_LOCAL + r')?',
@@ -280,7 +280,7 @@ class TurtleLexer(RegexLexer):
         ],
         'triple-double-quoted-string': [
             (r'"""', String, 'end-of-string'),
-            (r'[^\\]+', String),
+            (r'[^\\]+(?=""")', String),
             (r'\\', String, 'string-escape'),
         ],
         'single-double-quoted-string': [
@@ -290,7 +290,7 @@ class TurtleLexer(RegexLexer):
         ],
         'triple-single-quoted-string': [
             (r"'''", String, 'end-of-string'),
-            (r'[^\\]+', String),
+            (r"[^\\]+(?=''')", String),
             (r'\\', String, 'string-escape'),
         ],
         'single-single-quoted-string': [
@@ -305,7 +305,7 @@ class TurtleLexer(RegexLexer):
             (r'(@)([a-zA-Z]+(?:-[a-zA-Z0-9]+)*)',
              bygroups(Operator, Generic.Emph), '#pop:2'),
 
-            (r'(\^\^)%(IRIREF)s' % patterns, bygroups(Operator, Generic.Emph), '#pop:2'),
+            (r'(\^\^){IRIREF}'.format(**patterns), bygroups(Operator, Generic.Emph), '#pop:2'),
 
             default('#pop:2'),
 
@@ -316,18 +316,20 @@ class TurtleLexer(RegexLexer):
     # but each has a recognizable and distinct syntax.
     def analyse_text(text):
         for t in ('@base ', 'BASE ', '@prefix ', 'PREFIX '):
-            if re.search(r'^\s*%s' % t, text):
+            if re.search(rf'^\s*{t}', text):
                 return 0.80
 
 
 class ShExCLexer(RegexLexer):
     """
-    Lexer for `ShExC <https://shex.io/shex-semantics/#shexc>`_ shape expressions language syntax.
+    Lexer for ShExC shape expressions language syntax.
     """
     name = 'ShExC'
     aliases = ['shexc', 'shex']
     filenames = ['*.shex']
     mimetypes = ['text/shex']
+    url = 'https://shex.io/shex-semantics/#shexc'
+    version_added = ''
 
     # character group definitions ::
 
diff --git a/libs/pygments/lexers/rebol.py b/libs/pygments/lexers/rebol.py
index 6170f0c36..4b37a7494 100644
--- a/libs/pygments/lexers/rebol.py
+++ b/libs/pygments/lexers/rebol.py
@@ -4,7 +4,7 @@
 
     Lexers for the REBOL and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,14 @@ __all__ = ['RebolLexer', 'RedLexer']
 
 class RebolLexer(RegexLexer):
     """
-    A `REBOL <http://www.rebol.com/>`_ lexer.
-
-    .. versionadded:: 1.1
+    A REBOL lexer.
     """
     name = 'REBOL'
     aliases = ['rebol']
     filenames = ['*.r', '*.r3', '*.reb']
     mimetypes = ['text/x-rebol']
+    url = 'http://www.rebol.com'
+    version_added = '1.1'
 
     flags = re.IGNORECASE | re.MULTILINE
 
@@ -240,14 +240,14 @@ class RebolLexer(RegexLexer):
 
 class RedLexer(RegexLexer):
     """
-    A `Red-language <http://www.red-lang.org/>`_ lexer.
-
-    .. versionadded:: 2.0
+    A Red-language lexer.
     """
     name = 'Red'
     aliases = ['red', 'red/system']
     filenames = ['*.red', '*.reds']
     mimetypes = ['text/x-red', 'text/x-red-system']
+    url = 'https://www.red-lang.org'
+    version_added = '2.0'
 
     flags = re.IGNORECASE | re.MULTILINE
 
diff --git a/libs/pygments/lexers/rego.py b/libs/pygments/lexers/rego.py
new file mode 100644
index 000000000..6f2e3e9e6
--- /dev/null
+++ b/libs/pygments/lexers/rego.py
@@ -0,0 +1,57 @@
+"""
+    pygments.lexers.rego
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for the Rego policy languages.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words
+from pygments.token import Comment, Operator, Keyword, Name, String, Number, Punctuation, Whitespace
+
+class RegoLexer(RegexLexer):
+    """
+    For Rego source.
+    """
+    name = 'Rego'
+    url = 'https://www.openpolicyagent.org/docs/latest/policy-language/'
+    filenames = ['*.rego']
+    aliases = ['rego']
+    mimetypes = ['text/x-rego']
+    version_added = '2.19'
+
+    reserved_words = (
+        'as', 'contains', 'data', 'default', 'else', 'every', 'false',
+        'if', 'in', 'import', 'package', 'not', 'null',
+        'some', 'true', 'with'
+    )
+
+    builtins = (
+        # https://www.openpolicyagent.org/docs/latest/philosophy/#the-opa-document-model
+        'data',  # Global variable for accessing base and virtual documents
+        'input', # Represents synchronously pushed base documents
+    )
+
+    tokens = {
+        'root': [
+            (r'\n', Whitespace),
+            (r'\s+', Whitespace),
+            (r'#.*?$', Comment.Single),
+            (words(reserved_words, suffix=r'\b'), Keyword),
+            (words(builtins, suffix=r'\b'), Name.Builtin),
+            (r'[a-zA-Z_][a-zA-Z0-9_]*', Name),
+            (r'"(\\\\|\\"|[^"])*"', String.Double),
+            (r'`[^`]*`', String.Backtick),
+            (r'-?\d+(\.\d+)?', Number),
+            (r'(==|!=|<=|>=|:=)', Operator),  # Compound operators
+            (r'[=<>+\-*/%&|]', Operator),     # Single-character operators
+            (r'[\[\]{}(),.:;]', Punctuation),
+        ]
+    }
+
+__all__ = ['RegoLexer']
+
+
+
diff --git a/libs/pygments/lexers/resource.py b/libs/pygments/lexers/resource.py
index 2583ba874..9593c2124 100644
--- a/libs/pygments/lexers/resource.py
+++ b/libs/pygments/lexers/resource.py
@@ -4,7 +4,7 @@
 
     Lexer for resource definition files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['ResourceLexer']
 
 
 class ResourceLexer(RegexLexer):
-    """Lexer for `ICU Resource bundles
-    <http://userguide.icu-project.org/locale/resources>`_.
-
-    .. versionadded:: 2.0
+    """Lexer for ICU Resource bundles.
     """
     name = 'ResourceBundle'
     aliases = ['resourcebundle', 'resource']
     filenames = []
+    url = 'https://unicode-org.github.io/icu/userguide/locale/resources.html'
+    version_added = '2.0'
 
     _types = (':table', ':array', ':string', ':bin', ':import', ':intvector',
               ':int', ':alias')
@@ -37,7 +36,7 @@ class ResourceLexer(RegexLexer):
             (r'"', String, 'string'),
             (r'-?\d+', Number.Integer),
             (r'[,{}]', Operator),
-            (r'([^\s{:]+)(\s*)(%s?)' % '|'.join(_types),
+            (r'([^\s{{:]+)(\s*)({}?)'.format('|'.join(_types)),
              bygroups(Name, Text, Keyword)),
             (r'\s+', Text),
             (words(_types), Keyword),
diff --git a/libs/pygments/lexers/ride.py b/libs/pygments/lexers/ride.py
index 077fcc786..4d60c29cb 100644
--- a/libs/pygments/lexers/ride.py
+++ b/libs/pygments/lexers/ride.py
@@ -4,7 +4,7 @@
 
     Lexer for the Ride programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,16 +17,15 @@ __all__ = ['RideLexer']
 
 class RideLexer(RegexLexer):
     """
-    For `Ride <https://docs.wavesplatform.com/en/ride/about-ride.html>`_
-    source code.
-
-    .. versionadded:: 2.6
+    For Ride source code.
     """
 
     name = 'Ride'
     aliases = ['ride']
     filenames = ['*.ride']
     mimetypes = ['text/x-ride']
+    url = 'https://docs.waves.tech/en/ride'
+    version_added = '2.6'
 
     validName = r'[a-zA-Z_][a-zA-Z0-9_\']*'
 
diff --git a/libs/pygments/lexers/rita.py b/libs/pygments/lexers/rita.py
index 9aa856977..536aafffd 100644
--- a/libs/pygments/lexers/rita.py
+++ b/libs/pygments/lexers/rita.py
@@ -4,7 +4,7 @@
 
     Lexers for RITA language
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['RitaLexer']
 class RitaLexer(RegexLexer):
     """
     Lexer for RITA.
-
-    .. versionadded:: 2.11
     """
     name = 'Rita'
     url = 'https://github.com/zaibacu/rita-dsl'
     filenames = ['*.rita']
     aliases = ['rita']
     mimetypes = ['text/rita']
+    version_added = '2.11'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/rnc.py b/libs/pygments/lexers/rnc.py
index d71717538..b7a06bb91 100644
--- a/libs/pygments/lexers/rnc.py
+++ b/libs/pygments/lexers/rnc.py
@@ -4,7 +4,7 @@
 
     Lexer for Relax-NG Compact syntax
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['RNCCompactLexer']
 class RNCCompactLexer(RegexLexer):
     """
     For RelaxNG-compact syntax.
-
-    .. versionadded:: 2.2
     """
 
     name = 'Relax-NG Compact'
     url = 'http://relaxng.org'
     aliases = ['rng-compact', 'rnc']
     filenames = ['*.rnc']
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/roboconf.py b/libs/pygments/lexers/roboconf.py
index 5d7d76e0b..31adba9f4 100644
--- a/libs/pygments/lexers/roboconf.py
+++ b/libs/pygments/lexers/roboconf.py
@@ -4,7 +4,7 @@
 
     Lexers for Roboconf DSL.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,12 +17,12 @@ __all__ = ['RoboconfGraphLexer', 'RoboconfInstancesLexer']
 class RoboconfGraphLexer(RegexLexer):
     """
     Lexer for Roboconf graph files.
-
-    .. versionadded:: 2.1
     """
     name = 'Roboconf Graph'
     aliases = ['roboconf-graph']
     filenames = ['*.graph']
+    url = 'https://roboconf.github.io/en/user-guide/graph-definition.html'
+    version_added = '2.1'
 
     flags = re.IGNORECASE | re.MULTILINE
     tokens = {
@@ -52,12 +52,12 @@ class RoboconfGraphLexer(RegexLexer):
 class RoboconfInstancesLexer(RegexLexer):
     """
     Lexer for Roboconf instances files.
-
-    .. versionadded:: 2.1
     """
     name = 'Roboconf Instances'
     aliases = ['roboconf-instances']
     filenames = ['*.instances']
+    url = 'https://roboconf.github.io'
+    version_added = '2.1'
 
     flags = re.IGNORECASE | re.MULTILINE
     tokens = {
diff --git a/libs/pygments/lexers/robotframework.py b/libs/pygments/lexers/robotframework.py
index 3b676cce2..f92d56750 100644
--- a/libs/pygments/lexers/robotframework.py
+++ b/libs/pygments/lexers/robotframework.py
@@ -4,7 +4,7 @@
 
     Lexer for Robot Framework.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -57,14 +57,13 @@ class RobotFrameworkLexer(Lexer):
     For Robot Framework test data.
 
     Supports both space and pipe separated plain text formats.
-
-    .. versionadded:: 1.6
     """
     name = 'RobotFramework'
     url = 'http://robotframework.org'
     aliases = ['robotframework']
     filenames = ['*.robot', '*.resource']
     mimetypes = ['text/x-robotframework']
+    version_added = '1.6'
 
     def __init__(self, **options):
         options['tabsize'] = 2
diff --git a/libs/pygments/lexers/ruby.py b/libs/pygments/lexers/ruby.py
index 466d6e752..72aaeb5fe 100644
--- a/libs/pygments/lexers/ruby.py
+++ b/libs/pygments/lexers/ruby.py
@@ -4,7 +4,7 @@
 
     Lexers for Ruby and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -36,6 +36,7 @@ class RubyLexer(ExtendedRegexLexer):
     filenames = ['*.rb', '*.rbw', 'Rakefile', '*.rake', '*.gemspec',
                  '*.rbx', '*.duby', 'Gemfile', 'Vagrantfile']
     mimetypes = ['text/x-ruby', 'application/x-ruby']
+    version_added = ''
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -124,7 +125,7 @@ class RubyLexer(ExtendedRegexLexer):
                                 ('backtick', String.Backtick, '`'):
             states['simple-'+name] = [
                 include('string-intp-escaped'),
-                (r'[^\\%s#]+' % end, ttype),
+                (rf'[^\\{end}#]+', ttype),
                 (r'[\\#]', ttype),
                 (end, ttype, '#pop'),
             ]
@@ -399,6 +400,8 @@ class RubyConsoleLexer(Lexer):
     name = 'Ruby irb session'
     aliases = ['rbcon', 'irb']
     mimetypes = ['text/x-ruby-shellsession']
+    url = 'https://www.ruby-lang.org'
+    version_added = ''
     _example = 'rbcon/console'
 
     _prompt_re = re.compile(r'irb\([a-zA-Z_]\w*\):\d{3}:\d+[>*"\'] '
@@ -436,14 +439,13 @@ class FancyLexer(RegexLexer):
     Fancy is a self-hosted, pure object-oriented, dynamic,
     class-based, concurrent general-purpose programming language
     running on Rubinius, the Ruby VM.
-
-    .. versionadded:: 1.5
     """
     name = 'Fancy'
     url = 'https://github.com/bakkdoor/fancy'
     filenames = ['*.fy', '*.fancypack']
     aliases = ['fancy', 'fy']
     mimetypes = ['text/x-fancysrc']
+    version_added = '1.5'
 
     tokens = {
         # copied from PerlLexer:
diff --git a/libs/pygments/lexers/rust.py b/libs/pygments/lexers/rust.py
index db68bb346..634104755 100644
--- a/libs/pygments/lexers/rust.py
+++ b/libs/pygments/lexers/rust.py
@@ -4,7 +4,7 @@
 
     Lexers for the Rust language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['RustLexer']
 class RustLexer(RegexLexer):
     """
     Lexer for the Rust programming language (version 1.47).
-
-    .. versionadded:: 1.6
     """
     name = 'Rust'
     url = 'https://www.rust-lang.org/'
     filenames = ['*.rs', '*.rs.in']
     aliases = ['rust', 'rs']
     mimetypes = ['text/rust', 'text/x-rust']
+    version_added = '1.6'
 
     keyword_types = (words((
         'u8', 'u16', 'u32', 'u64', 'u128', 'i8', 'i16', 'i32', 'i64', 'i128',
@@ -99,16 +98,16 @@ class RustLexer(RegexLexer):
             (r'let\b', Keyword.Declaration),
             (r'fn\b', Keyword, 'funcname'),
             (r'(struct|enum|type|union)\b', Keyword, 'typename'),
-            (r'(default)(\s+)(type|fn)\b', bygroups(Keyword, Text, Keyword)),
+            (r'(default)(\s+)(type|fn)\b', bygroups(Keyword, Whitespace, Keyword)),
             keyword_types,
             (r'[sS]elf\b', Name.Builtin.Pseudo),
             # Prelude (taken from Rust's src/libstd/prelude.rs)
             builtin_funcs_types,
             builtin_macros,
             # Path separators, so types don't catch them.
-            (r'::\b', Text),
+            (r'::\b', Punctuation),
             # Types in positions.
-            (r'(?::|->)', Text, 'typename'),
+            (r'(?::|->)', Punctuation, 'typename'),
             # Labels
             (r'(break|continue)(\b\s*)(\'[A-Za-z_]\w*)?',
              bygroups(Keyword, Text.Whitespace, Name.Label)),
@@ -157,7 +156,7 @@ class RustLexer(RegexLexer):
             # Misc
             # Lone hashes: not used in Rust syntax, but allowed in macro
             # arguments, most famously for quote::quote!()
-            (r'#', Text),
+            (r'#', Punctuation),
         ],
         'comment': [
             (r'[^*/]+', Comment.Multiline),
@@ -172,17 +171,17 @@ class RustLexer(RegexLexer):
             (r'[*/]', String.Doc),
         ],
         'modname': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'[a-zA-Z_]\w*', Name.Namespace, '#pop'),
             default('#pop'),
         ],
         'funcname': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'[a-zA-Z_]\w*', Name.Function, '#pop'),
             default('#pop'),
         ],
         'typename': [
-            (r'\s+', Text),
+            (r'\s+', Whitespace),
             (r'&', Keyword.Pseudo),
             (r"'", Operator, 'lifetime'),
             builtin_funcs_types,
diff --git a/libs/pygments/lexers/sas.py b/libs/pygments/lexers/sas.py
index c34066b02..1b2ad432d 100644
--- a/libs/pygments/lexers/sas.py
+++ b/libs/pygments/lexers/sas.py
@@ -4,7 +4,7 @@
 
     Lexer for SAS.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,8 +19,6 @@ __all__ = ['SASLexer']
 class SASLexer(RegexLexer):
     """
     For SAS files.
-
-    .. versionadded:: 2.2
     """
     # Syntax from syntax/sas.vim by James Kidd <james.kidd@covance.com>
 
@@ -28,6 +26,8 @@ class SASLexer(RegexLexer):
     aliases   = ['sas']
     filenames = ['*.SAS', '*.sas']
     mimetypes = ['text/x-sas', 'text/sas', 'application/x-sas']
+    url = 'https://en.wikipedia.org/wiki/SAS_(software)'
+    version_added = '2.2'
     flags     = re.IGNORECASE | re.MULTILINE
 
     builtins_macros = (
diff --git a/libs/pygments/lexers/savi.py b/libs/pygments/lexers/savi.py
index 48927f3ab..1e443ae30 100644
--- a/libs/pygments/lexers/savi.py
+++ b/libs/pygments/lexers/savi.py
@@ -4,7 +4,7 @@
 
     Lexer for Savi.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -30,141 +30,142 @@ __all__ = ['SaviLexer']
 # (rouge, vscode, etc) so that all of the lexers can be kept cleanly in sync.
 
 class SaviLexer(RegexLexer):
-  """
-  For Savi source code.
+    """
+    For Savi source code.
 
-  .. versionadded: 2.10
-  """
+    .. versionadded: 2.10
+    """
 
-  name = 'Savi'
-  url = 'https://github.com/savi-lang/savi'
-  aliases = ['savi']
-  filenames = ['*.savi']
+    name = 'Savi'
+    url = 'https://github.com/savi-lang/savi'
+    aliases = ['savi']
+    filenames = ['*.savi']
+    version_added = ''
 
-  tokens = {
-    "root": [
-      # Line Comment
-      (r'//.*?$', Comment.Single),
+    tokens = {
+      "root": [
+        # Line Comment
+        (r'//.*?$', Comment.Single),
 
-      # Doc Comment
-      (r'::.*?$', Comment.Single),
+        # Doc Comment
+        (r'::.*?$', Comment.Single),
 
-      # Capability Operator
-      (r'(\')(\w+)(?=[^\'])', bygroups(Operator, Name)),
+        # Capability Operator
+        (r'(\')(\w+)(?=[^\'])', bygroups(Operator, Name)),
 
-      # Double-Quote String
-      (r'\w?"', String.Double, "string.double"),
+        # Double-Quote String
+        (r'\w?"', String.Double, "string.double"),
 
-      # Single-Char String
-      (r"'", String.Char, "string.char"),
+        # Single-Char String
+        (r"'", String.Char, "string.char"),
 
-      # Type Name
-      (r'(_?[A-Z]\w*)', Name.Class),
+        # Type Name
+        (r'(_?[A-Z]\w*)', Name.Class),
 
-      # Nested Type Name
-      (r'(\.)(\s*)(_?[A-Z]\w*)', bygroups(Punctuation, Whitespace, Name.Class)),
+        # Nested Type Name
+        (r'(\.)(\s*)(_?[A-Z]\w*)', bygroups(Punctuation, Whitespace, Name.Class)),
 
-      # Declare
-      (r'^([ \t]*)(:\w+)',
-        bygroups(Whitespace, Name.Tag),
-        "decl"),
+        # Declare
+        (r'^([ \t]*)(:\w+)',
+          bygroups(Whitespace, Name.Tag),
+          "decl"),
 
-      # Error-Raising Calls/Names
-      (r'((\w+|\+|\-|\*)\!)', Generic.Deleted),
+        # Error-Raising Calls/Names
+        (r'((\w+|\+|\-|\*)\!)', Generic.Deleted),
 
-      # Numeric Values
-      (r'\b\d([\d_]*(\.[\d_]+)?)\b', Number),
+        # Numeric Values
+        (r'\b\d([\d_]*(\.[\d_]+)?)\b', Number),
 
-      # Hex Numeric Values
-      (r'\b0x([0-9a-fA-F_]+)\b', Number.Hex),
+        # Hex Numeric Values
+        (r'\b0x([0-9a-fA-F_]+)\b', Number.Hex),
 
-      # Binary Numeric Values
-      (r'\b0b([01_]+)\b', Number.Bin),
+        # Binary Numeric Values
+        (r'\b0b([01_]+)\b', Number.Bin),
 
-      # Function Call (with braces)
-      (r'\w+(?=\()', Name.Function),
+        # Function Call (with braces)
+        (r'\w+(?=\()', Name.Function),
 
-      # Function Call (with receiver)
-      (r'(\.)(\s*)(\w+)', bygroups(Punctuation, Whitespace, Name.Function)),
+        # Function Call (with receiver)
+        (r'(\.)(\s*)(\w+)', bygroups(Punctuation, Whitespace, Name.Function)),
 
-      # Function Call (with self receiver)
-      (r'(@)(\w+)', bygroups(Punctuation, Name.Function)),
+        # Function Call (with self receiver)
+        (r'(@)(\w+)', bygroups(Punctuation, Name.Function)),
 
-      # Parenthesis
-      (r'\(', Punctuation, "root"),
-      (r'\)', Punctuation, "#pop"),
+        # Parenthesis
+        (r'\(', Punctuation, "root"),
+        (r'\)', Punctuation, "#pop"),
 
-      # Brace
-      (r'\{', Punctuation, "root"),
-      (r'\}', Punctuation, "#pop"),
+        # Brace
+        (r'\{', Punctuation, "root"),
+        (r'\}', Punctuation, "#pop"),
 
-      # Bracket
-      (r'\[', Punctuation, "root"),
-      (r'(\])(\!)', bygroups(Punctuation, Generic.Deleted), "#pop"),
-      (r'\]', Punctuation, "#pop"),
+        # Bracket
+        (r'\[', Punctuation, "root"),
+        (r'(\])(\!)', bygroups(Punctuation, Generic.Deleted), "#pop"),
+        (r'\]', Punctuation, "#pop"),
 
-      # Punctuation
-      (r'[,;:\.@]', Punctuation),
+        # Punctuation
+        (r'[,;:\.@]', Punctuation),
 
-      # Piping Operators
-      (r'(\|\>)', Operator),
+        # Piping Operators
+        (r'(\|\>)', Operator),
 
-      # Branching Operators
-      (r'(\&\&|\|\||\?\?|\&\?|\|\?|\.\?)', Operator),
+        # Branching Operators
+        (r'(\&\&|\|\||\?\?|\&\?|\|\?|\.\?)', Operator),
 
-      # Comparison Operators
-      (r'(\<\=\>|\=\~|\=\=|\<\=|\>\=|\<|\>)', Operator),
+        # Comparison Operators
+        (r'(\<\=\>|\=\~|\=\=|\<\=|\>\=|\<|\>)', Operator),
 
-      # Arithmetic Operators
-      (r'(\+|\-|\/|\*|\%)', Operator),
+        # Arithmetic Operators
+        (r'(\+|\-|\/|\*|\%)', Operator),
 
-      # Assignment Operators
-      (r'(\=)', Operator),
+        # Assignment Operators
+        (r'(\=)', Operator),
 
-      # Other Operators
-      (r'(\!|\<\<|\<|\&|\|)', Operator),
+        # Other Operators
+        (r'(\!|\<\<|\<|\&|\|)', Operator),
 
-      # Identifiers
-      (r'\b\w+\b', Name),
+        # Identifiers
+        (r'\b\w+\b', Name),
 
-      # Whitespace
-      (r'[ \t\r]+\n*|\n+', Whitespace),
-    ],
+        # Whitespace
+        (r'[ \t\r]+\n*|\n+', Whitespace),
+      ],
 
-    # Declare (nested rules)
-    "decl": [
-      (r'\b[a-z_]\w*\b(?!\!)', Keyword.Declaration),
-      (r':', Punctuation, "#pop"),
-      (r'\n', Whitespace, "#pop"),
-      include("root"),
-    ],
+      # Declare (nested rules)
+      "decl": [
+        (r'\b[a-z_]\w*\b(?!\!)', Keyword.Declaration),
+        (r':', Punctuation, "#pop"),
+        (r'\n', Whitespace, "#pop"),
+        include("root"),
+      ],
 
-    # Double-Quote String (nested rules)
-    "string.double": [
-      (r'\\\(', String.Interpol, "string.interpolation"),
-      (r'\\u[0-9a-fA-F]{4}', String.Escape),
-      (r'\\x[0-9a-fA-F]{2}', String.Escape),
-      (r'\\[bfnrt\\\']', String.Escape),
-      (r'\\"', String.Escape),
-      (r'"', String.Double, "#pop"),
-      (r'[^\\"]+', String.Double),
-      (r'.', Error),
-    ],
+      # Double-Quote String (nested rules)
+      "string.double": [
+        (r'\\\(', String.Interpol, "string.interpolation"),
+        (r'\\u[0-9a-fA-F]{4}', String.Escape),
+        (r'\\x[0-9a-fA-F]{2}', String.Escape),
+        (r'\\[bfnrt\\\']', String.Escape),
+        (r'\\"', String.Escape),
+        (r'"', String.Double, "#pop"),
+        (r'[^\\"]+', String.Double),
+        (r'.', Error),
+      ],
 
-    # Single-Char String (nested rules)
-    "string.char": [
-      (r'\\u[0-9a-fA-F]{4}', String.Escape),
-      (r'\\x[0-9a-fA-F]{2}', String.Escape),
-      (r'\\[bfnrt\\\']', String.Escape),
-      (r"\\'", String.Escape),
-      (r"'", String.Char, "#pop"),
-      (r"[^\\']+", String.Char),
-      (r'.', Error),
-    ],
+      # Single-Char String (nested rules)
+      "string.char": [
+        (r'\\u[0-9a-fA-F]{4}', String.Escape),
+        (r'\\x[0-9a-fA-F]{2}', String.Escape),
+        (r'\\[bfnrt\\\']', String.Escape),
+        (r"\\'", String.Escape),
+        (r"'", String.Char, "#pop"),
+        (r"[^\\']+", String.Char),
+        (r'.', Error),
+      ],
 
-    # Interpolation inside String (nested rules)
-    "string.interpolation": [
-      (r"\)", String.Interpol, "#pop"),
-      include("root"),
-    ]
-  }
+      # Interpolation inside String (nested rules)
+      "string.interpolation": [
+        (r"\)", String.Interpol, "#pop"),
+        include("root"),
+      ]
+    }
diff --git a/libs/pygments/lexers/scdoc.py b/libs/pygments/lexers/scdoc.py
index 90478acf6..8e850d02e 100644
--- a/libs/pygments/lexers/scdoc.py
+++ b/libs/pygments/lexers/scdoc.py
@@ -4,7 +4,7 @@
 
     Lexer for scdoc, a simple man page generator.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,13 +19,12 @@ __all__ = ['ScdocLexer']
 class ScdocLexer(RegexLexer):
     """
     `scdoc` is a simple man page generator for POSIX systems written in C99.
-
-    .. versionadded:: 2.5
     """
     name = 'scdoc'
     url = 'https://git.sr.ht/~sircmpwn/scdoc'
     aliases = ['scdoc', 'scd']
     filenames = ['*.scd', '*.scdoc']
+    version_added = '2.5'
     flags = re.MULTILINE
 
     tokens = {
diff --git a/libs/pygments/lexers/scripting.py b/libs/pygments/lexers/scripting.py
index eab7ec95c..17deae9bb 100644
--- a/libs/pygments/lexers/scripting.py
+++ b/libs/pygments/lexers/scripting.py
@@ -4,7 +4,7 @@
 
     Lexer for scripting and embedded languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -16,11 +16,15 @@ from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Error, Whitespace, Other
 from pygments.util import get_bool_opt, get_list_opt
 
-__all__ = ['LuaLexer', 'MoonScriptLexer', 'ChaiscriptLexer', 'LSLLexer',
+__all__ = ['LuaLexer', 'LuauLexer', 'MoonScriptLexer', 'ChaiscriptLexer', 'LSLLexer',
            'AppleScriptLexer', 'RexxLexer', 'MOOCodeLexer', 'HybrisLexer',
            'EasytrieveLexer', 'JclLexer', 'MiniScriptLexer']
 
 
+def all_lua_builtins():
+    from pygments.lexers._lua_builtins import MODULES
+    return [w for values in MODULES.values() for w in values]
+
 class LuaLexer(RegexLexer):
     """
     For Lua source code.
@@ -49,11 +53,12 @@ class LuaLexer(RegexLexer):
     aliases = ['lua']
     filenames = ['*.lua', '*.wlua']
     mimetypes = ['text/x-lua', 'application/x-lua']
+    version_added = ''
 
     _comment_multiline = r'(?:--\[(?P<level>=*)\[[\w\W]*?\](?P=level)\])'
     _comment_single = r'(?:--.*$)'
     _space = r'(?:\s+)'
-    _s = r'(?:%s|%s|%s)' % (_comment_multiline, _comment_single, _space)
+    _s = rf'(?:{_comment_multiline}|{_comment_single}|{_space})'
     _name = r'(?:[^\W\d]\w*)'
 
     tokens = {
@@ -65,7 +70,7 @@ class LuaLexer(RegexLexer):
         'ws': [
             (_comment_multiline, Comment.Multiline),
             (_comment_single, Comment.Single),
-            (_space, Text),
+            (_space, Whitespace),
         ],
         'base': [
             include('ws'),
@@ -81,7 +86,7 @@ class LuaLexer(RegexLexer):
             (r'::', Punctuation, 'label'),
             (r'\.{3}', Punctuation),
             (r'[=<>|~&+\-*/%#^]+|\.\.', Operator),
-            (r'[\[\]{}().,:;]', Punctuation),
+            (r'[\[\]{}().,:;]+', Punctuation),
             (r'(and|or|not)\b', Operator.Word),
 
             ('(break|do|else|elseif|end|for|if|in|repeat|return|then|until|'
@@ -92,16 +97,28 @@ class LuaLexer(RegexLexer):
 
             (r'(function)\b', Keyword.Reserved, 'funcname'),
 
-            (r'[A-Za-z_]\w*(\.[A-Za-z_]\w*)?', Name),
+            (words(all_lua_builtins(), suffix=r"\b"), Name.Builtin),
+            (fr'[A-Za-z_]\w*(?={_s}*[.:])', Name.Variable, 'varname'),
+            (fr'[A-Za-z_]\w*(?={_s}*\()', Name.Function),
+            (r'[A-Za-z_]\w*', Name.Variable),
 
             ("'", String.Single, combined('stringescape', 'sqs')),
             ('"', String.Double, combined('stringescape', 'dqs'))
         ],
 
+        'varname': [
+            include('ws'),
+            (r'\.\.', Operator, '#pop'),
+            (r'[.:]', Punctuation),
+            (rf'{_name}(?={_s}*[.:])', Name.Property),
+            (rf'{_name}(?={_s}*\()', Name.Function, '#pop'),
+            (_name, Name.Property, '#pop'),
+        ],
+
         'funcname': [
             include('ws'),
             (r'[.:]', Punctuation),
-            (r'%s(?=%s*[.:])' % (_name, _s), Name.Class),
+            (rf'{_name}(?={_s}*[.:])', Name.Class),
             (_name, Name.Function, '#pop'),
             # inline function
             (r'\(', Punctuation, '#pop'),
@@ -150,23 +167,335 @@ class LuaLexer(RegexLexer):
     def get_tokens_unprocessed(self, text):
         for index, token, value in \
                 RegexLexer.get_tokens_unprocessed(self, text):
-            if token is Name:
-                if value in self._functions:
-                    yield index, Name.Builtin, value
-                    continue
-                elif '.' in value:
+            if token is Name.Builtin and value not in self._functions:
+                if '.' in value:
                     a, b = value.split('.')
                     yield index, Name, a
                     yield index + len(a), Punctuation, '.'
                     yield index + len(a) + 1, Name, b
-                    continue
+                else:
+                    yield index, Name, value
+                continue
+            yield index, token, value
+
+def _luau_make_expression(should_pop, _s):
+    temp_list = [
+        (r'0[xX][\da-fA-F_]*', Number.Hex, '#pop'),
+        (r'0[bB][\d_]*', Number.Bin, '#pop'),
+        (r'\.?\d[\d_]*(?:\.[\d_]*)?(?:[eE][+-]?[\d_]+)?', Number.Float, '#pop'),
+
+        (words((
+            'true', 'false', 'nil'
+        ), suffix=r'\b'), Keyword.Constant, '#pop'),
+
+        (r'\[(=*)\[[.\n]*?\]\1\]', String, '#pop'),
+
+        (r'(\.)([a-zA-Z_]\w*)(?=%s*[({"\'])', bygroups(Punctuation, Name.Function), '#pop'),
+        (r'(\.)([a-zA-Z_]\w*)', bygroups(Punctuation, Name.Variable), '#pop'),
+
+        (rf'[a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*(?={_s}*[({{"\'])', Name.Other, '#pop'),
+        (r'[a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*', Name, '#pop'),
+    ]
+    if should_pop:
+        return temp_list
+    return [entry[:2] for entry in temp_list]
+
+def _luau_make_expression_special(should_pop):
+    temp_list = [
+        (r'\{', Punctuation, ('#pop', 'closing_brace_base', 'expression')),
+        (r'\(', Punctuation, ('#pop', 'closing_parenthesis_base', 'expression')),
+
+        (r'::?', Punctuation, ('#pop', 'type_end', 'type_start')),
+
+        (r"'", String.Single, ('#pop', 'string_single')),
+        (r'"', String.Double, ('#pop', 'string_double')),
+        (r'`', String.Backtick, ('#pop', 'string_interpolated')),
+    ]
+    if should_pop:
+        return temp_list
+    return [(entry[0], entry[1], entry[2][1:]) for entry in temp_list]
+
+class LuauLexer(RegexLexer):
+    """
+    For Luau source code.
+
+    Additional options accepted:
+
+    `include_luau_builtins`
+        If given and ``True``, automatically highlight Luau builtins
+        (default: ``True``).
+    `include_roblox_builtins`
+        If given and ``True``, automatically highlight Roblox-specific builtins
+        (default: ``False``).
+    `additional_builtins`
+        If given, must be a list of additional builtins to highlight.
+    `disabled_builtins`
+        If given, must be a list of builtins that will not be highlighted.
+    """
+
+    name = 'Luau'
+    url = 'https://luau-lang.org/'
+    aliases = ['luau']
+    filenames = ['*.luau']
+    version_added = '2.18'
+
+    _comment_multiline = r'(?:--\[(?P<level>=*)\[[\w\W]*?\](?P=level)\])'
+    _comment_single = r'(?:--.*$)'
+    _s = r'(?:{}|{}|{})'.format(_comment_multiline, _comment_single, r'\s+')
+
+    tokens = {
+        'root': [
+            (r'#!.*', Comment.Hashbang, 'base'),
+            default('base'),
+        ],
+
+        'ws': [
+            (_comment_multiline, Comment.Multiline),
+            (_comment_single, Comment.Single),
+            (r'\s+', Whitespace),
+        ],
+
+        'base': [
+            include('ws'),
+
+            *_luau_make_expression_special(False),
+            (r'\.\.\.', Punctuation),
+
+            (rf'type\b(?={_s}+[a-zA-Z_])', Keyword.Reserved, 'type_declaration'),
+            (rf'export\b(?={_s}+[a-zA-Z_])', Keyword.Reserved),
+
+            (r'(?:\.\.|//|[+\-*\/%^<>=])=?', Operator, 'expression'),
+            (r'~=', Operator, 'expression'),
+
+            (words((
+                'and', 'or', 'not'
+            ), suffix=r'\b'), Operator.Word, 'expression'),
+
+            (words((
+                'elseif', 'for', 'if', 'in', 'repeat', 'return', 'until',
+                'while'), suffix=r'\b'), Keyword.Reserved, 'expression'),
+            (r'local\b', Keyword.Declaration, 'expression'),
+
+            (r'function\b', Keyword.Reserved, ('expression', 'func_name')),
+
+            (r'[\])};]+', Punctuation),
+
+            include('expression_static'),
+            *_luau_make_expression(False, _s),
+
+            (r'[\[.,]', Punctuation, 'expression'),
+        ],
+        'expression_static': [
+            (words((
+                'break', 'continue', 'do', 'else', 'elseif', 'end', 'for',
+                'if', 'in', 'repeat', 'return', 'then', 'until', 'while'),
+                suffix=r'\b'), Keyword.Reserved),
+        ],
+        'expression': [
+            include('ws'),
+
+            (r'if\b', Keyword.Reserved, ('ternary', 'expression')),
+
+            (r'local\b', Keyword.Declaration),
+            *_luau_make_expression_special(True),
+            (r'\.\.\.', Punctuation, '#pop'),
+
+            (r'function\b', Keyword.Reserved, 'func_name'),
+
+            include('expression_static'),
+            *_luau_make_expression(True, _s),
+
+            default('#pop'),
+        ],
+        'ternary': [
+            include('ws'),
+
+            (r'else\b', Keyword.Reserved, '#pop'),
+            (words((
+                'then', 'elseif',
+            ), suffix=r'\b'), Operator.Reserved, 'expression'),
+
+            default('#pop'),
+        ],
+
+        'closing_brace_pop': [
+            (r'\}', Punctuation, '#pop'),
+        ],
+        'closing_parenthesis_pop': [
+            (r'\)', Punctuation, '#pop'),
+        ],
+        'closing_gt_pop': [
+            (r'>', Punctuation, '#pop'),
+        ],
+
+        'closing_parenthesis_base': [
+            include('closing_parenthesis_pop'),
+            include('base'),
+        ],
+        'closing_parenthesis_type': [
+            include('closing_parenthesis_pop'),
+            include('type'),
+        ],
+        'closing_brace_base': [
+            include('closing_brace_pop'),
+            include('base'),
+        ],
+        'closing_brace_type': [
+            include('closing_brace_pop'),
+            include('type'),
+        ],
+        'closing_gt_type': [
+            include('closing_gt_pop'),
+            include('type'),
+        ],
+
+        'string_escape': [
+            (r'\\z\s*', String.Escape),
+            (r'\\(?:[abfnrtvz\\"\'`\{\n])|[\r\n]{1,2}|x[\da-fA-F]{2}|\d{1,3}|'
+             r'u\{\}[\da-fA-F]*\}', String.Escape),
+        ],
+        'string_single': [
+            include('string_escape'),
+
+            (r"'", String.Single, "#pop"),
+            (r"[^\\']+", String.Single),
+        ],
+        'string_double': [
+            include('string_escape'),
+
+            (r'"', String.Double, "#pop"),
+            (r'[^\\"]+', String.Double),
+        ],
+        'string_interpolated': [
+            include('string_escape'),
+
+            (r'\{', Punctuation, ('closing_brace_base', 'expression')),
+
+            (r'`', String.Backtick, "#pop"),
+            (r'[^\\`\{]+', String.Backtick),
+        ],
+
+        'func_name': [
+            include('ws'),
+
+            (r'[.:]', Punctuation),
+            (rf'[a-zA-Z_]\w*(?={_s}*[.:])', Name.Class),
+            (r'[a-zA-Z_]\w*', Name.Function),
+
+            (r'<', Punctuation, 'closing_gt_type'),
+
+            (r'\(', Punctuation, '#pop'),
+        ],
+
+        'type': [
+            include('ws'),
+
+            (r'\(', Punctuation, 'closing_parenthesis_type'),
+            (r'\{', Punctuation, 'closing_brace_type'),
+            (r'<', Punctuation, 'closing_gt_type'),
+
+            (r"'", String.Single, 'string_single'),
+            (r'"', String.Double, 'string_double'),
+
+            (r'[|&\.,\[\]:=]+', Punctuation),
+            (r'->', Punctuation),
+
+            (r'typeof\(', Name.Builtin, ('closing_parenthesis_base',
+                                         'expression')),
+            (r'[a-zA-Z_]\w*', Name.Class),
+        ],
+        'type_start': [
+            include('ws'),
+
+            (r'\(', Punctuation, ('#pop', 'closing_parenthesis_type')),
+            (r'\{', Punctuation, ('#pop', 'closing_brace_type')),
+            (r'<', Punctuation, ('#pop', 'closing_gt_type')),
+
+            (r"'", String.Single, ('#pop', 'string_single')),
+            (r'"', String.Double, ('#pop', 'string_double')),
+
+            (r'typeof\(', Name.Builtin, ('#pop', 'closing_parenthesis_base',
+                                         'expression')),
+            (r'[a-zA-Z_]\w*', Name.Class, '#pop'),
+        ],
+        'type_end': [
+            include('ws'),
+
+            (r'[|&\.]', Punctuation, 'type_start'),
+            (r'->', Punctuation, 'type_start'),
+
+            (r'<', Punctuation, 'closing_gt_type'),
+
+            default('#pop'),
+        ],
+        'type_declaration': [
+            include('ws'),
+
+            (r'[a-zA-Z_]\w*', Name.Class),
+            (r'<', Punctuation, 'closing_gt_type'),
+
+            (r'=', Punctuation, ('#pop', 'type_end', 'type_start')),
+        ],
+    }
+
+    def __init__(self, **options):
+        self.include_luau_builtins = get_bool_opt(
+            options, 'include_luau_builtins', True)
+        self.include_roblox_builtins = get_bool_opt(
+            options, 'include_roblox_builtins', False)
+        self.additional_builtins = get_list_opt(options, 'additional_builtins', [])
+        self.disabled_builtins = get_list_opt(options, 'disabled_builtins', [])
+
+        self._builtins = set(self.additional_builtins)
+        if self.include_luau_builtins:
+            from pygments.lexers._luau_builtins import LUAU_BUILTINS
+            self._builtins.update(LUAU_BUILTINS)
+        if self.include_roblox_builtins:
+            from pygments.lexers._luau_builtins import ROBLOX_BUILTINS
+            self._builtins.update(ROBLOX_BUILTINS)
+        if self.additional_builtins:
+            self._builtins.update(self.additional_builtins)
+        self._builtins.difference_update(self.disabled_builtins)
+
+        RegexLexer.__init__(self, **options)
+
+    def get_tokens_unprocessed(self, text):
+        for index, token, value in \
+                RegexLexer.get_tokens_unprocessed(self, text):
+            if token is Name or token is Name.Other:
+                split_value = value.split('.')
+                complete_value = []
+                new_index = index
+                for position in range(len(split_value), 0, -1):
+                    potential_string = '.'.join(split_value[:position])
+                    if potential_string in self._builtins:
+                        yield index, Name.Builtin, potential_string
+                        new_index += len(potential_string)
+
+                        if complete_value:
+                            yield new_index, Punctuation, '.'
+                            new_index += 1
+                        break
+                    complete_value.insert(0, split_value[position - 1])
+
+                for position, substring in enumerate(complete_value):
+                    if position + 1 == len(complete_value):
+                        if token is Name:
+                            yield new_index, Name.Variable, substring
+                            continue
+                        yield new_index, Name.Function, substring
+                        continue
+                    yield new_index, Name.Variable, substring
+                    new_index += len(substring)
+                    yield new_index, Punctuation, '.'
+                    new_index += 1
+
+                continue
             yield index, token, value
 
 class MoonScriptLexer(LuaLexer):
     """
     For MoonScript source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'MoonScript'
@@ -174,6 +503,7 @@ class MoonScriptLexer(LuaLexer):
     aliases = ['moonscript', 'moon']
     filenames = ['*.moon']
     mimetypes = ['text/x-moonscript', 'application/x-moonscript']
+    version_added = '1.5'
 
     tokens = {
         'root': [
@@ -206,7 +536,8 @@ class MoonScriptLexer(LuaLexer):
             (r'(self)\b', Name.Builtin.Pseudo),
             (r'@@?([a-zA-Z_]\w*)?', Name.Variable.Class),
             (r'[A-Z]\w*', Name.Class),  # proper name
-            (r'[A-Za-z_]\w*(\.[A-Za-z_]\w*)?', Name),
+            (words(all_lua_builtins(), suffix=r"\b"), Name.Builtin),
+            (r'[A-Za-z_]\w*', Name),
             ("'", String.Single, combined('stringescape', 'sqs')),
             ('"', String.Double, combined('stringescape', 'dqs'))
         ],
@@ -234,8 +565,6 @@ class MoonScriptLexer(LuaLexer):
 class ChaiscriptLexer(RegexLexer):
     """
     For ChaiScript source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'ChaiScript'
@@ -243,6 +572,7 @@ class ChaiscriptLexer(RegexLexer):
     aliases = ['chaiscript', 'chai']
     filenames = ['*.chai']
     mimetypes = ['text/x-chaiscript', 'application/x-chaiscript']
+    version_added = '2.0'
 
     flags = re.DOTALL | re.MULTILINE
 
@@ -301,14 +631,14 @@ class ChaiscriptLexer(RegexLexer):
 class LSLLexer(RegexLexer):
     """
     For Second Life's Linden Scripting Language source code.
-
-    .. versionadded:: 2.0
     """
 
     name = 'LSL'
     aliases = ['lsl']
     filenames = ['*.lsl']
     mimetypes = ['text/x-lsl']
+    url = 'https://wiki.secondlife.com/wiki/Linden_Scripting_Language'
+    version_added = '2.0'
 
     flags = re.MULTILINE
 
@@ -389,14 +719,13 @@ class AppleScriptLexer(RegexLexer):
     <http://developer.apple.com/documentation/AppleScript/
     Reference/StudioReference>`_.
     Contributed by Andreas Amann <aamann@mac.com>.
-
-    .. versionadded:: 1.0
     """
 
     name = 'AppleScript'
     url = 'https://developer.apple.com/library/archive/documentation/AppleScript/Conceptual/AppleScriptLangGuide/introduction/ASLR_intro.html'
     aliases = ['applescript']
     filenames = ['*.applescript']
+    version_added = '1.0'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -672,26 +1001,26 @@ class AppleScriptLexer(RegexLexer):
              r'numeric strings|punctuation|white space)',
              bygroups(Keyword, Name.Builtin)),
             (r'(-|\*|\+|&|≠|>=?|<=?|=|≥|≤|/|÷|\^)', Operator),
-            (r"\b(%s)\b" % '|'.join(Operators), Operator.Word),
+            (r"\b({})\b".format('|'.join(Operators)), Operator.Word),
             (r'^(\s*(?:on|end)\s+)'
-             r'(%s)' % '|'.join(StudioEvents[::-1]),
+             r'({})'.format('|'.join(StudioEvents[::-1])),
              bygroups(Keyword, Name.Function)),
             (r'^(\s*)(in|on|script|to)(\s+)', bygroups(Text, Keyword, Text)),
-            (r'\b(as )(%s)\b' % '|'.join(Classes),
+            (r'\b(as )({})\b'.format('|'.join(Classes)),
              bygroups(Keyword, Name.Class)),
-            (r'\b(%s)\b' % '|'.join(Literals), Name.Constant),
-            (r'\b(%s)\b' % '|'.join(Commands), Name.Builtin),
-            (r'\b(%s)\b' % '|'.join(Control), Keyword),
-            (r'\b(%s)\b' % '|'.join(Declarations), Keyword),
-            (r'\b(%s)\b' % '|'.join(Reserved), Name.Builtin),
-            (r'\b(%s)s?\b' % '|'.join(BuiltIn), Name.Builtin),
-            (r'\b(%s)\b' % '|'.join(HandlerParams), Name.Builtin),
-            (r'\b(%s)\b' % '|'.join(StudioProperties), Name.Attribute),
-            (r'\b(%s)s?\b' % '|'.join(StudioClasses), Name.Builtin),
-            (r'\b(%s)\b' % '|'.join(StudioCommands), Name.Builtin),
-            (r'\b(%s)\b' % '|'.join(References), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(Literals)), Name.Constant),
+            (r'\b({})\b'.format('|'.join(Commands)), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(Control)), Keyword),
+            (r'\b({})\b'.format('|'.join(Declarations)), Keyword),
+            (r'\b({})\b'.format('|'.join(Reserved)), Name.Builtin),
+            (r'\b({})s?\b'.format('|'.join(BuiltIn)), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(HandlerParams)), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(StudioProperties)), Name.Attribute),
+            (r'\b({})s?\b'.format('|'.join(StudioClasses)), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(StudioCommands)), Name.Builtin),
+            (r'\b({})\b'.format('|'.join(References)), Name.Builtin),
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String.Double),
-            (r'\b(%s)\b' % Identifiers, Name.Variable),
+            (rf'\b({Identifiers})\b', Name.Variable),
             (r'[-+]?(\d+\.\d*|\d*\.\d+)(E[-+][0-9]+)?', Number.Float),
             (r'[-+]?\d+', Number.Integer),
         ],
@@ -710,14 +1039,13 @@ class RexxLexer(RegexLexer):
     a wide range of different platforms with its roots found on mainframe
     systems. It is popular for I/O- and data based tasks and can act as glue
     language to bind different applications together.
-
-    .. versionadded:: 2.0
     """
     name = 'Rexx'
     url = 'http://www.rexxinfo.org/'
     aliases = ['rexx', 'arexx']
     filenames = ['*.rexx', '*.rex', '*.rx', '*.arexx']
     mimetypes = ['text/x-rexx']
+    version_added = '2.0'
     flags = re.IGNORECASE
 
     tokens = {
@@ -781,7 +1109,8 @@ class RexxLexer(RegexLexer):
         ]
     }
 
-    _c = lambda s: re.compile(s, re.MULTILINE)
+    def _c(s):
+        return re.compile(s, re.MULTILINE)
     _ADDRESS_COMMAND_PATTERN = _c(r'^\s*address\s+command\b')
     _ADDRESS_PATTERN = _c(r'^\s*address\s+')
     _DO_WHILE_PATTERN = _c(r'^\s*do\s+while\b')
@@ -821,14 +1150,13 @@ class RexxLexer(RegexLexer):
 class MOOCodeLexer(RegexLexer):
     """
     For MOOCode (the MOO scripting language).
-
-    .. versionadded:: 0.9
     """
     name = 'MOOCode'
     url = 'http://www.moo.mud.org/'
     filenames = ['*.moo']
     aliases = ['moocode', 'moo']
     mimetypes = ['text/x-moocode']
+    version_added = '0.9'
 
     tokens = {
         'root': [
@@ -864,14 +1192,14 @@ class MOOCodeLexer(RegexLexer):
 class HybrisLexer(RegexLexer):
     """
     For Hybris source code.
-
-    .. versionadded:: 1.4
     """
 
     name = 'Hybris'
-    aliases = ['hybris', 'hy']
-    filenames = ['*.hy', '*.hyb']
+    aliases = ['hybris']
+    filenames = ['*.hyb']
     mimetypes = ['text/x-hybris', 'application/x-hybris']
+    url = 'https://github.com/evilsocket/hybris'
+    version_added = '1.4'
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -962,13 +1290,13 @@ class EasytrieveLexer(RegexLexer):
     converting sequential data. Furthermore it can layout data for reports.
     It is mainly used on mainframe platforms and can access several of the
     mainframe's native file formats. It is somewhat comparable to awk.
-
-    .. versionadded:: 2.1
     """
     name = 'Easytrieve'
     aliases = ['easytrieve']
     filenames = ['*.ezt', '*.mac']
     mimetypes = ['text/x-easytrieve']
+    url = 'https://www.broadcom.com/products/mainframe/application-development/easytrieve-report-generator'
+    version_added = '2.1'
     flags = 0
 
     # Note: We cannot use r'\b' at the start and end of keywords because
@@ -1154,13 +1482,14 @@ class JclLexer(RegexLexer):
     is a scripting language used on mainframe platforms to instruct the system
     on how to run a batch job or start a subsystem. It is somewhat
     comparable to MS DOS batch and Unix shell scripts.
-
-    .. versionadded:: 2.1
     """
     name = 'JCL'
     aliases = ['jcl']
     filenames = ['*.jcl']
     mimetypes = ['text/x-jcl']
+    url = 'https://en.wikipedia.org/wiki/Job_Control_Language'
+    version_added = '2.1'
+
     flags = re.IGNORECASE
 
     tokens = {
@@ -1234,8 +1563,6 @@ class JclLexer(RegexLexer):
 class MiniScriptLexer(RegexLexer):
     """
     For MiniScript source code.
-
-    .. versionadded:: 2.6
     """
 
     name = 'MiniScript'
@@ -1243,6 +1570,7 @@ class MiniScriptLexer(RegexLexer):
     aliases = ['miniscript', 'ms']
     filenames = ['*.ms']
     mimetypes = ['text/x-minicript', 'application/x-miniscript']
+    version_added = '2.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/sgf.py b/libs/pygments/lexers/sgf.py
index 0fad263e0..f0e56cba5 100644
--- a/libs/pygments/lexers/sgf.py
+++ b/libs/pygments/lexers/sgf.py
@@ -4,7 +4,7 @@
 
     Lexer for Smart Game Format (sgf) file format.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,13 +20,12 @@ class SmartGameFormatLexer(RegexLexer):
 
     The format is used to store game records of board games for two players
     (mainly Go game).
-
-    .. versionadded:: 2.4
     """
     name = 'SmartGameFormat'
     url = 'https://www.red-bean.com/sgf/'
     aliases = ['sgf']
     filenames = ['*.sgf']
+    version_added = '2.4'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/shell.py b/libs/pygments/lexers/shell.py
index eabf4ec94..744767a1d 100644
--- a/libs/pygments/lexers/shell.py
+++ b/libs/pygments/lexers/shell.py
@@ -4,7 +4,7 @@
 
     Lexers for various shells.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -25,18 +25,18 @@ __all__ = ['BashLexer', 'BashSessionLexer', 'TcshLexer', 'BatchLexer',
 class BashLexer(RegexLexer):
     """
     Lexer for (ba|k|z|)sh shell scripts.
-
-    .. versionadded:: 0.6
     """
 
     name = 'Bash'
-    aliases = ['bash', 'sh', 'ksh', 'zsh', 'shell']
+    aliases = ['bash', 'sh', 'ksh', 'zsh', 'shell', 'openrc']
     filenames = ['*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass',
                  '*.exheres-0', '*.exlib', '*.zsh',
                  '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc',
                  '.kshrc', 'kshrc',
                  'PKGBUILD']
     mimetypes = ['application/x-sh', 'application/x-shellscript', 'text/x-shellscript']
+    url = 'https://en.wikipedia.org/wiki/Unix_shell'
+    version_added = '0.6'
 
     tokens = {
         'root': [
@@ -129,14 +129,13 @@ class BashLexer(RegexLexer):
 class SlurmBashLexer(BashLexer):
     """
     Lexer for (ba|k|z|)sh Slurm scripts.
-
-    .. versionadded:: 2.4
     """
 
     name = 'Slurm'
     aliases = ['slurm', 'sbatch']
     filenames = ['*.sl']
     mimetypes = []
+    version_added = '2.4'
     EXTRA_KEYWORDS = {'srun'}
 
     def get_tokens_unprocessed(self, text):
@@ -225,14 +224,15 @@ class BashSessionLexer(ShellSessionBaseLexer):
     """
     Lexer for Bash shell sessions, i.e. command lines, including a
     prompt, interspersed with output.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Bash Session'
     aliases = ['console', 'shell-session']
     filenames = ['*.sh-session', '*.shell-session']
     mimetypes = ['application/x-shell-session', 'application/x-sh-session']
+    url = 'https://en.wikipedia.org/wiki/Unix_shell'
+    version_added = '1.1'
+    _example = "console/example.sh-session"
 
     _innerLexerCls = BashLexer
     _ps1rgx = re.compile(
@@ -244,13 +244,13 @@ class BashSessionLexer(ShellSessionBaseLexer):
 class BatchLexer(RegexLexer):
     """
     Lexer for the DOS/Windows Batch file format.
-
-    .. versionadded:: 0.7
     """
     name = 'Batchfile'
     aliases = ['batch', 'bat', 'dosbatch', 'winbatch']
     filenames = ['*.bat', '*.cmd']
     mimetypes = ['application/x-dos-batch']
+    url = 'https://en.wikipedia.org/wiki/Batch_file'
+    version_added = '0.7'
 
     flags = re.MULTILINE | re.IGNORECASE
 
@@ -258,28 +258,25 @@ class BatchLexer(RegexLexer):
     _punct = r'&<>|'
     _ws = r'\t\v\f\r ,;=\xa0'
     _nlws = r'\s\x1a\xa0,;='
-    _space = r'(?:(?:(?:\^[%s])?[%s])+)' % (_nl, _ws)
-    _keyword_terminator = (r'(?=(?:\^[%s]?)?[%s+./:[\\\]]|[%s%s(])' %
-                           (_nl, _ws, _nl, _punct))
-    _token_terminator = r'(?=\^?[%s]|[%s%s])' % (_ws, _punct, _nl)
-    _start_label = r'((?:(?<=^[^:])|^[^:]?)[%s]*)(:)' % _ws
-    _label = r'(?:(?:[^%s%s+:^]|\^[%s]?[\w\W])*)' % (_nlws, _punct, _nl)
-    _label_compound = r'(?:(?:[^%s%s+:^)]|\^[%s]?[^)])*)' % (_nlws, _punct, _nl)
-    _number = r'(?:-?(?:0[0-7]+|0x[\da-f]+|\d+)%s)' % _token_terminator
+    _space = rf'(?:(?:(?:\^[{_nl}])?[{_ws}])+)'
+    _keyword_terminator = (rf'(?=(?:\^[{_nl}]?)?[{_ws}+./:[\\\]]|[{_nl}{_punct}(])')
+    _token_terminator = rf'(?=\^?[{_ws}]|[{_punct}{_nl}])'
+    _start_label = rf'((?:(?<=^[^:])|^[^:]?)[{_ws}]*)(:)'
+    _label = rf'(?:(?:[^{_nlws}{_punct}+:^]|\^[{_nl}]?[\w\W])*)'
+    _label_compound = rf'(?:(?:[^{_nlws}{_punct}+:^)]|\^[{_nl}]?[^)])*)'
+    _number = rf'(?:-?(?:0[0-7]+|0x[\da-f]+|\d+){_token_terminator})'
     _opword = r'(?:equ|geq|gtr|leq|lss|neq)'
-    _string = r'(?:"[^%s"]*(?:"|(?=[%s])))' % (_nl, _nl)
-    _variable = (r'(?:(?:%%(?:\*|(?:~[a-z]*(?:\$[^:]+:)?)?\d|'
-                 r'[^%%:%s]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:[^%%%s^]|'
-                 r'\^[^%%%s])[^=%s]*=(?:[^%%%s^]|\^[^%%%s])*)?)?%%))|'
-                 r'(?:\^?![^!:%s]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:'
-                 r'[^!%s^]|\^[^!%s])[^=%s]*=(?:[^!%s^]|\^[^!%s])*)?)?\^?!))' %
-                 (_nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl, _nl))
-    _core_token = r'(?:(?:(?:\^[%s]?)?[^"%s%s])+)' % (_nl, _nlws, _punct)
-    _core_token_compound = r'(?:(?:(?:\^[%s]?)?[^"%s%s)])+)' % (_nl, _nlws, _punct)
-    _token = r'(?:[%s]+|%s)' % (_punct, _core_token)
-    _token_compound = r'(?:[%s]+|%s)' % (_punct, _core_token_compound)
-    _stoken = (r'(?:[%s]+|(?:%s|%s|%s)+)' %
-               (_punct, _string, _variable, _core_token))
+    _string = rf'(?:"[^{_nl}"]*(?:"|(?=[{_nl}])))'
+    _variable = (r'(?:(?:%(?:\*|(?:~[a-z]*(?:\$[^:]+:)?)?\d|'
+                 rf'[^%:{_nl}]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:[^%{_nl}^]|'
+                 rf'\^[^%{_nl}])[^={_nl}]*=(?:[^%{_nl}^]|\^[^%{_nl}])*)?)?%))|'
+                 rf'(?:\^?![^!:{_nl}]+(?::(?:~(?:-?\d+)?(?:,(?:-?\d+)?)?|(?:'
+                 rf'[^!{_nl}^]|\^[^!{_nl}])[^={_nl}]*=(?:[^!{_nl}^]|\^[^!{_nl}])*)?)?\^?!))')
+    _core_token = rf'(?:(?:(?:\^[{_nl}]?)?[^"{_nlws}{_punct}])+)'
+    _core_token_compound = rf'(?:(?:(?:\^[{_nl}]?)?[^"{_nlws}{_punct})])+)'
+    _token = rf'(?:[{_punct}]+|{_core_token})'
+    _token_compound = rf'(?:[{_punct}]+|{_core_token_compound})'
+    _stoken = (rf'(?:[{_punct}]+|(?:{_string}|{_variable}|{_core_token})+)')
 
     def _make_begin_state(compound, _core_token=_core_token,
                           _core_token_compound=_core_token_compound,
@@ -288,81 +285,71 @@ class BatchLexer(RegexLexer):
                           _space=_space, _start_label=_start_label,
                           _stoken=_stoken, _token_terminator=_token_terminator,
                           _variable=_variable, _ws=_ws):
-        rest = '(?:%s|%s|[^"%%%s%s%s])*' % (_string, _variable, _nl, _punct,
+        rest = '(?:{}|{}|[^"%{}{}{}])*'.format(_string, _variable, _nl, _punct,
                                             ')' if compound else '')
-        rest_of_line = r'(?:(?:[^%s^]|\^[%s]?[\w\W])*)' % (_nl, _nl)
-        rest_of_line_compound = r'(?:(?:[^%s^)]|\^[%s]?[^)])*)' % (_nl, _nl)
-        set_space = r'((?:(?:\^[%s]?)?[^\S\n])*)' % _nl
+        rest_of_line = rf'(?:(?:[^{_nl}^]|\^[{_nl}]?[\w\W])*)'
+        rest_of_line_compound = rf'(?:(?:[^{_nl}^)]|\^[{_nl}]?[^)])*)'
+        set_space = rf'((?:(?:\^[{_nl}]?)?[^\S\n])*)'
         suffix = ''
         if compound:
-            _keyword_terminator = r'(?:(?=\))|%s)' % _keyword_terminator
-            _token_terminator = r'(?:(?=\))|%s)' % _token_terminator
+            _keyword_terminator = rf'(?:(?=\))|{_keyword_terminator})'
+            _token_terminator = rf'(?:(?=\))|{_token_terminator})'
             suffix = '/compound'
         return [
             ((r'\)', Punctuation, '#pop') if compound else
-             (r'\)((?=\()|%s)%s' % (_token_terminator, rest_of_line),
+             (rf'\)((?=\()|{_token_terminator}){rest_of_line}',
               Comment.Single)),
-            (r'(?=%s)' % _start_label, Text, 'follow%s' % suffix),
+            (rf'(?={_start_label})', Text, f'follow{suffix}'),
             (_space, using(this, state='text')),
-            include('redirect%s' % suffix),
-            (r'[%s]+' % _nl, Text),
+            include(f'redirect{suffix}'),
+            (rf'[{_nl}]+', Text),
             (r'\(', Punctuation, 'root/compound'),
             (r'@+', Punctuation),
-            (r'((?:for|if|rem)(?:(?=(?:\^[%s]?)?/)|(?:(?!\^)|'
-             r'(?<=m))(?:(?=\()|%s)))(%s?%s?(?:\^[%s]?)?/(?:\^[%s]?)?\?)' %
-             (_nl, _token_terminator, _space,
-              _core_token_compound if compound else _core_token, _nl, _nl),
+            (rf'((?:for|if|rem)(?:(?=(?:\^[{_nl}]?)?/)|(?:(?!\^)|'
+             rf'(?<=m))(?:(?=\()|{_token_terminator})))({_space}?{_core_token_compound if compound else _core_token}?(?:\^[{_nl}]?)?/(?:\^[{_nl}]?)?\?)',
              bygroups(Keyword, using(this, state='text')),
-             'follow%s' % suffix),
-            (r'(goto%s)(%s(?:\^[%s]?)?/(?:\^[%s]?)?\?%s)' %
-             (_keyword_terminator, rest, _nl, _nl, rest),
+             f'follow{suffix}'),
+            (rf'(goto{_keyword_terminator})({rest}(?:\^[{_nl}]?)?/(?:\^[{_nl}]?)?\?{rest})',
              bygroups(Keyword, using(this, state='text')),
-             'follow%s' % suffix),
+             f'follow{suffix}'),
             (words(('assoc', 'break', 'cd', 'chdir', 'cls', 'color', 'copy',
                     'date', 'del', 'dir', 'dpath', 'echo', 'endlocal', 'erase',
                     'exit', 'ftype', 'keys', 'md', 'mkdir', 'mklink', 'move',
                     'path', 'pause', 'popd', 'prompt', 'pushd', 'rd', 'ren',
                     'rename', 'rmdir', 'setlocal', 'shift', 'start', 'time',
                     'title', 'type', 'ver', 'verify', 'vol'),
-                   suffix=_keyword_terminator), Keyword, 'follow%s' % suffix),
-            (r'(call)(%s?)(:)' % _space,
+                   suffix=_keyword_terminator), Keyword, f'follow{suffix}'),
+            (rf'(call)({_space}?)(:)',
              bygroups(Keyword, using(this, state='text'), Punctuation),
-             'call%s' % suffix),
-            (r'call%s' % _keyword_terminator, Keyword),
-            (r'(for%s(?!\^))(%s)(/f%s)' %
-             (_token_terminator, _space, _token_terminator),
+             f'call{suffix}'),
+            (rf'call{_keyword_terminator}', Keyword),
+            (rf'(for{_token_terminator}(?!\^))({_space})(/f{_token_terminator})',
              bygroups(Keyword, using(this, state='text'), Keyword),
              ('for/f', 'for')),
-            (r'(for%s(?!\^))(%s)(/l%s)' %
-             (_token_terminator, _space, _token_terminator),
+            (rf'(for{_token_terminator}(?!\^))({_space})(/l{_token_terminator})',
              bygroups(Keyword, using(this, state='text'), Keyword),
              ('for/l', 'for')),
-            (r'for%s(?!\^)' % _token_terminator, Keyword, ('for2', 'for')),
-            (r'(goto%s)(%s?)(:?)' % (_keyword_terminator, _space),
+            (rf'for{_token_terminator}(?!\^)', Keyword, ('for2', 'for')),
+            (rf'(goto{_keyword_terminator})({_space}?)(:?)',
              bygroups(Keyword, using(this, state='text'), Punctuation),
-             'label%s' % suffix),
-            (r'(if(?:(?=\()|%s)(?!\^))(%s?)((?:/i%s)?)(%s?)((?:not%s)?)(%s?)' %
-             (_token_terminator, _space, _token_terminator, _space,
-              _token_terminator, _space),
+             f'label{suffix}'),
+            (rf'(if(?:(?=\()|{_token_terminator})(?!\^))({_space}?)((?:/i{_token_terminator})?)({_space}?)((?:not{_token_terminator})?)({_space}?)',
              bygroups(Keyword, using(this, state='text'), Keyword,
                       using(this, state='text'), Keyword,
                       using(this, state='text')), ('(?', 'if')),
-            (r'rem(((?=\()|%s)%s?%s?.*|%s%s)' %
-             (_token_terminator, _space, _stoken, _keyword_terminator,
-              rest_of_line_compound if compound else rest_of_line),
-             Comment.Single, 'follow%s' % suffix),
-            (r'(set%s)%s(/a)' % (_keyword_terminator, set_space),
+            (rf'rem(((?=\()|{_token_terminator}){_space}?{_stoken}?.*|{_keyword_terminator}{rest_of_line_compound if compound else rest_of_line})',
+             Comment.Single, f'follow{suffix}'),
+            (rf'(set{_keyword_terminator}){set_space}(/a)',
              bygroups(Keyword, using(this, state='text'), Keyword),
-             'arithmetic%s' % suffix),
-            (r'(set%s)%s((?:/p)?)%s((?:(?:(?:\^[%s]?)?[^"%s%s^=%s]|'
-             r'\^[%s]?[^"=])+)?)((?:(?:\^[%s]?)?=)?)' %
-             (_keyword_terminator, set_space, set_space, _nl, _nl, _punct,
+             f'arithmetic{suffix}'),
+            (r'(set{}){}((?:/p)?){}((?:(?:(?:\^[{}]?)?[^"{}{}^={}]|'
+             r'\^[{}]?[^"=])+)?)((?:(?:\^[{}]?)?=)?)'.format(_keyword_terminator, set_space, set_space, _nl, _nl, _punct,
               ')' if compound else '', _nl, _nl),
              bygroups(Keyword, using(this, state='text'), Keyword,
                       using(this, state='text'), using(this, state='variable'),
                       Punctuation),
-             'follow%s' % suffix),
-            default('follow%s' % suffix)
+             f'follow{suffix}'),
+            default(f'follow{suffix}')
         ]
 
     def _make_follow_state(compound, _label=_label,
@@ -375,11 +362,10 @@ class BatchLexer(RegexLexer):
         if compound:
             state.append((r'(?=\))', Text, '#pop'))
         state += [
-            (r'%s([%s]*)(%s)(.*)' %
-             (_start_label, _ws, _label_compound if compound else _label),
+            (rf'{_start_label}([{_ws}]*)({_label_compound if compound else _label})(.*)',
              bygroups(Text, Punctuation, Text, Name.Label, Comment.Single)),
-            include('redirect%s' % suffix),
-            (r'(?=[%s])' % _nl, Text, '#pop'),
+            include(f'redirect{suffix}'),
+            (rf'(?=[{_nl}])', Text, '#pop'),
             (r'\|\|?|&&?', Punctuation, '#pop'),
             include('text')
         ]
@@ -397,9 +383,8 @@ class BatchLexer(RegexLexer):
             (r'0x[\da-f]+', Number.Hex),
             (r'\d+', Number.Integer),
             (r'[(),]+', Punctuation),
-            (r'([%s]|%%|\^\^)+' % op, Operator),
-            (r'(%s|%s|(\^[%s]?)?[^()%s%%\^"%s%s]|\^[%s]?%s)+' %
-             (_string, _variable, _nl, op, _nlws, _punct, _nlws,
+            (rf'([{op}]|%|\^\^)+', Operator),
+            (r'({}|{}|(\^[{}]?)?[^(){}%\^"{}{}]|\^[{}]?{})+'.format(_string, _variable, _nl, op, _nlws, _punct, _nlws,
               r'[^)]' if compound else r'[\w\W]'),
              using(this, state='variable')),
             (r'(?=[\x00|&])', Text, '#pop'),
@@ -422,8 +407,7 @@ class BatchLexer(RegexLexer):
         state = []
         if compound:
             state.append((r'(?=\))', Text, '#pop'))
-        state.append((r'(%s?)((?:%s|%s|\^[%s]?%s|[^"%%^%s%s%s])*)' %
-                      (_label_compound if compound else _label, _string,
+        state.append((r'({}?)((?:{}|{}|\^[{}]?{}|[^"%^{}{}{}])*)'.format(_label_compound if compound else _label, _string,
                        _variable, _nl, r'[^)]' if compound else r'[\w\W]', _nl,
                        _punct, r')' if compound else ''),
                       bygroups(Name.Label, Comment.Single), '#pop'))
@@ -434,14 +418,11 @@ class BatchLexer(RegexLexer):
                              _nl=_nl, _punct=_punct, _stoken=_stoken,
                              _string=_string, _space=_space,
                              _variable=_variable, _nlws=_nlws):
-        stoken_compound = (r'(?:[%s]+|(?:%s|%s|%s)+)' %
-                           (_punct, _string, _variable, _core_token_compound))
+        stoken_compound = (rf'(?:[{_punct}]+|(?:{_string}|{_variable}|{_core_token_compound})+)')
         return [
-            (r'((?:(?<=[%s])\d)?)(>>?&|<&)([%s]*)(\d)' %
-             (_nlws, _nlws),
+            (rf'((?:(?<=[{_nlws}])\d)?)(>>?&|<&)([{_nlws}]*)(\d)',
              bygroups(Number.Integer, Punctuation, Text, Number.Integer)),
-            (r'((?:(?<=[%s])(?<!\^[%s])\d)?)(>>?|<)(%s?%s)' %
-             (_nlws, _nl, _space, stoken_compound if compound else _stoken),
+            (rf'((?:(?<=[{_nlws}])(?<!\^[{_nl}])\d)?)(>>?|<)({_space}?{stoken_compound if compound else _stoken})',
              bygroups(Number.Integer, Punctuation, using(this, state='text')))
         ]
 
@@ -460,13 +441,13 @@ class BatchLexer(RegexLexer):
         'redirect/compound': _make_redirect_state(True),
         'variable-or-escape': [
             (_variable, Name.Variable),
-            (r'%%%%|\^[%s]?(\^!|[\w\W])' % _nl, String.Escape)
+            (rf'%%|\^[{_nl}]?(\^!|[\w\W])', String.Escape)
         ],
         'string': [
             (r'"', String.Double, '#pop'),
             (_variable, Name.Variable),
             (r'\^!|%%', String.Escape),
-            (r'[^"%%^%s]+|[%%^]' % _nl, String.Double),
+            (rf'[^"%^{_nl}]+|[%^]', String.Double),
             default('#pop')
         ],
         'sqstring': [
@@ -480,34 +461,34 @@ class BatchLexer(RegexLexer):
         'text': [
             (r'"', String.Double, 'string'),
             include('variable-or-escape'),
-            (r'[^"%%^%s%s\d)]+|.' % (_nlws, _punct), Text)
+            (rf'[^"%^{_nlws}{_punct}\d)]+|.', Text)
         ],
         'variable': [
             (r'"', String.Double, 'string'),
             include('variable-or-escape'),
-            (r'[^"%%^%s]+|.' % _nl, Name.Variable)
+            (rf'[^"%^{_nl}]+|.', Name.Variable)
         ],
         'for': [
-            (r'(%s)(in)(%s)(\()' % (_space, _space),
+            (rf'({_space})(in)({_space})(\()',
              bygroups(using(this, state='text'), Keyword,
                       using(this, state='text'), Punctuation), '#pop'),
             include('follow')
         ],
         'for2': [
             (r'\)', Punctuation),
-            (r'(%s)(do%s)' % (_space, _token_terminator),
+            (rf'({_space})(do{_token_terminator})',
              bygroups(using(this, state='text'), Keyword), '#pop'),
-            (r'[%s]+' % _nl, Text),
+            (rf'[{_nl}]+', Text),
             include('follow')
         ],
         'for/f': [
-            (r'(")((?:%s|[^"])*?")([%s]*)(\))' % (_variable, _nlws),
+            (rf'(")((?:{_variable}|[^"])*?")([{_nlws}]*)(\))',
              bygroups(String.Double, using(this, state='string'), Text,
                       Punctuation)),
             (r'"', String.Double, ('#pop', 'for2', 'string')),
-            (r"('(?:%%%%|%s|[\w\W])*?')([%s]*)(\))" % (_variable, _nlws),
+            (rf"('(?:%%|{_variable}|[\w\W])*?')([{_nlws}]*)(\))",
              bygroups(using(this, state='sqstring'), Text, Punctuation)),
-            (r'(`(?:%%%%|%s|[\w\W])*?`)([%s]*)(\))' % (_variable, _nlws),
+            (rf'(`(?:%%|{_variable}|[\w\W])*?`)([{_nlws}]*)(\))',
              bygroups(using(this, state='bqstring'), Text, Punctuation)),
             include('for2')
         ],
@@ -516,25 +497,24 @@ class BatchLexer(RegexLexer):
             include('for2')
         ],
         'if': [
-            (r'((?:cmdextversion|errorlevel)%s)(%s)(\d+)' %
-             (_token_terminator, _space),
+            (rf'((?:cmdextversion|errorlevel){_token_terminator})({_space})(\d+)',
              bygroups(Keyword, using(this, state='text'),
                       Number.Integer), '#pop'),
-            (r'(defined%s)(%s)(%s)' % (_token_terminator, _space, _stoken),
+            (rf'(defined{_token_terminator})({_space})({_stoken})',
              bygroups(Keyword, using(this, state='text'),
                       using(this, state='variable')), '#pop'),
-            (r'(exist%s)(%s%s)' % (_token_terminator, _space, _stoken),
+            (rf'(exist{_token_terminator})({_space}{_stoken})',
              bygroups(Keyword, using(this, state='text')), '#pop'),
-            (r'(%s%s)(%s)(%s%s)' % (_number, _space, _opword, _space, _number),
+            (rf'({_number}{_space})({_opword})({_space}{_number})',
              bygroups(using(this, state='arithmetic'), Operator.Word,
                       using(this, state='arithmetic')), '#pop'),
             (_stoken, using(this, state='text'), ('#pop', 'if2')),
         ],
         'if2': [
-            (r'(%s?)(==)(%s?%s)' % (_space, _space, _stoken),
+            (rf'({_space}?)(==)({_space}?{_stoken})',
              bygroups(using(this, state='text'), Operator,
                       using(this, state='text')), '#pop'),
-            (r'(%s)(%s)(%s%s)' % (_space, _opword, _space, _stoken),
+            (rf'({_space})({_opword})({_space}{_stoken})',
              bygroups(using(this, state='text'), Operator.Word,
                       using(this, state='text')), '#pop')
         ],
@@ -545,7 +525,7 @@ class BatchLexer(RegexLexer):
         ],
         'else?': [
             (_space, using(this, state='text')),
-            (r'else%s' % _token_terminator, Keyword, '#pop'),
+            (rf'else{_token_terminator}', Keyword, '#pop'),
             default('#pop')
         ]
     }
@@ -555,14 +535,15 @@ class MSDOSSessionLexer(ShellSessionBaseLexer):
     """
     Lexer for MS DOS shell sessions, i.e. command lines, including a
     prompt, interspersed with output.
-
-    .. versionadded:: 2.1
     """
 
     name = 'MSDOS Session'
     aliases = ['doscon']
     filenames = []
     mimetypes = []
+    url = 'https://en.wikipedia.org/wiki/MS-DOS'
+    version_added = '2.1'
+    _example = "doscon/session"
 
     _innerLexerCls = BatchLexer
     _ps1rgx = re.compile(r'^([^>]*>)(.*\n?)')
@@ -572,14 +553,14 @@ class MSDOSSessionLexer(ShellSessionBaseLexer):
 class TcshLexer(RegexLexer):
     """
     Lexer for tcsh scripts.
-
-    .. versionadded:: 0.10
     """
 
     name = 'Tcsh'
     aliases = ['tcsh', 'csh']
     filenames = ['*.tcsh', '*.csh']
     mimetypes = ['application/x-csh']
+    url = 'https://www.tcsh.org'
+    version_added = '0.10'
 
     tokens = {
         'root': [
@@ -641,14 +622,15 @@ class TcshSessionLexer(ShellSessionBaseLexer):
     """
     Lexer for Tcsh sessions, i.e. command lines, including a
     prompt, interspersed with output.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Tcsh Session'
     aliases = ['tcshcon']
     filenames = []
     mimetypes = []
+    url = 'https://www.tcsh.org'
+    version_added = '2.1'
+    _example = "tcshcon/session"
 
     _innerLexerCls = TcshLexer
     _ps1rgx = re.compile(r'^([^>]+>)(.*\n?)')
@@ -658,13 +640,13 @@ class TcshSessionLexer(ShellSessionBaseLexer):
 class PowerShellLexer(RegexLexer):
     """
     For Windows PowerShell code.
-
-    .. versionadded:: 1.5
     """
     name = 'PowerShell'
     aliases = ['powershell', 'pwsh', 'posh', 'ps1', 'psm1']
     filenames = ['*.ps1', '*.psm1']
     mimetypes = ['text/x-powershell']
+    url = 'https://learn.microsoft.com/en-us/powershell'
+    version_added = '1.5'
 
     flags = re.DOTALL | re.IGNORECASE | re.MULTILINE
 
@@ -721,7 +703,7 @@ class PowerShellLexer(RegexLexer):
             # of '$(...)' blocks in strings
             (r'\(', Punctuation, 'child'),
             (r'\s+', Text),
-            (r'^(\s*#[#\s]*)(\.(?:%s))([^\n]*$)' % '|'.join(commenthelp),
+            (r'^(\s*#[#\s]*)(\.(?:{}))([^\n]*$)'.format('|'.join(commenthelp)),
              bygroups(Comment, String.Doc, Comment)),
             (r'#[^\n]*?$', Comment),
             (r'(&lt;|<)#', Comment.Multiline, 'multline'),
@@ -733,10 +715,10 @@ class PowerShellLexer(RegexLexer):
             (r"'([^']|'')*'", String.Single),
             (r'(\$|@@|@)((global|script|private|env):)?\w+',
              Name.Variable),
-            (r'(%s)\b' % '|'.join(keywords), Keyword),
-            (r'-(%s)\b' % '|'.join(operators), Operator),
-            (r'(%s)-[a-z_]\w*\b' % '|'.join(verbs), Name.Builtin),
-            (r'(%s)\s' % '|'.join(aliases_), Name.Builtin),
+            (r'({})\b'.format('|'.join(keywords)), Keyword),
+            (r'-({})\b'.format('|'.join(operators)), Operator),
+            (r'({})-[a-z_]\w*\b'.format('|'.join(verbs)), Name.Builtin),
+            (r'({})\s'.format('|'.join(aliases_)), Name.Builtin),
             (r'\[[a-z_\[][\w. `,\[\]]*\]', Name.Constant),  # .net [type]s
             (r'-[a-z_]\w*', Name),
             (r'\w+', Name),
@@ -749,7 +731,7 @@ class PowerShellLexer(RegexLexer):
         'multline': [
             (r'[^#&.]+', Comment.Multiline),
             (r'#(>|&gt;)', Comment.Multiline, '#pop'),
-            (r'\.(%s)' % '|'.join(commenthelp), String.Doc),
+            (r'\.({})'.format('|'.join(commenthelp)), String.Doc),
             (r'[#&.]', Comment.Multiline),
         ],
         'string': [
@@ -773,14 +755,15 @@ class PowerShellSessionLexer(ShellSessionBaseLexer):
     """
     Lexer for PowerShell sessions, i.e. command lines, including a
     prompt, interspersed with output.
-
-    .. versionadded:: 2.1
     """
 
     name = 'PowerShell Session'
     aliases = ['pwsh-session', 'ps1con']
     filenames = []
     mimetypes = []
+    url = 'https://learn.microsoft.com/en-us/powershell'
+    version_added = '2.1'
+    _example = "pwsh-session/session"
 
     _innerLexerCls = PowerShellLexer
     _bare_continuation = True
@@ -791,14 +774,14 @@ class PowerShellSessionLexer(ShellSessionBaseLexer):
 class FishShellLexer(RegexLexer):
     """
     Lexer for Fish shell scripts.
-
-    .. versionadded:: 2.1
     """
 
     name = 'Fish'
     aliases = ['fish', 'fishshell']
     filenames = ['*.fish', '*.load']
     mimetypes = ['application/x-fish']
+    url = 'https://fishshell.com'
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -862,15 +845,14 @@ class FishShellLexer(RegexLexer):
 
 class ExeclineLexer(RegexLexer):
     """
-    Lexer for Laurent Bercot's execline language
-    (https://skarnet.org/software/execline).
-
-    .. versionadded:: 2.7
+    Lexer for Laurent Bercot's execline language.
     """
 
     name = 'execline'
     aliases = ['execline']
     filenames = ['*.exec']
+    url = 'https://skarnet.org/software/execline'
+    version_added = '2.7'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/sieve.py b/libs/pygments/lexers/sieve.py
index 8287b07e5..fc48980c4 100644
--- a/libs/pygments/lexers/sieve.py
+++ b/libs/pygments/lexers/sieve.py
@@ -13,7 +13,7 @@
     https://tools.ietf.org/html/rfc5429
     https://tools.ietf.org/html/rfc8580
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,12 +27,12 @@ __all__ = ["SieveLexer"]
 class SieveLexer(RegexLexer):
     """
     Lexer for sieve format.
-
-    .. versionadded:: 2.6
     """
     name = 'Sieve'
     filenames = ['*.siv', '*.sieve']
     aliases = ['sieve']
+    url = 'https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)'
+    version_added = '2.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/slash.py b/libs/pygments/lexers/slash.py
index cce47ce87..1c439d0db 100644
--- a/libs/pygments/lexers/slash.py
+++ b/libs/pygments/lexers/slash.py
@@ -2,10 +2,9 @@
     pygments.lexers.slash
     ~~~~~~~~~~~~~~~~~~~~~
 
-    Lexer for the `Slash <https://github.com/arturadib/Slash-A>`_ programming
-    language.
+    Lexer for the Slash programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -171,13 +170,13 @@ class SlashLanguageLexer(ExtendedRegexLexer):
 class SlashLexer(DelegatingLexer):
     """
     Lexer for the Slash programming language.
-
-    .. versionadded:: 2.4
     """
 
     name = 'Slash'
     aliases = ['slash']
     filenames = ['*.sla']
+    url = 'https://github.com/arturadib/Slash-A'
+    version_added = '2.4'
 
     def __init__(self, **options):
         from pygments.lexers.web import HtmlLexer
diff --git a/libs/pygments/lexers/smalltalk.py b/libs/pygments/lexers/smalltalk.py
index 58d870e54..674b7b4b3 100644
--- a/libs/pygments/lexers/smalltalk.py
+++ b/libs/pygments/lexers/smalltalk.py
@@ -4,7 +4,7 @@
 
     Lexers for Smalltalk and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ class SmalltalkLexer(RegexLexer):
     For Smalltalk syntax.
     Contributed by Stefan Matthias Aust.
     Rewritten by Nils Winter.
-
-    .. versionadded:: 0.10
     """
     name = 'Smalltalk'
     url = 'http://www.smalltalk.org/'
     filenames = ['*.st']
     aliases = ['smalltalk', 'squeak', 'st']
     mimetypes = ['text/x-smalltalk']
+    version_added = '0.10'
 
     tokens = {
         'root': [
@@ -140,14 +139,13 @@ class SmalltalkLexer(RegexLexer):
 class NewspeakLexer(RegexLexer):
     """
     For Newspeak syntax.
-
-    .. versionadded:: 1.1
     """
     name = 'Newspeak'
     url = 'http://newspeaklanguage.org/'
     filenames = ['*.ns2']
     aliases = ['newspeak', ]
     mimetypes = ['text/x-newspeak']
+    version_added = '1.1'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/smithy.py b/libs/pygments/lexers/smithy.py
index 3f48bfa45..bd479aec4 100644
--- a/libs/pygments/lexers/smithy.py
+++ b/libs/pygments/lexers/smithy.py
@@ -4,7 +4,7 @@
 
     Lexers for the Smithy IDL.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,12 @@ __all__ = ['SmithyLexer']
 class SmithyLexer(RegexLexer):
     """
     For Smithy IDL
-
-    .. versionadded:: 2.10
     """
     name = 'Smithy'
     url = 'https://awslabs.github.io/smithy/'
     filenames = ['*.smithy']
     aliases = ['smithy']
+    version_added = '2.10'
 
     unquoted = r'[A-Za-z0-9_\.#$-]+'
     identifier = r"[A-Za-z0-9_\.#$-]+"
diff --git a/libs/pygments/lexers/smv.py b/libs/pygments/lexers/smv.py
index 2584086e2..bf97b52a5 100644
--- a/libs/pygments/lexers/smv.py
+++ b/libs/pygments/lexers/smv.py
@@ -4,7 +4,7 @@
 
     Lexers for the SMV languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,14 @@ __all__ = ['NuSMVLexer']
 class NuSMVLexer(RegexLexer):
     """
     Lexer for the NuSMV language.
-
-    .. versionadded:: 2.2
     """
 
     name = 'NuSMV'
     aliases = ['nusmv']
     filenames = ['*.smv']
     mimetypes = []
+    url = 'https://nusmv.fbk.eu'
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/snobol.py b/libs/pygments/lexers/snobol.py
index 28087de24..bab51e9b1 100644
--- a/libs/pygments/lexers/snobol.py
+++ b/libs/pygments/lexers/snobol.py
@@ -4,7 +4,7 @@
 
     Lexers for the SNOBOL language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,14 +21,14 @@ class SnobolLexer(RegexLexer):
 
     Recognizes the common ASCII equivalents of the original SNOBOL4 operators.
     Does not require spaces around binary operators.
-
-    .. versionadded:: 1.5
     """
 
     name = "Snobol"
     aliases = ["snobol"]
     filenames = ['*.snobol']
     mimetypes = ['text/x-snobol']
+    url = 'https://www.regressive.org/snobol4'
+    version_added = '1.5'
 
     tokens = {
         # root state, start of line
diff --git a/libs/pygments/lexers/solidity.py b/libs/pygments/lexers/solidity.py
index f1654e46f..3182a148a 100644
--- a/libs/pygments/lexers/solidity.py
+++ b/libs/pygments/lexers/solidity.py
@@ -4,7 +4,7 @@
 
     Lexers for Solidity.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,14 @@ __all__ = ['SolidityLexer']
 class SolidityLexer(RegexLexer):
     """
     For Solidity source code.
-
-    .. versionadded:: 2.5
     """
 
     name = 'Solidity'
     aliases = ['solidity']
     filenames = ['*.sol']
     mimetypes = []
+    url = 'https://soliditylang.org'
+    version_added = '2.5'
 
     datatype = (
         r'\b(address|bool|(?:(?:bytes|hash|int|string|uint)(?:8|16|24|32|40|48|56|64'
diff --git a/libs/pygments/lexers/soong.py b/libs/pygments/lexers/soong.py
new file mode 100644
index 000000000..bbf204dd2
--- /dev/null
+++ b/libs/pygments/lexers/soong.py
@@ -0,0 +1,78 @@
+"""
+    pygments.lexers.soong
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Soong (Android.bp Blueprint) files.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, bygroups, include
+from pygments.token import Comment, Name, Number, Operator, Punctuation, \
+        String, Whitespace
+
+__all__ = ['SoongLexer']
+
+class SoongLexer(RegexLexer):
+    name = 'Soong'
+    version_added = '2.18'
+    url = 'https://source.android.com/docs/setup/reference/androidbp'
+    aliases = ['androidbp', 'bp', 'soong']
+    filenames = ['Android.bp']
+
+    tokens = {
+        'root': [
+            # A variable assignment
+            (r'(\w*)(\s*)(\+?=)(\s*)',
+             bygroups(Name.Variable, Whitespace, Operator, Whitespace),
+             'assign-rhs'),
+
+            # A top-level module
+            (r'(\w*)(\s*)(\{)',
+             bygroups(Name.Function, Whitespace, Punctuation),
+             'in-rule'),
+
+            # Everything else
+            include('comments'),
+            (r'\s+', Whitespace),  # newlines okay
+        ],
+        'assign-rhs': [
+            include('expr'),
+            (r'\n', Whitespace, '#pop'),
+        ],
+        'in-list': [
+            include('expr'),
+            include('comments'),
+            (r'\s+', Whitespace),  # newlines okay in a list
+            (r',', Punctuation),
+            (r'\]', Punctuation, '#pop'),
+        ],
+        'in-map': [
+            # A map key
+            (r'(\w+)(:)(\s*)', bygroups(Name, Punctuation, Whitespace)),
+
+            include('expr'),
+            include('comments'),
+            (r'\s+', Whitespace),  # newlines okay in a map
+            (r',', Punctuation),
+            (r'\}', Punctuation, '#pop'),
+        ],
+        'in-rule': [
+            # Just re-use map syntax
+            include('in-map'),
+        ],
+        'comments': [
+            (r'//.*', Comment.Single),
+            (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
+        ],
+        'expr': [
+            (r'(true|false)\b', Name.Builtin),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'\d+', Number.Integer),
+            (r'".*?"', String),
+            (r'\{', Punctuation, 'in-map'),
+            (r'\[', Punctuation, 'in-list'),
+            (r'\w+', Name),
+        ],
+    }
diff --git a/libs/pygments/lexers/sophia.py b/libs/pygments/lexers/sophia.py
index fc4928c31..37fcec5c3 100644
--- a/libs/pygments/lexers/sophia.py
+++ b/libs/pygments/lexers/sophia.py
@@ -6,7 +6,7 @@
 
     Derived from pygments/lexers/reason.py.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,14 +19,14 @@ __all__ = ['SophiaLexer']
 class SophiaLexer(RegexLexer):
     """
     A Sophia lexer.
-
-    .. versionadded:: 2.11
     """
 
     name = 'Sophia'
     aliases = ['sophia']
     filenames = ['*.aes']
     mimetypes = []
+    url = 'https://docs.aeternity.com/aesophia'
+    version_added = '2.11'
 
     keywords = (
         'contract', 'include', 'let', 'switch', 'type', 'record', 'datatype',
@@ -100,4 +100,3 @@ class SophiaLexer(RegexLexer):
             default('#pop'),
         ],
     }
-
diff --git a/libs/pygments/lexers/special.py b/libs/pygments/lexers/special.py
index 45565ac0f..524946fc3 100644
--- a/libs/pygments/lexers/special.py
+++ b/libs/pygments/lexers/special.py
@@ -4,7 +4,7 @@
 
     Special lexers.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,9 @@ class TextLexer(Lexer):
     aliases = ['text']
     filenames = ['*.txt']
     mimetypes = ['text/plain']
+    url = ""
+    version_added = ''
+
     priority = 0.01
 
     def get_tokens_unprocessed(self, text):
@@ -38,11 +41,12 @@ class TextLexer(Lexer):
 class OutputLexer(Lexer):
     """
     Simple lexer that highlights everything as ``Token.Generic.Output``.
-
-    .. versionadded:: 2.10
     """
     name = 'Text output'
     aliases = ['output']
+    url = ""
+    version_added = '2.10'
+    _example = "output/output"
 
     def get_tokens_unprocessed(self, text):
         yield 0, Generic.Output, text
@@ -65,6 +69,8 @@ class RawTokenLexer(Lexer):
     aliases = []
     filenames = []
     mimetypes = ['application/x-pygments-tokens']
+    url = 'https://pygments.org/docs/formatters/#RawTokenFormatter'
+    version_added = ''
 
     def __init__(self, **options):
         self.compress = get_choice_opt(options, 'compress',
diff --git a/libs/pygments/lexers/spice.py b/libs/pygments/lexers/spice.py
index 5c2d8f296..9d2b1a1a8 100644
--- a/libs/pygments/lexers/spice.py
+++ b/libs/pygments/lexers/spice.py
@@ -4,7 +4,7 @@
 
     Lexers for the Spice programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['SpiceLexer']
 class SpiceLexer(RegexLexer):
     """
     For Spice source.
-
-    .. versionadded:: 2.11
     """
     name = 'Spice'
     url = 'https://www.spicelang.com'
     filenames = ['*.spice']
     aliases = ['spice', 'spicelang']
     mimetypes = ['text/x-spice']
+    version_added = '2.11'
 
     tokens = {
         'root': [
@@ -39,12 +38,13 @@ class SpiceLexer(RegexLexer):
             # keywords
             (r'(import|as)\b', Keyword.Namespace),
             (r'(f|p|type|struct|interface|enum|alias|operator)\b', Keyword.Declaration),
-            (words(('if', 'else', 'for', 'foreach', 'do', 'while', 'break',
-                    'continue', 'return', 'assert', 'unsafe', 'ext'), suffix=r'\b'), Keyword),
-            (words(('const', 'signed', 'unsigned', 'inline', 'public', 'heap'),
+            (words(('if', 'else', 'switch', 'case', 'default', 'for', 'foreach', 'do',
+                    'while', 'break', 'continue', 'fallthrough', 'return', 'assert',
+                    'unsafe', 'ext'), suffix=r'\b'), Keyword),
+            (words(('const', 'signed', 'unsigned', 'inline', 'public', 'heap', 'compose'),
                    suffix=r'\b'), Keyword.Pseudo),
-            (words(('new', 'switch', 'case', 'yield', 'stash', 'pick', 'sync',
-                    'class'), suffix=r'\b'), Keyword.Reserved),
+            (words(('new', 'yield', 'stash', 'pick', 'sync', 'class'), suffix=r'\b'),
+                   Keyword.Reserved),
             (r'(true|false|nil)\b', Keyword.Constant),
             (words(('double', 'int', 'short', 'long', 'byte', 'char', 'string',
                     'bool', 'dyn'), suffix=r'\b'), Keyword.Type),
diff --git a/libs/pygments/lexers/sql.py b/libs/pygments/lexers/sql.py
index 2880841c3..c3a11f40a 100644
--- a/libs/pygments/lexers/sql.py
+++ b/libs/pygments/lexers/sql.py
@@ -36,10 +36,11 @@
     The ``tests/examplefiles`` contains a few test files with data to be
     parsed by these lexers.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+import collections
 import re
 
 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, words
@@ -56,12 +57,13 @@ from pygments.lexers._mysql_builtins import \
     MYSQL_KEYWORDS, \
     MYSQL_OPTIMIZER_HINTS
 
+from pygments.lexers import _googlesql_builtins
 from pygments.lexers import _tsql_builtins
 
 
-__all__ = ['PostgresLexer', 'PlPgsqlLexer', 'PostgresConsoleLexer',
-           'PostgresExplainLexer', 'SqlLexer', 'TransactSqlLexer',
-           'MySqlLexer', 'SqliteConsoleLexer', 'RqlLexer']
+__all__ = ['GoogleSqlLexer', 'PostgresLexer', 'PlPgsqlLexer',
+           'PostgresConsoleLexer', 'PostgresExplainLexer', 'SqlLexer',
+           'TransactSqlLexer', 'MySqlLexer', 'SqliteConsoleLexer', 'RqlLexer']
 
 line_re  = re.compile('.*?\n')
 sqlite_prompt_re = re.compile(r'^(?:sqlite|   ...)>(?= )')
@@ -77,6 +79,12 @@ tsql_go_re = re.compile(r'\bgo\b', re.IGNORECASE)
 tsql_declare_re = re.compile(r'\bdeclare\s+@', re.IGNORECASE)
 tsql_variable_re = re.compile(r'@[a-zA-Z_]\w*\b')
 
+# Identifiers for analyse_text()
+googlesql_identifiers = (
+    _googlesql_builtins.functionnames
+    + _googlesql_builtins.keywords
+    + _googlesql_builtins.types)
+
 
 def language_callback(lexer, match):
     """Parse the content of a $-string using a lexer
@@ -154,13 +162,13 @@ class PostgresBase:
 class PostgresLexer(PostgresBase, RegexLexer):
     """
     Lexer for the PostgreSQL dialect of SQL.
-
-    .. versionadded:: 1.5
     """
 
     name = 'PostgreSQL SQL dialect'
     aliases = ['postgresql', 'postgres']
     mimetypes = ['text/x-postgresql']
+    url = 'https://www.postgresql.org'
+    version_added = '1.5'
 
     flags = re.IGNORECASE
     tokens = {
@@ -210,15 +218,16 @@ class PostgresLexer(PostgresBase, RegexLexer):
 class PlPgsqlLexer(PostgresBase, RegexLexer):
     """
     Handle the extra syntax in Pl/pgSQL language.
-
-    .. versionadded:: 1.5
     """
     name = 'PL/pgSQL'
     aliases = ['plpgsql']
     mimetypes = ['text/x-plpgsql']
+    url = 'https://www.postgresql.org/docs/current/plpgsql.html'
+    version_added = '1.5'
 
     flags = re.IGNORECASE
-    tokens = {k: l[:] for (k, l) in PostgresLexer.tokens.items()}
+    # FIXME: use inheritance
+    tokens = {name: state[:] for (name, state) in PostgresLexer.tokens.items()}
 
     # extend the keywords list
     for i, pattern in enumerate(tokens['root']):
@@ -252,7 +261,7 @@ class PsqlRegexLexer(PostgresBase, RegexLexer):
     aliases = []    # not public
 
     flags = re.IGNORECASE
-    tokens = {k: l[:] for (k, l) in PostgresLexer.tokens.items()}
+    tokens = {name: state[:] for (name, state) in PostgresLexer.tokens.items()}
 
     tokens['root'].append(
         (r'\\[^\s]+', Keyword.Pseudo, 'psql-command'))
@@ -302,13 +311,14 @@ class lookahead:
 class PostgresConsoleLexer(Lexer):
     """
     Lexer for psql sessions.
-
-    .. versionadded:: 1.5
     """
 
     name = 'PostgreSQL console (psql)'
     aliases = ['psql', 'postgresql-console', 'postgres-console']
     mimetypes = ['text/x-postgresql-psql']
+    url = 'https://www.postgresql.org'
+    version_added = '1.5'
+    _example = "psql/psql_session.txt"
 
     def get_tokens_unprocessed(self, data):
         sql = PsqlRegexLexer(**self.options)
@@ -374,18 +384,18 @@ class PostgresConsoleLexer(Lexer):
 class PostgresExplainLexer(RegexLexer):
     """
     Handle PostgreSQL EXPLAIN output
-
-    .. versionadded:: 2.15
     """
 
     name = 'PostgreSQL EXPLAIN dialect'
     aliases = ['postgres-explain']
     filenames = ['*.explain']
     mimetypes = ['text/x-postgresql-explain']
+    url = 'https://www.postgresql.org/docs/current/using-explain.html'
+    version_added = '2.15'
 
     tokens = {
         'root': [
-            (r'(:|\(|\)|ms|kB|->|\.\.|\,)', Punctuation),
+            (r'(:|\(|\)|ms|kB|->|\.\.|\,|\/)', Punctuation),
             (r'(\s+)', Whitespace),
 
             # This match estimated cost and effectively measured counters with ANALYZE
@@ -394,9 +404,9 @@ class PostgresExplainLexer(RegexLexer):
             (r'(actual)( )(=?)', bygroups(Name.Class, Whitespace, Punctuation), 'instrumentation'),
 
             # Misc keywords
-            (words(('actual', 'Memory Usage', 'Memory', 'Buckets', 'Batches',
+            (words(('actual', 'Memory Usage', 'Disk Usage', 'Memory', 'Buckets', 'Batches',
                     'originally', 'row', 'rows', 'Hits', 'Misses',
-                    'Evictions', 'Overflows'), suffix=r'\b'),
+                    'Evictions', 'Overflows', 'Planned Partitions'), suffix=r'\b'),
              Comment.Single),
 
             (r'(hit|read|dirtied|written|write|time|calls)(=)', bygroups(Comment.Single, Operator)),
@@ -459,8 +469,8 @@ class PostgresExplainLexer(RegexLexer):
             # strings
             (r"'(''|[^'])*'", String.Single),
             # numbers
-            (r'\d+\.\d+', Number.Float),
-            (r'(\d+)', Number.Integer),
+            (r'-?\d+\.\d+', Number.Float),
+            (r'(-?\d+)', Number.Integer),
 
             # boolean
             (r'(true|false)', Name.Constant),
@@ -567,6 +577,8 @@ class SqlLexer(RegexLexer):
     aliases = ['sql']
     filenames = ['*.sql']
     mimetypes = ['text/x-sql']
+    url = 'https://en.wikipedia.org/wiki/SQL'
+    version_added = ''
 
     flags = re.IGNORECASE
     tokens = {
@@ -701,13 +713,15 @@ class TransactSqlLexer(RegexLexer):
     aliases = ['tsql', 't-sql']
     filenames = ['*.sql']
     mimetypes = ['text/x-tsql']
+    url = 'https://www.tsql.info'
+    version_added = ''
 
     flags = re.IGNORECASE
 
     tokens = {
         'root': [
             (r'\s+', Whitespace),
-            (r'--.*?$\n?', Comment.Single),
+            (r'--.*[$|\n]?', Comment.Single),
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (words(_tsql_builtins.OPERATORS), Operator),
             (words(_tsql_builtins.OPERATOR_WORDS, suffix=r'\b'), Operator.Word),
@@ -785,6 +799,8 @@ class MySqlLexer(RegexLexer):
     name = 'MySQL'
     aliases = ['mysql']
     mimetypes = ['text/x-mysql']
+    url = 'https://www.mysql.com'
+    version_added = ''
 
     flags = re.IGNORECASE
     tokens = {
@@ -956,17 +972,178 @@ class MySqlLexer(RegexLexer):
         return rating
 
 
+class GoogleSqlLexer(RegexLexer):
+    """
+    GoogleSQL is Google's standard SQL dialect, formerly known as ZetaSQL.
+
+    The list of keywords includes reserved words for future use.
+    """
+
+    name = 'GoogleSQL'
+    aliases = ['googlesql', 'zetasql']
+    filenames = ['*.googlesql', '*.googlesql.sql']
+    mimetypes = ['text/x-google-sql', 'text/x-google-sql-aux']
+    url = 'https://cloud.google.com/bigquery/googlesql'
+    version_added = '2.19'
+
+    flags = re.IGNORECASE
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+
+            # Comments
+            (r'(?:#|--\s+).*', Comment.Single),
+            (r'/\*', Comment.Multiline, 'multiline-comment'),
+
+            # Hexadecimal literals
+            (r"x'([0-9a-f]{2})+'", Number.Hex),
+            (r'0x[0-9a-f]+', Number.Hex),
+
+            # Binary literals
+            (r"b'[01]+'", Number.Bin),
+            (r'0b[01]+', Number.Bin),
+
+            # Numeric literals
+            (r'[0-9]+\.[0-9]*(e[+-]?[0-9]+)?', Number.Float),  # Mandatory integer, optional fraction and exponent
+            (r'[0-9]*\.[0-9]+(e[+-]?[0-9]+)?', Number.Float),  # Mandatory fraction, optional integer and exponent
+            (r'[0-9]+e[+-]?[0-9]+', Number.Float),  # Exponents with integer significands are still floats
+            (r'[0-9]+(?=[^0-9a-z$_\u0080-\uffff])', Number.Integer),  # Integers that are not in a schema object name
+
+            # Date literals
+            (r"\{\s*d\s*(?P<quote>['\"])\s*\d{2}(\d{2})?.?\d{2}.?\d{2}\s*(?P=quote)\s*\}",
+             Literal.Date),
+
+            # Time literals
+            (r"\{\s*t\s*(?P<quote>['\"])\s*(?:\d+\s+)?\d{1,2}.?\d{1,2}.?\d{1,2}(\.\d*)?\s*(?P=quote)\s*\}",
+             Literal.Date),
+
+            # Timestamp literals
+            (
+                r"\{\s*ts\s*(?P<quote>['\"])\s*"
+                r"\d{2}(?:\d{2})?.?\d{2}.?\d{2}"  # Date part
+                r"\s+"  # Whitespace between date and time
+                r"\d{1,2}.?\d{1,2}.?\d{1,2}(\.\d*)?"  # Time part
+                r"\s*(?P=quote)\s*\}",
+                Literal.Date
+            ),
+
+            # String literals
+            (r"'", String.Single, 'single-quoted-string'),
+            (r'"', String.Double, 'double-quoted-string'),
+
+            # Variables
+            (r'@@(?:global\.|persist\.|persist_only\.|session\.)?[a-z_]+', Name.Variable),
+            (r'@[a-z0-9_$.]+', Name.Variable),
+            (r"@'", Name.Variable, 'single-quoted-variable'),
+            (r'@"', Name.Variable, 'double-quoted-variable'),
+            (r"@`", Name.Variable, 'backtick-quoted-variable'),
+            (r'\?', Name.Variable),  # For demonstrating prepared statements
+
+            # Exceptions; these words tokenize differently in different contexts.
+            (r'\b(set)(?!\s*\()', Keyword),
+            (r'\b(character)(\s+)(set)\b', bygroups(Keyword, Whitespace, Keyword)),
+
+            # Constants, types, keywords, functions, operators
+            (words(_googlesql_builtins.constants, prefix=r'\b', suffix=r'\b'), Name.Constant),
+            (words(_googlesql_builtins.types, prefix=r'\b', suffix=r'\b'), Keyword.Type),
+            (words(_googlesql_builtins.keywords, prefix=r'\b', suffix=r'\b'), Keyword),
+            (words(_googlesql_builtins.functionnames, prefix=r'\b', suffix=r'\b(\s*)(\()'),
+             bygroups(Name.Function, Whitespace, Punctuation)),
+            (words(_googlesql_builtins.operators, prefix=r'\b', suffix=r'\b'), Operator),
+
+            # Schema object names
+            #
+            # Note: Although the first regex supports unquoted all-numeric
+            # identifiers, this will not be a problem in practice because
+            # numeric literals have already been handled above.
+            #
+            ('[0-9a-z$_\u0080-\uffff]+', Name),
+            (r'`', Name.Quoted, 'schema-object-name'),
+
+            # Punctuation
+            (r'[(),.;]', Punctuation),
+        ],
+
+        # Multiline comment substates
+        # ---------------------------
+
+        'multiline-comment': [
+            (r'[^*]+', Comment.Multiline),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'\*', Comment.Multiline),
+        ],
+
+        # String substates
+        # ----------------
+
+        'single-quoted-string': [
+            (r"[^'\\]+", String.Single),
+            (r"''", String.Escape),
+            (r"""\\[0'"bnrtZ\\%_]""", String.Escape),
+            (r"'", String.Single, '#pop'),
+        ],
+
+        'double-quoted-string': [
+            (r'[^"\\]+', String.Double),
+            (r'""', String.Escape),
+            (r"""\\[0'"bnrtZ\\%_]""", String.Escape),
+            (r'"', String.Double, '#pop'),
+        ],
+
+        # Variable substates
+        # ------------------
+
+        'single-quoted-variable': [
+            (r"[^']+", Name.Variable),
+            (r"''", Name.Variable),
+            (r"'", Name.Variable, '#pop'),
+        ],
+
+        'double-quoted-variable': [
+            (r'[^"]+', Name.Variable),
+            (r'""', Name.Variable),
+            (r'"', Name.Variable, '#pop'),
+        ],
+
+        'backtick-quoted-variable': [
+            (r'[^`]+', Name.Variable),
+            (r'``', Name.Variable),
+            (r'`', Name.Variable, '#pop'),
+        ],
+
+        # Schema object name substates
+        # ----------------------------
+        #
+        # "Name.Quoted" and "Name.Quoted.Escape" are non-standard but
+        # formatters will style them as "Name" by default but add
+        # additional styles based on the token name. This gives users
+        # flexibility to add custom styles as desired.
+        #
+        'schema-object-name': [
+            (r'[^`]+', Name.Quoted),
+            (r'``', Name.Quoted.Escape),
+            (r'`', Name.Quoted, '#pop'),
+        ],
+    }
+
+    def analyse_text(text):
+        tokens = collections.Counter(text.split())
+        return 0.001 * sum(count for t, count in tokens.items()
+                           if t in googlesql_identifiers)
+
+
 class SqliteConsoleLexer(Lexer):
     """
     Lexer for example sessions using sqlite3.
-
-    .. versionadded:: 0.11
     """
 
     name = 'sqlite3con'
     aliases = ['sqlite3']
     filenames = ['*.sqlite3-console']
     mimetypes = ['text/x-sqlite3-console']
+    url = 'https://www.sqlite.org'
+    version_added = '0.11'
+    _example = "sqlite3/sqlite3.sqlite3-console"
 
     def get_tokens_unprocessed(self, data):
         sql = SqlLexer(**self.options)
@@ -1000,14 +1177,13 @@ class SqliteConsoleLexer(Lexer):
 class RqlLexer(RegexLexer):
     """
     Lexer for Relation Query Language.
-
-    .. versionadded:: 2.0
     """
     name = 'RQL'
     url = 'http://www.logilab.org/project/rql'
     aliases = ['rql']
     filenames = ['*.rql']
     mimetypes = ['text/x-rql']
+    version_added = '2.0'
 
     flags = re.IGNORECASE
     tokens = {
diff --git a/libs/pygments/lexers/srcinfo.py b/libs/pygments/lexers/srcinfo.py
index c4da88b10..daf654ea9 100644
--- a/libs/pygments/lexers/srcinfo.py
+++ b/libs/pygments/lexers/srcinfo.py
@@ -7,7 +7,7 @@
     The description of the format can be found in the wiki:
     https://wiki.archlinux.org/title/.SRCINFO
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -34,13 +34,13 @@ architecture_dependent_keywords = (
 
 class SrcinfoLexer(RegexLexer):
     """Lexer for .SRCINFO files used by Arch Linux Packages.
-
-    .. versionadded:: 2.11
     """
 
     name = 'Srcinfo'
     aliases = ['srcinfo']
     filenames = ['.SRCINFO']
+    url = 'https://wiki.archlinux.org/title/.SRCINFO'
+    version_added = '2.11'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/stata.py b/libs/pygments/lexers/stata.py
index 917c99985..dc93cb4e0 100644
--- a/libs/pygments/lexers/stata.py
+++ b/libs/pygments/lexers/stata.py
@@ -4,7 +4,7 @@
 
     Lexer for Stata
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,8 +21,6 @@ __all__ = ['StataLexer']
 class StataLexer(RegexLexer):
     """
     For Stata do files.
-
-    .. versionadded:: 2.2
     """
     # Syntax based on
     # - http://fmwww.bc.edu/RePEc/bocode/s/synlightlist.ado
@@ -31,6 +29,7 @@ class StataLexer(RegexLexer):
 
     name = 'Stata'
     url = 'http://www.stata.com/'
+    version_added = '2.2'
     aliases   = ['stata', 'do']
     filenames = ['*.do', '*.ado']
     mimetypes = ['text/x-stata', 'text/stata', 'application/x-stata']
diff --git a/libs/pygments/lexers/supercollider.py b/libs/pygments/lexers/supercollider.py
index ea7a17676..0f19d2af3 100644
--- a/libs/pygments/lexers/supercollider.py
+++ b/libs/pygments/lexers/supercollider.py
@@ -4,7 +4,7 @@
 
     Lexer for SuperCollider
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,8 +20,6 @@ __all__ = ['SuperColliderLexer']
 class SuperColliderLexer(RegexLexer):
     """
     For SuperCollider source code.
-
-    .. versionadded:: 2.1
     """
 
     name = 'SuperCollider'
@@ -29,6 +27,7 @@ class SuperColliderLexer(RegexLexer):
     aliases = ['supercollider', 'sc']
     filenames = ['*.sc', '*.scd']
     mimetypes = ['application/supercollider', 'text/supercollider']
+    version_added = '2.1'
 
     flags = re.DOTALL | re.MULTILINE
     tokens = {
diff --git a/libs/pygments/lexers/tablegen.py b/libs/pygments/lexers/tablegen.py
new file mode 100644
index 000000000..5bcb3eef6
--- /dev/null
+++ b/libs/pygments/lexers/tablegen.py
@@ -0,0 +1,177 @@
+"""
+    pygments.lexers.tablegen
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Lexer for LLVM's TableGen DSL.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, words, using
+from pygments.lexers.c_cpp import CppLexer
+from pygments.token import Comment, Keyword, Name, Number, Operator, \
+    Punctuation, String, Text, Whitespace, Error
+
+__all__ = ['TableGenLexer']
+
+KEYWORDS = (
+    'assert',
+    'class',
+    'code',
+    'def',
+    'dump',
+    'else',
+    'foreach',
+    'defm',
+    'defset',
+    'defvar',
+    'field',
+    'if',
+    'in',
+    'include',
+    'let',
+    'multiclass',
+    'then',
+)
+
+KEYWORDS_CONST = (
+    'false',
+    'true',
+)
+KEYWORDS_TYPE = (
+    'bit',
+    'bits',
+    'dag',
+    'int',
+    'list',
+    'string',
+)
+
+BANG_OPERATORS = (
+    'add',
+    'and',
+    'cast',
+    'con',
+    'cond',
+    'dag',
+    'div',
+    'empty',
+    'eq',
+    'exists',
+    'filter',
+    'find',
+    'foldl',
+    'foreach',
+    'ge',
+    'getdagarg',
+    'getdagname',
+    'getdagop',
+    'gt',
+    'head',
+    'if',
+    'interleave',
+    'isa',
+    'le',
+    'listconcat',
+    'listremove',
+    'listsplat',
+    'logtwo',
+    'lt',
+    'mul',
+    'ne',
+    'not',
+    'or',
+    'range',
+    'repr',
+    'setdagarg',
+    'setdagname',
+    'setdagop',
+    'shl',
+    'size',
+    'sra',
+    'srl',
+    'strconcat',
+    'sub',
+    'subst',
+    'substr',
+    'tail',
+    'tolower',
+    'toupper',
+    'xor',
+)
+
+class TableGenLexer(RegexLexer):
+    """
+    Lexer for TableGen
+    """
+
+    name = 'TableGen'
+    url = 'https://llvm.org/docs/TableGen/ProgRef.html'
+    aliases = ['tablegen', 'td']
+    filenames = ['*.td']
+
+    version_added = '2.19'
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+
+            (r'/\*', Comment.Multiline, 'comment'),
+            (r'//.*?$', Comment.SingleLine),
+            (r'#(define|ifdef|ifndef|else|endif)', Comment.Preproc),
+
+            # Binary/hex numbers. Note that these take priority over names,
+            # which may begin with numbers.
+            (r'0b[10]+', Number.Bin),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+
+            # Keywords
+            (words(KEYWORDS, suffix=r'\b'), Keyword),
+            (words(KEYWORDS_CONST, suffix=r'\b'), Keyword.Constant),
+            (words(KEYWORDS_TYPE, suffix=r'\b'), Keyword.Type),
+
+            # Bang operators
+            (words(BANG_OPERATORS, prefix=r'\!', suffix=r'\b'), Operator),
+            # Unknown bang operators are an error
+            (r'![a-zA-Z]+', Error),
+
+            # Names and identifiers
+            (r'[0-9]*[a-zA-Z_][a-zA-Z_0-9]*', Name),
+            (r'\$[a-zA-Z_][a-zA-Z_0-9]*', Name.Variable),
+
+            # Place numbers after keywords. Names/identifiers may begin with
+            # numbers, and we want to parse 1X as one name token as opposed to
+            # a number and a name.
+            (r'[-\+]?[0-9]+', Number.Integer),
+
+            # String literals
+            (r'"', String, 'dqs'),
+            (r'\[\{', Text, 'codeblock'),
+
+            # Misc. punctuation
+            (r'[-+\[\]{}()<>\.,;:=?#]+', Punctuation),
+        ],
+        'comment': [
+            (r'[^*/]+', Comment.Multiline),
+            (r'/\*', Comment.Multiline, '#push'),
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[*/]', Comment.Multiline)
+        ],
+        'strings': [
+            (r'\\[\\\'"tn]', String.Escape),
+            (r'[^\\"]+', String),
+        ],
+        # Double-quoted string, a la C
+        'dqs': [
+            (r'"', String, '#pop'),
+            include('strings'),
+        ],
+        # No escaping inside a code block - everything is literal
+        # Assume that the code inside a code block is C++. This isn't always
+        # true in TableGen, but is the far most common scenario.
+        'codeblock': [
+            (r'\}\]', Text, '#pop'),
+            (r'([^}]+|\}[^]])*', using(CppLexer)),
+        ],
+    }
diff --git a/libs/pygments/lexers/tact.py b/libs/pygments/lexers/tact.py
new file mode 100644
index 000000000..9199a5b14
--- /dev/null
+++ b/libs/pygments/lexers/tact.py
@@ -0,0 +1,303 @@
+"""
+    pygments.lexers.tact
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Tact.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, include, bygroups, words
+from pygments.token import Comment, Operator, Keyword, Name, String, \
+    Number, Whitespace, Punctuation
+
+__all__ = ['TactLexer']
+
+
+class TactLexer(RegexLexer):
+    """For Tact source code."""
+
+    name = 'Tact'
+    aliases = ['tact']
+    filenames = ['*.tact']
+    url = "https://tact-lang.org"
+    version_added = '2.18'
+
+    tokens = {
+        'root': [
+            (r'\s+', Whitespace),
+            (r'[.;(),\[\]{}]', Punctuation),
+            (r'\?|!!', Operator),
+            include('comments'),
+            include('import-in'),
+            include('struct-in'),
+            include('contract-or-trait-in'),
+            include('annotation-in'),
+            include('fun-declaration-in'),
+            include('const-declaration-in'),
+            include('statements'),
+        ],
+        'import-in': [
+            (r'((?<=\.\.\.)|(?<![.$]))\b(import)\b(\s*)', bygroups(Punctuation, Keyword, Whitespace), 'import'),
+        ],
+        'import': [
+            (r';', Punctuation, '#pop'),
+            include('comments'),
+            include('string-in'),
+            (r'\s+', Whitespace),
+        ],
+        'struct-in': [
+            (r'((?<=\.\.\.)|(?<![.$]))\b(struct|message)\b', bygroups(Punctuation, Keyword), 'struct'),
+        ],
+        'struct': [
+            include('comments'),
+            include('struct-header'),
+            include('struct-body-in'),
+            (r'\s+', Whitespace),
+        ],
+        'struct-header': [
+            include('comments'),
+            (r'\b\w+', Name.Class),
+            (r'(\()((?:\b0[xX])[0-9a-fA-F][0-9a-fA-F_]*\b)(\))', bygroups(Punctuation, Number.Hex, Punctuation)),
+            (r'(\()((?:\b[0-9]+\b))(\))', bygroups(Punctuation, Number.Integer, Punctuation)),
+        ],
+        'struct-body-in': [
+            (r'\{', Punctuation, 'struct-body'),
+        ],
+        'struct-body': [
+            (r'\}', Punctuation, '#pop:2'),
+            include('comments'),
+            include('field-declaration-in'),
+        ],
+        'contract-or-trait-in': [
+            (r'((?<=\.\.\.)|(?<![.$]))\b(contract|trait)\b', Keyword, 'contract-or-trait'),
+        ],
+        'contract-or-trait': [
+            include('comments'),
+            (r'with', Keyword),
+            (r'\b\w+', Name.Class),
+            include('contract-or-trait-body-in'),
+            (r'\s+', Whitespace),
+            (r',', Punctuation),
+        ],
+        'contract-or-trait-body-in': [
+            (r'\{', Punctuation, 'contract-or-trait-body'),
+        ],
+        'contract-or-trait-body': [
+            (r'\}', Punctuation, '#pop:2'),
+            include('comments'),
+            include('init-declaration-in'),
+            include('receive-declaration-in'),
+            include('bounce-declaration-in'),
+            include('fun-declaration-in'),
+            include('const-declaration-in'),
+            include('field-declaration-in'),
+            (r'\s+', Whitespace),
+        ],
+        'field-declaration-in': [
+            (r'\b\w+', Name.Property, 'field-declaration'),
+        ],
+        'field-declaration': [
+            (r';', Punctuation, '#pop'),
+            include('comments'),
+            include('type-annotation-in'),
+            include('variable-init-in'),
+        ],
+        'const-declaration-in': [
+            (r'(?=\b(?:(?:get|native|extends|mutates|virtual|override|inline|abstract)\s*)*const\b)', Keyword, 'const-declaration'),
+        ],
+        'const-declaration': [
+            (r'(;)', Punctuation, '#pop'),
+            (r'const', Keyword),
+            (words(('get', 'native', 'extends', 'mutates', 'virtual', 'override', 'inline', 'abstract'), suffix=r'\b'), Keyword),
+            (r'\b\w+\b', Name.Constant),
+            include('comments'),
+            include('type-annotation-in'),
+            include('variable-init-in'),
+            (r'\s+', Whitespace),
+        ],
+        'init-declaration-in': [
+            (r'(init)', Keyword, 'init-declaration')
+        ],
+        'init-declaration': [
+            (r'(?<=\})', Punctuation, '#pop'),
+            include('comments'),
+            include('fun-arguments-in'),
+            include('block-declaration-in'),
+            (r'\s+', Whitespace),
+        ],
+        'receive-declaration-in': [
+            (r'(receive|exernal)', Keyword, 'receive-declaration')
+        ],
+        'receive-declaration': [
+            (r'(?<=\})', Punctuation, '#pop'),
+            include('comments'),
+            include('fun-arguments-in'),
+            include('block-declaration-in'),
+        ],
+        'bounce-declaration-in': [
+            (r'(bounced)', Keyword, 'bounce-declaration')
+        ],
+        'bounce-declaration': [
+            (r'(?<=\})', Punctuation, '#pop'),
+            include('comments'),
+            include('fun-arguments-in'),
+            include('block-declaration-in'),
+        ],
+        'fun-declaration-in': [
+            (r'(?=\b(?:(?:get|native|extends|mutates|virtual|override|inline|abstract)\s*)*fun\b)', Keyword, 'fun-declaration')
+        ],
+        'fun-declaration': [
+            (r'(?<=\}|\;)', Punctuation, '#pop'),
+            (r'fun', Keyword),
+            (r'\b(get|native|extends|mutates|virtual|override|inline|abstract)\b', Keyword),
+            (r'\b[\w]+', Name.Function),
+            include('fun-declaration-body'),
+            (r'[,;]', Punctuation),
+        ],
+        'fun-declaration-body': [
+            include('comments'),
+            include('fun-arguments-in'),
+            include('type-annotation-in'),
+            include('block-declaration-in'),
+            (r'\s+', Whitespace),
+        ],
+        'fun-arguments-in': [
+            (r'\(', Punctuation, 'fun-arguments'),
+        ],
+        'fun-arguments': [
+            (r'\)', Punctuation, '#pop'),
+            include('comments'),
+            include('string-in'),
+            include('type-annotation-in'),
+            (r'(self)|(\b[\w]+\b)', bygroups(Name.Variable.Instance, Name.Variable)),
+            (r',', Punctuation),
+            (r'\s+', Whitespace),
+        ],
+        'block-declaration-in': [
+            (r'\{', Punctuation, 'block-declaration')
+        ],
+        'block-declaration': [
+            (r'\}', Punctuation, '#pop'),
+            include('statements'),
+        ],
+        'statements': [
+            include('comments'),
+            include('block-declaration-in'),
+            include('expressions'),
+        ],
+        'annotation-in': [
+            (r'(@)(\w+)(\()', bygroups(Keyword.Pseudo, Keyword, Punctuation), 'annotation')
+        ],
+        'annotation': [
+            (r'\)', Punctuation, '#pop'),
+            include('annotation-argument'),
+            (r'\s+', Whitespace),
+        ],
+        'annotation-argument': [
+            (r'\w+', Name.Function.Magic),
+        ],
+        'expressions': [
+            include('comments'),
+            include('type-annotation-in'),
+            include('keywords'),
+            include('numeric'),
+            include('string-in'),
+            include('variable'),
+            include('function-call'),
+            include('struct-init-in'),
+        ],
+        'struct-init-in': [
+            (r'(\b\w+)(\s*)(\{)', bygroups(Name.Class, Whitespace, Punctuation), 'struct-init')
+        ],
+        'struct-init': [
+            (r'(\})', Punctuation, '#pop'),
+            include('comments'),
+            include('struct-property-in'),
+            (r'\s+', Whitespace),
+            (r',', Punctuation),
+        ],
+        'struct-property-in': [
+            (r'(\b[\w]+)(\s*)(:)', bygroups(Name.Property, Whitespace, Punctuation), 'struct-property')
+        ],
+        'struct-property': [
+            (r'(?=\}|\,)', Punctuation, '#pop'),
+            include('comments'),
+            include('expressions'),
+            (r'\s+', Whitespace),
+        ],
+        'variable-init-in': [
+            (r'(=)', Operator, 'variable-init')
+        ],
+        'variable-init': [
+            (r'(?=\}|\{|\,|\;)',Punctuation, '#pop'),
+            include('comments'),
+            include('expressions'),
+            (r'\s+', Whitespace),
+        ],
+        'type-annotation-in': [
+            (r'(:)(\s+)', bygroups(Punctuation, Whitespace), 'type-annotation')
+        ],
+        'type-annotation': [
+            (r'(?=\{|\;|\=|\,|\))', Punctuation, '#pop'),
+            include('comments'),
+            include('type-as-in'),
+            include('type-generic-in'),
+            (r'\?', Operator),
+            (r'\b\w+', Keyword.Type),
+            (r'\s+', Whitespace),
+        ],
+        'type-generic-in': [
+            (r'<', Punctuation, 'type-generic'),
+        ],
+        'type-generic': [
+            (r'>', Punctuation, '#pop'),
+            include('comments'),
+            include('type-as-in'),
+            (r'\b\w+', Keyword.Type),
+            (r'\s+', Whitespace),
+            (r',', Punctuation),
+        ],
+        'type-as-in': [
+            (r'\b(as)(\s+)', bygroups(Keyword, Whitespace), 'type-as'),
+        ],
+        'type-as': [
+            (r'(?=\{|\;|\=|\,|\)|\>)', Punctuation, '#pop'),
+            include('comments'),
+            (r'\b\w+', Keyword.Type),
+            (r'\s+', Whitespace),
+        ],
+        'keywords': [
+            (words(('if', 'else', 'while', 'do', 'until', 'repeat', 'return', 'extends', 'mutates', 'virtual', 'override', 'inline', 'native', 'let', 'const', 'fun', 'self', 'is', 'initOf', 'map', 'bounced', 'get', 'as'), prefix=r'\b', suffix=r'\b'), Keyword),
+            (r'(<=>|>=|<=|!=|==|\^>>|~>>|>>|<<|\/%|\^%|~%|\^\/|~\/|\+=|-=|\*=|\/=|~\/=|\^\/=|%=|\^%=|<<=|>>=|~>>=|\^>>=|&=|\|=|\^=|\^|=|~|\/|%|-|\*|\+|>|<|&|\||:|\?)', Operator),
+            (words(('true', 'false'), prefix=r'\b', suffix=r'\b'), Keyword.Constant),
+        ],
+        'string-in': [
+            (r'"', String, 'string'),
+        ],
+        'string': [
+            (r'"', String, '#pop'),
+            (r'\\.', String.Escape),
+            (r'[^\\"]+', String.Double),
+        ],
+        'numeric': [
+            (r'(?:\b0[xX])[0-9a-fA-F][0-9a-fA-F_]*\b', Number.Hex),
+            (r'(?:\b[0-9]+\b)', Number.Integer),
+        ],
+        'comments': [
+            (r'//.*', Comment.Single),
+            (r'/\*', Comment.Multiline, 'comments-multiline'),
+        ],
+        'comments-multiline': [
+            (r'\*/', Comment.Multiline, '#pop'),
+            (r'[^*]+', Comment.Multiline),
+            (r'[*]', Comment.Multiline),
+        ],
+        'variable': [
+            (r'\b\w+\b(?!\s*\()(?!\s*\{)', Name.Variable)
+        ],
+        'function-call': [
+            (r'\b\w+\b(?=\s*\()(?!\s*\{)', Name.Function)
+        ],
+    }
diff --git a/libs/pygments/lexers/tal.py b/libs/pygments/lexers/tal.py
index 170b781a9..33c1bdc93 100644
--- a/libs/pygments/lexers/tal.py
+++ b/libs/pygments/lexers/tal.py
@@ -6,7 +6,7 @@
 
     .. versionadded:: 2.12
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,15 +19,15 @@ __all__ = ['TalLexer']
 
 class TalLexer(RegexLexer):
     """
-    For `Uxntal <https://wiki.xxiivv.com/site/uxntal.html>`_ source code.
-
-    .. versionadded:: 2.12
+    For Uxntal source code.
     """
 
     name = 'Tal'
     aliases = ['tal', 'uxntal']
     filenames = ['*.tal']
     mimetypes = ['text/x-uxntal']
+    url = 'https://wiki.xxiivv.com/site/uxntal.html'
+    version_added = '2.12'
 
     instructions = [
         'BRK', 'LIT', 'INC', 'POP', 'DUP', 'NIP', 'SWP', 'OVR', 'ROT',
diff --git a/libs/pygments/lexers/tcl.py b/libs/pygments/lexers/tcl.py
index f444223aa..f156efa6a 100644
--- a/libs/pygments/lexers/tcl.py
+++ b/libs/pygments/lexers/tcl.py
@@ -4,7 +4,7 @@
 
     Lexers for Tcl and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,8 +19,6 @@ __all__ = ['TclLexer']
 class TclLexer(RegexLexer):
     """
     For Tcl source code.
-
-    .. versionadded:: 0.10
     """
 
     keyword_cmds_re = words((
@@ -48,6 +46,7 @@ class TclLexer(RegexLexer):
     aliases = ['tcl']
     filenames = ['*.tcl', '*.rvt']
     mimetypes = ['text/x-tcl', 'text/x-script.tcl', 'application/x-tcl']
+    version_added = '0.10'
 
     def _gen_command_rules(keyword_cmds_re, builtin_cmds_re, context=""):
         return [
diff --git a/libs/pygments/lexers/teal.py b/libs/pygments/lexers/teal.py
index e488e0931..54ee268cd 100644
--- a/libs/pygments/lexers/teal.py
+++ b/libs/pygments/lexers/teal.py
@@ -4,7 +4,7 @@
 
     Lexer for TEAL.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,13 +21,12 @@ class TealLexer(RegexLexer):
 
     For more information about the grammar, see:
     https://github.com/algorand/go-algorand/blob/master/data/transactions/logic/assembler.go
-
-    .. versionadded:: 2.9
     """
     name = 'teal'
     url = 'https://developer.algorand.org/docs/reference/teal/specification/'
     aliases = ['teal']
     filenames = ['*.teal']
+    version_added = '2.9'
 
     keywords = words({
         'Sender', 'Fee', 'FirstValid', 'FirstValidTime', 'LastValid', 'Note',
diff --git a/libs/pygments/lexers/templates.py b/libs/pygments/lexers/templates.py
index 5f46a47a8..ff796d3d0 100644
--- a/libs/pygments/lexers/templates.py
+++ b/libs/pygments/lexers/templates.py
@@ -4,7 +4,7 @@
 
     Lexers for various template engines' markup.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -62,6 +62,7 @@ class ErbLexer(Lexer):
     url = 'https://github.com/ruby/erb'
     aliases = ['erb']
     mimetypes = ['application/x-ruby-templating']
+    version_added = ''
 
     _block_re = re.compile(r'(<%%|%%>|<%=|<%#|<%-|<%|-%>|%>|^%[^%].*?$)', re.M)
 
@@ -156,6 +157,7 @@ class SmartyLexer(RegexLexer):
     aliases = ['smarty']
     filenames = ['*.tpl']
     mimetypes = ['application/x-smarty']
+    version_added = ''
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -212,6 +214,7 @@ class VelocityLexer(RegexLexer):
     url = 'https://velocity.apache.org/'
     aliases = ['velocity']
     filenames = ['*.vm', '*.fhtml']
+    version_added = ''
 
     flags = re.MULTILINE | re.DOTALL
 
@@ -292,8 +295,10 @@ class VelocityHtmlLexer(DelegatingLexer):
 
     name = 'HTML+Velocity'
     aliases = ['html+velocity']
+    version_added = ''
     alias_filenames = ['*.html', '*.fhtml']
     mimetypes = ['text/html+velocity']
+    url = 'https://velocity.apache.org/'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, VelocityLexer, **options)
@@ -308,8 +313,10 @@ class VelocityXmlLexer(DelegatingLexer):
 
     name = 'XML+Velocity'
     aliases = ['xml+velocity']
+    version_added = ''
     alias_filenames = ['*.xml', '*.vm']
     mimetypes = ['application/xml+velocity']
+    url = 'https://velocity.apache.org/'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, VelocityLexer, **options)
@@ -323,8 +330,8 @@ class VelocityXmlLexer(DelegatingLexer):
 
 class DjangoLexer(RegexLexer):
     """
-    Generic `django <http://www.djangoproject.com/documentation/templates/>`_
-    and `jinja <https://jinja.pocoo.org/jinja/>`_ template lexer.
+    Generic `Django <https://www.djangoproject.com/documentation/templates/>`_
+    and `Jinja <https://jinja.palletsprojects.com>`_ template lexer.
 
     It just highlights django/jinja code between the preprocessor directives,
     other data is left untouched by the lexer.
@@ -333,6 +340,8 @@ class DjangoLexer(RegexLexer):
     name = 'Django/Jinja'
     aliases = ['django', 'jinja']
     mimetypes = ['application/x-django-templating', 'application/x-jinja']
+    url = 'https://www.djangoproject.com/documentation/templates'
+    version_added = ''
 
     flags = re.M | re.S
 
@@ -408,8 +417,6 @@ class MyghtyLexer(RegexLexer):
     """
     Generic myghty templates lexer. Code that isn't Myghty
     markup is yielded as `Token.Other`.
-
-    .. versionadded:: 0.6
     """
 
     name = 'Myghty'
@@ -417,6 +424,7 @@ class MyghtyLexer(RegexLexer):
     aliases = ['myghty']
     filenames = ['*.myt', 'autodelegate']
     mimetypes = ['application/x-myghty']
+    version_added = '0.6'
 
     tokens = {
         'root': [
@@ -455,13 +463,13 @@ class MyghtyHtmlLexer(DelegatingLexer):
     """
     Subclass of the `MyghtyLexer` that highlights unlexed data
     with the `HtmlLexer`.
-
-    .. versionadded:: 0.6
     """
 
     name = 'HTML+Myghty'
     aliases = ['html+myghty']
     mimetypes = ['text/html+myghty']
+    url = 'http://www.myghty.org/'
+    version_added = '0.6'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, MyghtyLexer, **options)
@@ -471,13 +479,13 @@ class MyghtyXmlLexer(DelegatingLexer):
     """
     Subclass of the `MyghtyLexer` that highlights unlexed data
     with the `XmlLexer`.
-
-    .. versionadded:: 0.6
     """
 
     name = 'XML+Myghty'
     aliases = ['xml+myghty']
     mimetypes = ['application/xml+myghty']
+    url = 'http://www.myghty.org/'
+    version_added = '0.6'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, MyghtyLexer, **options)
@@ -487,8 +495,6 @@ class MyghtyJavascriptLexer(DelegatingLexer):
     """
     Subclass of the `MyghtyLexer` that highlights unlexed data
     with the `JavascriptLexer`.
-
-    .. versionadded:: 0.6
     """
 
     name = 'JavaScript+Myghty'
@@ -496,6 +502,8 @@ class MyghtyJavascriptLexer(DelegatingLexer):
     mimetypes = ['application/x-javascript+myghty',
                  'text/x-javascript+myghty',
                  'text/javascript+mygthy']
+    url = 'http://www.myghty.org/'
+    version_added = '0.6'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, MyghtyLexer, **options)
@@ -505,13 +513,13 @@ class MyghtyCssLexer(DelegatingLexer):
     """
     Subclass of the `MyghtyLexer` that highlights unlexed data
     with the `CssLexer`.
-
-    .. versionadded:: 0.6
     """
 
     name = 'CSS+Myghty'
     aliases = ['css+myghty']
     mimetypes = ['text/css+myghty']
+    url = 'http://www.myghty.org/'
+    version_added = '0.6'
 
     def __init__(self, **options):
         super().__init__(CssLexer, MyghtyLexer, **options)
@@ -521,14 +529,13 @@ class MasonLexer(RegexLexer):
     """
     Generic mason templates lexer. Stolen from Myghty lexer. Code that isn't
     Mason markup is HTML.
-
-    .. versionadded:: 1.4
     """
     name = 'Mason'
     url = 'http://www.masonhq.com/'
     aliases = ['mason']
     filenames = ['*.m', '*.mhtml', '*.mc', '*.mi', 'autohandler', 'dhandler']
     mimetypes = ['application/x-mason']
+    version_added = '1.4'
 
     tokens = {
         'root': [
@@ -576,8 +583,6 @@ class MakoLexer(RegexLexer):
     """
     Generic mako templates lexer. Code that isn't Mako
     markup is yielded as `Token.Other`.
-
-    .. versionadded:: 0.7
     """
 
     name = 'Mako'
@@ -585,6 +590,7 @@ class MakoLexer(RegexLexer):
     aliases = ['mako']
     filenames = ['*.mao']
     mimetypes = ['application/x-mako']
+    version_added = '0.7'
 
     tokens = {
         'root': [
@@ -643,13 +649,13 @@ class MakoHtmlLexer(DelegatingLexer):
     """
     Subclass of the `MakoLexer` that highlights unlexed data
     with the `HtmlLexer`.
-
-    .. versionadded:: 0.7
     """
 
     name = 'HTML+Mako'
     aliases = ['html+mako']
     mimetypes = ['text/html+mako']
+    url = 'http://www.makotemplates.org/'
+    version_added = '0.7'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, MakoLexer, **options)
@@ -659,13 +665,13 @@ class MakoXmlLexer(DelegatingLexer):
     """
     Subclass of the `MakoLexer` that highlights unlexed data
     with the `XmlLexer`.
-
-    .. versionadded:: 0.7
     """
 
     name = 'XML+Mako'
     aliases = ['xml+mako']
     mimetypes = ['application/xml+mako']
+    url = 'http://www.makotemplates.org/'
+    version_added = '0.7'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, MakoLexer, **options)
@@ -675,8 +681,6 @@ class MakoJavascriptLexer(DelegatingLexer):
     """
     Subclass of the `MakoLexer` that highlights unlexed data
     with the `JavascriptLexer`.
-
-    .. versionadded:: 0.7
     """
 
     name = 'JavaScript+Mako'
@@ -684,6 +688,8 @@ class MakoJavascriptLexer(DelegatingLexer):
     mimetypes = ['application/x-javascript+mako',
                  'text/x-javascript+mako',
                  'text/javascript+mako']
+    url = 'http://www.makotemplates.org/'
+    version_added = '0.7'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, MakoLexer, **options)
@@ -693,13 +699,13 @@ class MakoCssLexer(DelegatingLexer):
     """
     Subclass of the `MakoLexer` that highlights unlexed data
     with the `CssLexer`.
-
-    .. versionadded:: 0.7
     """
 
     name = 'CSS+Mako'
     aliases = ['css+mako']
     mimetypes = ['text/css+mako']
+    url = 'http://www.makotemplates.org/'
+    version_added = '0.7'
 
     def __init__(self, **options):
         super().__init__(CssLexer, MakoLexer, **options)
@@ -734,6 +740,7 @@ class CheetahLexer(RegexLexer):
     aliases = ['cheetah', 'spitfire']
     filenames = ['*.tmpl', '*.spt']
     mimetypes = ['application/x-cheetah', 'application/x-spitfire']
+    version_added = ''
 
     tokens = {
         'root': [
@@ -773,6 +780,8 @@ class CheetahHtmlLexer(DelegatingLexer):
     name = 'HTML+Cheetah'
     aliases = ['html+cheetah', 'html+spitfire', 'htmlcheetah']
     mimetypes = ['text/html+cheetah', 'text/html+spitfire']
+    url = 'http://www.cheetahtemplate.org/'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, CheetahLexer, **options)
@@ -787,6 +796,8 @@ class CheetahXmlLexer(DelegatingLexer):
     name = 'XML+Cheetah'
     aliases = ['xml+cheetah', 'xml+spitfire']
     mimetypes = ['application/xml+cheetah', 'application/xml+spitfire']
+    url = 'http://www.cheetahtemplate.org/'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(XmlLexer, CheetahLexer, **options)
@@ -807,6 +818,8 @@ class CheetahJavascriptLexer(DelegatingLexer):
                  'application/x-javascript+spitfire',
                  'text/x-javascript+spitfire',
                  'text/javascript+spitfire']
+    url = 'http://www.cheetahtemplate.org/'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, CheetahLexer, **options)
@@ -818,9 +831,10 @@ class GenshiTextLexer(RegexLexer):
     """
 
     name = 'Genshi Text'
-    url = 'http://genshi.edgewall.org/'
+    url = 'https://genshi.edgewall.org/'
     aliases = ['genshitext']
     mimetypes = ['application/x-genshi-text', 'text/x-genshi']
+    version_added = ''
 
     tokens = {
         'root': [
@@ -913,14 +927,16 @@ class GenshiMarkupLexer(RegexLexer):
 
 class HtmlGenshiLexer(DelegatingLexer):
     """
-    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and
+    A lexer that highlights `genshi <https://genshi.edgewall.org/>`_ and
     `kid <http://kid-templating.org/>`_ kid HTML templates.
     """
 
     name = 'HTML+Genshi'
     aliases = ['html+genshi', 'html+kid']
+    version_added = ''
     alias_filenames = ['*.html', '*.htm', '*.xhtml']
     mimetypes = ['text/html+genshi']
+    url = 'https://genshi.edgewall.org/'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, GenshiMarkupLexer, **options)
@@ -936,15 +952,17 @@ class HtmlGenshiLexer(DelegatingLexer):
 
 class GenshiLexer(DelegatingLexer):
     """
-    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and
+    A lexer that highlights `genshi <https://genshi.edgewall.org/>`_ and
     `kid <http://kid-templating.org/>`_ kid XML templates.
     """
 
     name = 'Genshi'
     aliases = ['genshi', 'kid', 'xml+genshi', 'xml+kid']
     filenames = ['*.kid']
+    version_added = ''
     alias_filenames = ['*.xml']
     mimetypes = ['application/x-genshi', 'application/x-kid']
+    url = 'https://genshi.edgewall.org/'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, GenshiMarkupLexer, **options)
@@ -966,10 +984,12 @@ class JavascriptGenshiLexer(DelegatingLexer):
     name = 'JavaScript+Genshi Text'
     aliases = ['js+genshitext', 'js+genshi', 'javascript+genshitext',
                'javascript+genshi']
+    version_added = ''
     alias_filenames = ['*.js']
     mimetypes = ['application/x-javascript+genshi',
                  'text/x-javascript+genshi',
                  'text/javascript+genshi']
+    url = 'https://genshi.edgewall.org'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, GenshiTextLexer, **options)
@@ -985,8 +1005,10 @@ class CssGenshiLexer(DelegatingLexer):
 
     name = 'CSS+Genshi Text'
     aliases = ['css+genshitext', 'css+genshi']
+    version_added = ''
     alias_filenames = ['*.css']
     mimetypes = ['text/css+genshi']
+    url = 'https://genshi.edgewall.org'
 
     def __init__(self, **options):
         super().__init__(CssLexer, GenshiTextLexer, **options)
@@ -1006,8 +1028,11 @@ class RhtmlLexer(DelegatingLexer):
     name = 'RHTML'
     aliases = ['rhtml', 'html+erb', 'html+ruby']
     filenames = ['*.rhtml']
+    version_added = ''
     alias_filenames = ['*.html', '*.htm', '*.xhtml']
     mimetypes = ['text/html+ruby']
+    url = 'https://github.com/ruby/erb'
+
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, ErbLexer, **options)
@@ -1028,8 +1053,10 @@ class XmlErbLexer(DelegatingLexer):
 
     name = 'XML+Ruby'
     aliases = ['xml+ruby', 'xml+erb']
+    version_added = ''
     alias_filenames = ['*.xml']
     mimetypes = ['application/xml+ruby']
+    url = 'https://github.com/ruby/erb'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, ErbLexer, **options)
@@ -1048,8 +1075,10 @@ class CssErbLexer(DelegatingLexer):
 
     name = 'CSS+Ruby'
     aliases = ['css+ruby', 'css+erb']
+    version_added = ''
     alias_filenames = ['*.css']
     mimetypes = ['text/css+ruby']
+    url = 'https://github.com/ruby/erb'
 
     def __init__(self, **options):
         super().__init__(CssLexer, ErbLexer, **options)
@@ -1066,10 +1095,12 @@ class JavascriptErbLexer(DelegatingLexer):
 
     name = 'JavaScript+Ruby'
     aliases = ['javascript+ruby', 'js+ruby', 'javascript+erb', 'js+erb']
+    version_added = ''
     alias_filenames = ['*.js']
     mimetypes = ['application/x-javascript+ruby',
                  'text/x-javascript+ruby',
                  'text/javascript+ruby']
+    url = 'https://github.com/ruby/erb'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, ErbLexer, **options)
@@ -1088,11 +1119,14 @@ class HtmlPhpLexer(DelegatingLexer):
     name = 'HTML+PHP'
     aliases = ['html+php']
     filenames = ['*.phtml']
+    version_added = ''
     alias_filenames = ['*.php', '*.html', '*.htm', '*.xhtml',
                        '*.php[345]']
     mimetypes = ['application/x-php',
                  'application/x-httpd-php', 'application/x-httpd-php3',
                  'application/x-httpd-php4', 'application/x-httpd-php5']
+    url = 'https://www.php.net'
+
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, PhpLexer, **options)
@@ -1111,8 +1145,10 @@ class XmlPhpLexer(DelegatingLexer):
 
     name = 'XML+PHP'
     aliases = ['xml+php']
+    version_added = ''
     alias_filenames = ['*.xml', '*.php', '*.php[345]']
     mimetypes = ['application/xml+php']
+    url = 'https://www.php.net'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, PhpLexer, **options)
@@ -1131,8 +1167,10 @@ class CssPhpLexer(DelegatingLexer):
 
     name = 'CSS+PHP'
     aliases = ['css+php']
+    version_added = ''
     alias_filenames = ['*.css']
     mimetypes = ['text/css+php']
+    url = 'https://www.php.net'
 
     def __init__(self, **options):
         super().__init__(CssLexer, PhpLexer, **options)
@@ -1149,10 +1187,12 @@ class JavascriptPhpLexer(DelegatingLexer):
 
     name = 'JavaScript+PHP'
     aliases = ['javascript+php', 'js+php']
+    version_added = ''
     alias_filenames = ['*.js']
     mimetypes = ['application/x-javascript+php',
                  'text/x-javascript+php',
                  'text/javascript+php']
+    url = 'https://www.php.net'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, PhpLexer, **options)
@@ -1171,8 +1211,10 @@ class HtmlSmartyLexer(DelegatingLexer):
 
     name = 'HTML+Smarty'
     aliases = ['html+smarty']
+    version_added = ''
     alias_filenames = ['*.html', '*.htm', '*.xhtml', '*.tpl']
     mimetypes = ['text/html+smarty']
+    url = 'https://www.smarty.net/'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, SmartyLexer, **options)
@@ -1192,8 +1234,10 @@ class XmlSmartyLexer(DelegatingLexer):
 
     name = 'XML+Smarty'
     aliases = ['xml+smarty']
+    version_added = ''
     alias_filenames = ['*.xml', '*.tpl']
     mimetypes = ['application/xml+smarty']
+    url = 'https://www.smarty.net/'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, SmartyLexer, **options)
@@ -1213,8 +1257,10 @@ class CssSmartyLexer(DelegatingLexer):
 
     name = 'CSS+Smarty'
     aliases = ['css+smarty']
+    version_added = ''
     alias_filenames = ['*.css', '*.tpl']
     mimetypes = ['text/css+smarty']
+    url = 'https://www.smarty.net/'
 
     def __init__(self, **options):
         super().__init__(CssLexer, SmartyLexer, **options)
@@ -1231,10 +1277,12 @@ class JavascriptSmartyLexer(DelegatingLexer):
 
     name = 'JavaScript+Smarty'
     aliases = ['javascript+smarty', 'js+smarty']
+    version_added = ''
     alias_filenames = ['*.js', '*.tpl']
     mimetypes = ['application/x-javascript+smarty',
                  'text/x-javascript+smarty',
                  'text/javascript+smarty']
+    url = 'https://www.smarty.net/'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, SmartyLexer, **options)
@@ -1254,8 +1302,10 @@ class HtmlDjangoLexer(DelegatingLexer):
     name = 'HTML+Django/Jinja'
     aliases = ['html+django', 'html+jinja', 'htmldjango']
     filenames = ['*.html.j2', '*.htm.j2', '*.xhtml.j2', '*.html.jinja2', '*.htm.jinja2', '*.xhtml.jinja2']
+    version_added = ''
     alias_filenames = ['*.html', '*.htm', '*.xhtml']
     mimetypes = ['text/html+django', 'text/html+jinja']
+    url = 'https://www.djangoproject.com/documentation/templates'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, DjangoLexer, **options)
@@ -1276,8 +1326,10 @@ class XmlDjangoLexer(DelegatingLexer):
     name = 'XML+Django/Jinja'
     aliases = ['xml+django', 'xml+jinja']
     filenames = ['*.xml.j2', '*.xml.jinja2']
+    version_added = ''
     alias_filenames = ['*.xml']
     mimetypes = ['application/xml+django', 'application/xml+jinja']
+    url = 'https://www.djangoproject.com/documentation/templates'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, DjangoLexer, **options)
@@ -1298,8 +1350,10 @@ class CssDjangoLexer(DelegatingLexer):
     name = 'CSS+Django/Jinja'
     aliases = ['css+django', 'css+jinja']
     filenames = ['*.css.j2', '*.css.jinja2']
+    version_added = ''
     alias_filenames = ['*.css']
     mimetypes = ['text/css+django', 'text/css+jinja']
+    url = 'https://www.djangoproject.com/documentation/templates'
 
     def __init__(self, **options):
         super().__init__(CssLexer, DjangoLexer, **options)
@@ -1318,6 +1372,7 @@ class JavascriptDjangoLexer(DelegatingLexer):
     aliases = ['javascript+django', 'js+django',
                'javascript+jinja', 'js+jinja']
     filenames = ['*.js.j2', '*.js.jinja2']
+    version_added = ''
     alias_filenames = ['*.js']
     mimetypes = ['application/x-javascript+django',
                  'application/x-javascript+jinja',
@@ -1325,6 +1380,7 @@ class JavascriptDjangoLexer(DelegatingLexer):
                  'text/x-javascript+jinja',
                  'text/javascript+django',
                  'text/javascript+jinja']
+    url = 'https://www.djangoproject.com/documentation/templates'
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, DjangoLexer, **options)
@@ -1361,13 +1417,13 @@ class JspRootLexer(RegexLexer):
 class JspLexer(DelegatingLexer):
     """
     Lexer for Java Server Pages.
-
-    .. versionadded:: 0.7
     """
     name = 'Java Server Page'
     aliases = ['jsp']
     filenames = ['*.jsp']
     mimetypes = ['application/x-jsp']
+    url = 'https://projects.eclipse.org/projects/ee4j.jsp'
+    version_added = '0.7'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, JspRootLexer, **options)
@@ -1384,13 +1440,13 @@ class JspLexer(DelegatingLexer):
 class EvoqueLexer(RegexLexer):
     """
     For files using the Evoque templating system.
-
-    .. versionadded:: 1.1
     """
     name = 'Evoque'
     aliases = ['evoque']
     filenames = ['*.evoque']
     mimetypes = ['application/x-evoque']
+    url = 'https://gizmojo.org/templating'
+    version_added = '1.1'
 
     flags = re.DOTALL
 
@@ -1442,13 +1498,13 @@ class EvoqueHtmlLexer(DelegatingLexer):
     """
     Subclass of the `EvoqueLexer` that highlights unlexed data with the
     `HtmlLexer`.
-
-    .. versionadded:: 1.1
     """
     name = 'HTML+Evoque'
     aliases = ['html+evoque']
-    filenames = ['*.html']
+    alias_filenames = ['*.html']
     mimetypes = ['text/html+evoque']
+    url = 'https://gizmojo.org/templating'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, EvoqueLexer, **options)
@@ -1461,13 +1517,13 @@ class EvoqueXmlLexer(DelegatingLexer):
     """
     Subclass of the `EvoqueLexer` that highlights unlexed data with the
     `XmlLexer`.
-
-    .. versionadded:: 1.1
     """
     name = 'XML+Evoque'
     aliases = ['xml+evoque']
-    filenames = ['*.xml']
+    alias_filenames = ['*.xml']
     mimetypes = ['application/xml+evoque']
+    url = 'https://gizmojo.org/templating'
+    version_added = '1.1'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, EvoqueLexer, **options)
@@ -1484,6 +1540,9 @@ class ColdfusionLexer(RegexLexer):
     aliases = ['cfs']
     filenames = []
     mimetypes = []
+    url = 'https://www.adobe.com/products/coldfusion-family.html'
+    version_added = ''
+
     flags = re.IGNORECASE
 
     tokens = {
@@ -1532,6 +1591,7 @@ class ColdfusionMarkupLexer(RegexLexer):
     aliases = ['cf']
     filenames = []
     mimetypes = []
+    url = 'https://www.adobe.com/products/coldfusion-family.html'
 
     tokens = {
         'root': [
@@ -1578,6 +1638,8 @@ class ColdfusionHtmlLexer(DelegatingLexer):
     aliases = ['cfm']
     filenames = ['*.cfm', '*.cfml']
     mimetypes = ['application/x-coldfusion']
+    url = 'https://www.adobe.com/products/coldfusion-family.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, ColdfusionMarkupLexer, **options)
@@ -1586,13 +1648,13 @@ class ColdfusionHtmlLexer(DelegatingLexer):
 class ColdfusionCFCLexer(DelegatingLexer):
     """
     Coldfusion markup/script components
-
-    .. versionadded:: 2.0
     """
     name = 'Coldfusion CFC'
     aliases = ['cfc']
     filenames = ['*.cfc']
     mimetypes = []
+    url = 'https://www.adobe.com/products/coldfusion-family.html'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(ColdfusionHtmlLexer, ColdfusionLexer, **options)
@@ -1601,13 +1663,13 @@ class ColdfusionCFCLexer(DelegatingLexer):
 class SspLexer(DelegatingLexer):
     """
     Lexer for Scalate Server Pages.
-
-    .. versionadded:: 1.4
     """
     name = 'Scalate Server Page'
     aliases = ['ssp']
     filenames = ['*.ssp']
     mimetypes = ['application/x-ssp']
+    url = 'https://scalate.github.io/scalate/'
+    version_added = '1.4'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, JspRootLexer, **options)
@@ -1647,14 +1709,14 @@ class TeaTemplateRootLexer(RegexLexer):
 
 class TeaTemplateLexer(DelegatingLexer):
     """
-    Lexer for `Tea Templates <http://teatrove.org/>`_.
-
-    .. versionadded:: 1.5
+    Lexer for Tea Templates.
     """
     name = 'Tea'
     aliases = ['tea']
     filenames = ['*.tea']
     mimetypes = ['text/x-tea']
+    url = 'https://github.com/teatrove/teatrove'
+    version_added = '1.5'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, TeaTemplateRootLexer, **options)
@@ -1674,17 +1736,17 @@ class LassoHtmlLexer(DelegatingLexer):
     `HtmlLexer`.
 
     Nested JavaScript and CSS is also highlighted.
-
-    .. versionadded:: 1.6
     """
 
     name = 'HTML+Lasso'
     aliases = ['html+lasso']
+    version_added = '1.6'
     alias_filenames = ['*.html', '*.htm', '*.xhtml', '*.lasso', '*.lasso[89]',
                        '*.incl', '*.inc', '*.las']
     mimetypes = ['text/html+lasso',
                  'application/x-httpd-lasso',
                  'application/x-httpd-lasso[89]']
+    url = 'https://www.lassosoft.com'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, LassoLexer, **options)
@@ -1700,15 +1762,15 @@ class LassoXmlLexer(DelegatingLexer):
     """
     Subclass of the `LassoLexer` which highlights unhandled data with the
     `XmlLexer`.
-
-    .. versionadded:: 1.6
     """
 
     name = 'XML+Lasso'
     aliases = ['xml+lasso']
+    version_added = '1.6'
     alias_filenames = ['*.xml', '*.lasso', '*.lasso[89]',
                        '*.incl', '*.inc', '*.las']
     mimetypes = ['application/xml+lasso']
+    url = 'https://www.lassosoft.com'
 
     def __init__(self, **options):
         super().__init__(XmlLexer, LassoLexer, **options)
@@ -1724,14 +1786,14 @@ class LassoCssLexer(DelegatingLexer):
     """
     Subclass of the `LassoLexer` which highlights unhandled data with the
     `CssLexer`.
-
-    .. versionadded:: 1.6
     """
 
     name = 'CSS+Lasso'
     aliases = ['css+lasso']
+    version_added = '1.6'
     alias_filenames = ['*.css']
     mimetypes = ['text/css+lasso']
+    url = 'https://www.lassosoft.com'
 
     def __init__(self, **options):
         options['requiredelimiters'] = True
@@ -1750,16 +1812,16 @@ class LassoJavascriptLexer(DelegatingLexer):
     """
     Subclass of the `LassoLexer` which highlights unhandled data with the
     `JavascriptLexer`.
-
-    .. versionadded:: 1.6
     """
 
     name = 'JavaScript+Lasso'
     aliases = ['javascript+lasso', 'js+lasso']
+    version_added = '1.6'
     alias_filenames = ['*.js']
     mimetypes = ['application/x-javascript+lasso',
                  'text/x-javascript+lasso',
                  'text/javascript+lasso']
+    url = 'https://www.lassosoft.com'
 
     def __init__(self, **options):
         options['requiredelimiters'] = True
@@ -1776,13 +1838,12 @@ class HandlebarsLexer(RegexLexer):
 
     Highlights only the Handlebars template tags (stuff between `{{` and `}}`).
     Everything else is left for a delegating lexer.
-
-    .. versionadded:: 2.0
     """
 
     name = "Handlebars"
     url = 'https://handlebarsjs.com/'
     aliases = ['handlebars']
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -1851,14 +1912,14 @@ class HandlebarsHtmlLexer(DelegatingLexer):
     """
     Subclass of the `HandlebarsLexer` that highlights unlexed data with the
     `HtmlLexer`.
-
-    .. versionadded:: 2.0
     """
 
     name = "HTML+Handlebars"
     aliases = ["html+handlebars"]
     filenames = ['*.handlebars', '*.hbs']
     mimetypes = ['text/html+handlebars', 'text/x-handlebars-template']
+    url = 'https://handlebarsjs.com/'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, HandlebarsLexer, **options)
@@ -1870,14 +1931,14 @@ class YamlJinjaLexer(DelegatingLexer):
     `YamlLexer`.
 
     Commonly used in Saltstack salt states.
-
-    .. versionadded:: 2.0
     """
 
     name = 'YAML+Jinja'
     aliases = ['yaml+jinja', 'salt', 'sls']
     filenames = ['*.sls', '*.yaml.j2', '*.yml.j2', '*.yaml.jinja2', '*.yml.jinja2']
     mimetypes = ['text/x-yaml+jinja', 'text/x-sls']
+    url = 'https://jinja.palletsprojects.com'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(YamlLexer, DjangoLexer, **options)
@@ -1886,13 +1947,12 @@ class YamlJinjaLexer(DelegatingLexer):
 class LiquidLexer(RegexLexer):
     """
     Lexer for Liquid templates.
-
-    .. versionadded:: 2.0
     """
     name = 'liquid'
     url = 'https://www.rubydoc.info/github/Shopify/liquid'
     aliases = ['liquid']
     filenames = ['*.liquid']
+    version_added = '2.0'
 
     tokens = {
         'root': [
@@ -2095,13 +2155,13 @@ class TwigLexer(RegexLexer):
 
     It just highlights Twig code between the preprocessor directives,
     other data is left untouched by the lexer.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Twig'
     aliases = ['twig']
     mimetypes = ['application/x-twig']
+    url = 'https://twig.symfony.com'
+    version_added = '2.0'
 
     flags = re.M | re.S
 
@@ -2130,7 +2190,7 @@ class TwigLexer(RegexLexer):
                       Other, Comment.Preproc, Text, Keyword, Text,
                       Comment.Preproc)),
             # filter blocks
-            (r'(\{%%)(-?\s*)(filter)(\s+)(%s)' % _ident_inner,
+            (rf'(\{{%)(-?\s*)(filter)(\s+)({_ident_inner})',
              bygroups(Comment.Preproc, Text, Keyword, Text, Name.Function),
              'tag'),
             (r'(\{%)(-?\s*)([a-zA-Z_]\w*)',
@@ -2138,9 +2198,9 @@ class TwigLexer(RegexLexer):
             (r'\{', Other),
         ],
         'varnames': [
-            (r'(\|)(\s*)(%s)' % _ident_inner,
+            (rf'(\|)(\s*)({_ident_inner})',
              bygroups(Operator, Text, Name.Function)),
-            (r'(is)(\s+)(not)?(\s*)(%s)' % _ident_inner,
+            (rf'(is)(\s+)(not)?(\s*)({_ident_inner})',
              bygroups(Keyword, Text, Keyword, Text, Name.Function)),
             (r'(?i)(true|false|none|null)\b', Keyword.Pseudo),
             (r'(in|not|and|b-and|or|b-or|b-xor|is'
@@ -2176,14 +2236,14 @@ class TwigHtmlLexer(DelegatingLexer):
     """
     Subclass of the `TwigLexer` that highlights unlexed data with the
     `HtmlLexer`.
-
-    .. versionadded:: 2.0
     """
 
     name = "HTML+Twig"
     aliases = ["html+twig"]
     filenames = ['*.twig']
     mimetypes = ['text/html+twig']
+    url = 'https://twig.symfony.com'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, TwigLexer, **options)
@@ -2196,13 +2256,12 @@ class Angular2Lexer(RegexLexer):
     Highlights only the Angular template tags (stuff between `{{` and `}}` and
     special attributes: '(event)=', '[property]=', '[(twoWayBinding)]=').
     Everything else is left for a delegating lexer.
-
-    .. versionadded:: 2.1
     """
 
     name = "Angular2"
     url = 'https://angular.io/guide/template-syntax'
     aliases = ['ng2']
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -2256,13 +2315,13 @@ class Angular2HtmlLexer(DelegatingLexer):
     """
     Subclass of the `Angular2Lexer` that highlights unlexed data with the
     `HtmlLexer`.
-
-    .. versionadded:: 2.0
     """
 
     name = "HTML + Angular2"
     aliases = ["html+ng2"]
     filenames = ['*.ng2']
+    url = 'https://angular.io/guide/template-syntax'
+    version_added = '2.0'
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, Angular2Lexer, **options)
@@ -2271,13 +2330,13 @@ class Angular2HtmlLexer(DelegatingLexer):
 class SqlJinjaLexer(DelegatingLexer):
     """
     Templated SQL lexer.
-
-    .. versionadded:: 2.13
     """
 
     name = 'SQL+Jinja'
     aliases = ['sql+jinja']
     filenames = ['*.sql', '*.sql.j2', '*.sql.jinja2']
+    url = 'https://jinja.palletsprojects.com'
+    version_added = '2.13'
 
     def __init__(self, **options):
         super().__init__(SqlLexer, DjangoLexer, **options)
diff --git a/libs/pygments/lexers/teraterm.py b/libs/pygments/lexers/teraterm.py
index 2c0d3b27a..a2c2980d4 100644
--- a/libs/pygments/lexers/teraterm.py
+++ b/libs/pygments/lexers/teraterm.py
@@ -4,7 +4,7 @@
 
     Lexer for Tera Term macro files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,13 @@ __all__ = ['TeraTermLexer']
 class TeraTermLexer(RegexLexer):
     """
     For Tera Term macro source code.
-
-    .. versionadded:: 2.4
     """
     name = 'Tera Term macro'
     url = 'https://ttssh2.osdn.jp/'
     aliases = ['teratermmacro', 'teraterm', 'ttl']
     filenames = ['*.ttl']
     mimetypes = ['text/x-teratermmacro']
+    version_added = '2.4'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/testing.py b/libs/pygments/lexers/testing.py
index dec3a15d0..e6c59269f 100644
--- a/libs/pygments/lexers/testing.py
+++ b/libs/pygments/lexers/testing.py
@@ -4,7 +4,7 @@
 
     Lexers for testing languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,13 +17,13 @@ __all__ = ['GherkinLexer', 'TAPLexer']
 class GherkinLexer(RegexLexer):
     """
     For Gherkin syntax.
-
-    .. versionadded:: 1.2
     """
     name = 'Gherkin'
     aliases = ['gherkin', 'cucumber']
     filenames = ['*.feature']
     mimetypes = ['text/x-gherkin']
+    url = 'https://cucumber.io/docs/gherkin'
+    version_added = '1.2'
 
     feature_keywords = '^(기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функционалност|Функционал|Фича|Особина|Могућност|Özellik|Właściwość|Tính năng|Trajto|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Egenskap|Egenskab|Crikey|Característica|Arwedd)(:)(.*)$'
     feature_element_keywords = '^(\\s*)(시나리오 개요|시나리오|배경|背景|場景大綱|場景|场景大纲|场景|劇本大綱|劇本|剧本大纲|剧本|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|シナリオ|سيناريو مخطط|سيناريو|الخلفية|תרחיש|תבנית תרחיש|רקע|Тарих|Сценарій|Сценарио|Сценарий структураси|Сценарий|Структура сценарію|Структура сценарија|Структура сценария|Скица|Рамка на сценарий|Пример|Предыстория|Предистория|Позадина|Передумова|Основа|Концепт|Контекст|Założenia|Wharrimean is|Tình huống|The thing of it is|Tausta|Taust|Tapausaihio|Tapaus|Szenariogrundriss|Szenario|Szablon scenariusza|Stsenaarium|Struktura scenarija|Skica|Skenario konsep|Skenario|Situācija|Senaryo taslağı|Senaryo|Scénář|Scénario|Schema dello scenario|Scenārijs pēc parauga|Scenārijs|Scenár|Scenaro|Scenariusz|Scenariul de şablon|Scenariul de sablon|Scenariu|Scenario Outline|Scenario Amlinellol|Scenario|Scenarijus|Scenarijaus šablonas|Scenarij|Scenarie|Rerefons|Raamstsenaarium|Primer|Pozadí|Pozadina|Pozadie|Plan du scénario|Plan du Scénario|Osnova scénáře|Osnova|Náčrt Scénáře|Náčrt Scenáru|Mate|MISHUN SRSLY|MISHUN|Kịch bản|Konturo de la scenaro|Kontext|Konteksts|Kontekstas|Kontekst|Koncept|Khung tình huống|Khung kịch bản|Háttér|Grundlage|Geçmiş|Forgatókönyv vázlat|Forgatókönyv|Fono|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l\'escenari|Escenario|Escenari|Dis is what went down|Dasar|Contexto|Contexte|Contesto|Condiţii|Conditii|Cenário|Cenario|Cefndir|Bối cảnh|Blokes|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|All y\'all|Achtergrond|Abstrakt Scenario|Abstract Scenario)(:)(.*)$'
@@ -136,13 +136,12 @@ class GherkinLexer(RegexLexer):
 class TAPLexer(RegexLexer):
     """
     For Test Anything Protocol (TAP) output.
-
-    .. versionadded:: 2.1
     """
     name = 'TAP'
     url = 'https://testanything.org/'
     aliases = ['tap']
     filenames = ['*.tap']
+    version_added = '2.1'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/text.py b/libs/pygments/lexers/text.py
index e35b0b5f0..f5524783e 100644
--- a/libs/pygments/lexers/text.py
+++ b/libs/pygments/lexers/text.py
@@ -4,10 +4,11 @@
 
     Lexers for non-source code file types.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.configs import ApacheConfLexer, NginxConfLexer, \
     SquidConfLexer, LighttpdConfLexer, IniLexer, RegeditLexer, PropertiesLexer, \
     UnixConfigLexer
@@ -15,7 +16,7 @@ from pygments.lexers.console import PyPyLogLexer
 from pygments.lexers.textedit import VimLexer
 from pygments.lexers.markup import BBCodeLexer, MoinWikiLexer, RstLexer, \
     TexLexer, GroffLexer
-from pygments.lexers.installers import DebianControlLexer, SourcesListLexer
+from pygments.lexers.installers import DebianControlLexer, DebianSourcesLexer, SourcesListLexer
 from pygments.lexers.make import MakefileLexer, BaseMakefileLexer, CMakeLexer
 from pygments.lexers.haxe import HxmlLexer
 from pygments.lexers.sgf import SmartGameFormatLexer
diff --git a/libs/pygments/lexers/textedit.py b/libs/pygments/lexers/textedit.py
index 09defdbe2..ea6a0a976 100644
--- a/libs/pygments/lexers/textedit.py
+++ b/libs/pygments/lexers/textedit.py
@@ -4,7 +4,7 @@
 
     Lexers for languages related to text processing.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -22,14 +22,14 @@ __all__ = ['AwkLexer', 'SedLexer', 'VimLexer']
 class AwkLexer(RegexLexer):
     """
     For Awk scripts.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Awk'
     aliases = ['awk', 'gawk', 'mawk', 'nawk']
     filenames = ['*.awk']
     mimetypes = ['application/x-awk']
+    url = 'https://en.wikipedia.org/wiki/AWK'
+    version_added = '1.5'
 
     tokens = {
         'commentsandwhitespace': [
@@ -49,7 +49,7 @@ class AwkLexer(RegexLexer):
         'root': [
             (r'^(?=\s|/)', Text, 'slashstartsregex'),
             include('commentsandwhitespace'),
-            (r'\+\+|--|\|\||&&|in\b|\$|!?~|'
+            (r'\+\+|--|\|\||&&|in\b|\$|!?~|\?|:|'
              r'(\*\*|[-<>+*%\^/!=|])=?', Operator, 'slashstartsregex'),
             (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
             (r'[})\].]', Punctuation),
@@ -81,6 +81,8 @@ class SedLexer(RegexLexer):
     aliases = ['sed', 'gsed', 'ssed']
     filenames = ['*.sed', '*.[gs]sed']
     mimetypes = ['text/x-sed']
+    url = 'https://en.wikipedia.org/wiki/Sed'
+    version_added = ''
     flags = re.MULTILINE
 
     # Match the contents within delimiters such as /<contents>/
@@ -111,14 +113,15 @@ class SedLexer(RegexLexer):
 class VimLexer(RegexLexer):
     """
     Lexer for VimL script files.
-
-    .. versionadded:: 0.8
     """
     name = 'VimL'
     aliases = ['vim']
     filenames = ['*.vim', '.vimrc', '.exrc', '.gvimrc',
                  '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc']
     mimetypes = ['text/x-vim']
+    url = 'https://www.vim.org'
+    version_added = '0.8'
+
     flags = re.MULTILINE
 
     _python = r'py(?:t(?:h(?:o(?:n)?)?)?)?'
diff --git a/libs/pygments/lexers/textfmts.py b/libs/pygments/lexers/textfmts.py
index c7cfb6d04..6dd4e581b 100644
--- a/libs/pygments/lexers/textfmts.py
+++ b/libs/pygments/lexers/textfmts.py
@@ -4,7 +4,7 @@
 
     Lexers for various text formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -29,6 +29,8 @@ class IrcLogsLexer(RegexLexer):
     aliases = ['irc']
     filenames = ['*.weechatlog']
     mimetypes = ['text/x-irclog']
+    url = 'https://en.wikipedia.org/wiki/Internet_Relay_Chat'
+    version_added = ''
 
     flags = re.VERBOSE | re.MULTILINE
     timestamp = r"""
@@ -86,13 +88,13 @@ class IrcLogsLexer(RegexLexer):
 class GettextLexer(RegexLexer):
     """
     Lexer for Gettext catalog files.
-
-    .. versionadded:: 0.9
     """
     name = 'Gettext Catalog'
     aliases = ['pot', 'po']
     filenames = ['*.pot', '*.po']
     mimetypes = ['application/x-gettext', 'text/x-gettext', 'text/gettext']
+    url = 'https://www.gnu.org/software/gettext'
+    version_added = '0.9'
 
     tokens = {
         'root': [
@@ -114,12 +116,12 @@ class GettextLexer(RegexLexer):
 class HttpLexer(RegexLexer):
     """
     Lexer for HTTP sessions.
-
-    .. versionadded:: 1.5
     """
 
     name = 'HTTP'
     aliases = ['http']
+    url = 'https://httpwg.org/specs'
+    version_added = '1.5'
 
     flags = re.DOTALL
 
@@ -206,13 +208,12 @@ class HttpLexer(RegexLexer):
 class TodotxtLexer(RegexLexer):
     """
     Lexer for Todo.txt todo list format.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Todotxt'
     url = 'http://todotxt.com/'
     aliases = ['todotxt']
+    version_added = '2.0'
     # *.todotxt is not a standard extension for Todo.txt files; including it
     # makes testing easier, and also makes autodetecting file type easier.
     filenames = ['todo.txt', '*.todotxt']
@@ -308,8 +309,6 @@ class NotmuchLexer(RegexLexer):
     """
     For Notmuch email text format.
 
-    .. versionadded:: 2.5
-
     Additional options accepted:
 
     `body_lexer`
@@ -320,6 +319,7 @@ class NotmuchLexer(RegexLexer):
     name = 'Notmuch'
     url = 'https://notmuchmail.org/'
     aliases = ['notmuch']
+    version_added = '2.5'
 
     def _highlight_code(self, match):
         code = match.group(1)
@@ -390,12 +390,12 @@ class NotmuchLexer(RegexLexer):
 class KernelLogLexer(RegexLexer):
     """
     For Linux Kernel log ("dmesg") output.
-
-    .. versionadded:: 2.6
     """
     name = 'Kernel log'
     aliases = ['kmsg', 'dmesg']
     filenames = ['*.kmsg', '*.dmesg']
+    url = 'https://fr.wikipedia.org/wiki/Dmesg'
+    version_added = '2.6'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/theorem.py b/libs/pygments/lexers/theorem.py
index abf09ae17..9e3f150d4 100644
--- a/libs/pygments/lexers/theorem.py
+++ b/libs/pygments/lexers/theorem.py
@@ -6,16 +6,15 @@
 
     See also :mod:`pygments.lexers.lean`
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-import re
-
-from pygments.lexer import RegexLexer, default, words, include
+from pygments.lexer import RegexLexer, bygroups, default, words
 from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Whitespace
-from pygments.lexers.lean import LeanLexer
+# compatibility import
+from pygments.lexers.lean import LeanLexer # noqa: F401
 
 __all__ = ['CoqLexer', 'IsabelleLexer']
 
@@ -23,8 +22,6 @@ __all__ = ['CoqLexer', 'IsabelleLexer']
 class CoqLexer(RegexLexer):
     """
     For the Coq theorem prover.
-
-    .. versionadded:: 1.5
     """
 
     name = 'Coq'
@@ -32,17 +29,18 @@ class CoqLexer(RegexLexer):
     aliases = ['coq']
     filenames = ['*.v']
     mimetypes = ['text/x-coq']
+    version_added = '1.5'
 
     flags = 0 # no re.MULTILINE
 
     keywords1 = (
         # Vernacular commands
-        'Section', 'Module', 'End', 'Require', 'Import', 'Export', 'Variable',
+        'Section', 'Module', 'End', 'Require', 'Import', 'Export', 'Include', 'Variable',
         'Variables', 'Parameter', 'Parameters', 'Axiom', 'Axioms', 'Hypothesis',
         'Hypotheses', 'Notation', 'Local', 'Tactic', 'Reserved', 'Scope',
-        'Open', 'Close', 'Bind', 'Delimit', 'Definition', 'Example', 'Let',
-        'Ltac', 'Fixpoint', 'CoFixpoint', 'Morphism', 'Relation', 'Implicit',
-        'Arguments', 'Types', 'Unset', 'Contextual', 'Strict', 'Prenex',
+        'Open', 'Close', 'Bind', 'Declare', 'Delimit', 'Definition', 'Example', 'Let',
+        'Ltac', 'Ltac2', 'Fixpoint', 'CoFixpoint', 'Morphism', 'Relation', 'Implicit',
+        'Arguments', 'Types', 'Contextual', 'Strict', 'Prenex',
         'Implicits', 'Inductive', 'CoInductive', 'Record', 'Structure',
         'Variant', 'Canonical', 'Coercion', 'Theorem', 'Lemma', 'Fact',
         'Remark', 'Corollary', 'Proposition', 'Property', 'Goal',
@@ -51,7 +49,8 @@ class CoqLexer(RegexLexer):
         'Show', 'Print', 'Printing', 'All', 'Graph', 'Projections', 'inside',
         'outside', 'Check', 'Global', 'Instance', 'Class', 'Existing',
         'Universe', 'Polymorphic', 'Monomorphic', 'Context', 'Scheme', 'From',
-        'Undo', 'Fail', 'Function',
+        'Undo', 'Fail', 'Function', 'Program', 'Elpi', 'Extract', 'Opaque',
+        'Transparent', 'Unshelve', 'Next Obligation',
     )
     keywords2 = (
         # Gallina
@@ -99,7 +98,7 @@ class CoqLexer(RegexLexer):
         '!=', '#', '&', '&&', r'\(', r'\)', r'\*', r'\+', ',', '-', r'-\.',
         '->', r'\.', r'\.\.', ':', '::', ':=', ':>', ';', ';;', '<', '<-',
         '<->', '=', '>', '>]', r'>\}', r'\?', r'\?\?', r'\[', r'\[<', r'\[>',
-        r'\[\|', ']', '_', '`', r'\{', r'\{<', r'\|', r'\|]', r'\}', '~', '=>',
+        r'\[\|', ']', '_', '`', r'\{', r'\{<', r'lp:\{\{', r'\|', r'\|]', r'\}', '~', '=>',
         r'/\\', r'\\/', r'\{\|', r'\|\}',
         # 'Π', 'Σ', # Not defined in the standard library
         'λ', '¬', '∧', '∨', '∀', '∃', '→', '↔', '≠', '≤', '≥',
@@ -115,8 +114,10 @@ class CoqLexer(RegexLexer):
             (r'\(\*', Comment, 'comment'),
             (r'\b(?:[^\W\d][\w\']*\.)+[^\W\d][\w\']*\b', Name),
             (r'\bEquations\b\??', Keyword.Namespace),
+            (r'\b(Elpi)(\s+)(Program|Query|Accumulate|Command|Typecheck|Db|Export|Tactic)?\b', bygroups(Keyword.Namespace,Text,Keyword.Namespace)),
             # Very weak heuristic to distinguish the Set vernacular from the Set sort
-            (r'\bSet(?=[ \t]+[A-Z][a-z][^\n]*?\.)', Keyword.Namespace),
+            (r'\bUnset\b|\bSet(?=[ \t]+[A-Z][a-z][^\n]*?\.)', Keyword.Namespace, 'set-options'),
+            (r'\b(?:String|Number)\s+Notation', Keyword.Namespace, 'sn-notation'),
             (words(keywords1, prefix=r'\b', suffix=r'\b'), Keyword.Namespace),
             (words(keywords2, prefix=r'\b', suffix=r'\b'), Keyword),
             (words(keywords3, prefix=r'\b', suffix=r'\b'), Keyword.Type),
@@ -125,8 +126,8 @@ class CoqLexer(RegexLexer):
             (words(keywords6, prefix=r'\b', suffix=r'\b'), Keyword.Reserved),
             # (r'\b([A-Z][\w\']*)(\.)', Name.Namespace, 'dotted'),
             (r'\b([A-Z][\w\']*)', Name),
-            (r'(%s)' % '|'.join(keyopts[::-1]), Operator),
-            (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator),
+            (r'({})'.format('|'.join(keyopts[::-1])), Operator),
+            (rf'({infix_syms}|{prefix_syms})?{operators}', Operator),
 
             (r"[^\W\d][\w']*", Name),
 
@@ -146,8 +147,27 @@ class CoqLexer(RegexLexer):
             (r'[~?][a-z][\w\']*:', Name),
             (r'\S', Name.Builtin.Pseudo),
         ],
+        'set-options': [
+            (r'\s+', Text),
+            (r'[A-Z]\w*', Keyword.Namespace),
+            (r'"', String.Double, 'string'),
+            (r'\d+', Number.Integer),
+            (r'\.', Punctuation, '#pop'),
+        ],
+        'sn-notation': [
+            (r'\s+', Text),
+            # Extra keywords to highlight only in this scope
+            (r'\b(?:via|mapping|abstract|warning|after)\b', Keyword),
+            (r'=>|[()\[\]:,]', Operator),
+            (r'\b[^\W\d][\w\']*(?:\.[^\W\d][\w\']*)*\b', Name),
+            (r'\d[\d_]*', Number.Integer),
+            (r'0[xX][\da-fA-F][\da-fA-F_]*', Number.Hex),
+            (r'\(\*', Comment, 'comment'),
+            (r'\.', Punctuation, '#pop'),
+        ],
         'comment': [
-            (r'[^(*)]+', Comment),
+            # Consume comments like ***** as one token
+            (r'([^(*)]+|\*+(?!\)))+', Comment),
             (r'\(\*', Comment, '#push'),
             (r'\*\)', Comment, '#pop'),
             (r'[(*)]', Comment),
@@ -175,8 +195,6 @@ class CoqLexer(RegexLexer):
 class IsabelleLexer(RegexLexer):
     """
     For the Isabelle proof assistant.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Isabelle'
@@ -184,6 +202,7 @@ class IsabelleLexer(RegexLexer):
     aliases = ['isabelle']
     filenames = ['*.thy']
     mimetypes = ['text/x-isabelle']
+    version_added = '2.0'
 
     keyword_minor = (
         'and', 'assumes', 'attach', 'avoids', 'binder', 'checking',
diff --git a/libs/pygments/lexers/thingsdb.py b/libs/pygments/lexers/thingsdb.py
index 13230f8b3..ee859c995 100644
--- a/libs/pygments/lexers/thingsdb.py
+++ b/libs/pygments/lexers/thingsdb.py
@@ -4,7 +4,7 @@
 
     Lexers for the ThingsDB language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,12 +18,12 @@ __all__ = ['ThingsDBLexer']
 class ThingsDBLexer(RegexLexer):
     """
     Lexer for the ThingsDB programming language.
-
-    .. versionadded:: 2.9
     """
     name = 'ThingsDB'
     aliases = ['ti', 'thingsdb']
     filenames = ['*.ti']
+    url = 'https://www.thingsdb.net'
+    version_added = '2.9'
 
     tokens = {
         'root': [
@@ -39,21 +39,24 @@ class ThingsDBLexer(RegexLexer):
             (r'([-+]?0x[0-9a-fA-F]+)', Number.Hex),
             (r'[-+]?[0-9]+', Number.Integer),
             (r'[-+]?((inf|nan)([^0-9A-Za-z_]|$)|[0-9]*\.[0-9]+(e[+-][0-9]+)?)',
-            Number.Float),
+             Number.Float),
 
             # strings
             (r'(?:"(?:[^"]*)")+', String.Double),
             (r"(?:'(?:[^']*)')+", String.Single),
+            (r"(?:`(?:[^`]*)`)+", String.Backtick),
 
             # literals
             (r'(true|false|nil)\b', Keyword.Constant),
 
+            # name constants
+            (r'(FULL|USER|GRANT|CHANGE|JOIN|RUN|QUERY|'
+             r'DEBUG|INFO|WARNING|ERROR|CRITICAL|'
+             r'NO_IDS|INT_MIN|INT_MAX)\b', Name.Constant),
+
             # regular expressions
             (r'(/[^/\\]*(?:\\.[^/\\]*)*/i?)', String.Regex),
 
-            # thing id's
-            (r'#[0-9]+', Comment.Preproc),
-
             # name, assignments and functions
             include('names'),
 
@@ -62,26 +65,47 @@ class ThingsDBLexer(RegexLexer):
         ],
         'names': [
             (r'(\.)'
-             r'(add|call|contains|del|endswith|extend|filter|find|findindex|'
-             r'get|has|id|indexof|keys|len|lower|map|pop|push|remove|set|sort|'
-             r'splice|startswith|test|unwrap|upper|values|wrap)'
+             r'(first|last|then|else|load|at|again_in|again_at|err|cancel|'
+             r'closure|set_closure|args|set_args|owner|set_owner|equals|copy|'
+             r'dup|assign|week|weekday|yday|zone|len|call|doc|emit|extract|'
+             r'choice|code|format|msg|each|every|extend|extend_unique|filter|'
+             r'find|flat|find_index|has|index_of|count|sum|is_unique|unique|'
+             r'join|map|map_id|map_wrap|map_type|vmap|move|pop|push|fill|'
+             r'remove|replace|restrict|restriction|shift|sort|splice|to|add|'
+             r'one|clear|contains|ends_with|name|lower|replace|reverse|'
+             r'starts_with|split|test|trim|trim_left|trim_right|upper|del|ren|'
+             r'to_type|to_thing|get|id|keys|reduce|set|some|value|values|wrap|'
+             r'unshift|unwrap|search)'
              r'(\()',
              bygroups(Name.Function, Name.Function, Punctuation), 'arguments'),
-            (r'(array|assert|assert_err|auth_err|backup_info|backups_info|'
-             r'bad_data_err|bool|closure|collection_info|collections_info|'
-             r'counters|deep|del_backup|del_collection|del_expired|del_node|'
-             r'del_procedure|del_token|del_type|del_user|err|float|'
-             r'forbidden_err|grant|int|isarray|isascii|isbool|isbytes|iserr|'
-             r'isfloat|isinf|isint|islist|isnan|isnil|israw|isset|isstr|'
-             r'isthing|istuple|isutf8|lookup_err|max_quota_err|mod_type|new|'
-             r'new_backup|new_collection|new_node|new_procedure|new_token|'
-             r'new_type|new_user|node_err|node_info|nodes_info|now|'
-             r'num_arguments_err|operation_err|overflow_err|procedure_doc|'
-             r'procedure_info|procedures_info|raise|refs|rename_collection|'
-             r'rename_user|reset_counters|return|revoke|run|set_log_level|set|'
-             r'set_quota|set_type|shutdown|str|syntax_err|thing|try|type|'
-             r'type_err|type_count|type_info|types_info|user_info|users_info|'
-             r'value_err|wse|zero_div_err)'
+            (r'(alt_raise|assert|base64_encode|base64_decode|bool|bytes|'
+             r'closure|datetime|deep|future|is_future|del_enum|del_type|room|'
+             r'is_room|task|tasks|is_task|is_email|is_url|is_tel|is_time_zone|'
+             r'timeit|enum|enum_info|enum_map|enums_info|err|regex|is_regex|'
+             r'change_id|float|has_enum|has_type|int|is_array|is_ascii|'
+             r'is_float|is_bool|is_bytes|is_closure|is_datetime|is_enum|'
+             r'is_err|is_mpdata|is_inf|is_int|is_list|is_nan|is_nil|is_raw|'
+             r'is_set|is_str|is_thing|is_timeval|is_tuple|is_utf8|json_dump|'
+             r'json_load|list|log|import|export|root|mod_enum|mod_type|new|'
+             r'new_type|now|raise|rand|range|randint|randstr|refs|rename_enum|'
+             r'set|set_enum|set_type|str|thing|timeval|try|type|type_assert|'
+             r'type_count|type_info|types_info|nse|wse|backup_info|'
+             r'backups_info|backups_ok|counters|del_backup|has_backup|'
+             r'new_backup|node_info|nodes_info|reset_counters|restart_module|'
+             r'set_log_level|shutdown|has_module|del_module|module_info|'
+             r'modules_info|new_module|deploy_module|rename_module|'
+             r'refresh_module|set_module_conf|set_module_scope|'
+             r'collections_info|del_collection|del_expired|del_node|del_token|'
+             r'del_user|grant|has_collection|has_node|has_token|has_user|'
+             r'new_collection|new_node|new_token|new_user|rename_collection|'
+             r'rename_user|restore|revoke|set_password|set_time_zone|'
+             r'set_default_deep|time_zones_info|user_info|users_info|'
+             r'del_procedure|has_procedure|new_procedure|mod_procedure|'
+             r'procedure_doc|procedure_info|procedures_info|rename_procedure|'
+             r'run|assert_err|auth_err|bad_data_err|cancelled_err|'
+             r'rename_type|forbidden_err|lookup_err|max_quota_err|node_err|'
+             r'num_arguments_err|operation_err|overflow_err|syntax_err|'
+             r'collection_info|type_err|value_err|zero_div_err)'
              r'(\()',
              bygroups(Name.Function, Punctuation),
              'arguments'),
@@ -90,7 +114,7 @@ class ThingsDBLexer(RegexLexer):
              bygroups(Name.Attribute, Text, Operator)),
             (r'\.[A-Za-z_][0-9A-Za-z_]*', Name.Attribute),
             (r'([A-Za-z_][0-9A-Za-z_]*)(\s*)(=)',
-            bygroups(Name.Variable, Text, Operator)),
+             bygroups(Name.Variable, Text, Operator)),
             (r'[A-Za-z_][0-9A-Za-z_]*', Name.Variable),
         ],
         'whitespace': [
diff --git a/libs/pygments/lexers/tlb.py b/libs/pygments/lexers/tlb.py
index ac629dc84..e652eac33 100644
--- a/libs/pygments/lexers/tlb.py
+++ b/libs/pygments/lexers/tlb.py
@@ -4,7 +4,7 @@
 
     Lexers for TL-b.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,6 +23,8 @@ class TlbLexer(RegexLexer):
     name = 'Tl-b'
     aliases = ['tlb']
     filenames = ['*.tlb']
+    url = 'https://docs.ton.org/#/overviews/TL-B'
+    version_added = ''
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/tls.py b/libs/pygments/lexers/tls.py
index 34f8d4f26..a3079a22a 100644
--- a/libs/pygments/lexers/tls.py
+++ b/libs/pygments/lexers/tls.py
@@ -4,7 +4,7 @@
 
     Lexers for the TLS presentation language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
@@ -19,14 +19,13 @@ __all__ = ['TlsLexer']
 class TlsLexer(RegexLexer):
     """
     The TLS presentation language, described in RFC 8446.
-
-    .. versionadded:: 2.16
     """
     name = 'TLS Presentation Language'
     url = 'https://www.rfc-editor.org/rfc/rfc8446#section-3'
     filenames = []
     aliases = ['tls']
     mimetypes = []
+    version_added = '2.16'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/tnt.py b/libs/pygments/lexers/tnt.py
index 2251373c5..1ae2ed84a 100644
--- a/libs/pygments/lexers/tnt.py
+++ b/libs/pygments/lexers/tnt.py
@@ -4,7 +4,7 @@
 
     Lexer for Typographic Number Theory.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,14 +21,13 @@ class TNTLexer(Lexer):
     """
     Lexer for Typographic Number Theory, as described in the book
     Gödel, Escher, Bach, by Douglas R. Hofstadter
-
-    .. versionadded:: 2.7
     """
 
     name = 'Typographic Number Theory'
     url = 'https://github.com/Kenny2github/language-tnt'
     aliases = ['tnt']
     filenames = ['*.tnt']
+    version_added = '2.7'
 
     cur = []
 
diff --git a/libs/pygments/lexers/trafficscript.py b/libs/pygments/lexers/trafficscript.py
index b48124be6..8c801c4cb 100644
--- a/libs/pygments/lexers/trafficscript.py
+++ b/libs/pygments/lexers/trafficscript.py
@@ -4,7 +4,7 @@
 
     Lexer for RiverBed's TrafficScript (RTS) language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,12 +17,12 @@ __all__ = ['RtsLexer']
 class RtsLexer(RegexLexer):
     """
     For Riverbed Stingray Traffic Manager
-
-    .. versionadded:: 2.1
     """
     name = 'TrafficScript'
     aliases = ['trafficscript', 'rts']
     filenames = ['*.rts']
+    url = 'https://riverbed.com'
+    version_added = '2.1'
 
     tokens = {
         'root' : [
diff --git a/libs/pygments/lexers/typoscript.py b/libs/pygments/lexers/typoscript.py
index dff6e5ed8..d71d5c355 100644
--- a/libs/pygments/lexers/typoscript.py
+++ b/libs/pygments/lexers/typoscript.py
@@ -13,7 +13,7 @@
     `TypoScriptHtmlDataLexer`
         Lexer that highlights markers, constants and registers within html tags.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -29,12 +29,12 @@ __all__ = ['TypoScriptLexer', 'TypoScriptCssDataLexer', 'TypoScriptHtmlDataLexer
 class TypoScriptCssDataLexer(RegexLexer):
     """
     Lexer that highlights markers, constants and registers within css blocks.
-
-    .. versionadded:: 2.2
     """
 
     name = 'TypoScriptCssData'
     aliases = ['typoscriptcssdata']
+    url = 'http://docs.typo3.org/typo3cms/TyposcriptReference/'
+    version_added = '2.2'
 
     tokens = {
         'root': [
@@ -64,12 +64,12 @@ class TypoScriptCssDataLexer(RegexLexer):
 class TypoScriptHtmlDataLexer(RegexLexer):
     """
     Lexer that highlights markers, constants and registers within html tags.
-
-    .. versionadded:: 2.2
     """
 
     name = 'TypoScriptHtmlData'
     aliases = ['typoscripthtmldata']
+    url = 'http://docs.typo3.org/typo3cms/TyposcriptReference/'
+    version_added = '2.2'
 
     tokens = {
         'root': [
@@ -99,8 +99,6 @@ class TypoScriptHtmlDataLexer(RegexLexer):
 class TypoScriptLexer(RegexLexer):
     """
     Lexer for TypoScript code.
-
-    .. versionadded:: 2.2
     """
 
     name = 'TypoScript'
@@ -108,6 +106,7 @@ class TypoScriptLexer(RegexLexer):
     aliases = ['typoscript']
     filenames = ['*.typoscript']
     mimetypes = ['text/x-typoscript']
+    version_added = '2.2'
 
     flags = re.DOTALL | re.MULTILINE
 
diff --git a/libs/pygments/lexers/typst.py b/libs/pygments/lexers/typst.py
new file mode 100644
index 000000000..21f8efd30
--- /dev/null
+++ b/libs/pygments/lexers/typst.py
@@ -0,0 +1,160 @@
+"""
+    pygments.lexers.typst
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Lexers for Typst language.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.lexer import RegexLexer, words, bygroups, include
+from pygments.token import Comment, Keyword, Name, String, Punctuation, \
+    Whitespace, Generic, Operator, Number, Text
+from pygments.util import get_choice_opt
+
+__all__ = ['TypstLexer']
+
+
+class TypstLexer(RegexLexer):
+    """
+    For Typst code.
+
+    Additional options accepted:
+
+    `start`
+        Specifies the starting state of the lexer (one of 'markup', 'math',
+        'code'). The default is 'markup'.
+    """
+
+    name = 'Typst'
+    aliases = ['typst']
+    filenames = ['*.typ']
+    mimetypes = ['text/x-typst']
+    url = 'https://typst.app'
+    version_added = '2.18'
+
+    MATH_SHORTHANDS = (
+        '[|', '|]', '||', '*', ':=', '::=', '...', '\'', '-', '=:', '!=', '>>',
+        '>=', '>>>', '<<', '<=', '<<<', '->', '|->', '=>', '|=>', '==>',
+        '-->', '~~>', '~>', '>->', '->>', '<-', '<==', '<--', '<~~', '<~',
+        '<-<','<<-','<->','<=>','<==>','<-->', '>', '<', '~', ':', '|'
+    )
+
+    tokens = {
+        'root': [
+            include('markup'),
+        ],
+        # common cases going from math/markup into code mode
+        'into_code': [
+            (words(('#let', '#set', '#show'), suffix=r'\b'), Keyword.Declaration, 'inline_code'),
+            (words(('#import', '#include'), suffix=r'\b'), Keyword.Namespace, 'inline_code'),
+            (words(('#if', '#for', '#while', '#export'), suffix=r'\b'), Keyword.Reserved, 'inline_code'),
+            (r'#\{', Punctuation, 'code'),
+            (r'#\(', Punctuation, 'code'),
+            (r'(#[a-zA-Z_][a-zA-Z0-9_-]*)(\[)', bygroups(Name.Function, Punctuation), 'markup'),
+            (r'(#[a-zA-Z_][a-zA-Z0-9_-]*)(\()', bygroups(Name.Function, Punctuation), 'code'),
+            (words(('#true', '#false', '#none', '#auto'), suffix=r'\b'), Keyword.Constant),
+            (r'#[a-zA-Z_][a-zA-Z0-9_]*', Name.Variable),
+            (r'#0x[0-9a-fA-F]+', Number.Hex),
+            (r'#0b[01]+', Number.Bin),
+            (r'#0o[0-7]+', Number.Oct),
+            (r'#[0-9]+[\.e][0-9]+', Number.Float),
+            (r'#[0-9]+', Number.Integer),
+        ],
+        'markup': [
+            include('comment'),
+            (r'^\s*=+.*$', Generic.Heading),
+            (r'[*][^*]*[*]', Generic.Strong),
+            (r'_[^_]*_', Generic.Emph),
+            (r'\$', Punctuation, 'math'),
+            (r'`[^`]*`', String.Backtick),  # inline code
+            (r'^(\s*)(-)(\s+)', bygroups(Whitespace, Punctuation, Whitespace)),  # unnumbered list
+            (r'^(\s*)(\+)(\s+)', bygroups(Whitespace, Punctuation, Whitespace)),  # numbered list
+            (r'^(\s*)([0-9]+\.)', bygroups(Whitespace, Punctuation)),  # numbered list variant
+            (r'^(\s*)(/)(\s+)([^:]+)(:)', bygroups(Whitespace, Punctuation, Whitespace, Name.Variable, Punctuation)),  # definitions
+            (r'<[a-zA-Z_][a-zA-Z0-9_-]*>', Name.Label),  # label
+            (r'@[a-zA-Z_][a-zA-Z0-9_-]*', Name.Label),  # reference
+            (r'\\#', Text), # escaped
+            include('into_code'),
+            (r'```(?:.|\n)*?```', String.Backtick),  # code block
+            (r'https?://[0-9a-zA-Z~/%#&=\',;.+?]*', Generic.Emph),  # links
+            (words(('---', '\\', '~', '--', '...'), suffix=r'\B'), Punctuation),  # special chars shorthand
+            (r'\\\[', Punctuation),  # escaped
+            (r'\\\]', Punctuation),  # escaped
+            (r'\[', Punctuation, '#push'),
+            (r'\]', Punctuation, '#pop'),
+            (r'[ \t]+\n?|\n', Whitespace),
+            (r'((?![*_$`<@\\#\] ]|https?://).)+', Text),
+        ],
+        'math': [
+            include('comment'),
+            (words(('\\_', '\\^', '\\&')), Text), # escapes
+            (words(('_', '^', '&', ';')), Punctuation),
+            (words(('+', '/', '=') + MATH_SHORTHANDS), Operator),
+            (r'\\', Punctuation), # line break
+            (r'\\\$', Punctuation),  # escaped
+            (r'\$', Punctuation, '#pop'),  # end of math mode
+            include('into_code'),
+            (r'([a-zA-Z][a-zA-Z0-9-]*)(\s*)(\()', bygroups(Name.Function, Whitespace, Punctuation)),
+            (r'([a-zA-Z][a-zA-Z0-9-]*)(:)', bygroups(Name.Variable, Punctuation)), # named arguments in math functions
+            (r'([a-zA-Z][a-zA-Z0-9-]*)', Name.Variable), # both variables and symbols (_ isn't supported for variables)
+            (r'[0-9]+(\.[0-9]+)?', Number),
+            (r'\.{1,3}|\(|\)|,|\{|\}', Punctuation),
+            (r'"[^"]*"', String.Double),
+            (r'[ \t\n]+', Whitespace),
+        ],
+        'comment': [
+            (r'//.*$', Comment.Single),
+            (r'/[*](.|\n)*?[*]/', Comment.Multiline),
+        ],
+        'code': [
+            include('comment'),
+            (r'\[', Punctuation, 'markup'),
+            (r'\(|\{', Punctuation, 'code'),
+            (r'\)|\}', Punctuation, '#pop'),
+            (r'"[^"]*"', String.Double),
+            (r',|\.{1,2}', Punctuation),
+            (r'=', Operator),
+            (words(('and', 'or', 'not'), suffix=r'\b'), Operator.Word),
+            (r'=>|<=|==|!=|>|<|-=|\+=|\*=|/=|\+|-|\\|\*', Operator), # comparisons
+            (r'([a-zA-Z_][a-zA-Z0-9_-]*)(:)', bygroups(Name.Variable, Punctuation)),
+            (r'([a-zA-Z_][a-zA-Z0-9_-]*)(\()', bygroups(Name.Function, Punctuation), 'code'),
+            (words(('as', 'break', 'export', 'continue', 'else', 'for', 'if',
+                    'in', 'return', 'while'), suffix=r'\b'),
+             Keyword.Reserved),
+             (words(('import', 'include'), suffix=r'\b'), Keyword.Namespace),
+            (words(('auto', 'none', 'true', 'false'), suffix=r'\b'), Keyword.Constant),
+            (r'([0-9.]+)(mm|pt|cm|in|em|fr|%)', bygroups(Number, Keyword.Reserved)),
+            (r'0x[0-9a-fA-F]+', Number.Hex),
+            (r'0b[01]+', Number.Bin),
+            (r'0o[0-7]+', Number.Oct),
+            (r'[0-9]+[\.e][0-9]+', Number.Float),
+            (r'[0-9]+', Number.Integer),
+            (words(('let', 'set', 'show'), suffix=r'\b'), Keyword.Declaration),
+            # FIXME: make this work
+            ## (r'(import|include)( *)(")([^"])(")',
+            ##  bygroups(Keyword.Reserved, Text, Punctuation, String.Double, Punctuation)),
+            (r'([a-zA-Z_][a-zA-Z0-9_-]*)', Name.Variable),
+            (r'[ \t\n]+', Whitespace),
+            (r':', Punctuation), # from imports like "import a: b" or "show: text.with(..)"
+        ],
+        'inline_code': [
+            (r';\b', Punctuation, '#pop'),
+            (r'\n', Whitespace, '#pop'),
+            include('code'),
+        ],
+    }
+
+    def __init__(self, **options):
+        self.start_state = get_choice_opt(
+            options, 'start', ['markup', 'code', 'math'], 'markup', True)
+
+        RegexLexer.__init__(self, **options)
+
+    def get_tokens_unprocessed(self, text):
+        stack = ['root']
+        if self.start_state != 'markup': # markup is equivalent to root
+            stack.append(self.start_state)
+
+        yield from RegexLexer.get_tokens_unprocessed(self, text, stack)
diff --git a/libs/pygments/lexers/ul4.py b/libs/pygments/lexers/ul4.py
index a40c20f67..552832cae 100644
--- a/libs/pygments/lexers/ul4.py
+++ b/libs/pygments/lexers/ul4.py
@@ -4,9 +4,7 @@
 
     Lexer for the UL4 templating language.
 
-    More information: https://python.livinglogic.de/UL4.html
-
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -25,8 +23,6 @@ __all__ = ['UL4Lexer', 'HTMLUL4Lexer', 'XMLUL4Lexer', 'CSSUL4Lexer',
 class UL4Lexer(RegexLexer):
     """
     Generic lexer for UL4.
-
-    .. versionadded:: 2.12
     """
 
     flags = re.MULTILINE | re.DOTALL
@@ -34,6 +30,8 @@ class UL4Lexer(RegexLexer):
     name = 'UL4'
     aliases = ['ul4']
     filenames = ['*.ul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = '2.12'
 
     tokens = {
         "root": [
@@ -52,12 +50,26 @@ class UL4Lexer(RegexLexer):
                          Text.Whitespace, Name.Function),
                 "ul4", # Switch to "expression" mode
             ),
+            (
+                # Comment:
+                # ``<?note?>...<?end note?>``
+                r"<\?\s*note\s*\?>",
+                Comment,
+                "note", # Switch to "note" mode
+            ),
             (
                 # Comment:
                 # ``<?note foobar?>``
                 r"<\?\s*note\s.*?\?>",
                 Comment,
             ),
+            (
+                # Template documentation:
+                # ``<?doc?>...<?end doc?>``
+                r"<\?\s*doc\s*\?>",
+                String.Doc,
+                "doc",
+            ),
             (
                 # Template documentation:
                 # ``<?doc foobar?>``
@@ -113,6 +125,26 @@ class UL4Lexer(RegexLexer):
             (r"[^<]+", Comment),
             (r".", Comment),
         ],
+        # Note mode ignores everything upto the matching ``<?end note?>`` tag
+        "note": [
+            # Nested ``<?note?>`` tag
+            (r"<\?\s*note\s*\?>", Comment, "#push"),
+            # ``<?end note?>`` tag
+            (r"<\?\s*end\s+note\s*\?>", Comment, "#pop"),
+            # Everything else
+            (r"[^<]+", Comment),
+            (r".", Comment),
+        ],
+        # Doc mode ignores everything upto the matching ``<?end doc?>`` tag
+        "doc": [
+            # Nested ``<?doc?>`` tag
+            (r"<\?\s*doc\s*\?>", String.Doc, "#push"),
+            # ``<?end doc?>`` tag
+            (r"<\?\s*end\s+doc\s*\?>", String.Doc, "#pop"),
+            # Everything else
+            (r"[^<]+", String.Doc),
+            (r".", String.Doc),
+        ],
         # UL4 expressions
         "ul4": [
             # End the tag
@@ -210,6 +242,8 @@ class HTMLUL4Lexer(DelegatingLexer):
     name = 'HTML+UL4'
     aliases = ['html+ul4']
     filenames = ['*.htmlul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(HtmlLexer, UL4Lexer, **options)
@@ -223,6 +257,8 @@ class XMLUL4Lexer(DelegatingLexer):
     name = 'XML+UL4'
     aliases = ['xml+ul4']
     filenames = ['*.xmlul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(XmlLexer, UL4Lexer, **options)
@@ -236,6 +272,8 @@ class CSSUL4Lexer(DelegatingLexer):
     name = 'CSS+UL4'
     aliases = ['css+ul4']
     filenames = ['*.cssul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(CssLexer, UL4Lexer, **options)
@@ -249,6 +287,8 @@ class JavascriptUL4Lexer(DelegatingLexer):
     name = 'Javascript+UL4'
     aliases = ['js+ul4']
     filenames = ['*.jsul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(JavascriptLexer, UL4Lexer, **options)
@@ -262,6 +302,8 @@ class PythonUL4Lexer(DelegatingLexer):
     name = 'Python+UL4'
     aliases = ['py+ul4']
     filenames = ['*.pyul4']
+    url = 'https://python.livinglogic.de/UL4.html'
+    version_added = ''
 
     def __init__(self, **options):
         super().__init__(PythonLexer, UL4Lexer, **options)
diff --git a/libs/pygments/lexers/unicon.py b/libs/pygments/lexers/unicon.py
index 9cd6790a4..1077661a3 100644
--- a/libs/pygments/lexers/unicon.py
+++ b/libs/pygments/lexers/unicon.py
@@ -4,7 +4,7 @@
 
     Lexers for the Icon and Unicon languages, including ucode VM.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,14 @@ __all__ = ['IconLexer', 'UcodeLexer', 'UniconLexer']
 class UniconLexer(RegexLexer):
     """
     For Unicon source code.
-
-    .. versionadded:: 2.4
     """
 
     name = 'Unicon'
     aliases = ['unicon']
     filenames = ['*.icn']
     mimetypes = ['text/unicon']
+    url = 'https://www.unicon.org'
+    version_added = '2.4'
 
     flags = re.MULTILINE
 
@@ -166,13 +166,14 @@ class UniconLexer(RegexLexer):
 class IconLexer(RegexLexer):
     """
     Lexer for Icon.
-
-    .. versionadded:: 1.6
     """
     name = 'Icon'
     aliases = ['icon']
     filenames = ['*.icon', '*.ICON']
     mimetypes = []
+    url = 'https://www2.cs.arizona.edu/icon'
+    version_added = '1.6'
+
     flags = re.MULTILINE
 
     tokens = {
@@ -306,13 +307,14 @@ class IconLexer(RegexLexer):
 class UcodeLexer(RegexLexer):
     """
     Lexer for Icon ucode files.
-
-    .. versionadded:: 2.4
     """
     name = 'ucode'
     aliases = ['ucode']
     filenames = ['*.u', '*.u1', '*.u2']
     mimetypes = []
+    url = 'http://www.unicon.org'
+    version_added = '2.4'
+
     flags = re.MULTILINE
 
     tokens = {
diff --git a/libs/pygments/lexers/urbi.py b/libs/pygments/lexers/urbi.py
index 3857ff20d..93cfcedc1 100644
--- a/libs/pygments/lexers/urbi.py
+++ b/libs/pygments/lexers/urbi.py
@@ -4,7 +4,7 @@
 
     Lexers for UrbiScript language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -20,14 +20,14 @@ __all__ = ['UrbiscriptLexer']
 class UrbiscriptLexer(ExtendedRegexLexer):
     """
     For UrbiScript source code.
-
-    .. versionadded:: 1.5
     """
 
     name = 'UrbiScript'
     aliases = ['urbiscript']
     filenames = ['*.u']
     mimetypes = ['application/x-urbiscript']
+    url = 'https://github.com/urbiforge/urbi'
+    version_added = '1.5'
 
     flags = re.DOTALL
 
diff --git a/libs/pygments/lexers/usd.py b/libs/pygments/lexers/usd.py
index 79a2ad943..468a37369 100644
--- a/libs/pygments/lexers/usd.py
+++ b/libs/pygments/lexers/usd.py
@@ -4,7 +4,7 @@
 
     The module that parses Pixar's Universal Scene Description file format.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -30,34 +30,29 @@ _WHITESPACE = r"([ \t]+)"
 class UsdLexer(RegexLexer):
     """
     A lexer that parses Pixar's Universal Scene Description file format.
-
-    .. versionadded:: 2.6
     """
 
     name = "USD"
     url = 'https://graphics.pixar.com/usd/release/index.html'
     aliases = ["usd", "usda"]
     filenames = ["*.usd", "*.usda"]
+    version_added = '2.6'
 
     tokens = {
         "root": [
-            (r"(custom){_WHITESPACE}(uniform)(\s+){}(\s+){}(\s*)(=)".format(
-                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+            (rf"(custom){_WHITESPACE}(uniform)(\s+){_TYPE}(\s+){_BASE_ATTRIBUTE}(\s*)(=)",
              bygroups(Keyword.Token, Whitespace, Keyword.Token, Whitespace,
                       Keyword.Type, Whitespace, Name.Attribute, Text,
                       Name.Keyword.Tokens, Whitespace, Operator)),
-            (r"(custom){_WHITESPACE}{}(\s+){}(\s*)(=)".format(
-                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+            (rf"(custom){_WHITESPACE}{_TYPE}(\s+){_BASE_ATTRIBUTE}(\s*)(=)",
              bygroups(Keyword.Token, Whitespace, Keyword.Type, Whitespace,
                       Name.Attribute, Text, Name.Keyword.Tokens, Whitespace,
                       Operator)),
-            (r"(uniform){_WHITESPACE}{}(\s+){}(\s*)(=)".format(
-                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+            (rf"(uniform){_WHITESPACE}{_TYPE}(\s+){_BASE_ATTRIBUTE}(\s*)(=)",
              bygroups(Keyword.Token, Whitespace, Keyword.Type, Whitespace,
                       Name.Attribute, Text, Name.Keyword.Tokens, Whitespace,
                       Operator)),
-            (r"{}{_WHITESPACE}{}(\s*)(=)".format(
-                _TYPE, _BASE_ATTRIBUTE, _WHITESPACE=_WHITESPACE),
+            (rf"{_TYPE}{_WHITESPACE}{_BASE_ATTRIBUTE}(\s*)(=)",
              bygroups(Keyword.Type, Whitespace, Name.Attribute, Text,
                       Name.Keyword.Tokens, Whitespace, Operator)),
         ] +
diff --git a/libs/pygments/lexers/varnish.py b/libs/pygments/lexers/varnish.py
index 3c22792a8..5c3de7994 100644
--- a/libs/pygments/lexers/varnish.py
+++ b/libs/pygments/lexers/varnish.py
@@ -4,7 +4,7 @@
 
     Lexers for Varnish configuration
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,13 +19,13 @@ __all__ = ['VCLLexer', 'VCLSnippetLexer']
 class VCLLexer(RegexLexer):
     """
     For Varnish Configuration Language (VCL).
-
-    .. versionadded:: 2.2
     """
     name = 'VCL'
     aliases = ['vcl']
     filenames = ['*.vcl']
     mimetypes = ['text/x-vclsrc']
+    url = 'https://www.varnish-software.com/developers/tutorials/varnish-configuration-language-vcl'
+    version_added = '2.2'
 
     def analyse_text(text):
         # If the very first line is 'vcl 4.0;' it's pretty much guaranteed
@@ -160,13 +160,13 @@ class VCLLexer(RegexLexer):
 class VCLSnippetLexer(VCLLexer):
     """
     For Varnish Configuration Language snippets.
-
-    .. versionadded:: 2.2
     """
     name = 'VCLSnippets'
     aliases = ['vclsnippets', 'vclsnippet']
     mimetypes = ['text/x-vclsnippet']
     filenames = []
+    url = 'https://www.varnish-software.com/developers/tutorials/varnish-configuration-language-vcl'
+    version_added = '2.2'
 
     def analyse_text(text):
         # override method inherited from VCLLexer
diff --git a/libs/pygments/lexers/verification.py b/libs/pygments/lexers/verification.py
index 41d45d406..ac0675797 100644
--- a/libs/pygments/lexers/verification.py
+++ b/libs/pygments/lexers/verification.py
@@ -4,7 +4,7 @@
 
     Lexer for Intermediate Verification Languages (IVLs).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,13 +18,12 @@ __all__ = ['BoogieLexer', 'SilverLexer']
 class BoogieLexer(RegexLexer):
     """
     For Boogie source code.
-
-    .. versionadded:: 2.1
     """
     name = 'Boogie'
     url = 'https://boogie-docs.readthedocs.io/en/latest/'
     aliases = ['boogie']
     filenames = ['*.bpl']
+    version_added = '2.1'
 
     tokens = {
         'root': [
@@ -66,12 +65,12 @@ class BoogieLexer(RegexLexer):
 class SilverLexer(RegexLexer):
     """
     For Silver source code.
-
-    .. versionadded:: 2.2
     """
     name = 'Silver'
     aliases = ['silver']
     filenames = ['*.sil', '*.vpr']
+    url = 'https://github.com/viperproject/silver'
+    version_added = '2.2'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/verifpal.py b/libs/pygments/lexers/verifpal.py
index 6953dd7b7..e226339dc 100644
--- a/libs/pygments/lexers/verifpal.py
+++ b/libs/pygments/lexers/verifpal.py
@@ -4,7 +4,7 @@
 
     Lexers for Verifpal languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['VerifpalLexer']
 class VerifpalLexer(RegexLexer):
     """
     For Verifpal code.
-
-    .. versionadded:: 2.16
     """
 
     name = 'Verifpal'
@@ -27,6 +25,7 @@ class VerifpalLexer(RegexLexer):
     filenames = ['*.vp']
     mimetypes = ['text/x-verifpal']
     url = 'https://verifpal.com'
+    version_added = '2.16'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/vip.py b/libs/pygments/lexers/vip.py
index 1b25d5cab..22395e1e9 100644
--- a/libs/pygments/lexers/vip.py
+++ b/libs/pygments/lexers/vip.py
@@ -4,7 +4,7 @@
 
     Lexers for Visual Prolog & Grammar files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -85,13 +85,12 @@ class VisualPrologBaseLexer(RegexLexer):
 
 class VisualPrologLexer(VisualPrologBaseLexer):
     """Lexer for VisualProlog
-
-    .. versionadded:: 2.17
     """
     name = 'Visual Prolog'
     url = 'https://www.visual-prolog.com/'
     aliases = ['visualprolog']
     filenames = ['*.pro', '*.cl', '*.i', '*.pack', '*.ph']
+    version_added = '2.17'
 
     majorkw = ('goal', 'namespace', 'interface', 'class', 'implement', 'where', 'open', 'inherits', 'supports', 'resolve',
                'delegate', 'monitor', 'constants', 'domains', 'predicates', 'constructors', 'properties', 'clauses', 'facts')
@@ -121,14 +120,13 @@ class VisualPrologLexer(VisualPrologBaseLexer):
 
 class VisualPrologGrammarLexer(VisualPrologBaseLexer):
     """Lexer for VisualProlog grammar
-
-    .. versionadded:: 2.17
     """
 
     name = 'Visual Prolog Grammar'
     url = 'https://www.visual-prolog.com/'
     aliases = ['visualprologgrammar']
     filenames = ['*.vipgrm']
+    version_added = '2.17'
 
     majorkw = ('open', 'namespace', 'grammar', 'nonterminals',
                'startsymbols', 'terminals', 'rules', 'precedence')
diff --git a/libs/pygments/lexers/vyper.py b/libs/pygments/lexers/vyper.py
index ff9d0b044..002ffeddc 100644
--- a/libs/pygments/lexers/vyper.py
+++ b/libs/pygments/lexers/vyper.py
@@ -4,7 +4,7 @@
 
     Lexer for the Vyper Smart Contract language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,13 +17,12 @@ __all__ = ['VyperLexer']
 
 class VyperLexer(RegexLexer):
     """For the Vyper smart contract language.
-    
-    .. versionadded:: 2.17
     """
     name = 'Vyper'
     aliases = ['vyper']
     filenames = ['*.vy']
     url = "https://vyper.readthedocs.io"
+    version_added = '2.17'
 
     tokens = {
         'root': [
@@ -62,7 +61,7 @@ class VyperLexer(RegexLexer):
             # Keywords
             (words(('def', 'event', 'pass', 'return', 'for', 'while', 'if', 'elif',
                     'else', 'assert', 'raise', 'import', 'in', 'struct', 'implements',
-                    'interface', 'from', 'indexed', 'log'),
+                    'interface', 'from', 'indexed', 'log', 'extcall', 'staticcall'),
                    prefix=r'\b', suffix=r'\b'), Keyword),
 
             # Visibility and State Mutability
diff --git a/libs/pygments/lexers/web.py b/libs/pygments/lexers/web.py
index 9e5265316..3d359662d 100644
--- a/libs/pygments/lexers/web.py
+++ b/libs/pygments/lexers/web.py
@@ -4,10 +4,11 @@
 
     Just export previously exported lexers.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+# ruff: noqa: F401
 from pygments.lexers.html import HtmlLexer, DtdLexer, XmlLexer, XsltLexer, \
     HamlLexer, ScamlLexer, JadeLexer
 from pygments.lexers.css import CssLexer, SassLexer, ScssLexer
diff --git a/libs/pygments/lexers/webassembly.py b/libs/pygments/lexers/webassembly.py
index f674eadc5..78cd4ca31 100644
--- a/libs/pygments/lexers/webassembly.py
+++ b/libs/pygments/lexers/webassembly.py
@@ -8,7 +8,7 @@
     and https://webassembly.github.io/spec/core/text/.
 
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -63,14 +63,13 @@ builtins = (
 
 class WatLexer(RegexLexer):
     """Lexer for the WebAssembly text format.
-
-    .. versionadded:: 2.9
     """
 
     name = 'WebAssembly'
     url = 'https://webassembly.org/'
     aliases = ['wast', 'wat']
     filenames = ['*.wat', '*.wast']
+    version_added = '2.9'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/webidl.py b/libs/pygments/lexers/webidl.py
index 5fcbe69c0..3bbd12efd 100644
--- a/libs/pygments/lexers/webidl.py
+++ b/libs/pygments/lexers/webidl.py
@@ -4,7 +4,7 @@
 
     Lexers for Web IDL, including some extensions.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -39,14 +39,13 @@ _string = r'"[^"]*"'
 class WebIDLLexer(RegexLexer):
     """
     For Web IDL.
-
-    .. versionadded:: 2.6
     """
 
     name = 'Web IDL'
     url = 'https://www.w3.org/wiki/Web_IDL'
     aliases = ['webidl']
     filenames = ['*.webidl']
+    version_added = '2.6'
 
     tokens = {
         'common': [
diff --git a/libs/pygments/lexers/webmisc.py b/libs/pygments/lexers/webmisc.py
index 787a8a6ec..347592d91 100644
--- a/libs/pygments/lexers/webmisc.py
+++ b/libs/pygments/lexers/webmisc.py
@@ -4,7 +4,7 @@
 
     Lexers for misc. web stuff.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,8 +26,6 @@ __all__ = ['DuelLexer', 'SlimLexer', 'XQueryLexer', 'QmlLexer', 'CirruLexer']
 class DuelLexer(RegexLexer):
     """
     Lexer for Duel Views Engine (formerly JBST) markup with JavaScript code blocks.
-
-    .. versionadded:: 1.4
     """
 
     name = 'Duel'
@@ -35,6 +33,7 @@ class DuelLexer(RegexLexer):
     aliases = ['duel', 'jbst', 'jsonml+bst']
     filenames = ['*.duel', '*.jbst']
     mimetypes = ['text/x-duel', 'text/x-jbst']
+    version_added = '1.4'
 
     flags = re.DOTALL
 
@@ -59,14 +58,13 @@ class XQueryLexer(ExtendedRegexLexer):
     """
     An XQuery lexer, parsing a stream and outputting the tokens needed to
     highlight xquery code.
-
-    .. versionadded:: 1.4
     """
     name = 'XQuery'
     url = 'https://www.w3.org/XML/Query/'
     aliases = ['xquery', 'xqy', 'xq', 'xql', 'xqm']
     filenames = ['*.xqy', '*.xquery', '*.xq', '*.xql', '*.xqm']
     mimetypes = ['text/xquery', 'application/xquery']
+    version_added = '1.4'
 
     xquery_parse_state = []
 
@@ -82,13 +80,13 @@ class XQueryLexer(ExtendedRegexLexer):
     # ncnamechar = ncnamestartchar + (r"|-|\.|[0-9]|\u00B7|[\u0300-\u036F]|"
     #                                 r"[\u203F-\u2040]")
     ncnamechar = r"(?:" + ncnamestartchar + r"|-|\.|[0-9])"
-    ncname = "(?:%s+%s*)" % (ncnamestartchar, ncnamechar)
+    ncname = f"(?:{ncnamestartchar}+{ncnamechar}*)"
     pitarget_namestartchar = r"(?:[A-KN-WYZ]|_|:|[a-kn-wyz])"
     pitarget_namechar = r"(?:" + pitarget_namestartchar + r"|-|\.|[0-9])"
-    pitarget = "%s+%s*" % (pitarget_namestartchar, pitarget_namechar)
-    prefixedname = "%s:%s" % (ncname, ncname)
+    pitarget = f"{pitarget_namestartchar}+{pitarget_namechar}*"
+    prefixedname = f"{ncname}:{ncname}"
     unprefixedname = ncname
-    qname = "(?:%s|%s)" % (prefixedname, unprefixedname)
+    qname = f"(?:{prefixedname}|{unprefixedname})"
 
     entityref = r'(?:&(?:lt|gt|amp|quot|apos|nbsp);)'
     charref = r'(?:&#[0-9]+;|&#x[0-9a-fA-F]+;)'
@@ -813,8 +811,6 @@ class XQueryLexer(ExtendedRegexLexer):
 class QmlLexer(RegexLexer):
     """
     For QML files.
-
-    .. versionadded:: 1.6
     """
 
     # QML is based on javascript, so much of this is taken from the
@@ -825,6 +821,7 @@ class QmlLexer(RegexLexer):
     aliases = ['qml', 'qbs']
     filenames = ['*.qml', '*.qbs']
     mimetypes = ['application/x-qml', 'application/x-qt.qbs+qml']
+    version_added = '1.6'
 
     # pasted from JavascriptLexer, with some additions
     flags = re.DOTALL | re.MULTILINE
@@ -891,8 +888,6 @@ class CirruLexer(RegexLexer):
     * using ``$`` as folding operator
     * using ``,`` as unfolding operator
     * using indentations for nested blocks
-
-    .. versionadded:: 2.0
     """
 
     name = 'Cirru'
@@ -900,6 +895,7 @@ class CirruLexer(RegexLexer):
     aliases = ['cirru']
     filenames = ['*.cirru']
     mimetypes = ['text/x-cirru']
+    version_added = '2.0'
     flags = re.MULTILINE
 
     tokens = {
@@ -940,14 +936,14 @@ class CirruLexer(RegexLexer):
 class SlimLexer(ExtendedRegexLexer):
     """
     For Slim markup.
-
-    .. versionadded:: 2.0
     """
 
     name = 'Slim'
     aliases = ['slim']
     filenames = ['*.slim']
     mimetypes = ['text/x-slim']
+    url = 'https://slim-template.github.io'
+    version_added = '2.0'
 
     flags = re.IGNORECASE
     _dot = r'(?: \|\n(?=.* \|)|.)'
diff --git a/libs/pygments/lexers/wgsl.py b/libs/pygments/lexers/wgsl.py
index f23342155..8fe950d9f 100644
--- a/libs/pygments/lexers/wgsl.py
+++ b/libs/pygments/lexers/wgsl.py
@@ -4,11 +4,11 @@
 
     Lexer for the WebGPU Shading Language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-from pygments.lexer import RegexLexer, include, bygroups, words, default
+from pygments.lexer import RegexLexer, include, words, default
 from pygments.token import Comment, Operator, Keyword, Name, \
     Number, Punctuation, Whitespace
 from pygments import unistring as uni
@@ -27,20 +27,19 @@ NotLineEndRE = '[^' + "".join(LineEndCodePoints) + ']'
 LineEndRE = '[' + "".join(LineEndCodePoints) + ']'
 
 # https://www.w3.org/TR/WGSL/#syntax-ident_pattern_token
-ident_pattern_token = '([{}][{}]+)|[{}]'.format(uni.xid_start,uni.xid_continue,uni.xid_start)
+ident_pattern_token = f'([{uni.xid_start}][{uni.xid_continue}]+)|[{uni.xid_start}]'
 
 
 class WgslLexer(RegexLexer):
     """
     Lexer for the WebGPU Shading Language.
-
-    .. versionadded:: 2.15
     """
     name = 'WebGPU Shading Language'
     url = 'https://www.w3.org/TR/WGSL/'
     aliases = ['wgsl']
     filenames = ['*.wgsl']
     mimetypes = ['text/wgsl']
+    version_added = '2.15'
 
     # https://www.w3.org/TR/WGSL/#var-and-value
     keyword_decl = (words('var let const override'.split(),suffix=r'\b'), Keyword.Declaration)
@@ -323,8 +322,8 @@ class WgslLexer(RegexLexer):
         'comments': [
             # Line ending comments
             # Match up CR/LF pair first.
-            (r'//{}*{}{}'.format(NotLineEndRE,CR,LF), Comment.Single),
-            (r'//{}*{}'.format(NotLineEndRE,LineEndRE), Comment.Single),
+            (rf'//{NotLineEndRE}*{CR}{LF}', Comment.Single),
+            (rf'//{NotLineEndRE}*{LineEndRE}', Comment.Single),
             (r'/\*', Comment.Multiline, 'block_comment'),
         ],
         'attribute': [
diff --git a/libs/pygments/lexers/whiley.py b/libs/pygments/lexers/whiley.py
index bf707d25c..ea98eb2d7 100644
--- a/libs/pygments/lexers/whiley.py
+++ b/libs/pygments/lexers/whiley.py
@@ -4,7 +4,7 @@
 
     Lexers for the Whiley language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,14 +18,13 @@ __all__ = ['WhileyLexer']
 class WhileyLexer(RegexLexer):
     """
     Lexer for the Whiley programming language.
-
-    .. versionadded:: 2.2
     """
     name = 'Whiley'
     url = 'http://whiley.org/'
     filenames = ['*.whiley']
     aliases = ['whiley']
     mimetypes = ['text/x-whiley']
+    version_added = '2.2'
 
     # See the language specification:
     # http://whiley.org/download/WhileyLanguageSpec.pdf
diff --git a/libs/pygments/lexers/wowtoc.py b/libs/pygments/lexers/wowtoc.py
index 6b96e65bd..2b18757d7 100644
--- a/libs/pygments/lexers/wowtoc.py
+++ b/libs/pygments/lexers/wowtoc.py
@@ -6,7 +6,7 @@
 
     TOC files describe game addons.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -46,13 +46,13 @@ def _create_tag_line_token(inner_pattern, inner_token, ignore_case=False):
 class WoWTocLexer(RegexLexer):
     """
     Lexer for World of Warcraft TOC files.
-
-    .. versionadded:: 2.14
     """
 
     name = "World of Warcraft TOC"
     aliases = ["wowtoc"]
     filenames = ["*.toc"]
+    url = 'https://wowpedia.fandom.com/wiki/TOC_format'
+    version_added = '2.14'
 
     tokens = {
         "root": [
diff --git a/libs/pygments/lexers/wren.py b/libs/pygments/lexers/wren.py
index ed4ddc7ad..ec2cd54c9 100644
--- a/libs/pygments/lexers/wren.py
+++ b/libs/pygments/lexers/wren.py
@@ -4,7 +4,7 @@
 
     Lexer for Wren.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -12,20 +12,19 @@ import re
 
 from pygments.lexer import include, RegexLexer, words
 from pygments.token import Whitespace, Punctuation, Keyword, Name, Comment, \
-    Operator, Number, String, Error
+    Operator, Number, String
 
 __all__ = ['WrenLexer']
 
 class WrenLexer(RegexLexer):
     """
     For Wren source code, version 0.4.0.
-
-    .. versionadded:: 2.14.0
     """
     name = 'Wren'
     url = 'https://wren.io'
     aliases = ['wren']
     filenames = ['*.wren']
+    version_added = '2.14'
 
     flags = re.MULTILINE | re.DOTALL
 
diff --git a/libs/pygments/lexers/x10.py b/libs/pygments/lexers/x10.py
index c125b530d..4b5d097c5 100644
--- a/libs/pygments/lexers/x10.py
+++ b/libs/pygments/lexers/x10.py
@@ -4,7 +4,7 @@
 
     Lexers for the X10 programming language.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,8 +17,6 @@ __all__ = ['X10Lexer']
 class X10Lexer(RegexLexer):
     """
     For the X10 language.
-
-    .. versionadded:: 2.2
     """
 
     name = 'X10'
@@ -26,6 +24,7 @@ class X10Lexer(RegexLexer):
     aliases = ['x10', 'xten']
     filenames = ['*.x10']
     mimetypes = ['text/x-x10']
+    version_added = '2.2'
 
     keywords = (
         'as', 'assert', 'async', 'at', 'athome', 'ateach', 'atomic',
@@ -56,10 +55,10 @@ class X10Lexer(RegexLexer):
             (r'[^\S\n]+', Text),
             (r'//.*?\n', Comment.Single),
             (r'/\*(.|\n)*?\*/', Comment.Multiline),
-            (r'\b(%s)\b' % '|'.join(keywords), Keyword),
-            (r'\b(%s)\b' % '|'.join(types), Keyword.Type),
-            (r'\b(%s)\b' % '|'.join(values), Keyword.Constant),
-            (r'\b(%s)\b' % '|'.join(modifiers), Keyword.Declaration),
+            (r'\b({})\b'.format('|'.join(keywords)), Keyword),
+            (r'\b({})\b'.format('|'.join(types)), Keyword.Type),
+            (r'\b({})\b'.format('|'.join(values)), Keyword.Constant),
+            (r'\b({})\b'.format('|'.join(modifiers)), Keyword.Declaration),
             (r'"(\\\\|\\[^\\]|[^"\\])*"', String),
             (r"'\\.'|'[^\\]'|'\\u[0-9a-fA-F]{4}'", String.Char),
             (r'.', Text)
diff --git a/libs/pygments/lexers/xorg.py b/libs/pygments/lexers/xorg.py
index 67878c3f6..37251e490 100644
--- a/libs/pygments/lexers/xorg.py
+++ b/libs/pygments/lexers/xorg.py
@@ -4,7 +4,7 @@
 
     Lexers for Xorg configs.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -21,6 +21,7 @@ class XorgLexer(RegexLexer):
     aliases = ['xorg.conf']
     filenames = ['xorg.conf']
     mimetypes = []
+    version_added = ''
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/yang.py b/libs/pygments/lexers/yang.py
index 866c01d27..e7f395125 100644
--- a/libs/pygments/lexers/yang.py
+++ b/libs/pygments/lexers/yang.py
@@ -4,7 +4,7 @@
 
     Lexer for the YANG 1.1 modeling language. See :rfc:`7950`.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -17,14 +17,13 @@ __all__ = ['YangLexer']
 class YangLexer(RegexLexer):
     """
     Lexer for YANG, based on RFC7950.
-
-    .. versionadded:: 2.7
     """
     name = 'YANG'
     url = 'https://tools.ietf.org/html/rfc7950/'
     aliases = ['yang']
     filenames = ['*.yang']
     mimetypes = ['application/yang']
+    version_added = '2.7'
 
     #Keywords from RFC7950 ; oriented at BNF style
     TOP_STMTS_KEYWORDS = ("module", "submodule")
diff --git a/libs/pygments/lexers/yara.py b/libs/pygments/lexers/yara.py
index 1a84e4a78..29694f5a1 100644
--- a/libs/pygments/lexers/yara.py
+++ b/libs/pygments/lexers/yara.py
@@ -4,7 +4,7 @@
 
     Lexers for YARA.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -18,8 +18,6 @@ __all__ = ['YaraLexer']
 class YaraLexer(RegexLexer):
     """
     For YARA rules
-
-    .. versionadded:: 2.16
     """
 
     name = 'YARA'
@@ -27,6 +25,7 @@ class YaraLexer(RegexLexer):
     aliases = ['yara', 'yar']
     filenames = ['*.yar']
     mimetypes = ['text/x-yara']
+    version_added = '2.16'
 
     tokens = {
         'root': [
diff --git a/libs/pygments/lexers/zig.py b/libs/pygments/lexers/zig.py
index fad3b79d9..2b0168acf 100644
--- a/libs/pygments/lexers/zig.py
+++ b/libs/pygments/lexers/zig.py
@@ -4,7 +4,7 @@
 
     Lexers for Zig.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -26,6 +26,7 @@ class ZigLexer(RegexLexer):
     aliases = ['zig']
     filenames = ['*.zig']
     mimetypes = ['text/zig']
+    version_added = ''
 
     type_keywords = (
         words(('bool', 'f16', 'f32', 'f64', 'f128', 'void', 'noreturn', 'type',
diff --git a/libs/pygments/modeline.py b/libs/pygments/modeline.py
index 7b6f6a324..c310f0edb 100644
--- a/libs/pygments/modeline.py
+++ b/libs/pygments/modeline.py
@@ -4,7 +4,7 @@
 
     A simple modeline parser (based on pymodeline).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,7 +19,7 @@ modeline_re = re.compile(r'''
 ''', re.VERBOSE)
 
 
-def get_filetype_from_line(l):
+def get_filetype_from_line(l): # noqa: E741
     m = modeline_re.search(l)
     if m:
         return m.group(1)
@@ -30,8 +30,8 @@ def get_filetype_from_buffer(buf, max_lines=5):
     Scan the buffer for modelines and return filetype if one is found.
     """
     lines = buf.splitlines()
-    for l in lines[-1:-max_lines-1:-1]:
-        ret = get_filetype_from_line(l)
+    for line in lines[-1:-max_lines-1:-1]:
+        ret = get_filetype_from_line(line)
         if ret:
             return ret
     for i in range(max_lines, -1, -1):
diff --git a/libs/pygments/plugin.py b/libs/pygments/plugin.py
index 0de47bace..498db4238 100644
--- a/libs/pygments/plugin.py
+++ b/libs/pygments/plugin.py
@@ -2,12 +2,7 @@
     pygments.plugin
     ~~~~~~~~~~~~~~~
 
-    Pygments plugin interface. By default, this tries to use
-    ``importlib.metadata``, which is in the Python standard
-    library since Python 3.8, or its ``importlib_metadata``
-    backport for earlier versions of Python. It falls back on
-    ``pkg_resources`` if not found. Finally, if ``pkg_resources``
-    is not found either, no plugins are loaded at all.
+    Pygments plugin interface.
 
     lexer plugins::
 
@@ -34,9 +29,10 @@
         yourfilter = yourfilter:YourFilter
 
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from importlib.metadata import entry_points
 
 LEXER_ENTRY_POINT = 'pygments.lexers'
 FORMATTER_ENTRY_POINT = 'pygments.formatters'
@@ -45,18 +41,6 @@ FILTER_ENTRY_POINT = 'pygments.filters'
 
 
 def iter_entry_points(group_name):
-    try:
-        from importlib.metadata import entry_points
-    except ImportError:
-        try:
-            from importlib_metadata import entry_points
-        except ImportError:
-            try:
-                from pkg_resources import iter_entry_points
-            except (ImportError, OSError):
-                return []
-            else:
-                return iter_entry_points(group_name)
     groups = entry_points()
     if hasattr(groups, 'select'):
         # New interface in Python 3.10 and newer versions of the
diff --git a/libs/pygments/regexopt.py b/libs/pygments/regexopt.py
index 45223eccc..cc8d2c31b 100644
--- a/libs/pygments/regexopt.py
+++ b/libs/pygments/regexopt.py
@@ -5,7 +5,7 @@
     An algorithm that generates optimized regexes for matching long lists of
     literal strings.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/scanner.py b/libs/pygments/scanner.py
index 32a2f3032..3c8c84873 100644
--- a/libs/pygments/scanner.py
+++ b/libs/pygments/scanner.py
@@ -11,7 +11,7 @@
     Have a look at the `DelphiLexer` to get an idea of how to use
     this scanner.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
diff --git a/libs/pygments/sphinxext.py b/libs/pygments/sphinxext.py
index f935688f1..c215399ba 100644
--- a/libs/pygments/sphinxext.py
+++ b/libs/pygments/sphinxext.py
@@ -5,7 +5,7 @@
     Sphinx extension to generate automatic documentation of lexers,
     formatters and filters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,6 +33,8 @@ LEXERDOC = '''
 
     %s
 
+    %s
+
 '''
 
 FMTERDOC = '''
@@ -119,11 +121,11 @@ class PygmentsDoc(Directive):
         def write_row(*columns):
             """Format a table row"""
             out = []
-            for l, c in zip(column_lengths, columns):
-                if c:
-                    out.append(c.ljust(l))
+            for length, col in zip(column_lengths, columns):
+                if col:
+                    out.append(col.ljust(length))
                 else:
-                    out.append(' '*l)
+                    out.append(' '*length)
 
             return ' '.join(out)
 
@@ -160,7 +162,7 @@ class PygmentsDoc(Directive):
             self.filenames.add(mod.__file__)
             cls = getattr(mod, classname)
             if not cls.__doc__:
-                print("Warning: %s does not have a docstring." % classname)
+                print(f"Warning: {classname} does not have a docstring.")
             docstring = cls.__doc__
             if isinstance(docstring, bytes):
                 docstring = docstring.decode('utf8')
@@ -182,12 +184,18 @@ class PygmentsDoc(Directive):
                     for line in content.splitlines():
                         docstring += f'          {line}\n'
 
+            if cls.version_added:
+                version_line = f'.. versionadded:: {cls.version_added}'
+            else:
+                version_line = ''
+
             modules.setdefault(module, []).append((
                 classname,
                 ', '.join(data[2]) or 'None',
                 ', '.join(data[3]).replace('*', '\\*').replace('_', '\\') or 'None',
                 ', '.join(data[4]) or 'None',
-                docstring))
+                docstring,
+                version_line))
             if module not in moduledocstrings:
                 moddoc = mod.__doc__
                 if isinstance(moddoc, bytes):
@@ -196,7 +204,7 @@ class PygmentsDoc(Directive):
 
         for module, lexers in sorted(modules.items(), key=lambda x: x[0]):
             if moduledocstrings[module] is None:
-                raise Exception("Missing docstring for %s" % (module,))
+                raise Exception(f"Missing docstring for {module}")
             heading = moduledocstrings[module].splitlines()[4].strip().rstrip('.')
             out.append(MODULEDOC % (module, heading, '-'*len(heading)))
             for data in lexers:
diff --git a/libs/pygments/style.py b/libs/pygments/style.py
index 96eb92c2b..ac36cad7b 100644
--- a/libs/pygments/style.py
+++ b/libs/pygments/style.py
@@ -4,7 +4,7 @@
 
     Basic style object.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -76,7 +76,7 @@ class StyleMeta(type):
                 return ''
             elif text.startswith('var') or text.startswith('calc'):
                 return text
-            assert False, "wrong color format %r" % text
+            assert False, f"wrong color format {text!r}"
 
         _styles = obj._styles = {}
 
diff --git a/libs/pygments/styles/__init__.py b/libs/pygments/styles/__init__.py
index 75ac30bb9..5d45d8b23 100644
--- a/libs/pygments/styles/__init__.py
+++ b/libs/pygments/styles/__init__.py
@@ -4,7 +4,7 @@
 
     Contains built-in styles.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -44,13 +44,13 @@ def get_style_by_name(name):
     try:
         mod = __import__(mod, None, None, [cls])
     except ImportError:
-        raise ClassNotFound("Could not find style module %r" % mod +
+        raise ClassNotFound(f"Could not find style module {mod!r}" +
                             (builtin and ", though it should be builtin")
                             + ".")
     try:
         return getattr(mod, cls)
     except AttributeError:
-        raise ClassNotFound("Could not find style class %r in style module." % cls)
+        raise ClassNotFound(f"Could not find style class {cls!r} in style module.")
 
 
 def get_all_styles():
diff --git a/libs/pygments/styles/_mapping.py b/libs/pygments/styles/_mapping.py
index 04c7ddfbb..49a7fae92 100644
--- a/libs/pygments/styles/_mapping.py
+++ b/libs/pygments/styles/_mapping.py
@@ -9,6 +9,7 @@ STYLES = {
     'AutumnStyle': ('pygments.styles.autumn', 'autumn', ()),
     'BlackWhiteStyle': ('pygments.styles.bw', 'bw', ()),
     'BorlandStyle': ('pygments.styles.borland', 'borland', ()),
+    'CoffeeStyle': ('pygments.styles.coffee', 'coffee', ()),
     'ColorfulStyle': ('pygments.styles.colorful', 'colorful', ()),
     'DefaultStyle': ('pygments.styles.default', 'default', ()),
     'DraculaStyle': ('pygments.styles.dracula', 'dracula', ()),
diff --git a/libs/pygments/styles/abap.py b/libs/pygments/styles/abap.py
index ab322df9c..584a4e649 100644
--- a/libs/pygments/styles/abap.py
+++ b/libs/pygments/styles/abap.py
@@ -4,7 +4,7 @@
 
     ABAP workbench like style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/algol.py b/libs/pygments/styles/algol.py
index 83319e0ab..86cafce23 100644
--- a/libs/pygments/styles/algol.py
+++ b/libs/pygments/styles/algol.py
@@ -25,7 +25,7 @@
 
     [1] `Revised Report on the Algorithmic Language Algol-60 <http://www.masswerk.at/algol60/report.htm>`
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/algol_nu.py b/libs/pygments/styles/algol_nu.py
index de1434dc8..d28da8f1b 100644
--- a/libs/pygments/styles/algol_nu.py
+++ b/libs/pygments/styles/algol_nu.py
@@ -25,7 +25,7 @@
 
     [1] `Revised Report on the Algorithmic Language Algol-60 <http://www.masswerk.at/algol60/report.htm>`
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/arduino.py b/libs/pygments/styles/arduino.py
index 8655b0371..dcb325217 100644
--- a/libs/pygments/styles/arduino.py
+++ b/libs/pygments/styles/arduino.py
@@ -4,7 +4,7 @@
 
     Arduino® Syntax highlighting style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/autumn.py b/libs/pygments/styles/autumn.py
index ccbb5fe77..8229ad175 100644
--- a/libs/pygments/styles/autumn.py
+++ b/libs/pygments/styles/autumn.py
@@ -4,7 +4,7 @@
 
     A colorful style, inspired by the terminal highlighting style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/borland.py b/libs/pygments/styles/borland.py
index 82c00ae13..bfceaea0f 100644
--- a/libs/pygments/styles/borland.py
+++ b/libs/pygments/styles/borland.py
@@ -4,7 +4,7 @@
 
     Style similar to the style used in the Borland IDEs.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/bw.py b/libs/pygments/styles/bw.py
index 3ba00925f..30cd78763 100644
--- a/libs/pygments/styles/bw.py
+++ b/libs/pygments/styles/bw.py
@@ -4,7 +4,7 @@
 
     Simple black/white only style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/coffee.py b/libs/pygments/styles/coffee.py
new file mode 100644
index 000000000..66f504d87
--- /dev/null
+++ b/libs/pygments/styles/coffee.py
@@ -0,0 +1,80 @@
+"""
+    pygments.styles.coffee
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    A warm and cozy theme based off gruvbox
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from pygments.style import Style
+from pygments.token import (Comment, Error, Generic, Keyword, Literal, Name,
+                            Number, Operator, Punctuation, String, Token)
+
+__all__ = ["CoffeeStyle"]
+
+
+class CoffeeStyle(Style):
+    """
+    A warm and cozy theme based off gruvbox
+    """
+
+    name = "coffee"
+
+    background_color = "#262220"
+    highlight_color = "#ddd0c0"
+
+    line_number_color = "#4e4e4e"
+    line_number_special_color = "#8f9494"
+
+    styles = {
+        Comment: "#70757A",
+        Comment.Hashbang: "#8f9f9f",
+        Comment.Preproc: "#fdd0c0",
+        Comment.PreprocFile: "#c9b98f",
+        Comment.Special: "#af5f5f",
+        Error: "#af5f5f",
+        Generic.Deleted: "#bb6868",
+        Generic.Emph: "italic",
+        Generic.Error: "#af5f5f",
+        Generic.Inserted: "#849155",
+        Generic.Output: "#ddd0c0",
+        Generic.Strong: "bold",
+        Generic.Traceback: "#af5f5f",
+        Keyword: "#919191",
+        Keyword.Constant: "#875f5f",
+        Keyword.Declaration: "#875f5f",
+        Keyword.Namespace: "#875f5f",
+        Keyword.Reserved: "#b46276",
+        Keyword.Type: "#af875f",
+        Literal: "#af875f",
+        Name: "#ddd0c0",
+        Name.Attribute: "#ddd0c0",
+        Name.Builtin: "#ddd0c0",
+        Name.Builtin.Pseudo: "#87afaf",
+        Name.Class: "#875f5f",
+        Name.Constant: "#af8787",
+        Name.Decorator: "#fdd0c0",
+        Name.Entity: "#ddd0c0",
+        Name.Exception: "#877575",
+        Name.Function: "#fdd0c0",
+        Name.Function.Magic: "#fdd0c0",
+        Name.Other: "#ddd0c0",
+        Name.Property: "#dfaf87",
+        Name.Tag: "#87afaf",
+        Name.Variable: "#ddd0c0",
+        Number: "#87afaf",
+        Operator: "#878787",
+        Operator.Word: "#878787",
+        Punctuation: "#ddd0c0",
+        String: "#c9b98f",
+        String.Affix: "#dfaf87",
+        String.Doc: "#878787",
+        String.Escape: "#af5f5f",
+        String.Interpol: "#af5f5f",
+        String.Other: "#fdd0c0",
+        String.Regex: "#af5f5f",
+        String.Symbol: "#af5f5f",
+        Token: "#ddd0c0",
+    }
diff --git a/libs/pygments/styles/colorful.py b/libs/pygments/styles/colorful.py
index 661a9e446..012d943ac 100644
--- a/libs/pygments/styles/colorful.py
+++ b/libs/pygments/styles/colorful.py
@@ -4,7 +4,7 @@
 
     A colorful style, inspired by CodeRay.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/default.py b/libs/pygments/styles/default.py
index f4e5b7b26..30f882e96 100644
--- a/libs/pygments/styles/default.py
+++ b/libs/pygments/styles/default.py
@@ -4,7 +4,7 @@
 
     The default highlighting style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/dracula.py b/libs/pygments/styles/dracula.py
index d7043c007..805e6630a 100644
--- a/libs/pygments/styles/dracula.py
+++ b/libs/pygments/styles/dracula.py
@@ -7,7 +7,7 @@
     Based on the Dracula Theme for pygments by Chris Bracco.
     See https://github.com/dracula/pygments/tree/fee9ed5613d1086bc01b9d0a5a0e9867a009f571
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/emacs.py b/libs/pygments/styles/emacs.py
index fad91a134..729486344 100644
--- a/libs/pygments/styles/emacs.py
+++ b/libs/pygments/styles/emacs.py
@@ -4,7 +4,7 @@
 
     A highlighting style for Pygments, inspired by Emacs.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/friendly.py b/libs/pygments/styles/friendly.py
index 8de4fcc1e..e1950f087 100644
--- a/libs/pygments/styles/friendly.py
+++ b/libs/pygments/styles/friendly.py
@@ -4,7 +4,7 @@
 
     A modern style based on the VIM pyte theme.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/friendly_grayscale.py b/libs/pygments/styles/friendly_grayscale.py
index e7d3ed47e..23dfaa59c 100644
--- a/libs/pygments/styles/friendly_grayscale.py
+++ b/libs/pygments/styles/friendly_grayscale.py
@@ -7,7 +7,7 @@
     using the luminosity value calculated by
     http://www.workwithcolor.com/color-converter-01.htm
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/fruity.py b/libs/pygments/styles/fruity.py
index b23257d19..64c8f96eb 100644
--- a/libs/pygments/styles/fruity.py
+++ b/libs/pygments/styles/fruity.py
@@ -4,7 +4,7 @@
 
     pygments version of my "fruity" vim theme.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/gh_dark.py b/libs/pygments/styles/gh_dark.py
index 95f8e803d..3bfd30003 100644
--- a/libs/pygments/styles/gh_dark.py
+++ b/libs/pygments/styles/gh_dark.py
@@ -5,7 +5,7 @@
     Github's Dark-Colorscheme based theme for Pygments
     Colors extracted from https://github.com/primer/primitives
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/gruvbox.py b/libs/pygments/styles/gruvbox.py
index c05f3140b..235639118 100644
--- a/libs/pygments/styles/gruvbox.py
+++ b/libs/pygments/styles/gruvbox.py
@@ -5,7 +5,7 @@
     pygments version of the "gruvbox" vim theme.
     https://github.com/morhetz/gruvbox
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/igor.py b/libs/pygments/styles/igor.py
index 797e3675c..467b281d0 100644
--- a/libs/pygments/styles/igor.py
+++ b/libs/pygments/styles/igor.py
@@ -4,7 +4,7 @@
 
     Igor Pro default style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/inkpot.py b/libs/pygments/styles/inkpot.py
index 817d97f09..39902c27c 100644
--- a/libs/pygments/styles/inkpot.py
+++ b/libs/pygments/styles/inkpot.py
@@ -4,7 +4,7 @@
 
     A highlighting style for Pygments, inspired by the Inkpot theme for VIM.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/lightbulb.py b/libs/pygments/styles/lightbulb.py
index 25c4b1559..8bcd21aaf 100644
--- a/libs/pygments/styles/lightbulb.py
+++ b/libs/pygments/styles/lightbulb.py
@@ -4,7 +4,7 @@
 
     A minimal dark theme based on the Lightbulb theme for VSCode.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/lilypond.py b/libs/pygments/styles/lilypond.py
index 1218ec9d3..b538798f1 100644
--- a/libs/pygments/styles/lilypond.py
+++ b/libs/pygments/styles/lilypond.py
@@ -4,7 +4,7 @@
 
     LilyPond-specific style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/lovelace.py b/libs/pygments/styles/lovelace.py
index 279ff0793..6e255cd66 100644
--- a/libs/pygments/styles/lovelace.py
+++ b/libs/pygments/styles/lovelace.py
@@ -8,7 +8,7 @@
     A desaturated, somewhat subdued style created for the Lovelace interactive
     learning environment.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/manni.py b/libs/pygments/styles/manni.py
index 1eb0e6986..df1822a21 100644
--- a/libs/pygments/styles/manni.py
+++ b/libs/pygments/styles/manni.py
@@ -7,7 +7,7 @@
     This is a port of the style used in the `php port`_ of pygments
     by Manni. The style is called 'default' there.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/material.py b/libs/pygments/styles/material.py
index db0952d20..633ef380f 100644
--- a/libs/pygments/styles/material.py
+++ b/libs/pygments/styles/material.py
@@ -6,7 +6,7 @@
 
     https://github.com/material-theme/vsc-material-theme
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/monokai.py b/libs/pygments/styles/monokai.py
index 2ae51bcdf..4a6ac0cab 100644
--- a/libs/pygments/styles/monokai.py
+++ b/libs/pygments/styles/monokai.py
@@ -6,7 +6,7 @@
 
     http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/murphy.py b/libs/pygments/styles/murphy.py
index 0c5cc6df6..1299fd5b6 100644
--- a/libs/pygments/styles/murphy.py
+++ b/libs/pygments/styles/murphy.py
@@ -4,7 +4,7 @@
 
     Murphy's style from CodeRay.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/native.py b/libs/pygments/styles/native.py
index 11f83db4b..c9f818dd5 100644
--- a/libs/pygments/styles/native.py
+++ b/libs/pygments/styles/native.py
@@ -4,7 +4,7 @@
 
     pygments version of my "native" vim theme.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -56,15 +56,15 @@ class NativeStyle(Style):
 
         Generic.Heading:    'bold #ffffff',
         Generic.Subheading: 'underline #ffffff',
-        Generic.Deleted:    '#d22323',
+        Generic.Deleted:    '#ff3a3a',
         Generic.Inserted:   '#589819',
-        Generic.Error:      '#d22323',
+        Generic.Error:      '#ff3a3a',
         Generic.Emph:       'italic',
         Generic.Strong:     'bold',
         Generic.EmphStrong: 'bold italic',
         Generic.Prompt:     '#aaaaaa',
         Generic.Output:     '#cccccc',
-        Generic.Traceback:  '#d22323',
+        Generic.Traceback:  '#ff3a3a',
 
         Error:              'bg:#e3d2d2 #a61717'
     }
diff --git a/libs/pygments/styles/nord.py b/libs/pygments/styles/nord.py
index e5cff2452..5481e9681 100644
--- a/libs/pygments/styles/nord.py
+++ b/libs/pygments/styles/nord.py
@@ -5,7 +5,7 @@
     pygments version of the "nord" theme by Arctic Ice Studio
     https://www.nordtheme.com/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/onedark.py b/libs/pygments/styles/onedark.py
index b145ce91e..75c4b17a4 100644
--- a/libs/pygments/styles/onedark.py
+++ b/libs/pygments/styles/onedark.py
@@ -7,7 +7,7 @@
     Inspired by one-dark-ui for the code editor Atom
     (https://atom.io/themes/one-dark-ui).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/paraiso_dark.py b/libs/pygments/styles/paraiso_dark.py
index 8cc231f31..9983e60d0 100644
--- a/libs/pygments/styles/paraiso_dark.py
+++ b/libs/pygments/styles/paraiso_dark.py
@@ -8,7 +8,7 @@
     Created with Base16 Builder by Chris Kempson
     (https://github.com/chriskempson/base16-builder).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/paraiso_light.py b/libs/pygments/styles/paraiso_light.py
index ac76badbf..903ad88d6 100644
--- a/libs/pygments/styles/paraiso_light.py
+++ b/libs/pygments/styles/paraiso_light.py
@@ -8,7 +8,7 @@
     Created with Base16 Builder by Chris Kempson
     (https://github.com/chriskempson/base16-builder).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/pastie.py b/libs/pygments/styles/pastie.py
index 2892660bf..819968e1a 100644
--- a/libs/pygments/styles/pastie.py
+++ b/libs/pygments/styles/pastie.py
@@ -6,7 +6,7 @@
 
     .. _pastie: http://pastie.caboo.se/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/perldoc.py b/libs/pygments/styles/perldoc.py
index 071821bb1..e76697a9a 100644
--- a/libs/pygments/styles/perldoc.py
+++ b/libs/pygments/styles/perldoc.py
@@ -6,7 +6,7 @@
 
     .. _perldoc: http://perldoc.perl.org/
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/rainbow_dash.py b/libs/pygments/styles/rainbow_dash.py
index 82bfed548..f98d5ef08 100644
--- a/libs/pygments/styles/rainbow_dash.py
+++ b/libs/pygments/styles/rainbow_dash.py
@@ -6,7 +6,7 @@
 
     .. _theme: http://sanssecours.github.io/Rainbow-Dash.tmbundle
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -46,48 +46,48 @@ class RainbowDashStyle(Style):
     background_color = WHITE
 
     styles = {
-        Comment: 'italic {}'.format(BLUE_LIGHT),
+        Comment: f'italic {BLUE_LIGHT}',
         Comment.Preproc: 'noitalic',
         Comment.Special: 'bold',
 
-        Error: 'bg:{} {}'.format(RED, WHITE),
+        Error: f'bg:{RED} {WHITE}',
 
-        Generic.Deleted: 'border:{} bg:{}'.format(RED_DARK, RED_LIGHT),
+        Generic.Deleted: f'border:{RED_DARK} bg:{RED_LIGHT}',
         Generic.Emph: 'italic',
         Generic.Error: RED_BRIGHT,
-        Generic.Heading: 'bold {}'.format(BLUE),
-        Generic.Inserted: 'border:{} bg:{}'.format(GREEN_NEON, GREEN_LIGHT),
+        Generic.Heading: f'bold {BLUE}',
+        Generic.Inserted: f'border:{GREEN_NEON} bg:{GREEN_LIGHT}',
         Generic.Output: GREY,
-        Generic.Prompt: 'bold {}'.format(BLUE),
+        Generic.Prompt: f'bold {BLUE}',
         Generic.Strong: 'bold',
         Generic.EmphStrong: 'bold italic',
-        Generic.Subheading: 'bold {}'.format(BLUE),
+        Generic.Subheading: f'bold {BLUE}',
         Generic.Traceback: RED_DARK,
 
-        Keyword: 'bold {}'.format(BLUE),
+        Keyword: f'bold {BLUE}',
         Keyword.Pseudo: 'nobold',
         Keyword.Type: PURPLE,
 
-        Name.Attribute: 'italic {}'.format(BLUE),
-        Name.Builtin: 'bold {}'.format(PURPLE),
+        Name.Attribute: f'italic {BLUE}',
+        Name.Builtin: f'bold {PURPLE}',
         Name.Class: 'underline',
         Name.Constant: TURQUOISE,
-        Name.Decorator: 'bold {}'.format(ORANGE),
-        Name.Entity: 'bold {}'.format(PURPLE),
-        Name.Exception: 'bold {}'.format(PURPLE),
-        Name.Function: 'bold {}'.format(ORANGE),
-        Name.Tag: 'bold {}'.format(BLUE),
+        Name.Decorator: f'bold {ORANGE}',
+        Name.Entity: f'bold {PURPLE}',
+        Name.Exception: f'bold {PURPLE}',
+        Name.Function: f'bold {ORANGE}',
+        Name.Tag: f'bold {BLUE}',
 
-        Number: 'bold {}'.format(PURPLE),
+        Number: f'bold {PURPLE}',
 
         Operator: BLUE,
         Operator.Word: 'bold',
 
         String: GREEN,
         String.Doc: 'italic',
-        String.Escape: 'bold {}'.format(RED_DARK),
+        String.Escape: f'bold {RED_DARK}',
         String.Other: TURQUOISE,
-        String.Symbol: 'bold {}'.format(RED_DARK),
+        String.Symbol: f'bold {RED_DARK}',
 
         Text: GREY_DARK,
 
diff --git a/libs/pygments/styles/rrt.py b/libs/pygments/styles/rrt.py
index 3376d581d..1e87d2625 100644
--- a/libs/pygments/styles/rrt.py
+++ b/libs/pygments/styles/rrt.py
@@ -4,12 +4,12 @@
 
     pygments "rrt" theme, based on Zap and Emacs defaults.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pygments.style import Style
-from pygments.token import Token, Comment, Name, Keyword, String, Number
+from pygments.token import Token, Comment, Name, Keyword, String, Number, Operator
 
 
 __all__ = ['RrtStyle']
@@ -32,6 +32,7 @@ class RrtStyle(Style):
         Name.Variable:      '#eedd82',
         Name.Constant:      '#7fffd4',
         Keyword:            '#ff0000',
+	Operator.Word:      '#ff0000',
         Comment.Preproc:    '#e5e5e5',
         String:             '#87ceeb',
         Keyword.Type:       '#ee82ee',
diff --git a/libs/pygments/styles/sas.py b/libs/pygments/styles/sas.py
index 4d19b224c..549a0cc9f 100644
--- a/libs/pygments/styles/sas.py
+++ b/libs/pygments/styles/sas.py
@@ -6,7 +6,7 @@
     meant to be a complete style. It's merely meant to mimic SAS'
     program editor syntax highlighting.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/solarized.py b/libs/pygments/styles/solarized.py
index 6a1f81240..c05170245 100644
--- a/libs/pygments/styles/solarized.py
+++ b/libs/pygments/styles/solarized.py
@@ -7,7 +7,7 @@
     A Pygments style for the Solarized themes (licensed under MIT).
     See: https://github.com/altercation/solarized
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/staroffice.py b/libs/pygments/styles/staroffice.py
index b2cfba9fb..a21aa4157 100644
--- a/libs/pygments/styles/staroffice.py
+++ b/libs/pygments/styles/staroffice.py
@@ -4,7 +4,7 @@
 
     Style similar to StarOffice style, also in OpenOffice and LibreOffice.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/stata_dark.py b/libs/pygments/styles/stata_dark.py
index c2d0f1924..315c5c6ab 100644
--- a/libs/pygments/styles/stata_dark.py
+++ b/libs/pygments/styles/stata_dark.py
@@ -6,7 +6,7 @@
     meant to be a complete style, just for Stata's file formats.
 
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/stata_light.py b/libs/pygments/styles/stata_light.py
index 5e034568c..95d72e2f3 100644
--- a/libs/pygments/styles/stata_light.py
+++ b/libs/pygments/styles/stata_light.py
@@ -5,7 +5,7 @@
     Light Style inspired by Stata's do-file editor. Note this is not
     meant to be a complete style, just for Stata's file formats.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/tango.py b/libs/pygments/styles/tango.py
index 787a69785..986e3ffe6 100644
--- a/libs/pygments/styles/tango.py
+++ b/libs/pygments/styles/tango.py
@@ -32,7 +32,7 @@
     have been chosen to have the same style.  Similarly, keywords (Keyword.*),
     and Operator.Word (and, or, in) have been assigned the same style.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/trac.py b/libs/pygments/styles/trac.py
index 5f5c319ab..2dbffa468 100644
--- a/libs/pygments/styles/trac.py
+++ b/libs/pygments/styles/trac.py
@@ -4,7 +4,7 @@
 
     Port of the default trac highlighter design.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/vim.py b/libs/pygments/styles/vim.py
index 1a0828fb0..6b53d0080 100644
--- a/libs/pygments/styles/vim.py
+++ b/libs/pygments/styles/vim.py
@@ -4,7 +4,7 @@
 
     A highlighting style for Pygments, inspired by vim.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/vs.py b/libs/pygments/styles/vs.py
index b3b98c05d..9ac18c781 100644
--- a/libs/pygments/styles/vs.py
+++ b/libs/pygments/styles/vs.py
@@ -4,7 +4,7 @@
 
     Simple style with MS Visual Studio colors.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/xcode.py b/libs/pygments/styles/xcode.py
index 87b1323ab..9ef7c8f18 100644
--- a/libs/pygments/styles/xcode.py
+++ b/libs/pygments/styles/xcode.py
@@ -4,7 +4,7 @@
 
     Style similar to the `Xcode` default theme.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/styles/zenburn.py b/libs/pygments/styles/zenburn.py
index 6751c08d7..4d0e0567f 100644
--- a/libs/pygments/styles/zenburn.py
+++ b/libs/pygments/styles/zenburn.py
@@ -7,7 +7,7 @@
     See: https://kippura.org/zenburnpage/
          https://github.com/jnurmine/Zenburn
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/token.py b/libs/pygments/token.py
index bdf2e8e2e..2f3b97e09 100644
--- a/libs/pygments/token.py
+++ b/libs/pygments/token.py
@@ -4,7 +4,7 @@
 
     Basic token types and the standard tokens.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/libs/pygments/unistring.py b/libs/pygments/unistring.py
index 39f6baeed..e3bd2e727 100644
--- a/libs/pygments/unistring.py
+++ b/libs/pygments/unistring.py
@@ -7,7 +7,7 @@
 
     Inspired by chartypes_create.py from the MoinMoin project.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -104,7 +104,7 @@ def _handle_runs(char_list):  # pragma: no cover
         if a == b:
             yield a
         else:
-            yield '%s-%s' % (a, b)
+            yield f'{a}-{b}'
 
 
 if __name__ == '__main__':  # pragma: no cover
@@ -141,13 +141,13 @@ if __name__ == '__main__':  # pragma: no cover
 
         for cat in sorted(categories):
             val = ''.join(_handle_runs(categories[cat]))
-            fp.write('%s = %a\n\n' % (cat, val))
+            fp.write(f'{cat} = {val!a}\n\n')
 
         cats = sorted(categories)
         cats.remove('xid_start')
         cats.remove('xid_continue')
-        fp.write('cats = %r\n\n' % cats)
+        fp.write(f'cats = {cats!r}\n\n')
 
-        fp.write('# Generated from unidata %s\n\n' % (unicodedata.unidata_version,))
+        fp.write(f'# Generated from unidata {unicodedata.unidata_version}\n\n')
 
         fp.write(footer)
diff --git a/libs/pygments/util.py b/libs/pygments/util.py
index 941fdb9ec..71c5710ae 100644
--- a/libs/pygments/util.py
+++ b/libs/pygments/util.py
@@ -4,7 +4,7 @@
 
     Utility functions.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -46,8 +46,7 @@ def get_choice_opt(options, optname, allowed, default=None, normcase=False):
     if normcase:
         string = string.lower()
     if string not in allowed:
-        raise OptionError('Value for option %s must be one of %s' %
-                          (optname, ', '.join(map(str, allowed))))
+        raise OptionError('Value for option {} must be one of {}'.format(optname, ', '.join(map(str, allowed))))
     return string
 
 
@@ -69,17 +68,15 @@ def get_bool_opt(options, optname, default=None):
     elif isinstance(string, int):
         return bool(string)
     elif not isinstance(string, str):
-        raise OptionError('Invalid type %r for option %s; use '
-                          '1/0, yes/no, true/false, on/off' % (
-                              string, optname))
+        raise OptionError(f'Invalid type {string!r} for option {optname}; use '
+                          '1/0, yes/no, true/false, on/off')
     elif string.lower() in ('1', 'yes', 'true', 'on'):
         return True
     elif string.lower() in ('0', 'no', 'false', 'off'):
         return False
     else:
-        raise OptionError('Invalid value %r for option %s; use '
-                          '1/0, yes/no, true/false, on/off' % (
-                              string, optname))
+        raise OptionError(f'Invalid value {string!r} for option {optname}; use '
+                          '1/0, yes/no, true/false, on/off')
 
 
 def get_int_opt(options, optname, default=None):
@@ -88,13 +85,11 @@ def get_int_opt(options, optname, default=None):
     try:
         return int(string)
     except TypeError:
-        raise OptionError('Invalid type %r for option %s; you '
-                          'must give an integer value' % (
-                              string, optname))
+        raise OptionError(f'Invalid type {string!r} for option {optname}; you '
+                          'must give an integer value')
     except ValueError:
-        raise OptionError('Invalid value %r for option %s; you '
-                          'must give an integer value' % (
-                              string, optname))
+        raise OptionError(f'Invalid value {string!r} for option {optname}; you '
+                          'must give an integer value')
 
 def get_list_opt(options, optname, default=None):
     """
@@ -108,9 +103,8 @@ def get_list_opt(options, optname, default=None):
     elif isinstance(val, (list, tuple)):
         return list(val)
     else:
-        raise OptionError('Invalid type %r for option %s; you '
-                          'must give a list value' % (
-                              val, optname))
+        raise OptionError(f'Invalid type {val!r} for option {optname}; you '
+                          'must give a list value')
 
 
 def docstring_headline(obj):
@@ -181,7 +175,7 @@ def shebang_matches(text, regex):
                      if x and not x.startswith('-')][-1]
         except IndexError:
             return False
-        regex = re.compile(r'^%s(\.(exe|cmd|bat|bin))?$' % regex, re.IGNORECASE)
+        regex = re.compile(rf'^{regex}(\.(exe|cmd|bat|bin))?$', re.IGNORECASE)
         if regex.search(found) is not None:
             return True
     return False
diff --git a/libs/pyparsing-3.1.1.dist-info/RECORD b/libs/pyparsing-3.1.1.dist-info/RECORD
deleted file mode 100644
index 4c012c3ed..000000000
--- a/libs/pyparsing-3.1.1.dist-info/RECORD
+++ /dev/null
@@ -1,18 +0,0 @@
-pyparsing-3.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyparsing-3.1.1.dist-info/LICENSE,sha256=ENUSChaAWAT_2otojCIL-06POXQbVzIGBNRVowngGXI,1023
-pyparsing-3.1.1.dist-info/METADATA,sha256=E8_EMvvNkZCq0__T31WduJ0R086qI7adBDU58_308Z0,5090
-pyparsing-3.1.1.dist-info/RECORD,,
-pyparsing-3.1.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyparsing-3.1.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-pyparsing/__init__.py,sha256=AbjlceFXuVPySz7tdBjyUyVMWyW-0nRNP9AeeY3ASu4,9148
-pyparsing/actions.py,sha256=05uaIPOznJPQ7VgRdmGCmG4sDnUPtwgv5qOYIqbL2UY,6567
-pyparsing/common.py,sha256=p-3c83E5-DjlkF35G0O9-kjQRpoejP-2_z0hxZ-eol4,13387
-pyparsing/core.py,sha256=SL7dkYDhhJliWU3vHWPWZIGVRMfbja0hfm--woDdOHg,226596
-pyparsing/diagram/__init__.py,sha256=TUqky0L642MJU8r6zTWW8oAr-s-8jOWLyiWgJev04Yo,24198
-pyparsing/exceptions.py,sha256=6Jc6W1eDZBzyFu1J0YrcdNFVBC-RINujZmveSnB8Rxw,9523
-pyparsing/helpers.py,sha256=BZJHCA8SS0pYio30KGQTc9w2qMOaK4YpZ7hcvHbnTgk,38646
-pyparsing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyparsing/results.py,sha256=9dyqQ-w3MjfmxWbFt8KEPU6IfXeyRdoWp2Og802rUQY,26692
-pyparsing/testing.py,sha256=eJncg0p83zm1FTPvM9auNT6oavIvXaibmRFDf1qmwkY,13488
-pyparsing/unicode.py,sha256=bXy63t4uevWZH0JKJtd6XFIKgsCOfIlxvcDCRw-MkN8,10634
-pyparsing/util.py,sha256=vTMzTdwSDyV8d_dSgquUTdWgBFoA_W30nfxEJDsshRQ,8670
diff --git a/libs/python_dateutil-2.8.2.dist-info/INSTALLER b/libs/pyparsing-3.1.4.dist-info/INSTALLER
similarity index 100%
rename from libs/python_dateutil-2.8.2.dist-info/INSTALLER
rename to libs/pyparsing-3.1.4.dist-info/INSTALLER
diff --git a/libs/pyparsing-3.1.1.dist-info/LICENSE b/libs/pyparsing-3.1.4.dist-info/LICENSE
similarity index 100%
rename from libs/pyparsing-3.1.1.dist-info/LICENSE
rename to libs/pyparsing-3.1.4.dist-info/LICENSE
diff --git a/libs/pyparsing-3.1.1.dist-info/METADATA b/libs/pyparsing-3.1.4.dist-info/METADATA
similarity index 98%
rename from libs/pyparsing-3.1.1.dist-info/METADATA
rename to libs/pyparsing-3.1.4.dist-info/METADATA
index dbad8472c..1aa7a1fc0 100644
--- a/libs/pyparsing-3.1.1.dist-info/METADATA
+++ b/libs/pyparsing-3.1.4.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyparsing
-Version: 3.1.1
+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
@@ -19,6 +19,7 @@ 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
diff --git a/libs/pyparsing-3.1.4.dist-info/RECORD b/libs/pyparsing-3.1.4.dist-info/RECORD
new file mode 100644
index 000000000..708912e52
--- /dev/null
+++ b/libs/pyparsing-3.1.4.dist-info/RECORD
@@ -0,0 +1,18 @@
+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/python_dateutil-2.8.2.dist-info/REQUESTED b/libs/pyparsing-3.1.4.dist-info/REQUESTED
similarity index 100%
rename from libs/python_dateutil-2.8.2.dist-info/REQUESTED
rename to libs/pyparsing-3.1.4.dist-info/REQUESTED
diff --git a/libs/idna-3.6.dist-info/WHEEL b/libs/pyparsing-3.1.4.dist-info/WHEEL
similarity index 100%
rename from libs/idna-3.6.dist-info/WHEEL
rename to libs/pyparsing-3.1.4.dist-info/WHEEL
diff --git a/libs/pyparsing/__init__.py b/libs/pyparsing/__init__.py
index 3dbc3cf83..a440cfbef 100644
--- a/libs/pyparsing/__init__.py
+++ b/libs/pyparsing/__init__.py
@@ -120,8 +120,8 @@ class version_info(NamedTuple):
         return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
 
 
-__version_info__ = version_info(3, 1, 1, "final", 1)
-__version_time__ = "29 Jul 2023 22:27 UTC"
+__version_info__ = version_info(3, 1, 4, "final", 1)
+__version_time__ = "25 Aug 2024 14:40 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire <ptmcg.gm+pyparsing@gmail.com>"
@@ -143,7 +143,7 @@ from .common import (
     _builtin_exprs as common_builtin_exprs,
 )
 
-# define backward compat synonyms
+# Compatibility synonyms
 if "pyparsing_unicode" not in globals():
     pyparsing_unicode = unicode  # type: ignore[misc]
 if "pyparsing_common" not in globals():
diff --git a/libs/pyparsing/actions.py b/libs/pyparsing/actions.py
index ca6e4c6af..1d2dce99e 100644
--- a/libs/pyparsing/actions.py
+++ b/libs/pyparsing/actions.py
@@ -111,7 +111,6 @@ def with_attribute(*args, **attr_dict):
             <div type="graph">1,3 2,3 1,1</div>
             <div>this has no type</div>
             </div>
-
         '''
         div,div_end = make_html_tags("div")
 
@@ -197,21 +196,11 @@ def with_class(classname, namespace=""):
     return with_attribute(**{classattr: classname})
 
 
-# pre-PEP8 compatibility symbols
+# Compatibility synonyms
 # fmt: off
-@replaced_by_pep8(replace_with)
-def replaceWith(): ...
-
-@replaced_by_pep8(remove_quotes)
-def removeQuotes(): ...
-
-@replaced_by_pep8(with_attribute)
-def withAttribute(): ...
-
-@replaced_by_pep8(with_class)
-def withClass(): ...
-
-@replaced_by_pep8(match_only_at_col)
-def matchOnlyAtCol(): ...
-
+replaceWith = replaced_by_pep8("replaceWith", replace_with)
+removeQuotes = replaced_by_pep8("removeQuotes", remove_quotes)
+withAttribute = replaced_by_pep8("withAttribute", with_attribute)
+withClass = replaced_by_pep8("withClass", with_class)
+matchOnlyAtCol = replaced_by_pep8("matchOnlyAtCol", match_only_at_col)
 # fmt: on
diff --git a/libs/pyparsing/common.py b/libs/pyparsing/common.py
index 7a666b276..649aad009 100644
--- a/libs/pyparsing/common.py
+++ b/libs/pyparsing/common.py
@@ -206,7 +206,7 @@ class pyparsing_common:
     scientific notation and returns a float"""
 
     # streamlining this expression makes the docs nicer-looking
-    number = (sci_real | real | signed_integer).setName("number").streamline()
+    number = (sci_real | real | signed_integer).set_name("number").streamline()
     """any numeric expression, returns the corresponding Python type"""
 
     fnumber = (
@@ -216,6 +216,13 @@ class pyparsing_common:
     )
     """any int or real number, returned as float"""
 
+    ieee_float = (
+        Regex(r"(?i)[+-]?((\d+\.?\d*(e[+-]?\d+)?)|nan|inf(inity)?)")
+        .set_name("ieee_float")
+        .set_parse_action(convert_to_float)
+    )
+    """any floating-point literal (int, real number, infinity, or NaN), returned as float"""
+
     identifier = Word(identchars, identbodychars).set_name("identifier")
     """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
 
@@ -411,20 +418,15 @@ class pyparsing_common:
     # fmt: on
 
     # pre-PEP8 compatibility names
-    convertToInteger = convert_to_integer
-    """Deprecated - use :class:`convert_to_integer`"""
-    convertToFloat = convert_to_float
-    """Deprecated - use :class:`convert_to_float`"""
-    convertToDate = convert_to_date
-    """Deprecated - use :class:`convert_to_date`"""
-    convertToDatetime = convert_to_datetime
-    """Deprecated - use :class:`convert_to_datetime`"""
-    stripHTMLTags = strip_html_tags
-    """Deprecated - use :class:`strip_html_tags`"""
-    upcaseTokens = upcase_tokens
-    """Deprecated - use :class:`upcase_tokens`"""
-    downcaseTokens = downcase_tokens
-    """Deprecated - use :class:`downcase_tokens`"""
+    # fmt: off
+    convertToInteger = staticmethod(replaced_by_pep8("convertToInteger", convert_to_integer))
+    convertToFloat = staticmethod(replaced_by_pep8("convertToFloat", convert_to_float))
+    convertToDate = staticmethod(replaced_by_pep8("convertToDate", convert_to_date))
+    convertToDatetime = staticmethod(replaced_by_pep8("convertToDatetime", convert_to_datetime))
+    stripHTMLTags = staticmethod(replaced_by_pep8("stripHTMLTags", strip_html_tags))
+    upcaseTokens = staticmethod(replaced_by_pep8("upcaseTokens", upcase_tokens))
+    downcaseTokens = staticmethod(replaced_by_pep8("downcaseTokens", downcase_tokens))
+    # fmt: on
 
 
 _builtin_exprs = [
diff --git a/libs/pyparsing/core.py b/libs/pyparsing/core.py
index 73514ed09..cbe73c987 100644
--- a/libs/pyparsing/core.py
+++ b/libs/pyparsing/core.py
@@ -53,6 +53,11 @@ 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
+
 #
 # Copyright (c) 2003-2022  Paul T. McGuire
 #
@@ -218,19 +223,11 @@ if _should_enable_warnings(
 
 
 # build list of single arg builtins, that can be used as parse actions
+# fmt: off
 _single_arg_builtins = {
-    sum,
-    len,
-    sorted,
-    reversed,
-    list,
-    tuple,
-    set,
-    any,
-    all,
-    min,
-    max,
+    sum, len, sorted, reversed, list, tuple, set, any, all, min, max
 }
+# fmt: on
 
 _generatorType = types.GeneratorType
 ParseImplReturnType = Tuple[int, Any]
@@ -255,13 +252,13 @@ DebugSuccessAction = Callable[
 DebugExceptionAction = Callable[[str, int, "ParserElement", Exception, bool], None]
 
 
-alphas = string.ascii_uppercase + string.ascii_lowercase
-identchars = pyparsing_unicode.Latin1.identchars
-identbodychars = pyparsing_unicode.Latin1.identbodychars
-nums = "0123456789"
-hexnums = nums + "ABCDEFabcdef"
-alphanums = alphas + nums
-printables = "".join([c for c in string.printable if c not in string.whitespace])
+alphas: str = string.ascii_uppercase + string.ascii_lowercase
+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])
 
 _trim_arity_call_line: traceback.StackSummary = None  # type: ignore[assignment]
 
@@ -280,7 +277,7 @@ def _trim_arity(func, max_limit=3):
     # user's parse action 'func', so that we don't incur call penalty at parse time
 
     # fmt: off
-    LINE_DIFF = 7
+    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])
@@ -288,6 +285,8 @@ def _trim_arity(func, max_limit=3):
 
     def wrapper(*args):
         nonlocal found_arity, limit
+        if found_arity:
+            return func(*args[limit:])
         while 1:
             try:
                 ret = func(*args[limit:])
@@ -476,7 +475,7 @@ class ParserElement(ABC):
         self.streamlined = False
         # optimize exception handling for subclasses that don't advance parse index
         self.mayIndexError = True
-        self.errmsg = ""
+        self.errmsg: Union[str, None] = ""
         # mark results names as modal (report only last) or cumulative (list all)
         self.modalResults = True
         # custom debug actions
@@ -571,6 +570,7 @@ class ParserElement(ABC):
 
         Example::
 
+            integer = Word(nums)
             date_str = (integer.set_results_name("year") + '/'
                         + integer.set_results_name("month") + '/'
                         + integer.set_results_name("day"))
@@ -581,15 +581,15 @@ class ParserElement(ABC):
         listAllMatches = listAllMatches or list_all_matches
         return self._setResultsName(name, listAllMatches)
 
-    def _setResultsName(self, name, listAllMatches=False):
+    def _setResultsName(self, name, list_all_matches=False) -> "ParserElement":
         if name is None:
             return self
         newself = self.copy()
         if name.endswith("*"):
             name = name[:-1]
-            listAllMatches = True
+            list_all_matches = True
         newself.resultsName = name
-        newself.modalResults = not listAllMatches
+        newself.modalResults = not list_all_matches
         return newself
 
     def set_break(self, break_flag: bool = True) -> "ParserElement":
@@ -601,21 +601,20 @@ class ParserElement(ABC):
         if break_flag:
             _parseMethod = self._parse
 
-            def breaker(instring, loc, doActions=True, callPreParse=True):
+            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()
-                return _parseMethod(instring, loc, doActions, callPreParse)
+                return _parseMethod(instring, loc, do_actions, callPreParse)
 
             breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
             self._parse = breaker  # type: ignore [assignment]
-        else:
-            if hasattr(self._parse, "_originalParseMethod"):
-                self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
+        elif hasattr(self._parse, "_originalParseMethod"):
+            self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
         return self
 
-    def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
+    def set_parse_action(self, *fns: ParseAction, **kwargs: Any) -> "ParserElement":
         """
         Define one or more actions to perform when successfully matching parse element definition.
 
@@ -691,17 +690,19 @@ class ParserElement(ABC):
                 ''')
         """
         if list(fns) == [None]:
-            self.parseAction = []
-        else:
-            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.parseAction.clear()
+            return self
+
+        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)
+        )
+
         return self
 
-    def add_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
+    def add_parse_action(self, *fns: ParseAction, **kwargs: Any) -> "ParserElement":
         """
         Add one or more parse actions to expression's list of parse actions. See :class:`set_parse_action`.
 
@@ -713,7 +714,7 @@ class ParserElement(ABC):
         )
         return self
 
-    def add_condition(self, *fns: ParseCondition, **kwargs) -> "ParserElement":
+    def add_condition(self, *fns: ParseCondition, **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.
@@ -799,7 +800,7 @@ class ParserElement(ABC):
 
         return loc
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         return loc, []
 
     def postParse(self, instring, loc, tokenlist):
@@ -807,10 +808,10 @@ class ParserElement(ABC):
 
     # @profile
     def _parseNoCache(
-        self, instring, loc, doActions=True, callPreParse=True
+        self, instring, loc, do_actions=True, callPreParse=True
     ) -> Tuple[int, ParseResults]:
         TRY, MATCH, FAIL = 0, 1, 2
-        debugging = self.debug  # and doActions)
+        debugging = self.debug  # and do_actions)
         len_instring = len(instring)
 
         if debugging or self.failAction:
@@ -825,11 +826,11 @@ class ParserElement(ABC):
                     self.debugActions.debug_try(instring, tokens_start, self, False)
                 if self.mayIndexError or pre_loc >= len_instring:
                     try:
-                        loc, tokens = self.parseImpl(instring, pre_loc, doActions)
+                        loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
                     except IndexError:
                         raise ParseException(instring, len_instring, self.errmsg, self)
                 else:
-                    loc, tokens = self.parseImpl(instring, pre_loc, doActions)
+                    loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
             except Exception as err:
                 # print("Exception raised:", err)
                 if self.debugActions.debug_fail:
@@ -847,18 +848,18 @@ class ParserElement(ABC):
             tokens_start = pre_loc
             if self.mayIndexError or pre_loc >= len_instring:
                 try:
-                    loc, tokens = self.parseImpl(instring, pre_loc, doActions)
+                    loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
                 except IndexError:
                     raise ParseException(instring, len_instring, self.errmsg, self)
             else:
-                loc, tokens = self.parseImpl(instring, pre_loc, doActions)
+                loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
 
         tokens = self.postParse(instring, loc, tokens)
 
         ret_tokens = ParseResults(
             tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults
         )
-        if self.parseAction and (doActions or self.callDuringTry):
+        if self.parseAction and (do_actions or self.callDuringTry):
             if debugging:
                 try:
                     for fn in self.parseAction:
@@ -917,7 +918,7 @@ class ParserElement(ABC):
         do_actions: bool = False,
     ) -> int:
         try:
-            return self._parse(instring, loc, doActions=do_actions)[0]
+            return self._parse(instring, loc, do_actions=do_actions)[0]
         except ParseFatalException:
             if raise_fatal:
                 raise
@@ -944,11 +945,9 @@ class ParserElement(ABC):
 
         not_in_cache: bool
 
-        def get(self, *args):
-            ...
+        def get(self, *args): ...
 
-        def set(self, *args):
-            ...
+        def set(self, *args): ...
 
     # argument cache for optimizing repeated calls when backtracking through recursive expressions
     packrat_cache = (
@@ -960,18 +959,18 @@ class ParserElement(ABC):
     # this method gets repeatedly called during backtracking with the same arguments -
     # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
     def _parseCache(
-        self, instring, loc, doActions=True, callPreParse=True
+        self, instring, loc, do_actions=True, callPreParse=True
     ) -> Tuple[int, ParseResults]:
         HIT, MISS = 0, 1
         TRY, MATCH, FAIL = 0, 1, 2
-        lookup = (self, instring, loc, callPreParse, doActions)
+        lookup = (self, instring, loc, callPreParse, do_actions)
         with ParserElement.packrat_cache_lock:
             cache = ParserElement.packrat_cache
             value = cache.get(lookup)
             if value is cache.not_in_cache:
                 ParserElement.packrat_cache_stats[MISS] += 1
                 try:
-                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
+                    value = self._parseNoCache(instring, loc, do_actions, callPreParse)
                 except ParseBaseException as pe:
                     # cache a copy of the exception, without the traceback
                     cache.set(lookup, pe.__class__(*pe.args))
@@ -1080,7 +1079,7 @@ class ParserElement(ABC):
         elif cache_size_limit > 0:
             ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
         else:
-            raise NotImplementedError("Memo size of %s" % cache_size_limit)
+            raise NotImplementedError(f"Memo size of {cache_size_limit}")
         ParserElement._left_recursion_enabled = True
 
     @staticmethod
@@ -1121,13 +1120,16 @@ class ParserElement(ABC):
             ParserElement.disable_memoization()
         elif ParserElement._left_recursion_enabled:
             raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-        if not ParserElement._packratEnabled:
-            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
+
+        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
 
     def parse_string(
         self, instring: str, parse_all: bool = False, *, parseAll: bool = False
@@ -1187,7 +1189,7 @@ class ParserElement(ABC):
             loc, tokens = self._parse(instring, 0)
             if parseAll:
                 loc = self.preParse(instring, loc)
-                se = Empty() + StringEnd()
+                se = Empty() + StringEnd().set_debug(False)
                 se._parse(instring, loc)
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
@@ -1285,9 +1287,9 @@ class ParserElement(ABC):
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def transform_string(self, instring: str, *, debug: bool = False) -> str:
         """
@@ -1317,23 +1319,27 @@ class ParserElement(ABC):
         try:
             for t, s, e in self.scan_string(instring, debug=debug):
                 out.append(instring[lastE:s])
-                if t:
-                    if isinstance(t, ParseResults):
-                        out += t.as_list()
-                    elif isinstance(t, Iterable) and not isinstance(t, str_type):
-                        out.extend(t)
-                    else:
-                        out.append(t)
                 lastE = e
+
+                if not t:
+                    continue
+
+                if isinstance(t, ParseResults):
+                    out += t.as_list()
+                elif isinstance(t, Iterable) and not isinstance(t, str_type):
+                    out.extend(t)
+                else:
+                    out.append(t)
+
             out.append(instring[lastE:])
             out = [o for o in out if o]
             return "".join([str(s) for s in _flatten(out)])
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def search_string(
         self,
@@ -1371,9 +1377,9 @@ class ParserElement(ABC):
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def split(
         self,
@@ -1502,9 +1508,12 @@ class ParserElement(ABC):
         elif isinstance(other, tuple) and other[:1] == (Ellipsis,):
             other = ((0,) + other[1:] + (None,))[:2]
 
+        if not isinstance(other, (int, tuple)):
+            return NotImplemented
+
         if isinstance(other, int):
             minElements, optElements = other, 0
-        elif isinstance(other, tuple):
+        else:
             other = tuple(o if o is not Ellipsis else None for o in other)
             other = (other + (None, None))[:2]
             if other[0] is None:
@@ -1521,8 +1530,6 @@ class ParserElement(ABC):
                 optElements -= minElements
             else:
                 return NotImplemented
-        else:
-            return NotImplemented
 
         if minElements < 0:
             raise ValueError("cannot multiply ParserElement by negative value")
@@ -1711,8 +1718,8 @@ class ParserElement(ABC):
         """
         if name is not None:
             return self._setResultsName(name)
-        else:
-            return self.copy()
+
+        return self.copy()
 
     def suppress(self) -> "ParserElement":
         """
@@ -1770,7 +1777,7 @@ class ParserElement(ABC):
 
         Example::
 
-            patt = Word(alphas)[1, ...]
+            patt = Word(alphas)[...]
             patt.parse_string('ablaj /* comment */ lskjd')
             # -> ['ablaj']
 
@@ -1778,8 +1785,6 @@ class ParserElement(ABC):
             patt.parse_string('ablaj /* comment */ lskjd')
             # -> ['ablaj', 'lskjd']
         """
-        import typing
-
         if isinstance(other, str_type):
             other = Suppress(other)
 
@@ -1881,19 +1886,29 @@ class ParserElement(ABC):
         Child classes must define this method, which defines how the ``default_name`` is set.
         """
 
-    def set_name(self, name: str) -> "ParserElement":
+    def set_name(self, name: typing.Optional[str]) -> "ParserElement":
         """
-        Define name for this expression, makes debugging and exception messages clearer.
+        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
+        enable debug for this expression.
+
+        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::
 
-            Word(nums).parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
-            Word(nums).set_name("integer").parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+            integer = Word(nums)
+            integer.parse_string("ABC")  # -> Exception: Expected W:(0-9) (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)
         """
         self.customName = name
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {str(self)}"
+
         if __diag__.enable_debug_on_named_expressions:
-            self.set_debug()
+            self.set_debug(name is not None)
+
         return self
 
     @property
@@ -1901,6 +1916,10 @@ class ParserElement(ABC):
         # This will use 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
+    def name(self, new_name) -> None:
+        self.set_name(new_name)
+
     def __str__(self) -> str:
         return self.name
 
@@ -1957,9 +1976,9 @@ class ParserElement(ABC):
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def __eq__(self, other):
         if self is other:
@@ -2005,7 +2024,9 @@ class ParserElement(ABC):
         full_dump: bool = True,
         print_results: bool = True,
         failure_tests: bool = False,
-        post_parse: typing.Optional[Callable[[str, ParseResults], str]] = None,
+        post_parse: typing.Optional[
+            Callable[[str, ParseResults], typing.Optional[str]]
+        ] = None,
         file: typing.Optional[TextIO] = None,
         with_line_numbers: bool = False,
         *,
@@ -2013,7 +2034,9 @@ class ParserElement(ABC):
         fullDump: bool = True,
         printResults: bool = True,
         failureTests: bool = False,
-        postParse: typing.Optional[Callable[[str, ParseResults], str]] = None,
+        postParse: typing.Optional[
+            Callable[[str, ParseResults], typing.Optional[str]]
+        ] = None,
     ) -> Tuple[bool, List[Tuple[str, Union[ParseResults, Exception]]]]:
         """
         Execute the parse expression on a series of test strings, showing each
@@ -2137,6 +2160,7 @@ class ParserElement(ABC):
         success = True
         NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
         BOM = "\ufeff"
+        nlstr = "\n"
         for t in tests:
             if comment_specified and comment.matches(t, False) or comments and not t:
                 comments.append(
@@ -2146,18 +2170,18 @@ class ParserElement(ABC):
             if not t:
                 continue
             out = [
-                "\n" + "\n".join(comments) if comments else "",
+                f"{nlstr}{nlstr.join(comments) if comments else ''}",
                 pyparsing_test.with_line_numbers(t) if with_line_numbers else t,
             ]
-            comments = []
+            comments.clear()
             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)
             except ParseBaseException as pe:
-                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
+                fatal = "(FATAL) " if isinstance(pe, ParseFatalException) else ""
                 out.append(pe.explain())
-                out.append("FAIL: " + str(pe))
+                out.append(f"FAIL: {fatal}{pe}")
                 if ParserElement.verbose_stacktrace:
                     out.extend(traceback.format_tb(pe.__traceback__))
                 success = success and failureTests
@@ -2244,93 +2268,46 @@ class ParserElement(ABC):
             show_groups=show_groups,
             diagram_kwargs=kwargs,
         )
-        if isinstance(output_html, (str, Path)):
-            with open(output_html, "w", encoding="utf-8") as diag_file:
-                diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
-        else:
+        if not isinstance(output_html, (str, Path)):
             # we were passed a file-like object, just write to it
             output_html.write(railroad_to_html(railroad, embed=embed, **kwargs))
+            return
+
+        with open(output_html, "w", encoding="utf-8") as diag_file:
+            diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
 
     # Compatibility synonyms
     # fmt: off
-    @staticmethod
-    @replaced_by_pep8(inline_literals_using)
-    def inlineLiteralsUsing(): ...
+    inlineLiteralsUsing = staticmethod(replaced_by_pep8("inlineLiteralsUsing", inline_literals_using))
+    setDefaultWhitespaceChars = staticmethod(replaced_by_pep8(
+        "setDefaultWhitespaceChars", set_default_whitespace_chars
+    ))
+    disableMemoization = staticmethod(replaced_by_pep8("disableMemoization", disable_memoization))
+    enableLeftRecursion = staticmethod(replaced_by_pep8("enableLeftRecursion", enable_left_recursion))
+    enablePackrat = staticmethod(replaced_by_pep8("enablePackrat", enable_packrat))
+    resetCache = staticmethod(replaced_by_pep8("resetCache", reset_cache))
 
-    @staticmethod
-    @replaced_by_pep8(set_default_whitespace_chars)
-    def setDefaultWhitespaceChars(): ...
-
-    @replaced_by_pep8(set_results_name)
-    def setResultsName(self): ...
-
-    @replaced_by_pep8(set_break)
-    def setBreak(self): ...
-
-    @replaced_by_pep8(set_parse_action)
-    def setParseAction(self): ...
-
-    @replaced_by_pep8(add_parse_action)
-    def addParseAction(self): ...
-
-    @replaced_by_pep8(add_condition)
-    def addCondition(self): ...
-
-    @replaced_by_pep8(set_fail_action)
-    def setFailAction(self): ...
-
-    @replaced_by_pep8(try_parse)
-    def tryParse(self): ...
-
-    @staticmethod
-    @replaced_by_pep8(enable_left_recursion)
-    def enableLeftRecursion(): ...
-
-    @staticmethod
-    @replaced_by_pep8(enable_packrat)
-    def enablePackrat(): ...
-
-    @replaced_by_pep8(parse_string)
-    def parseString(self): ...
-
-    @replaced_by_pep8(scan_string)
-    def scanString(self): ...
-
-    @replaced_by_pep8(transform_string)
-    def transformString(self): ...
-
-    @replaced_by_pep8(search_string)
-    def searchString(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
-
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(set_whitespace_chars)
-    def setWhitespaceChars(self): ...
-
-    @replaced_by_pep8(parse_with_tabs)
-    def parseWithTabs(self): ...
-
-    @replaced_by_pep8(set_debug_actions)
-    def setDebugActions(self): ...
-
-    @replaced_by_pep8(set_debug)
-    def setDebug(self): ...
-
-    @replaced_by_pep8(set_name)
-    def setName(self): ...
-
-    @replaced_by_pep8(parse_file)
-    def parseFile(self): ...
-
-    @replaced_by_pep8(run_tests)
-    def runTests(self): ...
-
-    canParseNext = can_parse_next
-    resetCache = reset_cache
+    setResultsName = replaced_by_pep8("setResultsName", set_results_name)
+    setBreak = replaced_by_pep8("setBreak", set_break)
+    setParseAction = replaced_by_pep8("setParseAction", set_parse_action)
+    addParseAction = replaced_by_pep8("addParseAction", add_parse_action)
+    addCondition = replaced_by_pep8("addCondition", add_condition)
+    setFailAction = replaced_by_pep8("setFailAction", set_fail_action)
+    tryParse = replaced_by_pep8("tryParse", try_parse)
+    parseString = replaced_by_pep8("parseString", parse_string)
+    scanString = replaced_by_pep8("scanString", scan_string)
+    transformString = replaced_by_pep8("transformString", transform_string)
+    searchString = replaced_by_pep8("searchString", search_string)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    setWhitespaceChars = replaced_by_pep8("setWhitespaceChars", set_whitespace_chars)
+    parseWithTabs = replaced_by_pep8("parseWithTabs", parse_with_tabs)
+    setDebugActions = replaced_by_pep8("setDebugActions", set_debug_actions)
+    setDebug = replaced_by_pep8("setDebug", set_debug)
+    setName = replaced_by_pep8("setName", set_name)
+    parseFile = replaced_by_pep8("parseFile", parse_file)
+    runTests = replaced_by_pep8("runTests", run_tests)
+    canParseNext = replaced_by_pep8("canParseNext", can_parse_next)
     defaultName = default_name
     # fmt: on
 
@@ -2358,7 +2335,7 @@ class _PendingSkip(ParserElement):
             def show_skip(t):
                 if t._skipped.as_list()[-1:] == [""]:
                     t.pop("_skipped")
-                    t["_skipped"] = "missing <" + repr(self.anchor) + ">"
+                    t["_skipped"] = f"missing <{self.anchor!r}>"
 
             return (
                 self.anchor + skipper().add_parse_action(must_skip)
@@ -2370,7 +2347,7 @@ class _PendingSkip(ParserElement):
     def __repr__(self):
         return self.defaultName
 
-    def parseImpl(self, *args):
+    def parseImpl(self, *args) -> ParseImplReturnType:
         raise Exception(
             "use of `...` expression without following SkipTo target expression"
         )
@@ -2399,7 +2376,7 @@ class NoMatch(Token):
         self.mayIndexError = False
         self.errmsg = "Unmatchable token"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         raise ParseException(instring, loc, self.errmsg, self)
 
 
@@ -2409,9 +2386,9 @@ class Literal(Token):
 
     Example::
 
-        Literal('blah').parse_string('blah')  # -> ['blah']
-        Literal('blah').parse_string('blahfooblah')  # -> ['blah']
-        Literal('blah').parse_string('bla')  # -> Exception: Expected "blah"
+        Literal('abc').parse_string('abc')  # -> ['abc']
+        Literal('abc').parse_string('abcdef')  # -> ['abc']
+        Literal('abc').parse_string('ab')  # -> Exception: Expected "abc"
 
     For case-insensitive matching, use :class:`CaselessLiteral`.
 
@@ -2441,14 +2418,14 @@ class Literal(Token):
         self.match = match_string
         self.matchLen = len(match_string)
         self.firstMatchChar = match_string[:1]
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayReturnEmpty = False
         self.mayIndexError = False
 
     def _generateDefaultName(self) -> str:
         return repr(self.match)
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if instring[loc] == self.firstMatchChar and instring.startswith(
             self.match, loc
         ):
@@ -2469,12 +2446,12 @@ class Empty(Literal):
     def _generateDefaultName(self) -> str:
         return "Empty"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         return loc, []
 
 
 class _SingleCharLiteral(Literal):
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if instring[loc] == self.firstMatchChar:
             return loc + 1, self.match
         raise ParseException(instring, loc, self.errmsg, self)
@@ -2544,7 +2521,7 @@ class Keyword(Token):
     def _generateDefaultName(self) -> str:
         return repr(self.match)
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         errmsg = self.errmsg
         errloc = loc
         if self.caseless:
@@ -2555,39 +2532,36 @@ class Keyword(Token):
                         or instring[loc + self.matchLen].upper() not in self.identChars
                     ):
                         return loc + self.matchLen, self.match
-                    else:
-                        # followed by keyword char
-                        errmsg += ", was immediately followed by keyword character"
-                        errloc = loc + self.matchLen
+
+                    # followed by keyword char
+                    errmsg += ", was immediately followed by keyword character"
+                    errloc = loc + self.matchLen
                 else:
                     # preceded by keyword char
                     errmsg += ", keyword was immediately preceded by keyword character"
                     errloc = loc - 1
             # else no match just raise plain exception
 
-        else:
-            if (
-                instring[loc] == self.firstMatchChar
-                and self.matchLen == 1
-                or instring.startswith(self.match, loc)
-            ):
-                if loc == 0 or instring[loc - 1] not in self.identChars:
-                    if (
-                        loc >= len(instring) - self.matchLen
-                        or instring[loc + self.matchLen] not in self.identChars
-                    ):
-                        return loc + self.matchLen, self.match
-                    else:
-                        # followed by keyword char
-                        errmsg += (
-                            ", keyword was immediately followed by keyword character"
-                        )
-                        errloc = loc + self.matchLen
-                else:
-                    # preceded by keyword char
-                    errmsg += ", keyword was immediately preceded by keyword character"
-                    errloc = loc - 1
-            # else no match just raise plain exception
+        elif (
+            instring[loc] == self.firstMatchChar
+            and self.matchLen == 1
+            or instring.startswith(self.match, loc)
+        ):
+            if loc == 0 or instring[loc - 1] not in self.identChars:
+                if (
+                    loc >= len(instring) - self.matchLen
+                    or instring[loc + self.matchLen] not in self.identChars
+                ):
+                    return loc + self.matchLen, self.match
+
+                # followed by keyword char
+                errmsg += ", keyword was immediately followed by keyword character"
+                errloc = loc + self.matchLen
+            else:
+                # preceded by keyword char
+                errmsg += ", keyword was immediately preceded by keyword character"
+                errloc = loc - 1
+        # else no match just raise plain exception
 
         raise ParseException(instring, errloc, errmsg, self)
 
@@ -2598,7 +2572,10 @@ class Keyword(Token):
         """
         Keyword.DEFAULT_KEYWORD_CHARS = chars
 
-    setDefaultKeywordChars = set_default_keyword_chars
+    # Compatibility synonyms
+    setDefaultKeywordChars = staticmethod(
+        replaced_by_pep8("setDefaultKeywordChars", set_default_keyword_chars)
+    )
 
 
 class CaselessLiteral(Literal):
@@ -2620,9 +2597,9 @@ class CaselessLiteral(Literal):
         super().__init__(match_string.upper())
         # Preserve the defining literal.
         self.returnString = match_string
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if instring[loc : loc + self.matchLen].upper() == self.match:
             return loc + self.matchLen, self.returnString
         raise ParseException(instring, loc, self.errmsg, self)
@@ -2708,7 +2685,7 @@ class CloseMatch(Token):
     def _generateDefaultName(self) -> str:
         return f"{type(self).__name__}:{self.match_string!r}"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         start = loc
         instrlen = len(instring)
         maxloc = start + len(self.match_string)
@@ -2795,7 +2772,7 @@ class Word(Token):
         integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
 
         # a word with a leading capital, and zero or more lowercase
-        capital_word = Word(alphas.upper(), alphas.lower())
+        capitalized_word = Word(alphas.upper(), alphas.lower())
 
         # hostnames are alphanumeric, with leading alpha, and '-'
         hostname = Word(alphas, alphanums + '-')
@@ -2872,7 +2849,7 @@ class Word(Token):
             self.maxLen = exact
             self.minLen = exact
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.asKeyword = asKeyword
         if self.asKeyword:
@@ -2929,10 +2906,11 @@ class Word(Token):
         def charsAsStr(s):
             max_repr_len = 16
             s = _collapse_string_to_ranges(s, re_escape=False)
+
             if len(s) > max_repr_len:
                 return s[: max_repr_len - 3] + "..."
-            else:
-                return s
+
+            return s
 
         if self.initChars != self.bodyChars:
             base = f"W:({charsAsStr(self.initChars)}, {charsAsStr(self.bodyChars)})"
@@ -2952,39 +2930,36 @@ class Word(Token):
                 return base + f"{{{self.minLen},{self.maxLen}}}"
         return base
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if instring[loc] not in self.initChars:
             raise ParseException(instring, loc, self.errmsg, self)
 
         start = loc
         loc += 1
         instrlen = len(instring)
-        bodychars = self.bodyChars
+        body_chars: set[str] = self.bodyChars
         maxloc = start + self.maxLen
         maxloc = min(maxloc, instrlen)
-        while loc < maxloc and instring[loc] in bodychars:
+        while loc < maxloc and instring[loc] in body_chars:
             loc += 1
 
-        throwException = False
+        throw_exception = False
         if loc - start < self.minLen:
-            throwException = True
-        elif self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
-            throwException = True
-        elif self.asKeyword:
-            if (
-                start > 0
-                and instring[start - 1] in bodychars
-                or loc < instrlen
-                and instring[loc] in bodychars
-            ):
-                throwException = True
+            throw_exception = True
+        elif self.maxSpecified and loc < instrlen and instring[loc] in body_chars:
+            throw_exception = True
+        elif self.asKeyword and (
+            (start > 0 and instring[start - 1] in body_chars)
+            or (loc < instrlen and instring[loc] in body_chars)
+        ):
+            throw_exception = True
 
-        if throwException:
+        if throw_exception:
             raise ParseException(instring, loc, self.errmsg, self)
 
         return loc, instring[start:loc]
 
-    def parseImpl_regex(self, instring, loc, doActions=True):
+    def parseImpl_regex(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3077,7 +3052,7 @@ class Regex(Token):
                 "Regex may only be constructed with a string or a compiled RE object"
             )
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.asGroupList = asGroupList
         self.asMatch = asMatch
@@ -3087,27 +3062,28 @@ class Regex(Token):
             self.parseImpl = self.parseImplAsMatch  # type: ignore [assignment]
 
     @cached_property
-    def re(self):
+    def re(self) -> _RePattern:
         if self._re:
             return self._re
-        else:
-            try:
-                return re.compile(self.pattern, self.flags)
-            except re.error:
-                raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
+
+        try:
+            return re.compile(self.pattern, self.flags)
+        except re.error:
+            raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
 
     @cached_property
-    def re_match(self):
+    def re_match(self) -> Callable[[str], Any]:
         return self.re.match
 
     @cached_property
-    def mayReturnEmpty(self):
+    def mayReturnEmpty(self) -> bool:
         return self.re_match("") is not None
 
     def _generateDefaultName(self) -> str:
-        return "Re:({})".format(repr(self.pattern).replace("\\\\", "\\"))
+        unescaped = self.pattern.replace("\\\\", "\\")
+        return f"Re:({unescaped!r})"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3115,12 +3091,13 @@ class Regex(Token):
         loc = result.end()
         ret = ParseResults(result.group())
         d = result.groupdict()
-        if d:
-            for k, v in d.items():
-                ret[k] = v
+
+        for k, v in d.items():
+            ret[k] = v
+
         return loc, ret
 
-    def parseImplAsGroupList(self, instring, loc, doActions=True):
+    def parseImplAsGroupList(self, instring, loc, do_actions=True):
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3129,7 +3106,7 @@ class Regex(Token):
         ret = result.groups()
         return loc, ret
 
-    def parseImplAsMatch(self, instring, loc, doActions=True):
+    def parseImplAsMatch(self, instring, loc, do_actions=True):
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3209,6 +3186,7 @@ class QuotedString(Token):
         [['This is the "quote"']]
         [['This is the quote with "embedded" quotes']]
     """
+
     ws_map = dict(((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r")))
 
     def __init__(
@@ -3265,7 +3243,7 @@ class QuotedString(Token):
 
         # fmt: off
         # build up re pattern for the content between the quote delimiters
-        inner_pattern = []
+        inner_pattern: List[str] = []
 
         if esc_quote:
             inner_pattern.append(rf"(?:{re.escape(esc_quote)})")
@@ -3287,12 +3265,12 @@ class QuotedString(Token):
             self.re_flags |= re.MULTILINE | re.DOTALL
             inner_pattern.append(
                 rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}"
-                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
+                rf"{(_escape_regex_range_chars(self.esc_char) if self.has_esc_char else '')}])"
             )
         else:
             inner_pattern.append(
                 rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}\n\r"
-                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
+                rf"{(_escape_regex_range_chars(self.esc_char) if self.has_esc_char else '')}])"
             )
 
         self.pattern = "".join(
@@ -3328,7 +3306,7 @@ class QuotedString(Token):
         except re.error:
             raise ValueError(f"invalid pattern {self.pattern!r} passed to Regex")
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.mayReturnEmpty = True
 
@@ -3340,7 +3318,7 @@ class QuotedString(Token):
 
         return f"quoted string, starting with {self.quote_char} ending with {self.end_quote_char}"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         # check first character of opening quote to see if that is a match
         # before doing the more complicated regex match
         result = (
@@ -3428,8 +3406,8 @@ class CharsNotIn(Token):
 
         if min < 1:
             raise ValueError(
-                "cannot specify a minimum length < 1; use "
-                "Opt(CharsNotIn()) if zero-length char group is permitted"
+                "cannot specify a minimum length < 1; use"
+                " Opt(CharsNotIn()) if zero-length char group is permitted"
             )
 
         self.minLen = min
@@ -3443,7 +3421,7 @@ class CharsNotIn(Token):
             self.maxLen = exact
             self.minLen = exact
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayReturnEmpty = self.minLen == 0
         self.mayIndexError = False
 
@@ -3454,7 +3432,7 @@ class CharsNotIn(Token):
         else:
             return f"!W:({self.notChars})"
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         notchars = self.notCharsSet
         if instring[loc] in notchars:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3516,7 +3494,7 @@ class White(Token):
         )
         # self.leave_whitespace()
         self.mayReturnEmpty = True
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
 
         self.minLen = min
 
@@ -3532,7 +3510,7 @@ class White(Token):
     def _generateDefaultName(self) -> str:
         return "".join(White.whiteStrs[c] for c in self.matchWhite)
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if instring[loc] not in self.matchWhite:
             raise ParseException(instring, loc, self.errmsg, self)
         start = loc
@@ -3565,19 +3543,22 @@ class GoToColumn(PositionToken):
         self.col = colno
 
     def preParse(self, instring: str, loc: int) -> int:
-        if col(loc, instring) != self.col:
-            instrlen = len(instring)
-            if self.ignoreExprs:
-                loc = self._skipIgnorables(instring, loc)
-            while (
-                loc < instrlen
-                and instring[loc].isspace()
-                and col(loc, instring) != self.col
-            ):
-                loc += 1
+        if col(loc, instring) == self.col:
+            return loc
+
+        instrlen = len(instring)
+        if self.ignoreExprs:
+            loc = self._skipIgnorables(instring, loc)
+        while (
+            loc < instrlen
+            and instring[loc].isspace()
+            and col(loc, instring) != self.col
+        ):
+            loc += 1
+
         return loc
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         thiscol = col(loc, instring)
         if thiscol > self.col:
             raise ParseException(instring, loc, "Text not in expected column", self)
@@ -3615,19 +3596,21 @@ class LineStart(PositionToken):
         self.orig_whiteChars = set() | self.whiteChars
         self.whiteChars.discard("\n")
         self.skipper = Empty().set_whitespace_chars(self.whiteChars)
-        self.errmsg = "Expected start of line"
+        self.set_name("start of line")
 
     def preParse(self, instring: str, loc: int) -> int:
         if loc == 0:
             return loc
-        else:
-            ret = self.skipper.preParse(instring, loc)
-            if "\n" in self.orig_whiteChars:
-                while instring[ret : ret + 1] == "\n":
-                    ret = self.skipper.preParse(instring, ret + 1)
-            return ret
 
-    def parseImpl(self, instring, loc, doActions=True):
+        ret = self.skipper.preParse(instring, loc)
+
+        if "\n" in self.orig_whiteChars:
+            while instring[ret : ret + 1] == "\n":
+                ret = self.skipper.preParse(instring, ret + 1)
+
+        return ret
+
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if col(loc, instring) == 1:
             return loc, []
         raise ParseException(instring, loc, self.errmsg, self)
@@ -3642,9 +3625,9 @@ class LineEnd(PositionToken):
         super().__init__()
         self.whiteChars.discard("\n")
         self.set_whitespace_chars(self.whiteChars, copy_defaults=False)
-        self.errmsg = "Expected end of line"
+        self.set_name("end of line")
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if loc < len(instring):
             if instring[loc] == "\n":
                 return loc + 1, "\n"
@@ -3663,13 +3646,13 @@ class StringStart(PositionToken):
 
     def __init__(self):
         super().__init__()
-        self.errmsg = "Expected start of text"
+        self.set_name("start of text")
+
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
+        # see if entire string up to here is just whitespace and ignoreables
+        if loc != 0 and loc != self.preParse(instring, 0):
+            raise ParseException(instring, loc, self.errmsg, self)
 
-    def parseImpl(self, instring, loc, doActions=True):
-        if loc != 0:
-            # see if entire string up to here is just whitespace and ignoreables
-            if loc != self.preParse(instring, 0):
-                raise ParseException(instring, loc, self.errmsg, self)
         return loc, []
 
 
@@ -3680,17 +3663,17 @@ class StringEnd(PositionToken):
 
     def __init__(self):
         super().__init__()
-        self.errmsg = "Expected end of text"
+        self.set_name("end of text")
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if loc < len(instring):
             raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
+        if loc == len(instring):
             return loc + 1, []
-        elif loc > len(instring):
+        if loc > len(instring):
             return loc, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
+
+        raise ParseException(instring, loc, self.errmsg, self)
 
 
 class WordStart(PositionToken):
@@ -3707,9 +3690,9 @@ class WordStart(PositionToken):
         wordChars = word_chars if wordChars == printables else wordChars
         super().__init__()
         self.wordChars = set(wordChars)
-        self.errmsg = "Not at the start of a word"
+        self.set_name("start of a word")
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if loc != 0:
             if (
                 instring[loc - 1] in self.wordChars
@@ -3733,9 +3716,9 @@ class WordEnd(PositionToken):
         super().__init__()
         self.wordChars = set(wordChars)
         self.skipWhitespace = False
-        self.errmsg = "Not at the end of a word"
+        self.set_name("end of a word")
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         instrlen = len(instring)
         if instrlen > 0 and loc < instrlen:
             if (
@@ -3746,6 +3729,47 @@ class WordEnd(PositionToken):
         return loc, []
 
 
+class Tag(Token):
+    """
+    A meta-element for inserting a named result into the parsed
+    tokens that may be checked later in a parse action or while
+    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())
+
+        result = greeting.parse_string("Hello, World!")
+        print(result.dump())
+
+    prints::
+
+        ['Hello,', 'World', '.']
+
+        ['Hello,', 'World', '!']
+        - enthusiastic: True
+    """
+    def __init__(self, tag_name: str, value: Any = True):
+        super().__init__()
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.leave_whitespace()
+        self.tag_name = tag_name
+        self.tag_value = value
+        self.add_parse_action(self._add_tag)
+
+    def _add_tag(self, tokens: ParseResults):
+        tokens[self.tag_name] = self.tag_value
+
+    def _generateDefaultName(self) -> str:
+        return f"{type(self).__name__}:{self.tag_name}={self.tag_value!r}"
+
+
 class ParseExpression(ParserElement):
     """Abstract subclass of ParserElement, for combining and
     post-processing parsed tokens.
@@ -3823,7 +3847,7 @@ class ParseExpression(ParserElement):
         return self
 
     def _generateDefaultName(self) -> str:
-        return f"{self.__class__.__name__}:({str(self.exprs)})"
+        return f"{type(self).__name__}:({self.exprs})"
 
     def streamline(self) -> ParserElement:
         if self.streamlined:
@@ -3862,7 +3886,7 @@ class ParseExpression(ParserElement):
                 self.mayReturnEmpty |= other.mayReturnEmpty
                 self.mayIndexError |= other.mayIndexError
 
-        self.errmsg = "Expected " + str(self)
+        self.errmsg = f"Expected {self}"
 
         return self
 
@@ -3883,39 +3907,37 @@ class ParseExpression(ParserElement):
         ret.exprs = [e.copy() for e in self.exprs]
         return ret
 
-    def _setResultsName(self, name, listAllMatches=False):
-        if (
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
+        if not (
             __diag__.warn_ungrouped_named_tokens_in_collection
             and Diagnostics.warn_ungrouped_named_tokens_in_collection
             not in self.suppress_warnings_
         ):
-            for e in self.exprs:
-                if (
-                    isinstance(e, ParserElement)
-                    and e.resultsName
-                    and Diagnostics.warn_ungrouped_named_tokens_in_collection
-                    not in e.suppress_warnings_
-                ):
-                    warnings.warn(
-                        "{}: setting results name {!r} on {} expression "
-                        "collides with {!r} on contained expression".format(
-                            "warn_ungrouped_named_tokens_in_collection",
-                            name,
-                            type(self).__name__,
-                            e.resultsName,
-                        ),
-                        stacklevel=3,
-                    )
+            return super()._setResultsName(name, list_all_matches)
 
-        return super()._setResultsName(name, listAllMatches)
+        for e in self.exprs:
+            if (
+                isinstance(e, ParserElement)
+                and e.resultsName
+                and (
+                    Diagnostics.warn_ungrouped_named_tokens_in_collection
+                    not in e.suppress_warnings_
+                )
+            ):
+                warning = (
+                    "warn_ungrouped_named_tokens_in_collection:"
+                    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)
+                break
+
+        return super()._setResultsName(name, list_all_matches)
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -3950,20 +3972,20 @@ class And(ParseExpression):
     ):
         exprs: List[ParserElement] = list(exprs_arg)
         if exprs and Ellipsis in exprs:
-            tmp = []
+            tmp: List[ParserElement] = []
             for i, expr in enumerate(exprs):
-                if expr is Ellipsis:
-                    if i < len(exprs) - 1:
-                        skipto_arg: ParserElement = typing.cast(
-                            ParseExpression, (Empty() + exprs[i + 1])
-                        ).exprs[-1]
-                        tmp.append(SkipTo(skipto_arg)("_skipped*"))
-                    else:
-                        raise Exception(
-                            "cannot construct And with sequence ending in ..."
-                        )
-                else:
+                if expr is not Ellipsis:
                     tmp.append(expr)
+                    continue
+
+                if i < len(exprs) - 1:
+                    skipto_arg: ParserElement = typing.cast(
+                        ParseExpression, (Empty() + exprs[i + 1])
+                    ).exprs[-1]
+                    tmp.append(SkipTo(skipto_arg)("_skipped*"))
+                    continue
+
+                raise Exception("cannot construct And with sequence ending in ...")
             exprs[:] = tmp
         super().__init__(exprs, savelist)
         if self.exprs:
@@ -3982,25 +4004,24 @@ class And(ParseExpression):
 
     def streamline(self) -> ParserElement:
         # collapse any _PendingSkip's
-        if self.exprs:
-            if any(
-                isinstance(e, ParseExpression)
-                and e.exprs
-                and isinstance(e.exprs[-1], _PendingSkip)
-                for e in self.exprs[:-1]
-            ):
-                deleted_expr_marker = NoMatch()
-                for i, e in enumerate(self.exprs[:-1]):
-                    if e is deleted_expr_marker:
-                        continue
-                    if (
-                        isinstance(e, ParseExpression)
-                        and e.exprs
-                        and isinstance(e.exprs[-1], _PendingSkip)
-                    ):
-                        e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
-                        self.exprs[i + 1] = deleted_expr_marker
-                self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
+        if self.exprs and any(
+            isinstance(e, ParseExpression)
+            and e.exprs
+            and isinstance(e.exprs[-1], _PendingSkip)
+            for e in self.exprs[:-1]
+        ):
+            deleted_expr_marker = NoMatch()
+            for i, e in enumerate(self.exprs[:-1]):
+                if e is deleted_expr_marker:
+                    continue
+                if (
+                    isinstance(e, ParseExpression)
+                    and e.exprs
+                    and isinstance(e.exprs[-1], _PendingSkip)
+                ):
+                    e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
+                    self.exprs[i + 1] = deleted_expr_marker
+            self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
 
         super().streamline()
 
@@ -4031,11 +4052,11 @@ class And(ParseExpression):
         self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
         return self
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True):
         # pass False as callPreParse arg to _parse for first element, since we already
         # pre-parsed the string as part of our And pre-parsing
         loc, resultlist = self.exprs[0]._parse(
-            instring, loc, doActions, callPreParse=False
+            instring, loc, do_actions, callPreParse=False
         )
         errorStop = False
         for e in self.exprs[1:]:
@@ -4045,7 +4066,7 @@ class And(ParseExpression):
                 continue
             if errorStop:
                 try:
-                    loc, exprtokens = e._parse(instring, loc, doActions)
+                    loc, exprtokens = e._parse(instring, loc, do_actions)
                 except ParseSyntaxException:
                     raise
                 except ParseBaseException as pe:
@@ -4056,7 +4077,7 @@ class And(ParseExpression):
                         instring, len(instring), self.errmsg, self
                     )
             else:
-                loc, exprtokens = e._parse(instring, loc, doActions)
+                loc, exprtokens = e._parse(instring, loc, do_actions)
             resultlist += exprtokens
         return loc, resultlist
 
@@ -4079,7 +4100,7 @@ class And(ParseExpression):
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
             inner = inner[1:-1]
-        return "{" + inner + "}"
+        return f"{{{inner}}}"
 
 
 class Or(ParseExpression):
@@ -4120,11 +4141,11 @@ class Or(ParseExpression):
             self.saveAsList = False
         return self
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         maxExcLoc = -1
         maxException = None
-        matches = []
-        fatals = []
+        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:
@@ -4157,11 +4178,11 @@ class Or(ParseExpression):
             # might change whether or how much they match of the input.
             matches.sort(key=itemgetter(0), reverse=True)
 
-            if not doActions:
+            if not do_actions:
                 # no further conditions or parse actions to change the selection of
                 # alternative, so the first match will be the best match
                 best_expr = matches[0][1]
-                return best_expr._parse(instring, loc, doActions)
+                return best_expr._parse(instring, loc, do_actions)
 
             longest = -1, None
             for loc1, expr1 in matches:
@@ -4170,7 +4191,7 @@ class Or(ParseExpression):
                     return longest
 
                 try:
-                    loc2, toks = expr1._parse(instring, loc, doActions)
+                    loc2, toks = expr1._parse(instring, loc, do_actions)
                 except ParseException as err:
                     err.__traceback__ = None
                     if err.loc > maxExcLoc:
@@ -4200,10 +4221,8 @@ class Or(ParseExpression):
             if maxExcLoc == loc:
                 maxException.msg = self.errmsg
             raise maxException
-        else:
-            raise ParseException(
-                instring, loc, "no defined alternatives to match", self
-            )
+
+        raise ParseException(instring, loc, "no defined alternatives to match", self)
 
     def __ixor__(self, other):
         if isinstance(other, str_type):
@@ -4213,9 +4232,9 @@ class Or(ParseExpression):
         return self.append(other)  # Or([self, other])
 
     def _generateDefaultName(self) -> str:
-        return "{" + " ^ ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' ^ '.join(str(e) for e in self.exprs)}}}"
 
-    def _setResultsName(self, name, listAllMatches=False):
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
         if (
             __diag__.warn_multiple_tokens_in_named_alternation
             and Diagnostics.warn_multiple_tokens_in_named_alternation
@@ -4227,19 +4246,16 @@ class Or(ParseExpression):
                 not in e.suppress_warnings_
                 for e in self.exprs
             ):
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "will return a list of all parsed tokens in an And alternative, "
-                    "in prior versions only the first token was returned; enclose "
-                    "contained argument in Group".format(
-                        "warn_multiple_tokens_in_named_alternation",
-                        name,
-                        type(self).__name__,
-                    ),
-                    stacklevel=3,
+                warning = (
+                    "warn_multiple_tokens_in_named_alternation:"
+                    f" setting results name {name!r} on {type(self).__name__} expression"
+                    " will return a list of all parsed tokens in an And alternative,"
+                    " in prior versions only the first token was returned; enclose"
+                    " contained argument in Group"
                 )
+                warnings.warn(warning, stacklevel=3)
 
-        return super()._setResultsName(name, listAllMatches)
+        return super()._setResultsName(name, list_all_matches)
 
 
 class MatchFirst(ParseExpression):
@@ -4284,17 +4300,13 @@ class MatchFirst(ParseExpression):
             self.mayReturnEmpty = True
         return self
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         maxExcLoc = -1
         maxException = None
 
         for e in self.exprs:
             try:
-                return e._parse(
-                    instring,
-                    loc,
-                    doActions,
-                )
+                return e._parse(instring, loc, do_actions)
             except ParseFatalException as pfe:
                 pfe.__traceback__ = None
                 pfe.parser_element = e
@@ -4316,10 +4328,8 @@ class MatchFirst(ParseExpression):
             if maxExcLoc == loc:
                 maxException.msg = self.errmsg
             raise maxException
-        else:
-            raise ParseException(
-                instring, loc, "no defined alternatives to match", self
-            )
+
+        raise ParseException(instring, loc, "no defined alternatives to match", self)
 
     def __ior__(self, other):
         if isinstance(other, str_type):
@@ -4329,9 +4339,9 @@ class MatchFirst(ParseExpression):
         return self.append(other)  # MatchFirst([self, other])
 
     def _generateDefaultName(self) -> str:
-        return "{" + " | ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' | '.join(str(e) for e in self.exprs)}}}"
 
-    def _setResultsName(self, name, listAllMatches=False):
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
         if (
             __diag__.warn_multiple_tokens_in_named_alternation
             and Diagnostics.warn_multiple_tokens_in_named_alternation
@@ -4343,19 +4353,16 @@ class MatchFirst(ParseExpression):
                 not in e.suppress_warnings_
                 for e in self.exprs
             ):
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "will return a list of all parsed tokens in an And alternative, "
-                    "in prior versions only the first token was returned; enclose "
-                    "contained argument in Group".format(
-                        "warn_multiple_tokens_in_named_alternation",
-                        name,
-                        type(self).__name__,
-                    ),
-                    stacklevel=3,
+                warning = (
+                    "warn_multiple_tokens_in_named_alternation:"
+                    f" setting results name {name!r} on {type(self).__name__} expression"
+                    " will return a list of all parsed tokens in an And alternative,"
+                    " in prior versions only the first token was returned; enclose"
+                    " contained argument in Group"
                 )
+                warnings.warn(warning, stacklevel=3)
 
-        return super()._setResultsName(name, listAllMatches)
+        return super()._setResultsName(name, list_all_matches)
 
 
 class Each(ParseExpression):
@@ -4441,7 +4448,7 @@ class Each(ParseExpression):
             self.mayReturnEmpty = True
         return self
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if self.initExprGroups:
             self.opt1map = dict(
                 (id(e.expr), e) for e in self.exprs if isinstance(e, Opt)
@@ -4473,11 +4480,11 @@ class Each(ParseExpression):
         tmpReqd = self.required[:]
         tmpOpt = self.optionals[:]
         multis = self.multioptionals[:]
-        matchOrder = []
+        matchOrder: List[ParserElement] = []
 
         keepMatching = True
-        failed = []
-        fatals = []
+        failed: List[ParserElement] = []
+        fatals: List[ParseFatalException] = []
         while keepMatching:
             tmpExprs = tmpReqd + tmpOpt + multis
             failed.clear()
@@ -4523,13 +4530,13 @@ class Each(ParseExpression):
 
         total_results = ParseResults([])
         for e in matchOrder:
-            loc, results = e._parse(instring, loc, doActions)
+            loc, results = e._parse(instring, loc, do_actions)
             total_results += results
 
         return loc, total_results
 
     def _generateDefaultName(self) -> str:
-        return "{" + " & ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' & '.join(str(e) for e in self.exprs)}}}"
 
 
 class ParseElementEnhance(ParserElement):
@@ -4563,17 +4570,20 @@ class ParseElementEnhance(ParserElement):
     def recurse(self) -> List[ParserElement]:
         return [self.expr] if self.expr is not None else []
 
-    def parseImpl(self, instring, loc, doActions=True):
-        if self.expr is not None:
-            try:
-                return self.expr._parse(instring, loc, doActions, callPreParse=False)
-            except ParseBaseException as pbe:
-                if not isinstance(self, Forward) or self.customName is not None:
-                    pbe.msg = self.errmsg
-                raise
-        else:
+    def parseImpl(self, instring, loc, do_actions=True):
+        if self.expr is None:
             raise ParseException(instring, loc, "No expression defined", self)
 
+        try:
+            return self.expr._parse(instring, loc, do_actions, callPreParse=False)
+        except ParseSyntaxException:
+            raise
+        except ParseBaseException as pbe:
+            if not isinstance(self, Forward) or self.customName is not None:
+                if self.errmsg:
+                    pbe.msg = self.errmsg
+            raise
+
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         super().leave_whitespace(recursive)
 
@@ -4593,15 +4603,11 @@ class ParseElementEnhance(ParserElement):
         return self
 
     def ignore(self, other) -> ParserElement:
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                super().ignore(other)
-                if self.expr is not None:
-                    self.expr.ignore(self.ignoreExprs[-1])
-        else:
+        if not isinstance(other, Suppress) or other not in self.ignoreExprs:
             super().ignore(other)
             if self.expr is not None:
                 self.expr.ignore(self.ignoreExprs[-1])
+
         return self
 
     def streamline(self) -> ParserElement:
@@ -4631,15 +4637,12 @@ class ParseElementEnhance(ParserElement):
         self._checkRecursion([])
 
     def _generateDefaultName(self) -> str:
-        return f"{self.__class__.__name__}:({str(self.expr)})"
+        return f"{type(self).__name__}:({self.expr})"
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -4671,14 +4674,14 @@ class IndentedBlock(ParseElementEnhance):
         self._grouped = grouped
         self.parent_anchor = 1
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         # advance parse position to non-whitespace by using an Empty()
         # this should be the column to be used for all subsequent indented lines
         anchor_loc = Empty().preParse(instring, loc)
 
         # see if self.expr matches at the current location - if not it will raise an exception
         # and no further work is necessary
-        self.expr.try_parse(instring, anchor_loc, do_actions=doActions)
+        self.expr.try_parse(instring, anchor_loc, do_actions=do_actions)
 
         indent_col = col(anchor_loc, instring)
         peer_detect_expr = self._Indent(indent_col)
@@ -4703,7 +4706,7 @@ class IndentedBlock(ParseElementEnhance):
         else:
             wrapper = lambda expr: expr
         return (wrapper(block) + Optional(trailing_undent)).parseImpl(
-            instring, anchor_loc, doActions
+            instring, anchor_loc, do_actions
         )
 
 
@@ -4722,10 +4725,10 @@ class AtStringStart(ParseElementEnhance):
         super().__init__(expr)
         self.callPreparse = False
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if loc != 0:
             raise ParseException(instring, loc, "not found at string start")
-        return super().parseImpl(instring, loc, doActions)
+        return super().parseImpl(instring, loc, do_actions)
 
 
 class AtLineStart(ParseElementEnhance):
@@ -4755,10 +4758,10 @@ class AtLineStart(ParseElementEnhance):
         super().__init__(expr)
         self.callPreparse = False
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if col(loc, instring) != 1:
             raise ParseException(instring, loc, "not found at line start")
-        return super().parseImpl(instring, loc, doActions)
+        return super().parseImpl(instring, loc, do_actions)
 
 
 class FollowedBy(ParseElementEnhance):
@@ -4788,10 +4791,10 @@ class FollowedBy(ParseElementEnhance):
         super().__init__(expr)
         self.mayReturnEmpty = True
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         # by using self._expr.parse and deleting the contents of the returned ParseResults list
         # we keep any named results that were defined in the FollowedBy expression
-        _, ret = self.expr._parse(instring, loc, doActions=doActions)
+        _, ret = self.expr._parse(instring, loc, do_actions=do_actions)
         del ret[:]
 
         return loc, ret
@@ -4849,33 +4852,34 @@ class PrecededBy(ParseElementEnhance):
             retreat = 0
             self.exact = True
         self.retreat = retreat
-        self.errmsg = "not preceded by " + str(expr)
+        self.errmsg = f"not preceded by {expr}"
         self.skipWhitespace = False
         self.parseAction.append(lambda s, l, t: t.__delitem__(slice(None, None)))
 
-    def parseImpl(self, instring, loc=0, doActions=True):
+    def parseImpl(self, instring, loc=0, do_actions=True) -> ParseImplReturnType:
         if self.exact:
             if loc < self.retreat:
                 raise ParseException(instring, loc, self.errmsg)
             start = loc - self.retreat
             _, ret = self.expr._parse(instring, start)
-        else:
-            # 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)
-            for offset in range(1, min(loc, self.retreat + 1) + 1):
-                try:
-                    # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
-                    _, ret = test_expr._parse(
-                        instring_slice, len(instring_slice) - offset
-                    )
-                except ParseBaseException as pbe:
-                    last_expr = pbe
-                else:
-                    break
+            return loc, ret
+
+        # 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)
+
+        for offset in range(1, min(loc, self.retreat + 1) + 1):
+            try:
+                # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
+                _, ret = test_expr._parse(instring_slice, len(instring_slice) - offset)
+            except ParseBaseException as pbe:
+                last_expr = pbe
             else:
-                raise last_expr
+                break
+        else:
+            raise last_expr
+
         return loc, ret
 
 
@@ -4907,9 +4911,9 @@ class Located(ParseElementEnhance):
 
     """
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         start = loc
-        loc, tokens = self.expr._parse(instring, start, doActions, callPreParse=False)
+        loc, tokens = self.expr._parse(instring, start, do_actions, callPreParse=False)
         ret_tokens = ParseResults([start, tokens, loc])
         ret_tokens["locn_start"] = start
         ret_tokens["value"] = tokens
@@ -4953,15 +4957,15 @@ class NotAny(ParseElementEnhance):
         self.skipWhitespace = False
 
         self.mayReturnEmpty = True
-        self.errmsg = "Found unwanted token, " + str(self.expr)
+        self.errmsg = f"Found unwanted token, {self.expr}"
 
-    def parseImpl(self, instring, loc, doActions=True):
-        if self.expr.can_parse_next(instring, loc, do_actions=doActions):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
+        if self.expr.can_parse_next(instring, loc, do_actions=do_actions):
             raise ParseException(instring, loc, self.errmsg, self)
         return loc, []
 
     def _generateDefaultName(self) -> str:
-        return "~{" + str(self.expr) + "}"
+        return f"~{{{self.expr}}}"
 
 
 class _MultipleMatch(ParseElementEnhance):
@@ -4986,7 +4990,7 @@ class _MultipleMatch(ParseElementEnhance):
         self.not_ender = ~ender if ender is not None else None
         return self
 
-    def parseImpl(self, instring, loc, doActions=True):
+    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
@@ -4997,7 +5001,7 @@ class _MultipleMatch(ParseElementEnhance):
         # if so, fail)
         if check_ender:
             try_not_ender(instring, loc)
-        loc, tokens = self_expr_parse(instring, loc, doActions)
+        loc, tokens = self_expr_parse(instring, loc, do_actions)
         try:
             hasIgnoreExprs = not not self.ignoreExprs
             while 1:
@@ -5007,14 +5011,14 @@ class _MultipleMatch(ParseElementEnhance):
                     preloc = self_skip_ignorables(instring, loc)
                 else:
                     preloc = loc
-                loc, tmptokens = self_expr_parse(instring, preloc, doActions)
+                loc, tmptokens = self_expr_parse(instring, preloc, do_actions)
                 tokens += tmptokens
         except (ParseException, IndexError):
             pass
 
         return loc, tokens
 
-    def _setResultsName(self, name, listAllMatches=False):
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
         if (
             __diag__.warn_ungrouped_named_tokens_in_collection
             and Diagnostics.warn_ungrouped_named_tokens_in_collection
@@ -5024,21 +5028,20 @@ class _MultipleMatch(ParseElementEnhance):
                 if (
                     isinstance(e, ParserElement)
                     and e.resultsName
-                    and Diagnostics.warn_ungrouped_named_tokens_in_collection
-                    not in e.suppress_warnings_
-                ):
-                    warnings.warn(
-                        "{}: setting results name {!r} on {} expression "
-                        "collides with {!r} on contained expression".format(
-                            "warn_ungrouped_named_tokens_in_collection",
-                            name,
-                            type(self).__name__,
-                            e.resultsName,
-                        ),
-                        stacklevel=3,
+                    and (
+                        Diagnostics.warn_ungrouped_named_tokens_in_collection
+                        not in e.suppress_warnings_
                     )
+                ):
+                    warning = (
+                        "warn_ungrouped_named_tokens_in_collection:"
+                        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)
+                    break
 
-        return super()._setResultsName(name, listAllMatches)
+        return super()._setResultsName(name, list_all_matches)
 
 
 class OneOrMore(_MultipleMatch):
@@ -5070,7 +5073,7 @@ class OneOrMore(_MultipleMatch):
     """
 
     def _generateDefaultName(self) -> str:
-        return "{" + str(self.expr) + "}..."
+        return f"{{{self.expr}}}..."
 
 
 class ZeroOrMore(_MultipleMatch):
@@ -5097,14 +5100,14 @@ class ZeroOrMore(_MultipleMatch):
         super().__init__(expr, stopOn=stopOn or stop_on)
         self.mayReturnEmpty = True
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         try:
-            return super().parseImpl(instring, loc, doActions)
+            return super().parseImpl(instring, loc, do_actions)
         except (ParseException, IndexError):
             return loc, ParseResults([], name=self.resultsName)
 
     def _generateDefaultName(self) -> str:
-        return "[" + str(self.expr) + "]..."
+        return f"[{self.expr}]..."
 
 
 class DelimitedList(ParseElementEnhance):
@@ -5139,12 +5142,11 @@ class DelimitedList(ParseElementEnhance):
             expr = ParserElement._literalStringClass(expr)
         expr = typing.cast(ParserElement, expr)
 
-        if min is not None:
-            if min < 1:
-                raise ValueError("min must be greater than 0")
-        if max is not None:
-            if min is not None and max < min:
-                raise ValueError("max must be greater than, or equal to min")
+        if min is not None and min < 1:
+            raise ValueError("min must be greater than 0")
+
+        if max is not None and min is not None and max < min:
+            raise ValueError("max must be greater than, or equal to min")
 
         self.content = expr
         self.raw_delim = str(delim)
@@ -5169,7 +5171,8 @@ class DelimitedList(ParseElementEnhance):
         super().__init__(delim_list_expr, savelist=True)
 
     def _generateDefaultName(self) -> str:
-        return "{0} [{1} {0}]...".format(self.content.streamline(), self.raw_delim)
+        content_expr = self.content.streamline()
+        return f"{content_expr} [{self.raw_delim} {content_expr}]..."
 
 
 class _NullToken:
@@ -5230,10 +5233,10 @@ class Opt(ParseElementEnhance):
         self.defaultValue = default
         self.mayReturnEmpty = True
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         self_expr = self.expr
         try:
-            loc, tokens = self_expr._parse(instring, loc, doActions, 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:
@@ -5251,7 +5254,7 @@ class Opt(ParseElementEnhance):
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
             inner = inner[1:-1]
-        return "[" + inner + "]"
+        return f"[{inner}]"
 
 
 Optional = Opt
@@ -5339,7 +5342,7 @@ class SkipTo(ParseElementEnhance):
             self.failOn = self._literalStringClass(failOn)
         else:
             self.failOn = failOn
-        self.errmsg = "No match found for " + str(self.expr)
+        self.errmsg = f"No match found for {self.expr}"
         self.ignorer = Empty().leave_whitespace()
         self._update_ignorer()
 
@@ -5355,7 +5358,7 @@ class SkipTo(ParseElementEnhance):
         super().ignore(expr)
         self._update_ignorer()
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True):
         startloc = loc
         instrlen = len(instring)
         self_expr_parse = self.expr._parse
@@ -5385,7 +5388,7 @@ class SkipTo(ParseElementEnhance):
                     prev_tmploc = tmploc
 
             try:
-                self_expr_parse(instring, tmploc, doActions=False, callPreParse=False)
+                self_expr_parse(instring, tmploc, do_actions=False, callPreParse=False)
             except (ParseException, IndexError):
                 # no match, advance loc in string
                 tmploc += 1
@@ -5403,7 +5406,7 @@ class SkipTo(ParseElementEnhance):
         skipresult = ParseResults(skiptext)
 
         if self.includeMatch:
-            loc, mat = self_expr_parse(instring, loc, doActions, callPreParse=False)
+            loc, mat = self_expr_parse(instring, loc, do_actions, callPreParse=False)
             skipresult += mat
 
         return loc, skipresult
@@ -5500,7 +5503,7 @@ class Forward(ParseElementEnhance):
                 lineno=self.caller_frame.lineno,
             )
 
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if (
             self.expr is None
             and __diag__.warn_on_parse_using_empty_Forward
@@ -5526,7 +5529,7 @@ class Forward(ParseElementEnhance):
                 stacklevel=stacklevel,
             )
         if not ParserElement._left_recursion_enabled:
-            return super().parseImpl(instring, loc, doActions)
+            return super().parseImpl(instring, loc, do_actions)
         # ## Bounded Recursion algorithm ##
         # Recursion only needs to be processed at ``Forward`` elements, since they are
         # the only ones that can actually refer to themselves. The general idea is
@@ -5544,13 +5547,13 @@ class Forward(ParseElementEnhance):
         #
         # There is a complication since we not only *parse* but also *transform* via
         # actions: We do not want to run the actions too often while expanding. Thus,
-        # we expand using `doActions=False` and only run `doActions=True` if the next
+        # we expand using `do_actions=False` and only run `do_actions=True` if the next
         # recursion level is acceptable.
         with ParserElement.recursion_lock:
             memo = ParserElement.recursion_memos
             try:
                 # we are parsing at a specific recursion expansion - use it as-is
-                prev_loc, prev_result = memo[loc, self, doActions]
+                prev_loc, prev_result = memo[loc, self, do_actions]
                 if isinstance(prev_result, Exception):
                     raise prev_result
                 return prev_loc, prev_result.copy()
@@ -5558,14 +5561,14 @@ class Forward(ParseElementEnhance):
                 act_key = (loc, self, True)
                 peek_key = (loc, self, False)
                 # we are searching for the best recursion expansion - keep on improving
-                # both `doActions` cases must be tracked separately here!
+                # both `do_actions` cases must be tracked separately here!
                 prev_loc, prev_peek = memo[peek_key] = (
                     loc - 1,
                     ParseException(
                         instring, loc, "Forward recursion without base case", self
                     ),
                 )
-                if doActions:
+                if do_actions:
                     memo[act_key] = memo[peek_key]
                 while True:
                     try:
@@ -5577,8 +5580,8 @@ class Forward(ParseElementEnhance):
                         new_loc, new_peek = prev_loc, prev_peek
                     # the match did not get better: we are done
                     if new_loc <= prev_loc:
-                        if doActions:
-                            # replace the match for doActions=False as well,
+                        if do_actions:
+                            # replace the match for do_actions=False as well,
                             # in case the action did backtrack
                             prev_loc, prev_result = memo[peek_key] = memo[act_key]
                             del memo[peek_key], memo[act_key]
@@ -5586,14 +5589,13 @@ class Forward(ParseElementEnhance):
                         del memo[peek_key]
                         return prev_loc, prev_peek.copy()
                     # the match did get better: see if we can improve further
-                    else:
-                        if doActions:
-                            try:
-                                memo[act_key] = super().parseImpl(instring, loc, True)
-                            except ParseException as e:
-                                memo[peek_key] = memo[act_key] = (new_loc, e)
-                                raise
-                        prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
+                    if do_actions:
+                        try:
+                            memo[act_key] = super().parseImpl(instring, loc, True)
+                        except ParseException as e:
+                            memo[peek_key] = memo[act_key] = (new_loc, e)
+                            raise
+                    prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
 
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         self.skipWhitespace = False
@@ -5637,7 +5639,7 @@ class Forward(ParseElementEnhance):
             else:
                 retString = "None"
         finally:
-            return self.__class__.__name__ + ": " + retString
+            return f"{type(self).__name__}: {retString}"
 
     def copy(self) -> ParserElement:
         if self.expr is not None:
@@ -5647,30 +5649,27 @@ class Forward(ParseElementEnhance):
             ret <<= self
             return ret
 
-    def _setResultsName(self, name, list_all_matches=False):
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
+        # fmt: off
         if (
             __diag__.warn_name_set_on_empty_Forward
-            and Diagnostics.warn_name_set_on_empty_Forward
-            not in self.suppress_warnings_
+            and Diagnostics.warn_name_set_on_empty_Forward not in self.suppress_warnings_
+            and self.expr is None
         ):
-            if self.expr is None:
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "that has no contained expression".format(
-                        "warn_name_set_on_empty_Forward", name, type(self).__name__
-                    ),
-                    stacklevel=3,
-                )
+            warning = (
+                "warn_name_set_on_empty_Forward:"
+                f" setting results name {name!r} on {type(self).__name__} expression"
+                " that has no contained expression"
+            )
+            warnings.warn(warning, stacklevel=3)
+        # fmt: on
 
         return super()._setResultsName(name, list_all_matches)
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -5774,8 +5773,8 @@ class Group(TokenConverter):
                 if isinstance(tokenlist, ParseResults)
                 else list(tokenlist)
             )
-        else:
-            return [tokenlist]
+
+        return [tokenlist]
 
 
 class Dict(TokenConverter):
@@ -5861,8 +5860,8 @@ class Dict(TokenConverter):
 
         if self._asPythonDict:
             return [tokenlist.as_dict()] if self.resultsName else tokenlist.as_dict()
-        else:
-            return [tokenlist] if self.resultsName else tokenlist
+
+        return [tokenlist] if self.resultsName else tokenlist
 
 
 class Suppress(TokenConverter):
@@ -5904,14 +5903,14 @@ class Suppress(TokenConverter):
     def __add__(self, other) -> "ParserElement":
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) + other
-        else:
-            return super().__add__(other)
+
+        return super().__add__(other)
 
     def __sub__(self, other) -> "ParserElement":
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) - other
-        else:
-            return super().__sub__(other)
+
+        return super().__sub__(other)
 
     def postParse(self, instring, loc, tokenlist):
         return []
@@ -5951,12 +5950,14 @@ def trace_parse_action(f: ParseAction) -> ParseAction:
         thisFunc = f.__name__
         s, l, t = paArgs[-3:]
         if len(paArgs) > 3:
-            thisFunc = paArgs[0].__class__.__name__ + "." + thisFunc
+            thisFunc = f"{type(paArgs[0]).__name__}.{thisFunc}"
         sys.stderr.write(f">>entering {thisFunc}(line: {line(l, s)!r}, {l}, {t!r})\n")
         try:
             ret = f(*paArgs)
         except Exception as exc:
-            sys.stderr.write(f"<<leaving {thisFunc} (exception: {exc})\n")
+            sys.stderr.write(
+                f"<<leaving {thisFunc} (exception: {type(exc).__name__}: {exc})\n"
+            )
             raise
         sys.stderr.write(f"<<leaving {thisFunc} (ret: {ret!r})\n")
         return ret
@@ -6019,8 +6020,8 @@ def srange(s: str) -> str:
     - any combination of the above (``'aeiouy'``,
       ``'a-zA-Z0-9_$'``, etc.)
     """
-    _expanded = (
-        lambda p: p
+    _expanded = lambda p: (
+        p
         if not isinstance(p, ParseResults)
         else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
     )
@@ -6134,7 +6135,7 @@ _builtin_exprs: List[ParserElement] = [
     v for v in vars().values() if isinstance(v, ParserElement)
 ]
 
-# backward compatibility names
+# Compatibility synonyms
 # fmt: off
 sglQuotedString = sgl_quoted_string
 dblQuotedString = dbl_quoted_string
@@ -6144,16 +6145,8 @@ lineStart = line_start
 lineEnd = line_end
 stringStart = string_start
 stringEnd = string_end
-
-@replaced_by_pep8(null_debug_action)
-def nullDebugAction(): ...
-
-@replaced_by_pep8(trace_parse_action)
-def traceParseAction(): ...
-
-@replaced_by_pep8(condition_as_parse_action)
-def conditionAsParseAction(): ...
-
-@replaced_by_pep8(token_map)
-def tokenMap(): ...
+nullDebugAction = replaced_by_pep8("nullDebugAction", null_debug_action)
+traceParseAction = replaced_by_pep8("traceParseAction", trace_parse_action)
+conditionAsParseAction = replaced_by_pep8("conditionAsParseAction", condition_as_parse_action)
+tokenMap = replaced_by_pep8("tokenMap", token_map)
 # fmt: on
diff --git a/libs/pyparsing/diagram/__init__.py b/libs/pyparsing/diagram/__init__.py
index 267f34474..3275adafb 100644
--- a/libs/pyparsing/diagram/__init__.py
+++ b/libs/pyparsing/diagram/__init__.py
@@ -36,6 +36,7 @@ jinja2_template_source = """\
 </head>
 <body>
 {% endif %}
+<meta charset="UTF-8"/>
 {{ body | safe }}
 {% for diagram in diagrams %}
     <div class="railroad-group">
@@ -89,7 +90,7 @@ class AnnotatedItem(railroad.Group):
     """
 
     def __init__(self, label: str, item):
-        super().__init__(item=item, label="[{}]".format(label) if label else label)
+        super().__init__(item=item, label=f"[{label}]")
 
 
 class EditablePartial(Generic[T]):
@@ -145,7 +146,7 @@ def railroad_to_html(diagrams: List[NamedDiagram], embed=False, **kwargs) -> str
             continue
         io = StringIO()
         try:
-            css = kwargs.get('css')
+            css = kwargs.get("css")
             diagram.diagram.writeStandalone(io.write, css=css)
         except AttributeError:
             diagram.diagram.writeSvg(io.write)
@@ -425,9 +426,11 @@ def _apply_diagram_item_enhancements(fn):
             element_results_name = element.resultsName
             if element_results_name:
                 # add "*" to indicate if this is a "list all results" name
-                element_results_name += "" if element.modalResults else "*"
+                modal_tag = "" if element.modalResults else "*"
                 ret = EditablePartial.from_call(
-                    railroad.Group, item=ret, label=element_results_name
+                    railroad.Group,
+                    item=ret,
+                    label=f"{repr(element_results_name)}{modal_tag}",
                 )
 
         return ret
@@ -473,7 +476,7 @@ def _to_diagram_element(
     :param show_groups: bool flag indicating whether to show groups using bounding box
     """
     exprs = element.recurse()
-    name = name_hint or element.customName or element.__class__.__name__
+    name = name_hint or element.customName or type(element).__name__
 
     # Python's id() is used to provide a unique identifier for elements
     el_id = id(element)
@@ -534,7 +537,7 @@ def _to_diagram_element(
         # (all will have the same name, and resultsName)
         if not exprs:
             return None
-        if len(set((e.name, e.resultsName) for e in exprs)) == 1:
+        if len(set((e.name, e.resultsName) for e in exprs)) == 1 and len(exprs) > 2:
             ret = EditablePartial.from_call(
                 railroad.OneOrMore, item="", repeat=str(len(exprs))
             )
@@ -563,7 +566,7 @@ def _to_diagram_element(
         if show_groups:
             ret = EditablePartial.from_call(AnnotatedItem, label="", item="")
         else:
-            ret = EditablePartial.from_call(railroad.Group, label="", item="")
+            ret = EditablePartial.from_call(railroad.Sequence, items=[])
     elif isinstance(element, pyparsing.TokenConverter):
         label = type(element).__name__.lower()
         if label == "tokenconverter":
@@ -573,8 +576,36 @@ def _to_diagram_element(
     elif isinstance(element, pyparsing.Opt):
         ret = EditablePartial.from_call(railroad.Optional, item="")
     elif isinstance(element, pyparsing.OneOrMore):
-        ret = EditablePartial.from_call(railroad.OneOrMore, item="")
+        if element.not_ender is not None:
+            args = [
+                parent,
+                lookup,
+                vertical,
+                index,
+                name_hint,
+                show_results_names,
+                show_groups,
+            ]
+            return _to_diagram_element(
+                (~element.not_ender.expr + element.expr)[1, ...].set_name(element.name),
+                *args,
+            )
+        ret = EditablePartial.from_call(railroad.OneOrMore, item=None)
     elif isinstance(element, pyparsing.ZeroOrMore):
+        if element.not_ender is not None:
+            args = [
+                parent,
+                lookup,
+                vertical,
+                index,
+                name_hint,
+                show_results_names,
+                show_groups,
+            ]
+            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(
diff --git a/libs/pyparsing/exceptions.py b/libs/pyparsing/exceptions.py
index 12219f124..8db34f195 100644
--- a/libs/pyparsing/exceptions.py
+++ b/libs/pyparsing/exceptions.py
@@ -14,11 +14,13 @@ from .util import (
 from .unicode import pyparsing_unicode as ppu
 
 
-class ExceptionWordUnicode(ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic):
+class _ExceptionWordUnicodeSet(
+    ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic
+):
     pass
 
 
-_extract_alphanums = _collapse_string_to_ranges(ExceptionWordUnicode.alphanums)
+_extract_alphanums = _collapse_string_to_ranges(_ExceptionWordUnicodeSet.alphanums)
 _exception_word_extractor = re.compile("([" + _extract_alphanums + "]{1,16})|.")
 
 
@@ -83,44 +85,42 @@ class ParseBaseException(Exception):
         ret = []
         if isinstance(exc, ParseBaseException):
             ret.append(exc.line)
-            ret.append(" " * (exc.column - 1) + "^")
+            ret.append(f"{' ' * (exc.column - 1)}^")
         ret.append(f"{type(exc).__name__}: {exc}")
 
-        if depth > 0:
-            callers = inspect.getinnerframes(exc.__traceback__, context=depth)
-            seen = set()
-            for i, ff in enumerate(callers[-depth:]):
-                frm = ff[0]
+        if depth <= 0:
+            return "\n".join(ret)
 
-                f_self = frm.f_locals.get("self", None)
-                if isinstance(f_self, ParserElement):
-                    if not frm.f_code.co_name.startswith(
-                        ("parseImpl", "_parseNoCache")
-                    ):
-                        continue
-                    if id(f_self) in seen:
-                        continue
-                    seen.add(id(f_self))
+        callers = inspect.getinnerframes(exc.__traceback__, context=depth)
+        seen = set()
+        for ff in callers[-depth:]:
+            frm = ff[0]
 
-                    self_type = type(f_self)
-                    ret.append(
-                        f"{self_type.__module__}.{self_type.__name__} - {f_self}"
-                    )
+            f_self = frm.f_locals.get("self", None)
+            if isinstance(f_self, ParserElement):
+                if not frm.f_code.co_name.startswith(("parseImpl", "_parseNoCache")):
+                    continue
+                if id(f_self) in seen:
+                    continue
+                seen.add(id(f_self))
 
-                elif f_self is not None:
-                    self_type = type(f_self)
-                    ret.append(f"{self_type.__module__}.{self_type.__name__}")
+                self_type = type(f_self)
+                ret.append(f"{self_type.__module__}.{self_type.__name__} - {f_self}")
 
-                else:
-                    code = frm.f_code
-                    if code.co_name in ("wrapper", "<module>"):
-                        continue
+            elif f_self is not None:
+                self_type = type(f_self)
+                ret.append(f"{self_type.__module__}.{self_type.__name__}")
 
-                    ret.append(code.co_name)
+            else:
+                code = frm.f_code
+                if code.co_name in ("wrapper", "<module>"):
+                    continue
 
-                depth -= 1
-                if not depth:
-                    break
+                ret.append(code.co_name)
+
+            depth -= 1
+            if not depth:
+                break
 
         return "\n".join(ret)
 
@@ -220,8 +220,10 @@ class ParseBaseException(Exception):
 
         Example::
 
+            # an expression to parse 3 integers
             expr = pp.Word(pp.nums) * 3
             try:
+                # a failing parse - the third integer is prefixed with "A"
                 expr.parse_string("123 456 A789")
             except pp.ParseException as pe:
                 print(pe.explain(depth=0))
@@ -243,9 +245,9 @@ class ParseBaseException(Exception):
         """
         return self.explain_exception(self, depth)
 
+    # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(mark_input_line)
-    def markInputline(self): ...
+    markInputline = replaced_by_pep8("markInputline", mark_input_line)
     # fmt: on
 
 
@@ -255,16 +257,16 @@ class ParseException(ParseBaseException):
 
     Example::
 
+        integer = Word(nums).set_name("integer")
         try:
-            Word(nums).set_name("integer").parse_string("ABC")
+            integer.parse_string("ABC")
         except ParseException as pe:
             print(pe)
-            print("column: {}".format(pe.column))
+            print(f"column: {pe.column}")
 
     prints::
 
-       Expected integer (at char 0), (line:1, col:1)
-        column: 1
+       Expected integer (at char 0), (line:1, col:1) column: 1
 
     """
 
diff --git a/libs/pyparsing/helpers.py b/libs/pyparsing/helpers.py
index 018f0d6ac..d5d14a08d 100644
--- a/libs/pyparsing/helpers.py
+++ b/libs/pyparsing/helpers.py
@@ -74,7 +74,7 @@ def counted_array(
         intExpr = intExpr.copy()
     intExpr.set_name("arrayLen")
     intExpr.add_parse_action(count_field_parse_action, call_during_try=True)
-    return (intExpr + array_expr).set_name("(len) " + str(expr) + "...")
+    return (intExpr + array_expr).set_name(f"(len) {expr}...")
 
 
 def match_previous_literal(expr: ParserElement) -> ParserElement:
@@ -95,15 +95,17 @@ def match_previous_literal(expr: ParserElement) -> ParserElement:
     rep = Forward()
 
     def copy_token_to_repeater(s, l, t):
-        if t:
-            if len(t) == 1:
-                rep << t[0]
-            else:
-                # flatten t tokens
-                tflat = _flatten(t.as_list())
-                rep << And(Literal(tt) for tt in tflat)
-        else:
+        if not t:
             rep << Empty()
+            return
+
+        if len(t) == 1:
+            rep << t[0]
+            return
+
+        # flatten t tokens
+        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))
@@ -230,7 +232,7 @@ def one_of(
                 if isequal(other, cur):
                     del symbols[i + j + 1]
                     break
-                elif masks(cur, other):
+                if masks(cur, other):
                     del symbols[i + j + 1]
                     symbols.insert(i, other)
                     break
@@ -534,7 +536,9 @@ def nested_expr(
         )
     else:
         ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
-    ret.set_name("nested %s%s expression" % (opener, closer))
+    ret.set_name(f"nested {opener}{closer} expression")
+    # don't override error message from content expressions
+    ret.errmsg = None
     return ret
 
 
@@ -580,7 +584,7 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
         )
     closeTag = Combine(Literal("</") + tagStr + ">", adjacent=False)
 
-    openTag.set_name("<%s>" % resname)
+    openTag.set_name(f"<{resname}>")
     # add start<tagname> results name in parse action now that ungrouped names are not reported at two levels
     openTag.add_parse_action(
         lambda t: t.__setitem__(
@@ -589,7 +593,7 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
     )
     closeTag = closeTag(
         "end" + "".join(resname.replace(":", " ").title().split())
-    ).set_name("</%s>" % resname)
+    ).set_name(f"</{resname}>")
     openTag.tag = resname
     closeTag.tag = resname
     openTag.tag_body = SkipTo(closeTag())
@@ -777,17 +781,20 @@ def infix_notation(
         rpar = Suppress(rpar)
 
     # if lpar and rpar are not suppressed, wrap in group
-    if not (isinstance(rpar, Suppress) and isinstance(rpar, Suppress)):
-        lastExpr = base_expr | Group(lpar + ret + rpar)
+    if not (isinstance(lpar, Suppress) and isinstance(rpar, Suppress)):
+        lastExpr = base_expr | Group(lpar + ret + rpar).set_name(
+            f"nested_{base_expr.name}"
+        )
     else:
-        lastExpr = base_expr | (lpar + ret + rpar)
+        lastExpr = base_expr | (lpar + ret + rpar).set_name(f"nested_{base_expr.name}")
+    root_expr = lastExpr
 
     arity: int
     rightLeftAssoc: opAssoc
     pa: typing.Optional[ParseAction]
     opExpr1: ParserElement
     opExpr2: ParserElement
-    for i, operDef in enumerate(op_list):
+    for operDef in op_list:
         opExpr, arity, rightLeftAssoc, pa = (operDef + (None,))[:4]  # type: ignore[assignment]
         if isinstance(opExpr, str_type):
             opExpr = ParserElement._literalStringClass(opExpr)
@@ -851,6 +858,7 @@ def infix_notation(
         thisExpr <<= (matchExpr | lastExpr).setName(term_name)
         lastExpr = thisExpr
     ret <<= lastExpr
+    root_expr.set_name("base_expr")
     return ret
 
 
@@ -1045,7 +1053,7 @@ def delimited_list(
     )
 
 
-# pre-PEP8 compatible names
+# Compatibility synonyms
 # fmt: off
 opAssoc = OpAssoc
 anyOpenTag = any_open_tag
@@ -1058,43 +1066,17 @@ dblSlashComment = dbl_slash_comment
 cppStyleComment = cpp_style_comment
 javaStyleComment = java_style_comment
 pythonStyleComment = python_style_comment
-
-@replaced_by_pep8(DelimitedList)
-def delimitedList(): ...
-
-@replaced_by_pep8(DelimitedList)
-def delimited_list(): ...
-
-@replaced_by_pep8(counted_array)
-def countedArray(): ...
-
-@replaced_by_pep8(match_previous_literal)
-def matchPreviousLiteral(): ...
-
-@replaced_by_pep8(match_previous_expr)
-def matchPreviousExpr(): ...
-
-@replaced_by_pep8(one_of)
-def oneOf(): ...
-
-@replaced_by_pep8(dict_of)
-def dictOf(): ...
-
-@replaced_by_pep8(original_text_for)
-def originalTextFor(): ...
-
-@replaced_by_pep8(nested_expr)
-def nestedExpr(): ...
-
-@replaced_by_pep8(make_html_tags)
-def makeHTMLTags(): ...
-
-@replaced_by_pep8(make_xml_tags)
-def makeXMLTags(): ...
-
-@replaced_by_pep8(replace_html_entity)
-def replaceHTMLEntity(): ...
-
-@replaced_by_pep8(infix_notation)
-def infixNotation(): ...
+delimitedList = replaced_by_pep8("delimitedList", DelimitedList)
+delimited_list = replaced_by_pep8("delimited_list", DelimitedList)
+countedArray = replaced_by_pep8("countedArray", counted_array)
+matchPreviousLiteral = replaced_by_pep8("matchPreviousLiteral", match_previous_literal)
+matchPreviousExpr = replaced_by_pep8("matchPreviousExpr", match_previous_expr)
+oneOf = replaced_by_pep8("oneOf", one_of)
+dictOf = replaced_by_pep8("dictOf", dict_of)
+originalTextFor = replaced_by_pep8("originalTextFor", original_text_for)
+nestedExpr = replaced_by_pep8("nestedExpr", nested_expr)
+makeHTMLTags = replaced_by_pep8("makeHTMLTags", make_html_tags)
+makeXMLTags = replaced_by_pep8("makeXMLTags", make_xml_tags)
+replaceHTMLEntity = replaced_by_pep8("replaceHTMLEntity", replace_html_entity)
+infixNotation = replaced_by_pep8("infixNotation", infix_notation)
 # fmt: on
diff --git a/libs/pyparsing/results.py b/libs/pyparsing/results.py
index 031304976..3bb7c948e 100644
--- a/libs/pyparsing/results.py
+++ b/libs/pyparsing/results.py
@@ -4,12 +4,14 @@ from collections.abc import (
     Mapping,
     MutableSequence,
     Iterator,
-    Sequence,
-    Container,
+    Iterable,
 )
 import pprint
 from typing import Tuple, Any, Dict, Set, List
 
+from .util import replaced_by_pep8
+
+
 str_type: Tuple[type, ...] = (str, bytes)
 _generator_type = type((_ for _ in ()))
 
@@ -173,42 +175,48 @@ class ParseResults:
     ):
         self._tokdict: Dict[str, _ParseResultsWithOffset]
         self._modal = modal
-        if name is not None and name != "":
-            if isinstance(name, int):
-                name = str(name)
-            if not modal:
-                self._all_names = {name}
-            self._name = name
-            if toklist not in self._null_values:
-                if isinstance(toklist, (str_type, type)):
-                    toklist = [toklist]
-                if asList:
-                    if isinstance(toklist, ParseResults):
-                        self[name] = _ParseResultsWithOffset(
-                            ParseResults(toklist._toklist), 0
-                        )
-                    else:
-                        self[name] = _ParseResultsWithOffset(
-                            ParseResults(toklist[0]), 0
-                        )
-                    self[name]._name = name
-                else:
-                    try:
-                        self[name] = toklist[0]
-                    except (KeyError, TypeError, IndexError):
-                        if toklist is not self:
-                            self[name] = toklist
-                        else:
-                            self._name = name
+
+        if name is None or name == "":
+            return
+
+        if isinstance(name, int):
+            name = str(name)
+
+        if not modal:
+            self._all_names = {name}
+
+        self._name = name
+
+        if toklist in self._null_values:
+            return
+
+        if isinstance(toklist, (str_type, type)):
+            toklist = [toklist]
+
+        if asList:
+            if isinstance(toklist, ParseResults):
+                self[name] = _ParseResultsWithOffset(ParseResults(toklist._toklist), 0)
+            else:
+                self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]), 0)
+            self[name]._name = name
+            return
+
+        try:
+            self[name] = toklist[0]
+        except (KeyError, TypeError, IndexError):
+            if toklist is not self:
+                self[name] = toklist
+            else:
+                self._name = name
 
     def __getitem__(self, i):
         if isinstance(i, (int, slice)):
             return self._toklist[i]
-        else:
-            if i not in self._all_names:
-                return self._tokdict[i][-1][0]
-            else:
-                return ParseResults([v[0] for v in self._tokdict[i]])
+
+        if i not in self._all_names:
+            return self._tokdict[i][-1][0]
+
+        return ParseResults([v[0] for v in self._tokdict[i]])
 
     def __setitem__(self, k, v, isinstance=isinstance):
         if isinstance(v, _ParseResultsWithOffset):
@@ -226,27 +234,28 @@ class ParseResults:
             sub._parent = self
 
     def __delitem__(self, i):
-        if isinstance(i, (int, slice)):
-            mylen = len(self._toklist)
-            del self._toklist[i]
-
-            # convert int to slice
-            if isinstance(i, int):
-                if i < 0:
-                    i += mylen
-                i = slice(i, i + 1)
-            # get removed indices
-            removed = list(range(*i.indices(mylen)))
-            removed.reverse()
-            # fixup indices in token dictionary
-            for name, occurrences in self._tokdict.items():
-                for j in removed:
-                    for k, (value, position) in enumerate(occurrences):
-                        occurrences[k] = _ParseResultsWithOffset(
-                            value, position - (position > j)
-                        )
-        else:
+        if not isinstance(i, (int, slice)):
             del self._tokdict[i]
+            return
+
+        mylen = len(self._toklist)
+        del self._toklist[i]
+
+        # convert int to slice
+        if isinstance(i, int):
+            if i < 0:
+                i += mylen
+            i = slice(i, i + 1)
+        # get removed indices
+        removed = list(range(*i.indices(mylen)))
+        removed.reverse()
+        # fixup indices in token dictionary
+        for occurrences in self._tokdict.values():
+            for j in removed:
+                for k, (value, position) in enumerate(occurrences):
+                    occurrences[k] = _ParseResultsWithOffset(
+                        value, position - (position > j)
+                    )
 
     def __contains__(self, k) -> bool:
         return k in self._tokdict
@@ -376,7 +385,7 @@ class ParseResults:
         """
         self._toklist.insert(index, ins_string)
         # fixup indices in token dictionary
-        for name, occurrences in self._tokdict.items():
+        for occurrences in self._tokdict.values():
             for k, (value, position) in enumerate(occurrences):
                 occurrences[k] = _ParseResultsWithOffset(
                     value, position + (position > index)
@@ -566,20 +575,20 @@ class ParseResults:
         # replace values with copies if they are of known mutable types
         for i, obj in enumerate(self._toklist):
             if isinstance(obj, ParseResults):
-                self._toklist[i] = obj.deepcopy()
+                ret._toklist[i] = obj.deepcopy()
             elif isinstance(obj, (str, bytes)):
                 pass
             elif isinstance(obj, MutableMapping):
-                self._toklist[i] = dest = type(obj)()
+                ret._toklist[i] = dest = type(obj)()
                 for k, v in obj.items():
                     dest[k] = v.deepcopy() if isinstance(v, ParseResults) else v
-            elif isinstance(obj, Container):
-                self._toklist[i] = type(obj)(
+            elif isinstance(obj, Iterable):
+                ret._toklist[i] = type(obj)(
                     v.deepcopy() if isinstance(v, ParseResults) else v for v in obj
                 )
         return ret
 
-    def get_name(self):
+    def get_name(self) -> str:
         r"""
         Returns the results name for this token expression. Useful when several
         different expressions might match at a particular location.
@@ -652,58 +661,52 @@ class ParseResults:
         NL = "\n"
         out.append(indent + str(self.as_list()) if include_list else "")
 
-        if full:
-            if self.haskeys():
-                items = sorted((str(k), v) for k, v in self.items())
-                for k, v in items:
-                    if out:
-                        out.append(NL)
-                    out.append(f"{indent}{('  ' * _depth)}- {k}: ")
-                    if isinstance(v, ParseResults):
-                        if v:
-                            out.append(
-                                v.dump(
-                                    indent=indent,
-                                    full=full,
-                                    include_list=include_list,
-                                    _depth=_depth + 1,
-                                )
-                            )
-                        else:
-                            out.append(str(v))
-                    else:
-                        out.append(repr(v))
-            if any(isinstance(vv, ParseResults) for vv in self):
-                v = self
-                for i, vv in enumerate(v):
-                    if isinstance(vv, ParseResults):
-                        out.append(
-                            "\n{}{}[{}]:\n{}{}{}".format(
-                                indent,
-                                ("  " * (_depth)),
-                                i,
-                                indent,
-                                ("  " * (_depth + 1)),
-                                vv.dump(
-                                    indent=indent,
-                                    full=full,
-                                    include_list=include_list,
-                                    _depth=_depth + 1,
-                                ),
-                            )
-                        )
-                    else:
-                        out.append(
-                            "\n%s%s[%d]:\n%s%s%s"
-                            % (
-                                indent,
-                                ("  " * (_depth)),
-                                i,
-                                indent,
-                                ("  " * (_depth + 1)),
-                                str(vv),
-                            )
-                        )
+        if not full:
+            return "".join(out)
+
+        if self.haskeys():
+            items = sorted((str(k), v) for k, v in self.items())
+            for k, v in items:
+                if out:
+                    out.append(NL)
+                out.append(f"{indent}{('  ' * _depth)}- {k}: ")
+                if not isinstance(v, ParseResults):
+                    out.append(repr(v))
+                    continue
+
+                if not v:
+                    out.append(str(v))
+                    continue
+
+                out.append(
+                    v.dump(
+                        indent=indent,
+                        full=full,
+                        include_list=include_list,
+                        _depth=_depth + 1,
+                    )
+                )
+        if not any(isinstance(vv, ParseResults) for vv in self):
+            return "".join(out)
+
+        v = self
+        incr = "  "
+        nl = "\n"
+        for i, vv in enumerate(v):
+            if isinstance(vv, ParseResults):
+                vv_dump = vv.dump(
+                    indent=indent,
+                    full=full,
+                    include_list=include_list,
+                    _depth=_depth + 1,
+                )
+                out.append(
+                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv_dump}"
+                )
+            else:
+                out.append(
+                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv}"
+                )
 
         return "".join(out)
 
diff --git a/libs/pyparsing/testing.py b/libs/pyparsing/testing.py
index 6a254c1c5..5654d47d6 100644
--- a/libs/pyparsing/testing.py
+++ b/libs/pyparsing/testing.py
@@ -1,8 +1,10 @@
 # testing.py
 
 from contextlib import contextmanager
+import re
 import typing
 
+
 from .core import (
     ParserElement,
     ParseException,
@@ -49,23 +51,23 @@ class pyparsing_test:
             self._save_context["default_whitespace"] = ParserElement.DEFAULT_WHITE_CHARS
             self._save_context["default_keyword_chars"] = Keyword.DEFAULT_KEYWORD_CHARS
 
-            self._save_context[
-                "literal_string_class"
-            ] = ParserElement._literalStringClass
+            self._save_context["literal_string_class"] = (
+                ParserElement._literalStringClass
+            )
 
             self._save_context["verbose_stacktrace"] = ParserElement.verbose_stacktrace
 
             self._save_context["packrat_enabled"] = ParserElement._packratEnabled
             if ParserElement._packratEnabled:
-                self._save_context[
-                    "packrat_cache_size"
-                ] = ParserElement.packrat_cache.size
+                self._save_context["packrat_cache_size"] = (
+                    ParserElement.packrat_cache.size
+                )
             else:
                 self._save_context["packrat_cache_size"] = None
             self._save_context["packrat_parse"] = ParserElement._parse
-            self._save_context[
-                "recursion_enabled"
-            ] = ParserElement._left_recursion_enabled
+            self._save_context["recursion_enabled"] = (
+                ParserElement._left_recursion_enabled
+            )
 
             self._save_context["__diag__"] = {
                 name: getattr(__diag__, name) for name in __diag__._all_names
@@ -180,49 +182,52 @@ class pyparsing_test:
             """
             run_test_success, run_test_results = run_tests_report
 
-            if expected_parse_results is not None:
-                merged = [
-                    (*rpt, expected)
-                    for rpt, expected in zip(run_test_results, expected_parse_results)
-                ]
-                for test_string, result, expected in merged:
-                    # expected should be a tuple containing a list and/or a dict or an exception,
-                    # and optional failure message string
-                    # an empty tuple will skip any result validation
-                    fail_msg = next(
-                        (exp for exp in expected if isinstance(exp, str)), None
+            if expected_parse_results is None:
+                self.assertTrue(
+                    run_test_success, msg=msg if msg is not None else "failed runTests"
+                )
+                return
+
+            merged = [
+                (*rpt, expected)
+                for rpt, expected in zip(run_test_results, expected_parse_results)
+            ]
+            for test_string, result, expected in merged:
+                # expected should be a tuple containing a list and/or a dict or an exception,
+                # and optional failure message string
+                # an empty tuple will skip any result validation
+                fail_msg = next((exp for exp in expected if isinstance(exp, str)), None)
+                expected_exception = next(
+                    (
+                        exp
+                        for exp in expected
+                        if isinstance(exp, type) and issubclass(exp, Exception)
+                    ),
+                    None,
+                )
+                if expected_exception is not None:
+                    with self.assertRaises(
+                        expected_exception=expected_exception, msg=fail_msg or msg
+                    ):
+                        if isinstance(result, Exception):
+                            raise result
+                else:
+                    expected_list = next(
+                        (exp for exp in expected if isinstance(exp, list)), None
                     )
-                    expected_exception = next(
-                        (
-                            exp
-                            for exp in expected
-                            if isinstance(exp, type) and issubclass(exp, Exception)
-                        ),
-                        None,
+                    expected_dict = next(
+                        (exp for exp in expected if isinstance(exp, dict)), None
                     )
-                    if expected_exception is not None:
-                        with self.assertRaises(
-                            expected_exception=expected_exception, msg=fail_msg or msg
-                        ):
-                            if isinstance(result, Exception):
-                                raise result
+                    if (expected_list, expected_dict) != (None, None):
+                        self.assertParseResultsEquals(
+                            result,
+                            expected_list=expected_list,
+                            expected_dict=expected_dict,
+                            msg=fail_msg or msg,
+                        )
                     else:
-                        expected_list = next(
-                            (exp for exp in expected if isinstance(exp, list)), None
-                        )
-                        expected_dict = next(
-                            (exp for exp in expected if isinstance(exp, dict)), None
-                        )
-                        if (expected_list, expected_dict) != (None, None):
-                            self.assertParseResultsEquals(
-                                result,
-                                expected_list=expected_list,
-                                expected_dict=expected_dict,
-                                msg=fail_msg or msg,
-                            )
-                        else:
-                            # warning here maybe?
-                            print(f"no validation for {test_string!r}")
+                        # warning here maybe?
+                        print(f"no validation for {test_string!r}")
 
             # do this last, in case some specific test results can be reported instead
             self.assertTrue(
@@ -230,9 +235,18 @@ class pyparsing_test:
             )
 
         @contextmanager
-        def assertRaisesParseException(self, exc_type=ParseException, msg=None):
-            with self.assertRaises(exc_type, msg=msg):
-                yield
+        def assertRaisesParseException(
+            self, exc_type=ParseException, expected_msg=None, msg=None
+        ):
+            if expected_msg is not None:
+                if isinstance(expected_msg, str):
+                    expected_msg = re.escape(expected_msg)
+                with self.assertRaisesRegex(exc_type, expected_msg, msg=msg) as ctx:
+                    yield ctx
+
+            else:
+                with self.assertRaises(exc_type, msg=msg) as ctx:
+                    yield ctx
 
     @staticmethod
     def with_line_numbers(
diff --git a/libs/pyparsing/unicode.py b/libs/pyparsing/unicode.py
index b0a87b235..0e3e06572 100644
--- a/libs/pyparsing/unicode.py
+++ b/libs/pyparsing/unicode.py
@@ -53,65 +53,60 @@ class unicode_set:
     _ranges: UnicodeRangeList = []
 
     @_lazyclassproperty
-    def _chars_for_ranges(cls):
-        ret = []
+    def _chars_for_ranges(cls) -> List[str]:
+        ret: List[int] = []
         for cc in cls.__mro__:
             if cc is unicode_set:
                 break
             for rr in getattr(cc, "_ranges", ()):
                 ret.extend(range(rr[0], rr[-1] + 1))
-        return [chr(c) for c in sorted(set(ret))]
+        return sorted(chr(c) for c in set(ret))
 
     @_lazyclassproperty
-    def printables(cls):
+    def printables(cls) -> str:
         """all non-whitespace characters in this range"""
         return "".join(filterfalse(str.isspace, cls._chars_for_ranges))
 
     @_lazyclassproperty
-    def alphas(cls):
+    def alphas(cls) -> str:
         """all alphabetic characters in this range"""
         return "".join(filter(str.isalpha, cls._chars_for_ranges))
 
     @_lazyclassproperty
-    def nums(cls):
+    def nums(cls) -> str:
         """all numeric digit characters in this range"""
         return "".join(filter(str.isdigit, cls._chars_for_ranges))
 
     @_lazyclassproperty
-    def alphanums(cls):
+    def alphanums(cls) -> str:
         """all alphanumeric characters in this range"""
         return cls.alphas + cls.nums
 
     @_lazyclassproperty
-    def identchars(cls):
+    def identchars(cls) -> str:
         """all characters in this range that are valid identifier characters, plus underscore '_'"""
         return "".join(
             sorted(
-                set(
-                    "".join(filter(str.isidentifier, cls._chars_for_ranges))
-                    + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzªµº"
-                    + "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
-                    + "_"
+                set(filter(str.isidentifier, cls._chars_for_ranges))
+                | set(
+                    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzªµº"
+                    "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
+                    "_"
                 )
             )
         )
 
     @_lazyclassproperty
-    def identbodychars(cls):
+    def identbodychars(cls) -> str:
         """
         all characters in this range that are valid identifier body characters,
         plus the digits 0-9, and · (Unicode MIDDLE DOT)
         """
+        identifier_chars = set(
+            c for c in cls._chars_for_ranges if ("_" + c).isidentifier()
+        )
         return "".join(
-            sorted(
-                set(
-                    cls.identchars
-                    + "0123456789·"
-                    + "".join(
-                        [c for c in cls._chars_for_ranges if ("_" + c).isidentifier()]
-                    )
-                )
-            )
+            sorted(identifier_chars | set(cls.identchars) | set("0123456789·"))
         )
 
     @_lazyclassproperty
diff --git a/libs/pyparsing/util.py b/libs/pyparsing/util.py
index d8d3f414c..94837fea0 100644
--- a/libs/pyparsing/util.py
+++ b/libs/pyparsing/util.py
@@ -237,7 +237,7 @@ def _flatten(ll: list) -> list:
     return ret
 
 
-def _make_synonym_function(compat_name: str, fn: C) -> C:
+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.
 
@@ -246,12 +246,12 @@ def _make_synonym_function(compat_name: str, fn: C) -> C:
 
     # (Presence of 'self' arg in signature is used by explain_exception() methods, so we take
     # some extra steps to add it if present in decorated function.)
-    if "self" == list(inspect.signature(fn).parameters)[0]:
+    if ["self"] == list(inspect.signature(fn).parameters)[:1]:
 
         @wraps(fn)
         def _inner(self, *args, **kwargs):
             # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=3
+            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
             # )
             return fn(self, *args, **kwargs)
 
@@ -260,7 +260,7 @@ def _make_synonym_function(compat_name: str, fn: C) -> C:
         @wraps(fn)
         def _inner(*args, **kwargs):
             # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=3
+            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
             # )
             return fn(*args, **kwargs)
 
@@ -275,10 +275,3 @@ def _make_synonym_function(compat_name: str, fn: C) -> C:
         _inner.__kwdefaults__ = None
     _inner.__qualname__ = fn.__qualname__
     return cast(C, _inner)
-
-
-def replaced_by_pep8(fn: C) -> Callable[[Callable], C]:
-    """
-    Decorator for pre-PEP8 compatibility synonyms, to link them to the new function.
-    """
-    return lambda other: _make_synonym_function(other.__name__, fn)
diff --git a/libs/pyrsistent-0.20.0.dist-info/RECORD b/libs/pyrsistent-0.20.0.dist-info/RECORD
index e48f6169d..5b552511b 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=3fWvIYLZg4EPc5WlLoCWUTd6hXnS6jAnqsvpgByxFeY,75992
+pvectorc.cpython-38-darwin.so,sha256=FWL6D05ITy7RG0cjmkA2_RlpMG8YeAXGGR9zoIv6YUI,39120
 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/RECORD,,
 pyrsistent-0.20.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyrsistent-0.20.0.dist-info/WHEEL,sha256=UkJU7GAEhyIKVwGX1j1L5OGjUFT--MirwyCseqfCpZU,109
+pyrsistent-0.20.0.dist-info/WHEEL,sha256=8MbRJsGMYV6Ym1_SoG8YuJPvArpN2Z2wVWusEpp3feg,108
 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 844cf17ca..be75fa70d 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: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_12_0_x86_64
 
diff --git a/libs/pysubs2-1.7.2.dist-info/RECORD b/libs/pysubs2-1.7.2.dist-info/RECORD
deleted file mode 100644
index d0730aa1f..000000000
--- a/libs/pysubs2-1.7.2.dist-info/RECORD
+++ /dev/null
@@ -1,47 +0,0 @@
-../../bin/pysubs2,sha256=qbyZPJ0JMXc2Ii34KZgXKNvu1v8En-GFSWQFwhstugg,249
-pysubs2-1.7.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pysubs2-1.7.2.dist-info/LICENSE.txt,sha256=WYgskvBrUBBDxuKH9JSV1u22g-UBTwHjeuJLlPp6lWU,1063
-pysubs2-1.7.2.dist-info/METADATA,sha256=2Fm6UaI7kElE-smr83cNBIfWRXt0vfso1Kyx5sChjB0,3183
-pysubs2-1.7.2.dist-info/RECORD,,
-pysubs2-1.7.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysubs2-1.7.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pysubs2-1.7.2.dist-info/entry_points.txt,sha256=mznmeaia9Ec19KsaIM8D4tt6V0HnOUlPhSg5nXiAfAE,49
-pysubs2-1.7.2.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/__pycache__/__init__.cpython-311.pyc,,
-pysubs2/__pycache__/__main__.cpython-311.pyc,,
-pysubs2/__pycache__/cli.cpython-311.pyc,,
-pysubs2/__pycache__/common.cpython-311.pyc,,
-pysubs2/__pycache__/exceptions.cpython-311.pyc,,
-pysubs2/__pycache__/ssaevent.cpython-311.pyc,,
-pysubs2/__pycache__/ssafile.cpython-311.pyc,,
-pysubs2/__pycache__/ssastyle.cpython-311.pyc,,
-pysubs2/__pycache__/time.cpython-311.pyc,,
-pysubs2/cli.py,sha256=lFVZsLChtnnaRov2lNEHlecTJaoNNvTLMQmZe0-4oGE,11916
-pysubs2/common.py,sha256=33XyqTSPqUNMedlnVkx-7GWFwvX0Fpce1G_ZHHtwQuI,1503
-pysubs2/exceptions.py,sha256=5XMoOvloP4QPPkEPour6YalxomcK-RkJA9eb_ecIbH0,2318
-pysubs2/formats/__init__.py,sha256=KZy9IibVmK-WwCHAYYplJELmYEnQu9BBRz5HEvyZ5U4,2515
-pysubs2/formats/__pycache__/__init__.cpython-311.pyc,,
-pysubs2/formats/__pycache__/base.cpython-311.pyc,,
-pysubs2/formats/__pycache__/jsonformat.cpython-311.pyc,,
-pysubs2/formats/__pycache__/microdvd.cpython-311.pyc,,
-pysubs2/formats/__pycache__/mpl2.cpython-311.pyc,,
-pysubs2/formats/__pycache__/subrip.cpython-311.pyc,,
-pysubs2/formats/__pycache__/substation.cpython-311.pyc,,
-pysubs2/formats/__pycache__/tmp.cpython-311.pyc,,
-pysubs2/formats/__pycache__/webvtt.cpython-311.pyc,,
-pysubs2/formats/__pycache__/whisper.cpython-311.pyc,,
-pysubs2/formats/base.py,sha256=zzt4L3KIC6VrUNfzwjDHSF5HV7swrdo65dop90vfy70,2959
-pysubs2/formats/jsonformat.py,sha256=TWk_qOI0-GaV_Jzs2S5JOe7uWu7t1jllO9NYOnZgRcE,2101
-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.2.dist-info/WHEEL b/libs/pysubs2-1.7.2.dist-info/WHEEL
deleted file mode 100644
index bab98d675..000000000
--- a/libs/pysubs2-1.7.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/python_engineio-4.9.0.dist-info/INSTALLER b/libs/pysubs2-1.7.3.dist-info/INSTALLER
similarity index 100%
rename from libs/python_engineio-4.9.0.dist-info/INSTALLER
rename to libs/pysubs2-1.7.3.dist-info/INSTALLER
diff --git a/libs/pysubs2-1.7.2.dist-info/LICENSE.txt b/libs/pysubs2-1.7.3.dist-info/LICENSE.txt
similarity index 100%
rename from libs/pysubs2-1.7.2.dist-info/LICENSE.txt
rename to libs/pysubs2-1.7.3.dist-info/LICENSE.txt
diff --git a/libs/pysubs2-1.7.2.dist-info/METADATA b/libs/pysubs2-1.7.3.dist-info/METADATA
similarity index 99%
rename from libs/pysubs2-1.7.2.dist-info/METADATA
rename to libs/pysubs2-1.7.3.dist-info/METADATA
index e1fef61e8..5326ba040 100644
--- a/libs/pysubs2-1.7.2.dist-info/METADATA
+++ b/libs/pysubs2-1.7.3.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pysubs2
-Version: 1.7.2
+Version: 1.7.3
 Summary: A library for editing subtitle files
 Home-page: https://github.com/tkarabela/pysubs2
 Author: Tomas Karabela
diff --git a/libs/pysubs2-1.7.3.dist-info/RECORD b/libs/pysubs2-1.7.3.dist-info/RECORD
new file mode 100644
index 000000000..ada373655
--- /dev/null
+++ b/libs/pysubs2-1.7.3.dist-info/RECORD
@@ -0,0 +1,28 @@
+../../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/python_engineio-4.9.0.dist-info/REQUESTED b/libs/pysubs2-1.7.3.dist-info/REQUESTED
similarity index 100%
rename from libs/python_engineio-4.9.0.dist-info/REQUESTED
rename to libs/pysubs2-1.7.3.dist-info/REQUESTED
diff --git a/libs/pysubs2-1.7.3.dist-info/WHEEL b/libs/pysubs2-1.7.3.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/pysubs2-1.7.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/pysubs2-1.7.2.dist-info/entry_points.txt b/libs/pysubs2-1.7.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/pysubs2-1.7.2.dist-info/entry_points.txt
rename to libs/pysubs2-1.7.3.dist-info/entry_points.txt
diff --git a/libs/pysubs2-1.7.2.dist-info/top_level.txt b/libs/pysubs2-1.7.3.dist-info/top_level.txt
similarity index 100%
rename from libs/pysubs2-1.7.2.dist-info/top_level.txt
rename to libs/pysubs2-1.7.3.dist-info/top_level.txt
diff --git a/libs/pysubs2/common.py b/libs/pysubs2/common.py
index 9ac8f13e8..f2c27f5de 100644
--- a/libs/pysubs2/common.py
+++ b/libs/pysubs2/common.py
@@ -58,7 +58,7 @@ SSA_ALIGNMENT: Tuple[int, ...] = (1, 2, 3, 9, 10, 11, 5, 6, 7)
 
 
 #: Version of the pysubs2 library.
-VERSION = "1.7.2"
+VERSION = "1.7.3"
 
 
 IntOrFloat = Union[int, float]
diff --git a/libs/pysubs2/exceptions.py b/libs/pysubs2/exceptions.py
index acf8112fb..eb08c3280 100644
--- a/libs/pysubs2/exceptions.py
+++ b/libs/pysubs2/exceptions.py
@@ -1,5 +1,4 @@
-from typing import List
-
+from typing import List, Any
 
 __all__ = [
     "Pysubs2Error",
@@ -35,6 +34,9 @@ class UnknownFileExtensionError(Pysubs2Error):
         msg = f"File extension {ext!r} does not match any supported subtitle format"
         super().__init__(msg)
 
+    def __reduce__(self) -> Any:
+        return self.__class__, (self.ext,)
+
 
 class UnknownFormatIdentifierError(Pysubs2Error):
     """
@@ -52,6 +54,9 @@ class UnknownFormatIdentifierError(Pysubs2Error):
         msg = f"Format identifier {format_!r} does not match any supported subtitle format"
         super().__init__(msg)
 
+    def __reduce__(self) -> Any:
+        return self.__class__, (self.format_,)
+
 
 class FormatAutodetectionError(Pysubs2Error):
     """
@@ -74,3 +79,6 @@ class FormatAutodetectionError(Pysubs2Error):
         else:
             msg = f"Multiple suitable formats ({formats!r})"
         super().__init__(msg)
+
+    def __reduce__(self) -> Any:
+        return self.__class__, (self.content, self.formats)
diff --git a/libs/pysubs2/formats/jsonformat.py b/libs/pysubs2/formats/jsonformat.py
index 2f9acc5f1..9927d1f25 100644
--- a/libs/pysubs2/formats/jsonformat.py
+++ b/libs/pysubs2/formats/jsonformat.py
@@ -9,11 +9,12 @@ from .base import FormatBase
 from ..ssafile import SSAFile
 
 
-# We're using Color dataclass
+# Custom JSONEncoder is needed since our `Color` is a dataclass
 # https://stackoverflow.com/questions/51286748/make-the-python-json-encoder-support-pythons-new-dataclasses
 class EnhancedJSONEncoder(json.JSONEncoder):
     def default(self, o: Any) -> Any:
-        if dataclasses.is_dataclass(o):
+        if not isinstance(o, type) and dataclasses.is_dataclass(o):
+            # MyPy 1.11.0 thinks `o` is `type[DataclassInstance]` instead of `DataclassInstance` without the isinstance
             return dataclasses.asdict(o)
         return super().default(o)
 
diff --git a/libs/python_dateutil-2.8.2.dist-info/RECORD b/libs/python_dateutil-2.8.2.dist-info/RECORD
deleted file mode 100644
index 557239e99..000000000
--- a/libs/python_dateutil-2.8.2.dist-info/RECORD
+++ /dev/null
@@ -1,27 +0,0 @@
-dateutil/__init__.py,sha256=lXElASqwYGwqlrSWSeX19JwF5Be9tNecDa9ebk-0gmk,222
-dateutil/_common.py,sha256=77w0yytkrxlYbSn--lDVPUMabUXRR9I3lBv_vQRUqUY,932
-dateutil/_version.py,sha256=DhYpbRoCd3nAZrV5KU75U2jhfoV0Ux9VW_qFy9TY7S8,411
-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
-dateutil/parser/isoparser.py,sha256=EtLY7w22HWx-XJpTWxJD3XNs6LBHRCps77tCdLnYad8,13247
-dateutil/relativedelta.py,sha256=GjVxqpAVWnG67rdbf7pkoIlJvQqmju9NSfGCcqblc7U,24904
-dateutil/rrule.py,sha256=b6GVV4MpZDbBhJ5qitQKRyx8-_OKyeAbk57or2A8AYU,66556
-dateutil/tz/__init__.py,sha256=F-Mz13v6jYseklQf9Te9J6nzcLDmq47gORa61K35_FA,444
-dateutil/tz/_common.py,sha256=cgzDTANsOXvEc86cYF77EsliuSab8Puwpsl5-bX3_S4,12977
-dateutil/tz/_factories.py,sha256=unb6XQNXrPMveksTCU-Ag8jmVZs4SojoPUcAHpWnrvU,2569
-dateutil/tz/tz.py,sha256=JotVjDcF16hzoouQ0kZW-5mCYu7Xj67NI-VQgnWapKE,62857
-dateutil/tz/win.py,sha256=xJszWgSwE1xPx_HJj4ZkepyukC_hNy016WMcXhbRaB8,12935
-dateutil/tzwin.py,sha256=7Ar4vdQCnnM0mKR3MUjbIKsZrBVfHgdwsJZc_mGYRew,59
-dateutil/utils.py,sha256=dKCchEw8eObi0loGTx91unBxm_7UGlU3v_FjFMdqwYM,1965
-dateutil/zoneinfo/__init__.py,sha256=KYg0pthCMjcp5MXSEiBJn3nMjZeNZav7rlJw5-tz1S4,5889
-dateutil/zoneinfo/dateutil-zoneinfo.tar.gz,sha256=AkcdBx3XkEZwMSpS_TmOEfrEFHLvgxPNDVIwGVxTVaI,174394
-dateutil/zoneinfo/rebuild.py,sha256=MiqYzCIHvNbMH-LdRYLv-4T0EIA7hDKt5GLR0IRTLdI,2392
-python_dateutil-2.8.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_dateutil-2.8.2.dist-info/LICENSE,sha256=ugD1Gg2SgjtaHN4n2LW50jIeZ-2NqbwWPv-W1eF-V34,2889
-python_dateutil-2.8.2.dist-info/METADATA,sha256=RQAxn6HOo6niL6LcTlO6YbksoUNuE1OwNqagkI1t2d8,8196
-python_dateutil-2.8.2.dist-info/RECORD,,
-python_dateutil-2.8.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_dateutil-2.8.2.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-python_dateutil-2.8.2.dist-info/top_level.txt,sha256=4tjdWkhRZvF7LA_BYe_L9gB2w_p2a-z5y6ArjaRkot8,9
-python_dateutil-2.8.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
diff --git a/libs/python_socketio-5.11.1.dist-info/INSTALLER b/libs/python_dateutil-2.9.0.dist-info/INSTALLER
similarity index 100%
rename from libs/python_socketio-5.11.1.dist-info/INSTALLER
rename to libs/python_dateutil-2.9.0.dist-info/INSTALLER
diff --git a/libs/python_dateutil-2.8.2.dist-info/LICENSE b/libs/python_dateutil-2.9.0.dist-info/LICENSE
similarity index 100%
rename from libs/python_dateutil-2.8.2.dist-info/LICENSE
rename to libs/python_dateutil-2.9.0.dist-info/LICENSE
diff --git a/libs/python_dateutil-2.8.2.dist-info/METADATA b/libs/python_dateutil-2.9.0.dist-info/METADATA
similarity index 97%
rename from libs/python_dateutil-2.8.2.dist-info/METADATA
rename to libs/python_dateutil-2.9.0.dist-info/METADATA
index 4f47cb6c2..257a43e4f 100644
--- a/libs/python_dateutil-2.8.2.dist-info/METADATA
+++ b/libs/python_dateutil-2.9.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-dateutil
-Version: 2.8.2
+Version: 2.9.0
 Summary: Extensions to the standard Python datetime module
 Home-page: https://github.com/dateutil/dateutil
 Author: Gustavo Niemeyer
@@ -25,11 +25,14 @@ 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
 Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,>=2.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: six >=1.5
+Requires-Dist: six>=1.5
 
 dateutil - powerful extensions to datetime
 ==========================================
@@ -180,7 +183,7 @@ keys can be found below:
 ===========  ============================
 Releases     Signing key fingerprint
 ===========  ============================
-2.4.1-2.8.2  `6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB`_ 
+2.4.1-2.8.2  `6B49 ACBA DCF6 BD1C A206 67AB CD54 FCE3 D964 BEFB`_
 ===========  ============================
 
 New releases *may* have signed tags, but binary and source distributions
diff --git a/libs/python_dateutil-2.9.0.dist-info/RECORD b/libs/python_dateutil-2.9.0.dist-info/RECORD
new file mode 100644
index 000000000..f1b18f863
--- /dev/null
+++ b/libs/python_dateutil-2.9.0.dist-info/RECORD
@@ -0,0 +1,27 @@
+dateutil/__init__.py,sha256=Mqam67WO9IkTmUFyI66vS6IoSXTp9G388DadH2LCMLY,620
+dateutil/_common.py,sha256=77w0yytkrxlYbSn--lDVPUMabUXRR9I3lBv_vQRUqUY,932
+dateutil/_version.py,sha256=Vb5T-8FcBzgHCb1RYqez20zYqm5tplcF41kZi7B8cik,411
+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
+dateutil/parser/isoparser.py,sha256=8Fy999bnCd1frSdOYuOraWfJTtd5W7qQ51NwNuH_hXM,13233
+dateutil/relativedelta.py,sha256=IY_mglMjoZbYfrvloTY2ce02aiVjPIkiZfqgNTZRfuA,24903
+dateutil/rrule.py,sha256=KJzKlaCd1jEbu4A38ZltslaoAUh9nSbdbOFdjp70Kew,66557
+dateutil/tz/__init__.py,sha256=F-Mz13v6jYseklQf9Te9J6nzcLDmq47gORa61K35_FA,444
+dateutil/tz/_common.py,sha256=cgzDTANsOXvEc86cYF77EsliuSab8Puwpsl5-bX3_S4,12977
+dateutil/tz/_factories.py,sha256=unb6XQNXrPMveksTCU-Ag8jmVZs4SojoPUcAHpWnrvU,2569
+dateutil/tz/tz.py,sha256=EUnEdMfeThXiY6l4sh9yBabZ63_POzy01zSsh9thn1o,62855
+dateutil/tz/win.py,sha256=xJszWgSwE1xPx_HJj4ZkepyukC_hNy016WMcXhbRaB8,12935
+dateutil/tzwin.py,sha256=7Ar4vdQCnnM0mKR3MUjbIKsZrBVfHgdwsJZc_mGYRew,59
+dateutil/utils.py,sha256=dKCchEw8eObi0loGTx91unBxm_7UGlU3v_FjFMdqwYM,1965
+dateutil/zoneinfo/__init__.py,sha256=KYg0pthCMjcp5MXSEiBJn3nMjZeNZav7rlJw5-tz1S4,5889
+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/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/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_socketio-5.11.1.dist-info/REQUESTED b/libs/python_dateutil-2.9.0.dist-info/REQUESTED
similarity index 100%
rename from libs/python_socketio-5.11.1.dist-info/REQUESTED
rename to libs/python_dateutil-2.9.0.dist-info/REQUESTED
diff --git a/libs/python_dateutil-2.8.2.dist-info/WHEEL b/libs/python_dateutil-2.9.0.dist-info/WHEEL
similarity index 70%
rename from libs/python_dateutil-2.8.2.dist-info/WHEEL
rename to libs/python_dateutil-2.9.0.dist-info/WHEEL
index 4724c4573..17c0299e4 100644
--- a/libs/python_dateutil-2.8.2.dist-info/WHEEL
+++ b/libs/python_dateutil-2.9.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/python_dateutil-2.8.2.dist-info/top_level.txt b/libs/python_dateutil-2.9.0.dist-info/top_level.txt
similarity index 100%
rename from libs/python_dateutil-2.8.2.dist-info/top_level.txt
rename to libs/python_dateutil-2.9.0.dist-info/top_level.txt
diff --git a/libs/pytz-2024.1.dist-info/zip-safe b/libs/python_dateutil-2.9.0.dist-info/zip-safe
similarity index 100%
rename from libs/pytz-2024.1.dist-info/zip-safe
rename to libs/python_dateutil-2.9.0.dist-info/zip-safe
diff --git a/libs/pytz-2024.1.dist-info/INSTALLER b/libs/python_engineio-4.11.2.dist-info/INSTALLER
similarity index 100%
rename from libs/pytz-2024.1.dist-info/INSTALLER
rename to libs/python_engineio-4.11.2.dist-info/INSTALLER
diff --git a/libs/python_engineio-4.9.0.dist-info/LICENSE b/libs/python_engineio-4.11.2.dist-info/LICENSE
similarity index 100%
rename from libs/python_engineio-4.9.0.dist-info/LICENSE
rename to libs/python_engineio-4.11.2.dist-info/LICENSE
diff --git a/libs/python_engineio-4.9.0.dist-info/METADATA b/libs/python_engineio-4.11.2.dist-info/METADATA
similarity index 99%
rename from libs/python_engineio-4.9.0.dist-info/METADATA
rename to libs/python_engineio-4.11.2.dist-info/METADATA
index 02b1caf75..a3824ff02 100644
--- a/libs/python_engineio-4.9.0.dist-info/METADATA
+++ b/libs/python_engineio-4.11.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-engineio
-Version: 4.9.0
+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
diff --git a/libs/python_engineio-4.11.2.dist-info/RECORD b/libs/python_engineio-4.11.2.dist-info/RECORD
new file mode 100644
index 000000000..b1e0f8498
--- /dev/null
+++ b/libs/python_engineio-4.11.2.dist-info/RECORD
@@ -0,0 +1,33 @@
+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/pytz-2024.1.dist-info/REQUESTED b/libs/python_engineio-4.11.2.dist-info/REQUESTED
similarity index 100%
rename from libs/pytz-2024.1.dist-info/REQUESTED
rename to libs/python_engineio-4.11.2.dist-info/REQUESTED
diff --git a/libs/python_engineio-4.11.2.dist-info/WHEEL b/libs/python_engineio-4.11.2.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/python_engineio-4.11.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/python_engineio-4.9.0.dist-info/top_level.txt b/libs/python_engineio-4.11.2.dist-info/top_level.txt
similarity index 100%
rename from libs/python_engineio-4.9.0.dist-info/top_level.txt
rename to libs/python_engineio-4.11.2.dist-info/top_level.txt
diff --git a/libs/python_engineio-4.9.0.dist-info/RECORD b/libs/python_engineio-4.9.0.dist-info/RECORD
deleted file mode 100644
index b0df9865e..000000000
--- a/libs/python_engineio-4.9.0.dist-info/RECORD
+++ /dev/null
@@ -1,33 +0,0 @@
-engineio/__init__.py,sha256=0R2PY1EXu3sicP7mkA0_QxEVGRlFlgvsxfhByqREE1A,481
-engineio/async_client.py,sha256=QyHBWpLZxfBc4lK_eodkPM0xzsfVYpt7mzNaA9uG3cg,27932
-engineio/async_drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-engineio/async_drivers/_websocket_wsgi.py,sha256=FGoRBGOUsEtlfklYNylR0o3oLOGmXIR8QzaCsGLgr3I,949
-engineio/async_drivers/aiohttp.py,sha256=zJdujjO6dSL_oKDDr4xfO4ID_Vd8faEp1AOIW4ogKME,3768
-engineio/async_drivers/asgi.py,sha256=AVEXVP4KLu0etH2kTiuJgVTUkstdNHh0srQSxXx3sBM,10354
-engineio/async_drivers/eventlet.py,sha256=IG6oLaWH663dw5CEnO-SRz6IsJb6lO55kRCYTdmqZE0,1755
-engineio/async_drivers/gevent.py,sha256=hnJHeWdDQE2jfoLCP5DnwVPzsQlcTLJUMA5EVf1UL-k,2962
-engineio/async_drivers/gevent_uwsgi.py,sha256=cnjCsnDHTa6rKgwDKD6rLvIw1Yun-g4c1QbujOC_bMY,5962
-engineio/async_drivers/sanic.py,sha256=SY0HIp5DUHF7B55tJCBB_8qDjrRTD_FyNQ2cIwRIGR8,4538
-engineio/async_drivers/threading.py,sha256=ywmG59d4H6OHZjKarBN97-9BHEsRxFEz9YN-E9QAu_I,463
-engineio/async_drivers/tornado.py,sha256=9bB7FvY47Snx_h4rsNwRk5wIINf2ju7hXWTAqF3intA,5909
-engineio/async_server.py,sha256=gO7Tq1i4c3rSnN2zQdRrbVZIrPCI9ynjFqsqyIVLP80,25061
-engineio/async_socket.py,sha256=P8OZW1N5y7jr2hW1qLLK2y_Clt7aHdv2ucYW69mbU4Q,10305
-engineio/base_client.py,sha256=Q_w0Stvy89wPHwWk7411dRxpGjxNPypm4xy_4XMPZ9M,4872
-engineio/base_server.py,sha256=Em2RRpbohulKjmYTWHnf_lALKvTT_jHr442Rr2g_BEQ,14013
-engineio/base_socket.py,sha256=Bw6TWv1pnlXcDdqT59C5CyTaBi7l-_mkykIUuZLjz-g,400
-engineio/client.py,sha256=xz1KVYlxjynGUUn6hR_rga1sByYcVdYb5taMVsfXJkk,26291
-engineio/exceptions.py,sha256=FyuMb5qhX9CUYP3fEoe1m-faU96ApdQTSbblaaoo8LA,292
-engineio/json.py,sha256=SG5FTojqd1ix6u0dKXJsZVqqdYioZLO4S2GPL7BKl3U,405
-engineio/middleware.py,sha256=BF_qHAIZZnIbfiP256SD1CX3kzNWbSuto1cpih8oIFg,3766
-engineio/packet.py,sha256=ETMeLgdpZghXK9fth93IZO8pIft6Sg3d1QGpyTx4xBE,3189
-engineio/payload.py,sha256=2iLIFgIweTWkLok_UZ5zCgELmRSGyUUI5eeYcEerFSs,1547
-engineio/server.py,sha256=UegXydKobZaR1O0MxS_MENKNF7PBjpP_kPI0-OpI5EQ,21558
-engineio/socket.py,sha256=dasec3jXoV2eR1jmIrhEIfHzyUuuv8FwvxLB3DpyjeY,9996
-engineio/static_files.py,sha256=pwez9LQFaSQXMbtI0vLyD6UDiokQ4rNfmRYgVLKOthc,2064
-python_engineio-4.9.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_engineio-4.9.0.dist-info/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_engineio-4.9.0.dist-info/METADATA,sha256=Qb43yDoGFRx78nu3tWw4hLWtPAt3bU-44hLJV-4P8DA,2244
-python_engineio-4.9.0.dist-info/RECORD,,
-python_engineio-4.9.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_engineio-4.9.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-python_engineio-4.9.0.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
diff --git a/libs/python_engineio-4.9.0.dist-info/WHEEL b/libs/python_engineio-4.9.0.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/python_engineio-4.9.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/python_socketio-5.11.1.dist-info/RECORD b/libs/python_socketio-5.11.1.dist-info/RECORD
deleted file mode 100644
index fa41e4f44..000000000
--- a/libs/python_socketio-5.11.1.dist-info/RECORD
+++ /dev/null
@@ -1,38 +0,0 @@
-python_socketio-5.11.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_socketio-5.11.1.dist-info/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_socketio-5.11.1.dist-info/METADATA,sha256=zz6nQ2YfgdvUuUN2eSS4b1YXhniYjjVvTjvVr87fSwQ,3213
-python_socketio-5.11.1.dist-info/RECORD,,
-python_socketio-5.11.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_socketio-5.11.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-python_socketio-5.11.1.dist-info/top_level.txt,sha256=xWd-HVUanhys_VzQQTRTRZBX8W448ayFytYf1Zffivs,9
-socketio/__init__.py,sha256=DXxtwPIqHFIqV4BGTgJ86OvCXD6Mth3PxBYhFoJ1_7g,1269
-socketio/admin.py,sha256=9B601337UMTh2NIFzVrlFyImmSEtegJoXYFDlEwGmYk,16473
-socketio/asgi.py,sha256=Ti38pUt9TMUDZfc_l9DI3ZN9l50XoOK0gjSsz1m_-2I,1807
-socketio/async_admin.py,sha256=Swn4s154pc7QTWCWNEbSM2psAmhEuvgobIn1Vf7Y0y8,16850
-socketio/async_aiopika_manager.py,sha256=DaBUjGRYaNIsOsk2xNjWylUsz2egmTAFFUiQkV6mNmk,5193
-socketio/async_client.py,sha256=8Gyj2pj72cW7disjodpvJZj_sXbv8_j634aVAirOnxg,25925
-socketio/async_manager.py,sha256=JiKiI01wOKsX6_v4VJpgBvlxYFDnCA3vpA_lGDuA0YI,4468
-socketio/async_namespace.py,sha256=fuIuIQDUL-lXyD9lm70W2QZr1wA_UMkOb-hQzE5P6u4,10616
-socketio/async_pubsub_manager.py,sha256=kN1G7dM4smVqk9OK85mZJ0eqG-5D8JBkvBW8fIQ70Io,11106
-socketio/async_redis_manager.py,sha256=UZXKunvbSk8neRVhGqigQF5S0WwLYTKV0BKondnV_yY,4299
-socketio/async_server.py,sha256=j3VOrCcAgq4HCyiCSf4VL4uRGXRe9QkhHSg-qploMgQ,35307
-socketio/async_simple_client.py,sha256=Dj2h0iRR1qZ4BhOV6gpzvDM0K5XO4f-vdxmISiREzhQ,8908
-socketio/base_client.py,sha256=bW2zRm7pjAGlB37iV62363zOl1er3z8I4EroCgeA6PQ,11576
-socketio/base_manager.py,sha256=DJLH6IbJpaJ38jCrmIaUQVj8WUKZDYtfzjKIbQslLjw,5768
-socketio/base_namespace.py,sha256=PpBylO78iyOJ6st5IHQeeXTvD7XzUim5MNDzdKjISxU,978
-socketio/base_server.py,sha256=kg4mFAXMD87PUVMN5FqS3Riy_qg0vmS-j5oxrLBVD5o,10548
-socketio/client.py,sha256=e-YWn63vxJ0Ium9y_-E1YrllVNn31K8Yth6fvTPNXFI,24622
-socketio/exceptions.py,sha256=c8yKss_oJl-fkL52X_AagyJecL-9Mxlgb5xDRqSz5tA,975
-socketio/kafka_manager.py,sha256=OCUBlntnqAOlqZn7YxxM0E4rt6VLd_b-wJWrVWKRR-A,2419
-socketio/kombu_manager.py,sha256=qFzWOUlsIznNx2IYKMvA6GKrDcG0zle5_G9duanJ3Po,5747
-socketio/manager.py,sha256=wief9dt2R_OpNKDcFr4HAppCDQfc_WTqwQQ6ViCZi4k,3826
-socketio/middleware.py,sha256=P8wOgSzy3YKOcRVI-r3KNKsEejBz_f5p2wdV8ZqW12E,1591
-socketio/msgpack_packet.py,sha256=0K_XXM-OF3SdqOaLN_O5B4a1xHE6N_UhhiaRhQdseNw,514
-socketio/namespace.py,sha256=jkCi7n-bmAXYRdM-dFwKuLSmXqNc7YGF7SUzHGZzaKw,8870
-socketio/packet.py,sha256=aVlNp2MV4QR1VfVoMN9zhIbxSTQONduDFgxVv4AzZcI,7065
-socketio/pubsub_manager.py,sha256=ht9dXinzUtiLldxwttih5hoMhQwIw7sBJMtVBpkcbVA,10407
-socketio/redis_manager.py,sha256=KExT3uzACK42g9OuHKvzI7YpfpGGLFMOwsWhgnPkx0Q,4442
-socketio/server.py,sha256=T5uU0nThuspxU1UXd153QmxT_IWUxCkPww9xMdzdCdA,34092
-socketio/simple_client.py,sha256=tZiX2sAPY66OJTIJPk-PIGQjmnmUxu3RnpgJ0nc1-y8,8326
-socketio/tornado.py,sha256=R82JCqz-E1ibZAQX708h7FX3sguCHQ1OLYpnMag-LY8,295
-socketio/zmq_manager.py,sha256=JsRooJoH0dwOE0QsmDwePmwzsIN0VudsFWweCzScvMs,3545
diff --git a/libs/python_socketio-5.11.1.dist-info/WHEEL b/libs/python_socketio-5.11.1.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/python_socketio-5.11.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/rarfile-4.1.dist-info/INSTALLER b/libs/python_socketio-5.12.1.dist-info/INSTALLER
similarity index 100%
rename from libs/rarfile-4.1.dist-info/INSTALLER
rename to libs/python_socketio-5.12.1.dist-info/INSTALLER
diff --git a/libs/python_socketio-5.11.1.dist-info/LICENSE b/libs/python_socketio-5.12.1.dist-info/LICENSE
similarity index 100%
rename from libs/python_socketio-5.11.1.dist-info/LICENSE
rename to libs/python_socketio-5.12.1.dist-info/LICENSE
diff --git a/libs/python_socketio-5.11.1.dist-info/METADATA b/libs/python_socketio-5.12.1.dist-info/METADATA
similarity index 98%
rename from libs/python_socketio-5.11.1.dist-info/METADATA
rename to libs/python_socketio-5.12.1.dist-info/METADATA
index caf38eb8f..e8a8c1629 100644
--- a/libs/python_socketio-5.11.1.dist-info/METADATA
+++ b/libs/python_socketio-5.12.1.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-socketio
-Version: 5.11.1
+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
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: bidict >=0.21.0
-Requires-Dist: python-engineio >=4.8.0
+Requires-Dist: python-engineio >=4.11.0
 Provides-Extra: asyncio_client
 Requires-Dist: aiohttp >=3.4 ; extra == 'asyncio_client'
 Provides-Extra: client
diff --git a/libs/python_socketio-5.12.1.dist-info/RECORD b/libs/python_socketio-5.12.1.dist-info/RECORD
new file mode 100644
index 000000000..6fa92b146
--- /dev/null
+++ b/libs/python_socketio-5.12.1.dist-info/RECORD
@@ -0,0 +1,38 @@
+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/rarfile-4.1.dist-info/REQUESTED b/libs/python_socketio-5.12.1.dist-info/REQUESTED
similarity index 100%
rename from libs/rarfile-4.1.dist-info/REQUESTED
rename to libs/python_socketio-5.12.1.dist-info/REQUESTED
diff --git a/libs/python_socketio-5.12.1.dist-info/WHEEL b/libs/python_socketio-5.12.1.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/python_socketio-5.12.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/python_socketio-5.11.1.dist-info/top_level.txt b/libs/python_socketio-5.12.1.dist-info/top_level.txt
similarity index 100%
rename from libs/python_socketio-5.11.1.dist-info/top_level.txt
rename to libs/python_socketio-5.12.1.dist-info/top_level.txt
diff --git a/libs/pytz-2024.1.dist-info/WHEEL b/libs/pytz-2024.1.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf9..000000000
--- a/libs/pytz-2024.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/requests-2.31.0.dist-info/INSTALLER b/libs/pytz-2024.2.dist-info/INSTALLER
similarity index 100%
rename from libs/requests-2.31.0.dist-info/INSTALLER
rename to libs/pytz-2024.2.dist-info/INSTALLER
diff --git a/libs/pytz-2024.1.dist-info/LICENSE.txt b/libs/pytz-2024.2.dist-info/LICENSE.txt
similarity index 100%
rename from libs/pytz-2024.1.dist-info/LICENSE.txt
rename to libs/pytz-2024.2.dist-info/LICENSE.txt
diff --git a/libs/pytz-2024.1.dist-info/METADATA b/libs/pytz-2024.2.dist-info/METADATA
similarity index 99%
rename from libs/pytz-2024.1.dist-info/METADATA
rename to libs/pytz-2024.2.dist-info/METADATA
index afe3703bf..6feaf3bac 100644
--- a/libs/pytz-2024.1.dist-info/METADATA
+++ b/libs/pytz-2024.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytz
-Version: 2024.1
+Version: 2024.2
 Summary: World timezone definitions, modern and historical
 Home-page: http://pythonhosted.org/pytz
 Download-URL: https://pypi.org/project/pytz/
@@ -35,6 +35,7 @@ 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
 
diff --git a/libs/pytz-2024.1.dist-info/RECORD b/libs/pytz-2024.2.dist-info/RECORD
similarity index 91%
rename from libs/pytz-2024.1.dist-info/RECORD
rename to libs/pytz-2024.2.dist-info/RECORD
index b6c14db40..1b6af9703 100644
--- a/libs/pytz-2024.1.dist-info/RECORD
+++ b/libs/pytz-2024.2.dist-info/RECORD
@@ -1,12 +1,12 @@
-pytz-2024.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pytz-2024.1.dist-info/LICENSE.txt,sha256=vosaN-vibFkqkPbA6zMQOn84POL010mMCvmlJpkKB7g,1088
-pytz-2024.1.dist-info/METADATA,sha256=XUwgTrg17abcCW5F68HMvNpFzYjEPtfKzO56iLiQoZ0,22323
-pytz-2024.1.dist-info/RECORD,,
-pytz-2024.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytz-2024.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-pytz-2024.1.dist-info/top_level.txt,sha256=6xRYlt934v1yHb1JIrXgHyGxn3cqACvd-yE8ski_kcc,5
-pytz-2024.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pytz/__init__.py,sha256=RZJJJ1W2RyP9fllsMNO4w-yjJRpIazWJ9fvj5telYig,35101
+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
@@ -22,9 +22,9 @@ pytz/zoneinfo/Africa/Bamako,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,1
 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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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
@@ -35,22 +35,22 @@ pytz/zoneinfo/Africa/Djibouti,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg
 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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
-pytz/zoneinfo/Africa/Harare,sha256=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
-pytz/zoneinfo/Africa/Lusaka,sha256=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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=k_GelVHViGiuWCB1LSyTpIYSTDZEY9yclInQRY-LxoI,149
+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
@@ -89,7 +89,7 @@ pytz/zoneinfo/America/Asuncion,sha256=V8wwkUoNqyj0C-fUSADpU7HU8H3Qkr3jNPJ4SLsGUI
 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=L6iHYbA1Us1pljllFLEIAHW4ZaZhFKoG2Zr8TT5aY38,1152
+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
@@ -100,14 +100,14 @@ pytz/zoneinfo/America/Boise,sha256=7HQsNPJiUheQgFz5kVLvTnf5xhXAYaeANqDskxKz2Vs,2
 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=lI4ZtiBtxKqNHvU47vRSwc5-GDl8JOdC2A6oc9s8iIo,834
+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=ZAlPSsUfT3VGp1VdibnHIf-QsdEIqHuzX15wu2P2YQk,1102
-pytz/zoneinfo/America/Ciudad_Juarez,sha256=OQstyPrMxx3nNEbzgDhq_W0mK49-ApNMK7_6p-6dJ64,1538
+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
@@ -123,7 +123,7 @@ pytz/zoneinfo/America/Dominica,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJ
 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=57-Q9LSTNuTidz-lOTwDysmlCoeFUXSecvVVqNWburQ,2374
+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
@@ -138,7 +138,7 @@ pytz/zoneinfo/America/Guayaquil,sha256=j2UuIo-4RgSOlTNfu77mhZ92waNTeKFSvmoVemJoo
 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=WnlVBpVBG8ONnz0wpxteXmuvSzOGwSlAisvDd1GtKYA,456
+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
@@ -168,15 +168,15 @@ pytz/zoneinfo/America/Manaus,sha256=F6RLOOeOi9lymZiQmQ9pR8tFpPZ6EguNdPfOc6BhXDE,
 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=RQQVwlEVHRp2X-c_0hJ46y54abTlqUuLkyrUUicyc5g,1128
+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=ORJCGiO2mXG-kk5ZZGro1MNuKqRnJx6HJlvoezTMM90,1004
+pytz/zoneinfo/America/Merida,sha256=SVNEHCazjomftnuPVBayFI-E-IQ0WmluHfTpHP0h3d0,1004
 pytz/zoneinfo/America/Metlakatla,sha256=twmieGTVY2V-U8nFxqvx7asYv8GVjeWdLtrOI7UApVI,1423
-pytz/zoneinfo/America/Mexico_City,sha256=A5MlfDUZ4O1-jMTRt0WPem7qqcW0Nrslls1hlc8C4-Q,1222
+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=vKBLVjG0bNVDI07M4WwOVv2KbrYJVNTLmc19iM2CvTU,980
+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
@@ -189,7 +189,7 @@ pytz/zoneinfo/America/North_Dakota/Beulah,sha256=qtgbqNu8M3AkHF2n-_oSps1pYT4Sxgc
 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=9catgEQ2SD7qfuvTMxs15Cdd9SKaUy-svEzPBFw2Q3Q,1524
+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
@@ -207,7 +207,7 @@ pytz/zoneinfo/America/Regina,sha256=yjqT08pHbICYe83H8JmtaDBvCFqRv7Tfze3Y8xuXukw,
 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=57-Q9LSTNuTidz-lOTwDysmlCoeFUXSecvVVqNWburQ,2374
+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
@@ -225,7 +225,7 @@ pytz/zoneinfo/America/Swift_Current,sha256=RRKOF7vZC8VvYxD8PP4J1_hUPayKBP7Lu80av
 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=57-Q9LSTNuTidz-lOTwDysmlCoeFUXSecvVVqNWburQ,2374
+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
@@ -266,14 +266,14 @@ pytz/zoneinfo/Asia/Bishkek,sha256=IOoUyjABILCkXu1rjCIqSwAufRYFklc5YAC4jdhVw6Q,96
 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=atm7FmPwZGsftLM7vS1LltjcdaDC-DSg1cIdP2MF17I,935
+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=0mUs0Utk-uW9deZV3cBUTpfWMgFvl0DyN29JuKvKMyw,213
+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
@@ -346,14 +346,14 @@ pytz/zoneinfo/Asia/Yakutsk,sha256=PPNrRGgg9jefOUM-6M8XqaIm-ElfmRZSWAtSGKLzNXQ,11
 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=NyNrE2YIwL9yVddpECcYWwci5JzrfjxiIXP7RP0MrL8,3498
+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=21Zcy0xRqDN3oY8jmjjO-LI7aC3G9mcS9ytaYg0g7ik,3503
+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
@@ -385,8 +385,8 @@ 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=o4omkrM_IsITxooUo8krM921XfBdvRs9JhwGXGd-Ypg,2094
-pytz/zoneinfo/CST6CDT,sha256=WGbtZ1FwjRX6Jeo_TCXKsfeDs4V9uhXGJfcnLJhk3s0,2310
+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
@@ -398,9 +398,9 @@ pytz/zoneinfo/Canada/Yukon,sha256=TrR6PCnYG-mSClBMohqlP8qnYhXMUsydI-L-quXFxyM,16
 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=gGVsW5-qnI7ty8vqVK1ADWhunrvAT8kUC79GUf-_7G8,1908
-pytz/zoneinfo/EST,sha256=uKE_VPKfxGyYEsyqV_DdE2MW55vs_qUioOdIn5Goobc,114
-pytz/zoneinfo/EST5EDT,sha256=fwzEMT1jgnY2dDjd0EqDl26_7LC-oF48Bd4ng5311H0,2310
+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
@@ -463,7 +463,7 @@ pytz/zoneinfo/Europe/Kaliningrad,sha256=s7GXSe1YvMcs7AiUhHNTA6I4nAOQn_Kmz_ZqJYO-
 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=mpUpxGexMhbOBImDLSQs5-GAk7pm7tg4qYW044Kkle0,3497
+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
@@ -510,7 +510,7 @@ 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=1YkCncvgL9Z5CmUo4Vk8VbQmgA7ZAQ0PtE37j1yOli8,115
+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
@@ -530,17 +530,17 @@ 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=i3CKSuP4N_PAj7o-Cbk8zPEdFs0CWWBCAfg2JXDx5V8,2094
-pytz/zoneinfo/MST,sha256=6IQwvtT12Bz1pTiqFuoVxNY-4ViS7ZrYHo5nPWwzKPw,114
-pytz/zoneinfo/MST7MDT,sha256=910Ek32FKoSyZWY_H19VHaVvqb-JsvnWTOOHvhrKsE0,2310
-pytz/zoneinfo/Mexico/BajaNorte,sha256=57-Q9LSTNuTidz-lOTwDysmlCoeFUXSecvVVqNWburQ,2374
-pytz/zoneinfo/Mexico/BajaSur,sha256=RQQVwlEVHRp2X-c_0hJ46y54abTlqUuLkyrUUicyc5g,1128
-pytz/zoneinfo/Mexico/General,sha256=A5MlfDUZ4O1-jMTRt0WPem7qqcW0Nrslls1hlc8C4-Q,1222
+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=Q7TCLkE69a6g7mPoPAkqhg-0dStyiAC0jVlM72KG_R8,2310
+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
@@ -586,7 +586,7 @@ pytz/zoneinfo/Pacific/Wake,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,15
 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=mpUpxGexMhbOBImDLSQs5-GAk7pm7tg4qYW044Kkle0,3497
+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
@@ -607,11 +607,11 @@ 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=Sc0l03EfVs_aIi17I4KyZJFkwiAHat5BgpjuuFDhgQ0,1905
+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=fjC39Eu3wB6I4g7x_VL7HzvDVbiKbLUjfQAEgo7442I,3257
-pytz/zoneinfo/tzdata.zi,sha256=8PWtzwDNZfLJU8Wa6Ktci7tg9V5mpvh26Vb0P8jBU0w,109390
-pytz/zoneinfo/zone.tab,sha256=qSLfeCWE3tsCDIIQbr71DMkmCUXTIUEgNZgfN-60d-Y,18846
-pytz/zoneinfo/zone1970.tab,sha256=FJErvL9wggoFluO2WceYn8ZQ-nA9A073Lub1x2Pzg40,17582
-pytz/zoneinfo/zonenow.tab,sha256=YoPd7huhHsKlJliOO-eMIBE5-bHBKpbfjkSJQFAto6I,8311
+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/requests-2.31.0.dist-info/REQUESTED b/libs/pytz-2024.2.dist-info/REQUESTED
similarity index 100%
rename from libs/requests-2.31.0.dist-info/REQUESTED
rename to libs/pytz-2024.2.dist-info/REQUESTED
diff --git a/libs/certifi-2024.2.2.dist-info/WHEEL b/libs/pytz-2024.2.dist-info/WHEEL
similarity index 100%
rename from libs/certifi-2024.2.2.dist-info/WHEEL
rename to libs/pytz-2024.2.dist-info/WHEEL
diff --git a/libs/pytz-2024.1.dist-info/top_level.txt b/libs/pytz-2024.2.dist-info/top_level.txt
similarity index 100%
rename from libs/pytz-2024.1.dist-info/top_level.txt
rename to libs/pytz-2024.2.dist-info/top_level.txt
diff --git a/libs/pytz-2024.2.dist-info/zip-safe b/libs/pytz-2024.2.dist-info/zip-safe
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/libs/pytz-2024.2.dist-info/zip-safe
@@ -0,0 +1 @@
+
diff --git a/libs/pytz/__init__.py b/libs/pytz/__init__.py
index 2355f8b44..96409e2d0 100644
--- a/libs/pytz/__init__.py
+++ b/libs/pytz/__init__.py
@@ -22,8 +22,8 @@ from pytz.tzfile import build_tzinfo
 
 
 # The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2024a'
-VERSION = '2024.1'  # pip compatible version number.
+OLSON_VERSION = '2024b'
+VERSION = '2024.2'  # pip compatible version number.
 __version__ = VERSION
 
 OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
@@ -1340,7 +1340,6 @@ common_timezones = \
  'Asia/Bishkek',
  'Asia/Brunei',
  'Asia/Chita',
- 'Asia/Choibalsan',
  'Asia/Colombo',
  'Asia/Damascus',
  'Asia/Dhaka',
diff --git a/libs/pytz/zoneinfo/Africa/Blantyre b/libs/pytz/zoneinfo/Africa/Blantyre
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Blantyre and b/libs/pytz/zoneinfo/Africa/Blantyre differ
diff --git a/libs/pytz/zoneinfo/Africa/Bujumbura b/libs/pytz/zoneinfo/Africa/Bujumbura
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Bujumbura and b/libs/pytz/zoneinfo/Africa/Bujumbura differ
diff --git a/libs/pytz/zoneinfo/Africa/Gaborone b/libs/pytz/zoneinfo/Africa/Gaborone
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Gaborone and b/libs/pytz/zoneinfo/Africa/Gaborone differ
diff --git a/libs/pytz/zoneinfo/Africa/Harare b/libs/pytz/zoneinfo/Africa/Harare
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Harare and b/libs/pytz/zoneinfo/Africa/Harare differ
diff --git a/libs/pytz/zoneinfo/Africa/Kigali b/libs/pytz/zoneinfo/Africa/Kigali
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Kigali and b/libs/pytz/zoneinfo/Africa/Kigali differ
diff --git a/libs/pytz/zoneinfo/Africa/Lubumbashi b/libs/pytz/zoneinfo/Africa/Lubumbashi
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Lubumbashi and b/libs/pytz/zoneinfo/Africa/Lubumbashi differ
diff --git a/libs/pytz/zoneinfo/Africa/Lusaka b/libs/pytz/zoneinfo/Africa/Lusaka
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Lusaka and b/libs/pytz/zoneinfo/Africa/Lusaka differ
diff --git a/libs/pytz/zoneinfo/Africa/Maputo b/libs/pytz/zoneinfo/Africa/Maputo
index 52753c0f8..65f043f1d 100644
Binary files a/libs/pytz/zoneinfo/Africa/Maputo and b/libs/pytz/zoneinfo/Africa/Maputo differ
diff --git a/libs/pytz/zoneinfo/America/Bahia_Banderas b/libs/pytz/zoneinfo/America/Bahia_Banderas
index ae4a8a754..3a493e3d5 100644
Binary files a/libs/pytz/zoneinfo/America/Bahia_Banderas and b/libs/pytz/zoneinfo/America/Bahia_Banderas differ
diff --git a/libs/pytz/zoneinfo/America/Cancun b/libs/pytz/zoneinfo/America/Cancun
index e7acbff18..0f7771e85 100644
Binary files a/libs/pytz/zoneinfo/America/Cancun and b/libs/pytz/zoneinfo/America/Cancun differ
diff --git a/libs/pytz/zoneinfo/America/Chihuahua b/libs/pytz/zoneinfo/America/Chihuahua
index e09103967..667a21911 100644
Binary files a/libs/pytz/zoneinfo/America/Chihuahua and b/libs/pytz/zoneinfo/America/Chihuahua differ
diff --git a/libs/pytz/zoneinfo/America/Ciudad_Juarez b/libs/pytz/zoneinfo/America/Ciudad_Juarez
index eb1e53961..29af5982a 100644
Binary files a/libs/pytz/zoneinfo/America/Ciudad_Juarez and b/libs/pytz/zoneinfo/America/Ciudad_Juarez differ
diff --git a/libs/pytz/zoneinfo/America/Ensenada b/libs/pytz/zoneinfo/America/Ensenada
index 63dfdf48a..0fe73912c 100644
Binary files a/libs/pytz/zoneinfo/America/Ensenada and b/libs/pytz/zoneinfo/America/Ensenada differ
diff --git a/libs/pytz/zoneinfo/America/Hermosillo b/libs/pytz/zoneinfo/America/Hermosillo
index 86bd1a20a..441fe3f2d 100644
Binary files a/libs/pytz/zoneinfo/America/Hermosillo and b/libs/pytz/zoneinfo/America/Hermosillo differ
diff --git a/libs/pytz/zoneinfo/America/Mazatlan b/libs/pytz/zoneinfo/America/Mazatlan
index 06fa22749..386616a59 100644
Binary files a/libs/pytz/zoneinfo/America/Mazatlan and b/libs/pytz/zoneinfo/America/Mazatlan differ
diff --git a/libs/pytz/zoneinfo/America/Merida b/libs/pytz/zoneinfo/America/Merida
index 17654cb59..c4b9b4e88 100644
Binary files a/libs/pytz/zoneinfo/America/Merida and b/libs/pytz/zoneinfo/America/Merida differ
diff --git a/libs/pytz/zoneinfo/America/Mexico_City b/libs/pytz/zoneinfo/America/Mexico_City
index 68176daa4..ad70cf3e0 100644
Binary files a/libs/pytz/zoneinfo/America/Mexico_City and b/libs/pytz/zoneinfo/America/Mexico_City differ
diff --git a/libs/pytz/zoneinfo/America/Monterrey b/libs/pytz/zoneinfo/America/Monterrey
index 5eb723c80..2d7993a0d 100644
Binary files a/libs/pytz/zoneinfo/America/Monterrey and b/libs/pytz/zoneinfo/America/Monterrey differ
diff --git a/libs/pytz/zoneinfo/America/Ojinaga b/libs/pytz/zoneinfo/America/Ojinaga
index f97946d1e..45118a4f4 100644
Binary files a/libs/pytz/zoneinfo/America/Ojinaga and b/libs/pytz/zoneinfo/America/Ojinaga differ
diff --git a/libs/pytz/zoneinfo/America/Santa_Isabel b/libs/pytz/zoneinfo/America/Santa_Isabel
index 63dfdf48a..0fe73912c 100644
Binary files a/libs/pytz/zoneinfo/America/Santa_Isabel and b/libs/pytz/zoneinfo/America/Santa_Isabel differ
diff --git a/libs/pytz/zoneinfo/America/Tijuana b/libs/pytz/zoneinfo/America/Tijuana
index 63dfdf48a..0fe73912c 100644
Binary files a/libs/pytz/zoneinfo/America/Tijuana and b/libs/pytz/zoneinfo/America/Tijuana differ
diff --git a/libs/pytz/zoneinfo/Asia/Choibalsan b/libs/pytz/zoneinfo/Asia/Choibalsan
index c5f4bb0b3..2aa5cc4b8 100644
Binary files a/libs/pytz/zoneinfo/Asia/Choibalsan and b/libs/pytz/zoneinfo/Asia/Choibalsan differ
diff --git a/libs/pytz/zoneinfo/Asia/Dili b/libs/pytz/zoneinfo/Asia/Dili
index c1af113af..4614e4fc4 100644
Binary files a/libs/pytz/zoneinfo/Asia/Dili and b/libs/pytz/zoneinfo/Asia/Dili differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Azores b/libs/pytz/zoneinfo/Atlantic/Azores
index 10232ab38..dd2c235bf 100644
Binary files a/libs/pytz/zoneinfo/Atlantic/Azores and b/libs/pytz/zoneinfo/Atlantic/Azores differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Madeira b/libs/pytz/zoneinfo/Atlantic/Madeira
index 7ddcd883f..6725a0ffc 100644
Binary files a/libs/pytz/zoneinfo/Atlantic/Madeira and b/libs/pytz/zoneinfo/Atlantic/Madeira differ
diff --git a/libs/pytz/zoneinfo/CET b/libs/pytz/zoneinfo/CET
index 122e93421..40d7124e5 100644
Binary files a/libs/pytz/zoneinfo/CET and b/libs/pytz/zoneinfo/CET differ
diff --git a/libs/pytz/zoneinfo/CST6CDT b/libs/pytz/zoneinfo/CST6CDT
index ca67929fb..c6981a06b 100644
Binary files a/libs/pytz/zoneinfo/CST6CDT and b/libs/pytz/zoneinfo/CST6CDT differ
diff --git a/libs/pytz/zoneinfo/EET b/libs/pytz/zoneinfo/EET
index cbdb71ddd..9f3a0678d 100644
Binary files a/libs/pytz/zoneinfo/EET and b/libs/pytz/zoneinfo/EET differ
diff --git a/libs/pytz/zoneinfo/EST b/libs/pytz/zoneinfo/EST
index 21ebc00b3..9964b9a33 100644
Binary files a/libs/pytz/zoneinfo/EST and b/libs/pytz/zoneinfo/EST differ
diff --git a/libs/pytz/zoneinfo/EST5EDT b/libs/pytz/zoneinfo/EST5EDT
index 9bce5007d..a8b9ab199 100644
Binary files a/libs/pytz/zoneinfo/EST5EDT and b/libs/pytz/zoneinfo/EST5EDT differ
diff --git a/libs/pytz/zoneinfo/Europe/Lisbon b/libs/pytz/zoneinfo/Europe/Lisbon
index 55f01930b..616de167b 100644
Binary files a/libs/pytz/zoneinfo/Europe/Lisbon and b/libs/pytz/zoneinfo/Europe/Lisbon differ
diff --git a/libs/pytz/zoneinfo/HST b/libs/pytz/zoneinfo/HST
index cccd45eb8..c7cd06015 100644
Binary files a/libs/pytz/zoneinfo/HST and b/libs/pytz/zoneinfo/HST differ
diff --git a/libs/pytz/zoneinfo/MET b/libs/pytz/zoneinfo/MET
index 4a826bb18..40d7124e5 100644
Binary files a/libs/pytz/zoneinfo/MET and b/libs/pytz/zoneinfo/MET differ
diff --git a/libs/pytz/zoneinfo/MST b/libs/pytz/zoneinfo/MST
index c93a58eee..ab37e8455 100644
Binary files a/libs/pytz/zoneinfo/MST and b/libs/pytz/zoneinfo/MST differ
diff --git a/libs/pytz/zoneinfo/MST7MDT b/libs/pytz/zoneinfo/MST7MDT
index 4506a6e15..abb2b974a 100644
Binary files a/libs/pytz/zoneinfo/MST7MDT and b/libs/pytz/zoneinfo/MST7MDT differ
diff --git a/libs/pytz/zoneinfo/Mexico/BajaNorte b/libs/pytz/zoneinfo/Mexico/BajaNorte
index 63dfdf48a..0fe73912c 100644
Binary files a/libs/pytz/zoneinfo/Mexico/BajaNorte and b/libs/pytz/zoneinfo/Mexico/BajaNorte differ
diff --git a/libs/pytz/zoneinfo/Mexico/BajaSur b/libs/pytz/zoneinfo/Mexico/BajaSur
index 06fa22749..386616a59 100644
Binary files a/libs/pytz/zoneinfo/Mexico/BajaSur and b/libs/pytz/zoneinfo/Mexico/BajaSur differ
diff --git a/libs/pytz/zoneinfo/Mexico/General b/libs/pytz/zoneinfo/Mexico/General
index 68176daa4..ad70cf3e0 100644
Binary files a/libs/pytz/zoneinfo/Mexico/General and b/libs/pytz/zoneinfo/Mexico/General differ
diff --git a/libs/pytz/zoneinfo/PST8PDT b/libs/pytz/zoneinfo/PST8PDT
index 99d246baa..610e7af5f 100644
Binary files a/libs/pytz/zoneinfo/PST8PDT and b/libs/pytz/zoneinfo/PST8PDT differ
diff --git a/libs/pytz/zoneinfo/Portugal b/libs/pytz/zoneinfo/Portugal
index 55f01930b..616de167b 100644
Binary files a/libs/pytz/zoneinfo/Portugal and b/libs/pytz/zoneinfo/Portugal differ
diff --git a/libs/pytz/zoneinfo/WET b/libs/pytz/zoneinfo/WET
index c27390b5b..616de167b 100644
Binary files a/libs/pytz/zoneinfo/WET and b/libs/pytz/zoneinfo/WET differ
diff --git a/libs/pytz/zoneinfo/leapseconds b/libs/pytz/zoneinfo/leapseconds
index ce150bfe0..6c715cb20 100644
--- a/libs/pytz/zoneinfo/leapseconds
+++ b/libs/pytz/zoneinfo/leapseconds
@@ -69,11 +69,11 @@ 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 2024	Dec	28	00:00:00
+#Expires 2025	Jun	28	00:00:00
 
 # POSIX timestamps for the data in this file:
-#updated 1704708379 (2024-01-08 10:06:19 UTC)
-#expires 1735344000 (2024-12-28 00:00:00 UTC)
+#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 December 2024
+#	File expires on 28 June 2025
diff --git a/libs/pytz/zoneinfo/tzdata.zi b/libs/pytz/zoneinfo/tzdata.zi
index b5a03be78..b89326a7a 100644
--- a/libs/pytz/zoneinfo/tzdata.zi
+++ b/libs/pytz/zoneinfo/tzdata.zi
@@ -1324,14 +1324,10 @@ 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 o - F 28 23s 1 S
-R p 1917 1921 - O 14 23s 0 -
-R p 1918 o - Mar 1 23s 1 S
-R p 1919 o - F 28 23s 1 S
-R p 1920 o - F 29 23s 1 S
-R p 1921 o - F 28 23s 1 S
+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 14 23s 0 -
+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
@@ -1349,8 +1345,9 @@ 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 1941 - O 5 23s 0 -
+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
@@ -1360,16 +1357,16 @@ 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 1965 - Ap Su>=1 2s 1 S
+R p 1947 1966 - Ap Su>=1 2s 1 S
 R p 1947 1965 - O Su>=1 2s 0 -
-R p 1977 o - Mar 27 0s 1 S
-R p 1977 o - S 25 0s 0 -
-R p 1978 1979 - Ap Su>=1 0s 1 S
-R p 1978 o - O 1 0s 0 -
-R p 1979 1982 - S lastSu 1s 0 -
-R p 1980 o - Mar lastSu 0s 1 S
-R p 1981 1982 - Mar lastSu 1s 1 S
-R p 1983 o - Mar lastSu 2s 1 S
+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
@@ -1728,7 +1725,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 - May 1 23 1 D
+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
@@ -2096,15 +2093,15 @@ Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
 0 d WE%sT 1981 May
 1 - CET
 Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - -01 1975
+-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 +00/+01 1984 Mar 16
-1 - +01 1986
-0 M +00/+01 2018 O 28 3
-1 M +01/+00
+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
@@ -2115,9 +2112,9 @@ Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
 1 - CET 1986
 1 E CE%sT
 Z Africa/El_Aaiun -0:52:48 - LMT 1934
--1 - -01 1976 Ap 14
-0 M +00/+01 2018 O 28 3
-1 M +01/+00
+-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
@@ -2132,19 +2129,19 @@ Z Africa/Khartoum 2:10:8 - LMT 1931
 Z Africa/Lagos 0:13:35 - LMT 1905 Jul
 0 - GMT 1908 Jul
 0:13:35 - LMT 1914
-0:30 - +0030 1919 S
+0:30 - %z 1919 S
 1 - WAT
-Z Africa/Maputo 2:10:20 - LMT 1903 Mar
+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 - +0230 1928 Jun 30 24
+2:30 - %z 1928 Jun 30 24
 3 - EAT 1930 Ja 4 24
-2:30 - +0230 1936 D 31 24
-2:45 - +0245 1942 Jul 31 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
@@ -2168,7 +2165,7 @@ 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 - +0130 1903 Mar
+1:30 - %z 1903 Mar
 2 - SAST 1942 S 20 2
 2 1 SAST 1943 Mar 21 2
 2 - SAST 1990 Mar 21
@@ -2191,167 +2188,166 @@ Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z America/Araguaina -3:12:48 - LMT 1914
--3 B -03/-02 1990 S 17
--3 - -03 1995 S 14
--3 B -03/-02 2003 S 24
--3 - -03 2012 O 21
--3 B -03/-02 2013 S
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990 Mar 4
--4 - -04 1990 O 28
--4 1 -03 1991 Mar 17
--4 - -04 1991 O 6
--3 1 -02 1992
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar
--4 - -04 1991 May 7
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990 Mar 4
--4 - -04 1990 O 15
--4 1 -03 1991 Mar
--4 - -04 1991 O 15
--4 1 -03 1992 Mar
--4 - -04 1992 O 18
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 23
--4 - -04 2004 S 26
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar
--4 - -04 1991 May 7
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 31
--4 - -04 2004 Jul 25
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990
--3 1 -02 1990 Mar 14
--4 - -04 1990 O 15
--4 1 -03 1991 Mar
--4 - -04 1991 Jun
--3 - -03 1999 O 3
--4 1 -03 2000 Mar 3
--3 - -03 2004 May 31
--4 - -04 2004 Jul 25
--3 A -03/-02 2008 Ja 21
--4 Sa -04/-03 2009 O 11
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 13
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 30
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1972 O
--3 - -03 1974 Ap
--4 y -04/-03
+-4 - %z 1972 O
+-3 - %z 1974 Ap
+-4 y %z
 Z America/Bahia -2:34:4 - LMT 1914
--3 B -03/-02 2003 S 24
--3 - -03 2011 O 16
--3 B -03/-02 2012 O 21
--3 - -03
+-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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-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
@@ -2359,18 +2355,18 @@ Z America/Barbados -3:58:29 - LMT 1911 Au 28
 -4 BB AST/-0330 1945
 -4 BB A%sT
 Z America/Belem -3:13:56 - LMT 1914
--3 B -03/-02 1988 S 12
--3 - -03
+-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 -04/-03 1988 S 12
--4 - -04 1999 S 30
--4 B -04/-03 2000 O 15
--4 - -04
+-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 -05/-04
+-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
@@ -2383,21 +2379,23 @@ Z America/Cambridge_Bay 0 - -00 1920
 -6 - CST 2001 Ap 1 3
 -7 C M%sT
 Z America/Campo_Grande -3:38:28 - LMT 1914
--4 B -04/-03
+-4 B %z
 Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 23
+-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 - -0430 1965
--4 - -04 2007 D 9 3
--4:30 - -0430 2016 May 1 2:30
--4 - -04
+-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 - -04 1967 O
--3 - -03
+-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
@@ -2407,7 +2405,7 @@ Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2416,7 +2414,7 @@ Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2430,12 +2428,12 @@ 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 -04/-03 2003 S 24
--4 - -04 2004 O
--4 B -04/-03
+-4 B %z 2003 S 24
+-4 - %z 2004 O
+-4 B %z
 Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
--3 - -03 1980 Ap 6 2
--3 E -03/-02 1996
+-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
@@ -2467,12 +2465,12 @@ 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 -05/-04 1988 S 12
--5 - -05 1993 S 28
--5 B -05/-04 1994 S 22
--5 - -05 2008 Jun 24
--4 - -04 2013 N 10
--5 - -05
+-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
@@ -2482,12 +2480,12 @@ Z America/Fort_Nelson -8:10:47 - LMT 1884
 -8 C P%sT 2015 Mar 8 2
 -7 - MST
 Z America/Fortaleza -2:34 - LMT 1914
--3 B -03/-02 1990 S 17
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 22
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2514,12 +2512,12 @@ 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 -05/-04
+-5 EC %z
 Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - -04 1915 Mar
--3:45 - -0345 1975 Au
--3 - -03 1992 Mar 29 1
--4 - -04
+-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
@@ -2531,12 +2529,11 @@ 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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-7 - MST 1996
 -7 m M%sT 1999
 -7 - MST
 Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
@@ -2644,23 +2641,23 @@ Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
 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 - -04
+-4 - %z
 Z America/Lima -5:8:12 - LMT 1890
 -5:8:36 - LMT 1908 Jul 28
--5 PE -05/-04
+-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 -03/-02 1990 S 17
--3 - -03 1995 O 13
--3 B -03/-02 1996 S 4
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 22
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2671,10 +2668,10 @@ Z America/Managua -5:45:8 - LMT 1890
 -5 - EST 1997
 -6 NI C%sT
 Z America/Manaus -4:0:4 - LMT 1914
--4 B -04/-03 1988 S 12
--4 - -04 1993 S 28
--4 B -04/-03 1994 S 22
--4 - -04
+-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
@@ -2686,12 +2683,11 @@ Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-7 - MST 1970
 -7 m M%sT
 Z America/Menominee -5:50:27 - LMT 1885 S 18 12
 -6 u C%sT 1946
@@ -2699,8 +2695,8 @@ Z America/Menominee -5:50:27 - LMT 1885 S 18 12
 -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 23
--5 - EST 1982 D 2
+-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
@@ -2713,7 +2709,7 @@ Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 m C%sT 2001 S 30 2
@@ -2721,8 +2717,8 @@ Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
 -6 m C%sT
 Z America/Miquelon -3:44:40 - LMT 1911 Jun 15
 -4 - AST 1980 May
--3 - -03 1987
--3 C -03/-02
+-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
@@ -2733,20 +2729,23 @@ Z America/Moncton -4:19:8 - LMT 1883 D 9
 -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 - -04 1923 O
--3:30 U -0330/-03 1942 D 14
--3 U -03/-0230 1960
--3 U -03/-02 1968
--3 U -03/-0230 1970
--3 U -03/-02 1974
--3 U -03/-0130 1974 Mar 10
--3 U -03/-0230 1974 D 22
--3 U -03/-02
+-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
@@ -2763,12 +2762,12 @@ Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z America/Noronha -2:9:40 - LMT 1914
--2 B -02/-01 1990 S 17
--2 - -02 1999 S 30
--2 B -02/-01 2000 O 15
--2 - -02 2001 S 13
--2 B -02/-01 2002 O
--2 - -02
+-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
@@ -2779,12 +2778,12 @@ 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 - -03 1980 Ap 6 2
--3 E -03/-02 2023 Mar 26 1u
--2 - -02 2023 O 29 1u
--2 E -02/-01
+-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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2800,8 +2799,8 @@ Z America/Panama -5:18:8 - LMT 1890
 Z America/Paramaribo -3:40:40 - LMT 1911
 -3:40:52 - PMT 1935
 -3:40:36 - PMT 1945 O
--3:30 - -0330 1984 O
--3 - -03
+-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
@@ -2813,37 +2812,37 @@ 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 -04/-03 1988 S 12
--4 - -04
+-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 - -05 1916 Jul
+-5 - %z 1916 Jul
 -4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
+-4 - %z 1919 Jul
 -4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1946 Au 28 24
--5 1 -04 1947 Mar 31 24
--5 - -05 1947 May 21 23
--4 x -04/-03 2016 D 4
--3 - -03
+-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 -03/-02 1990 S 17
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 15
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2854,28 +2853,28 @@ Z America/Resolute 0 - -00 1947 Au 31
 -5 - EST 2007 Mar 11 3
 -6 C C%sT
 Z America/Rio_Branco -4:31:12 - LMT 1914
--5 B -05/-04 1988 S 12
--5 - -05 2008 Jun 24
--4 - -04 2013 N 10
--5 - -05
+-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 -04/-03 1988 S 12
--4 - -04 2008 Jun 24
--3 - -03
+-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 - -05 1916 Jul
+-5 - %z 1916 Jul
 -4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
+-4 - %z 1919 Jul
 -4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1946 Jul 14 24
--4 1 -03 1946 Au 28 24
--5 1 -04 1947 Mar 31 24
--5 - -05 1947 May 21 23
--4 x -04/-03
+-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
@@ -2883,14 +2882,14 @@ Z America/Santo_Domingo -4:39:36 - LMT 1890
 -5 u E%sT 2000 D 3 1
 -4 - AST
 Z America/Sao_Paulo -3:6:28 - LMT 1914
--3 B -03/-02 1963 O 23
--3 1 -02 1964
--3 B -03/-02
+-3 B %z 1963 O 23
+-3 1 %z 1964
+-3 B %z
 Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
--2 - -02 1980 Ap 6 2
--2 c -02/-01 1981 Mar 29
--1 E -01/+00 2024 Mar 31
--2 E -02/-01
+-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
@@ -2918,15 +2917,21 @@ 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 23
+-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 12
+-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
@@ -2961,31 +2966,31 @@ Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z Antarctica/Casey 0 - -00 1969
-8 - +08 2009 O 18 2
-11 - +11 2010 Mar 5 2
-8 - +08 2011 O 28 2
-11 - +11 2012 F 21 17u
-8 - +08 2016 O 22
-11 - +11 2018 Mar 11 4
-8 - +08 2018 O 7 4
-11 - +11 2019 Mar 17 3
-8 - +08 2019 O 4 3
-11 - +11 2020 Mar 8 3
-8 - +08 2020 O 4 0:1
-11 - +11 2021 Mar 14
-8 - +08 2021 O 3 0:1
-11 - +11 2022 Mar 13
-8 - +08 2022 O 2 0:1
-11 - +11 2023 Mar 9 3
-8 - +08
+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 - +07 1964 N
+7 - %z 1964 N
 0 - -00 1969 F
-7 - +07 2009 O 18 2
-5 - +05 2010 Mar 10 20u
-7 - +07 2011 O 28 2
-5 - +05 2012 F 21 20u
-7 - +07
+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
@@ -2996,151 +3001,146 @@ Z Antarctica/Macquarie 0 - -00 1899 N
 10 1 AEDT 2011
 10 AT AE%sT
 Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - +06 2009 O 18 2
-5 - +05
+6 - %z 2009 O 18 2
+5 - %z
 Z Antarctica/Palmer 0 - -00 1965
--4 A -04/-03 1969 O 5
--3 A -03/-02 1982 May
--4 x -04/-03 2016 D 4
--3 - -03
+-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 - -03
+-3 - %z
 Z Antarctica/Troll 0 - -00 2005 F 12
 0 Tr %s
 Z Antarctica/Vostok 0 - -00 1957 D 16
-7 - +07 1994 F
+7 - %z 1994 F
 0 - -00 1994 N
-7 - +07 2023 D 18 2
-5 - +05
+7 - %z 2023 D 18 2
+5 - %z
 Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2004 O 31 2s
-6 - +06 2024 Mar
-5 - +05
+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 - +03
+3 - %z
 Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - +12 1930 Jun 21
-13 R +13/+14 1982 Ap 1 0s
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
+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 - +04 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1994 S 25 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-5 - +05
+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 - +04 1930 Jun 21
-5 R +05/+06 1991 Mar 31 2
-4 R +04/+05 1992 Ja 19 2
-5 - +05
+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 - +03 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1999 Mar 28 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +03 1982 May
-3 IQ +03/+04
+3 - %z 1982 May
+3 IQ %z
 Z Asia/Baku 3:19:24 - LMT 1924 May 2
-3 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1992 S lastSu 2s
-4 - +04 1996
-4 E +04/+05 1997
-4 AZ +04/+05
+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 - +07
+7 - %z
 Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1995 May 28
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Mar 27 2s
-7 - +07
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1991 Au 31 2
-5 KG +05/+06 2005 Au 12
-6 - +06
+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 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-8 - +08 2016 Mar 27 2
-9 - +09
-Z Asia/Choibalsan 7:38 - LMT 1905 Au
-7 - +07 1978
-8 - +08 1983 Ap
-9 X +09/+10 2008 Mar 31
-8 X +08/+09
+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 - +0530 1942 Ja 5
-5:30 0:30 +06 1942 S
-5:30 1 +0630 1945 O 16 2
-5:30 - +0530 1996 May 25
-6:30 - +0630 1996 O 26 0:30
-6 - +06 2006 Ap 15 0:30
-5:30 - +0530
+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 - +03
+3 - %z
 Z Asia/Dhaka 6:1:40 - LMT 1890
 5:53:20 - HMT 1941 O
-6:30 - +0630 1942 May 15
-5:30 - +0530 1942 S
-6:30 - +0630 1951 S 30
-6 - +06 2009
-6 BD +06/+07
-Z Asia/Dili 8:22:20 - LMT 1912
-8 - +08 1942 F 21 23
-9 - +09 1976 May 3
-8 - +08 2000 S 17
-9 - +09
+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 - +04
+4 - %z
 Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 1 +06 1991 S 9 2s
-5 - +05
+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 - +03 2017 O 29 1u
+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
@@ -3162,14 +3162,14 @@ Z Asia/Hebron 2:20:23 - LMT 1900 O
 2 P EE%sT
 Z Asia/Ho_Chi_Minh 7:6:30 - LMT 1906 Jul
 7:6:30 - PLMT 1911 May
-7 - +07 1942 D 31 23
-8 - +08 1945 Mar 14 23
-9 - +09 1945 S 1 24
-7 - +07 1947 Ap
-8 - +08 1955 Jul 1 1
-7 - +07 1959 D 31 23
-8 - +08 1975 Jun 13
-7 - +07
+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
@@ -3177,96 +3177,96 @@ Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 29 17u
 9 - JST 1945 N 18 2
 8 HK HK%sT
 Z Asia/Hovd 6:6:36 - LMT 1905 Au
-6 - +06 1978
-7 X +07/+08
+6 - %z 1978
+7 X %z
 Z Asia/Irkutsk 6:57:5 - LMT 1880
 6:57:5 - IMT 1920 Ja 25
-7 - +07 1930 Jun 21
-8 R +08/+09 1991 Mar 31 2s
-7 R +07/+08 1992 Ja 19 2s
-8 R +08/+09 2011 Mar 27 2s
-9 - +09 2014 O 26 2s
-8 - +08
+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 - +0720 1932 N
-7:30 - +0730 1942 Mar 23
-9 - +09 1945 S 23
-7:30 - +0730 1948 May
-8 - +08 1950 May
-7:30 - +0730 1964
+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 - +09 1944 S
-9:30 - +0930 1964
+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 - +04 1945
-4:30 - +0430
+4 - %z 1945
+4:30 - %z
 Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - +11 1930 Jun 21
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
+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 - +0530 1942 S
-5:30 1 +0630 1945 O 15
-5:30 - +0530 1951 S 30
-5 - +05 1971 Mar 26
+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 - +0530 1986
-5:45 - +0545
+5:30 - %z 1986
+5:45 - %z
 Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2004
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2011 S 13 0s
-10 - +10 2014 O 26 2s
-9 - +09
+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 +0630 1942 May 15
+5:30 1 %z 1942 May 15
 5:30 - IST 1942 S
-5:30 1 +0630 1945 O 15
+5:30 1 %z 1945 O 15
 5:30 - IST
 Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2011 Mar 27 2s
-8 - +08 2014 O 26 2s
-7 - +07
+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 - +0730 1933
-8 NB +08/+0820 1942 F 16
-9 - +09 1945 S 12
-8 - +08
+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 _ +09/+10 1945 S 30 24
+9 _ %z 1945 S 30 24
 8 _ C%sT
 Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-10 - +10 2016 Ap 24 2s
-11 - +11
+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 - +08 1942 F 9
-9 - +09 1945 S 23
+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
@@ -3277,45 +3277,45 @@ 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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2010 Mar 28 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07
+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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1993 May 23
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Jul 24 2s
-7 - +07
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06
+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 - +03 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1989 Mar 26 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1992 Mar 29 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +0730 1942 Ja 29
-9 - +09 1945 S 23
-7:30 - +0730 1948 May
-8 - +08 1950 May
-7:30 - +0730 1964
+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
@@ -3325,48 +3325,48 @@ Z Asia/Pyongyang 8:23 - LMT 1908 Ap
 8:30 - KST 2018 May 4 23:30
 9 - KST
 Z Asia/Qatar 3:26:8 - LMT 1920
-4 - +04 1972 Jun
-3 - +03
+4 - %z 1972 Jun
+3 - %z
 Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06 2024 Mar
-5 - +05
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1991 S 29 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 1992 Mar 29 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06 2018 D 21
-5 - +05
+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 - +03
+3 - %z
 Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - +09 1945 Au 25
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 1997 Mar lastSu 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10 2016 Mar 27 2s
-11 - +11
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1992
-5 - +05
+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
@@ -3378,161 +3378,147 @@ Z Asia/Shanghai 8:5:43 - LMT 1901
 8 CN C%sT
 Z Asia/Singapore 6:55:25 - LMT 1901
 6:55:25 - SMT 1905 Jun
-7 - +07 1933
-7 0:20 +0720 1936
-7:20 - +0720 1941 S
-7:30 - +0730 1942 F 16
-9 - +09 1945 S 12
-7:30 - +0730 1981 D 31 16u
-8 - +08
+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 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-11 - +11
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2
-5 R +05/+06 1992
-5 - +05
+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 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1992
-3 e +03/+04 1994 S lastSu
-4 e +04/+05 1996 O lastSu
-4 1 +05 1997 Mar lastSu
-4 e +04/+05 2004 Jun 27
-3 R +03/+04 2005 Mar lastSu 2
-4 - +04
+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 +0330/+0430 1977 O 20 24
-4 i +04/+05 1979
-3:30 i +0330/+0430
+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 - +0530 1987 O
-6 - +06
+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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2002 May 1 3
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 May 29 2s
-7 - +07
+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 - +07 1978
-8 X +08/+09
+7 - %z 1978
+8 X %z
 Z Asia/Urumqi 5:50:20 - LMT 1928
-6 - +06
+6 - %z
 Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1981 Ap
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2011 S 13 0s
-11 - +11 2014 O 26 2s
-10 - +10
+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 - +09 1930 Jun 21
-10 R +10/+11 1991 Mar 31 2s
-9 R +09/+10 1992 Ja 19 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10
+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 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-9 - +09
+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 - +0630 1942 May
-9 - +09 1945 May 3
-6:30 - +0630
+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 - +04 1930 Jun 21
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2011 Mar 27 2s
-6 - +06 2014 O 26 2s
-5 - +05
+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 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1995 S 24 2s
-4 - +04 1997
-4 R +04/+05 2011
-4 AM +04/+05
+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 -02/-01 1942 Ap 25 22s
--2 p +00 1942 Au 15 22s
--2 p -02/-01 1943 Ap 17 22s
--2 p +00 1943 Au 28 22s
--2 p -02/-01 1944 Ap 22 22s
--2 p +00 1944 Au 26 22s
--2 p -02/-01 1945 Ap 21 22s
--2 p +00 1945 Au 25 22s
--2 p -02/-01 1966 Ap 3 2
--1 p -01/+00 1983 S 25 1s
--1 W- -01/+00 1992 S 27 1s
-0 E WE%sT 1993 Mar 28 1u
--1 E -01/+00
+-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 - -01 1946 S 30 1
+-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 - -02 1942 S
--2 1 -01 1945 O 15
--2 - -02 1975 N 25 2
--1 - -01
+-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 -01/+00 1942 Ap 25 22s
--1 p +01 1942 Au 15 22s
--1 p -01/+00 1943 Ap 17 22s
--1 p +01 1943 Au 28 22s
--1 p -01/+00 1944 Ap 22 22s
--1 p +01 1944 Au 26 22s
--1 p -01/+00 1945 Ap 21 22s
--1 p +01 1945 Au 25 22s
--1 p -01/+00 1966 Ap 3 2
-0 p WE%sT 1983 S 25 1s
+-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 - -02
+-2 - %z
 Z Atlantic/Stanley -3:51:24 - LMT 1890
 -3:51:24 - SMT 1912 Mar 12
--4 FK -04/-03 1983 May
--3 FK -03/-02 1985 S 15
--4 FK -04/-03 2010 S 5 2
--3 - -03
+-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
@@ -3550,8 +3536,8 @@ 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 +0845/+0945 1943 Jul
-8:45 AW +0845/+0945
+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
@@ -3562,8 +3548,8 @@ Z Australia/Lindeman 9:55:56 - LMT 1895
 10 Ho AE%sT
 Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
 10 - AEST 1981 Mar
-10:30 LH +1030/+1130 1985 Jul
-10:30 LH +1030/+11
+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
@@ -3573,52 +3559,47 @@ Z Australia/Perth 7:43:24 - LMT 1895 D
 Z Australia/Sydney 10:4:52 - LMT 1895 F
 10 AU AE%sT 1971
 10 AN AE%sT
-Z CET 1 c CE%sT
-Z CST6CDT -6 u C%sT
-Z EET 2 E EE%sT
-Z EST -5 - EST
-Z EST5EDT -5 u E%sT
 Z Etc/GMT 0 - GMT
-Z Etc/GMT+1 -1 - -01
-Z Etc/GMT+10 -10 - -10
-Z Etc/GMT+11 -11 - -11
-Z Etc/GMT+12 -12 - -12
-Z Etc/GMT+2 -2 - -02
-Z Etc/GMT+3 -3 - -03
-Z Etc/GMT+4 -4 - -04
-Z Etc/GMT+5 -5 - -05
-Z Etc/GMT+6 -6 - -06
-Z Etc/GMT+7 -7 - -07
-Z Etc/GMT+8 -8 - -08
-Z Etc/GMT+9 -9 - -09
-Z Etc/GMT-1 1 - +01
-Z Etc/GMT-10 10 - +10
-Z Etc/GMT-11 11 - +11
-Z Etc/GMT-12 12 - +12
-Z Etc/GMT-13 13 - +13
-Z Etc/GMT-14 14 - +14
-Z Etc/GMT-2 2 - +02
-Z Etc/GMT-3 3 - +03
-Z Etc/GMT-4 4 - +04
-Z Etc/GMT-5 5 - +05
-Z Etc/GMT-6 6 - +06
-Z Etc/GMT-7 7 - +07
-Z Etc/GMT-8 8 - +08
-Z Etc/GMT-9 9 - +09
+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 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
+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
@@ -3691,7 +3672,7 @@ Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
 Z Europe/Istanbul 1:55:52 - LMT 1880
 1:56:56 - IMT 1910 O
 2 T EE%sT 1978 Jun 29
-3 T +03/+04 1984 N 1 2
+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
@@ -3700,19 +3681,19 @@ Z Europe/Istanbul 1:55:52 - LMT 1880
 2 E EE%sT 2015 O 25 1u
 2 1 EEST 2015 N 8 1u
 2 E EE%sT 2016 S 7
-3 - +03
+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 - +03 2014 O 26 2s
+3 - %z 2014 O 26 2s
 2 - EET
 Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
+3 - %z 1930 Jun 21
+4 R %z 1989 Mar 26 2s
 3 R MSK/MSD 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
+4 - %z 1992 Mar 29 2s
 3 R MSK/MSD 2011 Mar 27 2s
 4 - MSK 2014 O 26 2s
 3 - MSK
@@ -3727,10 +3708,10 @@ Z Europe/Kyiv 2:2:4 - LMT 1880
 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 Ap 3 2
+0 p WE%sT 1966 O 2 2s
 1 - CET 1976 S 26 1
-0 p WE%sT 1983 S 25 1s
-0 W- WE%sT 1992 S 27 1s
+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
@@ -3754,7 +3735,7 @@ Z Europe/Minsk 1:50:16 - LMT 1880
 3 R MSK/MSD 1990
 3 - MSK 1991 Mar 31 2s
 2 R EE%sT 2011 Mar 27 2s
-3 - +03
+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
@@ -3802,24 +3783,24 @@ Z Europe/Rome 0:49:56 - LMT 1866 D 12
 1 I CE%sT 1980
 1 E CE%sT
 Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 - +04 1935 Ja 27
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1991 S 29 2s
-3 - +03 1991 O 20 3
-4 R +04/+05 2010 Mar 28 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04
+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 - +03 1930 Jun 21
-4 R +04/+05 1988 Mar 27 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 D 4 2s
-4 - +04
+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
@@ -3863,14 +3844,14 @@ Z Europe/Tirane 1:19:20 - LMT 1914
 1 q CE%sT 1984 Jul
 1 E CE%sT
 Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1992 Ja 19 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
+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
@@ -3895,15 +3876,15 @@ Z Europe/Vilnius 1:41:16 - LMT 1880
 2 - EET 2003
 2 E EE%sT
 Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - +03 1930 Jun 21
-4 - +04 1961 N 11
-4 R +04/+05 1988 Mar 27 2s
+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 - +04 1992 Mar 29 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 - +04 2020 D 27 2s
+4 - %z 2020 D 27 2s
 3 - MSK
 Z Europe/Warsaw 1:24 - LMT 1880
 1:24 - WMT 1915 Au 5
@@ -3919,58 +3900,53 @@ Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
 1 CH CE%sT 1981
 1 E CE%sT
 Z Factory 0 - -00
-Z HST -10 - HST
 Z Indian/Chagos 4:49:40 - LMT 1907
-5 - +05 1996
-6 - +06
+5 - %z 1996
+6 - %z
 Z Indian/Maldives 4:54 - LMT 1880
 4:54 - MMT 1960
-5 - +05
+5 - %z
 Z Indian/Mauritius 3:50 - LMT 1907
-4 MU +04/+05
-Z MET 1 c ME%sT
-Z MST -7 - MST
-Z MST7MDT -7 u M%sT
-Z PST8PDT -8 u P%sT
+4 MU %z
 Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
 -11:26:56 - LMT 1911
--11:30 - -1130 1950
--11 WS -11/-10 2011 D 29 24
-13 WS +13/+14
+-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 - +10 1942 Jul
-9 - +09 1945 Au 21
-10 - +10 2014 D 28 2
-11 - +11
+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 - +1215 1946
-12:45 k +1245/+1345
+12:15 - %z 1946
+12:45 k %z
 Z Pacific/Easter -7:17:28 - LMT 1890
 -7:17:28 - EMT 1932 S
--7 x -07/-06 1982 Mar 14 3u
--6 x -06/-05
+-7 x %z 1982 Mar 14 3u
+-6 x %z
 Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
-11 VU +11/+12
+11 VU %z
 Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - -11 2011 D 30
-13 - +13
+-11 - %z 2011 D 30
+13 - %z
 Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ +12/+13
+12 FJ %z
 Z Pacific/Galapagos -5:58:24 - LMT 1931
--5 - -05 1986
--6 EC -06/-05
+-5 - %z 1986
+-6 EC %z
 Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - -09
+-9 - %z
 Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - +11
+11 - %z
 Z Pacific/Guam -14:21 - LMT 1844 D 31
 9:39 - LMT 1901
 10 - GST 1941 D 10
-9 - +09 1944 Jul 31
+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
@@ -3979,74 +3955,73 @@ Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
 -10:30 u H%sT 1947 Jun 8 2
 -10 - HST
 Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - -12 1979 O
--11 - -11 1994 D 31
-13 - +13
+-12 - %z 1979 O
+-11 - %z 1994 D 31
+13 - %z
 Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - -1040 1979 O
--10 - -10 1994 D 31
-14 - +14
+-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 - +11 1914 O
-9 - +09 1919 F
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1945 Au
-11 - +11 1969 O
-12 - +12 1999
-11 - +11
+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 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1944 F 6
-11 - +11 1969 O
--12 - -12 1993 Au 20 24
-12 - +12
+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 - -0930
+-9:30 - %z
 Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - +1130 1942 Au 29
-9 - +09 1945 S 8
-11:30 - +1130 1979 F 10 2
-12 - +12
+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 - -1120 1964 Jul
--11 - -11
+-11:20 - %z 1964 Jul
+-11 - %z
 Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - +1112 1951
-11:30 - +1130 1974 O 27 2s
-11:30 1 +1230 1975 Mar 2 2s
-11:30 - +1130 2015 O 4 2s
-11 - +11 2019 Jul
-11 AN +11/+12
+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 +11/+12
+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 - +09
+9 - %z
 Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - -0830 1998 Ap 27
--8 - -08
+-8:30 - %z 1998 Ap 27
+-8 - %z
 Z Pacific/Port_Moresby 9:48:40 - LMT 1880
 9:48:32 - PMMT 1895
-10 - +10
+10 - %z
 Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
 -10:39:4 - LMT 1952 O 16
--10:30 - -1030 1978 N 12
--10 CK -10/-0930
+-10:30 - %z 1978 N 12
+-10 CK %z
 Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - -10
+-10 - %z
 Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - +12
+12 - %z
 Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - +1220 1961
-13 - +13 1999
-13 TO +13/+14
-Z WET 0 E WE%sT
+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
@@ -4062,6 +4037,8 @@ 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
@@ -4073,6 +4050,9 @@ 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
@@ -4096,6 +4076,9 @@ 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
@@ -4259,6 +4242,7 @@ 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
@@ -4273,6 +4257,7 @@ 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
@@ -4290,5 +4275,7 @@ 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
index 3fa9306af..bfc0b5933 100644
--- a/libs/pytz/zoneinfo/zone.tab
+++ b/libs/pytz/zoneinfo/zone.tab
@@ -264,8 +264,7 @@ 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-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs
 MO	+221150+1133230	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
diff --git a/libs/pytz/zoneinfo/zone1970.tab b/libs/pytz/zoneinfo/zone1970.tab
index abd948975..7726f39a0 100644
--- a/libs/pytz/zoneinfo/zone1970.tab
+++ b/libs/pytz/zoneinfo/zone1970.tab
@@ -209,8 +209,7 @@ 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, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Hovd, Uvs
 MO	+221150+1133230	Asia/Macau
 MQ	+1436-06105	America/Martinique
 MT	+3554+01431	Europe/Malta
diff --git a/libs/pytz/zoneinfo/zonenow.tab b/libs/pytz/zoneinfo/zonenow.tab
index b6f291095..01f536b3b 100644
--- a/libs/pytz/zoneinfo/zonenow.tab
+++ b/libs/pytz/zoneinfo/zonenow.tab
@@ -5,7 +5,7 @@
 # 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 coments),
+# 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
@@ -123,8 +123,6 @@ XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
 #
 # -01/+00 (EU DST)
 XX	+3744-02540	Atlantic/Azores	Azores
-# -01/+00 (EU DST) until 2024-03-31; then -02/-01 (EU DST)
-XX	+7029-02158	America/Scoresbysund	Ittoqqortoormiit
 #
 # +00 - GMT
 XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
@@ -199,7 +197,7 @@ XX	+2518+05518	Asia/Dubai	Russia; Caucasus; Persian Gulf; Seychelles; Réunion
 XX	+3431+06912	Asia/Kabul	Afghanistan
 #
 # +05
-XX	+4120+06918	Asia/Tashkent	Russia; west Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
+XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
 #
 # +05 - PKT
 XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
@@ -215,8 +213,6 @@ XX	+2743+08519	Asia/Kathmandu	Nepal
 #
 # +06
 XX	+2343+09025	Asia/Dhaka	Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
-# +06 until 2024-03-01; then +05
-XX	+4315+07657	Asia/Almaty	Kazakhstan (except western areas)
 #
 # +06:30
 XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
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
index a3719b2cf..44b15072d 100644
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA
+++ b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA
@@ -23,9 +23,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"
+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
 ===========================================================
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
index fe8c6024c..4226a0b95 100644
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD
+++ b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD
@@ -1,10 +1,10 @@
 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=B8NEXuh5DgPzNX8Bu-JNnYNSpuhY5Gr7D38grL8y4J0,5276
+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=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+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
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
index 4724c4573..17c0299e4 100644
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL
+++ b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/rarfile-4.1.dist-info/RECORD b/libs/rarfile-4.1.dist-info/RECORD
deleted file mode 100644
index 1bd88b331..000000000
--- a/libs/rarfile-4.1.dist-info/RECORD
+++ /dev/null
@@ -1,8 +0,0 @@
-rarfile-4.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-rarfile-4.1.dist-info/LICENSE,sha256=1Wmi7X4Ns9qhEQ0upTMBywxLKFU9t7llVRwSIckG7T4,756
-rarfile-4.1.dist-info/METADATA,sha256=yFZeUonLAK3TAfLdB3XSuJ57IjjEhMo5vrg0Ym7AyGo,4357
-rarfile-4.1.dist-info/RECORD,,
-rarfile-4.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rarfile-4.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-rarfile-4.1.dist-info/top_level.txt,sha256=xJJpMMlbN1jihTp6tmMSBdb4mrmIcEOp1rsb-9oPxkQ,8
-rarfile.py,sha256=yWfYjFyaR0UgCbPLVdByb_bde1VtH4CGopMLivyqUjw,104442
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/INSTALLER b/libs/rarfile-4.2.dist-info/INSTALLER
similarity index 100%
rename from libs/requests_oauthlib-1.3.1.dist-info/INSTALLER
rename to libs/rarfile-4.2.dist-info/INSTALLER
diff --git a/libs/rarfile-4.1.dist-info/LICENSE b/libs/rarfile-4.2.dist-info/LICENSE
similarity index 92%
rename from libs/rarfile-4.1.dist-info/LICENSE
rename to libs/rarfile-4.2.dist-info/LICENSE
index 1aec5bcdd..b7d9d1daa 100644
--- a/libs/rarfile-4.1.dist-info/LICENSE
+++ b/libs/rarfile-4.2.dist-info/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2020 Marko Kreen <markokr@gmail.com>
+Copyright (c) 2005-2024 Marko Kreen <markokr@gmail.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/libs/rarfile-4.1.dist-info/METADATA b/libs/rarfile-4.2.dist-info/METADATA
similarity index 95%
rename from libs/rarfile-4.1.dist-info/METADATA
rename to libs/rarfile-4.2.dist-info/METADATA
index 0b395034d..e451a1b44 100644
--- a/libs/rarfile-4.1.dist-info/METADATA
+++ b/libs/rarfile-4.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rarfile
-Version: 4.1
+Version: 4.2
 Summary: RAR archive reader for Python
 Home-page: https://github.com/markokr/rarfile
 Author: Marko Kreen
@@ -68,9 +68,9 @@ Backends:
 |             |                      | * Does not support password-protected archives.     |
 |             |                      | * Does not support RARVM-based compression filters. |
 +-------------+----------------------+-----------------------------------------------------+
-| unrar-free_ | Not supported        | * Unusable: Does not support output to stdout.      |
+| unrar-free_ | Supported            | * Supports output to stdout (v0.2.0).               |
 |             |                      | * Based on libarchive so similar format support     |
-|             |                      |   as ``bsdtar``.                                    |
+|             |                      |   as ``bsdtar`` but supports multi-volume (v0.3.0). |
 +-------------+----------------------+-----------------------------------------------------+
 
 .. _p7zip: https://sourceforge.net/projects/p7zip/
diff --git a/libs/rarfile-4.2.dist-info/RECORD b/libs/rarfile-4.2.dist-info/RECORD
new file mode 100644
index 000000000..7c7576f4e
--- /dev/null
+++ b/libs/rarfile-4.2.dist-info/RECORD
@@ -0,0 +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/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/top_level.txt,sha256=xJJpMMlbN1jihTp6tmMSBdb4mrmIcEOp1rsb-9oPxkQ,8
+rarfile.py,sha256=Q9TFyOhHUkyWpJbvFb4p6efYKZCb5HwAiH7XfSJ3zDk,105004
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/REQUESTED b/libs/rarfile-4.2.dist-info/REQUESTED
similarity index 100%
rename from libs/requests_oauthlib-1.3.1.dist-info/REQUESTED
rename to libs/rarfile-4.2.dist-info/REQUESTED
diff --git a/libs/charset_normalizer-3.3.2.dist-info/WHEEL b/libs/rarfile-4.2.dist-info/WHEEL
similarity index 100%
rename from libs/charset_normalizer-3.3.2.dist-info/WHEEL
rename to libs/rarfile-4.2.dist-info/WHEEL
diff --git a/libs/rarfile-4.1.dist-info/top_level.txt b/libs/rarfile-4.2.dist-info/top_level.txt
similarity index 100%
rename from libs/rarfile-4.1.dist-info/top_level.txt
rename to libs/rarfile-4.2.dist-info/top_level.txt
diff --git a/libs/rarfile.py b/libs/rarfile.py
index 0399d7922..d27337f25 100644
--- a/libs/rarfile.py
+++ b/libs/rarfile.py
@@ -1,6 +1,6 @@
 # rarfile.py
 #
-# Copyright (c) 2005-2020  Marko Kreen <markokr@gmail.com>
+# Copyright (c) 2005-2024  Marko Kreen <markokr@gmail.com>
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -92,7 +92,7 @@ class AES_CBC_Decrypt:
             self.decrypt = ciph.decryptor().update
 
 
-__version__ = "4.1"
+__version__ = "4.2"
 
 # export only interesting items
 __all__ = ["get_rar_version", "is_rarfile", "is_rarfile_sfx", "RarInfo", "RarFile", "RarExtFile"]
@@ -671,6 +671,8 @@ class RarFile:
         part_only
             If True, read only single file and allow it to be middle-part
             of multi-volume archive.
+
+            .. versionadded:: 4.0
     """
 
     #: File name, if available.  Unicode string or None.
@@ -737,6 +739,13 @@ class RarFile:
         """
         return self._file_parser.needs_password()
 
+    def is_solid(self):
+        """Returns True if archive uses solid compression.
+
+        .. versionadded:: 4.2
+        """
+        return self._file_parser.is_solid()
+
     def namelist(self):
         """Return list of filenames in archive.
         """
@@ -765,6 +774,8 @@ class RarFile:
 
         RAR5: if name is hard-linked or copied file,
         returns original entry with original filename.
+
+        .. versionadded:: 4.1
         """
         return self._file_parser.getinfo_orig(name)
 
@@ -1026,6 +1037,14 @@ class CommonParser:
         self._sfx_offset = sfx_offset
         self._part_only = part_only
 
+    def is_solid(self):
+        """Returns True if archive uses solid compression.
+        """
+        if self._main:
+            if self._main.flags & RAR_MAIN_SOLID:
+                return True
+        return False
+
     def has_header_encryption(self):
         """Returns True if headers are encrypted
         """
@@ -1163,7 +1182,9 @@ class CommonParser:
                     if not self._password:
                         break
             elif h.type == RAR_BLOCK_ENDARC:
-                more_vols = (h.flags & RAR_ENDARC_NEXT_VOLUME) > 0
+                # use flag, but also allow RAR 2.x logic below to trigger
+                if h.flags & RAR_ENDARC_NEXT_VOLUME:
+                    more_vols = True
                 endarc = True
                 if raise_need_first_vol and (h.flags & RAR_ENDARC_VOLNR) > 0:
                     raise NeedFirstVolume(
@@ -2337,8 +2358,8 @@ class RarExtFile(io.RawIOBase):
         """Seek in data.
 
         On uncompressed files, the seeking works by actual
-        seeks so it's fast.  On compresses files its slow
-        - forward seeking happends by reading ahead,
+        seeks so it's fast.  On compressed files its slow
+        - forward seeking happens by reading ahead,
         backwards by re-opening and decompressing from the start.
         """
 
@@ -3110,7 +3131,7 @@ def rar3_decompress(vers, meth, data, declen=0, flags=0, crc=0, pwd=None, salt=N
 
 
 def sanitize_filename(fname, pathsep, is_win32):
-    """Simulate unrar sanitization.
+    """Make filename safe for write access.
     """
     if is_win32:
         if len(fname) > 1 and fname[1] == ":":
@@ -3182,12 +3203,12 @@ def parse_dos_time(stamp):
 class nsdatetime(datetime):
     """Datetime that carries nanoseconds.
 
-    Arithmetic not supported, will lose nanoseconds.
+    Arithmetic operations will lose nanoseconds.
 
     .. versionadded:: 4.0
     """
     __slots__ = ("nanosecond",)
-    nanosecond: int     #: Number of nanoseconds, 0 <= nanosecond < 999999999
+    nanosecond: int     #: Number of nanoseconds, 0 <= nanosecond <= 999999999
 
     def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0,
                 microsecond=0, tzinfo=None, *, fold=0, nanosecond=0):
@@ -3389,7 +3410,7 @@ class ToolSetup:
 
 UNRAR_CONFIG = {
     "open_cmd": ("UNRAR_TOOL", "p", "-inul"),
-    "check_cmd": ("UNRAR_TOOL", "-inul"),
+    "check_cmd": ("UNRAR_TOOL", "-inul", "-?"),
     "password": "-p",
     "no_password": ("-p-",),
     # map return code to exception class, codes from rar.txt
diff --git a/libs/referencing-0.23.0.dist-info/METADATA b/libs/referencing-0.23.0.dist-info/METADATA
index c6424b82e..03f462a50 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.1
+Metadata-Version: 2.3
 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 052d4950e..2b61f1e51 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=eRAc_V0qvXvRIgLT25JFG4irAVC_mScpnQznqV8ZNUY,2735
+referencing-0.23.0.dist-info/METADATA,sha256=9pct8JdeHVEza9Sz12mDeRztH81t077NMhBHDY85qo0,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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+referencing-0.23.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,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 5998f3aab..cdd68a497 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.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/requests-2.31.0.dist-info/RECORD b/libs/requests-2.31.0.dist-info/RECORD
deleted file mode 100644
index 98dcd813a..000000000
--- a/libs/requests-2.31.0.dist-info/RECORD
+++ /dev/null
@@ -1,25 +0,0 @@
-requests-2.31.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-requests-2.31.0.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-requests-2.31.0.dist-info/METADATA,sha256=Blp34Iss87pzeIEHb0Xz-jAfOzxpT-NinG6LjXNZSXk,4602
-requests-2.31.0.dist-info/RECORD,,
-requests-2.31.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-requests-2.31.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-requests-2.31.0.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9
-requests/__init__.py,sha256=LvmKhjIz8mHaKXthC2Mv5ykZ1d92voyf3oJpd-VuAig,4963
-requests/__version__.py,sha256=ssI3Ezt7PaxgkOW45GhtwPUclo_SO_ygtIm4A74IOfw,435
-requests/_internal_utils.py,sha256=nMQymr4hs32TqVo5AbCrmcJEhvPUh7xXlluyqwslLiQ,1495
-requests/adapters.py,sha256=v_FmjU5KZ76k-YttShZYB5RprIzhhL8Y3zgW9p4eBQ8,19553
-requests/api.py,sha256=q61xcXq4tmiImrvcSVLTbFyCiD2F-L_-hWKGbz4y8vg,6449
-requests/auth.py,sha256=h-HLlVx9j8rKV5hfSAycP2ApOSglTz77R0tz7qCbbEE,10187
-requests/certs.py,sha256=Z9Sb410Anv6jUFTyss0jFFhU6xst8ctELqfy8Ev23gw,429
-requests/compat.py,sha256=yxntVOSEHGMrn7FNr_32EEam1ZNAdPRdSE13_yaHzTk,1451
-requests/cookies.py,sha256=kD3kNEcCj-mxbtf5fJsSaT86eGoEYpD3X0CSgpzl7BM,18560
-requests/exceptions.py,sha256=DhveFBclVjTRxhRduVpO-GbMYMID2gmjdLfNEqNpI_U,3811
-requests/help.py,sha256=gPX5d_H7Xd88aDABejhqGgl9B1VFRTt5BmiYvL3PzIQ,3875
-requests/hooks.py,sha256=CiuysiHA39V5UfcCBXFIx83IrDpuwfN9RcTUgv28ftQ,733
-requests/models.py,sha256=-DlKi0or8gFAM6VzutobXvvBW_2wrJuOF5NfndTIddA,35223
-requests/packages.py,sha256=DXgv-FJIczZITmv0vEBAhWj4W-5CGCIN_ksvgR17Dvs,957
-requests/sessions.py,sha256=-LvTzrPtetSTrR3buxu4XhdgMrJFLB1q5D7P--L2Xhw,30373
-requests/status_codes.py,sha256=FvHmT5uH-_uimtRz5hH9VCbt7VV-Nei2J9upbej6j8g,4235
-requests/structures.py,sha256=-IbmhVz06S-5aPSZuUthZ6-6D9XOjRuTXHOabY041XM,2912
-requests/utils.py,sha256=6sx2X3cIVA8BgWOg8odxFy-_lbWDFETU8HI4fU4Rmqw,33448
diff --git a/libs/requests-2.31.0.dist-info/WHEEL b/libs/requests-2.31.0.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/requests-2.31.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/rich-13.7.0.dist-info/INSTALLER b/libs/requests-2.32.3.dist-info/INSTALLER
similarity index 100%
rename from libs/rich-13.7.0.dist-info/INSTALLER
rename to libs/requests-2.32.3.dist-info/INSTALLER
diff --git a/libs/requests-2.31.0.dist-info/LICENSE b/libs/requests-2.32.3.dist-info/LICENSE
similarity index 100%
rename from libs/requests-2.31.0.dist-info/LICENSE
rename to libs/requests-2.32.3.dist-info/LICENSE
diff --git a/libs/requests-2.31.0.dist-info/METADATA b/libs/requests-2.32.3.dist-info/METADATA
similarity index 89%
rename from libs/requests-2.31.0.dist-info/METADATA
rename to libs/requests-2.32.3.dist-info/METADATA
index 5ee9c18af..293a3f0e4 100644
--- a/libs/requests-2.31.0.dist-info/METADATA
+++ b/libs/requests-2.32.3.dist-info/METADATA
@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: requests
-Version: 2.31.0
+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
+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
@@ -16,28 +16,28 @@ Classifier: Natural Language :: English
 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 :: 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.7
+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
+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'
+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'
+Requires-Dist: chardet<6,>=3.0.2; extra == "use-chardet-on-py3"
 
 # Requests
 
@@ -62,7 +62,7 @@ Requests allows you to send HTTP/1.1 requests extremely easily. There’s no nee
 
 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://pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
+[![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)
 
@@ -74,7 +74,7 @@ Requests is available on PyPI:
 $ python -m pip install requests
 ```
 
-Requests officially supports Python 3.7+.
+Requests officially supports Python 3.8+.
 
 ## Supported Features & Best–Practices
 
diff --git a/libs/requests-2.32.3.dist-info/RECORD b/libs/requests-2.32.3.dist-info/RECORD
new file mode 100644
index 000000000..2a3d60976
--- /dev/null
+++ b/libs/requests-2.32.3.dist-info/RECORD
@@ -0,0 +1,25 @@
+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/rich-13.7.0.dist-info/REQUESTED b/libs/requests-2.32.3.dist-info/REQUESTED
similarity index 100%
rename from libs/rich-13.7.0.dist-info/REQUESTED
rename to libs/requests-2.32.3.dist-info/REQUESTED
diff --git a/libs/requests-2.32.3.dist-info/WHEEL b/libs/requests-2.32.3.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/requests-2.32.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/requests-2.31.0.dist-info/top_level.txt b/libs/requests-2.32.3.dist-info/top_level.txt
similarity index 100%
rename from libs/requests-2.31.0.dist-info/top_level.txt
rename to libs/requests-2.32.3.dist-info/top_level.txt
diff --git a/libs/requests/__init__.py b/libs/requests/__init__.py
index 300a16c57..051cda134 100644
--- a/libs/requests/__init__.py
+++ b/libs/requests/__init__.py
@@ -83,7 +83,11 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
         # charset_normalizer >= 2.0.0 < 4.0.0
         assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
     else:
-        raise Exception("You need either charset_normalizer or chardet installed")
+        warnings.warn(
+            "Unable to find acceptable character detection dependency "
+            "(chardet or charset_normalizer).",
+            RequestsDependencyWarning,
+        )
 
 
 def _check_cryptography(cryptography_version):
diff --git a/libs/requests/__version__.py b/libs/requests/__version__.py
index 5063c3f8e..2c105aca7 100644
--- a/libs/requests/__version__.py
+++ b/libs/requests/__version__.py
@@ -5,10 +5,10 @@
 __title__ = "requests"
 __description__ = "Python HTTP for Humans."
 __url__ = "https://requests.readthedocs.io"
-__version__ = "2.31.0"
-__build__ = 0x023100
+__version__ = "2.32.3"
+__build__ = 0x023203
 __author__ = "Kenneth Reitz"
 __author_email__ = "me@kennethreitz.org"
-__license__ = "Apache 2.0"
+__license__ = "Apache-2.0"
 __copyright__ = "Copyright Kenneth Reitz"
 __cake__ = "\u2728 \U0001f370 \u2728"
diff --git a/libs/requests/adapters.py b/libs/requests/adapters.py
index 78e3bb6ec..9a58b1602 100644
--- a/libs/requests/adapters.py
+++ b/libs/requests/adapters.py
@@ -8,6 +8,8 @@ and maintain connections.
 
 import os.path
 import socket  # noqa: F401
+import typing
+import warnings
 
 from urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
 from urllib3.exceptions import HTTPError as _HTTPError
@@ -25,6 +27,7 @@ from urllib3.poolmanager import PoolManager, proxy_from_url
 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
@@ -61,12 +64,76 @@ except ImportError:
         raise InvalidSchema("Missing dependencies for SOCKS support.")
 
 
+if typing.TYPE_CHECKING:
+    from .models import PreparedRequest
+
+
 DEFAULT_POOLBLOCK = False
 DEFAULT_POOLSIZE = 10
 DEFAULT_RETRIES = 0
 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",
+    client_cert: "typing.Tuple[str, str] | str | None",
+    poolmanager: "PoolManager",
+) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])":
+    host_params = {}
+    pool_kwargs = {}
+    parsed_request_url = urlparse(request.url)
+    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
+        else:
+            pool_kwargs["ca_cert_dir"] = verify
+    pool_kwargs["cert_reqs"] = cert_reqs
+    if client_cert is not None:
+        if isinstance(client_cert, tuple) and len(client_cert) == 2:
+            pool_kwargs["cert_file"] = client_cert[0]
+            pool_kwargs["key_file"] = client_cert[1]
+        else:
+            # According to our docs, we allow users to specify just the client
+            # cert path
+            pool_kwargs["cert_file"] = client_cert
+    host_params = {
+        "scheme": scheme,
+        "host": parsed_request_url.hostname,
+        "port": port,
+    }
+    return host_params, pool_kwargs
+
+
 class BaseAdapter:
     """The Base Transport Adapter"""
 
@@ -247,28 +314,26 @@ class HTTPAdapter(BaseAdapter):
         :param cert: The SSL certificate to verify.
         """
         if url.lower().startswith("https") and verify:
-
-            cert_loc = None
-
-            # Allow self-specified cert location.
-            if verify is not True:
-                cert_loc = verify
-
-            if not cert_loc:
-                cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
-
-            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
+            # 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()
+            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 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
@@ -328,8 +393,110 @@ class HTTPAdapter(BaseAdapter):
 
         return response
 
+    def build_connection_pool_key_attributes(self, request, verify, cert=None):
+        """Build the PoolKey attributes used by urllib3 to return a connection.
+
+        This looks at the PreparedRequest, the user-specified verify value,
+        and the value of the cert parameter to determine what PoolKey values
+        to use to select a connection from a given urllib3 Connection Pool.
+
+        The SSL related pool key arguments are not consistently set. As of
+        this writing, use the following to determine what keys may be in that
+        dictionary:
+
+        * If ``verify`` is ``True``, ``"ssl_context"`` will be set and will be the
+          default Requests SSL Context
+        * If ``verify`` is ``False``, ``"ssl_context"`` will not be set but
+          ``"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
+          set.
+        * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If
+          ``"cert"`` is a tuple with a second item, ``"key_file"`` will also
+          be present
+
+        To override these settings, one may subclass this class, call this
+        method and use the above logic to change parameters as desired. For
+        example, if one wishes to use a custom :py:class:`ssl.SSLContext` one
+        must both set ``"ssl_context"`` and based on what else they require,
+        alter the other keys to ensure the desired behaviour.
+
+        :param request:
+            The PreparedReqest being sent over the connection.
+        :type request:
+            :class:`~requests.models.PreparedRequest`
+        :param verify:
+            Either a boolean, in which case it controls whether
+            we verify the server's TLS certificate, or a string, in which case it
+            must be a path to a CA bundle to use.
+        :param cert:
+            (optional) Any user-provided SSL certificate for client
+            authentication (a.k.a., mTLS). This may be a string (i.e., just
+            the path to a file which holds both certificate and key) or a
+            tuple of length 2 with the certificate file path and key file
+            path.
+        :returns:
+            A tuple of two dictionaries. The first is the "host parameters"
+            portion of the Pool Key including scheme, hostname, and port. The
+            second is a dictionary of SSLContext related parameters.
+        """
+        return _urllib3_request_context(request, verify, cert, self.poolmanager)
+
+    def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
+        """Returns a urllib3 connection for the given request and TLS settings.
+        This should not be called from user code, and is only exposed for use
+        when subclassing the :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param request:
+            The :class:`PreparedRequest <PreparedRequest>` object to be sent
+            over the connection.
+        :param verify:
+            Either a boolean, in which case it controls whether we verify the
+            server's TLS certificate, or a string, in which case it must be a
+            path to a CA bundle to use.
+        :param proxies:
+            (optional) The proxies dictionary to apply to the request.
+        :param cert:
+            (optional) Any user-provided SSL certificate to be used for client
+            authentication (a.k.a., mTLS).
+        :rtype:
+            urllib3.ConnectionPool
+        """
+        proxy = select_proxy(request.url, proxies)
+        try:
+            host_params, pool_kwargs = self.build_connection_pool_key_attributes(
+                request,
+                verify,
+                cert,
+            )
+        except ValueError as e:
+            raise InvalidURL(e, request=request)
+        if proxy:
+            proxy = prepend_scheme_if_needed(proxy, "http")
+            proxy_url = parse_url(proxy)
+            if not proxy_url.host:
+                raise InvalidProxyURL(
+                    "Please check proxy URL. It is malformed "
+                    "and could be missing the host."
+                )
+            proxy_manager = self.proxy_manager_for(proxy)
+            conn = proxy_manager.connection_from_host(
+                **host_params, pool_kwargs=pool_kwargs
+            )
+        else:
+            # Only scheme should be lower case
+            conn = self.poolmanager.connection_from_host(
+                **host_params, pool_kwargs=pool_kwargs
+            )
+
+        return conn
+
     def get_connection(self, url, proxies=None):
-        """Returns a urllib3 connection for the given URL. This should not be
+        """DEPRECATED: Users should move to `get_connection_with_tls_context`
+        for all subclasses of HTTPAdapter using Requests>=2.32.2.
+
+        Returns a urllib3 connection for the given URL. This should not be
         called from user code, and is only exposed for use when subclassing the
         :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
 
@@ -337,6 +504,15 @@ class HTTPAdapter(BaseAdapter):
         :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
         :rtype: urllib3.ConnectionPool
         """
+        warnings.warn(
+            (
+                "`get_connection` has been deprecated in favor of "
+                "`get_connection_with_tls_context`. Custom HTTPAdapter subclasses "
+                "will need to migrate for Requests>=2.32.2. Please see "
+                "https://github.com/psf/requests/pull/6710 for more details."
+            ),
+            DeprecationWarning,
+        )
         proxy = select_proxy(url, proxies)
 
         if proxy:
@@ -391,6 +567,9 @@ class HTTPAdapter(BaseAdapter):
             using_socks_proxy = proxy_scheme.startswith("socks")
 
         url = request.path_url
+        if url.startswith("//"):  # Don't confuse urllib3
+            url = f"/{url.lstrip('/')}"
+
         if is_proxied_http_request and not using_socks_proxy:
             url = urldefragauth(request.url)
 
@@ -451,7 +630,9 @@ class HTTPAdapter(BaseAdapter):
         """
 
         try:
-            conn = self.get_connection(request.url, proxies)
+            conn = self.get_connection_with_tls_context(
+                request, verify, proxies=proxies, cert=cert
+            )
         except LocationValueError as e:
             raise InvalidURL(e, request=request)
 
diff --git a/libs/requests/api.py b/libs/requests/api.py
index cd0b3eeac..596074455 100644
--- a/libs/requests/api.py
+++ b/libs/requests/api.py
@@ -25,7 +25,7 @@ def request(method, url, **kwargs):
     :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
     :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
         ``file-tuple`` can be a 2-tuple ``('filename', fileobj)``, 3-tuple ``('filename', fileobj, 'content_type')``
-        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content-type'`` is a string
+        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content_type'`` is a string
         defining the content type of the given file and ``custom_headers`` a dict-like object containing additional headers
         to add for the file.
     :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
diff --git a/libs/requests/auth.py b/libs/requests/auth.py
index 9733686dd..4a7ce6dc1 100644
--- a/libs/requests/auth.py
+++ b/libs/requests/auth.py
@@ -258,7 +258,6 @@ class HTTPDigestAuth(AuthBase):
         s_auth = r.headers.get("www-authenticate", "")
 
         if "digest" in s_auth.lower() and self._thread_local.num_401_calls < 2:
-
             self._thread_local.num_401_calls += 1
             pat = re.compile(r"digest ", flags=re.IGNORECASE)
             self._thread_local.chal = parse_dict_header(pat.sub("", s_auth, count=1))
diff --git a/libs/requests/compat.py b/libs/requests/compat.py
index 6776163c9..095de1b6c 100644
--- a/libs/requests/compat.py
+++ b/libs/requests/compat.py
@@ -7,13 +7,28 @@ between Python 2 and Python 3. It remains for backwards
 compatibility until the next major version.
 """
 
-try:
-    import chardet
-except ImportError:
-    import charset_normalizer as chardet
-
+import importlib
 import sys
 
+# -------------------
+# Character Detection
+# -------------------
+
+
+def _resolve_char_detection():
+    """Find supported character detection libraries."""
+    chardet = None
+    for lib in ("chardet", "charset_normalizer"):
+        if chardet is None:
+            try:
+                chardet = importlib.import_module(lib)
+            except ImportError:
+                pass
+    return chardet
+
+
+chardet = _resolve_char_detection()
+
 # -------
 # Pythons
 # -------
diff --git a/libs/requests/cookies.py b/libs/requests/cookies.py
index bf54ab237..f69d0cda9 100644
--- a/libs/requests/cookies.py
+++ b/libs/requests/cookies.py
@@ -2,7 +2,7 @@
 requests.cookies
 ~~~~~~~~~~~~~~~~
 
-Compatibility code to be able to use `cookielib.CookieJar` with requests.
+Compatibility code to be able to use `http.cookiejar.CookieJar` with requests.
 
 requests.utils imports from here, so be careful with imports.
 """
@@ -23,7 +23,7 @@ except ImportError:
 class MockRequest:
     """Wraps a `requests.Request` to mimic a `urllib2.Request`.
 
-    The code in `cookielib.CookieJar` expects this interface in order to correctly
+    The code in `http.cookiejar.CookieJar` expects this interface in order to correctly
     manage cookie policies, i.e., determine whether a cookie can be set, given the
     domains of the request and the cookie.
 
@@ -76,7 +76,7 @@ class MockRequest:
         return self._r.headers.get(name, self._new_headers.get(name, default))
 
     def add_header(self, key, val):
-        """cookielib has no legitimate use for this method; add it back if you find one."""
+        """cookiejar has no legitimate use for this method; add it back if you find one."""
         raise NotImplementedError(
             "Cookie headers should be added with add_unredirected_header()"
         )
@@ -104,11 +104,11 @@ class MockResponse:
     """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
 
     ...what? Basically, expose the parsed HTTP headers from the server response
-    the way `cookielib` expects to see them.
+    the way `http.cookiejar` expects to see them.
     """
 
     def __init__(self, headers):
-        """Make a MockResponse for `cookielib` to read.
+        """Make a MockResponse for `cookiejar` to read.
 
         :param headers: a httplib.HTTPMessage or analogous carrying the headers
         """
@@ -124,7 +124,7 @@ class MockResponse:
 def extract_cookies_to_jar(jar, request, response):
     """Extract the cookies from the response into a CookieJar.
 
-    :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
+    :param jar: http.cookiejar.CookieJar (not necessarily a RequestsCookieJar)
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
@@ -174,7 +174,7 @@ class CookieConflictError(RuntimeError):
 
 
 class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
-    """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+    """Compatibility class; is a http.cookiejar.CookieJar, but exposes a dict
     interface.
 
     This is the CookieJar we create by default for requests and sessions that
@@ -341,7 +341,7 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         self.set(name, value)
 
     def __delitem__(self, name):
-        """Deletes a cookie given a name. Wraps ``cookielib.CookieJar``'s
+        """Deletes a cookie given a name. Wraps ``http.cookiejar.CookieJar``'s
         ``remove_cookie_by_name()``.
         """
         remove_cookie_by_name(self, name)
diff --git a/libs/requests/exceptions.py b/libs/requests/exceptions.py
index e1cedf883..83986b489 100644
--- a/libs/requests/exceptions.py
+++ b/libs/requests/exceptions.py
@@ -41,6 +41,16 @@ class JSONDecodeError(InvalidJSONError, CompatJSONDecodeError):
         CompatJSONDecodeError.__init__(self, *args)
         InvalidJSONError.__init__(self, *self.args, **kwargs)
 
+    def __reduce__(self):
+        """
+        The __reduce__ method called when pickling the object must
+        be the one from the JSONDecodeError (be it json/simplejson)
+        as it expects all the arguments for instantiation, not just
+        one like the IOError, and the MRO would by default call the
+        __reduce__ method from the IOError due to the inheritance order.
+        """
+        return CompatJSONDecodeError.__reduce__(self)
+
 
 class HTTPError(RequestException):
     """An HTTP error occurred."""
diff --git a/libs/requests/models.py b/libs/requests/models.py
index 617a4134e..8f56ca7d2 100644
--- a/libs/requests/models.py
+++ b/libs/requests/models.py
@@ -170,7 +170,7 @@ class RequestEncodingMixin:
                         )
                     )
 
-        for (k, v) in files:
+        for k, v in files:
             # support for explicit filename
             ft = None
             fh = None
@@ -268,7 +268,6 @@ class Request(RequestHooksMixin):
         hooks=None,
         json=None,
     ):
-
         # Default empty dicts for dict params.
         data = [] if data is None else data
         files = [] if files is None else files
@@ -277,7 +276,7 @@ class Request(RequestHooksMixin):
         hooks = {} if hooks is None else hooks
 
         self.hooks = default_hooks()
-        for (k, v) in list(hooks.items()):
+        for k, v in list(hooks.items()):
             self.register_hook(event=k, hook=v)
 
         self.method = method
@@ -790,7 +789,12 @@ class Response:
     @property
     def apparent_encoding(self):
         """The apparent encoding, provided by the charset_normalizer or chardet libraries."""
-        return chardet.detect(self.content)["encoding"]
+        if chardet is not None:
+            return chardet.detect(self.content)["encoding"]
+        else:
+            # If no character detection library is available, we'll fall back
+            # to a standard Python utf-8 str.
+            return "utf-8"
 
     def iter_content(self, chunk_size=1, decode_unicode=False):
         """Iterates over the response data.  When stream=True is set on the
@@ -865,7 +869,6 @@ class Response:
         for chunk in self.iter_content(
             chunk_size=chunk_size, decode_unicode=decode_unicode
         ):
-
             if pending is not None:
                 chunk = pending + chunk
 
diff --git a/libs/requests/packages.py b/libs/requests/packages.py
index 77c45c9e9..5ab3d8e25 100644
--- a/libs/requests/packages.py
+++ b/libs/requests/packages.py
@@ -1,13 +1,6 @@
 import sys
 
-try:
-    import chardet
-except ImportError:
-    import warnings
-
-    import charset_normalizer as chardet
-
-    warnings.filterwarnings("ignore", "Trying to detect", module="charset_normalizer")
+from .compat import chardet
 
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)
@@ -20,9 +13,11 @@ for package in ("urllib3", "idna"):
         if mod == package or mod.startswith(f"{package}."):
             sys.modules[f"requests.packages.{mod}"] = sys.modules[mod]
 
-target = chardet.__name__
-for mod in list(sys.modules):
-    if mod == target or mod.startswith(f"{target}."):
-        target = target.replace(target, "chardet")
-        sys.modules[f"requests.packages.{target}"] = sys.modules[mod]
-# Kinda cool, though, right?
+if chardet is not None:
+    target = chardet.__name__
+    for mod in list(sys.modules):
+        if mod == target or mod.startswith(f"{target}."):
+            imported_mod = sys.modules[mod]
+            sys.modules[f"requests.packages.{mod}"] = imported_mod
+            mod = mod.replace(target, "chardet")
+            sys.modules[f"requests.packages.{mod}"] = imported_mod
diff --git a/libs/requests/sessions.py b/libs/requests/sessions.py
index dbcf2a7b0..b387bc36d 100644
--- a/libs/requests/sessions.py
+++ b/libs/requests/sessions.py
@@ -262,7 +262,6 @@ class SessionRedirectMixin:
             if yield_requests:
                 yield req
             else:
-
                 resp = self.send(
                     req,
                     stream=stream,
@@ -326,7 +325,7 @@ class SessionRedirectMixin:
 
         # urllib3 handles proxy authorization for us in the standard adapter.
         # Avoid appending this to TLS tunneled requests where it may be leaked.
-        if not scheme.startswith('https') and username and password:
+        if not scheme.startswith("https") and username and password:
             headers["Proxy-Authorization"] = _basic_auth_str(username, password)
 
         return new_proxies
@@ -389,7 +388,6 @@ class Session(SessionRedirectMixin):
     ]
 
     def __init__(self):
-
         #: A case-insensitive dictionary of headers to be sent on each
         #: :class:`Request <Request>` sent from this
         #: :class:`Session <Session>`.
@@ -545,6 +543,8 @@ class Session(SessionRedirectMixin):
         :type allow_redirects: bool
         :param proxies: (optional) Dictionary mapping protocol or protocol and
             hostname to the URL of the proxy.
+        :param hooks: (optional) Dictionary mapping hook name to one event or
+            list of events, event must be callable.
         :param stream: (optional) whether to immediately download the response
             content. Defaults to ``False``.
         :param verify: (optional) Either a boolean, in which case it controls whether we verify
@@ -711,7 +711,6 @@ class Session(SessionRedirectMixin):
 
         # Persist cookies
         if r.history:
-
             # If the hooks create history then we want those cookies too
             for resp in r.history:
                 extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
@@ -759,7 +758,7 @@ class Session(SessionRedirectMixin):
             # Set environment's proxies.
             no_proxy = proxies.get("no_proxy") if proxies is not None else None
             env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
-            for (k, v) in env_proxies.items():
+            for k, v in env_proxies.items():
                 proxies.setdefault(k, v)
 
             # Look for requests environment configuration
@@ -785,8 +784,7 @@ class Session(SessionRedirectMixin):
 
         :rtype: requests.adapters.BaseAdapter
         """
-        for (prefix, adapter) in self.adapters.items():
-
+        for prefix, adapter in self.adapters.items():
             if url.lower().startswith(prefix.lower()):
                 return adapter
 
diff --git a/libs/requests/status_codes.py b/libs/requests/status_codes.py
index 4bd072be9..c7945a2f0 100644
--- a/libs/requests/status_codes.py
+++ b/libs/requests/status_codes.py
@@ -24,7 +24,7 @@ _codes = {
     # Informational.
     100: ("continue",),
     101: ("switching_protocols",),
-    102: ("processing",),
+    102: ("processing", "early-hints"),
     103: ("checkpoint",),
     122: ("uri_too_long", "request_uri_too_long"),
     200: ("ok", "okay", "all_ok", "all_okay", "all_good", "\\o/", "✓"),
@@ -65,8 +65,8 @@ _codes = {
     410: ("gone",),
     411: ("length_required",),
     412: ("precondition_failed", "precondition"),
-    413: ("request_entity_too_large",),
-    414: ("request_uri_too_large",),
+    413: ("request_entity_too_large", "content_too_large"),
+    414: ("request_uri_too_large", "uri_too_long"),
     415: ("unsupported_media_type", "unsupported_media", "media_type"),
     416: (
         "requested_range_not_satisfiable",
@@ -76,10 +76,10 @@ _codes = {
     417: ("expectation_failed",),
     418: ("im_a_teapot", "teapot", "i_am_a_teapot"),
     421: ("misdirected_request",),
-    422: ("unprocessable_entity", "unprocessable"),
+    422: ("unprocessable_entity", "unprocessable", "unprocessable_content"),
     423: ("locked",),
     424: ("failed_dependency", "dependency"),
-    425: ("unordered_collection", "unordered"),
+    425: ("unordered_collection", "unordered", "too_early"),
     426: ("upgrade_required", "upgrade"),
     428: ("precondition_required", "precondition"),
     429: ("too_many_requests", "too_many"),
diff --git a/libs/requests/utils.py b/libs/requests/utils.py
index a367417f8..ae6c42f6c 100644
--- a/libs/requests/utils.py
+++ b/libs/requests/utils.py
@@ -97,6 +97,8 @@ if sys.platform == "win32":
         # '<local>' string by the localhost entry and the corresponding
         # canonical entry.
         proxyOverride = proxyOverride.split(";")
+        # filter out empty strings to avoid re.match return true in the following code.
+        proxyOverride = filter(None, proxyOverride)
         # now check if we match one of the registry values.
         for test in proxyOverride:
             if test == "<local>":
@@ -134,6 +136,9 @@ def super_len(o):
     total_length = None
     current_position = 0
 
+    if isinstance(o, str):
+        o = o.encode("utf-8")
+
     if hasattr(o, "__len__"):
         total_length = len(o)
 
@@ -466,11 +471,7 @@ def dict_from_cookiejar(cj):
     :rtype: dict
     """
 
-    cookie_dict = {}
-
-    for cookie in cj:
-        cookie_dict[cookie.name] = cookie.value
-
+    cookie_dict = {cookie.name: cookie.value for cookie in cj}
     return cookie_dict
 
 
@@ -767,6 +768,7 @@ def should_bypass_proxies(url, no_proxy):
 
     :rtype: bool
     """
+
     # Prioritize lowercase environment variables over uppercase
     # to keep a consistent behaviour with other http projects (curl, wget).
     def get_proxy(key):
@@ -862,7 +864,7 @@ def select_proxy(url, proxies):
 def resolve_proxies(request, proxies, trust_env=True):
     """This method takes proxy information from a request and configuration
     input to resolve a mapping of target proxies. This will consider settings
-    such a NO_PROXY to strip proxy configurations.
+    such as NO_PROXY to strip proxy configurations.
 
     :param request: Request or PreparedRequest
     :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
@@ -1054,7 +1056,7 @@ def _validate_header_part(header, header_part, header_validator_index):
     if not validator.match(header_part):
         header_kind = "name" if header_validator_index == 0 else "value"
         raise InvalidHeader(
-            f"Invalid leading whitespace, reserved character(s), or return"
+            f"Invalid leading whitespace, reserved character(s), or return "
             f"character(s) in header {header_kind}: {header_part!r}"
         )
 
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/RECORD b/libs/requests_oauthlib-1.3.1.dist-info/RECORD
deleted file mode 100644
index 64a17ca01..000000000
--- a/libs/requests_oauthlib-1.3.1.dist-info/RECORD
+++ /dev/null
@@ -1,22 +0,0 @@
-requests_oauthlib-1.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-requests_oauthlib-1.3.1.dist-info/LICENSE,sha256=rgGEavrYqCkf5qCJZvMBWvmo_2ddhLmB-Xk8Ei94dug,745
-requests_oauthlib-1.3.1.dist-info/METADATA,sha256=HEn-XkRrhgfyryr2M4eTQd8Z8v-8z5Xoins6DWW3Ij4,10079
-requests_oauthlib-1.3.1.dist-info/RECORD,,
-requests_oauthlib-1.3.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-requests_oauthlib-1.3.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-requests_oauthlib-1.3.1.dist-info/top_level.txt,sha256=vx1R42DWBO64h6iu8Gco0F01TVTPWXSRWBaV1GwVRTQ,18
-requests_oauthlib/__init__.py,sha256=j3FXxxzppgvMvHj2v9csJtfEXt5QWeUODk6TmKTtopE,529
-requests_oauthlib/compliance_fixes/__init__.py,sha256=M0zZXYmddhdiVVtazEC23tmPYP4MDaeBabKh9FiAyGc,398
-requests_oauthlib/compliance_fixes/douban.py,sha256=Ilfc1jTjCD66rPFrPf97g2D8Gb-MjoNuXqSGmaBVAn0,472
-requests_oauthlib/compliance_fixes/ebay.py,sha256=bLaGRBG4Pkoac2V4gme1-3pbRYcxvfAGyPID7K6xIZ8,890
-requests_oauthlib/compliance_fixes/facebook.py,sha256=V6_2BQnyBKcwTWDRqDTbJQcJj4Rd_XMTAlDgGiFTQf4,1119
-requests_oauthlib/compliance_fixes/fitbit.py,sha256=rgA4MrYKHqeNOfCGL0pdG3kgum6rzh1QMvgIHL_EOAE,905
-requests_oauthlib/compliance_fixes/instagram.py,sha256=LO55o9VrmeegJOCzz2-QqMlneXS6YY_33ulA_-cG1pI,948
-requests_oauthlib/compliance_fixes/mailchimp.py,sha256=nTdyttxiTxdAzbC72XZb1_uV4ebVOUvQDpDbAmBTqvQ,757
-requests_oauthlib/compliance_fixes/plentymarkets.py,sha256=HnROrco-Z9EvGEjHw3fn-7UxxC8G2GKB8Yjda3es7Yw,796
-requests_oauthlib/compliance_fixes/slack.py,sha256=YDz9DQ3ukNgbyy1X4JIPAhTKKMwMf8R8THxnzhm79zE,1453
-requests_oauthlib/compliance_fixes/weibo.py,sha256=yMvmc2xGWsaxZZNT3XYdJhDuxXJ99N6rO0n3d2cP9MA,444
-requests_oauthlib/oauth1_auth.py,sha256=yq-3SxMvPa1Ux-dm_a2mC32TDKdGGT2XJJuu3d4QtRo,3737
-requests_oauthlib/oauth1_session.py,sha256=JPThdYoaDbc-I6aH7-UZKvFZ6B1ySvBlUkMqa6TcLpE,17055
-requests_oauthlib/oauth2_auth.py,sha256=uYT7ueHDG9TYR73yIFCX8TbquOz44p21lQYPCVw4gn8,1548
-requests_oauthlib/oauth2_session.py,sha256=lIuu5PbiVYfSrEiJ38H4QWh0maKEqwVUc3sU6hXXXmE,21992
diff --git a/libs/simple_websocket-1.0.0.dist-info/INSTALLER b/libs/requests_oauthlib-2.0.0.dist-info/INSTALLER
similarity index 100%
rename from libs/simple_websocket-1.0.0.dist-info/INSTALLER
rename to libs/requests_oauthlib-2.0.0.dist-info/INSTALLER
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/LICENSE b/libs/requests_oauthlib-2.0.0.dist-info/LICENSE
similarity index 100%
rename from libs/requests_oauthlib-1.3.1.dist-info/LICENSE
rename to libs/requests_oauthlib-2.0.0.dist-info/LICENSE
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/METADATA b/libs/requests_oauthlib-2.0.0.dist-info/METADATA
similarity index 88%
rename from libs/requests_oauthlib-1.3.1.dist-info/METADATA
rename to libs/requests_oauthlib-2.0.0.dist-info/METADATA
index 89639d5d1..0a62eb5b6 100644
--- a/libs/requests_oauthlib-1.3.1.dist-info/METADATA
+++ b/libs/requests_oauthlib-2.0.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: requests-oauthlib
-Version: 1.3.1
+Version: 2.0.0
 Summary: OAuthlib authentication support for Requests.
 Home-page: https://github.com/requests/requests-oauthlib
 Author: Kenneth Reitz
@@ -11,8 +11,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: BSD License
 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.4
 Classifier: Programming Language :: Python :: 3.5
@@ -20,9 +18,12 @@ 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
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Requires-Python: >=3.4
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: oauthlib >=3.0.0
@@ -33,7 +34,7 @@ Requires-Dist: oauthlib[signedtoken] >=3.0.0 ; extra == 'rsa'
 Requests-OAuthlib |build-status| |coverage-status| |docs|
 =========================================================
 
-This project provides first-class OAuth library support for `Requests <http://python-requests.org>`_.
+This project provides first-class OAuth library support for `Requests <https://requests.readthedocs.io>`_.
 
 The OAuth 1 workflow
 --------------------
@@ -78,7 +79,7 @@ To install requests and requests_oauthlib you can use pip:
 
 .. code-block:: bash
 
-    $ pip install requests requests_oauthlib
+    pip install requests requests-oauthlib
 
 .. |build-status| image:: https://github.com/requests/requests-oauthlib/actions/workflows/run-tests.yml/badge.svg
    :target: https://github.com/requests/requests-oauthlib/actions
@@ -93,10 +94,37 @@ To install requests and requests_oauthlib you can use pip:
 History
 -------
 
+v2.0.0 (22 March 2024)
+++++++++++++++++++++++++
+
+Full set of changes are in [github](https://github.com/requests/requests-oauthlib/milestone/4?closed=1).
+
+Additions & changes:
+
+- ``OAuth2Session`` now correctly uses the ``self.verify`` value if ``verify``
+  is not overridden in ``fetch_token`` and ``refresh_token``. Fixes `#404
+  <https://github.com/requests/requests-oauthlib/issues/404>`_.
+- ``OAuth2Session`` constructor now uses its ``client.scope`` when a ``client``
+  is provided and ``scope`` is not overridden. Fixes `#408
+  <https://github.com/requests/requests-oauthlib/issues/408>`_
+- Add ``refresh_token_request`` and ``access_token_request`` compliance hooks
+- Add PKCE support and Auth0 example
+- Add support for Python 3.8-3.12
+- Remove support of Python 2.x, <3.7
+- Migrated to Github Action
+- Updated dependencies
+- Cleanup some docs and examples
+
+v1.4.0 (27 Feb 2024)
+++++++++++++++++++++++++
+
+- Version 2.0.0 published initially as 1.4.0, it was yanked eventually.
+
 v1.3.1 (21 January 2022)
 ++++++++++++++++++++++++
 
 - Add initial support for OAuth Mutual TLS (draft-ietf-oauth-mtls)
+- Removed outdated LinkedIn Compliance Fixes
 - Add eBay compliance fix
 - Add Spotify OAuth 2 Tutorial
 - Add support for python 3.8, 3.9
diff --git a/libs/requests_oauthlib-2.0.0.dist-info/RECORD b/libs/requests_oauthlib-2.0.0.dist-info/RECORD
new file mode 100644
index 000000000..746562d4d
--- /dev/null
+++ b/libs/requests_oauthlib-2.0.0.dist-info/RECORD
@@ -0,0 +1,22 @@
+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/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/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
+requests_oauthlib/compliance_fixes/douban.py,sha256=9RTafRu0nWyiAn9r8502CEY6yvozcanXV2pwnKPUJNw,413
+requests_oauthlib/compliance_fixes/ebay.py,sha256=NRUxIMKVMP0QULur9REutsyZIqIP_AwOANjlji9ZgAE,832
+requests_oauthlib/compliance_fixes/facebook.py,sha256=rybiH839YwzyY13SiGA676iHCBTh3mqFdam5tqx041I,995
+requests_oauthlib/compliance_fixes/fitbit.py,sha256=cI4PPpTnXJpZw1SY-N8ocshV2pVvep679d_pRIJPImg,846
+requests_oauthlib/compliance_fixes/instagram.py,sha256=YEvXWKmhM6yY4k378V2mNll4VKyOJkZBH0fRvU6fDM0,875
+requests_oauthlib/compliance_fixes/mailchimp.py,sha256=SVFQlnbuXZCLeKv6Ymhg9eSBScHCXV93PXLHWhUPAN0,679
+requests_oauthlib/compliance_fixes/plentymarkets.py,sha256=s7lrTZhINakiKjlbOISTeHTSXsNkcG8wfKcEVlQUMos,737
+requests_oauthlib/compliance_fixes/slack.py,sha256=4ZQg1ny0vU-hf8NJjKwgZEggH2OB7N3aJ9Gt2v7cVc4,1380
+requests_oauthlib/compliance_fixes/weibo.py,sha256=TL8uu4XMD_Mh9tXIKMNA8TT1gOIraBipTKoXkSpR2sM,385
+requests_oauthlib/oauth1_auth.py,sha256=F3XfhVODV80nnCEPDHueU1gmqxhhjGTmnDEYGtRYwJc,3604
+requests_oauthlib/oauth1_session.py,sha256=A6j7CgQ8n2Ir4An-8U0J9lyUNeY8H5Wff5I5PWHzlHc,16942
+requests_oauthlib/oauth2_auth.py,sha256=MXs8vIbBOhXj9NLiw_-J24k56L_XRJ0tFH_EMpshYUk,1508
+requests_oauthlib/oauth2_session.py,sha256=K4XtdpNTiU6Dq8JvEsj8aUpMdavWSCZAuTOc_xhZcBw,23932
diff --git a/libs/simple_websocket-1.0.0.dist-info/REQUESTED b/libs/requests_oauthlib-2.0.0.dist-info/REQUESTED
similarity index 100%
rename from libs/simple_websocket-1.0.0.dist-info/REQUESTED
rename to libs/requests_oauthlib-2.0.0.dist-info/REQUESTED
diff --git a/libs/six-1.16.0.dist-info/WHEEL b/libs/requests_oauthlib-2.0.0.dist-info/WHEEL
similarity index 100%
rename from libs/six-1.16.0.dist-info/WHEEL
rename to libs/requests_oauthlib-2.0.0.dist-info/WHEEL
diff --git a/libs/requests_oauthlib-1.3.1.dist-info/top_level.txt b/libs/requests_oauthlib-2.0.0.dist-info/top_level.txt
similarity index 100%
rename from libs/requests_oauthlib-1.3.1.dist-info/top_level.txt
rename to libs/requests_oauthlib-2.0.0.dist-info/top_level.txt
diff --git a/libs/requests_oauthlib/__init__.py b/libs/requests_oauthlib/__init__.py
index 0d3e49f99..865d72fb7 100644
--- a/libs/requests_oauthlib/__init__.py
+++ b/libs/requests_oauthlib/__init__.py
@@ -1,3 +1,4 @@
+# ruff: noqa: F401
 import logging
 
 from .oauth1_auth import OAuth1
@@ -5,7 +6,7 @@ from .oauth1_session import OAuth1Session
 from .oauth2_auth import OAuth2
 from .oauth2_session import OAuth2Session, TokenUpdated
 
-__version__ = "1.3.1"
+__version__ = "2.0.0"
 
 import requests
 
diff --git a/libs/requests_oauthlib/compliance_fixes/__init__.py b/libs/requests_oauthlib/compliance_fixes/__init__.py
index 0e8e3ac84..8815ea0b8 100644
--- a/libs/requests_oauthlib/compliance_fixes/__init__.py
+++ b/libs/requests_oauthlib/compliance_fixes/__init__.py
@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-
+# ruff: noqa: F401
 from .facebook import facebook_compliance_fix
 from .fitbit import fitbit_compliance_fix
 from .slack import slack_compliance_fix
diff --git a/libs/requests_oauthlib/compliance_fixes/douban.py b/libs/requests_oauthlib/compliance_fixes/douban.py
index ecc57b081..c8b99c721 100644
--- a/libs/requests_oauthlib/compliance_fixes/douban.py
+++ b/libs/requests_oauthlib/compliance_fixes/douban.py
@@ -1,14 +1,12 @@
 import json
 
-from oauthlib.common import to_unicode
-
 
 def douban_compliance_fix(session):
     def fix_token_type(r):
         token = json.loads(r.text)
         token.setdefault("token_type", "Bearer")
         fixed_token = json.dumps(token)
-        r._content = to_unicode(fixed_token).encode("utf-8")
+        r._content = fixed_token.encode()
         return r
 
     session._client_default_token_placement = "query"
diff --git a/libs/requests_oauthlib/compliance_fixes/ebay.py b/libs/requests_oauthlib/compliance_fixes/ebay.py
index 4aa423b3f..ef33f3910 100644
--- a/libs/requests_oauthlib/compliance_fixes/ebay.py
+++ b/libs/requests_oauthlib/compliance_fixes/ebay.py
@@ -1,5 +1,4 @@
 import json
-from oauthlib.common import to_unicode
 
 
 def ebay_compliance_fix(session):
@@ -13,7 +12,7 @@ def ebay_compliance_fix(session):
         if token.get("token_type") in ["Application Access Token", "User Access Token"]:
             token["token_type"] = "Bearer"
             fixed_token = json.dumps(token)
-            response._content = to_unicode(fixed_token).encode("utf-8")
+            response._content = fixed_token.encode()
 
         return response
 
diff --git a/libs/requests_oauthlib/compliance_fixes/facebook.py b/libs/requests_oauthlib/compliance_fixes/facebook.py
index 90e792127..f44558a83 100644
--- a/libs/requests_oauthlib/compliance_fixes/facebook.py
+++ b/libs/requests_oauthlib/compliance_fixes/facebook.py
@@ -1,11 +1,5 @@
 from json import dumps
-
-try:
-    from urlparse import parse_qsl
-except ImportError:
-    from urllib.parse import parse_qsl
-
-from oauthlib.common import to_unicode
+from urllib.parse import parse_qsl
 
 
 def facebook_compliance_fix(session):
@@ -26,7 +20,7 @@ def facebook_compliance_fix(session):
         if expires is not None:
             token["expires_in"] = expires
         token["token_type"] = "Bearer"
-        r._content = to_unicode(dumps(token)).encode("UTF-8")
+        r._content = dumps(token).encode()
         return r
 
     session.register_compliance_hook("access_token_response", _compliance_fix)
diff --git a/libs/requests_oauthlib/compliance_fixes/fitbit.py b/libs/requests_oauthlib/compliance_fixes/fitbit.py
index 7e6270240..aacc68bfb 100644
--- a/libs/requests_oauthlib/compliance_fixes/fitbit.py
+++ b/libs/requests_oauthlib/compliance_fixes/fitbit.py
@@ -8,8 +8,6 @@ MissingTokenError.
 
 from json import loads, dumps
 
-from oauthlib.common import to_unicode
-
 
 def fitbit_compliance_fix(session):
     def _missing_error(r):
@@ -17,7 +15,7 @@ def fitbit_compliance_fix(session):
         if "errors" in token:
             # Set the error to the first one we have
             token["error"] = token["errors"][0]["errorType"]
-        r._content = to_unicode(dumps(token)).encode("UTF-8")
+        r._content = dumps(token).encode()
         return r
 
     session.register_compliance_hook("access_token_response", _missing_error)
diff --git a/libs/requests_oauthlib/compliance_fixes/instagram.py b/libs/requests_oauthlib/compliance_fixes/instagram.py
index 4e07fe08b..7d5a2ad44 100644
--- a/libs/requests_oauthlib/compliance_fixes/instagram.py
+++ b/libs/requests_oauthlib/compliance_fixes/instagram.py
@@ -1,7 +1,4 @@
-try:
-    from urlparse import urlparse, parse_qs
-except ImportError:
-    from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 from oauthlib.common import add_params_to_uri
 
diff --git a/libs/requests_oauthlib/compliance_fixes/mailchimp.py b/libs/requests_oauthlib/compliance_fixes/mailchimp.py
index c69ce9fda..0d602659c 100644
--- a/libs/requests_oauthlib/compliance_fixes/mailchimp.py
+++ b/libs/requests_oauthlib/compliance_fixes/mailchimp.py
@@ -1,21 +1,19 @@
 import json
 
-from oauthlib.common import to_unicode
-
 
 def mailchimp_compliance_fix(session):
     def _null_scope(r):
         token = json.loads(r.text)
         if "scope" in token and token["scope"] is None:
             token.pop("scope")
-        r._content = to_unicode(json.dumps(token)).encode("utf-8")
+        r._content = json.dumps(token).encode()
         return r
 
     def _non_zero_expiration(r):
         token = json.loads(r.text)
         if "expires_in" in token and token["expires_in"] == 0:
             token["expires_in"] = 3600
-        r._content = to_unicode(json.dumps(token)).encode("utf-8")
+        r._content = json.dumps(token).encode()
         return r
 
     session.register_compliance_hook("access_token_response", _null_scope)
diff --git a/libs/requests_oauthlib/compliance_fixes/plentymarkets.py b/libs/requests_oauthlib/compliance_fixes/plentymarkets.py
index 9f605f058..859f0566a 100644
--- a/libs/requests_oauthlib/compliance_fixes/plentymarkets.py
+++ b/libs/requests_oauthlib/compliance_fixes/plentymarkets.py
@@ -1,8 +1,6 @@
 from json import dumps, loads
 import re
 
-from oauthlib.common import to_unicode
-
 
 def plentymarkets_compliance_fix(session):
     def _to_snake_case(n):
@@ -22,7 +20,7 @@ def plentymarkets_compliance_fix(session):
         for k, v in token.items():
             fixed_token[_to_snake_case(k)] = v
 
-        r._content = to_unicode(dumps(fixed_token)).encode("UTF-8")
+        r._content = dumps(fixed_token).encode()
         return r
 
     session.register_compliance_hook("access_token_response", _compliance_fix)
diff --git a/libs/requests_oauthlib/compliance_fixes/slack.py b/libs/requests_oauthlib/compliance_fixes/slack.py
index 3f574b03a..9095a470c 100644
--- a/libs/requests_oauthlib/compliance_fixes/slack.py
+++ b/libs/requests_oauthlib/compliance_fixes/slack.py
@@ -1,7 +1,4 @@
-try:
-    from urlparse import urlparse, parse_qs
-except ImportError:
-    from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlparse, parse_qs
 
 from oauthlib.common import add_params_to_uri
 
diff --git a/libs/requests_oauthlib/compliance_fixes/weibo.py b/libs/requests_oauthlib/compliance_fixes/weibo.py
index 6733abeb1..f1623fd6d 100644
--- a/libs/requests_oauthlib/compliance_fixes/weibo.py
+++ b/libs/requests_oauthlib/compliance_fixes/weibo.py
@@ -1,13 +1,11 @@
 from json import loads, dumps
 
-from oauthlib.common import to_unicode
-
 
 def weibo_compliance_fix(session):
     def _missing_token_type(r):
         token = loads(r.text)
         token["token_type"] = "Bearer"
-        r._content = to_unicode(dumps(token)).encode("UTF-8")
+        r._content = dumps(token).encode()
         return r
 
     session._client.default_token_placement = "query"
diff --git a/libs/requests_oauthlib/oauth1_auth.py b/libs/requests_oauthlib/oauth1_auth.py
index cfbbd5902..f8c0bd6e7 100644
--- a/libs/requests_oauthlib/oauth1_auth.py
+++ b/libs/requests_oauthlib/oauth1_auth.py
@@ -1,20 +1,15 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import logging
 
 from oauthlib.common import extract_params
 from oauthlib.oauth1 import Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER
 from oauthlib.oauth1 import SIGNATURE_TYPE_BODY
-from requests.compat import is_py3
 from requests.utils import to_native_string
 from requests.auth import AuthBase
 
 CONTENT_TYPE_FORM_URLENCODED = "application/x-www-form-urlencoded"
 CONTENT_TYPE_MULTI_PART = "multipart/form-data"
 
-if is_py3:
-    unicode = str
 
 log = logging.getLogger(__name__)
 
@@ -83,7 +78,7 @@ class OAuth1(AuthBase):
             or self.client.signature_type == SIGNATURE_TYPE_BODY
         ):
             content_type = CONTENT_TYPE_FORM_URLENCODED
-        if not isinstance(content_type, unicode):
+        if not isinstance(content_type, str):
             content_type = content_type.decode("utf-8")
 
         is_form_encoded = CONTENT_TYPE_FORM_URLENCODED in content_type
@@ -96,17 +91,17 @@ class OAuth1(AuthBase):
         if is_form_encoded:
             r.headers["Content-Type"] = CONTENT_TYPE_FORM_URLENCODED
             r.url, headers, r.body = self.client.sign(
-                unicode(r.url), unicode(r.method), r.body or "", r.headers
+                str(r.url), str(r.method), r.body or "", r.headers
             )
         elif self.force_include_body:
             # To allow custom clients to work on non form encoded bodies.
             r.url, headers, r.body = self.client.sign(
-                unicode(r.url), unicode(r.method), r.body or "", r.headers
+                str(r.url), str(r.method), r.body or "", r.headers
             )
         else:
             # Omit body data in the signing of non form-encoded requests
             r.url, headers, _ = self.client.sign(
-                unicode(r.url), unicode(r.method), None, r.headers
+                str(r.url), str(r.method), None, r.headers
             )
 
         r.prepare_headers(headers)
diff --git a/libs/requests_oauthlib/oauth1_session.py b/libs/requests_oauthlib/oauth1_session.py
index 88f2853ca..7625c8084 100644
--- a/libs/requests_oauthlib/oauth1_session.py
+++ b/libs/requests_oauthlib/oauth1_session.py
@@ -1,9 +1,4 @@
-from __future__ import unicode_literals
-
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 import logging
 
@@ -85,7 +80,7 @@ class OAuth1Session(requests.Session):
     'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&oauth_callback=https%3A%2F%2F127.0.0.1%2Fcallback'
     >>>
     >>> # Third step. Fetch the access token
-    >>> redirect_response = raw_input('Paste the full redirect URL here.')
+    >>> redirect_response = input('Paste the full redirect URL here.')
     >>> oauth_session.parse_authorization_response(redirect_response)
     {
         'oauth_token: 'kjerht2309u',
@@ -258,7 +253,7 @@ class OAuth1Session(requests.Session):
         return add_params_to_uri(url, kwargs.items())
 
     def fetch_request_token(self, url, realm=None, **request_kwargs):
-        r"""Fetch a request token.
+        """Fetch a request token.
 
         This is the first step in the OAuth 1 workflow. A request token is
         obtained by making a signed post request to url. The token is then
@@ -267,7 +262,7 @@ class OAuth1Session(requests.Session):
 
         :param url: The request token endpoint URL.
         :param realm: A list of realms to request access to.
-        :param \*\*request_kwargs: Optional arguments passed to ''post''
+        :param request_kwargs: Optional arguments passed to ''post''
             function in ''requests.Session''
         :returns: The response in dict format.
 
diff --git a/libs/requests_oauthlib/oauth2_auth.py b/libs/requests_oauthlib/oauth2_auth.py
index b880f72f5..f19f52ac9 100644
--- a/libs/requests_oauthlib/oauth2_auth.py
+++ b/libs/requests_oauthlib/oauth2_auth.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from oauthlib.oauth2 import WebApplicationClient, InsecureTransportError
 from oauthlib.oauth2 import is_secure_transport
 from requests.auth import AuthBase
diff --git a/libs/requests_oauthlib/oauth2_session.py b/libs/requests_oauthlib/oauth2_session.py
index db4468089..93cc4d7bb 100644
--- a/libs/requests_oauthlib/oauth2_session.py
+++ b/libs/requests_oauthlib/oauth2_session.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from oauthlib.common import generate_token, urldecode
@@ -46,6 +44,7 @@ class OAuth2Session(requests.Session):
         token=None,
         state=None,
         token_updater=None,
+        pkce=None,
         **kwargs
     ):
         """Construct a new OAuth 2 client session.
@@ -72,18 +71,23 @@ class OAuth2Session(requests.Session):
                         set a TokenUpdated warning will be raised when a token
                         has been refreshed. This warning will carry the token
                         in its token argument.
+        :param pkce: Set "S256" or "plain" to enable PKCE. Default is disabled.
         :param kwargs: Arguments to pass to the Session constructor.
         """
         super(OAuth2Session, self).__init__(**kwargs)
         self._client = client or WebApplicationClient(client_id, token=token)
         self.token = token or {}
-        self.scope = scope
+        self._scope = scope
         self.redirect_uri = redirect_uri
         self.state = state or generate_token
         self._state = state
         self.auto_refresh_url = auto_refresh_url
         self.auto_refresh_kwargs = auto_refresh_kwargs or {}
         self.token_updater = token_updater
+        self._pkce = pkce
+
+        if self._pkce not in ["S256", "plain", None]:
+            raise AttributeError("Wrong value for {}(.., pkce={})".format(self.__class__, self._pkce))
 
         # Ensure that requests doesn't do any automatic auth. See #278.
         # The default behavior can be re-enabled by setting auth to None.
@@ -95,8 +99,24 @@ class OAuth2Session(requests.Session):
             "access_token_response": set(),
             "refresh_token_response": set(),
             "protected_request": set(),
+            "refresh_token_request": set(),
+            "access_token_request": set(),
         }
 
+    @property
+    def scope(self):
+        """By default the scope from the client is used, except if overridden"""
+        if self._scope is not None:
+            return self._scope
+        elif self._client is not None:
+            return self._client.scope
+        else:
+            return None
+
+    @scope.setter
+    def scope(self, scope):
+        self._scope = scope
+
     def new_state(self):
         """Generates a state string to be used in authorizations."""
         try:
@@ -161,6 +181,13 @@ class OAuth2Session(requests.Session):
         :return: authorization_url, state
         """
         state = state or self.new_state()
+        if self._pkce:
+            self._code_verifier = self._client.create_code_verifier(43)
+            kwargs["code_challenge_method"] = self._pkce
+            kwargs["code_challenge"] = self._client.create_code_challenge(
+                code_verifier=self._code_verifier,
+                code_challenge_method=self._pkce
+            )
         return (
             self._client.prepare_request_uri(
                 url,
@@ -185,7 +212,7 @@ class OAuth2Session(requests.Session):
         force_querystring=False,
         timeout=None,
         headers=None,
-        verify=True,
+        verify=None,
         proxies=None,
         include_client_id=None,
         client_secret=None,
@@ -252,6 +279,13 @@ class OAuth2Session(requests.Session):
                     "Please supply either code or " "authorization_response parameters."
                 )
 
+        if self._pkce:
+            if self._code_verifier is None:
+                raise ValueError(
+                    "Code verifier is not found, authorization URL must be generated before"
+                )
+            kwargs["code_verifier"] = self._code_verifier
+
         # Earlier versions of this library build an HTTPBasicAuth header out of
         # `username` and `password`. The RFC states, however these attributes
         # must be in the request body and not the header.
@@ -325,7 +359,7 @@ class OAuth2Session(requests.Session):
 
         headers = headers or {
             "Accept": "application/json",
-            "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+            "Content-Type": "application/x-www-form-urlencoded",
         }
         self.token = {}
         request_kwargs = {}
@@ -338,6 +372,12 @@ class OAuth2Session(requests.Session):
         else:
             raise ValueError("The method kwarg must be POST or GET.")
 
+        for hook in self.compliance_hook["access_token_request"]:
+            log.debug("Invoking access_token_request hook %s.", hook)
+            token_url, headers, request_kwargs = hook(
+                token_url, headers, request_kwargs
+            )
+
         r = self.request(
             method=method,
             url=token_url,
@@ -388,7 +428,7 @@ class OAuth2Session(requests.Session):
         auth=None,
         timeout=None,
         headers=None,
-        verify=True,
+        verify=None,
         proxies=None,
         **kwargs
     ):
@@ -426,9 +466,13 @@ class OAuth2Session(requests.Session):
         if headers is None:
             headers = {
                 "Accept": "application/json",
-                "Content-Type": ("application/x-www-form-urlencoded;charset=UTF-8"),
+                "Content-Type": ("application/x-www-form-urlencoded"),
             }
 
+        for hook in self.compliance_hook["refresh_token_request"]:
+            log.debug("Invoking refresh_token_request hook %s.", hook)
+            token_url, headers, body = hook(token_url, headers, body)
+
         r = self.post(
             token_url,
             data=dict(urldecode(body)),
@@ -450,7 +494,7 @@ class OAuth2Session(requests.Session):
             r = hook(r)
 
         self.token = self._client.parse_request_body_response(r.text, scope=self.scope)
-        if not "refresh_token" in self.token:
+        if "refresh_token" not in self.token:
             log.debug("No new refresh token given. Re-using old.")
             self.token["refresh_token"] = refresh_token
         return self.token
@@ -464,6 +508,7 @@ class OAuth2Session(requests.Session):
         withhold_token=False,
         client_id=None,
         client_secret=None,
+        files=None,
         **kwargs
     ):
         """Intercept all requests and add the OAuth 2 token if present."""
@@ -519,7 +564,7 @@ class OAuth2Session(requests.Session):
         log.debug("Supplying headers %s and data %s", headers, data)
         log.debug("Passing through key word arguments %s.", kwargs)
         return super(OAuth2Session, self).request(
-            method, url, headers=headers, data=data, **kwargs
+            method, url, headers=headers, data=data, files=files, **kwargs
         )
 
     def register_compliance_hook(self, hook_type, hook):
@@ -529,6 +574,8 @@ class OAuth2Session(requests.Session):
             access_token_response invoked before token parsing.
             refresh_token_response invoked before refresh token parsing.
             protected_request invoked before making a request.
+            access_token_request invoked before making a token fetch request.
+            refresh_token_request invoked before making a refresh request.
 
         If you find a new hook is needed please send a GitHub PR request
         or open an issue.
diff --git a/libs/rich-13.7.0.dist-info/WHEEL b/libs/rich-13.7.0.dist-info/WHEEL
deleted file mode 100644
index d73ccaae8..000000000
--- a/libs/rich-13.7.0.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/six-1.16.0.dist-info/INSTALLER b/libs/rich-13.9.4.dist-info/INSTALLER
similarity index 100%
rename from libs/six-1.16.0.dist-info/INSTALLER
rename to libs/rich-13.9.4.dist-info/INSTALLER
diff --git a/libs/rich-13.7.0.dist-info/LICENSE b/libs/rich-13.9.4.dist-info/LICENSE
similarity index 100%
rename from libs/rich-13.7.0.dist-info/LICENSE
rename to libs/rich-13.9.4.dist-info/LICENSE
diff --git a/libs/rich-13.7.0.dist-info/METADATA b/libs/rich-13.9.4.dist-info/METADATA
similarity index 96%
rename from libs/rich-13.7.0.dist-info/METADATA
rename to libs/rich-13.9.4.dist-info/METADATA
index f0b31e8e7..7f3ac7f81 100644
--- a/libs/rich-13.7.0.dist-info/METADATA
+++ b/libs/rich-13.9.4.dist-info/METADATA
@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: rich
-Version: 13.7.0
+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.7.0
+Requires-Python: >=3.8.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: IPython
@@ -16,18 +16,18 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 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: 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.9"
+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
 
@@ -72,7 +72,7 @@ See what [people are saying about Rich](https://www.willmcgugan.com/blog/pages/p
 
 ## Compatibility
 
-Rich works with Linux, OSX, and Windows. True color / emoji works with new Windows Terminal, classic terminal is limited to 16 colors. Rich requires Python 3.7 or later.
+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.
 
@@ -471,11 +471,3 @@ See also Rich's sister project, [Textual](https://github.com/Textualize/textual)
 
 ![Textual screenshot](https://raw.githubusercontent.com/Textualize/textual/main/imgs/textual.png)
 
-# Projects using Rich
-
-For some examples of projects using Rich, see the [Rich Gallery](https://www.textualize.io/rich/gallery) on [Textualize.io](https://www.textualize.io).
-
-Would you like to add your own project to the gallery? You can! Follow [these instructions](https://www.textualize.io/gallery-instructions).
-
-<!-- This is a test, no need to translate -->
-
diff --git a/libs/rich-13.7.0.dist-info/RECORD b/libs/rich-13.9.4.dist-info/RECORD
similarity index 58%
rename from libs/rich-13.7.0.dist-info/RECORD
rename to libs/rich-13.9.4.dist-info/RECORD
index ab5a6ef0d..5ed3d366b 100644
--- a/libs/rich-13.7.0.dist-info/RECORD
+++ b/libs/rich-13.9.4.dist-info/RECORD
@@ -1,68 +1,68 @@
-rich-13.7.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-rich-13.7.0.dist-info/LICENSE,sha256=3u18F6QxgVgZCj6iOcyHmlpQJxzruYrnAl9I--WNyhU,1056
-rich-13.7.0.dist-info/METADATA,sha256=F0xbgoukazzhEII4cfbUSAvzl6ndkKOba3OiNPElxaw,18636
-rich-13.7.0.dist-info/RECORD,,
-rich-13.7.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rich-13.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+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=2n4EiJi3X9sqIq0O16kUZ_zy6UYMd3xFfChlKfnW1Hc,10096
+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=oZJGw31e64dwXSCmrDnvZbwVb1ZKhWfU8wI3VWohjJk,9695
+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=tGSXk_v-IZmbj1GAzHit8A3kYIQMiCpVsCFfsC-_KJ4,1387
+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=-NtealsQXQ558e-zpJtkwh8x_dqC-SjlAGA872dGE6U,22784
+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=WNIpPPjG1HiLD2fUh5d11SHK5oXItu6UuwBk9t4CfZM,10320
-rich/ansi.py,sha256=iD6532QYqnBm6hADulKjrV8l8kFJ-9fEVooHJHH3hMg,6906
+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=aMmGK4BjXhgE6_JF1ZEGmW3O7mKkE8g84vUnj4Et4To,4780
-rich/color.py,sha256=bCRATVdRe5IClJ6Hl62de2PKQ_U4i2MZ4ugjUEg7Tao,18223
+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=-grwb9o1UzI2wwNsuOJaLNdS_iJWrLVR6bDzq4vpSI4,99101
+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=iBE04bD6RJCVhlpUkeCnEnulmydZzKqVAxHM-GpoXBI,8046
+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=9fTLAPCAwHmBXdRv7KZU194jSgNrRb6Wx7RIoBgqeKY,2508
-rich/highlighter.py,sha256=6ZAjUcNhBRajBCo9umFUclyi2xL0-55JL7S0vYGUJu4,9585
+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=vUcnJV2LMSK3sQNaILbm0-_B8BpAeiHfcQMAMLfpRe0,14271
+rich/live.py,sha256=DhzAPEnjTxQuq9_0Y2xh2MUwQcP_aGPkenLfKETslwM,14270
 rich/live_render.py,sha256=QaiB8dtGikCdssoXpkEmmiH55fxT-9bzLkBO9pbBvrU,3654
-rich/logging.py,sha256=XEKUteCZhN7j0pmIngTOCBSY2GvuT4_4-F20-ibPrEk,11891
-rich/markdown.py,sha256=o4-JIwL2By88PPctt-HCC9-NZu33kX7Aj7ndE_bNKVE,26167
+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=8I1dQNQQK1iCjHtGBDEn78kRp3p27GYzl5UR3qB7e2E,4958
+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=2Fd1V7e1kHxlPFIusoHY5T7-Cs0RpkrihgVG9ZVqJ4g,10705
-rich/pretty.py,sha256=2cT5KmcYVtbG3DS0Dd_va1xR5X4FU0WKjzFV7Q4IuJY,35812
-rich/progress.py,sha256=mc_7z0943s10GHDPHE7UIvb1SWY4scG4L6yk8dq0tVc,59703
-rich/progress_bar.py,sha256=L4jw8E6Qb_x-jhOrLVhkuMaPmiAhFIl8jHQbWFrKuR8,8164
-rich/prompt.py,sha256=C8Xkk7sYrHsai7ZajABFQT5xHRSHFl-sCu6MZFMhn8s,11292
+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
@@ -70,16 +70,16 @@ 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=7dLrBSS3jBRjMO3IzBDQrKvqYfRCrx9WUDh2MMbuhjk,24210
-rich/spinner.py,sha256=15koCmF0DQeD8-k28Lpt6X_zJQUlzEhgo_6A6uy47lc,4339
+rich/segment.py,sha256=7gOdwSPrzu0a2gRmxBDtu3u2S8iG5s9l7wlB58dKMy0,24707
+rich/spinner.py,sha256=PT5qgXPG3ZpqRj7n3EZQ6NW56mx3ldZqZCU7gEMyZk4,4364
 rich/status.py,sha256=kkPph3YeAZBo-X-4wPp8gTqZyU466NLwZBA4PZTTewo,4424
-rich/style.py,sha256=3hiocH_4N8vwRm3-8yFWzM7tSwjjEven69XqWasSQwM,27073
+rich/style.py,sha256=aSoUNbVgfP1PAnduAqgbbl4AMQy668qs2S1FEwr3Oqs,27067
 rich/styled.py,sha256=wljVsVTXbABMMZvkzkO43ZEk_-irzEtvUiQ-sNnikQ8,1234
-rich/syntax.py,sha256=_9CGepyxl9Mu4vO2F_4RFEcPZYJNmaudkbl93CvGzRQ,35367
-rich/table.py,sha256=WtzTleWTo5kQkcibaGqYhbKQxyzoe9WtpO_8K5IpuyA,39644
+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=sFFbpIkmtDMCuz5ilIqYaJQ2308ynXzutYUMQOaCgUk,47309
-rich/theme.py,sha256=belFJogzA0W0HysQabKaHOc3RWH2ko3fQAJhoN-AFdo,3777
+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=OTrtdHYPMCkHWcObufF9QtyCRvmNL_U1CXKKITp4hrE,29529
-rich/tree.py,sha256=ednhj4b1jHNadeEzADPVuemvgVClpjQuJR6v5htirI8,9107
+rich/traceback.py,sha256=hCLOig4Uwtc7f0FqseEkFZ8YUwzvGOli8BOG517mipg,31725
+rich/tree.py,sha256=QoOwg424FkdwGfR8K0tZ6Q7qtzWNAUP_m4sFaYuG6nw,9391
diff --git a/libs/six-1.16.0.dist-info/REQUESTED b/libs/rich-13.9.4.dist-info/REQUESTED
similarity index 100%
rename from libs/six-1.16.0.dist-info/REQUESTED
rename to libs/rich-13.9.4.dist-info/REQUESTED
diff --git a/libs/rich-13.9.4.dist-info/WHEEL b/libs/rich-13.9.4.dist-info/WHEEL
new file mode 100644
index 000000000..8b9b3a1bf
--- /dev/null
+++ b/libs/rich-13.9.4.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 1.9.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/rich/_cell_widths.py b/libs/rich/_cell_widths.py
index 36286df37..608ae3a75 100644
--- a/libs/rich/_cell_widths.py
+++ b/libs/rich/_cell_widths.py
@@ -4,6 +4,7 @@ CELL_WIDTHS = [
     (0, 0, 0),
     (1, 31, -1),
     (127, 159, -1),
+    (173, 173, 0),
     (768, 879, 0),
     (1155, 1161, 0),
     (1425, 1469, 0),
@@ -11,13 +12,16 @@ CELL_WIDTHS = [
     (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, 1756, 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),
@@ -28,149 +32,137 @@ CELL_WIDTHS = [
     (2085, 2087, 0),
     (2089, 2093, 0),
     (2137, 2139, 0),
-    (2259, 2273, 0),
-    (2275, 2306, 0),
-    (2362, 2362, 0),
-    (2364, 2364, 0),
-    (2369, 2376, 0),
-    (2381, 2381, 0),
+    (2192, 2193, 0),
+    (2200, 2207, 0),
+    (2250, 2307, 0),
+    (2362, 2364, 0),
+    (2366, 2383, 0),
     (2385, 2391, 0),
     (2402, 2403, 0),
-    (2433, 2433, 0),
+    (2433, 2435, 0),
     (2492, 2492, 0),
-    (2497, 2500, 0),
-    (2509, 2509, 0),
+    (2494, 2500, 0),
+    (2503, 2504, 0),
+    (2507, 2509, 0),
+    (2519, 2519, 0),
     (2530, 2531, 0),
     (2558, 2558, 0),
-    (2561, 2562, 0),
+    (2561, 2563, 0),
     (2620, 2620, 0),
-    (2625, 2626, 0),
+    (2622, 2626, 0),
     (2631, 2632, 0),
     (2635, 2637, 0),
     (2641, 2641, 0),
     (2672, 2673, 0),
     (2677, 2677, 0),
-    (2689, 2690, 0),
+    (2689, 2691, 0),
     (2748, 2748, 0),
-    (2753, 2757, 0),
-    (2759, 2760, 0),
-    (2765, 2765, 0),
+    (2750, 2757, 0),
+    (2759, 2761, 0),
+    (2763, 2765, 0),
     (2786, 2787, 0),
     (2810, 2815, 0),
-    (2817, 2817, 0),
+    (2817, 2819, 0),
     (2876, 2876, 0),
-    (2879, 2879, 0),
-    (2881, 2884, 0),
-    (2893, 2893, 0),
-    (2901, 2902, 0),
+    (2878, 2884, 0),
+    (2887, 2888, 0),
+    (2891, 2893, 0),
+    (2901, 2903, 0),
     (2914, 2915, 0),
     (2946, 2946, 0),
-    (3008, 3008, 0),
-    (3021, 3021, 0),
-    (3072, 3072, 0),
-    (3076, 3076, 0),
-    (3134, 3136, 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, 3201, 0),
+    (3201, 3203, 0),
     (3260, 3260, 0),
-    (3263, 3263, 0),
-    (3270, 3270, 0),
-    (3276, 3277, 0),
+    (3262, 3268, 0),
+    (3270, 3272, 0),
+    (3274, 3277, 0),
+    (3285, 3286, 0),
     (3298, 3299, 0),
-    (3328, 3329, 0),
+    (3315, 3315, 0),
+    (3328, 3331, 0),
     (3387, 3388, 0),
-    (3393, 3396, 0),
-    (3405, 3405, 0),
+    (3390, 3396, 0),
+    (3398, 3400, 0),
+    (3402, 3405, 0),
+    (3415, 3415, 0),
     (3426, 3427, 0),
-    (3457, 3457, 0),
+    (3457, 3459, 0),
     (3530, 3530, 0),
-    (3538, 3540, 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),
+    (3784, 3790, 0),
     (3864, 3865, 0),
     (3893, 3893, 0),
     (3895, 3895, 0),
     (3897, 3897, 0),
-    (3953, 3966, 0),
-    (3968, 3972, 0),
+    (3902, 3903, 0),
+    (3953, 3972, 0),
     (3974, 3975, 0),
     (3981, 3991, 0),
     (3993, 4028, 0),
     (4038, 4038, 0),
-    (4141, 4144, 0),
-    (4146, 4151, 0),
-    (4153, 4154, 0),
-    (4157, 4158, 0),
-    (4184, 4185, 0),
+    (4139, 4158, 0),
+    (4182, 4185, 0),
     (4190, 4192, 0),
+    (4194, 4196, 0),
+    (4199, 4205, 0),
     (4209, 4212, 0),
-    (4226, 4226, 0),
-    (4229, 4230, 0),
-    (4237, 4237, 0),
-    (4253, 4253, 0),
+    (4226, 4237, 0),
+    (4239, 4239, 0),
+    (4250, 4253, 0),
     (4352, 4447, 2),
+    (4448, 4607, 0),
     (4957, 4959, 0),
-    (5906, 5908, 0),
+    (5906, 5909, 0),
     (5938, 5940, 0),
     (5970, 5971, 0),
     (6002, 6003, 0),
-    (6068, 6069, 0),
-    (6071, 6077, 0),
-    (6086, 6086, 0),
-    (6089, 6099, 0),
+    (6068, 6099, 0),
     (6109, 6109, 0),
-    (6155, 6157, 0),
+    (6155, 6159, 0),
     (6277, 6278, 0),
     (6313, 6313, 0),
-    (6432, 6434, 0),
-    (6439, 6440, 0),
-    (6450, 6450, 0),
-    (6457, 6459, 0),
-    (6679, 6680, 0),
-    (6683, 6683, 0),
-    (6742, 6742, 0),
-    (6744, 6750, 0),
-    (6752, 6752, 0),
-    (6754, 6754, 0),
-    (6757, 6764, 0),
-    (6771, 6780, 0),
+    (6432, 6443, 0),
+    (6448, 6459, 0),
+    (6679, 6683, 0),
+    (6741, 6750, 0),
+    (6752, 6780, 0),
     (6783, 6783, 0),
-    (6832, 6848, 0),
-    (6912, 6915, 0),
-    (6964, 6964, 0),
-    (6966, 6970, 0),
-    (6972, 6972, 0),
-    (6978, 6978, 0),
+    (6832, 6862, 0),
+    (6912, 6916, 0),
+    (6964, 6980, 0),
     (7019, 7027, 0),
-    (7040, 7041, 0),
-    (7074, 7077, 0),
-    (7080, 7081, 0),
-    (7083, 7085, 0),
-    (7142, 7142, 0),
-    (7144, 7145, 0),
-    (7149, 7149, 0),
-    (7151, 7153, 0),
-    (7212, 7219, 0),
-    (7222, 7223, 0),
+    (7040, 7042, 0),
+    (7073, 7085, 0),
+    (7142, 7155, 0),
+    (7204, 7223, 0),
     (7376, 7378, 0),
-    (7380, 7392, 0),
-    (7394, 7400, 0),
+    (7380, 7400, 0),
     (7405, 7405, 0),
     (7412, 7412, 0),
-    (7416, 7417, 0),
-    (7616, 7673, 0),
-    (7675, 7679, 0),
+    (7415, 7417, 0),
+    (7616, 7679, 0),
     (8203, 8207, 0),
     (8232, 8238, 0),
-    (8288, 8291, 0),
+    (8288, 8292, 0),
+    (8294, 8303, 0),
     (8400, 8432, 0),
     (8986, 8987, 2),
     (9001, 9002, 2),
@@ -212,17 +204,16 @@ CELL_WIDTHS = [
     (11904, 11929, 2),
     (11931, 12019, 2),
     (12032, 12245, 2),
-    (12272, 12283, 2),
-    (12288, 12329, 2),
-    (12330, 12333, 0),
-    (12334, 12350, 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),
-    (12784, 12830, 2),
+    (12783, 12830, 2),
     (12832, 12871, 2),
     (12880, 19903, 2),
     (19968, 42124, 2),
@@ -234,36 +225,33 @@ CELL_WIDTHS = [
     (43010, 43010, 0),
     (43014, 43014, 0),
     (43019, 43019, 0),
-    (43045, 43046, 0),
+    (43043, 43047, 0),
     (43052, 43052, 0),
-    (43204, 43205, 0),
+    (43136, 43137, 0),
+    (43188, 43205, 0),
     (43232, 43249, 0),
     (43263, 43263, 0),
     (43302, 43309, 0),
-    (43335, 43345, 0),
+    (43335, 43347, 0),
     (43360, 43388, 2),
-    (43392, 43394, 0),
-    (43443, 43443, 0),
-    (43446, 43449, 0),
-    (43452, 43453, 0),
+    (43392, 43395, 0),
+    (43443, 43456, 0),
     (43493, 43493, 0),
-    (43561, 43566, 0),
-    (43569, 43570, 0),
-    (43573, 43574, 0),
+    (43561, 43574, 0),
     (43587, 43587, 0),
-    (43596, 43596, 0),
-    (43644, 43644, 0),
+    (43596, 43597, 0),
+    (43643, 43645, 0),
     (43696, 43696, 0),
     (43698, 43700, 0),
     (43703, 43704, 0),
     (43710, 43711, 0),
     (43713, 43713, 0),
-    (43756, 43757, 0),
-    (43766, 43766, 0),
-    (44005, 44005, 0),
-    (44008, 44008, 0),
-    (44013, 44013, 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),
@@ -272,8 +260,10 @@ CELL_WIDTHS = [
     (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),
@@ -285,102 +275,108 @@ CELL_WIDTHS = [
     (68325, 68326, 0),
     (68900, 68903, 0),
     (69291, 69292, 0),
+    (69373, 69375, 0),
     (69446, 69456, 0),
-    (69633, 69633, 0),
+    (69506, 69509, 0),
+    (69632, 69634, 0),
     (69688, 69702, 0),
-    (69759, 69761, 0),
-    (69811, 69814, 0),
-    (69817, 69818, 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, 69931, 0),
-    (69933, 69940, 0),
+    (69927, 69940, 0),
+    (69957, 69958, 0),
     (70003, 70003, 0),
-    (70016, 70017, 0),
-    (70070, 70078, 0),
+    (70016, 70018, 0),
+    (70067, 70080, 0),
     (70089, 70092, 0),
-    (70095, 70095, 0),
-    (70191, 70193, 0),
-    (70196, 70196, 0),
-    (70198, 70199, 0),
+    (70094, 70095, 0),
+    (70188, 70199, 0),
     (70206, 70206, 0),
-    (70367, 70367, 0),
-    (70371, 70378, 0),
-    (70400, 70401, 0),
+    (70209, 70209, 0),
+    (70367, 70378, 0),
+    (70400, 70403, 0),
     (70459, 70460, 0),
-    (70464, 70464, 0),
+    (70462, 70468, 0),
+    (70471, 70472, 0),
+    (70475, 70477, 0),
+    (70487, 70487, 0),
+    (70498, 70499, 0),
     (70502, 70508, 0),
     (70512, 70516, 0),
-    (70712, 70719, 0),
-    (70722, 70724, 0),
-    (70726, 70726, 0),
+    (70709, 70726, 0),
     (70750, 70750, 0),
-    (70835, 70840, 0),
-    (70842, 70842, 0),
-    (70847, 70848, 0),
-    (70850, 70851, 0),
-    (71090, 71093, 0),
-    (71100, 71101, 0),
-    (71103, 71104, 0),
+    (70832, 70851, 0),
+    (71087, 71093, 0),
+    (71096, 71104, 0),
     (71132, 71133, 0),
-    (71219, 71226, 0),
-    (71229, 71229, 0),
-    (71231, 71232, 0),
-    (71339, 71339, 0),
-    (71341, 71341, 0),
-    (71344, 71349, 0),
-    (71351, 71351, 0),
-    (71453, 71455, 0),
-    (71458, 71461, 0),
-    (71463, 71467, 0),
-    (71727, 71735, 0),
-    (71737, 71738, 0),
-    (71995, 71996, 0),
-    (71998, 71998, 0),
-    (72003, 72003, 0),
-    (72148, 72151, 0),
-    (72154, 72155, 0),
-    (72160, 72160, 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, 72248, 0),
+    (72243, 72249, 0),
     (72251, 72254, 0),
     (72263, 72263, 0),
-    (72273, 72278, 0),
-    (72281, 72283, 0),
-    (72330, 72342, 0),
-    (72344, 72345, 0),
-    (72752, 72758, 0),
-    (72760, 72765, 0),
-    (72767, 72767, 0),
+    (72273, 72283, 0),
+    (72330, 72345, 0),
+    (72751, 72758, 0),
+    (72760, 72767, 0),
     (72850, 72871, 0),
-    (72874, 72880, 0),
-    (72882, 72883, 0),
-    (72885, 72886, 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),
-    (73109, 73109, 0),
-    (73111, 73111, 0),
-    (73459, 73460, 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, 2),
+    (94192, 94193, 0),
     (94208, 100343, 2),
     (100352, 101589, 2),
     (101632, 101640, 2),
-    (110592, 110878, 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),
-    (119143, 119145, 0),
-    (119163, 119170, 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),
@@ -395,8 +391,11 @@ CELL_WIDTHS = [
     (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),
@@ -416,7 +415,9 @@ CELL_WIDTHS = [
     (127951, 127955, 2),
     (127968, 127984, 2),
     (127988, 127988, 2),
-    (127992, 128062, 2),
+    (127992, 127994, 2),
+    (127995, 127999, 0),
+    (128000, 128062, 2),
     (128064, 128064, 2),
     (128066, 128252, 2),
     (128255, 128317, 2),
@@ -430,22 +431,24 @@ CELL_WIDTHS = [
     (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, 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),
+    (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 30446ceb3..e87698d1f 100644
--- a/libs/rich/_inspect.py
+++ b/libs/rich/_inspect.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 from inspect import cleandoc, getdoc, getfile, isclass, ismodule, signature
 from typing import Any, Collection, Iterable, Optional, Tuple, Type, Union
diff --git a/libs/rich/_null_file.py b/libs/rich/_null_file.py
index b659673ef..6ae05d3e2 100644
--- a/libs/rich/_null_file.py
+++ b/libs/rich/_null_file.py
@@ -46,7 +46,7 @@ class NullFile(IO[str]):
         return iter([""])
 
     def __enter__(self) -> IO[str]:
-        pass
+        return self
 
     def __exit__(
         self,
diff --git a/libs/rich/_win32_console.py b/libs/rich/_win32_console.py
index e969d8164..371ec09fa 100644
--- a/libs/rich/_win32_console.py
+++ b/libs/rich/_win32_console.py
@@ -2,6 +2,7 @@
 
 The API that this module wraps is documented at https://docs.microsoft.com/en-us/windows/console/console-functions
 """
+
 import ctypes
 import sys
 from typing import Any
@@ -380,7 +381,7 @@ class LegacyWindowsTerm:
             WindowsCoordinates: The current cursor position.
         """
         coord: COORD = GetConsoleScreenBufferInfo(self._handle).dwCursorPosition
-        return WindowsCoordinates(row=cast(int, coord.Y), col=cast(int, coord.X))
+        return WindowsCoordinates(row=coord.Y, col=coord.X)
 
     @property
     def screen_size(self) -> WindowsCoordinates:
@@ -390,9 +391,7 @@ class LegacyWindowsTerm:
             WindowsCoordinates: The width and height of the screen as WindowsCoordinates.
         """
         screen_size: COORD = GetConsoleScreenBufferInfo(self._handle).dwSize
-        return WindowsCoordinates(
-            row=cast(int, screen_size.Y), col=cast(int, screen_size.X)
-        )
+        return WindowsCoordinates(row=screen_size.Y, col=screen_size.X)
 
     def write_text(self, text: str) -> None:
         """Write text directly to the terminal without any modification of styles
diff --git a/libs/rich/align.py b/libs/rich/align.py
index e230a66b4..fac50b1e3 100644
--- a/libs/rich/align.py
+++ b/libs/rich/align.py
@@ -240,6 +240,7 @@ class VerticalCenter(JupyterMixin):
 
     Args:
         renderable (RenderableType): A renderable object.
+        style (StyleType, optional): An optional style to apply to the background. Defaults to None.
     """
 
     def __init__(
diff --git a/libs/rich/ansi.py b/libs/rich/ansi.py
index 66365e653..7de86ce50 100644
--- a/libs/rich/ansi.py
+++ b/libs/rich/ansi.py
@@ -9,6 +9,7 @@ from .text import Text
 
 re_ansi = re.compile(
     r"""
+(?:\x1b[0-?])|
 (?:\x1b\](.*?)\x1b\\)|
 (?:\x1b([(@-Z\\-_]|\[[0-?]*[ -/]*[@-~]))
 """,
diff --git a/libs/rich/cells.py b/libs/rich/cells.py
index f85f928f7..a85462271 100644
--- a/libs/rich/cells.py
+++ b/libs/rich/cells.py
@@ -1,13 +1,33 @@
 from __future__ import annotations
 
-import re
 from functools import lru_cache
 from typing import Callable
 
 from ._cell_widths import CELL_WIDTHS
 
-# Regex to match sequence of the most common character ranges
-_is_single_cell_widths = re.compile("^[\u0020-\u006f\u00a0\u02ff\u0370-\u0482]*$").match
+# Ranges of unicode ordinals that produce a 1-cell wide character
+# This is non-exhaustive, but covers most common Western characters
+_SINGLE_CELL_UNICODE_RANGES: list[tuple[int, int]] = [
+    (0x20, 0x7E),  # Latin (excluding non-printable)
+    (0xA0, 0xAC),
+    (0xAE, 0x002FF),
+    (0x00370, 0x00482),  # Greek / Cyrillic
+    (0x02500, 0x025FC),  # Box drawing, box elements, geometric shapes
+    (0x02800, 0x028FF),  # Braille
+]
+
+# A set of characters that are a single cell wide
+_SINGLE_CELLS = frozenset(
+    [
+        character
+        for _start, _end in _SINGLE_CELL_UNICODE_RANGES
+        for character in map(chr, range(_start, _end + 1))
+    ]
+)
+
+# When called with a string this will return True if all
+# characters are single-cell, otherwise False
+_is_single_cell_widths: Callable[[str], bool] = _SINGLE_CELLS.issuperset
 
 
 @lru_cache(4096)
@@ -23,9 +43,9 @@ def cached_cell_len(text: str) -> int:
     Returns:
         int: Get the number of cells required to display text.
     """
-    _get_size = get_character_cell_size
-    total_size = sum(_get_size(character) for character in text)
-    return total_size
+    if _is_single_cell_widths(text):
+        return len(text)
+    return sum(map(get_character_cell_size, text))
 
 
 def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> int:
@@ -39,9 +59,9 @@ def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> in
     """
     if len(text) < 512:
         return _cell_len(text)
-    _get_size = get_character_cell_size
-    total_size = sum(_get_size(character) for character in text)
-    return total_size
+    if _is_single_cell_widths(text):
+        return len(text)
+    return sum(map(get_character_cell_size, text))
 
 
 @lru_cache(maxsize=4096)
@@ -54,20 +74,7 @@ def get_character_cell_size(character: str) -> int:
     Returns:
         int: Number of cells (0, 1 or 2) occupied by that character.
     """
-    return _get_codepoint_cell_size(ord(character))
-
-
-@lru_cache(maxsize=4096)
-def _get_codepoint_cell_size(codepoint: int) -> int:
-    """Get the cell size of a character.
-
-    Args:
-        codepoint (int): Codepoint of a character.
-
-    Returns:
-        int: Number of cells (0, 1 or 2) occupied by that character.
-    """
-
+    codepoint = ord(character)
     _table = CELL_WIDTHS
     lower_bound = 0
     upper_bound = len(_table) - 1
diff --git a/libs/rich/color.py b/libs/rich/color.py
index 4270a278d..e2c23a6a9 100644
--- a/libs/rich/color.py
+++ b/libs/rich/color.py
@@ -1,5 +1,5 @@
-import platform
 import re
+import sys
 from colorsys import rgb_to_hls
 from enum import IntEnum
 from functools import lru_cache
@@ -15,7 +15,7 @@ if TYPE_CHECKING:  # pragma: no cover
     from .text import Text
 
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 
 class ColorSystem(IntEnum):
diff --git a/libs/rich/console.py b/libs/rich/console.py
index 1232cd5ce..3ec9a8aab 100644
--- a/libs/rich/console.py
+++ b/libs/rich/console.py
@@ -1,6 +1,5 @@
 import inspect
 import os
-import platform
 import sys
 import threading
 import zlib
@@ -76,7 +75,7 @@ if TYPE_CHECKING:
 
 JUPYTER_DEFAULT_COLUMNS = 115
 JUPYTER_DEFAULT_LINES = 100
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 HighlighterType = Callable[[Union[str, "Text"]], "Text"]
 JustifyMethod = Literal["default", "left", "center", "right", "full"]
@@ -90,15 +89,15 @@ class NoChange:
 NO_CHANGE = NoChange()
 
 try:
-    _STDIN_FILENO = sys.__stdin__.fileno()
+    _STDIN_FILENO = sys.__stdin__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDIN_FILENO = 0
 try:
-    _STDOUT_FILENO = sys.__stdout__.fileno()
+    _STDOUT_FILENO = sys.__stdout__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDOUT_FILENO = 1
 try:
-    _STDERR_FILENO = sys.__stderr__.fileno()
+    _STDERR_FILENO = sys.__stderr__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDERR_FILENO = 2
 
@@ -1006,19 +1005,14 @@ class Console:
         width: Optional[int] = None
         height: Optional[int] = None
 
-        if WINDOWS:  # pragma: no cover
+        streams = _STD_STREAMS_OUTPUT if WINDOWS else _STD_STREAMS
+        for file_descriptor in streams:
             try:
-                width, height = os.get_terminal_size()
+                width, height = os.get_terminal_size(file_descriptor)
             except (AttributeError, ValueError, OSError):  # Probably not a terminal
                 pass
-        else:
-            for file_descriptor in _STD_STREAMS:
-                try:
-                    width, height = os.get_terminal_size(file_descriptor)
-                except (AttributeError, ValueError, OSError):
-                    pass
-                else:
-                    break
+            else:
+                break
 
         columns = self._environ.get("COLUMNS")
         if columns is not None and columns.isdigit():
@@ -1309,7 +1303,7 @@ class Console:
 
         renderable = rich_cast(renderable)
         if hasattr(renderable, "__rich_console__") and not isclass(renderable):
-            render_iterable = renderable.__rich_console__(self, _options)  # type: ignore[union-attr]
+            render_iterable = renderable.__rich_console__(self, _options)
         elif isinstance(renderable, str):
             text_renderable = self.render_str(
                 renderable, highlight=_options.highlight, markup=_options.markup
@@ -1386,9 +1380,14 @@ class Console:
                 extra_lines = render_options.height - len(lines)
                 if extra_lines > 0:
                     pad_line = [
-                        [Segment(" " * render_options.max_width, style), Segment("\n")]
-                        if new_lines
-                        else [Segment(" " * render_options.max_width, style)]
+                        (
+                            [
+                                Segment(" " * render_options.max_width, style),
+                                Segment("\n"),
+                            ]
+                            if new_lines
+                            else [Segment(" " * render_options.max_width, style)]
+                        )
                     ]
                     lines.extend(pad_line * extra_lines)
 
@@ -1437,9 +1436,11 @@ class Console:
             rich_text.overflow = overflow
         else:
             rich_text = Text(
-                _emoji_replace(text, default_variant=self._emoji_variant)
-                if emoji_enabled
-                else text,
+                (
+                    _emoji_replace(text, default_variant=self._emoji_variant)
+                    if emoji_enabled
+                    else text
+                ),
                 justify=justify,
                 overflow=overflow,
                 style=style,
@@ -1536,7 +1537,11 @@ class Console:
             if isinstance(renderable, str):
                 append_text(
                     self.render_str(
-                        renderable, emoji=emoji, markup=markup, highlighter=_highlighter
+                        renderable,
+                        emoji=emoji,
+                        markup=markup,
+                        highlight=highlight,
+                        highlighter=_highlighter,
                     )
                 )
             elif isinstance(renderable, Text):
@@ -1986,6 +1991,20 @@ class Console:
             ):
                 buffer_extend(line)
 
+    def on_broken_pipe(self) -> None:
+        """This function is called when a `BrokenPipeError` is raised.
+
+        This can occur when piping Textual output in Linux and macOS.
+        The default implementation is to exit the app, but you could implement
+        this method in a subclass to change the behavior.
+
+        See https://docs.python.org/3/library/signal.html#note-on-sigpipe for details.
+        """
+        self.quiet = True
+        devnull = os.open(os.devnull, os.O_WRONLY)
+        os.dup2(devnull, sys.stdout.fileno())
+        raise SystemExit(1)
+
     def _check_buffer(self) -> None:
         """Check if the buffer may be rendered. Render it if it can (e.g. Console.quiet is False)
         Rendering is supported on Windows, Unix and Jupyter environments. For
@@ -1995,8 +2014,17 @@ class Console:
         if self.quiet:
             del self._buffer[:]
             return
+
+        try:
+            self._write_buffer()
+        except BrokenPipeError:
+            self.on_broken_pipe()
+
+    def _write_buffer(self) -> None:
+        """Write the buffer to the output file."""
+
         with self._lock:
-            if self.record:
+            if self.record and not self._buffer_index:
                 with self._record_buffer_lock:
                     self._record_buffer.extend(self._buffer[:])
 
@@ -2166,7 +2194,7 @@ class Console:
 
         """
         text = self.export_text(clear=clear, styles=styles)
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(text)
 
     def export_html(
@@ -2272,7 +2300,7 @@ class Console:
             code_format=code_format,
             inline_styles=inline_styles,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(html)
 
     def export_svg(
@@ -2561,7 +2589,7 @@ class Console:
             font_aspect_ratio=font_aspect_ratio,
             unique_id=unique_id,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(svg)
 
 
diff --git a/libs/rich/default_styles.py b/libs/rich/default_styles.py
index ad72fff58..28e8f6f94 100644
--- a/libs/rich/default_styles.py
+++ b/libs/rich/default_styles.py
@@ -54,7 +54,7 @@ DEFAULT_STYLES: Dict[str, Style] = {
     "logging.level.notset": Style(dim=True),
     "logging.level.debug": Style(color="green"),
     "logging.level.info": Style(color="blue"),
-    "logging.level.warning": Style(color="red"),
+    "logging.level.warning": Style(color="yellow"),
     "logging.level.error": Style(color="red", bold=True),
     "logging.level.critical": Style(color="red", bold=True, reverse=True),
     "log.level": Style.null(),
@@ -120,6 +120,7 @@ DEFAULT_STYLES: Dict[str, Style] = {
     "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),
     "bar.back": Style(color="grey23"),
     "bar.complete": Style(color="rgb(249,38,114)"),
     "bar.finished": Style(color="rgb(114,156,31)"),
diff --git a/libs/rich/filesize.py b/libs/rich/filesize.py
index 99f118e20..83bc9118d 100644
--- a/libs/rich/filesize.py
+++ b/libs/rich/filesize.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 """Functions for reporting filesizes. Borrowed from https://github.com/PyFilesystem/pyfilesystem2
 
 The functions declared in this module should cover the different
@@ -27,7 +26,7 @@ def _to_str(
     if size == 1:
         return "1 byte"
     elif size < base:
-        return "{:,} bytes".format(size)
+        return f"{size:,} bytes"
 
     for i, suffix in enumerate(suffixes, 2):  # noqa: B007
         unit = base**i
diff --git a/libs/rich/highlighter.py b/libs/rich/highlighter.py
index 27714b25b..e4c462e2b 100644
--- a/libs/rich/highlighter.py
+++ b/libs/rich/highlighter.py
@@ -98,7 +98,7 @@ class ReprHighlighter(RegexHighlighter):
             r"(?P<number>(?<!\w)\-?[0-9]+\.?[0-9]*(e[-+]?\d+?)?\b|0x[0-9a-fA-F]*)",
             r"(?P<path>\B(/[-\w._+]+)*\/)(?P<filename>[-\w._+]*)?",
             r"(?<![\\\w])(?P<str>b?'''.*?(?<!\\)'''|b?'.*?(?<!\\)'|b?\"\"\".*?(?<!\\)\"\"\"|b?\".*?(?<!\\)\")",
-            r"(?P<url>(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~]*)",
+            r"(?P<url>(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
         ),
     ]
 
diff --git a/libs/rich/live.py b/libs/rich/live.py
index f0529a781..8738cf09f 100644
--- a/libs/rich/live.py
+++ b/libs/rich/live.py
@@ -37,7 +37,7 @@ class Live(JupyterMixin, RenderHook):
 
     Args:
         renderable (RenderableType, optional): The renderable to live display. Defaults to displaying nothing.
-        console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
+        console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
         screen (bool, optional): Enable alternate screen mode. Defaults to False.
         auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()` or `update()` with refresh flag. Defaults to True
         refresh_per_second (float, optional): Number of times per second to refresh the live display. Defaults to 4.
diff --git a/libs/rich/logging.py b/libs/rich/logging.py
index 96859934e..b2624cd54 100644
--- a/libs/rich/logging.py
+++ b/libs/rich/logging.py
@@ -36,11 +36,13 @@ class RichHandler(Handler):
         markup (bool, optional): Enable console markup in log messages. Defaults to False.
         rich_tracebacks (bool, optional): Enable rich tracebacks with syntax highlighting and formatting. Defaults to False.
         tracebacks_width (Optional[int], optional): Number of characters used to render tracebacks, or None for full width. Defaults to None.
+        tracebacks_code_width (int, optional): Number of code characters used to render tracebacks, or None for full width. Defaults to 88.
         tracebacks_extra_lines (int, optional): Additional lines of code to render tracebacks, or None for full width. Defaults to None.
         tracebacks_theme (str, optional): Override pygments theme used in traceback.
         tracebacks_word_wrap (bool, optional): Enable word wrapping of long tracebacks lines. Defaults to True.
         tracebacks_show_locals (bool, optional): Enable display of locals in tracebacks. Defaults to False.
         tracebacks_suppress (Sequence[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
+        tracebacks_max_frames (int, optional): Optional maximum number of frames returned by 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.
@@ -74,11 +76,13 @@ class RichHandler(Handler):
         markup: bool = False,
         rich_tracebacks: bool = False,
         tracebacks_width: Optional[int] = None,
+        tracebacks_code_width: int = 88,
         tracebacks_extra_lines: int = 3,
         tracebacks_theme: Optional[str] = None,
         tracebacks_word_wrap: bool = True,
         tracebacks_show_locals: bool = False,
         tracebacks_suppress: Iterable[Union[str, ModuleType]] = (),
+        tracebacks_max_frames: int = 100,
         locals_max_length: int = 10,
         locals_max_string: int = 80,
         log_time_format: Union[str, FormatTimeCallable] = "[%x %X]",
@@ -104,6 +108,8 @@ class RichHandler(Handler):
         self.tracebacks_word_wrap = tracebacks_word_wrap
         self.tracebacks_show_locals = tracebacks_show_locals
         self.tracebacks_suppress = tracebacks_suppress
+        self.tracebacks_max_frames = tracebacks_max_frames
+        self.tracebacks_code_width = tracebacks_code_width
         self.locals_max_length = locals_max_length
         self.locals_max_string = locals_max_string
         self.keywords = keywords
@@ -140,6 +146,7 @@ class RichHandler(Handler):
                 exc_value,
                 exc_traceback,
                 width=self.tracebacks_width,
+                code_width=self.tracebacks_code_width,
                 extra_lines=self.tracebacks_extra_lines,
                 theme=self.tracebacks_theme,
                 word_wrap=self.tracebacks_word_wrap,
@@ -147,6 +154,7 @@ class RichHandler(Handler):
                 locals_max_length=self.locals_max_length,
                 locals_max_string=self.locals_max_string,
                 suppress=self.tracebacks_suppress,
+                max_frames=self.tracebacks_max_frames,
             )
             message = record.getMessage()
             if self.formatter:
diff --git a/libs/rich/markdown.py b/libs/rich/markdown.py
index 9b5ceacd4..26c58d155 100644
--- a/libs/rich/markdown.py
+++ b/libs/rich/markdown.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import ClassVar, Dict, Iterable, List, Optional, Type, Union
+from typing import ClassVar, Iterable
 
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
@@ -31,7 +31,7 @@ class MarkdownElement:
     new_line: ClassVar[bool] = True
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         """Factory to create markdown element,
 
         Args:
@@ -43,30 +43,28 @@ class MarkdownElement:
         """
         return cls()
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         """Called when the node is entered.
 
         Args:
             context (MarkdownContext): The markdown context.
         """
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         """Called when text is parsed.
 
         Args:
             context (MarkdownContext): The markdown context.
         """
 
-    def on_leave(self, context: "MarkdownContext") -> None:
+    def on_leave(self, context: MarkdownContext) -> None:
         """Called when the parser leaves the element.
 
         Args:
             context (MarkdownContext): [description]
         """
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         """Called when a child element is closed.
 
         This method allows a parent element to take over rendering of its children.
@@ -81,8 +79,8 @@ class MarkdownElement:
         return True
 
     def __rich_console__(
-        self, console: "Console", options: "ConsoleOptions"
-    ) -> "RenderResult":
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
         return ()
 
 
@@ -100,14 +98,14 @@ class TextElement(MarkdownElement):
 
     style_name = "none"
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.style = context.enter_style(self.style_name)
         self.text = Text(justify="left")
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         self.text.append(text, context.current_style if isinstance(text, str) else None)
 
-    def on_leave(self, context: "MarkdownContext") -> None:
+    def on_leave(self, context: MarkdownContext) -> None:
         context.leave_style()
 
 
@@ -118,7 +116,7 @@ class Paragraph(TextElement):
     justify: JustifyMethod
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "Paragraph":
+    def create(cls, markdown: Markdown, token: Token) -> Paragraph:
         return cls(justify=markdown.justify or "left")
 
     def __init__(self, justify: JustifyMethod) -> None:
@@ -135,10 +133,10 @@ class Heading(TextElement):
     """A heading."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "Heading":
+    def create(cls, markdown: Markdown, token: Token) -> Heading:
         return cls(token.tag)
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.text = Text()
         context.enter_style(self.style_name)
 
@@ -172,7 +170,7 @@ class CodeBlock(TextElement):
     style_name = "markdown.code_block"
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "CodeBlock":
+    def create(cls, markdown: Markdown, token: Token) -> CodeBlock:
         node_info = token.info or ""
         lexer_name = node_info.partition(" ")[0]
         return cls(lexer_name or "text", markdown.code_theme)
@@ -199,9 +197,7 @@ class BlockQuote(TextElement):
     def __init__(self) -> None:
         self.elements: Renderables = Renderables()
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         self.elements.append(child)
         return False
 
@@ -238,9 +234,7 @@ class TableElement(MarkdownElement):
         self.header: TableHeaderElement | None = None
         self.body: TableBodyElement | None = None
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         if isinstance(child, TableHeaderElement):
             self.header = child
         elif isinstance(child, TableBodyElement):
@@ -272,9 +266,7 @@ class TableHeaderElement(MarkdownElement):
     def __init__(self) -> None:
         self.row: TableRowElement | None = None
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableRowElement)
         self.row = child
         return False
@@ -286,9 +278,7 @@ class TableBodyElement(MarkdownElement):
     def __init__(self) -> None:
         self.rows: list[TableRowElement] = []
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableRowElement)
         self.rows.append(child)
         return False
@@ -298,11 +288,9 @@ class TableRowElement(MarkdownElement):
     """MarkdownElement corresponding to `tr_open` and `tr_close`."""
 
     def __init__(self) -> None:
-        self.cells: List[TableDataElement] = []
+        self.cells: list[TableDataElement] = []
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableDataElement)
         self.cells.append(child)
         return False
@@ -313,7 +301,7 @@ class TableDataElement(MarkdownElement):
     and `th_open` and `th_close`."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         style = str(token.attrs.get("style")) or ""
 
         justify: JustifyMethod
@@ -333,7 +321,7 @@ class TableDataElement(MarkdownElement):
         self.content: Text = Text("", justify=justify)
         self.justify = justify
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         text = Text(text) if isinstance(text, str) else text
         text.stylize(context.current_style)
         self.content.append_text(text)
@@ -343,17 +331,15 @@ class ListElement(MarkdownElement):
     """A list element."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "ListElement":
+    def create(cls, markdown: Markdown, token: Token) -> ListElement:
         return cls(token.type, int(token.attrs.get("start", 1)))
 
     def __init__(self, list_type: str, list_start: int | None) -> None:
-        self.items: List[ListItem] = []
+        self.items: list[ListItem] = []
         self.list_type = list_type
         self.list_start = list_start
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, ListItem)
         self.items.append(child)
         return False
@@ -381,9 +367,7 @@ class ListItem(TextElement):
     def __init__(self) -> None:
         self.elements: Renderables = Renderables()
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         self.elements.append(child)
         return False
 
@@ -419,7 +403,7 @@ class ListItem(TextElement):
 
 class Link(TextElement):
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         url = token.attrs.get("href", "#")
         return cls(token.content, str(url))
 
@@ -434,7 +418,7 @@ class ImageItem(TextElement):
     new_line = False
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         """Factory to create markdown element,
 
         Args:
@@ -449,10 +433,10 @@ class ImageItem(TextElement):
     def __init__(self, destination: str, hyperlinks: bool) -> None:
         self.destination = destination
         self.hyperlinks = hyperlinks
-        self.link: Optional[str] = None
+        self.link: str | None = None
         super().__init__()
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.link = context.current_style.link
         self.text = Text(justify="left")
         super().on_enter(context)
@@ -476,7 +460,7 @@ class MarkdownContext:
         console: Console,
         options: ConsoleOptions,
         style: Style,
-        inline_code_lexer: Optional[str] = None,
+        inline_code_lexer: str | None = None,
         inline_code_theme: str = "monokai",
     ) -> None:
         self.console = console
@@ -484,7 +468,7 @@ class MarkdownContext:
         self.style_stack: StyleStack = StyleStack(style)
         self.stack: Stack[MarkdownElement] = Stack()
 
-        self._syntax: Optional[Syntax] = None
+        self._syntax: Syntax | None = None
         if inline_code_lexer is not None:
             self._syntax = Syntax("", inline_code_lexer, theme=inline_code_theme)
 
@@ -504,7 +488,7 @@ class MarkdownContext:
         else:
             self.stack.top.on_text(self, text)
 
-    def enter_style(self, style_name: Union[str, Style]) -> Style:
+    def enter_style(self, style_name: str | Style) -> Style:
         """Enter a style context."""
         style = self.console.get_style(style_name, default="none")
         self.style_stack.push(style)
@@ -521,7 +505,7 @@ class Markdown(JupyterMixin):
 
     Args:
         markup (str): A string containing markdown.
-        code_theme (str, optional): Pygments theme for code blocks. Defaults to "monokai".
+        code_theme (str, optional): Pygments theme for code blocks. Defaults to "monokai". See https://pygments.org/styles/ for code themes.
         justify (JustifyMethod, optional): Justify value for paragraphs. Defaults to None.
         style (Union[str, Style], optional): Optional style to apply to markdown.
         hyperlinks (bool, optional): Enable hyperlinks. Defaults to ``True``.
@@ -531,7 +515,7 @@ class Markdown(JupyterMixin):
             highlighting, or None for no highlighting. Defaults to None.
     """
 
-    elements: ClassVar[Dict[str, Type[MarkdownElement]]] = {
+    elements: ClassVar[dict[str, type[MarkdownElement]]] = {
         "paragraph_open": Paragraph,
         "heading_open": Heading,
         "fence": CodeBlock,
@@ -556,17 +540,17 @@ class Markdown(JupyterMixin):
         self,
         markup: str,
         code_theme: str = "monokai",
-        justify: Optional[JustifyMethod] = None,
-        style: Union[str, Style] = "none",
+        justify: JustifyMethod | None = None,
+        style: str | Style = "none",
         hyperlinks: bool = True,
-        inline_code_lexer: Optional[str] = None,
-        inline_code_theme: Optional[str] = None,
+        inline_code_lexer: str | None = None,
+        inline_code_theme: str | None = None,
     ) -> None:
         parser = MarkdownIt().enable("strikethrough").enable("table")
         self.markup = markup
         self.parsed = parser.parse(markup)
         self.code_theme = code_theme
-        self.justify: Optional[JustifyMethod] = justify
+        self.justify: JustifyMethod | None = justify
         self.style = style
         self.hyperlinks = hyperlinks
         self.inline_code_lexer = inline_code_lexer
@@ -693,7 +677,7 @@ class Markdown(JupyterMixin):
                         and context.stack.top.on_child_close(context, element)
                     )
                     if should_render:
-                        if new_line:
+                        if new_line and node_type != "inline":
                             yield _new_line_segment
                         yield from console.render(element, context.options)
 
@@ -772,7 +756,7 @@ if __name__ == "__main__":  # pragma: no cover
     if args.path == "-":
         markdown_body = sys.stdin.read()
     else:
-        with open(args.path, "rt", encoding="utf-8") as markdown_file:
+        with open(args.path, encoding="utf-8") as markdown_file:
             markdown_body = markdown_file.read()
 
     markdown = Markdown(
diff --git a/libs/rich/padding.py b/libs/rich/padding.py
index 1d1f4a553..d1aa01bee 100644
--- a/libs/rich/padding.py
+++ b/libs/rich/padding.py
@@ -1,4 +1,4 @@
-from typing import cast, List, Optional, Tuple, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 if TYPE_CHECKING:
     from .console import (
@@ -7,11 +7,11 @@ if TYPE_CHECKING:
         RenderableType,
         RenderResult,
     )
+
 from .jupyter import JupyterMixin
 from .measure import Measurement
-from .style import Style
 from .segment import Segment
-
+from .style import Style
 
 PaddingDimensions = Union[int, Tuple[int], Tuple[int, int], Tuple[int, int, int, int]]
 
@@ -66,10 +66,10 @@ class Padding(JupyterMixin):
             _pad = pad[0]
             return (_pad, _pad, _pad, _pad)
         if len(pad) == 2:
-            pad_top, pad_right = cast(Tuple[int, int], pad)
+            pad_top, pad_right = pad
             return (pad_top, pad_right, pad_top, pad_right)
         if len(pad) == 4:
-            top, right, bottom, left = cast(Tuple[int, int, int, int], pad)
+            top, right, bottom, left = pad
             return (top, right, bottom, left)
         raise ValueError(f"1, 2 or 4 integers required for padding; {len(pad)} given")
 
diff --git a/libs/rich/panel.py b/libs/rich/panel.py
index 95f4c84cf..8cfa6f4a2 100644
--- a/libs/rich/panel.py
+++ b/libs/rich/panel.py
@@ -22,11 +22,13 @@ 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, optional): 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.
+        subtitle_align (AlignMethod, optional): Alignment of subtitle. Defaults to "center".
         safe_box (bool, optional): Disable box characters that don't display on windows legacy terminal with *raster* fonts. Defaults to True.
-        expand (bool, optional): If True the panel will stretch to fill the console
-            width, otherwise it will be sized to fit the contents. Defaults to True.
+        expand (bool, optional): If True the panel will stretch to fill the console width, otherwise it will be sized to fit the contents. Defaults to True.
         style (str, optional): The style of the panel (border and contents). Defaults to "none".
         border_style (str, optional): The style of the border. Defaults to "none".
         width (Optional[int], optional): Optional width of panel. Defaults to None to auto-detect.
@@ -144,7 +146,8 @@ class Panel(JupyterMixin):
             Padding(self.renderable, _padding) if any(_padding) else self.renderable
         )
         style = console.get_style(self.style)
-        border_style = style + console.get_style(self.border_style)
+        partial_border_style = console.get_style(self.border_style)
+        border_style = style + partial_border_style
         width = (
             options.max_width
             if self.width is None
@@ -172,6 +175,9 @@ class Panel(JupyterMixin):
             text = text.copy()
             text.truncate(width)
             excess_space = width - cell_len(text.plain)
+            if text.style:
+                text.stylize(console.get_style(text.style))
+
             if excess_space:
                 if align == "left":
                     return Text.assemble(
@@ -200,7 +206,7 @@ class Panel(JupyterMixin):
 
         title_text = self._title
         if title_text is not None:
-            title_text.stylize_before(border_style)
+            title_text.stylize_before(partial_border_style)
 
         child_width = (
             width - 2
@@ -249,7 +255,7 @@ class Panel(JupyterMixin):
 
         subtitle_text = self._subtitle
         if subtitle_text is not None:
-            subtitle_text.stylize_before(border_style)
+            subtitle_text.stylize_before(partial_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 5c48cfd9f..5c725c0c5 100644
--- a/libs/rich/pretty.py
+++ b/libs/rich/pretty.py
@@ -3,6 +3,7 @@ import collections
 import dataclasses
 import inspect
 import os
+import reprlib
 import sys
 from array import array
 from collections import Counter, UserDict, UserList, defaultdict, deque
@@ -15,6 +16,7 @@ from typing import (
     Any,
     Callable,
     DefaultDict,
+    Deque,
     Dict,
     Iterable,
     List,
@@ -77,7 +79,10 @@ def _is_dataclass_repr(obj: object) -> bool:
     # Digging in to a lot of internals here
     # Catching all exceptions in case something is missing on a non CPython implementation
     try:
-        return obj.__repr__.__code__.co_filename == dataclasses.__file__
+        return obj.__repr__.__code__.co_filename in (
+            dataclasses.__file__,
+            reprlib.__file__,
+        )
     except Exception:  # pragma: no coverage
         return False
 
@@ -130,17 +135,19 @@ def _ipy_display_hook(
         if _safe_isinstance(value, ConsoleRenderable):
             console.line()
         console.print(
-            value
-            if _safe_isinstance(value, RichRenderable)
-            else Pretty(
-                value,
-                overflow=overflow,
-                indent_guides=indent_guides,
-                max_length=max_length,
-                max_string=max_string,
-                max_depth=max_depth,
-                expand_all=expand_all,
-                margin=12,
+            (
+                value
+                if _safe_isinstance(value, RichRenderable)
+                else Pretty(
+                    value,
+                    overflow=overflow,
+                    indent_guides=indent_guides,
+                    max_length=max_length,
+                    max_string=max_string,
+                    max_depth=max_depth,
+                    expand_all=expand_all,
+                    margin=12,
+                )
             ),
             crop=crop,
             new_line_start=True,
@@ -196,16 +203,18 @@ def install(
             assert console is not None
             builtins._ = None  # type: ignore[attr-defined]
             console.print(
-                value
-                if _safe_isinstance(value, RichRenderable)
-                else Pretty(
-                    value,
-                    overflow=overflow,
-                    indent_guides=indent_guides,
-                    max_length=max_length,
-                    max_string=max_string,
-                    max_depth=max_depth,
-                    expand_all=expand_all,
+                (
+                    value
+                    if _safe_isinstance(value, RichRenderable)
+                    else Pretty(
+                        value,
+                        overflow=overflow,
+                        indent_guides=indent_guides,
+                        max_length=max_length,
+                        max_string=max_string,
+                        max_depth=max_depth,
+                        expand_all=expand_all,
+                    )
                 ),
                 crop=crop,
             )
@@ -353,6 +362,16 @@ def _get_braces_for_defaultdict(_object: DefaultDict[Any, Any]) -> Tuple[str, st
     )
 
 
+def _get_braces_for_deque(_object: Deque[Any]) -> Tuple[str, str, str]:
+    if _object.maxlen is None:
+        return ("deque([", "])", "deque()")
+    return (
+        "deque([",
+        f"], maxlen={_object.maxlen})",
+        f"deque(maxlen={_object.maxlen})",
+    )
+
+
 def _get_braces_for_array(_object: "array[Any]") -> Tuple[str, str, str]:
     return (f"array({_object.typecode!r}, [", "])", f"array({_object.typecode!r})")
 
@@ -362,7 +381,7 @@ _BRACES: Dict[type, Callable[[Any], Tuple[str, str, str]]] = {
     array: _get_braces_for_array,
     defaultdict: _get_braces_for_defaultdict,
     Counter: lambda _object: ("Counter({", "})", "Counter()"),
-    deque: lambda _object: ("deque([", "])", "deque()"),
+    deque: _get_braces_for_deque,
     dict: lambda _object: ("{", "}", "{}"),
     UserDict: lambda _object: ("{", "}", "{}"),
     frozenset: lambda _object: ("frozenset({", "})", "frozenset()"),
@@ -762,7 +781,9 @@ def traverse(
                 )
 
                 for last, field in loop_last(
-                    field for field in fields(obj) if field.repr
+                    field
+                    for field in fields(obj)
+                    if field.repr and hasattr(obj, field.name)
                 ):
                     child_node = _traverse(getattr(obj, field.name), depth=depth + 1)
                     child_node.key_repr = field.name
@@ -846,7 +867,7 @@ def traverse(
             pop_visited(obj_id)
         else:
             node = Node(value_repr=to_repr(obj), last=root)
-        node.is_tuple = _safe_isinstance(obj, tuple)
+        node.is_tuple = type(obj) == tuple
         node.is_namedtuple = _is_namedtuple(obj)
         return node
 
diff --git a/libs/rich/progress.py b/libs/rich/progress.py
index 8810aeac4..1e92eb6b1 100644
--- a/libs/rich/progress.py
+++ b/libs/rich/progress.py
@@ -39,6 +39,11 @@ if sys.version_info >= (3, 8):
 else:
     from typing_extensions import Literal  # pragma: no cover
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self  # pragma: no cover
+
 from . import filesize, get_console
 from .console import Console, Group, JustifyMethod, RenderableType
 from .highlighter import Highlighter
@@ -70,7 +75,7 @@ class _TrackThread(Thread):
         self.done = Event()
 
         self.completed = 0
-        super().__init__()
+        super().__init__(daemon=True)
 
     def run(self) -> None:
         task_id = self.task_id
@@ -78,7 +83,7 @@ class _TrackThread(Thread):
         update_period = self.update_period
         last_completed = 0
         wait = self.done.wait
-        while not wait(update_period):
+        while not wait(update_period) and self.progress.live.is_started:
             completed = self.completed
             if last_completed != completed:
                 advance(task_id, completed - last_completed)
@@ -104,6 +109,7 @@ def track(
     sequence: Union[Sequence[ProgressType], Iterable[ProgressType]],
     description: str = "Working...",
     total: Optional[float] = None,
+    completed: int = 0,
     auto_refresh: bool = True,
     console: Optional[Console] = None,
     transient: bool = False,
@@ -123,6 +129,7 @@ def track(
         sequence (Iterable[ProgressType]): A sequence (must support "len") you wish to iterate over.
         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.
         auto_refresh (bool, optional): Automatic refresh, disable to force a refresh after each iteration. Default is True.
         transient: (bool, optional): Clear the progress on exit. Defaults to False.
         console (Console, optional): Console to write to. Default creates internal Console instance.
@@ -166,7 +173,11 @@ def track(
 
     with progress:
         yield from progress.track(
-            sequence, total=total, description=description, update_period=update_period
+            sequence,
+            total=total,
+            completed=completed,
+            description=description,
+            update_period=update_period,
         )
 
 
@@ -269,6 +280,9 @@ class _Reader(RawIOBase, BinaryIO):
     def write(self, s: Any) -> int:
         raise UnsupportedOperation("write")
 
+    def writelines(self, lines: Iterable[Any]) -> None:
+        raise UnsupportedOperation("writelines")
+
 
 class _ReadContext(ContextManager[_I], Generic[_I]):
     """A utility class to handle a context for both a reader and a progress."""
@@ -1050,7 +1064,7 @@ class Progress(JupyterMixin):
     """Renders an auto-updating progress bar(s).
 
     Args:
-        console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
+        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.
         speed_estimate_period: (float, optional): Period (in seconds) used to calculate the speed estimate. Defaults to 30.
@@ -1161,10 +1175,10 @@ class Progress(JupyterMixin):
     def stop(self) -> None:
         """Stop the progress display."""
         self.live.stop()
-        if not self.console.is_interactive:
+        if not self.console.is_interactive and not self.console.is_jupyter:
             self.console.print()
 
-    def __enter__(self) -> "Progress":
+    def __enter__(self) -> Self:
         self.start()
         return self
 
@@ -1180,6 +1194,7 @@ class Progress(JupyterMixin):
         self,
         sequence: Union[Iterable[ProgressType], Sequence[ProgressType]],
         total: Optional[float] = None,
+        completed: int = 0,
         task_id: Optional[TaskID] = None,
         description: str = "Working...",
         update_period: float = 0.1,
@@ -1189,6 +1204,7 @@ class Progress(JupyterMixin):
         Args:
             sequence (Sequence[ProgressType]): A sequence of 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.
             description: (str, optional): Description of task, if new task is created.
             update_period (float, optional): Minimum time (in seconds) between calls to update(). Defaults to 0.1.
@@ -1200,9 +1216,9 @@ class Progress(JupyterMixin):
             total = float(length_hint(sequence)) or None
 
         if task_id is None:
-            task_id = self.add_task(description, total=total)
+            task_id = self.add_task(description, total=total, completed=completed)
         else:
-            self.update(task_id, total=total)
+            self.update(task_id, total=total, completed=completed)
 
         if self.live.auto_refresh:
             with _TrackThread(self, task_id, update_period) as track_thread:
@@ -1326,7 +1342,7 @@ class Progress(JupyterMixin):
         # normalize the mode (always rb, rt)
         _mode = "".join(sorted(mode, reverse=False))
         if _mode not in ("br", "rt", "r"):
-            raise ValueError("invalid mode {!r}".format(mode))
+            raise ValueError(f"invalid mode {mode!r}")
 
         # patch buffering to provide the same behaviour as the builtin `open`
         line_buffering = buffering == 1
diff --git a/libs/rich/progress_bar.py b/libs/rich/progress_bar.py
index a2bf32614..41794f767 100644
--- a/libs/rich/progress_bar.py
+++ b/libs/rich/progress_bar.py
@@ -108,7 +108,7 @@ class ProgressBar(JupyterMixin):
 
         for index in range(PULSE_SIZE):
             position = index / PULSE_SIZE
-            fade = 0.5 + cos((position * pi * 2)) / 2.0
+            fade = 0.5 + cos(position * pi * 2) / 2.0
             color = blend_rgb(fore_color, back_color, cross_fade=fade)
             append(_Segment(bar, _Style(color=from_triplet(color))))
         return segments
diff --git a/libs/rich/prompt.py b/libs/rich/prompt.py
index 972082b72..c7cf25bae 100644
--- a/libs/rich/prompt.py
+++ b/libs/rich/prompt.py
@@ -36,6 +36,7 @@ class PromptBase(Generic[PromptType]):
         console (Console, optional): A Console instance or None to use global console. Defaults to None.
         password (bool, optional): Enable password input. Defaults to False.
         choices (List[str], optional): A list of valid choices. Defaults to None.
+        case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
         show_default (bool, optional): Show default in prompt. Defaults to True.
         show_choices (bool, optional): Show choices in prompt. Defaults to True.
     """
@@ -57,6 +58,7 @@ class PromptBase(Generic[PromptType]):
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
     ) -> None:
@@ -69,6 +71,7 @@ class PromptBase(Generic[PromptType]):
         self.password = password
         if choices is not None:
             self.choices = choices
+        self.case_sensitive = case_sensitive
         self.show_default = show_default
         self.show_choices = show_choices
 
@@ -81,6 +84,7 @@ class PromptBase(Generic[PromptType]):
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         default: DefaultType,
@@ -97,6 +101,7 @@ class PromptBase(Generic[PromptType]):
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         stream: Optional[TextIO] = None,
@@ -111,6 +116,7 @@ class PromptBase(Generic[PromptType]):
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         default: Any = ...,
@@ -126,6 +132,7 @@ class PromptBase(Generic[PromptType]):
             console (Console, optional): A Console instance or None to use global console. Defaults to None.
             password (bool, optional): Enable password input. Defaults to False.
             choices (List[str], optional): A list of valid choices. Defaults to None.
+            case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
             show_default (bool, optional): Show default in prompt. Defaults to True.
             show_choices (bool, optional): Show choices in prompt. Defaults to True.
             stream (TextIO, optional): Optional text file open for reading to get input. Defaults to None.
@@ -135,6 +142,7 @@ class PromptBase(Generic[PromptType]):
             console=console,
             password=password,
             choices=choices,
+            case_sensitive=case_sensitive,
             show_default=show_default,
             show_choices=show_choices,
         )
@@ -212,7 +220,9 @@ class PromptBase(Generic[PromptType]):
             bool: True if choice was valid, otherwise False.
         """
         assert self.choices is not None
-        return value.strip() in self.choices
+        if self.case_sensitive:
+            return value.strip() in self.choices
+        return value.strip().lower() in [choice.lower() for choice in self.choices]
 
     def process_response(self, value: str) -> PromptType:
         """Process response from user, convert to prompt type.
@@ -232,9 +242,17 @@ class PromptBase(Generic[PromptType]):
         except ValueError:
             raise InvalidResponse(self.validate_error_message)
 
-        if self.choices is not None and not self.check_choice(value):
-            raise InvalidResponse(self.illegal_choice_message)
+        if self.choices is not None:
+            if not self.check_choice(value):
+                raise InvalidResponse(self.illegal_choice_message)
 
+            if not self.case_sensitive:
+                # return the original choice, not the lower case version
+                return_value = self.response_type(
+                    self.choices[
+                        [choice.lower() for choice in self.choices].index(value.lower())
+                    ]
+                )
         return return_value
 
     def on_validate_error(self, value: str, error: InvalidResponse) -> None:
@@ -371,5 +389,12 @@ if __name__ == "__main__":  # pragma: no cover
         fruit = Prompt.ask("Enter a fruit", choices=["apple", "orange", "pear"])
         print(f"fruit={fruit!r}")
 
+        doggie = Prompt.ask(
+            "What's the best Dog? (Case INSENSITIVE)",
+            choices=["Border Terrier", "Collie", "Labradoodle"],
+            case_sensitive=False,
+        )
+        print(f"doggie={doggie!r}")
+
     else:
         print("[b]OK :loudly_crying_face:")
diff --git a/libs/rich/segment.py b/libs/rich/segment.py
index 603d5097f..edcb52dd3 100644
--- a/libs/rich/segment.py
+++ b/libs/rich/segment.py
@@ -109,41 +109,51 @@ class Segment(NamedTuple):
     @classmethod
     @lru_cache(1024 * 16)
     def _split_cells(cls, segment: "Segment", cut: int) -> Tuple["Segment", "Segment"]:
+        """Split a segment in to two at a given cell position.
+
+        Note that splitting a double-width character, may result in that character turning
+        into two spaces.
+
+        Args:
+            segment (Segment): A segment to split.
+            cut (int): A cell position to cut on.
+
+        Returns:
+            A tuple of two segments.
+        """
         text, style, control = segment
         _Segment = Segment
-
         cell_length = segment.cell_length
         if cut >= cell_length:
             return segment, _Segment("", style, control)
 
         cell_size = get_character_cell_size
 
-        pos = int((cut / cell_length) * (len(text) - 1))
+        pos = int((cut / cell_length) * len(text))
 
-        before = text[:pos]
-        cell_pos = cell_len(before)
-        if cell_pos == cut:
-            return (
-                _Segment(before, style, control),
-                _Segment(text[pos:], style, control),
-            )
-        while pos < len(text):
-            char = text[pos]
-            pos += 1
-            cell_pos += cell_size(char)
+        while True:
             before = text[:pos]
-            if cell_pos == cut:
+            cell_pos = cell_len(before)
+            out_by = cell_pos - cut
+            if not out_by:
                 return (
                     _Segment(before, style, control),
                     _Segment(text[pos:], style, control),
                 )
-            if cell_pos > cut:
+            if out_by == -1 and cell_size(text[pos]) == 2:
                 return (
-                    _Segment(before[: pos - 1] + " ", style, control),
+                    _Segment(text[:pos] + " ", style, control),
+                    _Segment(" " + text[pos + 1 :], style, control),
+                )
+            if out_by == +1 and cell_size(text[pos - 1]) == 2:
+                return (
+                    _Segment(text[: pos - 1] + " ", style, control),
                     _Segment(" " + text[pos:], style, control),
                 )
-
-        raise AssertionError("Will never reach here")
+            if cell_pos < cut:
+                pos += 1
+            else:
+                pos -= 1
 
     def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
         """Split segment in to two segments at the specified column.
@@ -151,10 +161,14 @@ class Segment(NamedTuple):
         If the cut point falls in the middle of a 2-cell wide character then it is replaced
         by two spaces, to preserve the display width of the parent segment.
 
+        Args:
+            cut (int): Offset within the segment to cut.
+
         Returns:
             Tuple[Segment, Segment]: Two segments.
         """
         text, style, control = self
+        assert cut >= 0
 
         if _is_single_cell_widths(text):
             # Fast path with all 1 cell characters
@@ -604,7 +618,7 @@ class Segment(NamedTuple):
         while True:
             cut = next(iter_cuts, -1)
             if cut == -1:
-                return []
+                return
             if cut != 0:
                 break
             yield []
diff --git a/libs/rich/spinner.py b/libs/rich/spinner.py
index 91ea630e1..70570b6b0 100644
--- a/libs/rich/spinner.py
+++ b/libs/rich/spinner.py
@@ -38,6 +38,7 @@ class Spinner:
         self.text: "Union[RenderableType, Text]" = (
             Text.from_markup(text) if isinstance(text, str) else text
         )
+        self.name = name
         self.frames = cast(List[str], spinner["frames"])[:]
         self.interval = cast(float, spinner["interval"])
         self.start_time: Optional[float] = None
diff --git a/libs/rich/style.py b/libs/rich/style.py
index 313c88949..262fd6eca 100644
--- a/libs/rich/style.py
+++ b/libs/rich/style.py
@@ -663,7 +663,7 @@ class Style:
         style._set_attributes = self._set_attributes
         style._link = None
         style._link_id = ""
-        style._hash = self._hash
+        style._hash = None
         style._null = False
         style._meta = None
         return style
diff --git a/libs/rich/syntax.py b/libs/rich/syntax.py
index 618e0459f..cff8fd235 100644
--- a/libs/rich/syntax.py
+++ b/libs/rich/syntax.py
@@ -1,5 +1,4 @@
 import os.path
-import platform
 import re
 import sys
 import textwrap
@@ -52,7 +51,7 @@ from .text import Text
 
 TokenType = Tuple[str, ...]
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 DEFAULT_THEME = "monokai"
 
 # The following styles are based on https://github.com/pygments/pygments/blob/master/pygments/formatters/terminal.py
@@ -222,6 +221,7 @@ class _SyntaxHighlightRange(NamedTuple):
     style: StyleType
     start: SyntaxPosition
     end: SyntaxPosition
+    style_before: bool = False
 
 
 class Syntax(JupyterMixin):
@@ -535,7 +535,11 @@ class Syntax(JupyterMixin):
         return text
 
     def stylize_range(
-        self, style: StyleType, start: SyntaxPosition, end: SyntaxPosition
+        self,
+        style: StyleType,
+        start: SyntaxPosition,
+        end: SyntaxPosition,
+        style_before: bool = False,
     ) -> None:
         """
         Adds a custom style on a part of the code, that will be applied to the syntax display when it's rendered.
@@ -545,8 +549,11 @@ class Syntax(JupyterMixin):
             style (StyleType): The style to apply.
             start (Tuple[int, int]): The start of the range, in the form `[line number, column index]`.
             end (Tuple[int, int]): The end of the range, in the form `[line number, column index]`.
+            style_before (bool): Apply the style before any existing styles.
         """
-        self._stylized_ranges.append(_SyntaxHighlightRange(style, start, end))
+        self._stylized_ranges.append(
+            _SyntaxHighlightRange(style, start, end, style_before)
+        )
 
     def _get_line_numbers_color(self, blend: float = 0.3) -> Color:
         background_style = self._theme.get_background_style() + self.background_style
@@ -620,9 +627,7 @@ class Syntax(JupyterMixin):
     ) -> RenderResult:
         segments = Segments(self._get_syntax(console, options))
         if self.padding:
-            yield Padding(
-                segments, style=self._theme.get_background_style(), pad=self.padding
-            )
+            yield Padding(segments, style=self._get_base_style(), pad=self.padding)
         else:
             yield segments
 
@@ -788,7 +793,10 @@ class Syntax(JupyterMixin):
                 newlines_offsets, stylized_range.end
             )
             if start is not None and end is not None:
-                text.stylize(stylized_range.style, start, end)
+                if stylized_range.style_before:
+                    text.stylize_before(stylized_range.style, start, end)
+                else:
+                    text.stylize(stylized_range.style, start, end)
 
     def _process_code(self, code: str) -> Tuple[bool, str]:
         """
diff --git a/libs/rich/table.py b/libs/rich/table.py
index 5fc5ace0b..7b1fa9e4b 100644
--- a/libs/rich/table.py
+++ b/libs/rich/table.py
@@ -54,7 +54,7 @@ class Column:
         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.
         show_lines (bool, optional): Draw lines between every row. Defaults to False.
-        leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+        leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
         style (Union[str, Style], optional): Default style for the table. Defaults to "none".
         row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
         header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -106,6 +106,9 @@ class Column:
     no_wrap: bool = False
     """bool: Prevent wrapping of text within the column. Defaults to ``False``."""
 
+    highlight: bool = False
+    """bool: Apply highlighter to column. Defaults to ``False``."""
+
     _index: int = 0
     """Index of column."""
 
@@ -167,7 +170,7 @@ class Table(JupyterMixin):
         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.
         show_lines (bool, optional): Draw lines between every row. Defaults to False.
-        leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+        leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
         style (Union[str, Style], optional): Default style for the table. Defaults to "none".
         row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
         header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -365,6 +368,7 @@ class Table(JupyterMixin):
         footer: "RenderableType" = "",
         *,
         header_style: Optional[StyleType] = None,
+        highlight: Optional[bool] = None,
         footer_style: Optional[StyleType] = None,
         style: Optional[StyleType] = None,
         justify: "JustifyMethod" = "left",
@@ -384,6 +388,7 @@ class Table(JupyterMixin):
             footer (RenderableType, optional): Text or renderable for the footer.
                 Defaults to "".
             header_style (Union[str, Style], optional): Style for the header, or None for default. Defaults to None.
+            highlight (bool, optional): Whether to highlight the text. The default of None uses the value of the table (self) object.
             footer_style (Union[str, Style], optional): Style for the footer, or None for default. Defaults to None.
             style (Union[str, Style], optional): Style for the column cells, or None for default. Defaults to None.
             justify (JustifyMethod, optional): Alignment for cells. Defaults to "left".
@@ -401,6 +406,7 @@ class Table(JupyterMixin):
             header=header,
             footer=footer,
             header_style=header_style or "",
+            highlight=highlight if highlight is not None else self.highlight,
             footer_style=footer_style or "",
             style=style or "",
             justify=justify,
@@ -445,7 +451,7 @@ class Table(JupyterMixin):
             ]
         for index, renderable in enumerate(cell_renderables):
             if index == len(columns):
-                column = Column(_index=index)
+                column = Column(_index=index, highlight=self.highlight)
                 for _ in self.rows:
                     add_cell(column, Text(""))
                 self.columns.append(column)
@@ -775,16 +781,16 @@ class Table(JupyterMixin):
                     _Segment(_box.head_right, border_style),
                     _Segment(_box.head_vertical, border_style),
                 ),
-                (
-                    _Segment(_box.foot_left, border_style),
-                    _Segment(_box.foot_right, border_style),
-                    _Segment(_box.foot_vertical, border_style),
-                ),
                 (
                     _Segment(_box.mid_left, border_style),
                     _Segment(_box.mid_right, border_style),
                     _Segment(_box.mid_vertical, border_style),
                 ),
+                (
+                    _Segment(_box.foot_left, border_style),
+                    _Segment(_box.foot_right, border_style),
+                    _Segment(_box.foot_vertical, border_style),
+                ),
             ]
             if show_edge:
                 yield _Segment(_box.get_top(widths), border_style)
@@ -818,6 +824,7 @@ class Table(JupyterMixin):
                     no_wrap=column.no_wrap,
                     overflow=column.overflow,
                     height=None,
+                    highlight=column.highlight,
                 )
                 lines = console.render_lines(
                     cell.renderable,
diff --git a/libs/rich/text.py b/libs/rich/text.py
index 7091e4291..b57d77c27 100644
--- a/libs/rich/text.py
+++ b/libs/rich/text.py
@@ -11,6 +11,7 @@ from typing import (
     List,
     NamedTuple,
     Optional,
+    Pattern,
     Tuple,
     Union,
 )
@@ -38,7 +39,7 @@ DEFAULT_OVERFLOW: "OverflowMethod" = "fold"
 _re_whitespace = re.compile(r"\s+$")
 
 TextType = Union[str, "Text"]
-"""A plain string or a [Text][rich.text.Text] instance."""
+"""A plain string or a :class:`Text` instance."""
 
 GetStyleCallable = Callable[[str], Optional[StyleType]]
 
@@ -173,7 +174,7 @@ class Text(JupyterMixin):
         return self.plain
 
     def __repr__(self) -> str:
-        return f"<text {self.plain!r} {self._spans!r}>"
+        return f"<text {self.plain!r} {self._spans!r} {self.style!r}>"
 
     def __add__(self, other: Any) -> "Text":
         if isinstance(other, (str, Text)):
@@ -591,7 +592,7 @@ class Text(JupyterMixin):
 
     def highlight_regex(
         self,
-        re_highlight: str,
+        re_highlight: Union[Pattern[str], str],
         style: Optional[Union[GetStyleCallable, StyleType]] = None,
         *,
         style_prefix: str = "",
@@ -600,7 +601,7 @@ class Text(JupyterMixin):
         translated to styles.
 
         Args:
-            re_highlight (str): A regular expression.
+            re_highlight (Union[re.Pattern, str]): A regular expression object or string.
             style (Union[GetStyleCallable, StyleType]): Optional style to apply to whole match, or a callable
                 which accepts the matched text and returns a style. Defaults to None.
             style_prefix (str, optional): Optional prefix to add to style group names.
@@ -612,7 +613,9 @@ class Text(JupyterMixin):
         append_span = self._spans.append
         _Span = Span
         plain = self.plain
-        for match in re.finditer(re_highlight, plain):
+        if isinstance(re_highlight, str):
+            re_highlight = re.compile(re_highlight)
+        for match in re_highlight.finditer(plain):
             get_span = match.span
             if style:
                 start, end = get_span()
@@ -998,7 +1001,7 @@ class Text(JupyterMixin):
                 self._text.append(text.plain)
                 self._spans.extend(
                     _Span(start + text_length, end + text_length, style)
-                    for start, end, style in text._spans
+                    for start, end, style in text._spans.copy()
                 )
                 self._length += len(text)
         return self
@@ -1020,7 +1023,7 @@ class Text(JupyterMixin):
         self._text.append(text.plain)
         self._spans.extend(
             _Span(start + text_length, end + text_length, style)
-            for start, end, style in text._spans
+            for start, end, style in text._spans.copy()
         )
         self._length += len(text)
         return self
@@ -1041,6 +1044,7 @@ class Text(JupyterMixin):
         _Span = Span
         offset = len(self)
         for content, style in tokens:
+            content = strip_control_codes(content)
             append_text(content)
             if style:
                 append_span(_Span(offset, offset + len(content), style))
diff --git a/libs/rich/theme.py b/libs/rich/theme.py
index 471dfb2f9..227f1d863 100644
--- a/libs/rich/theme.py
+++ b/libs/rich/theme.py
@@ -1,5 +1,5 @@
 import configparser
-from typing import Dict, List, IO, Mapping, Optional
+from typing import IO, Dict, List, Mapping, Optional
 
 from .default_styles import DEFAULT_STYLES
 from .style import Style, StyleType
@@ -69,7 +69,7 @@ class Theme:
         Returns:
             Theme: A new theme instance.
         """
-        with open(path, "rt", encoding=encoding) as config_file:
+        with open(path, encoding=encoding) as config_file:
             return cls.from_file(config_file, source=path, inherit=inherit)
 
 
diff --git a/libs/rich/traceback.py b/libs/rich/traceback.py
index 821c7501a..3bf5baa7b 100644
--- a/libs/rich/traceback.py
+++ b/libs/rich/traceback.py
@@ -1,10 +1,9 @@
-from __future__ import absolute_import
-
+import inspect
 import linecache
 import os
-import platform
 import sys
 from dataclasses import dataclass, field
+from itertools import islice
 from traceback import walk_tb
 from types import ModuleType, TracebackType
 from typing import (
@@ -39,7 +38,7 @@ from .syntax import Syntax
 from .text import Text
 from .theme import Theme
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 LOCALS_MAX_LENGTH = 10
 LOCALS_MAX_STRING = 80
@@ -49,6 +48,7 @@ def install(
     *,
     console: Optional[Console] = None,
     width: Optional[int] = 100,
+    code_width: Optional[int] = 88,
     extra_lines: int = 3,
     theme: Optional[str] = None,
     word_wrap: bool = False,
@@ -69,6 +69,7 @@ def install(
     Args:
         console (Optional[Console], optional): Console to write exception to. Default uses internal Console instance.
         width (Optional[int], optional): Width (in characters) of traceback. Defaults to 100.
+        code_width (Optional[int], optional): Code width (in characters) of traceback. Defaults to 88.
         extra_lines (int, optional): Extra lines of code. Defaults to 3.
         theme (Optional[str], optional): Pygments theme to use in traceback. Defaults to ``None`` which will pick
             a theme appropriate for the platform.
@@ -105,6 +106,7 @@ def install(
                 value,
                 traceback,
                 width=width,
+                code_width=code_width,
                 extra_lines=extra_lines,
                 theme=theme,
                 word_wrap=word_wrap,
@@ -179,6 +181,7 @@ class Frame:
     name: str
     line: str = ""
     locals: Optional[Dict[str, pretty.Node]] = None
+    last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]] = None
 
 
 @dataclass
@@ -215,6 +218,7 @@ class Traceback:
         trace (Trace, optional): A `Trace` object produced from `extract`. Defaults to None, which uses
             the last exception.
         width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
+        code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
         extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
         theme (str, optional): Override pygments theme used in traceback.
         word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -243,6 +247,7 @@ class Traceback:
         trace: Optional[Trace] = None,
         *,
         width: Optional[int] = 100,
+        code_width: Optional[int] = 88,
         extra_lines: int = 3,
         theme: Optional[str] = None,
         word_wrap: bool = False,
@@ -266,6 +271,7 @@ class Traceback:
             )
         self.trace = trace
         self.width = width
+        self.code_width = code_width
         self.extra_lines = extra_lines
         self.theme = Syntax.get_theme(theme or "ansi_dark")
         self.word_wrap = word_wrap
@@ -297,6 +303,7 @@ class Traceback:
         traceback: Optional[TracebackType],
         *,
         width: Optional[int] = 100,
+        code_width: Optional[int] = 88,
         extra_lines: int = 3,
         theme: Optional[str] = None,
         word_wrap: bool = False,
@@ -316,6 +323,7 @@ class Traceback:
             exc_value (BaseException): Exception value.
             traceback (TracebackType): Python Traceback object.
             width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
+            code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
             extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
             theme (str, optional): Override pygments theme used in traceback.
             word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -346,6 +354,7 @@ class Traceback:
         return cls(
             rich_traceback,
             width=width,
+            code_width=code_width,
             extra_lines=extra_lines,
             theme=theme,
             word_wrap=word_wrap,
@@ -436,6 +445,35 @@ class Traceback:
 
             for frame_summary, line_no in walk_tb(traceback):
                 filename = frame_summary.f_code.co_filename
+
+                last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]]
+                last_instruction = None
+                if sys.version_info >= (3, 11):
+                    instruction_index = frame_summary.f_lasti // 2
+                    instruction_position = next(
+                        islice(
+                            frame_summary.f_code.co_positions(),
+                            instruction_index,
+                            instruction_index + 1,
+                        )
+                    )
+                    (
+                        start_line,
+                        end_line,
+                        start_column,
+                        end_column,
+                    ) = instruction_position
+                    if (
+                        start_line is not None
+                        and end_line is not None
+                        and start_column is not None
+                        and end_column is not None
+                    ):
+                        last_instruction = (
+                            (start_line, start_column),
+                            (end_line, end_column),
+                        )
+
                 if filename and not filename.startswith("<"):
                     if not os.path.isabs(filename):
                         filename = os.path.join(_IMPORT_CWD, filename)
@@ -446,16 +484,20 @@ class Traceback:
                     filename=filename or "?",
                     lineno=line_no,
                     name=frame_summary.f_code.co_name,
-                    locals={
-                        key: pretty.traverse(
-                            value,
-                            max_length=locals_max_length,
-                            max_string=locals_max_string,
-                        )
-                        for key, value in get_locals(frame_summary.f_locals.items())
-                    }
-                    if show_locals
-                    else None,
+                    locals=(
+                        {
+                            key: pretty.traverse(
+                                value,
+                                max_length=locals_max_length,
+                                max_string=locals_max_string,
+                            )
+                            for key, value in get_locals(frame_summary.f_locals.items())
+                            if not (inspect.isfunction(value) or inspect.isclass(value))
+                        }
+                        if show_locals
+                        else None
+                    ),
+                    last_instruction=last_instruction,
                 )
                 append(frame)
                 if frame_summary.f_locals.get("_rich_traceback_guard", False):
@@ -695,7 +737,7 @@ class Traceback:
                         ),
                         highlight_lines={frame.lineno},
                         word_wrap=self.word_wrap,
-                        code_width=88,
+                        code_width=self.code_width,
                         indent_guides=self.indent_guides,
                         dedent=False,
                     )
@@ -705,6 +747,14 @@ class Traceback:
                         (f"\n{error}", "traceback.error"),
                     )
                 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,
+                        )
                     yield (
                         Columns(
                             [
@@ -719,12 +769,12 @@ class Traceback:
 
 
 if __name__ == "__main__":  # pragma: no cover
-    from .console import Console
-
-    console = Console()
+    install(show_locals=True)
     import sys
 
-    def bar(a: Any) -> None:  # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
+    def bar(
+        a: Any,
+    ) -> None:  # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
         one = 1
         print(one / a)
 
@@ -742,12 +792,6 @@ if __name__ == "__main__":  # pragma: no cover
         bar(a)
 
     def error() -> None:
-        try:
-            try:
-                foo(0)
-            except:
-                slfkjsldkfj  # type: ignore[name-defined]
-        except:
-            console.print_exception(show_locals=True)
+        foo(0)
 
     error()
diff --git a/libs/rich/tree.py b/libs/rich/tree.py
index 8c5e71819..9a87d60de 100644
--- a/libs/rich/tree.py
+++ b/libs/rich/tree.py
@@ -8,18 +8,32 @@ from .segment import Segment
 from .style import Style, StyleStack, StyleType
 from .styled import Styled
 
+GuideType = Tuple[str, str, str, str]
+
 
 class Tree(JupyterMixin):
     """A renderable for a tree structure.
 
+    Attributes:
+        ASCII_GUIDES (GuideType): Guide lines used when Console.ascii_only is True.
+        TREE_GUIDES (List[GuideType, GuideType, GuideType]): Default guide lines.
+
     Args:
         label (RenderableType): The renderable or str for the tree label.
         style (StyleType, optional): Style of this tree. Defaults to "tree".
         guide_style (StyleType, optional): Style of the guide lines. Defaults to "tree.line".
         expanded (bool, optional): Also display children. Defaults to True.
         highlight (bool, optional): Highlight renderable (if str). Defaults to False.
+        hide_root (bool, optional): Hide the root node. Defaults to False.
     """
 
+    ASCII_GUIDES = ("    ", "|   ", "+-- ", "`-- ")
+    TREE_GUIDES = [
+        ("    ", "│   ", "├── ", "└── "),
+        ("    ", "┃   ", "┣━━ ", "┗━━ "),
+        ("    ", "║   ", "╠══ ", "╚══ "),
+    ]
+
     def __init__(
         self,
         label: RenderableType,
@@ -82,21 +96,15 @@ class Tree(JupyterMixin):
         guide_style = get_style(self.guide_style, default="") or null_style
         SPACE, CONTINUE, FORK, END = range(4)
 
-        ASCII_GUIDES = ("    ", "|   ", "+-- ", "`-- ")
-        TREE_GUIDES = [
-            ("    ", "│   ", "├── ", "└── "),
-            ("    ", "┃   ", "┣━━ ", "┗━━ "),
-            ("    ", "║   ", "╠══ ", "╚══ "),
-        ]
         _Segment = Segment
 
         def make_guide(index: int, style: Style) -> Segment:
             """Make a Segment for a level of the guide lines."""
             if options.ascii_only:
-                line = ASCII_GUIDES[index]
+                line = self.ASCII_GUIDES[index]
             else:
                 guide = 1 if style.bold else (2 if style.underline2 else 0)
-                line = TREE_GUIDES[0 if options.legacy_windows else guide][index]
+                line = self.TREE_GUIDES[0 if options.legacy_windows else guide][index]
             return _Segment(line, style)
 
         levels: List[Segment] = [make_guide(CONTINUE, guide_style)]
diff --git a/libs/semver-3.0.2.dist-info/RECORD b/libs/semver-3.0.2.dist-info/RECORD
index 42db19ab7..aee2f2403 100644
--- a/libs/semver-3.0.2.dist-info/RECORD
+++ b/libs/semver-3.0.2.dist-info/RECORD
@@ -4,7 +4,7 @@ semver-3.0.2.dist-info/LICENSE.txt,sha256=zaSQwy5h04hNwXeR_IB48qPlZPupjdGLTcZOsn
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+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
diff --git a/libs/semver-3.0.2.dist-info/WHEEL b/libs/semver-3.0.2.dist-info/WHEEL
index 98c0d20b7..da25d7b42 100644
--- a/libs/semver-3.0.2.dist-info/WHEEL
+++ b/libs/semver-3.0.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/stevedore-5.2.0.dist-info/INSTALLER b/libs/semver-3.0.3.dist-info/INSTALLER
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/INSTALLER
rename to libs/semver-3.0.3.dist-info/INSTALLER
diff --git a/libs/semver-3.0.3.dist-info/LICENSE.txt b/libs/semver-3.0.3.dist-info/LICENSE.txt
new file mode 100644
index 000000000..bbb09286b
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/LICENSE.txt
@@ -0,0 +1,27 @@
+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.
diff --git a/libs/semver-3.0.3.dist-info/METADATA b/libs/semver-3.0.3.dist-info/METADATA
new file mode 100644
index 000000000..ecfecb477
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/METADATA
@@ -0,0 +1,164 @@
+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
new file mode 100644
index 000000000..8b4509523
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/RECORD
@@ -0,0 +1,17 @@
+../../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/stevedore-5.2.0.dist-info/REQUESTED b/libs/semver-3.0.3.dist-info/REQUESTED
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/REQUESTED
rename to libs/semver-3.0.3.dist-info/REQUESTED
diff --git a/libs/semver-3.0.3.dist-info/WHEEL b/libs/semver-3.0.3.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..ae89e4366
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/entry_points.txt
@@ -0,0 +1,2 @@
+[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
new file mode 100644
index 000000000..f4ded6385
--- /dev/null
+++ b/libs/semver-3.0.3.dist-info/top_level.txt
@@ -0,0 +1 @@
+semver
diff --git a/libs/semver/__about__.py b/libs/semver/__about__.py
index a0d9cf90f..d971e0382 100644
--- a/libs/semver/__about__.py
+++ b/libs/semver/__about__.py
@@ -16,7 +16,7 @@ of the semver specifictation, author, maintainers, and description.
 """
 
 #: Semver version
-__version__ = "3.0.2"
+__version__ = "3.0.3"
 
 #: Original semver author
 __author__ = "Kostiantyn Rybnikov"
diff --git a/libs/semver/__main__.py b/libs/semver/__main__.py
index 6cb11f091..c6adb834c 100644
--- a/libs/semver/__main__.py
+++ b/libs/semver/__main__.py
@@ -9,6 +9,7 @@ This makes it also possible to "run" a wheel like in this command::
     $ python3 semver-3*-py3-none-any.whl/semver -h
 
 """
+
 import os.path
 import sys
 from typing import List, Optional
diff --git a/libs/semver/_deprecated.py b/libs/semver/_deprecated.py
index efbdf4395..df11bb022 100644
--- a/libs/semver/_deprecated.py
+++ b/libs/semver/_deprecated.py
@@ -3,6 +3,7 @@ Contains all deprecated functions.
 
 .. autofunction: deprecated
 """
+
 import inspect
 import warnings
 from functools import partial, wraps
diff --git a/libs/semver/version.py b/libs/semver/version.py
index 29309ab40..0ff5b9f46 100644
--- a/libs/semver/version.py
+++ b/libs/semver/version.py
@@ -32,6 +32,7 @@ Comparable = Union["Version", Dict[str, VersionPart], Collection[VersionPart], s
 Comparator = Callable[["Version", Comparable], bool]
 
 T = TypeVar("T", bound="Version")
+T_cmp = TypeVar("T_cmp", tuple, str, int)
 
 
 def _comparator(operator: Comparator) -> Comparator:
@@ -40,7 +41,7 @@ def _comparator(operator: Comparator) -> Comparator:
     @wraps(operator)
     def wrapper(self: "Version", other: Comparable) -> bool:
         comparable_types = (
-            Version,
+            type(self),
             dict,
             tuple,
             list,
@@ -53,7 +54,7 @@ def _comparator(operator: Comparator) -> Comparator:
     return wrapper
 
 
-def _cmp(a, b):  # TODO: type hints
+def _cmp(a: T_cmp, b: T_cmp) -> int:
     """Return negative if a<b, zero if a==b, positive if a>b."""
     return (a > b) - (a < b)
 
@@ -137,7 +138,7 @@ class Version:
         self._build = None if build is None else str(build)
 
     @classmethod
-    def _nat_cmp(cls, a, b):  # TODO: type hints
+    def _nat_cmp(cls, a: Optional[str], b: Optional[str]) -> int:
         def cmp_prerelease_tag(a, b):
             if isinstance(a, int) and isinstance(b, int):
                 return _cmp(a, b)
@@ -148,16 +149,15 @@ class Version:
             else:
                 return _cmp(a, b)
 
-        a, b = a or "", b or ""
-        a_parts, b_parts = a.split("."), b.split(".")
-        a_parts = [int(x) if re.match(r"^\d+$", x) else x for x in a_parts]
-        b_parts = [int(x) if re.match(r"^\d+$", x) else x for x in b_parts]
+        a_parts = [int(x) if x.isdigit() else x for x in (a or "").split(".")]
+        b_parts = [int(x) if x.isdigit() else x for x in (b or "").split(".")]
+
         for sub_a, sub_b in zip(a_parts, b_parts):
             cmp_result = cmp_prerelease_tag(sub_a, sub_b)
             if cmp_result != 0:
                 return cmp_result
-        else:
-            return _cmp(len(a), len(b))
+
+        return _cmp(len(a_parts), len(b_parts))
 
     @property
     def major(self) -> int:
@@ -382,13 +382,11 @@ build='build.10')
         :return: The return value is negative if ver1 < ver2,
              zero if ver1 == ver2 and strictly positive if ver1 > ver2
 
-        >>> semver.compare("2.0.0")
+        >>> Version.parse("1.0.0").compare("2.0.0")
         -1
-        >>> semver.compare("1.0.0")
+        >>> Version.parse("2.0.0").compare("1.0.0")
         1
-        >>> semver.compare("2.0.0")
-        0
-        >>> semver.compare(dict(major=2, minor=0, patch=0))
+        >>> Version.parse("2.0.0").compare("2.0.0")
         0
         """
         cls = type(self)
diff --git a/libs/simple_websocket-1.0.0.dist-info/RECORD b/libs/simple_websocket-1.0.0.dist-info/RECORD
deleted file mode 100644
index b7f54dce8..000000000
--- a/libs/simple_websocket-1.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-simple_websocket-1.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-simple_websocket-1.0.0.dist-info/LICENSE,sha256=S4q63MXj3SnHGQW4SVKUVpnwp7pB5q-Z6rpG-qvpW7c,1072
-simple_websocket-1.0.0.dist-info/METADATA,sha256=wZQcZ5j94bd65Fp_YWYA06_iNQ3Obd0-R63s496nLmo,1347
-simple_websocket-1.0.0.dist-info/RECORD,,
-simple_websocket-1.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_websocket-1.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simple_websocket-1.0.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
-simple_websocket/asgi.py,sha256=ic2tmrUI-u9vjMNzjqIORc8g7pAsGwFd9YJIjppHHVU,1823
-simple_websocket/errors.py,sha256=5tIEemK-0w5A-6Qyp6imPmn3KI5EjND3R5pRWAiKWF8,583
-simple_websocket/ws.py,sha256=24fXv4pGxAeDEazZr06l7hmzUGcyiBv6TvMPa260JNo,22301
diff --git a/libs/simple_websocket-1.0.0.dist-info/WHEEL b/libs/simple_websocket-1.0.0.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/simple_websocket-1.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/textdistance-4.6.2.dist-info/INSTALLER b/libs/simple_websocket-1.1.0.dist-info/INSTALLER
similarity index 100%
rename from libs/textdistance-4.6.2.dist-info/INSTALLER
rename to libs/simple_websocket-1.1.0.dist-info/INSTALLER
diff --git a/libs/simple_websocket-1.0.0.dist-info/LICENSE b/libs/simple_websocket-1.1.0.dist-info/LICENSE
similarity index 100%
rename from libs/simple_websocket-1.0.0.dist-info/LICENSE
rename to libs/simple_websocket-1.1.0.dist-info/LICENSE
diff --git a/libs/simple_websocket-1.0.0.dist-info/METADATA b/libs/simple_websocket-1.1.0.dist-info/METADATA
similarity index 78%
rename from libs/simple_websocket-1.0.0.dist-info/METADATA
rename to libs/simple_websocket-1.1.0.dist-info/METADATA
index f93782fa8..dfdb05e72 100644
--- a/libs/simple_websocket-1.0.0.dist-info/METADATA
+++ b/libs/simple_websocket-1.1.0.dist-info/METADATA
@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: simple-websocket
-Version: 1.0.0
+Version: 1.1.0
 Summary: Simple WebSocket server and client for Python
-Home-page: https://github.com/miguelgrinberg/simple-websocket
-Author: Miguel Grinberg
-Author-email: miguel.grinberg@gmail.com
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+Project-URL: Homepage, https://github.com/miguelgrinberg/simple-websocket
 Project-URL: Bug Tracker, https://github.com/miguelgrinberg/simple-websocket/issues
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -15,6 +14,11 @@ Requires-Python: >=3.6
 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'
 Provides-Extra: docs
 Requires-Dist: sphinx ; extra == 'docs'
 
diff --git a/libs/simple_websocket-1.1.0.dist-info/RECORD b/libs/simple_websocket-1.1.0.dist-info/RECORD
new file mode 100644
index 000000000..3c240b283
--- /dev/null
+++ b/libs/simple_websocket-1.1.0.dist-info/RECORD
@@ -0,0 +1,12 @@
+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/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/top_level.txt,sha256=gslMtkYd2H3exn9JQxdAgsKBCESZDyTxmukAF9Iz5aA,17
+simple_websocket/__init__.py,sha256=EKakMkVO9vg5WlXjHEJiTwI2emAqs9q22ZxJz9vJ4co,167
+simple_websocket/aiows.py,sha256=CHIBIAN2cz004S4tPeTLAcQuT9iBgw6-hA0QD_JZD1A,20978
+simple_websocket/asgi.py,sha256=ic2tmrUI-u9vjMNzjqIORc8g7pAsGwFd9YJIjppHHVU,1823
+simple_websocket/errors.py,sha256=BtR8B4OI-FL2O_VSIi9cmLMobHqcJ2FhvQnRtvvMlSo,652
+simple_websocket/ws.py,sha256=Nj7DSMnUhOXGYI9j5wvJMpm5X_c7iNDg0H7EpJQPb9o,22789
diff --git a/libs/textdistance-4.6.2.dist-info/REQUESTED b/libs/simple_websocket-1.1.0.dist-info/REQUESTED
similarity index 100%
rename from libs/textdistance-4.6.2.dist-info/REQUESTED
rename to libs/simple_websocket-1.1.0.dist-info/REQUESTED
diff --git a/libs/simple_websocket-1.1.0.dist-info/WHEEL b/libs/simple_websocket-1.1.0.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/simple_websocket-1.1.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/simple_websocket-1.0.0.dist-info/top_level.txt b/libs/simple_websocket-1.1.0.dist-info/top_level.txt
similarity index 100%
rename from libs/simple_websocket-1.0.0.dist-info/top_level.txt
rename to libs/simple_websocket-1.1.0.dist-info/top_level.txt
diff --git a/libs/simple_websocket/errors.py b/libs/simple_websocket/errors.py
index 535b9d661..3a2a70b2d 100644
--- a/libs/simple_websocket/errors.py
+++ b/libs/simple_websocket/errors.py
@@ -1,14 +1,18 @@
 from wsproto.frame_protocol import CloseReason
 
 
-class ConnectionError(RuntimeError):  # pragma: no cover
+class SimpleWebsocketError(RuntimeError):
+    pass
+
+
+class ConnectionError(SimpleWebsocketError):
     """Connection error exception class."""
-    def __init__(self, status_code=None):
+    def __init__(self, status_code=None):  # pragma: no cover
         self.status_code = status_code
         super().__init__(f'Connection error: {status_code}')
 
 
-class ConnectionClosed(RuntimeError):
+class ConnectionClosed(SimpleWebsocketError):
     """Connection closed exception class."""
     def __init__(self, reason=CloseReason.NO_STATUS_RCVD, message=None):
         self.reason = reason
diff --git a/libs/simple_websocket/ws.py b/libs/simple_websocket/ws.py
index 627f53d3c..33519e7e0 100644
--- a/libs/simple_websocket/ws.py
+++ b/libs/simple_websocket/ws.py
@@ -132,7 +132,10 @@ class Base:
         if self.ping_interval:
             next_ping = time() + self.ping_interval
             sel = self.selector_class()
-            sel.register(self.sock, selectors.EVENT_READ, True)
+            try:
+                sel.register(self.sock, selectors.EVENT_READ, True)
+            except ValueError:  # pragma: no cover
+                self.connected = False
 
         while self.connected:
             try:
@@ -143,6 +146,7 @@ class Base:
                         if not self.pong_received:
                             self.close(reason=CloseReason.POLICY_VIOLATION,
                                        message='Ping/Pong timeout')
+                            self.event.set()
                             break
                         self.pong_received = False
                         self.sock.send(self.ws.send(Ping()))
@@ -153,7 +157,8 @@ class Base:
                     raise OSError()
                 self.ws.receive_data(in_data)
                 self.connected = self._handle_events()
-            except (OSError, ConnectionResetError):  # pragma: no cover
+            except (OSError, ConnectionResetError,
+                    LocalProtocolError):  # pragma: no cover
                 self.connected = False
                 self.event.set()
                 break
@@ -392,13 +397,18 @@ class Client(Base):
         elif isinstance(headers, list):
             self.extra_headeers = headers
 
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        connection_args = socket.getaddrinfo(self.host, self.port,
+                                             type=socket.SOCK_STREAM)
+        if len(connection_args) == 0:  # pragma: no cover
+            raise ConnectionError()
+        sock = socket.socket(connection_args[0][0], connection_args[0][1],
+                             connection_args[0][2])
         if is_secure:  # pragma: no cover
             if ssl_context is None:
                 ssl_context = ssl.create_default_context(
                     purpose=ssl.Purpose.SERVER_AUTH)
             sock = ssl_context.wrap_socket(sock, server_hostname=self.host)
-        sock.connect((self.host, self.port))
+        sock.connect(connection_args[0][4])
         super().__init__(sock, connection_type=ConnectionType.CLIENT,
                          receive_bytes=receive_bytes,
                          ping_interval=ping_interval,
diff --git a/libs/six-1.16.0.dist-info/RECORD b/libs/six-1.16.0.dist-info/RECORD
deleted file mode 100644
index 647723bd6..000000000
--- a/libs/six-1.16.0.dist-info/RECORD
+++ /dev/null
@@ -1,8 +0,0 @@
-six-1.16.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-six-1.16.0.dist-info/LICENSE,sha256=i7hQxWWqOJ_cFvOkaWWtI9gq3_YPI5P8J2K2MYXo5sk,1066
-six-1.16.0.dist-info/METADATA,sha256=kPDXQK_4EnOsvj5WSqmoXuuxj_qJ0mvBycBHlVCBgec,1797
-six-1.16.0.dist-info/RECORD,,
-six-1.16.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-six-1.16.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-six-1.16.0.dist-info/top_level.txt,sha256=_iVH_iYEtEXnD8nYGQYpYFUvkUW9sEO1GYbkeKSAais,4
-six.py,sha256=TOOfQi7nFGfMrIvtdr6wX4wyHH8M7aknmuLfo2cBBrM,34549
diff --git a/libs/tqdm-4.66.2.dist-info/INSTALLER b/libs/six-1.17.0.dist-info/INSTALLER
similarity index 100%
rename from libs/tqdm-4.66.2.dist-info/INSTALLER
rename to libs/six-1.17.0.dist-info/INSTALLER
diff --git a/libs/six-1.16.0.dist-info/LICENSE b/libs/six-1.17.0.dist-info/LICENSE
similarity index 96%
rename from libs/six-1.16.0.dist-info/LICENSE
rename to libs/six-1.17.0.dist-info/LICENSE
index de6633112..1cc22a5aa 100644
--- a/libs/six-1.16.0.dist-info/LICENSE
+++ b/libs/six-1.17.0.dist-info/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 Benjamin Peterson
+Copyright (c) 2010-2024 Benjamin Peterson
 
 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
diff --git a/libs/six-1.16.0.dist-info/METADATA b/libs/six-1.17.0.dist-info/METADATA
similarity index 91%
rename from libs/six-1.16.0.dist-info/METADATA
rename to libs/six-1.17.0.dist-info/METADATA
index d572bfe77..cfde03c26 100644
--- a/libs/six-1.16.0.dist-info/METADATA
+++ b/libs/six-1.17.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: six
-Version: 1.16.0
+Version: 1.17.0
 Summary: Python 2 and 3 compatibility utilities
 Home-page: https://github.com/benjaminp/six
 Author: Benjamin Peterson
@@ -20,10 +20,6 @@ License-File: LICENSE
    :target: https://pypi.org/project/six/
    :alt: six on PyPI
 
-.. image:: https://travis-ci.org/benjaminp/six.svg?branch=master
-   :target: https://travis-ci.org/benjaminp/six
-   :alt: six on TravisCI
-
 .. image:: https://readthedocs.org/projects/six/badge/?version=latest
    :target: https://six.readthedocs.io/
    :alt: six's documentation on Read the Docs
diff --git a/libs/six-1.17.0.dist-info/RECORD b/libs/six-1.17.0.dist-info/RECORD
new file mode 100644
index 000000000..e8890a328
--- /dev/null
+++ b/libs/six-1.17.0.dist-info/RECORD
@@ -0,0 +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/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/top_level.txt,sha256=_iVH_iYEtEXnD8nYGQYpYFUvkUW9sEO1GYbkeKSAais,4
+six.py,sha256=xRyR9wPT1LNpbJI8tf7CE-BeddkhU5O--sfy-mo5BN8,34703
diff --git a/libs/tqdm-4.66.2.dist-info/REQUESTED b/libs/six-1.17.0.dist-info/REQUESTED
similarity index 100%
rename from libs/tqdm-4.66.2.dist-info/REQUESTED
rename to libs/six-1.17.0.dist-info/REQUESTED
diff --git a/libs/rarfile-4.1.dist-info/WHEEL b/libs/six-1.17.0.dist-info/WHEEL
similarity index 83%
rename from libs/rarfile-4.1.dist-info/WHEEL
rename to libs/six-1.17.0.dist-info/WHEEL
index ba48cbcf9..f31e450fd 100644
--- a/libs/rarfile-4.1.dist-info/WHEEL
+++ b/libs/six-1.17.0.dist-info/WHEEL
@@ -1,5 +1,6 @@
 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/six-1.16.0.dist-info/top_level.txt b/libs/six-1.17.0.dist-info/top_level.txt
similarity index 100%
rename from libs/six-1.16.0.dist-info/top_level.txt
rename to libs/six-1.17.0.dist-info/top_level.txt
diff --git a/libs/six.py b/libs/six.py
index 4e15675d8..3de5969b1 100644
--- a/libs/six.py
+++ b/libs/six.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2020 Benjamin Peterson
+# Copyright (c) 2010-2024 Benjamin Peterson
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ import sys
 import types
 
 __author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.16.0"
+__version__ = "1.17.0"
 
 
 # Useful for very coarse version differentiation.
@@ -263,7 +263,7 @@ _moved_attributes = [
     MovedAttribute("reduce", "__builtin__", "functools"),
     MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
     MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserDict", "UserDict", "collections", "IterableUserDict", "UserDict"),
     MovedAttribute("UserList", "UserList", "collections"),
     MovedAttribute("UserString", "UserString", "collections"),
     MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
@@ -435,12 +435,17 @@ _urllib_request_moved_attributes = [
     MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
     MovedAttribute("urlretrieve", "urllib", "urllib.request"),
     MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
     MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
     MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
     MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
 ]
+if sys.version_info[:2] < (3, 14):
+    _urllib_request_moved_attributes.extend(
+        [
+            MovedAttribute("URLopener", "urllib", "urllib.request"),
+            MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+        ]
+    )
 for attr in _urllib_request_moved_attributes:
     setattr(Module_six_moves_urllib_request, attr.name, attr)
 del attr
diff --git a/libs/socketio/admin.py b/libs/socketio/admin.py
index f317ea260..12b905ea6 100644
--- a/libs/socketio/admin.py
+++ b/libs/socketio/admin.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 import functools
 import os
 import socket
@@ -16,7 +16,7 @@ class EventBuffer:
 
     def push(self, type, count=1):
         timestamp = int(time.time()) * 1000
-        key = '{};{}'.format(timestamp, type)
+        key = f'{timestamp};{type}'
         if key not in self.buffer:
             self.buffer[key] = {
                 'timestamp': timestamp,
@@ -77,13 +77,9 @@ class InstrumentedServer:
             # track socket connection times
             self.sio.manager._timestamps = {}
 
-            # report socket.io connections
-            self.sio.manager.__connect = self.sio.manager.connect
-            self.sio.manager.connect = self._connect
-
-            # report socket.io disconnection
-            self.sio.manager.__disconnect = self.sio.manager.disconnect
-            self.sio.manager.disconnect = self._disconnect
+            # report socket.io connections, disconnections and received events
+            self.sio.__trigger_event = self.sio._trigger_event
+            self.sio._trigger_event = self._trigger_event
 
             # report join rooms
             self.sio.manager.__basic_enter_room = \
@@ -99,10 +95,6 @@ class InstrumentedServer:
             self.sio.manager.__emit = self.sio.manager.emit
             self.sio.manager.emit = self._emit
 
-            # report receive events
-            self.sio.__handle_event_internal = self.sio._handle_event_internal
-            self.sio._handle_event_internal = self._handle_event_internal
-
         # report engine.io connections
         self.sio.eio.on('connect', self._handle_eio_connect)
         self.sio.eio.on('disconnect', self._handle_eio_disconnect)
@@ -128,14 +120,12 @@ class InstrumentedServer:
 
     def uninstrument(self):  # pragma: no cover
         if self.mode == 'development':
-            self.sio.manager.connect = self.sio.manager.__connect
-            self.sio.manager.disconnect = self.sio.manager.__disconnect
+            self.sio._trigger_event = self.sio.__trigger_event
             self.sio.manager.basic_enter_room = \
                 self.sio.manager.__basic_enter_room
             self.sio.manager.basic_leave_room = \
                 self.sio.manager.__basic_leave_room
             self.sio.manager.emit = self.sio.manager.__emit
-            self.sio._handle_event_internal = self.sio.__handle_event_internal
         self.sio.eio._ok = self.sio.eio.__ok
 
         from engineio.socket import Socket
@@ -205,26 +195,34 @@ class InstrumentedServer:
             self.stop_stats_event.set()
             self.stats_task.join()
 
-    def _connect(self, eio_sid, namespace):
-        sid = self.sio.manager.__connect(eio_sid, namespace)
+    def _trigger_event(self, event, namespace, *args):
         t = time.time()
-        self.sio.manager._timestamps[sid] = t
-        serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
-        self.sio.emit('socket_connected', (
-            serialized_socket,
-            datetime.utcfromtimestamp(t).isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return sid
-
-    def _disconnect(self, sid, namespace, **kwargs):
-        del self.sio.manager._timestamps[sid]
-        self.sio.emit('socket_disconnected', (
-            namespace,
-            sid,
-            'N/A',
-            datetime.utcnow().isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return self.sio.manager.__disconnect(sid, namespace, **kwargs)
+        sid = args[0]
+        if event == 'connect':
+            eio_sid = self.sio.manager.eio_sid_from_sid(sid, namespace)
+            self.sio.manager._timestamps[sid] = t
+            serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
+            self.sio.emit('socket_connected', (
+                serialized_socket,
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        elif event == 'disconnect':
+            del self.sio.manager._timestamps[sid]
+            reason = args[1]
+            self.sio.emit('socket_disconnected', (
+                namespace,
+                sid,
+                reason,
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        else:
+            self.sio.emit('event_received', (
+                namespace,
+                sid,
+                (event, *args[1:]),
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        return self.sio.__trigger_event(event, namespace, *args)
 
     def _check_for_upgrade(self, eio_sid, sid, namespace):  # pragma: no cover
         for _ in range(5):
@@ -248,7 +246,7 @@ class InstrumentedServer:
                 namespace,
                 room,
                 sid,
-                datetime.utcnow().isoformat() + 'Z',
+                datetime.now(timezone.utc).isoformat(),
             ), namespace=self.admin_namespace)
         return ret
 
@@ -258,7 +256,7 @@ class InstrumentedServer:
                 namespace,
                 room,
                 sid,
-                datetime.utcnow().isoformat() + 'Z',
+                datetime.now(timezone.utc).isoformat(),
             ), namespace=self.admin_namespace)
         return self.sio.manager.__basic_leave_room(sid, namespace, room)
 
@@ -269,7 +267,7 @@ class InstrumentedServer:
                                       **kwargs)
         if namespace != self.admin_namespace:
             event_data = [event] + list(data) if isinstance(data, tuple) \
-                else [data]
+                else [event, data]
             if not isinstance(skip_sid, list):  # pragma: no branch
                 skip_sid = [skip_sid]
             for sid, _ in self.sio.manager.get_participants(namespace, room):
@@ -278,22 +276,10 @@ class InstrumentedServer:
                         namespace,
                         sid,
                         event_data,
-                        datetime.utcnow().isoformat() + 'Z',
+                        datetime.now(timezone.utc).isoformat(),
                     ), namespace=self.admin_namespace)
         return ret
 
-    def _handle_event_internal(self, server, sid, eio_sid, data, namespace,
-                               id):
-        ret = self.sio.__handle_event_internal(server, sid, eio_sid, data,
-                                               namespace, id)
-        self.sio.emit('event_received', (
-            namespace,
-            sid,
-            data,
-            datetime.utcnow().isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return ret
-
     def _handle_eio_connect(self, eio_sid, environ):
         if self.stop_stats_event is None:
             self.stop_stats_event = self.sio.eio.create_event()
@@ -303,9 +289,9 @@ class InstrumentedServer:
         self.event_buffer.push('rawConnection')
         return self.sio._handle_eio_connect(eio_sid, environ)
 
-    def _handle_eio_disconnect(self, eio_sid):
+    def _handle_eio_disconnect(self, eio_sid, reason):
         self.event_buffer.push('rawDisconnection')
-        return self.sio._handle_eio_disconnect(eio_sid)
+        return self.sio._handle_eio_disconnect(eio_sid, reason)
 
     def _eio_http_response(self, packets=None, headers=None, jsonp_index=None):
         ret = self.sio.eio.__ok(packets=packets, headers=headers,
@@ -349,7 +335,7 @@ class InstrumentedServer:
                                                           eio_sid)
                 self.sio.emit('socket_connected', (
                     serialized_socket,
-                    datetime.utcfromtimestamp(t).isoformat() + 'Z',
+                    datetime.fromtimestamp(t, timezone.utc).isoformat(),
                 ), namespace=self.admin_namespace)
         return socket.__send_ping()
 
@@ -398,7 +384,7 @@ class InstrumentedServer:
                 'secure': environ.get('wsgi.url_scheme', '') == 'https',
                 'url': environ.get('PATH_INFO', ''),
                 'issued': tm * 1000,
-                'time': datetime.utcfromtimestamp(tm).isoformat() + 'Z'
+                'time': datetime.fromtimestamp(tm, timezone.utc).isoformat()
                 if tm else '',
             },
             'rooms': self.sio.manager.get_rooms(sid, namespace),
diff --git a/libs/socketio/asgi.py b/libs/socketio/asgi.py
index 2394ee1e2..23b094d8c 100644
--- a/libs/socketio/asgi.py
+++ b/libs/socketio/asgi.py
@@ -15,7 +15,12 @@ class ASGIApp(engineio.ASGIApp):  # pragma: no cover
     :param other_asgi_app: A separate ASGI app that receives all other traffic.
     :param socketio_path: The endpoint where the Socket.IO application should
                           be installed. The default value is appropriate for
-                          most cases.
+                          most cases. With a value of ``None``, all incoming
+                          traffic is directed to the Socket.IO server, with the
+                          assumption that routing, if necessary, is handled by
+                          a different layer. When this option is set to
+                          ``None``, ``static_files`` and ``other_asgi_app`` are
+                          ignored.
     :param on_startup: function to be called on application startup; can be
                        coroutine
     :param on_shutdown: function to be called on application shutdown; can be
@@ -27,7 +32,7 @@ class ASGIApp(engineio.ASGIApp):  # pragma: no cover
         import uvicorn
 
         sio = socketio.AsyncServer()
-        app = engineio.ASGIApp(sio, static_files={
+        app = socketio.ASGIApp(sio, static_files={
             '/': 'index.html',
             '/static': './public',
         })
diff --git a/libs/socketio/async_admin.py b/libs/socketio/async_admin.py
index 162c56607..b052d8fe2 100644
--- a/libs/socketio/async_admin.py
+++ b/libs/socketio/async_admin.py
@@ -1,5 +1,5 @@
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import functools
 import os
 import socket
@@ -58,13 +58,9 @@ class InstrumentedAsyncServer:
             # track socket connection times
             self.sio.manager._timestamps = {}
 
-            # report socket.io connections
-            self.sio.manager.__connect = self.sio.manager.connect
-            self.sio.manager.connect = self._connect
-
-            # report socket.io disconnection
-            self.sio.manager.__disconnect = self.sio.manager.disconnect
-            self.sio.manager.disconnect = self._disconnect
+            # report socket.io connections, disconnections and received events
+            self.sio.__trigger_event = self.sio._trigger_event
+            self.sio._trigger_event = self._trigger_event
 
             # report join rooms
             self.sio.manager.__basic_enter_room = \
@@ -80,10 +76,6 @@ class InstrumentedAsyncServer:
             self.sio.manager.__emit = self.sio.manager.emit
             self.sio.manager.emit = self._emit
 
-            # report receive events
-            self.sio.__handle_event_internal = self.sio._handle_event_internal
-            self.sio._handle_event_internal = self._handle_event_internal
-
         # report engine.io connections
         self.sio.eio.on('connect', self._handle_eio_connect)
         self.sio.eio.on('disconnect', self._handle_eio_disconnect)
@@ -109,14 +101,12 @@ class InstrumentedAsyncServer:
 
     def uninstrument(self):  # pragma: no cover
         if self.mode == 'development':
-            self.sio.manager.connect = self.sio.manager.__connect
-            self.sio.manager.disconnect = self.sio.manager.__disconnect
+            self.sio._trigger_event = self.sio.__trigger_event
             self.sio.manager.basic_enter_room = \
                 self.sio.manager.__basic_enter_room
             self.sio.manager.basic_leave_room = \
                 self.sio.manager.__basic_leave_room
             self.sio.manager.emit = self.sio.manager.__emit
-            self.sio._handle_event_internal = self.sio.__handle_event_internal
         self.sio.eio._ok = self.sio.eio.__ok
 
         from engineio.async_socket import AsyncSocket
@@ -193,26 +183,34 @@ class InstrumentedAsyncServer:
             self.stop_stats_event.set()
             await asyncio.gather(self.stats_task)
 
-    async def _connect(self, eio_sid, namespace):
-        sid = await self.sio.manager.__connect(eio_sid, namespace)
+    async def _trigger_event(self, event, namespace, *args):
         t = time.time()
-        self.sio.manager._timestamps[sid] = t
-        serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
-        await self.sio.emit('socket_connected', (
-            serialized_socket,
-            datetime.utcfromtimestamp(t).isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return sid
-
-    async def _disconnect(self, sid, namespace, **kwargs):
-        del self.sio.manager._timestamps[sid]
-        await self.sio.emit('socket_disconnected', (
-            namespace,
-            sid,
-            'N/A',
-            datetime.utcnow().isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return await self.sio.manager.__disconnect(sid, namespace, **kwargs)
+        sid = args[0]
+        if event == 'connect':
+            eio_sid = self.sio.manager.eio_sid_from_sid(sid, namespace)
+            self.sio.manager._timestamps[sid] = t
+            serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
+            await self.sio.emit('socket_connected', (
+                serialized_socket,
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        elif event == 'disconnect':
+            del self.sio.manager._timestamps[sid]
+            reason = args[1]
+            await self.sio.emit('socket_disconnected', (
+                namespace,
+                sid,
+                reason,
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        else:
+            await self.sio.emit('event_received', (
+                namespace,
+                sid,
+                (event, *args[1:]),
+                datetime.fromtimestamp(t, timezone.utc).isoformat(),
+            ), namespace=self.admin_namespace)
+        return await self.sio.__trigger_event(event, namespace, *args)
 
     async def _check_for_upgrade(self, eio_sid, sid,
                                  namespace):  # pragma: no cover
@@ -237,7 +235,7 @@ class InstrumentedAsyncServer:
                 namespace,
                 room,
                 sid,
-                datetime.utcnow().isoformat() + 'Z',
+                datetime.now(timezone.utc).isoformat(),
             )))
         return ret
 
@@ -247,7 +245,7 @@ class InstrumentedAsyncServer:
                 namespace,
                 room,
                 sid,
-                datetime.utcnow().isoformat() + 'Z',
+                datetime.now(timezone.utc).isoformat(),
             )))
         return self.sio.manager.__basic_leave_room(sid, namespace, room)
 
@@ -258,7 +256,7 @@ class InstrumentedAsyncServer:
             callback=callback, **kwargs)
         if namespace != self.admin_namespace:
             event_data = [event] + list(data) if isinstance(data, tuple) \
-                else [data]
+                else [event, data]
             if not isinstance(skip_sid, list):  # pragma: no branch
                 skip_sid = [skip_sid]
             for sid, _ in self.sio.manager.get_participants(namespace, room):
@@ -267,22 +265,10 @@ class InstrumentedAsyncServer:
                         namespace,
                         sid,
                         event_data,
-                        datetime.utcnow().isoformat() + 'Z',
+                        datetime.now(timezone.utc).isoformat(),
                     ), namespace=self.admin_namespace)
         return ret
 
-    async def _handle_event_internal(self, server, sid, eio_sid, data,
-                                     namespace, id):
-        ret = await self.sio.__handle_event_internal(server, sid, eio_sid,
-                                                     data, namespace, id)
-        await self.sio.emit('event_received', (
-            namespace,
-            sid,
-            data,
-            datetime.utcnow().isoformat() + 'Z',
-        ), namespace=self.admin_namespace)
-        return ret
-
     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()
@@ -292,9 +278,9 @@ class InstrumentedAsyncServer:
         self.event_buffer.push('rawConnection')
         return await self.sio._handle_eio_connect(eio_sid, environ)
 
-    async def _handle_eio_disconnect(self, eio_sid):
+    async def _handle_eio_disconnect(self, eio_sid, reason):
         self.event_buffer.push('rawDisconnection')
-        return await self.sio._handle_eio_disconnect(eio_sid)
+        return await self.sio._handle_eio_disconnect(eio_sid, reason)
 
     def _eio_http_response(self, packets=None, headers=None, jsonp_index=None):
         ret = self.sio.eio.__ok(packets=packets, headers=headers,
@@ -338,7 +324,7 @@ class InstrumentedAsyncServer:
                                                           eio_sid)
                 await self.sio.emit('socket_connected', (
                     serialized_socket,
-                    datetime.utcfromtimestamp(t).isoformat() + 'Z',
+                    datetime.fromtimestamp(t, timezone.utc).isoformat(),
                 ), namespace=self.admin_namespace)
         return await socket.__send_ping()
 
@@ -391,7 +377,7 @@ class InstrumentedAsyncServer:
                 'secure': environ.get('wsgi.url_scheme', '') == 'https',
                 'url': environ.get('PATH_INFO', ''),
                 'issued': tm * 1000,
-                'time': datetime.utcfromtimestamp(tm).isoformat() + 'Z'
+                'time': datetime.fromtimestamp(tm, timezone.utc).isoformat()
                 if tm else '',
             },
             'rooms': self.sio.manager.get_rooms(sid, namespace),
diff --git a/libs/socketio/async_client.py b/libs/socketio/async_client.py
index 9184d029e..463073e7b 100644
--- a/libs/socketio/async_client.py
+++ b/libs/socketio/async_client.py
@@ -53,11 +53,14 @@ class AsyncClient(base_client.BaseClient):
     :param http_session: an initialized ``aiohttp.ClientSession`` object to be
                          used when sending requests to the server. Use it if
                          you need to add special client options such as proxy
-                         servers, SSL certificates, etc.
+                         servers, SSL certificates, custom CA bundle, etc.
     :param ssl_verify: ``True`` to verify SSL certificates, or ``False`` to
                        skip SSL certificate verification, allowing
                        connections to servers with self signed certificates.
                        The default is ``True``.
+    :param websocket_extra_options: Dictionary containing additional keyword
+                                    arguments passed to
+                                    ``websocket.create_connection()``.
     :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
@@ -113,7 +116,7 @@ class AsyncClient(base_client.BaseClient):
         Example usage::
 
             sio = socketio.AsyncClient()
-            sio.connect('http://localhost:5000')
+            await sio.connect('http://localhost:5000')
         """
         if self.connected:
             raise exceptions.ConnectionError('Already connected')
@@ -128,6 +131,8 @@ class AsyncClient(base_client.BaseClient):
         if namespaces is None:
             namespaces = list(set(self.handlers.keys()).union(
                 set(self.namespace_handlers.keys())))
+            if '*' in namespaces:
+                namespaces.remove('*')
             if len(namespaces) == 0:
                 namespaces = ['/']
         elif isinstance(namespaces, str):
@@ -184,6 +189,9 @@ class AsyncClient(base_client.BaseClient):
             await self.eio.wait()
             await self.sleep(1)  # give the reconnect task time to start up
             if not self._reconnect_task:
+                if self.eio.state == 'connected':  # pragma: no cover
+                    # connected while sleeping above
+                    continue
                 break
             await self._reconnect_task
             if self.eio.state != 'connected':
@@ -318,6 +326,20 @@ class AsyncClient(base_client.BaseClient):
                                     namespace=n))
         await self.eio.disconnect(abort=True)
 
+    async def shutdown(self):
+        """Stop the client.
+
+        If the client is connected to a server, it is disconnected. If the
+        client is attempting to reconnect to server, the reconnection attempts
+        are stopped. If the client is not connected to a server and is not
+        attempting to reconnect, then this function does nothing.
+        """
+        if self.connected:
+            await self.disconnect()
+        elif self._reconnect_task:  # pragma: no branch
+            self._reconnect_abort.set()
+            await self._reconnect_task
+
     def start_background_task(self, target, *args, **kwargs):
         """Start a background task using the appropriate async model.
 
@@ -366,7 +388,7 @@ class AsyncClient(base_client.BaseClient):
     async def _handle_connect(self, namespace, data):
         namespace = namespace or '/'
         if namespace not in self.namespaces:
-            self.logger.info('Namespace {} is connected'.format(namespace))
+            self.logger.info(f'Namespace {namespace} is connected')
             self.namespaces[namespace] = (data or {}).get('sid', self.sid)
             await self._trigger_event('connect', namespace=namespace)
             self._connect_event.set()
@@ -375,8 +397,9 @@ class AsyncClient(base_client.BaseClient):
         if not self.connected:
             return
         namespace = namespace or '/'
-        await self._trigger_event('disconnect', namespace=namespace)
-        await self._trigger_event('__disconnect_final', namespace=namespace)
+        await self._trigger_event('disconnect', namespace,
+                                  self.reason.SERVER_DISCONNECT)
+        await self._trigger_event('__disconnect_final', namespace)
         if namespace in self.namespaces:
             del self.namespaces[namespace]
         if not self.namespaces:
@@ -439,11 +462,27 @@ class AsyncClient(base_client.BaseClient):
         if handler:
             if asyncio.iscoroutinefunction(handler):
                 try:
-                    ret = await handler(*args)
+                    try:
+                        ret = await handler(*args)
+                    except TypeError:
+                        # the legacy disconnect event does not take a reason
+                        # argument
+                        if event == 'disconnect':
+                            ret = await handler(*args[:-1])
+                        else:  # pragma: no cover
+                            raise
                 except asyncio.CancelledError:  # pragma: no cover
                     ret = None
             else:
-                ret = handler(*args)
+                try:
+                    ret = handler(*args)
+                except TypeError:
+                    # the legacy disconnect event does not take a reason
+                    # argument
+                    if event == 'disconnect':
+                        ret = handler(*args[:-1])
+                    else:  # pragma: no cover
+                        raise
             return ret
 
         # or else, forward the event to a namepsace handler if one exists
@@ -467,15 +506,20 @@ class AsyncClient(base_client.BaseClient):
             self.logger.info(
                 'Connection failed, new attempt in {:.02f} seconds'.format(
                     delay))
+            abort = False
             try:
                 await asyncio.wait_for(self._reconnect_abort.wait(), delay)
+                abort = True
+            except asyncio.TimeoutError:
+                pass
+            except asyncio.CancelledError:  # pragma: no cover
+                abort = True
+            if abort:
                 self.logger.info('Reconnect task aborted')
                 for n in self.connection_namespaces:
                     await self._trigger_event('__disconnect_final',
                                               namespace=n)
                 break
-            except (asyncio.TimeoutError, asyncio.CancelledError):
-                pass
             attempt_count += 1
             try:
                 await self.connect(self.connection_url,
@@ -538,22 +582,21 @@ class AsyncClient(base_client.BaseClient):
             else:
                 raise ValueError('Unknown packet type.')
 
-    async def _handle_eio_disconnect(self):
+    async def _handle_eio_disconnect(self, reason):
         """Handle the Engine.IO disconnection event."""
         self.logger.info('Engine.IO connection dropped')
         will_reconnect = self.reconnection and self.eio.state == 'connected'
         if self.connected:
             for n in self.namespaces:
-                await self._trigger_event('disconnect', namespace=n)
+                await self._trigger_event('disconnect', n, reason)
                 if not will_reconnect:
-                    await self._trigger_event('__disconnect_final',
-                                              namespace=n)
+                    await self._trigger_event('__disconnect_final', n)
             self.namespaces = {}
             self.connected = False
         self.callbacks = {}
         self._binary_packet = None
         self.sid = None
-        if will_reconnect:
+        if will_reconnect and not self._reconnect_task:
             self._reconnect_task = self.start_background_task(
                 self._handle_reconnect)
 
diff --git a/libs/socketio/async_manager.py b/libs/socketio/async_manager.py
index dcf79cf85..47e7a79fc 100644
--- a/libs/socketio/async_manager.py
+++ b/libs/socketio/async_manager.py
@@ -11,12 +11,13 @@ class AsyncManager(BaseManager):
         return self.is_connected(sid, namespace)
 
     async def emit(self, event, data, namespace, room=None, skip_sid=None,
-                   callback=None, **kwargs):
+                   callback=None, to=None, **kwargs):
         """Emit a message to a single client, a room, or all the clients
         connected to the namespace.
 
         Note: this method is a coroutine.
         """
+        room = to or room
         if namespace not in self.rooms:
             return
         if isinstance(data, tuple):
diff --git a/libs/socketio/async_namespace.py b/libs/socketio/async_namespace.py
index 0a2e0515c..42d650892 100644
--- a/libs/socketio/async_namespace.py
+++ b/libs/socketio/async_namespace.py
@@ -29,16 +29,32 @@ class AsyncNamespace(base_namespace.BaseServerNamespace):
 
         Note: this method is a coroutine.
         """
-        handler_name = 'on_' + event
+        handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
             handler = getattr(self, handler_name)
             if asyncio.iscoroutinefunction(handler) is True:
                 try:
-                    ret = await handler(*args)
+                    try:
+                        ret = await handler(*args)
+                    except TypeError:
+                        # legacy disconnect events do not have a reason
+                        # argument
+                        if event == 'disconnect':
+                            ret = await handler(*args[:-1])
+                        else:  # pragma: no cover
+                            raise
                 except asyncio.CancelledError:  # pragma: no cover
                     ret = None
             else:
-                ret = handler(*args)
+                try:
+                    ret = handler(*args)
+                except TypeError:
+                    # legacy disconnect events do not have a reason
+                    # argument
+                    if event == 'disconnect':
+                        ret = handler(*args[:-1])
+                    else:  # pragma: no cover
+                        raise
             return ret
 
     async def emit(self, event, data=None, to=None, room=None, skip_sid=None,
@@ -194,16 +210,32 @@ class AsyncClientNamespace(base_namespace.BaseClientNamespace):
 
         Note: this method is a coroutine.
         """
-        handler_name = 'on_' + event
+        handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
             handler = getattr(self, handler_name)
             if asyncio.iscoroutinefunction(handler) is True:
                 try:
-                    ret = await handler(*args)
+                    try:
+                        ret = await handler(*args)
+                    except TypeError:
+                        # legacy disconnect events do not have a reason
+                        # argument
+                        if event == 'disconnect':
+                            ret = await handler(*args[:-1])
+                        else:  # pragma: no cover
+                            raise
                 except asyncio.CancelledError:  # pragma: no cover
                     ret = None
             else:
-                ret = handler(*args)
+                try:
+                    ret = handler(*args)
+                except TypeError:
+                    # legacy disconnect events do not have a reason
+                    # argument
+                    if event == 'disconnect':
+                        ret = handler(*args[:-1])
+                    else:  # pragma: no cover
+                        raise
             return ret
 
     async def emit(self, event, data=None, namespace=None, callback=None):
diff --git a/libs/socketio/async_pubsub_manager.py b/libs/socketio/async_pubsub_manager.py
index 3e11f1eaa..72946eb22 100644
--- a/libs/socketio/async_pubsub_manager.py
+++ b/libs/socketio/async_pubsub_manager.py
@@ -38,7 +38,7 @@ class AsyncPubSubManager(AsyncManager):
         self._get_logger().info(self.name + ' backend initialized.')
 
     async def emit(self, event, data, namespace=None, room=None, skip_sid=None,
-                   callback=None, **kwargs):
+                   callback=None, to=None, **kwargs):
         """Emit a message to a single client, a room, or all the clients
         connected to the namespace.
 
@@ -49,6 +49,7 @@ class AsyncPubSubManager(AsyncManager):
 
         Note: this method is a coroutine.
         """
+        room = to or room
         if kwargs.get('ignore_queue'):
             return await super().emit(
                 event, data, namespace=namespace, room=room, skip_sid=skip_sid,
diff --git a/libs/socketio/async_server.py b/libs/socketio/async_server.py
index 91a14d066..f10fb8aee 100644
--- a/libs/socketio/async_server.py
+++ b/libs/socketio/async_server.py
@@ -102,6 +102,9 @@ class AsyncServer(base_server.BaseServer):
                             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
@@ -382,7 +385,7 @@ class AsyncServer(base_server.BaseServer):
                 async with eio.session(sid) as session:
                     print('received message from ', session['username'])
         """
-        class _session_context_manager(object):
+        class _session_context_manager:
             def __init__(self, server, sid, namespace):
                 self.server = server
                 self.sid = sid
@@ -424,7 +427,8 @@ class AsyncServer(base_server.BaseServer):
             eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
             await self._send_packet(eio_sid, self.packet_class(
                 packet.DISCONNECT, namespace=namespace))
-            await self._trigger_event('disconnect', namespace, sid)
+            await self._trigger_event('disconnect', namespace, sid,
+                                      self.reason.SERVER_DISCONNECT)
             await self.manager.disconnect(sid, namespace=namespace,
                                           ignore_queue=True)
 
@@ -572,14 +576,15 @@ class AsyncServer(base_server.BaseServer):
             await self._send_packet(eio_sid, self.packet_class(
                 packet.CONNECT, {'sid': sid}, namespace=namespace))
 
-    async def _handle_disconnect(self, eio_sid, namespace):
+    async def _handle_disconnect(self, eio_sid, namespace, reason=None):
         """Handle a client disconnect."""
         namespace = namespace or '/'
         sid = self.manager.sid_from_eio_sid(eio_sid, namespace)
         if not self.manager.is_connected(sid, namespace):  # pragma: no cover
             return
         self.manager.pre_disconnect(sid, namespace=namespace)
-        await self._trigger_event('disconnect', namespace, sid)
+        await self._trigger_event('disconnect', namespace, sid,
+                                  reason or self.reason.CLIENT_DISCONNECT)
         await self.manager.disconnect(sid, namespace, ignore_queue=True)
 
     async def _handle_event(self, eio_sid, namespace, id, data):
@@ -631,11 +636,25 @@ class AsyncServer(base_server.BaseServer):
         if handler:
             if asyncio.iscoroutinefunction(handler):
                 try:
-                    ret = await handler(*args)
+                    try:
+                        ret = await handler(*args)
+                    except TypeError:
+                        # legacy disconnect events use only one argument
+                        if event == 'disconnect':
+                            ret = await handler(*args[:-1])
+                        else:  # pragma: no cover
+                            raise
                 except asyncio.CancelledError:  # pragma: no cover
                     ret = None
             else:
-                ret = handler(*args)
+                try:
+                    ret = handler(*args)
+                except TypeError:
+                    # legacy disconnect events use only one argument
+                    if event == 'disconnect':
+                        ret = handler(*args[:-1])
+                    else:  # pragma: no cover
+                        raise
             return ret
         # or else, forward the event to a namespace handler if one exists
         handler, args = self._get_namespace_handler(namespace, args)
@@ -668,7 +687,8 @@ class AsyncServer(base_server.BaseServer):
             if pkt.packet_type == packet.CONNECT:
                 await self._handle_connect(eio_sid, pkt.namespace, pkt.data)
             elif pkt.packet_type == packet.DISCONNECT:
-                await self._handle_disconnect(eio_sid, pkt.namespace)
+                await self._handle_disconnect(eio_sid, pkt.namespace,
+                                              self.reason.CLIENT_DISCONNECT)
             elif pkt.packet_type == packet.EVENT:
                 await self._handle_event(eio_sid, pkt.namespace, pkt.id,
                                          pkt.data)
@@ -683,10 +703,10 @@ class AsyncServer(base_server.BaseServer):
             else:
                 raise ValueError('Unknown packet type.')
 
-    async def _handle_eio_disconnect(self, eio_sid):
+    async def _handle_eio_disconnect(self, eio_sid, reason):
         """Handle Engine.IO disconnect event."""
         for n in list(self.manager.get_namespaces()).copy():
-            await self._handle_disconnect(eio_sid, n)
+            await self._handle_disconnect(eio_sid, n, reason)
         if eio_sid in self.environ:
             del self.environ[eio_sid]
 
diff --git a/libs/socketio/base_client.py b/libs/socketio/base_client.py
index 1becf914c..7bf442071 100644
--- a/libs/socketio/base_client.py
+++ b/libs/socketio/base_client.py
@@ -3,6 +3,8 @@ import logging
 import signal
 import threading
 
+import engineio
+
 from . import base_namespace
 from . import packet
 
@@ -31,6 +33,7 @@ original_signal_handler = None
 class BaseClient:
     reserved_events = ['connect', 'connect_error', 'disconnect',
                        '__disconnect_final']
+    reason = engineio.Client.reason
 
     def __init__(self, reconnection=True, reconnection_attempts=0,
                  reconnection_delay=1, reconnection_delay_max=5,
@@ -285,7 +288,7 @@ class BaseClient:
     def _handle_eio_message(self, data):  # pragma: no cover
         raise NotImplementedError()
 
-    def _handle_eio_disconnect(self):  # pragma: no cover
+    def _handle_eio_disconnect(self, reason):  # pragma: no cover
         raise NotImplementedError()
 
     def _engineio_client_class(self):  # pragma: no cover
diff --git a/libs/socketio/base_manager.py b/libs/socketio/base_manager.py
index ca4b0b957..dafa60ac2 100644
--- a/libs/socketio/base_manager.py
+++ b/libs/socketio/base_manager.py
@@ -37,8 +37,7 @@ class BaseManager:
                 participants.update(ns[r]._fwdm if r in ns else {})
         else:
             participants = ns[room]._fwdm.copy() if room in ns else {}
-        for sid, eio_sid in participants.items():
-            yield sid, eio_sid
+        yield from participants.items()
 
     def connect(self, eio_sid, namespace):
         """Register a client connection to a namespace."""
diff --git a/libs/socketio/base_namespace.py b/libs/socketio/base_namespace.py
index 354f75acc..14b5d8fbf 100644
--- a/libs/socketio/base_namespace.py
+++ b/libs/socketio/base_namespace.py
@@ -1,4 +1,4 @@
-class BaseNamespace(object):
+class BaseNamespace:
     def __init__(self, namespace=None):
         self.namespace = namespace or '/'
 
diff --git a/libs/socketio/base_server.py b/libs/socketio/base_server.py
index c3b8591eb..d134eba1f 100644
--- a/libs/socketio/base_server.py
+++ b/libs/socketio/base_server.py
@@ -1,5 +1,7 @@
 import logging
 
+import engineio
+
 from . import manager
 from . import base_namespace
 from . import packet
@@ -9,6 +11,7 @@ default_logger = logging.getLogger('socketio.server')
 
 class BaseServer:
     reserved_events = ['connect', 'disconnect']
+    reason = engineio.Server.reason
 
     def __init__(self, client_manager=None, logger=False, serializer='default',
                  json=None, async_handlers=True, always_connect=False,
@@ -226,7 +229,7 @@ class BaseServer:
                     '*' in self.handlers[namespace]:
                 handler = self.handlers[namespace]['*']
                 args = (event, *args)
-        elif '*' in self.handlers:
+        if handler is None and '*' in self.handlers:
             if event in self.handlers['*']:
                 handler = self.handlers['*'][event]
                 args = (namespace, *args)
@@ -245,7 +248,7 @@ class BaseServer:
         handler = None
         if namespace in self.namespace_handlers:
             handler = self.namespace_handlers[namespace]
-        elif '*' in self.namespace_handlers:
+        if handler is None and '*' in self.namespace_handlers:
             handler = self.namespace_handlers['*']
             args = (namespace, *args)
         return handler, args
diff --git a/libs/socketio/client.py b/libs/socketio/client.py
index 905bb1e28..ade2dd6f1 100644
--- a/libs/socketio/client.py
+++ b/libs/socketio/client.py
@@ -56,11 +56,14 @@ class Client(base_client.BaseClient):
     :param http_session: an initialized ``requests.Session`` object to be used
                          when sending requests to the server. Use it if you
                          need to add special client options such as proxy
-                         servers, SSL certificates, etc.
+                         servers, SSL certificates, custom CA bundle, etc.
     :param ssl_verify: ``True`` to verify SSL certificates, or ``False`` to
                        skip SSL certificate verification, allowing
                        connections to servers with self signed certificates.
                        The default is ``True``.
+    :param websocket_extra_options: Dictionary containing additional keyword
+                                    arguments passed to
+                                    ``websocket.create_connection()``.
     :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
@@ -126,6 +129,8 @@ class Client(base_client.BaseClient):
         if namespaces is None:
             namespaces = list(set(self.handlers.keys()).union(
                 set(self.namespace_handlers.keys())))
+            if '*' in namespaces:
+                namespaces.remove('*')
             if len(namespaces) == 0:
                 namespaces = ['/']
         elif isinstance(namespaces, str):
@@ -175,7 +180,12 @@ class Client(base_client.BaseClient):
             self.eio.wait()
             self.sleep(1)  # give the reconnect task time to start up
             if not self._reconnect_task:
-                break
+                if self.eio.state == 'connected':  # pragma: no cover
+                    # connected while sleeping above
+                    continue
+                else:
+                    # the reconnect task gave up
+                    break
             self._reconnect_task.join()
             if self.eio.state != 'connected':
                 break
@@ -298,6 +308,20 @@ class Client(base_client.BaseClient):
                 packet.DISCONNECT, namespace=n))
         self.eio.disconnect(abort=True)
 
+    def shutdown(self):
+        """Stop the client.
+
+        If the client is connected to a server, it is disconnected. If the
+        client is attempting to reconnect to server, the reconnection attempts
+        are stopped. If the client is not connected to a server and is not
+        attempting to reconnect, then this function does nothing.
+        """
+        if self.connected:
+            self.disconnect()
+        elif self._reconnect_task:  # pragma: no branch
+            self._reconnect_abort.set()
+            self._reconnect_task.join()
+
     def start_background_task(self, target, *args, **kwargs):
         """Start a background task using the appropriate async model.
 
@@ -344,7 +368,7 @@ class Client(base_client.BaseClient):
     def _handle_connect(self, namespace, data):
         namespace = namespace or '/'
         if namespace not in self.namespaces:
-            self.logger.info('Namespace {} is connected'.format(namespace))
+            self.logger.info(f'Namespace {namespace} is connected')
             self.namespaces[namespace] = (data or {}).get('sid', self.sid)
             self._trigger_event('connect', namespace=namespace)
             self._connect_event.set()
@@ -353,8 +377,9 @@ class Client(base_client.BaseClient):
         if not self.connected:
             return
         namespace = namespace or '/'
-        self._trigger_event('disconnect', namespace=namespace)
-        self._trigger_event('__disconnect_final', namespace=namespace)
+        self._trigger_event('disconnect', namespace,
+                            self.reason.SERVER_DISCONNECT)
+        self._trigger_event('__disconnect_final', namespace)
         if namespace in self.namespaces:
             del self.namespaces[namespace]
         if not self.namespaces:
@@ -412,7 +437,14 @@ class Client(base_client.BaseClient):
         # first see if we have an explicit handler for the event
         handler, args = self._get_event_handler(event, namespace, args)
         if handler:
-            return handler(*args)
+            try:
+                return handler(*args)
+            except TypeError:
+                # the legacy disconnect event does not take a reason argument
+                if event == 'disconnect':
+                    return handler(*args[:-1])
+                else:  # pragma: no cover
+                    raise
 
         # or else, forward the event to a namespace handler if one exists
         handler, args = self._get_namespace_handler(namespace, args)
@@ -501,21 +533,21 @@ class Client(base_client.BaseClient):
             else:
                 raise ValueError('Unknown packet type.')
 
-    def _handle_eio_disconnect(self):
+    def _handle_eio_disconnect(self, reason):
         """Handle the Engine.IO disconnection event."""
         self.logger.info('Engine.IO connection dropped')
         will_reconnect = self.reconnection and self.eio.state == 'connected'
         if self.connected:
             for n in self.namespaces:
-                self._trigger_event('disconnect', namespace=n)
+                self._trigger_event('disconnect', n, reason)
                 if not will_reconnect:
-                    self._trigger_event('__disconnect_final', namespace=n)
+                    self._trigger_event('__disconnect_final', n)
             self.namespaces = {}
             self.connected = False
         self.callbacks = {}
         self._binary_packet = None
         self.sid = None
-        if will_reconnect:
+        if will_reconnect and not self._reconnect_task:
             self._reconnect_task = self.start_background_task(
                 self._handle_reconnect)
 
diff --git a/libs/socketio/kafka_manager.py b/libs/socketio/kafka_manager.py
index 4d87d46fa..11b87ad81 100644
--- a/libs/socketio/kafka_manager.py
+++ b/libs/socketio/kafka_manager.py
@@ -57,8 +57,7 @@ class KafkaManager(PubSubManager):  # pragma: no cover
         self.producer.flush()
 
     def _kafka_listen(self):
-        for message in self.consumer:
-            yield message
+        yield from self.consumer
 
     def _listen(self):
         for message in self._kafka_listen():
diff --git a/libs/socketio/kombu_manager.py b/libs/socketio/kombu_manager.py
index 0a63bc262..09e260c98 100644
--- a/libs/socketio/kombu_manager.py
+++ b/libs/socketio/kombu_manager.py
@@ -86,7 +86,7 @@ class KombuManager(PubSubManager):  # pragma: no cover
         return kombu.Exchange(self.channel, **options)
 
     def _queue(self):
-        queue_name = 'flask-socketio.' + str(uuid.uuid4())
+        queue_name = 'python-socketio.' + str(uuid.uuid4())
         options = {'durable': False, 'queue_arguments': {'x-expires': 300000}}
         options.update(self.queue_options)
         return kombu.Queue(queue_name, self._exchange(), **options)
diff --git a/libs/socketio/manager.py b/libs/socketio/manager.py
index 813c4af9e..3ebf67688 100644
--- a/libs/socketio/manager.py
+++ b/libs/socketio/manager.py
@@ -20,9 +20,10 @@ class Manager(base_manager.BaseManager):
         return self.is_connected(sid, namespace)
 
     def emit(self, event, data, namespace, room=None, skip_sid=None,
-             callback=None, **kwargs):
+             callback=None, to=None, **kwargs):
         """Emit a message to a single client, a room, or all the clients
         connected to the namespace."""
+        room = to or room
         if namespace not in self.rooms:
             return
         if isinstance(data, tuple):
diff --git a/libs/socketio/namespace.py b/libs/socketio/namespace.py
index ab4f69f80..60cab7831 100644
--- a/libs/socketio/namespace.py
+++ b/libs/socketio/namespace.py
@@ -21,9 +21,16 @@ class Namespace(base_namespace.BaseServerNamespace):
         method can be overridden if special dispatching rules are needed, or if
         having a single method that catches all events is desired.
         """
-        handler_name = 'on_' + event
+        handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
-            return getattr(self, handler_name)(*args)
+            try:
+                return getattr(self, handler_name)(*args)
+            except TypeError:
+                # legacy disconnect events do not have a reason argument
+                if event == 'disconnect':
+                    return getattr(self, handler_name)(*args[:-1])
+                else:  # pragma: no cover
+                    raise
 
     def emit(self, event, data=None, to=None, room=None, skip_sid=None,
              namespace=None, callback=None, ignore_queue=False):
@@ -152,9 +159,16 @@ class ClientNamespace(base_namespace.BaseClientNamespace):
         method can be overridden if special dispatching rules are needed, or if
         having a single method that catches all events is desired.
         """
-        handler_name = 'on_' + event
+        handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
-            return getattr(self, handler_name)(*args)
+            try:
+                return getattr(self, handler_name)(*args)
+            except TypeError:
+                # legacy disconnect events do not have a reason argument
+                if event == 'disconnect':
+                    return getattr(self, handler_name)(*args[:-1])
+                else:  # pragma: no cover
+                    raise
 
     def emit(self, event, data=None, namespace=None, callback=None):
         """Emit a custom event to the server.
diff --git a/libs/socketio/packet.py b/libs/socketio/packet.py
index 183076948..f7ad87e65 100644
--- a/libs/socketio/packet.py
+++ b/libs/socketio/packet.py
@@ -7,7 +7,7 @@ packet_names = ['CONNECT', 'DISCONNECT', 'EVENT', 'ACK', 'CONNECT_ERROR',
                 'BINARY_EVENT', 'BINARY_ACK']
 
 
-class Packet(object):
+class Packet:
     """Socket.IO packet."""
 
     # the format of the Socket.IO packet is as follows:
@@ -185,6 +185,6 @@ class Packet(object):
             'data': self.data,
             'nsp': self.namespace,
         }
-        if self.id:
+        if self.id is not None:
             d['id'] = self.id
         return d
diff --git a/libs/socketio/pubsub_manager.py b/libs/socketio/pubsub_manager.py
index 5ca7619c2..3270b4cb8 100644
--- a/libs/socketio/pubsub_manager.py
+++ b/libs/socketio/pubsub_manager.py
@@ -37,7 +37,7 @@ class PubSubManager(Manager):
         self._get_logger().info(self.name + ' backend initialized.')
 
     def emit(self, event, data, namespace=None, room=None, skip_sid=None,
-             callback=None, **kwargs):
+             callback=None, to=None, **kwargs):
         """Emit a message to a single client, a room, or all the clients
         connected to the namespace.
 
@@ -46,6 +46,7 @@ class PubSubManager(Manager):
 
         The parameters are the same as in :meth:`.Server.emit`.
         """
+        room = to or room
         if kwargs.get('ignore_queue'):
             return super().emit(
                 event, data, namespace=namespace, room=room, skip_sid=skip_sid,
diff --git a/libs/socketio/redis_manager.py b/libs/socketio/redis_manager.py
index ae9fa2928..a16fb2c73 100644
--- a/libs/socketio/redis_manager.py
+++ b/libs/socketio/redis_manager.py
@@ -94,8 +94,7 @@ class RedisManager(PubSubManager):  # pragma: no cover
                     self._redis_connect()
                     self.pubsub.subscribe(self.channel)
                     retry_sleep = 1
-                for message in self.pubsub.listen():
-                    yield message
+                yield from self.pubsub.listen()
             except redis.exceptions.RedisError:
                 logger.error('Cannot receive from redis... '
                              'retrying in {} secs'.format(retry_sleep))
diff --git a/libs/socketio/server.py b/libs/socketio/server.py
index c8bcaa334..71c702de1 100644
--- a/libs/socketio/server.py
+++ b/libs/socketio/server.py
@@ -87,7 +87,7 @@ class Server(base_server.BaseServer):
                                   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 tot he client containing the client
+                   server sends back to the 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
@@ -106,6 +106,9 @@ class Server(base_server.BaseServer):
                             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
@@ -360,7 +363,7 @@ class Server(base_server.BaseServer):
                 with sio.session(sid) as session:
                     print('received message from ', session['username'])
         """
-        class _session_context_manager(object):
+        class _session_context_manager:
             def __init__(self, server, sid, namespace):
                 self.server = server
                 self.sid = sid
@@ -400,7 +403,8 @@ class Server(base_server.BaseServer):
             eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
             self._send_packet(eio_sid, self.packet_class(
                 packet.DISCONNECT, namespace=namespace))
-            self._trigger_event('disconnect', namespace, sid)
+            self._trigger_event('disconnect', namespace, sid,
+                                self.reason.SERVER_DISCONNECT)
             self.manager.disconnect(sid, namespace=namespace,
                                     ignore_queue=True)
 
@@ -554,14 +558,15 @@ class Server(base_server.BaseServer):
             self._send_packet(eio_sid, self.packet_class(
                 packet.CONNECT, {'sid': sid}, namespace=namespace))
 
-    def _handle_disconnect(self, eio_sid, namespace):
+    def _handle_disconnect(self, eio_sid, namespace, reason=None):
         """Handle a client disconnect."""
         namespace = namespace or '/'
         sid = self.manager.sid_from_eio_sid(eio_sid, namespace)
         if not self.manager.is_connected(sid, namespace):  # pragma: no cover
             return
         self.manager.pre_disconnect(sid, namespace=namespace)
-        self._trigger_event('disconnect', namespace, sid)
+        self._trigger_event('disconnect', namespace, sid,
+                            reason or self.reason.CLIENT_DISCONNECT)
         self.manager.disconnect(sid, namespace, ignore_queue=True)
 
     def _handle_event(self, eio_sid, namespace, id, data):
@@ -608,7 +613,14 @@ class Server(base_server.BaseServer):
         # first see if we have an explicit handler for the event
         handler, args = self._get_event_handler(event, namespace, args)
         if handler:
-            return handler(*args)
+            try:
+                return handler(*args)
+            except TypeError:
+                # legacy disconnect events use only one argument
+                if event == 'disconnect':
+                    return handler(*args[:-1])
+                else:  # pragma: no cover
+                    raise
         # or else, forward the event to a namespace handler if one exists
         handler, args = self._get_namespace_handler(namespace, args)
         if handler:
@@ -639,7 +651,8 @@ class Server(base_server.BaseServer):
             if pkt.packet_type == packet.CONNECT:
                 self._handle_connect(eio_sid, pkt.namespace, pkt.data)
             elif pkt.packet_type == packet.DISCONNECT:
-                self._handle_disconnect(eio_sid, pkt.namespace)
+                self._handle_disconnect(eio_sid, pkt.namespace,
+                                        self.reason.CLIENT_DISCONNECT)
             elif pkt.packet_type == packet.EVENT:
                 self._handle_event(eio_sid, pkt.namespace, pkt.id, pkt.data)
             elif pkt.packet_type == packet.ACK:
@@ -652,10 +665,10 @@ class Server(base_server.BaseServer):
             else:
                 raise ValueError('Unknown packet type.')
 
-    def _handle_eio_disconnect(self, eio_sid):
+    def _handle_eio_disconnect(self, eio_sid, reason):
         """Handle Engine.IO disconnect event."""
         for n in list(self.manager.get_namespaces()).copy():
-            self._handle_disconnect(eio_sid, n)
+            self._handle_disconnect(eio_sid, n, reason)
         if eio_sid in self.environ:
             del self.environ[eio_sid]
 
diff --git a/libs/socketio/zmq_manager.py b/libs/socketio/zmq_manager.py
index 760fbc387..468dc268b 100644
--- a/libs/socketio/zmq_manager.py
+++ b/libs/socketio/zmq_manager.py
@@ -66,7 +66,7 @@ class ZmqManager(PubSubManager):  # pragma: no cover
         sink.connect(sink_url)
 
         sub = zmq.Context().socket(zmq.SUB)
-        sub.setsockopt_string(zmq.SUBSCRIBE, u'')
+        sub.setsockopt_string(zmq.SUBSCRIBE, '')
         sub.connect(sub_url)
 
         self.sink = sink
diff --git a/libs/soupsieve-2.3.2.post1.dist-info/METADATA b/libs/soupsieve-2.3.2.post1.dist-info/METADATA
index a41417282..0c2e17067 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.1
+Metadata-Version: 2.3
 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 fe5941fc8..2b13b9330 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=Z3OtmokeTrXhMB768n4ksU3i6okVF44a84FAyenO_jc,5700
+soupsieve-2.3.2.post1.dist-info/METADATA,sha256=VEZjsG1NqmGWu5L_aYIJMB9ytDcWWTi_f0QlaJ40AR4,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=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+soupsieve-2.3.2.post1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,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 5998f3aab..cdd68a497 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.21.1
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/sqlalchemy/__init__.py b/libs/sqlalchemy/__init__.py
index 7090a744c..c74afd901 100644
--- a/libs/sqlalchemy/__init__.py
+++ b/libs/sqlalchemy/__init__.py
@@ -1,5 +1,5 @@
 # __init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 Uuid as Uuid
 from .types import VARBINARY as VARBINARY
 from .types import VARCHAR as VARCHAR
 
-__version__ = "2.0.27"
+__version__ = "2.0.37"
 
 
 def __go(lcls: Any) -> None:
diff --git a/libs/sqlalchemy/connectors/__init__.py b/libs/sqlalchemy/connectors/__init__.py
index f1cae0b3c..43cd1035c 100644
--- a/libs/sqlalchemy/connectors/__init__.py
+++ b/libs/sqlalchemy/connectors/__init__.py
@@ -1,5 +1,5 @@
 # connectors/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 3b5c3b497..39b2a8a23 100644
--- a/libs/sqlalchemy/connectors/aioodbc.py
+++ b/libs/sqlalchemy/connectors/aioodbc.py
@@ -1,5 +1,5 @@
 # connectors/aioodbc.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/connectors/asyncio.py b/libs/sqlalchemy/connectors/asyncio.py
index 0b44f23a0..c4f0d7154 100644
--- a/libs/sqlalchemy/connectors/asyncio.py
+++ b/libs/sqlalchemy/connectors/asyncio.py
@@ -1,5 +1,5 @@
 # connectors/asyncio.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -11,7 +11,6 @@
 from __future__ import annotations
 
 import collections
-import itertools
 
 from ..engine import AdaptedConnection
 from ..util.concurrency import asyncio
@@ -37,7 +36,8 @@ class AsyncAdapt_dbapi_cursor:
         cursor = self._connection.cursor()
         self._cursor = self._aenter_cursor(cursor)
 
-        self._rows = collections.deque()
+        if not self.server_side:
+            self._rows = collections.deque()
 
     def _aenter_cursor(self, cursor):
         return self.await_(cursor.__aenter__())
@@ -114,11 +114,8 @@ class AsyncAdapt_dbapi_cursor:
     def fetchmany(self, size=None):
         if size is None:
             size = self.arraysize
-
-        rr = iter(self._rows)
-        retval = list(itertools.islice(rr, 0, size))
-        self._rows = collections.deque(rr)
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
         retval = list(self._rows)
@@ -153,6 +150,14 @@ class AsyncAdapt_dbapi_ss_cursor(AsyncAdapt_dbapi_cursor):
     def fetchall(self):
         return self.await_(self._cursor.fetchall())
 
+    def __iter__(self):
+        iterator = self._cursor.__aiter__()
+        while True:
+            try:
+                yield self.await_(iterator.__anext__())
+            except StopAsyncIteration:
+                break
+
 
 class AsyncAdapt_dbapi_connection(AdaptedConnection):
     _cursor_cls = AsyncAdapt_dbapi_cursor
diff --git a/libs/sqlalchemy/connectors/pyodbc.py b/libs/sqlalchemy/connectors/pyodbc.py
index f204d80a8..92b7c3a41 100644
--- a/libs/sqlalchemy/connectors/pyodbc.py
+++ b/libs/sqlalchemy/connectors/pyodbc.py
@@ -1,5 +1,5 @@
 # connectors/pyodbc.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/cyextension/.gitignore b/libs/sqlalchemy/cyextension/.gitignore
deleted file mode 100644
index dfc107eaf..000000000
--- a/libs/sqlalchemy/cyextension/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# cython complied files
-*.c
-*.o
-# cython annotated output
-*.html
\ No newline at end of file
diff --git a/libs/sqlalchemy/cyextension/__init__.py b/libs/sqlalchemy/cyextension/__init__.py
index 88a4d9039..cb8dc2c6e 100644
--- a/libs/sqlalchemy/cyextension/__init__.py
+++ b/libs/sqlalchemy/cyextension/__init__.py
@@ -1,5 +1,5 @@
 # cyextension/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/__init__.py b/libs/sqlalchemy/dialects/__init__.py
index 7d5cc1c9c..31ce6d64b 100644
--- a/libs/sqlalchemy/dialects/__init__.py
+++ b/libs/sqlalchemy/dialects/__init__.py
@@ -1,5 +1,5 @@
 # dialects/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/_typing.py b/libs/sqlalchemy/dialects/_typing.py
index 9ee6e4bca..4dd40d722 100644
--- a/libs/sqlalchemy/dialects/_typing.py
+++ b/libs/sqlalchemy/dialects/_typing.py
@@ -1,5 +1,5 @@
 # dialects/_typing.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -12,14 +12,19 @@ from typing import Mapping
 from typing import Optional
 from typing import Union
 
-from ..sql._typing import _DDLColumnArgument
-from ..sql.elements import DQLDMLClauseElement
+from ..sql import roles
+from ..sql.base import ColumnCollection
+from ..sql.schema import Column
 from ..sql.schema import ColumnCollectionConstraint
 from ..sql.schema import Index
 
 
 _OnConflictConstraintT = Union[str, ColumnCollectionConstraint, Index, None]
-_OnConflictIndexElementsT = Optional[Iterable[_DDLColumnArgument]]
-_OnConflictIndexWhereT = Optional[DQLDMLClauseElement]
-_OnConflictSetT = Optional[Mapping[Any, Any]]
-_OnConflictWhereT = Union[DQLDMLClauseElement, str, None]
+_OnConflictIndexElementsT = Optional[
+    Iterable[Union[Column[Any], str, roles.DDLConstraintColumnRole]]
+]
+_OnConflictIndexWhereT = Optional[roles.WhereHavingRole]
+_OnConflictSetT = Optional[
+    Union[Mapping[Any, Any], ColumnCollection[Any, Any]]
+]
+_OnConflictWhereT = Optional[roles.WhereHavingRole]
diff --git a/libs/sqlalchemy/dialects/mssql/__init__.py b/libs/sqlalchemy/dialects/mssql/__init__.py
index 19ab7c422..20140fddd 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 65945d975..522ad1d6b 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,13 +32,12 @@ This dialect should normally be used only with the
 styles are otherwise equivalent to those documented in the pyodbc section::
 
     from sqlalchemy.ext.asyncio import create_async_engine
+
     engine = create_async_engine(
         "mssql+aioodbc://scott:tiger@mssql2017:1433/test?"
         "driver=ODBC+Driver+18+for+SQL+Server&TrustServerCertificate=yes"
     )
 
-
-
 """
 
 from __future__ import annotations
diff --git a/libs/sqlalchemy/dialects/mssql/base.py b/libs/sqlalchemy/dialects/mssql/base.py
index 98f7f6dce..916809e76 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,7 +9,6 @@
 """
 .. dialect:: mssql
     :name: Microsoft SQL Server
-    :full_support: 2017
     :normal_support: 2012+
     :best_effort: 2005+
 
@@ -40,9 +39,12 @@ considered to be the identity column - unless it is associated with a
     from sqlalchemy import Table, MetaData, Column, Integer
 
     m = MetaData()
-    t = Table('t', m,
-            Column('id', Integer, primary_key=True),
-            Column('x', Integer))
+    t = Table(
+        "t",
+        m,
+        Column("id", Integer, primary_key=True),
+        Column("x", Integer),
+    )
     m.create_all(engine)
 
 The above example will generate DDL as:
@@ -60,9 +62,12 @@ specify ``False`` for the :paramref:`_schema.Column.autoincrement` flag,
 on the first integer primary key column::
 
     m = MetaData()
-    t = Table('t', m,
-            Column('id', Integer, primary_key=True, autoincrement=False),
-            Column('x', Integer))
+    t = Table(
+        "t",
+        m,
+        Column("id", Integer, primary_key=True, autoincrement=False),
+        Column("x", Integer),
+    )
     m.create_all(engine)
 
 To add the ``IDENTITY`` keyword to a non-primary key column, specify
@@ -72,9 +77,12 @@ To add the ``IDENTITY`` keyword to a non-primary key column, specify
 is set to ``False`` on any integer primary key column::
 
     m = MetaData()
-    t = Table('t', m,
-            Column('id', Integer, primary_key=True, autoincrement=False),
-            Column('x', Integer, autoincrement=True))
+    t = Table(
+        "t",
+        m,
+        Column("id", Integer, primary_key=True, autoincrement=False),
+        Column("x", Integer, autoincrement=True),
+    )
     m.create_all(engine)
 
 .. versionchanged::  1.4   Added :class:`_schema.Identity` construct
@@ -137,14 +145,12 @@ parameters passed to the :class:`_schema.Identity` object::
     from sqlalchemy import Table, Integer, Column, Identity
 
     test = Table(
-        'test', metadata,
+        "test",
+        metadata,
         Column(
-            'id',
-            Integer,
-            primary_key=True,
-            Identity(start=100, increment=10)
+            "id", Integer, primary_key=True, Identity(start=100, increment=10)
         ),
-        Column('name', String(20))
+        Column("name", String(20)),
     )
 
 The CREATE TABLE for the above :class:`_schema.Table` object would be:
@@ -154,7 +160,7 @@ The CREATE TABLE for the above :class:`_schema.Table` object would be:
    CREATE TABLE test (
      id INTEGER NOT NULL IDENTITY(100,10) PRIMARY KEY,
      name VARCHAR(20) NULL,
-     )
+   )
 
 .. note::
 
@@ -187,6 +193,7 @@ type deployed to the SQL Server database can be specified as ``Numeric`` using
 
     Base = declarative_base()
 
+
     class TestTable(Base):
         __tablename__ = "test"
         id = Column(
@@ -212,8 +219,9 @@ integer values in Python 3), use :class:`_types.TypeDecorator` as follows::
 
     from sqlalchemy import TypeDecorator
 
+
     class NumericAsInteger(TypeDecorator):
-        '''normalize floating point return values into ints'''
+        "normalize floating point return values into ints"
 
         impl = Numeric(10, 0, asdecimal=False)
         cache_ok = True
@@ -223,6 +231,7 @@ integer values in Python 3), use :class:`_types.TypeDecorator` as follows::
                 value = int(value)
             return value
 
+
     class TestTable(Base):
         __tablename__ = "test"
         id = Column(
@@ -271,11 +280,11 @@ The process for fetching this value has several variants:
     fetched in order to receive the value.  Given a table as::
 
         t = Table(
-            't',
+            "t",
             metadata,
-            Column('id', Integer, primary_key=True),
-            Column('x', Integer),
-            implicit_returning=False
+            Column("id", Integer, primary_key=True),
+            Column("x", Integer),
+            implicit_returning=False,
         )
 
     an INSERT will look like:
@@ -301,12 +310,13 @@ statement proceeding, and ``SET IDENTITY_INSERT OFF`` subsequent to the
 execution.  Given this example::
 
     m = MetaData()
-    t = Table('t', m, Column('id', Integer, primary_key=True),
-                    Column('x', Integer))
+    t = Table(
+        "t", m, Column("id", Integer, primary_key=True), Column("x", Integer)
+    )
     m.create_all(engine)
 
     with engine.begin() as conn:
-        conn.execute(t.insert(), {'id': 1, 'x':1}, {'id':2, 'x':2})
+        conn.execute(t.insert(), {"id": 1, "x": 1}, {"id": 2, "x": 2})
 
 The above column will be created with IDENTITY, however the INSERT statement
 we emit is specifying explicit values.  In the echo output we can see
@@ -342,7 +352,11 @@ The :class:`.Sequence` object creates "real" sequences, i.e.,
     >>> from sqlalchemy import Sequence
     >>> from sqlalchemy.schema import CreateSequence
     >>> from sqlalchemy.dialects import mssql
-    >>> print(CreateSequence(Sequence("my_seq", start=1)).compile(dialect=mssql.dialect()))
+    >>> print(
+    ...     CreateSequence(Sequence("my_seq", start=1)).compile(
+    ...         dialect=mssql.dialect()
+    ...     )
+    ... )
     {printsql}CREATE SEQUENCE my_seq START WITH 1
 
 For integer primary key generation, SQL Server's ``IDENTITY`` construct should
@@ -376,12 +390,12 @@ more than one backend without using dialect-specific types.
 To build a SQL Server VARCHAR or NVARCHAR with MAX length, use None::
 
     my_table = Table(
-        'my_table', metadata,
-        Column('my_data', VARCHAR(None)),
-        Column('my_n_data', NVARCHAR(None))
+        "my_table",
+        metadata,
+        Column("my_data", VARCHAR(None)),
+        Column("my_n_data", NVARCHAR(None)),
     )
 
-
 Collation Support
 -----------------
 
@@ -389,10 +403,13 @@ Character collations are supported by the base string types,
 specified by the string argument "collation"::
 
     from sqlalchemy import VARCHAR
-    Column('login', VARCHAR(32, collation='Latin1_General_CI_AS'))
+
+    Column("login", VARCHAR(32, collation="Latin1_General_CI_AS"))
 
 When such a column is associated with a :class:`_schema.Table`, the
-CREATE TABLE statement for this column will yield::
+CREATE TABLE statement for this column will yield:
+
+.. sourcecode:: sql
 
     login VARCHAR(32) COLLATE Latin1_General_CI_AS NULL
 
@@ -412,7 +429,9 @@ versions when no OFFSET clause is present.  A statement such as::
 
     select(some_table).limit(5)
 
-will render similarly to::
+will render similarly to:
+
+.. sourcecode:: sql
 
     SELECT TOP 5 col1, col2.. FROM table
 
@@ -422,7 +441,9 @@ LIMIT and OFFSET, or just OFFSET alone, will be rendered using the
 
     select(some_table).order_by(some_table.c.col3).limit(5).offset(10)
 
-will render similarly to::
+will render similarly to:
+
+.. sourcecode:: sql
 
     SELECT anon_1.col1, anon_1.col2 FROM (SELECT col1, col2,
     ROW_NUMBER() OVER (ORDER BY col3) AS
@@ -475,16 +496,13 @@ each new connection.
 To set isolation level using :func:`_sa.create_engine`::
 
     engine = create_engine(
-        "mssql+pyodbc://scott:tiger@ms_2008",
-        isolation_level="REPEATABLE READ"
+        "mssql+pyodbc://scott:tiger@ms_2008", isolation_level="REPEATABLE READ"
     )
 
 To set using per-connection execution options::
 
     connection = engine.connect()
-    connection = connection.execution_options(
-        isolation_level="READ COMMITTED"
-    )
+    connection = connection.execution_options(isolation_level="READ COMMITTED")
 
 Valid values for ``isolation_level`` include:
 
@@ -534,7 +552,6 @@ will remain consistent with the state of the transaction::
 
     mssql_engine = create_engine(
         "mssql+pyodbc://scott:tiger^5HHH@mssql2017:1433/test?driver=ODBC+Driver+17+for+SQL+Server",
-
         # disable default reset-on-return scheme
         pool_reset_on_return=None,
     )
@@ -563,13 +580,17 @@ Nullability
 -----------
 MSSQL has support for three levels of column nullability. The default
 nullability allows nulls and is explicit in the CREATE TABLE
-construct::
+construct:
+
+.. sourcecode:: sql
 
     name VARCHAR(20) NULL
 
 If ``nullable=None`` is specified then no specification is made. In
 other words the database's configured default is used. This will
-render::
+render:
+
+.. sourcecode:: sql
 
     name VARCHAR(20)
 
@@ -625,8 +646,9 @@ behavior of this flag is as follows:
 * The flag can be set to either ``True`` or ``False`` when the dialect
   is created, typically via :func:`_sa.create_engine`::
 
-        eng = create_engine("mssql+pymssql://user:pass@host/db",
-                        deprecate_large_types=True)
+        eng = create_engine(
+            "mssql+pymssql://user:pass@host/db", deprecate_large_types=True
+        )
 
 * Complete control over whether the "old" or "new" types are rendered is
   available in all SQLAlchemy versions by using the UPPERCASE type objects
@@ -648,9 +670,10 @@ at once using the :paramref:`_schema.Table.schema` argument of
 :class:`_schema.Table`::
 
     Table(
-        "some_table", metadata,
+        "some_table",
+        metadata,
         Column("q", String(50)),
-        schema="mydatabase.dbo"
+        schema="mydatabase.dbo",
     )
 
 When performing operations such as table or component reflection, a schema
@@ -662,9 +685,10 @@ components will be quoted separately for case sensitive names and other
 special characters.   Given an argument as below::
 
     Table(
-        "some_table", metadata,
+        "some_table",
+        metadata,
         Column("q", String(50)),
-        schema="MyDataBase.dbo"
+        schema="MyDataBase.dbo",
     )
 
 The above schema would be rendered as ``[MyDataBase].dbo``, and also in
@@ -677,21 +701,22 @@ Below, the "owner" will be considered as ``MyDataBase.dbo`` and the
 "database" will be None::
 
     Table(
-        "some_table", metadata,
+        "some_table",
+        metadata,
         Column("q", String(50)),
-        schema="[MyDataBase.dbo]"
+        schema="[MyDataBase.dbo]",
     )
 
 To individually specify both database and owner name with special characters
 or embedded dots, use two sets of brackets::
 
     Table(
-        "some_table", metadata,
+        "some_table",
+        metadata,
         Column("q", String(50)),
-        schema="[MyDataBase.Period].[MyOwner.Dot]"
+        schema="[MyDataBase.Period].[MyOwner.Dot]",
     )
 
-
 .. versionchanged:: 1.2 the SQL Server dialect now treats brackets as
    identifier delimiters splitting the schema into separate database
    and owner tokens, to allow dots within either name itself.
@@ -706,10 +731,11 @@ schema-qualified table would be auto-aliased when used in a
 SELECT statement; given a table::
 
     account_table = Table(
-        'account', metadata,
-        Column('id', Integer, primary_key=True),
-        Column('info', String(100)),
-        schema="customer_schema"
+        "account",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column("info", String(100)),
+        schema="customer_schema",
     )
 
 this legacy mode of rendering would assume that "customer_schema.account"
@@ -752,37 +778,55 @@ which renders the index as ``CREATE CLUSTERED INDEX my_index ON table (x)``.
 
 To generate a clustered primary key use::
 
-    Table('my_table', metadata,
-          Column('x', ...),
-          Column('y', ...),
-          PrimaryKeyConstraint("x", "y", mssql_clustered=True))
+    Table(
+        "my_table",
+        metadata,
+        Column("x", ...),
+        Column("y", ...),
+        PrimaryKeyConstraint("x", "y", mssql_clustered=True),
+    )
 
-which will render the table, for example, as::
+which will render the table, for example, as:
 
-  CREATE TABLE my_table (x INTEGER NOT NULL, y INTEGER NOT NULL,
-                         PRIMARY KEY CLUSTERED (x, y))
+.. sourcecode:: sql
+
+  CREATE TABLE my_table (
+    x INTEGER NOT NULL,
+    y INTEGER NOT NULL,
+    PRIMARY KEY CLUSTERED (x, y)
+  )
 
 Similarly, we can generate a clustered unique constraint using::
 
-    Table('my_table', metadata,
-          Column('x', ...),
-          Column('y', ...),
-          PrimaryKeyConstraint("x"),
-          UniqueConstraint("y", mssql_clustered=True),
-          )
+    Table(
+        "my_table",
+        metadata,
+        Column("x", ...),
+        Column("y", ...),
+        PrimaryKeyConstraint("x"),
+        UniqueConstraint("y", mssql_clustered=True),
+    )
 
 To explicitly request a non-clustered primary key (for example, when
 a separate clustered index is desired), use::
 
-    Table('my_table', metadata,
-          Column('x', ...),
-          Column('y', ...),
-          PrimaryKeyConstraint("x", "y", mssql_clustered=False))
+    Table(
+        "my_table",
+        metadata,
+        Column("x", ...),
+        Column("y", ...),
+        PrimaryKeyConstraint("x", "y", mssql_clustered=False),
+    )
 
-which will render the table, for example, as::
+which will render the table, for example, as:
 
-  CREATE TABLE my_table (x INTEGER NOT NULL, y INTEGER NOT NULL,
-                         PRIMARY KEY NONCLUSTERED (x, y))
+.. sourcecode:: sql
+
+  CREATE TABLE my_table (
+    x INTEGER NOT NULL,
+    y INTEGER NOT NULL,
+    PRIMARY KEY NONCLUSTERED (x, y)
+  )
 
 Columnstore Index Support
 -------------------------
@@ -820,7 +864,7 @@ INCLUDE
 The ``mssql_include`` option renders INCLUDE(colname) for the given string
 names::
 
-    Index("my_index", table.c.x, mssql_include=['y'])
+    Index("my_index", table.c.x, mssql_include=["y"])
 
 would render the index as ``CREATE INDEX my_index ON table (x) INCLUDE (y)``
 
@@ -875,18 +919,19 @@ To disable the usage of OUTPUT INSERTED on a per-table basis,
 specify ``implicit_returning=False`` for each :class:`_schema.Table`
 which has triggers::
 
-    Table('mytable', metadata,
-        Column('id', Integer, primary_key=True),
+    Table(
+        "mytable",
+        metadata,
+        Column("id", Integer, primary_key=True),
         # ...,
-        implicit_returning=False
+        implicit_returning=False,
     )
 
 Declarative form::
 
     class MyClass(Base):
         # ...
-        __table_args__ = {'implicit_returning':False}
-
+        __table_args__ = {"implicit_returning": False}
 
 .. _mssql_rowcount_versioning:
 
@@ -920,7 +965,9 @@ isolation mode that locks entire tables, and causes even mildly concurrent
 applications to have long held locks and frequent deadlocks.
 Enabling snapshot isolation for the database as a whole is recommended
 for modern levels of concurrency support.  This is accomplished via the
-following ALTER DATABASE commands executed at the SQL prompt::
+following ALTER DATABASE commands executed at the SQL prompt:
+
+.. sourcecode:: sql
 
     ALTER DATABASE MyDatabase SET ALLOW_SNAPSHOT_ISOLATION ON
 
@@ -1555,29 +1602,6 @@ class MSUUid(sqltypes.Uuid):
 
                 return process
 
-    def _sentinel_value_resolver(self, dialect):
-        if not self.native_uuid:
-            # dealing entirely with strings going in and out of
-            # CHAR(32)
-            return None
-
-        # true if we expect the returned UUID values to be strings
-        # pymssql sends UUID objects back, pyodbc sends strings,
-        # however pyodbc converts them to uppercase coming back, so
-        # need special logic here
-        character_based_uuid = not dialect.supports_native_uuid
-
-        if character_based_uuid:
-            # we sent UUID objects in all cases, see bind_processor()
-            def process(uuid_value):
-                return str(uuid_value).upper()
-
-            return process
-        elif not self.as_uuid:
-            return _python_UUID
-        else:
-            return None
-
 
 class UNIQUEIDENTIFIER(sqltypes.Uuid[sqltypes._UUID_RETURN]):
     __visit_name__ = "UNIQUEIDENTIFIER"
@@ -1841,7 +1865,6 @@ class MSExecutionContext(default.DefaultExecutionContext):
     _enable_identity_insert = False
     _select_lastrowid = False
     _lastrowid = None
-    _rowcount = None
 
     dialect: MSDialect
 
@@ -1961,13 +1984,6 @@ class MSExecutionContext(default.DefaultExecutionContext):
     def get_lastrowid(self):
         return self._lastrowid
 
-    @property
-    def rowcount(self):
-        if self._rowcount is not None:
-            return self._rowcount
-        else:
-            return self.cursor.rowcount
-
     def handle_dbapi_exception(self, e):
         if self._enable_identity_insert:
             try:
@@ -2019,6 +2035,10 @@ class MSSQLCompiler(compiler.SQLCompiler):
         self.tablealiases = {}
         super().__init__(*args, **kwargs)
 
+    def _format_frame_clause(self, range_, **kw):
+        kw["literal_execute"] = True
+        return super()._format_frame_clause(range_, **kw)
+
     def _with_legacy_schema_aliasing(fn):
         def decorate(self, *arg, **kw):
             if self.dialect.legacy_schema_aliasing:
diff --git a/libs/sqlalchemy/dialects/mssql/information_schema.py b/libs/sqlalchemy/dialects/mssql/information_schema.py
index 0c5f2372d..b60bb158b 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/json.py b/libs/sqlalchemy/dialects/mssql/json.py
index 18bea09d0..a2d3ce814 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -54,9 +54,7 @@ class JSON(sqltypes.JSON):
        dictionary or list, the :meth:`_types.JSON.Comparator.as_json` accessor
        should be used::
 
-            stmt = select(
-                data_table.c.data["some key"].as_json()
-            ).where(
+            stmt = select(data_table.c.data["some key"].as_json()).where(
                 data_table.c.data["some key"].as_json() == {"sub": "structure"}
             )
 
@@ -67,9 +65,7 @@ class JSON(sqltypes.JSON):
        :meth:`_types.JSON.Comparator.as_integer`,
        :meth:`_types.JSON.Comparator.as_float`::
 
-            stmt = select(
-                data_table.c.data["some key"].as_string()
-            ).where(
+            stmt = select(data_table.c.data["some key"].as_string()).where(
                 data_table.c.data["some key"].as_string() == "some string"
             )
 
diff --git a/libs/sqlalchemy/dialects/mssql/provision.py b/libs/sqlalchemy/dialects/mssql/provision.py
index 143d386c4..10165856e 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -22,10 +22,17 @@ from ...testing.provision import generate_driver_url
 from ...testing.provision import get_temp_table_name
 from ...testing.provision import log
 from ...testing.provision import normalize_sequence
+from ...testing.provision import post_configure_engine
 from ...testing.provision import run_reap_dbs
 from ...testing.provision import temp_table_keyword_args
 
 
+@post_configure_engine.for_db("mssql")
+def post_configure_engine(url, engine, follower_ident):
+    if engine.driver == "pyodbc":
+        engine.dialect.dbapi.pooling = False
+
+
 @generate_driver_url.for_db("mssql")
 def generate_driver_url(url, driver, query_str):
     backend = url.get_backend_name()
diff --git a/libs/sqlalchemy/dialects/mssql/pymssql.py b/libs/sqlalchemy/dialects/mssql/pymssql.py
index ea1f9bd3a..301a98eb4 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -103,6 +103,7 @@ class MSDialect_pymssql(MSDialect):
             "message 20006",  # Write to the server failed
             "message 20017",  # Unexpected EOF from the server
             "message 20047",  # DBPROCESS is dead or not enabled
+            "The server failed to resume the transaction",
         ):
             if msg in str(e):
                 return True
diff --git a/libs/sqlalchemy/dialects/mssql/pyodbc.py b/libs/sqlalchemy/dialects/mssql/pyodbc.py
index 76ea046de..cbf0adbfe 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -30,7 +30,9 @@ is configured on the client, a basic DSN-based connection looks like::
 
     engine = create_engine("mssql+pyodbc://scott:tiger@some_dsn")
 
-Which above, will pass the following connection string to PyODBC::
+Which above, will pass the following connection string to PyODBC:
+
+.. sourcecode:: text
 
     DSN=some_dsn;UID=scott;PWD=tiger
 
@@ -49,7 +51,9 @@ When using a hostname connection, the driver name must also be specified in the
 query parameters of the URL.  As these names usually have spaces in them, the
 name must be URL encoded which means using plus signs for spaces::
 
-    engine = create_engine("mssql+pyodbc://scott:tiger@myhost:port/databasename?driver=ODBC+Driver+17+for+SQL+Server")
+    engine = create_engine(
+        "mssql+pyodbc://scott:tiger@myhost:port/databasename?driver=ODBC+Driver+17+for+SQL+Server"
+    )
 
 The ``driver`` keyword is significant to the pyodbc dialect and must be
 specified in lowercase.
@@ -69,6 +73,7 @@ internally::
 The equivalent URL can be constructed using :class:`_sa.engine.URL`::
 
     from sqlalchemy.engine import URL
+
     connection_url = URL.create(
         "mssql+pyodbc",
         username="scott",
@@ -83,7 +88,6 @@ The equivalent URL can be constructed using :class:`_sa.engine.URL`::
         },
     )
 
-
 Pass through exact Pyodbc string
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -94,8 +98,11 @@ using the parameter ``odbc_connect``.  A :class:`_sa.engine.URL` object
 can help make this easier::
 
     from sqlalchemy.engine import URL
+
     connection_string = "DRIVER={SQL Server Native Client 10.0};SERVER=dagger;DATABASE=test;UID=user;PWD=password"
-    connection_url = URL.create("mssql+pyodbc", query={"odbc_connect": connection_string})
+    connection_url = URL.create(
+        "mssql+pyodbc", query={"odbc_connect": connection_string}
+    )
 
     engine = create_engine(connection_url)
 
@@ -127,7 +134,8 @@ database using Azure credentials::
     from sqlalchemy.engine.url import URL
     from azure import identity
 
-    SQL_COPT_SS_ACCESS_TOKEN = 1256  # Connection option for access tokens, as defined in msodbcsql.h
+    # Connection option for access tokens, as defined in msodbcsql.h
+    SQL_COPT_SS_ACCESS_TOKEN = 1256
     TOKEN_URL = "https://database.windows.net/"  # The token URL for any Azure SQL database
 
     connection_string = "mssql+pyodbc://@my-server.database.windows.net/myDb?driver=ODBC+Driver+17+for+SQL+Server"
@@ -136,14 +144,19 @@ database using Azure credentials::
 
     azure_credentials = identity.DefaultAzureCredential()
 
+
     @event.listens_for(engine, "do_connect")
     def provide_token(dialect, conn_rec, cargs, cparams):
         # remove the "Trusted_Connection" parameter that SQLAlchemy adds
         cargs[0] = cargs[0].replace(";Trusted_Connection=Yes", "")
 
         # create token credential
-        raw_token = azure_credentials.get_token(TOKEN_URL).token.encode("utf-16-le")
-        token_struct = struct.pack(f"<I{len(raw_token)}s", len(raw_token), raw_token)
+        raw_token = azure_credentials.get_token(TOKEN_URL).token.encode(
+            "utf-16-le"
+        )
+        token_struct = struct.pack(
+            f"<I{len(raw_token)}s", len(raw_token), raw_token
+        )
 
         # apply it to keyword arguments
         cparams["attrs_before"] = {SQL_COPT_SS_ACCESS_TOKEN: token_struct}
@@ -176,7 +189,9 @@ emit a ``.rollback()`` after an operation had a failure of some kind.
 This specific case can be handled by passing ``ignore_no_transaction_on_rollback=True`` to
 the SQL Server dialect via the :func:`_sa.create_engine` function as follows::
 
-    engine = create_engine(connection_url, ignore_no_transaction_on_rollback=True)
+    engine = create_engine(
+        connection_url, ignore_no_transaction_on_rollback=True
+    )
 
 Using the above parameter, the dialect will catch ``ProgrammingError``
 exceptions raised during ``connection.rollback()`` and emit a warning
@@ -236,7 +251,6 @@ behavior and pass long strings as varchar(max)/nvarchar(max) using the
         },
     )
 
-
 Pyodbc Pooling / connection close behavior
 ------------------------------------------
 
@@ -301,7 +315,8 @@ Server dialect supports this parameter by passing the
 
     engine = create_engine(
         "mssql+pyodbc://scott:tiger@mssql2017:1433/test?driver=ODBC+Driver+17+for+SQL+Server",
-        fast_executemany=True)
+        fast_executemany=True,
+    )
 
 .. versionchanged:: 2.0.9 - the ``fast_executemany`` parameter now has its
    intended effect of this PyODBC feature taking effect for all INSERT
diff --git a/libs/sqlalchemy/dialects/mysql/__init__.py b/libs/sqlalchemy/dialects/mysql/__init__.py
index 60bac8744..9174c5441 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -53,7 +53,8 @@ from .base import YEAR
 from .dml import Insert
 from .dml import insert
 from .expression import match
-from ...util import compat
+from .mariadb import INET4
+from .mariadb import INET6
 
 # default dialect
 base.dialect = dialect = mysqldb.dialect
@@ -71,6 +72,8 @@ __all__ = (
     "DOUBLE",
     "ENUM",
     "FLOAT",
+    "INET4",
+    "INET6",
     "INTEGER",
     "INTEGER",
     "JSON",
diff --git a/libs/sqlalchemy/dialects/mysql/aiomysql.py b/libs/sqlalchemy/dialects/mysql/aiomysql.py
index 405fa82c8..bd5e7de6b 100644
--- a/libs/sqlalchemy/dialects/mysql/aiomysql.py
+++ b/libs/sqlalchemy/dialects/mysql/aiomysql.py
@@ -1,5 +1,5 @@
 # dialects/mysql/aiomysql.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -23,10 +23,14 @@ This dialect should normally be used only with the
 :func:`_asyncio.create_async_engine` engine creation function::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    engine = create_async_engine("mysql+aiomysql://user:pass@hostname/dbname?charset=utf8mb4")
 
+    engine = create_async_engine(
+        "mysql+aiomysql://user:pass@hostname/dbname?charset=utf8mb4"
+    )
 
 """  # noqa
+from collections import deque
+
 from .pymysql import MySQLDialect_pymysql
 from ... import pool
 from ... import util
@@ -57,7 +61,7 @@ class AsyncAdapt_aiomysql_cursor:
 
         # see https://github.com/aio-libs/aiomysql/issues/543
         self._cursor = self.await_(cursor.__aenter__())
-        self._rows = []
+        self._rows = deque()
 
     @property
     def description(self):
@@ -87,7 +91,7 @@ class AsyncAdapt_aiomysql_cursor:
         # 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[:] = []
+        self._rows.clear()
 
     def execute(self, operation, parameters=None):
         return self.await_(self._execute_async(operation, parameters))
@@ -106,7 +110,7 @@ class AsyncAdapt_aiomysql_cursor:
                 # 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 = list(await self._cursor.fetchall())
+                self._rows = deque(await self._cursor.fetchall())
             return result
 
     async def _executemany_async(self, operation, seq_of_parameters):
@@ -118,11 +122,11 @@ class AsyncAdapt_aiomysql_cursor:
 
     def __iter__(self):
         while self._rows:
-            yield self._rows.pop(0)
+            yield self._rows.popleft()
 
     def fetchone(self):
         if self._rows:
-            return self._rows.pop(0)
+            return self._rows.popleft()
         else:
             return None
 
@@ -130,13 +134,12 @@ class AsyncAdapt_aiomysql_cursor:
         if size is None:
             size = self.arraysize
 
-        retval = self._rows[0:size]
-        self._rows[:] = self._rows[size:]
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
-        retval = self._rows[:]
-        self._rows[:] = []
+        retval = list(self._rows)
+        self._rows.clear()
         return retval
 
 
diff --git a/libs/sqlalchemy/dialects/mysql/asyncmy.py b/libs/sqlalchemy/dialects/mysql/asyncmy.py
index 7360044d2..9ec54e694 100644
--- a/libs/sqlalchemy/dialects/mysql/asyncmy.py
+++ b/libs/sqlalchemy/dialects/mysql/asyncmy.py
@@ -1,5 +1,5 @@
 # dialects/mysql/asyncmy.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -21,10 +21,13 @@ This dialect should normally be used only with the
 :func:`_asyncio.create_async_engine` engine creation function::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    engine = create_async_engine("mysql+asyncmy://user:pass@hostname/dbname?charset=utf8mb4")
 
+    engine = create_async_engine(
+        "mysql+asyncmy://user:pass@hostname/dbname?charset=utf8mb4"
+    )
 
 """  # noqa
+from collections import deque
 from contextlib import asynccontextmanager
 
 from .pymysql import MySQLDialect_pymysql
@@ -56,7 +59,7 @@ class AsyncAdapt_asyncmy_cursor:
         cursor = self._connection.cursor()
 
         self._cursor = self.await_(cursor.__aenter__())
-        self._rows = []
+        self._rows = deque()
 
     @property
     def description(self):
@@ -86,7 +89,7 @@ class AsyncAdapt_asyncmy_cursor:
         # 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[:] = []
+        self._rows.clear()
 
     def execute(self, operation, parameters=None):
         return self.await_(self._execute_async(operation, parameters))
@@ -108,7 +111,7 @@ class AsyncAdapt_asyncmy_cursor:
                 # 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 = list(await self._cursor.fetchall())
+                self._rows = deque(await self._cursor.fetchall())
             return result
 
     async def _executemany_async(self, operation, seq_of_parameters):
@@ -120,11 +123,11 @@ class AsyncAdapt_asyncmy_cursor:
 
     def __iter__(self):
         while self._rows:
-            yield self._rows.pop(0)
+            yield self._rows.popleft()
 
     def fetchone(self):
         if self._rows:
-            return self._rows.pop(0)
+            return self._rows.popleft()
         else:
             return None
 
@@ -132,13 +135,12 @@ class AsyncAdapt_asyncmy_cursor:
         if size is None:
             size = self.arraysize
 
-        retval = self._rows[0:size]
-        self._rows[:] = self._rows[size:]
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
-        retval = self._rows[:]
-        self._rows[:] = []
+        retval = list(self._rows)
+        self._rows.clear()
         return retval
 
 
diff --git a/libs/sqlalchemy/dialects/mysql/base.py b/libs/sqlalchemy/dialects/mysql/base.py
index dacbb7afa..db887269c 100644
--- a/libs/sqlalchemy/dialects/mysql/base.py
+++ b/libs/sqlalchemy/dialects/mysql/base.py
@@ -1,5 +1,5 @@
 # dialects/mysql/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -11,7 +11,6 @@ r"""
 
 .. dialect:: mysql
     :name: MySQL / MariaDB
-    :full_support: 5.6, 5.7, 8.0 / 10.8, 10.9
     :normal_support: 5.6+ / 10+
     :best_effort: 5.0.2+ / 5.0.2+
 
@@ -35,7 +34,9 @@ syntactical and behavioral differences that SQLAlchemy accommodates automaticall
 To connect to a MariaDB database, no changes to the database URL are required::
 
 
-    engine = create_engine("mysql+pymysql://user:pass@some_mariadb/dbname?charset=utf8mb4")
+    engine = create_engine(
+        "mysql+pymysql://user:pass@some_mariadb/dbname?charset=utf8mb4"
+    )
 
 Upon first connect, the SQLAlchemy dialect employs a
 server version detection scheme that determines if the
@@ -53,7 +54,9 @@ useful for the case where an application makes use of MariaDB-specific features
 and is not compatible with a MySQL database.    To use this mode of operation,
 replace the "mysql" token in the above URL with "mariadb"::
 
-    engine = create_engine("mariadb+pymysql://user:pass@some_mariadb/dbname?charset=utf8mb4")
+    engine = create_engine(
+        "mariadb+pymysql://user:pass@some_mariadb/dbname?charset=utf8mb4"
+    )
 
 The above engine, upon first connect, will raise an error if the server version
 detection detects that the backing database is not MariaDB.
@@ -99,7 +102,7 @@ the :paramref:`_sa.create_engine.pool_recycle` option which ensures that
 a connection will be discarded and replaced with a new one if it has been
 present in the pool for a fixed number of seconds::
 
-    engine = create_engine('mysql+mysqldb://...', pool_recycle=3600)
+    engine = create_engine("mysql+mysqldb://...", pool_recycle=3600)
 
 For more comprehensive disconnect detection of pooled connections, including
 accommodation of  server restarts and network issues, a pre-ping approach may
@@ -123,12 +126,14 @@ To accommodate the rendering of these arguments, specify the form
 ``ENGINE`` of ``InnoDB``, ``CHARSET`` of ``utf8mb4``, and ``KEY_BLOCK_SIZE``
 of ``1024``::
 
-  Table('mytable', metadata,
-        Column('data', String(32)),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8mb4',
-        mysql_key_block_size="1024"
-       )
+  Table(
+      "mytable",
+      metadata,
+      Column("data", String(32)),
+      mysql_engine="InnoDB",
+      mysql_charset="utf8mb4",
+      mysql_key_block_size="1024",
+  )
 
 When supporting :ref:`mysql_mariadb_only_mode` mode, similar keys against
 the "mariadb" prefix must be included as well.  The values can of course
@@ -137,19 +142,17 @@ be maintained::
 
   # support both "mysql" and "mariadb-only" engine URLs
 
-  Table('mytable', metadata,
-        Column('data', String(32)),
-
-        mysql_engine='InnoDB',
-        mariadb_engine='InnoDB',
-
-        mysql_charset='utf8mb4',
-        mariadb_charset='utf8',
-
-        mysql_key_block_size="1024"
-        mariadb_key_block_size="1024"
-
-       )
+  Table(
+      "mytable",
+      metadata,
+      Column("data", String(32)),
+      mysql_engine="InnoDB",
+      mariadb_engine="InnoDB",
+      mysql_charset="utf8mb4",
+      mariadb_charset="utf8",
+      mysql_key_block_size="1024",
+      mariadb_key_block_size="1024",
+  )
 
 The MySQL / MariaDB dialects will normally transfer any keyword specified as
 ``mysql_keyword_name`` to be rendered as ``KEYWORD_NAME`` in the
@@ -215,16 +218,14 @@ techniques are used.
 To set isolation level using :func:`_sa.create_engine`::
 
     engine = create_engine(
-                    "mysql+mysqldb://scott:tiger@localhost/test",
-                    isolation_level="READ UNCOMMITTED"
-                )
+        "mysql+mysqldb://scott:tiger@localhost/test",
+        isolation_level="READ UNCOMMITTED",
+    )
 
 To set using per-connection execution options::
 
     connection = engine.connect()
-    connection = connection.execution_options(
-        isolation_level="READ COMMITTED"
-    )
+    connection = connection.execution_options(isolation_level="READ COMMITTED")
 
 Valid values for ``isolation_level`` include:
 
@@ -256,8 +257,8 @@ When creating tables, SQLAlchemy will automatically set ``AUTO_INCREMENT`` on
 the first :class:`.Integer` primary key column which is not marked as a
 foreign key::
 
-  >>> t = Table('mytable', metadata,
-  ...   Column('mytable_id', Integer, primary_key=True)
+  >>> t = Table(
+  ...     "mytable", metadata, Column("mytable_id", Integer, primary_key=True)
   ... )
   >>> t.create()
   CREATE TABLE mytable (
@@ -271,10 +272,12 @@ This flag
 can also be used to enable auto-increment on a secondary column in a
 multi-column key for some storage engines::
 
-  Table('mytable', metadata,
-        Column('gid', Integer, primary_key=True, autoincrement=False),
-        Column('id', Integer, primary_key=True)
-       )
+  Table(
+      "mytable",
+      metadata,
+      Column("gid", Integer, primary_key=True, autoincrement=False),
+      Column("id", Integer, primary_key=True),
+  )
 
 .. _mysql_ss_cursors:
 
@@ -292,7 +295,9 @@ Server side cursors are enabled on a per-statement basis by using the
 option::
 
     with engine.connect() as conn:
-        result = conn.execution_options(stream_results=True).execute(text("select * from table"))
+        result = conn.execution_options(stream_results=True).execute(
+            text("select * from table")
+        )
 
 Note that some kinds of SQL statements may not be supported with
 server side cursors; generally, only SQL statements that return rows should be
@@ -320,7 +325,8 @@ a connection.   This is typically delivered using the ``charset`` parameter
 in the URL, such as::
 
     e = create_engine(
-        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4")
+        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4"
+    )
 
 This charset is the **client character set** for the connection.  Some
 MySQL DBAPIs will default this to a value such as ``latin1``, and some
@@ -340,7 +346,8 @@ charset is preferred, if supported by both the database as well as the client
 DBAPI, as in::
 
     e = create_engine(
-        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4")
+        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4"
+    )
 
 All modern DBAPIs should support the ``utf8mb4`` charset.
 
@@ -362,7 +369,9 @@ Dealing with Binary Data Warnings and Unicode
 MySQL versions 5.6, 5.7 and later (not MariaDB at the time of this writing) now
 emit a warning when attempting to pass binary data to the database, while a
 character set encoding is also in place, when the binary data itself is not
-valid for that encoding::
+valid for that encoding:
+
+.. sourcecode:: text
 
     default.py:509: Warning: (1300, "Invalid utf8mb4 character string:
     'F9876A'")
@@ -372,7 +381,9 @@ This warning is due to the fact that the MySQL client library is attempting to
 interpret the binary string as a unicode object even if a datatype such
 as :class:`.LargeBinary` is in use.   To resolve this, the SQL statement requires
 a binary "character set introducer" be present before any non-NULL value
-that renders like this::
+that renders like this:
+
+.. sourcecode:: sql
 
     INSERT INTO table (data) VALUES (_binary %s)
 
@@ -382,12 +393,13 @@ string parameter ``binary_prefix=true`` to the URL to repair this warning::
 
     # mysqlclient
     engine = create_engine(
-        "mysql+mysqldb://scott:tiger@localhost/test?charset=utf8mb4&binary_prefix=true")
+        "mysql+mysqldb://scott:tiger@localhost/test?charset=utf8mb4&binary_prefix=true"
+    )
 
     # PyMySQL
     engine = create_engine(
-        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4&binary_prefix=true")
-
+        "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4&binary_prefix=true"
+    )
 
 The ``binary_prefix`` flag may or may not be supported by other MySQL drivers.
 
@@ -430,7 +442,10 @@ the ``first_connect`` and ``connect`` events::
 
     from sqlalchemy import create_engine, event
 
-    eng = create_engine("mysql+mysqldb://scott:tiger@localhost/test", echo='debug')
+    eng = create_engine(
+        "mysql+mysqldb://scott:tiger@localhost/test", echo="debug"
+    )
+
 
     # `insert=True` will ensure this is the very first listener to run
     @event.listens_for(eng, "connect", insert=True)
@@ -438,6 +453,7 @@ the ``first_connect`` and ``connect`` events::
         cursor = dbapi_connection.cursor()
         cursor.execute("SET sql_mode = 'STRICT_ALL_TABLES'")
 
+
     conn = eng.connect()
 
 In the example illustrated above, the "connect" event will invoke the "SET"
@@ -454,8 +470,8 @@ MySQL / MariaDB SQL Extensions
 Many of the MySQL / MariaDB SQL extensions are handled through SQLAlchemy's generic
 function and operator support::
 
-  table.select(table.c.password==func.md5('plaintext'))
-  table.select(table.c.username.op('regexp')('^[a-d]'))
+  table.select(table.c.password == func.md5("plaintext"))
+  table.select(table.c.username.op("regexp")("^[a-d]"))
 
 And of course any valid SQL statement can be executed as a string as well.
 
@@ -468,11 +484,18 @@ available.
 * SELECT pragma, use :meth:`_expression.Select.prefix_with` and
   :meth:`_query.Query.prefix_with`::
 
-    select(...).prefix_with(['HIGH_PRIORITY', 'SQL_SMALL_RESULT'])
+    select(...).prefix_with(["HIGH_PRIORITY", "SQL_SMALL_RESULT"])
 
 * UPDATE with LIMIT::
 
-    update(..., mysql_limit=10, mariadb_limit=10)
+    update(...).with_dialect_options(mysql_limit=10, mariadb_limit=10)
+
+* DELETE
+  with LIMIT::
+
+    delete(...).with_dialect_options(mysql_limit=10, mariadb_limit=10)
+
+  .. versionadded:: 2.0.37 Added delete with limit
 
 * optimizer hints, use :meth:`_expression.Select.prefix_with` and
   :meth:`_query.Query.prefix_with`::
@@ -484,14 +507,16 @@ available.
 
     select(...).with_hint(some_table, "USE INDEX xyz")
 
-* MATCH operator support::
+* MATCH
+  operator support::
 
-    from sqlalchemy.dialects.mysql import match
-    select(...).where(match(col1, col2, against="some expr").in_boolean_mode())
+        from sqlalchemy.dialects.mysql import match
 
-    .. seealso::
+        select(...).where(match(col1, col2, against="some expr").in_boolean_mode())
 
-        :class:`_mysql.match`
+  .. seealso::
+
+    :class:`_mysql.match`
 
 INSERT/DELETE...RETURNING
 -------------------------
@@ -508,17 +533,15 @@ To specify an explicit ``RETURNING`` clause, use the
 
     # INSERT..RETURNING
     result = connection.execute(
-        table.insert().
-        values(name='foo').
-        returning(table.c.col1, table.c.col2)
+        table.insert().values(name="foo").returning(table.c.col1, table.c.col2)
     )
     print(result.all())
 
     # DELETE..RETURNING
     result = connection.execute(
-        table.delete().
-        where(table.c.name=='foo').
-        returning(table.c.col1, table.c.col2)
+        table.delete()
+        .where(table.c.name == "foo")
+        .returning(table.c.col1, table.c.col2)
     )
     print(result.all())
 
@@ -545,12 +568,11 @@ the generative method :meth:`~.mysql.Insert.on_duplicate_key_update`:
     >>> from sqlalchemy.dialects.mysql import insert
 
     >>> insert_stmt = insert(my_table).values(
-    ...     id='some_existing_id',
-    ...     data='inserted value')
+    ...     id="some_existing_id", data="inserted value"
+    ... )
 
     >>> on_duplicate_key_stmt = insert_stmt.on_duplicate_key_update(
-    ...     data=insert_stmt.inserted.data,
-    ...     status='U'
+    ...     data=insert_stmt.inserted.data, status="U"
     ... )
     >>> print(on_duplicate_key_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%s, %s)
@@ -575,8 +597,8 @@ as values:
 .. sourcecode:: pycon+sql
 
     >>> insert_stmt = insert(my_table).values(
-    ...          id='some_existing_id',
-    ...          data='inserted value')
+    ...     id="some_existing_id", data="inserted value"
+    ... )
 
     >>> on_duplicate_key_stmt = insert_stmt.on_duplicate_key_update(
     ...     data="some data",
@@ -639,13 +661,11 @@ table:
 .. sourcecode:: pycon+sql
 
     >>> stmt = insert(my_table).values(
-    ...     id='some_id',
-    ...     data='inserted value',
-    ...     author='jlh')
+    ...     id="some_id", data="inserted value", author="jlh"
+    ... )
 
     >>> do_update_stmt = stmt.on_duplicate_key_update(
-    ...     data="updated value",
-    ...     author=stmt.inserted.author
+    ...     data="updated value", author=stmt.inserted.author
     ... )
 
     >>> print(do_update_stmt)
@@ -690,13 +710,13 @@ MySQL and MariaDB both provide an option to create index entries with a certain
 become part of the index. SQLAlchemy provides this feature via the
 ``mysql_length`` and/or ``mariadb_length`` parameters::
 
-    Index('my_index', my_table.c.data, mysql_length=10, mariadb_length=10)
+    Index("my_index", my_table.c.data, mysql_length=10, mariadb_length=10)
 
-    Index('a_b_idx', my_table.c.a, my_table.c.b, mysql_length={'a': 4,
-                                                               'b': 9})
+    Index("a_b_idx", my_table.c.a, my_table.c.b, mysql_length={"a": 4, "b": 9})
 
-    Index('a_b_idx', my_table.c.a, my_table.c.b, mariadb_length={'a': 4,
-                                                               'b': 9})
+    Index(
+        "a_b_idx", my_table.c.a, my_table.c.b, mariadb_length={"a": 4, "b": 9}
+    )
 
 Prefix lengths are given in characters for nonbinary string types and in bytes
 for binary string types. The value passed to the keyword argument *must* be
@@ -713,7 +733,7 @@ MySQL storage engines permit you to specify an index prefix when creating
 an index. SQLAlchemy provides this feature via the
 ``mysql_prefix`` parameter on :class:`.Index`::
 
-    Index('my_index', my_table.c.data, mysql_prefix='FULLTEXT')
+    Index("my_index", my_table.c.data, mysql_prefix="FULLTEXT")
 
 The value passed to the keyword argument will be simply passed through to the
 underlying CREATE INDEX, so it *must* be a valid index prefix for your MySQL
@@ -730,11 +750,13 @@ Some MySQL storage engines permit you to specify an index type when creating
 an index or primary key constraint. SQLAlchemy provides this feature via the
 ``mysql_using`` parameter on :class:`.Index`::
 
-    Index('my_index', my_table.c.data, mysql_using='hash', mariadb_using='hash')
+    Index(
+        "my_index", my_table.c.data, mysql_using="hash", mariadb_using="hash"
+    )
 
 As well as the ``mysql_using`` parameter on :class:`.PrimaryKeyConstraint`::
 
-    PrimaryKeyConstraint("data", mysql_using='hash', mariadb_using='hash')
+    PrimaryKeyConstraint("data", mysql_using="hash", mariadb_using="hash")
 
 The value passed to the keyword argument will be simply passed through to the
 underlying CREATE INDEX or PRIMARY KEY clause, so it *must* be a valid index
@@ -753,9 +775,12 @@ CREATE FULLTEXT INDEX in MySQL also supports a "WITH PARSER" option.  This
 is available using the keyword argument ``mysql_with_parser``::
 
     Index(
-        'my_index', my_table.c.data,
-        mysql_prefix='FULLTEXT', mysql_with_parser="ngram",
-        mariadb_prefix='FULLTEXT', mariadb_with_parser="ngram",
+        "my_index",
+        my_table.c.data,
+        mysql_prefix="FULLTEXT",
+        mysql_with_parser="ngram",
+        mariadb_prefix="FULLTEXT",
+        mariadb_with_parser="ngram",
     )
 
 .. versionadded:: 1.3
@@ -782,6 +807,7 @@ them ignored on a MySQL / MariaDB backend, use a custom compile rule::
     from sqlalchemy.ext.compiler import compiles
     from sqlalchemy.schema import ForeignKeyConstraint
 
+
     @compiles(ForeignKeyConstraint, "mysql", "mariadb")
     def process(element, compiler, **kw):
         element.deferrable = element.initially = None
@@ -803,10 +829,12 @@ very common ``MyISAM`` MySQL storage engine, the information loaded by table
 reflection will not include foreign keys.  For these tables, you may supply a
 :class:`~sqlalchemy.ForeignKeyConstraint` at reflection time::
 
-  Table('mytable', metadata,
-        ForeignKeyConstraint(['other_id'], ['othertable.other_id']),
-        autoload_with=engine
-       )
+  Table(
+      "mytable",
+      metadata,
+      ForeignKeyConstraint(["other_id"], ["othertable.other_id"]),
+      autoload_with=engine,
+  )
 
 .. seealso::
 
@@ -878,13 +906,15 @@ parameter and pass a textual clause that also includes the ON UPDATE clause::
     mytable = Table(
         "mytable",
         metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', String(50)),
+        Column("id", Integer, primary_key=True),
+        Column("data", String(50)),
         Column(
-            'last_updated',
+            "last_updated",
             TIMESTAMP,
-            server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-        )
+            server_default=text(
+                "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"
+            ),
+        ),
     )
 
 The same instructions apply to use of the :class:`_types.DateTime` and
@@ -895,34 +925,37 @@ The same instructions apply to use of the :class:`_types.DateTime` and
     mytable = Table(
         "mytable",
         metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', String(50)),
+        Column("id", Integer, primary_key=True),
+        Column("data", String(50)),
         Column(
-            'last_updated',
+            "last_updated",
             DateTime,
-            server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-        )
+            server_default=text(
+                "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"
+            ),
+        ),
     )
 
-
 Even though the :paramref:`_schema.Column.server_onupdate` feature does not
 generate this DDL, it still may be desirable to signal to the ORM that this
 updated value should be fetched.  This syntax looks like the following::
 
     from sqlalchemy.schema import FetchedValue
 
+
     class MyClass(Base):
-        __tablename__ = 'mytable'
+        __tablename__ = "mytable"
 
         id = Column(Integer, primary_key=True)
         data = Column(String(50))
         last_updated = Column(
             TIMESTAMP,
-            server_default=text("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
-            server_onupdate=FetchedValue()
+            server_default=text(
+                "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"
+            ),
+            server_onupdate=FetchedValue(),
         )
 
-
 .. _mysql_timestamp_null:
 
 TIMESTAMP Columns and NULL
@@ -932,7 +965,9 @@ MySQL historically enforces that a column which specifies the
 TIMESTAMP datatype implicitly includes a default value of
 CURRENT_TIMESTAMP, even though this is not stated, and additionally
 sets the column as NOT NULL, the opposite behavior vs. that of all
-other datatypes::
+other datatypes:
+
+.. sourcecode:: text
 
     mysql> CREATE TABLE ts_test (
         -> a INTEGER,
@@ -977,19 +1012,24 @@ SQLAlchemy also emits NOT NULL for TIMESTAMP columns that do specify
     from sqlalchemy.dialects.mysql import TIMESTAMP
 
     m = MetaData()
-    t = Table('ts_test', m,
-            Column('a', Integer),
-            Column('b', Integer, nullable=False),
-            Column('c', TIMESTAMP),
-            Column('d', TIMESTAMP, nullable=False)
-        )
+    t = Table(
+        "ts_test",
+        m,
+        Column("a", Integer),
+        Column("b", Integer, nullable=False),
+        Column("c", TIMESTAMP),
+        Column("d", TIMESTAMP, nullable=False),
+    )
 
 
     from sqlalchemy import create_engine
+
     e = create_engine("mysql+mysqldb://scott:tiger@localhost/test", echo=True)
     m.create_all(e)
 
-output::
+output:
+
+.. sourcecode:: sql
 
     CREATE TABLE ts_test (
         a INTEGER,
@@ -1349,7 +1389,7 @@ class MySQLCompiler(compiler.SQLCompiler):
 
         clauses = []
 
-        requires_mysql8_alias = (
+        requires_mysql8_alias = statement.select is None and (
             self.dialect._requires_alias_for_on_duplicate_key
         )
 
@@ -1363,6 +1403,8 @@ class MySQLCompiler(compiler.SQLCompiler):
         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
             if coercions._is_literal(val):
                 val = elements.BindParameter(None, val, type_=column.type)
                 value_text = self.process(val.self_group(), use_schema=False)
@@ -1678,8 +1720,15 @@ class MySQLCompiler(compiler.SQLCompiler):
 
     def update_limit_clause(self, update_stmt):
         limit = update_stmt.kwargs.get("%s_limit" % self.dialect.name, None)
-        if limit:
-            return "LIMIT %s" % limit
+        if limit is not None:
+            return f"LIMIT {int(limit)}"
+        else:
+            return None
+
+    def delete_limit_clause(self, delete_stmt):
+        limit = delete_stmt.kwargs.get("%s_limit" % self.dialect.name, None)
+        if limit is not None:
+            return f"LIMIT {int(limit)}"
         else:
             return None
 
@@ -1850,7 +1899,15 @@ class MySQLDDLCompiler(compiler.DDLCompiler):
         else:
             default = self.get_column_default_string(column)
             if default is not None:
-                colspec.append("DEFAULT " + default)
+                if (
+                    isinstance(
+                        column.server_default.arg, functions.FunctionElement
+                    )
+                    and self.dialect._support_default_function
+                ):
+                    colspec.append(f"DEFAULT ({default})")
+                else:
+                    colspec.append("DEFAULT " + default)
         return " ".join(colspec)
 
     def post_create_table(self, table):
@@ -2380,6 +2437,8 @@ class MySQLTypeCompiler(compiler.GenericTypeCompiler):
     def _visit_enumerated_values(self, name, type_, enumerated_values):
         quoted_enums = []
         for e in enumerated_values:
+            if self.dialect.identifier_preparer._double_percents:
+                e = e.replace("%", "%%")
             quoted_enums.append("'%s'" % e.replace("'", "''"))
         return self._extend_string(
             type_, {}, "%s(%s)" % (name, ",".join(quoted_enums))
@@ -2493,6 +2552,7 @@ class MySQLDialect(default.DefaultDialect):
     construct_arguments = [
         (sa_schema.Table, {"*": None}),
         (sql.Update, {"limit": None}),
+        (sql.Delete, {"limit": None}),
         (sa_schema.PrimaryKeyConstraint, {"using": None}),
         (
             sa_schema.Index,
@@ -2893,6 +2953,17 @@ class MySQLDialect(default.DefaultDialect):
             # ref https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-17.html#mysqld-8-0-17-feature  # noqa
             return self.server_version_info >= (8, 0, 17)
 
+    @property
+    def _support_default_function(self):
+        if not self.server_version_info:
+            return False
+        elif self.is_mariadb:
+            # ref https://mariadb.com/kb/en/mariadb-1021-release-notes/
+            return self.server_version_info >= (10, 2, 1)
+        else:
+            # ref https://dev.mysql.com/doc/refman/8.0/en/data-type-defaults.html # noqa
+            return self.server_version_info >= (8, 0, 13)
+
     @property
     def _is_mariadb(self):
         return self.is_mariadb
@@ -3050,29 +3121,47 @@ class MySQLDialect(default.DefaultDialect):
                 return s
 
         default_schema_name = connection.dialect.default_schema_name
-        col_tuples = [
-            (
-                lower(rec["referred_schema"] or default_schema_name),
-                lower(rec["referred_table"]),
-                col_name,
-            )
-            for rec in fkeys
-            for col_name in rec["referred_columns"]
-        ]
 
-        if col_tuples:
-            correct_for_wrong_fk_case = connection.execute(
-                sql.text(
-                    """
-                    select table_schema, table_name, column_name
-                    from information_schema.columns
-                    where (table_schema, table_name, lower(column_name)) in
-                    :table_data;
-                """
-                ).bindparams(sql.bindparam("table_data", expanding=True)),
-                dict(table_data=col_tuples),
+        # 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))
+        for rec in fkeys:
+            sch = lower(rec["referred_schema"] or default_schema_name)
+            tbl = lower(rec["referred_table"])
+            for col_name in rec["referred_columns"]:
+                schema_by_table_by_column[sch][tbl].append(col_name)
+
+        if schema_by_table_by_column:
+
+            condition = sql.or_(
+                *(
+                    sql.and_(
+                        _info_columns.c.table_schema == schema,
+                        sql.or_(
+                            *(
+                                sql.and_(
+                                    _info_columns.c.table_name == table,
+                                    sql.func.lower(
+                                        _info_columns.c.column_name
+                                    ).in_(columns),
+                                )
+                                for table, columns in tables.items()
+                            )
+                        ),
+                    )
+                    for schema, tables in schema_by_table_by_column.items()
+                )
             )
 
+            select = sql.select(
+                _info_columns.c.table_schema,
+                _info_columns.c.table_name,
+                _info_columns.c.column_name,
+            ).where(condition)
+
+            correct_for_wrong_fk_case = connection.execute(select)
+
             # in casing=0, table name and schema name come back in their
             # exact case.
             # in casing=1, table name and schema name come back in lower
@@ -3445,3 +3534,12 @@ class _DecodingRow:
             return item.decode(self.charset)
         else:
             return item
+
+
+_info_columns = sql.table(
+    "columns",
+    sql.column("table_schema", VARCHAR(64)),
+    sql.column("table_name", VARCHAR(64)),
+    sql.column("column_name", VARCHAR(64)),
+    schema="information_schema",
+)
diff --git a/libs/sqlalchemy/dialects/mysql/cymysql.py b/libs/sqlalchemy/dialects/mysql/cymysql.py
index f199aa4e8..5c00ada9f 100644
--- a/libs/sqlalchemy/dialects/mysql/cymysql.py
+++ b/libs/sqlalchemy/dialects/mysql/cymysql.py
@@ -1,5 +1,5 @@
 # dialects/mysql/cymysql.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/dml.py b/libs/sqlalchemy/dialects/mysql/dml.py
index e4005c267..cceb0818f 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 Dict
 from typing import List
 from typing import Mapping
 from typing import Optional
@@ -141,7 +142,11 @@ class Insert(StandardInsert):
          in :ref:`tutorial_parameter_ordered_updates`::
 
             insert().on_duplicate_key_update(
-                [("name", "some name"), ("value", "some value")])
+                [
+                    ("name", "some name"),
+                    ("value", "some value"),
+                ]
+            )
 
          .. versionchanged:: 1.3 parameters can be specified as a dictionary
             or list of 2-tuples; the latter form provides for parameter
@@ -181,6 +186,7 @@ class OnDuplicateClause(ClauseElement):
 
     _parameter_ordering: Optional[List[str]] = None
 
+    update: Dict[str, Any]
     stringify_dialect = "mysql"
 
     def __init__(
diff --git a/libs/sqlalchemy/dialects/mysql/enumerated.py b/libs/sqlalchemy/dialects/mysql/enumerated.py
index 96499d7be..6745cae55 100644
--- a/libs/sqlalchemy/dialects/mysql/enumerated.py
+++ b/libs/sqlalchemy/dialects/mysql/enumerated.py
@@ -1,5 +1,5 @@
 # dialects/mysql/enumerated.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,7 +28,7 @@ class ENUM(sqltypes.NativeForEmulated, sqltypes.Enum, _StringType):
 
         E.g.::
 
-          Column('myenum', ENUM("foo", "bar", "baz"))
+          Column("myenum", ENUM("foo", "bar", "baz"))
 
         :param enums: The range of valid values for this ENUM.  Values in
           enums are not quoted, they will be escaped and surrounded by single
@@ -102,8 +102,7 @@ class SET(_StringType):
 
         E.g.::
 
-          Column('myset', SET("foo", "bar", "baz"))
-
+          Column("myset", SET("foo", "bar", "baz"))
 
         The list of potential values is required in the case that this
         set will be used to generate DDL for a table, or if the
diff --git a/libs/sqlalchemy/dialects/mysql/expression.py b/libs/sqlalchemy/dialects/mysql/expression.py
index b81b58afc..b60a08885 100644
--- a/libs/sqlalchemy/dialects/mysql/expression.py
+++ b/libs/sqlalchemy/dialects/mysql/expression.py
@@ -1,5 +1,5 @@
 # dialects/mysql/expression.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -38,7 +38,9 @@ class match(Generative, elements.BinaryExpression):
             .order_by(desc(match_expr))
         )
 
-    Would produce SQL resembling::
+    Would produce SQL resembling:
+
+    .. sourcecode:: sql
 
         SELECT id, firstname, lastname
         FROM user
diff --git a/libs/sqlalchemy/dialects/mysql/json.py b/libs/sqlalchemy/dialects/mysql/json.py
index ebe4a34d2..8912af366 100644
--- a/libs/sqlalchemy/dialects/mysql/json.py
+++ b/libs/sqlalchemy/dialects/mysql/json.py
@@ -1,5 +1,5 @@
 # dialects/mysql/json.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/mariadb.py b/libs/sqlalchemy/dialects/mysql/mariadb.py
index 10a05f9cb..ac2cfbd1b 100644
--- a/libs/sqlalchemy/dialects/mysql/mariadb.py
+++ b/libs/sqlalchemy/dialects/mysql/mariadb.py
@@ -1,5 +1,5 @@
 # dialects/mysql/mariadb.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,6 +7,34 @@
 # mypy: ignore-errors
 from .base import MariaDBIdentifierPreparer
 from .base import MySQLDialect
+from .base import MySQLTypeCompiler
+from ...sql import sqltypes
+
+
+class INET4(sqltypes.TypeEngine[str]):
+    """INET4 column type for MariaDB
+
+    .. versionadded:: 2.0.37
+    """
+
+    __visit_name__ = "INET4"
+
+
+class INET6(sqltypes.TypeEngine[str]):
+    """INET6 column type for MariaDB
+
+    .. versionadded:: 2.0.37
+    """
+
+    __visit_name__ = "INET6"
+
+
+class MariaDBTypeCompiler(MySQLTypeCompiler):
+    def visit_INET4(self, type_, **kwargs) -> str:
+        return "INET4"
+
+    def visit_INET6(self, type_, **kwargs) -> str:
+        return "INET6"
 
 
 class MariaDBDialect(MySQLDialect):
@@ -14,6 +42,7 @@ class MariaDBDialect(MySQLDialect):
     supports_statement_cache = True
     name = "mariadb"
     preparer = MariaDBIdentifierPreparer
+    type_compiler_cls = MariaDBTypeCompiler
 
 
 def loader(driver):
diff --git a/libs/sqlalchemy/dialects/mysql/mariadbconnector.py b/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
index 2fe3a192a..2d2ad1997 100644
--- a/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
+++ b/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
@@ -1,5 +1,5 @@
 # dialects/mysql/mariadbconnector.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -87,13 +87,6 @@ class MySQLExecutionContext_mariadbconnector(MySQLExecutionContext):
         if self.isinsert and self.compiled.postfetch_lastrowid:
             self._lastrowid = self.cursor.lastrowid
 
-    @property
-    def rowcount(self):
-        if self._rowcount is not None:
-            return self._rowcount
-        else:
-            return self.cursor.rowcount
-
     def get_lastrowid(self):
         return self._lastrowid
 
@@ -172,6 +165,7 @@ class MySQLDialect_mariadbconnector(MySQLDialect):
 
     def create_connect_args(self, url):
         opts = url.translate_connect_args()
+        opts.update(url.query)
 
         int_params = [
             "connect_timeout",
@@ -186,6 +180,7 @@ class MySQLDialect_mariadbconnector(MySQLDialect):
             "ssl_verify_cert",
             "ssl",
             "pool_reset_connection",
+            "compress",
         ]
 
         for key in int_params:
diff --git a/libs/sqlalchemy/dialects/mysql/mysqlconnector.py b/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
index b1523392d..e88f8fd71 100644
--- a/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
+++ b/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
@@ -1,5 +1,5 @@
 # dialects/mysql/mysqlconnector.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -96,6 +96,7 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
         util.coerce_kw_type(opts, "allow_local_infile", bool)
         util.coerce_kw_type(opts, "autocommit", bool)
         util.coerce_kw_type(opts, "buffered", bool)
+        util.coerce_kw_type(opts, "client_flag", int)
         util.coerce_kw_type(opts, "compress", bool)
         util.coerce_kw_type(opts, "connection_timeout", int)
         util.coerce_kw_type(opts, "connect_timeout", int)
diff --git a/libs/sqlalchemy/dialects/mysql/mysqldb.py b/libs/sqlalchemy/dialects/mysql/mysqldb.py
index d46d159d4..3cf56c1fd 100644
--- a/libs/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/libs/sqlalchemy/dialects/mysql/mysqldb.py
@@ -1,5 +1,5 @@
 # dialects/mysql/mysqldb.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -48,9 +48,9 @@ key "ssl", which may be specified using the
             "ssl": {
                 "ca": "/home/gord/client-ssl/ca.pem",
                 "cert": "/home/gord/client-ssl/client-cert.pem",
-                "key": "/home/gord/client-ssl/client-key.pem"
+                "key": "/home/gord/client-ssl/client-key.pem",
             }
-        }
+        },
     )
 
 For convenience, the following keys may also be specified inline within the URL
@@ -74,7 +74,9 @@ Using MySQLdb with Google Cloud SQL
 -----------------------------------
 
 Google Cloud SQL now recommends use of the MySQLdb dialect.  Connect
-using a URL like the following::
+using a URL like the following:
+
+.. sourcecode:: text
 
     mysql+mysqldb://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>
 
@@ -97,12 +99,7 @@ from ... import util
 
 
 class MySQLExecutionContext_mysqldb(MySQLExecutionContext):
-    @property
-    def rowcount(self):
-        if hasattr(self, "_rowcount"):
-            return self._rowcount
-        else:
-            return self.cursor.rowcount
+    pass
 
 
 class MySQLCompiler_mysqldb(MySQLCompiler):
@@ -217,7 +214,7 @@ class MySQLDialect_mysqldb(MySQLDialect):
         util.coerce_kw_type(opts, "read_timeout", int)
         util.coerce_kw_type(opts, "write_timeout", int)
         util.coerce_kw_type(opts, "client_flag", int)
-        util.coerce_kw_type(opts, "local_infile", int)
+        util.coerce_kw_type(opts, "local_infile", bool)
         # Note: using either of the below will cause all strings to be
         # returned as Unicode, both in raw SQL operations and with column
         # types like String and MSString.
diff --git a/libs/sqlalchemy/dialects/mysql/provision.py b/libs/sqlalchemy/dialects/mysql/provision.py
index 3f05bcee7..7807af409 100644
--- a/libs/sqlalchemy/dialects/mysql/provision.py
+++ b/libs/sqlalchemy/dialects/mysql/provision.py
@@ -1,5 +1,5 @@
 # dialects/mysql/provision.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -40,6 +40,9 @@ def generate_driver_url(url, driver, query_str):
         drivername="%s+%s" % (backend, driver)
     ).update_query_string(query_str)
 
+    if driver == "mariadbconnector":
+        new_url = new_url.difference_update_query(["charset"])
+
     try:
         new_url.get_dialect()
     except exc.NoSuchModuleError:
diff --git a/libs/sqlalchemy/dialects/mysql/pymysql.py b/libs/sqlalchemy/dialects/mysql/pymysql.py
index 830e4416c..67cb4cdd7 100644
--- a/libs/sqlalchemy/dialects/mysql/pymysql.py
+++ b/libs/sqlalchemy/dialects/mysql/pymysql.py
@@ -1,5 +1,5 @@
 # dialects/mysql/pymysql.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -41,7 +41,6 @@ necessary to indicate ``ssl_check_hostname=false`` in PyMySQL::
         "&ssl_check_hostname=false"
     )
 
-
 MySQL-Python Compatibility
 --------------------------
 
diff --git a/libs/sqlalchemy/dialects/mysql/pyodbc.py b/libs/sqlalchemy/dialects/mysql/pyodbc.py
index 428c8dfd3..6d44bd383 100644
--- a/libs/sqlalchemy/dialects/mysql/pyodbc.py
+++ b/libs/sqlalchemy/dialects/mysql/pyodbc.py
@@ -1,5 +1,5 @@
 # dialects/mysql/pyodbc.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -30,14 +30,15 @@ r"""
 Pass through exact pyodbc connection string::
 
     import urllib
+
     connection_string = (
-        'DRIVER=MySQL ODBC 8.0 ANSI Driver;'
-        'SERVER=localhost;'
-        'PORT=3307;'
-        'DATABASE=mydb;'
-        'UID=root;'
-        'PWD=(whatever);'
-        'charset=utf8mb4;'
+        "DRIVER=MySQL ODBC 8.0 ANSI Driver;"
+        "SERVER=localhost;"
+        "PORT=3307;"
+        "DATABASE=mydb;"
+        "UID=root;"
+        "PWD=(whatever);"
+        "charset=utf8mb4;"
     )
     params = urllib.parse.quote_plus(connection_string)
     connection_uri = "mysql+pyodbc:///?odbc_connect=%s" % params
diff --git a/libs/sqlalchemy/dialects/mysql/reflection.py b/libs/sqlalchemy/dialects/mysql/reflection.py
index c764e8ccc..3998be977 100644
--- a/libs/sqlalchemy/dialects/mysql/reflection.py
+++ b/libs/sqlalchemy/dialects/mysql/reflection.py
@@ -1,5 +1,5 @@
 # dialects/mysql/reflection.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -505,7 +505,7 @@ class MySQLTableDefinitionParser:
         #
         # unique constraints come back as KEYs
         kw = quotes.copy()
-        kw["on"] = "RESTRICT|CASCADE|SET NULL|NO ACTION"
+        kw["on"] = "RESTRICT|CASCADE|SET NULL|NO ACTION|SET DEFAULT"
         self._re_fk_constraint = _re_compile(
             r"  "
             r"CONSTRAINT +"
diff --git a/libs/sqlalchemy/dialects/mysql/reserved_words.py b/libs/sqlalchemy/dialects/mysql/reserved_words.py
index 009988a60..34fecf427 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -282,6 +282,7 @@ RESERVED_WORDS_MARIADB = {
     }
 )
 
+# https://dev.mysql.com/doc/refman/8.3/en/keywords.html
 # https://dev.mysql.com/doc/refman/8.0/en/keywords.html
 # https://dev.mysql.com/doc/refman/5.7/en/keywords.html
 # https://dev.mysql.com/doc/refman/5.6/en/keywords.html
@@ -403,6 +404,7 @@ RESERVED_WORDS_MYSQL = {
     "int4",
     "int8",
     "integer",
+    "intersect",
     "interval",
     "into",
     "io_after_gtids",
@@ -468,6 +470,7 @@ RESERVED_WORDS_MYSQL = {
     "outfile",
     "over",
     "parse_gcol_expr",
+    "parallel",
     "partition",
     "percent_rank",
     "persist",
@@ -476,6 +479,7 @@ RESERVED_WORDS_MYSQL = {
     "primary",
     "procedure",
     "purge",
+    "qualify",
     "range",
     "rank",
     "read",
diff --git a/libs/sqlalchemy/dialects/mysql/types.py b/libs/sqlalchemy/dialects/mysql/types.py
index f563ead35..0c05aacb7 100644
--- a/libs/sqlalchemy/dialects/mysql/types.py
+++ b/libs/sqlalchemy/dialects/mysql/types.py
@@ -1,5 +1,5 @@
 # dialects/mysql/types.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -499,7 +499,7 @@ class YEAR(sqltypes.TypeEngine):
 
 
 class TEXT(_StringType, sqltypes.TEXT):
-    """MySQL TEXT type, for text up to 2^16 characters."""
+    """MySQL TEXT type, for character storage encoded up to 2^16 bytes."""
 
     __visit_name__ = "TEXT"
 
@@ -508,7 +508,7 @@ class TEXT(_StringType, sqltypes.TEXT):
 
         :param length: Optional, if provided the server may optimize storage
           by substituting the smallest TEXT type sufficient to store
-          ``length`` characters.
+          ``length`` bytes of characters.
 
         :param charset: Optional, a column-level character set for this string
           value.  Takes precedence to 'ascii' or 'unicode' short-hand.
@@ -535,7 +535,7 @@ class TEXT(_StringType, sqltypes.TEXT):
 
 
 class TINYTEXT(_StringType):
-    """MySQL TINYTEXT type, for text up to 2^8 characters."""
+    """MySQL TINYTEXT type, for character storage encoded up to 2^8 bytes."""
 
     __visit_name__ = "TINYTEXT"
 
@@ -567,7 +567,8 @@ class TINYTEXT(_StringType):
 
 
 class MEDIUMTEXT(_StringType):
-    """MySQL MEDIUMTEXT type, for text up to 2^24 characters."""
+    """MySQL MEDIUMTEXT type, for character storage encoded up
+    to 2^24 bytes."""
 
     __visit_name__ = "MEDIUMTEXT"
 
@@ -599,7 +600,7 @@ class MEDIUMTEXT(_StringType):
 
 
 class LONGTEXT(_StringType):
-    """MySQL LONGTEXT type, for text up to 2^32 characters."""
+    """MySQL LONGTEXT type, for character storage encoded up to 2^32 bytes."""
 
     __visit_name__ = "LONGTEXT"
 
@@ -683,7 +684,7 @@ class CHAR(_StringType, sqltypes.CHAR):
         super().__init__(length=length, **kwargs)
 
     @classmethod
-    def _adapt_string_for_cast(self, type_):
+    def _adapt_string_for_cast(cls, type_):
         # copy the given string type into a CHAR
         # for the purposes of rendering a CAST expression
         type_ = sqltypes.to_instance(type_)
diff --git a/libs/sqlalchemy/dialects/oracle/__init__.py b/libs/sqlalchemy/dialects/oracle/__init__.py
index d855122ee..7ceb743d6 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/base.py b/libs/sqlalchemy/dialects/oracle/base.py
index a548b3449..019b76bc0 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,8 +9,7 @@
 
 r"""
 .. dialect:: oracle
-    :name: Oracle
-    :full_support: 18c
+    :name: Oracle Database
     :normal_support: 11+
     :best_effort: 9+
 
@@ -18,21 +17,24 @@ r"""
 Auto Increment Behavior
 -----------------------
 
-SQLAlchemy Table objects which include integer primary keys are usually
-assumed to have "autoincrementing" behavior, meaning they can generate their
-own primary key values upon INSERT. For use within Oracle, two options are
-available, which are the use of IDENTITY columns (Oracle 12 and above only)
-or the association of a SEQUENCE with the column.
+SQLAlchemy Table objects which include integer primary keys are usually assumed
+to have "autoincrementing" behavior, meaning they can generate their own
+primary key values upon INSERT. For use within Oracle Database, two options are
+available, which are the use of IDENTITY columns (Oracle Database 12 and above
+only) or the association of a SEQUENCE with the column.
 
-Specifying GENERATED AS IDENTITY (Oracle 12 and above)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Specifying GENERATED AS IDENTITY (Oracle Database 12 and above)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Starting from version 12 Oracle can make use of identity columns using
-the :class:`_sql.Identity` to specify the autoincrementing behavior::
+Starting from version 12, Oracle Database can make use of identity columns
+using the :class:`_sql.Identity` to specify the autoincrementing behavior::
 
-    t = Table('mytable', metadata,
-        Column('id', Integer, Identity(start=3), primary_key=True),
-        Column(...), ...
+    t = Table(
+        "mytable",
+        metadata,
+        Column("id", Integer, Identity(start=3), primary_key=True),
+        Column(...),
+        ...,
     )
 
 The CREATE TABLE for the above :class:`_schema.Table` object would be:
@@ -47,34 +49,38 @@ The CREATE TABLE for the above :class:`_schema.Table` object would be:
 
 The :class:`_schema.Identity` object support many options to control the
 "autoincrementing" behavior of the column, like the starting value, the
-incrementing value, etc.
-In addition to the standard options, Oracle supports setting
-:paramref:`_schema.Identity.always` to ``None`` to use the default
-generated mode, rendering GENERATED AS IDENTITY in the DDL. It also supports
+incrementing value, etc.  In addition to the standard options, Oracle Database
+supports setting :paramref:`_schema.Identity.always` to ``None`` to use the
+default generated mode, rendering GENERATED AS IDENTITY in the DDL. It also supports
 setting :paramref:`_schema.Identity.on_null` to ``True`` to specify ON NULL
 in conjunction with a 'BY DEFAULT' identity column.
 
-Using a SEQUENCE (all Oracle versions)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Using a SEQUENCE (all Oracle Database versions)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Older version of Oracle had no "autoincrement"
-feature, SQLAlchemy relies upon sequences to produce these values.   With the
-older Oracle versions, *a sequence must always be explicitly specified to
-enable autoincrement*.  This is divergent with the majority of documentation
-examples which assume the usage of an autoincrement-capable database.   To
-specify sequences, use the sqlalchemy.schema.Sequence object which is passed
-to a Column construct::
+Older version of Oracle Database had no "autoincrement" feature: SQLAlchemy
+relies upon sequences to produce these values.  With the older Oracle Database
+versions, *a sequence must always be explicitly specified to enable
+autoincrement*.  This is divergent with the majority of documentation examples
+which assume the usage of an autoincrement-capable database.  To specify
+sequences, use the sqlalchemy.schema.Sequence object which is passed to a
+Column construct::
 
-  t = Table('mytable', metadata,
-        Column('id', Integer, Sequence('id_seq', start=1), primary_key=True),
-        Column(...), ...
+  t = Table(
+      "mytable",
+      metadata,
+      Column("id", Integer, Sequence("id_seq", start=1), primary_key=True),
+      Column(...),
+      ...,
   )
 
 This step is also required when using table reflection, i.e. autoload_with=engine::
 
-  t = Table('mytable', metadata,
-        Column('id', Integer, Sequence('id_seq', start=1), primary_key=True),
-        autoload_with=engine
+  t = Table(
+      "mytable",
+      metadata,
+      Column("id", Integer, Sequence("id_seq", start=1), primary_key=True),
+      autoload_with=engine,
   )
 
 .. versionchanged::  1.4   Added :class:`_schema.Identity` construct
@@ -86,21 +92,18 @@ This step is also required when using table reflection, i.e. autoload_with=engin
 Transaction Isolation Level / Autocommit
 ----------------------------------------
 
-The Oracle database supports "READ COMMITTED" and "SERIALIZABLE" modes of
-isolation. The AUTOCOMMIT isolation level is also supported by the cx_Oracle
-dialect.
+Oracle Database supports "READ COMMITTED" and "SERIALIZABLE" modes of
+isolation. The AUTOCOMMIT isolation level is also supported by the
+python-oracledb and cx_Oracle dialects.
 
 To set using per-connection execution options::
 
     connection = engine.connect()
-    connection = connection.execution_options(
-        isolation_level="AUTOCOMMIT"
-    )
+    connection = connection.execution_options(isolation_level="AUTOCOMMIT")
 
-For ``READ COMMITTED`` and ``SERIALIZABLE``, the Oracle dialect sets the
-level at the session level using ``ALTER SESSION``, which is reverted back
-to its default setting when the connection is returned to the connection
-pool.
+For ``READ COMMITTED`` and ``SERIALIZABLE``, the Oracle Database dialects sets
+the level at the session level using ``ALTER SESSION``, which is reverted back
+to its default setting when the connection is returned to the connection pool.
 
 Valid values for ``isolation_level`` include:
 
@@ -110,28 +113,28 @@ Valid values for ``isolation_level`` include:
 
 .. note:: The implementation for the
    :meth:`_engine.Connection.get_isolation_level` method as implemented by the
-   Oracle dialect necessarily forces the start of a transaction using the
-   Oracle LOCAL_TRANSACTION_ID function; otherwise no level is normally
-   readable.
+   Oracle Database dialects necessarily force the start of a transaction using the
+   Oracle Database DBMS_TRANSACTION.LOCAL_TRANSACTION_ID function; otherwise no
+   level is normally readable.
 
    Additionally, the :meth:`_engine.Connection.get_isolation_level` method will
    raise an exception if the ``v$transaction`` view is not available due to
-   permissions or other reasons, which is a common occurrence in Oracle
+   permissions or other reasons, which is a common occurrence in Oracle Database
    installations.
 
-   The cx_Oracle dialect attempts to call the
+   The python-oracledb and cx_Oracle dialects attempt to call the
    :meth:`_engine.Connection.get_isolation_level` method when the dialect makes
    its first connection to the database in order to acquire the
    "default"isolation level.  This default level is necessary so that the level
    can be reset on a connection after it has been temporarily modified using
-   :meth:`_engine.Connection.execution_options` method.   In the common event
+   :meth:`_engine.Connection.execution_options` method.  In the common event
    that the :meth:`_engine.Connection.get_isolation_level` method raises an
    exception due to ``v$transaction`` not being readable as well as any other
    database-related failure, the level is assumed to be "READ COMMITTED".  No
    warning is emitted for this initial first-connect condition as it is
    expected to be a common restriction on Oracle databases.
 
-.. versionadded:: 1.3.16 added support for AUTOCOMMIT to the cx_oracle dialect
+.. versionadded:: 1.3.16 added support for AUTOCOMMIT to the cx_Oracle dialect
    as well as the notion of a default isolation level
 
 .. versionadded:: 1.3.21 Added support for SERIALIZABLE as well as live
@@ -149,56 +152,57 @@ Valid values for ``isolation_level`` include:
 Identifier Casing
 -----------------
 
-In Oracle, 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 dialect
-converts 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
+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, 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.
+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.
 
 .. _oracle_max_identifier_lengths:
 
-Max Identifier Lengths
-----------------------
+Maximum Identifier Lengths
+--------------------------
 
-Oracle has changed the default max identifier length as of Oracle Server
-version 12.2.   Prior to this version, the length was 30, and for 12.2 and
-greater it is now 128.   This change impacts SQLAlchemy in the area of
-generated SQL label names as well as the generation of constraint names,
-particularly in the case where the constraint naming convention feature
-described at :ref:`constraint_naming_conventions` is being used.
+SQLAlchemy is sensitive to the maximum identifier length supported by Oracle
+Database. This affects generated SQL label names as well as the generation of
+constraint names, particularly in the case where the constraint naming
+convention feature described at :ref:`constraint_naming_conventions` is being
+used.
 
-To assist with this change and others, Oracle includes the concept of a
-"compatibility" version, which is a version number that is independent of the
-actual server version in order to assist with migration of Oracle databases,
-and may be configured within the Oracle server itself. This compatibility
-version is retrieved using the query  ``SELECT value FROM v$parameter WHERE
-name = 'compatible';``.   The SQLAlchemy Oracle dialect, when tasked with
-determining the default max identifier length, will attempt to use this query
-upon first connect in order to determine the effective compatibility version of
-the server, which determines what the maximum allowed identifier length is for
-the server.  If the table is not available, the  server version information is
-used instead.
-
-As of SQLAlchemy 1.4, the default max identifier length for the Oracle dialect
-is 128 characters.  Upon first connect, the compatibility version is detected
-and if it is less than Oracle version 12.2, the max identifier length is
-changed to be 30 characters.  In all cases, setting the
+Oracle Database 12.2 increased the default maximum identifier length from 30 to
+128. As of SQLAlchemy 1.4, the default maximum identifier length for the Oracle
+dialects is 128 characters.  Upon first connection, the maximum length actually
+supported by the database is obtained. In all cases, setting the
 :paramref:`_sa.create_engine.max_identifier_length` parameter will bypass this
 change and the value given will be used as is::
 
     engine = create_engine(
-        "oracle+cx_oracle://scott:tiger@oracle122",
-        max_identifier_length=30)
+        "oracle+oracledb://scott:tiger@localhost:1521?service_name=freepdb1",
+        max_identifier_length=30,
+    )
+
+If :paramref:`_sa.create_engine.max_identifier_length` is not set, the oracledb
+dialect internally uses the ``max_identifier_length`` attribute available on
+driver connections since python-oracledb version 2.5. When using an older
+driver version, or using the cx_Oracle dialect, SQLAlchemy will instead attempt
+to use the query ``SELECT value FROM v$parameter WHERE name = 'compatible'``
+upon first connect in order to determine the effective compatibility version of
+the database. The "compatibility" version is a version number that is
+independent of the actual database version. It is used to assist database
+migration. It is configured by an Oracle Database initialization parameter. The
+compatibility version then determines the maximum allowed identifier length for
+the database. If the V$ view is not available, the database version information
+is used instead.
 
 The maximum identifier length comes into play both when generating anonymized
 SQL labels in SELECT statements, but more crucially when generating constraint
 names from a naming convention.  It is this area that has created the need for
-SQLAlchemy to change this default conservatively.   For example, the following
+SQLAlchemy to change this default conservatively.  For example, the following
 naming convention produces two very different constraint names based on the
 identifier length::
 
@@ -230,68 +234,71 @@ identifier length::
     oracle_dialect = oracle.dialect(max_identifier_length=30)
     print(CreateIndex(ix).compile(dialect=oracle_dialect))
 
-With an identifier length of 30, the above CREATE INDEX looks like::
+With an identifier length of 30, the above CREATE INDEX looks like:
+
+.. sourcecode:: sql
 
     CREATE INDEX ix_some_column_name_1s_70cd ON t
     (some_column_name_1, some_column_name_2, some_column_name_3)
 
-However with length=128, it becomes::
+However with length of 128, it becomes::
+
+.. sourcecode:: sql
 
     CREATE INDEX ix_some_column_name_1some_column_name_2some_column_name_3 ON t
     (some_column_name_1, some_column_name_2, some_column_name_3)
 
-Applications which have run versions of SQLAlchemy prior to 1.4 on an  Oracle
-server version 12.2 or greater are therefore subject to the scenario of a
+Applications which have run versions of SQLAlchemy prior to 1.4 on Oracle
+Database version 12.2 or greater are therefore subject to the scenario of a
 database migration that wishes to "DROP CONSTRAINT" on a name that was
 previously generated with the shorter length.  This migration will fail when
 the identifier length is changed without the name of the index or constraint
 first being adjusted.  Such applications are strongly advised to make use of
-:paramref:`_sa.create_engine.max_identifier_length`
-in order to maintain control
-of the generation of truncated names, and to fully review and test all database
-migrations in a staging environment when changing this value to ensure that the
-impact of this change has been mitigated.
+:paramref:`_sa.create_engine.max_identifier_length` in order to maintain
+control of the generation of truncated names, and to fully review and test all
+database migrations in a staging environment when changing this value to ensure
+that the impact of this change has been mitigated.
 
-.. versionchanged:: 1.4 the default max_identifier_length for Oracle is 128
-   characters, which is adjusted down to 30 upon first connect if an older
-   version of Oracle server (compatibility version < 12.2) is detected.
+.. versionchanged:: 1.4 the default max_identifier_length for Oracle Database
+   is 128 characters, which is adjusted down to 30 upon first connect if the
+   Oracle Database, or its compatibility setting, are lower than version 12.2.
 
 
 LIMIT/OFFSET/FETCH Support
 --------------------------
 
-Methods like :meth:`_sql.Select.limit` and :meth:`_sql.Select.offset` make
-use of ``FETCH FIRST N ROW / OFFSET N ROWS`` syntax assuming
-Oracle 12c or above, and assuming the SELECT statement is not embedded within
-a compound statement like UNION.  This syntax is also available directly by using
-the :meth:`_sql.Select.fetch` method.
+Methods like :meth:`_sql.Select.limit` and :meth:`_sql.Select.offset` make use
+of ``FETCH FIRST N ROW / OFFSET N ROWS`` syntax assuming Oracle Database 12c or
+above, and assuming the SELECT statement is not embedded within a compound
+statement like UNION.  This syntax is also available directly by using the
+:meth:`_sql.Select.fetch` method.
 
-.. versionchanged:: 2.0  the Oracle dialect now uses
-   ``FETCH FIRST N ROW / OFFSET N ROWS`` for all
-   :meth:`_sql.Select.limit` and :meth:`_sql.Select.offset` usage including
-   within the ORM and legacy :class:`_orm.Query`.  To force the legacy
-   behavior using window functions, specify the ``enable_offset_fetch=False``
-   dialect parameter to :func:`_sa.create_engine`.
+.. versionchanged:: 2.0 the Oracle Database dialects now use ``FETCH FIRST N
+   ROW / OFFSET N ROWS`` for all :meth:`_sql.Select.limit` and
+   :meth:`_sql.Select.offset` usage including within the ORM and legacy
+   :class:`_orm.Query`.  To force the legacy behavior using window functions,
+   specify the ``enable_offset_fetch=False`` dialect parameter to
+   :func:`_sa.create_engine`.
 
-The use of ``FETCH FIRST / OFFSET`` may be disabled on any Oracle version
-by passing ``enable_offset_fetch=False`` to :func:`_sa.create_engine`, which
-will force the use of "legacy" mode that makes use of window functions.
+The use of ``FETCH FIRST / OFFSET`` may be disabled on any Oracle Database
+version by passing ``enable_offset_fetch=False`` to :func:`_sa.create_engine`,
+which will force the use of "legacy" mode that makes use of window functions.
 This mode is also selected automatically when using a version of Oracle
-prior to 12c.
+Database prior to 12c.
 
-When using legacy mode, or when a :class:`.Select` statement
-with limit/offset is embedded in a compound statement, an emulated approach for
-LIMIT / OFFSET based on window functions is used, which involves creation of a
-subquery using ``ROW_NUMBER`` that is prone to performance issues as well as
-SQL construction issues for complex statements. However, this approach is
-supported by all Oracle versions. See notes below.
+When using legacy mode, or when a :class:`.Select` statement with limit/offset
+is embedded in a compound statement, an emulated approach for LIMIT / OFFSET
+based on window functions is used, which involves creation of a subquery using
+``ROW_NUMBER`` that is prone to performance issues as well as SQL construction
+issues for complex statements. However, this approach is supported by all
+Oracle Database versions. See notes below.
 
 Notes on LIMIT / OFFSET emulation (when fetch() method cannot be used)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If using :meth:`_sql.Select.limit` and :meth:`_sql.Select.offset`, or with the
 ORM the :meth:`_orm.Query.limit` and :meth:`_orm.Query.offset` methods on an
-Oracle version prior to 12c, the following notes apply:
+Oracle Database version prior to 12c, the following notes apply:
 
 * SQLAlchemy currently makes use of ROWNUM to achieve
   LIMIT/OFFSET; the exact methodology is taken from
@@ -302,10 +309,11 @@ Oracle version prior to 12c, the following notes apply:
   to :func:`_sa.create_engine`.
 
   .. versionchanged:: 1.4
-      The Oracle dialect renders limit/offset integer values using a "post
-      compile" scheme which renders the integer directly before passing the
-      statement to the cursor for execution.   The ``use_binds_for_limits`` flag
-      no longer has an effect.
+
+      The Oracle Database dialect renders limit/offset integer values using a
+      "post compile" scheme which renders the integer directly before passing
+      the statement to the cursor for execution.  The ``use_binds_for_limits``
+      flag no longer has an effect.
 
       .. seealso::
 
@@ -316,37 +324,36 @@ Oracle version prior to 12c, the following notes apply:
 RETURNING Support
 -----------------
 
-The Oracle database supports RETURNING fully for INSERT, UPDATE and DELETE
-statements that are invoked with a single collection of bound parameters
-(that is, a ``cursor.execute()`` style statement; SQLAlchemy does not generally
+Oracle Database supports RETURNING fully for INSERT, UPDATE and DELETE
+statements that are invoked with a single collection of bound parameters (that
+is, a ``cursor.execute()`` style statement; SQLAlchemy does not generally
 support RETURNING with :term:`executemany` statements).  Multiple rows may be
 returned as well.
 
-.. versionchanged:: 2.0  the Oracle backend has full support for RETURNING
-   on parity with other backends.
-
+.. versionchanged:: 2.0 the Oracle Database backend has full support for
+   RETURNING on parity with other backends.
 
 
 ON UPDATE CASCADE
 -----------------
 
-Oracle doesn't have native ON UPDATE CASCADE functionality.  A trigger based
-solution is available at
-https://asktom.oracle.com/tkyte/update_cascade/index.html .
+Oracle Database doesn't have native ON UPDATE CASCADE functionality.  A trigger
+based solution is available at
+https://web.archive.org/web/20090317041251/https://asktom.oracle.com/tkyte/update_cascade/index.html
 
 When using the SQLAlchemy ORM, the ORM has limited ability to manually issue
 cascading updates - specify ForeignKey objects using the
 "deferrable=True, initially='deferred'" keyword arguments,
 and specify "passive_updates=False" on each relationship().
 
-Oracle 8 Compatibility
-----------------------
+Oracle Database 8 Compatibility
+-------------------------------
 
-.. warning:: The status of Oracle 8 compatibility is not known for SQLAlchemy
-   2.0.
+.. warning:: The status of Oracle Database 8 compatibility is not known for
+   SQLAlchemy 2.0.
 
-When Oracle 8 is detected, the dialect internally configures itself to the
-following behaviors:
+When Oracle Database 8 is detected, the dialect internally configures itself to
+the following behaviors:
 
 * the use_ansi flag is set to False.  This has the effect of converting all
   JOIN phrases into the WHERE clause, and in the case of LEFT OUTER JOIN
@@ -368,14 +375,15 @@ for tables indicated by synonyms, either in local or remote schemas or
 accessed over DBLINK, by passing the flag ``oracle_resolve_synonyms=True`` as
 a keyword argument to the :class:`_schema.Table` construct::
 
-    some_table = Table('some_table', autoload_with=some_engine,
-                                oracle_resolve_synonyms=True)
+    some_table = Table(
+        "some_table", autoload_with=some_engine, oracle_resolve_synonyms=True
+    )
 
-When this flag is set, the given name (such as ``some_table`` above) will
-be searched not just in the ``ALL_TABLES`` view, but also within the
+When this flag is set, the given name (such as ``some_table`` above) will be
+searched not just in the ``ALL_TABLES`` view, but also within the
 ``ALL_SYNONYMS`` view to see if this name is actually a synonym to another
-name.  If the synonym is located and refers to a DBLINK, the oracle dialect
-knows how to locate the table's information using DBLINK syntax(e.g.
+name.  If the synonym is located and refers to a DBLINK, the Oracle Database
+dialects know how to locate the table's information using DBLINK syntax(e.g.
 ``@dblink``).
 
 ``oracle_resolve_synonyms`` is accepted wherever reflection arguments are
@@ -389,8 +397,8 @@ If synonyms are not in use, this flag should be left disabled.
 Constraint Reflection
 ---------------------
 
-The Oracle dialect can return information about foreign key, unique, and
-CHECK constraints, as well as indexes on tables.
+The Oracle Database dialects can return information about foreign key, unique,
+and CHECK constraints, as well as indexes on tables.
 
 Raw information regarding these constraints can be acquired using
 :meth:`_reflection.Inspector.get_foreign_keys`,
@@ -398,7 +406,7 @@ Raw information regarding these constraints can be acquired using
 :meth:`_reflection.Inspector.get_check_constraints`, and
 :meth:`_reflection.Inspector.get_indexes`.
 
-.. versionchanged:: 1.2  The Oracle dialect can now reflect UNIQUE and
+.. versionchanged:: 1.2 The Oracle Database dialect can now reflect UNIQUE and
    CHECK constraints.
 
 When using reflection at the :class:`_schema.Table` level, the
@@ -408,29 +416,29 @@ will also include these constraints.
 Note the following caveats:
 
 * When using the :meth:`_reflection.Inspector.get_check_constraints` method,
-  Oracle
-  builds a special "IS NOT NULL" constraint for columns that specify
-  "NOT NULL".  This constraint is **not** returned by default; to include
-  the "IS NOT NULL" constraints, pass the flag ``include_all=True``::
+  Oracle Database builds a special "IS NOT NULL" constraint for columns that
+  specify "NOT NULL".  This constraint is **not** returned by default; to
+  include the "IS NOT NULL" constraints, pass the flag ``include_all=True``::
 
       from sqlalchemy import create_engine, inspect
 
-      engine = create_engine("oracle+cx_oracle://s:t@dsn")
+      engine = create_engine(
+          "oracle+oracledb://scott:tiger@localhost:1521?service_name=freepdb1"
+      )
       inspector = inspect(engine)
       all_check_constraints = inspector.get_check_constraints(
-          "some_table", include_all=True)
+          "some_table", include_all=True
+      )
 
-* in most cases, when reflecting a :class:`_schema.Table`,
-  a UNIQUE constraint will
-  **not** be available as a :class:`.UniqueConstraint` object, as Oracle
-  mirrors unique constraints with a UNIQUE index in most cases (the exception
-  seems to be when two or more unique constraints represent the same columns);
-  the :class:`_schema.Table` will instead represent these using
-  :class:`.Index`
-  with the ``unique=True`` flag set.
+* in most cases, when reflecting a :class:`_schema.Table`, a UNIQUE constraint
+  will **not** be available as a :class:`.UniqueConstraint` object, as Oracle
+  Database mirrors unique constraints with a UNIQUE index in most cases (the
+  exception seems to be when two or more unique constraints represent the same
+  columns); the :class:`_schema.Table` will instead represent these using
+  :class:`.Index` with the ``unique=True`` flag set.
 
-* Oracle creates an implicit index for the primary key of a table; this index
-  is **excluded** from all index results.
+* Oracle Database creates an implicit index for the primary key of a table;
+  this index is **excluded** from all index results.
 
 * the list of columns reflected for an index will not include column names
   that start with SYS_NC.
@@ -450,50 +458,112 @@ the ``exclude_tablespaces`` parameter::
 
     # exclude SYSAUX and SOME_TABLESPACE, but not SYSTEM
     e = create_engine(
-      "oracle+cx_oracle://scott:tiger@xe",
-      exclude_tablespaces=["SYSAUX", "SOME_TABLESPACE"])
+        "oracle+oracledb://scott:tiger@localhost:1521/?service_name=freepdb1",
+        exclude_tablespaces=["SYSAUX", "SOME_TABLESPACE"],
+    )
+
+.. _oracle_float_support:
+
+FLOAT / DOUBLE Support and Behaviors
+------------------------------------
+
+The SQLAlchemy :class:`.Float` and :class:`.Double` datatypes are generic
+datatypes that resolve to the "least surprising" datatype for a given backend.
+For Oracle Database, this means they resolve to the ``FLOAT`` and ``DOUBLE``
+types::
+
+    >>> from sqlalchemy import cast, literal, Float
+    >>> from sqlalchemy.dialects import oracle
+    >>> float_datatype = Float()
+    >>> print(cast(literal(5.0), float_datatype).compile(dialect=oracle.dialect()))
+    CAST(:param_1 AS FLOAT)
+
+Oracle's ``FLOAT`` / ``DOUBLE`` datatypes are aliases for ``NUMBER``.   Oracle
+Database stores ``NUMBER`` values with full precision, not floating point
+precision, which means that ``FLOAT`` / ``DOUBLE`` do not actually behave like
+native FP values. Oracle Database instead offers special datatypes
+``BINARY_FLOAT`` and ``BINARY_DOUBLE`` to deliver real 4- and 8- byte FP
+values.
+
+SQLAlchemy supports these datatypes directly using :class:`.BINARY_FLOAT` and
+:class:`.BINARY_DOUBLE`.   To use the :class:`.Float` or :class:`.Double`
+datatypes in a database agnostic way, while allowing Oracle backends to utilize
+one of these types, use the :meth:`.TypeEngine.with_variant` method to set up a
+variant::
+
+    >>> from sqlalchemy import cast, literal, Float
+    >>> from sqlalchemy.dialects import oracle
+    >>> float_datatype = Float().with_variant(oracle.BINARY_FLOAT(), "oracle")
+    >>> print(cast(literal(5.0), float_datatype).compile(dialect=oracle.dialect()))
+    CAST(:param_1 AS BINARY_FLOAT)
+
+E.g. to use this datatype in a :class:`.Table` definition::
+
+    my_table = Table(
+        "my_table",
+        metadata,
+        Column(
+            "fp_data", Float().with_variant(oracle.BINARY_FLOAT(), "oracle")
+        ),
+    )
 
 DateTime Compatibility
 ----------------------
 
-Oracle has no datatype known as ``DATETIME``, it instead has only ``DATE``,
-which can actually store a date and time value.  For this reason, the Oracle
-dialect provides a type :class:`_oracle.DATE` which is a subclass of
-:class:`.DateTime`.   This type has no special behavior, and is only
-present as a "marker" for this type; additionally, when a database column
-is reflected and the type is reported as ``DATE``, the time-supporting
+Oracle Database has no datatype known as ``DATETIME``, it instead has only
+``DATE``, which can actually store a date and time value.  For this reason, the
+Oracle Database dialects provide a type :class:`_oracle.DATE` which is a
+subclass of :class:`.DateTime`.  This type has no special behavior, and is only
+present as a "marker" for this type; additionally, when a database column is
+reflected and the type is reported as ``DATE``, the time-supporting
 :class:`_oracle.DATE` type is used.
 
 .. _oracle_table_options:
 
-Oracle Table Options
--------------------------
+Oracle Database Table Options
+-----------------------------
 
-The CREATE TABLE phrase supports the following options with Oracle
-in conjunction with the :class:`_schema.Table` construct:
+The CREATE TABLE phrase supports the following options with Oracle Database
+dialects in conjunction with the :class:`_schema.Table` construct:
 
 
 * ``ON COMMIT``::
 
     Table(
-        "some_table", metadata, ...,
-        prefixes=['GLOBAL TEMPORARY'], oracle_on_commit='PRESERVE ROWS')
+        "some_table",
+        metadata,
+        ...,
+        prefixes=["GLOBAL TEMPORARY"],
+        oracle_on_commit="PRESERVE ROWS",
+    )
 
-* ``COMPRESS``::
+*
+  ``COMPRESS``::
 
-    Table('mytable', metadata, Column('data', String(32)),
-        oracle_compress=True)
+     Table(
+         "mytable", metadata, Column("data", String(32)), oracle_compress=True
+     )
 
-    Table('mytable', metadata, Column('data', String(32)),
-        oracle_compress=6)
+     Table("mytable", metadata, Column("data", String(32)), oracle_compress=6)
 
-   The ``oracle_compress`` parameter accepts either an integer compression
-   level, or ``True`` to use the default compression level.
+  The ``oracle_compress`` parameter accepts either an integer compression
+  level, or ``True`` to use the default compression level.
+
+*
+  ``TABLESPACE``::
+
+     Table("mytable", metadata, ..., oracle_tablespace="EXAMPLE_TABLESPACE")
+
+  The ``oracle_tablespace`` parameter specifies the tablespace in which the
+  table is to be created. This is useful when you want to create a table in a
+  tablespace other than the default tablespace of the user.
+
+  .. versionadded:: 2.0.37
 
 .. _oracle_index_options:
 
-Oracle Specific Index Options
------------------------------
+Oracle Database Specific Index Options
+--------------------------------------
 
 Bitmap Indexes
 ~~~~~~~~~~~~~~
@@ -501,7 +571,7 @@ Bitmap Indexes
 You can specify the ``oracle_bitmap`` parameter to create a bitmap index
 instead of a B-tree index::
 
-    Index('my_index', my_table.c.data, oracle_bitmap=True)
+    Index("my_index", my_table.c.data, oracle_bitmap=True)
 
 Bitmap indexes cannot be unique and cannot be compressed. SQLAlchemy will not
 check for such limitations, only the database will.
@@ -509,14 +579,19 @@ check for such limitations, only the database will.
 Index compression
 ~~~~~~~~~~~~~~~~~
 
-Oracle has a more efficient storage mode for indexes containing lots of
-repeated values. Use the ``oracle_compress`` parameter to turn on key
+Oracle Database has a more efficient storage mode for indexes containing lots
+of repeated values. Use the ``oracle_compress`` parameter to turn on key
 compression::
 
-    Index('my_index', my_table.c.data, oracle_compress=True)
+    Index("my_index", my_table.c.data, oracle_compress=True)
 
-    Index('my_index', my_table.c.data1, my_table.c.data2, unique=True,
-           oracle_compress=1)
+    Index(
+        "my_index",
+        my_table.c.data1,
+        my_table.c.data2,
+        unique=True,
+        oracle_compress=1,
+    )
 
 The ``oracle_compress`` parameter accepts either an integer specifying the
 number of prefix columns to compress, or ``True`` to use the default (all
@@ -708,16 +783,16 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler):
                 # https://www.oracletutorial.com/oracle-basics/oracle-float/
                 estimated_binary_precision = int(precision / 0.30103)
                 raise exc.ArgumentError(
-                    "Oracle FLOAT types use 'binary precision', which does "
-                    "not convert cleanly from decimal 'precision'.  Please "
-                    "specify "
-                    f"this type with a separate Oracle variant, such as "
-                    f"{type_.__class__.__name__}(precision={precision})."
+                    "Oracle Database FLOAT types use 'binary precision', "
+                    "which does not convert cleanly from decimal "
+                    "'precision'.  Please specify "
+                    "this type with a separate Oracle Database variant, such "
+                    f"as {type_.__class__.__name__}(precision={precision})."
                     f"with_variant(oracle.FLOAT"
                     f"(binary_precision="
                     f"{estimated_binary_precision}), 'oracle'), so that the "
-                    "Oracle specific 'binary_precision' may be specified "
-                    "accurately."
+                    "Oracle Database specific 'binary_precision' may be "
+                    "specified accurately."
                 )
             else:
                 precision = binary_precision
@@ -839,7 +914,7 @@ class OracleCompiler(compiler.SQLCompiler):
 
     def visit_function(self, func, **kw):
         text = super().visit_function(func, **kw)
-        if kw.get("asfrom", False):
+        if kw.get("asfrom", False) and func.name.lower() != "table":
             text = "TABLE (%s)" % text
         return text
 
@@ -946,13 +1021,13 @@ class OracleCompiler(compiler.SQLCompiler):
                 and not self.dialect._supports_update_returning_computed_cols
             ):
                 util.warn(
-                    "Computed columns don't work with Oracle UPDATE "
+                    "Computed columns don't work with Oracle Database UPDATE "
                     "statements that use RETURNING; the value of the column "
                     "*before* the UPDATE takes place is returned.   It is "
-                    "advised to not use RETURNING with an Oracle computed "
-                    "column.  Consider setting implicit_returning to False on "
-                    "the Table object in order to avoid implicit RETURNING "
-                    "clauses from being generated for this Table."
+                    "advised to not use RETURNING with an Oracle Database "
+                    "computed column.  Consider setting implicit_returning "
+                    "to False on the Table object in order to avoid implicit "
+                    "RETURNING clauses from being generated for this Table."
                 )
             if column.type._has_column_expression:
                 col_expr = column.type.column_expression(column)
@@ -976,7 +1051,7 @@ class OracleCompiler(compiler.SQLCompiler):
                 raise exc.InvalidRequestError(
                     "Using explicit outparam() objects with "
                     "UpdateBase.returning() in the same Core DML statement "
-                    "is not supported in the Oracle dialect."
+                    "is not supported in the Oracle Database dialects."
                 )
 
             self._oracle_returning = True
@@ -997,7 +1072,7 @@ class OracleCompiler(compiler.SQLCompiler):
         return "RETURNING " + ", ".join(columns) + " INTO " + ", ".join(binds)
 
     def _row_limit_clause(self, select, **kw):
-        """ORacle 12c supports OFFSET/FETCH operators
+        """Oracle Database 12c supports OFFSET/FETCH operators
         Use it instead subquery with row_number
 
         """
@@ -1244,6 +1319,31 @@ class OracleCompiler(compiler.SQLCompiler):
     def visit_aggregate_strings_func(self, fn, **kw):
         return "LISTAGG%s" % self.function_argspec(fn, **kw)
 
+    def _visit_bitwise(self, binary, fn_name, custom_right=None, **kw):
+        left = self.process(binary.left, **kw)
+        right = self.process(
+            custom_right if custom_right is not None else binary.right, **kw
+        )
+        return f"{fn_name}({left}, {right})"
+
+    def visit_bitwise_xor_op_binary(self, binary, operator, **kw):
+        return self._visit_bitwise(binary, "BITXOR", **kw)
+
+    def visit_bitwise_or_op_binary(self, binary, operator, **kw):
+        return self._visit_bitwise(binary, "BITOR", **kw)
+
+    def visit_bitwise_and_op_binary(self, binary, operator, **kw):
+        return self._visit_bitwise(binary, "BITAND", **kw)
+
+    def visit_bitwise_rshift_op_binary(self, binary, operator, **kw):
+        raise exc.CompileError("Cannot compile bitwise_rshift in oracle")
+
+    def visit_bitwise_lshift_op_binary(self, binary, operator, **kw):
+        raise exc.CompileError("Cannot compile bitwise_lshift in oracle")
+
+    def visit_bitwise_not_op_unary_operator(self, element, operator, **kw):
+        raise exc.CompileError("Cannot compile bitwise_not in oracle")
+
 
 class OracleDDLCompiler(compiler.DDLCompiler):
     def define_constraint_cascades(self, constraint):
@@ -1253,10 +1353,10 @@ class OracleDDLCompiler(compiler.DDLCompiler):
 
         # oracle has no ON UPDATE CASCADE -
         # its only available via triggers
-        # https://asktom.oracle.com/tkyte/update_cascade/index.html
+        # https://web.archive.org/web/20090317041251/https://asktom.oracle.com/tkyte/update_cascade/index.html
         if constraint.onupdate is not None:
             util.warn(
-                "Oracle does not contain native UPDATE CASCADE "
+                "Oracle Database does not contain native UPDATE CASCADE "
                 "functionality - onupdates will not be rendered for foreign "
                 "keys.  Consider using deferrable=True, initially='deferred' "
                 "or triggers."
@@ -1310,7 +1410,10 @@ class OracleDDLCompiler(compiler.DDLCompiler):
                 table_opts.append("\n COMPRESS")
             else:
                 table_opts.append("\n COMPRESS FOR %s" % (opts["compress"]))
-
+        if opts["tablespace"]:
+            table_opts.append(
+                "\n TABLESPACE %s" % self.preparer.quote(opts["tablespace"])
+            )
         return "".join(table_opts)
 
     def get_identity_options(self, identity_options):
@@ -1328,8 +1431,9 @@ class OracleDDLCompiler(compiler.DDLCompiler):
         )
         if generated.persisted is True:
             raise exc.CompileError(
-                "Oracle computed columns do not support 'stored' persistence; "
-                "set the 'persisted' flag to None or False for Oracle support."
+                "Oracle Database computed columns do not support 'stored' "
+                "persistence; set the 'persisted' flag to None or False for "
+                "Oracle Database support."
             )
         elif generated.persisted is False:
             text += " VIRTUAL"
@@ -1434,7 +1538,12 @@ class OracleDialect(default.DefaultDialect):
     construct_arguments = [
         (
             sa_schema.Table,
-            {"resolve_synonyms": False, "on_commit": None, "compress": False},
+            {
+                "resolve_synonyms": False,
+                "on_commit": None,
+                "compress": False,
+                "tablespace": None,
+            },
         ),
         (sa_schema.Index, {"bitmap": False, "compress": False}),
     ]
@@ -1442,8 +1551,8 @@ class OracleDialect(default.DefaultDialect):
     @util.deprecated_params(
         use_binds_for_limits=(
             "1.4",
-            "The ``use_binds_for_limits`` Oracle dialect parameter is "
-            "deprecated. The dialect now renders LIMIT /OFFSET integers "
+            "The ``use_binds_for_limits`` Oracle Database dialect parameter "
+            "is deprecated. The dialect now renders LIMIT / OFFSET integers "
             "inline in all cases using a post-compilation hook, so that the "
             "value is still represented by a 'bound parameter' on the Core "
             "Expression side.",
@@ -2036,8 +2145,17 @@ class OracleDialect(default.DefaultDialect):
     ):
         query = select(
             dictionary.all_tables.c.table_name,
-            dictionary.all_tables.c.compression,
-            dictionary.all_tables.c.compress_for,
+            (
+                dictionary.all_tables.c.compression
+                if self._supports_table_compression
+                else sql.null().label("compression")
+            ),
+            (
+                dictionary.all_tables.c.compress_for
+                if self._supports_table_compress_for
+                else sql.null().label("compress_for")
+            ),
+            dictionary.all_tables.c.tablespace_name,
         ).where(dictionary.all_tables.c.owner == owner)
         if has_filter_names:
             query = query.where(
@@ -2129,11 +2247,12 @@ class OracleDialect(default.DefaultDialect):
                 connection, query, dblink, returns_long=False, params=params
             )
 
-            for table, compression, compress_for in result:
+            for table, compression, compress_for, tablespace in result:
+                data = default()
                 if compression == "ENABLED":
-                    data = {"oracle_compress": compress_for}
-                else:
-                    data = default()
+                    data["oracle_compress"] = compress_for
+                if tablespace:
+                    data["oracle_tablespace"] = tablespace
                 options[(schema, self.normalize_name(table))] = data
         if ObjectKind.VIEW in kind and ObjectScope.DEFAULT in scope:
             # add the views (no temporary views)
diff --git a/libs/sqlalchemy/dialects/oracle/cx_oracle.py b/libs/sqlalchemy/dialects/oracle/cx_oracle.py
index 934622466..0514ebbcd 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,13 +7,18 @@
 # mypy: ignore-errors
 
 
-r"""
-.. dialect:: oracle+cx_oracle
+r""".. dialect:: oracle+cx_oracle
     :name: cx-Oracle
     :dbapi: cx_oracle
     :connectstring: oracle+cx_oracle://user:pass@hostname:port[/dbname][?service_name=<service>[&key=value&key=value...]]
     :url: https://oracle.github.io/python-cx_Oracle/
 
+Description
+-----------
+
+cx_Oracle was the original driver for Oracle Database. It was superseded by
+python-oracledb which should be used instead.
+
 DSN vs. Hostname connections
 -----------------------------
 
@@ -23,27 +28,41 @@ dialect translates from a series of different URL forms.
 Hostname Connections with Easy Connect Syntax
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Given a hostname, port and service name of the target Oracle Database, for
-example from Oracle's `Easy Connect syntax
-<https://cx-oracle.readthedocs.io/en/latest/user_guide/connection_handling.html#easy-connect-syntax-for-connection-strings>`_,
-then connect in SQLAlchemy using the ``service_name`` query string parameter::
+Given a hostname, port and service name of the target database, for example
+from Oracle Database's Easy Connect syntax then connect in SQLAlchemy using the
+``service_name`` query string parameter::
 
-    engine = create_engine("oracle+cx_oracle://scott:tiger@hostname:port/?service_name=myservice&encoding=UTF-8&nencoding=UTF-8")
+    engine = create_engine(
+        "oracle+cx_oracle://scott:tiger@hostname:port?service_name=myservice&encoding=UTF-8&nencoding=UTF-8"
+    )
 
-The `full Easy Connect syntax
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-B0437826-43C1-49EC-A94D-B650B6A4A6EE>`_
-is not supported.  Instead, use a ``tnsnames.ora`` file and connect using a
-DSN.
+Note that the default driver value for encoding and nencoding was changed to
+“UTF-8” in cx_Oracle 8.0 so these parameters can be omitted when using that
+version, or later.
 
-Connections with tnsnames.ora or Oracle Cloud
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+To use a full Easy Connect string, pass it as the ``dsn`` key value in a
+:paramref:`_sa.create_engine.connect_args` dictionary::
 
-Alternatively, if no port, database name, or ``service_name`` is provided, the
-dialect will use an Oracle DSN "connection string".  This takes the "hostname"
-portion of the URL as the data source name.  For example, if the
-``tnsnames.ora`` file contains a `Net Service Name
-<https://cx-oracle.readthedocs.io/en/latest/user_guide/connection_handling.html#net-service-names-for-connection-strings>`_
-of ``myalias`` as below::
+    import cx_Oracle
+
+    e = create_engine(
+        "oracle+cx_oracle://@",
+        connect_args={
+            "user": "scott",
+            "password": "tiger",
+            "dsn": "hostname:port/myservice?transport_connect_timeout=30&expire_time=60",
+        },
+    )
+
+Connections with tnsnames.ora or to Oracle Autonomous Database
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Alternatively, if no port, database name, or service name is provided, the
+dialect will use an Oracle Database DSN "connection string".  This takes the
+"hostname" portion of the URL as the data source name.  For example, if the
+``tnsnames.ora`` file contains a TNS Alias of ``myalias`` as below:
+
+.. sourcecode:: text
 
     myalias =
       (DESCRIPTION =
@@ -58,19 +77,22 @@ The cx_Oracle dialect connects to this database service when ``myalias`` is the
 hostname portion of the URL, without specifying a port, database name or
 ``service_name``::
 
-    engine = create_engine("oracle+cx_oracle://scott:tiger@myalias/?encoding=UTF-8&nencoding=UTF-8")
+    engine = create_engine("oracle+cx_oracle://scott:tiger@myalias")
 
-Users of Oracle Cloud should use this syntax and also configure the cloud
+Users of Oracle Autonomous Database should use this syntax. If the database is
+configured for mutural TLS ("mTLS"), then you must also configure the cloud
 wallet as shown in cx_Oracle documentation `Connecting to Autononmous Databases
-<https://cx-oracle.readthedocs.io/en/latest/user_guide/connection_handling.html#connecting-to-autononmous-databases>`_.
+<https://cx-oracle.readthedocs.io/en/latest/user_guide/connection_handling.html#autonomousdb>`_.
 
 SID Connections
 ^^^^^^^^^^^^^^^
 
-To use Oracle's obsolete SID connection syntax, the SID can be passed in a
-"database name" portion of the URL as below::
+To use Oracle Database's obsolete System Identifier connection syntax, the SID
+can be passed in a "database name" portion of the URL::
 
-    engine = create_engine("oracle+cx_oracle://scott:tiger@hostname:1521/dbname?encoding=UTF-8&nencoding=UTF-8")
+    engine = create_engine(
+        "oracle+cx_oracle://scott:tiger@hostname:port/dbname"
+    )
 
 Above, the DSN passed to cx_Oracle is created by ``cx_Oracle.makedsn()`` as
 follows::
@@ -79,17 +101,23 @@ follows::
     >>> cx_Oracle.makedsn("hostname", 1521, sid="dbname")
     '(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=hostname)(PORT=1521))(CONNECT_DATA=(SID=dbname)))'
 
+Note that although the SQLAlchemy syntax ``hostname:port/dbname`` looks like
+Oracle's Easy Connect syntax it is different. It uses a SID in place of the
+service name required by Easy Connect.  The Easy Connect syntax does not
+support SIDs.
+
 Passing cx_Oracle connect arguments
 -----------------------------------
 
-Additional connection arguments can usually be passed via the URL
-query string; particular symbols like ``cx_Oracle.SYSDBA`` are intercepted
-and converted to the correct symbol::
+Additional connection arguments can usually be passed via the URL query string;
+particular symbols like ``SYSDBA`` are intercepted and converted to the correct
+symbol::
 
     e = create_engine(
-        "oracle+cx_oracle://user:pass@dsn?encoding=UTF-8&nencoding=UTF-8&mode=SYSDBA&events=true")
+        "oracle+cx_oracle://user:pass@dsn?encoding=UTF-8&nencoding=UTF-8&mode=SYSDBA&events=true"
+    )
 
-.. versionchanged:: 1.3 the cx_oracle dialect now accepts all argument names
+.. versionchanged:: 1.3 the cx_Oracle dialect now accepts all argument names
    within the URL string itself, to be passed to the cx_Oracle DBAPI.   As
    was the case earlier but not correctly documented, the
    :paramref:`_sa.create_engine.connect_args` parameter also accepts all
@@ -100,19 +128,20 @@ string, use the :paramref:`_sa.create_engine.connect_args` dictionary.
 Any cx_Oracle parameter value and/or constant may be passed, such as::
 
     import cx_Oracle
+
     e = create_engine(
         "oracle+cx_oracle://user:pass@dsn",
         connect_args={
             "encoding": "UTF-8",
             "nencoding": "UTF-8",
             "mode": cx_Oracle.SYSDBA,
-            "events": True
-        }
+            "events": True,
+        },
     )
 
-Note that the default value for ``encoding`` and ``nencoding`` was changed to
-"UTF-8" in cx_Oracle 8.0 so these parameters can be omitted when using that
-version, or later.
+Note that the default driver value for ``encoding`` and ``nencoding`` was
+changed to "UTF-8" in cx_Oracle 8.0 so these parameters can be omitted when
+using that version, or later.
 
 Options consumed by the SQLAlchemy cx_Oracle dialect outside of the driver
 --------------------------------------------------------------------------
@@ -122,7 +151,8 @@ itself.  These options are always passed directly to :func:`_sa.create_engine`
 , such as::
 
     e = create_engine(
-        "oracle+cx_oracle://user:pass@dsn", coerce_to_decimal=False)
+        "oracle+cx_oracle://user:pass@dsn", coerce_to_decimal=False
+    )
 
 The parameters accepted by the cx_oracle dialect are as follows:
 
@@ -130,8 +160,7 @@ The parameters accepted by the cx_oracle dialect are as follows:
   to ``None``, indicating that the driver default should be used (typically
   the value is 100).  This setting controls how many rows are buffered when
   fetching rows, and can have a significant effect on performance when
-  modified.   The setting is used for both ``cx_Oracle`` as well as
-  ``oracledb``.
+  modified.
 
   .. versionchanged:: 2.0.26 - changed the default value from 50 to None,
     to use the default value of the driver itself.
@@ -147,10 +176,16 @@ The parameters accepted by the cx_oracle dialect are as follows:
 Using cx_Oracle SessionPool
 ---------------------------
 
-The cx_Oracle library provides its own connection pool implementation that may
-be used in place of SQLAlchemy's pooling functionality.  This can be achieved
-by using the :paramref:`_sa.create_engine.creator` parameter to provide a
-function that returns a new connection, along with setting
+The cx_Oracle driver provides its own connection pool implementation that may
+be used in place of SQLAlchemy's pooling functionality. The driver pool
+supports Oracle Database features such dead connection detection, connection
+draining for planned database downtime, support for Oracle Application
+Continuity and Transparent Application Continuity, and gives support for
+Database Resident Connection Pooling (DRCP).
+
+Using the driver pool can be achieved by using the
+:paramref:`_sa.create_engine.creator` parameter to provide a function that
+returns a new connection, along with setting
 :paramref:`_sa.create_engine.pool_class` to ``NullPool`` to disable
 SQLAlchemy's pooling::
 
@@ -159,32 +194,41 @@ SQLAlchemy's pooling::
     from sqlalchemy.pool import NullPool
 
     pool = cx_Oracle.SessionPool(
-        user="scott", password="tiger", dsn="orclpdb",
-        min=2, max=5, increment=1, threaded=True,
-	encoding="UTF-8", nencoding="UTF-8"
+        user="scott",
+        password="tiger",
+        dsn="orclpdb",
+        min=1,
+        max=4,
+        increment=1,
+        threaded=True,
+        encoding="UTF-8",
+        nencoding="UTF-8",
     )
 
-    engine = create_engine("oracle+cx_oracle://", creator=pool.acquire, poolclass=NullPool)
+    engine = create_engine(
+        "oracle+cx_oracle://", creator=pool.acquire, poolclass=NullPool
+    )
 
 The above engine may then be used normally where cx_Oracle's pool handles
 connection pooling::
 
     with engine.connect() as conn:
-        print(conn.scalar("select 1 FROM dual"))
-
+        print(conn.scalar("select 1 from dual"))
 
 As well as providing a scalable solution for multi-user applications, the
 cx_Oracle session pool supports some Oracle features such as DRCP and
 `Application Continuity
 <https://cx-oracle.readthedocs.io/en/latest/user_guide/ha.html#application-continuity-ac>`_.
 
+Note that the pool creation parameters ``threaded``, ``encoding`` and
+``nencoding`` were deprecated in later cx_Oracle releases.
+
 Using Oracle Database Resident Connection Pooling (DRCP)
 --------------------------------------------------------
 
-When using Oracle's `DRCP
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-015CA8C1-2386-4626-855D-CC546DDC1086>`_,
-the best practice is to pass a connection class and "purity" when acquiring a
-connection from the SessionPool.  Refer to the `cx_Oracle DRCP documentation
+When using Oracle Database's DRCP, the best practice is to pass a connection
+class and "purity" when acquiring a connection from the SessionPool.  Refer to
+the `cx_Oracle DRCP documentation
 <https://cx-oracle.readthedocs.io/en/latest/user_guide/connection_handling.html#database-resident-connection-pooling-drcp>`_.
 
 This can be achieved by wrapping ``pool.acquire()``::
@@ -194,21 +238,33 @@ This can be achieved by wrapping ``pool.acquire()``::
     from sqlalchemy.pool import NullPool
 
     pool = cx_Oracle.SessionPool(
-        user="scott", password="tiger", dsn="orclpdb",
-        min=2, max=5, increment=1, threaded=True,
-	encoding="UTF-8", nencoding="UTF-8"
+        user="scott",
+        password="tiger",
+        dsn="orclpdb",
+        min=2,
+        max=5,
+        increment=1,
+        threaded=True,
+        encoding="UTF-8",
+        nencoding="UTF-8",
     )
 
-    def creator():
-        return pool.acquire(cclass="MYCLASS", purity=cx_Oracle.ATTR_PURITY_SELF)
 
-    engine = create_engine("oracle+cx_oracle://", creator=creator, poolclass=NullPool)
+    def creator():
+        return pool.acquire(
+            cclass="MYCLASS", purity=cx_Oracle.ATTR_PURITY_SELF
+        )
+
+
+    engine = create_engine(
+        "oracle+cx_oracle://", creator=creator, poolclass=NullPool
+    )
 
 The above engine may then be used normally where cx_Oracle handles session
 pooling and Oracle Database additionally uses DRCP::
 
     with engine.connect() as conn:
-        print(conn.scalar("select 1 FROM dual"))
+        print(conn.scalar("select 1 from dual"))
 
 .. _cx_oracle_unicode:
 
@@ -216,24 +272,28 @@ Unicode
 -------
 
 As is the case for all DBAPIs under Python 3, all strings are inherently
-Unicode strings.   In all cases however, the driver requires an explicit
+Unicode strings. In all cases however, the driver requires an explicit
 encoding configuration.
 
 Ensuring the Correct Client Encoding
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The long accepted standard for establishing client encoding for nearly all
-Oracle related software is via the `NLS_LANG <https://www.oracle.com/database/technologies/faq-nls-lang.html>`_
-environment variable.   cx_Oracle like most other Oracle drivers will use
-this environment variable as the source of its encoding configuration.  The
-format of this variable is idiosyncratic; a typical value would be
-``AMERICAN_AMERICA.AL32UTF8``.
+Oracle Database related software is via the `NLS_LANG
+<https://www.oracle.com/database/technologies/faq-nls-lang.html>`_ environment
+variable.  Older versions of cx_Oracle use this environment variable as the
+source of its encoding configuration.  The format of this variable is
+Territory_Country.CharacterSet; a typical value would be
+``AMERICAN_AMERICA.AL32UTF8``.  cx_Oracle version 8 and later use the character
+set "UTF-8" by default, and ignore the character set component of NLS_LANG.
 
-The cx_Oracle driver also supports a programmatic alternative which is to
-pass the ``encoding`` and ``nencoding`` parameters directly to its
-``.connect()`` function.  These can be present in the URL as follows::
+The cx_Oracle driver also supported a programmatic alternative which is to pass
+the ``encoding`` and ``nencoding`` parameters directly to its ``.connect()``
+function.  These can be present in the URL as follows::
 
-    engine = create_engine("oracle+cx_oracle://scott:tiger@orclpdb/?encoding=UTF-8&nencoding=UTF-8")
+    engine = create_engine(
+        "oracle+cx_oracle://scott:tiger@tnsalias?encoding=UTF-8&nencoding=UTF-8"
+    )
 
 For the meaning of the ``encoding`` and ``nencoding`` parameters, please
 consult
@@ -248,25 +308,24 @@ consult
 Unicode-specific Column datatypes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The Core expression language handles unicode data by use of the :class:`.Unicode`
-and :class:`.UnicodeText`
-datatypes.  These types correspond to the  VARCHAR2 and CLOB Oracle datatypes by
-default.   When using these datatypes with Unicode data, it is expected that
-the Oracle database is configured with a Unicode-aware character set, as well
-as that the ``NLS_LANG`` environment variable is set appropriately, so that
-the VARCHAR2 and CLOB datatypes can accommodate the data.
+The Core expression language handles unicode data by use of the
+:class:`.Unicode` and :class:`.UnicodeText` datatypes.  These types correspond
+to the VARCHAR2 and CLOB Oracle Database datatypes by default.  When using
+these datatypes with Unicode data, it is expected that the database is
+configured with a Unicode-aware character set, as well as that the ``NLS_LANG``
+environment variable is set appropriately (this applies to older versions of
+cx_Oracle), so that the VARCHAR2 and CLOB datatypes can accommodate the data.
 
-In the case that the Oracle database is not configured with a Unicode character
+In the case that Oracle Database is not configured with a Unicode character
 set, the two options are to use the :class:`_types.NCHAR` and
 :class:`_oracle.NCLOB` datatypes explicitly, or to pass the flag
-``use_nchar_for_unicode=True`` to :func:`_sa.create_engine`,
-which will cause the
-SQLAlchemy dialect to use NCHAR/NCLOB for the :class:`.Unicode` /
+``use_nchar_for_unicode=True`` to :func:`_sa.create_engine`, which will cause
+the SQLAlchemy dialect to use NCHAR/NCLOB for the :class:`.Unicode` /
 :class:`.UnicodeText` datatypes instead of VARCHAR/CLOB.
 
-.. versionchanged:: 1.3  The :class:`.Unicode` and :class:`.UnicodeText`
-   datatypes now correspond to the ``VARCHAR2`` and ``CLOB`` Oracle datatypes
-   unless the ``use_nchar_for_unicode=True`` is passed to the dialect
+.. versionchanged:: 1.3 The :class:`.Unicode` and :class:`.UnicodeText`
+   datatypes now correspond to the ``VARCHAR2`` and ``CLOB`` Oracle Database
+   datatypes unless the ``use_nchar_for_unicode=True`` is passed to the dialect
    when :func:`_sa.create_engine` is called.
 
 
@@ -275,7 +334,7 @@ SQLAlchemy dialect to use NCHAR/NCLOB for the :class:`.Unicode` /
 Encoding Errors
 ^^^^^^^^^^^^^^^
 
-For the unusual case that data in the Oracle database is present with a broken
+For the unusual case that data in Oracle Database is present with a broken
 encoding, the dialect accepts a parameter ``encoding_errors`` which will be
 passed to Unicode decoding functions in order to affect how decoding errors are
 handled.  The value is ultimately consumed by the Python `decode
@@ -293,13 +352,13 @@ Fine grained control over cx_Oracle data binding performance with setinputsizes
 -------------------------------------------------------------------------------
 
 The cx_Oracle DBAPI has a deep and fundamental reliance upon the usage of the
-DBAPI ``setinputsizes()`` call.   The purpose of this call is to establish the
+DBAPI ``setinputsizes()`` call.  The purpose of this call is to establish the
 datatypes that are bound to a SQL statement for Python values being passed as
 parameters.  While virtually no other DBAPI assigns any use to the
 ``setinputsizes()`` call, the cx_Oracle DBAPI relies upon it heavily in its
-interactions with the Oracle client interface, and in some scenarios it is  not
-possible for SQLAlchemy to know exactly how data should be bound, as some
-settings can cause profoundly different performance characteristics, while
+interactions with the Oracle Database client interface, and in some scenarios
+it is not possible for SQLAlchemy to know exactly how data should be bound, as
+some settings can cause profoundly different performance characteristics, while
 altering the type coercion behavior at the same time.
 
 Users of the cx_Oracle dialect are **strongly encouraged** to read through
@@ -328,13 +387,16 @@ objects which have a ``.key`` and a ``.type`` attribute::
 
     engine = create_engine("oracle+cx_oracle://scott:tiger@host/xe")
 
+
     @event.listens_for(engine, "do_setinputsizes")
     def _log_setinputsizes(inputsizes, cursor, statement, parameters, context):
         for bindparam, dbapitype in inputsizes.items():
-                log.info(
-                    "Bound parameter name: %s  SQLAlchemy type: %r  "
-                    "DBAPI object: %s",
-                    bindparam.key, bindparam.type, dbapitype)
+            log.info(
+                "Bound parameter name: %s  SQLAlchemy type: %r DBAPI object: %s",
+                bindparam.key,
+                bindparam.type,
+                dbapitype,
+            )
 
 Example 2 - remove all bindings to CLOB
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -348,12 +410,28 @@ series.   This setting can be modified as follows::
 
     engine = create_engine("oracle+cx_oracle://scott:tiger@host/xe")
 
+
     @event.listens_for(engine, "do_setinputsizes")
     def _remove_clob(inputsizes, cursor, statement, parameters, context):
         for bindparam, dbapitype in list(inputsizes.items()):
             if dbapitype is CLOB:
                 del inputsizes[bindparam]
 
+.. _cx_oracle_lob:
+
+LOB Datatypes
+--------------
+
+LOB datatypes refer to the "large object" datatypes such as CLOB, NCLOB and
+BLOB. Modern versions of cx_Oracle is optimized for these datatypes to be
+delivered as a single buffer. As such, SQLAlchemy makes use of these newer type
+handlers by default.
+
+To disable the use of newer type handlers and deliver LOB objects as classic
+buffered objects with a ``read()`` method, the parameter
+``auto_convert_lobs=False`` may be passed to :func:`_sa.create_engine`,
+which takes place only engine-wide.
+
 .. _cx_oracle_returning:
 
 RETURNING Support
@@ -362,29 +440,12 @@ RETURNING Support
 The cx_Oracle dialect implements RETURNING using OUT parameters.
 The dialect supports RETURNING fully.
 
-.. _cx_oracle_lob:
-
-LOB Datatypes
---------------
-
-LOB datatypes refer to the "large object" datatypes such as CLOB, NCLOB and
-BLOB. Modern versions of cx_Oracle and oracledb are optimized for these
-datatypes to be delivered as a single buffer. As such, SQLAlchemy makes use of
-these newer type handlers by default.
-
-To disable the use of newer type handlers and deliver LOB objects as classic
-buffered objects with a ``read()`` method, the parameter
-``auto_convert_lobs=False`` may be passed to :func:`_sa.create_engine`,
-which takes place only engine-wide.
-
 Two Phase Transactions Not Supported
--------------------------------------
+------------------------------------
 
-Two phase transactions are **not supported** under cx_Oracle due to poor
-driver support.   As of cx_Oracle 6.0b1, the interface for
-two phase transactions has been changed to be more of a direct pass-through
-to the underlying OCI layer with less automation.  The additional logic
-to support this system is not implemented in SQLAlchemy.
+Two phase transactions are **not supported** under cx_Oracle due to poor driver
+support. The newer :ref:`oracledb` dialect however **does** support two phase
+transactions.
 
 .. _cx_oracle_numeric:
 
@@ -395,20 +456,21 @@ SQLAlchemy's numeric types can handle receiving and returning values as Python
 ``Decimal`` objects or float objects.  When a :class:`.Numeric` object, or a
 subclass such as :class:`.Float`, :class:`_oracle.DOUBLE_PRECISION` etc. is in
 use, the :paramref:`.Numeric.asdecimal` flag determines if values should be
-coerced to ``Decimal`` upon return, or returned as float objects.   To make
-matters more complicated under Oracle, Oracle's ``NUMBER`` type can also
-represent integer values if the "scale" is zero, so the Oracle-specific
-:class:`_oracle.NUMBER` type takes this into account as well.
+coerced to ``Decimal`` upon return, or returned as float objects.  To make
+matters more complicated under Oracle Database, the ``NUMBER`` type can also
+represent integer values if the "scale" is zero, so the Oracle
+Database-specific :class:`_oracle.NUMBER` type takes this into account as well.
 
 The cx_Oracle dialect makes extensive use of connection- and cursor-level
 "outputtypehandler" callables in order to coerce numeric values as requested.
 These callables are specific to the specific flavor of :class:`.Numeric` in
-use, as well as if no SQLAlchemy typing objects are present.   There are
-observed scenarios where Oracle may sends incomplete or ambiguous information
-about the numeric types being returned, such as a query where the numeric types
-are buried under multiple levels of subquery.  The type handlers do their best
-to make the right decision in all cases, deferring to the underlying cx_Oracle
-DBAPI for all those cases where the driver can make the best decision.
+use, as well as if no SQLAlchemy typing objects are present.  There are
+observed scenarios where Oracle Database may send incomplete or ambiguous
+information about the numeric types being returned, such as a query where the
+numeric types are buried under multiple levels of subquery.  The type handlers
+do their best to make the right decision in all cases, deferring to the
+underlying cx_Oracle DBAPI for all those cases where the driver can make the
+best decision.
 
 When no typing objects are present, as when executing plain SQL strings, a
 default "outputtypehandler" is present which will generally return numeric
@@ -1291,8 +1353,13 @@ class OracleDialect_cx_oracle(OracleDialect):
                 cx_Oracle.CLOB,
                 cx_Oracle.NCLOB,
             ):
+                typ = (
+                    cx_Oracle.DB_TYPE_VARCHAR
+                    if default_type is cx_Oracle.CLOB
+                    else cx_Oracle.DB_TYPE_NVARCHAR
+                )
                 return cursor.var(
-                    cx_Oracle.DB_TYPE_NVARCHAR,
+                    typ,
                     _CX_ORACLE_MAGIC_LOB_SIZE,
                     cursor.arraysize,
                     **dialect._cursor_var_unicode_kwargs,
@@ -1423,13 +1490,6 @@ class OracleDialect_cx_oracle(OracleDialect):
         return False
 
     def create_xid(self):
-        """create a two-phase transaction ID.
-
-        this id will be passed to do_begin_twophase(), do_rollback_twophase(),
-        do_commit_twophase().  its format is unspecified.
-
-        """
-
         id_ = random.randint(0, 2**128)
         return (0x1234, "%032x" % id_, "%032x" % 9)
 
diff --git a/libs/sqlalchemy/dialects/oracle/dictionary.py b/libs/sqlalchemy/dialects/oracle/dictionary.py
index 63479b9fc..f785a66ef 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 9cdec3b55..c09d2bae0 100644
--- a/libs/sqlalchemy/dialects/oracle/oracledb.py
+++ b/libs/sqlalchemy/dialects/oracle/oracledb.py
@@ -1,77 +1,595 @@
 # dialects/oracle/oracledb.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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:: oracle+oracledb
+r""".. dialect:: oracle+oracledb
     :name: python-oracledb
     :dbapi: oracledb
     :connectstring: oracle+oracledb://user:pass@hostname:port[/dbname][?service_name=<service>[&key=value&key=value...]]
     :url: https://oracle.github.io/python-oracledb/
 
-python-oracledb is released by Oracle to supersede the cx_Oracle driver.
-It is fully compatible with cx_Oracle and features both a "thin" client
-mode that requires no dependencies, as well as a "thick" mode that uses
-the Oracle Client Interface in the same way as cx_Oracle.
+Description
+-----------
 
-.. seealso::
+Python-oracledb is the Oracle Database driver for Python. It features a default
+"thin" client mode that requires no dependencies, and an optional "thick" mode
+that uses Oracle Client libraries.  It supports SQLAlchemy features including
+two phase transactions and Asyncio.
 
-    :ref:`cx_oracle` - all of cx_Oracle's notes apply to the oracledb driver
-    as well.
+Python-oracle is the renamed, updated cx_Oracle driver. Oracle is no longer
+doing any releases in the cx_Oracle namespace.
 
 The SQLAlchemy ``oracledb`` dialect provides both a sync and an async
 implementation under the same dialect name. The proper version is
 selected depending on how the engine is created:
 
 * calling :func:`_sa.create_engine` with ``oracle+oracledb://...`` will
-  automatically select the sync version, e.g.::
+  automatically select the sync version::
 
     from sqlalchemy import create_engine
-    sync_engine = create_engine("oracle+oracledb://scott:tiger@localhost/?service_name=XEPDB1")
 
-* calling :func:`_asyncio.create_async_engine` with
-  ``oracle+oracledb://...`` will automatically select the async version,
-  e.g.::
+    sync_engine = create_engine(
+        "oracle+oracledb://scott:tiger@localhost?service_name=FREEPDB1"
+    )
+
+* calling :func:`_asyncio.create_async_engine` with ``oracle+oracledb://...``
+  will automatically select the async version::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    asyncio_engine = create_async_engine("oracle+oracledb://scott:tiger@localhost/?service_name=XEPDB1")
 
-The asyncio version of the dialect may also be specified explicitly using the
-``oracledb_async`` suffix, as::
+    asyncio_engine = create_async_engine(
+        "oracle+oracledb://scott:tiger@localhost?service_name=FREEPDB1"
+    )
 
-    from sqlalchemy.ext.asyncio import create_async_engine
-    asyncio_engine = create_async_engine("oracle+oracledb_async://scott:tiger@localhost/?service_name=XEPDB1")
+  The asyncio version of the dialect may also be specified explicitly using the
+  ``oracledb_async`` suffix::
+
+      from sqlalchemy.ext.asyncio import create_async_engine
+
+      asyncio_engine = create_async_engine(
+          "oracle+oracledb_async://scott:tiger@localhost?service_name=FREEPDB1"
+      )
 
 .. versionadded:: 2.0.25 added support for the async version of oracledb.
 
 Thick mode support
 ------------------
 
-By default the ``python-oracledb`` is started in thin mode, that does not
-require oracle client libraries to be installed in the system. The
-``python-oracledb`` driver also support a "thick" mode, that behaves
-similarly to ``cx_oracle`` and requires that Oracle Client Interface (OCI)
-is installed.
+By default, the python-oracledb driver runs in a "thin" mode that does not
+require Oracle Client libraries to be installed. The driver also supports a
+"thick" mode that uses Oracle Client libraries to get functionality such as
+Oracle Application Continuity.
 
-To enable this mode, the user may call ``oracledb.init_oracle_client``
-manually, or by passing the parameter ``thick_mode=True`` to
-:func:`_sa.create_engine`. To pass custom arguments to ``init_oracle_client``,
-like the ``lib_dir`` path, a dict may be passed to this parameter, as in::
+To enable thick mode, call `oracledb.init_oracle_client()
+<https://python-oracledb.readthedocs.io/en/latest/api_manual/module.html#oracledb.init_oracle_client>`_
+explicitly, or pass the parameter ``thick_mode=True`` to
+:func:`_sa.create_engine`. To pass custom arguments to
+``init_oracle_client()``, like the ``lib_dir`` path, a dict may be passed, for
+example::
 
-    engine = sa.create_engine("oracle+oracledb://...", thick_mode={
-        "lib_dir": "/path/to/oracle/client/lib", "driver_name": "my-app"
-    })
+    engine = sa.create_engine(
+        "oracle+oracledb://...",
+        thick_mode={
+            "lib_dir": "/path/to/oracle/client/lib",
+            "config_dir": "/path/to/network_config_file_directory",
+            "driver_name": "my-app : 1.0.0",
+        },
+    )
+
+Note that passing a ``lib_dir`` path should only be done on macOS or
+Windows. On Linux it does not behave as you might expect.
 
 .. seealso::
 
-    https://python-oracledb.readthedocs.io/en/latest/api_manual/module.html#oracledb.init_oracle_client
+    python-oracledb documentation `Enabling python-oracledb Thick mode
+    <https://python-oracledb.readthedocs.io/en/latest/user_guide/initialization.html#enabling-python-oracledb-thick-mode>`_
+
+Connecting to Oracle Database
+-----------------------------
+
+python-oracledb provides several methods of indicating the target database.
+The dialect translates from a series of different URL forms.
+
+Given the hostname, port and service name of the target database, you can
+connect in SQLAlchemy using the ``service_name`` query string parameter::
+
+    engine = create_engine(
+        "oracle+oracledb://scott:tiger@hostname:port?service_name=myservice"
+    )
+
+Connecting with Easy Connect strings
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can pass any valid python-oracledb connection string as the ``dsn`` key
+value in a :paramref:`_sa.create_engine.connect_args` dictionary.  See
+python-oracledb documentation `Oracle Net Services Connection Strings
+<https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#oracle-net-services-connection-strings>`_.
+
+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
+a keep-alive time of 60 seconds to stop idle network connections from being
+terminated by a firewall::
+
+    e = create_engine(
+        "oracle+oracledb://@",
+        connect_args={
+            "user": "scott",
+            "password": "tiger",
+            "dsn": "hostname:port/myservice?transport_connect_timeout=30&expire_time=60",
+        },
+    )
+
+The Easy Connect syntax has been enhanced during the life of Oracle Database.
+Review the documentation for your database version.  The current documentation
+is at `Understanding the Easy Connect Naming Method
+<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-B0437826-43C1-49EC-A94D-B650B6A4A6EE>`_.
+
+The general syntax is similar to:
+
+.. sourcecode:: text
+
+    [[protocol:]//]host[:port][/[service_name]][?parameter_name=value{&parameter_name=value}]
+
+Note that although the SQLAlchemy URL syntax ``hostname:port/dbname`` looks
+like Oracle's Easy Connect syntax, it is different. SQLAlchemy's URL requires a
+system identifier (SID) for the ``dbname`` component::
+
+    engine = create_engine("oracle+oracledb://scott:tiger@hostname:port/sid")
+
+Easy Connect syntax does not support SIDs. It uses services names, which are
+the preferred choice for connecting to Oracle Database.
+
+Passing python-oracledb connect arguments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Other python-oracledb driver `connection options
+<https://python-oracledb.readthedocs.io/en/latest/api_manual/module.html#oracledb.connect>`_
+can be passed in ``connect_args``.  For example::
+
+    e = create_engine(
+        "oracle+oracledb://@",
+        connect_args={
+            "user": "scott",
+            "password": "tiger",
+            "dsn": "hostname:port/myservice",
+            "events": True,
+            "mode": oracledb.AUTH_MODE_SYSDBA,
+        },
+    )
+
+Connecting with tnsnames.ora TNS aliases
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If no port, database name, or service name is provided, the dialect will use an
+Oracle Database DSN "connection string".  This takes the "hostname" portion of
+the URL as the data source name.  For example, if the ``tnsnames.ora`` file
+contains a `TNS Alias
+<https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#tns-aliases-for-connection-strings>`_
+of ``myalias`` as below:
+
+.. sourcecode:: text
+
+    myalias =
+      (DESCRIPTION =
+        (ADDRESS = (PROTOCOL = TCP)(HOST = mymachine.example.com)(PORT = 1521))
+        (CONNECT_DATA =
+          (SERVER = DEDICATED)
+          (SERVICE_NAME = orclpdb1)
+        )
+      )
+
+The python-oracledb dialect connects to this database service when ``myalias`` is the
+hostname portion of the URL, without specifying a port, database name or
+``service_name``::
+
+    engine = create_engine("oracle+oracledb://scott:tiger@myalias")
+
+Connecting to Oracle Autonomous Database
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Users of Oracle Autonomous Database should use either use the TNS Alias URL
+shown above, or pass the TNS Alias as the ``dsn`` key value in a
+:paramref:`_sa.create_engine.connect_args` dictionary.
+
+If Oracle Autonomous Database is configured for mutual TLS ("mTLS")
+connections, then additional configuration is required as shown in `Connecting
+to Oracle Cloud Autonomous Databases
+<https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#connecting-to-oracle-cloud-autonomous-databases>`_. In
+summary, Thick mode users should configure file locations and set the wallet
+path in ``sqlnet.ora`` appropriately::
+
+    e = create_engine(
+        "oracle+oracledb://@",
+        thick_mode={
+            # directory containing tnsnames.ora and cwallet.so
+            "config_dir": "/opt/oracle/wallet_dir",
+        },
+        connect_args={
+            "user": "scott",
+            "password": "tiger",
+            "dsn": "mydb_high",
+        },
+    )
+
+Thin mode users of mTLS should pass the appropriate directories and PEM wallet
+password when creating the engine, similar to::
+
+    e = create_engine(
+        "oracle+oracledb://@",
+        connect_args={
+            "user": "scott",
+            "password": "tiger",
+            "dsn": "mydb_high",
+            "config_dir": "/opt/oracle/wallet_dir",  # directory containing tnsnames.ora
+            "wallet_location": "/opt/oracle/wallet_dir",  # directory containing ewallet.pem
+            "wallet_password": "top secret",  # password for the PEM file
+        },
+    )
+
+Typically ``config_dir`` and ``wallet_location`` are the same directory, which
+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.
+
+The python-oracledb driver provides its own connection pool implementation that
+may be used in place of SQLAlchemy's pooling functionality.  The driver pool
+gives support for high availability features such as dead connection detection,
+connection draining for planned database downtime, support for Oracle
+Application Continuity and Transparent Application Continuity, and gives
+support for `Database Resident Connection Pooling (DRCP)
+<https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#database-resident-connection-pooling-drcp>`_.
+
+To take advantage of python-oracledb's pool, use the
+:paramref:`_sa.create_engine.creator` parameter to provide a function that
+returns a new connection, along with setting
+:paramref:`_sa.create_engine.pool_class` to ``NullPool`` to disable
+SQLAlchemy's pooling::
+
+    import oracledb
+    from sqlalchemy import create_engine
+    from sqlalchemy import text
+    from sqlalchemy.pool import NullPool
+
+    # Uncomment to use the optional python-oracledb Thick mode.
+    # Review the python-oracledb doc for the appropriate parameters
+    # oracledb.init_oracle_client(<your parameters>)
+
+    pool = oracledb.create_pool(
+        user="scott",
+        password="tiger",
+        dsn="localhost:1521/freepdb1",
+        min=1,
+        max=4,
+        increment=1,
+    )
+    engine = create_engine(
+        "oracle+oracledb://", creator=pool.acquire, poolclass=NullPool
+    )
+
+The above engine may then be used normally. Internally, python-oracledb handles
+connection pooling::
+
+    with engine.connect() as conn:
+        print(conn.scalar(text("select 1 from dual")))
+
+Refer to the python-oracledb documentation for `oracledb.create_pool()
+<https://python-oracledb.readthedocs.io/en/latest/api_manual/module.html#oracledb.create_pool>`_
+for the arguments that can be used when creating a connection pool.
+
+.. _drcp:
+
+Using Oracle Database Resident Connection Pooling (DRCP)
+--------------------------------------------------------
+
+When using Oracle Database's Database Resident Connection Pooling (DRCP), the
+best practice is to specify a connection class and "purity". Refer to the
+`python-oracledb documentation on DRCP
+<https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#database-resident-connection-pooling-drcp>`_.
+For example::
+
+    import oracledb
+    from sqlalchemy import create_engine
+    from sqlalchemy import text
+    from sqlalchemy.pool import NullPool
+
+    # Uncomment to use the optional python-oracledb Thick mode.
+    # Review the python-oracledb doc for the appropriate parameters
+    # oracledb.init_oracle_client(<your parameters>)
+
+    pool = oracledb.create_pool(
+        user="scott",
+        password="tiger",
+        dsn="localhost:1521/freepdb1",
+        min=1,
+        max=4,
+        increment=1,
+        cclass="MYCLASS",
+        purity=oracledb.PURITY_SELF,
+    )
+    engine = create_engine(
+        "oracle+oracledb://", creator=pool.acquire, poolclass=NullPool
+    )
+
+The above engine may then be used normally where python-oracledb handles
+application connection pooling and Oracle Database additionally uses DRCP::
+
+    with engine.connect() as conn:
+        print(conn.scalar(text("select 1 from dual")))
+
+If you wish to use different connection classes or purities for different
+connections, then wrap ``pool.acquire()``::
+
+    import oracledb
+    from sqlalchemy import create_engine
+    from sqlalchemy import text
+    from sqlalchemy.pool import NullPool
+
+    # Uncomment to use python-oracledb Thick mode.
+    # Review the python-oracledb doc for the appropriate parameters
+    # oracledb.init_oracle_client(<your parameters>)
+
+    pool = oracledb.create_pool(
+        user="scott",
+        password="tiger",
+        dsn="localhost:1521/freepdb1",
+        min=1,
+        max=4,
+        increment=1,
+        cclass="MYCLASS",
+        purity=oracledb.PURITY_SELF,
+    )
 
 
-.. versionadded:: 2.0.0 added support for oracledb driver.
+    def creator():
+        return pool.acquire(cclass="MYOTHERCLASS", purity=oracledb.PURITY_NEW)
+
+
+    engine = create_engine(
+        "oracle+oracledb://", creator=creator, poolclass=NullPool
+    )
+
+Engine Options consumed by the SQLAlchemy oracledb dialect outside of the driver
+--------------------------------------------------------------------------------
+
+There are also options that are consumed by the SQLAlchemy oracledb dialect
+itself.  These options are always passed directly to :func:`_sa.create_engine`,
+such as::
+
+    e = create_engine("oracle+oracledb://user:pass@tnsalias", arraysize=500)
+
+The parameters accepted by the oracledb dialect are as follows:
+
+* ``arraysize`` - set the driver cursor.arraysize value. It defaults to
+  ``None``, indicating that the driver default value of 100 should be used.
+  This setting controls how many rows are buffered when fetching rows, and can
+  have a significant effect on performance if increased for queries that return
+  large numbers of rows.
+
+  .. versionchanged:: 2.0.26 - changed the default value from 50 to None,
+    to use the default value of the driver itself.
+
+* ``auto_convert_lobs`` - defaults to True; See :ref:`oracledb_lob`.
+
+* ``coerce_to_decimal`` - see :ref:`oracledb_numeric` for detail.
+
+* ``encoding_errors`` - see :ref:`oracledb_unicode_encoding_errors` for detail.
+
+.. _oracledb_unicode:
+
+Unicode
+-------
+
+As is the case for all DBAPIs under Python 3, all strings are inherently
+Unicode strings.
+
+Ensuring the Correct Client Encoding
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In python-oracledb, the encoding used for all character data is "UTF-8".
+
+Unicode-specific Column datatypes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Core expression language handles unicode data by use of the
+:class:`.Unicode` and :class:`.UnicodeText` datatypes.  These types correspond
+to the VARCHAR2 and CLOB Oracle Database datatypes by default.  When using
+these datatypes with Unicode data, it is expected that the database is
+configured with a Unicode-aware character set so that the VARCHAR2 and CLOB
+datatypes can accommodate the data.
+
+In the case that Oracle Database is not configured with a Unicode character
+set, the two options are to use the :class:`_types.NCHAR` and
+:class:`_oracle.NCLOB` datatypes explicitly, or to pass the flag
+``use_nchar_for_unicode=True`` to :func:`_sa.create_engine`, which will cause
+the SQLAlchemy dialect to use NCHAR/NCLOB for the :class:`.Unicode` /
+:class:`.UnicodeText` datatypes instead of VARCHAR/CLOB.
+
+.. versionchanged:: 1.3 The :class:`.Unicode` and :class:`.UnicodeText`
+   datatypes now correspond to the ``VARCHAR2`` and ``CLOB`` Oracle Database
+   datatypes unless the ``use_nchar_for_unicode=True`` is passed to the dialect
+   when :func:`_sa.create_engine` is called.
+
+
+.. _oracledb_unicode_encoding_errors:
+
+Encoding Errors
+^^^^^^^^^^^^^^^
+
+For the unusual case that data in Oracle Database is present with a broken
+encoding, the dialect accepts a parameter ``encoding_errors`` which will be
+passed to Unicode decoding functions in order to affect how decoding errors are
+handled.  The value is ultimately consumed by the Python `decode
+<https://docs.python.org/3/library/stdtypes.html#bytes.decode>`_ function, and
+is passed both via python-oracledb's ``encodingErrors`` parameter consumed by
+``Cursor.var()``, as well as SQLAlchemy's own decoding function, as the
+python-oracledb dialect makes use of both under different circumstances.
+
+.. versionadded:: 1.3.11
+
+
+.. _oracledb_setinputsizes:
+
+Fine grained control over python-oracledb data binding with setinputsizes
+-------------------------------------------------------------------------
+
+The python-oracle DBAPI has a deep and fundamental reliance upon the usage of
+the DBAPI ``setinputsizes()`` call.  The purpose of this call is to establish
+the datatypes that are bound to a SQL statement for Python values being passed
+as parameters.  While virtually no other DBAPI assigns any use to the
+``setinputsizes()`` call, the python-oracledb DBAPI relies upon it heavily in
+its interactions with the Oracle Database, and in some scenarios it is not
+possible for SQLAlchemy to know exactly how data should be bound, as some
+settings can cause profoundly different performance characteristics, while
+altering the type coercion behavior at the same time.
+
+Users of the oracledb dialect are **strongly encouraged** to read through
+python-oracledb's list of built-in datatype symbols at `Database Types
+<https://python-oracledb.readthedocs.io/en/latest/api_manual/module.html#database-types>`_
+Note that in some cases, significant performance degradation can occur when
+using these types vs. not.
+
+On the SQLAlchemy side, the :meth:`.DialectEvents.do_setinputsizes` event can
+be used both for runtime visibility (e.g. logging) of the setinputsizes step as
+well as to fully control how ``setinputsizes()`` is used on a per-statement
+basis.
+
+.. versionadded:: 1.2.9 Added :meth:`.DialectEvents.setinputsizes`
+
+
+Example 1 - logging all setinputsizes calls
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following example illustrates how to log the intermediary values from a
+SQLAlchemy perspective before they are converted to the raw ``setinputsizes()``
+parameter dictionary.  The keys of the dictionary are :class:`.BindParameter`
+objects which have a ``.key`` and a ``.type`` attribute::
+
+    from sqlalchemy import create_engine, event
+
+    engine = create_engine(
+        "oracle+oracledb://scott:tiger@localhost:1521?service_name=freepdb1"
+    )
+
+
+    @event.listens_for(engine, "do_setinputsizes")
+    def _log_setinputsizes(inputsizes, cursor, statement, parameters, context):
+        for bindparam, dbapitype in inputsizes.items():
+            log.info(
+                "Bound parameter name: %s  SQLAlchemy type: %r DBAPI object: %s",
+                bindparam.key,
+                bindparam.type,
+                dbapitype,
+            )
+
+Example 2 - remove all bindings to CLOB
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For performance, fetching LOB datatypes from Oracle Database is set by default
+for the ``Text`` type within SQLAlchemy.  This setting can be modified as
+follows::
+
+
+    from sqlalchemy import create_engine, event
+    from oracledb import CLOB
+
+    engine = create_engine(
+        "oracle+oracledb://scott:tiger@localhost:1521?service_name=freepdb1"
+    )
+
+
+    @event.listens_for(engine, "do_setinputsizes")
+    def _remove_clob(inputsizes, cursor, statement, parameters, context):
+        for bindparam, dbapitype in list(inputsizes.items()):
+            if dbapitype is CLOB:
+                del inputsizes[bindparam]
+
+.. _oracledb_lob:
+
+LOB Datatypes
+--------------
+
+LOB datatypes refer to the "large object" datatypes such as CLOB, NCLOB and
+BLOB. Oracle Database can efficiently return these datatypes as a single
+buffer. SQLAlchemy makes use of type handlers to do this by default.
+
+To disable the use of the type handlers and deliver LOB objects as classic
+buffered objects with a ``read()`` method, the parameter
+``auto_convert_lobs=False`` may be passed to :func:`_sa.create_engine`.
+
+.. _oracledb_returning:
+
+RETURNING Support
+-----------------
+
+The oracledb dialect implements RETURNING using OUT parameters.  The dialect
+supports RETURNING fully.
+
+Two Phase Transaction Support
+-----------------------------
+
+Two phase transactions are fully supported with python-oracledb. (Thin mode
+requires python-oracledb 2.3).  APIs for two phase transactions are provided at
+the Core level via :meth:`_engine.Connection.begin_twophase` and
+:paramref:`_orm.Session.twophase` for transparent ORM use.
+
+.. versionchanged:: 2.0.32 added support for two phase transactions
+
+.. _oracledb_numeric:
+
+Precision Numerics
+------------------
+
+SQLAlchemy's numeric types can handle receiving and returning values as Python
+``Decimal`` objects or float objects.  When a :class:`.Numeric` object, or a
+subclass such as :class:`.Float`, :class:`_oracle.DOUBLE_PRECISION` etc. is in
+use, the :paramref:`.Numeric.asdecimal` flag determines if values should be
+coerced to ``Decimal`` upon return, or returned as float objects.  To make
+matters more complicated under Oracle Database, the ``NUMBER`` type can also
+represent integer values if the "scale" is zero, so the Oracle
+Database-specific :class:`_oracle.NUMBER` type takes this into account as well.
+
+The oracledb dialect makes extensive use of connection- and cursor-level
+"outputtypehandler" callables in order to coerce numeric values as requested.
+These callables are specific to the specific flavor of :class:`.Numeric` in
+use, as well as if no SQLAlchemy typing objects are present.  There are
+observed scenarios where Oracle Database may send incomplete or ambiguous
+information about the numeric types being returned, such as a query where the
+numeric types are buried under multiple levels of subquery.  The type handlers
+do their best to make the right decision in all cases, deferring to the
+underlying python-oracledb DBAPI for all those cases where the driver can make
+the best decision.
+
+When no typing objects are present, as when executing plain SQL strings, a
+default "outputtypehandler" is present which will generally return numeric
+values which specify precision and scale as Python ``Decimal`` objects.  To
+disable this coercion to decimal for performance reasons, pass the flag
+``coerce_to_decimal=False`` to :func:`_sa.create_engine`::
+
+    engine = create_engine(
+        "oracle+oracledb://scott:tiger@tnsalias", coerce_to_decimal=False
+    )
+
+The ``coerce_to_decimal`` flag only impacts the results of plain string
+SQL statements that are not otherwise associated with a :class:`.Numeric`
+SQLAlchemy type (or a subclass of such).
+
+.. versionchanged:: 1.2 The numeric handling system for the oracle dialects has
+   been reworked to take advantage of newer driver features as well as better
+   integration of outputtypehandlers.
+
+.. versionadded:: 2.0.0 added support for the python-oracledb driver.
 
 """  # noqa
 from __future__ import annotations
@@ -81,12 +599,14 @@ import re
 from typing import Any
 from typing import TYPE_CHECKING
 
-from .cx_oracle import OracleDialect_cx_oracle as _OracleDialect_cx_oracle
+from . import cx_oracle as _cx_oracle
 from ... import exc
 from ... import pool
 from ...connectors.asyncio import AsyncAdapt_dbapi_connection
 from ...connectors.asyncio import AsyncAdapt_dbapi_cursor
+from ...connectors.asyncio import AsyncAdapt_dbapi_ss_cursor
 from ...connectors.asyncio import AsyncAdaptFallback_dbapi_connection
+from ...engine import default
 from ...util import asbool
 from ...util import await_fallback
 from ...util import await_only
@@ -96,8 +616,16 @@ if TYPE_CHECKING:
     from oracledb import AsyncCursor
 
 
-class OracleDialect_oracledb(_OracleDialect_cx_oracle):
+class OracleExecutionContext_oracledb(
+    _cx_oracle.OracleExecutionContext_cx_oracle
+):
+    pass
+
+
+class OracleDialect_oracledb(_cx_oracle.OracleDialect_cx_oracle):
     supports_statement_cache = True
+    execution_ctx_cls = OracleExecutionContext_oracledb
+
     driver = "oracledb"
     _min_version = (1,)
 
@@ -155,6 +683,56 @@ class OracleDialect_oracledb(_OracleDialect_cx_oracle):
                 f"oracledb version {self._min_version} and above are supported"
             )
 
+    def do_begin_twophase(self, connection, xid):
+        conn_xis = connection.connection.xid(*xid)
+        connection.connection.tpc_begin(conn_xis)
+        connection.connection.info["oracledb_xid"] = conn_xis
+
+    def do_prepare_twophase(self, connection, xid):
+        should_commit = connection.connection.tpc_prepare()
+        connection.info["oracledb_should_commit"] = should_commit
+
+    def do_rollback_twophase(
+        self, connection, xid, is_prepared=True, recover=False
+    ):
+        if recover:
+            conn_xid = connection.connection.xid(*xid)
+        else:
+            conn_xid = None
+        connection.connection.tpc_rollback(conn_xid)
+
+    def do_commit_twophase(
+        self, connection, xid, is_prepared=True, recover=False
+    ):
+        conn_xid = None
+        if not is_prepared:
+            should_commit = connection.connection.tpc_prepare()
+        elif recover:
+            conn_xid = connection.connection.xid(*xid)
+            should_commit = True
+        else:
+            should_commit = connection.info["oracledb_should_commit"]
+        if should_commit:
+            connection.connection.tpc_commit(conn_xid)
+
+    def do_recover_twophase(self, connection):
+        return [
+            # oracledb seems to return bytes
+            (
+                fi,
+                gti.decode() if isinstance(gti, bytes) else gti,
+                bq.decode() if isinstance(bq, bytes) else bq,
+            )
+            for fi, gti, bq in connection.connection.tpc_recover()
+        ]
+
+    def _check_max_identifier_length(self, connection):
+        if self.oracledb_ver >= (2, 5):
+            max_len = connection.connection.max_identifier_length
+            if max_len is not None:
+                return max_len
+        return super()._check_max_identifier_length(connection)
+
 
 class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):
     _cursor: AsyncCursor
@@ -185,7 +763,7 @@ class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):
             self._adapt_connection._handle_exception(error)
 
     async def _execute_async(self, operation, parameters):
-        # override to not use mutex, oracledb already has mutex
+        # override to not use mutex, oracledb already has a mutex
 
         if parameters is None:
             result = await self._cursor.execute(operation)
@@ -201,7 +779,7 @@ class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):
         operation,
         seq_of_parameters,
     ):
-        # override to not use mutex, oracledb already has mutex
+        # override to not use mutex, oracledb already has a mutex
         return await self._cursor.executemany(operation, seq_of_parameters)
 
     def __enter__(self):
@@ -211,6 +789,17 @@ class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):
         self.close()
 
 
+class AsyncAdapt_oracledb_ss_cursor(
+    AsyncAdapt_dbapi_ss_cursor, AsyncAdapt_oracledb_cursor
+):
+    __slots__ = ()
+
+    def close(self) -> None:
+        if self._cursor is not None:
+            self._cursor.close()
+            self._cursor = None  # type: ignore
+
+
 class AsyncAdapt_oracledb_connection(AsyncAdapt_dbapi_connection):
     _connection: AsyncConnection
     __slots__ = ()
@@ -248,9 +837,34 @@ class AsyncAdapt_oracledb_connection(AsyncAdapt_dbapi_connection):
     def stmtcachesize(self, value):
         self._connection.stmtcachesize = value
 
+    @property
+    def max_identifier_length(self):
+        return self._connection.max_identifier_length
+
     def cursor(self):
         return AsyncAdapt_oracledb_cursor(self)
 
+    def ss_cursor(self):
+        return AsyncAdapt_oracledb_ss_cursor(self)
+
+    def xid(self, *args: Any, **kwargs: Any) -> Any:
+        return self._connection.xid(*args, **kwargs)
+
+    def tpc_begin(self, *args: Any, **kwargs: Any) -> Any:
+        return self.await_(self._connection.tpc_begin(*args, **kwargs))
+
+    def tpc_commit(self, *args: Any, **kwargs: Any) -> Any:
+        return self.await_(self._connection.tpc_commit(*args, **kwargs))
+
+    def tpc_prepare(self, *args: Any, **kwargs: Any) -> Any:
+        return self.await_(self._connection.tpc_prepare(*args, **kwargs))
+
+    def tpc_recover(self, *args: Any, **kwargs: Any) -> Any:
+        return self.await_(self._connection.tpc_recover(*args, **kwargs))
+
+    def tpc_rollback(self, *args: Any, **kwargs: Any) -> Any:
+        return self.await_(self._connection.tpc_rollback(*args, **kwargs))
+
 
 class AsyncAdaptFallback_oracledb_connection(
     AsyncAdaptFallback_dbapi_connection, AsyncAdapt_oracledb_connection
@@ -281,9 +895,31 @@ class OracledbAdaptDBAPI:
             )
 
 
+class OracleExecutionContextAsync_oracledb(OracleExecutionContext_oracledb):
+    # restore default create cursor
+    create_cursor = default.DefaultExecutionContext.create_cursor
+
+    def create_default_cursor(self):
+        # copy of OracleExecutionContext_cx_oracle.create_cursor
+        c = self._dbapi_connection.cursor()
+        if self.dialect.arraysize:
+            c.arraysize = self.dialect.arraysize
+
+        return c
+
+    def create_server_side_cursor(self):
+        c = self._dbapi_connection.ss_cursor()
+        if self.dialect.arraysize:
+            c.arraysize = self.dialect.arraysize
+
+        return c
+
+
 class OracleDialectAsync_oracledb(OracleDialect_oracledb):
     is_async = True
+    supports_server_side_cursors = True
     supports_statement_cache = True
+    execution_ctx_cls = OracleExecutionContextAsync_oracledb
 
     _min_version = (2,)
 
diff --git a/libs/sqlalchemy/dialects/oracle/provision.py b/libs/sqlalchemy/dialects/oracle/provision.py
index b33c1525c..3587de9d0 100644
--- a/libs/sqlalchemy/dialects/oracle/provision.py
+++ b/libs/sqlalchemy/dialects/oracle/provision.py
@@ -1,5 +1,5 @@
 # dialects/oracle/provision.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -89,7 +89,7 @@ def _oracle_drop_db(cfg, eng, ident):
         # cx_Oracle seems to occasionally leak open connections when a large
         # suite it run, even if we confirm we have zero references to
         # connection objects.
-        # while there is a "kill session" command in Oracle,
+        # while there is a "kill session" command in Oracle Database,
         # it unfortunately does not release the connection sufficiently.
         _ora_drop_ignore(conn, ident)
         _ora_drop_ignore(conn, "%s_ts1" % ident)
diff --git a/libs/sqlalchemy/dialects/oracle/types.py b/libs/sqlalchemy/dialects/oracle/types.py
index 36caaa05e..06aeaace2 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -64,17 +64,18 @@ class NUMBER(sqltypes.Numeric, sqltypes.Integer):
 
 
 class FLOAT(sqltypes.FLOAT):
-    """Oracle FLOAT.
+    """Oracle Database FLOAT.
 
     This is the same as :class:`_sqltypes.FLOAT` except that
-    an Oracle-specific :paramref:`_oracle.FLOAT.binary_precision`
+    an Oracle Database -specific :paramref:`_oracle.FLOAT.binary_precision`
     parameter is accepted, and
     the :paramref:`_sqltypes.Float.precision` parameter is not accepted.
 
-    Oracle FLOAT types indicate precision in terms of "binary precision", which
-    defaults to 126. For a REAL type, the value is 63. This parameter does not
-    cleanly map to a specific number of decimal places but is roughly
-    equivalent to the desired number of decimal places divided by 0.3103.
+    Oracle Database FLOAT types indicate precision in terms of "binary
+    precision", which defaults to 126. For a REAL type, the value is 63. This
+    parameter does not cleanly map to a specific number of decimal places but
+    is roughly equivalent to the desired number of decimal places divided by
+    0.3103.
 
     .. versionadded:: 2.0
 
@@ -91,10 +92,11 @@ class FLOAT(sqltypes.FLOAT):
         r"""
         Construct a FLOAT
 
-        :param binary_precision: Oracle binary precision value to be rendered
-         in DDL. This may be approximated to the number of decimal characters
-         using the formula "decimal precision = 0.30103 * binary precision".
-         The default value used by Oracle for FLOAT / DOUBLE PRECISION is 126.
+        :param binary_precision: Oracle Database binary precision value to be
+         rendered in DDL. This may be approximated to the number of decimal
+         characters using the formula "decimal precision = 0.30103 * binary
+         precision".  The default value used by Oracle Database for FLOAT /
+         DOUBLE PRECISION is 126.
 
         :param asdecimal: See :paramref:`_sqltypes.Float.asdecimal`
 
@@ -109,10 +111,36 @@ class FLOAT(sqltypes.FLOAT):
 
 
 class BINARY_DOUBLE(sqltypes.Double):
+    """Implement the Oracle ``BINARY_DOUBLE`` datatype.
+
+    This datatype differs from the Oracle ``DOUBLE`` datatype in that it
+    delivers a true 8-byte FP value.   The datatype may be combined with a
+    generic :class:`.Double` datatype using :meth:`.TypeEngine.with_variant`.
+
+    .. seealso::
+
+        :ref:`oracle_float_support`
+
+
+    """
+
     __visit_name__ = "BINARY_DOUBLE"
 
 
 class BINARY_FLOAT(sqltypes.Float):
+    """Implement the Oracle ``BINARY_FLOAT`` datatype.
+
+    This datatype differs from the Oracle ``FLOAT`` datatype in that it
+    delivers a true 4-byte FP value.   The datatype may be combined with a
+    generic :class:`.Float` datatype using :meth:`.TypeEngine.with_variant`.
+
+    .. seealso::
+
+        :ref:`oracle_float_support`
+
+
+    """
+
     __visit_name__ = "BINARY_FLOAT"
 
 
@@ -163,10 +191,10 @@ class _OracleDateLiteralRender:
 
 
 class DATE(_OracleDateLiteralRender, sqltypes.DateTime):
-    """Provide the oracle DATE type.
+    """Provide the Oracle Database DATE type.
 
     This type has no special Python behavior, except that it subclasses
-    :class:`_types.DateTime`; this is to suit the fact that the Oracle
+    :class:`_types.DateTime`; this is to suit the fact that the Oracle Database
     ``DATE`` type supports a time value.
 
     """
@@ -246,8 +274,8 @@ class INTERVAL(sqltypes.NativeForEmulated, sqltypes._AbstractInterval):
 
 
 class TIMESTAMP(sqltypes.TIMESTAMP):
-    """Oracle implementation of ``TIMESTAMP``, which supports additional
-    Oracle-specific modes
+    """Oracle Database implementation of ``TIMESTAMP``, which supports
+    additional Oracle Database-specific modes
 
     .. versionadded:: 2.0
 
@@ -257,10 +285,11 @@ class TIMESTAMP(sqltypes.TIMESTAMP):
         """Construct a new :class:`_oracle.TIMESTAMP`.
 
         :param timezone: boolean.  Indicates that the TIMESTAMP type should
-         use Oracle's ``TIMESTAMP WITH TIME ZONE`` datatype.
+         use Oracle Database's ``TIMESTAMP WITH TIME ZONE`` datatype.
 
         :param local_timezone: boolean.  Indicates that the TIMESTAMP type
-         should use Oracle's ``TIMESTAMP WITH LOCAL TIME ZONE`` datatype.
+         should use Oracle Database's ``TIMESTAMP WITH LOCAL TIME ZONE``
+         datatype.
 
 
         """
@@ -273,7 +302,7 @@ class TIMESTAMP(sqltypes.TIMESTAMP):
 
 
 class ROWID(sqltypes.TypeEngine):
-    """Oracle ROWID type.
+    """Oracle Database ROWID type.
 
     When used in a cast() or similar, generates ROWID.
 
diff --git a/libs/sqlalchemy/dialects/postgresql/__init__.py b/libs/sqlalchemy/dialects/postgresql/__init__.py
index 17b14f4d0..88935e202 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -8,7 +8,7 @@
 
 from types import ModuleType
 
-from . import array as arraylib  # noqa # must be above base and other dialects
+from . import array as arraylib  # noqa # keep above base and other dialects
 from . import asyncpg  # noqa
 from . import base
 from . import pg8000  # noqa
diff --git a/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py b/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py
index 46858c9f2..d827e054c 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/array.py b/libs/sqlalchemy/dialects/postgresql/array.py
index e88c27d2d..7708769cb 100644
--- a/libs/sqlalchemy/dialects/postgresql/array.py
+++ b/libs/sqlalchemy/dialects/postgresql/array.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/array.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -54,11 +54,13 @@ class array(expression.ExpressionClauseList[_T]):
         from sqlalchemy.dialects import postgresql
         from sqlalchemy import select, func
 
-        stmt = select(array([1,2]) + array([3,4,5]))
+        stmt = select(array([1, 2]) + array([3, 4, 5]))
 
         print(stmt.compile(dialect=postgresql.dialect()))
 
-    Produces the SQL::
+    Produces the SQL:
+
+    .. sourcecode:: sql
 
         SELECT ARRAY[%(param_1)s, %(param_2)s] ||
             ARRAY[%(param_3)s, %(param_4)s, %(param_5)s]) AS anon_1
@@ -67,7 +69,7 @@ class array(expression.ExpressionClauseList[_T]):
     :class:`_types.ARRAY`.  The "inner" type of the array is inferred from
     the values present, unless the ``type_`` keyword argument is passed::
 
-        array(['foo', 'bar'], type_=CHAR)
+        array(["foo", "bar"], type_=CHAR)
 
     Multidimensional arrays are produced by nesting :class:`.array` constructs.
     The dimensionality of the final :class:`_types.ARRAY`
@@ -76,16 +78,21 @@ class array(expression.ExpressionClauseList[_T]):
     type::
 
         stmt = select(
-            array([
-                array([1, 2]), array([3, 4]), array([column('q'), column('x')])
-            ])
+            array(
+                [array([1, 2]), array([3, 4]), array([column("q"), column("x")])]
+            )
         )
         print(stmt.compile(dialect=postgresql.dialect()))
 
-    Produces::
+    Produces:
 
-        SELECT ARRAY[ARRAY[%(param_1)s, %(param_2)s],
-        ARRAY[%(param_3)s, %(param_4)s], ARRAY[q, x]] AS anon_1
+    .. sourcecode:: sql
+
+        SELECT ARRAY[
+            ARRAY[%(param_1)s, %(param_2)s],
+            ARRAY[%(param_3)s, %(param_4)s],
+            ARRAY[q, x]
+        ] AS anon_1
 
     .. versionadded:: 1.3.6 added support for multidimensional array literals
 
@@ -93,7 +100,7 @@ class array(expression.ExpressionClauseList[_T]):
 
         :class:`_postgresql.ARRAY`
 
-    """
+    """  # noqa: E501
 
     __visit_name__ = "array"
 
@@ -166,9 +173,11 @@ class ARRAY(sqltypes.ARRAY):
 
         from sqlalchemy.dialects import postgresql
 
-        mytable = Table("mytable", metadata,
-                Column("data", postgresql.ARRAY(Integer, dimensions=2))
-            )
+        mytable = Table(
+            "mytable",
+            metadata,
+            Column("data", postgresql.ARRAY(Integer, dimensions=2)),
+        )
 
     The :class:`_postgresql.ARRAY` type provides all operations defined on the
     core :class:`_types.ARRAY` type, including support for "dimensions",
@@ -183,8 +192,9 @@ class ARRAY(sqltypes.ARRAY):
 
         mytable.c.data.contains([1, 2])
 
-    The :class:`_postgresql.ARRAY` type may not be supported on all
-    PostgreSQL DBAPIs; it is currently known to work on psycopg2 only.
+    Indexed access is one-based by default, to match that of PostgreSQL;
+    for zero-based indexed access, set
+    :paramref:`_postgresql.ARRAY.zero_indexes`.
 
     Additionally, the :class:`_postgresql.ARRAY`
     type does not work directly in
@@ -203,6 +213,7 @@ class ARRAY(sqltypes.ARRAY):
             from sqlalchemy.dialects.postgresql import ARRAY
             from sqlalchemy.ext.mutable import MutableList
 
+
             class SomeOrmClass(Base):
                 # ...
 
@@ -224,41 +235,6 @@ class ARRAY(sqltypes.ARRAY):
 
     """
 
-    class Comparator(sqltypes.ARRAY.Comparator):
-        """Define comparison operations for :class:`_types.ARRAY`.
-
-        Note that these operations are in addition to those provided
-        by the base :class:`.types.ARRAY.Comparator` class, including
-        :meth:`.types.ARRAY.Comparator.any` and
-        :meth:`.types.ARRAY.Comparator.all`.
-
-        """
-
-        def contains(self, other, **kwargs):
-            """Boolean expression.  Test if elements are a superset of the
-            elements of the argument array expression.
-
-            kwargs may be ignored by this operator but are required for API
-            conformance.
-            """
-            return self.operate(CONTAINS, other, result_type=sqltypes.Boolean)
-
-        def contained_by(self, other):
-            """Boolean expression.  Test if elements are a proper subset of the
-            elements of the argument array expression.
-            """
-            return self.operate(
-                CONTAINED_BY, other, result_type=sqltypes.Boolean
-            )
-
-        def overlap(self, other):
-            """Boolean expression.  Test if array has elements in common with
-            an argument array expression.
-            """
-            return self.operate(OVERLAP, other, result_type=sqltypes.Boolean)
-
-    comparator_factory = Comparator
-
     def __init__(
         self,
         item_type: _TypeEngineArgument[Any],
@@ -270,7 +246,7 @@ class ARRAY(sqltypes.ARRAY):
 
         E.g.::
 
-          Column('myarray', ARRAY(Integer))
+          Column("myarray", ARRAY(Integer))
 
         Arguments are:
 
@@ -310,6 +286,41 @@ class ARRAY(sqltypes.ARRAY):
         self.dimensions = dimensions
         self.zero_indexes = zero_indexes
 
+    class Comparator(sqltypes.ARRAY.Comparator):
+        """Define comparison operations for :class:`_types.ARRAY`.
+
+        Note that these operations are in addition to those provided
+        by the base :class:`.types.ARRAY.Comparator` class, including
+        :meth:`.types.ARRAY.Comparator.any` and
+        :meth:`.types.ARRAY.Comparator.all`.
+
+        """
+
+        def contains(self, other, **kwargs):
+            """Boolean expression.  Test if elements are a superset of the
+            elements of the argument array expression.
+
+            kwargs may be ignored by this operator but are required for API
+            conformance.
+            """
+            return self.operate(CONTAINS, other, result_type=sqltypes.Boolean)
+
+        def contained_by(self, other):
+            """Boolean expression.  Test if elements are a proper subset of the
+            elements of the argument array expression.
+            """
+            return self.operate(
+                CONTAINED_BY, other, result_type=sqltypes.Boolean
+            )
+
+        def overlap(self, other):
+            """Boolean expression.  Test if array has elements in common with
+            an argument array expression.
+            """
+            return self.operate(OVERLAP, other, result_type=sqltypes.Boolean)
+
+    comparator_factory = Comparator
+
     @property
     def hashable(self):
         return self.as_tuple
diff --git a/libs/sqlalchemy/dialects/postgresql/asyncpg.py b/libs/sqlalchemy/dialects/postgresql/asyncpg.py
index 4c60c3d83..523c47abc 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-2024 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -23,7 +23,10 @@ This dialect should normally be used only with the
 :func:`_asyncio.create_async_engine` engine creation function::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    engine = create_async_engine("postgresql+asyncpg://user:pass@hostname/dbname")
+
+    engine = create_async_engine(
+        "postgresql+asyncpg://user:pass@hostname/dbname"
+    )
 
 .. versionadded:: 1.4
 
@@ -78,11 +81,15 @@ asyncpg dialect, therefore is handled as a DBAPI argument, not a dialect
 argument)::
 
 
-    engine = create_async_engine("postgresql+asyncpg://user:pass@hostname/dbname?prepared_statement_cache_size=500")
+    engine = create_async_engine(
+        "postgresql+asyncpg://user:pass@hostname/dbname?prepared_statement_cache_size=500"
+    )
 
 To disable the prepared statement cache, use a value of zero::
 
-    engine = create_async_engine("postgresql+asyncpg://user:pass@hostname/dbname?prepared_statement_cache_size=0")
+    engine = create_async_engine(
+        "postgresql+asyncpg://user:pass@hostname/dbname?prepared_statement_cache_size=0"
+    )
 
 .. versionadded:: 1.4.0b2 Added ``prepared_statement_cache_size`` for asyncpg.
 
@@ -112,8 +119,8 @@ To disable the prepared statement cache, use a value of zero::
 
 .. _asyncpg_prepared_statement_name:
 
-Prepared Statement Name
------------------------
+Prepared Statement Name with PGBouncer
+--------------------------------------
 
 By default, asyncpg enumerates prepared statements in numeric order, which
 can lead to errors if a name has already been taken for another prepared
@@ -128,10 +135,10 @@ a prepared statement is prepared::
     from uuid import uuid4
 
     engine = create_async_engine(
-        "postgresql+asyncpg://user:pass@hostname/dbname",
+        "postgresql+asyncpg://user:pass@somepgbouncer/dbname",
         poolclass=NullPool,
         connect_args={
-            'prepared_statement_name_func': lambda:  f'__asyncpg_{uuid4()}__',
+            "prepared_statement_name_func": lambda: f"__asyncpg_{uuid4()}__",
         },
     )
 
@@ -141,7 +148,7 @@ a prepared statement is prepared::
 
    https://github.com/sqlalchemy/sqlalchemy/issues/6467
 
-.. warning:: To prevent a buildup of useless prepared statements in
+.. warning:: When using PGBouncer, to prevent a buildup of useless prepared statements in
    your application, it's important to use the :class:`.NullPool` pool
    class, and to configure PgBouncer to use `DISCARD <https://www.postgresql.org/docs/current/sql-discard.html>`_
    when returning connections.  The DISCARD command is used to release resources held by the db connection,
@@ -171,7 +178,7 @@ client using this setting passed to :func:`_asyncio.create_async_engine`::
 
 from __future__ import annotations
 
-import collections
+from collections import deque
 import decimal
 import json as _py_json
 import re
@@ -258,20 +265,20 @@ class AsyncpgInteger(sqltypes.Integer):
     render_bind_cast = True
 
 
+class AsyncpgSmallInteger(sqltypes.SmallInteger):
+    render_bind_cast = True
+
+
 class AsyncpgBigInteger(sqltypes.BigInteger):
     render_bind_cast = True
 
 
 class AsyncpgJSON(json.JSON):
-    render_bind_cast = True
-
     def result_processor(self, dialect, coltype):
         return None
 
 
 class AsyncpgJSONB(json.JSONB):
-    render_bind_cast = True
-
     def result_processor(self, dialect, coltype):
         return None
 
@@ -487,7 +494,7 @@ class AsyncAdapt_asyncpg_cursor:
     def __init__(self, adapt_connection):
         self._adapt_connection = adapt_connection
         self._connection = adapt_connection._connection
-        self._rows = []
+        self._rows = deque()
         self._cursor = None
         self.description = None
         self.arraysize = 1
@@ -495,7 +502,7 @@ class AsyncAdapt_asyncpg_cursor:
         self._invalidate_schema_cache_asof = 0
 
     def close(self):
-        self._rows[:] = []
+        self._rows.clear()
 
     def _handle_exception(self, error):
         self._adapt_connection._handle_exception(error)
@@ -535,11 +542,12 @@ class AsyncAdapt_asyncpg_cursor:
                     self._cursor = await prepared_stmt.cursor(*parameters)
                     self.rowcount = -1
                 else:
-                    self._rows = await prepared_stmt.fetch(*parameters)
+                    self._rows = deque(await prepared_stmt.fetch(*parameters))
                     status = prepared_stmt.get_statusmsg()
 
                     reg = re.match(
-                        r"(?:SELECT|UPDATE|DELETE|INSERT \d+) (\d+)", status
+                        r"(?:SELECT|UPDATE|DELETE|INSERT \d+) (\d+)",
+                        status or "",
                     )
                     if reg:
                         self.rowcount = int(reg.group(1))
@@ -583,11 +591,11 @@ class AsyncAdapt_asyncpg_cursor:
 
     def __iter__(self):
         while self._rows:
-            yield self._rows.pop(0)
+            yield self._rows.popleft()
 
     def fetchone(self):
         if self._rows:
-            return self._rows.pop(0)
+            return self._rows.popleft()
         else:
             return None
 
@@ -595,13 +603,12 @@ class AsyncAdapt_asyncpg_cursor:
         if size is None:
             size = self.arraysize
 
-        retval = self._rows[0:size]
-        self._rows[:] = self._rows[size:]
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
-        retval = self._rows[:]
-        self._rows[:] = []
+        retval = list(self._rows)
+        self._rows.clear()
         return retval
 
 
@@ -611,23 +618,21 @@ class AsyncAdapt_asyncpg_ss_cursor(AsyncAdapt_asyncpg_cursor):
 
     def __init__(self, adapt_connection):
         super().__init__(adapt_connection)
-        self._rowbuffer = None
+        self._rowbuffer = deque()
 
     def close(self):
         self._cursor = None
-        self._rowbuffer = None
+        self._rowbuffer.clear()
 
     def _buffer_rows(self):
+        assert self._cursor is not None
         new_rows = self._adapt_connection.await_(self._cursor.fetch(50))
-        self._rowbuffer = collections.deque(new_rows)
+        self._rowbuffer.extend(new_rows)
 
     def __aiter__(self):
         return self
 
     async def __anext__(self):
-        if not self._rowbuffer:
-            self._buffer_rows()
-
         while True:
             while self._rowbuffer:
                 yield self._rowbuffer.popleft()
@@ -650,21 +655,19 @@ class AsyncAdapt_asyncpg_ss_cursor(AsyncAdapt_asyncpg_cursor):
         if not self._rowbuffer:
             self._buffer_rows()
 
-        buf = list(self._rowbuffer)
-        lb = len(buf)
+        assert self._cursor is not None
+        rb = self._rowbuffer
+        lb = len(rb)
         if size > lb:
-            buf.extend(
+            rb.extend(
                 self._adapt_connection.await_(self._cursor.fetch(size - lb))
             )
 
-        result = buf[0:size]
-        self._rowbuffer = collections.deque(buf[size:])
-        return result
+        return [rb.popleft() for _ in range(min(size, len(rb)))]
 
     def fetchall(self):
-        ret = list(self._rowbuffer) + list(
-            self._adapt_connection.await_(self._all())
-        )
+        ret = list(self._rowbuffer)
+        ret.extend(self._adapt_connection.await_(self._all()))
         self._rowbuffer.clear()
         return ret
 
@@ -849,25 +852,45 @@ class AsyncAdapt_asyncpg_connection(AdaptedConnection):
         else:
             return AsyncAdapt_asyncpg_cursor(self)
 
+    async def _rollback_and_discard(self):
+        try:
+            await self._transaction.rollback()
+        finally:
+            # if asyncpg .rollback() was actually called, then whether or
+            # not it raised or succeeded, the transation is done, discard it
+            self._transaction = None
+            self._started = False
+
+    async def _commit_and_discard(self):
+        try:
+            await self._transaction.commit()
+        finally:
+            # if asyncpg .commit() was actually called, then whether or
+            # not it raised or succeeded, the transation is done, discard it
+            self._transaction = None
+            self._started = False
+
     def rollback(self):
         if self._started:
             try:
-                self.await_(self._transaction.rollback())
-            except Exception as error:
-                self._handle_exception(error)
-            finally:
+                self.await_(self._rollback_and_discard())
                 self._transaction = None
                 self._started = False
+            except Exception as error:
+                # don't dereference asyncpg transaction if we didn't
+                # actually try to call rollback() on it
+                self._handle_exception(error)
 
     def commit(self):
         if self._started:
             try:
-                self.await_(self._transaction.commit())
-            except Exception as error:
-                self._handle_exception(error)
-            finally:
+                self.await_(self._commit_and_discard())
                 self._transaction = None
                 self._started = False
+            except Exception as error:
+                # don't dereference asyncpg transaction if we didn't
+                # actually try to call commit() on it
+                self._handle_exception(error)
 
     def close(self):
         self.rollback()
@@ -884,6 +907,7 @@ class AsyncAdapt_asyncpg_connection(AdaptedConnection):
                 self.await_(self._connection.close(timeout=2))
             except (
                 asyncio.TimeoutError,
+                asyncio.CancelledError,
                 OSError,
                 self.dbapi.asyncpg.PostgresError,
             ):
@@ -1032,6 +1056,7 @@ class PGDialect_asyncpg(PGDialect):
             INTERVAL: AsyncPgInterval,
             sqltypes.Boolean: AsyncpgBoolean,
             sqltypes.Integer: AsyncpgInteger,
+            sqltypes.SmallInteger: AsyncpgSmallInteger,
             sqltypes.BigInteger: AsyncpgBigInteger,
             sqltypes.Numeric: AsyncpgNumeric,
             sqltypes.Float: AsyncpgFloat,
diff --git a/libs/sqlalchemy/dialects/postgresql/base.py b/libs/sqlalchemy/dialects/postgresql/base.py
index 3fe8900ac..9bfaa277c 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,7 +9,6 @@
 r"""
 .. dialect:: postgresql
     :name: PostgreSQL
-    :full_support: 12, 13, 14, 15
     :normal_support: 9.6+
     :best_effort: 9+
 
@@ -32,7 +31,7 @@ use the :func:`~sqlalchemy.schema.Sequence` construct::
         metadata,
         Column(
             "id", Integer, Sequence("some_id_seq", start=1), primary_key=True
-        )
+        ),
     )
 
 When SQLAlchemy issues a single INSERT statement, to fulfill the contract of
@@ -64,9 +63,9 @@ of SERIAL. The :class:`_schema.Identity` construct in a
         "data",
         metadata,
         Column(
-            'id', Integer, Identity(start=42, cycle=True), primary_key=True
+            "id", Integer, Identity(start=42, cycle=True), primary_key=True
         ),
-        Column('data', String)
+        Column("data", String),
     )
 
 The CREATE TABLE for the above :class:`_schema.Table` object would be:
@@ -93,23 +92,21 @@ The CREATE TABLE for the above :class:`_schema.Table` object would be:
        from sqlalchemy.ext.compiler import compiles
 
 
-       @compiles(CreateColumn, 'postgresql')
+       @compiles(CreateColumn, "postgresql")
        def use_identity(element, compiler, **kw):
            text = compiler.visit_create_column(element, **kw)
-           text = text.replace(
-               "SERIAL", "INT GENERATED BY DEFAULT AS IDENTITY"
-            )
+           text = text.replace("SERIAL", "INT GENERATED BY DEFAULT AS IDENTITY")
            return text
 
    Using the above, a table such as::
 
        t = Table(
-           't', m,
-           Column('id', Integer, primary_key=True),
-           Column('data', String)
+           "t", m, Column("id", Integer, primary_key=True), Column("data", String)
        )
 
-   Will generate on the backing database as::
+   Will generate on the backing database as:
+
+   .. sourcecode:: sql
 
        CREATE TABLE t (
            id INT GENERATED BY DEFAULT AS IDENTITY,
@@ -130,7 +127,9 @@ Server side cursors are enabled on a per-statement basis by using the
 option::
 
     with engine.connect() as conn:
-        result = conn.execution_options(stream_results=True).execute(text("select * from table"))
+        result = conn.execution_options(stream_results=True).execute(
+            text("select * from table")
+        )
 
 Note that some kinds of SQL statements may not be supported with
 server side cursors; generally, only SQL statements that return rows should be
@@ -169,17 +168,15 @@ To set isolation level using :func:`_sa.create_engine`::
 
     engine = create_engine(
         "postgresql+pg8000://scott:tiger@localhost/test",
-        isolation_level = "REPEATABLE READ"
+        isolation_level="REPEATABLE READ",
     )
 
 To set using per-connection execution options::
 
     with engine.connect() as conn:
-        conn = conn.execution_options(
-            isolation_level="REPEATABLE READ"
-        )
+        conn = conn.execution_options(isolation_level="REPEATABLE READ")
         with conn.begin():
-            # ... work with transaction
+            ...  # work with transaction
 
 There are also more options for isolation level configurations, such as
 "sub-engine" objects linked to a main :class:`_engine.Engine` which each apply
@@ -222,10 +219,10 @@ passing the ``"SERIALIZABLE"`` isolation level at the same time as setting
         conn = conn.execution_options(
             isolation_level="SERIALIZABLE",
             postgresql_readonly=True,
-            postgresql_deferrable=True
+            postgresql_deferrable=True,
         )
         with conn.begin():
-            #  ... work with transaction
+            ...  # work with transaction
 
 Note that some DBAPIs such as asyncpg only support "readonly" with
 SERIALIZABLE isolation.
@@ -270,7 +267,6 @@ will remain consistent with the state of the transaction::
 
     postgresql_engine = create_engine(
         "postgresql+pyscopg2://scott:tiger@hostname/dbname",
-
         # disable default reset-on-return scheme
         pool_reset_on_return=None,
     )
@@ -317,6 +313,7 @@ at :ref:`schema_set_default_connections`::
 
     engine = create_engine("postgresql+psycopg2://scott:tiger@host/dbname")
 
+
     @event.listens_for(engine, "connect", insert=True)
     def set_search_path(dbapi_connection, connection_record):
         existing_autocommit = dbapi_connection.autocommit
@@ -335,9 +332,6 @@ be reverted when the DBAPI connection has a rollback.
 
   :ref:`schema_set_default_connections` - in the :ref:`metadata_toplevel` documentation
 
-
-
-
 .. _postgresql_schema_reflection:
 
 Remote-Schema Table Introspection and PostgreSQL search_path
@@ -346,7 +340,9 @@ Remote-Schema Table Introspection and PostgreSQL search_path
 .. admonition:: Section Best Practices Summarized
 
     keep the ``search_path`` variable set to its default of ``public``, without
-    any other schema names. For other schema names, name these explicitly
+    any other schema names. Ensure the username used to connect **does not**
+    match remote schemas, or ensure the ``"$user"`` token is **removed** from
+    ``search_path``.  For other schema names, name these explicitly
     within :class:`_schema.Table` definitions. Alternatively, the
     ``postgresql_ignore_search_path`` option will cause all reflected
     :class:`_schema.Table` objects to have a :attr:`_schema.Table.schema`
@@ -355,19 +351,78 @@ Remote-Schema Table Introspection and PostgreSQL search_path
 The PostgreSQL dialect can reflect tables from any schema, as outlined in
 :ref:`metadata_reflection_schemas`.
 
+In all cases, the first thing SQLAlchemy does when reflecting tables is
+to **determine the default schema for the current database connection**.
+It does this using the PostgreSQL ``current_schema()``
+function, illustated below using a PostgreSQL client session (i.e. using
+the ``psql`` tool):
+
+.. sourcecode:: sql
+
+    test=> select current_schema();
+    current_schema
+    ----------------
+    public
+    (1 row)
+
+Above we see that on a plain install of PostgreSQL, the default schema name
+is the name ``public``.
+
+However, if your database username **matches the name of a schema**, PostgreSQL's
+default is to then **use that name as the default schema**.  Below, we log in
+using the username ``scott``.  When we create a schema named ``scott``, **it
+implicitly changes the default schema**:
+
+.. sourcecode:: sql
+
+    test=> select current_schema();
+    current_schema
+    ----------------
+    public
+    (1 row)
+
+    test=> create schema scott;
+    CREATE SCHEMA
+    test=> select current_schema();
+    current_schema
+    ----------------
+    scott
+    (1 row)
+
+The behavior of ``current_schema()`` is derived from the
+`PostgreSQL search path
+<https://www.postgresql.org/docs/current/static/ddl-schemas.html#DDL-SCHEMAS-PATH>`_
+variable ``search_path``, which in modern PostgreSQL versions defaults to this:
+
+.. sourcecode:: sql
+
+    test=> show search_path;
+    search_path
+    -----------------
+    "$user", public
+    (1 row)
+
+Where above, the ``"$user"`` variable will inject the current username as the
+default schema, if one exists.   Otherwise, ``public`` is used.
+
+When a :class:`_schema.Table` object is reflected, if it is present in the
+schema indicated by the ``current_schema()`` function, **the schema name assigned
+to the ".schema" attribute of the Table is the Python "None" value**.  Otherwise, the
+".schema" attribute will be assigned the string name of that schema.
+
 With regards to tables which these :class:`_schema.Table`
 objects refer to via foreign key constraint, a decision must be made as to how
 the ``.schema`` is represented in those remote tables, in the case where that
-remote schema name is also a member of the current
-`PostgreSQL search path
-<https://www.postgresql.org/docs/current/static/ddl-schemas.html#DDL-SCHEMAS-PATH>`_.
+remote schema name is also a member of the current ``search_path``.
 
 By default, the PostgreSQL dialect mimics the behavior encouraged by
 PostgreSQL's own ``pg_get_constraintdef()`` builtin procedure.  This function
 returns a sample definition for a particular foreign key constraint,
 omitting the referenced schema name from that definition when the name is
 also in the PostgreSQL schema search path.  The interaction below
-illustrates this behavior::
+illustrates this behavior:
+
+.. sourcecode:: sql
 
     test=> CREATE TABLE test_schema.referred(id INTEGER PRIMARY KEY);
     CREATE TABLE
@@ -394,13 +449,17 @@ PG ``search_path`` and then asked ``pg_get_constraintdef()`` for the
 the function.
 
 On the other hand, if we set the search path back to the typical default
-of ``public``::
+of ``public``:
+
+.. sourcecode:: sql
 
     test=> SET search_path TO public;
     SET
 
 The same query against ``pg_get_constraintdef()`` now returns the fully
-schema-qualified name for us::
+schema-qualified name for us:
+
+.. sourcecode:: sql
 
     test=> SELECT pg_catalog.pg_get_constraintdef(r.oid, true) FROM
     test-> pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n
@@ -422,16 +481,14 @@ reflection process as follows::
     >>> with engine.connect() as conn:
     ...     conn.execute(text("SET search_path TO test_schema, public"))
     ...     metadata_obj = MetaData()
-    ...     referring = Table('referring', metadata_obj,
-    ...                       autoload_with=conn)
-    ...
+    ...     referring = Table("referring", metadata_obj, autoload_with=conn)
     <sqlalchemy.engine.result.CursorResult object at 0x101612ed0>
 
 The above process would deliver to the :attr:`_schema.MetaData.tables`
 collection
 ``referred`` table named **without** the schema::
 
-    >>> metadata_obj.tables['referred'].schema is None
+    >>> metadata_obj.tables["referred"].schema is None
     True
 
 To alter the behavior of reflection such that the referred schema is
@@ -443,15 +500,17 @@ dialect-specific argument to both :class:`_schema.Table` as well as
     >>> with engine.connect() as conn:
     ...     conn.execute(text("SET search_path TO test_schema, public"))
     ...     metadata_obj = MetaData()
-    ...     referring = Table('referring', metadata_obj,
-    ...                       autoload_with=conn,
-    ...                       postgresql_ignore_search_path=True)
-    ...
+    ...     referring = Table(
+    ...         "referring",
+    ...         metadata_obj,
+    ...         autoload_with=conn,
+    ...         postgresql_ignore_search_path=True,
+    ...     )
     <sqlalchemy.engine.result.CursorResult object at 0x1016126d0>
 
 We will now have ``test_schema.referred`` stored as schema-qualified::
 
-    >>> metadata_obj.tables['test_schema.referred'].schema
+    >>> metadata_obj.tables["test_schema.referred"].schema
     'test_schema'
 
 .. sidebar:: Best Practices for PostgreSQL Schema reflection
@@ -466,13 +525,6 @@ We will now have ``test_schema.referred`` stored as schema-qualified::
     described here are only for those users who can't, or prefer not to, stay
     within these guidelines.
 
-Note that **in all cases**, the "default" schema is always reflected as
-``None``. The "default" schema on PostgreSQL is that which is returned by the
-PostgreSQL ``current_schema()`` function.  On a typical PostgreSQL
-installation, this is the name ``public``.  So a table that refers to another
-which is in the ``public`` (i.e. default) schema will always have the
-``.schema`` attribute set to ``None``.
-
 .. seealso::
 
     :ref:`reflection_schema_qualified_interaction` - discussion of the issue
@@ -492,18 +544,26 @@ primary key identifiers.   To specify an explicit ``RETURNING`` clause,
 use the :meth:`._UpdateBase.returning` method on a per-statement basis::
 
     # INSERT..RETURNING
-    result = table.insert().returning(table.c.col1, table.c.col2).\
-        values(name='foo')
+    result = (
+        table.insert().returning(table.c.col1, table.c.col2).values(name="foo")
+    )
     print(result.fetchall())
 
     # UPDATE..RETURNING
-    result = table.update().returning(table.c.col1, table.c.col2).\
-        where(table.c.name=='foo').values(name='bar')
+    result = (
+        table.update()
+        .returning(table.c.col1, table.c.col2)
+        .where(table.c.name == "foo")
+        .values(name="bar")
+    )
     print(result.fetchall())
 
     # DELETE..RETURNING
-    result = table.delete().returning(table.c.col1, table.c.col2).\
-        where(table.c.name=='foo')
+    result = (
+        table.delete()
+        .returning(table.c.col1, table.c.col2)
+        .where(table.c.name == "foo")
+    )
     print(result.fetchall())
 
 .. _postgresql_insert_on_conflict:
@@ -533,19 +593,16 @@ and :meth:`~.postgresql.Insert.on_conflict_do_nothing`:
 
     >>> from sqlalchemy.dialects.postgresql import insert
     >>> insert_stmt = insert(my_table).values(
-    ...     id='some_existing_id',
-    ...     data='inserted value')
-    >>> do_nothing_stmt = insert_stmt.on_conflict_do_nothing(
-    ...     index_elements=['id']
+    ...     id="some_existing_id", data="inserted value"
     ... )
+    >>> do_nothing_stmt = insert_stmt.on_conflict_do_nothing(index_elements=["id"])
     >>> print(do_nothing_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
     ON CONFLICT (id) DO NOTHING
     {stop}
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     constraint='pk_my_table',
-    ...     set_=dict(data='updated value')
+    ...     constraint="pk_my_table", set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -571,8 +628,7 @@ named constraint or by column inference:
   .. sourcecode:: pycon+sql
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value')
+    ...     index_elements=["id"], set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -580,8 +636,7 @@ named constraint or by column inference:
     {stop}
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     index_elements=[my_table.c.id],
-    ...     set_=dict(data='updated value')
+    ...     index_elements=[my_table.c.id], set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -593,11 +648,11 @@ named constraint or by column inference:
 
   .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(user_email='a@b.com', data='inserted data')
+    >>> stmt = insert(my_table).values(user_email="a@b.com", data="inserted data")
     >>> stmt = stmt.on_conflict_do_update(
     ...     index_elements=[my_table.c.user_email],
-    ...     index_where=my_table.c.user_email.like('%@gmail.com'),
-    ...     set_=dict(data=stmt.excluded.data)
+    ...     index_where=my_table.c.user_email.like("%@gmail.com"),
+    ...     set_=dict(data=stmt.excluded.data),
     ... )
     >>> print(stmt)
     {printsql}INSERT INTO my_table (data, user_email)
@@ -611,8 +666,7 @@ named constraint or by column inference:
   .. sourcecode:: pycon+sql
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     constraint='my_table_idx_1',
-    ...     set_=dict(data='updated value')
+    ...     constraint="my_table_idx_1", set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -620,8 +674,7 @@ named constraint or by column inference:
     {stop}
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     constraint='my_table_pk',
-    ...     set_=dict(data='updated value')
+    ...     constraint="my_table_pk", set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -643,8 +696,7 @@ named constraint or by column inference:
   .. sourcecode:: pycon+sql
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     constraint=my_table.primary_key,
-    ...     set_=dict(data='updated value')
+    ...     constraint=my_table.primary_key, set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -662,10 +714,9 @@ for UPDATE:
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
     >>> do_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value')
+    ...     index_elements=["id"], set_=dict(data="updated value")
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -694,13 +745,11 @@ table:
 .. sourcecode:: pycon+sql
 
     >>> stmt = insert(my_table).values(
-    ...     id='some_id',
-    ...     data='inserted value',
-    ...     author='jlh'
+    ...     id="some_id", data="inserted value", author="jlh"
     ... )
     >>> do_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value', author=stmt.excluded.author)
+    ...     index_elements=["id"],
+    ...     set_=dict(data="updated value", author=stmt.excluded.author),
     ... )
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data, author)
@@ -717,14 +766,12 @@ parameter, which will limit those rows which receive an UPDATE:
 .. sourcecode:: pycon+sql
 
     >>> stmt = insert(my_table).values(
-    ...     id='some_id',
-    ...     data='inserted value',
-    ...     author='jlh'
+    ...     id="some_id", data="inserted value", author="jlh"
     ... )
     >>> on_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value', author=stmt.excluded.author),
-    ...     where=(my_table.c.status == 2)
+    ...     index_elements=["id"],
+    ...     set_=dict(data="updated value", author=stmt.excluded.author),
+    ...     where=(my_table.c.status == 2),
     ... )
     >>> print(on_update_stmt)
     {printsql}INSERT INTO my_table (id, data, author)
@@ -742,8 +789,8 @@ this is illustrated using the
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
-    >>> stmt = stmt.on_conflict_do_nothing(index_elements=['id'])
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
+    >>> stmt = stmt.on_conflict_do_nothing(index_elements=["id"])
     >>> print(stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
     ON CONFLICT (id) DO NOTHING
@@ -754,7 +801,7 @@ constraint violation which occurs:
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
     >>> stmt = stmt.on_conflict_do_nothing()
     >>> print(stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (%(id)s, %(data)s)
@@ -785,7 +832,9 @@ On the PostgreSQL dialect, an expression like the following::
 
     select(sometable.c.text.match("search string"))
 
-would emit to the database::
+would emit to the database:
+
+.. sourcecode:: sql
 
     SELECT text @@ plainto_tsquery('search string') FROM table
 
@@ -801,11 +850,11 @@ with other backends.
 
         from sqlalchemy import func
 
-        select(
-            sometable.c.text.bool_op("@@")(func.to_tsquery("search string"))
-        )
+        select(sometable.c.text.bool_op("@@")(func.to_tsquery("search string")))
 
-   Which would emit::
+   Which would emit:
+
+   .. sourcecode:: sql
 
         SELECT text @@ to_tsquery('search string') FROM table
 
@@ -819,9 +868,7 @@ any boolean operator.
 
 For example, the query::
 
-    select(
-        func.to_tsquery('cat').bool_op("@>")(func.to_tsquery('cat & rat'))
-    )
+    select(func.to_tsquery("cat").bool_op("@>")(func.to_tsquery("cat & rat")))
 
 would generate:
 
@@ -834,9 +881,12 @@ The :class:`_postgresql.TSVECTOR` type can provide for explicit CAST::
 
     from sqlalchemy.dialects.postgresql import TSVECTOR
     from sqlalchemy import select, cast
+
     select(cast("some text", TSVECTOR))
 
-produces a statement equivalent to::
+produces a statement equivalent to:
+
+.. sourcecode:: sql
 
     SELECT CAST('some text' AS TSVECTOR) AS anon_1
 
@@ -864,10 +914,12 @@ When using :meth:`.Operators.match`, this additional parameter may be
 specified using the ``postgresql_regconfig`` parameter, such as::
 
     select(mytable.c.id).where(
-        mytable.c.title.match('somestring', postgresql_regconfig='english')
+        mytable.c.title.match("somestring", postgresql_regconfig="english")
     )
 
-Which would emit::
+Which would emit:
+
+.. sourcecode:: sql
 
     SELECT mytable.id FROM mytable
     WHERE mytable.title @@ plainto_tsquery('english', 'somestring')
@@ -881,7 +933,9 @@ When using other PostgreSQL search functions with :data:`.func`, the
         )
     )
 
-produces a statement equivalent to::
+produces a statement equivalent to:
+
+.. sourcecode:: sql
 
     SELECT mytable.id FROM mytable
     WHERE to_tsvector('english', mytable.title) @@
@@ -905,16 +959,16 @@ table in an inheritance hierarchy. This can be used to produce the
 syntaxes. It uses SQLAlchemy's hints mechanism::
 
     # SELECT ... FROM ONLY ...
-    result = table.select().with_hint(table, 'ONLY', 'postgresql')
+    result = table.select().with_hint(table, "ONLY", "postgresql")
     print(result.fetchall())
 
     # UPDATE ONLY ...
-    table.update(values=dict(foo='bar')).with_hint('ONLY',
-                                                   dialect_name='postgresql')
+    table.update(values=dict(foo="bar")).with_hint(
+        "ONLY", dialect_name="postgresql"
+    )
 
     # DELETE FROM ONLY ...
-    table.delete().with_hint('ONLY', dialect_name='postgresql')
-
+    table.delete().with_hint("ONLY", dialect_name="postgresql")
 
 .. _postgresql_indexes:
 
@@ -930,7 +984,7 @@ Covering Indexes
 The ``postgresql_include`` option renders INCLUDE(colname) for the given
 string names::
 
-    Index("my_index", table.c.x, postgresql_include=['y'])
+    Index("my_index", table.c.x, postgresql_include=["y"])
 
 would render the index as ``CREATE INDEX my_index ON table (x) INCLUDE (y)``
 
@@ -947,7 +1001,7 @@ Partial indexes add criterion to the index definition so that the index is
 applied to a subset of rows.   These can be specified on :class:`.Index`
 using the ``postgresql_where`` keyword argument::
 
-  Index('my_index', my_table.c.id, postgresql_where=my_table.c.value > 10)
+  Index("my_index", my_table.c.id, postgresql_where=my_table.c.value > 10)
 
 .. _postgresql_operator_classes:
 
@@ -961,11 +1015,11 @@ The :class:`.Index` construct allows these to be specified via the
 ``postgresql_ops`` keyword argument::
 
     Index(
-        'my_index', my_table.c.id, my_table.c.data,
-        postgresql_ops={
-            'data': 'text_pattern_ops',
-            'id': 'int4_ops'
-        })
+        "my_index",
+        my_table.c.id,
+        my_table.c.data,
+        postgresql_ops={"data": "text_pattern_ops", "id": "int4_ops"},
+    )
 
 Note that the keys in the ``postgresql_ops`` dictionaries are the
 "key" name of the :class:`_schema.Column`, i.e. the name used to access it from
@@ -977,12 +1031,11 @@ as a function call, then to apply to the column it must be given a label
 that is identified in the dictionary by name, e.g.::
 
     Index(
-        'my_index', my_table.c.id,
-        func.lower(my_table.c.data).label('data_lower'),
-        postgresql_ops={
-            'data_lower': 'text_pattern_ops',
-            'id': 'int4_ops'
-        })
+        "my_index",
+        my_table.c.id,
+        func.lower(my_table.c.data).label("data_lower"),
+        postgresql_ops={"data_lower": "text_pattern_ops", "id": "int4_ops"},
+    )
 
 Operator classes are also supported by the
 :class:`_postgresql.ExcludeConstraint` construct using the
@@ -1001,7 +1054,7 @@ as the ability for users to create their own (see
 https://www.postgresql.org/docs/current/static/indexes-types.html). These can be
 specified on :class:`.Index` using the ``postgresql_using`` keyword argument::
 
-    Index('my_index', my_table.c.data, postgresql_using='gin')
+    Index("my_index", my_table.c.data, postgresql_using="gin")
 
 The value passed to the keyword argument will be simply passed through to the
 underlying CREATE INDEX command, so it *must* be a valid index type for your
@@ -1017,13 +1070,13 @@ parameters available depend on the index method used by the index. Storage
 parameters can be specified on :class:`.Index` using the ``postgresql_with``
 keyword argument::
 
-    Index('my_index', my_table.c.data, postgresql_with={"fillfactor": 50})
+    Index("my_index", my_table.c.data, postgresql_with={"fillfactor": 50})
 
 PostgreSQL allows to define the tablespace in which to create the index.
 The tablespace can be specified on :class:`.Index` using the
 ``postgresql_tablespace`` keyword argument::
 
-    Index('my_index', my_table.c.data, postgresql_tablespace='my_tablespace')
+    Index("my_index", my_table.c.data, postgresql_tablespace="my_tablespace")
 
 Note that the same option is available on :class:`_schema.Table` as well.
 
@@ -1035,17 +1088,21 @@ Indexes with CONCURRENTLY
 The PostgreSQL index option CONCURRENTLY is supported by passing the
 flag ``postgresql_concurrently`` to the :class:`.Index` construct::
 
-    tbl = Table('testtbl', m, Column('data', Integer))
+    tbl = Table("testtbl", m, Column("data", Integer))
 
-    idx1 = Index('test_idx1', tbl.c.data, postgresql_concurrently=True)
+    idx1 = Index("test_idx1", tbl.c.data, postgresql_concurrently=True)
 
 The above index construct will render DDL for CREATE INDEX, assuming
-PostgreSQL 8.2 or higher is detected or for a connection-less dialect, as::
+PostgreSQL 8.2 or higher is detected or for a connection-less dialect, as:
+
+.. sourcecode:: sql
 
     CREATE INDEX CONCURRENTLY test_idx1 ON testtbl (data)
 
 For DROP INDEX, assuming PostgreSQL 9.2 or higher is detected or for
-a connection-less dialect, it will emit::
+a connection-less dialect, it will emit:
+
+.. sourcecode:: sql
 
     DROP INDEX CONCURRENTLY test_idx1
 
@@ -1055,14 +1112,11 @@ even for a single statement, a transaction is present, so to use this
 construct, the DBAPI's "autocommit" mode must be used::
 
     metadata = MetaData()
-    table = Table(
-        "foo", metadata,
-        Column("id", String))
-    index = Index(
-        "foo_idx", table.c.id, postgresql_concurrently=True)
+    table = Table("foo", metadata, Column("id", String))
+    index = Index("foo_idx", table.c.id, postgresql_concurrently=True)
 
     with engine.connect() as conn:
-        with conn.execution_options(isolation_level='AUTOCOMMIT'):
+        with conn.execution_options(isolation_level="AUTOCOMMIT"):
             table.create(conn)
 
 .. seealso::
@@ -1120,26 +1174,33 @@ dialect in conjunction with the :class:`_schema.Table` construct:
 
 * ``ON COMMIT``::
 
-    Table("some_table", metadata, ..., postgresql_on_commit='PRESERVE ROWS')
+    Table("some_table", metadata, ..., postgresql_on_commit="PRESERVE ROWS")
 
-* ``PARTITION BY``::
+*
+  ``PARTITION BY``::
 
-    Table("some_table", metadata, ...,
-          postgresql_partition_by='LIST (part_column)')
+    Table(
+        "some_table",
+        metadata,
+        ...,
+        postgresql_partition_by="LIST (part_column)",
+    )
 
-    .. versionadded:: 1.2.6
+  .. versionadded:: 1.2.6
 
-* ``TABLESPACE``::
+*
+  ``TABLESPACE``::
 
-    Table("some_table", metadata, ..., postgresql_tablespace='some_tablespace')
+    Table("some_table", metadata, ..., postgresql_tablespace="some_tablespace")
 
   The above option is also available on the :class:`.Index` construct.
 
-* ``USING``::
+*
+  ``USING``::
 
-    Table("some_table", metadata, ..., postgresql_using='heap')
+    Table("some_table", metadata, ..., postgresql_using="heap")
 
-    .. versionadded:: 2.0.26
+  .. versionadded:: 2.0.26
 
 * ``WITH OIDS``::
 
@@ -1180,7 +1241,7 @@ with selected constraint constructs:
                 "user",
                 ["user_id"],
                 ["id"],
-                postgresql_not_valid=True
+                postgresql_not_valid=True,
             )
 
   The keyword is ultimately accepted directly by the
@@ -1191,7 +1252,9 @@ with selected constraint constructs:
 
        CheckConstraint("some_field IS NOT NULL", postgresql_not_valid=True)
 
-       ForeignKeyConstraint(["some_id"], ["some_table.some_id"], postgresql_not_valid=True)
+       ForeignKeyConstraint(
+           ["some_id"], ["some_table.some_id"], postgresql_not_valid=True
+       )
 
   .. versionadded:: 1.4.32
 
@@ -1234,7 +1297,9 @@ Examples from PostgreSQL's reference documentation follow below:
   .. sourcecode:: pycon+sql
 
     >>> from sqlalchemy import select, func
-    >>> stmt = select(func.json_each('{"a":"foo", "b":"bar"}').table_valued("key", "value"))
+    >>> stmt = select(
+    ...     func.json_each('{"a":"foo", "b":"bar"}').table_valued("key", "value")
+    ... )
     >>> print(stmt)
     {printsql}SELECT anon_1.key, anon_1.value
     FROM json_each(:json_each_1) AS anon_1
@@ -1246,8 +1311,7 @@ Examples from PostgreSQL's reference documentation follow below:
     >>> from sqlalchemy import select, func, literal_column
     >>> stmt = select(
     ...     func.json_populate_record(
-    ...         literal_column("null::myrowtype"),
-    ...         '{"a":1,"b":2}'
+    ...         literal_column("null::myrowtype"), '{"a":1,"b":2}'
     ...     ).table_valued("a", "b", name="x")
     ... )
     >>> print(stmt)
@@ -1265,9 +1329,13 @@ Examples from PostgreSQL's reference documentation follow below:
 
     >>> from sqlalchemy import select, func, column, Integer, Text
     >>> stmt = select(
-    ...     func.json_to_record('{"a":1,"b":[1,2,3],"c":"bar"}').table_valued(
-    ...         column("a", Integer), column("b", Text), column("d", Text),
-    ...     ).render_derived(name="x", with_types=True)
+    ...     func.json_to_record('{"a":1,"b":[1,2,3],"c":"bar"}')
+    ...     .table_valued(
+    ...         column("a", Integer),
+    ...         column("b", Text),
+    ...         column("d", Text),
+    ...     )
+    ...     .render_derived(name="x", with_types=True)
     ... )
     >>> print(stmt)
     {printsql}SELECT x.a, x.b, x.d
@@ -1284,9 +1352,9 @@ Examples from PostgreSQL's reference documentation follow below:
 
     >>> from sqlalchemy import select, func
     >>> stmt = select(
-    ...     func.generate_series(4, 1, -1).
-    ...     table_valued("value", with_ordinality="ordinality").
-    ...     render_derived()
+    ...     func.generate_series(4, 1, -1)
+    ...     .table_valued("value", with_ordinality="ordinality")
+    ...     .render_derived()
     ... )
     >>> print(stmt)
     {printsql}SELECT anon_1.value, anon_1.ordinality
@@ -1315,7 +1383,9 @@ scalar value.  PostgreSQL functions such as ``json_array_elements()``,
   .. sourcecode:: pycon+sql
 
     >>> from sqlalchemy import select, func
-    >>> stmt = select(func.json_array_elements('["one", "two"]').column_valued("x"))
+    >>> stmt = select(
+    ...     func.json_array_elements('["one", "two"]').column_valued("x")
+    ... )
     >>> print(stmt)
     {printsql}SELECT x
     FROM json_array_elements(:json_array_elements_1) AS x
@@ -1339,7 +1409,7 @@ scalar value.  PostgreSQL functions such as ``json_array_elements()``,
 
     >>> from sqlalchemy import table, column, ARRAY, Integer
     >>> from sqlalchemy import select, func
-    >>> t = table("t", column('value', ARRAY(Integer)))
+    >>> t = table("t", column("value", ARRAY(Integer)))
     >>> stmt = select(func.unnest(t.c.value).column_valued("unnested_value"))
     >>> print(stmt)
     {printsql}SELECT unnested_value
@@ -1361,10 +1431,10 @@ Built-in support for rendering a ``ROW`` may be approximated using
 
     >>> from sqlalchemy import table, column, func, tuple_
     >>> t = table("t", column("id"), column("fk"))
-    >>> stmt = t.select().where(
-    ...     tuple_(t.c.id, t.c.fk) > (1,2)
-    ... ).where(
-    ...     func.ROW(t.c.id, t.c.fk) < func.ROW(3, 7)
+    >>> stmt = (
+    ...     t.select()
+    ...     .where(tuple_(t.c.id, t.c.fk) > (1, 2))
+    ...     .where(func.ROW(t.c.id, t.c.fk) < func.ROW(3, 7))
     ... )
     >>> print(stmt)
     {printsql}SELECT t.id, t.fk
@@ -1393,7 +1463,7 @@ itself:
 .. sourcecode:: pycon+sql
 
     >>> from sqlalchemy import table, column, func, select
-    >>> a = table( "a", column("id"), column("x"), column("y"))
+    >>> a = table("a", column("id"), column("x"), column("y"))
     >>> stmt = select(func.row_to_json(a.table_valued()))
     >>> print(stmt)
     {printsql}SELECT row_to_json(a) AS row_to_json_1
@@ -2015,6 +2085,8 @@ class PGCompiler(compiler.SQLCompiler):
             else:
                 continue
 
+            # TODO: this coercion should be up front.  we can't cache
+            # SQL constructs with non-bound literals buried in them
             if coercions._is_literal(value):
                 value = elements.BindParameter(None, value, type_=c.type)
 
@@ -2730,6 +2802,8 @@ class ReflectedDomain(ReflectedNamedType):
     """The constraints defined in the domain, if any.
     The constraint are in order of evaluation by postgresql.
     """
+    collation: Optional[str]
+    """The collation for the domain."""
 
 
 class ReflectedEnum(ReflectedNamedType):
@@ -3661,20 +3735,156 @@ class PGDialect(default.DefaultDialect):
 
         return columns.items()
 
-    def _get_columns_info(self, rows, domains, enums, schema):
-        array_type_pattern = re.compile(r"\[\]$")
-        attype_pattern = re.compile(r"\(.*\)")
-        charlen_pattern = re.compile(r"\(([\d,]+)\)")
-        args_pattern = re.compile(r"\((.*)\)")
-        args_split_pattern = re.compile(r"\s*,\s*")
+    _format_type_args_pattern = re.compile(r"\((.*)\)")
+    _format_type_args_delim = re.compile(r"\s*,\s*")
+    _format_array_spec_pattern = re.compile(r"((?:\[\])*)$")
 
-        def _handle_array_type(attype):
-            return (
-                # strip '[]' from integer[], etc.
-                array_type_pattern.sub("", attype),
-                attype.endswith("[]"),
+    def _reflect_type(
+        self,
+        format_type: Optional[str],
+        domains: dict[str, ReflectedDomain],
+        enums: dict[str, ReflectedEnum],
+        type_description: str,
+    ) -> sqltypes.TypeEngine[Any]:
+        """
+        Attempts to reconstruct a column type defined in ischema_names based
+        on the information available in the format_type.
+
+        If the `format_type` cannot be associated with a known `ischema_names`,
+        it is treated as a reference to a known PostgreSQL named `ENUM` or
+        `DOMAIN` type.
+        """
+        type_description = type_description or "unknown type"
+        if format_type is None:
+            util.warn(
+                "PostgreSQL format_type() returned NULL for %s"
+                % type_description
             )
+            return sqltypes.NULLTYPE
 
+        attype_args_match = self._format_type_args_pattern.search(format_type)
+        if attype_args_match and attype_args_match.group(1):
+            attype_args = self._format_type_args_delim.split(
+                attype_args_match.group(1)
+            )
+        else:
+            attype_args = ()
+
+        match_array_dim = self._format_array_spec_pattern.search(format_type)
+        # Each "[]" in array specs corresponds to an array dimension
+        array_dim = len(match_array_dim.group(1) or "") // 2
+
+        # Remove all parameters and array specs from format_type to obtain an
+        # ischema_name candidate
+        attype = self._format_type_args_pattern.sub("", format_type)
+        attype = self._format_array_spec_pattern.sub("", attype)
+
+        schema_type = self.ischema_names.get(attype.lower(), None)
+        args, kwargs = (), {}
+
+        if attype == "numeric":
+            if len(attype_args) == 2:
+                precision, scale = map(int, attype_args)
+                args = (precision, scale)
+
+        elif attype == "double precision":
+            args = (53,)
+
+        elif attype == "integer":
+            args = ()
+
+        elif attype in ("timestamp with time zone", "time with time zone"):
+            kwargs["timezone"] = True
+            if len(attype_args) == 1:
+                kwargs["precision"] = int(attype_args[0])
+
+        elif attype in (
+            "timestamp without time zone",
+            "time without time zone",
+            "time",
+        ):
+            kwargs["timezone"] = False
+            if len(attype_args) == 1:
+                kwargs["precision"] = int(attype_args[0])
+
+        elif attype == "bit varying":
+            kwargs["varying"] = True
+            if len(attype_args) == 1:
+                charlen = int(attype_args[0])
+                args = (charlen,)
+
+        elif attype.startswith("interval"):
+            schema_type = INTERVAL
+
+            field_match = re.match(r"interval (.+)", attype)
+            if field_match:
+                kwargs["fields"] = field_match.group(1)
+
+            if len(attype_args) == 1:
+                kwargs["precision"] = int(attype_args[0])
+
+        else:
+            enum_or_domain_key = tuple(util.quoted_token_parser(attype))
+
+            if enum_or_domain_key in enums:
+                schema_type = ENUM
+                enum = enums[enum_or_domain_key]
+
+                args = tuple(enum["labels"])
+                kwargs["name"] = enum["name"]
+
+                if not enum["visible"]:
+                    kwargs["schema"] = enum["schema"]
+                args = tuple(enum["labels"])
+            elif enum_or_domain_key in domains:
+                schema_type = DOMAIN
+                domain = domains[enum_or_domain_key]
+
+                data_type = self._reflect_type(
+                    domain["type"],
+                    domains,
+                    enums,
+                    type_description="DOMAIN '%s'" % domain["name"],
+                )
+                args = (domain["name"], data_type)
+
+                kwargs["collation"] = domain["collation"]
+                kwargs["default"] = domain["default"]
+                kwargs["not_null"] = not domain["nullable"]
+                kwargs["create_type"] = False
+
+                if domain["constraints"]:
+                    # We only support a single constraint
+                    check_constraint = domain["constraints"][0]
+
+                    kwargs["constraint_name"] = check_constraint["name"]
+                    kwargs["check"] = check_constraint["check"]
+
+                if not domain["visible"]:
+                    kwargs["schema"] = domain["schema"]
+
+            else:
+                try:
+                    charlen = int(attype_args[0])
+                    args = (charlen, *attype_args[1:])
+                except (ValueError, IndexError):
+                    args = attype_args
+
+        if not schema_type:
+            util.warn(
+                "Did not recognize type '%s' of %s"
+                % (attype, type_description)
+            )
+            return sqltypes.NULLTYPE
+
+        data_type = schema_type(*args, **kwargs)
+        if array_dim >= 1:
+            # postgres does not preserve dimensionality or size of array types.
+            data_type = _array.ARRAY(data_type)
+
+        return data_type
+
+    def _get_columns_info(self, rows, domains, enums, schema):
         columns = defaultdict(list)
         for row_dict in rows:
             # ensure that each table has an entry, even if it has no columns
@@ -3685,131 +3895,28 @@ class PGDialect(default.DefaultDialect):
                 continue
             table_cols = columns[(schema, row_dict["table_name"])]
 
-            format_type = row_dict["format_type"]
+            coltype = self._reflect_type(
+                row_dict["format_type"],
+                domains,
+                enums,
+                type_description="column '%s'" % row_dict["name"],
+            )
+
             default = row_dict["default"]
             name = row_dict["name"]
             generated = row_dict["generated"]
-            identity = row_dict["identity_options"]
-
-            if format_type is None:
-                no_format_type = True
-                attype = format_type = "no format_type()"
-                is_array = False
-            else:
-                no_format_type = False
-
-                # strip (*) from character varying(5), timestamp(5)
-                # with time zone, geometry(POLYGON), etc.
-                attype = attype_pattern.sub("", format_type)
-
-                # strip '[]' from integer[], etc. and check if an array
-                attype, is_array = _handle_array_type(attype)
-
-            # strip quotes from case sensitive enum or domain names
-            enum_or_domain_key = tuple(util.quoted_token_parser(attype))
-
             nullable = not row_dict["not_null"]
 
-            charlen = charlen_pattern.search(format_type)
-            if charlen:
-                charlen = charlen.group(1)
-            args = args_pattern.search(format_type)
-            if args and args.group(1):
-                args = tuple(args_split_pattern.split(args.group(1)))
-            else:
-                args = ()
-            kwargs = {}
+            if isinstance(coltype, DOMAIN):
+                if not default:
+                    # domain can override the default value but
+                    # cant set it to None
+                    if coltype.default is not None:
+                        default = coltype.default
 
-            if attype == "numeric":
-                if charlen:
-                    prec, scale = charlen.split(",")
-                    args = (int(prec), int(scale))
-                else:
-                    args = ()
-            elif attype == "double precision":
-                args = (53,)
-            elif attype == "integer":
-                args = ()
-            elif attype in ("timestamp with time zone", "time with time zone"):
-                kwargs["timezone"] = True
-                if charlen:
-                    kwargs["precision"] = int(charlen)
-                args = ()
-            elif attype in (
-                "timestamp without time zone",
-                "time without time zone",
-                "time",
-            ):
-                kwargs["timezone"] = False
-                if charlen:
-                    kwargs["precision"] = int(charlen)
-                args = ()
-            elif attype == "bit varying":
-                kwargs["varying"] = True
-                if charlen:
-                    args = (int(charlen),)
-                else:
-                    args = ()
-            elif attype.startswith("interval"):
-                field_match = re.match(r"interval (.+)", attype, re.I)
-                if charlen:
-                    kwargs["precision"] = int(charlen)
-                if field_match:
-                    kwargs["fields"] = field_match.group(1)
-                attype = "interval"
-                args = ()
-            elif charlen:
-                args = (int(charlen),)
+                nullable = nullable and not coltype.not_null
 
-            while True:
-                # looping here to suit nested domains
-                if attype in self.ischema_names:
-                    coltype = self.ischema_names[attype]
-                    break
-                elif enum_or_domain_key in enums:
-                    enum = enums[enum_or_domain_key]
-                    coltype = ENUM
-                    kwargs["name"] = enum["name"]
-                    if not enum["visible"]:
-                        kwargs["schema"] = enum["schema"]
-                    args = tuple(enum["labels"])
-                    break
-                elif enum_or_domain_key in domains:
-                    domain = domains[enum_or_domain_key]
-                    attype = domain["type"]
-                    attype, is_array = _handle_array_type(attype)
-                    # strip quotes from case sensitive enum or domain names
-                    enum_or_domain_key = tuple(
-                        util.quoted_token_parser(attype)
-                    )
-                    # A table can't override a not null on the domain,
-                    # but can override nullable
-                    nullable = nullable and domain["nullable"]
-                    if domain["default"] and not default:
-                        # It can, however, override the default
-                        # value, but can't set it to null.
-                        default = domain["default"]
-                    continue
-                else:
-                    coltype = None
-                    break
-
-            if coltype:
-                coltype = coltype(*args, **kwargs)
-                if is_array:
-                    coltype = self.ischema_names["_array"](coltype)
-            elif no_format_type:
-                util.warn(
-                    "PostgreSQL format_type() returned NULL for column '%s'"
-                    % (name,)
-                )
-                coltype = sqltypes.NULLTYPE
-            else:
-                util.warn(
-                    "Did not recognize type '%s' of column '%s'"
-                    % (attype, name)
-                )
-                coltype = sqltypes.NULLTYPE
+            identity = row_dict["identity_options"]
 
             # If a zero byte or blank string depending on driver (is also
             # absent for older PG versions), then not a generated column.
@@ -4498,7 +4605,10 @@ class PGDialect(default.DefaultDialect):
                     dialect_options = {}
                     if row["reloptions"]:
                         dialect_options["postgresql_with"] = dict(
-                            [option.split("=") for option in row["reloptions"]]
+                            [
+                                option.split("=", 1)
+                                for option in row["reloptions"]
+                            ]
                         )
                     # it *might* be nice to include that this is 'btree' in the
                     # reflection info.  But we don't want an Index object
@@ -4608,6 +4718,8 @@ class PGDialect(default.DefaultDialect):
                     pg_catalog.pg_class.c.oid
                     == pg_catalog.pg_description.c.objoid,
                     pg_catalog.pg_description.c.objsubid == 0,
+                    pg_catalog.pg_description.c.classoid
+                    == sql.func.cast("pg_catalog.pg_class", REGCLASS),
                 ),
             )
             .where(self._pg_class_relkind_condition(relkinds))
@@ -4858,12 +4970,18 @@ class PGDialect(default.DefaultDialect):
                 pg_catalog.pg_namespace.c.nspname.label("schema"),
                 con_sq.c.condefs,
                 con_sq.c.connames,
+                pg_catalog.pg_collation.c.collname,
             )
             .join(
                 pg_catalog.pg_namespace,
                 pg_catalog.pg_namespace.c.oid
                 == pg_catalog.pg_type.c.typnamespace,
             )
+            .outerjoin(
+                pg_catalog.pg_collation,
+                pg_catalog.pg_type.c.typcollation
+                == pg_catalog.pg_collation.c.oid,
+            )
             .outerjoin(
                 con_sq,
                 pg_catalog.pg_type.c.oid == con_sq.c.contypid,
@@ -4877,14 +4995,13 @@ class PGDialect(default.DefaultDialect):
 
     @reflection.cache
     def _load_domains(self, connection, schema=None, **kw):
-        # Load data types for domains:
         result = connection.execute(self._domain_query(schema))
 
-        domains = []
+        domains: List[ReflectedDomain] = []
         for domain in result.mappings():
             # strip (30) from character varying(30)
             attype = re.search(r"([^\(]+)", domain["attype"]).group(1)
-            constraints = []
+            constraints: List[ReflectedDomainConstraint] = []
             if domain["connames"]:
                 # When a domain has multiple CHECK constraints, they will
                 # be tested in alphabetical order by name.
@@ -4898,7 +5015,7 @@ class PGDialect(default.DefaultDialect):
                     check = def_[7:-1]
                     constraints.append({"name": name, "check": check})
 
-            domain_rec = {
+            domain_rec: ReflectedDomain = {
                 "name": domain["name"],
                 "schema": domain["schema"],
                 "visible": domain["visible"],
@@ -4906,6 +5023,7 @@ class PGDialect(default.DefaultDialect):
                 "nullable": domain["nullable"],
                 "default": domain["default"],
                 "constraints": constraints,
+                "collation": domain["collname"],
             }
             domains.append(domain_rec)
 
diff --git a/libs/sqlalchemy/dialects/postgresql/dml.py b/libs/sqlalchemy/dialects/postgresql/dml.py
index 4404ecd37..1187b6bf5 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,7 +7,10 @@
 from __future__ import annotations
 
 from typing import Any
+from typing import List
 from typing import Optional
+from typing import Tuple
+from typing import Union
 
 from . import ext
 from .._typing import _OnConflictConstraintT
@@ -26,7 +29,9 @@ from ...sql.base import ColumnCollection
 from ...sql.base import ReadOnlyColumnCollection
 from ...sql.dml import Insert as StandardInsert
 from ...sql.elements import ClauseElement
+from ...sql.elements import ColumnElement
 from ...sql.elements import KeyedColumnElement
+from ...sql.elements import TextClause
 from ...sql.expression import alias
 from ...util.typing import Self
 
@@ -153,11 +158,10 @@ class Insert(StandardInsert):
             :paramref:`.Insert.on_conflict_do_update.set_` dictionary.
 
         :param where:
-         Optional argument. If present, can be a literal SQL
-         string or an acceptable expression for a ``WHERE`` clause
-         that restricts the rows affected by ``DO UPDATE SET``. Rows
-         not meeting the ``WHERE`` condition will not be updated
-         (effectively a ``DO NOTHING`` for those rows).
+         Optional argument. An expression object representing a ``WHERE``
+         clause that restricts the rows affected by ``DO UPDATE SET``. Rows not
+         meeting the ``WHERE`` condition will not be updated (effectively a
+         ``DO NOTHING`` for those rows).
 
 
         .. seealso::
@@ -212,8 +216,10 @@ class OnConflictClause(ClauseElement):
     stringify_dialect = "postgresql"
 
     constraint_target: Optional[str]
-    inferred_target_elements: _OnConflictIndexElementsT
-    inferred_target_whereclause: _OnConflictIndexWhereT
+    inferred_target_elements: Optional[List[Union[str, schema.Column[Any]]]]
+    inferred_target_whereclause: Optional[
+        Union[ColumnElement[Any], TextClause]
+    ]
 
     def __init__(
         self,
@@ -254,8 +260,24 @@ class OnConflictClause(ClauseElement):
 
         if index_elements is not None:
             self.constraint_target = None
-            self.inferred_target_elements = index_elements
-            self.inferred_target_whereclause = index_where
+            self.inferred_target_elements = [
+                coercions.expect(roles.DDLConstraintColumnRole, column)
+                for column in index_elements
+            ]
+
+            self.inferred_target_whereclause = (
+                coercions.expect(
+                    (
+                        roles.StatementOptionRole
+                        if isinstance(constraint, ext.ExcludeConstraint)
+                        else roles.WhereHavingRole
+                    ),
+                    index_where,
+                )
+                if index_where is not None
+                else None
+            )
+
         elif constraint is None:
             self.constraint_target = self.inferred_target_elements = (
                 self.inferred_target_whereclause
@@ -269,6 +291,9 @@ class OnConflictDoNothing(OnConflictClause):
 class OnConflictDoUpdate(OnConflictClause):
     __visit_name__ = "on_conflict_do_update"
 
+    update_values_to_set: List[Tuple[Union[schema.Column[Any], str], Any]]
+    update_whereclause: Optional[ColumnElement[Any]]
+
     def __init__(
         self,
         constraint: _OnConflictConstraintT = None,
@@ -307,4 +332,8 @@ class OnConflictDoUpdate(OnConflictClause):
             (coercions.expect(roles.DMLColumnRole, key), value)
             for key, value in set_.items()
         ]
-        self.update_whereclause = where
+        self.update_whereclause = (
+            coercions.expect(roles.WhereHavingRole, where)
+            if where is not None
+            else None
+        )
diff --git a/libs/sqlalchemy/dialects/postgresql/ext.py b/libs/sqlalchemy/dialects/postgresql/ext.py
index 7fc08953f..94466ae0a 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -35,22 +35,26 @@ class aggregate_order_by(expression.ColumnElement):
     E.g.::
 
         from sqlalchemy.dialects.postgresql import aggregate_order_by
+
         expr = func.array_agg(aggregate_order_by(table.c.a, table.c.b.desc()))
         stmt = select(expr)
 
-    would represent the expression::
+    would represent the expression:
+
+    .. sourcecode:: sql
 
         SELECT array_agg(a ORDER BY b DESC) FROM table;
 
     Similarly::
 
         expr = func.string_agg(
-            table.c.a,
-            aggregate_order_by(literal_column("','"), table.c.a)
+            table.c.a, aggregate_order_by(literal_column("','"), table.c.a)
         )
         stmt = select(expr)
 
-    Would represent::
+    Would represent:
+
+    .. sourcecode:: sql
 
         SELECT string_agg(a, ',' ORDER BY a) FROM table;
 
@@ -131,10 +135,10 @@ class ExcludeConstraint(ColumnCollectionConstraint):
         E.g.::
 
             const = ExcludeConstraint(
-                (Column('period'), '&&'),
-                (Column('group'), '='),
-                where=(Column('group') != 'some group'),
-                ops={'group': 'my_operator_class'}
+                (Column("period"), "&&"),
+                (Column("group"), "="),
+                where=(Column("group") != "some group"),
+                ops={"group": "my_operator_class"},
             )
 
         The constraint is normally embedded into the :class:`_schema.Table`
@@ -142,19 +146,20 @@ class ExcludeConstraint(ColumnCollectionConstraint):
         directly, or added later using :meth:`.append_constraint`::
 
             some_table = Table(
-                'some_table', metadata,
-                Column('id', Integer, primary_key=True),
-                Column('period', TSRANGE()),
-                Column('group', String)
+                "some_table",
+                metadata,
+                Column("id", Integer, primary_key=True),
+                Column("period", TSRANGE()),
+                Column("group", String),
             )
 
             some_table.append_constraint(
                 ExcludeConstraint(
-                    (some_table.c.period, '&&'),
-                    (some_table.c.group, '='),
-                    where=some_table.c.group != 'some group',
-                    name='some_table_excl_const',
-                    ops={'group': 'my_operator_class'}
+                    (some_table.c.period, "&&"),
+                    (some_table.c.group, "="),
+                    where=some_table.c.group != "some group",
+                    name="some_table_excl_const",
+                    ops={"group": "my_operator_class"},
                 )
             )
 
diff --git a/libs/sqlalchemy/dialects/postgresql/hstore.py b/libs/sqlalchemy/dialects/postgresql/hstore.py
index 04c8cf160..0a915b17d 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,28 +28,29 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
 
     The :class:`.HSTORE` type stores dictionaries containing strings, e.g.::
 
-        data_table = Table('data_table', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('data', HSTORE)
+        data_table = Table(
+            "data_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("data", HSTORE),
         )
 
         with engine.connect() as conn:
             conn.execute(
-                data_table.insert(),
-                data = {"key1": "value1", "key2": "value2"}
+                data_table.insert(), data={"key1": "value1", "key2": "value2"}
             )
 
     :class:`.HSTORE` provides for a wide range of operations, including:
 
     * Index operations::
 
-        data_table.c.data['some key'] == 'some value'
+        data_table.c.data["some key"] == "some value"
 
     * Containment operations::
 
-        data_table.c.data.has_key('some key')
+        data_table.c.data.has_key("some key")
 
-        data_table.c.data.has_all(['one', 'two', 'three'])
+        data_table.c.data.has_all(["one", "two", "three"])
 
     * Concatenation::
 
@@ -72,17 +73,19 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
 
             from sqlalchemy.ext.mutable import MutableDict
 
+
             class MyClass(Base):
-                __tablename__ = 'data_table'
+                __tablename__ = "data_table"
 
                 id = Column(Integer, primary_key=True)
                 data = Column(MutableDict.as_mutable(HSTORE))
 
+
             my_object = session.query(MyClass).one()
 
             # in-place mutation, requires Mutable extension
             # in order for the ORM to detect
-            my_object.data['some_key'] = 'some value'
+            my_object.data["some_key"] = "some value"
 
             session.commit()
 
@@ -96,7 +99,7 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
         :class:`.hstore` - render the PostgreSQL ``hstore()`` function.
 
 
-    """
+    """  # noqa: E501
 
     __visit_name__ = "HSTORE"
     hashable = False
@@ -192,6 +195,9 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
     comparator_factory = Comparator
 
     def bind_processor(self, dialect):
+        # note that dialect-specific types like that of psycopg and
+        # psycopg2 will override this method to allow driver-level conversion
+        # instead, see _PsycopgHStore
         def process(value):
             if isinstance(value, dict):
                 return _serialize_hstore(value)
@@ -201,6 +207,9 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
         return process
 
     def result_processor(self, dialect, coltype):
+        # note that dialect-specific types like that of psycopg and
+        # psycopg2 will override this method to allow driver-level conversion
+        # instead, see _PsycopgHStore
         def process(value):
             if value is not None:
                 return _parse_hstore(value)
@@ -221,12 +230,12 @@ class hstore(sqlfunc.GenericFunction):
 
         from sqlalchemy.dialects.postgresql import array, hstore
 
-        select(hstore('key1', 'value1'))
+        select(hstore("key1", "value1"))
 
         select(
             hstore(
-                array(['key1', 'key2', 'key3']),
-                array(['value1', 'value2', 'value3'])
+                array(["key1", "key2", "key3"]),
+                array(["value1", "value2", "value3"]),
             )
         )
 
diff --git a/libs/sqlalchemy/dialects/postgresql/json.py b/libs/sqlalchemy/dialects/postgresql/json.py
index dff12e7f4..2f26b39e3 100644
--- a/libs/sqlalchemy/dialects/postgresql/json.py
+++ b/libs/sqlalchemy/dialects/postgresql/json.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/json.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -90,14 +90,14 @@ class JSON(sqltypes.JSON):
 
     * Index operations (the ``->`` operator)::
 
-        data_table.c.data['some key']
+        data_table.c.data["some key"]
 
         data_table.c.data[5]
 
+    * Index operations returning text
+      (the ``->>`` operator)::
 
-    * Index operations returning text (the ``->>`` operator)::
-
-        data_table.c.data['some key'].astext == 'some value'
+        data_table.c.data["some key"].astext == "some value"
 
       Note that equivalent functionality is available via the
       :attr:`.JSON.Comparator.as_string` accessor.
@@ -105,18 +105,20 @@ class JSON(sqltypes.JSON):
     * Index operations with CAST
       (equivalent to ``CAST(col ->> ['some key'] AS <type>)``)::
 
-        data_table.c.data['some key'].astext.cast(Integer) == 5
+        data_table.c.data["some key"].astext.cast(Integer) == 5
 
       Note that equivalent functionality is available via the
       :attr:`.JSON.Comparator.as_integer` and similar accessors.
 
     * Path index operations (the ``#>`` operator)::
 
-        data_table.c.data[('key_1', 'key_2', 5, ..., 'key_n')]
+        data_table.c.data[("key_1", "key_2", 5, ..., "key_n")]
 
     * Path index operations returning text (the ``#>>`` operator)::
 
-        data_table.c.data[('key_1', 'key_2', 5, ..., 'key_n')].astext == 'some value'
+        data_table.c.data[
+            ("key_1", "key_2", 5, ..., "key_n")
+        ].astext == "some value"
 
     Index operations return an expression object whose type defaults to
     :class:`_types.JSON` by default,
@@ -128,10 +130,11 @@ class JSON(sqltypes.JSON):
     using psycopg2, the DBAPI only allows serializers at the per-cursor
     or per-connection level.   E.g.::
 
-        engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test",
-                                json_serializer=my_serialize_fn,
-                                json_deserializer=my_deserialize_fn
-                        )
+        engine = create_engine(
+            "postgresql+psycopg2://scott:tiger@localhost/test",
+            json_serializer=my_serialize_fn,
+            json_deserializer=my_deserialize_fn,
+        )
 
     When using the psycopg2 dialect, the json_deserializer is registered
     against the database using ``psycopg2.extras.register_default_json``.
@@ -144,6 +147,7 @@ class JSON(sqltypes.JSON):
 
     """  # noqa
 
+    render_bind_cast = True
     astext_type = sqltypes.Text()
 
     def __init__(self, none_as_null=False, astext_type=None):
@@ -155,7 +159,8 @@ class JSON(sqltypes.JSON):
          be used to persist a NULL value::
 
              from sqlalchemy import null
-             conn.execute(table.insert(), data=null())
+
+             conn.execute(table.insert(), {"data": null()})
 
          .. seealso::
 
@@ -180,7 +185,7 @@ class JSON(sqltypes.JSON):
 
             E.g.::
 
-                select(data_table.c.data['some key'].astext)
+                select(data_table.c.data["some key"].astext)
 
             .. seealso::
 
@@ -207,15 +212,16 @@ class JSONB(JSON):
     The :class:`_postgresql.JSONB` type stores arbitrary JSONB format data,
     e.g.::
 
-        data_table = Table('data_table', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('data', JSONB)
+        data_table = Table(
+            "data_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("data", JSONB),
         )
 
         with engine.connect() as conn:
             conn.execute(
-                data_table.insert(),
-                data = {"key1": "value1", "key2": "value2"}
+                data_table.insert(), data={"key1": "value1", "key2": "value2"}
             )
 
     The :class:`_postgresql.JSONB` type includes all operations provided by
@@ -256,22 +262,27 @@ class JSONB(JSON):
         """Define comparison operations for :class:`_types.JSON`."""
 
         def has_key(self, other):
-            """Boolean expression.  Test for presence of a key.  Note that the
-            key may be a SQLA expression.
+            """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):
-            """Boolean expression.  Test for presence of all keys in jsonb"""
+            """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):
-            """Boolean expression.  Test for presence of any key in jsonb"""
+            """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):
             """Boolean expression.  Test if keys (or array) are a superset
-            of/contained the keys of the argument jsonb expression.
+            of/contained the keys of the argument jsonb expression
+            (equivalent of the ``@>`` operator).
 
             kwargs may be ignored by this operator but are required for API
             conformance.
@@ -280,7 +291,8 @@ class JSONB(JSON):
 
         def contained_by(self, other):
             """Boolean expression.  Test if keys are a proper subset of the
-            keys of the argument jsonb expression.
+            keys of the argument jsonb expression
+            (equivalent of the ``<@`` operator).
             """
             return self.operate(
                 CONTAINED_BY, other, result_type=sqltypes.Boolean
@@ -288,7 +300,7 @@ class JSONB(JSON):
 
         def delete_path(self, array):
             """JSONB expression. Deletes field or array element specified in
-            the argument array.
+            the argument array (equivalent of the ``#-`` operator).
 
             The input may be a list of strings that will be coerced to an
             ``ARRAY`` or an instance of :meth:`_postgres.array`.
@@ -302,7 +314,7 @@ class JSONB(JSON):
 
         def path_exists(self, other):
             """Boolean expression. Test for presence of item given by the
-            argument JSONPath expression.
+            argument JSONPath expression (equivalent of the ``@?`` operator).
 
             .. versionadded:: 2.0
             """
@@ -312,7 +324,8 @@ class JSONB(JSON):
 
         def path_match(self, other):
             """Boolean expression. Test if JSONPath predicate given by the
-            argument JSONPath expression matches.
+            argument JSONPath expression matches
+            (equivalent of the ``@@`` operator).
 
             Only the first item of the result is taken into account.
 
diff --git a/libs/sqlalchemy/dialects/postgresql/named_types.py b/libs/sqlalchemy/dialects/postgresql/named_types.py
index 56bec1dc7..e1b8e84ce 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -185,8 +185,10 @@ class ENUM(NamedType, type_api.NativeForEmulated, sqltypes.Enum):
     :meth:`_schema.Table.drop`
     methods are called::
 
-        table = Table('sometable', metadata,
-            Column('some_enum', ENUM('a', 'b', 'c', name='myenum'))
+        table = Table(
+            "sometable",
+            metadata,
+            Column("some_enum", ENUM("a", "b", "c", name="myenum")),
         )
 
         table.create(engine)  # will emit CREATE ENUM and CREATE TABLE
@@ -197,21 +199,17 @@ class ENUM(NamedType, type_api.NativeForEmulated, sqltypes.Enum):
     :class:`_postgresql.ENUM` independently, and associate it with the
     :class:`_schema.MetaData` object itself::
 
-        my_enum = ENUM('a', 'b', 'c', name='myenum', metadata=metadata)
+        my_enum = ENUM("a", "b", "c", name="myenum", metadata=metadata)
 
-        t1 = Table('sometable_one', metadata,
-            Column('some_enum', myenum)
-        )
+        t1 = Table("sometable_one", metadata, Column("some_enum", myenum))
 
-        t2 = Table('sometable_two', metadata,
-            Column('some_enum', myenum)
-        )
+        t2 = Table("sometable_two", metadata, Column("some_enum", myenum))
 
     When this pattern is used, care must still be taken at the level
     of individual table creates.  Emitting CREATE TABLE without also
     specifying ``checkfirst=True`` will still cause issues::
 
-        t1.create(engine) # will fail: no such type 'myenum'
+        t1.create(engine)  # will fail: no such type 'myenum'
 
     If we specify ``checkfirst=True``, the individual table-level create
     operation will check for the ``ENUM`` and create if not exists::
@@ -387,14 +385,12 @@ class DOMAIN(NamedType, sqltypes.SchemaType):
     A domain is essentially a data type with optional constraints
     that restrict the allowed set of values. E.g.::
 
-        PositiveInt = DOMAIN(
-            "pos_int", Integer, check="VALUE > 0", not_null=True
-        )
+        PositiveInt = DOMAIN("pos_int", Integer, check="VALUE > 0", not_null=True)
 
         UsPostalCode = DOMAIN(
             "us_postal_code",
             Text,
-            check="VALUE ~ '^\d{5}$' OR VALUE ~ '^\d{5}-\d{4}$'"
+            check="VALUE ~ '^\d{5}$' OR VALUE ~ '^\d{5}-\d{4}$'",
         )
 
     See the `PostgreSQL documentation`__ for additional details
@@ -403,7 +399,7 @@ class DOMAIN(NamedType, sqltypes.SchemaType):
 
     .. versionadded:: 2.0
 
-    """
+    """  # noqa: E501
 
     DDLGenerator = DomainGenerator
     DDLDropper = DomainDropper
@@ -416,10 +412,10 @@ class DOMAIN(NamedType, sqltypes.SchemaType):
         data_type: _TypeEngineArgument[Any],
         *,
         collation: Optional[str] = None,
-        default: Optional[Union[str, elements.TextClause]] = None,
+        default: Union[elements.TextClause, str, None] = None,
         constraint_name: Optional[str] = None,
         not_null: Optional[bool] = None,
-        check: Optional[str] = None,
+        check: Union[elements.TextClause, str, None] = None,
         create_type: bool = True,
         **kw: Any,
     ):
@@ -463,7 +459,7 @@ class DOMAIN(NamedType, sqltypes.SchemaType):
         self.default = default
         self.collation = collation
         self.constraint_name = constraint_name
-        self.not_null = not_null
+        self.not_null = bool(not_null)
         if check is not None:
             check = coercions.expect(roles.DDLExpressionRole, check)
         self.check = check
@@ -474,6 +470,20 @@ class DOMAIN(NamedType, sqltypes.SchemaType):
     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 53e175f9c..ebcafcba9 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 0151be025..bf113230e 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-2024 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -27,19 +27,21 @@ PostgreSQL ``client_encoding`` parameter; by default this is the value in
 the ``postgresql.conf`` file, which often defaults to ``SQL_ASCII``.
 Typically, this can be changed to ``utf-8``, as a more useful default::
 
-    #client_encoding = sql_ascii # actually, defaults to database
-                                 # encoding
+    # client_encoding = sql_ascii # actually, defaults to database encoding
     client_encoding = utf8
 
 The ``client_encoding`` can be overridden for a session by executing the SQL:
 
-SET CLIENT_ENCODING TO 'utf8';
+.. sourcecode:: sql
+
+    SET CLIENT_ENCODING TO 'utf8';
 
 SQLAlchemy will execute this SQL on all new connections based on the value
 passed to :func:`_sa.create_engine` using the ``client_encoding`` parameter::
 
     engine = create_engine(
-        "postgresql+pg8000://user:pass@host/dbname", client_encoding='utf8')
+        "postgresql+pg8000://user:pass@host/dbname", client_encoding="utf8"
+    )
 
 .. _pg8000_ssl:
 
@@ -50,6 +52,7 @@ pg8000 accepts a Python ``SSLContext`` object which may be specified using the
 :paramref:`_sa.create_engine.connect_args` dictionary::
 
     import ssl
+
     ssl_context = ssl.create_default_context()
     engine = sa.create_engine(
         "postgresql+pg8000://scott:tiger@192.168.0.199/test",
@@ -61,6 +64,7 @@ or does not match the host name (as seen from the client), it may also be
 necessary to disable hostname checking::
 
     import ssl
+
     ssl_context = ssl.create_default_context()
     ssl_context.check_hostname = False
     ssl_context.verify_mode = ssl.CERT_NONE
diff --git a/libs/sqlalchemy/dialects/postgresql/pg_catalog.py b/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
index 7b44bc93f..78f390a21 100644
--- a/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
+++ b/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/pg_catalog.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -77,7 +77,7 @@ RELKINDS_MAT_VIEW = ("m",)
 RELKINDS_ALL_TABLE_LIKE = RELKINDS_TABLE + RELKINDS_VIEW + RELKINDS_MAT_VIEW
 
 # tables
-pg_catalog_meta = MetaData()
+pg_catalog_meta = MetaData(schema="pg_catalog")
 
 pg_namespace = Table(
     "pg_namespace",
@@ -85,7 +85,6 @@ pg_namespace = Table(
     Column("oid", OID),
     Column("nspname", NAME),
     Column("nspowner", OID),
-    schema="pg_catalog",
 )
 
 pg_class = Table(
@@ -120,7 +119,6 @@ pg_class = Table(
     Column("relispartition", Boolean, info={"server_version": (10,)}),
     Column("relrewrite", OID, info={"server_version": (11,)}),
     Column("reloptions", ARRAY(Text)),
-    schema="pg_catalog",
 )
 
 pg_type = Table(
@@ -155,7 +153,6 @@ pg_type = Table(
     Column("typndims", Integer),
     Column("typcollation", OID, info={"server_version": (9, 1)}),
     Column("typdefault", Text),
-    schema="pg_catalog",
 )
 
 pg_index = Table(
@@ -182,7 +179,6 @@ pg_index = Table(
     Column("indoption", INT2VECTOR),
     Column("indexprs", PG_NODE_TREE),
     Column("indpred", PG_NODE_TREE),
-    schema="pg_catalog",
 )
 
 pg_attribute = Table(
@@ -209,7 +205,6 @@ pg_attribute = Table(
     Column("attislocal", Boolean),
     Column("attinhcount", Integer),
     Column("attcollation", OID, info={"server_version": (9, 1)}),
-    schema="pg_catalog",
 )
 
 pg_constraint = Table(
@@ -235,7 +230,6 @@ pg_constraint = Table(
     Column("connoinherit", Boolean, info={"server_version": (9, 2)}),
     Column("conkey", ARRAY(SmallInteger)),
     Column("confkey", ARRAY(SmallInteger)),
-    schema="pg_catalog",
 )
 
 pg_sequence = Table(
@@ -249,7 +243,6 @@ pg_sequence = Table(
     Column("seqmin", BigInteger),
     Column("seqcache", BigInteger),
     Column("seqcycle", Boolean),
-    schema="pg_catalog",
     info={"server_version": (10,)},
 )
 
@@ -260,7 +253,6 @@ pg_attrdef = Table(
     Column("adrelid", OID),
     Column("adnum", SmallInteger),
     Column("adbin", PG_NODE_TREE),
-    schema="pg_catalog",
 )
 
 pg_description = Table(
@@ -270,7 +262,6 @@ pg_description = Table(
     Column("classoid", OID),
     Column("objsubid", Integer),
     Column("description", Text(collation="C")),
-    schema="pg_catalog",
 )
 
 pg_enum = Table(
@@ -280,7 +271,6 @@ pg_enum = Table(
     Column("enumtypid", OID),
     Column("enumsortorder", Float(), info={"server_version": (9, 1)}),
     Column("enumlabel", NAME),
-    schema="pg_catalog",
 )
 
 pg_am = Table(
@@ -290,5 +280,21 @@ pg_am = Table(
     Column("amname", NAME),
     Column("amhandler", REGPROC, info={"server_version": (9, 6)}),
     Column("amtype", CHAR, info={"server_version": (9, 6)}),
-    schema="pg_catalog",
+)
+
+pg_collation = Table(
+    "pg_collation",
+    pg_catalog_meta,
+    Column("oid", OID, info={"server_version": (9, 3)}),
+    Column("collname", NAME),
+    Column("collnamespace", OID),
+    Column("collowner", OID),
+    Column("collprovider", CHAR, info={"server_version": (10,)}),
+    Column("collisdeterministic", Boolean, info={"server_version": (12,)}),
+    Column("collencoding", Integer),
+    Column("collcollate", Text),
+    Column("collctype", Text),
+    Column("colliculocale", Text),
+    Column("collicurules", Text, info={"server_version": (16,)}),
+    Column("collversion", Text, info={"server_version": (10,)}),
 )
diff --git a/libs/sqlalchemy/dialects/postgresql/provision.py b/libs/sqlalchemy/dialects/postgresql/provision.py
index a87bb9320..c76f5f518 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -97,7 +97,7 @@ def drop_all_schema_objects_pre_tables(cfg, eng):
         for xid in conn.exec_driver_sql(
             "select gid from pg_prepared_xacts"
         ).scalars():
-            conn.execute("ROLLBACK PREPARED '%s'" % xid)
+            conn.exec_driver_sql("ROLLBACK PREPARED '%s'" % xid)
 
 
 @drop_all_schema_objects_post_tables.for_db("postgresql")
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg.py b/libs/sqlalchemy/dialects/postgresql/psycopg.py
index 90177a43c..0554048c2 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,20 +29,29 @@ selected depending on how the engine is created:
   automatically select the sync version, e.g.::
 
     from sqlalchemy import create_engine
-    sync_engine = create_engine("postgresql+psycopg://scott:tiger@localhost/test")
+
+    sync_engine = create_engine(
+        "postgresql+psycopg://scott:tiger@localhost/test"
+    )
 
 * calling :func:`_asyncio.create_async_engine` with
   ``postgresql+psycopg://...`` will automatically select the async version,
   e.g.::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    asyncio_engine = create_async_engine("postgresql+psycopg://scott:tiger@localhost/test")
+
+    asyncio_engine = create_async_engine(
+        "postgresql+psycopg://scott:tiger@localhost/test"
+    )
 
 The asyncio version of the dialect may also be specified explicitly using the
 ``psycopg_async`` suffix, as::
 
     from sqlalchemy.ext.asyncio import create_async_engine
-    asyncio_engine = create_async_engine("postgresql+psycopg_async://scott:tiger@localhost/test")
+
+    asyncio_engine = create_async_engine(
+        "postgresql+psycopg_async://scott:tiger@localhost/test"
+    )
 
 .. seealso::
 
@@ -50,9 +59,42 @@ The asyncio version of the dialect may also be specified explicitly using the
     dialect shares most of its behavior with the ``psycopg2`` dialect.
     Further documentation is available there.
 
+Using a different Cursor class
+------------------------------
+
+One of the differences between ``psycopg`` and the older ``psycopg2``
+is how bound parameters are handled: ``psycopg2`` would bind them
+client side, while ``psycopg`` by default will bind them server side.
+
+It's possible to configure ``psycopg`` to do client side binding by
+specifying the ``cursor_factory`` to be ``ClientCursor`` when creating
+the engine::
+
+    from psycopg import ClientCursor
+
+    client_side_engine = create_engine(
+        "postgresql+psycopg://...",
+        connect_args={"cursor_factory": ClientCursor},
+    )
+
+Similarly when using an async engine the ``AsyncClientCursor`` can be
+specified::
+
+    from psycopg import AsyncClientCursor
+
+    client_side_engine = create_async_engine(
+        "postgresql+psycopg://...",
+        connect_args={"cursor_factory": AsyncClientCursor},
+    )
+
+.. seealso::
+
+    `Client-side-binding cursors <https://www.psycopg.org/psycopg3/docs/advanced/cursors.html#client-side-binding-cursors>`_
+
 """  # noqa
 from __future__ import annotations
 
+from collections import deque
 import logging
 import re
 from typing import cast
@@ -93,8 +135,6 @@ class _PGREGCONFIG(REGCONFIG):
 
 
 class _PGJSON(JSON):
-    render_bind_cast = True
-
     def bind_processor(self, dialect):
         return self._make_bind_processor(None, dialect._psycopg_Json)
 
@@ -103,8 +143,6 @@ class _PGJSON(JSON):
 
 
 class _PGJSONB(JSONB):
-    render_bind_cast = True
-
     def bind_processor(self, dialect):
         return self._make_bind_processor(None, dialect._psycopg_Jsonb)
 
@@ -368,10 +406,12 @@ class PGDialect_psycopg(_PGDialect_common_psycopg):
 
                 # register the adapter for connections made subsequent to
                 # this one
+                assert self._psycopg_adapters_map
                 register_hstore(info, self._psycopg_adapters_map)
 
                 # register the adapter for this connection
-                register_hstore(info, connection.connection)
+                assert connection.connection
+                register_hstore(info, connection.connection.driver_connection)
 
     @classmethod
     def import_dbapi(cls):
@@ -532,7 +572,7 @@ class AsyncAdapt_psycopg_cursor:
     def __init__(self, cursor, await_) -> None:
         self._cursor = cursor
         self.await_ = await_
-        self._rows = []
+        self._rows = deque()
 
     def __getattr__(self, name):
         return getattr(self._cursor, name)
@@ -559,24 +599,19 @@ class AsyncAdapt_psycopg_cursor:
         # eq/ne
         if res and res.status == self._psycopg_ExecStatus.TUPLES_OK:
             rows = self.await_(self._cursor.fetchall())
-            if not isinstance(rows, list):
-                self._rows = list(rows)
-            else:
-                self._rows = rows
+            self._rows = deque(rows)
         return result
 
     def executemany(self, query, params_seq):
         return self.await_(self._cursor.executemany(query, params_seq))
 
     def __iter__(self):
-        # TODO: try to avoid pop(0) on a list
         while self._rows:
-            yield self._rows.pop(0)
+            yield self._rows.popleft()
 
     def fetchone(self):
         if self._rows:
-            # TODO: try to avoid pop(0) on a list
-            return self._rows.pop(0)
+            return self._rows.popleft()
         else:
             return None
 
@@ -584,13 +619,12 @@ class AsyncAdapt_psycopg_cursor:
         if size is None:
             size = self._cursor.arraysize
 
-        retval = self._rows[0:size]
-        self._rows = self._rows[size:]
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
-        retval = self._rows
-        self._rows = []
+        retval = list(self._rows)
+        self._rows.clear()
         return retval
 
 
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg2.py b/libs/sqlalchemy/dialects/postgresql/psycopg2.py
index 9bf2e4933..eeb7604f7 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -88,7 +88,6 @@ connection URI::
         "postgresql+psycopg2://scott:tiger@192.168.0.199:5432/test?sslmode=require"
     )
 
-
 Unix Domain Connections
 ------------------------
 
@@ -103,13 +102,17 @@ in ``/tmp``, or whatever socket directory was specified when PostgreSQL
 was built.  This value can be overridden by passing a pathname to psycopg2,
 using ``host`` as an additional keyword argument::
 
-    create_engine("postgresql+psycopg2://user:password@/dbname?host=/var/lib/postgresql")
+    create_engine(
+        "postgresql+psycopg2://user:password@/dbname?host=/var/lib/postgresql"
+    )
 
 .. warning::  The format accepted here allows for a hostname in the main URL
    in addition to the "host" query string argument.  **When using this URL
    format, the initial host is silently ignored**.  That is, this URL::
 
-        engine = create_engine("postgresql+psycopg2://user:password@myhost1/dbname?host=myhost2")
+        engine = create_engine(
+            "postgresql+psycopg2://user:password@myhost1/dbname?host=myhost2"
+        )
 
    Above, the hostname ``myhost1`` is **silently ignored and discarded.**  The
    host which is connected is the ``myhost2`` host.
@@ -190,7 +193,7 @@ any or all elements of the connection string.
 For this form, the URL can be passed without any elements other than the
 initial scheme::
 
-    engine = create_engine('postgresql+psycopg2://')
+    engine = create_engine("postgresql+psycopg2://")
 
 In the above form, a blank "dsn" string is passed to the ``psycopg2.connect()``
 function which in turn represents an empty DSN passed to libpq.
@@ -242,7 +245,7 @@ Psycopg2 Fast Execution Helpers
 
 Modern versions of psycopg2 include a feature known as
 `Fast Execution Helpers \
-<https://initd.org/psycopg/docs/extras.html#fast-execution-helpers>`_, which
+<https://www.psycopg.org/docs/extras.html#fast-execution-helpers>`_, which
 have been shown in benchmarking to improve psycopg2's executemany()
 performance, primarily with INSERT statements, by at least
 an order of magnitude.
@@ -264,8 +267,8 @@ used feature.  The use of this extension may be enabled using the
 
     engine = create_engine(
         "postgresql+psycopg2://scott:tiger@host/dbname",
-        executemany_mode='values_plus_batch')
-
+        executemany_mode="values_plus_batch",
+    )
 
 Possible options for ``executemany_mode`` include:
 
@@ -311,8 +314,10 @@ is below::
 
     engine = create_engine(
         "postgresql+psycopg2://scott:tiger@host/dbname",
-        executemany_mode='values_plus_batch',
-        insertmanyvalues_page_size=5000, executemany_batch_page_size=500)
+        executemany_mode="values_plus_batch",
+        insertmanyvalues_page_size=5000,
+        executemany_batch_page_size=500,
+    )
 
 .. seealso::
 
@@ -338,7 +343,9 @@ in the following ways:
   passed in the database URL; this parameter is consumed by the underlying
   ``libpq`` PostgreSQL client library::
 
-    engine = create_engine("postgresql+psycopg2://user:pass@host/dbname?client_encoding=utf8")
+    engine = create_engine(
+        "postgresql+psycopg2://user:pass@host/dbname?client_encoding=utf8"
+    )
 
   Alternatively, the above ``client_encoding`` value may be passed using
   :paramref:`_sa.create_engine.connect_args` for programmatic establishment with
@@ -346,7 +353,7 @@ in the following ways:
 
     engine = create_engine(
         "postgresql+psycopg2://user:pass@host/dbname",
-        connect_args={'client_encoding': 'utf8'}
+        connect_args={"client_encoding": "utf8"},
     )
 
 * For all PostgreSQL versions, psycopg2 supports a client-side encoding
@@ -355,8 +362,7 @@ in the following ways:
   ``client_encoding`` parameter passed to :func:`_sa.create_engine`::
 
       engine = create_engine(
-          "postgresql+psycopg2://user:pass@host/dbname",
-          client_encoding="utf8"
+          "postgresql+psycopg2://user:pass@host/dbname", client_encoding="utf8"
       )
 
   .. tip:: The above ``client_encoding`` parameter admittedly is very similar
@@ -375,11 +381,9 @@ in the following ways:
     # postgresql.conf file
 
     # client_encoding = sql_ascii # actually, defaults to database
-                                 # encoding
+    # encoding
     client_encoding = utf8
 
-
-
 Transactions
 ------------
 
@@ -426,15 +430,15 @@ is set to the ``logging.INFO`` level, notice messages will be logged::
 
     import logging
 
-    logging.getLogger('sqlalchemy.dialects.postgresql').setLevel(logging.INFO)
+    logging.getLogger("sqlalchemy.dialects.postgresql").setLevel(logging.INFO)
 
 Above, it is assumed that logging is configured externally.  If this is not
 the case, configuration such as ``logging.basicConfig()`` must be utilized::
 
     import logging
 
-    logging.basicConfig()   # log messages to stdout
-    logging.getLogger('sqlalchemy.dialects.postgresql').setLevel(logging.INFO)
+    logging.basicConfig()  # log messages to stdout
+    logging.getLogger("sqlalchemy.dialects.postgresql").setLevel(logging.INFO)
 
 .. seealso::
 
@@ -471,8 +475,10 @@ textual HSTORE expression.  If this behavior is not desired, disable the
 use of the hstore extension by setting ``use_native_hstore`` to ``False`` as
 follows::
 
-    engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test",
-                use_native_hstore=False)
+    engine = create_engine(
+        "postgresql+psycopg2://scott:tiger@localhost/test",
+        use_native_hstore=False,
+    )
 
 The ``HSTORE`` type is **still supported** when the
 ``psycopg2.extensions.register_hstore()`` extension is not used.  It merely
@@ -844,33 +850,43 @@ class PGDialect_psycopg2(_PGDialect_common_psycopg):
             # checks based on strings.  in the case that .closed
             # didn't cut it, fall back onto these.
             str_e = str(e).partition("\n")[0]
-            for msg in [
-                # these error messages from libpq: interfaces/libpq/fe-misc.c
-                # and interfaces/libpq/fe-secure.c.
-                "terminating connection",
-                "closed the connection",
-                "connection not open",
-                "could not receive data from server",
-                "could not send data to server",
-                # psycopg2 client errors, psycopg2/connection.h,
-                # psycopg2/cursor.h
-                "connection already closed",
-                "cursor already closed",
-                # not sure where this path is originally from, it may
-                # be obsolete.   It really says "losed", not "closed".
-                "losed the connection unexpectedly",
-                # these can occur in newer SSL
-                "connection has been closed unexpectedly",
-                "SSL error: decryption failed or bad record mac",
-                "SSL SYSCALL error: Bad file descriptor",
-                "SSL SYSCALL error: EOF detected",
-                "SSL SYSCALL error: Operation timed out",
-                "SSL SYSCALL error: Bad address",
-            ]:
+            for msg in self._is_disconnect_messages:
                 idx = str_e.find(msg)
                 if idx >= 0 and '"' not in str_e[:idx]:
                     return True
         return False
 
+    @util.memoized_property
+    def _is_disconnect_messages(self):
+        return (
+            # these error messages from libpq: interfaces/libpq/fe-misc.c
+            # and interfaces/libpq/fe-secure.c.
+            "terminating connection",
+            "closed the connection",
+            "connection not open",
+            "could not receive data from server",
+            "could not send data to server",
+            # psycopg2 client errors, psycopg2/connection.h,
+            # psycopg2/cursor.h
+            "connection already closed",
+            "cursor already closed",
+            # not sure where this path is originally from, it may
+            # be obsolete.   It really says "losed", not "closed".
+            "losed the connection unexpectedly",
+            # these can occur in newer SSL
+            "connection has been closed unexpectedly",
+            "SSL error: decryption failed or bad record mac",
+            "SSL SYSCALL error: Bad file descriptor",
+            "SSL SYSCALL error: EOF detected",
+            "SSL SYSCALL error: Operation timed out",
+            "SSL SYSCALL error: Bad address",
+            # This can occur in OpenSSL 1 when an unexpected EOF occurs.
+            # https://www.openssl.org/docs/man1.1.1/man3/SSL_get_error.html#BUGS
+            # It may also occur in newer OpenSSL for a non-recoverable I/O
+            # error as a result of a system call that does not set 'errno'
+            # in libc.
+            "SSL SYSCALL error: Success",
+        )
+
 
 dialect = PGDialect_psycopg2
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py b/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py
index 3cc3b69fb..55e176070 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 b793ca49f..93253570c 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2013-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -360,6 +360,8 @@ class Range(Generic[_T]):
         else:
             return self._contains_value(value)
 
+    __contains__ = contains
+
     def overlaps(self, other: Range[_T]) -> bool:
         "Determine whether this range overlaps with `other`."
 
diff --git a/libs/sqlalchemy/dialects/postgresql/types.py b/libs/sqlalchemy/dialects/postgresql/types.py
index 2acf63bef..6fe4f576e 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2013-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -94,12 +94,11 @@ class MONEY(sqltypes.TypeEngine[str]):
         from sqlalchemy import Dialect
         from sqlalchemy import TypeDecorator
 
+
         class NumericMoney(TypeDecorator):
             impl = MONEY
 
-            def process_result_value(
-                self, value: Any, dialect: Dialect
-            ) -> None:
+            def process_result_value(self, value: Any, dialect: Dialect) -> None:
                 if value is not None:
                     # adjust this for the currency and numeric
                     m = re.match(r"\$([\d.]+)", value)
@@ -114,6 +113,7 @@ class MONEY(sqltypes.TypeEngine[str]):
         from sqlalchemy import cast
         from sqlalchemy import TypeDecorator
 
+
         class NumericMoney(TypeDecorator):
             impl = MONEY
 
@@ -122,7 +122,7 @@ class MONEY(sqltypes.TypeEngine[str]):
 
     .. versionadded:: 1.2
 
-    """
+    """  # noqa: E501
 
     __visit_name__ = "MONEY"
 
diff --git a/libs/sqlalchemy/dialects/sqlite/__init__.py b/libs/sqlalchemy/dialects/sqlite/__init__.py
index 45f088e21..7b381fa6f 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 6c915634d..c777bf445 100644
--- a/libs/sqlalchemy/dialects/sqlite/aiosqlite.py
+++ b/libs/sqlalchemy/dialects/sqlite/aiosqlite.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/aiosqlite.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -31,6 +31,7 @@ This dialect should normally be used only with the
 :func:`_asyncio.create_async_engine` engine creation function::
 
     from sqlalchemy.ext.asyncio import create_async_engine
+
     engine = create_async_engine("sqlite+aiosqlite:///filename")
 
 The URL passes through all arguments to the ``pysqlite`` driver, so all
@@ -58,12 +59,14 @@ The solution is similar to :ref:`pysqlite_serializable`. This is achieved by the
 
     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.
         # also stops it from emitting COMMIT before any DDL.
         dbapi_connection.isolation_level = None
 
+
     @event.listens_for(engine.sync_engine, "begin")
     def do_begin(conn):
         # emit our own BEGIN
@@ -78,6 +81,7 @@ The solution is similar to :ref:`pysqlite_serializable`. This is achieved by the
 """  # noqa
 
 import asyncio
+from collections import deque
 from functools import partial
 
 from .base import SQLiteExecutionContext
@@ -113,10 +117,10 @@ class AsyncAdapt_aiosqlite_cursor:
         self.arraysize = 1
         self.rowcount = -1
         self.description = None
-        self._rows = []
+        self._rows = deque()
 
     def close(self):
-        self._rows[:] = []
+        self._rows.clear()
 
     def execute(self, operation, parameters=None):
         try:
@@ -132,7 +136,7 @@ class AsyncAdapt_aiosqlite_cursor:
                 self.lastrowid = self.rowcount = -1
 
                 if not self.server_side:
-                    self._rows = self.await_(_cursor.fetchall())
+                    self._rows = deque(self.await_(_cursor.fetchall()))
             else:
                 self.description = None
                 self.lastrowid = _cursor.lastrowid
@@ -161,11 +165,11 @@ class AsyncAdapt_aiosqlite_cursor:
 
     def __iter__(self):
         while self._rows:
-            yield self._rows.pop(0)
+            yield self._rows.popleft()
 
     def fetchone(self):
         if self._rows:
-            return self._rows.pop(0)
+            return self._rows.popleft()
         else:
             return None
 
@@ -173,13 +177,12 @@ class AsyncAdapt_aiosqlite_cursor:
         if size is None:
             size = self.arraysize
 
-        retval = self._rows[0:size]
-        self._rows[:] = self._rows[size:]
-        return retval
+        rr = self._rows
+        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
     def fetchall(self):
-        retval = self._rows[:]
-        self._rows[:] = []
+        retval = list(self._rows)
+        self._rows.clear()
         return retval
 
 
diff --git a/libs/sqlalchemy/dialects/sqlite/base.py b/libs/sqlalchemy/dialects/sqlite/base.py
index 6db821465..e0c0f6e80 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,10 +7,9 @@
 # mypy: ignore-errors
 
 
-r"""
+r'''
 .. dialect:: sqlite
     :name: SQLite
-    :full_support: 3.36.0
     :normal_support: 3.12+
     :best_effort: 3.7.16+
 
@@ -70,9 +69,12 @@ To specifically render the AUTOINCREMENT keyword on the primary key column
 when rendering DDL, add the flag ``sqlite_autoincrement=True`` to the Table
 construct::
 
-    Table('sometable', metadata,
-            Column('id', Integer, primary_key=True),
-            sqlite_autoincrement=True)
+    Table(
+        "sometable",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        sqlite_autoincrement=True,
+    )
 
 Allowing autoincrement behavior SQLAlchemy types other than Integer/INTEGER
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -92,8 +94,13 @@ One approach to achieve this is to use :class:`.Integer` on SQLite
 only using :meth:`.TypeEngine.with_variant`::
 
     table = Table(
-        "my_table", metadata,
-        Column("id", BigInteger().with_variant(Integer, "sqlite"), primary_key=True)
+        "my_table",
+        metadata,
+        Column(
+            "id",
+            BigInteger().with_variant(Integer, "sqlite"),
+            primary_key=True,
+        ),
     )
 
 Another is to use a subclass of :class:`.BigInteger` that overrides its DDL
@@ -102,21 +109,23 @@ name to be ``INTEGER`` when compiled against SQLite::
     from sqlalchemy import BigInteger
     from sqlalchemy.ext.compiler import compiles
 
+
     class SLBigInteger(BigInteger):
         pass
 
-    @compiles(SLBigInteger, 'sqlite')
+
+    @compiles(SLBigInteger, "sqlite")
     def bi_c(element, compiler, **kw):
         return "INTEGER"
 
+
     @compiles(SLBigInteger)
     def bi_c(element, compiler, **kw):
         return compiler.visit_BIGINT(element, **kw)
 
 
     table = Table(
-        "my_table", metadata,
-        Column("id", SLBigInteger(), primary_key=True)
+        "my_table", metadata, Column("id", SLBigInteger(), primary_key=True)
     )
 
 .. seealso::
@@ -236,26 +245,24 @@ To specify an explicit ``RETURNING`` clause, use the
 
     # INSERT..RETURNING
     result = connection.execute(
-        table.insert().
-        values(name='foo').
-        returning(table.c.col1, table.c.col2)
+        table.insert().values(name="foo").returning(table.c.col1, table.c.col2)
     )
     print(result.all())
 
     # UPDATE..RETURNING
     result = connection.execute(
-        table.update().
-        where(table.c.name=='foo').
-        values(name='bar').
-        returning(table.c.col1, table.c.col2)
+        table.update()
+        .where(table.c.name == "foo")
+        .values(name="bar")
+        .returning(table.c.col1, table.c.col2)
     )
     print(result.all())
 
     # DELETE..RETURNING
     result = connection.execute(
-        table.delete().
-        where(table.c.name=='foo').
-        returning(table.c.col1, table.c.col2)
+        table.delete()
+        .where(table.c.name == "foo")
+        .returning(table.c.col1, table.c.col2)
     )
     print(result.all())
 
@@ -318,6 +325,7 @@ new connections through the usage of events::
     from sqlalchemy.engine import Engine
     from sqlalchemy import event
 
+
     @event.listens_for(Engine, "connect")
     def set_sqlite_pragma(dbapi_connection, connection_record):
         cursor = dbapi_connection.cursor()
@@ -380,13 +388,16 @@ ABORT, FAIL, IGNORE, and REPLACE.   For example, to add a UNIQUE constraint
 that specifies the IGNORE algorithm::
 
     some_table = Table(
-        'some_table', metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', Integer),
-        UniqueConstraint('id', 'data', sqlite_on_conflict='IGNORE')
+        "some_table",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column("data", Integer),
+        UniqueConstraint("id", "data", sqlite_on_conflict="IGNORE"),
     )
 
-The above renders CREATE TABLE DDL as::
+The above renders CREATE TABLE DDL as:
+
+.. sourcecode:: sql
 
     CREATE TABLE some_table (
         id INTEGER NOT NULL,
@@ -403,13 +414,17 @@ be added to the :class:`_schema.Column` as well, which will be added to the
 UNIQUE constraint in the DDL::
 
     some_table = Table(
-        'some_table', metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', Integer, unique=True,
-               sqlite_on_conflict_unique='IGNORE')
+        "some_table",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column(
+            "data", Integer, unique=True, sqlite_on_conflict_unique="IGNORE"
+        ),
     )
 
-rendering::
+rendering:
+
+.. sourcecode:: sql
 
     CREATE TABLE some_table (
         id INTEGER NOT NULL,
@@ -422,13 +437,17 @@ To apply the FAIL algorithm for a NOT NULL constraint,
 ``sqlite_on_conflict_not_null`` is used::
 
     some_table = Table(
-        'some_table', metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', Integer, nullable=False,
-               sqlite_on_conflict_not_null='FAIL')
+        "some_table",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column(
+            "data", Integer, nullable=False, sqlite_on_conflict_not_null="FAIL"
+        ),
     )
 
-this renders the column inline ON CONFLICT phrase::
+this renders the column inline ON CONFLICT phrase:
+
+.. sourcecode:: sql
 
     CREATE TABLE some_table (
         id INTEGER NOT NULL,
@@ -440,13 +459,20 @@ this renders the column inline ON CONFLICT phrase::
 Similarly, for an inline primary key, use ``sqlite_on_conflict_primary_key``::
 
     some_table = Table(
-        'some_table', metadata,
-        Column('id', Integer, primary_key=True,
-               sqlite_on_conflict_primary_key='FAIL')
+        "some_table",
+        metadata,
+        Column(
+            "id",
+            Integer,
+            primary_key=True,
+            sqlite_on_conflict_primary_key="FAIL",
+        ),
     )
 
 SQLAlchemy renders the PRIMARY KEY constraint separately, so the conflict
-resolution algorithm is applied to the constraint itself::
+resolution algorithm is applied to the constraint itself:
+
+.. sourcecode:: sql
 
     CREATE TABLE some_table (
         id INTEGER NOT NULL,
@@ -456,7 +482,7 @@ resolution algorithm is applied to the constraint itself::
 .. _sqlite_on_conflict_insert:
 
 INSERT...ON CONFLICT (Upsert)
------------------------------------
+-----------------------------
 
 .. seealso:: This section describes the :term:`DML` version of "ON CONFLICT" for
    SQLite, which occurs within an INSERT statement.  For "ON CONFLICT" as
@@ -484,21 +510,18 @@ and :meth:`_sqlite.Insert.on_conflict_do_nothing`:
     >>> from sqlalchemy.dialects.sqlite import insert
 
     >>> insert_stmt = insert(my_table).values(
-    ...     id='some_existing_id',
-    ...     data='inserted value')
+    ...     id="some_existing_id", data="inserted value"
+    ... )
 
     >>> do_update_stmt = insert_stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value')
+    ...     index_elements=["id"], set_=dict(data="updated value")
     ... )
 
     >>> print(do_update_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (?, ?)
     ON CONFLICT (id) DO UPDATE SET data = ?{stop}
 
-    >>> do_nothing_stmt = insert_stmt.on_conflict_do_nothing(
-    ...     index_elements=['id']
-    ... )
+    >>> do_nothing_stmt = insert_stmt.on_conflict_do_nothing(index_elements=["id"])
 
     >>> print(do_nothing_stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (?, ?)
@@ -529,13 +552,13 @@ Both methods supply the "target" of the conflict using column inference:
 
   .. sourcecode:: pycon+sql
 
-        >>> stmt = insert(my_table).values(user_email='a@b.com', data='inserted data')
+        >>> stmt = insert(my_table).values(user_email="a@b.com", data="inserted data")
 
         >>> do_update_stmt = stmt.on_conflict_do_update(
         ...     index_elements=[my_table.c.user_email],
-        ...     index_where=my_table.c.user_email.like('%@gmail.com'),
-        ...     set_=dict(data=stmt.excluded.data)
-        ...     )
+        ...     index_where=my_table.c.user_email.like("%@gmail.com"),
+        ...     set_=dict(data=stmt.excluded.data),
+        ... )
 
         >>> print(do_update_stmt)
         {printsql}INSERT INTO my_table (data, user_email) VALUES (?, ?)
@@ -555,11 +578,10 @@ for UPDATE:
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
 
     >>> do_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value')
+    ...     index_elements=["id"], set_=dict(data="updated value")
     ... )
 
     >>> print(do_update_stmt)
@@ -587,14 +609,12 @@ would have been inserted had the constraint not failed:
 .. sourcecode:: pycon+sql
 
     >>> stmt = insert(my_table).values(
-    ...     id='some_id',
-    ...     data='inserted value',
-    ...     author='jlh'
+    ...     id="some_id", data="inserted value", author="jlh"
     ... )
 
     >>> do_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value', author=stmt.excluded.author)
+    ...     index_elements=["id"],
+    ...     set_=dict(data="updated value", author=stmt.excluded.author),
     ... )
 
     >>> print(do_update_stmt)
@@ -611,15 +631,13 @@ parameter, which will limit those rows which receive an UPDATE:
 .. sourcecode:: pycon+sql
 
     >>> stmt = insert(my_table).values(
-    ...     id='some_id',
-    ...     data='inserted value',
-    ...     author='jlh'
+    ...     id="some_id", data="inserted value", author="jlh"
     ... )
 
     >>> on_update_stmt = stmt.on_conflict_do_update(
-    ...     index_elements=['id'],
-    ...     set_=dict(data='updated value', author=stmt.excluded.author),
-    ...     where=(my_table.c.status == 2)
+    ...     index_elements=["id"],
+    ...     set_=dict(data="updated value", author=stmt.excluded.author),
+    ...     where=(my_table.c.status == 2),
     ... )
     >>> print(on_update_stmt)
     {printsql}INSERT INTO my_table (id, data, author) VALUES (?, ?, ?)
@@ -636,8 +654,8 @@ using the :meth:`_sqlite.Insert.on_conflict_do_nothing` method:
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
-    >>> stmt = stmt.on_conflict_do_nothing(index_elements=['id'])
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
+    >>> stmt = stmt.on_conflict_do_nothing(index_elements=["id"])
     >>> print(stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (?, ?) ON CONFLICT (id) DO NOTHING
 
@@ -648,7 +666,7 @@ occurs:
 
 .. sourcecode:: pycon+sql
 
-    >>> stmt = insert(my_table).values(id='some_id', data='inserted value')
+    >>> stmt = insert(my_table).values(id="some_id", data="inserted value")
     >>> stmt = stmt.on_conflict_do_nothing()
     >>> print(stmt)
     {printsql}INSERT INTO my_table (id, data) VALUES (?, ?) ON CONFLICT DO NOTHING
@@ -708,11 +726,16 @@ Partial Indexes
 A partial index, e.g. one which uses a WHERE clause, can be specified
 with the DDL system using the argument ``sqlite_where``::
 
-    tbl = Table('testtbl', m, Column('data', Integer))
-    idx = Index('test_idx1', tbl.c.data,
-                sqlite_where=and_(tbl.c.data > 5, tbl.c.data < 10))
+    tbl = Table("testtbl", m, Column("data", Integer))
+    idx = Index(
+        "test_idx1",
+        tbl.c.data,
+        sqlite_where=and_(tbl.c.data > 5, tbl.c.data < 10),
+    )
 
-The index will be rendered at create time as::
+The index will be rendered at create time as:
+
+.. sourcecode:: sql
 
     CREATE INDEX test_idx1 ON testtbl (data)
     WHERE data > 5 AND data < 10
@@ -732,7 +755,11 @@ The bug, entirely outside of SQLAlchemy, can be illustrated thusly::
 
     import sqlite3
 
-    assert sqlite3.sqlite_version_info < (3, 10, 0), "bug is fixed in this version"
+    assert sqlite3.sqlite_version_info < (
+        3,
+        10,
+        0,
+    ), "bug is fixed in this version"
 
     conn = sqlite3.connect(":memory:")
     cursor = conn.cursor()
@@ -742,17 +769,22 @@ The bug, entirely outside of SQLAlchemy, can be illustrated thusly::
     cursor.execute("insert into x (a, b) values (2, 2)")
 
     cursor.execute("select x.a, x.b from x")
-    assert [c[0] for c in cursor.description] == ['a', 'b']
+    assert [c[0] for c in cursor.description] == ["a", "b"]
 
-    cursor.execute('''
+    cursor.execute(
+        """
         select x.a, x.b from x where a=1
         union
         select x.a, x.b from x where a=2
-    ''')
-    assert [c[0] for c in cursor.description] == ['a', 'b'], \
-        [c[0] for c in cursor.description]
+        """
+    )
+    assert [c[0] for c in cursor.description] == ["a", "b"], [
+        c[0] for c in cursor.description
+    ]
 
-The second assertion fails::
+The second assertion fails:
+
+.. sourcecode:: text
 
     Traceback (most recent call last):
       File "test.py", line 19, in <module>
@@ -780,11 +812,13 @@ to filter these out::
     result = conn.exec_driver_sql("select x.a, x.b from x")
     assert result.keys() == ["a", "b"]
 
-    result = conn.exec_driver_sql('''
+    result = conn.exec_driver_sql(
+        """
         select x.a, x.b from x where a=1
         union
         select x.a, x.b from x where a=2
-    ''')
+        """
+    )
     assert result.keys() == ["a", "b"]
 
 Note that above, even though SQLAlchemy filters out the dots, *both
@@ -808,16 +842,20 @@ contain dots, and the functionality of :meth:`_engine.CursorResult.keys` and
 the ``sqlite_raw_colnames`` execution option may be provided, either on a
 per-:class:`_engine.Connection` basis::
 
-    result = conn.execution_options(sqlite_raw_colnames=True).exec_driver_sql('''
+    result = conn.execution_options(sqlite_raw_colnames=True).exec_driver_sql(
+        """
         select x.a, x.b from x where a=1
         union
         select x.a, x.b from x where a=2
-    ''')
+        """
+    )
     assert result.keys() == ["x.a", "x.b"]
 
 or on a per-:class:`_engine.Engine` basis::
 
-    engine = create_engine("sqlite://", execution_options={"sqlite_raw_colnames": True})
+    engine = create_engine(
+        "sqlite://", execution_options={"sqlite_raw_colnames": True}
+    )
 
 When using the per-:class:`_engine.Engine` execution option, note that
 **Core and ORM queries that use UNION may not function properly**.
@@ -832,12 +870,18 @@ dialect in conjunction with the :class:`_schema.Table` construct:
 
     Table("some_table", metadata, ..., sqlite_with_rowid=False)
 
+*
+  ``STRICT``::
+
+    Table("some_table", metadata, ..., sqlite_strict=True)
+
+  .. versionadded:: 2.0.37
+
 .. seealso::
 
     `SQLite CREATE TABLE options
     <https://www.sqlite.org/lang_createtable.html>`_
 
-
 .. _sqlite_include_internal:
 
 Reflecting internal schema tables
@@ -866,7 +910,7 @@ passed to methods such as :meth:`_schema.MetaData.reflect` or
     `SQLite Internal Schema Objects <https://www.sqlite.org/fileformat2.html#intschema>`_ - in the SQLite
     documentation.
 
-"""  # noqa
+'''  # noqa
 from __future__ import annotations
 
 import datetime
@@ -980,7 +1024,9 @@ class DATETIME(_DateTimeMixin, sqltypes.DateTime):
 
         "%(year)04d-%(month)02d-%(day)02d %(hour)02d:%(minute)02d:%(second)02d.%(microsecond)06d"
 
-    e.g.::
+    e.g.:
+
+    .. sourcecode:: text
 
         2021-03-15 12:05:57.105542
 
@@ -996,9 +1042,11 @@ class DATETIME(_DateTimeMixin, sqltypes.DateTime):
         import re
         from sqlalchemy.dialects.sqlite import DATETIME
 
-        dt = DATETIME(storage_format="%(year)04d/%(month)02d/%(day)02d "
-                                     "%(hour)02d:%(minute)02d:%(second)02d",
-                      regexp=r"(\d+)/(\d+)/(\d+) (\d+)-(\d+)-(\d+)"
+        dt = DATETIME(
+            storage_format=(
+                "%(year)04d/%(month)02d/%(day)02d %(hour)02d:%(minute)02d:%(second)02d"
+            ),
+            regexp=r"(\d+)/(\d+)/(\d+) (\d+)-(\d+)-(\d+)",
         )
 
     :param storage_format: format string which will be applied to the dict
@@ -1088,7 +1136,9 @@ class DATE(_DateTimeMixin, sqltypes.Date):
 
         "%(year)04d-%(month)02d-%(day)02d"
 
-    e.g.::
+    e.g.:
+
+    .. sourcecode:: text
 
         2011-03-15
 
@@ -1106,9 +1156,9 @@ class DATE(_DateTimeMixin, sqltypes.Date):
         from sqlalchemy.dialects.sqlite import DATE
 
         d = DATE(
-                storage_format="%(month)02d/%(day)02d/%(year)04d",
-                regexp=re.compile("(?P<month>\d+)/(?P<day>\d+)/(?P<year>\d+)")
-            )
+            storage_format="%(month)02d/%(day)02d/%(year)04d",
+            regexp=re.compile("(?P<month>\d+)/(?P<day>\d+)/(?P<year>\d+)"),
+        )
 
     :param storage_format: format string which will be applied to the
      dict with keys year, month, and day.
@@ -1162,7 +1212,9 @@ class TIME(_DateTimeMixin, sqltypes.Time):
 
         "%(hour)02d:%(minute)02d:%(second)02d.%(microsecond)06d"
 
-    e.g.::
+    e.g.:
+
+    .. sourcecode:: text
 
         12:05:57.10558
 
@@ -1178,9 +1230,9 @@ class TIME(_DateTimeMixin, sqltypes.Time):
         import re
         from sqlalchemy.dialects.sqlite import TIME
 
-        t = TIME(storage_format="%(hour)02d-%(minute)02d-"
-                                "%(second)02d-%(microsecond)06d",
-                 regexp=re.compile("(\d+)-(\d+)-(\d+)-(?:-(\d+))?")
+        t = TIME(
+            storage_format="%(hour)02d-%(minute)02d-%(second)02d-%(microsecond)06d",
+            regexp=re.compile("(\d+)-(\d+)-(\d+)-(?:-(\d+))?"),
         )
 
     :param storage_format: format string which will be applied to the dict
@@ -1429,9 +1481,7 @@ class SQLiteCompiler(compiler.SQLCompiler):
         return self._generate_generic_binary(binary, " NOT REGEXP ", **kw)
 
     def _on_conflict_target(self, clause, **kw):
-        if clause.constraint_target is not None:
-            target_text = "(%s)" % clause.constraint_target
-        elif clause.inferred_target_elements is not None:
+        if clause.inferred_target_elements is not None:
             target_text = "(%s)" % ", ".join(
                 (
                     self.preparer.quote(c)
@@ -1445,7 +1495,7 @@ class SQLiteCompiler(compiler.SQLCompiler):
                     clause.inferred_target_whereclause,
                     include_table=False,
                     use_schema=False,
-                    literal_binds=True,
+                    literal_execute=True,
                 )
 
         else:
@@ -1528,6 +1578,13 @@ class SQLiteCompiler(compiler.SQLCompiler):
 
         return "ON CONFLICT %s DO UPDATE SET %s" % (target_text, action_text)
 
+    def visit_bitwise_xor_op_binary(self, binary, operator, **kw):
+        # sqlite has no xor. Use "a XOR b" = "(a | b) - (a & b)".
+        kw["eager_grouping"] = True
+        or_ = self._generate_generic_binary(binary, " | ", **kw)
+        and_ = self._generate_generic_binary(binary, " & ", **kw)
+        return f"({or_} - {and_})"
+
 
 class SQLiteDDLCompiler(compiler.DDLCompiler):
     def get_column_specification(self, column, **kwargs):
@@ -1701,9 +1758,12 @@ class SQLiteDDLCompiler(compiler.DDLCompiler):
         return text
 
     def post_create_table(self, table):
+        text = ""
         if table.dialect_options["sqlite"]["with_rowid"] is False:
-            return "\n WITHOUT ROWID"
-        return ""
+            text += "\n WITHOUT ROWID"
+        if table.dialect_options["sqlite"]["strict"] is True:
+            text += "\n STRICT"
+        return text
 
 
 class SQLiteTypeCompiler(compiler.GenericTypeCompiler):
@@ -1938,6 +1998,7 @@ class SQLiteDialect(default.DefaultDialect):
             {
                 "autoincrement": False,
                 "with_rowid": True,
+                "strict": False,
             },
         ),
         (sa_schema.Index, {"where": None}),
@@ -2231,6 +2292,14 @@ class SQLiteDialect(default.DefaultDialect):
                 tablesql = self._get_table_sql(
                     connection, table_name, schema, **kw
                 )
+                # remove create table
+                match = re.match(
+                    r"create table .*?\((.*)\)$",
+                    tablesql.strip(),
+                    re.DOTALL | re.IGNORECASE,
+                )
+                assert match, f"create table not found in {tablesql}"
+                tablesql = match.group(1).strip()
 
             columns.append(
                 self._get_column_info(
@@ -2285,7 +2354,10 @@ class SQLiteDialect(default.DefaultDialect):
         if generated:
             sqltext = ""
             if tablesql:
-                pattern = r"[^,]*\s+AS\s+\(([^,]*)\)\s*(?:virtual|stored)?"
+                pattern = (
+                    r"[^,]*\s+GENERATED\s+ALWAYS\s+AS"
+                    r"\s+\((.*)\)\s*(?:virtual|stored)?"
+                )
                 match = re.search(
                     re.escape(name) + pattern, tablesql, re.IGNORECASE
                 )
@@ -2570,8 +2642,8 @@ class SQLiteDialect(default.DefaultDialect):
                 return
             UNIQUE_PATTERN = r'(?:CONSTRAINT "?(.+?)"? +)?UNIQUE *\((.+?)\)'
             INLINE_UNIQUE_PATTERN = (
-                r'(?:(".+?")|(?:[\[`])?([a-z0-9_]+)(?:[\]`])?) '
-                r"+[a-z0-9_ ]+? +UNIQUE"
+                r'(?:(".+?")|(?:[\[`])?([a-z0-9_]+)(?:[\]`])?)[\t ]'
+                r"+[a-z0-9_ ]+?[\t ]+UNIQUE"
             )
 
             for match in re.finditer(UNIQUE_PATTERN, table_data, re.I):
@@ -2606,15 +2678,21 @@ class SQLiteDialect(default.DefaultDialect):
             connection, table_name, schema=schema, **kw
         )
 
-        CHECK_PATTERN = r"(?:CONSTRAINT (.+) +)?" r"CHECK *\( *(.+) *\),? *"
-        cks = []
-        # NOTE: we aren't using re.S here because we actually are
-        # taking advantage of each CHECK constraint being all on one
-        # line in the table definition in order to delineate.  This
+        # 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.
+        # 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 = []
 
         for match in re.finditer(CHECK_PATTERN, table_data or "", re.I):
+
             name = match.group(1)
 
             if name:
diff --git a/libs/sqlalchemy/dialects/sqlite/dml.py b/libs/sqlalchemy/dialects/sqlite/dml.py
index dcf5e4482..84cdb8bec 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,6 +7,10 @@
 from __future__ import annotations
 
 from typing import Any
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import Union
 
 from .._typing import _OnConflictIndexElementsT
 from .._typing import _OnConflictIndexWhereT
@@ -15,6 +19,7 @@ from .._typing import _OnConflictWhereT
 from ... import util
 from ...sql import coercions
 from ...sql import roles
+from ...sql import schema
 from ...sql._typing import _DMLTableArgument
 from ...sql.base import _exclusive_against
 from ...sql.base import _generative
@@ -22,7 +27,9 @@ from ...sql.base import ColumnCollection
 from ...sql.base import ReadOnlyColumnCollection
 from ...sql.dml import Insert as StandardInsert
 from ...sql.elements import ClauseElement
+from ...sql.elements import ColumnElement
 from ...sql.elements import KeyedColumnElement
+from ...sql.elements import TextClause
 from ...sql.expression import alias
 from ...util.typing import Self
 
@@ -141,11 +148,10 @@ class Insert(StandardInsert):
             :paramref:`.Insert.on_conflict_do_update.set_` dictionary.
 
         :param where:
-         Optional argument. If present, can be a literal SQL
-         string or an acceptable expression for a ``WHERE`` clause
-         that restricts the rows affected by ``DO UPDATE SET``. Rows
-         not meeting the ``WHERE`` condition will not be updated
-         (effectively a ``DO NOTHING`` for those rows).
+         Optional argument. An expression object representing a ``WHERE``
+         clause that restricts the rows affected by ``DO UPDATE SET``. Rows not
+         meeting the ``WHERE`` condition will not be updated (effectively a
+         ``DO NOTHING`` for those rows).
 
         """
 
@@ -184,9 +190,10 @@ class Insert(StandardInsert):
 class OnConflictClause(ClauseElement):
     stringify_dialect = "sqlite"
 
-    constraint_target: None
-    inferred_target_elements: _OnConflictIndexElementsT
-    inferred_target_whereclause: _OnConflictIndexWhereT
+    inferred_target_elements: Optional[List[Union[str, schema.Column[Any]]]]
+    inferred_target_whereclause: Optional[
+        Union[ColumnElement[Any], TextClause]
+    ]
 
     def __init__(
         self,
@@ -194,11 +201,20 @@ class OnConflictClause(ClauseElement):
         index_where: _OnConflictIndexWhereT = None,
     ):
         if index_elements is not None:
-            self.constraint_target = None
-            self.inferred_target_elements = index_elements
-            self.inferred_target_whereclause = index_where
+            self.inferred_target_elements = [
+                coercions.expect(roles.DDLConstraintColumnRole, column)
+                for column in index_elements
+            ]
+            self.inferred_target_whereclause = (
+                coercions.expect(
+                    roles.WhereHavingRole,
+                    index_where,
+                )
+                if index_where is not None
+                else None
+            )
         else:
-            self.constraint_target = self.inferred_target_elements = (
+            self.inferred_target_elements = (
                 self.inferred_target_whereclause
             ) = None
 
@@ -210,6 +226,9 @@ class OnConflictDoNothing(OnConflictClause):
 class OnConflictDoUpdate(OnConflictClause):
     __visit_name__ = "on_conflict_do_update"
 
+    update_values_to_set: List[Tuple[Union[schema.Column[Any], str], Any]]
+    update_whereclause: Optional[ColumnElement[Any]]
+
     def __init__(
         self,
         index_elements: _OnConflictIndexElementsT = None,
@@ -237,4 +256,8 @@ class OnConflictDoUpdate(OnConflictClause):
             (coercions.expect(roles.DMLColumnRole, key), value)
             for key, value in set_.items()
         ]
-        self.update_whereclause = where
+        self.update_whereclause = (
+            coercions.expect(roles.WhereHavingRole, where)
+            if where is not None
+            else None
+        )
diff --git a/libs/sqlalchemy/dialects/sqlite/json.py b/libs/sqlalchemy/dialects/sqlite/json.py
index ec2980297..02f4ea4c9 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 f18568b0b..97f882e7f 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/pysqlcipher.py b/libs/sqlalchemy/dialects/sqlite/pysqlcipher.py
index 388a4dff8..7a3dc1bae 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -39,7 +39,7 @@ Current dialect selection logic is:
 
         e = create_engine(
             "sqlite+pysqlcipher://:password@/dbname.db",
-            module=sqlcipher_compatible_driver
+            module=sqlcipher_compatible_driver,
         )
 
 These drivers make use of the SQLCipher engine. This system essentially
@@ -55,12 +55,12 @@ The format of the connect string is in every way the same as that
 of the :mod:`~sqlalchemy.dialects.sqlite.pysqlite` driver, except that the
 "password" field is now accepted, which should contain a passphrase::
 
-    e = create_engine('sqlite+pysqlcipher://:testing@/foo.db')
+    e = create_engine("sqlite+pysqlcipher://:testing@/foo.db")
 
 For an absolute file path, two leading slashes should be used for the
 database name::
 
-    e = create_engine('sqlite+pysqlcipher://:testing@//path/to/foo.db')
+    e = create_engine("sqlite+pysqlcipher://:testing@//path/to/foo.db")
 
 A selection of additional encryption-related pragmas supported by SQLCipher
 as documented at https://www.zetetic.net/sqlcipher/sqlcipher-api/ can be passed
@@ -68,7 +68,9 @@ in the query string, and will result in that PRAGMA being called for each
 new connection.  Currently, ``cipher``, ``kdf_iter``
 ``cipher_page_size`` and ``cipher_use_hmac`` are supported::
 
-    e = create_engine('sqlite+pysqlcipher://:testing@/foo.db?cipher=aes-256-cfb&kdf_iter=64000')
+    e = create_engine(
+        "sqlite+pysqlcipher://:testing@/foo.db?cipher=aes-256-cfb&kdf_iter=64000"
+    )
 
 .. warning:: Previous versions of sqlalchemy did not take into consideration
    the encryption-related pragmas passed in the url string, that were silently
diff --git a/libs/sqlalchemy/dialects/sqlite/pysqlite.py b/libs/sqlalchemy/dialects/sqlite/pysqlite.py
index e24877900..9dafda6d9 100644
--- a/libs/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/libs/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/pysqlite.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,7 +28,9 @@ Connect Strings
 ---------------
 
 The file specification for the SQLite database is taken as the "database"
-portion of the URL.  Note that the format of a SQLAlchemy url is::
+portion of the URL.  Note that the format of a SQLAlchemy url is:
+
+.. sourcecode:: text
 
     driver://user:pass@host/database
 
@@ -37,25 +39,28 @@ the **right** of the third slash.   So connecting to a relative filepath
 looks like::
 
     # relative path
-    e = create_engine('sqlite:///path/to/database.db')
+    e = create_engine("sqlite:///path/to/database.db")
 
 An absolute path, which is denoted by starting with a slash, means you
 need **four** slashes::
 
     # absolute path
-    e = create_engine('sqlite:////path/to/database.db')
+    e = create_engine("sqlite:////path/to/database.db")
 
 To use a Windows path, regular drive specifications and backslashes can be
 used. Double backslashes are probably needed::
 
     # absolute path on Windows
-    e = create_engine('sqlite:///C:\\path\\to\\database.db')
+    e = create_engine("sqlite:///C:\\path\\to\\database.db")
 
-The sqlite ``:memory:`` identifier is the default if no filepath is
-present.  Specify ``sqlite://`` and nothing else::
+To use sqlite ``:memory:`` database specify it as the filename using
+``sqlite:///:memory:``. It's also the default if no filepath is
+present, specifying only ``sqlite://`` and nothing else::
 
-    # in-memory database
-    e = create_engine('sqlite://')
+    # in-memory database (note three slashes)
+    e = create_engine("sqlite:///:memory:")
+    # also in-memory database
+    e2 = create_engine("sqlite://")
 
 .. _pysqlite_uri_connections:
 
@@ -95,7 +100,9 @@ Above, the pysqlite / sqlite3 DBAPI would be passed arguments as::
 
     sqlite3.connect(
         "file:path/to/database?mode=ro&nolock=1",
-        check_same_thread=True, timeout=10, uri=True
+        check_same_thread=True,
+        timeout=10,
+        uri=True,
     )
 
 Regarding future parameters added to either the Python or native drivers. new
@@ -141,8 +148,11 @@ as follows::
     def regexp(a, b):
         return re.search(a, b) is not None
 
+
     sqlite_connection.create_function(
-        "regexp", 2, regexp,
+        "regexp",
+        2,
+        regexp,
     )
 
 There is currently no support for regular expression flags as a separate
@@ -183,10 +193,12 @@ Keeping in mind that pysqlite's parsing option is not recommended,
 nor should be necessary, for use with SQLAlchemy, usage of PARSE_DECLTYPES
 can be forced if one configures "native_datetime=True" on create_engine()::
 
-    engine = create_engine('sqlite://',
-        connect_args={'detect_types':
-            sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES},
-        native_datetime=True
+    engine = create_engine(
+        "sqlite://",
+        connect_args={
+            "detect_types": sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES
+        },
+        native_datetime=True,
     )
 
 With this flag enabled, the DATE and TIMESTAMP types (but note - not the
@@ -241,6 +253,7 @@ Pooling may be disabled for a file based database by specifying the
 parameter::
 
     from sqlalchemy import NullPool
+
     engine = create_engine("sqlite:///myfile.db", poolclass=NullPool)
 
 It's been observed that the :class:`.NullPool` implementation incurs an
@@ -260,9 +273,12 @@ globally, and the ``check_same_thread`` flag can be passed to Pysqlite
 as ``False``::
 
     from sqlalchemy.pool import StaticPool
-    engine = create_engine('sqlite://',
-                        connect_args={'check_same_thread':False},
-                        poolclass=StaticPool)
+
+    engine = create_engine(
+        "sqlite://",
+        connect_args={"check_same_thread": False},
+        poolclass=StaticPool,
+    )
 
 Note that using a ``:memory:`` database in multiple threads requires a recent
 version of SQLite.
@@ -281,14 +297,14 @@ needed within multiple threads for this case::
 
     # maintain the same connection per thread
     from sqlalchemy.pool import SingletonThreadPool
-    engine = create_engine('sqlite:///mydb.db',
-                        poolclass=SingletonThreadPool)
+
+    engine = create_engine("sqlite:///mydb.db", poolclass=SingletonThreadPool)
 
 
     # maintain the same connection across all threads
     from sqlalchemy.pool import StaticPool
-    engine = create_engine('sqlite:///mydb.db',
-                        poolclass=StaticPool)
+
+    engine = create_engine("sqlite:///mydb.db", poolclass=StaticPool)
 
 Note that :class:`.SingletonThreadPool` should be configured for the number
 of threads that are to be used; beyond that number, connections will be
@@ -317,13 +333,14 @@ same column, use a custom type that will check each row individually::
     from sqlalchemy import String
     from sqlalchemy import TypeDecorator
 
+
     class MixedBinary(TypeDecorator):
         impl = String
         cache_ok = True
 
         def process_result_value(self, value, dialect):
             if isinstance(value, str):
-                value = bytes(value, 'utf-8')
+                value = bytes(value, "utf-8")
             elif value is not None:
                 value = bytes(value)
 
@@ -364,12 +381,14 @@ ourselves. This is achieved using two event listeners::
 
     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
@@ -439,7 +458,6 @@ connection when it is created. That is accomplished with an event listener::
         with engine.connect() as conn:
             print(conn.scalar(text("SELECT UDF()")))
 
-
 """  # noqa
 
 import math
diff --git a/libs/sqlalchemy/engine/__init__.py b/libs/sqlalchemy/engine/__init__.py
index af0f7ee8b..f4205d892 100644
--- a/libs/sqlalchemy/engine/__init__.py
+++ b/libs/sqlalchemy/engine/__init__.py
@@ -1,5 +1,5 @@
 # engine/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 2cc35b501..8536d53d7 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2010-2025 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 4e1dd7d43..38c60fcd2 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 2be4322ab..50badea2a 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/base.py b/libs/sqlalchemy/engine/base.py
index e577839c1..cbf11acf5 100644
--- a/libs/sqlalchemy/engine/base.py
+++ b/libs/sqlalchemy/engine/base.py
@@ -1,5 +1,5 @@
 # engine/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -109,6 +109,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
 
     """
 
+    dialect: Dialect
     dispatch: dispatcher[ConnectionEventsTarget]
 
     _sqla_logger_namespace = "sqlalchemy.engine.Connection"
@@ -173,13 +174,9 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
         if self._has_events or self.engine._has_events:
             self.dispatch.engine_connect(self)
 
-    @util.memoized_property
-    def _message_formatter(self) -> Any:
-        if "logging_token" in self._execution_options:
-            token = self._execution_options["logging_token"]
-            return lambda msg: "[%s] %s" % (token, msg)
-        else:
-            return None
+    # this can be assigned differently via
+    # characteristics.LoggingTokenCharacteristic
+    _message_formatter: Any = None
 
     def _log_info(self, message: str, *arg: Any, **kw: Any) -> None:
         fmt = self._message_formatter
@@ -250,6 +247,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
         yield_per: int = ...,
         insertmanyvalues_page_size: int = ...,
         schema_translate_map: Optional[SchemaTranslateMapType] = ...,
+        preserve_rowcount: bool = False,
         **opt: Any,
     ) -> Connection: ...
 
@@ -380,12 +378,11 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
         :param stream_results: Available on: :class:`_engine.Connection`,
           :class:`_sql.Executable`.
 
-          Indicate to the dialect that results should be
-          "streamed" and not pre-buffered, if possible.  For backends
-          such as PostgreSQL, MySQL and MariaDB, this indicates the use of
-          a "server side cursor" as opposed to a client side cursor.
-          Other backends such as that of Oracle may already use server
-          side cursors by default.
+          Indicate to the dialect that results should be "streamed" and not
+          pre-buffered, if possible.  For backends such as PostgreSQL, MySQL
+          and MariaDB, this indicates the use of a "server side cursor" as
+          opposed to a client side cursor.  Other backends such as that of
+          Oracle Database may already use server side cursors by default.
 
           The usage of
           :paramref:`_engine.Connection.execution_options.stream_results` is
@@ -490,6 +487,18 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
 
             :ref:`schema_translating`
 
+        :param preserve_rowcount: Boolean; when True, the ``cursor.rowcount``
+          attribute will be unconditionally memoized within the result and
+          made available via the :attr:`.CursorResult.rowcount` attribute.
+          Normally, this attribute is only preserved for UPDATE and DELETE
+          statements.  Using this option, the DBAPIs rowcount value can
+          be accessed for other kinds of statements such as INSERT and SELECT,
+          to the degree that the DBAPI supports these statements.  See
+          :attr:`.CursorResult.rowcount` for notes regarding the behavior
+          of this attribute.
+
+          .. versionadded:: 2.0.28
+
         .. seealso::
 
             :meth:`_engine.Engine.execution_options`
@@ -791,7 +800,6 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
                 with conn.begin() as trans:
                     conn.execute(table.insert(), {"username": "sandy"})
 
-
         The returned object is an instance of :class:`_engine.RootTransaction`.
         This object represents the "scope" of the transaction,
         which completes when either the :meth:`_engine.Transaction.rollback`
@@ -897,7 +905,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
                     trans.rollback()  # rollback to savepoint
 
                 # outer transaction continues
-                connection.execute( ... )
+                connection.execute(...)
 
         If :meth:`_engine.Connection.begin_nested` is called without first
         calling :meth:`_engine.Connection.begin` or
@@ -907,11 +915,11 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
 
             with engine.connect() as connection:  # begin() wasn't called
 
-                with connection.begin_nested(): will auto-"begin()" first
-                    connection.execute( ... )
+                with connection.begin_nested():  # will auto-"begin()" first
+                    connection.execute(...)
                 # savepoint is released
 
-                connection.execute( ... )
+                connection.execute(...)
 
                 # explicitly commit outer transaction
                 connection.commit()
@@ -1728,21 +1736,20 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
 
              conn.exec_driver_sql(
                  "INSERT INTO table (id, value) VALUES (%(id)s, %(value)s)",
-                 [{"id":1, "value":"v1"}, {"id":2, "value":"v2"}]
+                 [{"id": 1, "value": "v1"}, {"id": 2, "value": "v2"}],
              )
 
          Single dictionary::
 
              conn.exec_driver_sql(
                  "INSERT INTO table (id, value) VALUES (%(id)s, %(value)s)",
-                 dict(id=1, value="v1")
+                 dict(id=1, value="v1"),
              )
 
          Single tuple::
 
              conn.exec_driver_sql(
-                 "INSERT INTO table (id, value) VALUES (?, ?)",
-                 (1, 'v1')
+                 "INSERT INTO table (id, value) VALUES (?, ?)", (1, "v1")
              )
 
          .. note:: The :meth:`_engine.Connection.exec_driver_sql` method does
@@ -1831,10 +1838,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
         context.pre_exec()
 
         if context.execute_style is ExecuteStyle.INSERTMANYVALUES:
-            return self._exec_insertmany_context(
-                dialect,
-                context,
-            )
+            return self._exec_insertmany_context(dialect, context)
         else:
             return self._exec_single_context(
                 dialect, context, statement, parameters
@@ -2018,7 +2022,13 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
         if self._echo:
             stats = context._get_cache_stats() + " (insertmanyvalues)"
 
+        preserve_rowcount = context.execution_options.get(
+            "preserve_rowcount", False
+        )
+        rowcount = 0
+
         for imv_batch in dialect._deliver_insertmanyvalues_batches(
+            self,
             cursor,
             str_statement,
             effective_parameters,
@@ -2039,6 +2049,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
                         imv_batch.replaced_parameters,
                         None,
                         context,
+                        is_sub_exec=True,
                     )
 
             sub_stmt = imv_batch.replaced_statement
@@ -2128,9 +2139,15 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
                     context.executemany,
                 )
 
+            if preserve_rowcount:
+                rowcount += imv_batch.current_batch_size
+
         try:
             context.post_exec()
 
+            if preserve_rowcount:
+                context._rowcount = rowcount  # type: ignore[attr-defined]
+
             result = context._setup_result_proxy()
 
         except BaseException as e:
@@ -2494,6 +2511,7 @@ class Transaction(TransactionalContext):
     :class:`_engine.Connection`::
 
         from sqlalchemy import create_engine
+
         engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test")
         connection = engine.connect()
         trans = connection.begin()
@@ -3071,10 +3089,10 @@ class Engine(
 
             shards = {"default": "base", "shard_1": "db1", "shard_2": "db2"}
 
+
             @event.listens_for(Engine, "before_cursor_execute")
-            def _switch_shard(conn, cursor, stmt,
-                    params, context, executemany):
-                shard_id = conn.get_execution_options().get('shard_id', "default")
+            def _switch_shard(conn, cursor, stmt, params, context, executemany):
+                shard_id = conn.get_execution_options().get("shard_id", "default")
                 current_shard = conn.info.get("current_shard", None)
 
                 if current_shard != shard_id:
@@ -3200,9 +3218,7 @@ class Engine(
         E.g.::
 
             with engine.begin() as conn:
-                conn.execute(
-                    text("insert into table (x, y, z) values (1, 2, 3)")
-                )
+                conn.execute(text("insert into table (x, y, z) values (1, 2, 3)"))
                 conn.execute(text("my_special_procedure(5)"))
 
         Upon successful operation, the :class:`.Transaction`
@@ -3218,7 +3234,7 @@ class Engine(
             :meth:`_engine.Connection.begin` - start a :class:`.Transaction`
             for a particular :class:`_engine.Connection`.
 
-        """
+        """  # noqa: E501
         with self.connect() as conn:
             with conn.begin():
                 yield conn
diff --git a/libs/sqlalchemy/engine/characteristics.py b/libs/sqlalchemy/engine/characteristics.py
index 7dd3a2f31..322c28b5a 100644
--- a/libs/sqlalchemy/engine/characteristics.py
+++ b/libs/sqlalchemy/engine/characteristics.py
@@ -1,5 +1,5 @@
 # engine/characteristics.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 Any
 from typing import ClassVar
 
 if typing.TYPE_CHECKING:
+    from .base import Connection
     from .interfaces import DBAPIConnection
     from .interfaces import Dialect
 
@@ -44,13 +45,30 @@ class ConnectionCharacteristic(abc.ABC):
     def reset_characteristic(
         self, dialect: Dialect, dbapi_conn: DBAPIConnection
     ) -> None:
-        """Reset the characteristic on the connection to its default value."""
+        """Reset the characteristic on the DBAPI connection to its default
+        value."""
 
     @abc.abstractmethod
     def set_characteristic(
         self, dialect: Dialect, dbapi_conn: DBAPIConnection, value: Any
     ) -> None:
-        """set characteristic on the connection to a given value."""
+        """set characteristic on the DBAPI connection to a given value."""
+
+    def set_connection_characteristic(
+        self,
+        dialect: Dialect,
+        conn: Connection,
+        dbapi_conn: DBAPIConnection,
+        value: Any,
+    ) -> None:
+        """set characteristic on the :class:`_engine.Connection` to a given
+        value.
+
+        .. versionadded:: 2.0.30 - added to support elements that are local
+           to the :class:`_engine.Connection` itself.
+
+        """
+        self.set_characteristic(dialect, dbapi_conn, value)
 
     @abc.abstractmethod
     def get_characteristic(
@@ -61,8 +79,22 @@ class ConnectionCharacteristic(abc.ABC):
 
         """
 
+    def get_connection_characteristic(
+        self, dialect: Dialect, conn: Connection, dbapi_conn: DBAPIConnection
+    ) -> Any:
+        """Given a :class:`_engine.Connection`, get the current value of the
+        characteristic.
+
+        .. versionadded:: 2.0.30 - added to support elements that are local
+           to the :class:`_engine.Connection` itself.
+
+        """
+        return self.get_characteristic(dialect, dbapi_conn)
+
 
 class IsolationLevelCharacteristic(ConnectionCharacteristic):
+    """Manage the isolation level on a DBAPI connection"""
+
     transactional: ClassVar[bool] = True
 
     def reset_characteristic(
@@ -79,3 +111,45 @@ class IsolationLevelCharacteristic(ConnectionCharacteristic):
         self, dialect: Dialect, dbapi_conn: DBAPIConnection
     ) -> Any:
         return dialect.get_isolation_level(dbapi_conn)
+
+
+class LoggingTokenCharacteristic(ConnectionCharacteristic):
+    """Manage the 'logging_token' option of a :class:`_engine.Connection`.
+
+    .. versionadded:: 2.0.30
+
+    """
+
+    transactional: ClassVar[bool] = False
+
+    def reset_characteristic(
+        self, dialect: Dialect, dbapi_conn: DBAPIConnection
+    ) -> None:
+        pass
+
+    def set_characteristic(
+        self, dialect: Dialect, dbapi_conn: DBAPIConnection, value: Any
+    ) -> None:
+        raise NotImplementedError()
+
+    def set_connection_characteristic(
+        self,
+        dialect: Dialect,
+        conn: Connection,
+        dbapi_conn: DBAPIConnection,
+        value: Any,
+    ) -> None:
+        if value:
+            conn._message_formatter = lambda msg: "[%s] %s" % (value, msg)
+        else:
+            del conn._message_formatter
+
+    def get_characteristic(
+        self, dialect: Dialect, dbapi_conn: DBAPIConnection
+    ) -> Any:
+        raise NotImplementedError()
+
+    def get_connection_characteristic(
+        self, dialect: Dialect, conn: Connection, dbapi_conn: DBAPIConnection
+    ) -> Any:
+        return conn._execution_options.get("logging_token", None)
diff --git a/libs/sqlalchemy/engine/create.py b/libs/sqlalchemy/engine/create.py
index fb3c3b79c..920f620bd 100644
--- a/libs/sqlalchemy/engine/create.py
+++ b/libs/sqlalchemy/engine/create.py
@@ -1,5 +1,5 @@
 # engine/create.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -133,8 +133,11 @@ def create_engine(url: Union[str, _url.URL], **kwargs: Any) -> Engine:
     and its underlying :class:`.Dialect` and :class:`_pool.Pool`
     constructs::
 
-        engine = create_engine("mysql+mysqldb://scott:tiger@hostname/dbname",
-                                    pool_recycle=3600, echo=True)
+        engine = create_engine(
+            "mysql+mysqldb://scott:tiger@hostname/dbname",
+            pool_recycle=3600,
+            echo=True,
+        )
 
     The string form of the URL is
     ``dialect[+driver]://user:password@host/dbname[?key=value..]``, where
@@ -663,6 +666,17 @@ def create_engine(url: Union[str, _url.URL], **kwargs: Any) -> Engine:
     else:
         pool._dialect = dialect
 
+    if (
+        hasattr(pool, "_is_asyncio")
+        and pool._is_asyncio is not dialect.is_async
+    ):
+        raise exc.ArgumentError(
+            f"Pool class {pool.__class__.__name__} cannot be "
+            f"used with {'non-' if not dialect.is_async else ''}"
+            "asyncio engine",
+            code="pcls",
+        )
+
     # create engine.
     if not pop_kwarg("future", True):
         raise exc.ArgumentError(
diff --git a/libs/sqlalchemy/engine/cursor.py b/libs/sqlalchemy/engine/cursor.py
index 4b18ddb43..ff14ad8ee 100644
--- a/libs/sqlalchemy/engine/cursor.py
+++ b/libs/sqlalchemy/engine/cursor.py
@@ -1,5 +1,5 @@
 # engine/cursor.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -688,6 +688,7 @@ class CursorResultMetaData(ResultMetaData):
                 % (num_ctx_cols, len(cursor_description))
             )
         seen = set()
+
         for (
             idx,
             colname,
@@ -1161,7 +1162,7 @@ class BufferedRowCursorFetchStrategy(CursorFetchStrategy):
 
             result = conn.execution_options(
                 stream_results=True, max_row_buffer=50
-                ).execute(text("select * from table"))
+            ).execute(text("select * from table"))
 
     .. versionadded:: 1.4 ``max_row_buffer`` may now exceed 1000 rows.
 
@@ -1246,8 +1247,9 @@ class BufferedRowCursorFetchStrategy(CursorFetchStrategy):
         if size is None:
             return self.fetchall(result, dbapi_cursor)
 
-        buf = list(self._rowbuffer)
-        lb = len(buf)
+        rb = self._rowbuffer
+        lb = len(rb)
+        close = False
         if size > lb:
             try:
                 new = dbapi_cursor.fetchmany(size - lb)
@@ -1255,13 +1257,15 @@ class BufferedRowCursorFetchStrategy(CursorFetchStrategy):
                 self.handle_exception(result, dbapi_cursor, e)
             else:
                 if not new:
-                    result._soft_close()
+                    # defer closing since it may clear the row buffer
+                    close = True
                 else:
-                    buf.extend(new)
+                    rb.extend(new)
 
-        result = buf[0:size]
-        self._rowbuffer = collections.deque(buf[size:])
-        return result
+        res = [rb.popleft() for _ in range(min(size, len(rb)))]
+        if close:
+            result._soft_close()
+        return res
 
     def fetchall(self, result, dbapi_cursor):
         try:
@@ -1315,9 +1319,8 @@ class FullyBufferedCursorFetchStrategy(CursorFetchStrategy):
         if size is None:
             return self.fetchall(result, dbapi_cursor)
 
-        buf = list(self._rowbuffer)
-        rows = buf[0:size]
-        self._rowbuffer = collections.deque(buf[size:])
+        rb = self._rowbuffer
+        rows = [rb.popleft() for _ in range(min(size, len(rb)))]
         if not rows:
             result._soft_close()
         return rows
@@ -1753,11 +1756,9 @@ class CursorResult(Result[_T]):
 
             r1 = connection.execute(
                 users.insert().returning(
-                    users.c.user_name,
-                    users.c.user_id,
-                    sort_by_parameter_order=True
+                    users.c.user_name, users.c.user_id, sort_by_parameter_order=True
                 ),
-                user_values
+                user_values,
             )
 
             r2 = connection.execute(
@@ -1765,19 +1766,16 @@ class CursorResult(Result[_T]):
                     addresses.c.address_id,
                     addresses.c.address,
                     addresses.c.user_id,
-                    sort_by_parameter_order=True
+                    sort_by_parameter_order=True,
                 ),
-                address_values
+                address_values,
             )
 
             rows = r1.splice_horizontally(r2).all()
-            assert (
-                rows ==
-                [
-                    ("john", 1, 1, "foo@bar.com", 1),
-                    ("jack", 2, 2, "bar@bat.com", 2),
-                ]
-            )
+            assert rows == [
+                ("john", 1, 1, "foo@bar.com", 1),
+                ("jack", 2, 2, "bar@bat.com", 2),
+            ]
 
         .. versionadded:: 2.0
 
@@ -1786,7 +1784,7 @@ class CursorResult(Result[_T]):
             :meth:`.CursorResult.splice_vertically`
 
 
-        """
+        """  # noqa: E501
 
         clone = self._generate()
         total_rows = [
@@ -1975,8 +1973,28 @@ class CursorResult(Result[_T]):
     def rowcount(self) -> int:
         """Return the 'rowcount' for this result.
 
-        The 'rowcount' reports the number of rows *matched*
-        by the WHERE criterion of an UPDATE or DELETE statement.
+        The primary purpose of 'rowcount' is to report the number of rows
+        matched by the WHERE criterion of an UPDATE or DELETE statement
+        executed once (i.e. for a single parameter set), which may then be
+        compared to the number of rows expected to be updated or deleted as a
+        means of asserting data integrity.
+
+        This attribute is transferred from the ``cursor.rowcount`` attribute
+        of the DBAPI before the cursor is closed, to support DBAPIs that
+        don't make this value available after cursor close.   Some DBAPIs may
+        offer meaningful values for other kinds of statements, such as INSERT
+        and SELECT statements as well.  In order to retrieve ``cursor.rowcount``
+        for these statements, set the
+        :paramref:`.Connection.execution_options.preserve_rowcount`
+        execution option to True, which will cause the ``cursor.rowcount``
+        value to be unconditionally memoized before any results are returned
+        or the cursor is closed, regardless of statement type.
+
+        For cases where the DBAPI does not support rowcount for a particular
+        kind of statement and/or execution, the returned value will be ``-1``,
+        which is delivered directly from the DBAPI and is part of :pep:`249`.
+        All DBAPIs should support rowcount for single-parameter-set
+        UPDATE and DELETE statements, however.
 
         .. note::
 
@@ -1985,38 +2003,47 @@ class CursorResult(Result[_T]):
 
            * This attribute returns the number of rows *matched*,
              which is not necessarily the same as the number of rows
-             that were actually *modified* - an UPDATE statement, for example,
+             that were actually *modified*. For example, an UPDATE statement
              may have no net change on a given row if the SET values
              given are the same as those present in the row already.
              Such a row would be matched but not modified.
              On backends that feature both styles, such as MySQL,
-             rowcount is configured by default to return the match
+             rowcount is configured to return the match
              count in all cases.
 
-           * :attr:`_engine.CursorResult.rowcount`
-             is *only* useful in conjunction
-             with an UPDATE or DELETE statement.  Contrary to what the Python
-             DBAPI says, it does *not* reliably return the
-             number of rows available from the results of a SELECT statement
-             as DBAPIs cannot support this functionality when rows are
-             unbuffered.
+           * :attr:`_engine.CursorResult.rowcount` in the default case is
+             *only* useful in conjunction with an UPDATE or DELETE statement,
+             and only with a single set of parameters. For other kinds of
+             statements, SQLAlchemy will not attempt to pre-memoize the value
+             unless the
+             :paramref:`.Connection.execution_options.preserve_rowcount`
+             execution option is used.  Note that contrary to :pep:`249`, many
+             DBAPIs do not support rowcount values for statements that are not
+             UPDATE or DELETE, particularly when rows are being returned which
+             are not fully pre-buffered.   DBAPIs that dont support rowcount
+             for a particular kind of statement should return the value ``-1``
+             for such statements.
 
-           * :attr:`_engine.CursorResult.rowcount`
-             may not be fully implemented by
-             all dialects.  In particular, most DBAPIs do not support an
-             aggregate rowcount result from an executemany call.
-             The :meth:`_engine.CursorResult.supports_sane_rowcount` and
-             :meth:`_engine.CursorResult.supports_sane_multi_rowcount` methods
-             will report from the dialect if each usage is known to be
-             supported.
+           * :attr:`_engine.CursorResult.rowcount` may not be meaningful
+             when executing a single statement with multiple parameter sets
+             (i.e. an :term:`executemany`). Most DBAPIs do not sum "rowcount"
+             values across multiple parameter sets and will return ``-1``
+             when accessed.
 
-           * Statements that use RETURNING may not return a correct
-             rowcount.
+           * SQLAlchemy's :ref:`engine_insertmanyvalues` feature does support
+             a correct population of :attr:`_engine.CursorResult.rowcount`
+             when the :paramref:`.Connection.execution_options.preserve_rowcount`
+             execution option is set to True.
+
+           * Statements that use RETURNING may not support rowcount, returning
+             a ``-1`` value instead.
 
         .. seealso::
 
             :ref:`tutorial_update_delete_rowcount` - in the :ref:`unified_tutorial`
 
+            :paramref:`.Connection.execution_options.preserve_rowcount`
+
         """  # noqa: E501
         try:
             return self.context.rowcount
@@ -2110,8 +2137,7 @@ class CursorResult(Result[_T]):
 
     def merge(self, *others: Result[Any]) -> MergedResult[Any]:
         merged_result = super().merge(*others)
-        setup_rowcounts = self.context._has_rowcount
-        if setup_rowcounts:
+        if self.context._has_rowcount:
             merged_result.rowcount = sum(
                 cast("CursorResult[Any]", result).rowcount
                 for result in (self,) + others
diff --git a/libs/sqlalchemy/engine/default.py b/libs/sqlalchemy/engine/default.py
index d64f05cdf..dd4250ffc 100644
--- a/libs/sqlalchemy/engine/default.py
+++ b/libs/sqlalchemy/engine/default.py
@@ -1,5 +1,5 @@
 # engine/default.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -58,6 +58,7 @@ from ..sql import compiler
 from ..sql import dml
 from ..sql import expression
 from ..sql import type_api
+from ..sql import util as sql_util
 from ..sql._typing import is_tuple_type
 from ..sql.base import _NoArg
 from ..sql.compiler import DDLCompiler
@@ -95,6 +96,7 @@ if typing.TYPE_CHECKING:
     from ..sql.elements import BindParameter
     from ..sql.schema import Column
     from ..sql.type_api import _BindProcessorType
+    from ..sql.type_api import _ResultProcessorType
     from ..sql.type_api import TypeEngine
 
 # When we're handed literal SQL, ensure it's a SELECT query
@@ -167,7 +169,10 @@ class DefaultDialect(Dialect):
     tuple_in_values = False
 
     connection_characteristics = util.immutabledict(
-        {"isolation_level": characteristics.IsolationLevelCharacteristic()}
+        {
+            "isolation_level": characteristics.IsolationLevelCharacteristic(),
+            "logging_token": characteristics.LoggingTokenCharacteristic(),
+        }
     )
 
     engine_config_types: Mapping[str, Any] = util.immutabledict(
@@ -249,7 +254,7 @@ class DefaultDialect(Dialect):
     default_schema_name: Optional[str] = None
 
     # indicates symbol names are
-    # UPPERCASEd if they are case insensitive
+    # UPPERCASED if they are case insensitive
     # within the database.
     # if this is True, the methods normalize_name()
     # and denormalize_name() must be provided.
@@ -387,7 +392,8 @@ class DefaultDialect(Dialect):
         available if the dialect in use has opted into using the
         "use_insertmanyvalues" feature. If they haven't opted into that, then
         this attribute is False, unless the dialect in question overrides this
-        and provides some other implementation (such as the Oracle dialect).
+        and provides some other implementation (such as the Oracle Database
+        dialects).
 
         """
         return self.insert_returning and self.use_insertmanyvalues
@@ -410,7 +416,7 @@ class DefaultDialect(Dialect):
 
         If the dialect in use hasn't opted into that, then this attribute is
         False, unless the dialect in question overrides this and provides some
-        other implementation (such as the Oracle dialect).
+        other implementation (such as the Oracle Database dialects).
 
         """
         return self.insert_returning and self.use_insertmanyvalues
@@ -659,7 +665,7 @@ class DefaultDialect(Dialect):
         if connection.in_transaction():
             trans_objs = [
                 (name, obj)
-                for name, obj, value in characteristic_values
+                for name, obj, _ in characteristic_values
                 if obj.transactional
             ]
             if trans_objs:
@@ -672,8 +678,10 @@ class DefaultDialect(Dialect):
                 )
 
         dbapi_connection = connection.connection.dbapi_connection
-        for name, characteristic, value in characteristic_values:
-            characteristic.set_characteristic(self, dbapi_connection, value)
+        for _, characteristic, value in characteristic_values:
+            characteristic.set_connection_characteristic(
+                self, connection, dbapi_connection, value
+            )
         connection.connection._connection_record.finalize_callback.append(
             functools.partial(self._reset_characteristics, characteristics)
         )
@@ -756,11 +764,25 @@ class DefaultDialect(Dialect):
         connection.execute(expression.ReleaseSavepointClause(name))
 
     def _deliver_insertmanyvalues_batches(
-        self, cursor, statement, parameters, generic_setinputsizes, context
+        self,
+        connection,
+        cursor,
+        statement,
+        parameters,
+        generic_setinputsizes,
+        context,
     ):
         context = cast(DefaultExecutionContext, context)
         compiled = cast(SQLCompiler, context.compiled)
 
+        _composite_sentinel_proc: Sequence[
+            Optional[_ResultProcessorType[Any]]
+        ] = ()
+        _scalar_sentinel_proc: Optional[_ResultProcessorType[Any]] = None
+        _sentinel_proc_initialized: bool = False
+
+        compiled_parameters = context.compiled_parameters
+
         imv = compiled._insertmanyvalues
         assert imv is not None
 
@@ -769,7 +791,12 @@ class DefaultDialect(Dialect):
             "insertmanyvalues_page_size", self.insertmanyvalues_page_size
         )
 
-        sentinel_value_resolvers = None
+        if compiled.schema_translate_map:
+            schema_translate_map = context.execution_options.get(
+                "schema_translate_map", {}
+            )
+        else:
+            schema_translate_map = None
 
         if is_returning:
             result: Optional[List[Any]] = []
@@ -777,10 +804,6 @@ class DefaultDialect(Dialect):
 
             sort_by_parameter_order = imv.sort_by_parameter_order
 
-            if imv.num_sentinel_columns:
-                sentinel_value_resolvers = (
-                    compiled._imv_sentinel_value_resolvers
-                )
         else:
             sort_by_parameter_order = False
             result = None
@@ -788,14 +811,27 @@ class DefaultDialect(Dialect):
         for imv_batch in compiled._deliver_insertmanyvalues_batches(
             statement,
             parameters,
+            compiled_parameters,
             generic_setinputsizes,
             batch_size,
             sort_by_parameter_order,
+            schema_translate_map,
         ):
             yield imv_batch
 
             if is_returning:
-                rows = context.fetchall_for_returning(cursor)
+
+                try:
+                    rows = context.fetchall_for_returning(cursor)
+                except BaseException as be:
+                    connection._handle_dbapi_exception(
+                        be,
+                        sql_util._long_statement(imv_batch.replaced_statement),
+                        imv_batch.replaced_parameters,
+                        None,
+                        context,
+                        is_sub_exec=True,
+                    )
 
                 # I would have thought "is_returning: Final[bool]"
                 # would have assured this but pylance thinks not
@@ -815,11 +851,46 @@ class DefaultDialect(Dialect):
                     # otherwise, create dictionaries to match up batches
                     # with parameters
                     assert imv.sentinel_param_keys
+                    assert imv.sentinel_columns
 
+                    _nsc = imv.num_sentinel_columns
+
+                    if not _sentinel_proc_initialized:
+                        if composite_sentinel:
+                            _composite_sentinel_proc = [
+                                col.type._cached_result_processor(
+                                    self, cursor_desc[1]
+                                )
+                                for col, cursor_desc in zip(
+                                    imv.sentinel_columns,
+                                    cursor.description[-_nsc:],
+                                )
+                            ]
+                        else:
+                            _scalar_sentinel_proc = (
+                                imv.sentinel_columns[0]
+                            ).type._cached_result_processor(
+                                self, cursor.description[-1][1]
+                            )
+                        _sentinel_proc_initialized = True
+
+                    rows_by_sentinel: Union[
+                        Dict[Tuple[Any, ...], Any],
+                        Dict[Any, Any],
+                    ]
                     if composite_sentinel:
-                        _nsc = imv.num_sentinel_columns
                         rows_by_sentinel = {
-                            tuple(row[-_nsc:]): row for row in rows
+                            tuple(
+                                (proc(val) if proc else val)
+                                for val, proc in zip(
+                                    row[-_nsc:], _composite_sentinel_proc
+                                )
+                            ): row
+                            for row in rows
+                        }
+                    elif _scalar_sentinel_proc:
+                        rows_by_sentinel = {
+                            _scalar_sentinel_proc(row[-1]): row for row in rows
                         }
                     else:
                         rows_by_sentinel = {row[-1]: row for row in rows}
@@ -838,63 +909,10 @@ class DefaultDialect(Dialect):
                         )
 
                     try:
-                        if composite_sentinel:
-                            if sentinel_value_resolvers:
-                                # composite sentinel (PK) with value resolvers
-                                ordered_rows = [
-                                    rows_by_sentinel[
-                                        tuple(
-                                            (
-                                                _resolver(parameters[_spk])  # type: ignore  # noqa: E501
-                                                if _resolver
-                                                else parameters[_spk]  # type: ignore  # noqa: E501
-                                            )
-                                            for _resolver, _spk in zip(
-                                                sentinel_value_resolvers,
-                                                imv.sentinel_param_keys,
-                                            )
-                                        )
-                                    ]
-                                    for parameters in imv_batch.batch
-                                ]
-                            else:
-                                # composite sentinel (PK) with no value
-                                # resolvers
-                                ordered_rows = [
-                                    rows_by_sentinel[
-                                        tuple(
-                                            parameters[_spk]  # type: ignore
-                                            for _spk in imv.sentinel_param_keys
-                                        )
-                                    ]
-                                    for parameters in imv_batch.batch
-                                ]
-                        else:
-                            _sentinel_param_key = imv.sentinel_param_keys[0]
-                            if (
-                                sentinel_value_resolvers
-                                and sentinel_value_resolvers[0]
-                            ):
-                                # single-column sentinel with value resolver
-                                _sentinel_value_resolver = (
-                                    sentinel_value_resolvers[0]
-                                )
-                                ordered_rows = [
-                                    rows_by_sentinel[
-                                        _sentinel_value_resolver(
-                                            parameters[_sentinel_param_key]  # type: ignore  # noqa: E501
-                                        )
-                                    ]
-                                    for parameters in imv_batch.batch
-                                ]
-                            else:
-                                # single-column sentinel with no value resolver
-                                ordered_rows = [
-                                    rows_by_sentinel[
-                                        parameters[_sentinel_param_key]  # type: ignore  # noqa: E501
-                                    ]
-                                    for parameters in imv_batch.batch
-                                ]
+                        ordered_rows = [
+                            rows_by_sentinel[sentinel_keys]
+                            for sentinel_keys in imv_batch.sentinel_values
+                        ]
                     except KeyError as ke:
                         # see test_insert_exec.py::
                         # IMVSentinelTest::test_sentinel_cant_match_keys
@@ -1198,7 +1216,7 @@ class DefaultExecutionContext(ExecutionContext):
 
     _soft_closed = False
 
-    _has_rowcount = False
+    _rowcount: Optional[int] = None
 
     # a hook for SQLite's translation of
     # result column names
@@ -1788,7 +1806,14 @@ class DefaultExecutionContext(ExecutionContext):
 
     @util.non_memoized_property
     def rowcount(self) -> int:
-        return self.cursor.rowcount
+        if self._rowcount is not None:
+            return self._rowcount
+        else:
+            return self.cursor.rowcount
+
+    @property
+    def _has_rowcount(self):
+        return self._rowcount is not None
 
     def supports_sane_rowcount(self):
         return self.dialect.supports_sane_rowcount
@@ -1799,6 +1824,9 @@ class DefaultExecutionContext(ExecutionContext):
     def _setup_result_proxy(self):
         exec_opt = self.execution_options
 
+        if self._rowcount is None and exec_opt.get("preserve_rowcount", False):
+            self._rowcount = self.cursor.rowcount
+
         if self.is_crud or self.is_text:
             result = self._setup_dml_or_text_result()
             yp = sr = False
@@ -1955,8 +1983,7 @@ class DefaultExecutionContext(ExecutionContext):
 
             if rows:
                 self.returned_default_rows = rows
-            result.rowcount = len(rows)
-            self._has_rowcount = True
+            self._rowcount = len(rows)
 
             if self._is_supplemental_returning:
                 result._rewind(rows)
@@ -1970,12 +1997,12 @@ class DefaultExecutionContext(ExecutionContext):
         elif not result._metadata.returns_rows:
             # no results, get rowcount
             # (which requires open cursor on some drivers)
-            result.rowcount
-            self._has_rowcount = True
+            if self._rowcount is None:
+                self._rowcount = self.cursor.rowcount
             result._soft_close()
         elif self.isupdate or self.isdelete:
-            result.rowcount
-            self._has_rowcount = True
+            if self._rowcount is None:
+                self._rowcount = self.cursor.rowcount
         return result
 
     @util.memoized_property
@@ -2024,10 +2051,11 @@ class DefaultExecutionContext(ExecutionContext):
         style of ``setinputsizes()`` on the cursor, using DB-API types
         from the bind parameter's ``TypeEngine`` objects.
 
-        This method only called by those dialects which set
-        the :attr:`.Dialect.bind_typing` attribute to
-        :attr:`.BindTyping.SETINPUTSIZES`.   cx_Oracle is the only DBAPI
-        that requires setinputsizes(), pyodbc offers it as an option.
+        This method only called by those dialects which set the
+        :attr:`.Dialect.bind_typing` attribute to
+        :attr:`.BindTyping.SETINPUTSIZES`.  Python-oracledb and cx_Oracle are
+        the only DBAPIs that requires setinputsizes(); pyodbc offers it as an
+        option.
 
         Prior to SQLAlchemy 2.0, the setinputsizes() approach was also used
         for pg8000 and asyncpg, which has been changed to inline rendering
diff --git a/libs/sqlalchemy/engine/events.py b/libs/sqlalchemy/engine/events.py
index b8e8936b9..b759382cb 100644
--- a/libs/sqlalchemy/engine/events.py
+++ b/libs/sqlalchemy/engine/events.py
@@ -1,5 +1,5 @@
 # engine/events.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -54,19 +54,24 @@ class ConnectionEvents(event.Events[ConnectionEventsTarget]):
 
         from sqlalchemy import event, create_engine
 
-        def before_cursor_execute(conn, cursor, statement, parameters, context,
-                                                        executemany):
+
+        def before_cursor_execute(
+            conn, cursor, statement, parameters, context, executemany
+        ):
             log.info("Received statement: %s", statement)
 
-        engine = create_engine('postgresql+psycopg2://scott:tiger@localhost/test')
+
+        engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test")
         event.listen(engine, "before_cursor_execute", before_cursor_execute)
 
     or with a specific :class:`_engine.Connection`::
 
         with engine.begin() as conn:
-            @event.listens_for(conn, 'before_cursor_execute')
-            def before_cursor_execute(conn, cursor, statement, parameters,
-                                            context, executemany):
+
+            @event.listens_for(conn, "before_cursor_execute")
+            def before_cursor_execute(
+                conn, cursor, statement, parameters, context, executemany
+            ):
                 log.info("Received statement: %s", statement)
 
     When the methods are called with a `statement` parameter, such as in
@@ -84,9 +89,11 @@ class ConnectionEvents(event.Events[ConnectionEventsTarget]):
         from sqlalchemy.engine import Engine
         from sqlalchemy import event
 
+
         @event.listens_for(Engine, "before_cursor_execute", retval=True)
-        def comment_sql_calls(conn, cursor, statement, parameters,
-                                            context, executemany):
+        def comment_sql_calls(
+            conn, cursor, statement, parameters, context, executemany
+        ):
             statement = statement + " -- some comment"
             return statement, parameters
 
@@ -316,8 +323,9 @@ class ConnectionEvents(event.Events[ConnectionEventsTarget]):
         returned as a two-tuple in this case::
 
             @event.listens_for(Engine, "before_cursor_execute", retval=True)
-            def before_cursor_execute(conn, cursor, statement,
-                            parameters, context, executemany):
+            def before_cursor_execute(
+                conn, cursor, statement, parameters, context, executemany
+            ):
                 # do something with statement, parameters
                 return statement, parameters
 
@@ -766,9 +774,9 @@ class DialectEvents(event.Events[Dialect]):
 
             @event.listens_for(Engine, "handle_error")
             def handle_exception(context):
-                if isinstance(context.original_exception,
-                    psycopg2.OperationalError) and \
-                    "failed" in str(context.original_exception):
+                if isinstance(
+                    context.original_exception, psycopg2.OperationalError
+                ) and "failed" in str(context.original_exception):
                     raise MySpecialException("failed operation")
 
         .. warning::  Because the
@@ -791,10 +799,13 @@ class DialectEvents(event.Events[Dialect]):
 
             @event.listens_for(Engine, "handle_error", retval=True)
             def handle_exception(context):
-                if context.chained_exception is not None and \
-                    "special" in context.chained_exception.message:
-                    return MySpecialException("failed",
-                        cause=context.chained_exception)
+                if (
+                    context.chained_exception is not None
+                    and "special" in context.chained_exception.message
+                ):
+                    return MySpecialException(
+                        "failed", cause=context.chained_exception
+                    )
 
         Handlers that return ``None`` may be used within the chain; when
         a handler returns ``None``, the previous exception instance,
@@ -836,7 +847,8 @@ class DialectEvents(event.Events[Dialect]):
 
             e = create_engine("postgresql+psycopg2://user@host/dbname")
 
-            @event.listens_for(e, 'do_connect')
+
+            @event.listens_for(e, "do_connect")
             def receive_do_connect(dialect, conn_rec, cargs, cparams):
                 cparams["password"] = "some_password"
 
@@ -845,7 +857,8 @@ class DialectEvents(event.Events[Dialect]):
 
             e = create_engine("postgresql+psycopg2://user@host/dbname")
 
-            @event.listens_for(e, 'do_connect')
+
+            @event.listens_for(e, "do_connect")
             def receive_do_connect(dialect, conn_rec, cargs, cparams):
                 return psycopg2.connect(*cargs, **cparams)
 
@@ -928,7 +941,8 @@ class DialectEvents(event.Events[Dialect]):
 
         The setinputsizes hook overall is only used for dialects which include
         the flag ``use_setinputsizes=True``.  Dialects which use this
-        include cx_Oracle, pg8000, asyncpg, and pyodbc dialects.
+        include python-oracledb, cx_Oracle, pg8000, asyncpg, and pyodbc
+        dialects.
 
         .. note::
 
diff --git a/libs/sqlalchemy/engine/interfaces.py b/libs/sqlalchemy/engine/interfaces.py
index 67eb68ae9..9fb39db78 100644
--- a/libs/sqlalchemy/engine/interfaces.py
+++ b/libs/sqlalchemy/engine/interfaces.py
@@ -1,5 +1,5 @@
 # engine/interfaces.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -270,6 +270,7 @@ class _CoreKnownExecutionOptions(TypedDict, total=False):
     yield_per: int
     insertmanyvalues_page_size: int
     schema_translate_map: Optional[SchemaTranslateMapType]
+    preserve_rowcount: bool
 
 
 _ExecuteOptions = immutabledict[str, Any]
@@ -579,8 +580,8 @@ class BindTyping(Enum):
     """Use the pep-249 setinputsizes method.
 
     This is only implemented for DBAPIs that support this method and for which
-    the SQLAlchemy dialect has the appropriate infrastructure for that
-    dialect set up.   Current dialects include cx_Oracle as well as
+    the SQLAlchemy dialect has the appropriate infrastructure for that dialect
+    set up.  Current dialects include python-oracledb, cx_Oracle as well as
     optional support for SQL Server using pyodbc.
 
     When using setinputsizes, dialects also have a means of only using the
@@ -870,12 +871,12 @@ class Dialect(EventTarget):
     the statement multiple times for a series of batches when large numbers
     of rows are given.
 
-    The parameter is False for the default dialect, and is set to
-    True for SQLAlchemy internal dialects SQLite, MySQL/MariaDB, PostgreSQL,
-    SQL Server.   It remains at False for Oracle, which provides native
-    "executemany with RETURNING" support and also does not support
-    ``supports_multivalues_insert``.    For MySQL/MariaDB, those MySQL
-    dialects that don't support RETURNING will not report
+    The parameter is False for the default dialect, and is set to True for
+    SQLAlchemy internal dialects SQLite, MySQL/MariaDB, PostgreSQL, SQL Server.
+    It remains at False for Oracle Database, which provides native "executemany
+    with RETURNING" support and also does not support
+    ``supports_multivalues_insert``.  For MySQL/MariaDB, those MySQL dialects
+    that don't support RETURNING will not report
     ``insert_executemany_returning`` as True.
 
     .. versionadded:: 2.0
@@ -1059,11 +1060,7 @@ class Dialect(EventTarget):
     To implement, establish as a series of tuples, as in::
 
         construct_arguments = [
-            (schema.Index, {
-                "using": False,
-                "where": None,
-                "ops": None
-            })
+            (schema.Index, {"using": False, "where": None, "ops": None}),
         ]
 
     If the above construct is established on the PostgreSQL dialect,
@@ -1092,7 +1089,8 @@ class Dialect(EventTarget):
     established on a :class:`.Table` object which will be passed as
     "reflection options" when using :paramref:`.Table.autoload_with`.
 
-    Current example is "oracle_resolve_synonyms" in the Oracle dialect.
+    Current example is "oracle_resolve_synonyms" in the Oracle Database
+    dialects.
 
     """
 
@@ -1116,7 +1114,7 @@ class Dialect(EventTarget):
     supports_constraint_comments: bool
     """Indicates if the dialect supports comment DDL on constraints.
 
-    .. versionadded: 2.0
+    .. versionadded:: 2.0
     """
 
     _has_events = False
@@ -1252,8 +1250,7 @@ class Dialect(EventTarget):
         """
         raise NotImplementedError()
 
-    @classmethod
-    def type_descriptor(cls, typeobj: TypeEngine[_T]) -> TypeEngine[_T]:
+    def type_descriptor(self, typeobj: TypeEngine[_T]) -> TypeEngine[_T]:
         """Transform a generic type to a dialect-specific type.
 
         Dialect classes will usually use the
@@ -1315,6 +1312,7 @@ class Dialect(EventTarget):
     def get_multi_columns(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1363,6 +1361,7 @@ class Dialect(EventTarget):
     def get_multi_pk_constraint(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1409,6 +1408,7 @@ class Dialect(EventTarget):
     def get_multi_foreign_keys(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1568,6 +1568,7 @@ class Dialect(EventTarget):
     def get_multi_indexes(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1614,6 +1615,7 @@ class Dialect(EventTarget):
     def get_multi_unique_constraints(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1661,6 +1663,7 @@ class Dialect(EventTarget):
     def get_multi_check_constraints(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1703,6 +1706,7 @@ class Dialect(EventTarget):
     def get_multi_table_options(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -1754,6 +1758,7 @@ class Dialect(EventTarget):
     def get_multi_table_comment(
         self,
         connection: Connection,
+        *,
         schema: Optional[str] = None,
         filter_names: Optional[Collection[str]] = None,
         **kw: Any,
@@ -2146,6 +2151,7 @@ class Dialect(EventTarget):
 
     def _deliver_insertmanyvalues_batches(
         self,
+        connection: Connection,
         cursor: DBAPICursor,
         statement: str,
         parameters: _DBAPIMultiExecuteParams,
@@ -2489,7 +2495,7 @@ class Dialect(EventTarget):
           ``REPEATABLE READ``.  isolation level names will have underscores
           converted to spaces before being passed along to the dialect.
         * The names for the four standard isolation names to the extent that
-          they are supported by the backend should be ``READ UNCOMMITTED``
+          they are supported by the backend should be ``READ UNCOMMITTED``,
           ``READ COMMITTED``, ``REPEATABLE READ``, ``SERIALIZABLE``
         * if the dialect supports an autocommit option it should be provided
           using the isolation level name ``AUTOCOMMIT``.
@@ -2675,11 +2681,14 @@ class CreateEnginePlugin:
         from sqlalchemy.engine import CreateEnginePlugin
         from sqlalchemy import event
 
+
         class LogCursorEventsPlugin(CreateEnginePlugin):
             def __init__(self, url, kwargs):
                 # consume the parameter "log_cursor_logging_name" from the
                 # URL query
-                logging_name = url.query.get("log_cursor_logging_name", "log_cursor")
+                logging_name = url.query.get(
+                    "log_cursor_logging_name", "log_cursor"
+                )
 
                 self.log = logging.getLogger(logging_name)
 
@@ -2691,7 +2700,6 @@ class CreateEnginePlugin:
                 "attach an event listener after the new Engine is constructed"
                 event.listen(engine, "before_cursor_execute", self._log_event)
 
-
             def _log_event(
                 self,
                 conn,
@@ -2699,19 +2707,19 @@ class CreateEnginePlugin:
                 statement,
                 parameters,
                 context,
-                executemany):
+                executemany,
+            ):
 
                 self.log.info("Plugin logged cursor event: %s", statement)
 
-
-
     Plugins are registered using entry points in a similar way as that
     of dialects::
 
-        entry_points={
-            'sqlalchemy.plugins': [
-                'log_cursor_plugin = myapp.plugins:LogCursorEventsPlugin'
+        entry_points = {
+            "sqlalchemy.plugins": [
+                "log_cursor_plugin = myapp.plugins:LogCursorEventsPlugin"
             ]
+        }
 
     A plugin that uses the above names would be invoked from a database
     URL as in::
@@ -2728,15 +2736,16 @@ class CreateEnginePlugin:
     in the URL::
 
         engine = create_engine(
-          "mysql+pymysql://scott:tiger@localhost/test?"
-          "plugin=plugin_one&plugin=plugin_twp&plugin=plugin_three")
+            "mysql+pymysql://scott:tiger@localhost/test?"
+            "plugin=plugin_one&plugin=plugin_twp&plugin=plugin_three"
+        )
 
     The plugin names may also be passed directly to :func:`_sa.create_engine`
     using the :paramref:`_sa.create_engine.plugins` argument::
 
         engine = create_engine(
-          "mysql+pymysql://scott:tiger@localhost/test",
-          plugins=["myplugin"])
+            "mysql+pymysql://scott:tiger@localhost/test", plugins=["myplugin"]
+        )
 
     .. versionadded:: 1.2.3  plugin names can also be specified
        to :func:`_sa.create_engine` as a list
@@ -2758,9 +2767,9 @@ class CreateEnginePlugin:
 
         class MyPlugin(CreateEnginePlugin):
             def __init__(self, url, kwargs):
-                self.my_argument_one = url.query['my_argument_one']
-                self.my_argument_two = url.query['my_argument_two']
-                self.my_argument_three = kwargs.pop('my_argument_three', None)
+                self.my_argument_one = url.query["my_argument_one"]
+                self.my_argument_two = url.query["my_argument_two"]
+                self.my_argument_three = kwargs.pop("my_argument_three", None)
 
             def update_url(self, url):
                 return url.difference_update_query(
@@ -2773,9 +2782,9 @@ class CreateEnginePlugin:
         from sqlalchemy import create_engine
 
         engine = create_engine(
-          "mysql+pymysql://scott:tiger@localhost/test?"
-          "plugin=myplugin&my_argument_one=foo&my_argument_two=bar",
-          my_argument_three='bat'
+            "mysql+pymysql://scott:tiger@localhost/test?"
+            "plugin=myplugin&my_argument_one=foo&my_argument_two=bar",
+            my_argument_three="bat",
         )
 
     .. versionchanged:: 1.4
@@ -2794,15 +2803,15 @@ class CreateEnginePlugin:
                 def __init__(self, url, kwargs):
                     if hasattr(CreateEnginePlugin, "update_url"):
                         # detect the 1.4 API
-                        self.my_argument_one = url.query['my_argument_one']
-                        self.my_argument_two = url.query['my_argument_two']
+                        self.my_argument_one = url.query["my_argument_one"]
+                        self.my_argument_two = url.query["my_argument_two"]
                     else:
                         # detect the 1.3 and earlier API - mutate the
                         # URL directly
-                        self.my_argument_one = url.query.pop('my_argument_one')
-                        self.my_argument_two = url.query.pop('my_argument_two')
+                        self.my_argument_one = url.query.pop("my_argument_one")
+                        self.my_argument_two = url.query.pop("my_argument_two")
 
-                    self.my_argument_three = kwargs.pop('my_argument_three', None)
+                    self.my_argument_three = kwargs.pop("my_argument_three", None)
 
                 def update_url(self, url):
                     # this method is only called in the 1.4 version
@@ -2977,6 +2986,9 @@ class ExecutionContext:
       inline SQL expression value was fired off.  Applies to inserts
       and updates."""
 
+    execution_options: _ExecuteOptions
+    """Execution options associated with the current statement execution"""
+
     @classmethod
     def _init_ddl(
         cls,
@@ -3370,11 +3382,14 @@ class AdaptedConnection:
 
             engine = create_async_engine(...)
 
+
             @event.listens_for(engine.sync_engine, "connect")
-            def register_custom_types(dbapi_connection, ...):
+            def register_custom_types(
+                dbapi_connection,  # ...
+            ):
                 dbapi_connection.run_async(
                     lambda connection: connection.set_type_codec(
-                        'MyCustomType', encoder, decoder, ...
+                        "MyCustomType", encoder, decoder, ...
                     )
                 )
 
diff --git a/libs/sqlalchemy/engine/mock.py b/libs/sqlalchemy/engine/mock.py
index c9fa5eb31..08dba5a64 100644
--- a/libs/sqlalchemy/engine/mock.py
+++ b/libs/sqlalchemy/engine/mock.py
@@ -1,5 +1,5 @@
 # engine/mock.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -90,10 +90,12 @@ def create_mock_engine(
 
         from sqlalchemy import create_mock_engine
 
+
         def dump(sql, *multiparams, **params):
             print(sql.compile(dialect=engine.dialect))
 
-        engine = create_mock_engine('postgresql+psycopg2://', dump)
+
+        engine = create_mock_engine("postgresql+psycopg2://", dump)
         metadata.create_all(engine, checkfirst=False)
 
     :param url: A string URL which typically needs to contain only the
diff --git a/libs/sqlalchemy/engine/processors.py b/libs/sqlalchemy/engine/processors.py
index 610e03d5a..b3f933084 100644
--- a/libs/sqlalchemy/engine/processors.py
+++ b/libs/sqlalchemy/engine/processors.py
@@ -1,5 +1,5 @@
 # engine/processors.py
-# Copyright (C) 2010-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2010-2025 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 ef1e566c2..5d754c670 100644
--- a/libs/sqlalchemy/engine/reflection.py
+++ b/libs/sqlalchemy/engine/reflection.py
@@ -1,5 +1,5 @@
 # engine/reflection.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -55,6 +55,7 @@ from .. import util
 from ..sql import operators
 from ..sql import schema as sa_schema
 from ..sql.cache_key import _ad_hoc_cache_key_from_args
+from ..sql.elements import quoted_name
 from ..sql.elements import TextClause
 from ..sql.type_api import TypeEngine
 from ..sql.visitors import InternalTraversal
@@ -89,8 +90,16 @@ def cache(
     exclude = {"info_cache", "unreflectable"}
     key = (
         fn.__name__,
-        tuple(a for a in args if isinstance(a, str)),
-        tuple((k, v) for k, v in kw.items() if k not in exclude),
+        tuple(
+            (str(a), a.quote) if isinstance(a, quoted_name) else a
+            for a in args
+            if isinstance(a, str)
+        ),
+        tuple(
+            (k, (str(v), v.quote) if isinstance(v, quoted_name) else v)
+            for k, v in kw.items()
+            if k not in exclude
+        ),
     )
     ret: _R = info_cache.get(key)
     if ret is None:
@@ -184,7 +193,8 @@ class Inspector(inspection.Inspectable["Inspector"]):
     or a :class:`_engine.Connection`::
 
         from sqlalchemy import inspect, create_engine
-        engine = create_engine('...')
+
+        engine = create_engine("...")
         insp = inspect(engine)
 
     Where above, the :class:`~sqlalchemy.engine.interfaces.Dialect` associated
@@ -621,7 +631,7 @@ class Inspector(inspection.Inspectable["Inspector"]):
         r"""Return a list of temporary table names for the current bind.
 
         This method is unsupported by most dialects; currently
-        only Oracle, PostgreSQL and SQLite implements it.
+        only Oracle Database, PostgreSQL and SQLite implements it.
 
         :param \**kw: Additional keyword argument to pass to the dialect
          specific implementation. See the documentation of the dialect
@@ -657,7 +667,7 @@ class Inspector(inspection.Inspectable["Inspector"]):
         given name was created.
 
         This currently includes some options that apply to MySQL and Oracle
-        tables.
+        Database tables.
 
         :param table_name: string name of the table.  For special quoting,
          use :class:`.quoted_name`.
@@ -1483,9 +1493,9 @@ class Inspector(inspection.Inspectable["Inspector"]):
             from sqlalchemy import create_engine, MetaData, Table
             from sqlalchemy import inspect
 
-            engine = create_engine('...')
+            engine = create_engine("...")
             meta = MetaData()
-            user_table = Table('user', meta)
+            user_table = Table("user", meta)
             insp = inspect(engine)
             insp.reflect_table(user_table, None)
 
diff --git a/libs/sqlalchemy/engine/result.py b/libs/sqlalchemy/engine/result.py
index 56b3a68bc..7411fd74f 100644
--- a/libs/sqlalchemy/engine/result.py
+++ b/libs/sqlalchemy/engine/result.py
@@ -1,5 +1,5 @@
 # engine/result.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1099,17 +1099,15 @@ class Result(_WithKeys, ResultInternal[Row[_TP]]):
             statement = select(table.c.x, table.c.y, table.c.z)
             result = connection.execute(statement)
 
-            for z, y in result.columns('z', 'y'):
-                # ...
-
+            for z, y in result.columns("z", "y"):
+                ...
 
         Example of using the column objects from the statement itself::
 
             for z, y in result.columns(
-                    statement.selected_columns.c.z,
-                    statement.selected_columns.c.y
+                statement.selected_columns.c.z, statement.selected_columns.c.y
             ):
-                # ...
+                ...
 
         .. versionadded:: 1.4
 
@@ -1452,11 +1450,11 @@ class Result(_WithKeys, ResultInternal[Row[_TP]]):
         """Return exactly one scalar result or raise an exception.
 
         This is equivalent to calling :meth:`_engine.Result.scalars` and
-        then :meth:`_engine.Result.one`.
+        then :meth:`_engine.ScalarResult.one`.
 
         .. seealso::
 
-            :meth:`_engine.Result.one`
+            :meth:`_engine.ScalarResult.one`
 
             :meth:`_engine.Result.scalars`
 
@@ -1475,11 +1473,11 @@ class Result(_WithKeys, ResultInternal[Row[_TP]]):
         """Return exactly one scalar result or ``None``.
 
         This is equivalent to calling :meth:`_engine.Result.scalars` and
-        then :meth:`_engine.Result.one_or_none`.
+        then :meth:`_engine.ScalarResult.one_or_none`.
 
         .. seealso::
 
-            :meth:`_engine.Result.one_or_none`
+            :meth:`_engine.ScalarResult.one_or_none`
 
             :meth:`_engine.Result.scalars`
 
@@ -1917,11 +1915,11 @@ class TupleResult(FilterResult[_R], util.TypingOnly):
             """Return exactly one scalar result or raise an exception.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one`.
+            and then :meth:`_engine.ScalarResult.one`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one`
+                :meth:`_engine.ScalarResult.one`
 
                 :meth:`_engine.Result.scalars`
 
@@ -1940,11 +1938,11 @@ class TupleResult(FilterResult[_R], util.TypingOnly):
             """Return exactly one or no scalar result.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one_or_none`.
+            and then :meth:`_engine.ScalarResult.one_or_none`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one_or_none`
+                :meth:`_engine.ScalarResult.one_or_none`
 
                 :meth:`_engine.Result.scalars`
 
diff --git a/libs/sqlalchemy/engine/row.py b/libs/sqlalchemy/engine/row.py
index bcaffee44..da7ae9af2 100644
--- a/libs/sqlalchemy/engine/row.py
+++ b/libs/sqlalchemy/engine/row.py
@@ -1,5 +1,5 @@
 # engine/row.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -340,12 +340,11 @@ class RowMapping(BaseRow, typing.Mapping["_KeyType", Any]):
     as iteration of keys, values, and items::
 
         for row in result:
-            if 'a' in row._mapping:
-                print("Column 'a': %s" % row._mapping['a'])
+            if "a" in row._mapping:
+                print("Column 'a': %s" % row._mapping["a"])
 
             print("Column b: %s" % row._mapping[table.c.b])
 
-
     .. versionadded:: 1.4 The :class:`.RowMapping` object replaces the
        mapping-like access previously provided by a database result row,
        which now seeks to behave mostly like a named tuple.
diff --git a/libs/sqlalchemy/engine/strategies.py b/libs/sqlalchemy/engine/strategies.py
index 30c331e8d..5dd7bca9a 100644
--- a/libs/sqlalchemy/engine/strategies.py
+++ b/libs/sqlalchemy/engine/strategies.py
@@ -1,5 +1,5 @@
 # engine/strategies.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/url.py b/libs/sqlalchemy/engine/url.py
index 1eeb73a23..bb004f11c 100644
--- a/libs/sqlalchemy/engine/url.py
+++ b/libs/sqlalchemy/engine/url.py
@@ -1,5 +1,5 @@
 # engine/url.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -122,7 +122,9 @@ class URL(NamedTuple):
        for keys and either strings or tuples of strings for values, e.g.::
 
             >>> from sqlalchemy.engine import make_url
-            >>> url = make_url("postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt")
+            >>> url = make_url(
+            ...     "postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt"
+            ... )
             >>> url.query
             immutabledict({'alt_host': ('host1', 'host2'), 'ssl_cipher': '/path/to/crt'})
 
@@ -371,7 +373,9 @@ class URL(NamedTuple):
 
             >>> from sqlalchemy.engine import make_url
             >>> url = make_url("postgresql+psycopg2://user:pass@host/dbname")
-            >>> url = url.update_query_string("alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt")
+            >>> url = url.update_query_string(
+            ...     "alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt"
+            ... )
             >>> str(url)
             'postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt'
 
@@ -407,7 +411,13 @@ class URL(NamedTuple):
 
             >>> from sqlalchemy.engine import make_url
             >>> url = make_url("postgresql+psycopg2://user:pass@host/dbname")
-            >>> url = url.update_query_pairs([("alt_host", "host1"), ("alt_host", "host2"), ("ssl_cipher", "/path/to/crt")])
+            >>> url = url.update_query_pairs(
+            ...     [
+            ...         ("alt_host", "host1"),
+            ...         ("alt_host", "host2"),
+            ...         ("ssl_cipher", "/path/to/crt"),
+            ...     ]
+            ... )
             >>> str(url)
             'postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt'
 
@@ -489,7 +499,9 @@ class URL(NamedTuple):
 
             >>> from sqlalchemy.engine import make_url
             >>> url = make_url("postgresql+psycopg2://user:pass@host/dbname")
-            >>> url = url.update_query_dict({"alt_host": ["host1", "host2"], "ssl_cipher": "/path/to/crt"})
+            >>> url = url.update_query_dict(
+            ...     {"alt_host": ["host1", "host2"], "ssl_cipher": "/path/to/crt"}
+            ... )
             >>> str(url)
             'postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt'
 
@@ -527,14 +539,14 @@ class URL(NamedTuple):
 
         E.g.::
 
-            url = url.difference_update_query(['foo', 'bar'])
+            url = url.difference_update_query(["foo", "bar"])
 
         Equivalent to using :meth:`_engine.URL.set` as follows::
 
             url = url.set(
                 query={
                     key: url.query[key]
-                    for key in set(url.query).difference(['foo', 'bar'])
+                    for key in set(url.query).difference(["foo", "bar"])
                 }
             )
 
@@ -583,7 +595,9 @@ class URL(NamedTuple):
 
 
             >>> from sqlalchemy.engine import make_url
-            >>> url = make_url("postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt")
+            >>> url = make_url(
+            ...     "postgresql+psycopg2://user:pass@host/dbname?alt_host=host1&alt_host=host2&ssl_cipher=%2Fpath%2Fto%2Fcrt"
+            ... )
             >>> url.query
             immutabledict({'alt_host': ('host1', 'host2'), 'ssl_cipher': '/path/to/crt'})
             >>> url.normalized_query
diff --git a/libs/sqlalchemy/engine/util.py b/libs/sqlalchemy/engine/util.py
index 3d95ac586..e499efa91 100644
--- a/libs/sqlalchemy/engine/util.py
+++ b/libs/sqlalchemy/engine/util.py
@@ -1,5 +1,5 @@
 # engine/util.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -17,6 +17,7 @@ from .. import exc
 from .. import util
 from ..util._has_cy import HAS_CYEXTENSION
 from ..util.typing import Protocol
+from ..util.typing import Self
 
 if typing.TYPE_CHECKING or not HAS_CYEXTENSION:
     from ._py_util import _distill_params_20 as _distill_params_20
@@ -113,7 +114,7 @@ class TransactionalContext:
                     "before emitting further commands."
                 )
 
-    def __enter__(self) -> TransactionalContext:
+    def __enter__(self) -> Self:
         subject = self._get_subject()
 
         # none for outer transaction, may be non-None for nested
diff --git a/libs/sqlalchemy/event/__init__.py b/libs/sqlalchemy/event/__init__.py
index 9b54f07fc..309b7bd33 100644
--- a/libs/sqlalchemy/event/__init__.py
+++ b/libs/sqlalchemy/event/__init__.py
@@ -1,5 +1,5 @@
 # event/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/event/api.py b/libs/sqlalchemy/event/api.py
index 4a39d10f4..b6ec8f6d3 100644
--- a/libs/sqlalchemy/event/api.py
+++ b/libs/sqlalchemy/event/api.py
@@ -1,5 +1,5 @@
 # event/api.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -51,15 +51,14 @@ def listen(
         from sqlalchemy import event
         from sqlalchemy.schema import UniqueConstraint
 
+
         def unique_constraint_name(const, table):
-            const.name = "uq_%s_%s" % (
-                table.name,
-                list(const.columns)[0].name
-            )
+            const.name = "uq_%s_%s" % (table.name, list(const.columns)[0].name)
+
+
         event.listen(
-                UniqueConstraint,
-                "after_parent_attach",
-                unique_constraint_name)
+            UniqueConstraint, "after_parent_attach", unique_constraint_name
+        )
 
     :param bool insert: The default behavior for event handlers is to append
       the decorated user defined function to an internal list of registered
@@ -132,19 +131,17 @@ def listens_for(
     The :func:`.listens_for` decorator is part of the primary interface for the
     SQLAlchemy event system, documented at :ref:`event_toplevel`.
 
-    This function generally shares the same kwargs as :func:`.listens`.
+    This function generally shares the same kwargs as :func:`.listen`.
 
     e.g.::
 
         from sqlalchemy import event
         from sqlalchemy.schema import UniqueConstraint
 
+
         @event.listens_for(UniqueConstraint, "after_parent_attach")
         def unique_constraint_name(const, table):
-            const.name = "uq_%s_%s" % (
-                table.name,
-                list(const.columns)[0].name
-            )
+            const.name = "uq_%s_%s" % (table.name, list(const.columns)[0].name)
 
     A given function can also be invoked for only the first invocation
     of the event using the ``once`` argument::
@@ -153,7 +150,6 @@ def listens_for(
         def on_config():
             do_config()
 
-
     .. warning:: The ``once`` argument does not imply automatic de-registration
        of the listener function after it has been invoked a first time; a
        listener entry will remain associated with the target object.
@@ -189,6 +185,7 @@ def remove(target: Any, identifier: str, fn: Callable[..., Any]) -> None:
         def my_listener_function(*arg):
             pass
 
+
         # ... it's removed like this
         event.remove(SomeMappedClass, "before_insert", my_listener_function)
 
diff --git a/libs/sqlalchemy/event/attr.py b/libs/sqlalchemy/event/attr.py
index ef2b334d1..ec5d5822f 100644
--- a/libs/sqlalchemy/event/attr.py
+++ b/libs/sqlalchemy/event/attr.py
@@ -1,5 +1,5 @@
 # event/attr.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/event/base.py b/libs/sqlalchemy/event/base.py
index 1f52e2eb7..a73e86bd2 100644
--- a/libs/sqlalchemy/event/base.py
+++ b/libs/sqlalchemy/event/base.py
@@ -1,5 +1,5 @@
 # event/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -191,13 +191,8 @@ class _Dispatch(_DispatchCommon[_ET]):
         :class:`._Dispatch` objects.
 
         """
-        if "_joined_dispatch_cls" not in self.__class__.__dict__:
-            cls = type(
-                "Joined%s" % self.__class__.__name__,
-                (_JoinedDispatcher,),
-                {"__slots__": self._event_names},
-            )
-            self.__class__._joined_dispatch_cls = cls
+        assert "_joined_dispatch_cls" in self.__class__.__dict__
+
         return self._joined_dispatch_cls(self, other)
 
     def __reduce__(self) -> Union[str, Tuple[Any, ...]]:
@@ -328,6 +323,51 @@ class _HasEventsDispatch(Generic[_ET]):
             else:
                 dispatch_target_cls.dispatch = dispatcher(cls)
 
+        klass = type(
+            "Joined%s" % dispatch_cls.__name__,
+            (_JoinedDispatcher,),
+            {"__slots__": event_names},
+        )
+        dispatch_cls._joined_dispatch_cls = klass
+
+        # establish pickle capability by adding it to this module
+        globals()[klass.__name__] = klass
+
+
+class _JoinedDispatcher(_DispatchCommon[_ET]):
+    """Represent a connection between two _Dispatch objects."""
+
+    __slots__ = "local", "parent", "_instance_cls"
+
+    local: _DispatchCommon[_ET]
+    parent: _DispatchCommon[_ET]
+    _instance_cls: Optional[Type[_ET]]
+
+    def __init__(
+        self, local: _DispatchCommon[_ET], parent: _DispatchCommon[_ET]
+    ):
+        self.local = local
+        self.parent = parent
+        self._instance_cls = self.local._instance_cls
+
+    def __reduce__(self) -> Any:
+        return (self.__class__, (self.local, self.parent))
+
+    def __getattr__(self, name: str) -> _JoinedListener[_ET]:
+        # Assign _JoinedListeners as attributes on demand
+        # to reduce startup time for new dispatch objects.
+        ls = getattr(self.local, name)
+        jl = _JoinedListener(self.parent, ls.name, ls)
+        setattr(self, ls.name, jl)
+        return jl
+
+    def _listen(self, event_key: _EventKey[_ET], **kw: Any) -> None:
+        return self.parent._listen(event_key, **kw)
+
+    @property
+    def _events(self) -> Type[_HasEventsDispatch[_ET]]:
+        return self.parent._events
+
 
 class Events(_HasEventsDispatch[_ET]):
     """Define event listening functions for a particular target type."""
@@ -382,38 +422,6 @@ class Events(_HasEventsDispatch[_ET]):
         cls.dispatch._clear()
 
 
-class _JoinedDispatcher(_DispatchCommon[_ET]):
-    """Represent a connection between two _Dispatch objects."""
-
-    __slots__ = "local", "parent", "_instance_cls"
-
-    local: _DispatchCommon[_ET]
-    parent: _DispatchCommon[_ET]
-    _instance_cls: Optional[Type[_ET]]
-
-    def __init__(
-        self, local: _DispatchCommon[_ET], parent: _DispatchCommon[_ET]
-    ):
-        self.local = local
-        self.parent = parent
-        self._instance_cls = self.local._instance_cls
-
-    def __getattr__(self, name: str) -> _JoinedListener[_ET]:
-        # Assign _JoinedListeners as attributes on demand
-        # to reduce startup time for new dispatch objects.
-        ls = getattr(self.local, name)
-        jl = _JoinedListener(self.parent, ls.name, ls)
-        setattr(self, ls.name, jl)
-        return jl
-
-    def _listen(self, event_key: _EventKey[_ET], **kw: Any) -> None:
-        return self.parent._listen(event_key, **kw)
-
-    @property
-    def _events(self) -> Type[_HasEventsDispatch[_ET]]:
-        return self.parent._events
-
-
 class dispatcher(Generic[_ET]):
     """Descriptor used by target classes to
     deliver the _Dispatch class at the class level
diff --git a/libs/sqlalchemy/event/legacy.py b/libs/sqlalchemy/event/legacy.py
index 57e561c39..e60fd9a5e 100644
--- a/libs/sqlalchemy/event/legacy.py
+++ b/libs/sqlalchemy/event/legacy.py
@@ -1,5 +1,5 @@
 # event/legacy.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/event/registry.py b/libs/sqlalchemy/event/registry.py
index 773620f8b..d7e4b3215 100644
--- a/libs/sqlalchemy/event/registry.py
+++ b/libs/sqlalchemy/event/registry.py
@@ -1,5 +1,5 @@
 # event/registry.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -154,7 +154,11 @@ def _removed_from_collection(
 
     if owner_ref in _collection_to_key:
         listener_to_key = _collection_to_key[owner_ref]
-        listener_to_key.pop(listen_ref)
+        # see #12216 - this guards against a removal that already occurred
+        # here. however, I cannot come up with a test that shows any negative
+        # side effects occurring from this removal happening, even though an
+        # event key may still be referenced from a clsleveldispatch here
+        listener_to_key.pop(listen_ref, None)
 
 
 def _stored_in_collection_multi(
diff --git a/libs/sqlalchemy/events.py b/libs/sqlalchemy/events.py
index 8c3bf01cf..ce8324395 100644
--- a/libs/sqlalchemy/events.py
+++ b/libs/sqlalchemy/events.py
@@ -1,5 +1,5 @@
 # events.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 7d7eff360..71e5dd81e 100644
--- a/libs/sqlalchemy/exc.py
+++ b/libs/sqlalchemy/exc.py
@@ -1,5 +1,5 @@
 # exc.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -432,14 +432,16 @@ class DontWrapMixin:
 
         from sqlalchemy.exc import DontWrapMixin
 
+
         class MyCustomException(Exception, DontWrapMixin):
             pass
 
+
         class MySpecialType(TypeDecorator):
             impl = String
 
             def process_bind_param(self, value, dialect):
-                if value == 'invalid':
+                if value == "invalid":
                     raise MyCustomException("invalid!")
 
     """
diff --git a/libs/sqlalchemy/ext/__init__.py b/libs/sqlalchemy/ext/__init__.py
index f03ed945f..2751bcf93 100644
--- a/libs/sqlalchemy/ext/__init__.py
+++ b/libs/sqlalchemy/ext/__init__.py
@@ -1,5 +1,5 @@
 # ext/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 80e6fdac9..8f2c19b87 100644
--- a/libs/sqlalchemy/ext/associationproxy.py
+++ b/libs/sqlalchemy/ext/associationproxy.py
@@ -1,5 +1,5 @@
 # ext/associationproxy.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -98,6 +98,7 @@ def association_proxy(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
 ) -> AssociationProxy[Any]:
     r"""Return a Python property implementing a view of a target
     attribute which references an attribute on members of the
@@ -198,6 +199,13 @@ def association_proxy(
 
      .. versionadded:: 2.0.0b4
 
+    :param hash: Specific to
+     :ref:`orm_declarative_native_dataclasses`, controls if this field
+     is included when generating the ``__hash__()`` method for the mapped
+     class.
+
+     .. versionadded:: 2.0.36
+
     :param info: optional, will be assigned to
      :attr:`.AssociationProxy.info` if present.
 
@@ -237,7 +245,7 @@ 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
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
     )
 
@@ -450,7 +458,7 @@ class AssociationProxy(
             class User(Base):
                 # ...
 
-                keywords = association_proxy('kws', 'keyword')
+                keywords = association_proxy("kws", "keyword")
 
         If we access this :class:`.AssociationProxy` from
         :attr:`_orm.Mapper.all_orm_descriptors`, and we want to view the
@@ -770,9 +778,9 @@ class AssociationProxyInstance(SQLORMOperations[_T]):
         :attr:`.AssociationProxyInstance.remote_attr` attributes separately::
 
             stmt = (
-                select(Parent).
-                join(Parent.proxied.local_attr).
-                join(Parent.proxied.remote_attr)
+                select(Parent)
+                .join(Parent.proxied.local_attr)
+                .join(Parent.proxied.remote_attr)
             )
 
         A future release may seek to provide a more succinct join pattern
diff --git a/libs/sqlalchemy/ext/asyncio/__init__.py b/libs/sqlalchemy/ext/asyncio/__init__.py
index 78c707b26..7d8a04bd7 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 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 9899364d1..b53d53b1a 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -224,7 +224,9 @@ def asyncstartablecontext(
     ``@contextlib.asynccontextmanager`` supports, and the usage pattern
     is different as well.
 
-    Typical usage::
+    Typical usage:
+
+    .. sourcecode:: text
 
         @asyncstartablecontext
         async def some_async_generator(<arguments>):
diff --git a/libs/sqlalchemy/ext/asyncio/engine.py b/libs/sqlalchemy/ext/asyncio/engine.py
index 3c718fad3..2c9b499f5 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -41,6 +41,8 @@ from ...engine.base import NestedTransaction
 from ...engine.base import Transaction
 from ...exc import ArgumentError
 from ...util.concurrency import greenlet_spawn
+from ...util.typing import Concatenate
+from ...util.typing import ParamSpec
 
 if TYPE_CHECKING:
     from ...engine.cursor import CursorResult
@@ -61,6 +63,7 @@ if TYPE_CHECKING:
     from ...sql.base import Executable
     from ...sql.selectable import TypedReturnsRows
 
+_P = ParamSpec("_P")
 _T = TypeVar("_T", bound=Any)
 
 
@@ -195,6 +198,7 @@ class AsyncConnection(
     method of :class:`_asyncio.AsyncEngine`::
 
         from sqlalchemy.ext.asyncio import create_async_engine
+
         engine = create_async_engine("postgresql+asyncpg://user:pass@host/dbname")
 
         async with engine.connect() as conn:
@@ -414,6 +418,7 @@ class AsyncConnection(
         yield_per: int = ...,
         insertmanyvalues_page_size: int = ...,
         schema_translate_map: Optional[SchemaTranslateMapType] = ...,
+        preserve_rowcount: bool = False,
         **opt: Any,
     ) -> AsyncConnection: ...
 
@@ -540,7 +545,7 @@ class AsyncConnection(
 
         E.g.::
 
-            result = await conn.stream(stmt):
+            result = await conn.stream(stmt)
             async for row in result:
                 print(f"{row}")
 
@@ -812,9 +817,12 @@ class AsyncConnection(
             yield result.scalars()
 
     async def run_sync(
-        self, fn: Callable[..., _T], *arg: Any, **kw: Any
+        self,
+        fn: Callable[Concatenate[Connection, _P], _T],
+        *arg: _P.args,
+        **kw: _P.kwargs,
     ) -> _T:
-        """Invoke the given synchronous (i.e. not async) callable,
+        '''Invoke the given synchronous (i.e. not async) callable,
         passing a synchronous-style :class:`_engine.Connection` as the first
         argument.
 
@@ -824,26 +832,26 @@ class AsyncConnection(
         E.g.::
 
             def do_something_with_core(conn: Connection, arg1: int, arg2: str) -> str:
-                '''A synchronous function that does not require awaiting
+                """A synchronous function that does not require awaiting
 
                 :param conn: a Core SQLAlchemy Connection, used synchronously
 
                 :return: an optional return value is supported
 
-                '''
-                conn.execute(
-                    some_table.insert().values(int_col=arg1, str_col=arg2)
-                )
+                """
+                conn.execute(some_table.insert().values(int_col=arg1, str_col=arg2))
                 return "success"
 
 
             async def do_something_async(async_engine: AsyncEngine) -> None:
-                '''an async function that uses awaiting'''
+                """an async function that uses awaiting"""
 
                 async with async_engine.begin() as async_conn:
                     # run do_something_with_core() with a sync-style
                     # Connection, proxied into an awaitable
-                    return_code = await async_conn.run_sync(do_something_with_core, 5, "strval")
+                    return_code = await async_conn.run_sync(
+                        do_something_with_core, 5, "strval"
+                    )
                     print(return_code)
 
         This method maintains the asyncio event loop all the way through
@@ -874,9 +882,11 @@ class AsyncConnection(
 
             :ref:`session_run_sync`
 
-        """  # noqa: E501
+        '''  # noqa: E501
 
-        return await greenlet_spawn(fn, self._proxied, *arg, **kw)
+        return await greenlet_spawn(
+            fn, self._proxied, *arg, _require_await=False, **kw
+        )
 
     def __await__(self) -> Generator[Any, None, AsyncConnection]:
         return self.start().__await__()
@@ -921,7 +931,7 @@ class AsyncConnection(
         return self._proxied.invalidated
 
     @property
-    def dialect(self) -> Any:
+    def dialect(self) -> Dialect:
         r"""Proxy for the :attr:`_engine.Connection.dialect` attribute
         on behalf of the :class:`_asyncio.AsyncConnection` class.
 
@@ -930,7 +940,7 @@ class AsyncConnection(
         return self._proxied.dialect
 
     @dialect.setter
-    def dialect(self, attr: Any) -> None:
+    def dialect(self, attr: Dialect) -> None:
         self._proxied.dialect = attr
 
     @property
@@ -991,6 +1001,7 @@ class AsyncEngine(ProxyComparable[Engine], AsyncConnectable):
     :func:`_asyncio.create_async_engine` function::
 
         from sqlalchemy.ext.asyncio import create_async_engine
+
         engine = create_async_engine("postgresql+asyncpg://user:pass@host/dbname")
 
     .. versionadded:: 1.4
@@ -1047,7 +1058,6 @@ class AsyncEngine(ProxyComparable[Engine], AsyncConnectable):
                 )
                 await conn.execute(text("my_special_procedure(5)"))
 
-
         """
         conn = self.connect()
 
diff --git a/libs/sqlalchemy/ext/asyncio/exc.py b/libs/sqlalchemy/ext/asyncio/exc.py
index 1cf6f3638..558187c0b 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 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 7dcbe3280..c51e166d9 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -333,11 +333,11 @@ class AsyncResult(_WithKeys, AsyncCommon[Row[_TP]]):
         """Return exactly one scalar result or raise an exception.
 
         This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
-        then :meth:`_asyncio.AsyncResult.one`.
+        then :meth:`_asyncio.AsyncScalarResult.one`.
 
         .. seealso::
 
-            :meth:`_asyncio.AsyncResult.one`
+            :meth:`_asyncio.AsyncScalarResult.one`
 
             :meth:`_asyncio.AsyncResult.scalars`
 
@@ -356,11 +356,11 @@ class AsyncResult(_WithKeys, AsyncCommon[Row[_TP]]):
         """Return exactly one scalar result or ``None``.
 
         This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
-        then :meth:`_asyncio.AsyncResult.one_or_none`.
+        then :meth:`_asyncio.AsyncScalarResult.one_or_none`.
 
         .. seealso::
 
-            :meth:`_asyncio.AsyncResult.one_or_none`
+            :meth:`_asyncio.AsyncScalarResult.one_or_none`
 
             :meth:`_asyncio.AsyncResult.scalars`
 
@@ -869,11 +869,11 @@ class AsyncTupleResult(AsyncCommon[_R], util.TypingOnly):
             """Return exactly one scalar result or raise an exception.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one`.
+            and then :meth:`_engine.AsyncScalarResult.one`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one`
+                :meth:`_engine.AsyncScalarResult.one`
 
                 :meth:`_engine.Result.scalars`
 
@@ -892,11 +892,11 @@ class AsyncTupleResult(AsyncCommon[_R], util.TypingOnly):
             """Return exactly one or no scalar result.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one_or_none`.
+            and then :meth:`_engine.AsyncScalarResult.one_or_none`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one_or_none`
+                :meth:`_engine.AsyncScalarResult.one_or_none`
 
                 :meth:`_engine.Result.scalars`
 
diff --git a/libs/sqlalchemy/ext/asyncio/scoping.py b/libs/sqlalchemy/ext/asyncio/scoping.py
index e879a1654..7ecab37b4 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -364,7 +364,7 @@ class async_scoped_session(Generic[_AS]):
         object is entered::
 
             async with async_session.begin():
-                # .. ORM transaction is begun
+                ...  # ORM transaction is begun
 
         Note that database IO will not normally occur when the session-level
         transaction is begun, as database transactions begin on an
@@ -808,28 +808,28 @@ class async_scoped_session(Generic[_AS]):
 
             # construct async engines w/ async drivers
             engines = {
-                'leader':create_async_engine("sqlite+aiosqlite:///leader.db"),
-                'other':create_async_engine("sqlite+aiosqlite:///other.db"),
-                'follower1':create_async_engine("sqlite+aiosqlite:///follower1.db"),
-                'follower2':create_async_engine("sqlite+aiosqlite:///follower2.db"),
+                "leader": create_async_engine("sqlite+aiosqlite:///leader.db"),
+                "other": create_async_engine("sqlite+aiosqlite:///other.db"),
+                "follower1": create_async_engine("sqlite+aiosqlite:///follower1.db"),
+                "follower2": create_async_engine("sqlite+aiosqlite:///follower2.db"),
             }
 
+
             class RoutingSession(Session):
                 def get_bind(self, mapper=None, clause=None, **kw):
                     # within get_bind(), return sync engines
                     if mapper and issubclass(mapper.class_, MyOtherClass):
-                        return engines['other'].sync_engine
+                        return engines["other"].sync_engine
                     elif self._flushing or isinstance(clause, (Update, Delete)):
-                        return engines['leader'].sync_engine
+                        return engines["leader"].sync_engine
                     else:
                         return engines[
-                            random.choice(['follower1','follower2'])
+                            random.choice(["follower1", "follower2"])
                         ].sync_engine
 
+
             # apply to AsyncSession using sync_session_class
-            AsyncSessionMaker = async_sessionmaker(
-                sync_session_class=RoutingSession
-            )
+            AsyncSessionMaker = async_sessionmaker(sync_session_class=RoutingSession)
 
         The :meth:`_orm.Session.get_bind` method is called in a non-asyncio,
         implicitly non-blocking context in the same manner as ORM event hooks
@@ -864,7 +864,7 @@ class async_scoped_session(Generic[_AS]):
 
         This method retrieves the history for each instrumented
         attribute on the instance and performs a comparison of the current
-        value to its previously committed value, if any.
+        value to its previously flushed or committed value, if any.
 
         It is in effect a more expensive and accurate
         version of checking for the given instance in the
diff --git a/libs/sqlalchemy/ext/asyncio/session.py b/libs/sqlalchemy/ext/asyncio/session.py
index a9ea55e49..bb276943c 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -38,6 +38,9 @@ from ...orm import Session
 from ...orm import SessionTransaction
 from ...orm import state as _instance_state
 from ...util.concurrency import greenlet_spawn
+from ...util.typing import Concatenate
+from ...util.typing import ParamSpec
+
 
 if TYPE_CHECKING:
     from .engine import AsyncConnection
@@ -71,6 +74,7 @@ if TYPE_CHECKING:
 
 _AsyncSessionBind = Union["AsyncEngine", "AsyncConnection"]
 
+_P = ParamSpec("_P")
 _T = TypeVar("_T", bound=Any)
 
 
@@ -332,9 +336,12 @@ class AsyncSession(ReversibleProxy[Session]):
         )
 
     async def run_sync(
-        self, fn: Callable[..., _T], *arg: Any, **kw: Any
+        self,
+        fn: Callable[Concatenate[Session, _P], _T],
+        *arg: _P.args,
+        **kw: _P.kwargs,
     ) -> _T:
-        """Invoke the given synchronous (i.e. not async) callable,
+        '''Invoke the given synchronous (i.e. not async) callable,
         passing a synchronous-style :class:`_orm.Session` as the first
         argument.
 
@@ -344,25 +351,27 @@ class AsyncSession(ReversibleProxy[Session]):
         E.g.::
 
             def some_business_method(session: Session, param: str) -> str:
-                '''A synchronous function that does not require awaiting
+                """A synchronous function that does not require awaiting
 
                 :param session: a SQLAlchemy Session, used synchronously
 
                 :return: an optional return value is supported
 
-                '''
+                """
                 session.add(MyObject(param=param))
                 session.flush()
                 return "success"
 
 
             async def do_something_async(async_engine: AsyncEngine) -> None:
-                '''an async function that uses awaiting'''
+                """an async function that uses awaiting"""
 
                 with AsyncSession(async_engine) as async_session:
                     # run some_business_method() with a sync-style
                     # Session, proxied into an awaitable
-                    return_code = await async_session.run_sync(some_business_method, param="param1")
+                    return_code = await async_session.run_sync(
+                        some_business_method, param="param1"
+                    )
                     print(return_code)
 
         This method maintains the asyncio event loop all the way through
@@ -384,9 +393,11 @@ class AsyncSession(ReversibleProxy[Session]):
             :meth:`.AsyncConnection.run_sync`
 
             :ref:`session_run_sync`
-        """  # noqa: E501
+        '''  # noqa: E501
 
-        return await greenlet_spawn(fn, self.sync_session, *arg, **kw)
+        return await greenlet_spawn(
+            fn, self.sync_session, *arg, _require_await=False, **kw
+        )
 
     @overload
     async def execute(
@@ -868,28 +879,28 @@ class AsyncSession(ReversibleProxy[Session]):
 
             # construct async engines w/ async drivers
             engines = {
-                'leader':create_async_engine("sqlite+aiosqlite:///leader.db"),
-                'other':create_async_engine("sqlite+aiosqlite:///other.db"),
-                'follower1':create_async_engine("sqlite+aiosqlite:///follower1.db"),
-                'follower2':create_async_engine("sqlite+aiosqlite:///follower2.db"),
+                "leader": create_async_engine("sqlite+aiosqlite:///leader.db"),
+                "other": create_async_engine("sqlite+aiosqlite:///other.db"),
+                "follower1": create_async_engine("sqlite+aiosqlite:///follower1.db"),
+                "follower2": create_async_engine("sqlite+aiosqlite:///follower2.db"),
             }
 
+
             class RoutingSession(Session):
                 def get_bind(self, mapper=None, clause=None, **kw):
                     # within get_bind(), return sync engines
                     if mapper and issubclass(mapper.class_, MyOtherClass):
-                        return engines['other'].sync_engine
+                        return engines["other"].sync_engine
                     elif self._flushing or isinstance(clause, (Update, Delete)):
-                        return engines['leader'].sync_engine
+                        return engines["leader"].sync_engine
                     else:
                         return engines[
-                            random.choice(['follower1','follower2'])
+                            random.choice(["follower1", "follower2"])
                         ].sync_engine
 
+
             # apply to AsyncSession using sync_session_class
-            AsyncSessionMaker = async_sessionmaker(
-                sync_session_class=RoutingSession
-            )
+            AsyncSessionMaker = async_sessionmaker(sync_session_class=RoutingSession)
 
         The :meth:`_orm.Session.get_bind` method is called in a non-asyncio,
         implicitly non-blocking context in the same manner as ORM event hooks
@@ -945,7 +956,7 @@ class AsyncSession(ReversibleProxy[Session]):
         object is entered::
 
             async with async_session.begin():
-                # .. ORM transaction is begun
+                ...  # ORM transaction is begun
 
         Note that database IO will not normally occur when the session-level
         transaction is begun, as database transactions begin on an
@@ -1298,7 +1309,7 @@ class AsyncSession(ReversibleProxy[Session]):
 
         This method retrieves the history for each instrumented
         attribute on the instance and performs a comparison of the current
-        value to its previously committed value, if any.
+        value to its previously flushed or committed value, if any.
 
         It is in effect a more expensive and accurate
         version of checking for the given instance in the
@@ -1622,16 +1633,22 @@ class async_sessionmaker(Generic[_AS]):
         from sqlalchemy.ext.asyncio import AsyncSession
         from sqlalchemy.ext.asyncio import async_sessionmaker
 
-        async def run_some_sql(async_session: async_sessionmaker[AsyncSession]) -> None:
+
+        async def run_some_sql(
+            async_session: async_sessionmaker[AsyncSession],
+        ) -> None:
             async with async_session() as session:
                 session.add(SomeObject(data="object"))
                 session.add(SomeOtherObject(name="other object"))
                 await session.commit()
 
+
         async def main() -> None:
             # an AsyncEngine, which the AsyncSession will use for connection
             # resources
-            engine = create_async_engine('postgresql+asyncpg://scott:tiger@localhost/')
+            engine = create_async_engine(
+                "postgresql+asyncpg://scott:tiger@localhost/"
+            )
 
             # create a reusable factory for new AsyncSession instances
             async_session = async_sessionmaker(engine)
@@ -1730,7 +1747,6 @@ class async_sessionmaker(Generic[_AS]):
 
                 # commits transaction, closes session
 
-
         """
 
         session = self()
@@ -1763,7 +1779,7 @@ class async_sessionmaker(Generic[_AS]):
 
             AsyncSession = async_sessionmaker(some_engine)
 
-            AsyncSession.configure(bind=create_async_engine('sqlite+aiosqlite://'))
+            AsyncSession.configure(bind=create_async_engine("sqlite+aiosqlite://"))
         """  # noqa E501
 
         self.kw.update(new_kw)
@@ -1854,7 +1870,7 @@ class AsyncSessionTransaction(
     ) -> AsyncSessionTransaction:
         self.sync_transaction = self._assign_proxied(
             await greenlet_spawn(
-                self.session.sync_session.begin_nested  # type: ignore
+                self.session.sync_session.begin_nested
                 if self.nested
                 else self.session.sync_session.begin
             )
diff --git a/libs/sqlalchemy/ext/automap.py b/libs/sqlalchemy/ext/automap.py
index 7d1f92534..817f91d26 100644
--- a/libs/sqlalchemy/ext/automap.py
+++ b/libs/sqlalchemy/ext/automap.py
@@ -1,5 +1,5 @@
 # ext/automap.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -11,7 +11,7 @@ schema, typically though not necessarily one which is reflected.
 
 It is hoped that the :class:`.AutomapBase` system provides a quick
 and modernized solution to the problem that the very famous
-`SQLSoup <https://sqlsoup.readthedocs.io/en/latest/>`_
+`SQLSoup <https://pypi.org/project/sqlsoup/>`_
 also tries to solve, that of generating a quick and rudimentary object
 model from an existing database on the fly.  By addressing the issue strictly
 at the mapper configuration level, and integrating fully with existing
@@ -64,7 +64,7 @@ asking it to reflect the schema and produce mappings::
     # collection-based relationships are by default named
     # "<classname>_collection"
     u1 = session.query(User).first()
-    print (u1.address_collection)
+    print(u1.address_collection)
 
 Above, calling :meth:`.AutomapBase.prepare` while passing along the
 :paramref:`.AutomapBase.prepare.reflect` parameter indicates that the
@@ -101,6 +101,7 @@ explicit table declaration::
 
     from sqlalchemy import create_engine, MetaData, Table, Column, ForeignKey
     from sqlalchemy.ext.automap import automap_base
+
     engine = create_engine("sqlite:///mydatabase.db")
 
     # produce our own MetaData object
@@ -108,13 +109,15 @@ explicit table declaration::
 
     # we can reflect it ourselves from a database, using options
     # such as 'only' to limit what tables we look at...
-    metadata.reflect(engine, only=['user', 'address'])
+    metadata.reflect(engine, only=["user", "address"])
 
     # ... or just define our own Table objects with it (or combine both)
-    Table('user_order', metadata,
-                    Column('id', Integer, primary_key=True),
-                    Column('user_id', ForeignKey('user.id'))
-                )
+    Table(
+        "user_order",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column("user_id", ForeignKey("user.id")),
+    )
 
     # we can then produce a set of mappings from this MetaData.
     Base = automap_base(metadata=metadata)
@@ -123,8 +126,9 @@ explicit table declaration::
     Base.prepare()
 
     # mapped classes are ready
-    User, Address, Order = Base.classes.user, Base.classes.address,\
-        Base.classes.user_order
+    User = Base.classes.user
+    Address = Base.classes.address
+    Order = Base.classes.user_order
 
 .. _automap_by_module:
 
@@ -177,18 +181,23 @@ the schema name ``default`` is used if no schema is present::
 
     Base.metadata.create_all(e)
 
+
     def module_name_for_table(cls, tablename, table):
         if table.schema is not None:
             return f"mymodule.{table.schema}"
         else:
             return f"mymodule.default"
 
+
     Base = automap_base()
 
     Base.prepare(e, modulename_for_table=module_name_for_table)
-    Base.prepare(e, schema="test_schema", modulename_for_table=module_name_for_table)
-    Base.prepare(e, schema="test_schema_2", modulename_for_table=module_name_for_table)
-
+    Base.prepare(
+        e, schema="test_schema", modulename_for_table=module_name_for_table
+    )
+    Base.prepare(
+        e, schema="test_schema_2", modulename_for_table=module_name_for_table
+    )
 
 The same named-classes are organized into a hierarchical collection available
 at :attr:`.AutomapBase.by_module`.  This collection is traversed using the
@@ -251,12 +260,13 @@ established based on the table name we use.  If our schema contains tables
     # automap base
     Base = automap_base()
 
+
     # pre-declare User for the 'user' table
     class User(Base):
-        __tablename__ = 'user'
+        __tablename__ = "user"
 
         # override schema elements like Columns
-        user_name = Column('name', String)
+        user_name = Column("name", String)
 
         # override relationships too, if desired.
         # we must use the same name that automap would use for the
@@ -264,6 +274,7 @@ established based on the table name we use.  If our schema contains tables
         # generate for "address"
         address_collection = relationship("address", collection_class=set)
 
+
     # reflect
     engine = create_engine("sqlite:///mydatabase.db")
     Base.prepare(autoload_with=engine)
@@ -274,11 +285,11 @@ established based on the table name we use.  If our schema contains tables
     Address = Base.classes.address
 
     u1 = session.query(User).first()
-    print (u1.address_collection)
+    print(u1.address_collection)
 
     # the backref is still there:
     a1 = session.query(Address).first()
-    print (a1.user)
+    print(a1.user)
 
 Above, one of the more intricate details is that we illustrated overriding
 one of the :func:`_orm.relationship` objects that automap would have created.
@@ -305,35 +316,49 @@ scheme for class names and a "pluralizer" for collection names using the
     import re
     import inflect
 
+
     def camelize_classname(base, tablename, table):
-        "Produce a 'camelized' class name, e.g. "
+        "Produce a 'camelized' class name, e.g."
         "'words_and_underscores' -> 'WordsAndUnderscores'"
 
-        return str(tablename[0].upper() + \
-                re.sub(r'_([a-z])', lambda m: m.group(1).upper(), tablename[1:]))
+        return str(
+            tablename[0].upper()
+            + re.sub(
+                r"_([a-z])",
+                lambda m: m.group(1).upper(),
+                tablename[1:],
+            )
+        )
+
 
     _pluralizer = inflect.engine()
+
+
     def pluralize_collection(base, local_cls, referred_cls, constraint):
-        "Produce an 'uncamelized', 'pluralized' class name, e.g. "
+        "Produce an 'uncamelized', 'pluralized' class name, e.g."
         "'SomeTerm' -> 'some_terms'"
 
         referred_name = referred_cls.__name__
-        uncamelized = re.sub(r'[A-Z]',
-                             lambda m: "_%s" % m.group(0).lower(),
-                             referred_name)[1:]
+        uncamelized = re.sub(
+            r"[A-Z]",
+            lambda m: "_%s" % m.group(0).lower(),
+            referred_name,
+        )[1:]
         pluralized = _pluralizer.plural(uncamelized)
         return pluralized
 
+
     from sqlalchemy.ext.automap import automap_base
 
     Base = automap_base()
 
     engine = create_engine("sqlite:///mydatabase.db")
 
-    Base.prepare(autoload_with=engine,
-                classname_for_table=camelize_classname,
-                name_for_collection_relationship=pluralize_collection
-        )
+    Base.prepare(
+        autoload_with=engine,
+        classname_for_table=camelize_classname,
+        name_for_collection_relationship=pluralize_collection,
+    )
 
 From the above mapping, we would now have classes ``User`` and ``Address``,
 where the collection from ``User`` to ``Address`` is called
@@ -422,16 +447,21 @@ Below is an illustration of how to send
 options along to all one-to-many relationships::
 
     from sqlalchemy.ext.automap import generate_relationship
+    from sqlalchemy.orm import interfaces
 
-    def _gen_relationship(base, direction, return_fn,
-                                    attrname, local_cls, referred_cls, **kw):
+
+    def _gen_relationship(
+        base, direction, return_fn, attrname, local_cls, referred_cls, **kw
+    ):
         if direction is interfaces.ONETOMANY:
-            kw['cascade'] = 'all, delete-orphan'
-            kw['passive_deletes'] = True
+            kw["cascade"] = "all, delete-orphan"
+            kw["passive_deletes"] = True
         # make use of the built-in function to actually return
         # the result.
-        return generate_relationship(base, direction, return_fn,
-                                     attrname, local_cls, referred_cls, **kw)
+        return generate_relationship(
+            base, direction, return_fn, attrname, local_cls, referred_cls, **kw
+        )
+
 
     from sqlalchemy.ext.automap import automap_base
     from sqlalchemy import create_engine
@@ -440,8 +470,7 @@ options along to all one-to-many relationships::
     Base = automap_base()
 
     engine = create_engine("sqlite:///mydatabase.db")
-    Base.prepare(autoload_with=engine,
-                generate_relationship=_gen_relationship)
+    Base.prepare(autoload_with=engine, generate_relationship=_gen_relationship)
 
 Many-to-Many relationships
 --------------------------
@@ -482,18 +511,20 @@ two classes that are in an inheritance relationship.   That is, with two
 classes given as follows::
 
     class Employee(Base):
-        __tablename__ = 'employee'
+        __tablename__ = "employee"
         id = Column(Integer, primary_key=True)
         type = Column(String(50))
         __mapper_args__ = {
-             'polymorphic_identity':'employee', 'polymorphic_on': type
+            "polymorphic_identity": "employee",
+            "polymorphic_on": type,
         }
 
+
     class Engineer(Employee):
-        __tablename__ = 'engineer'
-        id = Column(Integer, ForeignKey('employee.id'), primary_key=True)
+        __tablename__ = "engineer"
+        id = Column(Integer, ForeignKey("employee.id"), primary_key=True)
         __mapper_args__ = {
-            'polymorphic_identity':'engineer',
+            "polymorphic_identity": "engineer",
         }
 
 The foreign key from ``Engineer`` to ``Employee`` is used not for a
@@ -508,25 +539,28 @@ we want as well as the ``inherit_condition``, as these are not things
 SQLAlchemy can guess::
 
     class Employee(Base):
-        __tablename__ = 'employee'
+        __tablename__ = "employee"
         id = Column(Integer, primary_key=True)
         type = Column(String(50))
 
         __mapper_args__ = {
-            'polymorphic_identity':'employee', 'polymorphic_on':type
+            "polymorphic_identity": "employee",
+            "polymorphic_on": type,
         }
 
-    class Engineer(Employee):
-        __tablename__ = 'engineer'
-        id = Column(Integer, ForeignKey('employee.id'), primary_key=True)
-        favorite_employee_id = Column(Integer, ForeignKey('employee.id'))
 
-        favorite_employee = relationship(Employee,
-                                         foreign_keys=favorite_employee_id)
+    class Engineer(Employee):
+        __tablename__ = "engineer"
+        id = Column(Integer, ForeignKey("employee.id"), primary_key=True)
+        favorite_employee_id = Column(Integer, ForeignKey("employee.id"))
+
+        favorite_employee = relationship(
+            Employee, foreign_keys=favorite_employee_id
+        )
 
         __mapper_args__ = {
-            'polymorphic_identity':'engineer',
-            'inherit_condition': id == Employee.id
+            "polymorphic_identity": "engineer",
+            "inherit_condition": id == Employee.id,
         }
 
 Handling Simple Naming Conflicts
@@ -559,20 +593,24 @@ and will emit an error on mapping.
 
 We can resolve this conflict by using an underscore as follows::
 
-    def name_for_scalar_relationship(base, local_cls, referred_cls, constraint):
+    def name_for_scalar_relationship(
+        base, local_cls, referred_cls, constraint
+    ):
         name = referred_cls.__name__.lower()
         local_table = local_cls.__table__
         if name in local_table.columns:
             newname = name + "_"
             warnings.warn(
-                "Already detected name %s present.  using %s" %
-                (name, newname))
+                "Already detected name %s present.  using %s" % (name, newname)
+            )
             return newname
         return name
 
 
-    Base.prepare(autoload_with=engine,
-        name_for_scalar_relationship=name_for_scalar_relationship)
+    Base.prepare(
+        autoload_with=engine,
+        name_for_scalar_relationship=name_for_scalar_relationship,
+    )
 
 Alternatively, we can change the name on the column side.   The columns
 that are mapped can be modified using the technique described at
@@ -581,13 +619,14 @@ to a new name::
 
     Base = automap_base()
 
+
     class TableB(Base):
-        __tablename__ = 'table_b'
-        _table_a = Column('table_a', ForeignKey('table_a.id'))
+        __tablename__ = "table_b"
+        _table_a = Column("table_a", ForeignKey("table_a.id"))
+
 
     Base.prepare(autoload_with=engine)
 
-
 Using Automap with Explicit Declarations
 ========================================
 
@@ -603,26 +642,29 @@ defines table metadata::
 
     Base = automap_base()
 
+
     class User(Base):
-        __tablename__ = 'user'
+        __tablename__ = "user"
 
         id = Column(Integer, primary_key=True)
         name = Column(String)
 
+
     class Address(Base):
-        __tablename__ = 'address'
+        __tablename__ = "address"
 
         id = Column(Integer, primary_key=True)
         email = Column(String)
-        user_id = Column(ForeignKey('user.id'))
+        user_id = Column(ForeignKey("user.id"))
+
 
     # produce relationships
     Base.prepare()
 
     # mapping is complete, with "address_collection" and
     # "user" relationships
-    a1 = Address(email='u1')
-    a2 = Address(email='u2')
+    a1 = Address(email="u1")
+    a2 = Address(email="u2")
     u1 = User(address_collection=[a1, a2])
     assert a1.user is u1
 
@@ -651,7 +693,8 @@ be applied as::
     @event.listens_for(Base.metadata, "column_reflect")
     def column_reflect(inspector, table, column_info):
         # set column.key = "attr_<lower_case_name>"
-        column_info['key'] = "attr_%s" % column_info['name'].lower()
+        column_info["key"] = "attr_%s" % column_info["name"].lower()
+
 
     # run reflection
     Base.prepare(autoload_with=engine)
@@ -1002,6 +1045,12 @@ class AutomapBase:
 
         User, Address = Base.classes.User, Base.classes.Address
 
+    For class names that overlap with a method name of
+    :class:`.util.Properties`, such as ``items()``, the getitem form
+    is also supported::
+
+        Item = Base.classes["items"]
+
     """
 
     by_module: ClassVar[ByModuleProperties]
diff --git a/libs/sqlalchemy/ext/baked.py b/libs/sqlalchemy/ext/baked.py
index 60f7ae664..cd3e08793 100644
--- a/libs/sqlalchemy/ext/baked.py
+++ b/libs/sqlalchemy/ext/baked.py
@@ -1,5 +1,5 @@
 # ext/baked.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -258,23 +258,19 @@ class BakedQuery:
         is passed to the lambda::
 
             sub_bq = self.bakery(lambda s: s.query(User.name))
-            sub_bq += lambda q: q.filter(
-                User.id == Address.user_id).correlate(Address)
+            sub_bq += lambda q: q.filter(User.id == Address.user_id).correlate(Address)
 
             main_bq = self.bakery(lambda s: s.query(Address))
-            main_bq += lambda q: q.filter(
-                sub_bq.to_query(q).exists())
+            main_bq += lambda q: q.filter(sub_bq.to_query(q).exists())
 
         In the case where the subquery is used in the first callable against
         a :class:`.Session`, the :class:`.Session` is also accepted::
 
             sub_bq = self.bakery(lambda s: s.query(User.name))
-            sub_bq += lambda q: q.filter(
-                User.id == Address.user_id).correlate(Address)
+            sub_bq += lambda q: q.filter(User.id == Address.user_id).correlate(Address)
 
             main_bq = self.bakery(
-                lambda s: s.query(
-                Address.id, sub_bq.to_query(q).scalar_subquery())
+                lambda s: s.query(Address.id, sub_bq.to_query(q).scalar_subquery())
             )
 
         :param query_or_session: a :class:`_query.Query` object or a class
@@ -285,7 +281,7 @@ class BakedQuery:
          .. versionadded:: 1.3
 
 
-        """
+        """  # noqa: E501
 
         if isinstance(query_or_session, Session):
             session = query_or_session
diff --git a/libs/sqlalchemy/ext/compiler.py b/libs/sqlalchemy/ext/compiler.py
index 01462ad0b..cc64477ed 100644
--- a/libs/sqlalchemy/ext/compiler.py
+++ b/libs/sqlalchemy/ext/compiler.py
@@ -1,10 +1,9 @@
 # ext/compiler.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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"""Provides an API for creation of custom ClauseElements and compilers.
 
@@ -18,9 +17,11 @@ more callables defining its compilation::
     from sqlalchemy.ext.compiler import compiles
     from sqlalchemy.sql.expression import ColumnClause
 
+
     class MyColumn(ColumnClause):
         inherit_cache = True
 
+
     @compiles(MyColumn)
     def compile_mycolumn(element, compiler, **kw):
         return "[%s]" % element.name
@@ -32,10 +33,12 @@ when the object is compiled to a string::
 
     from sqlalchemy import select
 
-    s = select(MyColumn('x'), MyColumn('y'))
+    s = select(MyColumn("x"), MyColumn("y"))
     print(str(s))
 
-Produces::
+Produces:
+
+.. sourcecode:: sql
 
     SELECT [x], [y]
 
@@ -47,6 +50,7 @@ invoked for the dialect in use::
 
     from sqlalchemy.schema import DDLElement
 
+
     class AlterColumn(DDLElement):
         inherit_cache = False
 
@@ -54,14 +58,18 @@ invoked for the dialect in use::
             self.column = column
             self.cmd = cmd
 
+
     @compiles(AlterColumn)
     def visit_alter_column(element, compiler, **kw):
         return "ALTER COLUMN %s ..." % element.column.name
 
-    @compiles(AlterColumn, 'postgresql')
+
+    @compiles(AlterColumn, "postgresql")
     def visit_alter_column(element, compiler, **kw):
-        return "ALTER TABLE %s ALTER COLUMN %s ..." % (element.table.name,
-                                                       element.column.name)
+        return "ALTER TABLE %s ALTER COLUMN %s ..." % (
+            element.table.name,
+            element.column.name,
+        )
 
 The second ``visit_alter_table`` will be invoked when any ``postgresql``
 dialect is used.
@@ -81,6 +89,7 @@ method which can be used for compilation of embedded attributes::
 
     from sqlalchemy.sql.expression import Executable, ClauseElement
 
+
     class InsertFromSelect(Executable, ClauseElement):
         inherit_cache = False
 
@@ -88,20 +97,27 @@ method which can be used for compilation of embedded attributes::
             self.table = table
             self.select = select
 
+
     @compiles(InsertFromSelect)
     def visit_insert_from_select(element, compiler, **kw):
         return "INSERT INTO %s (%s)" % (
             compiler.process(element.table, asfrom=True, **kw),
-            compiler.process(element.select, **kw)
+            compiler.process(element.select, **kw),
         )
 
-    insert = InsertFromSelect(t1, select(t1).where(t1.c.x>5))
+
+    insert = InsertFromSelect(t1, select(t1).where(t1.c.x > 5))
     print(insert)
 
-Produces::
+Produces (formatted for readability):
 
-    "INSERT INTO mytable (SELECT mytable.x, mytable.y, mytable.z
-                          FROM mytable WHERE mytable.x > :x_1)"
+.. sourcecode:: sql
+
+    INSERT INTO mytable (
+        SELECT mytable.x, mytable.y, mytable.z
+        FROM mytable
+        WHERE mytable.x > :x_1
+    )
 
 .. note::
 
@@ -121,11 +137,10 @@ below where we generate a CHECK constraint that embeds a SQL expression::
 
     @compiles(MyConstraint)
     def compile_my_constraint(constraint, ddlcompiler, **kw):
-        kw['literal_binds'] = True
+        kw["literal_binds"] = True
         return "CONSTRAINT %s CHECK (%s)" % (
             constraint.name,
-            ddlcompiler.sql_compiler.process(
-                constraint.expression, **kw)
+            ddlcompiler.sql_compiler.process(constraint.expression, **kw),
         )
 
 Above, we add an additional flag to the process step as called by
@@ -153,6 +168,7 @@ an endless loop.   Such as, to add "prefix" to all insert statements::
 
     from sqlalchemy.sql.expression import Insert
 
+
     @compiles(Insert)
     def prefix_inserts(insert, compiler, **kw):
         return compiler.visit_insert(insert.prefix_with("some prefix"), **kw)
@@ -168,17 +184,16 @@ Changing Compilation of Types
 ``compiler`` works for types, too, such as below where we implement the
 MS-SQL specific 'max' keyword for ``String``/``VARCHAR``::
 
-    @compiles(String, 'mssql')
-    @compiles(VARCHAR, 'mssql')
+    @compiles(String, "mssql")
+    @compiles(VARCHAR, "mssql")
     def compile_varchar(element, compiler, **kw):
-        if element.length == 'max':
+        if element.length == "max":
             return "VARCHAR('max')"
         else:
             return compiler.visit_VARCHAR(element, **kw)
 
-    foo = Table('foo', metadata,
-        Column('data', VARCHAR('max'))
-    )
+
+    foo = Table("foo", metadata, Column("data", VARCHAR("max")))
 
 Subclassing Guidelines
 ======================
@@ -216,18 +231,23 @@ A synopsis is as follows:
 
       from sqlalchemy.sql.expression import FunctionElement
 
+
       class coalesce(FunctionElement):
-          name = 'coalesce'
+          name = "coalesce"
           inherit_cache = True
 
+
       @compiles(coalesce)
       def compile(element, compiler, **kw):
           return "coalesce(%s)" % compiler.process(element.clauses, **kw)
 
-      @compiles(coalesce, 'oracle')
+
+      @compiles(coalesce, "oracle")
       def compile(element, compiler, **kw):
           if len(element.clauses) > 2:
-              raise TypeError("coalesce only supports two arguments on Oracle")
+              raise TypeError(
+                  "coalesce only supports two arguments on " "Oracle Database"
+              )
           return "nvl(%s)" % compiler.process(element.clauses, **kw)
 
 * :class:`.ExecutableDDLElement` - The root of all DDL expressions,
@@ -281,6 +301,7 @@ for example to the "synopsis" example indicated previously::
     class MyColumn(ColumnClause):
         inherit_cache = True
 
+
     @compiles(MyColumn)
     def compile_mycolumn(element, compiler, **kw):
         return "[%s]" % element.name
@@ -319,11 +340,12 @@ caching::
             self.table = table
             self.select = select
 
+
     @compiles(InsertFromSelect)
     def visit_insert_from_select(element, compiler, **kw):
         return "INSERT INTO %s (%s)" % (
             compiler.process(element.table, asfrom=True, **kw),
-            compiler.process(element.select, **kw)
+            compiler.process(element.select, **kw),
         )
 
 While it is also possible that the above ``InsertFromSelect`` could be made to
@@ -359,28 +381,32 @@ For PostgreSQL and Microsoft SQL Server::
     from sqlalchemy.ext.compiler import compiles
     from sqlalchemy.types import DateTime
 
+
     class utcnow(expression.FunctionElement):
         type = DateTime()
         inherit_cache = True
 
-    @compiles(utcnow, 'postgresql')
+
+    @compiles(utcnow, "postgresql")
     def pg_utcnow(element, compiler, **kw):
         return "TIMEZONE('utc', CURRENT_TIMESTAMP)"
 
-    @compiles(utcnow, 'mssql')
+
+    @compiles(utcnow, "mssql")
     def ms_utcnow(element, compiler, **kw):
         return "GETUTCDATE()"
 
 Example usage::
 
-    from sqlalchemy import (
-                Table, Column, Integer, String, DateTime, MetaData
-            )
+    from sqlalchemy import Table, Column, Integer, String, DateTime, MetaData
+
     metadata = MetaData()
-    event = Table("event", metadata,
+    event = Table(
+        "event",
+        metadata,
         Column("id", Integer, primary_key=True),
         Column("description", String(50), nullable=False),
-        Column("timestamp", DateTime, server_default=utcnow())
+        Column("timestamp", DateTime, server_default=utcnow()),
     )
 
 "GREATEST" function
@@ -395,30 +421,30 @@ accommodates two arguments::
     from sqlalchemy.ext.compiler import compiles
     from sqlalchemy.types import Numeric
 
+
     class greatest(expression.FunctionElement):
         type = Numeric()
-        name = 'greatest'
+        name = "greatest"
         inherit_cache = True
 
+
     @compiles(greatest)
     def default_greatest(element, compiler, **kw):
         return compiler.visit_function(element)
 
-    @compiles(greatest, 'sqlite')
-    @compiles(greatest, 'mssql')
-    @compiles(greatest, 'oracle')
+
+    @compiles(greatest, "sqlite")
+    @compiles(greatest, "mssql")
+    @compiles(greatest, "oracle")
     def case_greatest(element, compiler, **kw):
         arg1, arg2 = list(element.clauses)
         return compiler.process(case((arg1 > arg2, arg1), else_=arg2), **kw)
 
 Example usage::
 
-    Session.query(Account).\
-            filter(
-                greatest(
-                    Account.checking_balance,
-                    Account.savings_balance) > 10000
-            )
+    Session.query(Account).filter(
+        greatest(Account.checking_balance, Account.savings_balance) > 10000
+    )
 
 "false" expression
 ------------------
@@ -429,16 +455,19 @@ don't have a "false" constant::
     from sqlalchemy.sql import expression
     from sqlalchemy.ext.compiler import compiles
 
+
     class sql_false(expression.ColumnElement):
         inherit_cache = True
 
+
     @compiles(sql_false)
     def default_false(element, compiler, **kw):
         return "false"
 
-    @compiles(sql_false, 'mssql')
-    @compiles(sql_false, 'mysql')
-    @compiles(sql_false, 'oracle')
+
+    @compiles(sql_false, "mssql")
+    @compiles(sql_false, "mysql")
+    @compiles(sql_false, "oracle")
     def int_false(element, compiler, **kw):
         return "0"
 
@@ -448,19 +477,33 @@ Example usage::
 
     exp = union_all(
         select(users.c.name, sql_false().label("enrolled")),
-        select(customers.c.name, customers.c.enrolled)
+        select(customers.c.name, customers.c.enrolled),
     )
 
 """
+from __future__ import annotations
+
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import Type
+from typing import TYPE_CHECKING
+from typing import TypeVar
+
 from .. import exc
 from ..sql import sqltypes
 
+if TYPE_CHECKING:
+    from ..sql.compiler import SQLCompiler
 
-def compiles(class_, *specs):
+_F = TypeVar("_F", bound=Callable[..., Any])
+
+
+def compiles(class_: Type[Any], *specs: str) -> Callable[[_F], _F]:
     """Register a function as a compiler for a
     given :class:`_expression.ClauseElement` type."""
 
-    def decorate(fn):
+    def decorate(fn: _F) -> _F:
         # get an existing @compiles handler
         existing = class_.__dict__.get("_compiler_dispatcher", None)
 
@@ -473,7 +516,9 @@ def compiles(class_, *specs):
 
             if existing_dispatch:
 
-                def _wrap_existing_dispatch(element, compiler, **kw):
+                def _wrap_existing_dispatch(
+                    element: Any, compiler: SQLCompiler, **kw: Any
+                ) -> Any:
                     try:
                         return existing_dispatch(element, compiler, **kw)
                     except exc.UnsupportedCompilationError as uce:
@@ -505,7 +550,7 @@ def compiles(class_, *specs):
     return decorate
 
 
-def deregister(class_):
+def deregister(class_: Type[Any]) -> None:
     """Remove all custom compilers associated with a given
     :class:`_expression.ClauseElement` type.
 
@@ -517,10 +562,10 @@ def deregister(class_):
 
 
 class _dispatcher:
-    def __init__(self):
-        self.specs = {}
+    def __init__(self) -> None:
+        self.specs: Dict[str, Callable[..., Any]] = {}
 
-    def __call__(self, element, compiler, **kw):
+    def __call__(self, element: Any, compiler: SQLCompiler, **kw: Any) -> Any:
         # TODO: yes, this could also switch off of DBAPI in use.
         fn = self.specs.get(compiler.dialect.name, None)
         if not fn:
diff --git a/libs/sqlalchemy/ext/declarative/__init__.py b/libs/sqlalchemy/ext/declarative/__init__.py
index 37da40377..0383f9d34 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 c0f7e3405..3dc6bf698 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -50,23 +50,26 @@ class ConcreteBase:
 
         from sqlalchemy.ext.declarative import ConcreteBase
 
+
         class Employee(ConcreteBase, Base):
-            __tablename__ = 'employee'
+            __tablename__ = "employee"
             employee_id = Column(Integer, primary_key=True)
             name = Column(String(50))
             __mapper_args__ = {
-                            'polymorphic_identity':'employee',
-                            'concrete':True}
+                "polymorphic_identity": "employee",
+                "concrete": True,
+            }
+
 
         class Manager(Employee):
-            __tablename__ = 'manager'
+            __tablename__ = "manager"
             employee_id = Column(Integer, primary_key=True)
             name = Column(String(50))
             manager_data = Column(String(40))
             __mapper_args__ = {
-                            'polymorphic_identity':'manager',
-                            'concrete':True}
-
+                "polymorphic_identity": "manager",
+                "concrete": True,
+            }
 
     The name of the discriminator column used by :func:`.polymorphic_union`
     defaults to the name ``type``.  To suit the use case of a mapping where an
@@ -75,7 +78,7 @@ class ConcreteBase:
     ``_concrete_discriminator_name`` attribute::
 
         class Employee(ConcreteBase, Base):
-            _concrete_discriminator_name = '_concrete_discriminator'
+            _concrete_discriminator_name = "_concrete_discriminator"
 
     .. versionadded:: 1.3.19 Added the ``_concrete_discriminator_name``
        attribute to :class:`_declarative.ConcreteBase` so that the
@@ -168,23 +171,27 @@ class AbstractConcreteBase(ConcreteBase):
         from sqlalchemy.orm import DeclarativeBase
         from sqlalchemy.ext.declarative import AbstractConcreteBase
 
+
         class Base(DeclarativeBase):
             pass
 
+
         class Employee(AbstractConcreteBase, Base):
             pass
 
+
         class Manager(Employee):
-            __tablename__ = 'manager'
+            __tablename__ = "manager"
             employee_id = Column(Integer, primary_key=True)
             name = Column(String(50))
             manager_data = Column(String(40))
 
             __mapper_args__ = {
-                'polymorphic_identity':'manager',
-                'concrete':True
+                "polymorphic_identity": "manager",
+                "concrete": True,
             }
 
+
         Base.registry.configure()
 
     The abstract base class is handled by declarative in a special way;
@@ -200,10 +207,12 @@ class AbstractConcreteBase(ConcreteBase):
 
         from sqlalchemy.ext.declarative import AbstractConcreteBase
 
+
         class Company(Base):
-            __tablename__ = 'company'
+            __tablename__ = "company"
             id = Column(Integer, primary_key=True)
 
+
         class Employee(AbstractConcreteBase, Base):
             strict_attrs = True
 
@@ -211,31 +220,31 @@ class AbstractConcreteBase(ConcreteBase):
 
             @declared_attr
             def company_id(cls):
-                return Column(ForeignKey('company.id'))
+                return Column(ForeignKey("company.id"))
 
             @declared_attr
             def company(cls):
                 return relationship("Company")
 
+
         class Manager(Employee):
-            __tablename__ = 'manager'
+            __tablename__ = "manager"
 
             name = Column(String(50))
             manager_data = Column(String(40))
 
             __mapper_args__ = {
-                'polymorphic_identity':'manager',
-                'concrete':True
+                "polymorphic_identity": "manager",
+                "concrete": True,
             }
 
+
         Base.registry.configure()
 
     When we make use of our mappings however, both ``Manager`` and
     ``Employee`` will have an independently usable ``.company`` attribute::
 
-        session.execute(
-            select(Employee).filter(Employee.company.has(id=5))
-        )
+        session.execute(select(Employee).filter(Employee.company.has(id=5)))
 
     :param strict_attrs: when specified on the base class, "strict" attribute
      mode is enabled which attempts to limit ORM mapped attributes on the
@@ -366,10 +375,12 @@ class DeferredReflection:
 
         from sqlalchemy.ext.declarative import declarative_base
         from sqlalchemy.ext.declarative import DeferredReflection
+
         Base = declarative_base()
 
+
         class MyClass(DeferredReflection, Base):
-            __tablename__ = 'mytable'
+            __tablename__ = "mytable"
 
     Above, ``MyClass`` is not yet mapped.   After a series of
     classes have been defined in the above fashion, all tables
@@ -391,17 +402,22 @@ class DeferredReflection:
         class ReflectedOne(DeferredReflection, Base):
             __abstract__ = True
 
+
         class ReflectedTwo(DeferredReflection, Base):
             __abstract__ = True
 
+
         class MyClass(ReflectedOne):
-            __tablename__ = 'mytable'
+            __tablename__ = "mytable"
+
 
         class MyOtherClass(ReflectedOne):
-            __tablename__ = 'myothertable'
+            __tablename__ = "myothertable"
+
 
         class YetAnotherClass(ReflectedTwo):
-            __tablename__ = 'yetanothertable'
+            __tablename__ = "yetanothertable"
+
 
         # ... etc.
 
diff --git a/libs/sqlalchemy/ext/horizontal_shard.py b/libs/sqlalchemy/ext/horizontal_shard.py
index d8ee819f2..3ea3304eb 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -125,12 +125,9 @@ class ShardedQuery(Query[_T]):
         The shard_id can be passed for a 2.0 style execution to the
         bind_arguments dictionary of :meth:`.Session.execute`::
 
-            results = session.execute(
-                stmt,
-                bind_arguments={"shard_id": "my_shard"}
-            )
+            results = session.execute(stmt, bind_arguments={"shard_id": "my_shard"})
 
-        """
+        """  # noqa: E501
         return self.execution_options(_sa_shard_id=shard_id)
 
 
@@ -321,7 +318,7 @@ class ShardedSession(Session):
             state.identity_token = shard_id
         return shard_id
 
-    def connection_callable(  # type: ignore [override]
+    def connection_callable(
         self,
         mapper: Optional[Mapper[_T]] = None,
         instance: Optional[Any] = None,
@@ -382,9 +379,9 @@ class set_shard_id(ORMOption):
     the :meth:`_sql.Executable.options` method of any executable statement::
 
         stmt = (
-            select(MyObject).
-            where(MyObject.name == 'some name').
-            options(set_shard_id("shard1"))
+            select(MyObject)
+            .where(MyObject.name == "some name")
+            .options(set_shard_id("shard1"))
         )
 
     Above, the statement when invoked will limit to the "shard1" shard
diff --git a/libs/sqlalchemy/ext/hybrid.py b/libs/sqlalchemy/ext/hybrid.py
index 25b74d8d6..c1c46e7c5 100644
--- a/libs/sqlalchemy/ext/hybrid.py
+++ b/libs/sqlalchemy/ext/hybrid.py
@@ -1,5 +1,5 @@
 # ext/hybrid.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -34,8 +34,9 @@ may receive the class directly, depending on context::
     class Base(DeclarativeBase):
         pass
 
+
     class Interval(Base):
-        __tablename__ = 'interval'
+        __tablename__ = "interval"
 
         id: Mapped[int] = mapped_column(primary_key=True)
         start: Mapped[int]
@@ -57,7 +58,6 @@ may receive the class directly, depending on context::
         def intersects(self, other: Interval) -> bool:
             return self.contains(other.start) | self.contains(other.end)
 
-
 Above, the ``length`` property returns the difference between the
 ``end`` and ``start`` attributes.  With an instance of ``Interval``,
 this subtraction occurs in Python, using normal Python descriptor
@@ -150,6 +150,7 @@ the absolute value function::
     from sqlalchemy import func
     from sqlalchemy import type_coerce
 
+
     class Interval(Base):
         # ...
 
@@ -214,6 +215,7 @@ example below that illustrates the use of :meth:`.hybrid_property.setter` and
 
     # correct use, however is not accepted by pep-484 tooling
 
+
     class Interval(Base):
         # ...
 
@@ -256,6 +258,7 @@ a single decorator under one name::
 
     # correct use which is also accepted by pep-484 tooling
 
+
     class Interval(Base):
         # ...
 
@@ -330,6 +333,7 @@ expression is used as the column that's the target of the SET.  If our
 ``Interval.start``, this could be substituted directly::
 
     from sqlalchemy import update
+
     stmt = update(Interval).values({Interval.start_point: 10})
 
 However, when using a composite hybrid like ``Interval.length``, this
@@ -340,6 +344,7 @@ A handler that works similarly to our setter would be::
 
     from typing import List, Tuple, Any
 
+
     class Interval(Base):
         # ...
 
@@ -352,10 +357,10 @@ A handler that works similarly to our setter would be::
             self.end = self.start + value
 
         @length.inplace.update_expression
-        def _length_update_expression(cls, value: Any) -> List[Tuple[Any, Any]]:
-            return [
-                (cls.end, cls.start + value)
-            ]
+        def _length_update_expression(
+            cls, value: Any
+        ) -> List[Tuple[Any, Any]]:
+            return [(cls.end, cls.start + value)]
 
 Above, if we use ``Interval.length`` in an UPDATE expression, we get
 a hybrid SET expression:
@@ -412,15 +417,16 @@ mapping which relates a ``User`` to a ``SavingsAccount``::
 
 
     class SavingsAccount(Base):
-        __tablename__ = 'account'
+        __tablename__ = "account"
         id: Mapped[int] = mapped_column(primary_key=True)
-        user_id: Mapped[int] = mapped_column(ForeignKey('user.id'))
+        user_id: Mapped[int] = mapped_column(ForeignKey("user.id"))
         balance: Mapped[Decimal] = mapped_column(Numeric(15, 5))
 
         owner: Mapped[User] = relationship(back_populates="accounts")
 
+
     class User(Base):
-        __tablename__ = 'user'
+        __tablename__ = "user"
         id: Mapped[int] = mapped_column(primary_key=True)
         name: Mapped[str] = mapped_column(String(100))
 
@@ -448,7 +454,10 @@ mapping which relates a ``User`` to a ``SavingsAccount``::
         @balance.inplace.expression
         @classmethod
         def _balance_expression(cls) -> SQLColumnExpression[Optional[Decimal]]:
-            return cast("SQLColumnExpression[Optional[Decimal]]", SavingsAccount.balance)
+            return cast(
+                "SQLColumnExpression[Optional[Decimal]]",
+                SavingsAccount.balance,
+            )
 
 The above hybrid property ``balance`` works with the first
 ``SavingsAccount`` entry in the list of accounts for this user.   The
@@ -471,8 +480,11 @@ be used in an appropriate context such that an appropriate join to
 .. sourcecode:: pycon+sql
 
     >>> from sqlalchemy import select
-    >>> print(select(User, User.balance).
-    ...       join(User.accounts).filter(User.balance > 5000))
+    >>> print(
+    ...     select(User, User.balance)
+    ...     .join(User.accounts)
+    ...     .filter(User.balance > 5000)
+    ... )
     {printsql}SELECT "user".id AS user_id, "user".name AS user_name,
     account.balance AS account_balance
     FROM "user" JOIN account ON "user".id = account.user_id
@@ -487,8 +499,11 @@ would use an outer join:
 
     >>> from sqlalchemy import select
     >>> from sqlalchemy import or_
-    >>> print (select(User, User.balance).outerjoin(User.accounts).
-    ...         filter(or_(User.balance < 5000, User.balance == None)))
+    >>> print(
+    ...     select(User, User.balance)
+    ...     .outerjoin(User.accounts)
+    ...     .filter(or_(User.balance < 5000, User.balance == None))
+    ... )
     {printsql}SELECT "user".id AS user_id, "user".name AS user_name,
     account.balance AS account_balance
     FROM "user" LEFT OUTER JOIN account ON "user".id = account.user_id
@@ -528,15 +543,16 @@ we can adjust our ``SavingsAccount`` example to aggregate the balances for
 
 
     class SavingsAccount(Base):
-        __tablename__ = 'account'
+        __tablename__ = "account"
         id: Mapped[int] = mapped_column(primary_key=True)
-        user_id: Mapped[int] = mapped_column(ForeignKey('user.id'))
+        user_id: Mapped[int] = mapped_column(ForeignKey("user.id"))
         balance: Mapped[Decimal] = mapped_column(Numeric(15, 5))
 
         owner: Mapped[User] = relationship(back_populates="accounts")
 
+
     class User(Base):
-        __tablename__ = 'user'
+        __tablename__ = "user"
         id: Mapped[int] = mapped_column(primary_key=True)
         name: Mapped[str] = mapped_column(String(100))
 
@@ -546,7 +562,9 @@ we can adjust our ``SavingsAccount`` example to aggregate the balances for
 
         @hybrid_property
         def balance(self) -> Decimal:
-            return sum((acc.balance for acc in self.accounts), start=Decimal("0"))
+            return sum(
+                (acc.balance for acc in self.accounts), start=Decimal("0")
+            )
 
         @balance.inplace.expression
         @classmethod
@@ -557,7 +575,6 @@ we can adjust our ``SavingsAccount`` example to aggregate the balances for
                 .label("total_balance")
             )
 
-
 The above recipe will give us the ``balance`` column which renders
 a correlated SELECT:
 
@@ -604,6 +621,7 @@ named ``word_insensitive``::
     from sqlalchemy.orm import Mapped
     from sqlalchemy.orm import mapped_column
 
+
     class Base(DeclarativeBase):
         pass
 
@@ -612,8 +630,9 @@ named ``word_insensitive``::
         def __eq__(self, other: Any) -> ColumnElement[bool]:  # type: ignore[override]  # noqa: E501
             return func.lower(self.__clause_element__()) == func.lower(other)
 
+
     class SearchWord(Base):
-        __tablename__ = 'searchword'
+        __tablename__ = "searchword"
 
         id: Mapped[int] = mapped_column(primary_key=True)
         word: Mapped[str]
@@ -675,6 +694,7 @@ how the standard Python ``@property`` object works::
         def _name_setter(self, value: str) -> None:
             self.first_name = value
 
+
     class FirstNameLastName(FirstNameOnly):
         # ...
 
@@ -684,11 +704,11 @@ how the standard Python ``@property`` object works::
         # of FirstNameOnly.name that is local to FirstNameLastName
         @FirstNameOnly.name.getter
         def name(self) -> str:
-            return self.first_name + ' ' + self.last_name
+            return self.first_name + " " + self.last_name
 
         @name.inplace.setter
         def _name_setter(self, value: str) -> None:
-            self.first_name, self.last_name = value.split(' ', 1)
+            self.first_name, self.last_name = value.split(" ", 1)
 
 Above, the ``FirstNameLastName`` class refers to the hybrid from
 ``FirstNameOnly.name`` to repurpose its getter and setter for the subclass.
@@ -709,8 +729,7 @@ reference the instrumented attribute back to the hybrid object::
         @FirstNameOnly.name.overrides.expression
         @classmethod
         def name(cls):
-            return func.concat(cls.first_name, ' ', cls.last_name)
-
+            return func.concat(cls.first_name, " ", cls.last_name)
 
 Hybrid Value Objects
 --------------------
@@ -751,7 +770,7 @@ Replacing the previous ``CaseInsensitiveComparator`` class with a new
         def __str__(self):
             return self.word
 
-        key = 'word'
+        key = "word"
         "Label to apply to Query tuple results"
 
 Above, the ``CaseInsensitiveWord`` object represents ``self.word``, which may
@@ -762,7 +781,7 @@ SQL side or Python side. Our ``SearchWord`` class can now deliver the
 ``CaseInsensitiveWord`` object unconditionally from a single hybrid call::
 
     class SearchWord(Base):
-        __tablename__ = 'searchword'
+        __tablename__ = "searchword"
         id: Mapped[int] = mapped_column(primary_key=True)
         word: Mapped[str]
 
@@ -983,6 +1002,7 @@ class hybrid_method(interfaces.InspectionAttrInfo, Generic[_P, _R]):
 
             from sqlalchemy.ext.hybrid import hybrid_method
 
+
             class SomeClass:
                 @hybrid_method
                 def value(self, x, y):
@@ -1080,6 +1100,7 @@ class hybrid_property(interfaces.InspectionAttrInfo, ORMDescriptor[_T]):
 
             from sqlalchemy.ext.hybrid import hybrid_property
 
+
             class SomeClass:
                 @hybrid_property
                 def value(self):
@@ -1096,7 +1117,7 @@ class hybrid_property(interfaces.InspectionAttrInfo, ORMDescriptor[_T]):
         self.expr = _unwrap_classmethod(expr)
         self.custom_comparator = _unwrap_classmethod(custom_comparator)
         self.update_expr = _unwrap_classmethod(update_expr)
-        util.update_wrapper(self, fget)
+        util.update_wrapper(self, fget)  # type: ignore[arg-type]
 
     @overload
     def __get__(self, instance: Any, owner: Literal[None]) -> Self: ...
@@ -1158,6 +1179,7 @@ class hybrid_property(interfaces.InspectionAttrInfo, ORMDescriptor[_T]):
                 def foobar(self):
                     return self._foobar
 
+
             class SubClass(SuperClass):
                 # ...
 
@@ -1367,10 +1389,7 @@ class hybrid_property(interfaces.InspectionAttrInfo, ORMDescriptor[_T]):
                 @fullname.update_expression
                 def fullname(cls, value):
                     fname, lname = value.split(" ", 1)
-                    return [
-                        (cls.first_name, fname),
-                        (cls.last_name, lname)
-                    ]
+                    return [(cls.first_name, fname), (cls.last_name, lname)]
 
         .. versionadded:: 1.2
 
diff --git a/libs/sqlalchemy/ext/indexable.py b/libs/sqlalchemy/ext/indexable.py
index 3c419308a..886069ce0 100644
--- a/libs/sqlalchemy/ext/indexable.py
+++ b/libs/sqlalchemy/ext/indexable.py
@@ -1,5 +1,5 @@
 # ext/indexable.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -36,19 +36,19 @@ as a dedicated attribute which behaves like a standalone column::
 
     Base = declarative_base()
 
+
     class Person(Base):
-        __tablename__ = 'person'
+        __tablename__ = "person"
 
         id = Column(Integer, primary_key=True)
         data = Column(JSON)
 
-        name = index_property('data', 'name')
-
+        name = index_property("data", "name")
 
 Above, the ``name`` attribute now behaves like a mapped column.   We
 can compose a new ``Person`` and set the value of ``name``::
 
-    >>> person = Person(name='Alchemist')
+    >>> person = Person(name="Alchemist")
 
 The value is now accessible::
 
@@ -59,11 +59,11 @@ Behind the scenes, the JSON field was initialized to a new blank dictionary
 and the field was set::
 
     >>> person.data
-    {"name": "Alchemist'}
+    {'name': 'Alchemist'}
 
 The field is mutable in place::
 
-    >>> person.name = 'Renamed'
+    >>> person.name = "Renamed"
     >>> person.name
     'Renamed'
     >>> person.data
@@ -87,18 +87,17 @@ A missing key will produce ``AttributeError``::
 
     >>> person = Person()
     >>> person.name
-    ...
     AttributeError: 'name'
 
 Unless you set a default value::
 
     >>> class Person(Base):
-    >>>     __tablename__ = 'person'
-    >>>
-    >>>     id = Column(Integer, primary_key=True)
-    >>>     data = Column(JSON)
-    >>>
-    >>>     name = index_property('data', 'name', default=None)  # See default
+    ...     __tablename__ = "person"
+    ...
+    ...     id = Column(Integer, primary_key=True)
+    ...     data = Column(JSON)
+    ...
+    ...     name = index_property("data", "name", default=None)  # See default
 
     >>> person = Person()
     >>> print(person.name)
@@ -111,11 +110,11 @@ an indexed SQL criteria::
 
     >>> from sqlalchemy.orm import Session
     >>> session = Session()
-    >>> query = session.query(Person).filter(Person.name == 'Alchemist')
+    >>> query = session.query(Person).filter(Person.name == "Alchemist")
 
 The above query is equivalent to::
 
-    >>> query = session.query(Person).filter(Person.data['name'] == 'Alchemist')
+    >>> query = session.query(Person).filter(Person.data["name"] == "Alchemist")
 
 Multiple :class:`.index_property` objects can be chained to produce
 multiple levels of indexing::
@@ -126,22 +125,25 @@ multiple levels of indexing::
 
     Base = declarative_base()
 
+
     class Person(Base):
-        __tablename__ = 'person'
+        __tablename__ = "person"
 
         id = Column(Integer, primary_key=True)
         data = Column(JSON)
 
-        birthday = index_property('data', 'birthday')
-        year = index_property('birthday', 'year')
-        month = index_property('birthday', 'month')
-        day = index_property('birthday', 'day')
+        birthday = index_property("data", "birthday")
+        year = index_property("birthday", "year")
+        month = index_property("birthday", "month")
+        day = index_property("birthday", "day")
 
 Above, a query such as::
 
-    q = session.query(Person).filter(Person.year == '1980')
+    q = session.query(Person).filter(Person.year == "1980")
 
-On a PostgreSQL backend, the above query will render as::
+On a PostgreSQL backend, the above query will render as:
+
+.. sourcecode:: sql
 
     SELECT person.id, person.data
     FROM person
@@ -198,13 +200,14 @@ version of :class:`_postgresql.JSON`::
 
     Base = declarative_base()
 
+
     class Person(Base):
-        __tablename__ = 'person'
+        __tablename__ = "person"
 
         id = Column(Integer, primary_key=True)
         data = Column(JSON)
 
-        age = pg_json_property('data', 'age', Integer)
+        age = pg_json_property("data", "age", Integer)
 
 The ``age`` attribute at the instance level works as before; however
 when rendering SQL, PostgreSQL's ``->>`` operator will be used
@@ -212,7 +215,8 @@ for indexed access, instead of the usual index operator of ``->``::
 
     >>> query = session.query(Person).filter(Person.age < 20)
 
-The above query will render::
+The above query will render:
+.. sourcecode:: sql
 
     SELECT person.id, person.data
     FROM person
diff --git a/libs/sqlalchemy/ext/instrumentation.py b/libs/sqlalchemy/ext/instrumentation.py
index 5f3c71282..8bb01985e 100644
--- a/libs/sqlalchemy/ext/instrumentation.py
+++ b/libs/sqlalchemy/ext/instrumentation.py
@@ -1,5 +1,5 @@
 # ext/instrumentation.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 7da5075a1..ed618c381 100644
--- a/libs/sqlalchemy/ext/mutable.py
+++ b/libs/sqlalchemy/ext/mutable.py
@@ -1,5 +1,5 @@
 # ext/mutable.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -21,6 +21,7 @@ JSON strings before being persisted::
     from sqlalchemy.types import TypeDecorator, VARCHAR
     import json
 
+
     class JSONEncodedDict(TypeDecorator):
         "Represents an immutable structure as a json-encoded string."
 
@@ -48,6 +49,7 @@ the :class:`.Mutable` mixin to a plain Python dictionary::
 
     from sqlalchemy.ext.mutable import Mutable
 
+
     class MutableDict(Mutable, dict):
         @classmethod
         def coerce(cls, key, value):
@@ -101,9 +103,11 @@ attribute. Such as, with classical table metadata::
 
     from sqlalchemy import Table, Column, Integer
 
-    my_data = Table('my_data', metadata,
-        Column('id', Integer, primary_key=True),
-        Column('data', MutableDict.as_mutable(JSONEncodedDict))
+    my_data = Table(
+        "my_data",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column("data", MutableDict.as_mutable(JSONEncodedDict)),
     )
 
 Above, :meth:`~.Mutable.as_mutable` returns an instance of ``JSONEncodedDict``
@@ -115,13 +119,17 @@ mapping against the ``my_data`` table::
     from sqlalchemy.orm import Mapped
     from sqlalchemy.orm import mapped_column
 
+
     class Base(DeclarativeBase):
         pass
 
+
     class MyDataClass(Base):
-        __tablename__ = 'my_data'
+        __tablename__ = "my_data"
         id: Mapped[int] = mapped_column(primary_key=True)
-        data: Mapped[dict[str, str]] = mapped_column(MutableDict.as_mutable(JSONEncodedDict))
+        data: Mapped[dict[str, str]] = mapped_column(
+            MutableDict.as_mutable(JSONEncodedDict)
+        )
 
 The ``MyDataClass.data`` member will now be notified of in place changes
 to its value.
@@ -132,11 +140,11 @@ will flag the attribute as "dirty" on the parent object::
     >>> from sqlalchemy.orm import Session
 
     >>> sess = Session(some_engine)
-    >>> m1 = MyDataClass(data={'value1':'foo'})
+    >>> m1 = MyDataClass(data={"value1": "foo"})
     >>> sess.add(m1)
     >>> sess.commit()
 
-    >>> m1.data['value1'] = 'bar'
+    >>> m1.data["value1"] = "bar"
     >>> assert m1 in sess.dirty
     True
 
@@ -153,15 +161,16 @@ the need to declare it individually::
 
     MutableDict.associate_with(JSONEncodedDict)
 
+
     class Base(DeclarativeBase):
         pass
 
+
     class MyDataClass(Base):
-        __tablename__ = 'my_data'
+        __tablename__ = "my_data"
         id: Mapped[int] = mapped_column(primary_key=True)
         data: Mapped[dict[str, str]] = mapped_column(JSONEncodedDict)
 
-
 Supporting Pickling
 --------------------
 
@@ -180,7 +189,7 @@ stream::
     class MyMutableType(Mutable):
         def __getstate__(self):
             d = self.__dict__.copy()
-            d.pop('_parents', None)
+            d.pop("_parents", None)
             return d
 
 With our dictionary example, we need to return the contents of the dict itself
@@ -213,13 +222,18 @@ from within the mutable extension::
     from sqlalchemy.orm import mapped_column
     from sqlalchemy import event
 
+
     class Base(DeclarativeBase):
         pass
 
+
     class MyDataClass(Base):
-        __tablename__ = 'my_data'
+        __tablename__ = "my_data"
         id: Mapped[int] = mapped_column(primary_key=True)
-        data: Mapped[dict[str, str]] = mapped_column(MutableDict.as_mutable(JSONEncodedDict))
+        data: Mapped[dict[str, str]] = mapped_column(
+            MutableDict.as_mutable(JSONEncodedDict)
+        )
+
 
     @event.listens_for(MyDataClass.data, "modified")
     def modified_json(instance, initiator):
@@ -247,6 +261,7 @@ class introduced in :ref:`mapper_composite` to include
     import dataclasses
     from sqlalchemy.ext.mutable import MutableComposite
 
+
     @dataclasses.dataclass
     class Point(MutableComposite):
         x: int
@@ -261,7 +276,6 @@ class introduced in :ref:`mapper_composite` to include
             # alert all parents to the change
             self.changed()
 
-
 The :class:`.MutableComposite` class makes use of class mapping events to
 automatically establish listeners for any usage of :func:`_orm.composite` that
 specifies our ``Point`` type. Below, when ``Point`` is mapped to the ``Vertex``
@@ -271,6 +285,7 @@ objects to each of the ``Vertex.start`` and ``Vertex.end`` attributes::
     from sqlalchemy.orm import DeclarativeBase, Mapped
     from sqlalchemy.orm import composite, mapped_column
 
+
     class Base(DeclarativeBase):
         pass
 
@@ -280,8 +295,12 @@ objects to each of the ``Vertex.start`` and ``Vertex.end`` attributes::
 
         id: Mapped[int] = mapped_column(primary_key=True)
 
-        start: Mapped[Point] = composite(mapped_column("x1"), mapped_column("y1"))
-        end: Mapped[Point] = composite(mapped_column("x2"), mapped_column("y2"))
+        start: Mapped[Point] = composite(
+            mapped_column("x1"), mapped_column("y1")
+        )
+        end: Mapped[Point] = composite(
+            mapped_column("x2"), mapped_column("y2")
+        )
 
         def __repr__(self):
             return f"Vertex(start={self.start}, end={self.end})"
@@ -391,6 +410,7 @@ from ..orm.context import QueryContext
 from ..orm.decl_api import DeclarativeAttributeIntercept
 from ..orm.state import InstanceState
 from ..orm.unitofwork import UOWTransaction
+from ..sql._typing import _TypeEngineArgument
 from ..sql.base import SchemaEventTarget
 from ..sql.schema import Column
 from ..sql.type_api import TypeEngine
@@ -638,7 +658,7 @@ class Mutable(MutableBase):
         event.listen(Mapper, "mapper_configured", listen_for_type)
 
     @classmethod
-    def as_mutable(cls, sqltype: TypeEngine[_T]) -> TypeEngine[_T]:
+    def as_mutable(cls, sqltype: _TypeEngineArgument[_T]) -> TypeEngine[_T]:
         """Associate a SQL type with this mutable Python type.
 
         This establishes listeners that will detect ORM mappings against
@@ -647,9 +667,11 @@ class Mutable(MutableBase):
         The type is returned, unconditionally as an instance, so that
         :meth:`.as_mutable` can be used inline::
 
-            Table('mytable', metadata,
-                Column('id', Integer, primary_key=True),
-                Column('data', MyMutableType.as_mutable(PickleType))
+            Table(
+                "mytable",
+                metadata,
+                Column("id", Integer, primary_key=True),
+                Column("data", MyMutableType.as_mutable(PickleType)),
             )
 
         Note that the returned type is always an instance, even if a class
diff --git a/libs/sqlalchemy/ext/mypy/__init__.py b/libs/sqlalchemy/ext/mypy/__init__.py
index de2c02ee9..b5827cb8d 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 eb9019453..02908cc14 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -199,11 +199,15 @@ def apply_type_to_mapped_statement(
 
     To one that describes the final Python behavior to Mypy::
 
+    ... format: off
+
         class User(Base):
             # ...
 
             attrname : Mapped[Optional[int]] = <meaningless temp node>
 
+    ... format: on
+
     """
     left_node = lvalue.node
     assert isinstance(left_node, Var)
diff --git a/libs/sqlalchemy/ext/mypy/decl_class.py b/libs/sqlalchemy/ext/mypy/decl_class.py
index 3d578b346..2ce7ad56c 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 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 09b3c443a..26a83cca8 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -385,9 +385,9 @@ def _infer_type_from_decl_column(
         class MyClass:
             # ...
 
-            a : Mapped[int]
+            a: Mapped[int]
 
-            b : Mapped[str]
+            b: Mapped[str]
 
             c: Mapped[int]
 
diff --git a/libs/sqlalchemy/ext/mypy/names.py b/libs/sqlalchemy/ext/mypy/names.py
index 35b4e2ba8..319786288 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -58,6 +58,14 @@ NAMED_TYPE_BUILTINS_STR = "builtins.str"
 NAMED_TYPE_BUILTINS_LIST = "builtins.list"
 NAMED_TYPE_SQLA_MAPPED = "sqlalchemy.orm.base.Mapped"
 
+_RelFullNames = {
+    "sqlalchemy.orm.relationships.Relationship",
+    "sqlalchemy.orm.relationships.RelationshipProperty",
+    "sqlalchemy.orm.relationships._RelationshipDeclared",
+    "sqlalchemy.orm.Relationship",
+    "sqlalchemy.orm.RelationshipProperty",
+}
+
 _lookup: Dict[str, Tuple[int, Set[str]]] = {
     "Column": (
         COLUMN,
@@ -66,24 +74,9 @@ _lookup: Dict[str, Tuple[int, Set[str]]] = {
             "sqlalchemy.sql.Column",
         },
     ),
-    "Relationship": (
-        RELATIONSHIP,
-        {
-            "sqlalchemy.orm.relationships.Relationship",
-            "sqlalchemy.orm.relationships.RelationshipProperty",
-            "sqlalchemy.orm.Relationship",
-            "sqlalchemy.orm.RelationshipProperty",
-        },
-    ),
-    "RelationshipProperty": (
-        RELATIONSHIP,
-        {
-            "sqlalchemy.orm.relationships.Relationship",
-            "sqlalchemy.orm.relationships.RelationshipProperty",
-            "sqlalchemy.orm.Relationship",
-            "sqlalchemy.orm.RelationshipProperty",
-        },
-    ),
+    "Relationship": (RELATIONSHIP, _RelFullNames),
+    "RelationshipProperty": (RELATIONSHIP, _RelFullNames),
+    "_RelationshipDeclared": (RELATIONSHIP, _RelFullNames),
     "registry": (
         REGISTRY,
         {
diff --git a/libs/sqlalchemy/ext/mypy/plugin.py b/libs/sqlalchemy/ext/mypy/plugin.py
index 00eb4d1cc..1ec2c02b9 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 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 7f04c481d..16761b9ab 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -80,7 +80,7 @@ class SQLAlchemyAttribute:
             "name": self.name,
             "line": self.line,
             "column": self.column,
-            "type": self.type.serialize(),
+            "type": serialize_type(self.type),
         }
 
     def expand_typevar_from_subtype(self, sub_type: TypeInfo) -> None:
@@ -336,3 +336,22 @@ def info_for_cls(
         return sym.node
 
     return cls.info
+
+
+def serialize_type(typ: Type) -> Union[str, JsonDict]:
+    try:
+        return typ.serialize()
+    except Exception:
+        pass
+    if hasattr(typ, "args"):
+        typ.args = tuple(
+            (
+                a.resolve_string_annotation()
+                if hasattr(a, "resolve_string_annotation")
+                else a
+            )
+            for a in typ.args
+        )
+    elif hasattr(typ, "resolve_string_annotation"):
+        typ = typ.resolve_string_annotation()
+    return typ.serialize()
diff --git a/libs/sqlalchemy/ext/orderinglist.py b/libs/sqlalchemy/ext/orderinglist.py
index 1a12cf38c..3cc67b189 100644
--- a/libs/sqlalchemy/ext/orderinglist.py
+++ b/libs/sqlalchemy/ext/orderinglist.py
@@ -1,5 +1,5 @@
 # ext/orderinglist.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -26,18 +26,20 @@ displayed in order based on the value of the ``position`` column in the
 
     Base = declarative_base()
 
+
     class Slide(Base):
-        __tablename__ = 'slide'
+        __tablename__ = "slide"
 
         id = Column(Integer, primary_key=True)
         name = Column(String)
 
         bullets = relationship("Bullet", order_by="Bullet.position")
 
+
     class Bullet(Base):
-        __tablename__ = 'bullet'
+        __tablename__ = "bullet"
         id = Column(Integer, primary_key=True)
-        slide_id = Column(Integer, ForeignKey('slide.id'))
+        slide_id = Column(Integer, ForeignKey("slide.id"))
         position = Column(Integer)
         text = Column(String)
 
@@ -57,19 +59,24 @@ constructed using the :func:`.ordering_list` factory::
 
     Base = declarative_base()
 
+
     class Slide(Base):
-        __tablename__ = 'slide'
+        __tablename__ = "slide"
 
         id = Column(Integer, primary_key=True)
         name = Column(String)
 
-        bullets = relationship("Bullet", order_by="Bullet.position",
-                                collection_class=ordering_list('position'))
+        bullets = relationship(
+            "Bullet",
+            order_by="Bullet.position",
+            collection_class=ordering_list("position"),
+        )
+
 
     class Bullet(Base):
-        __tablename__ = 'bullet'
+        __tablename__ = "bullet"
         id = Column(Integer, primary_key=True)
-        slide_id = Column(Integer, ForeignKey('slide.id'))
+        slide_id = Column(Integer, ForeignKey("slide.id"))
         position = Column(Integer)
         text = Column(String)
 
@@ -151,14 +158,18 @@ def ordering_list(
 
         from sqlalchemy.ext.orderinglist import ordering_list
 
+
         class Slide(Base):
-            __tablename__ = 'slide'
+            __tablename__ = "slide"
 
             id = Column(Integer, primary_key=True)
             name = Column(String)
 
-            bullets = relationship("Bullet", order_by="Bullet.position",
-                                    collection_class=ordering_list('position'))
+            bullets = relationship(
+                "Bullet",
+                order_by="Bullet.position",
+                collection_class=ordering_list("position"),
+            )
 
     :param attr:
       Name of the mapped attribute to use for storage and retrieval of
diff --git a/libs/sqlalchemy/ext/serializer.py b/libs/sqlalchemy/ext/serializer.py
index f21e997a2..b7032b659 100644
--- a/libs/sqlalchemy/ext/serializer.py
+++ b/libs/sqlalchemy/ext/serializer.py
@@ -1,5 +1,5 @@
 # ext/serializer.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,13 +28,17 @@ when it is deserialized.
 Usage is nearly the same as that of the standard Python pickle module::
 
     from sqlalchemy.ext.serializer import loads, dumps
+
     metadata = MetaData(bind=some_engine)
     Session = scoped_session(sessionmaker())
 
     # ... define mappers
 
-    query = Session.query(MyClass).
-        filter(MyClass.somedata=='foo').order_by(MyClass.sortkey)
+    query = (
+        Session.query(MyClass)
+        .filter(MyClass.somedata == "foo")
+        .order_by(MyClass.sortkey)
+    )
 
     # pickle the query
     serialized = dumps(query)
@@ -42,7 +46,7 @@ Usage is nearly the same as that of the standard Python pickle module::
     # unpickle.  Pass in metadata + scoped_session
     query2 = loads(serialized, metadata, Session)
 
-    print query2.all()
+    print(query2.all())
 
 Similar restrictions as when using raw pickle apply; mapped classes must be
 themselves be pickleable, meaning they are importable from a module-level
@@ -82,10 +86,9 @@ from ..util import b64encode
 __all__ = ["Serializer", "Deserializer", "dumps", "loads"]
 
 
-def Serializer(*args, **kw):
-    pickler = pickle.Pickler(*args, **kw)
+class Serializer(pickle.Pickler):
 
-    def persistent_id(obj):
+    def persistent_id(self, obj):
         # print "serializing:", repr(obj)
         if isinstance(obj, Mapper) and not obj.non_primary:
             id_ = "mapper:" + b64encode(pickle.dumps(obj.class_))
@@ -113,9 +116,6 @@ def Serializer(*args, **kw):
             return None
         return id_
 
-    pickler.persistent_id = persistent_id
-    return pickler
-
 
 our_ids = re.compile(
     r"(mapperprop|mapper|mapper_selectable|table|column|"
@@ -123,20 +123,23 @@ our_ids = re.compile(
 )
 
 
-def Deserializer(file, metadata=None, scoped_session=None, engine=None):
-    unpickler = pickle.Unpickler(file)
+class Deserializer(pickle.Unpickler):
 
-    def get_engine():
-        if engine:
-            return engine
-        elif scoped_session and scoped_session().bind:
-            return scoped_session().bind
-        elif metadata and metadata.bind:
-            return metadata.bind
+    def __init__(self, file, metadata=None, scoped_session=None, engine=None):
+        super().__init__(file)
+        self.metadata = metadata
+        self.scoped_session = scoped_session
+        self.engine = engine
+
+    def get_engine(self):
+        if self.engine:
+            return self.engine
+        elif self.scoped_session and self.scoped_session().bind:
+            return self.scoped_session().bind
         else:
             return None
 
-    def persistent_load(id_):
+    def persistent_load(self, id_):
         m = our_ids.match(str(id_))
         if not m:
             return None
@@ -157,20 +160,17 @@ def Deserializer(file, metadata=None, scoped_session=None, engine=None):
                 cls = pickle.loads(b64decode(mapper))
                 return class_mapper(cls).attrs[keyname]
             elif type_ == "table":
-                return metadata.tables[args]
+                return self.metadata.tables[args]
             elif type_ == "column":
                 table, colname = args.split(":")
-                return metadata.tables[table].c[colname]
+                return self.metadata.tables[table].c[colname]
             elif type_ == "session":
-                return scoped_session()
+                return self.scoped_session()
             elif type_ == "engine":
-                return get_engine()
+                return self.get_engine()
             else:
                 raise Exception("Unknown token: %s" % type_)
 
-    unpickler.persistent_load = persistent_load
-    return unpickler
-
 
 def dumps(obj, protocol=pickle.HIGHEST_PROTOCOL):
     buf = BytesIO()
diff --git a/libs/sqlalchemy/future/__init__.py b/libs/sqlalchemy/future/__init__.py
index 8ce36ccbc..ef9afb1a5 100644
--- a/libs/sqlalchemy/future/__init__.py
+++ b/libs/sqlalchemy/future/__init__.py
@@ -1,5 +1,5 @@
 # future/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 b55cda08d..0449c3d9f 100644
--- a/libs/sqlalchemy/future/engine.py
+++ b/libs/sqlalchemy/future/engine.py
@@ -1,5 +1,5 @@
 # future/engine.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 30d531957..2e5b22018 100644
--- a/libs/sqlalchemy/inspection.py
+++ b/libs/sqlalchemy/inspection.py
@@ -1,5 +1,5 @@
 # inspection.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 e6922b81a..849a0bfa0 100644
--- a/libs/sqlalchemy/log.py
+++ b/libs/sqlalchemy/log.py
@@ -1,5 +1,5 @@
 # log.py
-# Copyright (C) 2006-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2006-2025 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 70a112943..7771de47e 100644
--- a/libs/sqlalchemy/orm/__init__.py
+++ b/libs/sqlalchemy/orm/__init__.py
@@ -1,5 +1,5 @@
 # orm/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/_orm_constructors.py b/libs/sqlalchemy/orm/_orm_constructors.py
index f74de91c1..d9e3ec37b 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,8 +28,8 @@ from .properties import MappedColumn
 from .properties import MappedSQLExpression
 from .query import AliasOption
 from .relationships import _RelationshipArgumentType
+from .relationships import _RelationshipDeclared
 from .relationships import _RelationshipSecondaryArgument
-from .relationships import Relationship
 from .relationships import RelationshipProperty
 from .session import Session
 from .util import _ORMJoin
@@ -70,7 +70,7 @@ if TYPE_CHECKING:
     from ..sql._typing import _TypeEngineArgument
     from ..sql.elements import ColumnElement
     from ..sql.schema import _ServerDefaultArgument
-    from ..sql.schema import FetchedValue
+    from ..sql.schema import _ServerOnUpdateArgument
     from ..sql.selectable import Alias
     from ..sql.selectable import Subquery
 
@@ -108,6 +108,7 @@ def mapped_column(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     nullable: Optional[
         Union[bool, Literal[SchemaConst.NULL_UNSPECIFIED]]
     ] = SchemaConst.NULL_UNSPECIFIED,
@@ -127,7 +128,7 @@ def mapped_column(
     onupdate: Optional[Any] = None,
     insert_default: Optional[Any] = _NoArg.NO_ARG,
     server_default: Optional[_ServerDefaultArgument] = None,
-    server_onupdate: Optional[FetchedValue] = None,
+    server_onupdate: Optional[_ServerOnUpdateArgument] = None,
     active_history: bool = False,
     quote: Optional[bool] = None,
     system: bool = False,
@@ -255,12 +256,28 @@ def mapped_column(
         be used instead**.  This is necessary to disambiguate the callable from
         being interpreted as a dataclass level default.
 
+     .. seealso::
+
+        :ref:`defaults_default_factory_insert_default`
+
+        :paramref:`_orm.mapped_column.insert_default`
+
+        :paramref:`_orm.mapped_column.default_factory`
+
     :param insert_default: Passed directly to the
      :paramref:`_schema.Column.default` parameter; will supersede the value
      of :paramref:`_orm.mapped_column.default` when present, however
      :paramref:`_orm.mapped_column.default` will always apply to the
      constructor default for a dataclasses mapping.
 
+     .. seealso::
+
+        :ref:`defaults_default_factory_insert_default`
+
+        :paramref:`_orm.mapped_column.default`
+
+        :paramref:`_orm.mapped_column.default_factory`
+
     :param sort_order: An integer that indicates how this mapped column
      should be sorted compared to the others when the ORM is creating a
      :class:`_schema.Table`. Among mapped columns that have the same
@@ -295,6 +312,15 @@ def mapped_column(
      specifies a default-value generation function that will take place
      as part of the ``__init__()``
      method as generated by the dataclass process.
+
+     .. seealso::
+
+        :ref:`defaults_default_factory_insert_default`
+
+        :paramref:`_orm.mapped_column.default`
+
+        :paramref:`_orm.mapped_column.insert_default`
+
     :param compare: Specific to
      :ref:`orm_declarative_native_dataclasses`, indicates if this field
      should be included in comparison operations when generating the
@@ -306,6 +332,13 @@ def mapped_column(
      :ref:`orm_declarative_native_dataclasses`, indicates if this field
      should be marked as keyword-only when generating the ``__init__()``.
 
+    :param hash: Specific to
+     :ref:`orm_declarative_native_dataclasses`, controls if this field
+     is included when generating the ``__hash__()`` method for the mapped
+     class.
+
+     .. versionadded:: 2.0.36
+
     :param \**kw: All remaining keyword arguments are passed through to the
      constructor for the :class:`_schema.Column`.
 
@@ -320,7 +353,7 @@ def mapped_column(
         autoincrement=autoincrement,
         insert_default=insert_default,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
         doc=doc,
         key=key,
@@ -415,12 +448,13 @@ def column_property(
     deferred: bool = False,
     raiseload: bool = False,
     comparator_factory: Optional[Type[PropComparator[_T]]] = None,
-    init: Union[_NoArg, bool] = _NoArg.NO_ARG,  # noqa: A002
+    init: Union[_NoArg, bool] = _NoArg.NO_ARG,
     repr: Union[_NoArg, bool] = _NoArg.NO_ARG,  # noqa: A002
     default: Optional[Any] = _NoArg.NO_ARG,
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     active_history: bool = False,
     expire_on_flush: bool = True,
     info: Optional[_InfoType] = None,
@@ -509,13 +543,43 @@ def column_property(
 
             :ref:`orm_queryguide_deferred_raiseload`
 
-    :param init:
+    :param init: Specific to :ref:`orm_declarative_native_dataclasses`,
+     specifies if the mapped attribute should be part of the ``__init__()``
+     method as generated by the dataclass process.
+    :param repr: Specific to :ref:`orm_declarative_native_dataclasses`,
+     specifies if the mapped attribute should be part of the ``__repr__()``
+     method as generated by the dataclass process.
+    :param default_factory: Specific to
+     :ref:`orm_declarative_native_dataclasses`,
+     specifies a default-value generation function that will take place
+     as part of the ``__init__()``
+     method as generated by the dataclass process.
 
-    :param default:
+     .. seealso::
 
-    :param default_factory:
+        :ref:`defaults_default_factory_insert_default`
 
-    :param kw_only:
+        :paramref:`_orm.mapped_column.default`
+
+        :paramref:`_orm.mapped_column.insert_default`
+
+    :param compare: Specific to
+     :ref:`orm_declarative_native_dataclasses`, indicates if this field
+     should be included in comparison operations when generating the
+     ``__eq__()`` and ``__ne__()`` methods for the mapped class.
+
+     .. versionadded:: 2.0.0b4
+
+    :param kw_only: Specific to
+     :ref:`orm_declarative_native_dataclasses`, indicates if this field
+     should be marked as keyword-only when generating the ``__init__()``.
+
+    :param hash: Specific to
+     :ref:`orm_declarative_native_dataclasses`, controls if this field
+     is included when generating the ``__hash__()`` method for the mapped
+     class.
+
+     .. versionadded:: 2.0.36
 
     """
     return MappedSQLExpression(
@@ -528,6 +592,7 @@ def column_property(
             default_factory,
             compare,
             kw_only,
+            hash,
         ),
         group=group,
         deferred=deferred,
@@ -556,6 +621,7 @@ def composite(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
     **__kw: Any,
@@ -577,6 +643,7 @@ def composite(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
     **__kw: Any,
@@ -598,6 +665,7 @@ def composite(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
     **__kw: Any,
@@ -620,6 +688,7 @@ def composite(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
     **__kw: Any,
@@ -694,6 +763,12 @@ def composite(
      :ref:`orm_declarative_native_dataclasses`, indicates if this field
      should be marked as keyword-only when generating the ``__init__()``.
 
+    :param hash: Specific to
+     :ref:`orm_declarative_native_dataclasses`, controls if this field
+     is included when generating the ``__hash__()`` method for the mapped
+     class.
+
+     .. versionadded:: 2.0.36
     """
     if __kw:
         raise _no_kw()
@@ -702,7 +777,7 @@ def composite(
         _class_or_attr,
         *attrs,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
         group=group,
         deferred=deferred,
@@ -716,7 +791,10 @@ def composite(
 
 def with_loader_criteria(
     entity_or_base: _EntityType[Any],
-    where_criteria: _ColumnExpressionArgument[bool],
+    where_criteria: Union[
+        _ColumnExpressionArgument[bool],
+        Callable[[Any], _ColumnExpressionArgument[bool]],
+    ],
     loader_only: bool = False,
     include_aliases: bool = False,
     propagate_to_loaders: bool = True,
@@ -745,7 +823,7 @@ def with_loader_criteria(
 
         stmt = select(User).options(
             selectinload(User.addresses),
-            with_loader_criteria(Address, Address.email_address != 'foo'))
+            with_loader_criteria(Address, Address.email_address != "foo"),
         )
 
     Above, the "selectinload" for ``User.addresses`` will apply the
@@ -755,8 +833,10 @@ def with_loader_criteria(
     ON clause of the join, in this example using :term:`1.x style`
     queries::
 
-        q = session.query(User).outerjoin(User.addresses).options(
-            with_loader_criteria(Address, Address.email_address != 'foo'))
+        q = (
+            session.query(User)
+            .outerjoin(User.addresses)
+            .options(with_loader_criteria(Address, Address.email_address != "foo"))
         )
 
     The primary purpose of :func:`_orm.with_loader_criteria` is to use
@@ -769,6 +849,7 @@ def with_loader_criteria(
 
         session = Session(bind=engine)
 
+
         @event.listens_for("do_orm_execute", session)
         def _add_filtering_criteria(execute_state):
 
@@ -780,8 +861,8 @@ def with_loader_criteria(
                 execute_state.statement = execute_state.statement.options(
                     with_loader_criteria(
                         SecurityRole,
-                        lambda cls: cls.role.in_(['some_role']),
-                        include_aliases=True
+                        lambda cls: cls.role.in_(["some_role"]),
+                        include_aliases=True,
                     )
                 )
 
@@ -818,16 +899,19 @@ def with_loader_criteria(
        ``A -> A.bs -> B``, the given :func:`_orm.with_loader_criteria`
        option will affect the way in which the JOIN is rendered::
 
-            stmt = select(A).join(A.bs).options(
-                contains_eager(A.bs),
-                with_loader_criteria(B, B.flag == 1)
+            stmt = (
+                select(A)
+                .join(A.bs)
+                .options(contains_eager(A.bs), with_loader_criteria(B, B.flag == 1))
             )
 
        Above, the given :func:`_orm.with_loader_criteria` option will
        affect the ON clause of the JOIN that is specified by
        ``.join(A.bs)``, so is applied as expected. The
        :func:`_orm.contains_eager` option has the effect that columns from
-       ``B`` are added to the columns clause::
+       ``B`` are added to the columns clause:
+
+       .. sourcecode:: sql
 
             SELECT
                 b.id, b.a_id, b.data, b.flag,
@@ -893,7 +977,7 @@ def with_loader_criteria(
 
      .. versionadded:: 1.4.0b2
 
-    """
+    """  # noqa: E501
     return LoaderCriteriaOption(
         entity_or_base,
         where_criteria,
@@ -927,6 +1011,7 @@ def relationship(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     lazy: _LazyLoadArgumentType = "select",
     passive_deletes: Union[Literal["all"], bool] = False,
     passive_updates: bool = True,
@@ -947,7 +1032,7 @@ def relationship(
     omit_join: Literal[None, False] = None,
     sync_backref: Optional[bool] = None,
     **kw: Any,
-) -> Relationship[Any]:
+) -> _RelationshipDeclared[Any]:
     """Provide a relationship between two mapped classes.
 
     This corresponds to a parent-child or associative table relationship.
@@ -1750,10 +1835,15 @@ def relationship(
      :ref:`orm_declarative_native_dataclasses`, indicates if this field
      should be marked as keyword-only when generating the ``__init__()``.
 
+    :param hash: Specific to
+     :ref:`orm_declarative_native_dataclasses`, controls if this field
+     is included when generating the ``__hash__()`` method for the mapped
+     class.
 
+     .. versionadded:: 2.0.36
     """
 
-    return Relationship(
+    return _RelationshipDeclared(
         argument,
         secondary=secondary,
         uselist=uselist,
@@ -1768,7 +1858,7 @@ def relationship(
         cascade=cascade,
         viewonly=viewonly,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
         lazy=lazy,
         passive_deletes=passive_deletes,
@@ -1803,6 +1893,7 @@ def synonym(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
 ) -> Synonym[Any]:
@@ -1813,14 +1904,13 @@ def synonym(
     e.g.::
 
         class MyClass(Base):
-            __tablename__ = 'my_table'
+            __tablename__ = "my_table"
 
             id = Column(Integer, primary_key=True)
             job_status = Column(String(50))
 
             status = synonym("job_status")
 
-
     :param name: the name of the existing mapped property.  This
       can refer to the string name ORM-mapped attribute
       configured on the class, including column-bound attributes
@@ -1848,11 +1938,13 @@ def synonym(
       :paramref:`.synonym.descriptor` parameter::
 
         my_table = Table(
-            "my_table", metadata,
-            Column('id', Integer, primary_key=True),
-            Column('job_status', String(50))
+            "my_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("job_status", String(50)),
         )
 
+
         class MyClass:
             @property
             def _job_status_descriptor(self):
@@ -1860,11 +1952,15 @@ def synonym(
 
 
         mapper(
-            MyClass, my_table, properties={
+            MyClass,
+            my_table,
+            properties={
                 "job_status": synonym(
-                    "_job_status", map_column=True,
-                    descriptor=MyClass._job_status_descriptor)
-            }
+                    "_job_status",
+                    map_column=True,
+                    descriptor=MyClass._job_status_descriptor,
+                )
+            },
         )
 
       Above, the attribute named ``_job_status`` is automatically
@@ -1913,7 +2009,7 @@ def synonym(
         descriptor=descriptor,
         comparator_factory=comparator_factory,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
         doc=doc,
         info=info,
@@ -2014,8 +2110,7 @@ def backref(name: str, **kwargs: Any) -> ORMBackrefArgument:
 
     E.g.::
 
-        'items':relationship(
-            SomeItem, backref=backref('parent', lazy='subquery'))
+        "items": relationship(SomeItem, backref=backref("parent", lazy="subquery"))
 
     The :paramref:`_orm.relationship.backref` parameter is generally
     considered to be legacy; for modern applications, using
@@ -2027,7 +2122,7 @@ def backref(name: str, **kwargs: Any) -> ORMBackrefArgument:
 
         :ref:`relationships_backref` - background on backrefs
 
-    """
+    """  # noqa: E501
 
     return (name, kwargs)
 
@@ -2044,6 +2139,7 @@ def deferred(
     default_factory: Union[_NoArg, Callable[[], _T]] = _NoArg.NO_ARG,
     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
     active_history: bool = False,
     expire_on_flush: bool = True,
     info: Optional[_InfoType] = None,
@@ -2078,7 +2174,7 @@ def deferred(
         column,
         *additional_columns,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only
+            init, repr, default, default_factory, compare, kw_only, hash
         ),
         group=group,
         deferred=True,
@@ -2121,6 +2217,7 @@ def query_expression(
             _NoArg.NO_ARG,
             compare,
             _NoArg.NO_ARG,
+            _NoArg.NO_ARG,
         ),
         expire_on_flush=expire_on_flush,
         info=info,
@@ -2267,6 +2364,16 @@ def aliased(
      supported by all modern databases with regards to right-nested joins
      and generally produces more efficient queries.
 
+     When :paramref:`_orm.aliased.flat` is combined with
+     :paramref:`_orm.aliased.name`, the resulting joins will alias individual
+     tables using a naming scheme similar to ``<prefix>_<tablename>``.  This
+     naming scheme is for visibility / debugging purposes only and the
+     specific scheme is subject to change without notice.
+
+     .. versionadded:: 2.0.32 added support for combining
+        :paramref:`_orm.aliased.name` with :paramref:`_orm.aliased.flat`.
+        Previously, this would raise ``NotImplementedError``.
+
     :param adapt_on_names: if True, more liberal "matching" will be used when
      mapping the mapped columns of the ORM entity to those of the
      given selectable - a name-based match will be performed if the
@@ -2276,17 +2383,21 @@ def aliased(
      aggregate functions::
 
         class UnitPrice(Base):
-            __tablename__ = 'unit_price'
+            __tablename__ = "unit_price"
             ...
             unit_id = Column(Integer)
             price = Column(Numeric)
 
-        aggregated_unit_price = Session.query(
-                                    func.sum(UnitPrice.price).label('price')
-                                ).group_by(UnitPrice.unit_id).subquery()
 
-        aggregated_unit_price = aliased(UnitPrice,
-                    alias=aggregated_unit_price, adapt_on_names=True)
+        aggregated_unit_price = (
+            Session.query(func.sum(UnitPrice.price).label("price"))
+            .group_by(UnitPrice.unit_id)
+            .subquery()
+        )
+
+        aggregated_unit_price = aliased(
+            UnitPrice, alias=aggregated_unit_price, adapt_on_names=True
+        )
 
      Above, functions on ``aggregated_unit_price`` which refer to
      ``.price`` will return the
@@ -2314,6 +2425,7 @@ def with_polymorphic(
     aliased: bool = False,
     innerjoin: bool = False,
     adapt_on_names: bool = False,
+    name: Optional[str] = None,
     _use_mapper_path: bool = False,
 ) -> AliasedClass[_O]:
     """Produce an :class:`.AliasedClass` construct which specifies
@@ -2385,6 +2497,10 @@ def with_polymorphic(
 
       .. versionadded:: 1.4.33
 
+    :param name: Name given to the generated :class:`.AliasedClass`.
+
+      .. versionadded:: 2.0.31
+
     """
     return AliasedInsp._with_polymorphic_factory(
         base,
@@ -2395,6 +2511,7 @@ def with_polymorphic(
         adapt_on_names=adapt_on_names,
         aliased=aliased,
         innerjoin=innerjoin,
+        name=name,
         _use_mapper_path=_use_mapper_path,
     )
 
@@ -2426,16 +2543,21 @@ def join(
     :meth:`_sql.Select.select_from` method, as in::
 
         from sqlalchemy.orm import join
-        stmt = select(User).\
-            select_from(join(User, Address, User.addresses)).\
-            filter(Address.email_address=='foo@bar.com')
+
+        stmt = (
+            select(User)
+            .select_from(join(User, Address, User.addresses))
+            .filter(Address.email_address == "foo@bar.com")
+        )
 
     In modern SQLAlchemy the above join can be written more
     succinctly as::
 
-        stmt = select(User).\
-                join(User.addresses).\
-                filter(Address.email_address=='foo@bar.com')
+        stmt = (
+            select(User)
+            .join(User.addresses)
+            .filter(Address.email_address == "foo@bar.com")
+        )
 
     .. warning:: using :func:`_orm.join` directly may not work properly
        with modern ORM options such as :func:`_orm.with_loader_criteria`.
diff --git a/libs/sqlalchemy/orm/_typing.py b/libs/sqlalchemy/orm/_typing.py
index f8ac0590a..ccb8413b5 100644
--- a/libs/sqlalchemy/orm/_typing.py
+++ b/libs/sqlalchemy/orm/_typing.py
@@ -1,5 +1,5 @@
 # orm/_typing.py
-# Copyright (C) 2022-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2025 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 d9b2d8213..8207b4cac 100644
--- a/libs/sqlalchemy/orm/attributes.py
+++ b/libs/sqlalchemy/orm/attributes.py
@@ -1,5 +1,5 @@
 # orm/attributes.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -401,7 +401,7 @@ class QueryableAttribute(
             parententity=adapt_to_entity,
         )
 
-    def of_type(self, entity: _EntityType[Any]) -> QueryableAttribute[_T]:
+    def of_type(self, entity: _EntityType[_T]) -> QueryableAttribute[_T]:
         return QueryableAttribute(
             self.class_,
             self.key,
@@ -503,7 +503,7 @@ def _queryable_attribute_unreduce(
         return getattr(entity, key)
 
 
-class InstrumentedAttribute(QueryableAttribute[_T]):
+class InstrumentedAttribute(QueryableAttribute[_T_co]):
     """Class bound instrumented attribute which adds basic
     :term:`descriptor` methods.
 
@@ -544,14 +544,14 @@ class InstrumentedAttribute(QueryableAttribute[_T]):
     @overload
     def __get__(
         self, instance: None, owner: Any
-    ) -> InstrumentedAttribute[_T]: ...
+    ) -> InstrumentedAttribute[_T_co]: ...
 
     @overload
-    def __get__(self, instance: object, owner: Any) -> _T: ...
+    def __get__(self, instance: object, owner: Any) -> _T_co: ...
 
     def __get__(
         self, instance: Optional[object], owner: Any
-    ) -> Union[InstrumentedAttribute[_T], _T]:
+    ) -> Union[InstrumentedAttribute[_T_co], _T_co]:
         if instance is None:
             return self
 
@@ -2663,7 +2663,7 @@ def init_collection(obj: object, key: str) -> CollectionAdapter:
     This function is used to provide direct access to collection internals
     for a previously unloaded attribute.  e.g.::
 
-        collection_adapter = init_collection(someobject, 'elements')
+        collection_adapter = init_collection(someobject, "elements")
         for elem in values:
             collection_adapter.append_without_event(elem)
 
diff --git a/libs/sqlalchemy/orm/base.py b/libs/sqlalchemy/orm/base.py
index 86af81cd6..c84f3b1b3 100644
--- a/libs/sqlalchemy/orm/base.py
+++ b/libs/sqlalchemy/orm/base.py
@@ -1,5 +1,5 @@
 # orm/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -21,6 +21,7 @@ from typing import Generic
 from typing import no_type_check
 from typing import Optional
 from typing import overload
+from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
 from typing import TypeVar
@@ -282,6 +283,8 @@ _never_set = frozenset([NEVER_SET])
 
 _none_set = frozenset([None, NEVER_SET, PASSIVE_NO_RESULT])
 
+_none_only_set = frozenset([None])
+
 _SET_DEFERRED_EXPIRED = util.symbol("SET_DEFERRED_EXPIRED")
 
 _DEFER_FOR_STATE = util.symbol("DEFER_FOR_STATE")
@@ -579,7 +582,7 @@ class InspectionAttr:
 
     """
 
-    __slots__ = ()
+    __slots__: Tuple[str, ...] = ()
 
     is_selectable = False
     """Return True if this object is an instance of
diff --git a/libs/sqlalchemy/orm/bulk_persistence.py b/libs/sqlalchemy/orm/bulk_persistence.py
index 5d2558d95..402d7bede 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -76,6 +76,7 @@ def _bulk_insert(
     mapper: Mapper[_O],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     return_defaults: bool,
     render_nulls: bool,
@@ -89,6 +90,7 @@ def _bulk_insert(
     mapper: Mapper[_O],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     return_defaults: bool,
     render_nulls: bool,
@@ -101,6 +103,7 @@ def _bulk_insert(
     mapper: Mapper[_O],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     return_defaults: bool,
     render_nulls: bool,
@@ -116,13 +119,35 @@ def _bulk_insert(
         )
 
     if isstates:
+        if TYPE_CHECKING:
+            mappings = cast(Iterable[InstanceState[_O]], mappings)
+
         if return_defaults:
+            # list of states allows us to attach .key for return_defaults case
             states = [(state, state.dict) for state in mappings]
             mappings = [dict_ for (state, dict_) in states]
         else:
             mappings = [state.dict for state in mappings]
     else:
-        mappings = [dict(m) for m in mappings]
+        if TYPE_CHECKING:
+            mappings = cast(Iterable[Dict[str, Any]], mappings)
+
+        if return_defaults:
+            # use dictionaries given, so that newly populated defaults
+            # can be delivered back to the caller (see #11661). This is **not**
+            # compatible with other use cases such as a session-executed
+            # insert() construct, as this will confuse the case of
+            # insert-per-subclass for joined inheritance cases (see
+            # test_bulk_statements.py::BulkDMLReturningJoinedInhTest).
+            #
+            # So in this conditional, we have **only** called
+            # session.bulk_insert_mappings() which does not have this
+            # requirement
+            mappings = list(mappings)
+        else:
+            # for all other cases we need to establish a local dictionary
+            # so that the incoming dictionaries aren't mutated
+            mappings = [dict(m) for m in mappings]
         _expand_composites(mapper, mappings)
 
     connection = session_transaction.connection(base_mapper)
@@ -218,6 +243,7 @@ def _bulk_insert(
             state.key = (
                 identity_cls,
                 tuple([dict_[key] for key in identity_props]),
+                None,
             )
 
     if use_orm_insert_stmt is not None:
@@ -230,6 +256,7 @@ def _bulk_update(
     mapper: Mapper[Any],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     update_changed_only: bool,
     use_orm_update_stmt: Literal[None] = ...,
@@ -242,6 +269,7 @@ def _bulk_update(
     mapper: Mapper[Any],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     update_changed_only: bool,
     use_orm_update_stmt: Optional[dml.Update] = ...,
@@ -253,6 +281,7 @@ def _bulk_update(
     mapper: Mapper[Any],
     mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
     session_transaction: SessionTransaction,
+    *,
     isstates: bool,
     update_changed_only: bool,
     use_orm_update_stmt: Optional[dml.Update] = None,
@@ -590,6 +619,7 @@ class ORMDMLState(AbstractORMCompileState):
             querycontext = QueryContext(
                 compile_state.from_statement_ctx,
                 compile_state.select_statement,
+                statement,
                 params,
                 session,
                 load_options,
@@ -614,6 +644,7 @@ class BulkUDCompileState(ORMDMLState):
         _eval_condition = None
         _matched_rows = None
         _identity_token = None
+        _populate_existing: bool = False
 
     @classmethod
     def can_use_returning(
@@ -646,6 +677,7 @@ class BulkUDCompileState(ORMDMLState):
             {
                 "synchronize_session",
                 "autoflush",
+                "populate_existing",
                 "identity_token",
                 "is_delete_using",
                 "is_update_from",
@@ -830,53 +862,39 @@ class BulkUDCompileState(ORMDMLState):
         return return_crit
 
     @classmethod
-    def _interpret_returning_rows(cls, mapper, rows):
-        """translate from local inherited table columns to base mapper
-        primary key columns.
+    def _interpret_returning_rows(cls, result, mapper, rows):
+        """return rows that indicate PK cols in mapper.primary_key position
+        for RETURNING rows.
 
-        Joined inheritance mappers always establish the primary key in terms of
-        the base table.   When we UPDATE a sub-table, we can only get
-        RETURNING for the sub-table's columns.
+        Prior to 2.0.36, this method seemed to be written for some kind of
+        inheritance scenario but the scenario was unused for actual joined
+        inheritance, and the function instead seemed to perform some kind of
+        partial translation that would remove non-PK cols if the PK cols
+        happened to be first in the row, but not otherwise.  The joined
+        inheritance walk feature here seems to have never been used as it was
+        always skipped by the "local_table" check.
 
-        Here, we create a lookup from the local sub table's primary key
-        columns to the base table PK columns so that we can get identity
-        key values from RETURNING that's against the joined inheritance
-        sub-table.
-
-        the complexity here is to support more than one level deep of
-        inheritance, where we have to link columns to each other across
-        the inheritance hierarchy.
+        As of 2.0.36 the function strips away non-PK cols and provides the
+        PK cols for the table in mapper PK order.
 
         """
 
-        if mapper.local_table is not mapper.base_mapper.local_table:
-            return rows
+        try:
+            if mapper.local_table is not mapper.base_mapper.local_table:
+                # TODO: dive more into how a local table PK is used for fetch
+                # sync, not clear if this is correct as it depends on the
+                # downstream routine to fetch rows using
+                # local_table.primary_key order
+                pk_keys = result._tuple_getter(mapper.local_table.primary_key)
+            else:
+                pk_keys = result._tuple_getter(mapper.primary_key)
+        except KeyError:
+            # can't use these rows, they don't have PK cols in them
+            # this is an unusual case where the user would have used
+            # .return_defaults()
+            return []
 
-        # this starts as a mapping of
-        # local_pk_col: local_pk_col.
-        # we will then iteratively rewrite the "value" of the dict with
-        # each successive superclass column
-        local_pk_to_base_pk = {pk: pk for pk in mapper.local_table.primary_key}
-
-        for mp in mapper.iterate_to_root():
-            if mp.inherits is None:
-                break
-            elif mp.local_table is mp.inherits.local_table:
-                continue
-
-            t_to_e = dict(mp._table_to_equated[mp.inherits.local_table])
-            col_to_col = {sub_pk: super_pk for super_pk, sub_pk in t_to_e[mp]}
-            for pk, super_ in local_pk_to_base_pk.items():
-                local_pk_to_base_pk[pk] = col_to_col[super_]
-
-        lookup = {
-            local_pk_to_base_pk[lpk]: idx
-            for idx, lpk in enumerate(mapper.local_table.primary_key)
-        }
-        primary_key_convert = [
-            lookup[bpk] for bpk in mapper.base_mapper.primary_key
-        ]
-        return [tuple(row[idx] for idx in primary_key_convert) for row in rows]
+        return [pk_keys(row) for row in rows]
 
     @classmethod
     def _get_matched_objects_on_criteria(cls, update_options, states):
@@ -1439,6 +1457,9 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
 
         new_stmt = statement._clone()
 
+        if new_stmt.table._annotations["parententity"] is mapper:
+            new_stmt.table = mapper.local_table
+
         # note if the statement has _multi_values, these
         # are passed through to the new statement, which will then raise
         # InvalidRequestError because UPDATE doesn't support multi_values
@@ -1557,10 +1578,20 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
         bind_arguments: _BindArguments,
         conn: Connection,
     ) -> _result.Result:
+
         update_options = execution_options.get(
             "_sa_orm_update_options", cls.default_update_options
         )
 
+        if update_options._populate_existing:
+            load_options = execution_options.get(
+                "_sa_orm_load_options", QueryContext.default_load_options
+            )
+            load_options += {"_populate_existing": True}
+            execution_options = execution_options.union(
+                {"_sa_orm_load_options": load_options}
+            )
+
         if update_options._dml_strategy not in (
             "orm",
             "auto",
@@ -1716,7 +1747,10 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
             session,
             update_options,
             statement,
+            result.context.compiled_parameters[0],
             [(obj, state, dict_) for obj, state, dict_, _ in matched_objects],
+            result.prefetch_cols(),
+            result.postfetch_cols(),
         )
 
     @classmethod
@@ -1728,9 +1762,8 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
         returned_defaults_rows = result.returned_defaults_rows
         if returned_defaults_rows:
             pk_rows = cls._interpret_returning_rows(
-                target_mapper, returned_defaults_rows
+                result, target_mapper, returned_defaults_rows
             )
-
             matched_rows = [
                 tuple(row) + (update_options._identity_token,)
                 for row in pk_rows
@@ -1761,6 +1794,7 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
             session,
             update_options,
             statement,
+            result.context.compiled_parameters[0],
             [
                 (
                     obj,
@@ -1769,16 +1803,26 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
                 )
                 for obj in objs
             ],
+            result.prefetch_cols(),
+            result.postfetch_cols(),
         )
 
     @classmethod
     def _apply_update_set_values_to_objects(
-        cls, session, update_options, statement, matched_objects
+        cls,
+        session,
+        update_options,
+        statement,
+        effective_params,
+        matched_objects,
+        prefetch_cols,
+        postfetch_cols,
     ):
         """apply values to objects derived from an update statement, e.g.
         UPDATE..SET <values>
 
         """
+
         mapper = update_options._subject_mapper
         target_cls = mapper.class_
         evaluator_compiler = evaluator._EvaluatorCompiler(target_cls)
@@ -1801,7 +1845,35 @@ class BulkORMUpdate(BulkUDCompileState, UpdateDMLState):
         attrib = {k for k, v in resolved_keys_as_propnames}
 
         states = set()
+
+        to_prefetch = {
+            c
+            for c in prefetch_cols
+            if c.key in effective_params
+            and c in mapper._columntoproperty
+            and c.key not in evaluated_keys
+        }
+        to_expire = {
+            mapper._columntoproperty[c].key
+            for c in postfetch_cols
+            if c in mapper._columntoproperty
+        }.difference(evaluated_keys)
+
+        prefetch_transfer = [
+            (mapper._columntoproperty[c].key, c.key) for c in to_prefetch
+        ]
+
         for obj, state, dict_ in matched_objects:
+
+            dict_.update(
+                {
+                    col_to_prop: effective_params[c_key]
+                    for col_to_prop, c_key in prefetch_transfer
+                }
+            )
+
+            state._expire_attributes(state.dict, to_expire)
+
             to_evaluate = state.unmodified.intersection(evaluated_keys)
 
             for key in to_evaluate:
@@ -1858,6 +1930,9 @@ class BulkORMDelete(BulkUDCompileState, DeleteDMLState):
 
         new_stmt = statement._clone()
 
+        if new_stmt.table._annotations["parententity"] is mapper:
+            new_stmt.table = mapper.local_table
+
         new_crit = cls._adjust_for_extra_criteria(
             self.global_attributes, mapper
         )
@@ -2018,7 +2093,7 @@ class BulkORMDelete(BulkUDCompileState, DeleteDMLState):
 
         if returned_defaults_rows:
             pk_rows = cls._interpret_returning_rows(
-                target_mapper, returned_defaults_rows
+                result, target_mapper, returned_defaults_rows
             )
 
             matched_rows = [
diff --git a/libs/sqlalchemy/orm/clsregistry.py b/libs/sqlalchemy/orm/clsregistry.py
index 26113d8b2..70307ec76 100644
--- a/libs/sqlalchemy/orm/clsregistry.py
+++ b/libs/sqlalchemy/orm/clsregistry.py
@@ -1,5 +1,5 @@
 # orm/clsregistry.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -287,8 +287,9 @@ class _ModuleMarker(ClsRegistryToken):
 
     def _remove_item(self, name: str) -> None:
         self.contents.pop(name, None)
-        if not self.contents and self.parent is not None:
-            self.parent._remove_item(self.name)
+        if not self.contents:
+            if self.parent is not None:
+                self.parent._remove_item(self.name)
             _registries.discard(self)
 
     def resolve_attr(self, key: str) -> Union[_ModNS, Type[Any]]:
diff --git a/libs/sqlalchemy/orm/collections.py b/libs/sqlalchemy/orm/collections.py
index 6fefd787a..336b1133d 100644
--- a/libs/sqlalchemy/orm/collections.py
+++ b/libs/sqlalchemy/orm/collections.py
@@ -1,5 +1,5 @@
 # orm/collections.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -21,6 +21,8 @@ provided.  One is a bundle of generic decorators that map function arguments
 and return values to events::
 
   from sqlalchemy.orm.collections import collection
+
+
   class MyClass:
       # ...
 
@@ -32,7 +34,6 @@ and return values to events::
       def pop(self):
           return self.data.pop()
 
-
 The second approach is a bundle of targeted decorators that wrap appropriate
 append and remove notifiers around the mutation methods present in the
 standard Python ``list``, ``set`` and ``dict`` interfaces.  These could be
@@ -73,10 +74,11 @@ generally not needed.  Odds are, the extension method will delegate to a
 method that's already instrumented.  For example::
 
   class QueueIsh(list):
-     def push(self, item):
-         self.append(item)
-     def shift(self):
-         return self.pop(0)
+      def push(self, item):
+          self.append(item)
+
+      def shift(self):
+          return self.pop(0)
 
 There's no need to decorate these methods.  ``append`` and ``pop`` are already
 instrumented as part of the ``list`` interface.  Decorating them would fire
@@ -148,10 +150,12 @@ __all__ = [
     "keyfunc_mapping",
     "column_keyed_dict",
     "attribute_keyed_dict",
-    "column_keyed_dict",
-    "attribute_keyed_dict",
-    "MappedCollection",
     "KeyFuncDict",
+    # old names in < 2.0
+    "mapped_collection",
+    "column_mapped_collection",
+    "attribute_mapped_collection",
+    "MappedCollection",
 ]
 
 __instrumentation_mutex = threading.Lock()
@@ -193,9 +197,10 @@ class collection:
     The recipe decorators all require parens, even those that take no
     arguments::
 
-        @collection.adds('entity')
+        @collection.adds("entity")
         def insert(self, position, entity): ...
 
+
         @collection.removes_return()
         def popitem(self): ...
 
@@ -215,11 +220,13 @@ class collection:
             @collection.appender
             def add(self, append): ...
 
+
             # or, equivalently
             @collection.appender
             @collection.adds(1)
             def add(self, append): ...
 
+
             # for mapping type, an 'append' may kick out a previous value
             # that occupies that slot.  consider d['a'] = 'foo'- any previous
             # value in d['a'] is discarded.
@@ -259,10 +266,11 @@ class collection:
             @collection.remover
             def zap(self, entity): ...
 
+
             # or, equivalently
             @collection.remover
             @collection.removes_return()
-            def zap(self, ): ...
+            def zap(self): ...
 
         If the value to remove is not present in the collection, you may
         raise an exception or return None to ignore the error.
@@ -362,7 +370,8 @@ class collection:
             @collection.adds(1)
             def push(self, item): ...
 
-            @collection.adds('entity')
+
+            @collection.adds("entity")
             def do_stuff(self, thing, entity=None): ...
 
         """
diff --git a/libs/sqlalchemy/orm/context.py b/libs/sqlalchemy/orm/context.py
index 3056016e7..c09c03b78 100644
--- a/libs/sqlalchemy/orm/context.py
+++ b/libs/sqlalchemy/orm/context.py
@@ -1,5 +1,5 @@
 # orm/context.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -104,6 +104,7 @@ class QueryContext:
         "top_level_context",
         "compile_state",
         "query",
+        "user_passed_query",
         "params",
         "load_options",
         "bind_arguments",
@@ -148,6 +149,10 @@ class QueryContext:
         self,
         compile_state: CompileState,
         statement: Union[Select[Any], FromStatement[Any]],
+        user_passed_query: Union[
+            Select[Any],
+            FromStatement[Any],
+        ],
         params: _CoreSingleExecuteParams,
         session: Session,
         load_options: Union[
@@ -162,6 +167,13 @@ class QueryContext:
         self.bind_arguments = bind_arguments or _EMPTY_DICT
         self.compile_state = compile_state
         self.query = statement
+
+        # the query that the end user passed to Session.execute() or similar.
+        # this is usually the same as .query, except in the bulk_persistence
+        # routines where a separate FromStatement is manufactured in the
+        # compile stage; this allows differentiation in that case.
+        self.user_passed_query = user_passed_query
+
         self.session = session
         self.loaders_require_buffering = False
         self.loaders_require_uniquing = False
@@ -169,7 +181,7 @@ class QueryContext:
         self.top_level_context = load_options._sa_top_level_orm_context
 
         cached_options = compile_state.select_statement._with_options
-        uncached_options = statement._with_options
+        uncached_options = user_passed_query._with_options
 
         # see issue #7447 , #8399 for some background
         # propagated loader options will be present on loaded InstanceState
@@ -578,6 +590,7 @@ class ORMCompileState(AbstractORMCompileState):
         querycontext = QueryContext(
             compile_state,
             statement,
+            statement,
             params,
             session,
             load_options,
@@ -888,6 +901,8 @@ class FromStatement(GroupedElement, Generative, TypedReturnsRows[_TP]):
         ("_compile_options", InternalTraversal.dp_has_cache_key)
     ]
 
+    is_from_statement = True
+
     def __init__(
         self,
         entities: Iterable[_ColumnsClauseArgument[Any]],
@@ -905,6 +920,10 @@ class FromStatement(GroupedElement, Generative, TypedReturnsRows[_TP]):
         ]
         self.element = element
         self.is_dml = element.is_dml
+        self.is_select = element.is_select
+        self.is_delete = element.is_delete
+        self.is_insert = element.is_insert
+        self.is_update = element.is_update
         self._label_style = (
             element._label_style if is_select_base(element) else None
         )
@@ -1551,10 +1570,10 @@ class ORMSelectCompileState(ORMCompileState, SelectState):
         )
         statement._label_style = self.label_style
 
-        # Oracle however does not allow FOR UPDATE on the subquery,
-        # and the Oracle dialect ignores it, plus for PostgreSQL, MySQL
-        # we expect that all elements of the row are locked, so also put it
-        # on the outside (except in the case of PG when OF is used)
+        # Oracle Database however does not allow FOR UPDATE on the subquery,
+        # and the Oracle Database dialects ignore it, plus for PostgreSQL,
+        # MySQL we expect that all elements of the row are locked, so also put
+        # it on the outside (except in the case of PG when OF is used)
         if (
             self._for_update_arg is not None
             and self._for_update_arg.of is None
@@ -3044,7 +3063,10 @@ class _RawColumnEntity(_ColumnEntity):
         if not is_current_entities or column._is_text_clause:
             self._label_name = None
         else:
-            self._label_name = compile_state._label_convention(column)
+            if parent_bundle:
+                self._label_name = column._proxy_key
+            else:
+                self._label_name = compile_state._label_convention(column)
 
         if parent_bundle:
             parent_bundle._entities.append(self)
@@ -3138,9 +3160,12 @@ class _ORMColumnEntity(_ColumnEntity):
         self.raw_column_index = raw_column_index
 
         if is_current_entities:
-            self._label_name = compile_state._label_convention(
-                column, col_name=orm_key
-            )
+            if parent_bundle:
+                self._label_name = orm_key if orm_key else column._proxy_key
+            else:
+                self._label_name = compile_state._label_convention(
+                    column, col_name=orm_key
+                )
         else:
             self._label_name = None
 
diff --git a/libs/sqlalchemy/orm/decl_api.py b/libs/sqlalchemy/orm/decl_api.py
index 09128ea8f..c32851dea 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -14,7 +14,6 @@ import re
 import typing
 from typing import Any
 from typing import Callable
-from typing import cast
 from typing import ClassVar
 from typing import Dict
 from typing import FrozenSet
@@ -72,13 +71,16 @@ from ..sql.selectable import FromClause
 from ..util import hybridmethod
 from ..util import hybridproperty
 from ..util import typing as compat_typing
+from ..util import warn_deprecated
 from ..util.typing import CallableReference
+from ..util.typing import de_optionalize_union_types
 from ..util.typing import flatten_newtype
 from ..util.typing import is_generic
 from ..util.typing import is_literal
 from ..util.typing import is_newtype
 from ..util.typing import is_pep695
 from ..util.typing import Literal
+from ..util.typing import LITERAL_TYPES
 from ..util.typing import Self
 
 if TYPE_CHECKING:
@@ -207,7 +209,7 @@ def synonym_for(
     :paramref:`.orm.synonym.descriptor` parameter::
 
         class MyClass(Base):
-            __tablename__ = 'my_table'
+            __tablename__ = "my_table"
 
             id = Column(Integer, primary_key=True)
             _job_status = Column("job_status", String(50))
@@ -373,20 +375,21 @@ class declared_attr(interfaces._MappedAttribute[_T], _declared_attr_common):
     for subclasses::
 
         class Employee(Base):
-            __tablename__ = 'employee'
+            __tablename__ = "employee"
 
             id: Mapped[int] = mapped_column(primary_key=True)
             type: Mapped[str] = mapped_column(String(50))
 
             @declared_attr.directive
             def __mapper_args__(cls) -> Dict[str, Any]:
-                if cls.__name__ == 'Employee':
+                if cls.__name__ == "Employee":
                     return {
-                            "polymorphic_on":cls.type,
-                            "polymorphic_identity":"Employee"
+                        "polymorphic_on": cls.type,
+                        "polymorphic_identity": "Employee",
                     }
                 else:
-                    return {"polymorphic_identity":cls.__name__}
+                    return {"polymorphic_identity": cls.__name__}
+
 
         class Engineer(Employee):
             pass
@@ -485,6 +488,7 @@ def declarative_mixin(cls: Type[_T]) -> Type[_T]:
         from sqlalchemy.orm import declared_attr
         from sqlalchemy.orm import declarative_mixin
 
+
         @declarative_mixin
         class MyMixin:
 
@@ -492,10 +496,11 @@ def declarative_mixin(cls: Type[_T]) -> Type[_T]:
             def __tablename__(cls):
                 return cls.__name__.lower()
 
-            __table_args__ = {'mysql_engine': 'InnoDB'}
-            __mapper_args__= {'always_refresh': True}
+            __table_args__ = {"mysql_engine": "InnoDB"}
+            __mapper_args__ = {"always_refresh": True}
+
+            id = Column(Integer, primary_key=True)
 
-            id =  Column(Integer, primary_key=True)
 
         class MyModel(MyMixin, Base):
             name = Column(String(1000))
@@ -638,10 +643,10 @@ class DeclarativeBase(
 
         from sqlalchemy.orm import DeclarativeBase
 
+
         class Base(DeclarativeBase):
             pass
 
-
     The above ``Base`` class is now usable as the base for new declarative
     mappings.  The superclass makes use of the ``__init_subclass__()``
     method to set up new classes and metaclasses aren't used.
@@ -664,11 +669,12 @@ class DeclarativeBase(
         bigint = Annotated[int, "bigint"]
         my_metadata = MetaData()
 
+
         class Base(DeclarativeBase):
             metadata = my_metadata
             type_annotation_map = {
                 str: String().with_variant(String(255), "mysql", "mariadb"),
-                bigint: BigInteger()
+                bigint: BigInteger(),
             }
 
     Class-level attributes which may be specified include:
@@ -1221,42 +1227,34 @@ class registry:
 
         self.type_annotation_map.update(
             {
-                sub_type: sqltype
+                de_optionalize_union_types(typ): sqltype
                 for typ, sqltype in type_annotation_map.items()
-                for sub_type in compat_typing.expand_unions(
-                    typ, include_union=True, discard_none=True
-                )
             }
         )
 
     def _resolve_type(
-        self, python_type: _MatchedOnType
+        self, python_type: _MatchedOnType, _do_fallbacks: bool = True
     ) -> Optional[sqltypes.TypeEngine[Any]]:
-        search: Iterable[Tuple[_MatchedOnType, Type[Any]]]
         python_type_type: Type[Any]
+        search: Iterable[Tuple[_MatchedOnType, Type[Any]]]
 
         if is_generic(python_type):
             if is_literal(python_type):
-                python_type_type = cast("Type[Any]", python_type)
+                python_type_type = python_type  # type: ignore[assignment]
 
-                search = (  # type: ignore[assignment]
+                search = (
                     (python_type, python_type_type),
-                    (Literal, python_type_type),
+                    *((lt, python_type_type) for lt in LITERAL_TYPES),  # type: ignore[arg-type] # noqa: E501
                 )
             else:
                 python_type_type = python_type.__origin__
                 search = ((python_type, python_type_type),)
-        elif is_newtype(python_type):
-            python_type_type = flatten_newtype(python_type)
-            search = ((python_type, python_type_type),)
-        elif is_pep695(python_type):
-            python_type_type = python_type.__value__
-            flattened = None
-            search = ((python_type, python_type_type),)
-        else:
-            python_type_type = cast("Type[Any]", python_type)
-            flattened = None
+        elif isinstance(python_type, type):
+            python_type_type = python_type
             search = ((pt, pt) for pt in python_type_type.__mro__)
+        else:
+            python_type_type = python_type  # type: ignore[assignment]
+            search = ((python_type, python_type_type),)
 
         for pt, flattened in search:
             # we search through full __mro__ for types.  however...
@@ -1280,6 +1278,39 @@ class registry:
                 if resolved_sql_type is not None:
                     return resolved_sql_type
 
+        # 2.0 fallbacks
+        if _do_fallbacks:
+            python_type_to_check: Any = None
+            kind = None
+            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):
+                    python_type_to_check = python_type_to_check.__value__
+                python_type_to_check = de_optionalize_union_types(
+                    python_type_to_check
+                )
+                kind = "TypeAliasType"
+            if is_newtype(python_type):
+                python_type_to_check = flatten_newtype(python_type)
+                kind = "NewType"
+
+            if python_type_to_check is not None:
+                res_after_fallback = self._resolve_type(
+                    python_type_to_check, False
+                )
+                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",
+                    )
+                    return res_after_fallback
+
         return None
 
     @property
@@ -1472,6 +1503,7 @@ class registry:
 
             Base = mapper_registry.generate_base()
 
+
             class MyClass(Base):
                 __tablename__ = "my_table"
                 id = Column(Integer, primary_key=True)
@@ -1484,6 +1516,7 @@ class registry:
 
             mapper_registry = registry()
 
+
             class Base(metaclass=DeclarativeMeta):
                 __abstract__ = True
                 registry = mapper_registry
@@ -1649,9 +1682,10 @@ class registry:
 
             mapper_registry = registry()
 
+
             @mapper_registry.mapped
             class Foo:
-                __tablename__ = 'some_table'
+                __tablename__ = "some_table"
 
                 id = Column(Integer, primary_key=True)
                 name = Column(String)
@@ -1691,15 +1725,17 @@ class registry:
 
             mapper_registry = registry()
 
+
             @mapper_registry.as_declarative_base()
             class Base:
                 @declared_attr
                 def __tablename__(cls):
                     return cls.__name__.lower()
+
                 id = Column(Integer, primary_key=True)
 
-            class MyMappedClass(Base):
-                # ...
+
+            class MyMappedClass(Base): ...
 
         All keyword arguments passed to
         :meth:`_orm.registry.as_declarative_base` are passed
@@ -1729,12 +1765,14 @@ class registry:
 
             mapper_registry = registry()
 
+
             class Foo:
-                __tablename__ = 'some_table'
+                __tablename__ = "some_table"
 
                 id = Column(Integer, primary_key=True)
                 name = Column(String)
 
+
             mapper = mapper_registry.map_declaratively(Foo)
 
         This function is more conveniently invoked indirectly via either the
@@ -1787,12 +1825,14 @@ class registry:
             my_table = Table(
                 "my_table",
                 mapper_registry.metadata,
-                Column('id', Integer, primary_key=True)
+                Column("id", Integer, primary_key=True),
             )
 
+
             class MyClass:
                 pass
 
+
             mapper_registry.map_imperatively(MyClass, my_table)
 
         See the section :ref:`orm_imperative_mapping` for complete background
@@ -1839,15 +1879,17 @@ def as_declarative(**kw: Any) -> Callable[[Type[_T]], Type[_T]]:
 
         from sqlalchemy.orm import as_declarative
 
+
         @as_declarative()
         class Base:
             @declared_attr
             def __tablename__(cls):
                 return cls.__name__.lower()
+
             id = Column(Integer, primary_key=True)
 
-        class MyMappedClass(Base):
-            # ...
+
+        class MyMappedClass(Base): ...
 
     .. seealso::
 
diff --git a/libs/sqlalchemy/orm/decl_base.py b/libs/sqlalchemy/orm/decl_base.py
index 96530c3ac..c480994d8 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -65,11 +65,11 @@ from ..sql.schema import Column
 from ..sql.schema import Table
 from ..util import topological
 from ..util.typing import _AnnotationScanType
+from ..util.typing import get_args
 from ..util.typing import is_fwd_ref
 from ..util.typing import is_literal
 from ..util.typing import Protocol
 from ..util.typing import TypedDict
-from ..util.typing import typing_get_args
 
 if TYPE_CHECKING:
     from ._typing import _ClassDict
@@ -431,7 +431,7 @@ class _ImperativeMapperConfig(_MapperConfig):
 class _CollectedAnnotation(NamedTuple):
     raw_annotation: _AnnotationScanType
     mapped_container: Optional[Type[Mapped[Any]]]
-    extracted_mapped_annotation: Union[Type[Any], str]
+    extracted_mapped_annotation: Union[_AnnotationScanType, str]
     is_dataclass: bool
     attr_value: Any
     originating_module: str
@@ -453,6 +453,7 @@ class _ClassScanMapperConfig(_MapperConfig):
         "tablename",
         "mapper_args",
         "mapper_args_fn",
+        "table_fn",
         "inherits",
         "single",
         "allow_dataclass_fields",
@@ -759,7 +760,7 @@ class _ClassScanMapperConfig(_MapperConfig):
         _include_dunders = self._include_dunders
         mapper_args_fn = None
         table_args = inherited_table_args = None
-
+        table_fn = None
         tablename = None
         fixed_table = "__table__" in clsdict_view
 
@@ -840,6 +841,22 @@ class _ClassScanMapperConfig(_MapperConfig):
                         )
                         if not tablename and (not class_mapped or check_decl):
                             tablename = cls_as_Decl.__tablename__
+                    elif name == "__table__":
+                        check_decl = _check_declared_props_nocascade(
+                            obj, name, cls
+                        )
+                        # if a @declared_attr using "__table__" is detected,
+                        # wrap up a callable to look for "__table__" from
+                        # the final concrete class when we set up a table.
+                        # this was fixed by
+                        # #11509, regression in 2.0 from version 1.4.
+                        if check_decl and not table_fn:
+                            # don't even invoke __table__ until we're ready
+                            def _table_fn() -> FromClause:
+                                return cls_as_Decl.__table__
+
+                            table_fn = _table_fn
+
                     elif name == "__table_args__":
                         check_decl = _check_declared_props_nocascade(
                             obj, name, cls
@@ -856,9 +873,10 @@ class _ClassScanMapperConfig(_MapperConfig):
                             if base is not cls:
                                 inherited_table_args = True
                     else:
-                        # skip all other dunder names, which at the moment
-                        # should only be __table__
-                        continue
+                        # any other dunder names; should not be here
+                        # as we have tested for all four names in
+                        # _include_dunders
+                        assert False
                 elif class_mapped:
                     if _is_declarative_props(obj) and not obj._quiet:
                         util.warn(
@@ -1031,6 +1049,7 @@ class _ClassScanMapperConfig(_MapperConfig):
         self.table_args = table_args
         self.tablename = tablename
         self.mapper_args_fn = mapper_args_fn
+        self.table_fn = table_fn
 
     def _setup_dataclasses_transforms(self) -> None:
         dataclass_setup_arguments = self.dataclass_setup_arguments
@@ -1048,6 +1067,16 @@ class _ClassScanMapperConfig(_MapperConfig):
                 "'@registry.mapped_as_dataclass'"
             )
 
+        # can't create a dataclass if __table__ is already there. This would
+        # fail an assertion when calling _get_arguments_for_make_dataclass:
+        # assert False, "Mapped[] received without a mapping declaration"
+        if "__table__" in self.cls.__dict__:
+            raise exc.InvalidRequestError(
+                f"Class {self.cls} already defines a '__table__'. "
+                "ORM Annotated Dataclasses do not support a pre-existing "
+                "'__table__' element"
+            )
+
         warn_for_non_dc_attrs = collections.defaultdict(list)
 
         def _allow_dataclass_field(
@@ -1279,10 +1308,8 @@ class _ClassScanMapperConfig(_MapperConfig):
             type(attr_value),
             required=False,
             is_dataclass_field=is_dataclass_field,
-            expect_mapped=expect_mapped
-            and not is_dataclass,  # self.allow_dataclass_fields,
+            expect_mapped=expect_mapped and not is_dataclass,
         )
-
         if extracted is None:
             # ClassVar can come out here
             return None
@@ -1290,9 +1317,9 @@ class _ClassScanMapperConfig(_MapperConfig):
         extracted_mapped_annotation, mapped_container = extracted
 
         if attr_value is None and not is_literal(extracted_mapped_annotation):
-            for elem in typing_get_args(extracted_mapped_annotation):
-                if isinstance(elem, str) or is_fwd_ref(
-                    elem, check_generic=True
+            for elem in get_args(extracted_mapped_annotation):
+                if is_fwd_ref(
+                    elem, check_generic=True, check_for_plain_string=True
                 ):
                     elem = de_stringify_annotation(
                         self.cls,
@@ -1687,7 +1714,11 @@ class _ClassScanMapperConfig(_MapperConfig):
 
         manager = attributes.manager_of_class(cls)
 
-        if "__table__" not in clsdict_view and table is None:
+        if (
+            self.table_fn is None
+            and "__table__" not in clsdict_view
+            and table is None
+        ):
             if hasattr(cls, "__table_cls__"):
                 table_cls = cast(
                     Type[Table],
@@ -1733,7 +1764,12 @@ class _ClassScanMapperConfig(_MapperConfig):
                 )
         else:
             if table is None:
-                table = cls_as_Decl.__table__
+                if self.table_fn:
+                    table = self.set_cls_attribute(
+                        "__table__", self.table_fn()
+                    )
+                else:
+                    table = cls_as_Decl.__table__
             if declared_columns:
                 for c in declared_columns:
                     if not table.c.contains_column(c):
diff --git a/libs/sqlalchemy/orm/dependency.py b/libs/sqlalchemy/orm/dependency.py
index 71c06fbeb..595306245 100644
--- a/libs/sqlalchemy/orm/dependency.py
+++ b/libs/sqlalchemy/orm/dependency.py
@@ -1,5 +1,5 @@
 # orm/dependency.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/descriptor_props.py b/libs/sqlalchemy/orm/descriptor_props.py
index a3650f5f0..f01cc1788 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -53,9 +53,10 @@ from .. import util
 from ..sql import expression
 from ..sql import operators
 from ..sql.elements import BindParameter
+from ..util.typing import get_args
 from ..util.typing import is_fwd_ref
 from ..util.typing import is_pep593
-from ..util.typing import typing_get_args
+
 
 if typing.TYPE_CHECKING:
     from ._typing import _InstanceDict
@@ -364,7 +365,7 @@ class CompositeProperty(
         argument = extracted_mapped_annotation
 
         if is_pep593(argument):
-            argument = typing_get_args(argument)[0]
+            argument = get_args(argument)[0]
 
         if argument and self.composite_class is None:
             if isinstance(argument, str) or is_fwd_ref(
@@ -781,7 +782,9 @@ class CompositeProperty(
             elif isinstance(self.prop.composite_class, type) and isinstance(
                 value, self.prop.composite_class
             ):
-                values = self.prop._composite_values_from_instance(value)
+                values = self.prop._composite_values_from_instance(
+                    value  # type: ignore[arg-type]
+                )
             else:
                 raise sa_exc.ArgumentError(
                     "Can't UPDATE composite attribute %s to %r"
diff --git a/libs/sqlalchemy/orm/dynamic.py b/libs/sqlalchemy/orm/dynamic.py
index 7496e5c30..3c81c396f 100644
--- a/libs/sqlalchemy/orm/dynamic.py
+++ b/libs/sqlalchemy/orm/dynamic.py
@@ -1,5 +1,5 @@
 # orm/dynamic.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -161,10 +161,12 @@ class AppenderMixin(AbstractCollectionWriter[_T]):
 
             return result.IteratorResult(
                 result.SimpleResultMetaData([self.attr.class_.__name__]),
-                self.attr._get_collection_history(  # type: ignore[arg-type]
-                    attributes.instance_state(self.instance),
-                    PassiveFlag.PASSIVE_NO_INITIALIZE,
-                ).added_items,
+                iter(
+                    self.attr._get_collection_history(
+                        attributes.instance_state(self.instance),
+                        PassiveFlag.PASSIVE_NO_INITIALIZE,
+                    ).added_items
+                ),
                 _source_supports_scalars=True,
             ).scalars()
         else:
diff --git a/libs/sqlalchemy/orm/evaluator.py b/libs/sqlalchemy/orm/evaluator.py
index f2644548c..57aae5a3c 100644
--- a/libs/sqlalchemy/orm/evaluator.py
+++ b/libs/sqlalchemy/orm/evaluator.py
@@ -1,5 +1,5 @@
 # orm/evaluator.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,6 +28,7 @@ from .. import exc
 from .. import inspect
 from ..sql import and_
 from ..sql import operators
+from ..sql.sqltypes import Concatenable
 from ..sql.sqltypes import Integer
 from ..sql.sqltypes import Numeric
 from ..util import warn_deprecated
@@ -311,6 +312,16 @@ class _EvaluatorCompiler:
     def visit_concat_op_binary_op(
         self, operator, eval_left, eval_right, clause
     ):
+
+        if not issubclass(
+            clause.left.type._type_affinity, Concatenable
+        ) or not issubclass(clause.right.type._type_affinity, Concatenable):
+            raise UnevaluatableError(
+                f"Cannot evaluate concatenate operator "
+                f'"{operator.__name__}" for '
+                f"datatypes {clause.left.type}, {clause.right.type}"
+            )
+
         return self._straight_evaluate(
             lambda a, b: a + b, eval_left, eval_right, clause
         )
diff --git a/libs/sqlalchemy/orm/events.py b/libs/sqlalchemy/orm/events.py
index 2233d7ee1..f161760e6 100644
--- a/libs/sqlalchemy/orm/events.py
+++ b/libs/sqlalchemy/orm/events.py
@@ -1,5 +1,5 @@
 # orm/events.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -207,10 +207,12 @@ class InstanceEvents(event.Events[ClassManager[Any]]):
 
         from sqlalchemy import event
 
+
         def my_load_listener(target, context):
             print("on load!")
 
-        event.listen(SomeClass, 'load', my_load_listener)
+
+        event.listen(SomeClass, "load", my_load_listener)
 
     Available targets include:
 
@@ -466,8 +468,7 @@ class InstanceEvents(event.Events[ClassManager[Any]]):
             the existing loading context is maintained for the object after the
             event is called::
 
-                @event.listens_for(
-                    SomeClass, "load", restore_load_context=True)
+                @event.listens_for(SomeClass, "load", restore_load_context=True)
                 def on_load(instance, context):
                     instance.some_unloaded_attribute
 
@@ -502,7 +503,7 @@ class InstanceEvents(event.Events[ClassManager[Any]]):
 
             :meth:`.SessionEvents.loaded_as_persistent`
 
-        """
+        """  # noqa: E501
 
     def refresh(
         self, target: _O, context: QueryContext, attrs: Optional[Iterable[str]]
@@ -749,6 +750,7 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
         from sqlalchemy import event
 
+
         def my_before_insert_listener(mapper, connection, target):
             # execute a stored procedure upon INSERT,
             # apply the value to the row to be inserted
@@ -756,10 +758,10 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
                 text("select my_special_function(%d)" % target.special_number)
             ).scalar()
 
+
         # associate the listener function with SomeClass,
         # to execute during the "before_insert" hook
-        event.listen(
-            SomeClass, 'before_insert', my_before_insert_listener)
+        event.listen(SomeClass, "before_insert", my_before_insert_listener)
 
     Available targets include:
 
@@ -925,9 +927,10 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             Base = declarative_base()
 
+
             @event.listens_for(Base, "instrument_class", propagate=True)
             def on_new_class(mapper, cls_):
-                " ... "
+                "..."
 
         :param mapper: the :class:`_orm.Mapper` which is the target
          of this event.
@@ -983,7 +986,7 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
         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 he "new mappers" flag will remain set,
+        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.
@@ -992,7 +995,7 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
         :meth:`.MapperEvents.before_configured`,
         :meth:`.MapperEvents.after_configured`, and
         :meth:`.MapperEvents.mapper_configured`, the
-        :meth;`.MapperEvents.before_mapper_configured` event provides for a
+        :meth:`.MapperEvents.before_mapper_configured` event provides for a
         meaningful return value when it is registered with the ``retval=True``
         parameter.
 
@@ -1006,13 +1009,16 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             DontConfigureBase = declarative_base()
 
+
             @event.listens_for(
                 DontConfigureBase,
-                "before_mapper_configured", retval=True, propagate=True)
+                "before_mapper_configured",
+                retval=True,
+                propagate=True,
+            )
             def dont_configure(mapper, cls):
                 return EXT_SKIP
 
-
         .. seealso::
 
             :meth:`.MapperEvents.before_configured`
@@ -1094,9 +1100,9 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             from sqlalchemy.orm import Mapper
 
+
             @event.listens_for(Mapper, "before_configured")
-            def go():
-                ...
+            def go(): ...
 
         Contrast this event to :meth:`.MapperEvents.after_configured`,
         which is invoked after the series of mappers has been configured,
@@ -1114,10 +1120,9 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             from sqlalchemy.orm import mapper
 
-            @event.listens_for(mapper, "before_configured", once=True)
-            def go():
-                ...
 
+            @event.listens_for(mapper, "before_configured", once=True)
+            def go(): ...
 
         .. seealso::
 
@@ -1154,9 +1159,9 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             from sqlalchemy.orm import Mapper
 
+
             @event.listens_for(Mapper, "after_configured")
-            def go():
-                # ...
+            def go(): ...
 
         Theoretically this event is called once per
         application, but is actually called any time new mappers
@@ -1168,9 +1173,9 @@ class MapperEvents(event.Events[mapperlib.Mapper[Any]]):
 
             from sqlalchemy.orm import mapper
 
+
             @event.listens_for(mapper, "after_configured", once=True)
-            def go():
-                # ...
+            def go(): ...
 
         .. seealso::
 
@@ -1557,9 +1562,11 @@ class SessionEvents(event.Events[Session]):
         from sqlalchemy import event
         from sqlalchemy.orm import sessionmaker
 
+
         def my_before_commit(session):
             print("before commit!")
 
+
         Session = sessionmaker()
 
         event.listen(Session, "before_commit", my_before_commit)
@@ -1779,7 +1786,7 @@ class SessionEvents(event.Events[Session]):
                 @event.listens_for(session, "after_transaction_create")
                 def after_transaction_create(session, transaction):
                     if transaction.parent is None:
-                        # work with top-level transaction
+                        ...  # work with top-level transaction
 
          To detect if the :class:`.SessionTransaction` is a SAVEPOINT, use the
          :attr:`.SessionTransaction.nested` attribute::
@@ -1787,8 +1794,7 @@ class SessionEvents(event.Events[Session]):
                 @event.listens_for(session, "after_transaction_create")
                 def after_transaction_create(session, transaction):
                     if transaction.nested:
-                        # work with SAVEPOINT transaction
-
+                        ...  # work with SAVEPOINT transaction
 
         .. seealso::
 
@@ -1820,7 +1826,7 @@ class SessionEvents(event.Events[Session]):
                 @event.listens_for(session, "after_transaction_create")
                 def after_transaction_end(session, transaction):
                     if transaction.parent is None:
-                        # work with top-level transaction
+                        ...  # work with top-level transaction
 
          To detect if the :class:`.SessionTransaction` is a SAVEPOINT, use the
          :attr:`.SessionTransaction.nested` attribute::
@@ -1828,8 +1834,7 @@ class SessionEvents(event.Events[Session]):
                 @event.listens_for(session, "after_transaction_create")
                 def after_transaction_end(session, transaction):
                     if transaction.nested:
-                        # work with SAVEPOINT transaction
-
+                        ...  # work with SAVEPOINT transaction
 
         .. seealso::
 
@@ -1939,7 +1944,7 @@ class SessionEvents(event.Events[Session]):
             @event.listens_for(Session, "after_soft_rollback")
             def do_something(session, previous_transaction):
                 if session.is_active:
-                    session.execute("select * from some_table")
+                    session.execute(text("select * from some_table"))
 
         :param session: The target :class:`.Session`.
         :param previous_transaction: The :class:`.SessionTransaction`
@@ -2455,11 +2460,11 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
 
         from sqlalchemy import event
 
-        @event.listens_for(MyClass.collection, 'append', propagate=True)
+
+        @event.listens_for(MyClass.collection, "append", propagate=True)
         def my_append_listener(target, value, initiator):
             print("received append event for target: %s" % target)
 
-
     Listeners have the option to return a possibly modified version of the
     value, when the :paramref:`.AttributeEvents.retval` flag is passed to
     :func:`.event.listen` or :func:`.event.listens_for`, such as below,
@@ -2468,11 +2473,12 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
         def validate_phone(target, value, oldvalue, initiator):
             "Strip non-numeric characters from a phone number"
 
-            return re.sub(r'\D', '', value)
+            return re.sub(r"\D", "", value)
+
 
         # setup listener on UserContact.phone attribute, instructing
         # it to use the return value
-        listen(UserContact.phone, 'set', validate_phone, retval=True)
+        listen(UserContact.phone, "set", validate_phone, retval=True)
 
     A validation function like the above can also raise an exception
     such as :exc:`ValueError` to halt the operation.
@@ -2482,7 +2488,7 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
     as when using mapper inheritance patterns::
 
 
-        @event.listens_for(MySuperClass.attr, 'set', propagate=True)
+        @event.listens_for(MySuperClass.attr, "set", propagate=True)
         def receive_set(target, value, initiator):
             print("value set: %s" % target)
 
@@ -2715,10 +2721,12 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
 
             from sqlalchemy.orm.attributes import OP_BULK_REPLACE
 
+
             @event.listens_for(SomeObject.collection, "bulk_replace")
             def process_collection(target, values, initiator):
                 values[:] = [_make_value(value) for value in values]
 
+
             @event.listens_for(SomeObject.collection, "append", retval=True)
             def process_collection(target, value, initiator):
                 # make sure bulk_replace didn't already do it
@@ -2866,16 +2874,18 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
 
             SOME_CONSTANT = 3.1415926
 
+
             class MyClass(Base):
                 # ...
 
                 some_attribute = Column(Numeric, default=SOME_CONSTANT)
 
+
             @event.listens_for(
-                MyClass.some_attribute, "init_scalar",
-                retval=True, propagate=True)
+                MyClass.some_attribute, "init_scalar", retval=True, propagate=True
+            )
             def _init_some_attribute(target, dict_, value):
-                dict_['some_attribute'] = SOME_CONSTANT
+                dict_["some_attribute"] = SOME_CONSTANT
                 return SOME_CONSTANT
 
         Above, we initialize the attribute ``MyClass.some_attribute`` to the
@@ -2911,9 +2921,10 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
 
             SOME_CONSTANT = 3.1415926
 
+
             @event.listens_for(
-                MyClass.some_attribute, "init_scalar",
-                retval=True, propagate=True)
+                MyClass.some_attribute, "init_scalar", retval=True, propagate=True
+            )
             def _init_some_attribute(target, dict_, value):
                 # will also fire off attribute set events
                 target.some_attribute = SOME_CONSTANT
@@ -2950,7 +2961,7 @@ class AttributeEvents(event.Events[QueryableAttribute[Any]]):
             :ref:`examples_instrumentation` - see the
             ``active_column_defaults.py`` example.
 
-        """
+        """  # noqa: E501
 
     def init_collection(
         self,
@@ -3088,8 +3099,8 @@ class QueryEvents(event.Events[Query[Any]]):
             @event.listens_for(Query, "before_compile", retval=True)
             def no_deleted(query):
                 for desc in query.column_descriptions:
-                    if desc['type'] is User:
-                        entity = desc['entity']
+                    if desc["type"] is User:
+                        entity = desc["entity"]
                         query = query.filter(entity.deleted == False)
                 return query
 
@@ -3105,12 +3116,11 @@ class QueryEvents(event.Events[Query[Any]]):
         re-establish the query being cached, apply the event adding the
         ``bake_ok`` flag::
 
-            @event.listens_for(
-                Query, "before_compile", retval=True, bake_ok=True)
+            @event.listens_for(Query, "before_compile", retval=True, bake_ok=True)
             def my_event(query):
                 for desc in query.column_descriptions:
-                    if desc['type'] is User:
-                        entity = desc['entity']
+                    if desc["type"] is User:
+                        entity = desc["entity"]
                         query = query.filter(entity.deleted == False)
                 return query
 
@@ -3131,7 +3141,7 @@ class QueryEvents(event.Events[Query[Any]]):
 
             :ref:`baked_with_before_compile`
 
-        """
+        """  # noqa: E501
 
     def before_compile_update(
         self, query: Query[Any], update_context: BulkUpdate
@@ -3151,11 +3161,13 @@ class QueryEvents(event.Events[Query[Any]]):
             @event.listens_for(Query, "before_compile_update", retval=True)
             def no_deleted(query, update_context):
                 for desc in query.column_descriptions:
-                    if desc['type'] is User:
-                        entity = desc['entity']
+                    if desc["type"] is User:
+                        entity = desc["entity"]
                         query = query.filter(entity.deleted == False)
 
-                        update_context.values['timestamp'] = datetime.utcnow()
+                        update_context.values["timestamp"] = datetime.datetime.now(
+                            datetime.UTC
+                        )
                 return query
 
         The ``.values`` dictionary of the "update context" object can also
@@ -3183,7 +3195,7 @@ class QueryEvents(event.Events[Query[Any]]):
             :meth:`.QueryEvents.before_compile_delete`
 
 
-        """
+        """  # noqa: E501
 
     def before_compile_delete(
         self, query: Query[Any], delete_context: BulkDelete
@@ -3202,8 +3214,8 @@ class QueryEvents(event.Events[Query[Any]]):
             @event.listens_for(Query, "before_compile_delete", retval=True)
             def no_deleted(query, delete_context):
                 for desc in query.column_descriptions:
-                    if desc['type'] is User:
-                        entity = desc['entity']
+                    if desc["type"] is User:
+                        entity = desc["entity"]
                         query = query.filter(entity.deleted == False)
                 return query
 
diff --git a/libs/sqlalchemy/orm/exc.py b/libs/sqlalchemy/orm/exc.py
index 8ab831002..0494edf98 100644
--- a/libs/sqlalchemy/orm/exc.py
+++ b/libs/sqlalchemy/orm/exc.py
@@ -1,5 +1,5 @@
 # orm/exc.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,6 +16,7 @@ from typing import Type
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
+from .util import _mapper_property_as_plain_name
 from .. import exc as sa_exc
 from .. import util
 from ..exc import MultipleResultsFound  # noqa
@@ -191,8 +192,8 @@ class LoaderStrategyException(sa_exc.InvalidRequestError):
                 % (
                     util.clsname_as_plain_name(actual_strategy_type),
                     requesting_property,
-                    util.clsname_as_plain_name(applied_to_property_type),
-                    util.clsname_as_plain_name(applies_to),
+                    _mapper_property_as_plain_name(applied_to_property_type),
+                    _mapper_property_as_plain_name(applies_to),
                 ),
             )
 
diff --git a/libs/sqlalchemy/orm/identity.py b/libs/sqlalchemy/orm/identity.py
index 23682f7ef..1808b2d5e 100644
--- a/libs/sqlalchemy/orm/identity.py
+++ b/libs/sqlalchemy/orm/identity.py
@@ -1,5 +1,5 @@
 # orm/identity.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 e9fe84336..f87023f18 100644
--- a/libs/sqlalchemy/orm/instrumentation.py
+++ b/libs/sqlalchemy/orm/instrumentation.py
@@ -1,5 +1,5 @@
 # orm/instrumentation.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 2f090588f..b4462e545 100644
--- a/libs/sqlalchemy/orm/interfaces.py
+++ b/libs/sqlalchemy/orm/interfaces.py
@@ -1,5 +1,5 @@
 # orm/interfaces.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -149,13 +149,17 @@ class ORMColumnDescription(TypedDict):
 class _IntrospectsAnnotations:
     __slots__ = ()
 
+    @classmethod
+    def _mapper_property_name(cls) -> str:
+        return cls.__name__
+
     def found_in_pep593_annotated(self) -> Any:
         """return a copy of this object to use in declarative when the
         object is found inside of an Annotated object."""
 
         raise NotImplementedError(
-            f"Use of the {self.__class__} construct inside of an "
-            f"Annotated object is not yet supported."
+            f"Use of the {self._mapper_property_name()!r} "
+            "construct inside of an Annotated object is not yet supported."
         )
 
     def declarative_scan(
@@ -181,7 +185,8 @@ class _IntrospectsAnnotations:
         raise sa_exc.ArgumentError(
             f"Python typing annotation is required for attribute "
             f'"{cls.__name__}.{key}" when primary argument(s) for '
-            f'"{self.__class__.__name__}" construct are None or not present'
+            f'"{self._mapper_property_name()}" '
+            "construct are None or not present"
         )
 
 
@@ -201,6 +206,7 @@ class _AttributeOptions(NamedTuple):
     dataclasses_default_factory: Union[_NoArg, Callable[[], Any]]
     dataclasses_compare: Union[_NoArg, bool]
     dataclasses_kw_only: Union[_NoArg, bool]
+    dataclasses_hash: Union[_NoArg, bool, None]
 
     def _as_dataclass_field(self, key: str) -> Any:
         """Return a ``dataclasses.Field`` object given these arguments."""
@@ -218,6 +224,8 @@ class _AttributeOptions(NamedTuple):
             kw["compare"] = self.dataclasses_compare
         if self.dataclasses_kw_only is not _NoArg.NO_ARG:
             kw["kw_only"] = self.dataclasses_kw_only
+        if self.dataclasses_hash is not _NoArg.NO_ARG:
+            kw["hash"] = self.dataclasses_hash
 
         if "default" in kw and callable(kw["default"]):
             # callable defaults are ambiguous. deprecate them in favour of
@@ -297,6 +305,7 @@ _DEFAULT_ATTRIBUTE_OPTIONS = _AttributeOptions(
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
+    _NoArg.NO_ARG,
 )
 
 _DEFAULT_READONLY_ATTRIBUTE_OPTIONS = _AttributeOptions(
@@ -306,6 +315,7 @@ _DEFAULT_READONLY_ATTRIBUTE_OPTIONS = _AttributeOptions(
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
+    _NoArg.NO_ARG,
 )
 
 
@@ -675,27 +685,37 @@ class PropComparator(SQLORMOperations[_T_co], Generic[_T_co], ColumnOperators):
 
         # definition of custom PropComparator subclasses
 
-        from sqlalchemy.orm.properties import \
-                                ColumnProperty,\
-                                Composite,\
-                                Relationship
+        from sqlalchemy.orm.properties import (
+            ColumnProperty,
+            Composite,
+            Relationship,
+        )
+
 
         class MyColumnComparator(ColumnProperty.Comparator):
             def __eq__(self, other):
                 return self.__clause_element__() == other
 
+
         class MyRelationshipComparator(Relationship.Comparator):
             def any(self, expression):
                 "define the 'any' operation"
                 # ...
 
+
         class MyCompositeComparator(Composite.Comparator):
             def __gt__(self, other):
                 "redefine the 'greater than' operation"
 
-                return sql.and_(*[a>b for a, b in
-                                  zip(self.__clause_element__().clauses,
-                                      other.__composite_values__())])
+                return sql.and_(
+                    *[
+                        a > b
+                        for a, b in zip(
+                            self.__clause_element__().clauses,
+                            other.__composite_values__(),
+                        )
+                    ]
+                )
 
 
         # application of custom PropComparator subclasses
@@ -703,17 +723,22 @@ class PropComparator(SQLORMOperations[_T_co], Generic[_T_co], ColumnOperators):
         from sqlalchemy.orm import column_property, relationship, composite
         from sqlalchemy import Column, String
 
-        class SomeMappedClass(Base):
-            some_column = column_property(Column("some_column", String),
-                                comparator_factory=MyColumnComparator)
 
-            some_relationship = relationship(SomeOtherClass,
-                                comparator_factory=MyRelationshipComparator)
+        class SomeMappedClass(Base):
+            some_column = column_property(
+                Column("some_column", String),
+                comparator_factory=MyColumnComparator,
+            )
+
+            some_relationship = relationship(
+                SomeOtherClass, comparator_factory=MyRelationshipComparator
+            )
 
             some_composite = composite(
-                    Column("a", String), Column("b", String),
-                    comparator_factory=MyCompositeComparator
-                )
+                Column("a", String),
+                Column("b", String),
+                comparator_factory=MyCompositeComparator,
+            )
 
     Note that for column-level operator redefinition, it's usually
     simpler to define the operators at the Core level, using the
@@ -855,8 +880,9 @@ class PropComparator(SQLORMOperations[_T_co], Generic[_T_co], ColumnOperators):
 
         e.g.::
 
-            query.join(Company.employees.of_type(Engineer)).\
-               filter(Engineer.name=='foo')
+            query.join(Company.employees.of_type(Engineer)).filter(
+                Engineer.name == "foo"
+            )
 
         :param \class_: a class or mapper indicating that criterion will be
             against this specific subclass.
@@ -882,11 +908,11 @@ class PropComparator(SQLORMOperations[_T_co], Generic[_T_co], ColumnOperators):
 
 
             stmt = select(User).join(
-                User.addresses.and_(Address.email_address != 'foo')
+                User.addresses.and_(Address.email_address != "foo")
             )
 
             stmt = select(User).options(
-                joinedload(User.addresses.and_(Address.email_address != 'foo'))
+                joinedload(User.addresses.and_(Address.email_address != "foo"))
             )
 
         .. versionadded:: 1.4
diff --git a/libs/sqlalchemy/orm/loading.py b/libs/sqlalchemy/orm/loading.py
index 4e2cb8250..679286f54 100644
--- a/libs/sqlalchemy/orm/loading.py
+++ b/libs/sqlalchemy/orm/loading.py
@@ -1,5 +1,5 @@
 # orm/loading.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1010,21 +1010,38 @@ def _instance_processor(
             # loading does not apply
             assert only_load_props is None
 
-            callable_ = _load_subclass_via_in(
-                context,
-                path,
-                selectin_load_via,
-                _polymorphic_from,
-                option_entities,
-            )
-            PostLoad.callable_for_path(
-                context,
-                load_path,
-                selectin_load_via.mapper,
-                selectin_load_via,
-                callable_,
-                selectin_load_via,
-            )
+            if selectin_load_via.is_mapper:
+                _load_supers = []
+                _endmost_mapper = selectin_load_via
+                while (
+                    _endmost_mapper
+                    and _endmost_mapper is not _polymorphic_from
+                ):
+                    _load_supers.append(_endmost_mapper)
+                    _endmost_mapper = _endmost_mapper.inherits
+            else:
+                _load_supers = [selectin_load_via]
+
+            for _selectinload_entity in _load_supers:
+                if PostLoad.path_exists(
+                    context, load_path, _selectinload_entity
+                ):
+                    continue
+                callable_ = _load_subclass_via_in(
+                    context,
+                    path,
+                    _selectinload_entity,
+                    _polymorphic_from,
+                    option_entities,
+                )
+                PostLoad.callable_for_path(
+                    context,
+                    load_path,
+                    _selectinload_entity.mapper,
+                    _selectinload_entity,
+                    callable_,
+                    _selectinload_entity,
+                )
 
     post_load = PostLoad.for_context(context, load_path, only_load_props)
 
diff --git a/libs/sqlalchemy/orm/mapped_collection.py b/libs/sqlalchemy/orm/mapped_collection.py
index 13c6b689e..ca085c403 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,6 +29,8 @@ from .. import util
 from ..sql import coercions
 from ..sql import expression
 from ..sql import roles
+from ..util.langhelpers import Missing
+from ..util.langhelpers import MissingOr
 from ..util.typing import Literal
 
 if TYPE_CHECKING:
@@ -40,8 +42,6 @@ if TYPE_CHECKING:
 _KT = TypeVar("_KT", bound=Any)
 _VT = TypeVar("_VT", bound=Any)
 
-_F = TypeVar("_F", bound=Callable[[Any], Any])
-
 
 class _PlainColumnGetter(Generic[_KT]):
     """Plain column getter, stores collection of Column objects
@@ -70,7 +70,7 @@ class _PlainColumnGetter(Generic[_KT]):
     def _cols(self, mapper: Mapper[_KT]) -> Sequence[ColumnElement[_KT]]:
         return self.cols
 
-    def __call__(self, value: _KT) -> Union[_KT, Tuple[_KT, ...]]:
+    def __call__(self, value: _KT) -> MissingOr[Union[_KT, Tuple[_KT, ...]]]:
         state = base.instance_state(value)
         m = base._state_mapper(state)
 
@@ -83,7 +83,7 @@ class _PlainColumnGetter(Generic[_KT]):
         else:
             obj = key[0]
             if obj is None:
-                return _UNMAPPED_AMBIGUOUS_NONE
+                return Missing
             else:
                 return obj
 
@@ -198,9 +198,6 @@ def column_keyed_dict(
     )
 
 
-_UNMAPPED_AMBIGUOUS_NONE = object()
-
-
 class _AttrGetter:
     __slots__ = ("attr_name", "getter")
 
@@ -217,9 +214,9 @@ class _AttrGetter:
                 dict_ = state.dict
                 obj = dict_.get(self.attr_name, base.NO_VALUE)
                 if obj is None:
-                    return _UNMAPPED_AMBIGUOUS_NONE
+                    return Missing
             else:
-                return _UNMAPPED_AMBIGUOUS_NONE
+                return Missing
 
         return obj
 
@@ -277,7 +274,7 @@ def attribute_keyed_dict(
 
 
 def keyfunc_mapping(
-    keyfunc: _F,
+    keyfunc: Callable[[Any], Any],
     *,
     ignore_unpopulated_attribute: bool = False,
 ) -> Type[KeyFuncDict[_KT, Any]]:
@@ -353,7 +350,7 @@ class KeyFuncDict(Dict[_KT, _VT]):
 
     def __init__(
         self,
-        keyfunc: _F,
+        keyfunc: Callable[[Any], Any],
         *dict_args: Any,
         ignore_unpopulated_attribute: bool = False,
     ) -> None:
@@ -377,7 +374,7 @@ class KeyFuncDict(Dict[_KT, _VT]):
     @classmethod
     def _unreduce(
         cls,
-        keyfunc: _F,
+        keyfunc: Callable[[Any], Any],
         values: Dict[_KT, _KT],
         adapter: Optional[CollectionAdapter] = None,
     ) -> "KeyFuncDict[_KT, _KT]":
@@ -464,7 +461,7 @@ class KeyFuncDict(Dict[_KT, _VT]):
                 )
             else:
                 return
-        elif key is _UNMAPPED_AMBIGUOUS_NONE:
+        elif key is Missing:
             if not self.ignore_unpopulated_attribute:
                 self._raise_for_unpopulated(
                     value, _sa_initiator, warn_only=True
@@ -492,7 +489,7 @@ class KeyFuncDict(Dict[_KT, _VT]):
                     value, _sa_initiator, warn_only=False
                 )
             return
-        elif key is _UNMAPPED_AMBIGUOUS_NONE:
+        elif key is Missing:
             if not self.ignore_unpopulated_attribute:
                 self._raise_for_unpopulated(
                     value, _sa_initiator, warn_only=True
@@ -514,7 +511,7 @@ class KeyFuncDict(Dict[_KT, _VT]):
 
 
 def _mapped_collection_cls(
-    keyfunc: _F, ignore_unpopulated_attribute: bool
+    keyfunc: Callable[[Any], Any], ignore_unpopulated_attribute: bool
 ) -> Type[KeyFuncDict[_KT, _KT]]:
     class _MKeyfuncMapped(KeyFuncDict[_KT, _KT]):
         def __init__(self, *dict_args: Any) -> None:
diff --git a/libs/sqlalchemy/orm/mapper.py b/libs/sqlalchemy/orm/mapper.py
index 0caed0e2f..11010efbc 100644
--- a/libs/sqlalchemy/orm/mapper.py
+++ b/libs/sqlalchemy/orm/mapper.py
@@ -1,5 +1,5 @@
 # orm/mapper.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -296,6 +296,17 @@ class Mapper(
            particular primary key value. A "partial primary key" can occur if
            one has mapped to an OUTER JOIN, for example.
 
+           The :paramref:`.orm.Mapper.allow_partial_pks` parameter also
+           indicates to the ORM relationship lazy loader, when loading a
+           many-to-one related object, if a composite primary key that has
+           partial NULL values should result in an attempt to load from the
+           database, or if a load attempt is not necessary.
+
+           .. versionadded:: 2.0.36 :paramref:`.orm.Mapper.allow_partial_pks`
+              is consulted by the relationship lazy loader strategy, such that
+              when set to False, a SELECT for a composite primary key that
+              has partial NULL values will not be emitted.
+
         :param batch: Defaults to ``True``, indicating that save operations
            of multiple entities can be batched together for efficiency.
            Setting to False indicates
@@ -318,7 +329,7 @@ class Mapper(
 
                 class User(Base):
                     __table__ = user_table
-                    __mapper_args__ = {'column_prefix':'_'}
+                    __mapper_args__ = {"column_prefix": "_"}
 
            The above mapping will assign the ``user_id``, ``user_name``, and
            ``password`` columns to attributes named ``_user_id``,
@@ -442,7 +453,7 @@ class Mapper(
           mapping of the class to an alternate selectable, for loading
           only.
 
-         .. seealso::
+          .. seealso::
 
             :ref:`relationship_aliased_class` - the new pattern that removes
             the need for the :paramref:`_orm.Mapper.non_primary` flag.
@@ -534,14 +545,14 @@ class Mapper(
           base-most mapped :class:`.Table`::
 
             class Employee(Base):
-                __tablename__ = 'employee'
+                __tablename__ = "employee"
 
                 id: Mapped[int] = mapped_column(primary_key=True)
                 discriminator: Mapped[str] = mapped_column(String(50))
 
                 __mapper_args__ = {
-                    "polymorphic_on":discriminator,
-                    "polymorphic_identity":"employee"
+                    "polymorphic_on": discriminator,
+                    "polymorphic_identity": "employee",
                 }
 
           It may also be specified
@@ -550,17 +561,18 @@ class Mapper(
           approach::
 
             class Employee(Base):
-                __tablename__ = 'employee'
+                __tablename__ = "employee"
 
                 id: Mapped[int] = mapped_column(primary_key=True)
                 discriminator: Mapped[str] = mapped_column(String(50))
 
                 __mapper_args__ = {
-                    "polymorphic_on":case(
+                    "polymorphic_on": case(
                         (discriminator == "EN", "engineer"),
                         (discriminator == "MA", "manager"),
-                        else_="employee"),
-                    "polymorphic_identity":"employee"
+                        else_="employee",
+                    ),
+                    "polymorphic_identity": "employee",
                 }
 
           It may also refer to any attribute using its string name,
@@ -568,14 +580,14 @@ class Mapper(
           configurations::
 
                 class Employee(Base):
-                    __tablename__ = 'employee'
+                    __tablename__ = "employee"
 
                     id: Mapped[int] = mapped_column(primary_key=True)
                     discriminator: Mapped[str]
 
                     __mapper_args__ = {
                         "polymorphic_on": "discriminator",
-                        "polymorphic_identity": "employee"
+                        "polymorphic_identity": "employee",
                     }
 
           When setting ``polymorphic_on`` to reference an
@@ -592,6 +604,7 @@ class Mapper(
                 from sqlalchemy import event
                 from sqlalchemy.orm import object_mapper
 
+
                 @event.listens_for(Employee, "init", propagate=True)
                 def set_identity(instance, *arg, **kw):
                     mapper = object_mapper(instance)
@@ -3248,14 +3261,9 @@ class Mapper(
         The resulting structure is a dictionary of columns mapped
         to lists of equivalent columns, e.g.::
 
-            {
-                tablea.col1:
-                    {tableb.col1, tablec.col1},
-                tablea.col2:
-                    {tabled.col2}
-            }
+            {tablea.col1: {tableb.col1, tablec.col1}, tablea.col2: {tabled.col2}}
 
-        """
+        """  # noqa: E501
         result: _EquivalentColumnMap = {}
 
         def visit_binary(binary):
@@ -3728,14 +3736,15 @@ class Mapper(
 
         given::
 
-            class A:
-                ...
+            class A: ...
+
 
             class B(A):
                 __mapper_args__ = {"polymorphic_load": "selectin"}
 
-            class C(B):
-                ...
+
+            class C(B): ...
+
 
             class D(B):
                 __mapper_args__ = {"polymorphic_load": "selectin"}
@@ -3805,6 +3814,7 @@ class Mapper(
         this subclass as a SELECT with IN.
 
         """
+
         strategy_options = util.preloaded.orm_strategy_options
 
         assert self.inherits
@@ -3828,7 +3838,7 @@ class Mapper(
             classes_to_include.add(m)
             m = m.inherits
 
-        for prop in self.attrs:
+        for prop in self.column_attrs + self.relationships:
             # skip prop keys that are not instrumented on the mapped class.
             # this is primarily the "_sa_polymorphic_on" property that gets
             # created for an ad-hoc polymorphic_on SQL expression, issue #8704
diff --git a/libs/sqlalchemy/orm/path_registry.py b/libs/sqlalchemy/orm/path_registry.py
index 76484b3e6..a15f7f61b 100644
--- a/libs/sqlalchemy/orm/path_registry.py
+++ b/libs/sqlalchemy/orm/path_registry.py
@@ -1,5 +1,5 @@
 # orm/path_registry.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -35,7 +35,7 @@ from ..sql.cache_key import HasCacheKey
 
 if TYPE_CHECKING:
     from ._typing import _InternalEntityType
-    from .interfaces import MapperProperty
+    from .interfaces import StrategizedProperty
     from .mapper import Mapper
     from .relationships import RelationshipProperty
     from .util import AliasedInsp
@@ -57,13 +57,13 @@ else:
 _SerializedPath = List[Any]
 _StrPathToken = str
 _PathElementType = Union[
-    _StrPathToken, "_InternalEntityType[Any]", "MapperProperty[Any]"
+    _StrPathToken, "_InternalEntityType[Any]", "StrategizedProperty[Any]"
 ]
 
 # the representation is in fact
 # a tuple with alternating:
-# [_InternalEntityType[Any], Union[str, MapperProperty[Any]],
-# _InternalEntityType[Any], Union[str, MapperProperty[Any]], ...]
+# [_InternalEntityType[Any], Union[str, StrategizedProperty[Any]],
+# _InternalEntityType[Any], Union[str, StrategizedProperty[Any]], ...]
 # this might someday be a tuple of 2-tuples instead, but paths can be
 # chopped at odd intervals as well so this is less flexible
 _PathRepresentation = Tuple[_PathElementType, ...]
@@ -71,7 +71,7 @@ _PathRepresentation = Tuple[_PathElementType, ...]
 # NOTE: these names are weird since the array is 0-indexed,
 # the "_Odd" entries are at 0, 2, 4, etc
 _OddPathRepresentation = Sequence["_InternalEntityType[Any]"]
-_EvenPathRepresentation = Sequence[Union["MapperProperty[Any]", str]]
+_EvenPathRepresentation = Sequence[Union["StrategizedProperty[Any]", str]]
 
 
 log = logging.getLogger(__name__)
@@ -197,7 +197,9 @@ class PathRegistry(HasCacheKey):
     ) -> AbstractEntityRegistry: ...
 
     @overload
-    def __getitem__(self, entity: MapperProperty[Any]) -> PropRegistry: ...
+    def __getitem__(
+        self, entity: StrategizedProperty[Any]
+    ) -> PropRegistry: ...
 
     def __getitem__(
         self,
@@ -206,7 +208,7 @@ class PathRegistry(HasCacheKey):
             int,
             slice,
             _InternalEntityType[Any],
-            MapperProperty[Any],
+            StrategizedProperty[Any],
         ],
     ) -> Union[
         TokenRegistry,
@@ -225,7 +227,7 @@ class PathRegistry(HasCacheKey):
     def pairs(
         self,
     ) -> Iterator[
-        Tuple[_InternalEntityType[Any], Union[str, MapperProperty[Any]]]
+        Tuple[_InternalEntityType[Any], Union[str, StrategizedProperty[Any]]]
     ]:
         odd_path = cast(_OddPathRepresentation, self.path)
         even_path = cast(_EvenPathRepresentation, odd_path)
@@ -531,15 +533,16 @@ class PropRegistry(PathRegistry):
     inherit_cache = True
     is_property = True
 
-    prop: MapperProperty[Any]
+    prop: StrategizedProperty[Any]
     mapper: Optional[Mapper[Any]]
     entity: Optional[_InternalEntityType[Any]]
 
     def __init__(
-        self, parent: AbstractEntityRegistry, prop: MapperProperty[Any]
+        self, parent: AbstractEntityRegistry, prop: StrategizedProperty[Any]
     ):
+
         # restate this path in terms of the
-        # given MapperProperty's parent.
+        # given StrategizedProperty's parent.
         insp = cast("_InternalEntityType[Any]", parent[-1])
         natural_parent: AbstractEntityRegistry = parent
 
diff --git a/libs/sqlalchemy/orm/persistence.py b/libs/sqlalchemy/orm/persistence.py
index 369fc5998..cbe8557ad 100644
--- a/libs/sqlalchemy/orm/persistence.py
+++ b/libs/sqlalchemy/orm/persistence.py
@@ -1,5 +1,5 @@
 # orm/persistence.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/properties.py b/libs/sqlalchemy/orm/properties.py
index 7a5eb8625..a41c520cd 100644
--- a/libs/sqlalchemy/orm/properties.py
+++ b/libs/sqlalchemy/orm/properties.py
@@ -1,5 +1,5 @@
 # orm/properties.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -43,7 +43,6 @@ from .interfaces import PropComparator
 from .interfaces import StrategizedProperty
 from .relationships import RelationshipProperty
 from .util import de_stringify_annotation
-from .util import de_stringify_union_elements
 from .. import exc as sa_exc
 from .. import ForeignKey
 from .. import log
@@ -55,12 +54,12 @@ from ..sql.schema import Column
 from ..sql.schema import SchemaConst
 from ..sql.type_api import TypeEngine
 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_fwd_ref
-from ..util.typing import is_optional_union
 from ..util.typing import is_pep593
-from ..util.typing import is_union
+from ..util.typing import is_pep695
 from ..util.typing import Self
-from ..util.typing import typing_get_args
 
 if TYPE_CHECKING:
     from ._typing import _IdentityKeyType
@@ -279,8 +278,8 @@ class ColumnProperty(
 
                 name = Column(String(64))
                 extension = Column(String(8))
-                filename = column_property(name + '.' + extension)
-                path = column_property('C:/' + filename.expression)
+                filename = column_property(name + "." + extension)
+                path = column_property("C:/" + filename.expression)
 
         .. seealso::
 
@@ -688,7 +687,7 @@ class MappedColumn(
             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 # noqa: E501
+            column = self.column = supercls_mapper.local_table.c.get(  # type: ignore[assignment] # noqa: E501
                 colname, column
             )
 
@@ -737,47 +736,44 @@ class MappedColumn(
     ) -> None:
         sqltype = self.column.type
 
-        if isinstance(argument, str) or is_fwd_ref(
-            argument, check_generic=True
+        if is_fwd_ref(
+            argument, check_generic=True, check_for_plain_string=True
         ):
             assert originating_module is not None
             argument = de_stringify_annotation(
                 cls, argument, originating_module, include_generic=True
             )
 
-        if is_union(argument):
-            assert originating_module is not None
-            argument = de_stringify_union_elements(
-                cls, argument, originating_module
-            )
-
-        nullable = is_optional_union(argument)
+        nullable = includes_none(argument)
 
         if not self._has_nullable:
             self.column.nullable = nullable
 
         our_type = de_optionalize_union_types(argument)
 
-        use_args_from = None
+        find_mapped_in: Tuple[Any, ...] = ()
+        our_type_is_pep593 = False
+        raw_pep_593_type = None
 
         if is_pep593(our_type):
             our_type_is_pep593 = True
 
-            pep_593_components = typing_get_args(our_type)
+            pep_593_components = get_args(our_type)
             raw_pep_593_type = pep_593_components[0]
-            if is_optional_union(raw_pep_593_type):
+            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:]
 
-                nullable = True
-                if not self._has_nullable:
-                    self.column.nullable = nullable
-            for elem in pep_593_components[1:]:
-                if isinstance(elem, MappedColumn):
-                    use_args_from = elem
-                    break
+        use_args_from: Optional[MappedColumn[Any]]
+        for elem in find_mapped_in:
+            if isinstance(elem, MappedColumn):
+                use_args_from = elem
+                break
         else:
-            our_type_is_pep593 = False
-            raw_pep_593_type = None
+            use_args_from = None
 
         if use_args_from is not None:
             if (
@@ -851,6 +847,7 @@ class MappedColumn(
         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:
diff --git a/libs/sqlalchemy/orm/query.py b/libs/sqlalchemy/orm/query.py
index 77bce7884..c7e1ca8ad 100644
--- a/libs/sqlalchemy/orm/query.py
+++ b/libs/sqlalchemy/orm/query.py
@@ -1,5 +1,5 @@
 # orm/query.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -672,41 +672,38 @@ class Query(
 
             from sqlalchemy.orm import aliased
 
+
             class Part(Base):
-                __tablename__ = 'part'
+                __tablename__ = "part"
                 part = Column(String, primary_key=True)
                 sub_part = Column(String, primary_key=True)
                 quantity = Column(Integer)
 
-            included_parts = session.query(
-                            Part.sub_part,
-                            Part.part,
-                            Part.quantity).\
-                                filter(Part.part=="our part").\
-                                cte(name="included_parts", recursive=True)
+
+            included_parts = (
+                session.query(Part.sub_part, Part.part, Part.quantity)
+                .filter(Part.part == "our part")
+                .cte(name="included_parts", recursive=True)
+            )
 
             incl_alias = aliased(included_parts, name="pr")
             parts_alias = aliased(Part, name="p")
             included_parts = included_parts.union_all(
                 session.query(
-                    parts_alias.sub_part,
-                    parts_alias.part,
-                    parts_alias.quantity).\
-                        filter(parts_alias.part==incl_alias.c.sub_part)
-                )
+                    parts_alias.sub_part, parts_alias.part, parts_alias.quantity
+                ).filter(parts_alias.part == incl_alias.c.sub_part)
+            )
 
             q = session.query(
-                    included_parts.c.sub_part,
-                    func.sum(included_parts.c.quantity).
-                        label('total_quantity')
-                ).\
-                group_by(included_parts.c.sub_part)
+                included_parts.c.sub_part,
+                func.sum(included_parts.c.quantity).label("total_quantity"),
+            ).group_by(included_parts.c.sub_part)
 
         .. seealso::
 
             :meth:`_sql.Select.cte` - v2 equivalent method.
 
-        """
+        """  # noqa: E501
         return (
             self.enable_eagerloads(False)
             ._get_select_statement_only()
@@ -731,7 +728,7 @@ class Query(
         )
 
     @overload
-    def as_scalar(
+    def as_scalar(  # type: ignore[overload-overlap]
         self: Query[Tuple[_MAYBE_ENTITY]],
     ) -> ScalarSelect[_MAYBE_ENTITY]: ...
 
@@ -941,9 +938,7 @@ class Query(
            :attr:`_query.Query.statement` using :meth:`.Session.execute`::
 
                 result = session.execute(
-                    query
-                    .set_label_style(LABEL_STYLE_TABLENAME_PLUS_COL)
-                    .statement
+                    query.set_label_style(LABEL_STYLE_TABLENAME_PLUS_COL).statement
                 )
 
         .. versionadded:: 1.4
@@ -1052,8 +1047,7 @@ class Query(
 
             some_object = session.query(VersionedFoo).get((5, 10))
 
-            some_object = session.query(VersionedFoo).get(
-                {"id": 5, "version_id": 10})
+            some_object = session.query(VersionedFoo).get({"id": 5, "version_id": 10})
 
         :meth:`_query.Query.get` is special in that it provides direct
         access to the identity map of the owning :class:`.Session`.
@@ -1119,7 +1113,7 @@ class Query(
 
         :return: The object instance, or ``None``.
 
-        """
+        """  # noqa: E501
         self._no_criterion_assertion("get", order_by=False, distinct=False)
 
         # we still implement _get_impl() so that baked query can override
@@ -1563,19 +1557,22 @@ class Query(
 
             # Users, filtered on some arbitrary criterion
             # and then ordered by related email address
-            q = session.query(User).\
-                        join(User.address).\
-                        filter(User.name.like('%ed%')).\
-                        order_by(Address.email)
+            q = (
+                session.query(User)
+                .join(User.address)
+                .filter(User.name.like("%ed%"))
+                .order_by(Address.email)
+            )
 
             # given *only* User.id==5, Address.email, and 'q', what
             # would the *next* User in the result be ?
-            subq = q.with_entities(Address.email).\
-                        order_by(None).\
-                        filter(User.id==5).\
-                        subquery()
-            q = q.join((subq, subq.c.email < Address.email)).\
-                        limit(1)
+            subq = (
+                q.with_entities(Address.email)
+                .order_by(None)
+                .filter(User.id == 5)
+                .subquery()
+            )
+            q = q.join((subq, subq.c.email < Address.email)).limit(1)
 
         .. seealso::
 
@@ -1671,9 +1668,11 @@ class Query(
             def filter_something(criterion):
                 def transform(q):
                     return q.filter(criterion)
+
                 return transform
 
-            q = q.with_transformation(filter_something(x==5))
+
+            q = q.with_transformation(filter_something(x == 5))
 
         This allows ad-hoc recipes to be created for :class:`_query.Query`
         objects.
@@ -1710,6 +1709,7 @@ class Query(
         schema_translate_map: Optional[SchemaTranslateMapType] = ...,
         populate_existing: bool = False,
         autoflush: bool = False,
+        preserve_rowcount: bool = False,
         **opt: Any,
     ) -> Self: ...
 
@@ -1789,9 +1789,15 @@ class Query(
 
         E.g.::
 
-            q = sess.query(User).populate_existing().with_for_update(nowait=True, of=User)
+            q = (
+                sess.query(User)
+                .populate_existing()
+                .with_for_update(nowait=True, of=User)
+            )
 
-        The above query on a PostgreSQL backend will render like::
+        The above query on a PostgreSQL backend will render like:
+
+        .. sourcecode:: sql
 
             SELECT users.id AS users_id FROM users FOR UPDATE OF users NOWAIT
 
@@ -1869,14 +1875,13 @@ class Query(
 
         e.g.::
 
-            session.query(MyClass).filter(MyClass.name == 'some name')
+            session.query(MyClass).filter(MyClass.name == "some name")
 
         Multiple criteria may be specified as comma separated; the effect
         is that they will be joined together using the :func:`.and_`
         function::
 
-            session.query(MyClass).\
-                filter(MyClass.name == 'some name', MyClass.id > 5)
+            session.query(MyClass).filter(MyClass.name == "some name", MyClass.id > 5)
 
         The criterion is any SQL expression object applicable to the
         WHERE clause of a select.   String expressions are coerced
@@ -1889,7 +1894,7 @@ class Query(
 
             :meth:`_sql.Select.where` - v2 equivalent method.
 
-        """
+        """  # noqa: E501
         for crit in list(criterion):
             crit = coercions.expect(
                 roles.WhereHavingRole, crit, apply_propagate_attrs=self
@@ -1957,14 +1962,13 @@ class Query(
 
         e.g.::
 
-            session.query(MyClass).filter_by(name = 'some name')
+            session.query(MyClass).filter_by(name="some name")
 
         Multiple criteria may be specified as comma separated; the effect
         is that they will be joined together using the :func:`.and_`
         function::
 
-            session.query(MyClass).\
-                filter_by(name = 'some name', id = 5)
+            session.query(MyClass).filter_by(name="some name", id=5)
 
         The keyword expressions are extracted from the primary
         entity of the query, or the last entity that was the
@@ -2091,10 +2095,12 @@ class Query(
         HAVING criterion makes it possible to use filters on aggregate
         functions like COUNT, SUM, AVG, MAX, and MIN, eg.::
 
-            q = session.query(User.id).\
-                        join(User.addresses).\
-                        group_by(User.id).\
-                        having(func.count(Address.id) > 2)
+            q = (
+                session.query(User.id)
+                .join(User.addresses)
+                .group_by(User.id)
+                .having(func.count(Address.id) > 2)
+            )
 
         .. seealso::
 
@@ -2118,8 +2124,8 @@ class Query(
 
         e.g.::
 
-            q1 = sess.query(SomeClass).filter(SomeClass.foo=='bar')
-            q2 = sess.query(SomeClass).filter(SomeClass.bar=='foo')
+            q1 = sess.query(SomeClass).filter(SomeClass.foo == "bar")
+            q2 = sess.query(SomeClass).filter(SomeClass.bar == "foo")
 
             q3 = q1.union(q2)
 
@@ -2128,7 +2134,9 @@ class Query(
 
             x.union(y).union(z).all()
 
-        will nest on each ``union()``, and produces::
+        will nest on each ``union()``, and produces:
+
+        .. sourcecode:: sql
 
             SELECT * FROM (SELECT * FROM (SELECT * FROM X UNION
                             SELECT * FROM y) UNION SELECT * FROM Z)
@@ -2137,7 +2145,9 @@ class Query(
 
             x.union(y, z).all()
 
-        produces::
+        produces:
+
+        .. sourcecode:: sql
 
             SELECT * FROM (SELECT * FROM X UNION SELECT * FROM y UNION
                             SELECT * FROM Z)
@@ -2249,7 +2259,9 @@ class Query(
             q = session.query(User).join(User.addresses)
 
         Where above, the call to :meth:`_query.Query.join` along
-        ``User.addresses`` will result in SQL approximately equivalent to::
+        ``User.addresses`` will result in SQL approximately equivalent to:
+
+        .. sourcecode:: sql
 
             SELECT user.id, user.name
             FROM user JOIN address ON user.id = address.user_id
@@ -2262,10 +2274,12 @@ class Query(
         calls may be used.  The relationship-bound attribute implies both
         the left and right side of the join at once::
 
-            q = session.query(User).\
-                    join(User.orders).\
-                    join(Order.items).\
-                    join(Item.keywords)
+            q = (
+                session.query(User)
+                .join(User.orders)
+                .join(Order.items)
+                .join(Item.keywords)
+            )
 
         .. note:: as seen in the above example, **the order in which each
            call to the join() method occurs is important**.    Query would not,
@@ -2304,7 +2318,7 @@ class Query(
         as the ON clause to be passed explicitly.    A example that includes
         a SQL expression as the ON clause is as follows::
 
-            q = session.query(User).join(Address, User.id==Address.user_id)
+            q = session.query(User).join(Address, User.id == Address.user_id)
 
         The above form may also use a relationship-bound attribute as the
         ON clause as well::
@@ -2319,11 +2333,13 @@ class Query(
             a1 = aliased(Address)
             a2 = aliased(Address)
 
-            q = session.query(User).\
-                    join(a1, User.addresses).\
-                    join(a2, User.addresses).\
-                    filter(a1.email_address=='ed@foo.com').\
-                    filter(a2.email_address=='ed@bar.com')
+            q = (
+                session.query(User)
+                .join(a1, User.addresses)
+                .join(a2, User.addresses)
+                .filter(a1.email_address == "ed@foo.com")
+                .filter(a2.email_address == "ed@bar.com")
+            )
 
         The relationship-bound calling form can also specify a target entity
         using the :meth:`_orm.PropComparator.of_type` method; a query
@@ -2332,11 +2348,13 @@ class Query(
             a1 = aliased(Address)
             a2 = aliased(Address)
 
-            q = session.query(User).\
-                    join(User.addresses.of_type(a1)).\
-                    join(User.addresses.of_type(a2)).\
-                    filter(a1.email_address == 'ed@foo.com').\
-                    filter(a2.email_address == 'ed@bar.com')
+            q = (
+                session.query(User)
+                .join(User.addresses.of_type(a1))
+                .join(User.addresses.of_type(a2))
+                .filter(a1.email_address == "ed@foo.com")
+                .filter(a2.email_address == "ed@bar.com")
+            )
 
         **Augmenting Built-in ON Clauses**
 
@@ -2347,7 +2365,7 @@ class Query(
         with the default criteria using AND::
 
             q = session.query(User).join(
-                User.addresses.and_(Address.email_address != 'foo@bar.com')
+                User.addresses.and_(Address.email_address != "foo@bar.com")
             )
 
         .. versionadded:: 1.4
@@ -2360,29 +2378,28 @@ class Query(
         appropriate ``.subquery()`` method in order to make a subquery
         out of a query::
 
-            subq = session.query(Address).\
-                filter(Address.email_address == 'ed@foo.com').\
-                subquery()
-
-
-            q = session.query(User).join(
-                subq, User.id == subq.c.user_id
+            subq = (
+                session.query(Address)
+                .filter(Address.email_address == "ed@foo.com")
+                .subquery()
             )
 
+
+            q = session.query(User).join(subq, User.id == subq.c.user_id)
+
         Joining to a subquery in terms of a specific relationship and/or
         target entity may be achieved by linking the subquery to the
         entity using :func:`_orm.aliased`::
 
-            subq = session.query(Address).\
-                filter(Address.email_address == 'ed@foo.com').\
-                subquery()
+            subq = (
+                session.query(Address)
+                .filter(Address.email_address == "ed@foo.com")
+                .subquery()
+            )
 
             address_subq = aliased(Address, subq)
 
-            q = session.query(User).join(
-                User.addresses.of_type(address_subq)
-            )
-
+            q = session.query(User).join(User.addresses.of_type(address_subq))
 
         **Controlling what to Join From**
 
@@ -2390,11 +2407,16 @@ class Query(
         :class:`_query.Query` is not in line with what we want to join from,
         the :meth:`_query.Query.select_from` method may be used::
 
-            q = session.query(Address).select_from(User).\
-                            join(User.addresses).\
-                            filter(User.name == 'ed')
+            q = (
+                session.query(Address)
+                .select_from(User)
+                .join(User.addresses)
+                .filter(User.name == "ed")
+            )
 
-        Which will produce SQL similar to::
+        Which will produce SQL similar to:
+
+        .. sourcecode:: sql
 
             SELECT address.* FROM user
                 JOIN address ON user.id=address.user_id
@@ -2498,11 +2520,16 @@ class Query(
 
         A typical example::
 
-            q = session.query(Address).select_from(User).\
-                join(User.addresses).\
-                filter(User.name == 'ed')
+            q = (
+                session.query(Address)
+                .select_from(User)
+                .join(User.addresses)
+                .filter(User.name == "ed")
+            )
 
-        Which produces SQL equivalent to::
+        Which produces SQL equivalent to:
+
+        .. sourcecode:: sql
 
             SELECT address.* FROM user
             JOIN address ON user.id=address.user_id
@@ -2865,7 +2892,7 @@ class Query(
 
         Format is a list of dictionaries::
 
-            user_alias = aliased(User, name='user2')
+            user_alias = aliased(User, name="user2")
             q = sess.query(User, User.id, user_alias)
 
             # this expression:
@@ -2874,26 +2901,26 @@ class Query(
             # would return:
             [
                 {
-                    'name':'User',
-                    'type':User,
-                    'aliased':False,
-                    'expr':User,
-                    'entity': User
+                    "name": "User",
+                    "type": User,
+                    "aliased": False,
+                    "expr": User,
+                    "entity": User,
                 },
                 {
-                    'name':'id',
-                    'type':Integer(),
-                    'aliased':False,
-                    'expr':User.id,
-                    'entity': User
+                    "name": "id",
+                    "type": Integer(),
+                    "aliased": False,
+                    "expr": User.id,
+                    "entity": User,
                 },
                 {
-                    'name':'user2',
-                    'type':User,
-                    'aliased':True,
-                    'expr':user_alias,
-                    'entity': user_alias
-                }
+                    "name": "user2",
+                    "type": User,
+                    "aliased": True,
+                    "expr": user_alias,
+                    "entity": user_alias,
+                },
             ]
 
         .. seealso::
@@ -2938,6 +2965,7 @@ class Query(
             context = QueryContext(
                 compile_state,
                 compile_state.statement,
+                compile_state.statement,
                 self._params,
                 self.session,
                 self.load_options,
@@ -3001,10 +3029,12 @@ class Query(
 
         e.g.::
 
-            q = session.query(User).filter(User.name == 'fred')
+            q = session.query(User).filter(User.name == "fred")
             session.query(q.exists())
 
-        Producing SQL similar to::
+        Producing SQL similar to:
+
+        .. sourcecode:: sql
 
             SELECT EXISTS (
                 SELECT 1 FROM users WHERE users.name = :name_1
@@ -3053,7 +3083,9 @@ class Query(
         r"""Return a count of rows this the SQL formed by this :class:`Query`
         would return.
 
-        This generates the SQL for this Query as follows::
+        This generates the SQL for this Query as follows:
+
+        .. sourcecode:: sql
 
             SELECT count(1) AS count_1 FROM (
                 SELECT <rest of query follows...>
@@ -3093,8 +3125,7 @@ class Query(
 
             # return count of user "id" grouped
             # by "name"
-            session.query(func.count(User.id)).\
-                    group_by(User.name)
+            session.query(func.count(User.id)).group_by(User.name)
 
             from sqlalchemy import distinct
 
@@ -3112,7 +3143,9 @@ class Query(
         )
 
     def delete(
-        self, synchronize_session: SynchronizeSessionArgument = "auto"
+        self,
+        synchronize_session: SynchronizeSessionArgument = "auto",
+        delete_args: Optional[Dict[Any, Any]] = None,
     ) -> int:
         r"""Perform a DELETE with an arbitrary WHERE clause.
 
@@ -3120,11 +3153,11 @@ class Query(
 
         E.g.::
 
-            sess.query(User).filter(User.age == 25).\
-                delete(synchronize_session=False)
+            sess.query(User).filter(User.age == 25).delete(synchronize_session=False)
 
-            sess.query(User).filter(User.age == 25).\
-                delete(synchronize_session='evaluate')
+            sess.query(User).filter(User.age == 25).delete(
+                synchronize_session="evaluate"
+            )
 
         .. warning::
 
@@ -3137,6 +3170,13 @@ class Query(
          :ref:`orm_expression_update_delete` for a discussion of these
          strategies.
 
+        :param delete_args: Optional dictionary, if present will be passed
+         to the underlying :func:`_expression.delete` construct as the ``**kw``
+         for the object.  May be used to pass dialect-specific arguments such
+         as ``mysql_limit``.
+
+         .. versionadded:: 2.0.37
+
         :return: the count of rows matched as returned by the database's
           "row count" feature.
 
@@ -3144,9 +3184,9 @@ class Query(
 
             :ref:`orm_expression_update_delete`
 
-        """
+        """  # noqa: E501
 
-        bulk_del = BulkDelete(self)
+        bulk_del = BulkDelete(self, delete_args)
         if self.dispatch.before_compile_delete:
             for fn in self.dispatch.before_compile_delete:
                 new_query = fn(bulk_del.query, bulk_del)
@@ -3156,6 +3196,10 @@ class Query(
                 self = bulk_del.query
 
         delete_ = sql.delete(*self._raw_columns)  # type: ignore
+
+        if delete_args:
+            delete_ = delete_.with_dialect_options(**delete_args)
+
         delete_._where_criteria = self._where_criteria
         result: CursorResult[Any] = self.session.execute(
             delete_,
@@ -3182,11 +3226,13 @@ class Query(
 
         E.g.::
 
-            sess.query(User).filter(User.age == 25).\
-                update({User.age: User.age - 10}, synchronize_session=False)
+            sess.query(User).filter(User.age == 25).update(
+                {User.age: User.age - 10}, synchronize_session=False
+            )
 
-            sess.query(User).filter(User.age == 25).\
-                update({"age": User.age - 10}, synchronize_session='evaluate')
+            sess.query(User).filter(User.age == 25).update(
+                {"age": User.age - 10}, synchronize_session="evaluate"
+            )
 
         .. warning::
 
@@ -3209,9 +3255,8 @@ class Query(
          strategies.
 
         :param update_args: Optional dictionary, if present will be passed
-         to the underlying :func:`_expression.update`
-         construct as the ``**kw`` for
-         the object.  May be used to pass dialect-specific arguments such
+         to the underlying :func:`_expression.update` construct as the ``**kw``
+         for the object.  May be used to pass dialect-specific arguments such
          as ``mysql_limit``, as well as other special arguments such as
          :paramref:`~sqlalchemy.sql.expression.update.preserve_parameter_order`.
 
@@ -3297,6 +3342,7 @@ class Query(
         context = QueryContext(
             compile_state,
             compile_state.statement,
+            compile_state.statement,
             self._params,
             self.session,
             self.load_options,
@@ -3385,6 +3431,14 @@ class BulkUpdate(BulkUD):
 class BulkDelete(BulkUD):
     """BulkUD which handles DELETEs."""
 
+    def __init__(
+        self,
+        query: Query[Any],
+        delete_kwargs: Optional[Dict[Any, Any]],
+    ):
+        super().__init__(query)
+        self.delete_kwargs = delete_kwargs
+
 
 class RowReturningQuery(Query[Row[_TP]]):
     if TYPE_CHECKING:
diff --git a/libs/sqlalchemy/orm/relationships.py b/libs/sqlalchemy/orm/relationships.py
index 11ea59112..0d0bc7089 100644
--- a/libs/sqlalchemy/orm/relationships.py
+++ b/libs/sqlalchemy/orm/relationships.py
@@ -1,5 +1,5 @@
 # orm/relationships.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -19,6 +19,7 @@ import collections
 from collections import abc
 import dataclasses
 import inspect as _py_inspect
+import itertools
 import re
 import typing
 from typing import Any
@@ -26,6 +27,7 @@ from typing import Callable
 from typing import cast
 from typing import Collection
 from typing import Dict
+from typing import FrozenSet
 from typing import Generic
 from typing import Iterable
 from typing import Iterator
@@ -707,12 +709,16 @@ class RelationshipProperty(
         def __eq__(self, other: Any) -> ColumnElement[bool]:  # type: ignore[override]  # noqa: E501
             """Implement the ``==`` operator.
 
-            In a many-to-one context, such as::
+            In a many-to-one context, such as:
+
+            .. sourcecode:: text
 
               MyClass.some_prop == <some object>
 
             this will typically produce a
-            clause such as::
+            clause such as:
+
+            .. sourcecode:: text
 
               mytable.related_id == <some id>
 
@@ -875,11 +881,12 @@ class RelationshipProperty(
             An expression like::
 
                 session.query(MyClass).filter(
-                    MyClass.somereference.any(SomeRelated.x==2)
+                    MyClass.somereference.any(SomeRelated.x == 2)
                 )
 
+            Will produce a query like:
 
-            Will produce a query like::
+            .. sourcecode:: sql
 
                 SELECT * FROM my_table WHERE
                 EXISTS (SELECT 1 FROM related WHERE related.my_id=my_table.id
@@ -893,11 +900,11 @@ class RelationshipProperty(
             :meth:`~.Relationship.Comparator.any` is particularly
             useful for testing for empty collections::
 
-                session.query(MyClass).filter(
-                    ~MyClass.somereference.any()
-                )
+                session.query(MyClass).filter(~MyClass.somereference.any())
 
-            will produce::
+            will produce:
+
+            .. sourcecode:: sql
 
                 SELECT * FROM my_table WHERE
                 NOT (EXISTS (SELECT 1 FROM related WHERE
@@ -928,11 +935,12 @@ class RelationshipProperty(
             An expression like::
 
                 session.query(MyClass).filter(
-                    MyClass.somereference.has(SomeRelated.x==2)
+                    MyClass.somereference.has(SomeRelated.x == 2)
                 )
 
+            Will produce a query like:
 
-            Will produce a query like::
+            .. sourcecode:: sql
 
                 SELECT * FROM my_table WHERE
                 EXISTS (SELECT 1 FROM related WHERE
@@ -971,7 +979,9 @@ class RelationshipProperty(
 
                 MyClass.contains(other)
 
-            Produces a clause like::
+            Produces a clause like:
+
+            .. sourcecode:: sql
 
                 mytable.id == <some id>
 
@@ -991,7 +1001,9 @@ class RelationshipProperty(
 
                 query(MyClass).filter(MyClass.contains(other))
 
-            Produces a query like::
+            Produces a query like:
+
+            .. sourcecode:: sql
 
                 SELECT * FROM my_table, my_association_table AS
                 my_association_table_1 WHERE
@@ -1087,11 +1099,15 @@ class RelationshipProperty(
         def __ne__(self, other: Any) -> ColumnElement[bool]:  # type: ignore[override]  # noqa: E501
             """Implement the ``!=`` operator.
 
-            In a many-to-one context, such as::
+            In a many-to-one context, such as:
+
+            .. sourcecode:: text
 
               MyClass.some_prop != <some object>
 
-            This will typically produce a clause such as::
+            This will typically produce a clause such as:
+
+            .. sourcecode:: sql
 
               mytable.related_id != <some id>
 
@@ -1753,19 +1769,17 @@ class RelationshipProperty(
         argument = extracted_mapped_annotation
         assert originating_module is not None
 
-        is_write_only = mapped_container is not None and issubclass(
-            mapped_container, WriteOnlyMapped
-        )
-        if is_write_only:
-            self.lazy = "write_only"
-            self.strategy_key = (("lazy", self.lazy),)
-
-        is_dynamic = mapped_container is not None and issubclass(
-            mapped_container, DynamicMapped
-        )
-        if is_dynamic:
-            self.lazy = "dynamic"
-            self.strategy_key = (("lazy", self.lazy),)
+        if mapped_container is not None:
+            is_write_only = issubclass(mapped_container, WriteOnlyMapped)
+            is_dynamic = issubclass(mapped_container, DynamicMapped)
+            if is_write_only:
+                self.lazy = "write_only"
+                self.strategy_key = (("lazy", self.lazy),)
+            elif is_dynamic:
+                self.lazy = "dynamic"
+                self.strategy_key = (("lazy", self.lazy),)
+        else:
+            is_write_only = is_dynamic = False
 
         argument = de_optionalize_union_types(argument)
 
@@ -3235,6 +3249,15 @@ class JoinCondition:
             if annotation_set.issubset(col._annotations)
         }
 
+    @util.memoized_property
+    def _secondary_lineage_set(self) -> FrozenSet[ColumnElement[Any]]:
+        if self.secondary is not None:
+            return frozenset(
+                itertools.chain(*[c.proxy_set for c in self.secondary.c])
+            )
+        else:
+            return util.EMPTY_SET
+
     def join_targets(
         self,
         source_selectable: Optional[FromClause],
@@ -3285,23 +3308,25 @@ class JoinCondition:
 
         if extra_criteria:
 
-            def mark_unrelated_columns_as_ok_to_adapt(
+            def mark_exclude_cols(
                 elem: SupportsAnnotations, annotations: _AnnotationDict
             ) -> SupportsAnnotations:
-                """note unrelated columns in the "extra criteria" as OK
-                to adapt, even though they are not part of our "local"
-                or "remote" side.
+                """note unrelated columns in the "extra criteria" as either
+                should be adapted or not adapted, even though they are not
+                part of our "local" or "remote" side.
 
-                see #9779 for this case
+                see #9779 for this case, as well as #11010 for a follow up
 
                 """
 
                 parentmapper_for_element = elem._annotations.get(
                     "parentmapper", None
                 )
+
                 if (
                     parentmapper_for_element is not self.prop.parent
                     and parentmapper_for_element is not self.prop.mapper
+                    and elem not in self._secondary_lineage_set
                 ):
                     return _safe_annotate(elem, annotations)
                 else:
@@ -3310,8 +3335,8 @@ class JoinCondition:
             extra_criteria = tuple(
                 _deep_annotate(
                     elem,
-                    {"ok_to_adapt_in_join_condition": True},
-                    annotate_callable=mark_unrelated_columns_as_ok_to_adapt,
+                    {"should_not_adapt": True},
+                    annotate_callable=mark_exclude_cols,
                 )
                 for elem in extra_criteria
             )
@@ -3325,14 +3350,16 @@ class JoinCondition:
             if secondary is not None:
                 secondary = secondary._anonymous_fromclause(flat=True)
                 primary_aliasizer = ClauseAdapter(
-                    secondary, exclude_fn=_ColInAnnotations("local")
+                    secondary,
+                    exclude_fn=_local_col_exclude,
                 )
                 secondary_aliasizer = ClauseAdapter(
                     dest_selectable, equivalents=self.child_equivalents
                 ).chain(primary_aliasizer)
                 if source_selectable is not None:
                     primary_aliasizer = ClauseAdapter(
-                        secondary, exclude_fn=_ColInAnnotations("local")
+                        secondary,
+                        exclude_fn=_local_col_exclude,
                     ).chain(
                         ClauseAdapter(
                             source_selectable,
@@ -3344,14 +3371,14 @@ class JoinCondition:
             else:
                 primary_aliasizer = ClauseAdapter(
                     dest_selectable,
-                    exclude_fn=_ColInAnnotations("local"),
+                    exclude_fn=_local_col_exclude,
                     equivalents=self.child_equivalents,
                 )
                 if source_selectable is not None:
                     primary_aliasizer.chain(
                         ClauseAdapter(
                             source_selectable,
-                            exclude_fn=_ColInAnnotations("remote"),
+                            exclude_fn=_remote_col_exclude,
                             equivalents=self.parent_equivalents,
                         )
                     )
@@ -3430,25 +3457,29 @@ class JoinCondition:
 
 
 class _ColInAnnotations:
-    """Serializable object that tests for a name in c._annotations."""
+    """Serializable object that tests for names in c._annotations.
 
-    __slots__ = ("name",)
+    TODO: does this need to be serializable anymore?  can we find what the
+    use case was for that?
 
-    def __init__(self, name: str):
-        self.name = name
+    """
+
+    __slots__ = ("names",)
+
+    def __init__(self, *names: str):
+        self.names = frozenset(names)
 
     def __call__(self, c: ClauseElement) -> bool:
-        return (
-            self.name in c._annotations
-            or "ok_to_adapt_in_join_condition" in c._annotations
-        )
+        return bool(self.names.intersection(c._annotations))
 
 
-class Relationship(  # type: ignore
+_local_col_exclude = _ColInAnnotations("local", "should_not_adapt")
+_remote_col_exclude = _ColInAnnotations("remote", "should_not_adapt")
+
+
+class Relationship(
     RelationshipProperty[_T],
     _DeclarativeMapped[_T],
-    WriteOnlyMapped[_T],  # not compatible with Mapped[_T]
-    DynamicMapped[_T],  # not compatible with Mapped[_T]
 ):
     """Describes an object property that holds a single item or list
     of items that correspond to a related database table.
@@ -3466,3 +3497,18 @@ class Relationship(  # type: ignore
 
     inherit_cache = True
     """:meta private:"""
+
+
+class _RelationshipDeclared(  # type: ignore[misc]
+    Relationship[_T],
+    WriteOnlyMapped[_T],  # not compatible with Mapped[_T]
+    DynamicMapped[_T],  # not compatible with Mapped[_T]
+):
+    """Relationship subclass used implicitly for declarative mapping."""
+
+    inherit_cache = True
+    """:meta private:"""
+
+    @classmethod
+    def _mapper_property_name(cls) -> str:
+        return "Relationship"
diff --git a/libs/sqlalchemy/orm/scoping.py b/libs/sqlalchemy/orm/scoping.py
index 819616ae8..a0e9f17e4 100644
--- a/libs/sqlalchemy/orm/scoping.py
+++ b/libs/sqlalchemy/orm/scoping.py
@@ -1,5 +1,5 @@
 # orm/scoping.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -280,11 +280,13 @@ class scoped_session(Generic[_S]):
 
             Session = scoped_session(sessionmaker())
 
+
             class MyClass:
                 query: QueryPropertyDescriptor = Session.query_property()
 
+
             # after mappers are defined
-            result = MyClass.query.filter(MyClass.name=='foo').all()
+            result = MyClass.query.filter(MyClass.name == "foo").all()
 
         Produces instances of the session's configured query class by
         default.  To override and use a custom implementation, provide
@@ -730,9 +732,8 @@ class scoped_session(Generic[_S]):
         E.g.::
 
             from sqlalchemy import select
-            result = session.execute(
-                select(User).where(User.id == 5)
-            )
+
+            result = session.execute(select(User).where(User.id == 5))
 
         The API contract of :meth:`_orm.Session.execute` is similar to that
         of :meth:`_engine.Connection.execute`, the :term:`2.0 style` version
@@ -962,10 +963,7 @@ class scoped_session(Generic[_S]):
 
             some_object = session.get(VersionedFoo, (5, 10))
 
-            some_object = session.get(
-                VersionedFoo,
-                {"id": 5, "version_id": 10}
-            )
+            some_object = session.get(VersionedFoo, {"id": 5, "version_id": 10})
 
         .. versionadded:: 1.4 Added :meth:`_orm.Session.get`, which is moved
            from the now legacy :meth:`_orm.Query.get` method.
@@ -1228,7 +1226,7 @@ class scoped_session(Generic[_S]):
 
         This method retrieves the history for each instrumented
         attribute on the instance and performs a comparison of the current
-        value to its previously committed value, if any.
+        value to its previously flushed or committed value, if any.
 
         It is in effect a more expensive and accurate
         version of checking for the given instance in the
diff --git a/libs/sqlalchemy/orm/session.py b/libs/sqlalchemy/orm/session.py
index 3eba5aaf4..6cd7cd633 100644
--- a/libs/sqlalchemy/orm/session.py
+++ b/libs/sqlalchemy/orm/session.py
@@ -1,5 +1,5 @@
 # orm/session.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -575,22 +575,67 @@ class ORMExecuteState(util.MemoizedSlots):
 
     @property
     def is_select(self) -> bool:
-        """return True if this is a SELECT operation."""
+        """return True if this is a SELECT operation.
+
+        .. versionchanged:: 2.0.30 - the attribute is also True for a
+           :meth:`_sql.Select.from_statement` construct that is itself against
+           a :class:`_sql.Select` construct, such as
+           ``select(Entity).from_statement(select(..))``
+
+        """
         return self.statement.is_select
 
+    @property
+    def is_from_statement(self) -> bool:
+        """return True if this operation is a
+        :meth:`_sql.Select.from_statement` operation.
+
+        This is independent from :attr:`_orm.ORMExecuteState.is_select`, as a
+        ``select().from_statement()`` construct can be used with
+        INSERT/UPDATE/DELETE RETURNING types of statements as well.
+        :attr:`_orm.ORMExecuteState.is_select` will only be set if the
+        :meth:`_sql.Select.from_statement` is itself against a
+        :class:`_sql.Select` construct.
+
+        .. versionadded:: 2.0.30
+
+        """
+        return self.statement.is_from_statement
+
     @property
     def is_insert(self) -> bool:
-        """return True if this is an INSERT operation."""
+        """return True if this is an INSERT operation.
+
+        .. versionchanged:: 2.0.30 - the attribute is also True for a
+           :meth:`_sql.Select.from_statement` construct that is itself against
+           a :class:`_sql.Insert` construct, such as
+           ``select(Entity).from_statement(insert(..))``
+
+        """
         return self.statement.is_dml and self.statement.is_insert
 
     @property
     def is_update(self) -> bool:
-        """return True if this is an UPDATE operation."""
+        """return True if this is an UPDATE operation.
+
+        .. versionchanged:: 2.0.30 - the attribute is also True for a
+           :meth:`_sql.Select.from_statement` construct that is itself against
+           a :class:`_sql.Update` construct, such as
+           ``select(Entity).from_statement(update(..))``
+
+        """
         return self.statement.is_dml and self.statement.is_update
 
     @property
     def is_delete(self) -> bool:
-        """return True if this is a DELETE operation."""
+        """return True if this is a DELETE operation.
+
+        .. versionchanged:: 2.0.30 - the attribute is also True for a
+           :meth:`_sql.Select.from_statement` construct that is itself against
+           a :class:`_sql.Delete` construct, such as
+           ``select(Entity).from_statement(delete(..))``
+
+        """
         return self.statement.is_dml and self.statement.is_delete
 
     @property
@@ -1166,6 +1211,17 @@ class SessionTransaction(_StateChange, TransactionalContext):
                         else:
                             join_transaction_mode = "rollback_only"
 
+                        if local_connect:
+                            util.warn(
+                                "The engine provided as bind produced a "
+                                "connection that is already in a transaction. "
+                                "This is usually caused by a core event, "
+                                "such as 'engine_connect', that has left a "
+                                "transaction open. The effective join "
+                                "transaction mode used by this session is "
+                                f"{join_transaction_mode!r}. To silence this "
+                                "warning, do not leave transactions open"
+                            )
                     if join_transaction_mode in (
                         "control_fully",
                         "rollback_only",
@@ -1513,12 +1569,16 @@ class Session(_SessionClassMethods, EventTarget):
            operation.    The complete heuristics for resolution are
            described at :meth:`.Session.get_bind`.  Usage looks like::
 
-            Session = sessionmaker(binds={
-                SomeMappedClass: create_engine('postgresql+psycopg2://engine1'),
-                SomeDeclarativeBase: create_engine('postgresql+psycopg2://engine2'),
-                some_mapper: create_engine('postgresql+psycopg2://engine3'),
-                some_table: create_engine('postgresql+psycopg2://engine4'),
-                })
+            Session = sessionmaker(
+                binds={
+                    SomeMappedClass: create_engine("postgresql+psycopg2://engine1"),
+                    SomeDeclarativeBase: create_engine(
+                        "postgresql+psycopg2://engine2"
+                    ),
+                    some_mapper: create_engine("postgresql+psycopg2://engine3"),
+                    some_table: create_engine("postgresql+psycopg2://engine4"),
+                }
+            )
 
            .. seealso::
 
@@ -1713,7 +1773,7 @@ class Session(_SessionClassMethods, EventTarget):
 
         # the idea is that at some point NO_ARG will warn that in the future
         # the default will switch to close_resets_only=False.
-        if close_resets_only or close_resets_only is _NoArg.NO_ARG:
+        if close_resets_only in (True, _NoArg.NO_ARG):
             self._close_state = _SessionCloseState.CLOSE_IS_RESET
         else:
             self._close_state = _SessionCloseState.ACTIVE
@@ -2260,9 +2320,8 @@ class Session(_SessionClassMethods, EventTarget):
         E.g.::
 
             from sqlalchemy import select
-            result = session.execute(
-                select(User).where(User.id == 5)
-            )
+
+            result = session.execute(select(User).where(User.id == 5))
 
         The API contract of :meth:`_orm.Session.execute` is similar to that
         of :meth:`_engine.Connection.execute`, the :term:`2.0 style` version
@@ -2914,7 +2973,7 @@ class Session(_SessionClassMethods, EventTarget):
 
         e.g.::
 
-            obj = session._identity_lookup(inspect(SomeClass), (1, ))
+            obj = session._identity_lookup(inspect(SomeClass), (1,))
 
         :param mapper: mapper in use
         :param primary_key_identity: the primary key we are searching for, as
@@ -2985,7 +3044,8 @@ class Session(_SessionClassMethods, EventTarget):
     @util.langhelpers.tag_method_for_warnings(
         "This warning originated from the Session 'autoflush' process, "
         "which was invoked automatically in response to a user-initiated "
-        "operation.",
+        "operation. Consider using ``no_autoflush`` context manager if this "
+        "warning happended while initializing objects.",
         sa_exc.SAWarning,
     )
     def _autoflush(self) -> None:
@@ -3541,10 +3601,7 @@ class Session(_SessionClassMethods, EventTarget):
 
             some_object = session.get(VersionedFoo, (5, 10))
 
-            some_object = session.get(
-                VersionedFoo,
-                {"id": 5, "version_id": 10}
-            )
+            some_object = session.get(VersionedFoo, {"id": 5, "version_id": 10})
 
         .. versionadded:: 1.4 Added :meth:`_orm.Session.get`, which is moved
            from the now legacy :meth:`_orm.Query.get` method.
@@ -3633,7 +3690,7 @@ class Session(_SessionClassMethods, EventTarget):
 
         :return: The object instance, or ``None``.
 
-        """
+        """  # noqa: E501
         return self._get_impl(
             entity,
             ident,
@@ -4529,11 +4586,11 @@ class Session(_SessionClassMethods, EventTarget):
             self._bulk_save_mappings(
                 mapper,
                 states,
-                isupdate,
-                True,
-                return_defaults,
-                update_changed_only,
-                False,
+                isupdate=isupdate,
+                isstates=True,
+                return_defaults=return_defaults,
+                update_changed_only=update_changed_only,
+                render_nulls=False,
             )
 
     def bulk_insert_mappings(
@@ -4612,11 +4669,11 @@ class Session(_SessionClassMethods, EventTarget):
         self._bulk_save_mappings(
             mapper,
             mappings,
-            False,
-            False,
-            return_defaults,
-            False,
-            render_nulls,
+            isupdate=False,
+            isstates=False,
+            return_defaults=return_defaults,
+            update_changed_only=False,
+            render_nulls=render_nulls,
         )
 
     def bulk_update_mappings(
@@ -4658,13 +4715,20 @@ class Session(_SessionClassMethods, EventTarget):
 
         """
         self._bulk_save_mappings(
-            mapper, mappings, True, False, False, False, False
+            mapper,
+            mappings,
+            isupdate=True,
+            isstates=False,
+            return_defaults=False,
+            update_changed_only=False,
+            render_nulls=False,
         )
 
     def _bulk_save_mappings(
         self,
         mapper: Mapper[_O],
         mappings: Union[Iterable[InstanceState[_O]], Iterable[Dict[str, Any]]],
+        *,
         isupdate: bool,
         isstates: bool,
         return_defaults: bool,
@@ -4681,17 +4745,17 @@ class Session(_SessionClassMethods, EventTarget):
                     mapper,
                     mappings,
                     transaction,
-                    isstates,
-                    update_changed_only,
+                    isstates=isstates,
+                    update_changed_only=update_changed_only,
                 )
             else:
                 bulk_persistence._bulk_insert(
                     mapper,
                     mappings,
                     transaction,
-                    isstates,
-                    return_defaults,
-                    render_nulls,
+                    isstates=isstates,
+                    return_defaults=return_defaults,
+                    render_nulls=render_nulls,
                 )
             transaction.commit()
 
@@ -4709,7 +4773,7 @@ class Session(_SessionClassMethods, EventTarget):
 
         This method retrieves the history for each instrumented
         attribute on the instance and performs a comparison of the current
-        value to its previously committed value, if any.
+        value to its previously flushed or committed value, if any.
 
         It is in effect a more expensive and accurate
         version of checking for the given instance in the
@@ -4879,7 +4943,7 @@ class sessionmaker(_SessionClassMethods, Generic[_S]):
 
         # an Engine, which the Session will use for connection
         # resources
-        engine = create_engine('postgresql+psycopg2://scott:tiger@localhost/')
+        engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/")
 
         Session = sessionmaker(engine)
 
@@ -4932,7 +4996,7 @@ class sessionmaker(_SessionClassMethods, Generic[_S]):
 
         with engine.connect() as connection:
             with Session(bind=connection) as session:
-                # work with session
+                ...  # work with session
 
     The class also includes a method :meth:`_orm.sessionmaker.configure`, which
     can be used to specify additional keyword arguments to the factory, which
@@ -4947,7 +5011,7 @@ class sessionmaker(_SessionClassMethods, Generic[_S]):
 
         # ... later, when an engine URL is read from a configuration
         # file or other events allow the engine to be created
-        engine = create_engine('sqlite:///foo.db')
+        engine = create_engine("sqlite:///foo.db")
         Session.configure(bind=engine)
 
         sess = Session()
@@ -5085,7 +5149,7 @@ class sessionmaker(_SessionClassMethods, Generic[_S]):
 
             Session = sessionmaker()
 
-            Session.configure(bind=create_engine('sqlite://'))
+            Session.configure(bind=create_engine("sqlite://"))
         """
         self.kw.update(new_kw)
 
diff --git a/libs/sqlalchemy/orm/state.py b/libs/sqlalchemy/orm/state.py
index 03b81f904..d4bbf9209 100644
--- a/libs/sqlalchemy/orm/state.py
+++ b/libs/sqlalchemy/orm/state.py
@@ -1,5 +1,5 @@
 # orm/state.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -98,7 +98,7 @@ class _InstallLoaderCallableProto(Protocol[_O]):
 
 @inspection._self_inspects
 class InstanceState(interfaces.InspectionAttrInfo, Generic[_O]):
-    """tracks state information at the instance level.
+    """Tracks state information at the instance level.
 
     The :class:`.InstanceState` is a key object used by the
     SQLAlchemy ORM in order to track the state of an object;
@@ -148,7 +148,14 @@ class InstanceState(interfaces.InspectionAttrInfo, Generic[_O]):
     committed_state: Dict[str, Any]
 
     modified: bool = False
+    """When ``True`` the object was modified."""
     expired: bool = False
+    """When ``True`` the object is :term:`expired`.
+
+    .. seealso::
+
+        :ref:`session_expire`
+    """
     _deleted: bool = False
     _load_pending: bool = False
     _orphaned_outside_of_session: bool = False
@@ -169,11 +176,12 @@ class InstanceState(interfaces.InspectionAttrInfo, Generic[_O]):
 
     expired_attributes: Set[str]
     """The set of keys which are 'expired' to be loaded by
-       the manager's deferred scalar loader, assuming no pending
-       changes.
+    the manager's deferred scalar loader, assuming no pending
+    changes.
 
-       see also the ``unmodified`` collection which is intersected
-       against this set when a refresh operation occurs."""
+    See also the ``unmodified`` collection which is intersected
+    against this set when a refresh operation occurs.
+    """
 
     callables: Dict[str, Callable[[InstanceState[_O], PassiveFlag], Any]]
     """A namespace where a per-state loader callable can be associated.
@@ -228,7 +236,6 @@ class InstanceState(interfaces.InspectionAttrInfo, Generic[_O]):
     def pending(self) -> bool:
         """Return ``True`` if the object is :term:`pending`.
 
-
         .. seealso::
 
             :ref:`session_object_states`
diff --git a/libs/sqlalchemy/orm/state_changes.py b/libs/sqlalchemy/orm/state_changes.py
index 56963c6af..10e417e85 100644
--- a/libs/sqlalchemy/orm/state_changes.py
+++ b/libs/sqlalchemy/orm/state_changes.py
@@ -1,5 +1,5 @@
 # orm/state_changes.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/strategies.py b/libs/sqlalchemy/orm/strategies.py
index 20c3b9cc6..f2d165145 100644
--- a/libs/sqlalchemy/orm/strategies.py
+++ b/libs/sqlalchemy/orm/strategies.py
@@ -1,5 +1,5 @@
 # orm/strategies.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,8 +16,10 @@ import collections
 import itertools
 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 . import attributes
 from . import exc as orm_exc
@@ -45,7 +47,7 @@ from .interfaces import StrategizedProperty
 from .session import _state_session
 from .state import InstanceState
 from .strategy_options import Load
-from .util import _none_set
+from .util import _none_only_set
 from .util import AliasedClass
 from .. import event
 from .. import exc as sa_exc
@@ -57,8 +59,10 @@ from ..sql import util as sql_util
 from ..sql import visitors
 from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
 from ..sql.selectable import Select
+from ..util.typing import Literal
 
 if TYPE_CHECKING:
+    from .mapper import Mapper
     from .relationships import RelationshipProperty
     from ..sql.elements import ColumnElement
 
@@ -932,8 +936,15 @@ class LazyLoader(
             elif LoaderCallableStatus.NEVER_SET in primary_key_identity:
                 return LoaderCallableStatus.NEVER_SET
 
-            if _none_set.issuperset(primary_key_identity):
-                return None
+            # test for None alone in primary_key_identity based on
+            # allow_partial_pks preference.   PASSIVE_NO_RESULT and NEVER_SET
+            # have already been tested above
+            if not self.mapper.allow_partial_pks:
+                if _none_only_set.intersection(primary_key_identity):
+                    return None
+            else:
+                if _none_only_set.issuperset(primary_key_identity):
+                    return None
 
             if (
                 self.key in state.dict
@@ -1373,12 +1384,16 @@ class ImmediateLoader(PostLoader):
         adapter,
         populators,
     ):
+        if not context.compile_state.compile_options._enable_eagerloads:
+            return
+
         (
             effective_path,
             run_loader,
             execution_options,
             recursion_depth,
         ) = self._setup_for_recursion(context, path, loadopt, self.join_depth)
+
         if not run_loader:
             # this will not emit SQL and will only emit for a many-to-one
             # "use get" load.   the "_RELATED" part means it may return
@@ -1957,6 +1972,18 @@ class SubqueryLoader(PostLoader):
         adapter,
         populators,
     ):
+        if (
+            loadopt
+            and context.compile_state.statement is not None
+            and context.compile_state.statement.is_dml
+        ):
+            util.warn_deprecated(
+                "The subqueryload loader option is not compatible with DML "
+                "statements such as INSERT, UPDATE.  Only SELECT may be used."
+                "This warning will become an exception in a future release.",
+                "2.0",
+            )
+
         if context.refresh_state:
             return self._immediateload_create_row_processor(
                 context,
@@ -2122,6 +2149,17 @@ class JoinedLoader(AbstractRelationshipLoader):
 
         if not compile_state.compile_options._enable_eagerloads:
             return
+        elif (
+            loadopt
+            and compile_state.statement is not None
+            and compile_state.statement.is_dml
+        ):
+            util.warn_deprecated(
+                "The joinedload loader option is not compatible with DML "
+                "statements such as INSERT, UPDATE.  Only SELECT may be used."
+                "This warning will become an exception in a future release.",
+                "2.0",
+            )
         elif self.uselist:
             compile_state.multi_row_eager_loaders = True
 
@@ -2506,13 +2544,13 @@ class JoinedLoader(AbstractRelationshipLoader):
                 or query_entity.entity_zero.represents_outer_join
                 or (chained_from_outerjoin and isinstance(towrap, sql.Join)),
                 _left_memo=self.parent,
-                _right_memo=self.mapper,
+                _right_memo=path[self.mapper],
                 _extra_criteria=extra_join_criteria,
             )
         else:
             # all other cases are innerjoin=='nested' approach
             eagerjoin = self._splice_nested_inner_join(
-                path, towrap, clauses, onclause, extra_join_criteria
+                path, path[-2], towrap, clauses, onclause, extra_join_criteria
             )
 
         compile_state.eager_joins[query_entity_key] = eagerjoin
@@ -2546,93 +2584,177 @@ class JoinedLoader(AbstractRelationshipLoader):
             )
 
     def _splice_nested_inner_join(
-        self, path, join_obj, clauses, onclause, extra_criteria, splicing=False
+        self,
+        path,
+        entity_we_want_to_splice_onto,
+        join_obj,
+        clauses,
+        onclause,
+        extra_criteria,
+        entity_inside_join_structure: Union[
+            Mapper, None, Literal[False]
+        ] = False,
+        detected_existing_path: Optional[path_registry.PathRegistry] = None,
     ):
         # recursive fn to splice a nested join into an existing one.
-        # splicing=False means this is the outermost call, and it
-        # should return a value.  splicing=<from object> is the recursive
-        # form, where it can return None to indicate the end of the recursion
+        # entity_inside_join_structure=False means this is the outermost call,
+        # and it should return a value.  entity_inside_join_structure=<mapper>
+        # indicates we've descended into a join and are looking at a FROM
+        # clause representing this mapper; if this is not
+        # entity_we_want_to_splice_onto then return None to end the recursive
+        # branch
 
-        if splicing is False:
-            # first call is always handed a join object
-            # from the outside
+        assert entity_we_want_to_splice_onto is path[-2]
+
+        if entity_inside_join_structure is False:
             assert isinstance(join_obj, orm_util._ORMJoin)
-        elif isinstance(join_obj, sql.selectable.FromGrouping):
+
+        if isinstance(join_obj, sql.selectable.FromGrouping):
+            # FromGrouping - continue descending into the structure
             return self._splice_nested_inner_join(
                 path,
+                entity_we_want_to_splice_onto,
                 join_obj.element,
                 clauses,
                 onclause,
                 extra_criteria,
-                splicing,
+                entity_inside_join_structure,
             )
-        elif not isinstance(join_obj, orm_util._ORMJoin):
-            if path[-2].isa(splicing):
-                return orm_util._ORMJoin(
-                    join_obj,
-                    clauses.aliased_insp,
-                    onclause,
-                    isouter=False,
-                    _left_memo=splicing,
-                    _right_memo=path[-1].mapper,
-                    _extra_criteria=extra_criteria,
-                )
-            else:
-                return None
+        elif isinstance(join_obj, orm_util._ORMJoin):
+            # _ORMJoin - continue descending into the structure
 
-        target_join = self._splice_nested_inner_join(
-            path,
-            join_obj.right,
-            clauses,
-            onclause,
-            extra_criteria,
-            join_obj._right_memo,
-        )
-        if target_join is None:
-            right_splice = False
+            join_right_path = join_obj._right_memo
+
+            # see if right side of join is viable
             target_join = self._splice_nested_inner_join(
                 path,
-                join_obj.left,
+                entity_we_want_to_splice_onto,
+                join_obj.right,
                 clauses,
                 onclause,
                 extra_criteria,
-                join_obj._left_memo,
+                entity_inside_join_structure=(
+                    join_right_path[-1].mapper
+                    if join_right_path is not None
+                    else None
+                ),
             )
-            if target_join is None:
-                # should only return None when recursively called,
-                # e.g. splicing refers to a from obj
-                assert (
-                    splicing is not False
-                ), "assertion failed attempting to produce joined eager loads"
-                return None
-        else:
-            right_splice = True
 
-        if right_splice:
-            # for a right splice, attempt to flatten out
-            # a JOIN b JOIN c JOIN .. to avoid needless
-            # parenthesis nesting
-            if not join_obj.isouter and not target_join.isouter:
-                eagerjoin = join_obj._splice_into_center(target_join)
+            if target_join is not None:
+                # for a right splice, attempt to flatten out
+                # a JOIN b JOIN c JOIN .. to avoid needless
+                # parenthesis nesting
+                if not join_obj.isouter and not target_join.isouter:
+                    eagerjoin = join_obj._splice_into_center(target_join)
+                else:
+                    eagerjoin = orm_util._ORMJoin(
+                        join_obj.left,
+                        target_join,
+                        join_obj.onclause,
+                        isouter=join_obj.isouter,
+                        _left_memo=join_obj._left_memo,
+                    )
+
+                eagerjoin._target_adapter = target_join._target_adapter
+                return eagerjoin
+
             else:
-                eagerjoin = orm_util._ORMJoin(
+                # see if left side of join is viable
+                target_join = self._splice_nested_inner_join(
+                    path,
+                    entity_we_want_to_splice_onto,
                     join_obj.left,
-                    target_join,
-                    join_obj.onclause,
-                    isouter=join_obj.isouter,
-                    _left_memo=join_obj._left_memo,
+                    clauses,
+                    onclause,
+                    extra_criteria,
+                    entity_inside_join_structure=join_obj._left_memo,
+                    detected_existing_path=join_right_path,
                 )
-        else:
-            eagerjoin = orm_util._ORMJoin(
-                target_join,
-                join_obj.right,
-                join_obj.onclause,
-                isouter=join_obj.isouter,
-                _right_memo=join_obj._right_memo,
-            )
 
-        eagerjoin._target_adapter = target_join._target_adapter
-        return eagerjoin
+                if target_join is not None:
+                    eagerjoin = orm_util._ORMJoin(
+                        target_join,
+                        join_obj.right,
+                        join_obj.onclause,
+                        isouter=join_obj.isouter,
+                        _right_memo=join_obj._right_memo,
+                    )
+                    eagerjoin._target_adapter = target_join._target_adapter
+                    return eagerjoin
+
+            # neither side viable, return None, or fail if this was the top
+            # most call
+            if entity_inside_join_structure is False:
+                assert (
+                    False
+                ), "assertion failed attempting to produce joined eager loads"
+            return None
+
+        # reached an endpoint (e.g. a table that's mapped, or an alias of that
+        # table).  determine if we can use this endpoint to splice onto
+
+        # is this the entity we want to splice onto in the first place?
+        if not entity_we_want_to_splice_onto.isa(entity_inside_join_structure):
+            return None
+
+        # path check.  if we know the path how this join endpoint got here,
+        # lets look at our path we are satisfying and see if we're in the
+        # wrong place.  This is specifically for when our entity may
+        # appear more than once in the path, issue #11449
+        # updated in issue #11965.
+        if detected_existing_path and len(detected_existing_path) > 2:
+            # this assertion is currently based on how this call is made,
+            # where given a join_obj, the call will have these parameters as
+            # entity_inside_join_structure=join_obj._left_memo
+            # and entity_inside_join_structure=join_obj._right_memo.mapper
+            assert detected_existing_path[-3] is entity_inside_join_structure
+
+            # from that, see if the path we are targeting matches the
+            # "existing" path of this join all the way up to the midpoint
+            # of this join object (e.g. the relationship).
+            # if not, then this is not our target
+            #
+            # a test condition where this test is false looks like:
+            #
+            # desired splice:         Node->kind->Kind
+            # path of desired splice: NodeGroup->nodes->Node->kind
+            # path we've located:     NodeGroup->nodes->Node->common_node->Node
+            #
+            # above, because we want to splice kind->Kind onto
+            # NodeGroup->nodes->Node, this is not our path because it actually
+            # goes more steps than we want into self-referential
+            # ->common_node->Node
+            #
+            # a test condition where this test is true looks like:
+            #
+            # desired splice:         B->c2s->C2
+            # path of desired splice: A->bs->B->c2s
+            # path we've located:     A->bs->B->c1s->C1
+            #
+            # above, we want to splice c2s->C2 onto B, and the located path
+            # shows that the join ends with B->c1s->C1.  so we will
+            # add another join onto that, which would create a "branch" that
+            # we might represent in a pseudopath as:
+            #
+            # B->c1s->C1
+            #  ->c2s->C2
+            #
+            # i.e. A JOIN B ON <bs> JOIN C1 ON <c1s>
+            #                       JOIN C2 ON <c2s>
+            #
+
+            if detected_existing_path[0:-2] != path.path[0:-1]:
+                return None
+
+        return orm_util._ORMJoin(
+            join_obj,
+            clauses.aliased_insp,
+            onclause,
+            isouter=False,
+            _left_memo=entity_inside_join_structure,
+            _right_memo=path[path[-1].mapper],
+            _extra_criteria=extra_criteria,
+        )
 
     def _create_eager_adapter(self, context, result, adapter, path, loadopt):
         compile_state = context.compile_state
@@ -2681,6 +2803,10 @@ class JoinedLoader(AbstractRelationshipLoader):
         adapter,
         populators,
     ):
+
+        if not context.compile_state.compile_options._enable_eagerloads:
+            return
+
         if not self.parent.class_manager[self.key].impl.supports_population:
             raise sa_exc.InvalidRequestError(
                 "'%s' does not support object "
@@ -2960,6 +3086,9 @@ class SelectInLoader(PostLoader, util.MemoizedSlots):
         if not run_loader:
             return
 
+        if not context.compile_state.compile_options._enable_eagerloads:
+            return
+
         if not self.parent.class_manager[self.key].impl.supports_population:
             raise sa_exc.InvalidRequestError(
                 "'%s' does not support object "
@@ -3117,7 +3246,7 @@ class SelectInLoader(PostLoader, util.MemoizedSlots):
         orig_query = context.compile_state.select_statement
 
         # the actual statement that was requested is this one:
-        #  context_query = context.query
+        #  context_query = context.user_passed_query
         #
         # that's not the cached one, however.  So while it is of the identical
         # structure, if it has entities like AliasedInsp, which we get from
@@ -3141,11 +3270,11 @@ class SelectInLoader(PostLoader, util.MemoizedSlots):
 
         effective_path = path[self.parent_property]
 
-        if orig_query is context.query:
+        if orig_query is context.user_passed_query:
             new_options = orig_query._with_options
         else:
             cached_options = orig_query._with_options
-            uncached_options = context.query._with_options
+            uncached_options = context.user_passed_query._with_options
 
             # propagate compile state options from the original query,
             # updating their "extra_criteria" as necessary.
diff --git a/libs/sqlalchemy/orm/strategy_options.py b/libs/sqlalchemy/orm/strategy_options.py
index c20215ac3..f4f292ee7 100644
--- a/libs/sqlalchemy/orm/strategy_options.py
+++ b/libs/sqlalchemy/orm/strategy_options.py
@@ -1,5 +1,5 @@
 # orm/strategy_options.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -98,6 +98,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         attr: _AttrType,
         alias: Optional[_FromClauseArgument] = None,
         _is_chain: bool = False,
+        _propagate_to_loaders: bool = False,
     ) -> Self:
         r"""Indicate that the given attribute should be eagerly loaded from
         columns stated manually in the query.
@@ -108,9 +109,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         The option is used in conjunction with an explicit join that loads
         the desired rows, i.e.::
 
-            sess.query(Order).\
-                    join(Order.user).\
-                    options(contains_eager(Order.user))
+            sess.query(Order).join(Order.user).options(contains_eager(Order.user))
 
         The above query would join from the ``Order`` entity to its related
         ``User`` entity, and the returned ``Order`` objects would have the
@@ -121,11 +120,9 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         :ref:`orm_queryguide_populate_existing` execution option assuming the
         primary collection of parent objects may already have been loaded::
 
-            sess.query(User).\
-                join(User.addresses).\
-                filter(Address.email_address.like('%@aol.com')).\
-                options(contains_eager(User.addresses)).\
-                populate_existing()
+            sess.query(User).join(User.addresses).filter(
+                Address.email_address.like("%@aol.com")
+            ).options(contains_eager(User.addresses)).populate_existing()
 
         See the section :ref:`contains_eager` for complete usage details.
 
@@ -160,7 +157,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         cloned = self._set_relationship_strategy(
             attr,
             {"lazy": "joined"},
-            propagate_to_loaders=False,
+            propagate_to_loaders=_propagate_to_loaders,
             opts={"eager_from_alias": coerced_alias},
             _reconcile_to_other=True if _is_chain else None,
         )
@@ -191,10 +188,18 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         the lead entity can be
         specifically referred to using the :class:`_orm.Load` constructor::
 
-            stmt = select(User, Address).join(User.addresses).options(
-                        Load(User).load_only(User.name, User.fullname),
-                        Load(Address).load_only(Address.email_address)
-                    )
+            stmt = (
+                select(User, Address)
+                .join(User.addresses)
+                .options(
+                    Load(User).load_only(User.name, User.fullname),
+                    Load(Address).load_only(Address.email_address),
+                )
+            )
+
+        When used together with the
+        :ref:`populate_existing <orm_queryguide_populate_existing>`
+        execution option only the attributes listed will be refreshed.
 
         :param \*attrs: Attributes to be loaded, all others will be deferred.
 
@@ -247,28 +252,25 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         examples::
 
             # joined-load the "orders" collection on "User"
-            query(User).options(joinedload(User.orders))
+            select(User).options(joinedload(User.orders))
 
             # joined-load Order.items and then Item.keywords
-            query(Order).options(
-                joinedload(Order.items).joinedload(Item.keywords))
+            select(Order).options(joinedload(Order.items).joinedload(Item.keywords))
 
             # lazily load Order.items, but when Items are loaded,
             # joined-load the keywords collection
-            query(Order).options(
-                lazyload(Order.items).joinedload(Item.keywords))
+            select(Order).options(lazyload(Order.items).joinedload(Item.keywords))
 
         :param innerjoin: if ``True``, indicates that the joined eager load
          should use an inner join instead of the default of left outer join::
 
-            query(Order).options(joinedload(Order.user, innerjoin=True))
+            select(Order).options(joinedload(Order.user, innerjoin=True))
 
         In order to chain multiple eager joins together where some may be
         OUTER and others INNER, right-nested joins are used to link them::
 
-            query(A).options(
-                joinedload(A.bs, innerjoin=False).
-                    joinedload(B.cs, innerjoin=True)
+            select(A).options(
+                joinedload(A.bs, innerjoin=False).joinedload(B.cs, innerjoin=True)
             )
 
         The above query, linking A.bs via "outer" join and B.cs via "inner"
@@ -283,10 +285,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         will render as LEFT OUTER JOIN.  For example, supposing ``A.bs``
         is an outerjoin::
 
-            query(A).options(
-                joinedload(A.bs).
-                    joinedload(B.cs, innerjoin="unnested")
-            )
+            select(A).options(joinedload(A.bs).joinedload(B.cs, innerjoin="unnested"))
 
         The above join will render as "a LEFT OUTER JOIN b LEFT OUTER JOIN c",
         rather than as "a LEFT OUTER JOIN (b JOIN c)".
@@ -316,7 +315,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
 
             :ref:`joined_eager_loading`
 
-        """
+        """  # noqa: E501
         loader = self._set_relationship_strategy(
             attr,
             {"lazy": "joined"},
@@ -338,17 +337,16 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         examples::
 
             # subquery-load the "orders" collection on "User"
-            query(User).options(subqueryload(User.orders))
+            select(User).options(subqueryload(User.orders))
 
             # subquery-load Order.items and then Item.keywords
-            query(Order).options(
-                subqueryload(Order.items).subqueryload(Item.keywords))
+            select(Order).options(
+                subqueryload(Order.items).subqueryload(Item.keywords)
+            )
 
             # lazily load Order.items, but when Items are loaded,
             # subquery-load the keywords collection
-            query(Order).options(
-                lazyload(Order.items).subqueryload(Item.keywords))
-
+            select(Order).options(lazyload(Order.items).subqueryload(Item.keywords))
 
         .. seealso::
 
@@ -373,16 +371,16 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         examples::
 
             # selectin-load the "orders" collection on "User"
-            query(User).options(selectinload(User.orders))
+            select(User).options(selectinload(User.orders))
 
             # selectin-load Order.items and then Item.keywords
-            query(Order).options(
-                selectinload(Order.items).selectinload(Item.keywords))
+            select(Order).options(
+                selectinload(Order.items).selectinload(Item.keywords)
+            )
 
             # lazily load Order.items, but when Items are loaded,
             # selectin-load the keywords collection
-            query(Order).options(
-                lazyload(Order.items).selectinload(Item.keywords))
+            select(Order).options(lazyload(Order.items).selectinload(Item.keywords))
 
         :param recursion_depth: optional int; when set to a positive integer
          in conjunction with a self-referential relationship,
@@ -493,10 +491,10 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         :func:`_orm.noload` applies to :func:`_orm.relationship` attributes
         only.
 
-        .. note:: Setting this loading strategy as the default strategy
-            for a relationship using the :paramref:`.orm.relationship.lazy`
-            parameter may cause issues with flushes, such if a delete operation
-            needs to load related objects and instead ``None`` was returned.
+        .. legacy:: The :func:`_orm.noload` option is **legacy**.  As it
+           forces collections to be empty, which invariably leads to
+           non-intuitive and difficult to predict results.  There are no
+           legitimate uses for this option in modern SQLAlchemy.
 
         .. seealso::
 
@@ -558,17 +556,20 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         element of an element::
 
             session.query(MyClass).options(
-                defaultload(MyClass.someattribute).
-                joinedload(MyOtherClass.someotherattribute)
+                defaultload(MyClass.someattribute).joinedload(
+                    MyOtherClass.someotherattribute
+                )
             )
 
         :func:`.defaultload` is also useful for setting column-level options on
         a related class, namely that of :func:`.defer` and :func:`.undefer`::
 
-            session.query(MyClass).options(
-                defaultload(MyClass.someattribute).
-                defer("some_column").
-                undefer("some_other_column")
+            session.scalars(
+                select(MyClass).options(
+                    defaultload(MyClass.someattribute)
+                    .defer("some_column")
+                    .undefer("some_other_column")
+                )
             )
 
         .. seealso::
@@ -592,8 +593,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
             from sqlalchemy.orm import defer
 
             session.query(MyClass).options(
-                defer(MyClass.attribute_one),
-                defer(MyClass.attribute_two)
+                defer(MyClass.attribute_one), defer(MyClass.attribute_two)
             )
 
         To specify a deferred load of an attribute on a related class,
@@ -609,11 +609,11 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         at once using :meth:`_orm.Load.options`::
 
 
-            session.query(MyClass).options(
+            select(MyClass).options(
                 defaultload(MyClass.someattr).options(
                     defer(RelatedClass.some_column),
                     defer(RelatedClass.some_other_column),
-                    defer(RelatedClass.another_column)
+                    defer(RelatedClass.another_column),
                 )
             )
 
@@ -659,12 +659,10 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
             )
 
             # undefer all columns specific to a single class using Load + *
-            session.query(MyClass, MyOtherClass).options(
-                Load(MyClass).undefer("*"))
+            session.query(MyClass, MyOtherClass).options(Load(MyClass).undefer("*"))
 
             # undefer a column on a related object
-            session.query(MyClass).options(
-                defaultload(MyClass.items).undefer(MyClass.text))
+            select(MyClass).options(defaultload(MyClass.items).undefer(MyClass.text))
 
         :param key: Attribute to be undeferred.
 
@@ -677,7 +675,7 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
 
             :func:`_orm.undefer_group`
 
-        """
+        """  # noqa: E501
         return self._set_column_strategy(
             (key,), {"deferred": False, "instrument": True}
         )
@@ -697,8 +695,9 @@ class _AbstractLoad(traversals.GenerativeOnTraversal, LoaderOption):
         spelled out using relationship loader options, such as
         :func:`_orm.defaultload`::
 
-            session.query(MyClass).options(
-                defaultload("someattr").undefer_group("large_attrs"))
+            select(MyClass).options(
+                defaultload("someattr").undefer_group("large_attrs")
+            )
 
         .. seealso::
 
@@ -1034,6 +1033,8 @@ class Load(_AbstractLoad):
     def _adapt_cached_option_to_uncached_option(
         self, context: QueryContext, uncached_opt: ORMOption
     ) -> ORMOption:
+        if uncached_opt is self:
+            return self
         return self._adjust_for_extra_criteria(context)
 
     def _prepend_path(self, path: PathRegistry) -> Load:
@@ -1049,48 +1050,52 @@ class Load(_AbstractLoad):
         returning a new instance of this ``Load`` object.
 
         """
-        orig_query = context.compile_state.select_statement
-
-        orig_cache_key: Optional[CacheKey] = None
-        replacement_cache_key: Optional[CacheKey] = None
-        found_crit = False
-
-        def process(opt: _LoadElement) -> _LoadElement:
-            nonlocal orig_cache_key, replacement_cache_key, found_crit
-
-            found_crit = True
-
-            if orig_cache_key is None or replacement_cache_key is None:
-                orig_cache_key = orig_query._generate_cache_key()
-                replacement_cache_key = context.query._generate_cache_key()
-
-            if replacement_cache_key is not None:
-                assert orig_cache_key is not None
-
-                opt._extra_criteria = tuple(
-                    replacement_cache_key._apply_params_to_element(
-                        orig_cache_key, crit
-                    )
-                    for crit in opt._extra_criteria
-                )
-
-            return opt
 
         # avoid generating cache keys for the queries if we don't
         # actually have any extra_criteria options, which is the
         # common case
-        new_context = tuple(
-            process(value._clone()) if value._extra_criteria else value
-            for value in self.context
-        )
-
-        if found_crit:
-            cloned = self._clone()
-            cloned.context = new_context
-            return cloned
+        for value in self.context:
+            if value._extra_criteria:
+                break
         else:
             return self
 
+        replacement_cache_key = context.user_passed_query._generate_cache_key()
+
+        if replacement_cache_key is None:
+            return self
+
+        orig_query = context.compile_state.select_statement
+        orig_cache_key = orig_query._generate_cache_key()
+        assert orig_cache_key is not None
+
+        def process(
+            opt: _LoadElement,
+            replacement_cache_key: CacheKey,
+            orig_cache_key: CacheKey,
+        ) -> _LoadElement:
+            cloned_opt = opt._clone()
+
+            cloned_opt._extra_criteria = tuple(
+                replacement_cache_key._apply_params_to_element(
+                    orig_cache_key, crit
+                )
+                for crit in cloned_opt._extra_criteria
+            )
+
+            return cloned_opt
+
+        cloned = self._clone()
+        cloned.context = tuple(
+            (
+                process(value, replacement_cache_key, orig_cache_key)
+                if value._extra_criteria
+                else value
+            )
+            for value in self.context
+        )
+        return cloned
+
     def _reconcile_query_entities_with_us(self, mapper_entities, raiseerr):
         """called at process time to allow adjustment of the root
         entity inside of _LoadElement objects.
@@ -1121,7 +1126,20 @@ class Load(_AbstractLoad):
             mapper_entities, raiseerr
         )
 
+        # if the context has a current path, this is a lazy load
+        has_current_path = bool(compile_state.compile_options._current_path)
+
         for loader in self.context:
+            # issue #11292
+            # historically, propagate_to_loaders was only considered at
+            # object loading time, whether or not to carry along options
+            # onto an object's loaded state where it would be used by lazyload.
+            # however, the defaultload() option needs to propagate in case
+            # its sub-options propagate_to_loaders, but its sub-options
+            # that dont propagate should not be applied for lazy loaders.
+            # so we check again
+            if has_current_path and not loader.propagate_to_loaders:
+                continue
             loader.process_compile_state(
                 self,
                 compile_state,
@@ -1179,13 +1197,11 @@ class Load(_AbstractLoad):
 
             query = session.query(Author)
             query = query.options(
-                        joinedload(Author.book).options(
-                            load_only(Book.summary, Book.excerpt),
-                            joinedload(Book.citations).options(
-                                joinedload(Citation.author)
-                            )
-                        )
-                    )
+                joinedload(Author.book).options(
+                    load_only(Book.summary, Book.excerpt),
+                    joinedload(Book.citations).options(joinedload(Citation.author)),
+                )
+            )
 
         :param \*opts: A series of loader option objects (ultimately
          :class:`_orm.Load` objects) which should be applied to the path
@@ -1629,13 +1645,17 @@ class _LoadElement(
         loads, and adjusts the given path to be relative to the
         current_path.
 
-        E.g. given a loader path and current path::
+        E.g. given a loader path and current path:
+
+        .. sourcecode:: text
 
             lp: User -> orders -> Order -> items -> Item -> keywords -> Keyword
 
             cp: User -> orders -> Order -> items
 
-        The adjusted path would be::
+        The adjusted path would be:
+
+        .. sourcecode:: text
 
             Item -> keywords -> Keyword
 
@@ -2116,11 +2136,11 @@ class _TokenStrategyLoad(_LoadElement):
 
     e.g.::
 
-        raiseload('*')
-        Load(User).lazyload('*')
-        defer('*')
+        raiseload("*")
+        Load(User).lazyload("*")
+        defer("*")
         load_only(User.name, User.email)  # will create a defer('*')
-        joinedload(User.addresses).raiseload('*')
+        joinedload(User.addresses).raiseload("*")
 
     """
 
diff --git a/libs/sqlalchemy/orm/sync.py b/libs/sqlalchemy/orm/sync.py
index db09a3e90..8f85a41a2 100644
--- a/libs/sqlalchemy/orm/sync.py
+++ b/libs/sqlalchemy/orm/sync.py
@@ -1,5 +1,5 @@
 # orm/sync.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 7e2df2b0e..80897f292 100644
--- a/libs/sqlalchemy/orm/unitofwork.py
+++ b/libs/sqlalchemy/orm/unitofwork.py
@@ -1,5 +1,5 @@
 # orm/unitofwork.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 90508206e..48282b2d5 100644
--- a/libs/sqlalchemy/orm/util.py
+++ b/libs/sqlalchemy/orm/util.py
@@ -1,5 +1,5 @@
 # orm/util.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -42,6 +42,7 @@ from ._typing import prop_is_relationship
 from .base import _class_to_mapper as _class_to_mapper
 from .base import _MappedAnnotationBase
 from .base import _never_set as _never_set  # noqa: F401
+from .base import _none_only_set as _none_only_set  # noqa: F401
 from .base import _none_set as _none_set  # noqa: F401
 from .base import attribute_str as attribute_str  # noqa: F401
 from .base import class_mapper as class_mapper
@@ -85,14 +86,12 @@ from ..sql.elements import KeyedColumnElement
 from ..sql.selectable import FromClause
 from ..util.langhelpers import MemoizedSlots
 from ..util.typing import de_stringify_annotation as _de_stringify_annotation
-from ..util.typing import (
-    de_stringify_union_elements as _de_stringify_union_elements,
-)
 from ..util.typing import eval_name_only as _eval_name_only
+from ..util.typing import fixup_container_fwd_refs
+from ..util.typing import get_origin
 from ..util.typing import is_origin_of_cls
 from ..util.typing import Literal
 from ..util.typing import Protocol
-from ..util.typing import typing_get_origin
 
 if typing.TYPE_CHECKING:
     from ._typing import _EntityType
@@ -121,7 +120,6 @@ if typing.TYPE_CHECKING:
     from ..sql.selectable import Selectable
     from ..sql.visitors import anon_map
     from ..util.typing import _AnnotationScanType
-    from ..util.typing import ArgsTypeProcotol
 
 _T = TypeVar("_T", bound=Any)
 
@@ -138,7 +136,6 @@ all_cascades = frozenset(
     )
 )
 
-
 _de_stringify_partial = functools.partial(
     functools.partial,
     locals_=util.immutabledict(
@@ -171,23 +168,6 @@ de_stringify_annotation = cast(
 )
 
 
-class _DeStringifyUnionElements(Protocol):
-    def __call__(
-        self,
-        cls: Type[Any],
-        annotation: ArgsTypeProcotol,
-        originating_module: str,
-        *,
-        str_cleanup_fn: Optional[Callable[[str, str], str]] = None,
-    ) -> Type[Any]: ...
-
-
-de_stringify_union_elements = cast(
-    _DeStringifyUnionElements,
-    _de_stringify_partial(_de_stringify_union_elements),
-)
-
-
 class _EvalNameOnly(Protocol):
     def __call__(self, name: str, module_name: str) -> Any: ...
 
@@ -247,7 +227,7 @@ class CascadeOptions(FrozenSet[str]):
             values.clear()
         values.discard("all")
 
-        self = super().__new__(cls, values)  # type: ignore
+        self = super().__new__(cls, values)
         self.save_update = "save-update" in values
         self.delete = "delete" in values
         self.refresh_expire = "refresh-expire" in values
@@ -473,9 +453,7 @@ def identity_key(
 
       E.g.::
 
-        >>> row = engine.execute(\
-            text("select * from table where a=1 and b=2")\
-            ).first()
+        >>> row = engine.execute(text("select * from table where a=1 and b=2")).first()
         >>> identity_key(MyClass, row=row)
         (<class '__main__.MyClass'>, (1, 2), None)
 
@@ -486,7 +464,7 @@ def identity_key(
 
         .. versionadded:: 1.2 added identity_token
 
-    """
+    """  # noqa: E501
     if class_ is not None:
         mapper = class_mapper(class_)
         if row is None:
@@ -664,9 +642,9 @@ class AliasedClass(
 
         # find all pairs of users with the same name
         user_alias = aliased(User)
-        session.query(User, user_alias).\
-                        join((user_alias, User.id > user_alias.id)).\
-                        filter(User.name == user_alias.name)
+        session.query(User, user_alias).join(
+            (user_alias, User.id > user_alias.id)
+        ).filter(User.name == user_alias.name)
 
     :class:`.AliasedClass` is also capable of mapping an existing mapped
     class to an entirely new selectable, provided this selectable is column-
@@ -690,6 +668,7 @@ class AliasedClass(
     using :func:`_sa.inspect`::
 
         from sqlalchemy import inspect
+
         my_alias = aliased(MyClass)
         insp = inspect(my_alias)
 
@@ -1067,6 +1046,7 @@ class AliasedInsp(
         aliased: bool = False,
         innerjoin: bool = False,
         adapt_on_names: bool = False,
+        name: Optional[str] = None,
         _use_mapper_path: bool = False,
     ) -> AliasedClass[_O]:
         primary_mapper = _class_to_mapper(base)
@@ -1087,6 +1067,7 @@ class AliasedInsp(
         return AliasedClass(
             base,
             selectable,
+            name=name,
             with_polymorphic_mappers=mappers,
             adapt_on_names=adapt_on_names,
             with_polymorphic_discriminator=polymorphic_on,
@@ -1378,7 +1359,10 @@ class LoaderCriteriaOption(CriteriaOption):
     def __init__(
         self,
         entity_or_base: _EntityType[Any],
-        where_criteria: _ColumnExpressionArgument[bool],
+        where_criteria: Union[
+            _ColumnExpressionArgument[bool],
+            Callable[[Any], _ColumnExpressionArgument[bool]],
+        ],
         loader_only: bool = False,
         include_aliases: bool = False,
         propagate_to_loaders: bool = True,
@@ -1537,7 +1521,7 @@ GenericAlias = type(List[Any])
 def _inspect_generic_alias(
     class_: Type[_O],
 ) -> Optional[Mapper[_O]]:
-    origin = cast("Type[_O]", typing_get_origin(class_))
+    origin = cast("Type[_O]", get_origin(class_))
     return _inspect_mc(origin)
 
 
@@ -1594,8 +1578,7 @@ class Bundle(
 
             bn = Bundle("mybundle", MyClass.x, MyClass.y)
 
-            for row in session.query(bn).filter(
-                    bn.c.x == 5).filter(bn.c.y == 4):
+            for row in session.query(bn).filter(bn.c.x == 5).filter(bn.c.y == 4):
                 print(row.mybundle.x, row.mybundle.y)
 
         :param name: name of the bundle.
@@ -1604,7 +1587,7 @@ class Bundle(
          can be returned as a "single entity" outside of any enclosing tuple
          in the same manner as a mapped entity.
 
-        """
+        """  # noqa: E501
         self.name = self._label = name
         coerced_exprs = [
             coercions.expect(
@@ -1659,24 +1642,24 @@ class Bundle(
 
         Nesting of bundles is also supported::
 
-            b1 = Bundle("b1",
-                    Bundle('b2', MyClass.a, MyClass.b),
-                    Bundle('b3', MyClass.x, MyClass.y)
-                )
+            b1 = Bundle(
+                "b1",
+                Bundle("b2", MyClass.a, MyClass.b),
+                Bundle("b3", MyClass.x, MyClass.y),
+            )
 
-            q = sess.query(b1).filter(
-                b1.c.b2.c.a == 5).filter(b1.c.b3.c.y == 9)
+            q = sess.query(b1).filter(b1.c.b2.c.a == 5).filter(b1.c.b3.c.y == 9)
 
     .. seealso::
 
         :attr:`.Bundle.c`
 
-    """
+    """  # noqa: E501
 
     c: ReadOnlyColumnCollection[str, KeyedColumnElement[Any]]
     """An alias for :attr:`.Bundle.columns`."""
 
-    def _clone(self):
+    def _clone(self, **kw):
         cloned = self.__class__.__new__(self.__class__)
         cloned.__dict__.update(self.__dict__)
         return cloned
@@ -1737,25 +1720,24 @@ class Bundle(
 
             from sqlalchemy.orm import Bundle
 
+
             class DictBundle(Bundle):
                 def create_row_processor(self, query, procs, labels):
-                    'Override create_row_processor to return values as
-                    dictionaries'
+                    "Override create_row_processor to return values as dictionaries"
 
                     def proc(row):
-                        return dict(
-                            zip(labels, (proc(row) for proc in procs))
-                        )
+                        return dict(zip(labels, (proc(row) for proc in procs)))
+
                     return proc
 
         A result from the above :class:`_orm.Bundle` will return dictionary
         values::
 
-            bn = DictBundle('mybundle', MyClass.data1, MyClass.data2)
-            for row in session.execute(select(bn)).where(bn.c.data1 == 'd1'):
-                print(row.mybundle['data1'], row.mybundle['data2'])
+            bn = DictBundle("mybundle", MyClass.data1, MyClass.data2)
+            for row in session.execute(select(bn)).where(bn.c.data1 == "d1"):
+                print(row.mybundle["data1"], row.mybundle["data2"])
 
-        """
+        """  # noqa: E501
         keyed_tuple = result_tuple(labels, [() for l in labels])
 
         def proc(row: Row[Any]) -> Any:
@@ -1938,7 +1920,7 @@ class _ORMJoin(expression.Join):
             self.onclause,
             isouter=self.isouter,
             _left_memo=self._left_memo,
-            _right_memo=other._left_memo,
+            _right_memo=other._left_memo._path_registry,
         )
 
         return _ORMJoin(
@@ -1981,7 +1963,6 @@ def with_parent(
 
         stmt = select(Address).where(with_parent(some_user, User.addresses))
 
-
     The SQL rendered is the same as that rendered when a lazy loader
     would fire off from the given parent on that attribute, meaning
     that the appropriate state is taken from the parent object in
@@ -1994,9 +1975,7 @@ def with_parent(
 
         a1 = aliased(Address)
         a2 = aliased(Address)
-        stmt = select(a1, a2).where(
-            with_parent(u1, User.addresses.of_type(a2))
-        )
+        stmt = select(a1, a2).where(with_parent(u1, User.addresses.of_type(a2)))
 
     The above use is equivalent to using the
     :func:`_orm.with_parent.from_entity` argument::
@@ -2021,7 +2000,7 @@ def with_parent(
 
       .. versionadded:: 1.2
 
-    """
+    """  # noqa: E501
     prop_t: RelationshipProperty[Any]
 
     if isinstance(prop, str):
@@ -2115,14 +2094,13 @@ def _entity_corresponds_to_use_path_impl(
         someoption(A).someoption(C.d)  # -> fn(A, C) -> False
 
         a1 = aliased(A)
-        someoption(a1).someoption(A.b) # -> fn(a1, A) -> False
-        someoption(a1).someoption(a1.b) # -> fn(a1, a1) -> True
+        someoption(a1).someoption(A.b)  # -> fn(a1, A) -> False
+        someoption(a1).someoption(a1.b)  # -> fn(a1, a1) -> True
 
         wp = with_polymorphic(A, [A1, A2])
         someoption(wp).someoption(A1.foo)  # -> fn(wp, A1) -> False
         someoption(wp).someoption(wp.A1.foo)  # -> fn(wp, wp.A1) -> True
 
-
     """
     if insp_is_aliased_class(given):
         return (
@@ -2149,7 +2127,7 @@ def _entity_isa(given: _InternalEntityType[Any], mapper: Mapper[Any]) -> bool:
             mapper
         )
     elif given.with_polymorphic_mappers:
-        return mapper in given.with_polymorphic_mappers
+        return mapper in given.with_polymorphic_mappers or given.isa(mapper)
     else:
         return given.isa(mapper)
 
@@ -2231,7 +2209,7 @@ def _cleanup_mapped_str_annotation(
 
     inner: Optional[Match[str]]
 
-    mm = re.match(r"^(.+?)\[(.+)\]$", annotation)
+    mm = re.match(r"^([^ \|]+?)\[(.+)\]$", annotation)
 
     if not mm:
         return annotation
@@ -2271,7 +2249,7 @@ def _cleanup_mapped_str_annotation(
     while True:
         stack.append(real_symbol if mm is inner else inner.group(1))
         g2 = inner.group(2)
-        inner = re.match(r"^(.+?)\[(.+)\]$", g2)
+        inner = re.match(r"^([^ \|]+?)\[(.+)\]$", g2)
         if inner is None:
             stack.append(g2)
             break
@@ -2293,8 +2271,10 @@ def _cleanup_mapped_str_annotation(
         # ['Mapped', "'Optional[Dict[str, str]]'"]
         not re.match(r"""^["'].*["']$""", stack[-1])
         # avoid further generics like Dict[] such as
-        # ['Mapped', 'dict[str, str] | None']
-        and not re.match(r".*\[.*\]", stack[-1])
+        # ['Mapped', 'dict[str, str] | None'],
+        # ['Mapped', 'list[int] | list[str]'],
+        # ['Mapped', 'Union[list[int], list[str]]'],
+        and not re.search(r"[\[\]]", stack[-1])
     ):
         stripchars = "\"' "
         stack[-1] = ", ".join(
@@ -2316,7 +2296,7 @@ def _extract_mapped_subtype(
     is_dataclass_field: bool,
     expect_mapped: bool = True,
     raiseerr: bool = True,
-) -> Optional[Tuple[Union[type, str], Optional[type]]]:
+) -> Optional[Tuple[Union[_AnnotationScanType, str], Optional[type]]]:
     """given an annotation, figure out if it's ``Mapped[something]`` and if
     so, return the ``something`` part.
 
@@ -2334,6 +2314,11 @@ def _extract_mapped_subtype(
         return None
 
     try:
+        # destringify the "outside" of the annotation.  note we are not
+        # adding include_generic so it will *not* dig into generic contents,
+        # which will remain as ForwardRef or plain str under future annotations
+        # mode.  The full destringify happens later when mapped_column goes
+        # to do a full lookup in the registry type_annotations_map.
         annotated = de_stringify_annotation(
             cls,
             raw_annotation,
@@ -2402,4 +2387,16 @@ def _extract_mapped_subtype(
                 "Expected sub-type for Mapped[] annotation"
             )
 
-        return annotated.__args__[0], annotated.__origin__
+        return (
+            # fix dict/list/set args to be ForwardRef, see #11814
+            fixup_container_fwd_refs(annotated.__args__[0]),
+            annotated.__origin__,
+        )
+
+
+def _mapper_property_as_plain_name(prop: Type[Any]) -> str:
+    if hasattr(prop, "_mapper_property_name"):
+        name = prop._mapper_property_name()
+    else:
+        name = None
+    return util.clsname_as_plain_name(prop, name)
diff --git a/libs/sqlalchemy/orm/writeonly.py b/libs/sqlalchemy/orm/writeonly.py
index 5680cc70e..ac034a09e 100644
--- a/libs/sqlalchemy/orm/writeonly.py
+++ b/libs/sqlalchemy/orm/writeonly.py
@@ -1,5 +1,5 @@
 # orm/writeonly.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/pool/__init__.py b/libs/sqlalchemy/pool/__init__.py
index 29fd65293..51bf0ec79 100644
--- a/libs/sqlalchemy/pool/__init__.py
+++ b/libs/sqlalchemy/pool/__init__.py
@@ -1,5 +1,5 @@
 # pool/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 98d202789..34d022543 100644
--- a/libs/sqlalchemy/pool/base.py
+++ b/libs/sqlalchemy/pool/base.py
@@ -1,5 +1,5 @@
 # pool/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/pool/events.py b/libs/sqlalchemy/pool/events.py
index 4b4f4e478..4ceb260f7 100644
--- a/libs/sqlalchemy/pool/events.py
+++ b/libs/sqlalchemy/pool/events.py
@@ -1,5 +1,5 @@
 # pool/events.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -35,10 +35,12 @@ class PoolEvents(event.Events[Pool]):
 
         from sqlalchemy import event
 
+
         def my_on_checkout(dbapi_conn, connection_rec, connection_proxy):
             "handle an on checkout event"
 
-        event.listen(Pool, 'checkout', my_on_checkout)
+
+        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
@@ -49,7 +51,7 @@ class PoolEvents(event.Events[Pool]):
         engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test")
 
         # will associate with engine.pool
-        event.listen(engine, 'checkout', my_on_checkout)
+        event.listen(engine, "checkout", my_on_checkout)
 
     """  # noqa: E501
 
diff --git a/libs/sqlalchemy/pool/impl.py b/libs/sqlalchemy/pool/impl.py
index 18f9414ca..f2b951d8e 100644
--- a/libs/sqlalchemy/pool/impl.py
+++ b/libs/sqlalchemy/pool/impl.py
@@ -1,5 +1,5 @@
 # pool/impl.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -47,8 +47,18 @@ class QueuePool(Pool):
     that imposes a limit on the number of open connections.
 
     :class:`.QueuePool` is the default pooling implementation used for
-    all :class:`_engine.Engine` objects, unless the SQLite dialect is
-    in use with a ``:memory:`` database.
+    all :class:`_engine.Engine` objects other than SQLite with a ``:memory:``
+    database.
+
+    The :class:`.QueuePool` class **is not compatible** with asyncio and
+    :func:`_asyncio.create_async_engine`.  The
+    :class:`.AsyncAdaptedQueuePool` class is used automatically when
+    using :func:`_asyncio.create_async_engine`, if no other kind of pool
+    is specified.
+
+    .. seealso::
+
+        :class:`.AsyncAdaptedQueuePool`
 
     """
 
@@ -123,6 +133,7 @@ class QueuePool(Pool):
           :class:`_pool.Pool` constructor.
 
         """
+
         Pool.__init__(self, creator, **kw)
         self._pool = self._queue_class(pool_size, use_lifo=use_lifo)
         self._overflow = 0 - pool_size
@@ -248,6 +259,18 @@ class QueuePool(Pool):
 
 
 class AsyncAdaptedQueuePool(QueuePool):
+    """An asyncio-compatible version of :class:`.QueuePool`.
+
+    This pool is used by default when using :class:`.AsyncEngine` engines that
+    were generated from :func:`_asyncio.create_async_engine`.   It uses an
+    asyncio-compatible queue implementation that does not use
+    ``threading.Lock``.
+
+    The arguments and operation of :class:`.AsyncAdaptedQueuePool` are
+    otherwise identical to that of :class:`.QueuePool`.
+
+    """
+
     _is_asyncio = True  # type: ignore[assignment]
     _queue_class: Type[sqla_queue.QueueCommon[ConnectionPoolEntry]] = (
         sqla_queue.AsyncAdaptedQueue
@@ -270,6 +293,9 @@ class NullPool(Pool):
     invalidation are not supported by this Pool implementation, since
     no connections are held persistently.
 
+    The :class:`.NullPool` class **is compatible** with asyncio and
+    :func:`_asyncio.create_async_engine`.
+
     """
 
     def status(self) -> str:
@@ -317,6 +343,9 @@ class SingletonThreadPool(Pool):
        scenarios using a SQLite ``:memory:`` database and is not recommended
        for production use.
 
+    The :class:`.SingletonThreadPool` class **is not compatible** with asyncio
+    and :func:`_asyncio.create_async_engine`.
+
 
     Options are the same as those of :class:`_pool.Pool`, as well as:
 
@@ -425,6 +454,8 @@ class StaticPool(Pool):
     invalidation (which is also used to support auto-reconnect) are only
     partially supported right now and may not yield good results.
 
+    The :class:`.StaticPool` class **is compatible** with asyncio and
+    :func:`_asyncio.create_async_engine`.
 
     """
 
@@ -489,6 +520,9 @@ class AssertionPool(Pool):
     at a time.  Useful for debugging code that is using more connections
     than desired.
 
+    The :class:`.AssertionPool` class **is compatible** with asyncio and
+    :func:`_asyncio.create_async_engine`.
+
     """
 
     _conn: Optional[ConnectionPoolEntry]
diff --git a/libs/sqlalchemy/schema.py b/libs/sqlalchemy/schema.py
index 9edca4e5c..32adc9bb2 100644
--- a/libs/sqlalchemy/schema.py
+++ b/libs/sqlalchemy/schema.py
@@ -1,5 +1,5 @@
 # schema.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/__init__.py b/libs/sqlalchemy/sql/__init__.py
index 9e0d2ca2a..188f709d7 100644
--- a/libs/sqlalchemy/sql/__init__.py
+++ b/libs/sqlalchemy/sql/__init__.py
@@ -1,5 +1,5 @@
 # sql/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 a7ead521f..0a6f60115 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -24,10 +24,7 @@ def insert(table: _DMLTableArgument) -> Insert:
 
         from sqlalchemy import insert
 
-        stmt = (
-            insert(user_table).
-            values(name='username', fullname='Full Username')
-        )
+        stmt = insert(user_table).values(name="username", fullname="Full Username")
 
     Similar functionality is available via the
     :meth:`_expression.TableClause.insert` method on
@@ -78,7 +75,7 @@ def insert(table: _DMLTableArgument) -> Insert:
 
         :ref:`tutorial_core_insert` - in the :ref:`unified_tutorial`
 
-    """
+    """  # noqa: E501
     return Insert(table)
 
 
@@ -90,9 +87,7 @@ def update(table: _DMLTableArgument) -> Update:
         from sqlalchemy import update
 
         stmt = (
-            update(user_table).
-            where(user_table.c.id == 5).
-            values(name='user #5')
+            update(user_table).where(user_table.c.id == 5).values(name="user #5")
         )
 
     Similar functionality is available via the
@@ -109,7 +104,7 @@ def update(table: _DMLTableArgument) -> Update:
         :ref:`tutorial_core_update_delete` - in the :ref:`unified_tutorial`
 
 
-    """
+    """  # noqa: E501
     return Update(table)
 
 
@@ -120,10 +115,7 @@ def delete(table: _DMLTableArgument) -> Delete:
 
         from sqlalchemy import delete
 
-        stmt = (
-            delete(user_table).
-            where(user_table.c.id == 5)
-        )
+        stmt = delete(user_table).where(user_table.c.id == 5)
 
     Similar functionality is available via the
     :meth:`_expression.TableClause.delete` method on
diff --git a/libs/sqlalchemy/sql/_elements_constructors.py b/libs/sqlalchemy/sql/_elements_constructors.py
index 27bac59e1..b628fcc9b 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -125,11 +125,8 @@ def and_(  # type: ignore[empty-body]
         from sqlalchemy import and_
 
         stmt = select(users_table).where(
-                        and_(
-                            users_table.c.name == 'wendy',
-                            users_table.c.enrolled == True
-                        )
-                    )
+            and_(users_table.c.name == "wendy", users_table.c.enrolled == True)
+        )
 
     The :func:`.and_` conjunction is also available using the
     Python ``&`` operator (though note that compound expressions
@@ -137,9 +134,8 @@ def and_(  # type: ignore[empty-body]
     operator precedence behavior)::
 
         stmt = select(users_table).where(
-                        (users_table.c.name == 'wendy') &
-                        (users_table.c.enrolled == True)
-                    )
+            (users_table.c.name == "wendy") & (users_table.c.enrolled == True)
+        )
 
     The :func:`.and_` operation is also implicit in some cases;
     the :meth:`_expression.Select.where`
@@ -147,9 +143,11 @@ def and_(  # type: ignore[empty-body]
     times against a statement, which will have the effect of each
     clause being combined using :func:`.and_`::
 
-        stmt = select(users_table).\
-                where(users_table.c.name == 'wendy').\
-                where(users_table.c.enrolled == True)
+        stmt = (
+            select(users_table)
+            .where(users_table.c.name == "wendy")
+            .where(users_table.c.enrolled == True)
+        )
 
     The :func:`.and_` construct must be given at least one positional
     argument in order to be valid; a :func:`.and_` construct with no
@@ -159,6 +157,7 @@ def and_(  # type: ignore[empty-body]
     specified::
 
         from sqlalchemy import true
+
         criteria = and_(true(), *expressions)
 
     The above expression will compile to SQL as the expression ``true``
@@ -190,11 +189,8 @@ if not TYPE_CHECKING:
             from sqlalchemy import and_
 
             stmt = select(users_table).where(
-                            and_(
-                                users_table.c.name == 'wendy',
-                                users_table.c.enrolled == True
-                            )
-                        )
+                and_(users_table.c.name == "wendy", users_table.c.enrolled == True)
+            )
 
         The :func:`.and_` conjunction is also available using the
         Python ``&`` operator (though note that compound expressions
@@ -202,9 +198,8 @@ if not TYPE_CHECKING:
         operator precedence behavior)::
 
             stmt = select(users_table).where(
-                            (users_table.c.name == 'wendy') &
-                            (users_table.c.enrolled == True)
-                        )
+                (users_table.c.name == "wendy") & (users_table.c.enrolled == True)
+            )
 
         The :func:`.and_` operation is also implicit in some cases;
         the :meth:`_expression.Select.where`
@@ -212,9 +207,11 @@ if not TYPE_CHECKING:
         times against a statement, which will have the effect of each
         clause being combined using :func:`.and_`::
 
-            stmt = select(users_table).\
-                    where(users_table.c.name == 'wendy').\
-                    where(users_table.c.enrolled == True)
+            stmt = (
+                select(users_table)
+                .where(users_table.c.name == "wendy")
+                .where(users_table.c.enrolled == True)
+            )
 
         The :func:`.and_` construct must be given at least one positional
         argument in order to be valid; a :func:`.and_` construct with no
@@ -224,6 +221,7 @@ if not TYPE_CHECKING:
         specified::
 
             from sqlalchemy import true
+
             criteria = and_(true(), *expressions)
 
         The above expression will compile to SQL as the expression ``true``
@@ -241,7 +239,7 @@ if not TYPE_CHECKING:
 
             :func:`.or_`
 
-        """
+        """  # noqa: E501
         return BooleanClauseList.and_(*clauses)
 
 
@@ -307,9 +305,12 @@ def asc(
     e.g.::
 
         from sqlalchemy import asc
+
         stmt = select(users_table).order_by(asc(users_table.c.name))
 
-    will produce SQL as::
+    will produce SQL as:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user ORDER BY name ASC
 
@@ -346,9 +347,11 @@ def collate(
 
     e.g.::
 
-        collate(mycolumn, 'utf8_bin')
+        collate(mycolumn, "utf8_bin")
 
-    produces::
+    produces:
+
+    .. sourcecode:: sql
 
         mycolumn COLLATE utf8_bin
 
@@ -373,9 +376,12 @@ def between(
     E.g.::
 
         from sqlalchemy import between
+
         stmt = select(users_table).where(between(users_table.c.id, 5, 7))
 
-    Would produce SQL resembling::
+    Would produce SQL resembling:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user WHERE id BETWEEN :id_1 AND :id_2
 
@@ -493,10 +499,13 @@ def bindparam(
 
         from sqlalchemy import bindparam
 
-        stmt = select(users_table).\
-                    where(users_table.c.name == bindparam('username'))
+        stmt = select(users_table).where(
+            users_table.c.name == bindparam("username")
+        )
 
-    The above statement, when rendered, will produce SQL similar to::
+    The above statement, when rendered, will produce SQL similar to:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user WHERE name = :username
 
@@ -504,22 +513,25 @@ def bindparam(
     would typically be applied at execution time to a method
     like :meth:`_engine.Connection.execute`::
 
-        result = connection.execute(stmt, username='wendy')
+        result = connection.execute(stmt, {"username": "wendy"})
 
     Explicit use of :func:`.bindparam` is also common when producing
     UPDATE or DELETE statements that are to be invoked multiple times,
     where the WHERE criterion of the statement is to change on each
     invocation, such as::
 
-        stmt = (users_table.update().
-                where(user_table.c.name == bindparam('username')).
-                values(fullname=bindparam('fullname'))
-                )
+        stmt = (
+            users_table.update()
+            .where(user_table.c.name == bindparam("username"))
+            .values(fullname=bindparam("fullname"))
+        )
 
         connection.execute(
-            stmt, [{"username": "wendy", "fullname": "Wendy Smith"},
-                   {"username": "jack", "fullname": "Jack Jones"},
-                   ]
+            stmt,
+            [
+                {"username": "wendy", "fullname": "Wendy Smith"},
+                {"username": "jack", "fullname": "Jack Jones"},
+            ],
         )
 
     SQLAlchemy's Core expression system makes wide use of
@@ -528,7 +540,7 @@ def bindparam(
     coerced into fixed :func:`.bindparam` constructs.  For example, given
     a comparison operation such as::
 
-        expr = users_table.c.name == 'Wendy'
+        expr = users_table.c.name == "Wendy"
 
     The above expression will produce a :class:`.BinaryExpression`
     construct, where the left side is the :class:`_schema.Column` object
@@ -536,9 +548,11 @@ def bindparam(
     :class:`.BindParameter` representing the literal value::
 
         print(repr(expr.right))
-        BindParameter('%(4327771088 name)s', 'Wendy', type_=String())
+        BindParameter("%(4327771088 name)s", "Wendy", type_=String())
 
-    The expression above will render SQL such as::
+    The expression above will render SQL such as:
+
+    .. sourcecode:: sql
 
         user.name = :name_1
 
@@ -547,10 +561,12 @@ def bindparam(
     along where it is later used within statement execution.  If we
     invoke a statement like the following::
 
-        stmt = select(users_table).where(users_table.c.name == 'Wendy')
+        stmt = select(users_table).where(users_table.c.name == "Wendy")
         result = connection.execute(stmt)
 
-    We would see SQL logging output as::
+    We would see SQL logging output as:
+
+    .. sourcecode:: sql
 
         SELECT "user".id, "user".name
         FROM "user"
@@ -568,9 +584,11 @@ def bindparam(
     bound placeholders based on the arguments passed, as in::
 
         stmt = users_table.insert()
-        result = connection.execute(stmt, name='Wendy')
+        result = connection.execute(stmt, {"name": "Wendy"})
 
-    The above will produce SQL output as::
+    The above will produce SQL output as:
+
+    .. sourcecode:: sql
 
         INSERT INTO "user" (name) VALUES (%(name)s)
         {'name': 'Wendy'}
@@ -643,12 +661,12 @@ def bindparam(
     :param quote:
       True if this parameter name requires quoting and is not
       currently known as a SQLAlchemy reserved word; this currently
-      only applies to the Oracle backend, where bound names must
+      only applies to the Oracle Database backends, where bound names must
       sometimes be quoted.
 
     :param isoutparam:
       if True, the parameter should be treated like a stored procedure
-      "OUT" parameter.  This applies to backends such as Oracle which
+      "OUT" parameter.  This applies to backends such as Oracle Database which
       support OUT parameters.
 
     :param expanding:
@@ -734,16 +752,17 @@ def case(
 
         from sqlalchemy import case
 
-        stmt = select(users_table).\
-                    where(
-                        case(
-                            (users_table.c.name == 'wendy', 'W'),
-                            (users_table.c.name == 'jack', 'J'),
-                            else_='E'
-                        )
-                    )
+        stmt = select(users_table).where(
+            case(
+                (users_table.c.name == "wendy", "W"),
+                (users_table.c.name == "jack", "J"),
+                else_="E",
+            )
+        )
 
-    The above statement will produce SQL resembling::
+    The above statement will produce SQL resembling:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user
         WHERE CASE
@@ -761,14 +780,9 @@ def case(
     compared against keyed to result expressions.  The statement below is
     equivalent to the preceding statement::
 
-        stmt = select(users_table).\
-                    where(
-                        case(
-                            {"wendy": "W", "jack": "J"},
-                            value=users_table.c.name,
-                            else_='E'
-                        )
-                    )
+        stmt = select(users_table).where(
+            case({"wendy": "W", "jack": "J"}, value=users_table.c.name, else_="E")
+        )
 
     The values which are accepted as result values in
     :paramref:`.case.whens` as well as with :paramref:`.case.else_` are
@@ -783,20 +797,16 @@ def case(
         from sqlalchemy import case, literal_column
 
         case(
-            (
-                orderline.c.qty > 100,
-                literal_column("'greaterthan100'")
-            ),
-            (
-                orderline.c.qty > 10,
-                literal_column("'greaterthan10'")
-            ),
-            else_=literal_column("'lessthan10'")
+            (orderline.c.qty > 100, literal_column("'greaterthan100'")),
+            (orderline.c.qty > 10, literal_column("'greaterthan10'")),
+            else_=literal_column("'lessthan10'"),
         )
 
     The above will render the given constants without using bound
     parameters for the result values (but still for the comparison
-    values), as in::
+    values), as in:
+
+    .. sourcecode:: sql
 
         CASE
             WHEN (orderline.qty > :qty_1) THEN 'greaterthan100'
@@ -817,8 +827,8 @@ def case(
      resulting value, e.g.::
 
         case(
-            (users_table.c.name == 'wendy', 'W'),
-            (users_table.c.name == 'jack', 'J')
+            (users_table.c.name == "wendy", "W"),
+            (users_table.c.name == "jack", "J"),
         )
 
      In the second form, it accepts a Python dictionary of comparison
@@ -826,10 +836,7 @@ def case(
      :paramref:`.case.value` to be present, and values will be compared
      using the ``==`` operator, e.g.::
 
-        case(
-            {"wendy": "W", "jack": "J"},
-            value=users_table.c.name
-        )
+        case({"wendy": "W", "jack": "J"}, value=users_table.c.name)
 
     :param value: An optional SQL expression which will be used as a
       fixed "comparison point" for candidate values within a dictionary
@@ -842,7 +849,7 @@ def case(
       expressions evaluate to true.
 
 
-    """
+    """  # noqa: E501
     return Case(*whens, value=value, else_=else_)
 
 
@@ -860,7 +867,9 @@ def cast(
 
         stmt = select(cast(product_table.c.unit_price, Numeric(10, 4)))
 
-    The above statement will produce SQL resembling::
+    The above statement will produce SQL resembling:
+
+    .. sourcecode:: sql
 
         SELECT CAST(unit_price AS NUMERIC(10, 4)) FROM product
 
@@ -929,11 +938,11 @@ def try_cast(
 
         from sqlalchemy import select, try_cast, Numeric
 
-        stmt = select(
-            try_cast(product_table.c.unit_price, Numeric(10, 4))
-        )
+        stmt = select(try_cast(product_table.c.unit_price, Numeric(10, 4)))
 
-    The above would render on Microsoft SQL Server as::
+    The above would render on Microsoft SQL Server as:
+
+    .. sourcecode:: sql
 
         SELECT TRY_CAST (product_table.unit_price AS NUMERIC(10, 4))
         FROM product_table
@@ -964,7 +973,9 @@ def column(
         id, name = column("id"), column("name")
         stmt = select(id, name).select_from("user")
 
-    The above statement would produce SQL like::
+    The above statement would produce SQL like:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user
 
@@ -1000,13 +1011,14 @@ def column(
 
         from sqlalchemy import table, column, select
 
-        user = table("user",
-                column("id"),
-                column("name"),
-                column("description"),
+        user = table(
+            "user",
+            column("id"),
+            column("name"),
+            column("description"),
         )
 
-        stmt = select(user.c.description).where(user.c.name == 'wendy')
+        stmt = select(user.c.description).where(user.c.name == "wendy")
 
     A :func:`_expression.column` / :func:`.table`
     construct like that illustrated
@@ -1053,7 +1065,9 @@ def desc(
 
         stmt = select(users_table).order_by(desc(users_table.c.name))
 
-    will produce SQL as::
+    will produce SQL as:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user ORDER BY name DESC
 
@@ -1086,16 +1100,26 @@ def desc(
 def distinct(expr: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
     """Produce an column-expression-level unary ``DISTINCT`` clause.
 
-    This applies the ``DISTINCT`` keyword to an individual column
-    expression, and is typically contained within an aggregate function,
-    as in::
+    This applies the ``DISTINCT`` keyword to an **individual column
+    expression** (e.g. not the whole statement), and renders **specifically
+    in that column position**; this is used for containment within
+    an aggregate function, as in::
 
         from sqlalchemy import distinct, func
-        stmt = select(func.count(distinct(users_table.c.name)))
 
-    The above would produce an expression resembling::
+        stmt = select(users_table.c.id, func.count(distinct(users_table.c.name)))
 
-        SELECT COUNT(DISTINCT name) FROM user
+    The above would produce an statement resembling:
+
+    .. sourcecode:: sql
+
+        SELECT user.id, count(DISTINCT user.name) FROM user
+
+    .. tip:: The :func:`_sql.distinct` function does **not** apply DISTINCT
+       to the full SELECT statement, instead applying a DISTINCT modifier
+       to **individual column expressions**.  For general ``SELECT DISTINCT``
+       support, use the
+       :meth:`_sql.Select.distinct` method on :class:`_sql.Select`.
 
     The :func:`.distinct` function is also available as a column-level
     method, e.g. :meth:`_expression.ColumnElement.distinct`, as in::
@@ -1118,7 +1142,7 @@ def distinct(expr: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
 
         :data:`.func`
 
-    """
+    """  # noqa: E501
     return UnaryExpression._create_distinct(expr)
 
 
@@ -1148,6 +1172,9 @@ def extract(field: str, expr: _ColumnExpressionArgument[Any]) -> Extract:
 
     :param field: The field to extract.
 
+     .. warning:: This field is used as a literal SQL string.
+         **DO NOT PASS UNTRUSTED INPUT TO THIS STRING**.
+
     :param expr: A column or Python scalar expression serving as the
       right side of the ``EXTRACT`` expression.
 
@@ -1156,9 +1183,10 @@ def extract(field: str, expr: _ColumnExpressionArgument[Any]) -> Extract:
         from sqlalchemy import extract
         from sqlalchemy import table, column
 
-        logged_table = table("user",
-                column("id"),
-                column("date_created"),
+        logged_table = table(
+            "user",
+            column("id"),
+            column("date_created"),
         )
 
         stmt = select(logged_table.c.id).where(
@@ -1170,9 +1198,9 @@ def extract(field: str, expr: _ColumnExpressionArgument[Any]) -> Extract:
 
     Similarly, one can also select an extracted component::
 
-        stmt = select(
-            extract("YEAR", logged_table.c.date_created)
-        ).where(logged_table.c.id == 1)
+        stmt = select(extract("YEAR", logged_table.c.date_created)).where(
+            logged_table.c.id == 1
+        )
 
     The implementation of ``EXTRACT`` may vary across database backends.
     Users are reminded to consult their database documentation.
@@ -1231,7 +1259,8 @@ def funcfilter(
     E.g.::
 
         from sqlalchemy import funcfilter
-        funcfilter(func.count(1), MyClass.name == 'some name')
+
+        funcfilter(func.count(1), MyClass.name == "some name")
 
     Would produce "COUNT(1) FILTER (WHERE myclass.name = 'some name')".
 
@@ -1288,10 +1317,11 @@ def nulls_first(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
 
         from sqlalchemy import desc, nulls_first
 
-        stmt = select(users_table).order_by(
-            nulls_first(desc(users_table.c.name)))
+        stmt = select(users_table).order_by(nulls_first(desc(users_table.c.name)))
 
-    The SQL expression from the above would resemble::
+    The SQL expression from the above would resemble:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user ORDER BY name DESC NULLS FIRST
 
@@ -1302,7 +1332,8 @@ def nulls_first(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
     function version, as in::
 
         stmt = select(users_table).order_by(
-            users_table.c.name.desc().nulls_first())
+            users_table.c.name.desc().nulls_first()
+        )
 
     .. versionchanged:: 1.4 :func:`.nulls_first` is renamed from
         :func:`.nullsfirst` in previous releases.
@@ -1318,7 +1349,7 @@ def nulls_first(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
 
         :meth:`_expression.Select.order_by`
 
-    """
+    """  # noqa: E501
     return UnaryExpression._create_nulls_first(column)
 
 
@@ -1332,10 +1363,11 @@ def nulls_last(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
 
         from sqlalchemy import desc, nulls_last
 
-        stmt = select(users_table).order_by(
-            nulls_last(desc(users_table.c.name)))
+        stmt = select(users_table).order_by(nulls_last(desc(users_table.c.name)))
 
-    The SQL expression from the above would resemble::
+    The SQL expression from the above would resemble:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user ORDER BY name DESC NULLS LAST
 
@@ -1345,8 +1377,7 @@ def nulls_last(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
     rather than as its standalone
     function version, as in::
 
-        stmt = select(users_table).order_by(
-            users_table.c.name.desc().nulls_last())
+        stmt = select(users_table).order_by(users_table.c.name.desc().nulls_last())
 
     .. versionchanged:: 1.4 :func:`.nulls_last` is renamed from
         :func:`.nullslast` in previous releases.
@@ -1362,7 +1393,7 @@ def nulls_last(column: _ColumnExpressionArgument[_T]) -> UnaryExpression[_T]:
 
         :meth:`_expression.Select.order_by`
 
-    """
+    """  # noqa: E501
     return UnaryExpression._create_nulls_last(column)
 
 
@@ -1377,11 +1408,8 @@ def or_(  # type: ignore[empty-body]
         from sqlalchemy import or_
 
         stmt = select(users_table).where(
-                        or_(
-                            users_table.c.name == 'wendy',
-                            users_table.c.name == 'jack'
-                        )
-                    )
+            or_(users_table.c.name == "wendy", users_table.c.name == "jack")
+        )
 
     The :func:`.or_` conjunction is also available using the
     Python ``|`` operator (though note that compound expressions
@@ -1389,9 +1417,8 @@ def or_(  # type: ignore[empty-body]
     operator precedence behavior)::
 
         stmt = select(users_table).where(
-                        (users_table.c.name == 'wendy') |
-                        (users_table.c.name == 'jack')
-                    )
+            (users_table.c.name == "wendy") | (users_table.c.name == "jack")
+        )
 
     The :func:`.or_` construct must be given at least one positional
     argument in order to be valid; a :func:`.or_` construct with no
@@ -1401,6 +1428,7 @@ def or_(  # type: ignore[empty-body]
     specified::
 
         from sqlalchemy import false
+
         or_criteria = or_(false(), *expressions)
 
     The above expression will compile to SQL as the expression ``false``
@@ -1432,11 +1460,8 @@ if not TYPE_CHECKING:
             from sqlalchemy import or_
 
             stmt = select(users_table).where(
-                            or_(
-                                users_table.c.name == 'wendy',
-                                users_table.c.name == 'jack'
-                            )
-                        )
+                or_(users_table.c.name == "wendy", users_table.c.name == "jack")
+            )
 
         The :func:`.or_` conjunction is also available using the
         Python ``|`` operator (though note that compound expressions
@@ -1444,9 +1469,8 @@ if not TYPE_CHECKING:
         operator precedence behavior)::
 
             stmt = select(users_table).where(
-                            (users_table.c.name == 'wendy') |
-                            (users_table.c.name == 'jack')
-                        )
+                (users_table.c.name == "wendy") | (users_table.c.name == "jack")
+            )
 
         The :func:`.or_` construct must be given at least one positional
         argument in order to be valid; a :func:`.or_` construct with no
@@ -1456,6 +1480,7 @@ if not TYPE_CHECKING:
         specified::
 
             from sqlalchemy import false
+
             or_criteria = or_(false(), *expressions)
 
         The above expression will compile to SQL as the expression ``false``
@@ -1473,7 +1498,7 @@ if not TYPE_CHECKING:
 
             :func:`.and_`
 
-        """
+        """  # noqa: E501
         return BooleanClauseList.or_(*clauses)
 
 
@@ -1494,7 +1519,9 @@ def over(
 
         func.row_number().over(order_by=mytable.c.some_column)
 
-    Would produce::
+    Would produce:
+
+    .. sourcecode:: sql
 
         ROW_NUMBER() OVER(ORDER BY some_column)
 
@@ -1503,10 +1530,11 @@ def over(
     mutually-exclusive parameters each accept a 2-tuple, which contains
     a combination of integers and None::
 
-        func.row_number().over(
-            order_by=my_table.c.some_column, range_=(None, 0))
+        func.row_number().over(order_by=my_table.c.some_column, range_=(None, 0))
 
-    The above would produce::
+    The above would produce:
+
+    .. sourcecode:: sql
 
         ROW_NUMBER() OVER(ORDER BY some_column
         RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)
@@ -1517,19 +1545,19 @@ def over(
 
     * RANGE BETWEEN 5 PRECEDING AND 10 FOLLOWING::
 
-        func.row_number().over(order_by='x', range_=(-5, 10))
+        func.row_number().over(order_by="x", range_=(-5, 10))
 
     * ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW::
 
-        func.row_number().over(order_by='x', rows=(None, 0))
+        func.row_number().over(order_by="x", rows=(None, 0))
 
     * RANGE BETWEEN 2 PRECEDING AND UNBOUNDED FOLLOWING::
 
-        func.row_number().over(order_by='x', range_=(-2, None))
+        func.row_number().over(order_by="x", range_=(-2, None))
 
     * RANGE BETWEEN 1 FOLLOWING AND 3 FOLLOWING::
 
-        func.row_number().over(order_by='x', range_=(1, 3))
+        func.row_number().over(order_by="x", range_=(1, 3))
 
     :param element: a :class:`.FunctionElement`, :class:`.WithinGroup`,
      or other compatible construct.
@@ -1558,7 +1586,7 @@ def over(
 
         :func:`_expression.within_group`
 
-    """
+    """  # noqa: E501
     return Over(element, partition_by, order_by, range_, rows)
 
 
@@ -1589,7 +1617,7 @@ def text(text: str) -> TextClause:
     E.g.::
 
         t = text("SELECT * FROM users WHERE id=:user_id")
-        result = connection.execute(t, user_id=12)
+        result = connection.execute(t, {"user_id": 12})
 
     For SQL statements where a colon is required verbatim, as within
     an inline string, use a backslash to escape::
@@ -1607,9 +1635,11 @@ def text(text: str) -> TextClause:
     method allows
     specification of return columns including names and types::
 
-        t = text("SELECT * FROM users WHERE id=:user_id").\
-                bindparams(user_id=7).\
-                columns(id=Integer, name=String)
+        t = (
+            text("SELECT * FROM users WHERE id=:user_id")
+            .bindparams(user_id=7)
+            .columns(id=Integer, name=String)
+        )
 
         for id, name in connection.execute(t):
             print(id, name)
@@ -1619,7 +1649,7 @@ def text(text: str) -> TextClause:
     such as for the WHERE clause of a SELECT statement::
 
         s = select(users.c.id, users.c.name).where(text("id=:user_id"))
-        result = connection.execute(s, user_id=12)
+        result = connection.execute(s, {"user_id": 12})
 
     :func:`_expression.text` is also used for the construction
     of a full, standalone statement using plain text.
@@ -1691,9 +1721,7 @@ def tuple_(
 
         from sqlalchemy import tuple_
 
-        tuple_(table.c.col1, table.c.col2).in_(
-            [(1, 2), (5, 12), (10, 19)]
-        )
+        tuple_(table.c.col1, table.c.col2).in_([(1, 2), (5, 12), (10, 19)])
 
     .. versionchanged:: 1.3.6 Added support for SQLite IN tuples.
 
@@ -1743,10 +1771,9 @@ def type_coerce(
     :meth:`_expression.ColumnElement.label`::
 
         stmt = select(
-            type_coerce(log_table.date_string, StringDateTime()).label('date')
+            type_coerce(log_table.date_string, StringDateTime()).label("date")
         )
 
-
     A type that features bound-value handling will also have that behavior
     take effect when literal values or :func:`.bindparam` constructs are
     passed to :func:`.type_coerce` as targets.
@@ -1807,11 +1834,10 @@ def within_group(
     the :meth:`.FunctionElement.within_group` method, e.g.::
 
         from sqlalchemy import within_group
+
         stmt = select(
             department.c.id,
-            func.percentile_cont(0.5).within_group(
-                department.c.salary.desc()
-            )
+            func.percentile_cont(0.5).within_group(department.c.salary.desc()),
         )
 
     The above statement would produce SQL similar to
diff --git a/libs/sqlalchemy/sql/_orm_types.py b/libs/sqlalchemy/sql/_orm_types.py
index bccb533ca..c37d805ef 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2025 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 df372bf5d..9e1a084a3 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 c2b5008c6..1660778c5 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -155,16 +155,16 @@ def exists(
     :meth:`_sql.SelectBase.exists` method::
 
         exists_criteria = (
-            select(table2.c.col2).
-            where(table1.c.col1 == table2.c.col2).
-            exists()
+            select(table2.c.col2).where(table1.c.col1 == table2.c.col2).exists()
         )
 
     The EXISTS criteria is then used inside of an enclosing SELECT::
 
         stmt = select(table1.c.col1).where(exists_criteria)
 
-    The above statement will then be of the form::
+    The above statement will then be of the form:
+
+    .. sourcecode:: sql
 
         SELECT col1 FROM table1 WHERE EXISTS
         (SELECT table2.col2 FROM table2 WHERE table2.col2 = table1.col1)
@@ -225,11 +225,14 @@ def join(
 
     E.g.::
 
-        j = join(user_table, address_table,
-                 user_table.c.id == address_table.c.user_id)
+        j = join(
+            user_table, address_table, user_table.c.id == address_table.c.user_id
+        )
         stmt = select(user_table).select_from(j)
 
-    would emit SQL along the lines of::
+    would emit SQL along the lines of:
+
+    .. sourcecode:: sql
 
         SELECT user.id, user.name FROM user
         JOIN address ON user.id = address.user_id
@@ -263,7 +266,7 @@ def join(
 
         :class:`_expression.Join` - the type of object produced.
 
-    """
+    """  # noqa: E501
 
     return Join(left, right, onclause, isouter, full)
 
@@ -529,13 +532,14 @@ def tablesample(
         from sqlalchemy import func
 
         selectable = people.tablesample(
-                    func.bernoulli(1),
-                    name='alias',
-                    seed=func.random())
+            func.bernoulli(1), name="alias", seed=func.random()
+        )
         stmt = select(selectable.c.people_id)
 
     Assuming ``people`` with a column ``people_id``, the above
-    statement would render as::
+    statement would render as:
+
+    .. sourcecode:: sql
 
         SELECT alias.people_id FROM
         people AS alias TABLESAMPLE bernoulli(:bernoulli_1)
@@ -613,12 +617,10 @@ def values(
         from sqlalchemy import values
 
         value_expr = values(
-            column('id', Integer),
-            column('name', String),
-            name="my_values"
-        ).data(
-            [(1, 'name1'), (2, 'name2'), (3, 'name3')]
-        )
+            column("id", Integer),
+            column("name", String),
+            name="my_values",
+        ).data([(1, "name1"), (2, "name2"), (3, "name3")])
 
     :param \*columns: column expressions, typically composed using
      :func:`_expression.column` objects.
diff --git a/libs/sqlalchemy/sql/_typing.py b/libs/sqlalchemy/sql/_typing.py
index ea9cbe1f4..cf9129b47 100644
--- a/libs/sqlalchemy/sql/_typing.py
+++ b/libs/sqlalchemy/sql/_typing.py
@@ -1,5 +1,5 @@
 # sql/_typing.py
-# Copyright (C) 2022-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -69,6 +69,7 @@ if TYPE_CHECKING:
     from .sqltypes import TableValueType
     from .sqltypes import TupleType
     from .type_api import TypeEngine
+    from ..engine import Dialect
     from ..util.typing import TypeGuard
 
 _T = TypeVar("_T", bound=Any)
@@ -92,11 +93,21 @@ class _CoreAdapterProto(Protocol):
     def __call__(self, obj: _CE) -> _CE: ...
 
 
+class _HasDialect(Protocol):
+    """protocol for Engine/Connection-like objects that have dialect
+    attribute.
+    """
+
+    @property
+    def dialect(self) -> Dialect: ...
+
+
 # match column types that are not ORM entities
 _NOT_ENTITY = TypeVar(
     "_NOT_ENTITY",
     int,
     str,
+    bool,
     "datetime",
     "date",
     "time",
@@ -106,10 +117,12 @@ _NOT_ENTITY = TypeVar(
     "Decimal",
 )
 
+_StarOrOne = Literal["*", 1]
+
 _MAYBE_ENTITY = TypeVar(
     "_MAYBE_ENTITY",
     roles.ColumnsClauseRole,
-    Literal["*", 1],
+    _StarOrOne,
     Type[Any],
     Inspectable[_HasClauseElement[Any]],
     _HasClauseElement[Any],
@@ -134,7 +147,7 @@ _ColumnsClauseArgument = Union[
     roles.TypedColumnsClauseRole[_T],
     roles.ColumnsClauseRole,
     "SQLCoreOperations[_T]",
-    Literal["*", 1],
+    _StarOrOne,
     Type[_T],
     Inspectable[_HasClauseElement[_T]],
     _HasClauseElement[_T],
@@ -174,6 +187,7 @@ _ColumnExpressionArgument = Union[
     _HasClauseElement[_T],
     "SQLCoreOperations[_T]",
     roles.ExpressionElementRole[_T],
+    roles.TypedColumnsClauseRole[_T],
     Callable[[], "ColumnElement[_T]"],
     "LambdaElement",
 ]
diff --git a/libs/sqlalchemy/sql/annotation.py b/libs/sqlalchemy/sql/annotation.py
index db382b874..bf445ff33 100644
--- a/libs/sqlalchemy/sql/annotation.py
+++ b/libs/sqlalchemy/sql/annotation.py
@@ -1,5 +1,5 @@
 # sql/annotation.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/base.py b/libs/sqlalchemy/sql/base.py
index cea0f177d..6d409a9fb 100644
--- a/libs/sqlalchemy/sql/base.py
+++ b/libs/sqlalchemy/sql/base.py
@@ -1,5 +1,5 @@
 # sql/base.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -72,7 +72,6 @@ if TYPE_CHECKING:
     from .elements import ClauseList
     from .elements import ColumnClause  # noqa
     from .elements import ColumnElement
-    from .elements import KeyedColumnElement
     from .elements import NamedColumn
     from .elements import SQLCoreOperations
     from .elements import TextClause
@@ -481,7 +480,7 @@ class DialectKWArgs:
 
             Index.argument_for("mydialect", "length", None)
 
-            some_index = Index('a', 'b', mydialect_length=5)
+            some_index = Index("a", "b", mydialect_length=5)
 
         The :meth:`.DialectKWArgs.argument_for` method is a per-argument
         way adding extra arguments to the
@@ -570,7 +569,7 @@ class DialectKWArgs:
         and ``<argument_name>``.  For example, the ``postgresql_where``
         argument would be locatable as::
 
-            arg = my_object.dialect_options['postgresql']['where']
+            arg = my_object.dialect_options["postgresql"]["where"]
 
         .. versionadded:: 0.9.2
 
@@ -918,11 +917,7 @@ class Options(metaclass=_MetaOptions):
                 execution_options,
             ) = QueryContext.default_load_options.from_execution_options(
                 "_sa_orm_load_options",
-                {
-                    "populate_existing",
-                    "autoflush",
-                    "yield_per"
-                },
+                {"populate_existing", "autoflush", "yield_per"},
                 execution_options,
                 statement._execution_options,
             )
@@ -1029,6 +1024,7 @@ class Executable(roles.StatementRole):
     ]
 
     is_select = False
+    is_from_statement = False
     is_update = False
     is_insert = False
     is_text = False
@@ -1167,6 +1163,7 @@ class Executable(roles.StatementRole):
         render_nulls: bool = ...,
         is_delete_using: bool = ...,
         is_update_from: bool = ...,
+        preserve_rowcount: bool = False,
         **opt: Any,
     ) -> Self: ...
 
@@ -1223,6 +1220,7 @@ class Executable(roles.StatementRole):
 
              from sqlalchemy import event
 
+
              @event.listens_for(some_engine, "before_execute")
              def _process_opt(conn, statement, multiparams, params, execution_options):
                  "run a SQL function before invoking a statement"
@@ -1352,7 +1350,7 @@ class _SentinelColumnCharacterization(NamedTuple):
 _COLKEY = TypeVar("_COLKEY", Union[None, str], str)
 
 _COL_co = TypeVar("_COL_co", bound="ColumnElement[Any]", covariant=True)
-_COL = TypeVar("_COL", bound="KeyedColumnElement[Any]")
+_COL = TypeVar("_COL", bound="ColumnElement[Any]")
 
 
 class _ColumnMetrics(Generic[_COL_co]):
@@ -1474,14 +1472,14 @@ class ColumnCollection(Generic[_COLKEY, _COL_co]):
     mean either two columns with the same key, in which case the column
     returned by key  access is **arbitrary**::
 
-        >>> x1, x2 = Column('x', Integer), Column('x', Integer)
+        >>> x1, x2 = Column("x", Integer), Column("x", Integer)
         >>> cc = ColumnCollection(columns=[(x1.name, x1), (x2.name, x2)])
         >>> list(cc)
         [Column('x', Integer(), table=None),
          Column('x', Integer(), table=None)]
-        >>> cc['x'] is x1
+        >>> cc["x"] is x1
         False
-        >>> cc['x'] is x2
+        >>> cc["x"] is x2
         True
 
     Or it can also mean the same column multiple times.   These cases are
@@ -1640,9 +1638,15 @@ class ColumnCollection(Generic[_COLKEY, _COL_co]):
     def __eq__(self, other: Any) -> bool:
         return self.compare(other)
 
+    @overload
+    def get(self, key: str, default: None = None) -> Optional[_COL_co]: ...
+
+    @overload
+    def get(self, key: str, default: _COL) -> Union[_COL_co, _COL]: ...
+
     def get(
-        self, key: str, default: Optional[_COL_co] = None
-    ) -> Optional[_COL_co]:
+        self, key: str, default: Optional[_COL] = None
+    ) -> Optional[Union[_COL_co, _COL]]:
         """Get a :class:`_sql.ColumnClause` or :class:`_schema.Column` object
         based on a string key name from this
         :class:`_expression.ColumnCollection`."""
@@ -1923,16 +1927,15 @@ class DedupeColumnCollection(ColumnCollection[str, _NAMEDCOL]):
 
     """
 
-    def add(
-        self, column: ColumnElement[Any], key: Optional[str] = None
+    def add(  # type: ignore[override]
+        self, column: _NAMEDCOL, key: Optional[str] = None
     ) -> None:
-        named_column = cast(_NAMEDCOL, column)
-        if key is not None and named_column.key != key:
+        if key is not None and column.key != key:
             raise exc.ArgumentError(
                 "DedupeColumnCollection requires columns be under "
                 "the same key as their .key"
             )
-        key = named_column.key
+        key = column.key
 
         if key is None:
             raise exc.ArgumentError(
@@ -1942,17 +1945,17 @@ class DedupeColumnCollection(ColumnCollection[str, _NAMEDCOL]):
         if key in self._index:
             existing = self._index[key][1]
 
-            if existing is named_column:
+            if existing is column:
                 return
 
-            self.replace(named_column)
+            self.replace(column)
 
             # pop out memoized proxy_set as this
             # operation may very well be occurring
             # in a _make_proxy operation
-            util.memoized_property.reset(named_column, "proxy_set")
+            util.memoized_property.reset(column, "proxy_set")
         else:
-            self._append_new_column(key, named_column)
+            self._append_new_column(key, column)
 
     def _append_new_column(self, key: str, named_column: _NAMEDCOL) -> None:
         l = len(self._collection)
@@ -2027,8 +2030,8 @@ class DedupeColumnCollection(ColumnCollection[str, _NAMEDCOL]):
 
         e.g.::
 
-            t = Table('sometable', metadata, Column('col1', Integer))
-            t.columns.replace(Column('col1', Integer, key='columnone'))
+            t = Table("sometable", metadata, Column("col1", Integer))
+            t.columns.replace(Column("col1", Integer, key="columnone"))
 
         will remove the original 'col1' from the collection, and add
         the new column under the name 'columnname'.
@@ -2131,7 +2134,7 @@ class ColumnSet(util.OrderedSet["ColumnClause[Any]"]):
                     l.append(c == local)
         return elements.and_(*l)
 
-    def __hash__(self):
+    def __hash__(self):  # type: ignore[override]
         return hash(tuple(x for x in self))
 
 
diff --git a/libs/sqlalchemy/sql/cache_key.py b/libs/sqlalchemy/sql/cache_key.py
index b4b6b23fa..1f562f2e6 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -37,6 +37,7 @@ from ..util.typing import Protocol
 if typing.TYPE_CHECKING:
     from .elements import BindParameter
     from .elements import ClauseElement
+    from .elements import ColumnElement
     from .visitors import _TraverseInternalsType
     from ..engine.interfaces import _CoreSingleExecuteParams
 
@@ -557,18 +558,17 @@ class CacheKey(NamedTuple):
         _anon_map = prefix_anon_map()
         return {b.key % _anon_map: b.effective_value for b in self.bindparams}
 
+    @util.preload_module("sqlalchemy.sql.elements")
     def _apply_params_to_element(
-        self, original_cache_key: CacheKey, target_element: ClauseElement
-    ) -> ClauseElement:
-        if target_element._is_immutable:
+        self, original_cache_key: CacheKey, target_element: ColumnElement[Any]
+    ) -> ColumnElement[Any]:
+        if target_element._is_immutable or original_cache_key is self:
             return target_element
 
-        translate = {
-            k.key: v.value
-            for k, v in zip(original_cache_key.bindparams, self.bindparams)
-        }
-
-        return target_element.params(translate)
+        elements = util.preloaded.sql_elements
+        return elements._OverrideBinds(
+            target_element, self.bindparams, original_cache_key.bindparams
+        )
 
 
 def _ad_hoc_cache_key_from_args(
diff --git a/libs/sqlalchemy/sql/coercions.py b/libs/sqlalchemy/sql/coercions.py
index 22d609155..123b5c556 100644
--- a/libs/sqlalchemy/sql/coercions.py
+++ b/libs/sqlalchemy/sql/coercions.py
@@ -1,5 +1,5 @@
 # sql/coercions.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,7 +29,6 @@ from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
 
-from . import operators
 from . import roles
 from . import visitors
 from ._typing import is_from_clause
@@ -58,9 +57,9 @@ if typing.TYPE_CHECKING:
     from .elements import ClauseElement
     from .elements import ColumnClause
     from .elements import ColumnElement
-    from .elements import DQLDMLClauseElement
     from .elements import NamedColumn
     from .elements import SQLCoreOperations
+    from .elements import TextClause
     from .schema import Column
     from .selectable import _ColumnsClauseElement
     from .selectable import _JoinTargetProtocol
@@ -191,7 +190,7 @@ def expect(
     role: Type[roles.DDLReferredColumnRole],
     element: Any,
     **kw: Any,
-) -> Column[Any]: ...
+) -> Union[Column[Any], str]: ...
 
 
 @overload
@@ -207,7 +206,7 @@ def expect(
     role: Type[roles.StatementOptionRole],
     element: Any,
     **kw: Any,
-) -> DQLDMLClauseElement: ...
+) -> Union[ColumnElement[Any], TextClause]: ...
 
 
 @overload
@@ -493,6 +492,7 @@ class RoleImpl:
         element: Any,
         argname: Optional[str] = None,
         resolved: Optional[Any] = None,
+        *,
         advice: Optional[str] = None,
         code: Optional[str] = None,
         err: Optional[Exception] = None,
@@ -595,7 +595,7 @@ def _no_text_coercion(
 class _NoTextCoercion(RoleImpl):
     __slots__ = ()
 
-    def _literal_coercion(self, element, argname=None, **kw):
+    def _literal_coercion(self, element, *, argname=None, **kw):
         if isinstance(element, str) and issubclass(
             elements.TextClause, self._role_class
         ):
@@ -613,7 +613,7 @@ class _CoerceLiterals(RoleImpl):
     def _text_coercion(self, element, argname=None):
         return _no_text_coercion(element, argname)
 
-    def _literal_coercion(self, element, argname=None, **kw):
+    def _literal_coercion(self, element, *, argname=None, **kw):
         if isinstance(element, str):
             if self._coerce_star and element == "*":
                 return elements.ColumnClause("*", is_literal=True)
@@ -641,7 +641,8 @@ class LiteralValueImpl(RoleImpl):
         self,
         element,
         resolved,
-        argname,
+        argname=None,
+        *,
         type_=None,
         literal_execute=False,
         **kw,
@@ -659,7 +660,7 @@ class LiteralValueImpl(RoleImpl):
             literal_execute=literal_execute,
         )
 
-    def _literal_coercion(self, element, argname=None, type_=None, **kw):
+    def _literal_coercion(self, element, **kw):
         return element
 
 
@@ -671,6 +672,7 @@ class _SelectIsNotFrom(RoleImpl):
         element: Any,
         argname: Optional[str] = None,
         resolved: Optional[Any] = None,
+        *,
         advice: Optional[str] = None,
         code: Optional[str] = None,
         err: Optional[Exception] = None,
@@ -745,7 +747,7 @@ class ExpressionElementImpl(_ColumnCoercions, RoleImpl):
     __slots__ = ()
 
     def _literal_coercion(
-        self, element, name=None, type_=None, argname=None, is_crud=False, **kw
+        self, element, *, name=None, type_=None, is_crud=False, **kw
     ):
         if (
             element is None
@@ -787,15 +789,22 @@ class ExpressionElementImpl(_ColumnCoercions, RoleImpl):
 class BinaryElementImpl(ExpressionElementImpl, RoleImpl):
     __slots__ = ()
 
-    def _literal_coercion(
-        self, element, expr, operator, bindparam_type=None, argname=None, **kw
+    def _literal_coercion(  # type: ignore[override]
+        self,
+        element,
+        *,
+        expr,
+        operator,
+        bindparam_type=None,
+        argname=None,
+        **kw,
     ):
         try:
             return expr._bind_param(operator, element, type_=bindparam_type)
         except exc.ArgumentError as err:
             self._raise_for_expected(element, err=err)
 
-    def _post_coercion(self, resolved, expr, bindparam_type=None, **kw):
+    def _post_coercion(self, resolved, *, expr, bindparam_type=None, **kw):
         if resolved.type._isnull and not expr.type._isnull:
             resolved = resolved._with_binary_element_type(
                 bindparam_type if bindparam_type is not None else expr.type
@@ -833,16 +842,19 @@ class InElementImpl(RoleImpl):
             % (elem.__class__.__name__)
         )
 
-    def _literal_coercion(self, element, expr, operator, **kw):
+    @util.preload_module("sqlalchemy.sql.elements")
+    def _literal_coercion(self, element, *, expr, operator, **kw):
         if util.is_non_string_iterable(element):
             non_literal_expressions: Dict[
-                Optional[operators.ColumnOperators],
-                operators.ColumnOperators,
+                Optional[_ColumnExpressionArgument[Any]],
+                _ColumnExpressionArgument[Any],
             ] = {}
             element = list(element)
             for o in element:
                 if not _is_literal(o):
-                    if not isinstance(o, operators.ColumnOperators):
+                    if not isinstance(
+                        o, util.preloaded.sql_elements.ColumnElement
+                    ) and not hasattr(o, "__clause_element__"):
                         self._raise_for_expected(element, **kw)
 
                     else:
@@ -867,7 +879,7 @@ class InElementImpl(RoleImpl):
         else:
             self._raise_for_expected(element, **kw)
 
-    def _post_coercion(self, element, expr, operator, **kw):
+    def _post_coercion(self, element, *, expr, operator, **kw):
         if element._is_select_base:
             # for IN, we are doing scalar_subquery() coercion without
             # a warning
@@ -893,12 +905,10 @@ class OnClauseImpl(_ColumnCoercions, RoleImpl):
 
     _coerce_consts = True
 
-    def _literal_coercion(
-        self, element, name=None, type_=None, argname=None, is_crud=False, **kw
-    ):
+    def _literal_coercion(self, element, **kw):
         self._raise_for_expected(element)
 
-    def _post_coercion(self, resolved, original_element=None, **kw):
+    def _post_coercion(self, resolved, *, original_element=None, **kw):
         # this is a hack right now as we want to use coercion on an
         # ORM InstrumentedAttribute, but we want to return the object
         # itself if it is one, not its clause element.
@@ -983,7 +993,7 @@ class GroupByImpl(ByOfImpl, RoleImpl):
 class DMLColumnImpl(_ReturnsStringKey, RoleImpl):
     __slots__ = ()
 
-    def _post_coercion(self, element, as_key=False, **kw):
+    def _post_coercion(self, element, *, as_key=False, **kw):
         if as_key:
             return element.key
         else:
@@ -993,7 +1003,7 @@ class DMLColumnImpl(_ReturnsStringKey, RoleImpl):
 class ConstExprImpl(RoleImpl):
     __slots__ = ()
 
-    def _literal_coercion(self, element, argname=None, **kw):
+    def _literal_coercion(self, element, *, argname=None, **kw):
         if element is None:
             return elements.Null()
         elif element is False:
@@ -1019,7 +1029,7 @@ class TruncatedLabelImpl(_StringOnly, RoleImpl):
         else:
             self._raise_for_expected(element, argname, resolved)
 
-    def _literal_coercion(self, element, argname=None, **kw):
+    def _literal_coercion(self, element, **kw):
         """coerce the given value to :class:`._truncated_label`.
 
         Existing :class:`._truncated_label` and
@@ -1069,7 +1079,9 @@ class LimitOffsetImpl(RoleImpl):
         else:
             self._raise_for_expected(element, argname, resolved)
 
-    def _literal_coercion(self, element, name, type_, **kw):
+    def _literal_coercion(  # type: ignore[override]
+        self, element, *, name, type_, **kw
+    ):
         if element is None:
             return None
         else:
@@ -1111,7 +1123,7 @@ class ColumnsClauseImpl(_SelectIsNotFrom, _CoerceLiterals, RoleImpl):
     _guess_straight_column = re.compile(r"^\w\S*$", re.I)
 
     def _raise_for_expected(
-        self, element, argname=None, resolved=None, advice=None, **kw
+        self, element, argname=None, resolved=None, *, advice=None, **kw
     ):
         if not advice and isinstance(element, list):
             advice = (
@@ -1149,7 +1161,9 @@ class ReturnsRowsImpl(RoleImpl):
 class StatementImpl(_CoerceLiterals, RoleImpl):
     __slots__ = ()
 
-    def _post_coercion(self, resolved, original_element, argname=None, **kw):
+    def _post_coercion(
+        self, resolved, *, original_element, argname=None, **kw
+    ):
         if resolved is not original_element and not isinstance(
             original_element, str
         ):
@@ -1215,7 +1229,7 @@ class JoinTargetImpl(RoleImpl):
 
     _skip_clauseelement_for_target_match = True
 
-    def _literal_coercion(self, element, argname=None, **kw):
+    def _literal_coercion(self, element, *, argname=None, **kw):
         self._raise_for_expected(element, argname)
 
     def _implicit_coercions(
@@ -1223,6 +1237,7 @@ class JoinTargetImpl(RoleImpl):
         element: Any,
         resolved: Any,
         argname: Optional[str] = None,
+        *,
         legacy: bool = False,
         **kw: Any,
     ) -> Any:
@@ -1256,6 +1271,7 @@ class FromClauseImpl(_SelectIsNotFrom, _NoTextCoercion, RoleImpl):
         element: Any,
         resolved: Any,
         argname: Optional[str] = None,
+        *,
         explicit_subquery: bool = False,
         allow_select: bool = True,
         **kw: Any,
@@ -1277,7 +1293,7 @@ class FromClauseImpl(_SelectIsNotFrom, _NoTextCoercion, RoleImpl):
         else:
             self._raise_for_expected(element, argname, resolved)
 
-    def _post_coercion(self, element, deannotate=False, **kw):
+    def _post_coercion(self, element, *, deannotate=False, **kw):
         if deannotate:
             return element._deannotate()
         else:
@@ -1292,7 +1308,7 @@ class StrictFromClauseImpl(FromClauseImpl):
         element: Any,
         resolved: Any,
         argname: Optional[str] = None,
-        explicit_subquery: bool = False,
+        *,
         allow_select: bool = False,
         **kw: Any,
     ) -> Any:
@@ -1312,7 +1328,7 @@ class StrictFromClauseImpl(FromClauseImpl):
 class AnonymizedFromClauseImpl(StrictFromClauseImpl):
     __slots__ = ()
 
-    def _post_coercion(self, element, flat=False, name=None, **kw):
+    def _post_coercion(self, element, *, flat=False, name=None, **kw):
         assert name is None
 
         return element._anonymous_fromclause(flat=flat)
diff --git a/libs/sqlalchemy/sql/compiler.py b/libs/sqlalchemy/sql/compiler.py
index ba8e3ea45..49e8ce500 100644
--- a/libs/sqlalchemy/sql/compiler.py
+++ b/libs/sqlalchemy/sql/compiler.py
@@ -1,5 +1,5 @@
 # sql/compiler.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,6 +29,7 @@ import collections
 import collections.abc as collections_abc
 import contextlib
 from enum import IntEnum
+import functools
 import itertools
 import operator
 import re
@@ -114,7 +115,6 @@ if typing.TYPE_CHECKING:
     from .selectable import Select
     from .selectable import SelectState
     from .type_api import _BindProcessorType
-    from .type_api import _SentinelProcessorType
     from ..engine.cursor import CursorResultMetaData
     from ..engine.interfaces import _CoreSingleExecuteParams
     from ..engine.interfaces import _DBAPIAnyExecuteParams
@@ -545,8 +545,8 @@ class _InsertManyValues(NamedTuple):
 
     """
 
-    sentinel_param_keys: Optional[Sequence[Union[str, int]]] = None
-    """parameter str keys / int indexes in each param dictionary / tuple
+    sentinel_param_keys: Optional[Sequence[str]] = None
+    """parameter str keys in each param dictionary / tuple
     that would link to the client side "sentinel" values for that row, which
     we can use to match up parameter sets to result rows.
 
@@ -556,6 +556,10 @@ class _InsertManyValues(NamedTuple):
 
     .. versionadded:: 2.0.10
 
+    .. versionchanged:: 2.0.29 - the sequence is now string dictionary keys
+       only, used against the "compiled parameteters" collection before
+       the parameters were converted by bound parameter processors
+
     """
 
     implicit_sentinel: bool = False
@@ -600,7 +604,8 @@ class _InsertManyValuesBatch(NamedTuple):
     replaced_parameters: _DBAPIAnyExecuteParams
     processed_setinputsizes: Optional[_GenericSetInputSizesType]
     batch: Sequence[_DBAPISingleExecuteParams]
-    batch_size: int
+    sentinel_values: Sequence[Tuple[Any, ...]]
+    current_batch_size: int
     batchnum: int
     total_batches: int
     rows_sorted: bool
@@ -1675,19 +1680,9 @@ class SQLCompiler(Compiled):
                 for v in self._insertmanyvalues.insert_crud_params
             ]
 
-            sentinel_param_int_idxs = (
-                [
-                    self.positiontup.index(cast(str, _param_key))
-                    for _param_key in self._insertmanyvalues.sentinel_param_keys  # noqa: E501
-                ]
-                if self._insertmanyvalues.sentinel_param_keys is not None
-                else None
-            )
-
             self._insertmanyvalues = self._insertmanyvalues._replace(
                 single_values_expr=single_values_expr,
                 insert_crud_params=insert_crud_params,
-                sentinel_param_keys=sentinel_param_int_idxs,
             )
 
     def _process_numeric(self):
@@ -1756,21 +1751,11 @@ class SQLCompiler(Compiled):
                 for v in self._insertmanyvalues.insert_crud_params
             ]
 
-            sentinel_param_int_idxs = (
-                [
-                    self.positiontup.index(cast(str, _param_key))
-                    for _param_key in self._insertmanyvalues.sentinel_param_keys  # noqa: E501
-                ]
-                if self._insertmanyvalues.sentinel_param_keys is not None
-                else None
-            )
-
             self._insertmanyvalues = self._insertmanyvalues._replace(
                 # This has the numbers (:1, :2)
                 single_values_expr=single_values_expr,
                 # The single binds are instead %s so they can be formatted
                 insert_crud_params=insert_crud_params,
-                sentinel_param_keys=sentinel_param_int_idxs,
             )
 
     @util.memoized_property
@@ -1802,23 +1787,6 @@ class SQLCompiler(Compiled):
             if value is not None
         }
 
-    @util.memoized_property
-    def _imv_sentinel_value_resolvers(
-        self,
-    ) -> Optional[Sequence[Optional[_SentinelProcessorType[Any]]]]:
-        imv = self._insertmanyvalues
-        if imv is None or imv.sentinel_columns is None:
-            return None
-
-        sentinel_value_resolvers = [
-            _scol.type._cached_sentinel_value_processor(self.dialect)
-            for _scol in imv.sentinel_columns
-        ]
-        if util.NONE_SET.issuperset(sentinel_value_resolvers):
-            return None
-        else:
-            return sentinel_value_resolvers
-
     def is_subquery(self):
         return len(self.stack) > 1
 
@@ -2378,11 +2346,76 @@ class SQLCompiler(Compiled):
         """Called when a SELECT statement has no froms, and no FROM clause is
         to be appended.
 
-        Gives Oracle a chance to tack on a ``FROM DUAL`` to the string output.
+        Gives Oracle Database a chance to tack on a ``FROM DUAL`` to the string
+        output.
 
         """
         return ""
 
+    def visit_override_binds(self, override_binds, **kw):
+        """SQL compile the nested element of an _OverrideBinds with
+        bindparams swapped out.
+
+        The _OverrideBinds is not normally expected to be compiled; it
+        is meant to be used when an already cached statement is to be used,
+        the compilation was already performed, and only the bound params should
+        be swapped in at execution time.
+
+        However, there are test cases that exericise this object, and
+        additionally the ORM subquery loader is known to feed in expressions
+        which include this construct into new queries (discovered in #11173),
+        so it has to do the right thing at compile time as well.
+
+        """
+
+        # get SQL text first
+        sqltext = override_binds.element._compiler_dispatch(self, **kw)
+
+        # for a test compile that is not for caching, change binds after the
+        # fact.  note that we don't try to
+        # swap the bindparam as we compile, because our element may be
+        # elsewhere in the statement already (e.g. a subquery or perhaps a
+        # CTE) and was already visited / compiled. See
+        # test_relationship_criteria.py ->
+        #    test_selectinload_local_criteria_subquery
+        for k in override_binds.translate:
+            if k not in self.binds:
+                continue
+            bp = self.binds[k]
+
+            # so this would work, just change the value of bp in place.
+            # but we dont want to mutate things outside.
+            # bp.value = override_binds.translate[bp.key]
+            # continue
+
+            # instead, need to replace bp with new_bp or otherwise accommodate
+            # in all internal collections
+            new_bp = bp._with_value(
+                override_binds.translate[bp.key],
+                maintain_key=True,
+                required=False,
+            )
+
+            name = self.bind_names[bp]
+            self.binds[k] = self.binds[name] = new_bp
+            self.bind_names[new_bp] = name
+            self.bind_names.pop(bp, None)
+
+            if bp in self.post_compile_params:
+                self.post_compile_params |= {new_bp}
+            if bp in self.literal_execute_params:
+                self.literal_execute_params |= {new_bp}
+
+            ckbm_tuple = self._cache_key_bind_match
+            if ckbm_tuple:
+                ckbm, cksm = ckbm_tuple
+                for bp in bp._cloned_set:
+                    if bp.key in cksm:
+                        cb = cksm[bp.key]
+                        ckbm[cb].append(new_bp)
+
+        return sqltext
+
     def visit_grouping(self, grouping, asfrom=False, **kwargs):
         return "(" + grouping.element._compiler_dispatch(self, **kwargs) + ")"
 
@@ -2904,7 +2937,7 @@ class SQLCompiler(Compiled):
         **kwargs: Any,
     ) -> str:
         if add_to_result_map is not None:
-            add_to_result_map(func.name, func.name, (), func.type)
+            add_to_result_map(func.name, func.name, (func.name,), func.type)
 
         disp = getattr(self, "visit_%s_func" % func.name.lower(), None)
 
@@ -3614,6 +3647,7 @@ class SQLCompiler(Compiled):
         render_postcompile=False,
         **kwargs,
     ):
+
         if not skip_bind_expression:
             impl = bindparam.type.dialect_impl(self.dialect)
             if impl._has_bind_expression:
@@ -4353,6 +4387,11 @@ class SQLCompiler(Compiled):
         objects: Tuple[Any, ...],
         type_: TypeEngine[Any],
     ) -> None:
+
+        # note objects must be non-empty for cursor.py to handle the
+        # collection properly
+        assert objects
+
         if keyname is None or keyname == "*":
             self._ordered_columns = False
             self._ad_hoc_textual = True
@@ -4426,7 +4465,7 @@ class SQLCompiler(Compiled):
                 _add_to_result_map = add_to_result_map
 
                 def add_to_result_map(keyname, name, objects, type_):
-                    _add_to_result_map(keyname, name, (), type_)
+                    _add_to_result_map(keyname, name, (keyname,), type_)
 
             # if we redefined col_expr for type expressions, wrap the
             # callable with one that adds the original column to the targets
@@ -5358,13 +5397,22 @@ class SQLCompiler(Compiled):
         self,
         statement: str,
         parameters: _DBAPIMultiExecuteParams,
+        compiled_parameters: List[_MutableCoreSingleExecuteParams],
         generic_setinputsizes: Optional[_GenericSetInputSizesType],
         batch_size: int,
         sort_by_parameter_order: bool,
+        schema_translate_map: Optional[SchemaTranslateMapType],
     ) -> Iterator[_InsertManyValuesBatch]:
         imv = self._insertmanyvalues
         assert imv is not None
 
+        if not imv.sentinel_param_keys:
+            _sentinel_from_params = None
+        else:
+            _sentinel_from_params = operator.itemgetter(
+                *imv.sentinel_param_keys
+            )
+
         lenparams = len(parameters)
         if imv.is_default_expr and not self.dialect.supports_default_metavalue:
             # backend doesn't support
@@ -5396,15 +5444,24 @@ class SQLCompiler(Compiled):
             downgraded = False
 
         if use_row_at_a_time:
-            for batchnum, param in enumerate(
-                cast("Sequence[_DBAPISingleExecuteParams]", parameters), 1
+            for batchnum, (param, compiled_param) in enumerate(
+                cast(
+                    "Sequence[Tuple[_DBAPISingleExecuteParams, _MutableCoreSingleExecuteParams]]",  # noqa: E501
+                    zip(parameters, compiled_parameters),
+                ),
+                1,
             ):
                 yield _InsertManyValuesBatch(
                     statement,
                     param,
                     generic_setinputsizes,
                     [param],
-                    batch_size,
+                    (
+                        [_sentinel_from_params(compiled_param)]
+                        if _sentinel_from_params
+                        else []
+                    ),
+                    1,
                     batchnum,
                     lenparams,
                     sort_by_parameter_order,
@@ -5412,7 +5469,19 @@ class SQLCompiler(Compiled):
                 )
             return
 
-        executemany_values = f"({imv.single_values_expr})"
+        if schema_translate_map:
+            rst = functools.partial(
+                self.preparer._render_schema_translates,
+                schema_translate_map=schema_translate_map,
+            )
+        else:
+            rst = None
+
+        imv_single_values_expr = imv.single_values_expr
+        if rst:
+            imv_single_values_expr = rst(imv_single_values_expr)
+
+        executemany_values = f"({imv_single_values_expr})"
         statement = statement.replace(executemany_values, "__EXECMANY_TOKEN__")
 
         # Use optional insertmanyvalues_max_parameters
@@ -5435,7 +5504,10 @@ class SQLCompiler(Compiled):
                 ),
             )
 
-        batches = list(parameters)
+        batches = cast("List[Sequence[Any]]", list(parameters))
+        compiled_batches = cast(
+            "List[Sequence[Any]]", list(compiled_parameters)
+        )
 
         processed_setinputsizes: Optional[_GenericSetInputSizesType] = None
         batchnum = 1
@@ -5446,6 +5518,12 @@ class SQLCompiler(Compiled):
         insert_crud_params = imv.insert_crud_params
         assert insert_crud_params is not None
 
+        if rst:
+            insert_crud_params = [
+                (col, key, rst(expr), st)
+                for col, key, expr, st in insert_crud_params
+            ]
+
         escaped_bind_names: Mapping[str, str]
         expand_pos_lower_index = expand_pos_upper_index = 0
 
@@ -5493,10 +5571,10 @@ class SQLCompiler(Compiled):
 
             if imv.embed_values_counter:
                 executemany_values_w_comma = (
-                    f"({imv.single_values_expr}, _IMV_VALUES_COUNTER), "
+                    f"({imv_single_values_expr}, _IMV_VALUES_COUNTER), "
                 )
             else:
-                executemany_values_w_comma = f"({imv.single_values_expr}), "
+                executemany_values_w_comma = f"({imv_single_values_expr}), "
 
             all_names_we_will_expand: Set[str] = set()
             for elem in imv.insert_crud_params:
@@ -5529,8 +5607,16 @@ class SQLCompiler(Compiled):
                 )
 
         while batches:
-            batch = cast("Sequence[Any]", batches[0:batch_size])
+            batch = batches[0:batch_size]
+            compiled_batch = compiled_batches[0:batch_size]
+
             batches[0:batch_size] = []
+            compiled_batches[0:batch_size] = []
+
+            if batches:
+                current_batch_size = batch_size
+            else:
+                current_batch_size = len(batch)
 
             if generic_setinputsizes:
                 # if setinputsizes is present, expand this collection to
@@ -5540,7 +5626,7 @@ class SQLCompiler(Compiled):
                     (new_key, len_, typ)
                     for new_key, len_, typ in (
                         (f"{key}_{index}", len_, typ)
-                        for index in range(len(batch))
+                        for index in range(current_batch_size)
                         for key, len_, typ in generic_setinputsizes
                     )
                 ]
@@ -5550,6 +5636,9 @@ class SQLCompiler(Compiled):
                 num_ins_params = imv.num_positional_params_counted
 
                 batch_iterator: Iterable[Sequence[Any]]
+                extra_params_left: Sequence[Any]
+                extra_params_right: Sequence[Any]
+
                 if num_ins_params == len(batch[0]):
                     extra_params_left = extra_params_right = ()
                     batch_iterator = batch
@@ -5572,7 +5661,7 @@ class SQLCompiler(Compiled):
                     )[:-2]
                 else:
                     expanded_values_string = (
-                        (executemany_values_w_comma * len(batch))
+                        (executemany_values_w_comma * current_batch_size)
                     )[:-2]
 
                 if self._numeric_binds and num_ins_params > 0:
@@ -5588,7 +5677,7 @@ class SQLCompiler(Compiled):
                     assert not extra_params_right
 
                     start = expand_pos_lower_index + 1
-                    end = num_ins_params * (len(batch)) + start
+                    end = num_ins_params * (current_batch_size) + start
 
                     # need to format here, since statement may contain
                     # unescaped %, while values_string contains just (%s, %s)
@@ -5638,7 +5727,12 @@ class SQLCompiler(Compiled):
                 replaced_parameters,
                 processed_setinputsizes,
                 batch,
-                batch_size,
+                (
+                    [_sentinel_from_params(cb) for cb in compiled_batch]
+                    if _sentinel_from_params
+                    else []
+                ),
+                current_batch_size,
                 batchnum,
                 total_batches,
                 sort_by_parameter_order,
@@ -6020,6 +6114,10 @@ class SQLCompiler(Compiled):
         """Provide a hook for MySQL to add LIMIT to the UPDATE"""
         return None
 
+    def delete_limit_clause(self, delete_stmt):
+        """Provide a hook for MySQL to add LIMIT to the DELETE"""
+        return None
+
     def update_tables_clause(self, update_stmt, from_table, extra_froms, **kw):
         """Provide a hook to override the initial table clause
         in an UPDATE statement.
@@ -6312,6 +6410,10 @@ class SQLCompiler(Compiled):
             if t:
                 text += " WHERE " + t
 
+        limit_clause = self.delete_limit_clause(delete_stmt)
+        if limit_clause:
+            text += " " + limit_clause
+
         if (
             self.implicit_returning or delete_stmt._returning
         ) and not self.returning_precedes_values:
@@ -6396,8 +6498,10 @@ class StrSQLCompiler(SQLCompiler):
     def visit_json_path_getitem_op_binary(self, binary, operator, **kw):
         return self.visit_getitem_binary(binary, operator, **kw)
 
-    def visit_sequence(self, seq, **kw):
-        return "<next sequence value: %s>" % self.preparer.format_sequence(seq)
+    def visit_sequence(self, sequence, **kw):
+        return (
+            f"<next sequence value: {self.preparer.format_sequence(sequence)}>"
+        )
 
     def returning_clause(
         self,
@@ -6431,7 +6535,7 @@ class StrSQLCompiler(SQLCompiler):
             for t in extra_froms
         )
 
-    def visit_empty_set_expr(self, type_, **kw):
+    def visit_empty_set_expr(self, element_types, **kw):
         return "SELECT 1 WHERE 1!=1"
 
     def get_from_hint_text(self, table, text):
@@ -7202,7 +7306,7 @@ class StrSQLTypeCompiler(GenericTypeCompiler):
 
 
 class _SchemaForObjectCallable(Protocol):
-    def __call__(self, obj: Any) -> str: ...
+    def __call__(self, __obj: Any) -> str: ...
 
 
 class _BindNameForColProtocol(Protocol):
diff --git a/libs/sqlalchemy/sql/crud.py b/libs/sqlalchemy/sql/crud.py
index 499a19d97..19af40ff0 100644
--- a/libs/sqlalchemy/sql/crud.py
+++ b/libs/sqlalchemy/sql/crud.py
@@ -1,5 +1,5 @@
 # sql/crud.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1286,7 +1286,7 @@ class _multiparam_column(elements.ColumnElement[Any]):
     def compare(self, other, **kw):
         raise NotImplementedError()
 
-    def _copy_internals(self, other, **kw):
+    def _copy_internals(self, **kw):
         raise NotImplementedError()
 
     def __eq__(self, other):
diff --git a/libs/sqlalchemy/sql/ddl.py b/libs/sqlalchemy/sql/ddl.py
index d9e3f673a..0950043bc 100644
--- a/libs/sqlalchemy/sql/ddl.py
+++ b/libs/sqlalchemy/sql/ddl.py
@@ -1,5 +1,5 @@
 # sql/ddl.py
-# Copyright (C) 2009-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2009-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -155,8 +155,8 @@ class ExecutableDDLElement(roles.DDLRole, Executable, BaseDDLElement):
 
         event.listen(
             users,
-            'after_create',
-            AddConstraint(constraint).execute_if(dialect='postgresql')
+            "after_create",
+            AddConstraint(constraint).execute_if(dialect="postgresql"),
         )
 
     .. seealso::
@@ -231,20 +231,20 @@ class ExecutableDDLElement(roles.DDLRole, Executable, BaseDDLElement):
         Used to provide a wrapper for event listening::
 
             event.listen(
-                        metadata,
-                        'before_create',
-                        DDL("my_ddl").execute_if(dialect='postgresql')
-                    )
+                metadata,
+                "before_create",
+                DDL("my_ddl").execute_if(dialect="postgresql"),
+            )
 
         :param dialect: May be a string or tuple of strings.
           If a string, it will be compared to the name of the
           executing database dialect::
 
-            DDL('something').execute_if(dialect='postgresql')
+            DDL("something").execute_if(dialect="postgresql")
 
           If a tuple, specifies multiple dialect names::
 
-            DDL('something').execute_if(dialect=('postgresql', 'mysql'))
+            DDL("something").execute_if(dialect=("postgresql", "mysql"))
 
         :param callable\_: A callable, which will be invoked with
           three positional arguments as well as optional keyword
@@ -342,17 +342,19 @@ class DDL(ExecutableDDLElement):
 
       from sqlalchemy import event, DDL
 
-      tbl = Table('users', metadata, Column('uid', Integer))
-      event.listen(tbl, 'before_create', DDL('DROP TRIGGER users_trigger'))
+      tbl = Table("users", metadata, Column("uid", Integer))
+      event.listen(tbl, "before_create", DDL("DROP TRIGGER users_trigger"))
 
-      spow = DDL('ALTER TABLE %(table)s SET secretpowers TRUE')
-      event.listen(tbl, 'after_create', spow.execute_if(dialect='somedb'))
+      spow = DDL("ALTER TABLE %(table)s SET secretpowers TRUE")
+      event.listen(tbl, "after_create", spow.execute_if(dialect="somedb"))
 
-      drop_spow = DDL('ALTER TABLE users SET secretpowers FALSE')
+      drop_spow = DDL("ALTER TABLE users SET secretpowers FALSE")
       connection.execute(drop_spow)
 
     When operating on Table events, the following ``statement``
-    string substitutions are available::
+    string substitutions are available:
+
+    .. sourcecode:: text
 
       %(table)s  - the Table name, with any required quoting applied
       %(schema)s - the schema name, with any required quoting applied
@@ -470,8 +472,8 @@ class CreateSchema(_CreateBase):
 
     def __init__(
         self,
-        name,
-        if_not_exists=False,
+        name: str,
+        if_not_exists: bool = False,
     ):
         """Create a new :class:`.CreateSchema` construct."""
 
@@ -491,9 +493,9 @@ class DropSchema(_DropBase):
 
     def __init__(
         self,
-        name,
-        cascade=False,
-        if_exists=False,
+        name: str,
+        cascade: bool = False,
+        if_exists: bool = False,
     ):
         """Create a new :class:`.DropSchema` construct."""
 
@@ -568,6 +570,7 @@ class CreateColumn(BaseDDLElement):
         from sqlalchemy import schema
         from sqlalchemy.ext.compiler import compiles
 
+
         @compiles(schema.CreateColumn)
         def compile(element, compiler, **kw):
             column = element.element
@@ -576,9 +579,9 @@ class CreateColumn(BaseDDLElement):
                 return compiler.visit_create_column(element, **kw)
 
             text = "%s SPECIAL DIRECTIVE %s" % (
-                    column.name,
-                    compiler.type_compiler.process(column.type)
-                )
+                column.name,
+                compiler.type_compiler.process(column.type),
+            )
             default = compiler.get_column_default_string(column)
             if default is not None:
                 text += " DEFAULT " + default
@@ -588,8 +591,8 @@ class CreateColumn(BaseDDLElement):
 
             if column.constraints:
                 text += " ".join(
-                            compiler.process(const)
-                            for const in column.constraints)
+                    compiler.process(const) for const in column.constraints
+                )
             return text
 
     The above construct can be applied to a :class:`_schema.Table`
@@ -600,17 +603,21 @@ class CreateColumn(BaseDDLElement):
 
         metadata = MetaData()
 
-        table = Table('mytable', MetaData(),
-                Column('x', Integer, info={"special":True}, primary_key=True),
-                Column('y', String(50)),
-                Column('z', String(20), info={"special":True})
-            )
+        table = Table(
+            "mytable",
+            MetaData(),
+            Column("x", Integer, info={"special": True}, primary_key=True),
+            Column("y", String(50)),
+            Column("z", String(20), info={"special": True}),
+        )
 
         metadata.create_all(conn)
 
     Above, the directives we've added to the :attr:`_schema.Column.info`
     collection
-    will be detected by our custom compilation scheme::
+    will be detected by our custom compilation scheme:
+
+    .. sourcecode:: sql
 
         CREATE TABLE mytable (
                 x SPECIAL DIRECTIVE INTEGER NOT NULL,
@@ -635,18 +642,21 @@ class CreateColumn(BaseDDLElement):
 
         from sqlalchemy.schema import CreateColumn
 
+
         @compiles(CreateColumn, "postgresql")
         def skip_xmin(element, compiler, **kw):
-            if element.element.name == 'xmin':
+            if element.element.name == "xmin":
                 return None
             else:
                 return compiler.visit_create_column(element, **kw)
 
 
-        my_table = Table('mytable', metadata,
-                    Column('id', Integer, primary_key=True),
-                    Column('xmin', Integer)
-                )
+        my_table = Table(
+            "mytable",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("xmin", Integer),
+        )
 
     Above, a :class:`.CreateTable` construct will generate a ``CREATE TABLE``
     which only includes the ``id`` column in the string; the ``xmin`` column
diff --git a/libs/sqlalchemy/sql/default_comparator.py b/libs/sqlalchemy/sql/default_comparator.py
index 76131bcaa..7fa5dafe9 100644
--- a/libs/sqlalchemy/sql/default_comparator.py
+++ b/libs/sqlalchemy/sql/default_comparator.py
@@ -1,5 +1,5 @@
 # sql/default_comparator.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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.py b/libs/sqlalchemy/sql/dml.py
index 779be1dac..0b92e38bc 100644
--- a/libs/sqlalchemy/sql/dml.py
+++ b/libs/sqlalchemy/sql/dml.py
@@ -1,5 +1,5 @@
 # sql/dml.py
-# Copyright (C) 2009-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2009-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -525,11 +525,11 @@ class UpdateBase(
 
         E.g.::
 
-            stmt = table.insert().values(data='newdata').return_defaults()
+            stmt = table.insert().values(data="newdata").return_defaults()
 
             result = connection.execute(stmt)
 
-            server_created_at = result.returned_defaults['created_at']
+            server_created_at = result.returned_defaults["created_at"]
 
         When used against an UPDATE statement
         :meth:`.UpdateBase.return_defaults` instead looks for columns that
@@ -1032,7 +1032,7 @@ class ValuesBase(UpdateBase):
 
                 users.insert().values(name="some name")
 
-                users.update().where(users.c.id==5).values(name="some name")
+                users.update().where(users.c.id == 5).values(name="some name")
 
         :param \*args: As an alternative to passing key/value parameters,
          a dictionary, tuple, or list of dictionaries or tuples can be passed
@@ -1062,13 +1062,17 @@ class ValuesBase(UpdateBase):
          this syntax is supported on backends such as SQLite, PostgreSQL,
          MySQL, but not necessarily others::
 
-            users.insert().values([
-                                {"name": "some name"},
-                                {"name": "some other name"},
-                                {"name": "yet another name"},
-                            ])
+            users.insert().values(
+                [
+                    {"name": "some name"},
+                    {"name": "some other name"},
+                    {"name": "yet another name"},
+                ]
+            )
 
-         The above form would render a multiple VALUES statement similar to::
+         The above form would render a multiple VALUES statement similar to:
+
+         .. sourcecode:: sql
 
                 INSERT INTO users (name) VALUES
                                 (:name_1),
@@ -1246,7 +1250,7 @@ class Insert(ValuesBase):
         e.g.::
 
             sel = select(table1.c.a, table1.c.b).where(table1.c.c > 5)
-            ins = table2.insert().from_select(['a', 'b'], sel)
+            ins = table2.insert().from_select(["a", "b"], sel)
 
         :param names: a sequence of string column names or
          :class:`_schema.Column`
@@ -1535,9 +1539,7 @@ class Update(DMLWhereBase, ValuesBase):
 
         E.g.::
 
-            stmt = table.update().ordered_values(
-                ("name", "ed"), ("ident", "foo")
-            )
+            stmt = table.update().ordered_values(("name", "ed"), ("ident", "foo"))
 
         .. seealso::
 
@@ -1550,7 +1552,7 @@ class Update(DMLWhereBase, ValuesBase):
            :paramref:`_expression.update.preserve_parameter_order`
            parameter, which will be removed in SQLAlchemy 2.0.
 
-        """
+        """  # noqa: E501
         if self._values:
             raise exc.ArgumentError(
                 "This statement already has values present"
diff --git a/libs/sqlalchemy/sql/elements.py b/libs/sqlalchemy/sql/elements.py
index e8131994b..f7d376770 100644
--- a/libs/sqlalchemy/sql/elements.py
+++ b/libs/sqlalchemy/sql/elements.py
@@ -1,5 +1,5 @@
 # sql/elements.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 from decimal import Decimal
-from enum import IntEnum
+from enum import Enum
 import itertools
 import operator
 import re
@@ -77,12 +77,14 @@ from .. import util
 from ..util import HasMemoized_ro_memoized_attribute
 from ..util import TypingOnly
 from ..util.typing import Literal
+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 _PropagateAttrsType
     from ._typing import _TypeEngineArgument
@@ -104,9 +106,9 @@ if typing.TYPE_CHECKING:
     from .type_api import TypeEngine
     from .visitors import _CloneCallableType
     from .visitors import _TraverseInternalsType
+    from .visitors import anon_map
     from ..engine import Connection
     from ..engine import Dialect
-    from ..engine import Engine
     from ..engine.interfaces import _CoreMultiExecuteParams
     from ..engine.interfaces import CacheStats
     from ..engine.interfaces import CompiledCacheType
@@ -243,7 +245,7 @@ class CompilerElement(Visitable):
     @util.preload_module("sqlalchemy.engine.url")
     def compile(
         self,
-        bind: Optional[Union[Engine, Connection]] = None,
+        bind: Optional[_HasDialect] = None,
         dialect: Optional[Dialect] = None,
         **kw: Any,
     ) -> Compiled:
@@ -279,7 +281,7 @@ class CompilerElement(Visitable):
 
                 from sqlalchemy.sql import table, column, select
 
-                t = table('t', column('x'))
+                t = table("t", column("x"))
 
                 s = select(t).where(t.c.x == 5)
 
@@ -582,10 +584,10 @@ class ClauseElement(
         :func:`_expression.bindparam`
         elements replaced with values taken from the given dictionary::
 
-          >>> clause = column('x') + bindparam('foo')
+          >>> clause = column("x") + bindparam("foo")
           >>> print(clause.compile().params)
           {'foo':None}
-          >>> print(clause.params({'foo':7}).compile().params)
+          >>> print(clause.params({"foo": 7}).compile().params)
           {'foo':7}
 
         """
@@ -775,7 +777,7 @@ class DQLDMLClauseElement(ClauseElement):
 
         def compile(  # noqa: A001
             self,
-            bind: Optional[Union[Engine, Connection]] = None,
+            bind: Optional[_HasDialect] = None,
             dialect: Optional[Dialect] = None,
             **kw: Any,
         ) -> SQLCompiler: ...
@@ -1064,6 +1066,9 @@ class SQLCoreOperations(Generic[_T_co], ColumnOperators, TypingOnly):
             other: Any,
         ) -> ColumnElement[str]: ...
 
+        @overload
+        def __add__(self, other: Any) -> ColumnElement[Any]: ...
+
         def __add__(self, other: Any) -> ColumnElement[Any]: ...
 
         @overload
@@ -1281,9 +1286,9 @@ class ColumnElement(
     .. sourcecode:: pycon+sql
 
         >>> from sqlalchemy.sql import column
-        >>> column('a') + column('b')
+        >>> column("a") + column("b")
         <sqlalchemy.sql.expression.BinaryExpression object at 0x101029dd0>
-        >>> print(column('a') + column('b'))
+        >>> print(column("a") + column("b"))
         {printsql}a + b
 
     .. seealso::
@@ -1372,7 +1377,9 @@ class ColumnElement(
         SQL.
 
         Concretely, this is the "name" of a column or a label in a
-        SELECT statement; ``<columnname>`` and ``<labelname>`` below::
+        SELECT statement; ``<columnname>`` and ``<labelname>`` below:
+
+        .. sourcecode:: sql
 
             SELECT <columnmame> FROM table
 
@@ -1425,13 +1432,11 @@ class ColumnElement(
     _alt_names: Sequence[str] = ()
 
     @overload
-    def self_group(
-        self: ColumnElement[_T], against: Optional[OperatorType] = None
-    ) -> ColumnElement[_T]: ...
+    def self_group(self, against: None = None) -> ColumnElement[_T]: ...
 
     @overload
     def self_group(
-        self: ColumnElement[Any], against: Optional[OperatorType] = None
+        self, against: Optional[OperatorType] = None
     ) -> ColumnElement[Any]: ...
 
     def self_group(
@@ -1910,8 +1915,9 @@ class BindParameter(roles.InElementRole, KeyedColumnElement[_T]):
 
         from sqlalchemy import bindparam
 
-        stmt = select(users_table).\
-                    where(users_table.c.name == bindparam('username'))
+        stmt = select(users_table).where(
+            users_table.c.name == bindparam("username")
+        )
 
     Detailed discussion of how :class:`.BindParameter` is used is
     at :func:`.bindparam`.
@@ -2228,7 +2234,6 @@ class TextClause(
         t = text("SELECT * FROM users")
         result = connection.execute(t)
 
-
     The :class:`_expression.TextClause` construct is produced using the
     :func:`_expression.text`
     function; see that function for full documentation.
@@ -2305,16 +2310,19 @@ class TextClause(
         Given a text construct such as::
 
             from sqlalchemy import text
-            stmt = text("SELECT id, name FROM user WHERE name=:name "
-                        "AND timestamp=:timestamp")
+
+            stmt = text(
+                "SELECT id, name FROM user WHERE name=:name AND timestamp=:timestamp"
+            )
 
         the :meth:`_expression.TextClause.bindparams`
         method can be used to establish
         the initial value of ``:name`` and ``:timestamp``,
         using simple keyword arguments::
 
-            stmt = stmt.bindparams(name='jack',
-                        timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5))
+            stmt = stmt.bindparams(
+                name="jack", timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5)
+            )
 
         Where above, new :class:`.BindParameter` objects
         will be generated with the names ``name`` and ``timestamp``, and
@@ -2329,10 +2337,11 @@ class TextClause(
         argument, then an optional value and type::
 
             from sqlalchemy import bindparam
+
             stmt = stmt.bindparams(
-                            bindparam('name', value='jack', type_=String),
-                            bindparam('timestamp', type_=DateTime)
-                        )
+                bindparam("name", value="jack", type_=String),
+                bindparam("timestamp", type_=DateTime),
+            )
 
         Above, we specified the type of :class:`.DateTime` for the
         ``timestamp`` bind, and the type of :class:`.String` for the ``name``
@@ -2342,8 +2351,9 @@ class TextClause(
         Additional bound parameters can be supplied at statement execution
         time, e.g.::
 
-            result = connection.execute(stmt,
-                        timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5))
+            result = connection.execute(
+                stmt, timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5)
+            )
 
         The :meth:`_expression.TextClause.bindparams`
         method can be called repeatedly,
@@ -2353,15 +2363,15 @@ class TextClause(
         first with typing information, and a
         second time with value information, and it will be combined::
 
-            stmt = text("SELECT id, name FROM user WHERE name=:name "
-                        "AND timestamp=:timestamp")
-            stmt = stmt.bindparams(
-                bindparam('name', type_=String),
-                bindparam('timestamp', type_=DateTime)
+            stmt = text(
+                "SELECT id, name FROM user WHERE name=:name "
+                "AND timestamp=:timestamp"
             )
             stmt = stmt.bindparams(
-                name='jack',
-                timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5)
+                bindparam("name", type_=String), bindparam("timestamp", type_=DateTime)
+            )
+            stmt = stmt.bindparams(
+                name="jack", timestamp=datetime.datetime(2012, 10, 8, 15, 12, 5)
             )
 
         The :meth:`_expression.TextClause.bindparams`
@@ -2375,18 +2385,17 @@ class TextClause(
         object::
 
             stmt1 = text("select id from table where name=:name").bindparams(
-                bindparam("name", value='name1', unique=True)
+                bindparam("name", value="name1", unique=True)
             )
             stmt2 = text("select id from table where name=:name").bindparams(
-                bindparam("name", value='name2', unique=True)
+                bindparam("name", value="name2", unique=True)
             )
 
-            union = union_all(
-                stmt1.columns(column("id")),
-                stmt2.columns(column("id"))
-            )
+            union = union_all(stmt1.columns(column("id")), stmt2.columns(column("id")))
 
-        The above statement will render as::
+        The above statement will render as:
+
+        .. sourcecode:: sql
 
             select id from table where name=:name_1
             UNION ALL select id from table where name=:name_2
@@ -2396,7 +2405,7 @@ class TextClause(
            :func:`_expression.text`
            constructs.
 
-        """
+        """  # noqa: E501
         self._bindparams = new_params = self._bindparams.copy()
 
         for bind in binds:
@@ -2427,7 +2436,9 @@ class TextClause(
 
     @util.preload_module("sqlalchemy.sql.selectable")
     def columns(
-        self, *cols: _ColumnExpressionArgument[Any], **types: TypeEngine[Any]
+        self,
+        *cols: _ColumnExpressionArgument[Any],
+        **types: _TypeEngineArgument[Any],
     ) -> TextualSelect:
         r"""Turn this :class:`_expression.TextClause` object into a
         :class:`_expression.TextualSelect`
@@ -2448,12 +2459,13 @@ class TextClause(
             from sqlalchemy.sql import column, text
 
             stmt = text("SELECT id, name FROM some_table")
-            stmt = stmt.columns(column('id'), column('name')).subquery('st')
+            stmt = stmt.columns(column("id"), column("name")).subquery("st")
 
-            stmt = select(mytable).\
-                    select_from(
-                        mytable.join(stmt, mytable.c.name == stmt.c.name)
-                    ).where(stmt.c.id > 5)
+            stmt = (
+                select(mytable)
+                .select_from(mytable.join(stmt, mytable.c.name == stmt.c.name))
+                .where(stmt.c.id > 5)
+            )
 
         Above, we pass a series of :func:`_expression.column` elements to the
         :meth:`_expression.TextClause.columns` method positionally.  These
@@ -2474,10 +2486,10 @@ class TextClause(
 
             stmt = text("SELECT id, name, timestamp FROM some_table")
             stmt = stmt.columns(
-                        column('id', Integer),
-                        column('name', Unicode),
-                        column('timestamp', DateTime)
-                    )
+                column("id", Integer),
+                column("name", Unicode),
+                column("timestamp", DateTime),
+            )
 
             for id, name, timestamp in connection.execute(stmt):
                 print(id, name, timestamp)
@@ -2486,11 +2498,7 @@ class TextClause(
         types alone may be used, if only type conversion is needed::
 
             stmt = text("SELECT id, name, timestamp FROM some_table")
-            stmt = stmt.columns(
-                        id=Integer,
-                        name=Unicode,
-                        timestamp=DateTime
-                    )
+            stmt = stmt.columns(id=Integer, name=Unicode, timestamp=DateTime)
 
             for id, name, timestamp in connection.execute(stmt):
                 print(id, name, timestamp)
@@ -2504,26 +2512,31 @@ class TextClause(
         the result set will match to those columns positionally, meaning the
         name or origin of the column in the textual SQL doesn't matter::
 
-            stmt = text("SELECT users.id, addresses.id, users.id, "
-                 "users.name, addresses.email_address AS email "
-                 "FROM users JOIN addresses ON users.id=addresses.user_id "
-                 "WHERE users.id = 1").columns(
-                    User.id,
-                    Address.id,
-                    Address.user_id,
-                    User.name,
-                    Address.email_address
-                 )
+            stmt = text(
+                "SELECT users.id, addresses.id, users.id, "
+                "users.name, addresses.email_address AS email "
+                "FROM users JOIN addresses ON users.id=addresses.user_id "
+                "WHERE users.id = 1"
+            ).columns(
+                User.id,
+                Address.id,
+                Address.user_id,
+                User.name,
+                Address.email_address,
+            )
 
-            query = session.query(User).from_statement(stmt).options(
-                contains_eager(User.addresses))
+            query = (
+                session.query(User)
+                .from_statement(stmt)
+                .options(contains_eager(User.addresses))
+            )
 
         The :meth:`_expression.TextClause.columns` method provides a direct
         route to calling :meth:`_expression.FromClause.subquery` as well as
         :meth:`_expression.SelectBase.cte`
         against a textual SELECT statement::
 
-            stmt = stmt.columns(id=Integer, name=String).cte('st')
+            stmt = stmt.columns(id=Integer, name=String).cte("st")
 
             stmt = select(sometable).where(sometable.c.id == stmt.c.id)
 
@@ -2576,7 +2589,9 @@ class TextClause(
         # be using this method.
         return self.type.comparator_factory(self)  # type: ignore
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[Any]]:
         if against is operators.in_op:
             return Grouping(self)
         else:
@@ -2781,7 +2796,9 @@ class ClauseList(
     def _from_objects(self) -> List[FromClause]:
         return list(itertools.chain(*[c._from_objects for c in self.clauses]))
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[Any]]:
         if self.group and operators.is_precedent(self.operator, against):
             return Grouping(self)
         else:
@@ -2804,7 +2821,9 @@ class OperatorExpression(ColumnElement[_T]):
     def is_comparison(self):
         return operators.is_comparison(self.operator)
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[_T]]:
         if (
             self.group
             and operators.is_precedent(self.operator, against)
@@ -3164,7 +3183,9 @@ class BooleanClauseList(ExpressionClauseList[bool]):
     def _select_iterable(self) -> _SelectIterable:
         return (self,)
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[bool]]:
         if not self.clauses:
             return self
         else:
@@ -3247,7 +3268,7 @@ class Tuple(ClauseList, ColumnElement[typing_Tuple[Any, ...]]):
                 ]
             )
 
-    def self_group(self, against=None):
+    def self_group(self, against: Optional[OperatorType] = None) -> Self:
         # Tuple is parenthesized by definition.
         return self
 
@@ -3260,14 +3281,13 @@ class Case(ColumnElement[_T]):
 
         from sqlalchemy import case
 
-        stmt = select(users_table).\
-                    where(
-                        case(
-                            (users_table.c.name == 'wendy', 'W'),
-                            (users_table.c.name == 'jack', 'J'),
-                            else_='E'
-                        )
-                    )
+        stmt = select(users_table).where(
+            case(
+                (users_table.c.name == "wendy", "W"),
+                (users_table.c.name == "jack", "J"),
+                else_="E",
+            )
+        )
 
     Details on :class:`.Case` usage is at :func:`.case`.
 
@@ -3480,7 +3500,9 @@ class TypeCoerce(WrapsColumnExpression[_T]):
     def wrapped_column_expression(self):
         return self.clause
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> TypeCoerce[_T]:
         grouped = self.clause.self_group(against=against)
         if grouped is not self.clause:
             return TypeCoerce(grouped, self.type)
@@ -3675,7 +3697,7 @@ class UnaryExpression(ColumnElement[_T]):
 
     @property
     def _order_by_label_element(self) -> Optional[Label[Any]]:
-        if self.modifier in (operators.desc_op, operators.asc_op):
+        if operators.is_order_by_modifier(self.modifier):
             return self.element._order_by_label_element
         else:
             return None
@@ -3695,7 +3717,9 @@ class UnaryExpression(ColumnElement[_T]):
         else:
             return ClauseElement._negate(self)
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[_T]]:
         if self.operator and operators.is_precedent(self.operator, against):
             return Grouping(self)
         else:
@@ -3782,7 +3806,7 @@ class AsBoolean(WrapsColumnExpression[bool], UnaryExpression[bool]):
     def wrapped_column_expression(self):
         return self.element
 
-    def self_group(self, against=None):
+    def self_group(self, against: Optional[OperatorType] = None) -> Self:
         return self
 
     def _negate(self):
@@ -3801,9 +3825,9 @@ class BinaryExpression(OperatorExpression[_T]):
     .. sourcecode:: pycon+sql
 
         >>> from sqlalchemy.sql import column
-        >>> column('a') + column('b')
+        >>> column("a") + column("b")
         <sqlalchemy.sql.expression.BinaryExpression object at 0x101029dd0>
-        >>> print(column('a') + column('b'))
+        >>> print(column("a") + column("b"))
         {printsql}a + b
 
     """
@@ -3892,7 +3916,7 @@ class BinaryExpression(OperatorExpression[_T]):
         The rationale here is so that ColumnElement objects can be hashable.
         What?  Well, suppose you do this::
 
-            c1, c2 = column('x'), column('y')
+            c1, c2 = column("x"), column("y")
             s1 = set([c1, c2])
 
         We do that **a lot**, columns inside of sets is an extremely basic
@@ -3982,7 +4006,7 @@ class Slice(ColumnElement[Any]):
         )
         self.type = type_api.NULLTYPE
 
-    def self_group(self, against=None):
+    def self_group(self, against: Optional[OperatorType] = None) -> Self:
         assert against is operator.getitem
         return self
 
@@ -4001,7 +4025,7 @@ class GroupedElement(DQLDMLClauseElement):
 
     element: ClauseElement
 
-    def self_group(self, against=None):
+    def self_group(self, against: Optional[OperatorType] = None) -> Self:
         return self
 
     def _ungroup(self):
@@ -4065,8 +4089,65 @@ class Grouping(GroupedElement, ColumnElement[_T]):
         self.element = state["element"]
         self.type = state["type"]
 
+    if TYPE_CHECKING:
 
-class _OverRange(IntEnum):
+        def self_group(
+            self, against: Optional[OperatorType] = None
+        ) -> Self: ...
+
+
+class _OverrideBinds(Grouping[_T]):
+    """used by cache_key->_apply_params_to_element to allow compilation /
+    execution of a SQL element that's been cached, using an alternate set of
+    bound parameter values.
+
+    This is used by the ORM to swap new parameter values into expressions
+    that are embedded into loader options like with_expression(),
+    selectinload().  Previously, this task was accomplished using the
+    .params() method which would perform a deep-copy instead.  This deep
+    copy proved to be too expensive for more complex expressions.
+
+    See #11085
+
+    """
+
+    __visit_name__ = "override_binds"
+
+    def __init__(
+        self,
+        element: ColumnElement[_T],
+        bindparams: Sequence[BindParameter[Any]],
+        replaces_params: Sequence[BindParameter[Any]],
+    ):
+        self.element = element
+        self.translate = {
+            k.key: v.value for k, v in zip(replaces_params, bindparams)
+        }
+
+    def _gen_cache_key(
+        self, anon_map: anon_map, bindparams: List[BindParameter[Any]]
+    ) -> Optional[typing_Tuple[Any, ...]]:
+        """generate a cache key for the given element, substituting its bind
+        values for the translation values present."""
+
+        existing_bps: List[BindParameter[Any]] = []
+        ck = self.element._gen_cache_key(anon_map, existing_bps)
+
+        bindparams.extend(
+            (
+                bp._with_value(
+                    self.translate[bp.key], maintain_key=True, required=False
+                )
+                if bp.key in self.translate
+                else bp
+            )
+            for bp in existing_bps
+        )
+
+        return ck
+
+
+class _OverRange(Enum):
     RANGE_UNBOUNDED = 0
     RANGE_CURRENT = 1
 
@@ -4074,6 +4155,8 @@ class _OverRange(IntEnum):
 RANGE_UNBOUNDED = _OverRange.RANGE_UNBOUNDED
 RANGE_CURRENT = _OverRange.RANGE_CURRENT
 
+_IntOrRange = Union[int, _OverRange]
+
 
 class Over(ColumnElement[_T]):
     """Represent an OVER clause.
@@ -4102,7 +4185,8 @@ class Over(ColumnElement[_T]):
     """The underlying expression object to which this :class:`.Over`
     object refers."""
 
-    range_: Optional[typing_Tuple[int, int]]
+    range_: Optional[typing_Tuple[_IntOrRange, _IntOrRange]]
+    rows: Optional[typing_Tuple[_IntOrRange, _IntOrRange]]
 
     def __init__(
         self,
@@ -4147,19 +4231,24 @@ class Over(ColumnElement[_T]):
         )
 
     def _interpret_range(
-        self, range_: typing_Tuple[Optional[int], Optional[int]]
-    ) -> typing_Tuple[int, int]:
+        self,
+        range_: typing_Tuple[Optional[_IntOrRange], Optional[_IntOrRange]],
+    ) -> typing_Tuple[_IntOrRange, _IntOrRange]:
         if not isinstance(range_, tuple) or len(range_) != 2:
             raise exc.ArgumentError("2-tuple expected for range/rows")
 
-        lower: int
-        upper: int
+        r0, r1 = range_
 
-        if range_[0] is None:
+        lower: _IntOrRange
+        upper: _IntOrRange
+
+        if r0 is None:
             lower = RANGE_UNBOUNDED
+        elif isinstance(r0, _OverRange):
+            lower = r0
         else:
             try:
-                lower = int(range_[0])
+                lower = int(r0)
             except ValueError as err:
                 raise exc.ArgumentError(
                     "Integer or None expected for range value"
@@ -4168,11 +4257,13 @@ class Over(ColumnElement[_T]):
                 if lower == 0:
                     lower = RANGE_CURRENT
 
-        if range_[1] is None:
+        if r1 is None:
             upper = RANGE_UNBOUNDED
+        elif isinstance(r1, _OverRange):
+            upper = r1
         else:
             try:
-                upper = int(range_[1])
+                upper = int(r1)
             except ValueError as err:
                 raise exc.ArgumentError(
                     "Integer or None expected for range value"
@@ -4211,7 +4302,7 @@ class WithinGroup(ColumnElement[_T]):
     ``rank()``, ``dense_rank()``, etc.
 
     It's supported only by certain database backends, such as PostgreSQL,
-    Oracle and MS SQL Server.
+    Oracle Database and MS SQL Server.
 
     The :class:`.WithinGroup` construct extracts its type from the
     method :meth:`.FunctionElement.within_group_type`.  If this returns
@@ -4230,7 +4321,7 @@ class WithinGroup(ColumnElement[_T]):
 
     def __init__(
         self,
-        element: FunctionElement[_T],
+        element: Union[FunctionElement[_T], FunctionFilter[_T]],
         *order_by: _ColumnExpressionArgument[Any],
     ):
         self.element = element
@@ -4244,7 +4335,14 @@ class WithinGroup(ColumnElement[_T]):
             tuple(self.order_by) if self.order_by is not None else ()
         )
 
-    def over(self, partition_by=None, order_by=None, range_=None, rows=None):
+    def over(
+        self,
+        *,
+        partition_by: Optional[_ByArgument] = None,
+        order_by: Optional[_ByArgument] = None,
+        rows: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+        range_: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+    ) -> Over[_T]:
         """Produce an OVER clause against this :class:`.WithinGroup`
         construct.
 
@@ -4260,6 +4358,24 @@ class WithinGroup(ColumnElement[_T]):
             rows=rows,
         )
 
+    @overload
+    def filter(self) -> Self: ...
+
+    @overload
+    def filter(
+        self,
+        __criterion0: _ColumnExpressionArgument[bool],
+        *criterion: _ColumnExpressionArgument[bool],
+    ) -> FunctionFilter[_T]: ...
+
+    def filter(
+        self, *criterion: _ColumnExpressionArgument[bool]
+    ) -> Union[Self, FunctionFilter[_T]]:
+        """Produce a FILTER clause against this function."""
+        if not criterion:
+            return self
+        return FunctionFilter(self, *criterion)
+
     if not TYPE_CHECKING:
 
         @util.memoized_property
@@ -4283,7 +4399,7 @@ class WithinGroup(ColumnElement[_T]):
         )
 
 
-class FunctionFilter(ColumnElement[_T]):
+class FunctionFilter(Generative, ColumnElement[_T]):
     """Represent a function FILTER clause.
 
     This is a special operator against aggregate and window functions,
@@ -4312,12 +4428,13 @@ class FunctionFilter(ColumnElement[_T]):
 
     def __init__(
         self,
-        func: FunctionElement[_T],
+        func: Union[FunctionElement[_T], WithinGroup[_T]],
         *criterion: _ColumnExpressionArgument[bool],
     ):
         self.func = func
-        self.filter(*criterion)
+        self.filter.non_generative(self, *criterion)  # type: ignore
 
+    @_generative
     def filter(self, *criterion: _ColumnExpressionArgument[bool]) -> Self:
         """Produce an additional FILTER against the function.
 
@@ -4364,12 +4481,13 @@ class FunctionFilter(ColumnElement[_T]):
 
         The expression::
 
-            func.rank().filter(MyClass.y > 5).over(order_by='x')
+            func.rank().filter(MyClass.y > 5).over(order_by="x")
 
         is shorthand for::
 
             from sqlalchemy import over, funcfilter
-            over(funcfilter(func.rank(), MyClass.y > 5), order_by='x')
+
+            over(funcfilter(func.rank(), MyClass.y > 5), order_by="x")
 
         See :func:`_expression.over` for a full description.
 
@@ -4382,6 +4500,19 @@ class FunctionFilter(ColumnElement[_T]):
             rows=rows,
         )
 
+    def within_group(
+        self, *order_by: _ColumnExpressionArgument[Any]
+    ) -> WithinGroup[_T]:
+        """Produce a WITHIN GROUP (ORDER BY expr) clause against
+        this function.
+        """
+        return WithinGroup(self, *order_by)
+
+    def within_group_type(
+        self, within_group: WithinGroup[_T]
+    ) -> Optional[TypeEngine[_T]]:
+        return None
+
     def self_group(
         self, against: Optional[OperatorType] = None
     ) -> Union[Self, Grouping[_T]]:
@@ -4514,6 +4645,9 @@ class NamedColumn(KeyedColumnElement[_T]):
         return c.key, c
 
 
+_PS = ParamSpec("_PS")
+
+
 class Label(roles.LabeledColumnExprRole[_T], NamedColumn[_T]):
     """Represents a column label (AS).
 
@@ -4611,13 +4745,18 @@ class Label(roles.LabeledColumnExprRole[_T], NamedColumn[_T]):
     def element(self) -> ColumnElement[_T]:
         return self._element.self_group(against=operators.as_)
 
-    def self_group(self, against=None):
+    def self_group(self, against: Optional[OperatorType] = None) -> Label[_T]:
         return self._apply_to_inner(self._element.self_group, against=against)
 
     def _negate(self):
         return self._apply_to_inner(self._element._negate)
 
-    def _apply_to_inner(self, fn, *arg, **kw):
+    def _apply_to_inner(
+        self,
+        fn: Callable[_PS, ColumnElement[_T]],
+        *arg: _PS.args,
+        **kw: _PS.kwargs,
+    ) -> Label[_T]:
         sub_element = fn(*arg, **kw)
         if sub_element is not self._element:
             return Label(self.name, sub_element, type_=self.type)
@@ -4710,7 +4849,9 @@ class ColumnClause(
         id, name = column("id"), column("name")
         stmt = select(id, name).select_from("user")
 
-    The above statement would produce SQL like::
+    The above statement would produce SQL like:
+
+    .. sourcecode:: sql
 
         SELECT id, name FROM user
 
@@ -4978,15 +5119,25 @@ class CollationClause(ColumnElement[str]):
     ]
 
     @classmethod
+    @util.preload_module("sqlalchemy.sql.sqltypes")
     def _create_collation_expression(
         cls, expression: _ColumnExpressionArgument[str], collation: str
     ) -> BinaryExpression[str]:
+
+        sqltypes = util.preloaded.sql_sqltypes
+
         expr = coercions.expect(roles.ExpressionElementRole[str], expression)
+
+        if expr.type._type_affinity is sqltypes.String:
+            collate_type = expr.type._with_collation(collation)
+        else:
+            collate_type = expr.type
+
         return BinaryExpression(
             expr,
             CollationClause(collation),
             operators.collate,
-            type_=expr.type,
+            type_=collate_type,
         )
 
     def __init__(self, collation):
@@ -5030,7 +5181,7 @@ class quoted_name(util.MemoizedSlots, str):
     A :class:`.quoted_name` object with ``quote=True`` is also
     prevented from being modified in the case of a so-called
     "name normalize" option.  Certain database backends, such as
-    Oracle, Firebird, and DB2 "normalize" case-insensitive names
+    Oracle Database, Firebird, and DB2 "normalize" case-insensitive names
     as uppercase.  The SQLAlchemy dialects for these backends
     convert from SQLAlchemy's lower-case-means-insensitive convention
     to the upper-case-means-insensitive conventions of those backends.
@@ -5051,11 +5202,11 @@ class quoted_name(util.MemoizedSlots, str):
         from sqlalchemy import inspect
         from sqlalchemy.sql import quoted_name
 
-        engine = create_engine("oracle+cx_oracle://some_dsn")
+        engine = create_engine("oracle+oracledb://some_dsn")
         print(inspect(engine).has_table(quoted_name("some_table", True)))
 
-    The above logic will run the "has table" logic against the Oracle backend,
-    passing the name exactly as ``"some_table"`` without converting to
+    The above logic will run the "has table" logic against the Oracle Database
+    backend, passing the name exactly as ``"some_table"`` without converting to
     upper case.
 
     .. versionchanged:: 1.2 The :class:`.quoted_name` construct is now
@@ -5175,7 +5326,14 @@ class AnnotatedColumnElement(Annotated):
 
     def _with_annotations(self, values):
         clone = super()._with_annotations(values)
-        clone.__dict__.pop("comparator", None)
+        for attr in (
+            "comparator",
+            "_proxy_key",
+            "_tq_key_label",
+            "_tq_label",
+            "_non_anon_label",
+        ):
+            clone.__dict__.pop(attr, None)
         return clone
 
     @util.memoized_property
@@ -5246,11 +5404,12 @@ class conv(_truncated_label):
     E.g. when we create a :class:`.Constraint` using a naming convention
     as follows::
 
-        m = MetaData(naming_convention={
-            "ck": "ck_%(table_name)s_%(constraint_name)s"
-        })
-        t = Table('t', m, Column('x', Integer),
-                        CheckConstraint('x > 5', name='x5'))
+        m = MetaData(
+            naming_convention={"ck": "ck_%(table_name)s_%(constraint_name)s"}
+        )
+        t = Table(
+            "t", m, Column("x", Integer), CheckConstraint("x > 5", name="x5")
+        )
 
     The name of the above constraint will be rendered as ``"ck_t_x5"``.
     That is, the existing name ``x5`` is used in the naming convention as the
@@ -5263,11 +5422,15 @@ class conv(_truncated_label):
     use this explicitly as follows::
 
 
-        m = MetaData(naming_convention={
-            "ck": "ck_%(table_name)s_%(constraint_name)s"
-        })
-        t = Table('t', m, Column('x', Integer),
-                        CheckConstraint('x > 5', name=conv('ck_t_x5')))
+        m = MetaData(
+            naming_convention={"ck": "ck_%(table_name)s_%(constraint_name)s"}
+        )
+        t = Table(
+            "t",
+            m,
+            Column("x", Integer),
+            CheckConstraint("x > 5", name=conv("ck_t_x5")),
+        )
 
     Where above, the :func:`_schema.conv` marker indicates that the constraint
     name here is final, and the name will render as ``"ck_t_x5"`` and not
diff --git a/libs/sqlalchemy/sql/events.py b/libs/sqlalchemy/sql/events.py
index 1a6a9a6a7..601092fd9 100644
--- a/libs/sqlalchemy/sql/events.py
+++ b/libs/sqlalchemy/sql/events.py
@@ -1,5 +1,5 @@
 # sql/events.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -63,13 +63,14 @@ class DDLEvents(event.Events[SchemaEventTarget]):
         from sqlalchemy import Table, Column, Metadata, Integer
 
         m = MetaData()
-        some_table = Table('some_table', m, Column('data', Integer))
+        some_table = Table("some_table", m, Column("data", Integer))
+
 
         @event.listens_for(some_table, "after_create")
         def after_create(target, connection, **kw):
-            connection.execute(text(
-                "ALTER TABLE %s SET name=foo_%s" % (target.name, target.name)
-            ))
+            connection.execute(
+                text("ALTER TABLE %s SET name=foo_%s" % (target.name, target.name))
+            )
 
 
         some_engine = create_engine("postgresql://scott:tiger@host/test")
@@ -127,10 +128,11 @@ class DDLEvents(event.Events[SchemaEventTarget]):
     as listener callables::
 
         from sqlalchemy import DDL
+
         event.listen(
             some_table,
             "after_create",
-            DDL("ALTER TABLE %(table)s SET name=foo_%(table)s")
+            DDL("ALTER TABLE %(table)s SET name=foo_%(table)s"),
         )
 
     **Event Propagation to MetaData Copies**
@@ -149,7 +151,7 @@ class DDLEvents(event.Events[SchemaEventTarget]):
             some_table,
             "after_create",
             DDL("ALTER TABLE %(table)s SET name=foo_%(table)s"),
-            propagate=True
+            propagate=True,
         )
 
         new_metadata = MetaData()
@@ -169,7 +171,7 @@ class DDLEvents(event.Events[SchemaEventTarget]):
 
         :ref:`schema_ddl_sequences`
 
-    """
+    """  # noqa: E501
 
     _target_class_doc = "SomeSchemaClassOrObject"
     _dispatch_target = SchemaEventTarget
@@ -358,16 +360,17 @@ class DDLEvents(event.Events[SchemaEventTarget]):
 
             metadata = MetaData()
 
-            @event.listens_for(metadata, 'column_reflect')
+
+            @event.listens_for(metadata, "column_reflect")
             def receive_column_reflect(inspector, table, column_info):
                 # receives for all Table objects that are reflected
                 # under this MetaData
+                ...
 
 
             # will use the above event hook
             my_table = Table("my_table", metadata, autoload_with=some_engine)
 
-
         .. versionadded:: 1.4.0b2 The :meth:`_events.DDLEvents.column_reflect`
            hook may now be applied to a :class:`_schema.MetaData` object as
            well as the :class:`_schema.MetaData` class itself where it will
@@ -379,9 +382,11 @@ class DDLEvents(event.Events[SchemaEventTarget]):
 
             from sqlalchemy import Table
 
-            @event.listens_for(Table, 'column_reflect')
+
+            @event.listens_for(Table, "column_reflect")
             def receive_column_reflect(inspector, table, column_info):
                 # receives for all Table objects that are reflected
+                ...
 
         It can also be applied to a specific :class:`_schema.Table` at the
         point that one is being reflected using the
@@ -390,9 +395,7 @@ class DDLEvents(event.Events[SchemaEventTarget]):
             t1 = Table(
                 "my_table",
                 autoload_with=some_engine,
-                listeners=[
-                    ('column_reflect', receive_column_reflect)
-                ]
+                listeners=[("column_reflect", receive_column_reflect)],
             )
 
         The dictionary of column information as returned by the
diff --git a/libs/sqlalchemy/sql/expression.py b/libs/sqlalchemy/sql/expression.py
index ba42445d0..f8ac3a9ec 100644
--- a/libs/sqlalchemy/sql/expression.py
+++ b/libs/sqlalchemy/sql/expression.py
@@ -1,5 +1,5 @@
 # sql/expression.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/functions.py b/libs/sqlalchemy/sql/functions.py
index afb2b1d9b..ea02279d4 100644
--- a/libs/sqlalchemy/sql/functions.py
+++ b/libs/sqlalchemy/sql/functions.py
@@ -1,5 +1,5 @@
 # sql/functions.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -69,6 +69,7 @@ if TYPE_CHECKING:
     from ._typing import _ColumnExpressionArgument
     from ._typing import _ColumnExpressionOrLiteralArgument
     from ._typing import _ColumnExpressionOrStrLabelArgument
+    from ._typing import _StarOrOne
     from ._typing import _TypeEngineArgument
     from .base import _EntityNamespace
     from .elements import ClauseElement
@@ -245,9 +246,8 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
 
         .. sourcecode:: pycon+sql
 
-            >>> fn = (
-            ...     func.generate_series(1, 5).
-            ...     table_valued("value", "start", "stop", "step")
+            >>> fn = func.generate_series(1, 5).table_valued(
+            ...     "value", "start", "stop", "step"
             ... )
 
             >>> print(select(fn))
@@ -264,7 +264,9 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
 
         .. sourcecode:: pycon+sql
 
-            >>> fn = func.generate_series(4, 1, -1).table_valued("gen", with_ordinality="ordinality")
+            >>> fn = func.generate_series(4, 1, -1).table_valued(
+            ...     "gen", with_ordinality="ordinality"
+            ... )
             >>> print(select(fn))
             {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
@@ -376,7 +378,7 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
         .. sourcecode:: pycon+sql
 
             >>> from sqlalchemy import column, select, func
-            >>> stmt = select(column('x'), column('y')).select_from(func.myfunction())
+            >>> stmt = select(column("x"), column("y")).select_from(func.myfunction())
             >>> print(stmt)
             {printsql}SELECT x, y FROM myfunction()
 
@@ -441,12 +443,13 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
 
         The expression::
 
-            func.row_number().over(order_by='x')
+            func.row_number().over(order_by="x")
 
         is shorthand for::
 
             from sqlalchemy import over
-            over(func.row_number(), order_by='x')
+
+            over(func.row_number(), order_by="x")
 
         See :func:`_expression.over` for a full description.
 
@@ -510,6 +513,7 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
         is shorthand for::
 
             from sqlalchemy import funcfilter
+
             funcfilter(func.count(1), True)
 
         .. seealso::
@@ -566,7 +570,7 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
         An ORM example is as follows::
 
             class Venue(Base):
-                __tablename__ = 'venue'
+                __tablename__ = "venue"
                 id = Column(Integer, primary_key=True)
                 name = Column(String)
 
@@ -574,9 +578,10 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
                     "Venue",
                     primaryjoin=func.instr(
                         remote(foreign(name)), name + "/"
-                    ).as_comparison(1, 2) == 1,
+                    ).as_comparison(1, 2)
+                    == 1,
                     viewonly=True,
-                    order_by=name
+                    order_by=name,
                 )
 
         Above, the "Venue" class can load descendant "Venue" objects by
@@ -880,8 +885,11 @@ class _FunctionGenerator:
 
     .. sourcecode:: pycon+sql
 
-        >>> print(func.my_string(u'hi', type_=Unicode) + ' ' +
-        ...       func.my_string(u'there', type_=Unicode))
+        >>> print(
+        ...     func.my_string("hi", type_=Unicode)
+        ...     + " "
+        ...     + func.my_string("there", type_=Unicode)
+        ... )
         {printsql}my_string(:my_string_1) || :my_string_2 || my_string(:my_string_3)
 
     The object returned by a :data:`.func` call is usually an instance of
@@ -1366,10 +1374,12 @@ class GenericFunction(Function[_T]):
         from sqlalchemy.sql.functions import GenericFunction
         from sqlalchemy.types import DateTime
 
+
         class as_utc(GenericFunction):
             type = DateTime()
             inherit_cache = True
 
+
         print(select(func.as_utc()))
 
     User-defined generic functions can be organized into
@@ -1417,6 +1427,7 @@ class GenericFunction(Function[_T]):
 
         from sqlalchemy.sql import quoted_name
 
+
         class GeoBuffer(GenericFunction):
             type = Geometry()
             package = "geo"
@@ -1656,7 +1667,7 @@ class concat(GenericFunction[str]):
 
     .. sourcecode:: pycon+sql
 
-        >>> print(select(func.concat('a', 'b')))
+        >>> print(select(func.concat("a", "b")))
         {printsql}SELECT concat(:concat_2, :concat_3) AS concat_1
 
     String concatenation in SQLAlchemy is more commonly available using the
@@ -1704,11 +1715,13 @@ class count(GenericFunction[int]):
         from sqlalchemy import select
         from sqlalchemy import table, column
 
-        my_table = table('some_table', column('id'))
+        my_table = table("some_table", column("id"))
 
         stmt = select(func.count()).select_from(my_table)
 
-    Executing ``stmt`` would emit::
+    Executing ``stmt`` would emit:
+
+    .. sourcecode:: sql
 
         SELECT count(*) AS count_1
         FROM some_table
@@ -1721,7 +1734,9 @@ class count(GenericFunction[int]):
 
     def __init__(
         self,
-        expression: Optional[_ColumnExpressionArgument[Any]] = None,
+        expression: Union[
+            _ColumnExpressionArgument[Any], _StarOrOne, None
+        ] = None,
         **kwargs: Any,
     ):
         if expression is None:
@@ -2006,9 +2021,7 @@ class grouping_sets(GenericFunction[_T]):
         from sqlalchemy import tuple_
 
         stmt = select(
-            func.sum(table.c.value),
-            table.c.col_1, table.c.col_2,
-            table.c.col_3
+            func.sum(table.c.value), table.c.col_1, table.c.col_2, table.c.col_3
         ).group_by(
             func.grouping_sets(
                 tuple_(table.c.col_1, table.c.col_2),
@@ -2016,10 +2029,9 @@ class grouping_sets(GenericFunction[_T]):
             )
         )
 
-
     .. versionadded:: 1.2
 
-    """
+    """  # noqa: E501
 
     _has_args = True
     inherit_cache = True
diff --git a/libs/sqlalchemy/sql/lambdas.py b/libs/sqlalchemy/sql/lambdas.py
index 726fa2411..8d70f800e 100644
--- a/libs/sqlalchemy/sql/lambdas.py
+++ b/libs/sqlalchemy/sql/lambdas.py
@@ -1,5 +1,5 @@
 # sql/lambdas.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -278,7 +278,7 @@ class LambdaElement(elements.ClauseElement):
                         rec = AnalyzedFunction(
                             tracker, self, apply_propagate_attrs, fn
                         )
-                        rec.closure_bindparams = bindparams
+                        rec.closure_bindparams = list(bindparams)
                         lambda_cache[key] = rec
                     else:
                         rec = lambda_cache[key]
@@ -437,7 +437,7 @@ class DeferredLambdaElement(LambdaElement):
 
     def __init__(
         self,
-        fn: _LambdaType,
+        fn: _AnyLambdaType,
         role: Type[roles.SQLRole],
         opts: Union[Type[LambdaOptions], LambdaOptions] = LambdaOptions,
         lambda_args: Tuple[Any, ...] = (),
@@ -518,7 +518,6 @@ class StatementLambdaElement(
 
         stmt += lambda s: s.where(table.c.col == parameter)
 
-
     .. versionadded:: 1.4
 
     .. seealso::
@@ -558,9 +557,7 @@ class StatementLambdaElement(
             ...     stmt = lambda_stmt(
             ...         lambda: select(table.c.x, table.c.y),
             ...     )
-            ...     stmt = stmt.add_criteria(
-            ...         lambda: table.c.x > parameter
-            ...     )
+            ...     stmt = stmt.add_criteria(lambda: table.c.x > parameter)
             ...     return stmt
 
         The :meth:`_sql.StatementLambdaElement.add_criteria` method is
@@ -571,18 +568,15 @@ class StatementLambdaElement(
             >>> def my_stmt(self, foo):
             ...     stmt = lambda_stmt(
             ...         lambda: select(func.max(foo.x, foo.y)),
-            ...         track_closure_variables=False
-            ...     )
-            ...     stmt = stmt.add_criteria(
-            ...         lambda: self.where_criteria,
-            ...         track_on=[self]
+            ...         track_closure_variables=False,
             ...     )
+            ...     stmt = stmt.add_criteria(lambda: self.where_criteria, track_on=[self])
             ...     return stmt
 
         See :func:`_sql.lambda_stmt` for a description of the parameters
         accepted.
 
-        """
+        """  # noqa: E501
 
         opts = self.opts + dict(
             enable_tracking=enable_tracking,
diff --git a/libs/sqlalchemy/sql/naming.py b/libs/sqlalchemy/sql/naming.py
index 7213ddb29..58203e4b9 100644
--- a/libs/sqlalchemy/sql/naming.py
+++ b/libs/sqlalchemy/sql/naming.py
@@ -1,5 +1,5 @@
 # sql/naming.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/operators.py b/libs/sqlalchemy/sql/operators.py
index 9fb096e47..d5f876cb0 100644
--- a/libs/sqlalchemy/sql/operators.py
+++ b/libs/sqlalchemy/sql/operators.py
@@ -1,5 +1,5 @@
 # sql/operators.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -148,6 +148,7 @@ class Operators:
         is equivalent to::
 
             from sqlalchemy import and_
+
             and_(a, b)
 
         Care should be taken when using ``&`` regarding
@@ -172,6 +173,7 @@ class Operators:
         is equivalent to::
 
             from sqlalchemy import or_
+
             or_(a, b)
 
         Care should be taken when using ``|`` regarding
@@ -196,6 +198,7 @@ class Operators:
         is equivalent to::
 
             from sqlalchemy import not_
+
             not_(a)
 
         """
@@ -224,7 +227,7 @@ class Operators:
         This function can also be used to make bitwise operators explicit. For
         example::
 
-          somecolumn.op('&')(0xff)
+          somecolumn.op("&")(0xFF)
 
         is a bitwise AND of the value in ``somecolumn``.
 
@@ -275,7 +278,7 @@ class Operators:
 
          e.g.::
 
-            >>> expr = column('x').op('+', python_impl=lambda a, b: a + b)('y')
+            >>> expr = column("x").op("+", python_impl=lambda a, b: a + b)("y")
 
          The operator for the above expression will also work for non-SQL
          left and right objects::
@@ -389,10 +392,9 @@ class custom_op(OperatorType, Generic[_T]):
         from sqlalchemy.sql import operators
         from sqlalchemy import Numeric
 
-        unary = UnaryExpression(table.c.somecolumn,
-                modifier=operators.custom_op("!"),
-                type_=Numeric)
-
+        unary = UnaryExpression(
+            table.c.somecolumn, modifier=operators.custom_op("!"), type_=Numeric
+        )
 
     .. seealso::
 
@@ -400,7 +402,7 @@ class custom_op(OperatorType, Generic[_T]):
 
         :meth:`.Operators.bool_op`
 
-    """
+    """  # noqa: E501
 
     __name__ = "custom_op"
 
@@ -698,14 +700,15 @@ class ColumnOperators(Operators):
     ) -> ColumnOperators:
         r"""Implement the ``like`` operator.
 
-        In a column context, produces the expression::
+        In a column context, produces the expression:
+
+        .. sourcecode:: sql
 
             a LIKE other
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.like("%foobar%"))
+            stmt = select(sometable).where(sometable.c.column.like("%foobar%"))
 
         :param other: expression to be compared
         :param escape: optional escape character, renders the ``ESCAPE``
@@ -725,18 +728,21 @@ class ColumnOperators(Operators):
     ) -> ColumnOperators:
         r"""Implement the ``ilike`` operator, e.g. case insensitive LIKE.
 
-        In a column context, produces an expression either of the form::
+        In a column context, produces an expression either of the form:
+
+        .. sourcecode:: sql
 
             lower(a) LIKE lower(other)
 
-        Or on backends that support the ILIKE operator::
+        Or on backends that support the ILIKE operator:
+
+        .. sourcecode:: sql
 
             a ILIKE other
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.ilike("%foobar%"))
+            stmt = select(sometable).where(sometable.c.column.ilike("%foobar%"))
 
         :param other: expression to be compared
         :param escape: optional escape character, renders the ``ESCAPE``
@@ -748,7 +754,7 @@ class ColumnOperators(Operators):
 
             :meth:`.ColumnOperators.like`
 
-        """
+        """  # noqa: E501
         return self.operate(ilike_op, other, escape=escape)
 
     def bitwise_xor(self, other: Any) -> ColumnOperators:
@@ -842,12 +848,15 @@ class ColumnOperators(Operators):
 
         The given parameter ``other`` may be:
 
-        * A list of literal values, e.g.::
+        * A list of literal values,
+          e.g.::
 
             stmt.where(column.in_([1, 2, 3]))
 
           In this calling form, the list of items is converted to a set of
-          bound parameters the same length as the list given::
+          bound parameters the same length as the list given:
+
+          .. sourcecode:: sql
 
             WHERE COL IN (?, ?, ?)
 
@@ -855,16 +864,20 @@ class ColumnOperators(Operators):
           :func:`.tuple_` containing multiple expressions::
 
             from sqlalchemy import tuple_
+
             stmt.where(tuple_(col1, col2).in_([(1, 10), (2, 20), (3, 30)]))
 
-        * An empty list, e.g.::
+        * An empty list,
+          e.g.::
 
             stmt.where(column.in_([]))
 
           In this calling form, the expression renders an "empty set"
           expression.  These expressions are tailored to individual backends
           and are generally trying to get an empty SELECT statement as a
-          subquery.  Such as on SQLite, the expression is::
+          subquery.  Such as on SQLite, the expression is:
+
+          .. sourcecode:: sql
 
             WHERE col IN (SELECT 1 FROM (SELECT 1) WHERE 1!=1)
 
@@ -874,10 +887,12 @@ class ColumnOperators(Operators):
         * A bound parameter, e.g. :func:`.bindparam`, may be used if it
           includes the :paramref:`.bindparam.expanding` flag::
 
-            stmt.where(column.in_(bindparam('value', expanding=True)))
+            stmt.where(column.in_(bindparam("value", expanding=True)))
 
           In this calling form, the expression renders a special non-SQL
-          placeholder expression that looks like::
+          placeholder expression that looks like:
+
+          .. sourcecode:: sql
 
             WHERE COL IN ([EXPANDING_value])
 
@@ -887,7 +902,9 @@ class ColumnOperators(Operators):
 
             connection.execute(stmt, {"value": [1, 2, 3]})
 
-          The database would be passed a bound parameter for each value::
+          The database would be passed a bound parameter for each value:
+
+          .. sourcecode:: sql
 
             WHERE COL IN (?, ?, ?)
 
@@ -895,7 +912,9 @@ class ColumnOperators(Operators):
 
           If an empty list is passed, a special "empty list" expression,
           which is specific to the database in use, is rendered.  On
-          SQLite this would be::
+          SQLite this would be:
+
+          .. sourcecode:: sql
 
             WHERE COL IN (SELECT 1 FROM (SELECT 1) WHERE 1!=1)
 
@@ -906,13 +925,12 @@ class ColumnOperators(Operators):
           correlated scalar select::
 
             stmt.where(
-                column.in_(
-                    select(othertable.c.y).
-                    where(table.c.x == othertable.c.x)
-                )
+                column.in_(select(othertable.c.y).where(table.c.x == othertable.c.x))
             )
 
-          In this calling form, :meth:`.ColumnOperators.in_` renders as given::
+          In this calling form, :meth:`.ColumnOperators.in_` renders as given:
+
+          .. sourcecode:: sql
 
             WHERE COL IN (SELECT othertable.y
             FROM othertable WHERE othertable.x = table.x)
@@ -921,7 +939,7 @@ class ColumnOperators(Operators):
          construct, or a :func:`.bindparam` construct that includes the
          :paramref:`.bindparam.expanding` flag set to True.
 
-        """
+        """  # noqa: E501
         return self.operate(in_op, other)
 
     def not_in(self, other: Any) -> ColumnOperators:
@@ -1065,14 +1083,15 @@ class ColumnOperators(Operators):
         r"""Implement the ``startswith`` operator.
 
         Produces a LIKE expression that tests against a match for the start
-        of a string value::
+        of a string value:
+
+        .. sourcecode:: sql
 
             column LIKE <other> || '%'
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.startswith("foobar"))
+            stmt = select(sometable).where(sometable.c.column.startswith("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1101,7 +1120,9 @@ class ColumnOperators(Operators):
 
             somecolumn.startswith("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE :param || '%' ESCAPE '/'
 
@@ -1117,7 +1138,9 @@ class ColumnOperators(Operators):
 
             somecolumn.startswith("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE :param || '%' ESCAPE '^'
 
@@ -1137,7 +1160,7 @@ class ColumnOperators(Operators):
 
             :meth:`.ColumnOperators.like`
 
-        """
+        """  # noqa: E501
         return self.operate(
             startswith_op, other, escape=escape, autoescape=autoescape
         )
@@ -1152,14 +1175,15 @@ class ColumnOperators(Operators):
         version of :meth:`.ColumnOperators.startswith`.
 
         Produces a LIKE expression that tests against an insensitive
-        match for the start of a string value::
+        match for the start of a string value:
+
+        .. sourcecode:: sql
 
             lower(column) LIKE lower(<other>) || '%'
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.istartswith("foobar"))
+            stmt = select(sometable).where(sometable.c.column.istartswith("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1188,7 +1212,9 @@ class ColumnOperators(Operators):
 
             somecolumn.istartswith("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE lower(:param) || '%' ESCAPE '/'
 
@@ -1204,7 +1230,9 @@ class ColumnOperators(Operators):
 
             somecolumn.istartswith("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE lower(:param) || '%' ESCAPE '^'
 
@@ -1219,7 +1247,7 @@ class ColumnOperators(Operators):
         .. seealso::
 
             :meth:`.ColumnOperators.startswith`
-        """
+        """  # noqa: E501
         return self.operate(
             istartswith_op, other, escape=escape, autoescape=autoescape
         )
@@ -1233,14 +1261,15 @@ class ColumnOperators(Operators):
         r"""Implement the 'endswith' operator.
 
         Produces a LIKE expression that tests against a match for the end
-        of a string value::
+        of a string value:
+
+        .. sourcecode:: sql
 
             column LIKE '%' || <other>
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.endswith("foobar"))
+            stmt = select(sometable).where(sometable.c.column.endswith("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1269,7 +1298,9 @@ class ColumnOperators(Operators):
 
             somecolumn.endswith("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE '%' || :param ESCAPE '/'
 
@@ -1285,7 +1316,9 @@ class ColumnOperators(Operators):
 
             somecolumn.endswith("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE '%' || :param ESCAPE '^'
 
@@ -1305,7 +1338,7 @@ class ColumnOperators(Operators):
 
             :meth:`.ColumnOperators.like`
 
-        """
+        """  # noqa: E501
         return self.operate(
             endswith_op, other, escape=escape, autoescape=autoescape
         )
@@ -1320,14 +1353,15 @@ class ColumnOperators(Operators):
         version of :meth:`.ColumnOperators.endswith`.
 
         Produces a LIKE expression that tests against an insensitive match
-        for the end of a string value::
+        for the end of a string value:
+
+        .. sourcecode:: sql
 
             lower(column) LIKE '%' || lower(<other>)
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.iendswith("foobar"))
+            stmt = select(sometable).where(sometable.c.column.iendswith("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1356,7 +1390,9 @@ class ColumnOperators(Operators):
 
             somecolumn.iendswith("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE '%' || lower(:param) ESCAPE '/'
 
@@ -1372,7 +1408,9 @@ class ColumnOperators(Operators):
 
             somecolumn.iendswith("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE '%' || lower(:param) ESCAPE '^'
 
@@ -1387,7 +1425,7 @@ class ColumnOperators(Operators):
         .. seealso::
 
             :meth:`.ColumnOperators.endswith`
-        """
+        """  # noqa: E501
         return self.operate(
             iendswith_op, other, escape=escape, autoescape=autoescape
         )
@@ -1396,14 +1434,15 @@ class ColumnOperators(Operators):
         r"""Implement the 'contains' operator.
 
         Produces a LIKE expression that tests against a match for the middle
-        of a string value::
+        of a string value:
+
+        .. sourcecode:: sql
 
             column LIKE '%' || <other> || '%'
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.contains("foobar"))
+            stmt = select(sometable).where(sometable.c.column.contains("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1432,7 +1471,9 @@ class ColumnOperators(Operators):
 
             somecolumn.contains("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE '%' || :param || '%' ESCAPE '/'
 
@@ -1448,7 +1489,9 @@ class ColumnOperators(Operators):
 
             somecolumn.contains("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             somecolumn LIKE '%' || :param || '%' ESCAPE '^'
 
@@ -1469,7 +1512,7 @@ class ColumnOperators(Operators):
             :meth:`.ColumnOperators.like`
 
 
-        """
+        """  # noqa: E501
         return self.operate(contains_op, other, **kw)
 
     def icontains(self, other: Any, **kw: Any) -> ColumnOperators:
@@ -1477,14 +1520,15 @@ class ColumnOperators(Operators):
         version of :meth:`.ColumnOperators.contains`.
 
         Produces a LIKE expression that tests against an insensitive match
-        for the middle of a string value::
+        for the middle of a string value:
+
+        .. sourcecode:: sql
 
             lower(column) LIKE '%' || lower(<other>) || '%'
 
         E.g.::
 
-            stmt = select(sometable).\
-                where(sometable.c.column.icontains("foobar"))
+            stmt = select(sometable).where(sometable.c.column.icontains("foobar"))
 
         Since the operator uses ``LIKE``, wildcard characters
         ``"%"`` and ``"_"`` that are present inside the <other> expression
@@ -1513,7 +1557,9 @@ class ColumnOperators(Operators):
 
             somecolumn.icontains("foo%bar", autoescape=True)
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE '%' || lower(:param) || '%' ESCAPE '/'
 
@@ -1529,7 +1575,9 @@ class ColumnOperators(Operators):
 
             somecolumn.icontains("foo/%bar", escape="^")
 
-          Will render as::
+          Will render as:
+
+          .. sourcecode:: sql
 
             lower(somecolumn) LIKE '%' || lower(:param) || '%' ESCAPE '^'
 
@@ -1545,7 +1593,7 @@ class ColumnOperators(Operators):
 
             :meth:`.ColumnOperators.contains`
 
-        """
+        """  # noqa: E501
         return self.operate(icontains_op, other, **kw)
 
     def match(self, other: Any, **kwargs: Any) -> ColumnOperators:
@@ -1569,7 +1617,7 @@ class ColumnOperators(Operators):
                 :class:`_mysql.match` - MySQL specific construct with
                 additional features.
 
-        * Oracle - renders ``CONTAINS(x, y)``
+        * Oracle Database - renders ``CONTAINS(x, y)``
         * other backends may provide special implementations.
         * Backends without any special implementation will emit
           the operator as "MATCH".  This is compatible with SQLite, for
@@ -1586,7 +1634,7 @@ class ColumnOperators(Operators):
         E.g.::
 
             stmt = select(table.c.some_column).where(
-                table.c.some_column.regexp_match('^(b|c)')
+                table.c.some_column.regexp_match("^(b|c)")
             )
 
         :meth:`_sql.ColumnOperators.regexp_match` attempts to resolve to
@@ -1597,7 +1645,7 @@ class ColumnOperators(Operators):
         Examples include:
 
         * PostgreSQL - renders ``x ~ y`` or ``x !~ y`` when negated.
-        * Oracle - renders ``REGEXP_LIKE(x, y)``
+        * Oracle Database - renders ``REGEXP_LIKE(x, y)``
         * SQLite - uses SQLite's ``REGEXP`` placeholder operator and calls into
           the Python ``re.match()`` builtin.
         * other backends may provide special implementations.
@@ -1605,9 +1653,9 @@ class ColumnOperators(Operators):
           the operator as "REGEXP" or "NOT REGEXP".  This is compatible with
           SQLite and MySQL, for example.
 
-        Regular expression support is currently implemented for Oracle,
-        PostgreSQL, MySQL and MariaDB.  Partial support is available for
-        SQLite.  Support among third-party dialects may vary.
+        Regular expression support is currently implemented for Oracle
+        Database, PostgreSQL, MySQL and MariaDB.  Partial support is available
+        for SQLite.  Support among third-party dialects may vary.
 
         :param pattern: The regular expression pattern string or column
           clause.
@@ -1644,11 +1692,7 @@ class ColumnOperators(Operators):
         E.g.::
 
             stmt = select(
-                table.c.some_column.regexp_replace(
-                    'b(..)',
-                    'X\1Y',
-                    flags='g'
-                )
+                table.c.some_column.regexp_replace("b(..)", "X\1Y", flags="g")
             )
 
         :meth:`_sql.ColumnOperators.regexp_replace` attempts to resolve to
@@ -1658,8 +1702,8 @@ class ColumnOperators(Operators):
         **not backend agnostic**.
 
         Regular expression replacement support is currently implemented for
-        Oracle, PostgreSQL, MySQL 8 or greater and MariaDB.  Support among
-        third-party dialects may vary.
+        Oracle Database, PostgreSQL, MySQL 8 or greater and MariaDB.  Support
+        among third-party dialects may vary.
 
         :param pattern: The regular expression pattern string or column
           clause.
@@ -2474,6 +2518,12 @@ def is_associative(op: OperatorType) -> bool:
     return op in _associative
 
 
+def is_order_by_modifier(op: Optional[OperatorType]) -> bool:
+    return op in _order_by_modifier
+
+
+_order_by_modifier = {desc_op, asc_op, nulls_first_op, nulls_last_op}
+
 _natural_self_precedent = _associative.union(
     [getitem, json_getitem_op, json_path_getitem_op]
 )
diff --git a/libs/sqlalchemy/sql/roles.py b/libs/sqlalchemy/sql/roles.py
index ae70ac3a5..da69616dc 100644
--- a/libs/sqlalchemy/sql/roles.py
+++ b/libs/sqlalchemy/sql/roles.py
@@ -1,5 +1,5 @@
 # sql/roles.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 2932fffad..173b38c5f 100644
--- a/libs/sqlalchemy/sql/schema.py
+++ b/libs/sqlalchemy/sql/schema.py
@@ -1,5 +1,5 @@
 # sql/schema.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -60,6 +60,7 @@ from . import roles
 from . import type_api
 from . import visitors
 from .base import _DefaultDescriptionTuple
+from .base import _NoArg
 from .base import _NoneName
 from .base import _SentinelColumnCharacterization
 from .base import _SentinelDefaultCharacterization
@@ -76,7 +77,6 @@ from .elements import TextClause
 from .selectable import TableClause
 from .type_api import to_instance
 from .visitors import ExternallyTraversible
-from .visitors import InternalTraversal
 from .. import event
 from .. import exc
 from .. import inspection
@@ -100,7 +100,6 @@ if typing.TYPE_CHECKING:
     from .elements import BindParameter
     from .functions import Function
     from .type_api import TypeEngine
-    from .visitors import _TraverseInternalsType
     from .visitors import anon_map
     from ..engine import Connection
     from ..engine import Engine
@@ -124,6 +123,8 @@ _ServerDefaultArgument = Union[
     "FetchedValue", str, TextClause, ColumnElement[Any]
 ]
 
+_ServerOnUpdateArgument = _ServerDefaultArgument
+
 
 class SchemaConst(Enum):
     RETAIN_SCHEMA = 1
@@ -319,9 +320,10 @@ class Table(
     e.g.::
 
         mytable = Table(
-            "mytable", metadata,
-            Column('mytable_id', Integer, primary_key=True),
-            Column('value', String(50))
+            "mytable",
+            metadata,
+            Column("mytable_id", Integer, primary_key=True),
+            Column("value", String(50)),
         )
 
     The :class:`_schema.Table`
@@ -391,11 +393,6 @@ class Table(
 
     """
 
-    _traverse_internals: _TraverseInternalsType = (
-        TableClause._traverse_internals
-        + [("schema", InternalTraversal.dp_string)]
-    )
-
     if TYPE_CHECKING:
 
         @util.ro_non_memoized_property
@@ -636,11 +633,13 @@ class Table(
             :class:`_schema.Column`
             named "y"::
 
-                Table("mytable", metadata,
-                            Column('y', Integer),
-                            extend_existing=True,
-                            autoload_with=engine
-                        )
+                Table(
+                    "mytable",
+                    metadata,
+                    Column("y", Integer),
+                    extend_existing=True,
+                    autoload_with=engine,
+                )
 
             .. seealso::
 
@@ -737,12 +736,12 @@ class Table(
                     "handle the column reflection event"
                     # ...
 
+
                 t = Table(
-                    'sometable',
+                    "sometable",
                     autoload_with=engine,
-                    listeners=[
-                        ('column_reflect', listen_for_reflect)
-                    ])
+                    listeners=[("column_reflect", listen_for_reflect)],
+                )
 
             .. seealso::
 
@@ -1349,7 +1348,7 @@ class Table(
 
             m1 = MetaData()
 
-            user = Table('user', m1, Column('id', Integer, primary_key=True))
+            user = Table("user", m1, Column("id", Integer, primary_key=True))
 
             m2 = MetaData()
             user_copy = user.to_metadata(m2)
@@ -1373,7 +1372,7 @@ class Table(
          unless
          set explicitly::
 
-            m2 = MetaData(schema='newschema')
+            m2 = MetaData(schema="newschema")
 
             # user_copy_one will have "newschema" as the schema name
             user_copy_one = user.to_metadata(m2, schema=None)
@@ -1400,15 +1399,16 @@ class Table(
 
          E.g.::
 
-                def referred_schema_fn(table, to_schema,
-                                                constraint, referred_schema):
-                    if referred_schema == 'base_tables':
+                def referred_schema_fn(table, to_schema, constraint, referred_schema):
+                    if referred_schema == "base_tables":
                         return referred_schema
                     else:
                         return to_schema
 
-                new_table = table.to_metadata(m2, schema="alt_schema",
-                                        referred_schema_fn=referred_schema_fn)
+
+                new_table = table.to_metadata(
+                    m2, schema="alt_schema", referred_schema_fn=referred_schema_fn
+                )
 
         :param name: optional string name indicating the target table name.
          If not specified or None, the table name is retained.  This allows
@@ -1416,7 +1416,7 @@ class Table(
          :class:`_schema.MetaData` target
          with a new name.
 
-        """
+        """  # noqa: E501
         if name is None:
             name = self.name
 
@@ -1438,7 +1438,7 @@ class Table(
 
         args = []
         for col in self.columns:
-            args.append(col._copy(schema=actual_schema))
+            args.append(col._copy(schema=actual_schema, _to_metadata=metadata))
         table = Table(
             name,
             metadata,
@@ -1514,7 +1514,8 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
         name: Optional[str] = None,
         type_: Optional[_TypeEngineArgument[_T]] = None,
         autoincrement: _AutoIncrementType = "auto",
-        default: Optional[Any] = None,
+        default: Optional[Any] = _NoArg.NO_ARG,
+        insert_default: Optional[Any] = _NoArg.NO_ARG,
         doc: Optional[str] = None,
         key: Optional[str] = None,
         index: Optional[bool] = None,
@@ -1526,7 +1527,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
         onupdate: Optional[Any] = None,
         primary_key: bool = False,
         server_default: Optional[_ServerDefaultArgument] = None,
-        server_onupdate: Optional[FetchedValue] = None,
+        server_onupdate: Optional[_ServerOnUpdateArgument] = None,
         quote: Optional[bool] = None,
         system: bool = False,
         comment: Optional[str] = None,
@@ -1547,7 +1548,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
           unless they are a reserved word.  Names with any number of upper
           case characters will be quoted and sent exactly.  Note that this
           behavior applies even for databases which standardize upper
-          case names as case insensitive such as Oracle.
+          case names as case insensitive such as Oracle Database.
 
           The name field may be omitted at construction time and applied
           later, at any time before the Column is associated with a
@@ -1560,10 +1561,10 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
           as well, e.g.::
 
             # use a type with arguments
-            Column('data', String(50))
+            Column("data", String(50))
 
             # use no arguments
-            Column('level', Integer)
+            Column("level", Integer)
 
           The ``type`` argument may be the second positional argument
           or specified by keyword.
@@ -1619,8 +1620,8 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
             will imply that database-specific keywords such as PostgreSQL
             ``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
-            backend always needs an explicit construct such as
+            "implied" default generator available; for example the Oracle Database
+            backends alway 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.
@@ -1665,8 +1666,12 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
 
                 # turn on autoincrement for this column despite
                 # the ForeignKey()
-                Column('id', ForeignKey('other.id'),
-                            primary_key=True, autoincrement='ignore_fk')
+                Column(
+                    "id",
+                    ForeignKey("other.id"),
+                    primary_key=True,
+                    autoincrement="ignore_fk",
+                )
 
           It is typically not desirable to have "autoincrement" enabled on a
           column that refers to another via foreign key, as such a column is
@@ -1694,7 +1699,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
               is not included as this is unnecessary and not recommended
               by the database vendor.  See the section
               :ref:`sqlite_autoincrement` for more background.
-            * Oracle - The Oracle dialect has no default "autoincrement"
+            * Oracle Database - The Oracle Database dialects have no default "autoincrement"
               feature available at this time, instead the :class:`.Identity`
               construct is recommended to achieve this (the :class:`.Sequence`
               construct may also be used).
@@ -1711,10 +1716,10 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
               (see
               `https://www.python.org/dev/peps/pep-0249/#lastrowid
               <https://www.python.org/dev/peps/pep-0249/#lastrowid>`_)
-            * PostgreSQL, SQL Server, Oracle - use RETURNING or an equivalent
+            * PostgreSQL, SQL Server, Oracle Database - use RETURNING or an equivalent
               construct when rendering an INSERT statement, and then retrieving
               the newly generated primary key values after execution
-            * PostgreSQL, Oracle for :class:`_schema.Table` objects that
+            * PostgreSQL, Oracle Database for :class:`_schema.Table` objects that
               set :paramref:`_schema.Table.implicit_returning` to False -
               for a :class:`.Sequence` only, the :class:`.Sequence` is invoked
               explicitly before the INSERT statement takes place so that the
@@ -1751,6 +1756,11 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
 
                 :ref:`metadata_defaults_toplevel`
 
+        :param insert_default: An alias of :paramref:`.Column.default`
+            for compatibility with :func:`_orm.mapped_column`.
+
+            .. versionadded: 2.0.31
+
         :param doc: optional String that can be used by the ORM or similar
             to document attributes on the Python side.   This attribute does
             **not** render SQL comments; use the
@@ -1778,7 +1788,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
                     "some_table",
                     metadata,
                     Column("x", Integer),
-                    Index("ix_some_table_x", "x")
+                    Index("ix_some_table_x", "x"),
                 )
 
             To add the :paramref:`_schema.Index.unique` flag to the
@@ -1860,14 +1870,22 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
 
             String types will be emitted as-is, surrounded by single quotes::
 
-                Column('x', Text, server_default="val")
+                Column("x", Text, server_default="val")
+
+            will render:
+
+            .. sourcecode:: sql
 
                 x TEXT DEFAULT 'val'
 
             A :func:`~sqlalchemy.sql.expression.text` expression will be
             rendered as-is, without quotes::
 
-                Column('y', DateTime, server_default=text('NOW()'))
+                Column("y", DateTime, server_default=text("NOW()"))
+
+            will render:
+
+            .. sourcecode:: sql
 
                 y DATETIME DEFAULT NOW()
 
@@ -1882,20 +1900,21 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
                 from sqlalchemy.dialects.postgresql import array
 
                 engine = create_engine(
-                    'postgresql+psycopg2://scott:tiger@localhost/mydatabase'
+                    "postgresql+psycopg2://scott:tiger@localhost/mydatabase"
                 )
                 metadata_obj = MetaData()
                 tbl = Table(
-                        "foo",
-                        metadata_obj,
-                        Column("bar",
-                               ARRAY(Text),
-                               server_default=array(["biz", "bang", "bash"])
-                               )
+                    "foo",
+                    metadata_obj,
+                    Column(
+                        "bar", ARRAY(Text), server_default=array(["biz", "bang", "bash"])
+                    ),
                 )
                 metadata_obj.create_all(engine)
 
-            The above results in a table created with the following SQL::
+            The above results in a table created with the following SQL:
+
+            .. sourcecode:: sql
 
                 CREATE TABLE foo (
                     bar TEXT[] DEFAULT ARRAY['biz', 'bang', 'bash']
@@ -1960,12 +1979,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
             :class:`_schema.UniqueConstraint` construct explicitly at the
             level of the :class:`_schema.Table` construct itself::
 
-                Table(
-                    "some_table",
-                    metadata,
-                    Column("x", Integer),
-                    UniqueConstraint("x")
-                )
+                Table("some_table", metadata, Column("x", Integer), UniqueConstraint("x"))
 
             The :paramref:`_schema.UniqueConstraint.name` parameter
             of the unique constraint object is left at its default value
@@ -2104,12 +2118,19 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
             # otherwise, add DDL-related events
             self._set_type(self.type)
 
-        if default is not None:
-            if not isinstance(default, (ColumnDefault, Sequence)):
-                default = ColumnDefault(default)
+        if insert_default is not _NoArg.NO_ARG:
+            resolved_default = insert_default
+        elif default is not _NoArg.NO_ARG:
+            resolved_default = default
+        else:
+            resolved_default = None
 
-            self.default = default
-            l_args.append(default)
+        if resolved_default is not None:
+            if not isinstance(resolved_default, (ColumnDefault, Sequence)):
+                resolved_default = ColumnDefault(resolved_default)
+
+            self.default = resolved_default
+            l_args.append(resolved_default)
         else:
             self.default = None
 
@@ -2466,6 +2487,8 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
         server_onupdate = self.server_onupdate
         if isinstance(server_default, (Computed, Identity)):
             # TODO: likely should be copied in all cases
+            # TODO: if a Sequence, we would need to transfer the Sequence
+            # .metadata as well
             args.append(server_default._copy(**kw))
             server_default = server_onupdate = None
 
@@ -2569,8 +2592,11 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
             new_onupdate = self.onupdate._copy()
             new_onupdate._set_parent(other)
 
-        if self.index and not other.index:
-            other.index = True
+        if self.index in (True, False) and other.index is None:
+            other.index = self.index
+
+        if self.unique in (True, False) and other.unique is None:
+            other.unique = self.unique
 
         if self.doc and other.doc is None:
             other.doc = self.doc
@@ -2578,9 +2604,6 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_T]):
         if self.comment and other.comment is None:
             other.comment = self.comment
 
-        if self.unique and not other.unique:
-            other.unique = True
-
         for const in self.constraints:
             if not const._type_bound:
                 new_const = const._copy()
@@ -2727,8 +2750,10 @@ class ForeignKey(DialectKWArgs, SchemaItem):
     object,
     e.g.::
 
-        t = Table("remote_table", metadata,
-            Column("remote_id", ForeignKey("main_table.id"))
+        t = Table(
+            "remote_table",
+            metadata,
+            Column("remote_id", ForeignKey("main_table.id")),
         )
 
     Note that ``ForeignKey`` is only a marker object that defines
@@ -3377,12 +3402,11 @@ class ColumnDefault(DefaultGenerator, ABC):
 
     For example, the following::
 
-        Column('foo', Integer, default=50)
+        Column("foo", Integer, default=50)
 
     Is equivalent to::
 
-        Column('foo', Integer, ColumnDefault(50))
-
+        Column("foo", Integer, ColumnDefault(50))
 
     """
 
@@ -3669,9 +3693,14 @@ class Sequence(HasSchemaAttr, IdentityOptions, DefaultGenerator):
     The :class:`.Sequence` is typically associated with a primary key column::
 
         some_table = Table(
-            'some_table', metadata,
-            Column('id', Integer, Sequence('some_table_seq', start=1),
-            primary_key=True)
+            "some_table",
+            metadata,
+            Column(
+                "id",
+                Integer,
+                Sequence("some_table_seq", start=1),
+                primary_key=True,
+            ),
         )
 
     When CREATE TABLE is emitted for the above :class:`_schema.Table`, if the
@@ -3782,11 +3811,11 @@ class Sequence(HasSchemaAttr, IdentityOptions, DefaultGenerator):
 
         :param cache: optional integer value; number of future values in the
          sequence which are calculated in advance.  Renders the CACHE keyword
-         understood by Oracle and PostgreSQL.
+         understood by Oracle Database and PostgreSQL.
 
         :param order: optional boolean value; if ``True``, renders the
-         ORDER keyword, understood by Oracle, indicating the sequence is
-         definitively ordered.   May be necessary to provide deterministic
+         ORDER keyword, understood by Oracle Database, indicating the sequence
+         is definitively ordered.   May be necessary to provide deterministic
          ordering using Oracle RAC.
 
         :param data_type: The type to be returned by the sequence, for
@@ -3947,7 +3976,7 @@ class FetchedValue(SchemaEventTarget):
 
     E.g.::
 
-        Column('foo', Integer, FetchedValue())
+        Column("foo", Integer, FetchedValue())
 
     Would indicate that some trigger or default generator
     will create a new value for the ``foo`` column during an
@@ -4013,11 +4042,11 @@ class DefaultClause(FetchedValue):
 
     For example, the following::
 
-        Column('foo', Integer, server_default="50")
+        Column("foo", Integer, server_default="50")
 
     Is equivalent to::
 
-        Column('foo', Integer, DefaultClause("50"))
+        Column("foo", Integer, DefaultClause("50"))
 
     """
 
@@ -4196,6 +4225,10 @@ class ColumnCollectionMixin:
         ] = _gather_expressions
 
         if processed_expressions is not None:
+
+            # this is expected to be an empty list
+            assert not processed_expressions
+
             self._pending_colargs = []
             for (
                 expr,
@@ -4846,11 +4879,13 @@ class PrimaryKeyConstraint(ColumnCollectionConstraint):
     :class:`_schema.Column` objects corresponding to those marked with
     the :paramref:`_schema.Column.primary_key` flag::
 
-        >>> my_table = Table('mytable', metadata,
-        ...                 Column('id', Integer, primary_key=True),
-        ...                 Column('version_id', Integer, primary_key=True),
-        ...                 Column('data', String(50))
-        ...     )
+        >>> my_table = Table(
+        ...     "mytable",
+        ...     metadata,
+        ...     Column("id", Integer, primary_key=True),
+        ...     Column("version_id", Integer, primary_key=True),
+        ...     Column("data", String(50)),
+        ... )
         >>> my_table.primary_key
         PrimaryKeyConstraint(
             Column('id', Integer(), table=<mytable>,
@@ -4864,13 +4899,14 @@ class PrimaryKeyConstraint(ColumnCollectionConstraint):
     the "name" of the constraint can also be specified, as well as other
     options which may be recognized by dialects::
 
-        my_table = Table('mytable', metadata,
-                    Column('id', Integer),
-                    Column('version_id', Integer),
-                    Column('data', String(50)),
-                    PrimaryKeyConstraint('id', 'version_id',
-                                         name='mytable_pk')
-                )
+        my_table = Table(
+            "mytable",
+            metadata,
+            Column("id", Integer),
+            Column("version_id", Integer),
+            Column("data", String(50)),
+            PrimaryKeyConstraint("id", "version_id", name="mytable_pk"),
+        )
 
     The two styles of column-specification should generally not be mixed.
     An warning is emitted if the columns present in the
@@ -4888,13 +4924,14 @@ class PrimaryKeyConstraint(ColumnCollectionConstraint):
     primary key column collection from the :class:`_schema.Table` based on the
     flags::
 
-        my_table = Table('mytable', metadata,
-                    Column('id', Integer, primary_key=True),
-                    Column('version_id', Integer, primary_key=True),
-                    Column('data', String(50)),
-                    PrimaryKeyConstraint(name='mytable_pk',
-                                         mssql_clustered=True)
-                )
+        my_table = Table(
+            "mytable",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("version_id", Integer, primary_key=True),
+            Column("data", String(50)),
+            PrimaryKeyConstraint(name="mytable_pk", mssql_clustered=True),
+        )
 
     """
 
@@ -5091,19 +5128,21 @@ class Index(
 
     E.g.::
 
-        sometable = Table("sometable", metadata,
-                        Column("name", String(50)),
-                        Column("address", String(100))
-                    )
+        sometable = Table(
+            "sometable",
+            metadata,
+            Column("name", String(50)),
+            Column("address", String(100)),
+        )
 
         Index("some_index", sometable.c.name)
 
     For a no-frills, single column index, adding
     :class:`_schema.Column` also supports ``index=True``::
 
-        sometable = Table("sometable", metadata,
-                        Column("name", String(50), index=True)
-                    )
+        sometable = Table(
+            "sometable", metadata, Column("name", String(50), index=True)
+        )
 
     For a composite index, multiple columns can be specified::
 
@@ -5122,22 +5161,26 @@ class Index(
     the names
     of the indexed columns can be specified as strings::
 
-        Table("sometable", metadata,
-                        Column("name", String(50)),
-                        Column("address", String(100)),
-                        Index("some_index", "name", "address")
-                )
+        Table(
+            "sometable",
+            metadata,
+            Column("name", String(50)),
+            Column("address", String(100)),
+            Index("some_index", "name", "address"),
+        )
 
     To support functional or expression-based indexes in this form, the
     :func:`_expression.text` construct may be used::
 
         from sqlalchemy import text
 
-        Table("sometable", metadata,
-                        Column("name", String(50)),
-                        Column("address", String(100)),
-                        Index("some_index", text("lower(name)"))
-                )
+        Table(
+            "sometable",
+            metadata,
+            Column("name", String(50)),
+            Column("address", String(100)),
+            Index("some_index", text("lower(name)")),
+        )
 
     .. seealso::
 
@@ -5616,6 +5659,38 @@ class MetaData(HasSchemaAttr):
             sorted(self.tables.values(), key=lambda t: t.key)  # type: ignore
         )
 
+    # overload needed to work around mypy this mypy
+    # https://github.com/python/mypy/issues/17093
+    @overload
+    def reflect(
+        self,
+        bind: Engine,
+        schema: Optional[str] = ...,
+        views: bool = ...,
+        only: Union[
+            _typing_Sequence[str], Callable[[str, MetaData], bool], None
+        ] = ...,
+        extend_existing: bool = ...,
+        autoload_replace: bool = ...,
+        resolve_fks: bool = ...,
+        **dialect_kwargs: Any,
+    ) -> None: ...
+
+    @overload
+    def reflect(
+        self,
+        bind: Connection,
+        schema: Optional[str] = ...,
+        views: bool = ...,
+        only: Union[
+            _typing_Sequence[str], Callable[[str, MetaData], bool], None
+        ] = ...,
+        extend_existing: bool = ...,
+        autoload_replace: bool = ...,
+        resolve_fks: bool = ...,
+        **dialect_kwargs: Any,
+    ) -> None: ...
+
     @util.preload_module("sqlalchemy.engine.reflection")
     def reflect(
         self,
@@ -5863,9 +5938,11 @@ class Computed(FetchedValue, SchemaItem):
 
         from sqlalchemy import Computed
 
-        Table('square', metadata_obj,
-            Column('side', Float, nullable=False),
-            Column('area', Float, Computed('side * side'))
+        Table(
+            "square",
+            metadata_obj,
+            Column("side", Float, nullable=False),
+            Column("area", Float, Computed("side * side")),
         )
 
     See the linked documentation below for complete details.
@@ -5970,9 +6047,11 @@ class Identity(IdentityOptions, FetchedValue, SchemaItem):
 
         from sqlalchemy import Identity
 
-        Table('foo', metadata_obj,
-            Column('id', Integer, Identity())
-            Column('description', Text),
+        Table(
+            "foo",
+            metadata_obj,
+            Column("id", Integer, Identity()),
+            Column("description", Text),
         )
 
     See the linked documentation below for complete details.
@@ -6032,7 +6111,7 @@ class Identity(IdentityOptions, FetchedValue, SchemaItem):
         :param on_null:
           Set to ``True`` to specify ON NULL in conjunction with a
           ``always=False`` identity column. This option is only supported on
-          some backends, like Oracle.
+          some backends, like Oracle Database.
 
         :param start: the starting index of the sequence.
         :param increment: the increment value of the sequence.
diff --git a/libs/sqlalchemy/sql/selectable.py b/libs/sqlalchemy/sql/selectable.py
index 65978f664..7660a1dbc 100644
--- a/libs/sqlalchemy/sql/selectable.py
+++ b/libs/sqlalchemy/sql/selectable.py
@@ -1,5 +1,5 @@
 # sql/selectable.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -392,8 +392,7 @@ class HasPrefixes:
             stmt = table.insert().prefix_with("LOW_PRIORITY", dialect="mysql")
 
             # MySQL 5.7 optimizer hints
-            stmt = select(table).prefix_with(
-                "/*+ BKA(t1) */", dialect="mysql")
+            stmt = select(table).prefix_with("/*+ BKA(t1) */", dialect="mysql")
 
         Multiple prefixes can be specified by multiple calls
         to :meth:`_expression.HasPrefixes.prefix_with`.
@@ -440,8 +439,13 @@ class HasSuffixes:
 
         E.g.::
 
-            stmt = select(col1, col2).cte().suffix_with(
-                "cycle empno set y_cycle to 1 default 0", dialect="oracle")
+            stmt = (
+                select(col1, col2)
+                .cte()
+                .suffix_with(
+                    "cycle empno set y_cycle to 1 default 0", dialect="oracle"
+                )
+            )
 
         Multiple suffixes can be specified by multiple calls
         to :meth:`_expression.HasSuffixes.suffix_with`.
@@ -473,14 +477,25 @@ class HasHints:
         ("_hints", InternalTraversal.dp_table_hint_list),
     ]
 
+    @_generative
     def with_statement_hint(self, text: str, dialect_name: str = "*") -> Self:
         """Add a statement hint to this :class:`_expression.Select` or
         other selectable object.
 
-        This method is similar to :meth:`_expression.Select.with_hint`
-        except that
-        it does not require an individual table, and instead applies to the
-        statement as a whole.
+        .. tip::
+
+            :meth:`_expression.Select.with_statement_hint` generally adds hints
+            **at the trailing end** of a SELECT statement.  To place
+            dialect-specific hints such as optimizer hints at the **front** of
+            the SELECT statement after the SELECT keyword, use the
+            :meth:`_expression.Select.prefix_with` method for an open-ended
+            space, or for table-specific hints the
+            :meth:`_expression.Select.with_hint` may be used, which places
+            hints in a dialect-specific location.
+
+        This method is similar to :meth:`_expression.Select.with_hint` except
+        that it does not require an individual table, and instead applies to
+        the statement as a whole.
 
         Hints here are specific to the backend database and may include
         directives such as isolation levels, file directives, fetch directives,
@@ -492,7 +507,7 @@ class HasHints:
 
             :meth:`_expression.Select.prefix_with` - generic SELECT prefixing
             which also can suit some database-specific HINT syntaxes such as
-            MySQL optimizer hints
+            MySQL or Oracle Database optimizer hints
 
         """
         return self._with_hint(None, text, dialect_name)
@@ -508,6 +523,17 @@ class HasHints:
         selectable to this :class:`_expression.Select` or other selectable
         object.
 
+        .. tip::
+
+            The :meth:`_expression.Select.with_hint` method adds hints that are
+            **specific to a single table** to a statement, in a location that
+            is **dialect-specific**.  To add generic optimizer hints to the
+            **beginning** of a statement ahead of the SELECT keyword such as
+            for MySQL or Oracle Database, use the
+            :meth:`_expression.Select.prefix_with` method.  To add optimizer
+            hints to the **end** of a statement such as for PostgreSQL, use the
+            :meth:`_expression.Select.with_statement_hint` method.
+
         The text of the hint is rendered in the appropriate
         location for the database backend in use, relative
         to the given :class:`_schema.Table` or :class:`_expression.Alias`
@@ -515,28 +541,33 @@ class HasHints:
         ``selectable`` argument. The dialect implementation
         typically uses Python string substitution syntax
         with the token ``%(name)s`` to render the name of
-        the table or alias. E.g. when using Oracle, the
+        the table or alias. E.g. when using Oracle Database, the
         following::
 
-            select(mytable).\
-                with_hint(mytable, "index(%(name)s ix_mytable)")
+            select(mytable).with_hint(mytable, "index(%(name)s ix_mytable)")
 
-        Would render SQL as::
+        Would render SQL as:
+
+        .. sourcecode:: sql
 
             select /*+ index(mytable ix_mytable) */ ... from mytable
 
         The ``dialect_name`` option will limit the rendering of a particular
         hint to a particular backend. Such as, to add hints for both Oracle
-        and Sybase simultaneously::
+        Database and MSSql simultaneously::
 
-            select(mytable).\
-                with_hint(mytable, "index(%(name)s ix_mytable)", 'oracle').\
-                with_hint(mytable, "WITH INDEX ix_mytable", 'mssql')
+            select(mytable).with_hint(
+                mytable, "index(%(name)s ix_mytable)", "oracle"
+            ).with_hint(mytable, "WITH INDEX ix_mytable", "mssql")
 
         .. seealso::
 
             :meth:`_expression.Select.with_statement_hint`
 
+            :meth:`_expression.Select.prefix_with` - generic SELECT prefixing
+            which also can suit some database-specific HINT syntaxes such as
+            MySQL or Oracle Database optimizer hints
+
         """
 
         return self._with_hint(selectable, text, dialect_name)
@@ -639,11 +670,14 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
 
             from sqlalchemy import join
 
-            j = user_table.join(address_table,
-                            user_table.c.id == address_table.c.user_id)
+            j = user_table.join(
+                address_table, user_table.c.id == address_table.c.user_id
+            )
             stmt = select(user_table).select_from(j)
 
-        would emit SQL along the lines of::
+        would emit SQL along the lines of:
+
+        .. sourcecode:: sql
 
             SELECT user.id, user.name FROM user
             JOIN address ON user.id = address.user_id
@@ -689,15 +723,15 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
 
             from sqlalchemy import outerjoin
 
-            j = user_table.outerjoin(address_table,
-                            user_table.c.id == address_table.c.user_id)
+            j = user_table.outerjoin(
+                address_table, user_table.c.id == address_table.c.user_id
+            )
 
         The above is equivalent to::
 
             j = user_table.join(
-                address_table,
-                user_table.c.id == address_table.c.user_id,
-                isouter=True)
+                address_table, user_table.c.id == address_table.c.user_id, isouter=True
+            )
 
         :param right: the right side of the join; this is any
          :class:`_expression.FromClause` object such as a
@@ -719,7 +753,7 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
 
             :class:`_expression.Join`
 
-        """
+        """  # noqa: E501
 
         return Join(self, right, onclause, True, full)
 
@@ -730,7 +764,7 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
 
         E.g.::
 
-            a2 = some_table.alias('a2')
+            a2 = some_table.alias("a2")
 
         The above code creates an :class:`_expression.Alias`
         object which can be used
@@ -867,7 +901,7 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
         This is the namespace that is used to resolve "filter_by()" type
         expressions, such as::
 
-            stmt.filter_by(address='some address')
+            stmt.filter_by(address="some address")
 
         It defaults to the ``.c`` collection, however internally it can
         be overridden using the "entity_namespace" annotation to deliver
@@ -1010,7 +1044,7 @@ class NamedFromClause(FromClause):
         A :class:`_sql.TableValuedColumn` is a :class:`_sql.ColumnElement` that
         represents a complete row in a table. Support for this construct is
         backend dependent, and is supported in various forms by backends
-        such as PostgreSQL, Oracle and SQL Server.
+        such as PostgreSQL, Oracle Database and SQL Server.
 
         E.g.:
 
@@ -1050,7 +1084,11 @@ class SelectLabelStyle(Enum):
         >>> from sqlalchemy import table, column, select, true, LABEL_STYLE_NONE
         >>> table1 = table("table1", column("columna"), column("columnb"))
         >>> table2 = table("table2", column("columna"), column("columnc"))
-        >>> print(select(table1, table2).join(table2, true()).set_label_style(LABEL_STYLE_NONE))
+        >>> print(
+        ...     select(table1, table2)
+        ...     .join(table2, true())
+        ...     .set_label_style(LABEL_STYLE_NONE)
+        ... )
         {printsql}SELECT table1.columna, table1.columnb, table2.columna, table2.columnc
         FROM table1 JOIN table2 ON true
 
@@ -1072,10 +1110,20 @@ class SelectLabelStyle(Enum):
 
     .. sourcecode:: pycon+sql
 
-        >>> from sqlalchemy import table, column, select, true, LABEL_STYLE_TABLENAME_PLUS_COL
+        >>> from sqlalchemy import (
+        ...     table,
+        ...     column,
+        ...     select,
+        ...     true,
+        ...     LABEL_STYLE_TABLENAME_PLUS_COL,
+        ... )
         >>> table1 = table("table1", column("columna"), column("columnb"))
         >>> table2 = table("table2", column("columna"), column("columnc"))
-        >>> print(select(table1, table2).join(table2, true()).set_label_style(LABEL_STYLE_TABLENAME_PLUS_COL))
+        >>> print(
+        ...     select(table1, table2)
+        ...     .join(table2, true())
+        ...     .set_label_style(LABEL_STYLE_TABLENAME_PLUS_COL)
+        ... )
         {printsql}SELECT table1.columna AS table1_columna, table1.columnb AS table1_columnb, table2.columna AS table2_columna, table2.columnc AS table2_columnc
         FROM table1 JOIN table2 ON true
 
@@ -1101,10 +1149,20 @@ class SelectLabelStyle(Enum):
 
     .. sourcecode:: pycon+sql
 
-        >>> from sqlalchemy import table, column, select, true, LABEL_STYLE_DISAMBIGUATE_ONLY
+        >>> from sqlalchemy import (
+        ...     table,
+        ...     column,
+        ...     select,
+        ...     true,
+        ...     LABEL_STYLE_DISAMBIGUATE_ONLY,
+        ... )
         >>> table1 = table("table1", column("columna"), column("columnb"))
         >>> table2 = table("table2", column("columna"), column("columnc"))
-        >>> print(select(table1, table2).join(table2, true()).set_label_style(LABEL_STYLE_DISAMBIGUATE_ONLY))
+        >>> print(
+        ...     select(table1, table2)
+        ...     .join(table2, true())
+        ...     .set_label_style(LABEL_STYLE_DISAMBIGUATE_ONLY)
+        ... )
         {printsql}SELECT table1.columna, table1.columnb, table2.columna AS columna_1, table2.columnc
         FROM table1 JOIN table2 ON true
 
@@ -1242,7 +1300,6 @@ class Join(roles.DMLTableRole, FromClause):
     def self_group(
         self, against: Optional[OperatorType] = None
     ) -> FromGrouping:
-        ...
         return FromGrouping(self)
 
     @util.preload_module("sqlalchemy.sql.util")
@@ -1503,7 +1560,9 @@ class Join(roles.DMLTableRole, FromClause):
 
             stmt = stmt.select()
 
-        The above will produce a SQL string resembling::
+        The above will produce a SQL string resembling:
+
+        .. sourcecode:: sql
 
             SELECT table_a.id, table_a.col, table_b.id, table_b.a_id
             FROM table_a JOIN table_b ON table_a.id = table_b.a_id
@@ -1517,11 +1576,23 @@ class Join(roles.DMLTableRole, FromClause):
     ) -> TODO_Any:
         sqlutil = util.preloaded.sql_util
         if flat:
-            if name is not None:
-                raise exc.ArgumentError("Can't send name argument with flat")
+            if isinstance(self.left, (FromGrouping, Join)):
+                left_name = name  # will recurse
+            else:
+                if name and isinstance(self.left, NamedFromClause):
+                    left_name = f"{name}_{self.left.name}"
+                else:
+                    left_name = name
+            if isinstance(self.right, (FromGrouping, Join)):
+                right_name = name  # will recurse
+            else:
+                if name and isinstance(self.right, NamedFromClause):
+                    right_name = f"{name}_{self.right.name}"
+                else:
+                    right_name = name
             left_a, right_a = (
-                self.left._anonymous_fromclause(flat=True),
-                self.right._anonymous_fromclause(flat=True),
+                self.left._anonymous_fromclause(name=left_name, flat=flat),
+                self.right._anonymous_fromclause(name=right_name, flat=flat),
             )
             adapter = sqlutil.ClauseAdapter(left_a).chain(
                 sqlutil.ClauseAdapter(right_a)
@@ -1683,7 +1754,7 @@ class Alias(roles.DMLTableRole, FromClauseAlias):
 
     Represents an alias, as typically applied to any table or
     sub-select within a SQL statement using the ``AS`` keyword (or
-    without the keyword on certain databases such as Oracle).
+    without the keyword on certain databases such as Oracle Database).
 
     This object is constructed from the :func:`_expression.alias` module
     level function as well as the :meth:`_expression.FromClause.alias`
@@ -1725,7 +1796,9 @@ class TableValuedAlias(LateralFromClause, Alias):
     .. sourcecode:: pycon+sql
 
         >>> from sqlalchemy import select, func
-        >>> fn = func.json_array_elements_text('["one", "two", "three"]').table_valued("value")
+        >>> fn = func.json_array_elements_text('["one", "two", "three"]').table_valued(
+        ...     "value"
+        ... )
         >>> print(select(fn.c.value))
         {printsql}SELECT anon_1.value
         FROM json_array_elements_text(:json_array_elements_text_1) AS anon_1
@@ -1844,8 +1917,9 @@ class TableValuedAlias(LateralFromClause, Alias):
 
             >>> print(
             ...     select(
-            ...         func.unnest(array(["one", "two", "three"])).
-                        table_valued("x", with_ordinality="o").render_derived()
+            ...         func.unnest(array(["one", "two", "three"]))
+            ...         .table_valued("x", with_ordinality="o")
+            ...         .render_derived()
             ...     )
             ... )
             {printsql}SELECT anon_1.x, anon_1.o
@@ -1859,9 +1933,7 @@ class TableValuedAlias(LateralFromClause, Alias):
 
             >>> print(
             ...     select(
-            ...         func.json_to_recordset(
-            ...             '[{"a":1,"b":"foo"},{"a":"2","c":"bar"}]'
-            ...         )
+            ...         func.json_to_recordset('[{"a":1,"b":"foo"},{"a":"2","c":"bar"}]')
             ...         .table_valued(column("a", Integer), column("b", String))
             ...         .render_derived(with_types=True)
             ...     )
@@ -2418,16 +2490,20 @@ class HasCTE(roles.HasCTERole, SelectsRows):
         E.g.::
 
             from sqlalchemy import table, column, select
-            t = table('t', column('c1'), column('c2'))
+
+            t = table("t", column("c1"), column("c2"))
 
             ins = t.insert().values({"c1": "x", "c2": "y"}).cte()
 
             stmt = select(t).add_cte(ins)
 
-        Would render::
+        Would render:
 
-            WITH anon_1 AS
-            (INSERT INTO t (c1, c2) VALUES (:param_1, :param_2))
+        .. sourcecode:: sql
+
+            WITH anon_1 AS (
+                INSERT INTO t (c1, c2) VALUES (:param_1, :param_2)
+            )
             SELECT t.c1, t.c2
             FROM t
 
@@ -2443,9 +2519,7 @@ class HasCTE(roles.HasCTERole, SelectsRows):
 
             t = table("t", column("c1"), column("c2"))
 
-            delete_statement_cte = (
-                t.delete().where(t.c.c1 < 1).cte("deletions")
-            )
+            delete_statement_cte = t.delete().where(t.c.c1 < 1).cte("deletions")
 
             insert_stmt = insert(t).values({"c1": 1, "c2": 2})
             update_statement = insert_stmt.on_conflict_do_update(
@@ -2458,10 +2532,13 @@ class HasCTE(roles.HasCTERole, SelectsRows):
 
             print(update_statement)
 
-        The above statement renders as::
+        The above statement renders as:
 
-            WITH deletions AS
-            (DELETE FROM t WHERE t.c1 < %(c1_1)s)
+        .. sourcecode:: sql
+
+            WITH deletions AS (
+                DELETE FROM t WHERE t.c1 < %(c1_1)s
+            )
             INSERT INTO t (c1, c2) VALUES (%(c1)s, %(c2)s)
             ON CONFLICT (c1) DO UPDATE SET c1 = excluded.c1, c2 = excluded.c2
 
@@ -2485,10 +2562,8 @@ class HasCTE(roles.HasCTERole, SelectsRows):
             :paramref:`.HasCTE.cte.nesting`
 
 
-        """
-        opt = _CTEOpts(
-            nest_here,
-        )
+        """  # noqa: E501
+        opt = _CTEOpts(nest_here)
         for cte in ctes:
             cte = coercions.expect(roles.IsCTERole, cte)
             self._independent_ctes += (cte,)
@@ -2556,95 +2631,123 @@ class HasCTE(roles.HasCTERole, SelectsRows):
 
         Example 1, non recursive::
 
-            from sqlalchemy import (Table, Column, String, Integer,
-                                    MetaData, select, func)
+            from sqlalchemy import (
+                Table,
+                Column,
+                String,
+                Integer,
+                MetaData,
+                select,
+                func,
+            )
 
             metadata = MetaData()
 
-            orders = Table('orders', metadata,
-                Column('region', String),
-                Column('amount', Integer),
-                Column('product', String),
-                Column('quantity', Integer)
+            orders = Table(
+                "orders",
+                metadata,
+                Column("region", String),
+                Column("amount", Integer),
+                Column("product", String),
+                Column("quantity", Integer),
             )
 
-            regional_sales = select(
-                                orders.c.region,
-                                func.sum(orders.c.amount).label('total_sales')
-                            ).group_by(orders.c.region).cte("regional_sales")
+            regional_sales = (
+                select(orders.c.region, func.sum(orders.c.amount).label("total_sales"))
+                .group_by(orders.c.region)
+                .cte("regional_sales")
+            )
 
 
-            top_regions = select(regional_sales.c.region).\
-                    where(
-                        regional_sales.c.total_sales >
-                        select(
-                            func.sum(regional_sales.c.total_sales) / 10
-                        )
-                    ).cte("top_regions")
+            top_regions = (
+                select(regional_sales.c.region)
+                .where(
+                    regional_sales.c.total_sales
+                    > select(func.sum(regional_sales.c.total_sales) / 10)
+                )
+                .cte("top_regions")
+            )
 
-            statement = select(
-                        orders.c.region,
-                        orders.c.product,
-                        func.sum(orders.c.quantity).label("product_units"),
-                        func.sum(orders.c.amount).label("product_sales")
-                ).where(orders.c.region.in_(
-                    select(top_regions.c.region)
-                )).group_by(orders.c.region, orders.c.product)
+            statement = (
+                select(
+                    orders.c.region,
+                    orders.c.product,
+                    func.sum(orders.c.quantity).label("product_units"),
+                    func.sum(orders.c.amount).label("product_sales"),
+                )
+                .where(orders.c.region.in_(select(top_regions.c.region)))
+                .group_by(orders.c.region, orders.c.product)
+            )
 
             result = conn.execute(statement).fetchall()
 
         Example 2, WITH RECURSIVE::
 
-            from sqlalchemy import (Table, Column, String, Integer,
-                                    MetaData, select, func)
+            from sqlalchemy import (
+                Table,
+                Column,
+                String,
+                Integer,
+                MetaData,
+                select,
+                func,
+            )
 
             metadata = MetaData()
 
-            parts = Table('parts', metadata,
-                Column('part', String),
-                Column('sub_part', String),
-                Column('quantity', Integer),
+            parts = Table(
+                "parts",
+                metadata,
+                Column("part", String),
+                Column("sub_part", String),
+                Column("quantity", Integer),
             )
 
-            included_parts = select(\
-                parts.c.sub_part, parts.c.part, parts.c.quantity\
-                ).\
-                where(parts.c.part=='our part').\
-                cte(recursive=True)
+            included_parts = (
+                select(parts.c.sub_part, parts.c.part, parts.c.quantity)
+                .where(parts.c.part == "our part")
+                .cte(recursive=True)
+            )
 
 
             incl_alias = included_parts.alias()
             parts_alias = parts.alias()
             included_parts = included_parts.union_all(
                 select(
-                    parts_alias.c.sub_part,
-                    parts_alias.c.part,
-                    parts_alias.c.quantity
-                ).\
-                where(parts_alias.c.part==incl_alias.c.sub_part)
+                    parts_alias.c.sub_part, parts_alias.c.part, parts_alias.c.quantity
+                ).where(parts_alias.c.part == incl_alias.c.sub_part)
             )
 
             statement = select(
-                        included_parts.c.sub_part,
-                        func.sum(included_parts.c.quantity).
-                          label('total_quantity')
-                    ).\
-                    group_by(included_parts.c.sub_part)
+                included_parts.c.sub_part,
+                func.sum(included_parts.c.quantity).label("total_quantity"),
+            ).group_by(included_parts.c.sub_part)
 
             result = conn.execute(statement).fetchall()
 
         Example 3, an upsert using UPDATE and INSERT with CTEs::
 
             from datetime import date
-            from sqlalchemy import (MetaData, Table, Column, Integer,
-                                    Date, select, literal, and_, exists)
+            from sqlalchemy import (
+                MetaData,
+                Table,
+                Column,
+                Integer,
+                Date,
+                select,
+                literal,
+                and_,
+                exists,
+            )
 
             metadata = MetaData()
 
-            visitors = Table('visitors', metadata,
-                Column('product_id', Integer, primary_key=True),
-                Column('date', Date, primary_key=True),
-                Column('count', Integer),
+            visitors = Table(
+                "visitors",
+                metadata,
+                Column("product_id", Integer, primary_key=True),
+                Column("date", Date, primary_key=True),
+                Column("count", Integer),
             )
 
             # add 5 visitors for the product_id == 1
@@ -2654,31 +2757,31 @@ class HasCTE(roles.HasCTERole, SelectsRows):
 
             update_cte = (
                 visitors.update()
-                .where(and_(visitors.c.product_id == product_id,
-                            visitors.c.date == day))
+                .where(
+                    and_(visitors.c.product_id == product_id, visitors.c.date == day)
+                )
                 .values(count=visitors.c.count + count)
                 .returning(literal(1))
-                .cte('update_cte')
+                .cte("update_cte")
             )
 
             upsert = visitors.insert().from_select(
                 [visitors.c.product_id, visitors.c.date, visitors.c.count],
-                select(literal(product_id), literal(day), literal(count))
-                    .where(~exists(update_cte.select()))
+                select(literal(product_id), literal(day), literal(count)).where(
+                    ~exists(update_cte.select())
+                ),
             )
 
             connection.execute(upsert)
 
         Example 4, Nesting CTE (SQLAlchemy 1.4.24 and above)::
 
-            value_a = select(
-                literal("root").label("n")
-            ).cte("value_a")
+            value_a = select(literal("root").label("n")).cte("value_a")
 
             # A nested CTE with the same name as the root one
-            value_a_nested = select(
-                literal("nesting").label("n")
-            ).cte("value_a", nesting=True)
+            value_a_nested = select(literal("nesting").label("n")).cte(
+                "value_a", nesting=True
+            )
 
             # Nesting CTEs takes ascendency locally
             # over the CTEs at a higher level
@@ -2687,7 +2790,9 @@ class HasCTE(roles.HasCTERole, SelectsRows):
             value_ab = select(value_a.c.n.label("a"), value_b.c.n.label("b"))
 
         The above query will render the second CTE nested inside the first,
-        shown with inline parameters below as::
+        shown with inline parameters below as:
+
+        .. sourcecode:: sql
 
             WITH
                 value_a AS
@@ -2702,21 +2807,17 @@ class HasCTE(roles.HasCTERole, SelectsRows):
         The same CTE can be set up using the :meth:`.HasCTE.add_cte` method
         as follows (SQLAlchemy 2.0 and above)::
 
-            value_a = select(
-                literal("root").label("n")
-            ).cte("value_a")
+            value_a = select(literal("root").label("n")).cte("value_a")
 
             # A nested CTE with the same name as the root one
-            value_a_nested = select(
-                literal("nesting").label("n")
-            ).cte("value_a")
+            value_a_nested = select(literal("nesting").label("n")).cte("value_a")
 
             # Nesting CTEs takes ascendency locally
             # over the CTEs at a higher level
             value_b = (
-                select(value_a_nested.c.n).
-                add_cte(value_a_nested, nest_here=True).
-                cte("value_b")
+                select(value_a_nested.c.n)
+                .add_cte(value_a_nested, nest_here=True)
+                .cte("value_b")
             )
 
             value_ab = select(value_a.c.n.label("a"), value_b.c.n.label("b"))
@@ -2731,9 +2832,7 @@ class HasCTE(roles.HasCTERole, SelectsRows):
                 Column("right", Integer),
             )
 
-            root_node = select(literal(1).label("node")).cte(
-                "nodes", recursive=True
-            )
+            root_node = select(literal(1).label("node")).cte("nodes", recursive=True)
 
             left_edge = select(edge.c.left).join(
                 root_node, edge.c.right == root_node.c.node
@@ -2746,7 +2845,9 @@ class HasCTE(roles.HasCTERole, SelectsRows):
 
             subgraph = select(subgraph_cte)
 
-        The above query will render 2 UNIONs inside the recursive CTE::
+        The above query will render 2 UNIONs inside the recursive CTE:
+
+        .. sourcecode:: sql
 
             WITH RECURSIVE nodes(node) AS (
                     SELECT 1 AS node
@@ -2764,7 +2865,7 @@ class HasCTE(roles.HasCTERole, SelectsRows):
             :meth:`_orm.Query.cte` - ORM version of
             :meth:`_expression.HasCTE.cte`.
 
-        """
+        """  # noqa: E501
         return CTE._construct(
             self, name=name, recursive=recursive, nesting=nesting
         )
@@ -2889,6 +2990,12 @@ class FromGrouping(GroupedElement, FromClause):
     def __setstate__(self, state: Dict[str, FromClause]) -> None:
         self.element = state["element"]
 
+    if TYPE_CHECKING:
+
+        def self_group(
+            self, against: Optional[OperatorType] = None
+        ) -> Self: ...
+
 
 class NamedFromGrouping(FromGrouping, NamedFromClause):
     """represent a grouping of a named FROM clause
@@ -2899,6 +3006,12 @@ class NamedFromGrouping(FromGrouping, NamedFromClause):
 
     inherit_cache = True
 
+    if TYPE_CHECKING:
+
+        def self_group(
+            self, against: Optional[OperatorType] = None
+        ) -> Self: ...
+
 
 class TableClause(roles.DMLTableRole, Immutable, NamedFromClause):
     """Represents a minimal "table" construct.
@@ -2909,10 +3022,11 @@ class TableClause(roles.DMLTableRole, Immutable, NamedFromClause):
 
         from sqlalchemy import table, column
 
-        user = table("user",
-                column("id"),
-                column("name"),
-                column("description"),
+        user = table(
+            "user",
+            column("id"),
+            column("name"),
+            column("description"),
         )
 
     The :class:`_expression.TableClause` construct serves as the base for
@@ -3018,7 +3132,7 @@ class TableClause(roles.DMLTableRole, Immutable, NamedFromClause):
 
         E.g.::
 
-            table.insert().values(name='foo')
+            table.insert().values(name="foo")
 
         See :func:`_expression.insert` for argument and usage information.
 
@@ -3033,7 +3147,7 @@ class TableClause(roles.DMLTableRole, Immutable, NamedFromClause):
 
         E.g.::
 
-            table.update().where(table.c.id==7).values(name='foo')
+            table.update().where(table.c.id == 7).values(name="foo")
 
         See :func:`_expression.update` for argument and usage information.
 
@@ -3049,7 +3163,7 @@ class TableClause(roles.DMLTableRole, Immutable, NamedFromClause):
 
         E.g.::
 
-            table.delete().where(table.c.id==7)
+            table.delete().where(table.c.id == 7)
 
         See :func:`_expression.delete` for argument and usage information.
 
@@ -3070,6 +3184,7 @@ class ForUpdateArg(ClauseElement):
         ("nowait", InternalTraversal.dp_boolean),
         ("read", InternalTraversal.dp_boolean),
         ("skip_locked", InternalTraversal.dp_boolean),
+        ("key_share", InternalTraversal.dp_boolean),
     ]
 
     of: Optional[Sequence[ClauseElement]]
@@ -3236,7 +3351,7 @@ class Values(roles.InElementRole, Generative, LateralFromClause):
 
         E.g.::
 
-            my_values = my_values.data([(1, 'value 1'), (2, 'value2')])
+            my_values = my_values.data([(1, "value 1"), (2, "value2")])
 
         :param values: a sequence (i.e. list) of tuples that map to the
          column expressions given in the :class:`_expression.Values`
@@ -3312,6 +3427,12 @@ class ScalarValues(roles.InElementRole, GroupedElement, ColumnElement[Any]):
     def __clause_element__(self) -> ScalarValues:
         return self
 
+    if TYPE_CHECKING:
+
+        def self_group(
+            self, against: Optional[OperatorType] = None
+        ) -> Self: ...
+
 
 class SelectBase(
     roles.SelectStatementRole,
@@ -3575,7 +3696,9 @@ class SelectBase(
 
             stmt = select(table.c.id, table.c.name)
 
-        The above statement might look like::
+        The above statement might look like:
+
+        .. sourcecode:: sql
 
             SELECT table.id, table.name FROM table
 
@@ -3586,7 +3709,9 @@ class SelectBase(
             subq = stmt.subquery()
             new_stmt = select(subq)
 
-        The above renders as::
+        The above renders as:
+
+        .. sourcecode:: sql
 
             SELECT anon_1.id, anon_1.name
             FROM (SELECT table.id, table.name FROM table) AS anon_1
@@ -3651,7 +3776,7 @@ class SelectStatementGrouping(GroupedElement, SelectBase, Generic[_SB]):
     __visit_name__ = "select_statement_grouping"
     _traverse_internals: _TraverseInternalsType = [
         ("element", InternalTraversal.dp_clauseelement)
-    ]
+    ] + SupportsCloneAnnotations._clone_annotations_traverse_internals
 
     _is_select_container = True
 
@@ -3684,7 +3809,6 @@ class SelectStatementGrouping(GroupedElement, SelectBase, Generic[_SB]):
         return self.element
 
     def self_group(self, against: Optional[OperatorType] = None) -> Self:
-        ...
         return self
 
     if TYPE_CHECKING:
@@ -3732,6 +3856,10 @@ class SelectStatementGrouping(GroupedElement, SelectBase, Generic[_SB]):
     def _from_objects(self) -> List[FromClause]:
         return self.element._from_objects
 
+    def add_cte(self, *ctes: CTE, nest_here: bool = False) -> Self:
+        # SelectStatementGrouping not generative: has no attribute '_generate'
+        raise NotImplementedError
+
 
 class GenerativeSelect(SelectBase, Generative):
     """Base class for SELECT statements where additional elements can be
@@ -3777,13 +3905,17 @@ class GenerativeSelect(SelectBase, Generative):
 
             stmt = select(table).with_for_update(nowait=True)
 
-        On a database like PostgreSQL or Oracle, the above would render a
-        statement like::
+        On a database like PostgreSQL or Oracle Database, the above would
+        render a statement like:
+
+        .. sourcecode:: sql
 
             SELECT table.a, table.b FROM table FOR UPDATE NOWAIT
 
         on other backends, the ``nowait`` option is ignored and instead
-        would produce::
+        would produce:
+
+        .. sourcecode:: sql
 
             SELECT table.a, table.b FROM table FOR UPDATE
 
@@ -3793,7 +3925,7 @@ class GenerativeSelect(SelectBase, Generative):
         variants.
 
         :param nowait: boolean; will render ``FOR UPDATE NOWAIT`` on Oracle
-         and PostgreSQL dialects.
+         Database and PostgreSQL dialects.
 
         :param read: boolean; will render ``LOCK IN SHARE MODE`` on MySQL,
          ``FOR SHARE`` on PostgreSQL.  On PostgreSQL, when combined with
@@ -3802,13 +3934,13 @@ class GenerativeSelect(SelectBase, Generative):
         :param of: SQL expression or list of SQL expression elements,
          (typically :class:`_schema.Column` objects or a compatible expression,
          for some backends may also be a table expression) which will render
-         into a ``FOR UPDATE OF`` clause; supported by PostgreSQL, Oracle, some
-         MySQL versions and possibly others. May render as a table or as a
-         column depending on backend.
+         into a ``FOR UPDATE OF`` clause; supported by PostgreSQL, Oracle
+         Database, some MySQL versions and possibly others. May render as a
+         table or as a column depending on backend.
 
-        :param skip_locked: boolean, will render ``FOR UPDATE SKIP LOCKED``
-         on Oracle and PostgreSQL dialects or ``FOR SHARE SKIP LOCKED`` if
-         ``read=True`` is also specified.
+        :param skip_locked: boolean, will render ``FOR UPDATE SKIP LOCKED`` on
+         Oracle Database and PostgreSQL dialects or ``FOR SHARE SKIP LOCKED``
+         if ``read=True`` is also specified.
 
         :param key_share: boolean, will render ``FOR NO KEY UPDATE``,
          or if combined with ``read=True`` will render ``FOR KEY SHARE``,
@@ -3840,7 +3972,7 @@ class GenerativeSelect(SelectBase, Generative):
         :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DISAMBIGUATE_ONLY`,
         :attr:`_sql.SelectLabelStyle.LABEL_STYLE_TABLENAME_PLUS_COL`, and
         :attr:`_sql.SelectLabelStyle.LABEL_STYLE_NONE`.   The default style is
-        :attr:`_sql.SelectLabelStyle.LABEL_STYLE_TABLENAME_PLUS_COL`.
+        :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DISAMBIGUATE_ONLY`.
 
         In modern SQLAlchemy, there is not generally a need to change the
         labeling style, as per-expression labels are more effectively used by
@@ -4014,10 +4146,10 @@ class GenerativeSelect(SelectBase, Generative):
         """Return a new selectable with the given FETCH FIRST criterion
         applied.
 
-        This is a numeric value which usually renders as
-        ``FETCH {FIRST | NEXT} [ count ] {ROW | ROWS} {ONLY | WITH TIES}``
-        expression in the resulting select. This functionality is
-        is currently implemented for Oracle, PostgreSQL, MSSQL.
+        This is a numeric value which usually renders as ``FETCH {FIRST | NEXT}
+        [ count ] {ROW | ROWS} {ONLY | WITH TIES}`` expression in the resulting
+        select. This functionality is is currently implemented for Oracle
+        Database, PostgreSQL, MSSQL.
 
         Use :meth:`_sql.GenerativeSelect.offset` to specify the offset.
 
@@ -4101,7 +4233,7 @@ class GenerativeSelect(SelectBase, Generative):
 
         For example, ::
 
-            stmt = select(User).order_by(User).id.slice(1, 3)
+            stmt = select(User).order_by(User.id).slice(1, 3)
 
         renders as
 
@@ -4200,8 +4332,7 @@ class GenerativeSelect(SelectBase, Generative):
 
         e.g.::
 
-            stmt = select(table.c.name, func.max(table.c.stat)).\
-            group_by(table.c.name)
+            stmt = select(table.c.name, func.max(table.c.stat)).group_by(table.c.name)
 
         :param \*clauses: a series of :class:`_expression.ColumnElement`
          constructs
@@ -4214,7 +4345,7 @@ class GenerativeSelect(SelectBase, Generative):
 
             :ref:`tutorial_order_by_label` - in the :ref:`unified_tutorial`
 
-        """
+        """  # noqa: E501
 
         if not clauses and __first is None:
             self._group_by_clauses = ()
@@ -4277,17 +4408,21 @@ class CompoundSelect(HasCompileState, GenerativeSelect, ExecutableReturnsRows):
 
     __visit_name__ = "compound_select"
 
-    _traverse_internals: _TraverseInternalsType = [
-        ("selects", InternalTraversal.dp_clauseelement_list),
-        ("_limit_clause", InternalTraversal.dp_clauseelement),
-        ("_offset_clause", InternalTraversal.dp_clauseelement),
-        ("_fetch_clause", InternalTraversal.dp_clauseelement),
-        ("_fetch_clause_options", InternalTraversal.dp_plain_dict),
-        ("_order_by_clauses", InternalTraversal.dp_clauseelement_list),
-        ("_group_by_clauses", InternalTraversal.dp_clauseelement_list),
-        ("_for_update_arg", InternalTraversal.dp_clauseelement),
-        ("keyword", InternalTraversal.dp_string),
-    ] + SupportsCloneAnnotations._clone_annotations_traverse_internals
+    _traverse_internals: _TraverseInternalsType = (
+        [
+            ("selects", InternalTraversal.dp_clauseelement_list),
+            ("_limit_clause", InternalTraversal.dp_clauseelement),
+            ("_offset_clause", InternalTraversal.dp_clauseelement),
+            ("_fetch_clause", InternalTraversal.dp_clauseelement),
+            ("_fetch_clause_options", InternalTraversal.dp_plain_dict),
+            ("_order_by_clauses", InternalTraversal.dp_clauseelement_list),
+            ("_group_by_clauses", InternalTraversal.dp_clauseelement_list),
+            ("_for_update_arg", InternalTraversal.dp_clauseelement),
+            ("keyword", InternalTraversal.dp_string),
+        ]
+        + SupportsCloneAnnotations._clone_annotations_traverse_internals
+        + HasCTE._has_ctes_traverse_internals
+    )
 
     selects: List[SelectBase]
 
@@ -4547,6 +4682,7 @@ class SelectState(util.MemoizedSlots, CompileState):
         cls, label_style: SelectLabelStyle
     ) -> _LabelConventionCallable:
         table_qualified = label_style is LABEL_STYLE_TABLENAME_PLUS_COL
+
         dedupe = label_style is not LABEL_STYLE_NONE
 
         pa = prefix_anon_map()
@@ -5282,11 +5418,17 @@ class Select(
 
         E.g.::
 
-            stmt = select(user_table).join(address_table, user_table.c.id == address_table.c.user_id)
+            stmt = select(user_table).join(
+                address_table, user_table.c.id == address_table.c.user_id
+            )
 
-        The above statement generates SQL similar to::
+        The above statement generates SQL similar to:
 
-            SELECT user.id, user.name FROM user JOIN address ON user.id = address.user_id
+        .. sourcecode:: sql
+
+            SELECT user.id, user.name
+            FROM user
+            JOIN address ON user.id = address.user_id
 
         .. versionchanged:: 1.4 :meth:`_expression.Select.join` now creates
            a :class:`_sql.Join` object between a :class:`_sql.FromClause`
@@ -5390,7 +5532,9 @@ class Select(
                 user_table, address_table, user_table.c.id == address_table.c.user_id
             )
 
-        The above statement generates SQL similar to::
+        The above statement generates SQL similar to:
+
+        .. sourcecode:: sql
 
             SELECT user.id, user.name, address.id, address.email, address.user_id
             FROM user JOIN address ON user.id = address.user_id
@@ -5755,22 +5899,33 @@ class Select(
         )
         return woc
 
-    # START OVERLOADED FUNCTIONS self.with_only_columns Select 8
+    # START OVERLOADED FUNCTIONS self.with_only_columns Select 1-8 ", *, maintain_column_froms: bool =..." # noqa: E501
 
     # code within this block is **programmatically,
-    # statically generated** by tools/generate_sel_v1_overloads.py
-
-    @overload
-    def with_only_columns(self, __ent0: _TCCA[_T0]) -> Select[Tuple[_T0]]: ...
+    # statically generated** by tools/generate_tuple_map_overloads.py
 
     @overload
     def with_only_columns(
-        self, __ent0: _TCCA[_T0], __ent1: _TCCA[_T1]
+        self, __ent0: _TCCA[_T0], *, maintain_column_froms: bool = ...
+    ) -> Select[Tuple[_T0]]: ...
+
+    @overload
+    def with_only_columns(
+        self,
+        __ent0: _TCCA[_T0],
+        __ent1: _TCCA[_T1],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1]]: ...
 
     @overload
     def with_only_columns(
-        self, __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], __ent2: _TCCA[_T2]
+        self,
+        __ent0: _TCCA[_T0],
+        __ent1: _TCCA[_T1],
+        __ent2: _TCCA[_T2],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2]]: ...
 
     @overload
@@ -5780,6 +5935,8 @@ class Select(
         __ent1: _TCCA[_T1],
         __ent2: _TCCA[_T2],
         __ent3: _TCCA[_T3],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2, _T3]]: ...
 
     @overload
@@ -5790,6 +5947,8 @@ class Select(
         __ent2: _TCCA[_T2],
         __ent3: _TCCA[_T3],
         __ent4: _TCCA[_T4],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2, _T3, _T4]]: ...
 
     @overload
@@ -5801,6 +5960,8 @@ class Select(
         __ent3: _TCCA[_T3],
         __ent4: _TCCA[_T4],
         __ent5: _TCCA[_T5],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2, _T3, _T4, _T5]]: ...
 
     @overload
@@ -5813,6 +5974,8 @@ class Select(
         __ent4: _TCCA[_T4],
         __ent5: _TCCA[_T5],
         __ent6: _TCCA[_T6],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2, _T3, _T4, _T5, _T6]]: ...
 
     @overload
@@ -5826,6 +5989,8 @@ class Select(
         __ent5: _TCCA[_T5],
         __ent6: _TCCA[_T6],
         __ent7: _TCCA[_T7],
+        *,
+        maintain_column_froms: bool = ...,
     ) -> Select[Tuple[_T0, _T1, _T2, _T3, _T4, _T5, _T6, _T7]]: ...
 
     # END OVERLOADED FUNCTIONS self.with_only_columns
@@ -5972,11 +6137,29 @@ class Select(
     @_generative
     def distinct(self, *expr: _ColumnExpressionArgument[Any]) -> Self:
         r"""Return a new :func:`_expression.select` construct which
-        will apply DISTINCT to its columns clause.
+        will apply DISTINCT to the SELECT statement overall.
+
+        E.g.::
+
+            from sqlalchemy import select
+
+            stmt = select(users_table.c.id, users_table.c.name).distinct()
+
+        The above would produce an statement resembling:
+
+        .. sourcecode:: sql
+
+            SELECT DISTINCT user.id, user.name FROM user
+
+        The method also accepts an ``*expr`` parameter which produces the
+        PostgreSQL dialect-specific ``DISTINCT ON`` expression.  Using this
+        parameter on other backends which don't support this syntax will
+        raise an error.
 
         :param \*expr: optional column expressions.  When present,
-         the PostgreSQL dialect will render a ``DISTINCT ON (<expressions>>)``
-         construct.
+         the PostgreSQL dialect will render a ``DISTINCT ON (<expressions>)``
+         construct.  A deprecation warning and/or :class:`_exc.CompileError`
+         will be raised on other backends.
 
          .. deprecated:: 1.4 Using \*expr in other dialects is deprecated
             and will raise :class:`_exc.CompileError` in a future version.
@@ -6000,12 +6183,11 @@ class Select(
 
         E.g.::
 
-            table1 = table('t1', column('a'))
-            table2 = table('t2', column('b'))
-            s = select(table1.c.a).\
-                select_from(
-                    table1.join(table2, table1.c.a==table2.c.b)
-                )
+            table1 = table("t1", column("a"))
+            table2 = table("t2", column("b"))
+            s = select(table1.c.a).select_from(
+                table1.join(table2, table1.c.a == table2.c.b)
+            )
 
         The "from" list is a unique set on the identity of each element,
         so adding an already present :class:`_schema.Table`
@@ -6024,7 +6206,7 @@ class Select(
         if desired, in the case that the FROM clause cannot be fully
         derived from the columns clause::
 
-            select(func.count('*')).select_from(table1)
+            select(func.count("*")).select_from(table1)
 
         """
 
@@ -6177,8 +6359,8 @@ class Select(
         :class:`_expression.ColumnElement` objects are directly present as they
         were given, e.g.::
 
-            col1 = column('q', Integer)
-            col2 = column('p', Integer)
+            col1 = column("q", Integer)
+            col2 = column("p", Integer)
             stmt = select(col1, col2)
 
         Above, ``stmt.selected_columns`` would be a collection that contains
@@ -6193,7 +6375,8 @@ class Select(
         criteria, e.g.::
 
             def filter_on_id(my_select, id):
-                return my_select.where(my_select.selected_columns['id'] == id)
+                return my_select.where(my_select.selected_columns["id"] == id)
+
 
             stmt = select(MyModel)
 
@@ -6308,7 +6491,6 @@ class Select(
     def self_group(
         self, against: Optional[OperatorType] = None
     ) -> Union[SelectStatementGrouping[Self], Self]:
-        ...
         """Return a 'grouping' construct as per the
         :class:`_expression.ClauseElement` specification.
 
@@ -6500,19 +6682,7 @@ class ScalarSelect(
         self.element = cast("Select[Any]", self.element).where(crit)
         return self
 
-    @overload
-    def self_group(
-        self: ScalarSelect[Any], against: Optional[OperatorType] = None
-    ) -> ScalarSelect[Any]: ...
-
-    @overload
-    def self_group(
-        self: ColumnElement[Any], against: Optional[OperatorType] = None
-    ) -> ColumnElement[Any]: ...
-
-    def self_group(
-        self, against: Optional[OperatorType] = None
-    ) -> ColumnElement[Any]:
+    def self_group(self, against: Optional[OperatorType] = None) -> Self:
         return self
 
     if TYPE_CHECKING:
@@ -6648,14 +6818,16 @@ class Exists(UnaryExpression[bool]):
         assert isinstance(return_value, SelectStatementGrouping)
         return return_value
 
-    def select(self) -> Select[Any]:
+    def select(self) -> Select[Tuple[bool]]:
         r"""Return a SELECT of this :class:`_expression.Exists`.
 
         e.g.::
 
             stmt = exists(some_table.c.id).where(some_table.c.id == 5).select()
 
-        This will produce a statement resembling::
+        This will produce a statement resembling:
+
+        .. sourcecode:: sql
 
             SELECT EXISTS (SELECT id FROM some_table WHERE some_table = :param) AS anon_1
 
@@ -6771,10 +6943,14 @@ class TextualSelect(SelectBase, ExecutableReturnsRows, Generative):
 
     _label_style = LABEL_STYLE_NONE
 
-    _traverse_internals: _TraverseInternalsType = [
-        ("element", InternalTraversal.dp_clauseelement),
-        ("column_args", InternalTraversal.dp_clauseelement_list),
-    ] + SupportsCloneAnnotations._clone_annotations_traverse_internals
+    _traverse_internals: _TraverseInternalsType = (
+        [
+            ("element", InternalTraversal.dp_clauseelement),
+            ("column_args", InternalTraversal.dp_clauseelement_list),
+        ]
+        + SupportsCloneAnnotations._clone_annotations_traverse_internals
+        + HasCTE._has_ctes_traverse_internals
+    )
 
     _is_textual = True
 
diff --git a/libs/sqlalchemy/sql/sqltypes.py b/libs/sqlalchemy/sql/sqltypes.py
index fa4c7827f..ee471a6c4 100644
--- a/libs/sqlalchemy/sql/sqltypes.py
+++ b/libs/sqlalchemy/sql/sqltypes.py
@@ -1,5 +1,5 @@
 # sql/sqltypes.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -59,9 +59,11 @@ from .. import util
 from ..engine import processors
 from ..util import langhelpers
 from ..util import OrderedDict
+from ..util import warn_deprecated
+from ..util.typing import get_args
 from ..util.typing import is_literal
+from ..util.typing import is_pep695
 from ..util.typing import Literal
-from ..util.typing import typing_get_args
 
 if TYPE_CHECKING:
     from ._typing import _ColumnExpressionArgument
@@ -202,7 +204,7 @@ class String(Concatenable, TypeEngine[str]):
           .. sourcecode:: pycon+sql
 
             >>> from sqlalchemy import cast, select, String
-            >>> print(select(cast('some string', String(collation='utf8'))))
+            >>> print(select(cast("some string", String(collation="utf8"))))
             {printsql}SELECT CAST(:param_1 AS VARCHAR COLLATE utf8) AS anon_1
 
           .. note::
@@ -217,6 +219,11 @@ class String(Concatenable, TypeEngine[str]):
         self.length = length
         self.collation = collation
 
+    def _with_collation(self, collation):
+        new_type = self.copy()
+        new_type.collation = collation
+        return new_type
+
     def _resolve_for_literal(self, value):
         # I was SO PROUD of my regex trick, but we dont need it.
         # re.search(r"[^\u0000-\u007F]", value)
@@ -269,8 +276,8 @@ class Unicode(String):
     The :class:`.Unicode` type is a :class:`.String` subclass that assumes
     input and output strings that may contain non-ASCII characters, and for
     some backends implies an underlying column type that is explicitly
-    supporting of non-ASCII data, such as ``NVARCHAR`` on Oracle and SQL
-    Server.  This will impact the output of ``CREATE TABLE`` statements and
+    supporting of non-ASCII data, such as ``NVARCHAR`` on Oracle Database and
+    SQL Server.  This will impact the output of ``CREATE TABLE`` statements and
     ``CAST`` functions at the dialect level.
 
     The character encoding used by the :class:`.Unicode` type that is used to
@@ -301,7 +308,6 @@ class Unicode(String):
 
         :meth:`.DialectEvents.do_setinputsizes`
 
-
     """
 
     __visit_name__ = "unicode"
@@ -629,16 +635,16 @@ class Float(Numeric[_N]):
            indicates a number of digits for the generic
            :class:`_sqltypes.Float` datatype.
 
-           .. note:: For the Oracle backend, the
+           .. note:: For the Oracle Database backend, the
               :paramref:`_sqltypes.Float.precision` parameter is not accepted
-              when rendering DDL, as Oracle does not support float precision
+              when rendering DDL, as Oracle Database does not support float precision
               specified as a number of decimal places. Instead, use the
-              Oracle-specific :class:`_oracle.FLOAT` datatype and specify the
+              Oracle Database-specific :class:`_oracle.FLOAT` datatype and specify the
               :paramref:`_oracle.FLOAT.binary_precision` parameter. This is new
               in version 2.0 of SQLAlchemy.
 
               To create a database agnostic :class:`_types.Float` that
-              separately specifies binary precision for Oracle, use
+              separately specifies binary precision for Oracle Database, use
               :meth:`_types.TypeEngine.with_variant` as follows::
 
                     from sqlalchemy import Column
@@ -647,7 +653,7 @@ class Float(Numeric[_N]):
 
                     Column(
                         "float_data",
-                        Float(5).with_variant(oracle.FLOAT(binary_precision=16), "oracle")
+                        Float(5).with_variant(oracle.FLOAT(binary_precision=16), "oracle"),
                     )
 
         :param asdecimal: the same flag as that of :class:`.Numeric`, but
@@ -749,7 +755,7 @@ class DateTime(
          to make use of the :class:`_types.TIMESTAMP` datatype directly when
          using this flag, as some databases include separate generic
          date/time-holding types distinct from the timezone-capable
-         TIMESTAMP datatype, such as Oracle.
+         TIMESTAMP datatype, such as Oracle Database.
 
 
         """
@@ -865,6 +871,12 @@ class _Binary(TypeEngine[bytes]):
     def __init__(self, length: Optional[int] = None):
         self.length = length
 
+    @util.ro_memoized_property
+    def _generic_type_affinity(
+        self,
+    ) -> Type[TypeEngine[bytes]]:
+        return LargeBinary
+
     def literal_processor(self, dialect):
         def process(value):
             # TODO: this is useless for real world scenarios; implement
@@ -1006,7 +1018,7 @@ class SchemaType(SchemaEventTarget, TypeEngineMixin):
         if _adapted_from:
             self.dispatch = self.dispatch._join(_adapted_from.dispatch)
 
-    def _set_parent(self, column, **kw):
+    def _set_parent(self, parent, **kw):
         # set parent hook is when this type is associated with a column.
         # Column calls it for all SchemaEventTarget instances, either the
         # base type and/or variants in _variant_mapping.
@@ -1020,7 +1032,7 @@ class SchemaType(SchemaEventTarget, TypeEngineMixin):
         # on_table/metadata_create/drop in this method, which is used by
         # "native" types with a separate CREATE/DROP e.g. Postgresql.ENUM
 
-        column._on_table_attach(util.portable_instancemethod(self._set_table))
+        parent._on_table_attach(util.portable_instancemethod(self._set_table))
 
     def _variant_mapping_for_set_table(self, column):
         if column.type._variant_mapping:
@@ -1080,6 +1092,11 @@ class SchemaType(SchemaEventTarget, TypeEngineMixin):
         return self.adapt(
             cast("Type[TypeEngine[Any]]", self.__class__),
             _create_events=True,
+            metadata=(
+                kw.get("_to_metadata", self.metadata)
+                if self.metadata is not None
+                else None
+            ),
         )
 
     @overload
@@ -1211,15 +1228,14 @@ class Enum(String, SchemaType, Emulated, TypeEngine[Union[str, enum.Enum]]):
         import enum
         from sqlalchemy import Enum
 
+
         class MyEnum(enum.Enum):
             one = 1
             two = 2
             three = 3
 
-        t = Table(
-            'data', MetaData(),
-            Column('value', Enum(MyEnum))
-        )
+
+        t = Table("data", MetaData(), Column("value", Enum(MyEnum)))
 
         connection.execute(t.insert(), {"value": MyEnum.two})
         assert connection.scalar(t.select()) is MyEnum.two
@@ -1497,16 +1513,9 @@ class Enum(String, SchemaType, Emulated, TypeEngine[Union[str, enum.Enum]]):
 
         native_enum = None
 
-        if not we_are_generic_form and python_type is matched_on:
-            # if we have enumerated values, and the incoming python
-            # type is exactly the one that matched in the type map,
-            # then we use these enumerated values and dont try to parse
-            # what's incoming
-            enum_args = self._enums_argument
-
-        elif is_literal(python_type):
+        def process_literal(pt):
             # for a literal, where we need to get its contents, parse it out.
-            enum_args = typing_get_args(python_type)
+            enum_args = get_args(pt)
             bad_args = [arg for arg in enum_args if not isinstance(arg, str)]
             if bad_args:
                 raise exc.ArgumentError(
@@ -1515,6 +1524,42 @@ class Enum(String, SchemaType, Emulated, TypeEngine[Union[str, enum.Enum]]):
                     f"provide an explicit Enum datatype for this Python type"
                 )
             native_enum = False
+            return enum_args, native_enum
+
+        if not we_are_generic_form and python_type is matched_on:
+            # if we have enumerated values, and the incoming python
+            # type is exactly the one that matched in the type map,
+            # then we use these enumerated values and dont try to parse
+            # what's incoming
+            enum_args = self._enums_argument
+
+        elif is_literal(python_type):
+            enum_args, native_enum = process_literal(python_type)
+        elif is_pep695(python_type):
+            value = python_type.__value__
+            if is_pep695(value):
+                new_value = value
+                while is_pep695(new_value):
+                    new_value = new_value.__value__
+                if is_literal(new_value):
+                    value = new_value
+                    warn_deprecated(
+                        f"Mapping recursive TypeAliasType '{python_type}' "
+                        "that resolve to literal to generate an Enum is "
+                        "deprecated. SQLAlchemy 2.1 will not support this "
+                        "use case. Please avoid using recursing "
+                        "TypeAliasType.",
+                        "2.0",
+                    )
+            if not is_literal(value):
+                raise exc.ArgumentError(
+                    f"Can't associate TypeAliasType '{python_type}' to an "
+                    "Enum since it's not a direct alias of a Literal. Only "
+                    "aliases in this form `type my_alias = Literal['a', "
+                    "'b']` are supported when generating Enums."
+                )
+            enum_args, native_enum = process_literal(value)
+
         elif isinstance(python_type, type) and issubclass(
             python_type, enum.Enum
         ):
@@ -1664,10 +1709,10 @@ class Enum(String, SchemaType, Emulated, TypeEngine[Union[str, enum.Enum]]):
         assert "_enums" in kw
         return impltype(**kw)
 
-    def adapt(self, impltype, **kw):
+    def adapt(self, cls, **kw):
         kw["_enums"] = self._enums_argument
         kw["_disable_warnings"] = True
-        return super().adapt(impltype, **kw)
+        return super().adapt(cls, **kw)
 
     def _should_create_constraint(self, compiler, **kw):
         if not self._is_impl_for_variant(compiler.dialect, kw):
@@ -1903,6 +1948,13 @@ class Boolean(SchemaType, Emulated, TypeEngine[bool]):
         if _adapted_from:
             self.dispatch = self.dispatch._join(_adapted_from.dispatch)
 
+    def copy(self, **kw):
+        # override SchemaType.copy() to not include to_metadata logic
+        return self.adapt(
+            cast("Type[TypeEngine[Any]]", self.__class__),
+            _create_events=True,
+        )
+
     def _should_create_constraint(self, compiler, **kw):
         if not self._is_impl_for_variant(compiler.dialect, kw):
             return False
@@ -2007,10 +2059,9 @@ class _AbstractInterval(HasExpressionLookup, TypeEngine[dt.timedelta]):
 class Interval(Emulated, _AbstractInterval, TypeDecorator[dt.timedelta]):
     """A type for ``datetime.timedelta()`` objects.
 
-    The Interval type deals with ``datetime.timedelta`` objects.  In
-    PostgreSQL and Oracle, the native ``INTERVAL`` type is used; for others,
-    the value is stored as a date which is relative to the "epoch"
-    (Jan. 1, 1970).
+    The Interval type deals with ``datetime.timedelta`` objects.  In PostgreSQL
+    and Oracle Database, the native ``INTERVAL`` type is used; for others, the
+    value is stored as a date which is relative to the "epoch" (Jan. 1, 1970).
 
     Note that the ``Interval`` type does not currently provide date arithmetic
     operations on platforms which do not support interval types natively. Such
@@ -2035,16 +2086,16 @@ class Interval(Emulated, _AbstractInterval, TypeDecorator[dt.timedelta]):
 
         :param native: when True, use the actual
           INTERVAL type provided by the database, if
-          supported (currently PostgreSQL, Oracle).
+          supported (currently PostgreSQL, Oracle Database).
           Otherwise, represent the interval data as
           an epoch value regardless.
 
         :param second_precision: For native interval types
           which support a "fractional seconds precision" parameter,
-          i.e. Oracle and PostgreSQL
+          i.e. Oracle Database and PostgreSQL
 
         :param day_precision: for native interval types which
-          support a "day precision" parameter, i.e. Oracle.
+          support a "day precision" parameter, i.e. Oracle Database.
 
         """
         super().__init__()
@@ -2154,15 +2205,16 @@ class JSON(Indexable, TypeEngine[Any]):
 
     The :class:`_types.JSON` type stores arbitrary JSON format data, e.g.::
 
-        data_table = Table('data_table', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('data', JSON)
+        data_table = Table(
+            "data_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("data", JSON),
         )
 
         with engine.connect() as conn:
             conn.execute(
-                data_table.insert(),
-                {"data": {"key1": "value1", "key2": "value2"}}
+                data_table.insert(), {"data": {"key1": "value1", "key2": "value2"}}
             )
 
     **JSON-Specific Expression Operators**
@@ -2172,7 +2224,7 @@ class JSON(Indexable, TypeEngine[Any]):
 
     * Keyed index operations::
 
-        data_table.c.data['some key']
+        data_table.c.data["some key"]
 
     * Integer index operations::
 
@@ -2180,7 +2232,7 @@ class JSON(Indexable, TypeEngine[Any]):
 
     * Path index operations::
 
-        data_table.c.data[('key_1', 'key_2', 5, ..., 'key_n')]
+        data_table.c.data[("key_1", "key_2", 5, ..., "key_n")]
 
     * Data casters for specific JSON element types, subsequent to an index
       or path operation being invoked::
@@ -2235,13 +2287,12 @@ class JSON(Indexable, TypeEngine[Any]):
 
            from sqlalchemy import cast, type_coerce
            from sqlalchemy import String, JSON
-           cast(
-               data_table.c.data['some_key'], String
-           ) == type_coerce(55, JSON)
+
+           cast(data_table.c.data["some_key"], String) == type_coerce(55, JSON)
 
         The above case now works directly as::
 
-            data_table.c.data['some_key'].as_integer() == 5
+            data_table.c.data["some_key"].as_integer() == 5
 
         For details on the previous comparison approach within the 1.3.x
         series, see the documentation for SQLAlchemy 1.2 or the included HTML
@@ -2272,6 +2323,7 @@ class JSON(Indexable, TypeEngine[Any]):
     should be SQL NULL as opposed to JSON ``"null"``::
 
         from sqlalchemy import null
+
         conn.execute(table.insert(), {"json_value": null()})
 
     To insert or select against a value that is JSON ``"null"``, use the
@@ -2304,7 +2356,8 @@ class JSON(Indexable, TypeEngine[Any]):
 
         engine = create_engine(
             "sqlite://",
-            json_serializer=lambda obj: json.dumps(obj, ensure_ascii=False))
+            json_serializer=lambda obj: json.dumps(obj, ensure_ascii=False),
+        )
 
     .. versionchanged:: 1.3.7
 
@@ -2322,7 +2375,7 @@ class JSON(Indexable, TypeEngine[Any]):
 
         :class:`sqlalchemy.dialects.sqlite.JSON`
 
-    """
+    """  # noqa: E501
 
     __visit_name__ = "JSON"
 
@@ -2356,8 +2409,7 @@ class JSON(Indexable, TypeEngine[Any]):
     transparent method is to use :func:`_expression.text`::
 
         Table(
-            'my_table', metadata,
-            Column('json_data', JSON, default=text("'null'"))
+            "my_table", metadata, Column("json_data", JSON, default=text("'null'"))
         )
 
     While it is possible to use :attr:`_types.JSON.NULL` in this context, the
@@ -2369,7 +2421,7 @@ class JSON(Indexable, TypeEngine[Any]):
     generated defaults.
 
 
-    """
+    """  # noqa: E501
 
     def __init__(self, none_as_null: bool = False):
         """Construct a :class:`_types.JSON` type.
@@ -2382,6 +2434,7 @@ class JSON(Indexable, TypeEngine[Any]):
          as SQL NULL::
 
              from sqlalchemy import null
+
              conn.execute(table.insert(), {"data": null()})
 
          .. note::
@@ -2516,95 +2569,101 @@ class JSON(Indexable, TypeEngine[Any]):
             return operator, index, self.type
 
         def as_boolean(self):
-            """Cast an indexed value as boolean.
+            """Consider an indexed value as boolean.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(
-                    mytable.c.json_column['some_data'].as_boolean()
-                ).where(
-                    mytable.c.json_column['some_data'].as_boolean() == True
+                stmt = select(mytable.c.json_column["some_data"].as_boolean()).where(
+                    mytable.c.json_column["some_data"].as_boolean() == True
                 )
 
             .. versionadded:: 1.3.11
 
-            """
+            """  # noqa: E501
             return self._binary_w_type(Boolean(), "as_boolean")
 
         def as_string(self):
-            """Cast an indexed value as string.
+            """Consider an indexed value as string.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(
-                    mytable.c.json_column['some_data'].as_string()
-                ).where(
-                    mytable.c.json_column['some_data'].as_string() ==
-                    'some string'
+                stmt = select(mytable.c.json_column["some_data"].as_string()).where(
+                    mytable.c.json_column["some_data"].as_string() == "some string"
                 )
 
             .. versionadded:: 1.3.11
 
-            """
+            """  # noqa: E501
             return self._binary_w_type(Unicode(), "as_string")
 
         def as_integer(self):
-            """Cast an indexed value as integer.
+            """Consider an indexed value as integer.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(
-                    mytable.c.json_column['some_data'].as_integer()
-                ).where(
-                    mytable.c.json_column['some_data'].as_integer() == 5
+                stmt = select(mytable.c.json_column["some_data"].as_integer()).where(
+                    mytable.c.json_column["some_data"].as_integer() == 5
                 )
 
             .. versionadded:: 1.3.11
 
-            """
+            """  # noqa: E501
             return self._binary_w_type(Integer(), "as_integer")
 
         def as_float(self):
-            """Cast an indexed value as float.
+            """Consider an indexed value as float.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(
-                    mytable.c.json_column['some_data'].as_float()
-                ).where(
-                    mytable.c.json_column['some_data'].as_float() == 29.75
+                stmt = select(mytable.c.json_column["some_data"].as_float()).where(
+                    mytable.c.json_column["some_data"].as_float() == 29.75
                 )
 
             .. versionadded:: 1.3.11
 
-            """
+            """  # noqa: E501
             return self._binary_w_type(Float(), "as_float")
 
         def as_numeric(self, precision, scale, asdecimal=True):
-            """Cast an indexed value as numeric/decimal.
+            """Consider an indexed value as numeric/decimal.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(
-                    mytable.c.json_column['some_data'].as_numeric(10, 6)
-                ).where(
-                    mytable.c.
-                    json_column['some_data'].as_numeric(10, 6) == 29.75
+                stmt = select(mytable.c.json_column["some_data"].as_numeric(10, 6)).where(
+                    mytable.c.json_column["some_data"].as_numeric(10, 6) == 29.75
                 )
 
             .. versionadded:: 1.4.0b2
 
-            """
+            """  # noqa: E501
             return self._binary_w_type(
                 Numeric(precision, scale, asdecimal=asdecimal), "as_numeric"
             )
 
         def as_json(self):
-            """Cast an indexed value as JSON.
+            """Consider an indexed value as JSON.
+
+            This is similar to using :class:`_sql.type_coerce`, and will
+            usually not apply a ``CAST()``.
 
             e.g.::
 
-                stmt = select(mytable.c.json_column['some_data'].as_json())
+                stmt = select(mytable.c.json_column["some_data"].as_json())
 
             This is typically the default behavior of indexed elements in any
             case.
@@ -2722,26 +2781,21 @@ class ARRAY(
     An :class:`_types.ARRAY` type is constructed given the "type"
     of element::
 
-        mytable = Table("mytable", metadata,
-                Column("data", ARRAY(Integer))
-            )
+        mytable = Table("mytable", metadata, Column("data", ARRAY(Integer)))
 
     The above type represents an N-dimensional array,
     meaning a supporting backend such as PostgreSQL will interpret values
     with any number of dimensions automatically.   To produce an INSERT
     construct that passes in a 1-dimensional array of integers::
 
-        connection.execute(
-                mytable.insert(),
-                {"data": [1,2,3]}
-        )
+        connection.execute(mytable.insert(), {"data": [1, 2, 3]})
 
     The :class:`_types.ARRAY` type can be constructed given a fixed number
     of dimensions::
 
-        mytable = Table("mytable", metadata,
-                Column("data", ARRAY(Integer, dimensions=2))
-            )
+        mytable = Table(
+            "mytable", metadata, Column("data", ARRAY(Integer, dimensions=2))
+        )
 
     Sending a number of dimensions is optional, but recommended if the
     datatype is to represent arrays of more than one dimension.  This number
@@ -2766,22 +2820,21 @@ class ARRAY(
     dimension parameter will generally assume single-dimensional behaviors.
 
     SQL expressions of type :class:`_types.ARRAY` have support for "index" and
-    "slice" behavior.  The Python ``[]`` operator works normally here, given
-    integer indexes or slices.  Arrays default to 1-based indexing.
-    The operator produces binary expression
+    "slice" behavior.  The ``[]`` operator produces expression
     constructs which will produce the appropriate SQL, both for
     SELECT statements::
 
         select(mytable.c.data[5], mytable.c.data[2:7])
 
     as well as UPDATE statements when the :meth:`_expression.Update.values`
-    method
-    is used::
+    method is used::
 
-        mytable.update().values({
-            mytable.c.data[5]: 7,
-            mytable.c.data[2:7]: [1, 2, 3]
-        })
+        mytable.update().values(
+            {mytable.c.data[5]: 7, mytable.c.data[2:7]: [1, 2, 3]}
+        )
+
+    Indexed access is one-based by default;
+    for zero-based index conversion, set :paramref:`_types.ARRAY.zero_indexes`.
 
     The :class:`_types.ARRAY` type also provides for the operators
     :meth:`.types.ARRAY.Comparator.any` and
@@ -2800,6 +2853,7 @@ class ARRAY(
             from sqlalchemy import ARRAY
             from sqlalchemy.ext.mutable import MutableList
 
+
             class SomeOrmClass(Base):
                 # ...
 
@@ -2827,6 +2881,56 @@ class ARRAY(
     """If True, Python zero-based indexes should be interpreted as one-based
     on the SQL expression side."""
 
+    def __init__(
+        self,
+        item_type: _TypeEngineArgument[Any],
+        as_tuple: bool = False,
+        dimensions: Optional[int] = None,
+        zero_indexes: bool = False,
+    ):
+        """Construct an :class:`_types.ARRAY`.
+
+        E.g.::
+
+          Column("myarray", ARRAY(Integer))
+
+        Arguments are:
+
+        :param item_type: The data type of items of this array. Note that
+          dimensionality is irrelevant here, so multi-dimensional arrays like
+          ``INTEGER[][]``, are constructed as ``ARRAY(Integer)``, not as
+          ``ARRAY(ARRAY(Integer))`` or such.
+
+        :param as_tuple=False: Specify whether return results
+          should be converted to tuples from lists.  This parameter is
+          not generally needed as a Python list corresponds well
+          to a SQL array.
+
+        :param dimensions: if non-None, the ARRAY will assume a fixed
+         number of dimensions.   This impacts how the array is declared
+         on the database, how it goes about interpreting Python and
+         result values, as well as how expression behavior in conjunction
+         with the "getitem" operator works.  See the description at
+         :class:`_types.ARRAY` for additional detail.
+
+        :param zero_indexes=False: when True, index values will be converted
+         between Python zero-based and SQL one-based indexes, e.g.
+         a value of one will be added to all index values before passing
+         to the database.
+
+        """
+        if isinstance(item_type, ARRAY):
+            raise ValueError(
+                "Do not nest ARRAY types; ARRAY(basetype) "
+                "handles multi-dimensional arrays of basetype"
+            )
+        if isinstance(item_type, type):
+            item_type = item_type()
+        self.item_type = item_type
+        self.as_tuple = as_tuple
+        self.dimensions = dimensions
+        self.zero_indexes = zero_indexes
+
     class Comparator(
         Indexable.Comparator[Sequence[Any]],
         Concatenable.Comparator[Sequence[Any]],
@@ -2897,9 +3001,7 @@ class ARRAY(
                 from sqlalchemy.sql import operators
 
                 conn.execute(
-                    select(table.c.data).where(
-                            table.c.data.any(7, operator=operators.lt)
-                        )
+                    select(table.c.data).where(table.c.data.any(7, operator=operators.lt))
                 )
 
             :param other: expression to be compared
@@ -2913,7 +3015,7 @@ class ARRAY(
 
                 :meth:`.types.ARRAY.Comparator.all`
 
-            """
+            """  # noqa: E501
             elements = util.preloaded.sql_elements
             operator = operator if operator else operators.eq
 
@@ -2946,9 +3048,7 @@ class ARRAY(
                 from sqlalchemy.sql import operators
 
                 conn.execute(
-                    select(table.c.data).where(
-                            table.c.data.all(7, operator=operators.lt)
-                        )
+                    select(table.c.data).where(table.c.data.all(7, operator=operators.lt))
                 )
 
             :param other: expression to be compared
@@ -2962,7 +3062,7 @@ class ARRAY(
 
                 :meth:`.types.ARRAY.Comparator.any`
 
-            """
+            """  # noqa: E501
             elements = util.preloaded.sql_elements
             operator = operator if operator else operators.eq
 
@@ -2981,56 +3081,6 @@ class ARRAY(
 
     comparator_factory = Comparator
 
-    def __init__(
-        self,
-        item_type: _TypeEngineArgument[Any],
-        as_tuple: bool = False,
-        dimensions: Optional[int] = None,
-        zero_indexes: bool = False,
-    ):
-        """Construct an :class:`_types.ARRAY`.
-
-        E.g.::
-
-          Column('myarray', ARRAY(Integer))
-
-        Arguments are:
-
-        :param item_type: The data type of items of this array. Note that
-          dimensionality is irrelevant here, so multi-dimensional arrays like
-          ``INTEGER[][]``, are constructed as ``ARRAY(Integer)``, not as
-          ``ARRAY(ARRAY(Integer))`` or such.
-
-        :param as_tuple=False: Specify whether return results
-          should be converted to tuples from lists.  This parameter is
-          not generally needed as a Python list corresponds well
-          to a SQL array.
-
-        :param dimensions: if non-None, the ARRAY will assume a fixed
-         number of dimensions.   This impacts how the array is declared
-         on the database, how it goes about interpreting Python and
-         result values, as well as how expression behavior in conjunction
-         with the "getitem" operator works.  See the description at
-         :class:`_types.ARRAY` for additional detail.
-
-        :param zero_indexes=False: when True, index values will be converted
-         between Python zero-based and SQL one-based indexes, e.g.
-         a value of one will be added to all index values before passing
-         to the database.
-
-        """
-        if isinstance(item_type, ARRAY):
-            raise ValueError(
-                "Do not nest ARRAY types; ARRAY(basetype) "
-                "handles multi-dimensional arrays of basetype"
-            )
-        if isinstance(item_type, type):
-            item_type = item_type()
-        self.item_type = item_type
-        self.as_tuple = as_tuple
-        self.dimensions = dimensions
-        self.zero_indexes = zero_indexes
-
     @property
     def hashable(self):
         return self.as_tuple
@@ -3042,13 +3092,13 @@ class ARRAY(
     def compare_values(self, x, y):
         return x == y
 
-    def _set_parent(self, column, outer=False, **kw):
+    def _set_parent(self, parent, outer=False, **kw):
         """Support SchemaEventTarget"""
 
         if not outer and isinstance(self.item_type, SchemaEventTarget):
-            self.item_type._set_parent(column, **kw)
+            self.item_type._set_parent(parent, **kw)
 
-    def _set_parent_with_dispatch(self, parent):
+    def _set_parent_with_dispatch(self, parent, **kw):
         """Support SchemaEventTarget"""
 
         super()._set_parent_with_dispatch(parent, outer=True)
@@ -3282,8 +3332,8 @@ class BIGINT(BigInteger):
 class TIMESTAMP(DateTime):
     """The SQL TIMESTAMP type.
 
-    :class:`_types.TIMESTAMP` datatypes have support for timezone
-    storage on some backends, such as PostgreSQL and Oracle.  Use the
+    :class:`_types.TIMESTAMP` datatypes have support for timezone storage on
+    some backends, such as PostgreSQL and Oracle Database.  Use the
     :paramref:`~types.TIMESTAMP.timezone` argument in order to enable
     "TIMESTAMP WITH TIMEZONE" for these backends.
 
@@ -3335,7 +3385,7 @@ class TEXT(Text):
 class CLOB(Text):
     """The CLOB type.
 
-    This type is found in Oracle and Informix.
+    This type is found in Oracle Database and Informix.
     """
 
     __visit_name__ = "CLOB"
@@ -3501,14 +3551,13 @@ class Uuid(Emulated, TypeEngine[_UUID_RETURN]):
         t = Table(
             "t",
             metadata_obj,
-            Column('uuid_data', Uuid, primary_key=True),
-            Column("other_data", String)
+            Column("uuid_data", Uuid, primary_key=True),
+            Column("other_data", String),
         )
 
         with engine.begin() as conn:
             conn.execute(
-                t.insert(),
-                {"uuid_data": uuid.uuid4(), "other_data", "some data"}
+                t.insert(), {"uuid_data": uuid.uuid4(), "other_data": "some data"}
             )
 
     To have the :class:`_sqltypes.Uuid` datatype work with string-based
@@ -3522,7 +3571,7 @@ class Uuid(Emulated, TypeEngine[_UUID_RETURN]):
         :class:`_sqltypes.UUID` - represents exactly the ``UUID`` datatype
         without any backend-agnostic behaviors.
 
-    """
+    """  # noqa: E501
 
     __visit_name__ = "uuid"
 
@@ -3661,31 +3710,6 @@ class Uuid(Emulated, TypeEngine[_UUID_RETURN]):
 
                 return process
 
-    def _sentinel_value_resolver(self, dialect):
-        """For the "insertmanyvalues" feature only, return a callable that
-        will receive the uuid object or string
-        as it is normally passed to the DB in the parameter set, after
-        bind_processor() is called.  Convert this value to match
-        what it would be as coming back from a RETURNING or similar
-        statement for the given backend.
-
-        Individual dialects and drivers may need their own implementations
-        based on how their UUID types send data and how the drivers behave
-        (e.g. pyodbc)
-
-        """
-        if not self.native_uuid or not dialect.supports_native_uuid:
-            # dealing entirely with strings going in and out of
-            # CHAR(32)
-            return None
-
-        elif self.as_uuid:
-            # we sent UUID objects and we are getting UUID objects back
-            return None
-        else:
-            # we sent strings and we are getting UUID objects back
-            return _python_UUID
-
 
 class UUID(Uuid[_UUID_RETURN], type_api.NativeForEmulated):
     """Represent the SQL UUID type.
diff --git a/libs/sqlalchemy/sql/traversals.py b/libs/sqlalchemy/sql/traversals.py
index 3ca3caf9e..13ad28996 100644
--- a/libs/sqlalchemy/sql/traversals.py
+++ b/libs/sqlalchemy/sql/traversals.py
@@ -1,5 +1,5 @@
 # sql/traversals.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -562,6 +562,8 @@ class TraversalComparatorStrategy(HasTraversalDispatch, util.MemoizedSlots):
                         return False
                     else:
                         continue
+                elif right_child is None:
+                    return False
 
                 comparison = dispatch(
                     left_attrname, left, left_child, right, right_child, **kw
diff --git a/libs/sqlalchemy/sql/type_api.py b/libs/sqlalchemy/sql/type_api.py
index 414b91ab4..aeb804d3f 100644
--- a/libs/sqlalchemy/sql/type_api.py
+++ b/libs/sqlalchemy/sql/type_api.py
@@ -1,5 +1,5 @@
 # sql/type_api.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -183,6 +183,9 @@ class TypeEngine(Visitable, Generic[_T]):
             self.expr = expr
             self.type = expr.type
 
+        def __reduce__(self) -> Any:
+            return self.__class__, (self.expr,)
+
         @util.preload_module("sqlalchemy.sql.default_comparator")
         def operate(
             self, op: OperatorType, *other: Any, **kwargs: Any
@@ -308,11 +311,13 @@ class TypeEngine(Visitable, Generic[_T]):
         E.g.::
 
                 Table(
-                    'some_table', metadata,
+                    "some_table",
+                    metadata,
                     Column(
                         String(50).evaluates_none(),
                         nullable=True,
-                        server_default='no value')
+                        server_default="no value",
+                    ),
                 )
 
         The ORM uses this flag to indicate that a positive value of ``None``
@@ -574,18 +579,6 @@ class TypeEngine(Visitable, Generic[_T]):
         """
         return None
 
-    def _sentinel_value_resolver(
-        self, dialect: Dialect
-    ) -> Optional[_SentinelProcessorType[_T]]:
-        """Return an optional callable that will match parameter values
-        (post-bind processing) to result values
-        (pre-result-processing), for use in the "sentinel" feature.
-
-        .. versionadded:: 2.0.10
-
-        """
-        return None
-
     @util.memoized_property
     def _has_bind_expression(self) -> bool:
         """memoized boolean, check if bind_expression is implemented.
@@ -650,7 +643,7 @@ class TypeEngine(Visitable, Generic[_T]):
             string_type = String()
 
             string_type = string_type.with_variant(
-                mysql.VARCHAR(collation='foo'), 'mysql', 'mariadb'
+                mysql.VARCHAR(collation="foo"), "mysql", "mariadb"
             )
 
         The variant mapping indicates that when this type is
@@ -767,6 +760,10 @@ class TypeEngine(Visitable, Generic[_T]):
 
         return self
 
+    def _with_collation(self, collation: str) -> Self:
+        """set up error handling for the collate expression"""
+        raise NotImplementedError("this datatype does not support collation")
+
     @util.ro_memoized_property
     def _type_affinity(self) -> Optional[Type[TypeEngine[_T]]]:
         """Return a rudimental 'affinity' value expressing the general class
@@ -933,18 +930,6 @@ class TypeEngine(Visitable, Generic[_T]):
         d["result"][coltype] = rp
         return rp
 
-    def _cached_sentinel_value_processor(
-        self, dialect: Dialect
-    ) -> Optional[_SentinelProcessorType[_T]]:
-        try:
-            return dialect._type_memos[self]["sentinel"]
-        except KeyError:
-            pass
-
-        d = self._dialect_info(dialect)
-        d["sentinel"] = bp = d["impl"]._sentinel_value_resolver(dialect)
-        return bp
-
     def _cached_custom_processor(
         self, dialect: Dialect, key: str, fn: Callable[[TypeEngine[_T]], _O]
     ) -> _O:
@@ -1029,9 +1014,11 @@ class TypeEngine(Visitable, Generic[_T]):
         types with "implementation" types that are specific to a particular
         dialect.
         """
-        return util.constructor_copy(
+        typ = util.constructor_copy(
             self, cast(Type[TypeEngine[Any]], cls), **kw
         )
+        typ._variant_mapping = self._variant_mapping
+        return typ
 
     def coerce_compared_value(
         self, op: Optional[OperatorType], value: Any
@@ -1143,7 +1130,7 @@ class ExternalType(TypeEngineMixin):
     """
 
     cache_ok: Optional[bool] = None
-    """Indicate if statements using this :class:`.ExternalType` are "safe to
+    '''Indicate if statements using this :class:`.ExternalType` are "safe to
     cache".
 
     The default value ``None`` will emit a warning and then not allow caching
@@ -1184,12 +1171,12 @@ class ExternalType(TypeEngineMixin):
     series of tuples.   Given a previously un-cacheable type as::
 
         class LookupType(UserDefinedType):
-            '''a custom type that accepts a dictionary as a parameter.
+            """a custom type that accepts a dictionary as a parameter.
 
             this is the non-cacheable version, as "self.lookup" is not
             hashable.
 
-            '''
+            """
 
             def __init__(self, lookup):
                 self.lookup = lookup
@@ -1197,8 +1184,7 @@ class ExternalType(TypeEngineMixin):
             def get_col_spec(self, **kw):
                 return "VARCHAR(255)"
 
-            def bind_processor(self, dialect):
-                # ...  works with "self.lookup" ...
+            def bind_processor(self, dialect): ...  # works with "self.lookup" ...
 
     Where "lookup" is a dictionary.  The type will not be able to generate
     a cache key::
@@ -1234,7 +1220,7 @@ class ExternalType(TypeEngineMixin):
     to the ".lookup" attribute::
 
         class LookupType(UserDefinedType):
-            '''a custom type that accepts a dictionary as a parameter.
+            """a custom type that accepts a dictionary as a parameter.
 
             The dictionary is stored both as itself in a private variable,
             and published in a public variable as a sorted tuple of tuples,
@@ -1242,7 +1228,7 @@ class ExternalType(TypeEngineMixin):
             two equivalent dictionaries.  Note it assumes the keys and
             values of the dictionary are themselves hashable.
 
-            '''
+            """
 
             cache_ok = True
 
@@ -1251,15 +1237,12 @@ class ExternalType(TypeEngineMixin):
 
                 # assume keys/values of "lookup" are hashable; otherwise
                 # they would also need to be converted in some way here
-                self.lookup = tuple(
-                    (key, lookup[key]) for key in sorted(lookup)
-                )
+                self.lookup = tuple((key, lookup[key]) for key in sorted(lookup))
 
             def get_col_spec(self, **kw):
                 return "VARCHAR(255)"
 
-            def bind_processor(self, dialect):
-                # ...  works with "self._lookup" ...
+            def bind_processor(self, dialect): ...  # works with "self._lookup" ...
 
     Where above, the cache key for ``LookupType({"a": 10, "b": 20})`` will be::
 
@@ -1277,7 +1260,7 @@ class ExternalType(TypeEngineMixin):
 
         :ref:`sql_caching`
 
-    """  # noqa: E501
+    '''  # noqa: E501
 
     @util.non_memoized_property
     def _static_cache_key(
@@ -1319,10 +1302,11 @@ class UserDefinedType(
 
       import sqlalchemy.types as types
 
+
       class MyType(types.UserDefinedType):
           cache_ok = True
 
-          def __init__(self, precision = 8):
+          def __init__(self, precision=8):
               self.precision = precision
 
           def get_col_spec(self, **kw):
@@ -1331,19 +1315,23 @@ class UserDefinedType(
           def bind_processor(self, dialect):
               def process(value):
                   return value
+
               return process
 
           def result_processor(self, dialect, coltype):
               def process(value):
                   return value
+
               return process
 
     Once the type is made, it's immediately usable::
 
-      table = Table('foo', metadata_obj,
-          Column('id', Integer, primary_key=True),
-          Column('data', MyType(16))
-          )
+      table = Table(
+          "foo",
+          metadata_obj,
+          Column("id", Integer, primary_key=True),
+          Column("data", MyType(16)),
+      )
 
     The ``get_col_spec()`` method will in most cases receive a keyword
     argument ``type_expression`` which refers to the owning expression
@@ -1508,7 +1496,7 @@ class NativeForEmulated(TypeEngineMixin):
 
 
 class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
-    """Allows the creation of types which add additional functionality
+    '''Allows the creation of types which add additional functionality
     to an existing type.
 
     This method is preferred to direct subclassing of SQLAlchemy's
@@ -1519,10 +1507,11 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
 
       import sqlalchemy.types as types
 
+
       class MyType(types.TypeDecorator):
-          '''Prefixes Unicode values with "PREFIX:" on the way in and
+          """Prefixes Unicode values with "PREFIX:" on the way in and
           strips it off on the way out.
-          '''
+          """
 
           impl = types.Unicode
 
@@ -1575,6 +1564,8 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
         class MyEpochType(types.TypeDecorator):
             impl = types.Integer
 
+            cache_ok = True
+
             epoch = datetime.date(1970, 1, 1)
 
             def process_bind_param(self, value, dialect):
@@ -1612,6 +1603,7 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
             from sqlalchemy import JSON
             from sqlalchemy import TypeDecorator
 
+
             class MyJsonType(TypeDecorator):
                 impl = JSON
 
@@ -1632,6 +1624,7 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
             from sqlalchemy import ARRAY
             from sqlalchemy import TypeDecorator
 
+
             class MyArrayType(TypeDecorator):
                 impl = ARRAY
 
@@ -1640,8 +1633,7 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
                 def coerce_compared_value(self, op, value):
                     return self.impl.coerce_compared_value(op, value)
 
-
-    """
+    '''
 
     __visit_name__ = "type_decorator"
 
@@ -1737,20 +1729,48 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
             kwargs["_python_is_types"] = self.expr.type.coerce_to_is_types
             return super().reverse_operate(op, other, **kwargs)
 
+    @staticmethod
+    def _reduce_td_comparator(
+        impl: TypeEngine[Any], expr: ColumnElement[_T]
+    ) -> Any:
+        return TypeDecorator._create_td_comparator_type(impl)(expr)
+
+    @staticmethod
+    def _create_td_comparator_type(
+        impl: TypeEngine[Any],
+    ) -> _ComparatorFactory[Any]:
+
+        def __reduce__(self: TypeDecorator.Comparator[Any]) -> Any:
+            return (TypeDecorator._reduce_td_comparator, (impl, self.expr))
+
+        return type(
+            "TDComparator",
+            (TypeDecorator.Comparator, impl.comparator_factory),  # type: ignore # noqa: E501
+            {"__reduce__": __reduce__},
+        )
+
     @property
     def comparator_factory(  # type: ignore  # mypy properties bug
         self,
     ) -> _ComparatorFactory[Any]:
         if TypeDecorator.Comparator in self.impl.comparator_factory.__mro__:  # type: ignore # noqa: E501
-            return self.impl.comparator_factory
+            return self.impl_instance.comparator_factory
         else:
             # reconcile the Comparator class on the impl with that
-            # of TypeDecorator
-            return type(
-                "TDComparator",
-                (TypeDecorator.Comparator, self.impl.comparator_factory),  # type: ignore # noqa: E501
-                {},
+            # of TypeDecorator.
+            # the use of multiple staticmethods is to support repeated
+            # pickling of the Comparator itself
+            return TypeDecorator._create_td_comparator_type(self.impl_instance)
+
+    def _copy_with_check(self) -> Self:
+        tt = self.copy()
+        if not isinstance(tt, self.__class__):
+            raise AssertionError(
+                "Type object %s does not properly "
+                "implement the copy() method, it must "
+                "return an object of type %s" % (self, self.__class__)
             )
+        return tt
 
     def _gen_dialect_impl(self, dialect: Dialect) -> TypeEngine[_T]:
         if dialect.name in self._variant_mapping:
@@ -1766,16 +1786,17 @@ class TypeDecorator(SchemaEventTarget, ExternalType, TypeEngine[_T]):
         # to a copy of this TypeDecorator and return
         # that.
         typedesc = self.load_dialect_impl(dialect).dialect_impl(dialect)
-        tt = self.copy()
-        if not isinstance(tt, self.__class__):
-            raise AssertionError(
-                "Type object %s does not properly "
-                "implement the copy() method, it must "
-                "return an object of type %s" % (self, self.__class__)
-            )
+        tt = self._copy_with_check()
         tt.impl = tt.impl_instance = typedesc
         return tt
 
+    def _with_collation(self, collation: str) -> Self:
+        tt = self._copy_with_check()
+        tt.impl = tt.impl_instance = self.impl_instance._with_collation(
+            collation
+        )
+        return tt
+
     @util.ro_non_memoized_property
     def _type_affinity(self) -> Optional[Type[TypeEngine[Any]]]:
         return self.impl_instance._type_affinity
@@ -2299,11 +2320,10 @@ def to_instance(
 
 
 def adapt_type(
-    typeobj: TypeEngine[Any],
+    typeobj: _TypeEngineArgument[Any],
     colspecs: Mapping[Type[Any], Type[TypeEngine[Any]]],
 ) -> TypeEngine[Any]:
-    if isinstance(typeobj, type):
-        typeobj = typeobj()
+    typeobj = to_instance(typeobj)
     for t in typeobj.__class__.__mro__[0:-1]:
         try:
             impltype = colspecs[t]
diff --git a/libs/sqlalchemy/sql/util.py b/libs/sqlalchemy/sql/util.py
index 4a35bb217..29cd0e2b0 100644
--- a/libs/sqlalchemy/sql/util.py
+++ b/libs/sqlalchemy/sql/util.py
@@ -1,5 +1,5 @@
 # sql/util.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -106,7 +106,7 @@ def join_condition(
 
     would produce an expression along the lines of::
 
-        tablea.c.id==tableb.c.tablea_id
+        tablea.c.id == tableb.c.tablea_id
 
     The join is determined based on the foreign key relationships
     between the two selectables.   If there are multiple ways
@@ -268,7 +268,7 @@ def visit_binary_product(
 
     The function is of the form::
 
-        def my_fn(binary, left, right)
+        def my_fn(binary, left, right): ...
 
     For each binary expression located which has a
     comparison operator, the product of "left" and
@@ -277,12 +277,11 @@ def visit_binary_product(
 
     Hence an expression like::
 
-        and_(
-            (a + b) == q + func.sum(e + f),
-            j == r
-        )
+        and_((a + b) == q + func.sum(e + f), j == r)
 
-    would have the traversal::
+    would have the traversal:
+
+    .. sourcecode:: text
 
         a <eq> q
         a <eq> e
@@ -528,9 +527,7 @@ def bind_values(clause):
 
     E.g.::
 
-        >>> expr = and_(
-        ...    table.c.foo==5, table.c.foo==7
-        ... )
+        >>> expr = and_(table.c.foo == 5, table.c.foo == 7)
         >>> bind_values(expr)
         [5, 7]
     """
@@ -1041,20 +1038,24 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal):
 
     E.g.::
 
-      table1 = Table('sometable', metadata,
-          Column('col1', Integer),
-          Column('col2', Integer)
-          )
-      table2 = Table('someothertable', metadata,
-          Column('col1', Integer),
-          Column('col2', Integer)
-          )
+      table1 = Table(
+          "sometable",
+          metadata,
+          Column("col1", Integer),
+          Column("col2", Integer),
+      )
+      table2 = Table(
+          "someothertable",
+          metadata,
+          Column("col1", Integer),
+          Column("col2", Integer),
+      )
 
       condition = table1.c.col1 == table2.c.col1
 
     make an alias of table1::
 
-      s = table1.alias('foo')
+      s = table1.alias("foo")
 
     calling ``ClauseAdapter(s).traverse(condition)`` converts
     condition to read::
diff --git a/libs/sqlalchemy/sql/visitors.py b/libs/sqlalchemy/sql/visitors.py
index d1cd7a939..e758350ad 100644
--- a/libs/sqlalchemy/sql/visitors.py
+++ b/libs/sqlalchemy/sql/visitors.py
@@ -1,5 +1,5 @@
 # sql/visitors.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -934,11 +934,13 @@ def traverse(
 
         from sqlalchemy.sql import visitors
 
-        stmt = select(some_table).where(some_table.c.foo == 'bar')
+        stmt = select(some_table).where(some_table.c.foo == "bar")
+
 
         def visit_bindparam(bind_param):
             print("found bound value: %s" % bind_param.value)
 
+
         visitors.traverse(stmt, {}, {"bindparam": visit_bindparam})
 
     The iteration of objects uses the :func:`.visitors.iterate` function,
diff --git a/libs/sqlalchemy/testing/__init__.py b/libs/sqlalchemy/testing/__init__.py
index d3a6f32c7..4e574bbb2 100644
--- a/libs/sqlalchemy/testing/__init__.py
+++ b/libs/sqlalchemy/testing/__init__.py
@@ -1,5 +1,5 @@
 # testing/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -83,6 +83,7 @@ from .util import provide_metadata
 from .util import resolve_lambda
 from .util import rowset
 from .util import run_as_contextmanager
+from .util import skip_if_timeout
 from .util import teardown_events
 from .warnings import assert_warnings
 from .warnings import warn_test_suite
diff --git a/libs/sqlalchemy/testing/assertions.py b/libs/sqlalchemy/testing/assertions.py
index baef79d18..8364c15f8 100644
--- a/libs/sqlalchemy/testing/assertions.py
+++ b/libs/sqlalchemy/testing/assertions.py
@@ -1,5 +1,5 @@
 # testing/assertions.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/assertsql.py b/libs/sqlalchemy/testing/assertsql.py
index ae4d335a9..81c7138c4 100644
--- a/libs/sqlalchemy/testing/assertsql.py
+++ b/libs/sqlalchemy/testing/assertsql.py
@@ -1,5 +1,5 @@
 # testing/assertsql.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/asyncio.py b/libs/sqlalchemy/testing/asyncio.py
index 17dc861c9..28470ba21 100644
--- a/libs/sqlalchemy/testing/asyncio.py
+++ b/libs/sqlalchemy/testing/asyncio.py
@@ -1,5 +1,5 @@
 # testing/asyncio.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -24,16 +24,21 @@ from functools import wraps
 import inspect
 
 from . import config
-from ..util.concurrency import _util_async_run
-from ..util.concurrency import _util_async_run_coroutine_function
+from ..util.concurrency import _AsyncUtil
 
 # may be set to False if the
 # --disable-asyncio flag is passed to the test runner.
 ENABLE_ASYNCIO = True
+_async_util = _AsyncUtil()  # it has lazy init so just always create one
+
+
+def _shutdown():
+    """called when the test finishes"""
+    _async_util.close()
 
 
 def _run_coroutine_function(fn, *args, **kwargs):
-    return _util_async_run_coroutine_function(fn, *args, **kwargs)
+    return _async_util.run(fn, *args, **kwargs)
 
 
 def _assume_async(fn, *args, **kwargs):
@@ -50,7 +55,7 @@ def _assume_async(fn, *args, **kwargs):
     if not ENABLE_ASYNCIO:
         return fn(*args, **kwargs)
 
-    return _util_async_run(fn, *args, **kwargs)
+    return _async_util.run_in_greenlet(fn, *args, **kwargs)
 
 
 def _maybe_async_provisioning(fn, *args, **kwargs):
@@ -69,7 +74,7 @@ def _maybe_async_provisioning(fn, *args, **kwargs):
         return fn(*args, **kwargs)
 
     if config.any_async:
-        return _util_async_run(fn, *args, **kwargs)
+        return _async_util.run_in_greenlet(fn, *args, **kwargs)
     else:
         return fn(*args, **kwargs)
 
@@ -89,7 +94,7 @@ def _maybe_async(fn, *args, **kwargs):
     is_async = config._current.is_async
 
     if is_async:
-        return _util_async_run(fn, *args, **kwargs)
+        return _async_util.run_in_greenlet(fn, *args, **kwargs)
     else:
         return fn(*args, **kwargs)
 
diff --git a/libs/sqlalchemy/testing/config.py b/libs/sqlalchemy/testing/config.py
index e2623ead5..2eec642b7 100644
--- a/libs/sqlalchemy/testing/config.py
+++ b/libs/sqlalchemy/testing/config.py
@@ -1,5 +1,5 @@
 # testing/config.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -122,7 +122,9 @@ def combinations(
      passed, each argument combination is turned into a pytest.param() object,
      mapping the elements of the argument tuple to produce an id based on a
      character value in the same position within the string template using the
-     following scheme::
+     following scheme:
+
+     .. sourcecode:: text
 
         i - the given argument is a string that is part of the id only, don't
             pass it as an argument
@@ -146,7 +148,7 @@ def combinations(
             (operator.ne, "ne"),
             (operator.gt, "gt"),
             (operator.lt, "lt"),
-            id_="na"
+            id_="na",
         )
         def test_operator(self, opfunc, name):
             pass
@@ -228,14 +230,9 @@ def variation(argname_or_fn, cases=None):
 
         @testing.variation("querytyp", ["select", "subquery", "legacy_query"])
         @testing.variation("lazy", ["select", "raise", "raise_on_sql"])
-        def test_thing(
-            self,
-            querytyp,
-            lazy,
-            decl_base
-        ):
+        def test_thing(self, querytyp, lazy, decl_base):
             class Thing(decl_base):
-                __tablename__ = 'thing'
+                __tablename__ = "thing"
 
                 # use name directly
                 rel = relationship("Rel", lazy=lazy.name)
@@ -250,7 +247,6 @@ def variation(argname_or_fn, cases=None):
             else:
                 querytyp.fail()
 
-
     The variable provided is a slots object of boolean variables, as well
     as the name of the case itself under the attribute ".name"
 
diff --git a/libs/sqlalchemy/testing/engines.py b/libs/sqlalchemy/testing/engines.py
index e055d99d2..51beed98b 100644
--- a/libs/sqlalchemy/testing/engines.py
+++ b/libs/sqlalchemy/testing/engines.py
@@ -1,5 +1,5 @@
 # testing/engines.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -330,16 +330,18 @@ def testing_engine(
     url = url or config.db.url
 
     url = make_url(url)
-    if options is None:
-        if config.db is None or url.drivername == config.db.url.drivername:
-            options = config.db_opts
-        else:
-            options = {}
-    elif config.db is not None and url.drivername == config.db.url.drivername:
-        default_opt = config.db_opts.copy()
-        default_opt.update(options)
 
-    engine = create_engine(url, **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 = {}
+
+    if options is not None:
+        use_options.update(options)
+
+    engine = create_engine(url, **use_options)
 
     if sqlite_savepoint and engine.name == "sqlite":
         # apply SQLite savepoint workaround
@@ -368,7 +370,12 @@ def testing_engine(
                 True  # enable event blocks, helps with profiling
             )
 
-    if isinstance(engine.pool, pool.QueuePool):
+    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
+    ):
         engine.pool._timeout = 0
         engine.pool._max_overflow = 0
     if use_reaper:
diff --git a/libs/sqlalchemy/testing/entities.py b/libs/sqlalchemy/testing/entities.py
index 8f0f36bd1..5bd4f7de2 100644
--- a/libs/sqlalchemy/testing/entities.py
+++ b/libs/sqlalchemy/testing/entities.py
@@ -1,5 +1,5 @@
 # testing/entities.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 addc4b759..8ff9b6443 100644
--- a/libs/sqlalchemy/testing/exclusions.py
+++ b/libs/sqlalchemy/testing/exclusions.py
@@ -1,5 +1,5 @@
 # testing/exclusions.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/__init__.py b/libs/sqlalchemy/testing/fixtures/__init__.py
index 5981fb583..f2948dee8 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 0697f4902..09d45a0a2 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/mypy.py b/libs/sqlalchemy/testing/fixtures/mypy.py
index 149df9f7d..0832d8924 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/orm.py b/libs/sqlalchemy/testing/fixtures/orm.py
index 5ddd21ec6..77cb243a8 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 144851062..44cf21c24 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -459,6 +459,10 @@ def insertmanyvalues_fixture(
         # by not having the other methods we assert that those aren't being
         # used
 
+        @property
+        def description(self):
+            return self.cursor.description
+
         def fetchall(self):
             rows = self.cursor.fetchall()
             rows = list(rows)
@@ -466,22 +470,29 @@ def insertmanyvalues_fixture(
             return rows
 
     def _deliver_insertmanyvalues_batches(
-        cursor, statement, parameters, generic_setinputsizes, context
+        connection,
+        cursor,
+        statement,
+        parameters,
+        generic_setinputsizes,
+        context,
     ):
         if randomize_rows:
             cursor = RandomCursor(cursor)
         for batch in orig_dialect(
-            cursor, statement, parameters, generic_setinputsizes, context
+            connection,
+            cursor,
+            statement,
+            parameters,
+            generic_setinputsizes,
+            context,
         ):
             if warn_on_downgraded and batch.is_downgraded:
                 util.warn("Batches were downgraded for sorted INSERT")
 
             yield batch
 
-    def _exec_insertmany_context(
-        dialect,
-        context,
-    ):
+    def _exec_insertmany_context(dialect, context):
         with mock.patch.object(
             dialect,
             "_deliver_insertmanyvalues_batches",
diff --git a/libs/sqlalchemy/testing/pickleable.py b/libs/sqlalchemy/testing/pickleable.py
index 761891ad4..9317be63b 100644
--- a/libs/sqlalchemy/testing/pickleable.py
+++ b/libs/sqlalchemy/testing/pickleable.py
@@ -1,5 +1,5 @@
 # testing/pickleable.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 0f9877731..ce960be96 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 d0d375458..2ad4d9915 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 a642668be..2dfa44141 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/pytestplugin.py b/libs/sqlalchemy/testing/plugin/pytestplugin.py
index b63e06359..f6d47c631 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -182,6 +182,12 @@ def pytest_sessionfinish(session):
         collect_types.dump_stats(session.config.option.dump_pyannotate)
 
 
+def pytest_unconfigure(config):
+    from sqlalchemy.testing import asyncio
+
+    asyncio._shutdown()
+
+
 def pytest_collection_finish(session):
     if session.config.option.dump_pyannotate:
         from pyannotate_runtime import collect_types
diff --git a/libs/sqlalchemy/testing/profiling.py b/libs/sqlalchemy/testing/profiling.py
index b9093c901..0d90947e4 100644
--- a/libs/sqlalchemy/testing/profiling.py
+++ b/libs/sqlalchemy/testing/profiling.py
@@ -1,5 +1,5 @@
 # testing/profiling.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/provision.py b/libs/sqlalchemy/testing/provision.py
index e50c6eb5d..3afcf119b 100644
--- a/libs/sqlalchemy/testing/provision.py
+++ b/libs/sqlalchemy/testing/provision.py
@@ -1,5 +1,5 @@
 # testing/provision.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -108,7 +108,9 @@ def generate_db_urls(db_urls, extra_drivers):
     """Generate a set of URLs to test given configured URLs plus additional
     driver names.
 
-    Given::
+    Given:
+
+    .. sourcecode:: text
 
         --dburi postgresql://db1  \
         --dburi postgresql://db2  \
@@ -116,7 +118,9 @@ def generate_db_urls(db_urls, extra_drivers):
         --dbdriver=psycopg2 --dbdriver=asyncpg?async_fallback=true
 
     Noting that the default postgresql driver is psycopg2,  the output
-    would be::
+    would be:
+
+    .. sourcecode:: text
 
         postgresql+psycopg2://db1
         postgresql+asyncpg://db1
@@ -133,6 +137,8 @@ def generate_db_urls(db_urls, extra_drivers):
     driver name. For example, to enable the async fallback option for
     asyncpg::
 
+    .. sourcecode:: text
+
         --dburi postgresql://db1  \
         --dbdriver=asyncpg?async_fallback=true
 
@@ -362,7 +368,7 @@ def update_db_opts(db_url, db_opts, options):
 def post_configure_engine(url, engine, follower_ident):
     """Perform extra steps after configuring an engine for testing.
 
-    (For the internal dialects, currently only used by sqlite, oracle)
+    (For the internal dialects, currently only used by sqlite, oracle, mssql)
     """
 
 
diff --git a/libs/sqlalchemy/testing/requirements.py b/libs/sqlalchemy/testing/requirements.py
index 31aac741d..bbf56a059 100644
--- a/libs/sqlalchemy/testing/requirements.py
+++ b/libs/sqlalchemy/testing/requirements.py
@@ -1,5 +1,5 @@
 # testing/requirements.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -91,7 +91,9 @@ class SuiteRequirements(Requirements):
 
     @property
     def table_value_constructor(self):
-        """Database / dialect supports a query like::
+        """Database / dialect supports a query like:
+
+        .. sourcecode:: sql
 
              SELECT * FROM VALUES ( (c1, c2), (c1, c2), ...)
              AS some_table(col1, col2)
@@ -796,6 +798,11 @@ class SuiteRequirements(Requirements):
         """target dialect supports reflection of unique constraints"""
         return exclusions.open()
 
+    @property
+    def inline_check_constraint_reflection(self):
+        """target dialect supports reflection of inline check constraints"""
+        return exclusions.closed()
+
     @property
     def check_constraint_reflection(self):
         """target dialect supports reflection of check constraints"""
@@ -987,7 +994,9 @@ class SuiteRequirements(Requirements):
     @property
     def binary_literals(self):
         """target backend supports simple binary literals, e.g. an
-        expression like::
+        expression like:
+
+        .. sourcecode:: sql
 
             SELECT CAST('foo' AS BINARY)
 
@@ -1093,6 +1102,11 @@ class SuiteRequirements(Requirements):
 
         return exclusions.only_if(go)
 
+    @property
+    def array_type(self):
+        """Target platform implements a native ARRAY type"""
+        return exclusions.closed()
+
     @property
     def json_type(self):
         """target platform implements a native JSON type."""
@@ -1163,9 +1177,7 @@ class SuiteRequirements(Requirements):
 
             expr = decimal.Decimal("15.7563")
 
-            value = e.scalar(
-                select(literal(expr))
-            )
+            value = e.scalar(select(literal(expr)))
 
             assert value == expr
 
@@ -1333,7 +1345,9 @@ class SuiteRequirements(Requirements):
         present in a subquery in the WHERE clause.
 
         This is an ANSI-standard syntax that apparently MySQL can't handle,
-        such as::
+        such as:
+
+        .. sourcecode:: sql
 
             UPDATE documents SET flag=1 WHERE documents.title IN
                 (SELECT max(documents.title) AS title
@@ -1366,7 +1380,11 @@ class SuiteRequirements(Requirements):
         """target database supports ordering by a column from a SELECT
         inside of a UNION
 
-        E.g.  (SELECT id, ...) UNION (SELECT id, ...) ORDER BY id
+        E.g.:
+
+        .. sourcecode:: sql
+
+            (SELECT id, ...) UNION (SELECT id, ...) ORDER BY id
 
         """
         return exclusions.open()
@@ -1376,7 +1394,9 @@ class SuiteRequirements(Requirements):
         """target backend supports ORDER BY a column label within an
         expression.
 
-        Basically this::
+        Basically this:
+
+        .. sourcecode:: sql
 
             select data as foo from test order by foo || 'bar'
 
@@ -1781,3 +1801,28 @@ class SuiteRequirements(Requirements):
     def materialized_views_reflect_pk(self):
         """Target database reflect MATERIALIZED VIEWs pks."""
         return exclusions.closed()
+
+    @property
+    def supports_bitwise_or(self):
+        """Target database supports bitwise or"""
+        return exclusions.closed()
+
+    @property
+    def supports_bitwise_and(self):
+        """Target database supports bitwise and"""
+        return exclusions.closed()
+
+    @property
+    def supports_bitwise_not(self):
+        """Target database supports bitwise not"""
+        return exclusions.closed()
+
+    @property
+    def supports_bitwise_xor(self):
+        """Target database supports bitwise xor"""
+        return exclusions.closed()
+
+    @property
+    def supports_bitwise_shift(self):
+        """Target database supports bitwise left or right shift"""
+        return exclusions.closed()
diff --git a/libs/sqlalchemy/testing/schema.py b/libs/sqlalchemy/testing/schema.py
index 7dfd33d4d..0dd7de202 100644
--- a/libs/sqlalchemy/testing/schema.py
+++ b/libs/sqlalchemy/testing/schema.py
@@ -1,5 +1,5 @@
 # testing/schema.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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/__init__.py b/libs/sqlalchemy/testing/suite/__init__.py
index a146cb316..8435aa004 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 5d37880e1..4e4d420fa 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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_ddl.py b/libs/sqlalchemy/testing/suite/test_ddl.py
index 3d9b8ec13..c7e7d817d 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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_deprecations.py b/libs/sqlalchemy/testing/suite/test_deprecations.py
index 07970c03e..db0a9fc48 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 696472037..ae67cc10a 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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_insert.py b/libs/sqlalchemy/testing/suite/test_insert.py
index 1cff044bc..8467c3517 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 f257d2fcb..54d0d449a 100644
--- a/libs/sqlalchemy/testing/suite/test_reflection.py
+++ b/libs/sqlalchemy/testing/suite/test_reflection.py
@@ -1,11 +1,12 @@
 # testing/suite/test_reflection.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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
 import operator
 import re
 
@@ -2454,62 +2455,158 @@ class TableNoColumnsTest(fixtures.TestBase):
 class ComponentReflectionTestExtra(ComparesIndexes, fixtures.TestBase):
     __backend__ = True
 
-    @testing.combinations(
-        (True, testing.requires.schemas), (False,), argnames="use_schema"
-    )
-    @testing.requires.check_constraint_reflection
-    def test_get_check_constraints(self, metadata, connection, use_schema):
-        if use_schema:
-            schema = config.test_schema
+    @testing.fixture(params=[True, False])
+    def use_schema_fixture(self, request):
+        if request.param:
+            return config.test_schema
         else:
-            schema = None
+            return None
 
-        Table(
-            "sa_cc",
-            metadata,
-            Column("a", Integer()),
-            sa.CheckConstraint("a > 1 AND a < 5", name="cc1"),
-            sa.CheckConstraint(
-                "a = 1 OR (a > 2 AND a < 5)", name="UsesCasing"
-            ),
-            schema=schema,
-        )
-        Table(
-            "no_constraints",
-            metadata,
-            Column("data", sa.String(20)),
-            schema=schema,
-        )
+    @testing.fixture()
+    def inspect_for_table(self, metadata, connection, use_schema_fixture):
+        @contextlib.contextmanager
+        def go(tablename):
+            yield use_schema_fixture, inspect(connection)
 
-        metadata.create_all(connection)
+            metadata.create_all(connection)
 
-        insp = inspect(connection)
-        reflected = sorted(
-            insp.get_check_constraints("sa_cc", schema=schema),
-            key=operator.itemgetter("name"),
-        )
+        return go
 
+    def ck_eq(self, reflected, expected):
         # trying to minimize effect of quoting, parenthesis, etc.
         # may need to add more to this as new dialects get CHECK
         # constraint reflection support
         def normalize(sqltext):
             return " ".join(
-                re.findall(r"and|\d|=|a|or|<|>", sqltext.lower(), re.I)
+                re.findall(r"and|\d|=|a|b|c|or|<|>", sqltext.lower(), re.I)
             )
 
-        reflected = [
-            {"name": item["name"], "sqltext": normalize(item["sqltext"])}
-            for item in reflected
-        ]
-        eq_(
+        reflected = sorted(
+            [
+                {"name": item["name"], "sqltext": normalize(item["sqltext"])}
+                for item in reflected
+            ],
+            key=lambda item: (item["sqltext"]),
+        )
+
+        expected = sorted(
+            expected,
+            key=lambda item: (item["sqltext"]),
+        )
+        eq_(reflected, expected)
+
+    @testing.requires.check_constraint_reflection
+    def test_check_constraint_no_constraint(self, metadata, inspect_for_table):
+        with inspect_for_table("no_constraints") as (schema, inspector):
+            Table(
+                "no_constraints",
+                metadata,
+                Column("data", sa.String(20)),
+                schema=schema,
+            )
+
+        self.ck_eq(
+            inspector.get_check_constraints("no_constraints", schema=schema),
+            [],
+        )
+
+    @testing.requires.inline_check_constraint_reflection
+    @testing.combinations(
+        "my_inline", "MyInline", None, argnames="constraint_name"
+    )
+    def test_check_constraint_inline(
+        self, metadata, inspect_for_table, constraint_name
+    ):
+
+        with inspect_for_table("sa_cc") as (schema, inspector):
+            Table(
+                "sa_cc",
+                metadata,
+                Column("id", Integer(), primary_key=True),
+                Column(
+                    "a",
+                    Integer(),
+                    sa.CheckConstraint(
+                        "a > 1 AND a < 5", name=constraint_name
+                    ),
+                ),
+                Column("data", String(50)),
+                schema=schema,
+            )
+
+        reflected = inspector.get_check_constraints("sa_cc", schema=schema)
+
+        self.ck_eq(
             reflected,
             [
-                {"name": "UsesCasing", "sqltext": "a = 1 or a > 2 and a < 5"},
-                {"name": "cc1", "sqltext": "a > 1 and a < 5"},
+                {
+                    "name": constraint_name or mock.ANY,
+                    "sqltext": "a > 1 and a < 5",
+                },
+            ],
+        )
+
+    @testing.requires.check_constraint_reflection
+    @testing.combinations(
+        "my_ck_const", "MyCkConst", None, argnames="constraint_name"
+    )
+    def test_check_constraint_standalone(
+        self, metadata, inspect_for_table, constraint_name
+    ):
+        with inspect_for_table("sa_cc") as (schema, inspector):
+            Table(
+                "sa_cc",
+                metadata,
+                Column("a", Integer()),
+                sa.CheckConstraint(
+                    "a = 1 OR (a > 2 AND a < 5)", name=constraint_name
+                ),
+                schema=schema,
+            )
+
+        reflected = inspector.get_check_constraints("sa_cc", schema=schema)
+
+        self.ck_eq(
+            reflected,
+            [
+                {
+                    "name": constraint_name or mock.ANY,
+                    "sqltext": "a = 1 or a > 2 and a < 5",
+                },
+            ],
+        )
+
+    @testing.requires.inline_check_constraint_reflection
+    def test_check_constraint_mixed(self, metadata, inspect_for_table):
+        with inspect_for_table("sa_cc") as (schema, inspector):
+            Table(
+                "sa_cc",
+                metadata,
+                Column("id", Integer(), primary_key=True),
+                Column("a", Integer(), sa.CheckConstraint("a > 1 AND a < 5")),
+                Column(
+                    "b",
+                    Integer(),
+                    sa.CheckConstraint("b > 1 AND b < 5", name="my_inline"),
+                ),
+                Column("c", Integer()),
+                Column("data", String(50)),
+                sa.UniqueConstraint("data", name="some_uq"),
+                sa.CheckConstraint("c > 1 AND c < 5", name="cc1"),
+                sa.UniqueConstraint("c", name="some_c_uq"),
+                schema=schema,
+            )
+
+        reflected = inspector.get_check_constraints("sa_cc", schema=schema)
+
+        self.ck_eq(
+            reflected,
+            [
+                {"name": "cc1", "sqltext": "c > 1 and c < 5"},
+                {"name": "my_inline", "sqltext": "b > 1 and b < 5"},
+                {"name": mock.ANY, "sqltext": "a > 1 and a < 5"},
             ],
         )
-        no_cst = "no_constraints"
-        eq_(insp.get_check_constraints(no_cst, schema=schema), [])
 
     @testing.requires.indexes_with_expressions
     def test_reflect_expression_based_indexes(self, metadata, connection):
diff --git a/libs/sqlalchemy/testing/suite/test_results.py b/libs/sqlalchemy/testing/suite/test_results.py
index b3f432fb7..a6179d855 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,6 +7,7 @@
 # mypy: ignore-errors
 
 import datetime
+import re
 
 from .. import engines
 from .. import fixtures
@@ -273,6 +274,8 @@ class ServerSideCursorsTest(
             return getattr(cursor, "server_side", False)
         elif self.engine.dialect.driver == "psycopg":
             return bool(getattr(cursor, "name", False))
+        elif self.engine.dialect.driver == "oracledb":
+            return getattr(cursor, "server_side", False)
         else:
             return False
 
@@ -293,11 +296,26 @@ class ServerSideCursorsTest(
             )
         return self.engine
 
+    def stringify(self, str_):
+        return re.compile(r"SELECT (\d+)", re.I).sub(
+            lambda m: str(select(int(m.group(1))).compile(testing.db)), str_
+        )
+
     @testing.combinations(
-        ("global_string", True, "select 1", True),
-        ("global_text", True, text("select 1"), True),
+        ("global_string", True, lambda stringify: stringify("select 1"), True),
+        (
+            "global_text",
+            True,
+            lambda stringify: text(stringify("select 1")),
+            True,
+        ),
         ("global_expr", True, select(1), True),
-        ("global_off_explicit", False, text("select 1"), False),
+        (
+            "global_off_explicit",
+            False,
+            lambda stringify: text(stringify("select 1")),
+            False,
+        ),
         (
             "stmt_option",
             False,
@@ -315,15 +333,22 @@ class ServerSideCursorsTest(
         (
             "for_update_string",
             True,
-            "SELECT 1 FOR UPDATE",
+            lambda stringify: stringify("SELECT 1 FOR UPDATE"),
             True,
             testing.skip_if(["sqlite", "mssql"]),
         ),
-        ("text_no_ss", False, text("select 42"), False),
+        (
+            "text_no_ss",
+            False,
+            lambda stringify: text(stringify("select 42")),
+            False,
+        ),
         (
             "text_ss_option",
             False,
-            text("select 42").execution_options(stream_results=True),
+            lambda stringify: text(stringify("select 42")).execution_options(
+                stream_results=True
+            ),
             True,
         ),
         id_="iaaa",
@@ -334,6 +359,11 @@ class ServerSideCursorsTest(
     ):
         engine = self._fixture(engine_ss_arg)
         with engine.begin() as conn:
+            if callable(statement):
+                statement = testing.resolve_lambda(
+                    statement, stringify=self.stringify
+                )
+
             if isinstance(statement, str):
                 result = conn.exec_driver_sql(statement)
             else:
@@ -348,7 +378,7 @@ class ServerSideCursorsTest(
             # should be enabled for this one
             result = conn.execution_options(
                 stream_results=True
-            ).exec_driver_sql("select 1")
+            ).exec_driver_sql(self.stringify("select 1"))
             assert self._is_server_side(result.cursor)
 
             # the connection has autobegun, which means at the end of the
@@ -402,7 +432,9 @@ class ServerSideCursorsTest(
         test_table = Table(
             "test_table",
             md,
-            Column("id", Integer, primary_key=True),
+            Column(
+                "id", Integer, primary_key=True, test_needs_autoincrement=True
+            ),
             Column("data", String(50)),
         )
 
@@ -442,7 +474,9 @@ class ServerSideCursorsTest(
         test_table = Table(
             "test_table",
             md,
-            Column("id", Integer, primary_key=True),
+            Column(
+                "id", Integer, primary_key=True, test_needs_autoincrement=True
+            ),
             Column("data", String(50)),
         )
 
diff --git a/libs/sqlalchemy/testing/suite/test_rowcount.py b/libs/sqlalchemy/testing/suite/test_rowcount.py
index a7dbd364f..59953fff5 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 866bf09cb..7eb5cd005 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1886,3 +1886,114 @@ class IsOrIsNotDistinctFromTest(fixtures.TablesTest):
             len(result),
             expected_row_count_for_is_not,
         )
+
+
+class WindowFunctionTest(fixtures.TablesTest):
+    __requires__ = ("window_functions",)
+
+    __backend__ = True
+
+    @classmethod
+    def define_tables(cls, metadata):
+        Table(
+            "some_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("col1", Integer),
+            Column("col2", Integer),
+        )
+
+    @classmethod
+    def insert_data(cls, connection):
+        connection.execute(
+            cls.tables.some_table.insert(),
+            [{"id": i, "col1": i, "col2": i * 5} for i in range(1, 50)],
+        )
+
+    def test_window(self, connection):
+        some_table = self.tables.some_table
+        rows = connection.execute(
+            select(
+                func.max(some_table.c.col2).over(
+                    order_by=[some_table.c.col1.desc()]
+                )
+            ).where(some_table.c.col1 < 20)
+        ).all()
+
+        eq_(rows, [(95,) for i in range(19)])
+
+    def test_window_rows_between(self, connection):
+        some_table = self.tables.some_table
+
+        # note the rows are part of the cache key right now, not handled
+        # as binds.  this is issue #11515
+        rows = connection.execute(
+            select(
+                func.max(some_table.c.col2).over(
+                    order_by=[some_table.c.col1],
+                    rows=(-5, 0),
+                )
+            )
+        ).all()
+
+        eq_(rows, [(i,) for i in range(5, 250, 5)])
+
+
+class BitwiseTest(fixtures.TablesTest):
+    __backend__ = True
+    run_inserts = run_deletes = "once"
+
+    inserted_data = [{"a": i, "b": i + 1} for i in range(10)]
+
+    @classmethod
+    def define_tables(cls, metadata):
+        Table("bitwise", metadata, Column("a", Integer), Column("b", Integer))
+
+    @classmethod
+    def insert_data(cls, connection):
+        connection.execute(cls.tables.bitwise.insert(), cls.inserted_data)
+
+    @testing.combinations(
+        (
+            lambda a: a.bitwise_xor(5),
+            [i for i in range(10) if i != 5],
+            testing.requires.supports_bitwise_xor,
+        ),
+        (
+            lambda a: a.bitwise_or(1),
+            list(range(10)),
+            testing.requires.supports_bitwise_or,
+        ),
+        (
+            lambda a: a.bitwise_and(4),
+            list(range(4, 8)),
+            testing.requires.supports_bitwise_and,
+        ),
+        (
+            lambda a: (a - 2).bitwise_not(),
+            [0],
+            testing.requires.supports_bitwise_not,
+        ),
+        (
+            lambda a: a.bitwise_lshift(1),
+            list(range(1, 10)),
+            testing.requires.supports_bitwise_shift,
+        ),
+        (
+            lambda a: a.bitwise_rshift(2),
+            list(range(4, 10)),
+            testing.requires.supports_bitwise_shift,
+        ),
+        argnames="case, expected",
+    )
+    def test_bitwise(self, case, expected, connection):
+        tbl = self.tables.bitwise
+
+        a = tbl.c.a
+
+        op = testing.resolve_lambda(case, a=a)
+
+        stmt = select(tbl).where(op > 0).order_by(a)
+
+        res = connection.execute(stmt).mappings().all()
+        eq_(res, [self.inserted_data[i] for i in expected])
diff --git a/libs/sqlalchemy/testing/suite/test_sequence.py b/libs/sqlalchemy/testing/suite/test_sequence.py
index 138616f13..f0e657537 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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_types.py b/libs/sqlalchemy/testing/suite/test_types.py
index 4a7c1f199..de3cd53e3 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,6 +32,7 @@ from ... import case
 from ... import cast
 from ... import Date
 from ... import DateTime
+from ... import Enum
 from ... import Float
 from ... import Integer
 from ... import Interval
@@ -1918,6 +1919,74 @@ class JSONLegacyStringCastIndexTest(
         )
 
 
+class EnumTest(_LiteralRoundTripFixture, fixtures.TablesTest):
+    __backend__ = True
+
+    enum_values = "a", "b", "a%", "b%percent", "réveillé"
+
+    datatype = Enum(*enum_values, name="myenum")
+
+    @classmethod
+    def define_tables(cls, metadata):
+        Table(
+            "enum_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("enum_data", cls.datatype),
+        )
+
+    @testing.combinations(*enum_values, argnames="data")
+    def test_round_trip(self, data, connection):
+        connection.execute(
+            self.tables.enum_table.insert(), {"id": 1, "enum_data": data}
+        )
+
+        eq_(
+            connection.scalar(
+                select(self.tables.enum_table.c.enum_data).where(
+                    self.tables.enum_table.c.id == 1
+                )
+            ),
+            data,
+        )
+
+    def test_round_trip_executemany(self, connection):
+        connection.execute(
+            self.tables.enum_table.insert(),
+            [
+                {"id": 1, "enum_data": "b%percent"},
+                {"id": 2, "enum_data": "réveillé"},
+                {"id": 3, "enum_data": "b"},
+                {"id": 4, "enum_data": "a%"},
+            ],
+        )
+
+        eq_(
+            connection.scalars(
+                select(self.tables.enum_table.c.enum_data).order_by(
+                    self.tables.enum_table.c.id
+                )
+            ).all(),
+            ["b%percent", "réveillé", "b", "a%"],
+        )
+
+    @testing.requires.insert_executemany_returning
+    def test_round_trip_executemany_returning(self, connection):
+        result = connection.execute(
+            self.tables.enum_table.insert().returning(
+                self.tables.enum_table.c.enum_data
+            ),
+            [
+                {"id": 1, "enum_data": "b%percent"},
+                {"id": 2, "enum_data": "réveillé"},
+                {"id": 3, "enum_data": "b"},
+                {"id": 4, "enum_data": "a%"},
+            ],
+        )
+
+        eq_(result.scalars().all(), ["b%percent", "réveillé", "b", "a%"])
+
+
 class UuidTest(_LiteralRoundTripFixture, fixtures.TablesTest):
     __backend__ = True
 
@@ -2066,6 +2135,7 @@ __all__ = (
     "DateHistoricTest",
     "StringTest",
     "BooleanTest",
+    "EnumTest",
     "UuidTest",
     "NativeUUIDTest",
 )
diff --git a/libs/sqlalchemy/testing/suite/test_unicode_ddl.py b/libs/sqlalchemy/testing/suite/test_unicode_ddl.py
index 1f15ab564..c8dd33505 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 fd4757f9a..85a8d3933 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/util.py b/libs/sqlalchemy/testing/util.py
index a6ce6ca3c..42f077108 100644
--- a/libs/sqlalchemy/testing/util.py
+++ b/libs/sqlalchemy/testing/util.py
@@ -1,5 +1,5 @@
 # testing/util.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,13 +10,16 @@
 from __future__ import annotations
 
 from collections import deque
+import contextlib
 import decimal
 import gc
 from itertools import chain
 import random
 import sys
 from sys import getsizeof
+import time
 import types
+from typing import Any
 
 from . import config
 from . import mock
@@ -251,18 +254,19 @@ def flag_combinations(*combinations):
             dict(lazy=False, passive=True),
             dict(lazy=False, passive=True, raiseload=True),
         )
-
+        def test_fn(lazy, passive, raiseload): ...
 
     would result in::
 
         @testing.combinations(
-            ('', False, False, False),
-            ('lazy', True, False, False),
-            ('lazy_passive', True, True, False),
-            ('lazy_passive', True, True, True),
-            id_='iaaa',
-            argnames='lazy,passive,raiseload'
+            ("", False, False, False),
+            ("lazy", True, False, False),
+            ("lazy_passive", True, True, False),
+            ("lazy_passive", True, True, True),
+            id_="iaaa",
+            argnames="lazy,passive,raiseload",
         )
+        def test_fn(lazy, passive, raiseload): ...
 
     """
 
@@ -517,3 +521,18 @@ def count_cache_key_tuples(tup):
             if elem:
                 stack = list(elem) + [sentinel] + stack
     return num_elements
+
+
+@contextlib.contextmanager
+def skip_if_timeout(seconds: float, cleanup: Any = None):
+
+    now = time.time()
+    yield
+    sec = time.time() - now
+    if sec > seconds:
+        try:
+            cleanup()
+        finally:
+            config.skip_test(
+                f"test took too long ({sec:.4f} seconds > {seconds})"
+            )
diff --git a/libs/sqlalchemy/testing/warnings.py b/libs/sqlalchemy/testing/warnings.py
index baef037f7..9be0813b5 100644
--- a/libs/sqlalchemy/testing/warnings.py
+++ b/libs/sqlalchemy/testing/warnings.py
@@ -1,5 +1,5 @@
 # testing/warnings.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 a5bb56cf6..c2b1ab194 100644
--- a/libs/sqlalchemy/types.py
+++ b/libs/sqlalchemy/types.py
@@ -1,5 +1,5 @@
 # types.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/__init__.py b/libs/sqlalchemy/util/__init__.py
index 69424e7cc..a9b4c3b1c 100644
--- a/libs/sqlalchemy/util/__init__.py
+++ b/libs/sqlalchemy/util/__init__.py
@@ -1,5 +1,5 @@
 # util/__init__.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -65,6 +65,7 @@ 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 py38 as py38
 from .compat import py39 as py39
 from .compat import pypy as pypy
diff --git a/libs/sqlalchemy/util/_collections.py b/libs/sqlalchemy/util/_collections.py
index e3a8ad834..12283eba9 100644
--- a/libs/sqlalchemy/util/_collections.py
+++ b/libs/sqlalchemy/util/_collections.py
@@ -1,5 +1,5 @@
 # util/_collections.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,6 +16,7 @@ import typing
 from typing import Any
 from typing import Callable
 from typing import cast
+from typing import Container
 from typing import Dict
 from typing import FrozenSet
 from typing import Generic
@@ -79,8 +80,8 @@ def merge_lists_w_ordering(a: List[Any], b: List[Any]) -> List[Any]:
 
     Example::
 
-        >>> a = ['__tablename__', 'id', 'x', 'created_at']
-        >>> b = ['id', 'name', 'data', 'y', 'created_at']
+        >>> a = ["__tablename__", "id", "x", "created_at"]
+        >>> b = ["id", "name", "data", "y", "created_at"]
         >>> merge_lists_w_ordering(a, b)
         ['__tablename__', 'id', 'name', 'data', 'y', 'x', 'created_at']
 
@@ -425,15 +426,14 @@ def to_list(x: Any, default: Optional[List[Any]] = None) -> List[Any]:
         return list(x)
 
 
-def has_intersection(set_, iterable):
+def has_intersection(set_: Container[Any], iterable: Iterable[Any]) -> bool:
     r"""return True if any items of set\_ are present in iterable.
 
     Goes through special effort to ensure __hash__ is not called
     on items in iterable that don't support it.
 
     """
-    # TODO: optimize, write in C, etc.
-    return bool(set_.intersection([i for i in iterable if i.__hash__]))
+    return any(i in set_ for i in iterable if i.__hash__)
 
 
 def to_set(x):
diff --git a/libs/sqlalchemy/util/_concurrency_py3k.py b/libs/sqlalchemy/util/_concurrency_py3k.py
index 42ceb8122..718c077c0 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -19,10 +19,14 @@ from typing import Coroutine
 from typing import Optional
 from typing import TYPE_CHECKING
 from typing import TypeVar
+from typing import Union
 
 from .langhelpers import memoized_property
 from .. import exc
+from ..util import py311
+from ..util.typing import Literal
 from ..util.typing import Protocol
+from ..util.typing import Self
 from ..util.typing import TypeGuard
 
 _T = TypeVar("_T")
@@ -70,9 +74,10 @@ def is_exit_exception(e: BaseException) -> bool:
 class _AsyncIoGreenlet(greenlet):
     dead: bool
 
+    __sqlalchemy_greenlet_provider__ = True
+
     def __init__(self, fn: Callable[..., Any], driver: greenlet):
         greenlet.__init__(self, fn, driver)
-        self.driver = driver
         if _has_gr_context:
             self.gr_context = driver.gr_context
 
@@ -98,7 +103,7 @@ def _safe_cancel_awaitable(awaitable: Awaitable[Any]) -> None:
 
 def in_greenlet() -> bool:
     current = getcurrent()
-    return isinstance(current, _AsyncIoGreenlet)
+    return getattr(current, "__sqlalchemy_greenlet_provider__", False)
 
 
 def await_only(awaitable: Awaitable[_T]) -> _T:
@@ -112,7 +117,7 @@ def await_only(awaitable: Awaitable[_T]) -> _T:
     """
     # this is called in the context greenlet while running fn
     current = getcurrent()
-    if not isinstance(current, _AsyncIoGreenlet):
+    if not getattr(current, "__sqlalchemy_greenlet_provider__", False):
         _safe_cancel_awaitable(awaitable)
 
         raise exc.MissingGreenlet(
@@ -124,7 +129,7 @@ def await_only(awaitable: Awaitable[_T]) -> _T:
     # a coroutine to run. Once the awaitable is done, the driver greenlet
     # switches back to this greenlet with the result of awaitable that is
     # then returned to the caller (or raised as error)
-    return current.driver.switch(awaitable)  # type: ignore[no-any-return]
+    return current.parent.switch(awaitable)  # type: ignore[no-any-return,attr-defined] # noqa: E501
 
 
 def await_fallback(awaitable: Awaitable[_T]) -> _T:
@@ -144,7 +149,7 @@ def await_fallback(awaitable: Awaitable[_T]) -> _T:
 
     # this is called in the context greenlet while running fn
     current = getcurrent()
-    if not isinstance(current, _AsyncIoGreenlet):
+    if not getattr(current, "__sqlalchemy_greenlet_provider__", False):
         loop = get_event_loop()
         if loop.is_running():
             _safe_cancel_awaitable(awaitable)
@@ -156,7 +161,7 @@ def await_fallback(awaitable: Awaitable[_T]) -> _T:
             )
         return loop.run_until_complete(awaitable)
 
-    return current.driver.switch(awaitable)  # type: ignore[no-any-return]
+    return current.parent.switch(awaitable)  # type: ignore[no-any-return,attr-defined] # noqa: E501
 
 
 async def greenlet_spawn(
@@ -182,24 +187,21 @@ async def greenlet_spawn(
     # coroutine to wait. If the context is dead the function has
     # returned, and its result can be returned.
     switch_occurred = False
-    try:
-        result = context.switch(*args, **kwargs)
-        while not context.dead:
-            switch_occurred = True
-            try:
-                # wait for a coroutine from await_only and then return its
-                # result back to it.
-                value = await result
-            except BaseException:
-                # this allows an exception to be raised within
-                # the moderated greenlet so that it can continue
-                # its expected flow.
-                result = context.throw(*sys.exc_info())
-            else:
-                result = context.switch(value)
-    finally:
-        # clean up to avoid cycle resolution by gc
-        del context.driver
+    result = context.switch(*args, **kwargs)
+    while not context.dead:
+        switch_occurred = True
+        try:
+            # wait for a coroutine from await_only and then return its
+            # result back to it.
+            value = await result
+        except BaseException:
+            # this allows an exception to be raised within
+            # the moderated greenlet so that it can continue
+            # its expected flow.
+            result = context.throw(*sys.exc_info())
+        else:
+            result = context.switch(value)
+
     if _require_await and not switch_occurred:
         raise exc.AwaitRequired(
             "The current operation required an async execution but none was "
@@ -225,34 +227,6 @@ class AsyncAdaptedLock:
         self.mutex.release()
 
 
-def _util_async_run_coroutine_function(
-    fn: Callable[..., Coroutine[Any, Any, Any]], *args: Any, **kwargs: Any
-) -> Any:
-    """for test suite/ util only"""
-
-    loop = get_event_loop()
-    if loop.is_running():
-        raise Exception(
-            "for async run coroutine we expect that no greenlet or event "
-            "loop is running when we start out"
-        )
-    return loop.run_until_complete(fn(*args, **kwargs))
-
-
-def _util_async_run(
-    fn: Callable[..., Coroutine[Any, Any, Any]], *args: Any, **kwargs: Any
-) -> Any:
-    """for test suite/ util only"""
-
-    loop = get_event_loop()
-    if not loop.is_running():
-        return loop.run_until_complete(greenlet_spawn(fn, *args, **kwargs))
-    else:
-        # allow for a wrapped test function to call another
-        assert isinstance(getcurrent(), _AsyncIoGreenlet)
-        return fn(*args, **kwargs)
-
-
 def get_event_loop() -> asyncio.AbstractEventLoop:
     """vendor asyncio.get_event_loop() for python 3.7 and above.
 
@@ -265,3 +239,50 @@ def get_event_loop() -> asyncio.AbstractEventLoop:
         # avoid "During handling of the above exception, another exception..."
         pass
     return asyncio.get_event_loop_policy().get_event_loop()
+
+
+if not TYPE_CHECKING and py311:
+    _Runner = asyncio.Runner
+else:
+
+    class _Runner:
+        """Runner implementation for test only"""
+
+        _loop: Union[None, asyncio.AbstractEventLoop, Literal[False]]
+
+        def __init__(self) -> None:
+            self._loop = None
+
+        def __enter__(self) -> Self:
+            self._lazy_init()
+            return self
+
+        def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
+            self.close()
+
+        def close(self) -> None:
+            if self._loop:
+                try:
+                    self._loop.run_until_complete(
+                        self._loop.shutdown_asyncgens()
+                    )
+                finally:
+                    self._loop.close()
+                    self._loop = False
+
+        def get_loop(self) -> asyncio.AbstractEventLoop:
+            """Return embedded event loop."""
+            self._lazy_init()
+            assert self._loop
+            return self._loop
+
+        def run(self, coro: Coroutine[Any, Any, _T]) -> _T:
+            self._lazy_init()
+            assert self._loop
+            return self._loop.run_until_complete(coro)
+
+        def _lazy_init(self) -> None:
+            if self._loop is False:
+                raise RuntimeError("Runner is closed")
+            if self._loop is None:
+                self._loop = asyncio.new_event_loop()
diff --git a/libs/sqlalchemy/util/_has_cy.py b/libs/sqlalchemy/util/_has_cy.py
index 7713e236a..21faed04e 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 dfb9af2e1..f6aefcf67 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/compat.py b/libs/sqlalchemy/util/compat.py
index e1b5e6614..c8b5e7a22 100644
--- a/libs/sqlalchemy/util/compat.py
+++ b/libs/sqlalchemy/util/compat.py
@@ -1,5 +1,5 @@
 # util/compat.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,6 +32,7 @@ from typing import Type
 from typing import TypeVar
 
 
+py313 = sys.version_info >= (3, 13)
 py312 = sys.version_info >= (3, 12)
 py311 = sys.version_info >= (3, 11)
 py310 = sys.version_info >= (3, 10)
@@ -58,7 +59,7 @@ class FullArgSpec(typing.NamedTuple):
     varkw: Optional[str]
     defaults: Optional[Tuple[Any, ...]]
     kwonlyargs: List[str]
-    kwonlydefaults: Dict[str, Any]
+    kwonlydefaults: Optional[Dict[str, Any]]
     annotations: Dict[str, Any]
 
 
diff --git a/libs/sqlalchemy/util/concurrency.py b/libs/sqlalchemy/util/concurrency.py
index 65a620521..006340f5b 100644
--- a/libs/sqlalchemy/util/concurrency.py
+++ b/libs/sqlalchemy/util/concurrency.py
@@ -1,5 +1,5 @@
 # util/concurrency.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,11 +10,15 @@ from __future__ import annotations
 
 import asyncio  # noqa
 import typing
+from typing import Any
+from typing import Callable
+from typing import Coroutine
+from typing import TypeVar
 
 have_greenlet = False
 greenlet_error = None
 try:
-    import greenlet  # type: ignore # noqa: F401
+    import greenlet  # type: ignore[import-untyped,unused-ignore]  # noqa: F401,E501
 except ImportError as e:
     greenlet_error = str(e)
     pass
@@ -26,12 +30,43 @@ else:
     from ._concurrency_py3k import greenlet_spawn as greenlet_spawn
     from ._concurrency_py3k import is_exit_exception as is_exit_exception
     from ._concurrency_py3k import AsyncAdaptedLock as AsyncAdaptedLock
-    from ._concurrency_py3k import (
-        _util_async_run as _util_async_run,
-    )  # noqa: F401
-    from ._concurrency_py3k import (
-        _util_async_run_coroutine_function as _util_async_run_coroutine_function,  # noqa: F401, E501
-    )
+    from ._concurrency_py3k import _Runner
+
+_T = TypeVar("_T")
+
+
+class _AsyncUtil:
+    """Asyncio util for test suite/ util only"""
+
+    def __init__(self) -> None:
+        if have_greenlet:
+            self.runner = _Runner()
+
+    def run(
+        self,
+        fn: Callable[..., Coroutine[Any, Any, _T]],
+        *args: Any,
+        **kwargs: Any,
+    ) -> _T:
+        """Run coroutine on the loop"""
+        return self.runner.run(fn(*args, **kwargs))
+
+    def run_in_greenlet(
+        self, fn: Callable[..., _T], *args: Any, **kwargs: Any
+    ) -> _T:
+        """Run sync function in greenlet. Support nested calls"""
+        if have_greenlet:
+            if self.runner.get_loop().is_running():
+                return fn(*args, **kwargs)
+            else:
+                return self.runner.run(greenlet_spawn(fn, *args, **kwargs))
+        else:
+            return fn(*args, **kwargs)
+
+    def close(self) -> None:
+        if have_greenlet:
+            self.runner.close()
+
 
 if not typing.TYPE_CHECKING and not have_greenlet:
 
diff --git a/libs/sqlalchemy/util/deprecations.py b/libs/sqlalchemy/util/deprecations.py
index 3034715b5..88b687240 100644
--- a/libs/sqlalchemy/util/deprecations.py
+++ b/libs/sqlalchemy/util/deprecations.py
@@ -1,5 +1,5 @@
 # util/deprecations.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -205,10 +205,10 @@ def deprecated_params(**specs: Tuple[str, str]) -> Callable[[_F], _F]:
             weak_identity_map=(
                 "0.7",
                 "the :paramref:`.Session.weak_identity_map parameter "
-                "is deprecated."
+                "is deprecated.",
             )
-
         )
+        def some_function(**kwargs): ...
 
     """
 
diff --git a/libs/sqlalchemy/util/langhelpers.py b/libs/sqlalchemy/util/langhelpers.py
index 396a03977..b4086f1d5 100644
--- a/libs/sqlalchemy/util/langhelpers.py
+++ b/libs/sqlalchemy/util/langhelpers.py
@@ -1,5 +1,5 @@
 # util/langhelpers.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -174,10 +174,11 @@ def string_or_unprintable(element: Any) -> str:
             return "unprintable element %r" % element
 
 
-def clsname_as_plain_name(cls: Type[Any]) -> str:
-    return " ".join(
-        n.lower() for n in re.findall(r"([A-Z][a-z]+|SQL)", cls.__name__)
-    )
+def clsname_as_plain_name(
+    cls: Type[Any], use_name: Optional[str] = None
+) -> str:
+    name = use_name or cls.__name__
+    return " ".join(n.lower() for n in re.findall(r"([A-Z][a-z]+|SQL)", name))
 
 
 def method_is_overridden(
@@ -307,10 +308,10 @@ def decorator(target: Callable[..., Any]) -> Callable[[_Fn], _Fn]:
         )
         decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
 
-        decorated.__wrapped__ = fn  # type: ignore
-        return cast(_Fn, update_wrapper(decorated, fn))
+        decorated.__wrapped__ = fn  # type: ignore[attr-defined]
+        return update_wrapper(decorated, fn)  # type: ignore[return-value]
 
-    return update_wrapper(decorate, target)
+    return update_wrapper(decorate, target)  # type: ignore[return-value]
 
 
 def _update_argspec_defaults_into_env(spec, env):
@@ -661,7 +662,9 @@ def format_argspec_init(method, grouped=True):
     """format_argspec_plus with considerations for typical __init__ methods
 
     Wraps format_argspec_plus with error handling strategies for typical
-    __init__ cases::
+    __init__ cases:
+
+    .. sourcecode:: text
 
       object.__init__ -> (self)
       other unreflectable (usually C) -> (self, *args, **kwargs)
@@ -716,7 +719,9 @@ def create_proxy_methods(
 def getargspec_init(method):
     """inspect.getargspec with considerations for typical __init__ methods
 
-    Wraps inspect.getargspec with error handling for typical __init__ cases::
+    Wraps inspect.getargspec with error handling for typical __init__ cases:
+
+    .. sourcecode:: text
 
       object.__init__ -> (self)
       other unreflectable (usually C) -> (self, *args, **kwargs)
@@ -1590,9 +1595,9 @@ class hybridmethod(Generic[_T]):
 class symbol(int):
     """A constant symbol.
 
-    >>> symbol('foo') is symbol('foo')
+    >>> symbol("foo") is symbol("foo")
     True
-    >>> symbol('foo')
+    >>> symbol("foo")
     <symbol 'foo>
 
     A slight refinement of the MAGICCOOKIE=object() pattern.  The primary
@@ -1658,6 +1663,8 @@ class _IntFlagMeta(type):
         items: List[symbol]
         cls._items = items = []
         for k, v in dict_.items():
+            if re.match(r"^__.*__$", k):
+                continue
             if isinstance(v, int):
                 sym = symbol(k, canonical=v)
             elif not k.startswith("_"):
@@ -1957,6 +1964,9 @@ def attrsetter(attrname):
     return env["set"]
 
 
+_dunders = re.compile("^__.+__$")
+
+
 class TypingOnly:
     """A mixin class that marks a class as 'typing only', meaning it has
     absolutely no methods, attributes, or runtime functionality whatsoever.
@@ -1967,15 +1977,9 @@ class TypingOnly:
 
     def __init_subclass__(cls) -> None:
         if TypingOnly in cls.__bases__:
-            remaining = set(cls.__dict__).difference(
-                {
-                    "__module__",
-                    "__doc__",
-                    "__slots__",
-                    "__orig_bases__",
-                    "__annotations__",
-                }
-            )
+            remaining = {
+                name for name in cls.__dict__ if not _dunders.match(name)
+            }
             if remaining:
                 raise AssertionError(
                     f"Class {cls} directly inherits TypingOnly but has "
@@ -2208,3 +2212,11 @@ def has_compiled_ext(raise_=False):
         )
     else:
         return False
+
+
+class _Missing(enum.Enum):
+    Missing = enum.auto()
+
+
+Missing = _Missing.Missing
+MissingOr = Union[_T, Literal[_Missing.Missing]]
diff --git a/libs/sqlalchemy/util/preloaded.py b/libs/sqlalchemy/util/preloaded.py
index e91ce6854..4ea9aa90f 100644
--- a/libs/sqlalchemy/util/preloaded.py
+++ b/libs/sqlalchemy/util/preloaded.py
@@ -1,5 +1,5 @@
 # util/preloaded.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 99a68a317..3fb01a9a9 100644
--- a/libs/sqlalchemy/util/queue.py
+++ b/libs/sqlalchemy/util/queue.py
@@ -1,5 +1,5 @@
 # util/queue.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 a203a2ab7..407c2d450 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-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 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 aebbb436c..393c855ab 100644
--- a/libs/sqlalchemy/util/topological.py
+++ b/libs/sqlalchemy/util/topological.py
@@ -1,5 +1,5 @@
 # util/topological.py
-# Copyright (C) 2005-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/typing.py b/libs/sqlalchemy/util/typing.py
index 2d9e2250a..62fd47c6a 100644
--- a/libs/sqlalchemy/util/typing.py
+++ b/libs/sqlalchemy/util/typing.py
@@ -1,5 +1,5 @@
 # util/typing.py
-# Copyright (C) 2022-2024 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2025 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 builtins
+from collections import deque
 import collections.abc as collections_abc
 import re
 import sys
@@ -54,6 +55,7 @@ if True:  # zimports removes the tailing comments
     from typing_extensions import TypeGuard as TypeGuard  # 3.10
     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
 
 _T = TypeVar("_T", bound=Any)
 _KT = TypeVar("_KT")
@@ -62,6 +64,13 @@ _KT_contra = TypeVar("_KT_contra", contravariant=True)
 _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,
@@ -72,16 +81,13 @@ else:
 
 NoneFwd = ForwardRef("None")
 
-typing_get_args = get_args
-typing_get_origin = get_origin
-
 
 _AnnotationScanType = Union[
     Type[Any], str, ForwardRef, NewType, TypeAliasType, "GenericProtocol[Any]"
 ]
 
 
-class ArgsTypeProcotol(Protocol):
+class ArgsTypeProtocol(Protocol):
     """protocol for types that have ``__args__``
 
     there's no public interface for this AFAIK
@@ -188,9 +194,51 @@ def de_stringify_annotation(
         )
 
         return _copy_generic_annotation_with(annotation, elements)
+
     return annotation  # type: ignore
 
 
+def fixup_container_fwd_refs(
+    type_: _AnnotationScanType,
+) -> _AnnotationScanType:
+    """Correct dict['x', 'y'] into dict[ForwardRef('x'), ForwardRef('y')]
+    and similar for list, set
+
+    """
+
+    if (
+        is_generic(type_)
+        and get_origin(type_)
+        in (
+            dict,
+            set,
+            list,
+            collections_abc.MutableSet,
+            collections_abc.MutableMapping,
+            collections_abc.MutableSequence,
+            collections_abc.Mapping,
+            collections_abc.Sequence,
+        )
+        # fight, kick and scream to struggle to tell the difference between
+        # dict[] and typing.Dict[] which DO NOT compare the same and DO NOT
+        # behave the same yet there is NO WAY to distinguish between which type
+        # it is using public attributes
+        and not re.match(
+            "typing.(?:Dict|List|Set|.*Mapping|.*Sequence|.*Set)", repr(type_)
+        )
+    ):
+        # compat with py3.10 and earlier
+        return get_origin(type_).__class_getitem__(  # type: ignore
+            tuple(
+                [
+                    ForwardRef(elem) if isinstance(elem, str) else elem
+                    for elem in get_args(type_)
+                ]
+            )
+        )
+    return type_
+
+
 def _copy_generic_annotation_with(
     annotation: GenericProtocol[_T], elements: Tuple[_AnnotationScanType, ...]
 ) -> Type[_T]:
@@ -281,30 +329,8 @@ def resolve_name_to_real_class_name(name: str, module_name: str) -> str:
         return getattr(obj, "__name__", name)
 
 
-def de_stringify_union_elements(
-    cls: Type[Any],
-    annotation: ArgsTypeProcotol,
-    originating_module: str,
-    locals_: Mapping[str, Any],
-    *,
-    str_cleanup_fn: Optional[Callable[[str, str], str]] = None,
-) -> Type[Any]:
-    return make_union_type(
-        *[
-            de_stringify_annotation(
-                cls,
-                anno,
-                originating_module,
-                {},
-                str_cleanup_fn=str_cleanup_fn,
-            )
-            for anno in annotation.__args__
-        ]
-    )
-
-
-def is_pep593(type_: Optional[_AnnotationScanType]) -> bool:
-    return type_ is not None and typing_get_origin(type_) is Annotated
+def is_pep593(type_: Optional[Any]) -> bool:
+    return type_ is not None and get_origin(type_) is Annotated
 
 
 def is_non_string_iterable(obj: Any) -> TypeGuard[Iterable[Any]]:
@@ -313,8 +339,8 @@ def is_non_string_iterable(obj: Any) -> TypeGuard[Iterable[Any]]:
     )
 
 
-def is_literal(type_: _AnnotationScanType) -> bool:
-    return get_origin(type_) is Literal
+def is_literal(type_: Any) -> bool:
+    return get_origin(type_) in LITERAL_TYPES
 
 
 def is_newtype(type_: Optional[_AnnotationScanType]) -> TypeGuard[NewType]:
@@ -337,16 +363,62 @@ def flatten_newtype(type_: NewType) -> Type[Any]:
     super_type = type_.__supertype__
     while is_newtype(super_type):
         super_type = super_type.__supertype__
-    return super_type
+    return super_type  # type: ignore[return-value]
+
+
+def pep695_values(type_: _AnnotationScanType) -> Set[Any]:
+    """Extracts the value from a TypeAliasType, recursively exploring unions
+    and inner TypeAliasType to flatten them into a single set.
+
+    Forward references are not evaluated, so no recursive exploration happens
+    into them.
+    """
+    _seen = set()
+
+    def recursive_value(type_):
+        if 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__
+        if not is_union(value):
+            return value
+        return [recursive_value(t) for t in value.__args__]
+
+    res = recursive_value(type_)
+    if isinstance(res, list):
+        types = set()
+        stack = deque(res)
+        while stack:
+            t = stack.popleft()
+            if isinstance(t, list):
+                stack.extend(t)
+            else:
+                types.add(None if t in {NoneType, NoneFwd} else t)
+        return types
+    else:
+        return {res}
 
 
 def is_fwd_ref(
-    type_: _AnnotationScanType, check_generic: bool = False
+    type_: _AnnotationScanType,
+    check_generic: bool = False,
+    check_for_plain_string: bool = False,
 ) -> TypeGuard[ForwardRef]:
-    if isinstance(type_, ForwardRef):
+    if check_for_plain_string and isinstance(type_, str):
+        return True
+    elif isinstance(type_, ForwardRef):
         return True
     elif check_generic and is_generic(type_):
-        return any(is_fwd_ref(arg, True) for arg in type_.__args__)
+        return any(
+            is_fwd_ref(
+                arg, True, check_for_plain_string=check_for_plain_string
+            )
+            for arg in type_.__args__
+        )
     else:
         return False
 
@@ -371,13 +443,31 @@ def de_optionalize_union_types(
     """Given a type, filter out ``Union`` types that include ``NoneType``
     to not include the ``NoneType``.
 
+    Contains extra logic to work on non-flattened unions, unions that contain
+    ``None`` (seen in py38, 37)
+
     """
 
     if is_fwd_ref(type_):
-        return de_optionalize_fwd_ref_union_types(type_)
+        return _de_optionalize_fwd_ref_union_types(type_, False)
 
-    elif is_optional(type_):
-        typ = set(type_.__args__)
+    elif is_union(type_) and includes_none(type_):
+        if compat.py39:
+            typ = set(type_.__args__)
+        else:
+            # py38, 37 - unions are not automatically flattened, can contain
+            # None rather than NoneType
+            stack_of_unions = deque([type_])
+            typ = set()
+            while stack_of_unions:
+                u_typ = stack_of_unions.popleft()
+                for elem in u_typ.__args__:
+                    if is_union(elem):
+                        stack_of_unions.append(elem)
+                    else:
+                        typ.add(elem)
+
+            typ.discard(None)  # type: ignore
 
         typ.discard(NoneType)
         typ.discard(NoneFwd)
@@ -388,9 +478,21 @@ def de_optionalize_union_types(
         return type_
 
 
-def de_optionalize_fwd_ref_union_types(
-    type_: ForwardRef,
-) -> _AnnotationScanType:
+@overload
+def _de_optionalize_fwd_ref_union_types(
+    type_: ForwardRef, return_has_none: Literal[True]
+) -> bool: ...
+
+
+@overload
+def _de_optionalize_fwd_ref_union_types(
+    type_: ForwardRef, return_has_none: Literal[False]
+) -> _AnnotationScanType: ...
+
+
+def _de_optionalize_fwd_ref_union_types(
+    type_: ForwardRef, return_has_none: bool
+) -> Union[_AnnotationScanType, bool]:
     """return the non-optional type for Optional[], Union[None, ...], x|None,
     etc. without de-stringifying forward refs.
 
@@ -402,68 +504,78 @@ def de_optionalize_fwd_ref_union_types(
 
     mm = re.match(r"^(.+?)\[(.+)\]$", annotation)
     if mm:
-        if mm.group(1) == "Optional":
-            return ForwardRef(mm.group(2))
-        elif mm.group(1) == "Union":
-            elements = re.split(r",\s*", mm.group(2))
-            return make_union_type(
-                *[ForwardRef(elem) for elem in elements if elem != "None"]
-            )
+        g1 = mm.group(1).split(".")[-1]
+        if g1 == "Optional":
+            return True if return_has_none else ForwardRef(mm.group(2))
+        elif g1 == "Union":
+            if "[" in mm.group(2):
+                # cases like "Union[Dict[str, int], int, None]"
+                elements: list[str] = []
+                current: list[str] = []
+                ignore_comma = 0
+                for char in mm.group(2):
+                    if char == "[":
+                        ignore_comma += 1
+                    elif char == "]":
+                        ignore_comma -= 1
+                    elif ignore_comma == 0 and char == ",":
+                        elements.append("".join(current).strip())
+                        current.clear()
+                        continue
+                    current.append(char)
+            else:
+                elements = re.split(r",\s*", mm.group(2))
+            parts = [ForwardRef(elem) for elem in elements if elem != "None"]
+            if return_has_none:
+                return len(elements) != len(parts)
+            else:
+                return make_union_type(*parts) if parts else Never  # type: ignore[return-value] # noqa: E501
         else:
-            return type_
+            return False if return_has_none else type_
 
     pipe_tokens = re.split(r"\s*\|\s*", annotation)
-    if "None" in pipe_tokens:
-        return ForwardRef("|".join(p for p in pipe_tokens if p != "None"))
+    has_none = "None" in pipe_tokens
+    if return_has_none:
+        return has_none
+    if has_none:
+        anno_str = "|".join(p for p in pipe_tokens if p != "None")
+        return ForwardRef(anno_str) if anno_str else Never  # type: ignore[return-value] # noqa: E501
 
     return type_
 
 
 def make_union_type(*types: _AnnotationScanType) -> Type[Any]:
-    """Make a Union type.
+    """Make a Union type."""
+    return Union.__getitem__(types)  # type: ignore
 
-    This is needed by :func:`.de_optionalize_union_types` which removes
-    ``NoneType`` from a ``Union``.
 
+def includes_none(type_: Any) -> bool:
+    """Returns if the type annotation ``type_`` allows ``None``.
+
+    This function supports:
+    * forward refs
+    * unions
+    * pep593 - Annotated
+    * pep695 - TypeAliasType (does not support looking into
+    fw reference of other pep695)
+    * NewType
+    * plain types like ``int``, ``None``, etc
     """
-    return cast(Any, Union).__getitem__(types)  # type: ignore
-
-
-def expand_unions(
-    type_: Type[Any], include_union: bool = False, discard_none: bool = False
-) -> Tuple[Type[Any], ...]:
-    """Return a type as a tuple of individual types, expanding for
-    ``Union`` types."""
-
+    if is_fwd_ref(type_):
+        return _de_optionalize_fwd_ref_union_types(type_, True)
     if is_union(type_):
-        typ = set(type_.__args__)
-
-        if discard_none:
-            typ.discard(NoneType)
-
-        if include_union:
-            return (type_,) + tuple(typ)  # type: ignore
-        else:
-            return tuple(typ)  # type: ignore
-    else:
-        return (type_,)
+        return any(includes_none(t) for t in get_args(type_))
+    if is_pep593(type_):
+        return includes_none(get_args(type_)[0])
+    if is_pep695(type_):
+        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)
 
 
-def is_optional(type_: Any) -> TypeGuard[ArgsTypeProcotol]:
-    return is_origin_of(
-        type_,
-        "Optional",
-        "Union",
-        "UnionType",
-    )
-
-
-def is_optional_union(type_: Any) -> bool:
-    return is_optional(type_) and NoneType in typing_get_args(type_)
-
-
-def is_union(type_: Any) -> TypeGuard[ArgsTypeProcotol]:
-    return is_origin_of(type_, "Union")
+def is_union(type_: Any) -> TypeGuard[ArgsTypeProtocol]:
+    return is_origin_of(type_, "Union", "UnionType")
 
 
 def is_origin_of_cls(
@@ -472,7 +584,7 @@ def is_origin_of_cls(
     """return True if the given type has an __origin__ that shares a base
     with the given class"""
 
-    origin = typing_get_origin(type_)
+    origin = get_origin(type_)
     if origin is None:
         return False
 
@@ -485,7 +597,7 @@ def is_origin_of(
     """return True if the given type has an __origin__ with the given name
     and optional module."""
 
-    origin = typing_get_origin(type_)
+    origin = get_origin(type_)
     if origin is None:
         return False
 
@@ -575,6 +687,3 @@ class CallableReference(Generic[_FN]):
         def __set__(self, instance: Any, value: _FN) -> None: ...
 
         def __delete__(self, instance: Any) -> None: ...
-
-
-# $def ro_descriptor_reference(fn: Callable[])
diff --git a/libs/stevedore-5.2.0.dist-info/WHEEL b/libs/stevedore-5.2.0.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf9..000000000
--- a/libs/stevedore-5.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/stevedore-5.2.0.dist-info/pbr.json b/libs/stevedore-5.2.0.dist-info/pbr.json
deleted file mode 100644
index 635843679..000000000
--- a/libs/stevedore-5.2.0.dist-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"git_version": "21d601f", "is_release": true}
\ No newline at end of file
diff --git a/libs/stevedore-5.2.0.dist-info/AUTHORS b/libs/stevedore-5.3.0.dist-info/AUTHORS
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/AUTHORS
rename to libs/stevedore-5.3.0.dist-info/AUTHORS
diff --git a/libs/trakit-0.2.1.dist-info/INSTALLER b/libs/stevedore-5.3.0.dist-info/INSTALLER
similarity index 100%
rename from libs/trakit-0.2.1.dist-info/INSTALLER
rename to libs/stevedore-5.3.0.dist-info/INSTALLER
diff --git a/libs/stevedore-5.2.0.dist-info/LICENSE b/libs/stevedore-5.3.0.dist-info/LICENSE
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/LICENSE
rename to libs/stevedore-5.3.0.dist-info/LICENSE
diff --git a/libs/stevedore-5.2.0.dist-info/METADATA b/libs/stevedore-5.3.0.dist-info/METADATA
similarity index 97%
rename from libs/stevedore-5.2.0.dist-info/METADATA
rename to libs/stevedore-5.3.0.dist-info/METADATA
index 689f088aa..01c452849 100644
--- a/libs/stevedore-5.2.0.dist-info/METADATA
+++ b/libs/stevedore-5.3.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stevedore
-Version: 5.2.0
+Version: 5.3.0
 Summary: Manage dynamic plugins for Python applications
 Home-page: https://docs.openstack.org/stevedore/latest/
 Author: OpenStack
@@ -20,7 +20,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.8
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: pbr !=2.1.0,>=2.0.0
+Requires-Dist: pbr >=2.0.0
 
 ===========================================================
 stevedore -- Manage dynamic plugins for Python applications
diff --git a/libs/stevedore-5.2.0.dist-info/RECORD b/libs/stevedore-5.3.0.dist-info/RECORD
similarity index 82%
rename from libs/stevedore-5.2.0.dist-info/RECORD
rename to libs/stevedore-5.3.0.dist-info/RECORD
index 6d59d86e9..84b5f6da6 100644
--- a/libs/stevedore-5.2.0.dist-info/RECORD
+++ b/libs/stevedore-5.3.0.dist-info/RECORD
@@ -1,13 +1,13 @@
-stevedore-5.2.0.dist-info/AUTHORS,sha256=QQb_ThCRK-AvzWkx5sPEG9axRZOOE1nCuBRK0l0VzUg,2815
-stevedore-5.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-stevedore-5.2.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-stevedore-5.2.0.dist-info/METADATA,sha256=qr9P6i9k2e_kZQyTaC_y1RUDEH-VQ2n5MhqXx37-G3E,2265
-stevedore-5.2.0.dist-info/RECORD,,
-stevedore-5.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore-5.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-stevedore-5.2.0.dist-info/entry_points.txt,sha256=pESxBgqYcVV5wevQpKBLQoutvWWhIyRZbEzhsD9z_LY,387
-stevedore-5.2.0.dist-info/pbr.json,sha256=JTcag4yGkhjv_22HXJHIijGy7P9JB7zbzLtloJrI6S0,46
-stevedore-5.2.0.dist-info/top_level.txt,sha256=rtOULIhauZOXFiAgHRCDBdnqb0wKxA-NqLlvo_b_SOM,10
+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
diff --git a/libs/trakit-0.2.1.dist-info/REQUESTED b/libs/stevedore-5.3.0.dist-info/REQUESTED
similarity index 100%
rename from libs/trakit-0.2.1.dist-info/REQUESTED
rename to libs/stevedore-5.3.0.dist-info/REQUESTED
diff --git a/libs/click-8.1.7.dist-info/WHEEL b/libs/stevedore-5.3.0.dist-info/WHEEL
similarity index 100%
rename from libs/click-8.1.7.dist-info/WHEEL
rename to libs/stevedore-5.3.0.dist-info/WHEEL
diff --git a/libs/stevedore-5.2.0.dist-info/entry_points.txt b/libs/stevedore-5.3.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/entry_points.txt
rename to libs/stevedore-5.3.0.dist-info/entry_points.txt
diff --git a/libs/stevedore-5.3.0.dist-info/pbr.json b/libs/stevedore-5.3.0.dist-info/pbr.json
new file mode 100644
index 000000000..b1b1a2071
--- /dev/null
+++ b/libs/stevedore-5.3.0.dist-info/pbr.json
@@ -0,0 +1 @@
+{"git_version": "51134a4", "is_release": true}
\ No newline at end of file
diff --git a/libs/stevedore-5.2.0.dist-info/top_level.txt b/libs/stevedore-5.3.0.dist-info/top_level.txt
similarity index 100%
rename from libs/stevedore-5.2.0.dist-info/top_level.txt
rename to libs/stevedore-5.3.0.dist-info/top_level.txt
diff --git a/libs/textdistance-4.6.2.dist-info/WHEEL b/libs/textdistance-4.6.2.dist-info/WHEEL
deleted file mode 100644
index bab98d675..000000000
--- a/libs/textdistance-4.6.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/typing_extensions-4.10.0.dist-info/INSTALLER b/libs/textdistance-4.6.3.dist-info/INSTALLER
similarity index 100%
rename from libs/typing_extensions-4.10.0.dist-info/INSTALLER
rename to libs/textdistance-4.6.3.dist-info/INSTALLER
diff --git a/libs/textdistance-4.6.2.dist-info/LICENSE b/libs/textdistance-4.6.3.dist-info/LICENSE
similarity index 100%
rename from libs/textdistance-4.6.2.dist-info/LICENSE
rename to libs/textdistance-4.6.3.dist-info/LICENSE
diff --git a/libs/textdistance-4.6.2.dist-info/METADATA b/libs/textdistance-4.6.3.dist-info/METADATA
similarity index 78%
rename from libs/textdistance-4.6.2.dist-info/METADATA
rename to libs/textdistance-4.6.3.dist-info/METADATA
index d9fa87435..47f5a3d5e 100644
--- a/libs/textdistance-4.6.2.dist-info/METADATA
+++ b/libs/textdistance-4.6.3.dist-info/METADATA
@@ -1,402 +1,402 @@
-Metadata-Version: 2.1
-Name: textdistance
-Version: 4.6.2
-Summary: Compute distance between the two texts.
-Home-page: https://github.com/orsinium/textdistance
-Download-URL: https://github.com/orsinium/textdistance/tarball/master
-Author: orsinium
-Author-email: gram@orsinium.dev
-License: MIT
-Keywords: distance between text strings sequences iterators
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Plugins
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Topic :: Scientific/Engineering :: Human Machine Interfaces
-Requires-Python: >=3.5
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Provides-Extra: dameraulevenshtein
-Requires-Dist: rapidfuzz >=2.6.0 ; extra == 'dameraulevenshtein'
-Requires-Dist: jellyfish ; extra == 'dameraulevenshtein'
-Requires-Dist: pyxDamerauLevenshtein ; extra == 'dameraulevenshtein'
-Provides-Extra: hamming
-Requires-Dist: Levenshtein ; extra == 'hamming'
-Requires-Dist: rapidfuzz >=2.6.0 ; extra == 'hamming'
-Requires-Dist: jellyfish ; extra == 'hamming'
-Requires-Dist: distance ; extra == 'hamming'
-Provides-Extra: jaro
-Requires-Dist: rapidfuzz >=2.6.0 ; extra == 'jaro'
-Requires-Dist: Levenshtein ; extra == 'jaro'
-Provides-Extra: jarowinkler
-Requires-Dist: rapidfuzz >=2.6.0 ; extra == 'jarowinkler'
-Requires-Dist: jellyfish ; extra == 'jarowinkler'
-Provides-Extra: levenshtein
-Requires-Dist: rapidfuzz >=2.6.0 ; extra == 'levenshtein'
-Requires-Dist: Levenshtein ; extra == 'levenshtein'
-Provides-Extra: all
-Requires-Dist: jellyfish ; extra == 'all'
-Requires-Dist: numpy ; extra == 'all'
-Requires-Dist: Levenshtein ; extra == 'all'
-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: 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: benchmarks
-Requires-Dist: jellyfish ; extra == 'benchmarks'
-Requires-Dist: numpy ; extra == 'benchmarks'
-Requires-Dist: Levenshtein ; extra == 'benchmarks'
-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: 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'
-
-# TextDistance
-
-![TextDistance logo](logo.png)
-
-[![Build Status](https://travis-ci.org/life4/textdistance.svg?branch=master)](https://travis-ci.org/life4/textdistance) [![PyPI version](https://img.shields.io/pypi/v/textdistance.svg)](https://pypi.python.org/pypi/textdistance) [![Status](https://img.shields.io/pypi/status/textdistance.svg)](https://pypi.python.org/pypi/textdistance) [![License](https://img.shields.io/pypi/l/textdistance.svg)](LICENSE)
-
-**TextDistance** -- python library for comparing distance between two or more sequences by many algorithms.
-
-Features:
-
-- 30+ algorithms
-- Pure python implementation
-- Simple usage
-- More than two sequences comparing
-- Some algorithms have more than one implementation in one class.
-- Optional numpy usage for maximum speed.
-
-## Algorithms
-
-### Edit based
-
-| Algorithm                                                                                 | Class                | Functions              |
-|-------------------------------------------------------------------------------------------|----------------------|------------------------|
-| [Hamming](https://en.wikipedia.org/wiki/Hamming_distance)                                 | `Hamming`            | `hamming`              |
-| [MLIPNS](http://www.sial.iias.spb.su/files/386-386-1-PB.pdf)                              | `Mlipns`             | `mlipns`               |
-| [Levenshtein](https://en.wikipedia.org/wiki/Levenshtein_distance)                         | `Levenshtein`        | `levenshtein`          |
-| [Damerau-Levenshtein](https://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance) | `DamerauLevenshtein` | `damerau_levenshtein`  |
-| [Jaro-Winkler](https://en.wikipedia.org/wiki/Jaro%E2%80%93Winkler_distance)               | `JaroWinkler`        | `jaro_winkler`, `jaro` |
-| [Strcmp95](http://cpansearch.perl.org/src/SCW/Text-JaroWinkler-0.1/strcmp95.c)            | `StrCmp95`           | `strcmp95`             |
-| [Needleman-Wunsch](https://en.wikipedia.org/wiki/Needleman%E2%80%93Wunsch_algorithm)      | `NeedlemanWunsch`    | `needleman_wunsch`     |
-| [Gotoh](http://bioinfo.ict.ac.cn/~dbu/AlgorithmCourses/Lectures/LOA/Lec6-Sequence-Alignment-Affine-Gaps-Gotoh1982.pdf) | `Gotoh`              | `gotoh`                |
-| [Smith-Waterman](https://en.wikipedia.org/wiki/Smith%E2%80%93Waterman_algorithm)          | `SmithWaterman`      | `smith_waterman`       |
-
-### Token based
-
-| Algorithm                                                                                 | Class                | Functions     |
-|-------------------------------------------------------------------------------------------|----------------------|---------------|
-| [Jaccard index](https://en.wikipedia.org/wiki/Jaccard_index)                              | `Jaccard`            | `jaccard`     |
-| [Sørensen–Dice coefficient](https://en.wikipedia.org/wiki/S%C3%B8rensen%E2%80%93Dice_coefficient) | `Sorensen`   | `sorensen`, `sorensen_dice`, `dice` |
-| [Tversky index](https://en.wikipedia.org/wiki/Tversky_index)                              | `Tversky`            | `tversky`    |
-| [Overlap coefficient](https://en.wikipedia.org/wiki/Overlap_coefficient)                  | `Overlap`            | `overlap`    |
-| [Tanimoto distance](https://en.wikipedia.org/wiki/Jaccard_index#Tanimoto_similarity_and_distance) | `Tanimoto`   | `tanimoto`   |
-| [Cosine similarity](https://en.wikipedia.org/wiki/Cosine_similarity)                      | `Cosine`             | `cosine`     |
-| [Monge-Elkan](https://www.academia.edu/200314/Generalized_Monge-Elkan_Method_for_Approximate_Text_String_Comparison) | `MongeElkan` | `monge_elkan` |
-| [Bag distance](https://github.com/Yomguithereal/talisman/blob/master/src/metrics/bag.js) | `Bag`        | `bag`        |
-
-### Sequence based
-
-| Algorithm | Class | Functions |
-|-----------|-------|-----------|
-| [longest common subsequence similarity](https://en.wikipedia.org/wiki/Longest_common_subsequence_problem)          | `LCSSeq` | `lcsseq` |
-| [longest common substring similarity](https://docs.python.org/2/library/difflib.html#difflib.SequenceMatcher)      | `LCSStr` | `lcsstr` |
-| [Ratcliff-Obershelp similarity](https://en.wikipedia.org/wiki/Gestalt_Pattern_Matching) | `RatcliffObershelp` | `ratcliff_obershelp` |
-
-### Compression based
-
-[Normalized compression distance](https://en.wikipedia.org/wiki/Normalized_compression_distance#Normalized_compression_distance) with different compression algorithms.
-
-Classic compression algorithms:
-
-| Algorithm                                                                  | Class       | Function     |
-|----------------------------------------------------------------------------|-------------|--------------|
-| [Arithmetic coding](https://en.wikipedia.org/wiki/Arithmetic_coding)       | `ArithNCD`  | `arith_ncd`  |
-| [RLE](https://en.wikipedia.org/wiki/Run-length_encoding)                   | `RLENCD`    | `rle_ncd`    |
-| [BWT RLE](https://en.wikipedia.org/wiki/Burrows%E2%80%93Wheeler_transform) | `BWTRLENCD` | `bwtrle_ncd` |
-
-Normal compression algorithms:
-
-| Algorithm                                                                  | Class        | Function      |
-|----------------------------------------------------------------------------|--------------|---------------|
-| Square Root                                                                | `SqrtNCD`    | `sqrt_ncd`    |
-| [Entropy](https://en.wikipedia.org/wiki/Entropy_(information_theory))      | `EntropyNCD` | `entropy_ncd` |
-
-Work in progress algorithms that compare two strings as array of bits:
-
-| Algorithm                                  | Class     | Function   |
-|--------------------------------------------|-----------|------------|
-| [BZ2](https://en.wikipedia.org/wiki/Bzip2) | `BZ2NCD`  | `bz2_ncd`  |
-| [LZMA](https://en.wikipedia.org/wiki/LZMA) | `LZMANCD` | `lzma_ncd` |
-| [ZLib](https://en.wikipedia.org/wiki/Zlib) | `ZLIBNCD` | `zlib_ncd` |
-
-See [blog post](https://articles.life4web.ru/other/ncd/) for more details about NCD.
-
-### Phonetic
-
-| Algorithm                                                                    | Class    | Functions |
-|------------------------------------------------------------------------------|----------|-----------|
-| [MRA](https://en.wikipedia.org/wiki/Match_rating_approach)                   | `MRA`    | `mra`     |
-| [Editex](https://anhaidgroup.github.io/py_stringmatching/v0.3.x/Editex.html) | `Editex` | `editex`  |
-
-### Simple
-
-| Algorithm           | Class      | Functions  |
-|---------------------|------------|------------|
-| Prefix similarity   | `Prefix`   | `prefix`   |
-| Postfix similarity  | `Postfix`  | `postfix`  |
-| Length distance     | `Length`   | `length`   |
-| Identity similarity | `Identity` | `identity` |
-| Matrix similarity   | `Matrix`   | `matrix`   |
-
-## Installation
-
-### Stable
-
-Only pure python implementation:
-
-```bash
-pip install textdistance
-```
-
-With extra libraries for maximum speed:
-
-```bash
-pip install "textdistance[extras]"
-```
-
-With all libraries (required for [benchmarking](#benchmarks) and [testing](#running-tests)):
-
-```bash
-pip install "textdistance[benchmark]"
-```
-
-With algorithm specific extras:
-
-```bash
-pip install "textdistance[Hamming]"
-```
-
-Algorithms with available extras: `DamerauLevenshtein`, `Hamming`, `Jaro`, `JaroWinkler`, `Levenshtein`.
-
-### Dev
-
-Via pip:
-
-```bash
-pip install -e git+https://github.com/life4/textdistance.git#egg=textdistance
-```
-
-Or clone repo and install with some extras:
-
-```bash
-git clone https://github.com/life4/textdistance.git
-pip install -e ".[benchmark]"
-```
-
-## Usage
-
-All algorithms have 2 interfaces:
-
-1. Class with algorithm-specific params for customizing.
-1. Class instance with default params for quick and simple usage.
-
-All algorithms have some common methods:
-
-1. `.distance(*sequences)` -- calculate distance between sequences.
-1. `.similarity(*sequences)` -- calculate similarity for sequences.
-1. `.maximum(*sequences)` -- maximum possible value for distance and similarity. For any sequence: `distance + similarity == maximum`.
-1. `.normalized_distance(*sequences)` -- normalized distance between sequences. The return value is a float between 0 and 1, where 0 means equal, and 1 totally different.
-1. `.normalized_similarity(*sequences)` -- normalized similarity for sequences. The return value is a float between 0 and 1, where 0 means totally different, and 1 equal.
-
-Most common init arguments:
-
-1. `qval` -- q-value for split sequences into q-grams. Possible values:
-    - 1 (default) -- compare sequences by chars.
-    - 2 or more -- transform sequences to q-grams.
-    - None -- split sequences by words.
-1. `as_set` -- for token-based algorithms:
-    - True -- `t` and `ttt` is equal.
-    - False (default) -- `t` and `ttt` is different.
-
-## Examples
-
-For example, [Hamming distance](https://en.wikipedia.org/wiki/Hamming_distance):
-
-```python
-import textdistance
-
-textdistance.hamming('test', 'text')
-# 1
-
-textdistance.hamming.distance('test', 'text')
-# 1
-
-textdistance.hamming.similarity('test', 'text')
-# 3
-
-textdistance.hamming.normalized_distance('test', 'text')
-# 0.25
-
-textdistance.hamming.normalized_similarity('test', 'text')
-# 0.75
-
-textdistance.Hamming(qval=2).distance('test', 'text')
-# 2
-
-```
-
-Any other algorithms have same interface.
-
-## Articles
-
-A few articles with examples how to use textdistance in the real world:
-
-- [Guide to Fuzzy Matching with Python](http://theautomatic.net/2019/11/13/guide-to-fuzzy-matching-with-python/)
-- [String similarity — the basic know your algorithms guide!](https://itnext.io/string-similarity-the-basic-know-your-algorithms-guide-3de3d7346227)
-- [Normalized compression distance](https://articles.life4web.ru/other/ncd/)
-
-## Extra libraries
-
-For main algorithms textdistance try to call known external libraries (fastest first) if available (installed in your system) and possible (this implementation can compare this type of sequences). [Install](#installation) textdistance with extras for this feature.
-
-You can disable this by passing `external=False` argument on init:
-
-```python3
-import textdistance
-hamming = textdistance.Hamming(external=False)
-hamming('text', 'testit')
-# 3
-```
-
-Supported libraries:
-
-1. [Distance](https://github.com/doukremt/distance)
-1. [jellyfish](https://github.com/jamesturk/jellyfish)
-1. [py_stringmatching](https://github.com/anhaidgroup/py_stringmatching)
-1. [pylev](https://github.com/toastdriven/pylev)
-1. [Levenshtein](https://github.com/maxbachmann/Levenshtein)
-1. [pyxDamerauLevenshtein](https://github.com/gfairchild/pyxDamerauLevenshtein)
-
-Algorithms:
-
-1. DamerauLevenshtein
-1. Hamming
-1. Jaro
-1. JaroWinkler
-1. Levenshtein
-
-## Benchmarks
-
-Without extras installation:
-
-| algorithm          | library               |    time |
-|--------------------|-----------------------|---------|
-| DamerauLevenshtein | rapidfuzz             | 0.00312 |
-| DamerauLevenshtein | jellyfish             | 0.00591 |
-| DamerauLevenshtein | pyxdameraulevenshtein | 0.03335 |
-| DamerauLevenshtein | **textdistance**      | 0.83524 |
-| Hamming            | Levenshtein           | 0.00038 |
-| Hamming            | rapidfuzz             | 0.00044 |
-| Hamming            | jellyfish             | 0.00091 |
-| Hamming            | distance              | 0.00812 |
-| Hamming            | **textdistance**      | 0.03531 |
-| Jaro               | rapidfuzz             | 0.00092 |
-| Jaro               | jellyfish             | 0.00191 |
-| Jaro               | **textdistance**      | 0.07365 |
-| JaroWinkler        | rapidfuzz             | 0.00094 |
-| JaroWinkler        | jellyfish             | 0.00195 |
-| JaroWinkler        | **textdistance**      | 0.07501 |
-| Levenshtein        | rapidfuzz             | 0.00099 |
-| Levenshtein        | Levenshtein           | 0.00122 |
-| Levenshtein        | jellyfish             | 0.00254 |
-| Levenshtein        | pylev                 | 0.15688 |
-| Levenshtein        | distance              | 0.28669 |
-| Levenshtein        | **textdistance**      | 0.53902 |
-
-Total: 24 libs.
-
-Yeah, so slow. Use TextDistance on production only with extras.
-
-Textdistance use benchmark's results for algorithm's optimization and try to call fastest external lib first (if possible).
-
-You can run benchmark manually on your system:
-
-```bash
-pip install textdistance[benchmark]
-python3 -m textdistance.benchmark
-```
-
-TextDistance show benchmarks results table for your system and save libraries priorities into `libraries.json` file in TextDistance's folder. This file will be used by textdistance for calling fastest algorithm implementation. Default [libraries.json](textdistance/libraries.json) already included in package.
-
-## Running tests
-
-All you need is [task](https://taskfile.dev/). See [Taskfile.yml](./Taskfile.yml) for the list of available commands. For example, to run tests including third-party libraries usage, execute `task pytest-external:run`.
-
-## Contributing
-
-PRs are welcome!
-
-- Found a bug? Fix it!
-- Want to add more algorithms? Sure! Just make it with the same interface as other algorithms in the lib and add some tests.
-- Can make something faster? Great! Just avoid external dependencies and remember that everything should work not only with strings.
-- Something else that do you think is good? Do it! Just make sure that CI passes and everything from the README is still applicable (interface, features, and so on).
-- Have no time to code? Tell your friends and subscribers about `textdistance`. More users, more contributions, more amazing features.
-
-Thank you :heart:
+Metadata-Version: 2.1
+Name: textdistance
+Version: 4.6.3
+Summary: Compute distance between the two texts.
+Home-page: https://github.com/orsinium/textdistance
+Download-URL: https://github.com/orsinium/textdistance/tarball/master
+Author: orsinium
+Author-email: gram@orsinium.dev
+License: MIT
+Keywords: distance between text strings sequences iterators
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Topic :: Scientific/Engineering :: Human Machine Interfaces
+Requires-Python: >=3.5
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Provides-Extra: dameraulevenshtein
+Requires-Dist: rapidfuzz>=2.6.0; extra == "dameraulevenshtein"
+Requires-Dist: jellyfish; extra == "dameraulevenshtein"
+Requires-Dist: pyxDamerauLevenshtein; extra == "dameraulevenshtein"
+Provides-Extra: hamming
+Requires-Dist: Levenshtein; extra == "hamming"
+Requires-Dist: rapidfuzz>=2.6.0; extra == "hamming"
+Requires-Dist: jellyfish; extra == "hamming"
+Requires-Dist: distance; extra == "hamming"
+Provides-Extra: jaro
+Requires-Dist: rapidfuzz>=2.6.0; extra == "jaro"
+Requires-Dist: Levenshtein; extra == "jaro"
+Provides-Extra: jarowinkler
+Requires-Dist: rapidfuzz>=2.6.0; extra == "jarowinkler"
+Requires-Dist: jellyfish; extra == "jarowinkler"
+Provides-Extra: levenshtein
+Requires-Dist: rapidfuzz>=2.6.0; extra == "levenshtein"
+Requires-Dist: Levenshtein; extra == "levenshtein"
+Provides-Extra: all
+Requires-Dist: jellyfish; extra == "all"
+Requires-Dist: numpy; extra == "all"
+Requires-Dist: Levenshtein; extra == "all"
+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: 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: benchmarks
+Requires-Dist: jellyfish; extra == "benchmarks"
+Requires-Dist: numpy; extra == "benchmarks"
+Requires-Dist: Levenshtein; extra == "benchmarks"
+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: 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"
+
+# TextDistance
+
+![TextDistance logo](logo.png)
+
+[![Build Status](https://travis-ci.org/life4/textdistance.svg?branch=master)](https://travis-ci.org/life4/textdistance) [![PyPI version](https://img.shields.io/pypi/v/textdistance.svg)](https://pypi.python.org/pypi/textdistance) [![Status](https://img.shields.io/pypi/status/textdistance.svg)](https://pypi.python.org/pypi/textdistance) [![License](https://img.shields.io/pypi/l/textdistance.svg)](LICENSE)
+
+**TextDistance** -- python library for comparing distance between two or more sequences by many algorithms.
+
+Features:
+
+- 30+ algorithms
+- Pure python implementation
+- Simple usage
+- More than two sequences comparing
+- Some algorithms have more than one implementation in one class.
+- Optional numpy usage for maximum speed.
+
+## Algorithms
+
+### Edit based
+
+| Algorithm                                                                                 | Class                | Functions              |
+|-------------------------------------------------------------------------------------------|----------------------|------------------------|
+| [Hamming](https://en.wikipedia.org/wiki/Hamming_distance)                                 | `Hamming`            | `hamming`              |
+| [MLIPNS](http://www.sial.iias.spb.su/files/386-386-1-PB.pdf)                              | `MLIPNS`             | `mlipns`               |
+| [Levenshtein](https://en.wikipedia.org/wiki/Levenshtein_distance)                         | `Levenshtein`        | `levenshtein`          |
+| [Damerau-Levenshtein](https://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance) | `DamerauLevenshtein` | `damerau_levenshtein`  |
+| [Jaro-Winkler](https://en.wikipedia.org/wiki/Jaro%E2%80%93Winkler_distance)               | `JaroWinkler`        | `jaro_winkler`, `jaro` |
+| [Strcmp95](http://cpansearch.perl.org/src/SCW/Text-JaroWinkler-0.1/strcmp95.c)            | `StrCmp95`           | `strcmp95`             |
+| [Needleman-Wunsch](https://en.wikipedia.org/wiki/Needleman%E2%80%93Wunsch_algorithm)      | `NeedlemanWunsch`    | `needleman_wunsch`     |
+| [Gotoh](http://bioinfo.ict.ac.cn/~dbu/AlgorithmCourses/Lectures/LOA/Lec6-Sequence-Alignment-Affine-Gaps-Gotoh1982.pdf) | `Gotoh`              | `gotoh`                |
+| [Smith-Waterman](https://en.wikipedia.org/wiki/Smith%E2%80%93Waterman_algorithm)          | `SmithWaterman`      | `smith_waterman`       |
+
+### Token based
+
+| Algorithm                                                                                 | Class                | Functions     |
+|-------------------------------------------------------------------------------------------|----------------------|---------------|
+| [Jaccard index](https://en.wikipedia.org/wiki/Jaccard_index)                              | `Jaccard`            | `jaccard`     |
+| [Sørensen–Dice coefficient](https://en.wikipedia.org/wiki/S%C3%B8rensen%E2%80%93Dice_coefficient) | `Sorensen`   | `sorensen`, `sorensen_dice`, `dice` |
+| [Tversky index](https://en.wikipedia.org/wiki/Tversky_index)                              | `Tversky`            | `tversky`    |
+| [Overlap coefficient](https://en.wikipedia.org/wiki/Overlap_coefficient)                  | `Overlap`            | `overlap`    |
+| [Tanimoto distance](https://en.wikipedia.org/wiki/Jaccard_index#Tanimoto_similarity_and_distance) | `Tanimoto`   | `tanimoto`   |
+| [Cosine similarity](https://en.wikipedia.org/wiki/Cosine_similarity)                      | `Cosine`             | `cosine`     |
+| [Monge-Elkan](https://www.academia.edu/200314/Generalized_Monge-Elkan_Method_for_Approximate_Text_String_Comparison) | `MongeElkan` | `monge_elkan` |
+| [Bag distance](https://github.com/Yomguithereal/talisman/blob/master/src/metrics/bag.js) | `Bag`        | `bag`        |
+
+### Sequence based
+
+| Algorithm | Class | Functions |
+|-----------|-------|-----------|
+| [longest common subsequence similarity](https://en.wikipedia.org/wiki/Longest_common_subsequence_problem)          | `LCSSeq` | `lcsseq` |
+| [longest common substring similarity](https://docs.python.org/2/library/difflib.html#difflib.SequenceMatcher)      | `LCSStr` | `lcsstr` |
+| [Ratcliff-Obershelp similarity](https://en.wikipedia.org/wiki/Gestalt_Pattern_Matching) | `RatcliffObershelp` | `ratcliff_obershelp` |
+
+### Compression based
+
+[Normalized compression distance](https://en.wikipedia.org/wiki/Normalized_compression_distance#Normalized_compression_distance) with different compression algorithms.
+
+Classic compression algorithms:
+
+| Algorithm                                                                  | Class       | Function     |
+|----------------------------------------------------------------------------|-------------|--------------|
+| [Arithmetic coding](https://en.wikipedia.org/wiki/Arithmetic_coding)       | `ArithNCD`  | `arith_ncd`  |
+| [RLE](https://en.wikipedia.org/wiki/Run-length_encoding)                   | `RLENCD`    | `rle_ncd`    |
+| [BWT RLE](https://en.wikipedia.org/wiki/Burrows%E2%80%93Wheeler_transform) | `BWTRLENCD` | `bwtrle_ncd` |
+
+Normal compression algorithms:
+
+| Algorithm                                                                  | Class        | Function      |
+|----------------------------------------------------------------------------|--------------|---------------|
+| Square Root                                                                | `SqrtNCD`    | `sqrt_ncd`    |
+| [Entropy](https://en.wikipedia.org/wiki/Entropy_(information_theory))      | `EntropyNCD` | `entropy_ncd` |
+
+Work in progress algorithms that compare two strings as array of bits:
+
+| Algorithm                                  | Class     | Function   |
+|--------------------------------------------|-----------|------------|
+| [BZ2](https://en.wikipedia.org/wiki/Bzip2) | `BZ2NCD`  | `bz2_ncd`  |
+| [LZMA](https://en.wikipedia.org/wiki/LZMA) | `LZMANCD` | `lzma_ncd` |
+| [ZLib](https://en.wikipedia.org/wiki/Zlib) | `ZLIBNCD` | `zlib_ncd` |
+
+See [blog post](https://articles.life4web.ru/other/ncd/) for more details about NCD.
+
+### Phonetic
+
+| Algorithm                                                                    | Class    | Functions |
+|------------------------------------------------------------------------------|----------|-----------|
+| [MRA](https://en.wikipedia.org/wiki/Match_rating_approach)                   | `MRA`    | `mra`     |
+| [Editex](https://anhaidgroup.github.io/py_stringmatching/v0.3.x/Editex.html) | `Editex` | `editex`  |
+
+### Simple
+
+| Algorithm           | Class      | Functions  |
+|---------------------|------------|------------|
+| Prefix similarity   | `Prefix`   | `prefix`   |
+| Postfix similarity  | `Postfix`  | `postfix`  |
+| Length distance     | `Length`   | `length`   |
+| Identity similarity | `Identity` | `identity` |
+| Matrix similarity   | `Matrix`   | `matrix`   |
+
+## Installation
+
+### Stable
+
+Only pure python implementation:
+
+```bash
+pip install textdistance
+```
+
+With extra libraries for maximum speed:
+
+```bash
+pip install "textdistance[extras]"
+```
+
+With all libraries (required for [benchmarking](#benchmarks) and [testing](#running-tests)):
+
+```bash
+pip install "textdistance[benchmark]"
+```
+
+With algorithm specific extras:
+
+```bash
+pip install "textdistance[Hamming]"
+```
+
+Algorithms with available extras: `DamerauLevenshtein`, `Hamming`, `Jaro`, `JaroWinkler`, `Levenshtein`.
+
+### Dev
+
+Via pip:
+
+```bash
+pip install -e git+https://github.com/life4/textdistance.git#egg=textdistance
+```
+
+Or clone repo and install with some extras:
+
+```bash
+git clone https://github.com/life4/textdistance.git
+pip install -e ".[benchmark]"
+```
+
+## Usage
+
+All algorithms have 2 interfaces:
+
+1. Class with algorithm-specific params for customizing.
+1. Class instance with default params for quick and simple usage.
+
+All algorithms have some common methods:
+
+1. `.distance(*sequences)` -- calculate distance between sequences.
+1. `.similarity(*sequences)` -- calculate similarity for sequences.
+1. `.maximum(*sequences)` -- maximum possible value for distance and similarity. For any sequence: `distance + similarity == maximum`.
+1. `.normalized_distance(*sequences)` -- normalized distance between sequences. The return value is a float between 0 and 1, where 0 means equal, and 1 totally different.
+1. `.normalized_similarity(*sequences)` -- normalized similarity for sequences. The return value is a float between 0 and 1, where 0 means totally different, and 1 equal.
+
+Most common init arguments:
+
+1. `qval` -- q-value for split sequences into q-grams. Possible values:
+    - 1 (default) -- compare sequences by chars.
+    - 2 or more -- transform sequences to q-grams.
+    - None -- split sequences by words.
+1. `as_set` -- for token-based algorithms:
+    - True -- `t` and `ttt` is equal.
+    - False (default) -- `t` and `ttt` is different.
+
+## Examples
+
+For example, [Hamming distance](https://en.wikipedia.org/wiki/Hamming_distance):
+
+```python
+import textdistance
+
+textdistance.hamming('test', 'text')
+# 1
+
+textdistance.hamming.distance('test', 'text')
+# 1
+
+textdistance.hamming.similarity('test', 'text')
+# 3
+
+textdistance.hamming.normalized_distance('test', 'text')
+# 0.25
+
+textdistance.hamming.normalized_similarity('test', 'text')
+# 0.75
+
+textdistance.Hamming(qval=2).distance('test', 'text')
+# 2
+
+```
+
+Any other algorithms have same interface.
+
+## Articles
+
+A few articles with examples how to use textdistance in the real world:
+
+- [Guide to Fuzzy Matching with Python](http://theautomatic.net/2019/11/13/guide-to-fuzzy-matching-with-python/)
+- [String similarity — the basic know your algorithms guide!](https://itnext.io/string-similarity-the-basic-know-your-algorithms-guide-3de3d7346227)
+- [Normalized compression distance](https://articles.life4web.ru/other/ncd/)
+
+## Extra libraries
+
+For main algorithms textdistance try to call known external libraries (fastest first) if available (installed in your system) and possible (this implementation can compare this type of sequences). [Install](#installation) textdistance with extras for this feature.
+
+You can disable this by passing `external=False` argument on init:
+
+```python3
+import textdistance
+hamming = textdistance.Hamming(external=False)
+hamming('text', 'testit')
+# 3
+```
+
+Supported libraries:
+
+1. [Distance](https://github.com/doukremt/distance)
+1. [jellyfish](https://github.com/jamesturk/jellyfish)
+1. [py_stringmatching](https://github.com/anhaidgroup/py_stringmatching)
+1. [pylev](https://github.com/toastdriven/pylev)
+1. [Levenshtein](https://github.com/maxbachmann/Levenshtein)
+1. [pyxDamerauLevenshtein](https://github.com/gfairchild/pyxDamerauLevenshtein)
+
+Algorithms:
+
+1. DamerauLevenshtein
+1. Hamming
+1. Jaro
+1. JaroWinkler
+1. Levenshtein
+
+## Benchmarks
+
+Without extras installation:
+
+| algorithm          | library               |    time |
+|--------------------|-----------------------|---------|
+| DamerauLevenshtein | rapidfuzz             | 0.00312 |
+| DamerauLevenshtein | jellyfish             | 0.00591 |
+| DamerauLevenshtein | pyxdameraulevenshtein | 0.03335 |
+| DamerauLevenshtein | **textdistance**      | 0.83524 |
+| Hamming            | Levenshtein           | 0.00038 |
+| Hamming            | rapidfuzz             | 0.00044 |
+| Hamming            | jellyfish             | 0.00091 |
+| Hamming            | distance              | 0.00812 |
+| Hamming            | **textdistance**      | 0.03531 |
+| Jaro               | rapidfuzz             | 0.00092 |
+| Jaro               | jellyfish             | 0.00191 |
+| Jaro               | **textdistance**      | 0.07365 |
+| JaroWinkler        | rapidfuzz             | 0.00094 |
+| JaroWinkler        | jellyfish             | 0.00195 |
+| JaroWinkler        | **textdistance**      | 0.07501 |
+| Levenshtein        | rapidfuzz             | 0.00099 |
+| Levenshtein        | Levenshtein           | 0.00122 |
+| Levenshtein        | jellyfish             | 0.00254 |
+| Levenshtein        | pylev                 | 0.15688 |
+| Levenshtein        | distance              | 0.28669 |
+| Levenshtein        | **textdistance**      | 0.53902 |
+
+Total: 24 libs.
+
+Yeah, so slow. Use TextDistance on production only with extras.
+
+Textdistance use benchmark's results for algorithm's optimization and try to call fastest external lib first (if possible).
+
+You can run benchmark manually on your system:
+
+```bash
+pip install textdistance[benchmark]
+python3 -m textdistance.benchmark
+```
+
+TextDistance show benchmarks results table for your system and save libraries priorities into `libraries.json` file in TextDistance's folder. This file will be used by textdistance for calling fastest algorithm implementation. Default [libraries.json](textdistance/libraries.json) already included in package.
+
+## Running tests
+
+All you need is [task](https://taskfile.dev/). See [Taskfile.yml](./Taskfile.yml) for the list of available commands. For example, to run tests including third-party libraries usage, execute `task pytest-external:run`.
+
+## Contributing
+
+PRs are welcome!
+
+- Found a bug? Fix it!
+- Want to add more algorithms? Sure! Just make it with the same interface as other algorithms in the lib and add some tests.
+- Can make something faster? Great! Just avoid external dependencies and remember that everything should work not only with strings.
+- Something else that do you think is good? Do it! Just make sure that CI passes and everything from the README is still applicable (interface, features, and so on).
+- Have no time to code? Tell your friends and subscribers about `textdistance`. More users, more contributions, more amazing features.
+
+Thank you :heart:
diff --git a/libs/textdistance-4.6.2.dist-info/RECORD b/libs/textdistance-4.6.3.dist-info/RECORD
similarity index 70%
rename from libs/textdistance-4.6.2.dist-info/RECORD
rename to libs/textdistance-4.6.3.dist-info/RECORD
index bd4979d44..fcf0158fb 100644
--- a/libs/textdistance-4.6.2.dist-info/RECORD
+++ b/libs/textdistance-4.6.3.dist-info/RECORD
@@ -1,23 +1,23 @@
-textdistance-4.6.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-textdistance-4.6.2.dist-info/LICENSE,sha256=oOV_OJnxc9uQzeaMabB-rqV8Gti-Q1kQXusPgFxoEJI,1049
-textdistance-4.6.2.dist-info/METADATA,sha256=VEcNYZKg6DmHP3PO13LsHReUXriHMAPQ26SDcTkrENo,18635
-textdistance-4.6.2.dist-info/RECORD,,
-textdistance-4.6.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-textdistance-4.6.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-textdistance-4.6.2.dist-info/top_level.txt,sha256=GBIsLNa3pcbaPSp8KNq93YdHKE3CNIQMQrLrZdectak,13
-textdistance/__init__.py,sha256=abtyaG6QgNqbwQTs_8q1rJUSPr78akEOLYgJDXHgtLM,355
-textdistance/algorithms/__init__.py,sha256=1raagDGcgHenA-Ncj3oKHTCk0ai8ltLdqQzTA__clkg,217
-textdistance/algorithms/base.py,sha256=IJwzIa3G4n6piDS9dOhSAVUoHmD4sCJCvGHH1Z4F_0o,6332
-textdistance/algorithms/compression_based.py,sha256=qXg-jUm4ifd1jLLXhvrNkhbi-_JK5AQyjr4026qquVE,8190
-textdistance/algorithms/edit_based.py,sha256=OZc-sGjzRx0eFl5jsEA3V3Q5MkBJR5QLbZYiz_EAPL0,27598
-textdistance/algorithms/phonetic.py,sha256=E7yCZVV_6XDkq7tbLHmYd2CAIyj7VQcpf7rQhHXMMj8,6133
-textdistance/algorithms/sequence_based.py,sha256=0iS9iZkx_eYJQFZKjRpBFp8jCs1c_1Hz0kWq6CBnJVg,6158
-textdistance/algorithms/simple.py,sha256=2wryMhYmBRDGjG9AT74AAI9SpmYDLABqpSUbw_Fy8AU,3209
-textdistance/algorithms/token_based.py,sha256=D2__lJONSfvU6Eiuq8IkB6TIBWCHPb3JWNH5LuL5liA,9405
-textdistance/algorithms/types.py,sha256=PVVh0bcCEK8ziRsmKgHyIJ8i9TERKaGoVA36_5lnAr0,166
-textdistance/algorithms/vector_based.py,sha256=jmbeSioJlATSlx097ptcJRl0G6dHzp2x_fyOcKYY6ZE,2821
-textdistance/benchmark.py,sha256=NpxvQQgBFVElQrG0wP44AlmcxEntLI11qj1A0KFSrCY,3818
-textdistance/libraries.json,sha256=bZw0jXy6oPnKr7VPu0LyOMDA1EAUoF-TDwjazl3lknc,1161
-textdistance/libraries.py,sha256=GGQsTRlyMOoak2WQ1w_mESgDzmcYeUiCHmWqP0s8ncI,6716
-textdistance/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-textdistance/utils.py,sha256=SDJclnzpkOpoyJmZ23AO7JZQfdsdpWmOO0xofzi95YQ,783
+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/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/top_level.txt,sha256=GBIsLNa3pcbaPSp8KNq93YdHKE3CNIQMQrLrZdectak,13
+textdistance/__init__.py,sha256=abtyaG6QgNqbwQTs_8q1rJUSPr78akEOLYgJDXHgtLM,355
+textdistance/algorithms/__init__.py,sha256=1raagDGcgHenA-Ncj3oKHTCk0ai8ltLdqQzTA__clkg,217
+textdistance/algorithms/base.py,sha256=IJwzIa3G4n6piDS9dOhSAVUoHmD4sCJCvGHH1Z4F_0o,6332
+textdistance/algorithms/compression_based.py,sha256=qXg-jUm4ifd1jLLXhvrNkhbi-_JK5AQyjr4026qquVE,8190
+textdistance/algorithms/edit_based.py,sha256=OZc-sGjzRx0eFl5jsEA3V3Q5MkBJR5QLbZYiz_EAPL0,27598
+textdistance/algorithms/phonetic.py,sha256=E7yCZVV_6XDkq7tbLHmYd2CAIyj7VQcpf7rQhHXMMj8,6133
+textdistance/algorithms/sequence_based.py,sha256=0iS9iZkx_eYJQFZKjRpBFp8jCs1c_1Hz0kWq6CBnJVg,6158
+textdistance/algorithms/simple.py,sha256=2wryMhYmBRDGjG9AT74AAI9SpmYDLABqpSUbw_Fy8AU,3209
+textdistance/algorithms/token_based.py,sha256=QT36CbihwuurzVTG4CSYzmNAI3iJ_cmOngYAY8Lrkf8,9413
+textdistance/algorithms/types.py,sha256=PVVh0bcCEK8ziRsmKgHyIJ8i9TERKaGoVA36_5lnAr0,166
+textdistance/algorithms/vector_based.py,sha256=jmbeSioJlATSlx097ptcJRl0G6dHzp2x_fyOcKYY6ZE,2821
+textdistance/benchmark.py,sha256=NpxvQQgBFVElQrG0wP44AlmcxEntLI11qj1A0KFSrCY,3818
+textdistance/libraries.json,sha256=bZw0jXy6oPnKr7VPu0LyOMDA1EAUoF-TDwjazl3lknc,1161
+textdistance/libraries.py,sha256=GGQsTRlyMOoak2WQ1w_mESgDzmcYeUiCHmWqP0s8ncI,6716
+textdistance/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+textdistance/utils.py,sha256=SDJclnzpkOpoyJmZ23AO7JZQfdsdpWmOO0xofzi95YQ,783
diff --git a/libs/typing_extensions-4.10.0.dist-info/REQUESTED b/libs/textdistance-4.6.3.dist-info/REQUESTED
similarity index 100%
rename from libs/typing_extensions-4.10.0.dist-info/REQUESTED
rename to libs/textdistance-4.6.3.dist-info/REQUESTED
diff --git a/libs/textdistance-4.6.3.dist-info/WHEEL b/libs/textdistance-4.6.3.dist-info/WHEEL
new file mode 100644
index 000000000..da25d7b42
--- /dev/null
+++ b/libs/textdistance-4.6.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.2.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/textdistance-4.6.2.dist-info/top_level.txt b/libs/textdistance-4.6.3.dist-info/top_level.txt
similarity index 100%
rename from libs/textdistance-4.6.2.dist-info/top_level.txt
rename to libs/textdistance-4.6.3.dist-info/top_level.txt
diff --git a/libs/textdistance/algorithms/token_based.py b/libs/textdistance/algorithms/token_based.py
index 3dd8c07fd..d499b8468 100644
--- a/libs/textdistance/algorithms/token_based.py
+++ b/libs/textdistance/algorithms/token_based.py
@@ -15,7 +15,7 @@ __all__ = [
     'Jaccard', 'Sorensen', 'Tversky',
     'Overlap', 'Cosine', 'Tanimoto', 'MongeElkan', 'Bag',
 
-    'jaccard', 'sorensen', 'tversky', 'sorensen_dice',
+    'jaccard', 'sorensen', 'tversky', 'sorensen_dice', 'dice',
     'overlap', 'cosine', 'tanimoto', 'monge_elkan', 'bag',
 ]
 
diff --git a/libs/tld-0.13.dist-info/RECORD b/libs/tld-0.13.dist-info/RECORD
index 8aa81a595..e4ef5fe2a 100644
--- a/libs/tld-0.13.dist-info/RECORD
+++ b/libs/tld-0.13.dist-info/RECORD
@@ -4,7 +4,7 @@ tld-0.13.dist-info/LICENSE_LGPL_2.1.txt,sha256=lhMXOO1t3BzePhSCoSWiJ7WltJiBMbC0v
 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=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+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
diff --git a/libs/tld-0.13.dist-info/WHEEL b/libs/tld-0.13.dist-info/WHEEL
index 4724c4573..17c0299e4 100644
--- a/libs/tld-0.13.dist-info/WHEEL
+++ b/libs/tld-0.13.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/tqdm-4.66.2.dist-info/RECORD b/libs/tqdm-4.66.2.dist-info/RECORD
deleted file mode 100644
index 20f15e8e7..000000000
--- a/libs/tqdm-4.66.2.dist-info/RECORD
+++ /dev/null
@@ -1,43 +0,0 @@
-../../bin/tqdm,sha256=sIQGANa0Ss4XAwHxESDSgOd-paMFKgM1S2k-LA3IZ0c,230
-tqdm-4.66.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tqdm-4.66.2.dist-info/LICENCE,sha256=3DMlLoKQFeOxUAhvubOkD2rW-zLC9GEM6BL6Z301mGo,1985
-tqdm-4.66.2.dist-info/METADATA,sha256=hqX0to0oQdiQK_4I-kKeZTMZVBuSLqQlR-stAlZWUe4,57587
-tqdm-4.66.2.dist-info/RECORD,,
-tqdm-4.66.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tqdm-4.66.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tqdm-4.66.2.dist-info/entry_points.txt,sha256=ReJCH7Ui3Zyh6M16E4OhsZ1oU7WtMXCfbtoyBhGO29Y,39
-tqdm-4.66.2.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=WtMQthlgvWIN7EQ42ET8BE1M6YXdXKafzqbKD3PLmGk,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=WcWbVEjc1-GxqnN0BVntDuwYR31JN9SV7ERZhEz8kKo,2775
-tqdm/auto.py,sha256=nDZflj6p2zKkjBCNBourrhS81zYfZy1_dQvbckrdW8o,871
-tqdm/autonotebook.py,sha256=Yb9F5uaiBPhfbDDFpbtoG8I2YUw3uQJ89rUDLbfR6ws,956
-tqdm/cli.py,sha256=RZh5sKVclaNp_7tZ3iCXWJB3-V6KfeQNNw7mZ818gMc,10594
-tqdm/completion.sh,sha256=j79KbSmpIj_E11jfTfBXrGnUTzKXVpQ1vGVQvsyDRl4,946
-tqdm/contrib/__init__.py,sha256=cNNaRURdcPjbQpkxPGe4iaShyQr_Dx8h6NQJubPhq7g,2513
-tqdm/contrib/bells.py,sha256=Yx1HqGCmHrESCAO700j5wE__JCleNODJxedh1ijPLD0,837
-tqdm/contrib/concurrent.py,sha256=K1yjloKS5WRNFyjLRth0DmU5PAnDbF0A-GD27N-J4a8,3986
-tqdm/contrib/discord.py,sha256=hhbOL1VGTWXQ4z1RUsIybhga7oUMYH5CoAkNWTt7t70,3962
-tqdm/contrib/itertools.py,sha256=WdKKQU5eSzsqHu29SN_oH12huYZo0Jihqoi9-nVhwz4,774
-tqdm/contrib/logging.py,sha256=aUvbBPGm0jetH22p1H5bobkdzewwYpXkdO8C_6nmAJk,3785
-tqdm/contrib/slack.py,sha256=CYIzKBgbk0azM19F4kSA8Ccod9I8hNfuscbcc9kjGYU,4068
-tqdm/contrib/telegram.py,sha256=ICWNBIb-l-quSgjKw4PhRdrH2_bKk7umy6BfEsp9EuU,5100
-tqdm/contrib/utils_worker.py,sha256=HJP5Mz1S1xyzEke2JaqJ2sYLHXADYoo2epT5AzQ38eA,1207
-tqdm/dask.py,sha256=RWR3rz9s36zNceeESTm-F3H1F7dxuBuqS1bhifOuvEY,1337
-tqdm/gui.py,sha256=LhGizt5G1w4f17OjFRBWza8MEmQZjrFgTx9Y9Lc7-gA,5809
-tqdm/keras.py,sha256=op9sBkb6q6c6dw2wJ0SD2ZwpPK7yM1Vbg4l1Qiy3MIo,4373
-tqdm/notebook.py,sha256=A6waQCPa0Ud3OrByzZwj91STnhwoJ1Ui3THrmQBZjqE,11023
-tqdm/rich.py,sha256=8SamiW-LlUKEMQwzubomHCXkX6awaz-7Tq-gnMkJJ5A,5018
-tqdm/std.py,sha256=AuM80Fy023Ex6N7J8TP8XaJehJLo8OnjIfLk9r7j7T4,57478
-tqdm/tk.py,sha256=Hp9QwXTsihURoxt5aXbIe8Cu1qjLBZzkhfl_nAgD418,6727
-tqdm/tqdm.1,sha256=aILyUPk2S4OPe_uWy2P4AMjUf0oQ6PUW0nLYXB-BWwI,7889
-tqdm/utils.py,sha256=abBTZZ38isuYMR38AgZ-nQzC-KvRn8M-mFCuzFpgsuA,11883
-tqdm/version.py,sha256=-1yWjfu3P0eghVsysHH07fbzdiADNRdzRtYPqOaqR2A,333
diff --git a/libs/tqdm-4.66.2.dist-info/WHEEL b/libs/tqdm-4.66.2.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/tqdm-4.66.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/tzdata-2024.1.dist-info/INSTALLER b/libs/tqdm-4.67.1.dist-info/INSTALLER
similarity index 100%
rename from libs/tzdata-2024.1.dist-info/INSTALLER
rename to libs/tqdm-4.67.1.dist-info/INSTALLER
diff --git a/libs/tqdm-4.66.2.dist-info/LICENCE b/libs/tqdm-4.67.1.dist-info/LICENCE
similarity index 100%
rename from libs/tqdm-4.66.2.dist-info/LICENCE
rename to libs/tqdm-4.67.1.dist-info/LICENCE
diff --git a/libs/tqdm-4.66.2.dist-info/METADATA b/libs/tqdm-4.67.1.dist-info/METADATA
similarity index 98%
rename from libs/tqdm-4.66.2.dist-info/METADATA
rename to libs/tqdm-4.67.1.dist-info/METADATA
index 3dd9013fb..074db371c 100644
--- a/libs/tqdm-4.66.2.dist-info/METADATA
+++ b/libs/tqdm-4.67.1.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tqdm
-Version: 4.66.2
+Version: 4.67.1
 Summary: Fast, Extensible Progress Meter
 Maintainer-email: tqdm developers <devs@tqdm.ml>
 License: MPL-2.0 AND MIT
@@ -42,6 +42,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
@@ -66,18 +67,21 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 License-File: LICENCE
-Requires-Dist: colorama ; platform_system == "Windows"
+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-xdist ; 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'
+Requires-Dist: ipywidgets>=6; extra == "notebook"
 Provides-Extra: slack
-Requires-Dist: slack-sdk ; extra == 'slack'
+Requires-Dist: slack-sdk; extra == "slack"
 Provides-Extra: telegram
-Requires-Dist: requests ; extra == 'telegram'
+Requires-Dist: requests; extra == "telegram"
 
 |Logo|
 
@@ -847,7 +851,7 @@ Additional ``bar_format`` parameters may also be defined by overriding
         """Provides a `total_time` format parameter"""
         @property
         def format_dict(self):
-            d = super(TqdmExtraFormat, self).format_dict
+            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
@@ -1063,7 +1067,7 @@ custom callback take advantage of this, simply use the return value of
 
     class TqdmExt(std_tqdm):
         def update(self, n=1):
-            displayed = super(TqdmExt, self).update(n)
+            displayed = super().update(n)
             if displayed:
                 external_callback(**self.format_dict)
             return displayed
@@ -1586,5 +1590,5 @@ Citation information: |DOI|
 .. |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://caspersci.uk.to/cgi-bin/hits.cgi?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://caspersci.uk.to/cgi-bin/hits.cgi?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
+.. |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
new file mode 100644
index 000000000..a642fcb16
--- /dev/null
+++ b/libs/tqdm-4.67.1.dist-info/RECORD
@@ -0,0 +1,43 @@
+../../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/tzdata-2024.1.dist-info/REQUESTED b/libs/tqdm-4.67.1.dist-info/REQUESTED
similarity index 100%
rename from libs/tzdata-2024.1.dist-info/REQUESTED
rename to libs/tqdm-4.67.1.dist-info/REQUESTED
diff --git a/libs/tqdm-4.67.1.dist-info/WHEEL b/libs/tqdm-4.67.1.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/tqdm-4.67.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/tqdm-4.66.2.dist-info/entry_points.txt b/libs/tqdm-4.67.1.dist-info/entry_points.txt
similarity index 100%
rename from libs/tqdm-4.66.2.dist-info/entry_points.txt
rename to libs/tqdm-4.67.1.dist-info/entry_points.txt
diff --git a/libs/tqdm-4.66.2.dist-info/top_level.txt b/libs/tqdm-4.67.1.dist-info/top_level.txt
similarity index 100%
rename from libs/tqdm-4.66.2.dist-info/top_level.txt
rename to libs/tqdm-4.67.1.dist-info/top_level.txt
diff --git a/libs/tqdm/_dist_ver.py b/libs/tqdm/_dist_ver.py
index 63c9d0ae8..61af7d5bb 100644
--- a/libs/tqdm/_dist_ver.py
+++ b/libs/tqdm/_dist_ver.py
@@ -1 +1 @@
-__version__ = '4.66.2'
+__version__ = '4.67.1'
diff --git a/libs/tqdm/asyncio.py b/libs/tqdm/asyncio.py
index ddc89b853..2d00a0a2e 100644
--- a/libs/tqdm/asyncio.py
+++ b/libs/tqdm/asyncio.py
@@ -21,7 +21,7 @@ class tqdm_asyncio(std_tqdm):
     Asynchronous-friendly version of tqdm.
     """
     def __init__(self, iterable=None, *args, **kwargs):
-        super(tqdm_asyncio, self).__init__(iterable, *args, **kwargs)
+        super().__init__(iterable, *args, **kwargs)
         self.iterable_awaitable = False
         if iterable is not None:
             if hasattr(iterable, "__anext__"):
diff --git a/libs/tqdm/cli.py b/libs/tqdm/cli.py
index 1223d4977..e54a7fc85 100644
--- a/libs/tqdm/cli.py
+++ b/libs/tqdm/cli.py
@@ -5,6 +5,7 @@ import logging
 import re
 import sys
 from ast import literal_eval as numeric
+from textwrap import indent
 
 from .std import TqdmKeyError, TqdmTypeError, tqdm
 from .version import __version__
@@ -21,23 +22,34 @@ def cast(val, typ):
                 return cast(val, t)
             except TqdmTypeError:
                 pass
-        raise TqdmTypeError(val + ' : ' + typ)
+        raise TqdmTypeError(f"{val} : {typ}")
 
     # sys.stderr.write('\ndebug | `val:type`: `' + val + ':' + typ + '`.\n')
     if typ == 'bool':
         if (val == 'True') or (val == ''):
             return True
-        elif val == 'False':
+        if val == 'False':
             return False
-        else:
-            raise TqdmTypeError(val + ' : ' + typ)
-    try:
-        return eval(typ + '("' + val + '")')
-    except Exception:
-        if typ == 'chr':
-            return chr(ord(eval('"' + val + '"'))).encode()
-        else:
-            raise TqdmTypeError(val + ' : ' + typ)
+        raise TqdmTypeError(val + ' : ' + typ)
+    if typ == 'chr':
+        if len(val) == 1:
+            return val.encode()
+        if re.match(r"^\\\w+$", val):
+            return eval(f'"{val}"').encode()
+        raise TqdmTypeError(f"{val} : {typ}")
+    if typ == 'str':
+        return val
+    if typ == 'int':
+        try:
+            return int(val)
+        except ValueError as exc:
+            raise TqdmTypeError(f"{val} : {typ}") from exc
+    if typ == 'float':
+        try:
+            return float(val)
+        except ValueError as exc:
+            raise TqdmTypeError(f"{val} : {typ}") from exc
+    raise TqdmTypeError(f"{val} : {typ}")
 
 
 def posix_pipe(fin, fout, delim=b'\\n', buf_size=256,
@@ -166,7 +178,9 @@ def main(fp=sys.stderr, argv=None):
     logging.basicConfig(level=getattr(logging, logLevel),
                         format="%(levelname)s:%(module)s:%(lineno)d:%(message)s")
 
-    d = tqdm.__doc__ + CLI_EXTRA_DOC
+    # py<3.13 doesn't dedent docstrings
+    d = (tqdm.__doc__ if sys.version_info < (3, 13)
+         else indent(tqdm.__doc__, "    ")) + CLI_EXTRA_DOC
 
     opt_types = dict(RE_OPTS.findall(d))
     # opt_types['delim'] = 'chr'
@@ -244,22 +258,21 @@ Options:
             stdout = getattr(stdout, 'buffer', stdout)
         stdin = getattr(sys.stdin, 'buffer', sys.stdin)
         if manpath or comppath:
-            from importlib import resources
-            from os import path
-            from shutil import copyfile
+            try:  # py<3.9
+                import importlib_resources as resources
+            except ImportError:
+                from importlib import resources
+            from pathlib import Path
 
             def cp(name, dst):
                 """copy resource `name` to `dst`"""
-                if hasattr(resources, 'files'):
-                    copyfile(str(resources.files('tqdm') / name), dst)
-                else:  # py<3.9
-                    with resources.path('tqdm', name) as src:
-                        copyfile(str(src), dst)
+                fi = resources.files('tqdm') / name
+                dst.write_bytes(fi.read_bytes())
                 log.info("written:%s", dst)
             if manpath is not None:
-                cp('tqdm.1', path.join(manpath, 'tqdm.1'))
+                cp('tqdm.1', Path(manpath) / 'tqdm.1')
             if comppath is not None:
-                cp('completion.sh', path.join(comppath, 'tqdm_completion.sh'))
+                cp('completion.sh', Path(comppath) / 'tqdm_completion.sh')
             sys.exit(0)
         if tee:
             stdout_write = stdout.write
diff --git a/libs/tqdm/contrib/__init__.py b/libs/tqdm/contrib/__init__.py
index 7338c960a..d059461f9 100644
--- a/libs/tqdm/contrib/__init__.py
+++ b/libs/tqdm/contrib/__init__.py
@@ -17,7 +17,7 @@ class DummyTqdmFile(ObjectWrapper):
     """Dummy file-like that will write to tqdm"""
 
     def __init__(self, wrapped):
-        super(DummyTqdmFile, self).__init__(wrapped)
+        super().__init__(wrapped)
         self._buf = []
 
     def write(self, x, nolock=False):
diff --git a/libs/tqdm/contrib/discord.py b/libs/tqdm/contrib/discord.py
index 1e4130828..574baa84b 100644
--- a/libs/tqdm/contrib/discord.py
+++ b/libs/tqdm/contrib/discord.py
@@ -8,49 +8,83 @@ Usage:
 
 ![screenshot](https://tqdm.github.io/img/screenshot-discord.png)
 """
-import logging
 from os import getenv
+from warnings import warn
 
-try:
-    from disco.client import Client, ClientConfig
-except ImportError:
-    raise ImportError("Please `pip install disco-py`")
+from requests import Session
+from requests.utils import default_user_agent
 
 from ..auto import tqdm as tqdm_auto
+from ..std import TqdmWarning
+from ..version import __version__
 from .utils_worker import MonoWorker
 
-__author__ = {"github.com/": ["casperdcl"]}
+__author__ = {"github.com/": ["casperdcl", "guigoruiz1"]}
 __all__ = ['DiscordIO', 'tqdm_discord', 'tdrange', 'tqdm', 'trange']
 
 
 class DiscordIO(MonoWorker):
     """Non-blocking file-like IO using a Discord Bot."""
+    API = "https://discord.com/api/v10"
+    UA = f"tqdm (https://tqdm.github.io, {__version__}) {default_user_agent()}"
+
     def __init__(self, token, channel_id):
         """Creates a new message in the given `channel_id`."""
-        super(DiscordIO, self).__init__()
-        config = ClientConfig()
-        config.token = token
-        client = Client(config)
+        super().__init__()
+        self.token = token
+        self.channel_id = channel_id
+        self.session = Session()
         self.text = self.__class__.__name__
+        self.message_id
+
+    @property
+    def message_id(self):
+        if hasattr(self, '_message_id'):
+            return self._message_id
         try:
-            self.message = client.api.channels_messages_create(channel_id, self.text)
+            res = self.session.post(
+                f'{self.API}/channels/{self.channel_id}/messages',
+                headers={'Authorization': f'Bot {self.token}', 'User-Agent': self.UA},
+                json={'content': f"`{self.text}`"}).json()
         except Exception as e:
             tqdm_auto.write(str(e))
-            self.message = None
+        else:
+            if res.get('error_code') == 429:
+                warn("Creation rate limit: try increasing `mininterval`.",
+                     TqdmWarning, stacklevel=2)
+            else:
+                self._message_id = res['id']
+                return self._message_id
 
     def write(self, s):
-        """Replaces internal `message`'s text with `s`."""
+        """Replaces internal `message_id`'s text with `s`."""
         if not s:
             s = "..."
         s = s.replace('\r', '').strip()
         if s == self.text:
-            return  # skip duplicate message
-        message = self.message
-        if message is None:
+            return  # avoid duplicate message Bot error
+        message_id = self.message_id
+        if message_id is None:
             return
         self.text = s
         try:
-            future = self.submit(message.edit, '`' + s + '`')
+            future = self.submit(
+                self.session.patch,
+                f'{self.API}/channels/{self.channel_id}/messages/{message_id}',
+                headers={'Authorization': f'Bot {self.token}', 'User-Agent': self.UA},
+                json={'content': f"`{self.text}`"})
+        except Exception as e:
+            tqdm_auto.write(str(e))
+        else:
+            return future
+
+    def delete(self):
+        """Deletes internal `message_id`."""
+        try:
+            future = self.submit(
+                self.session.delete,
+                f'{self.API}/channels/{self.channel_id}/messages/{self.message_id}',
+                headers={'Authorization': f'Bot {self.token}', 'User-Agent': self.UA})
         except Exception as e:
             tqdm_auto.write(str(e))
         else:
@@ -75,26 +109,22 @@ class tqdm_discord(tqdm_auto):
         """
         Parameters
         ----------
-        token  : str, required. Discord token
+        token  : str, required. Discord bot token
             [default: ${TQDM_DISCORD_TOKEN}].
         channel_id  : int, required. Discord channel ID
             [default: ${TQDM_DISCORD_CHANNEL_ID}].
-        mininterval  : float, optional.
-          Minimum of [default: 1.5] to avoid rate limit.
 
         See `tqdm.auto.tqdm.__init__` for other parameters.
         """
         if not kwargs.get('disable'):
             kwargs = kwargs.copy()
-            logging.getLogger("HTTPClient").setLevel(logging.WARNING)
             self.dio = DiscordIO(
-                kwargs.pop('token', getenv("TQDM_DISCORD_TOKEN")),
-                kwargs.pop('channel_id', getenv("TQDM_DISCORD_CHANNEL_ID")))
-            kwargs['mininterval'] = max(1.5, kwargs.get('mininterval', 1.5))
-        super(tqdm_discord, self).__init__(*args, **kwargs)
+                kwargs.pop('token', getenv('TQDM_DISCORD_TOKEN')),
+                kwargs.pop('channel_id', getenv('TQDM_DISCORD_CHANNEL_ID')))
+        super().__init__(*args, **kwargs)
 
     def display(self, **kwargs):
-        super(tqdm_discord, self).display(**kwargs)
+        super().display(**kwargs)
         fmt = self.format_dict
         if fmt.get('bar_format', None):
             fmt['bar_format'] = fmt['bar_format'].replace(
@@ -104,10 +134,17 @@ class tqdm_discord(tqdm_auto):
         self.dio.write(self.format_meter(**fmt))
 
     def clear(self, *args, **kwargs):
-        super(tqdm_discord, self).clear(*args, **kwargs)
+        super().clear(*args, **kwargs)
         if not self.disable:
             self.dio.write("")
 
+    def close(self):
+        if self.disable:
+            return
+        super().close()
+        if not (self.leave or (self.leave is None and self.pos == 0)):
+            self.dio.delete()
+
 
 def tdrange(*args, **kwargs):
     """Shortcut for `tqdm.contrib.discord.tqdm(range(*args), **kwargs)`."""
diff --git a/libs/tqdm/contrib/logging.py b/libs/tqdm/contrib/logging.py
index b8eaec53f..e06febe37 100644
--- a/libs/tqdm/contrib/logging.py
+++ b/libs/tqdm/contrib/logging.py
@@ -18,7 +18,7 @@ class _TqdmLoggingHandler(logging.StreamHandler):
         self,
         tqdm_class=std_tqdm  # type: Type[std_tqdm]
     ):
-        super(_TqdmLoggingHandler, self).__init__()
+        super().__init__()
         self.tqdm_class = tqdm_class
 
     def emit(self, record):
diff --git a/libs/tqdm/contrib/slack.py b/libs/tqdm/contrib/slack.py
index d4c850ca4..9bca8ee98 100644
--- a/libs/tqdm/contrib/slack.py
+++ b/libs/tqdm/contrib/slack.py
@@ -27,7 +27,7 @@ class SlackIO(MonoWorker):
     """Non-blocking file-like IO using a Slack app."""
     def __init__(self, token, channel):
         """Creates a new message in the given `channel`."""
-        super(SlackIO, self).__init__()
+        super().__init__()
         self.client = WebClient(token=token)
         self.text = self.__class__.__name__
         try:
@@ -88,10 +88,10 @@ class tqdm_slack(tqdm_auto):
                 kwargs.pop('token', getenv("TQDM_SLACK_TOKEN")),
                 kwargs.pop('channel', getenv("TQDM_SLACK_CHANNEL")))
             kwargs['mininterval'] = max(1.5, kwargs.get('mininterval', 1.5))
-        super(tqdm_slack, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def display(self, **kwargs):
-        super(tqdm_slack, self).display(**kwargs)
+        super().display(**kwargs)
         fmt = self.format_dict
         if fmt.get('bar_format', None):
             fmt['bar_format'] = fmt['bar_format'].replace(
@@ -105,7 +105,7 @@ class tqdm_slack(tqdm_auto):
         self.sio.write(self.format_meter(**fmt))
 
     def clear(self, *args, **kwargs):
-        super(tqdm_slack, self).clear(*args, **kwargs)
+        super().clear(*args, **kwargs)
         if not self.disable:
             self.sio.write("")
 
diff --git a/libs/tqdm/contrib/telegram.py b/libs/tqdm/contrib/telegram.py
index cbeadf20f..019151800 100644
--- a/libs/tqdm/contrib/telegram.py
+++ b/libs/tqdm/contrib/telegram.py
@@ -27,7 +27,7 @@ class TelegramIO(MonoWorker):
 
     def __init__(self, token, chat_id):
         """Creates a new message in the given `chat_id`."""
-        super(TelegramIO, self).__init__()
+        super().__init__()
         self.token = token
         self.chat_id = chat_id
         self.session = Session()
@@ -118,10 +118,10 @@ class tqdm_telegram(tqdm_auto):
             self.tgio = TelegramIO(
                 kwargs.pop('token', getenv('TQDM_TELEGRAM_TOKEN')),
                 kwargs.pop('chat_id', getenv('TQDM_TELEGRAM_CHAT_ID')))
-        super(tqdm_telegram, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def display(self, **kwargs):
-        super(tqdm_telegram, self).display(**kwargs)
+        super().display(**kwargs)
         fmt = self.format_dict
         if fmt.get('bar_format', None):
             fmt['bar_format'] = fmt['bar_format'].replace(
@@ -131,14 +131,14 @@ class tqdm_telegram(tqdm_auto):
         self.tgio.write(self.format_meter(**fmt))
 
     def clear(self, *args, **kwargs):
-        super(tqdm_telegram, self).clear(*args, **kwargs)
+        super().clear(*args, **kwargs)
         if not self.disable:
             self.tgio.write("")
 
     def close(self):
         if self.disable:
             return
-        super(tqdm_telegram, self).close()
+        super().close()
         if not (self.leave or (self.leave is None and self.pos == 0)):
             self.tgio.delete()
 
diff --git a/libs/tqdm/dask.py b/libs/tqdm/dask.py
index af9926a27..57f1b668f 100644
--- a/libs/tqdm/dask.py
+++ b/libs/tqdm/dask.py
@@ -20,7 +20,7 @@ class TqdmCallback(Callback):
         tqdm_kwargs  : optional
             Any other arguments used for all bars.
         """
-        super(TqdmCallback, self).__init__(start=start, pretask=pretask)
+        super().__init__(start=start, pretask=pretask)
         if tqdm_kwargs:
             tqdm_class = partial(tqdm_class, **tqdm_kwargs)
         self.tqdm_class = tqdm_class
diff --git a/libs/tqdm/gui.py b/libs/tqdm/gui.py
index 8bab6ac78..cb52fb91a 100644
--- a/libs/tqdm/gui.py
+++ b/libs/tqdm/gui.py
@@ -32,7 +32,7 @@ class tqdm_gui(std_tqdm):  # pragma: no cover
         kwargs = kwargs.copy()
         kwargs['gui'] = True
         colour = kwargs.pop('colour', 'g')
-        super(tqdm_gui, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if self.disable:
             return
@@ -122,6 +122,7 @@ class tqdm_gui(std_tqdm):  # pragma: no cover
         ax = self.ax
         line1 = self.line1
         line2 = self.line2
+        hspan = getattr(self, 'hspan', None)
         # instantaneous rate
         y = delta_it / delta_t
         # overall rate
@@ -148,18 +149,10 @@ class tqdm_gui(std_tqdm):  # pragma: no cover
         if total:
             line1.set_data(xdata, ydata)
             line2.set_data(xdata, zdata)
-            try:
-                poly_lims = self.hspan.get_xy()
-            except AttributeError:
-                self.hspan = self.plt.axhspan(0, 0.001, xmin=0, xmax=0, color='g')
-                poly_lims = self.hspan.get_xy()
-            poly_lims[0, 1] = ymin
-            poly_lims[1, 1] = ymax
-            poly_lims[2] = [n / total, ymax]
-            poly_lims[3] = [poly_lims[2, 0], ymin]
-            if len(poly_lims) > 4:
-                poly_lims[4, 1] = ymin
-            self.hspan.set_xy(poly_lims)
+            if hspan:
+                hspan.set_xy((0, ymin))
+                hspan.set_height(ymax - ymin)
+                hspan.set_width(n / total)
         else:
             t_ago = [cur_t - i for i in xdata]
             line1.set_data(t_ago, ydata)
diff --git a/libs/tqdm/notebook.py b/libs/tqdm/notebook.py
index 6ee43a6c2..77b91bdd4 100644
--- a/libs/tqdm/notebook.py
+++ b/libs/tqdm/notebook.py
@@ -80,7 +80,7 @@ class TqdmHBox(HBox):
     def __repr__(self, pretty=False):
         pbar = getattr(self, 'pbar', None)
         if pbar is None:
-            return super(TqdmHBox, self).__repr__()
+            return super().__repr__()
         return pbar.format_meter(**self._json_(pretty))
 
     def _repr_pretty_(self, pp, *_, **__):
@@ -220,7 +220,7 @@ class tqdm_notebook(std_tqdm):
         kwargs['disable'] = bool(kwargs.get('disable', False))
         colour = kwargs.pop('colour', None)
         display_here = kwargs.pop('display', True)
-        super(tqdm_notebook, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if self.disable or not kwargs['gui']:
             self.disp = lambda *_, **__: None
             return
@@ -246,7 +246,7 @@ class tqdm_notebook(std_tqdm):
 
     def __iter__(self):
         try:
-            it = super(tqdm_notebook, self).__iter__()
+            it = super().__iter__()
             for obj in it:
                 # return super(tqdm...) will not catch exception
                 yield obj
@@ -259,7 +259,7 @@ class tqdm_notebook(std_tqdm):
 
     def update(self, n=1):
         try:
-            return super(tqdm_notebook, self).update(n=n)
+            return super().update(n=n)
         # NB: except ... [ as ...] breaks IPython async KeyboardInterrupt
         except:  # NOQA
             # cannot catch KeyboardInterrupt when using manual tqdm
@@ -272,7 +272,7 @@ class tqdm_notebook(std_tqdm):
     def close(self):
         if self.disable:
             return
-        super(tqdm_notebook, self).close()
+        super().close()
         # Try to detect if there was an error or KeyboardInterrupt
         # in manual mode: if n < total, things probably got wrong
         if self.total and self.n < self.total:
@@ -297,14 +297,14 @@ class tqdm_notebook(std_tqdm):
         total  : int or float, optional. Total to use for the new bar.
         """
         if self.disable:
-            return super(tqdm_notebook, self).reset(total=total)
+            return super().reset(total=total)
         _, pbar, _ = self.container.children
         pbar.bar_style = ''
         if total is not None:
             pbar.max = total
             if not self.total and self.ncols is None:  # no longer unknown total
                 pbar.layout.width = None  # reset width
-        return super(tqdm_notebook, self).reset(total=total)
+        return super().reset(total=total)
 
 
 def tnrange(*args, **kwargs):
diff --git a/libs/tqdm/rich.py b/libs/tqdm/rich.py
index 00e1ddf26..3d392edaf 100644
--- a/libs/tqdm/rich.py
+++ b/libs/tqdm/rich.py
@@ -90,7 +90,7 @@ class tqdm_rich(std_tqdm):  # pragma: no cover
         kwargs['disable'] = bool(kwargs.get('disable', False))
         progress = kwargs.pop('progress', None)
         options = kwargs.pop('options', {}).copy()
-        super(tqdm_rich, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if self.disable:
             return
@@ -116,7 +116,8 @@ class tqdm_rich(std_tqdm):  # pragma: no cover
     def close(self):
         if self.disable:
             return
-        super(tqdm_rich, self).close()
+        self.display()  # print 100%, vis #1306
+        super().close()
         self._prog.__exit__(None, None, None)
 
     def clear(self, *_, **__):
@@ -137,7 +138,7 @@ class tqdm_rich(std_tqdm):  # pragma: no cover
         """
         if hasattr(self, '_prog'):
             self._prog.reset(total=total)
-        super(tqdm_rich, self).reset(total=total)
+        super().reset(total=total)
 
 
 def trrange(*args, **kwargs):
diff --git a/libs/tqdm/std.py b/libs/tqdm/std.py
index e58fdca91..e91ad3090 100644
--- a/libs/tqdm/std.py
+++ b/libs/tqdm/std.py
@@ -46,7 +46,7 @@ class TqdmWarning(Warning):
         if fp_write is not None:
             fp_write("\n" + self.__class__.__name__ + ": " + str(msg).rstrip() + '\n')
         else:
-            super(TqdmWarning, self).__init__(msg, *a, **k)
+            super().__init__(msg, *a, **k)
 
 
 class TqdmExperimentalWarning(TqdmWarning, FutureWarning):
diff --git a/libs/tqdm/tk.py b/libs/tqdm/tk.py
index dfebf5c74..788303c86 100644
--- a/libs/tqdm/tk.py
+++ b/libs/tqdm/tk.py
@@ -53,7 +53,7 @@ class tqdm_tk(std_tqdm):  # pragma: no cover
         grab = kwargs.pop('grab', False)
         tk_parent = kwargs.pop('tk_parent', None)
         self._cancel_callback = kwargs.pop('cancel_callback', None)
-        super(tqdm_tk, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if self.disable:
             return
@@ -172,7 +172,7 @@ class tqdm_tk(std_tqdm):  # pragma: no cover
                 self._tk_pbar.configure(maximum=100, mode="indeterminate")
             else:
                 self._tk_pbar.configure(maximum=total, mode="determinate")
-        super(tqdm_tk, self).reset(total=total)
+        super().reset(total=total)
 
     @staticmethod
     def _tk_dispatching_helper():
diff --git a/libs/tqdm/utils.py b/libs/tqdm/utils.py
index 9883fdaea..af3ec7ded 100644
--- a/libs/tqdm/utils.py
+++ b/libs/tqdm/utils.py
@@ -14,7 +14,7 @@ from weakref import proxy
 _range, _unich, _unicode, _basestring = range, chr, str, str
 CUR_OS = sys.platform
 IS_WIN = any(CUR_OS.startswith(i) for i in ['win32', 'cygwin'])
-IS_NIX = any(CUR_OS.startswith(i) for i in ['aix', 'linux', 'darwin'])
+IS_NIX = any(CUR_OS.startswith(i) for i in ['aix', 'linux', 'darwin', 'freebsd'])
 RE_ANSI = re.compile(r"\x1b\[[;\d]*[A-Za-z]")
 
 try:
@@ -167,7 +167,7 @@ class SimpleTextIOWrapper(ObjectWrapper):
     """
     # pylint: disable=too-few-public-methods
     def __init__(self, wrapped, encoding):
-        super(SimpleTextIOWrapper, self).__init__(wrapped)
+        super().__init__(wrapped)
         self.wrapper_setattr('encoding', encoding)
 
     def write(self, s):
@@ -211,7 +211,7 @@ class DisableOnWriteError(ObjectWrapper):
         return inner
 
     def __init__(self, wrapped, tqdm_instance):
-        super(DisableOnWriteError, self).__init__(wrapped)
+        super().__init__(wrapped)
         if hasattr(wrapped, 'write'):
             self.wrapper_setattr(
                 'write', self.disable_on_exception(tqdm_instance, wrapped.write))
@@ -229,7 +229,7 @@ class CallbackIOWrapper(ObjectWrapper):
         Wrap a given `file`-like object's `read()` or `write()` to report
         lengths to the given `callback`
         """
-        super(CallbackIOWrapper, self).__init__(stream)
+        super().__init__(stream)
         func = getattr(stream, method)
         if method == "write":
             @wraps(func)
diff --git a/libs/trakit-0.2.1.dist-info/WHEEL b/libs/trakit-0.2.1.dist-info/WHEEL
deleted file mode 100644
index d73ccaae8..000000000
--- a/libs/trakit-0.2.1.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/urllib3-2.2.1.dist-info/INSTALLER b/libs/trakit-0.2.2.dist-info/INSTALLER
similarity index 100%
rename from libs/urllib3-2.2.1.dist-info/INSTALLER
rename to libs/trakit-0.2.2.dist-info/INSTALLER
diff --git a/libs/trakit-0.2.1.dist-info/LICENSE b/libs/trakit-0.2.2.dist-info/LICENSE
similarity index 100%
rename from libs/trakit-0.2.1.dist-info/LICENSE
rename to libs/trakit-0.2.2.dist-info/LICENSE
diff --git a/libs/trakit-0.2.1.dist-info/METADATA b/libs/trakit-0.2.2.dist-info/METADATA
similarity index 98%
rename from libs/trakit-0.2.1.dist-info/METADATA
rename to libs/trakit-0.2.2.dist-info/METADATA
index ad31ab577..910bbe458 100644
--- a/libs/trakit-0.2.1.dist-info/METADATA
+++ b/libs/trakit-0.2.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trakit
-Version: 0.2.1
+Version: 0.2.2
 Summary: Guess additional information from track titles
 Home-page: https://github.com/ratoaq2/trakit
 License: MIT
@@ -18,8 +18,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 :: 3.8
 Classifier: Topic :: Multimedia :: Video
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: babelfish (>=0.6.0,<0.7.0)
diff --git a/libs/trakit-0.2.1.dist-info/RECORD b/libs/trakit-0.2.2.dist-info/RECORD
similarity index 60%
rename from libs/trakit-0.2.1.dist-info/RECORD
rename to libs/trakit-0.2.2.dist-info/RECORD
index 3aa7879fa..eaa8cb061 100644
--- a/libs/trakit-0.2.1.dist-info/RECORD
+++ b/libs/trakit-0.2.2.dist-info/RECORD
@@ -1,15 +1,15 @@
 ../../bin/trakit,sha256=061GX_FSkORuBimuhcYrShFcfjURVuy8f4oP724YRaA,237
-trakit-0.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-trakit-0.2.1.dist-info/LICENSE,sha256=SQOlWLdyOaJn59XweZU7tqq5GShFrWixpgZA7BqePkc,1061
-trakit-0.2.1.dist-info/METADATA,sha256=RvJvZ6a9gfYBxdYYF1JrcMobicc5mRr8s9Pm2qGyxEI,5235
-trakit-0.2.1.dist-info/RECORD,,
-trakit-0.2.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trakit-0.2.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-trakit-0.2.1.dist-info/entry_points.txt,sha256=ua6hFDKScrfZ2Xs1RaVrkvyYK4QLZEfGRuqY6P7ZmV4,47
-trakit/__init__.py,sha256=PyNSXj0gDAbqM1pp1sBdLEagiws51ns-ZvfaQpUWLM0,398
+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=wQxO-mk5qmX1zSkoG-zrqymIBZ5GLenEGjzcfIo287Q,802
+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
diff --git a/libs/urllib3-2.2.1.dist-info/REQUESTED b/libs/trakit-0.2.2.dist-info/REQUESTED
similarity index 100%
rename from libs/urllib3-2.2.1.dist-info/REQUESTED
rename to libs/trakit-0.2.2.dist-info/REQUESTED
diff --git a/libs/trakit-0.2.2.dist-info/WHEEL b/libs/trakit-0.2.2.dist-info/WHEEL
new file mode 100644
index 000000000..8b9b3a1bf
--- /dev/null
+++ b/libs/trakit-0.2.2.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 1.9.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/trakit-0.2.1.dist-info/entry_points.txt b/libs/trakit-0.2.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/trakit-0.2.1.dist-info/entry_points.txt
rename to libs/trakit-0.2.2.dist-info/entry_points.txt
diff --git a/libs/trakit/__init__.py b/libs/trakit/__init__.py
index 5ea2d6f63..0c98ebc70 100644
--- a/libs/trakit/__init__.py
+++ b/libs/trakit/__init__.py
@@ -5,7 +5,6 @@ __version__ = metadata.version(__package__)
 __short_version__ = '.'.join(__version__.split('.')[:2])
 __author__ = metadata.metadata(__package__)['author']
 __license__ = metadata.metadata(__package__)['license']
-__url__ = metadata.metadata(__package__)['home_page']
 
 del metadata
 
diff --git a/libs/trakit/config.py b/libs/trakit/config.py
index 6458b4bbd..30c280b32 100644
--- a/libs/trakit/config.py
+++ b/libs/trakit/config.py
@@ -1,12 +1,16 @@
 import json
 import typing
 
-from pkg_resources import resource_stream
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files  # type: ignore[assignment,no-redef,import-not-found]
 
 
 class Config:
     def __init__(self, config: typing.Optional[typing.Mapping[str, typing.Any]]):
-        with resource_stream('trakit', 'data/config.json') as f:
+        config_file = files(__package__).joinpath('data/config.json')
+        with config_file.open('rb') as f:
             cfg: typing.Dict[str, typing.Any] = json.load(f)
         if config:
             cfg.update(config)
diff --git a/libs/typing_extensions-4.10.0.dist-info/RECORD b/libs/typing_extensions-4.10.0.dist-info/RECORD
deleted file mode 100644
index 2ab7c7154..000000000
--- a/libs/typing_extensions-4.10.0.dist-info/RECORD
+++ /dev/null
@@ -1,7 +0,0 @@
-typing_extensions-4.10.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-typing_extensions-4.10.0.dist-info/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
-typing_extensions-4.10.0.dist-info/METADATA,sha256=bOf50GPcCK0zOP8nCDWSOABNwCEiX62UQhDUWnNOaxU,2967
-typing_extensions-4.10.0.dist-info/RECORD,,
-typing_extensions-4.10.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typing_extensions-4.10.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-typing_extensions.py,sha256=TaQTqUtLUZa4yzkKE1hjChDIWPmH1y2qG0FXYX8kigk,117599
diff --git a/libs/websocket_client-1.7.0.dist-info/INSTALLER b/libs/typing_extensions-4.12.2.dist-info/INSTALLER
similarity index 100%
rename from libs/websocket_client-1.7.0.dist-info/INSTALLER
rename to libs/typing_extensions-4.12.2.dist-info/INSTALLER
diff --git a/libs/typing_extensions-4.10.0.dist-info/LICENSE b/libs/typing_extensions-4.12.2.dist-info/LICENSE
similarity index 100%
rename from libs/typing_extensions-4.10.0.dist-info/LICENSE
rename to libs/typing_extensions-4.12.2.dist-info/LICENSE
diff --git a/libs/typing_extensions-4.10.0.dist-info/METADATA b/libs/typing_extensions-4.12.2.dist-info/METADATA
similarity index 97%
rename from libs/typing_extensions-4.10.0.dist-info/METADATA
rename to libs/typing_extensions-4.12.2.dist-info/METADATA
index 13d06e24b..f15e2b387 100644
--- a/libs/typing_extensions-4.10.0.dist-info/METADATA
+++ b/libs/typing_extensions-4.12.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typing_extensions
-Version: 4.10.0
+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>
@@ -18,6 +18,7 @@ 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
diff --git a/libs/typing_extensions-4.12.2.dist-info/RECORD b/libs/typing_extensions-4.12.2.dist-info/RECORD
new file mode 100644
index 000000000..b8bde9a36
--- /dev/null
+++ b/libs/typing_extensions-4.12.2.dist-info/RECORD
@@ -0,0 +1,7 @@
+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/websocket_client-1.7.0.dist-info/REQUESTED b/libs/typing_extensions-4.12.2.dist-info/REQUESTED
similarity index 100%
rename from libs/websocket_client-1.7.0.dist-info/REQUESTED
rename to libs/typing_extensions-4.12.2.dist-info/REQUESTED
diff --git a/libs/pyparsing-3.1.1.dist-info/WHEEL b/libs/typing_extensions-4.12.2.dist-info/WHEEL
similarity index 100%
rename from libs/pyparsing-3.1.1.dist-info/WHEEL
rename to libs/typing_extensions-4.12.2.dist-info/WHEEL
diff --git a/libs/typing_extensions.py b/libs/typing_extensions.py
index f3132ea4a..dec429ca8 100644
--- a/libs/typing_extensions.py
+++ b/libs/typing_extensions.py
@@ -1,6 +1,7 @@
 import abc
 import collections
 import collections.abc
+import contextlib
 import functools
 import inspect
 import operator
@@ -116,6 +117,7 @@ __all__ = [
     'MutableMapping',
     'MutableSequence',
     'MutableSet',
+    'NoDefault',
     'Optional',
     'Pattern',
     'Reversible',
@@ -134,6 +136,7 @@ __all__ = [
 # for backward compatibility
 PEP_560 = True
 GenericMeta = type
+_PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
 
 # The functions below are modified copies of typing internal helpers.
 # They are needed by _ProtocolMeta and they provide support for PEP 646.
@@ -147,27 +150,6 @@ class _Sentinel:
 _marker = _Sentinel()
 
 
-def _check_generic(cls, parameters, elen=_marker):
-    """Check correct count for parameters of a generic cls (internal helper).
-    This gives a nice error message in case of count mismatch.
-    """
-    if not elen:
-        raise TypeError(f"{cls} is not a generic class")
-    if elen is _marker:
-        if not hasattr(cls, "__parameters__") or not cls.__parameters__:
-            raise TypeError(f"{cls} is not a generic class")
-        elen = len(cls.__parameters__)
-    alen = len(parameters)
-    if alen != elen:
-        if hasattr(cls, "__parameters__"):
-            parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-            num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
-            if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
-                return
-        raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};"
-                        f" actual {alen}, expected {elen}")
-
-
 if sys.version_info >= (3, 10):
     def _should_collect_from_parameters(t):
         return isinstance(
@@ -181,27 +163,6 @@ else:
         return isinstance(t, typing._GenericAlias) and not t._special
 
 
-def _collect_type_vars(types, typevar_types=None):
-    """Collect all type variable contained in types in order of
-    first appearance (lexicographic order). For example::
-
-        _collect_type_vars((T, List[S, T])) == (T, S)
-    """
-    if typevar_types is None:
-        typevar_types = typing.TypeVar
-    tvars = []
-    for t in types:
-        if (
-            isinstance(t, typevar_types) and
-            t not in tvars and
-            not _is_unpack(t)
-        ):
-            tvars.append(t)
-        if _should_collect_from_parameters(t):
-            tvars.extend([t for t in t.__parameters__ if t not in tvars])
-    return tuple(tvars)
-
-
 NoReturn = typing.NoReturn
 
 # Some unconstrained type variables.  These are used by the container types.
@@ -448,17 +409,96 @@ Coroutine = typing.Coroutine
 AsyncIterable = typing.AsyncIterable
 AsyncIterator = typing.AsyncIterator
 Deque = typing.Deque
-ContextManager = typing.ContextManager
-AsyncContextManager = typing.AsyncContextManager
 DefaultDict = typing.DefaultDict
 OrderedDict = typing.OrderedDict
 Counter = typing.Counter
 ChainMap = typing.ChainMap
-AsyncGenerator = typing.AsyncGenerator
 Text = typing.Text
 TYPE_CHECKING = typing.TYPE_CHECKING
 
 
+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):
+        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)
+            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:
+                setattr(self.__origin__, attr, val)
+
+        @typing._tp_cache
+        def __getitem__(self, params):
+            if not isinstance(params, tuple):
+                params = (params,)
+            msg = "Parameters to generic types must be types."
+            params = tuple(typing._type_check(p, msg) for p in params)
+            if (
+                self._defaults
+                and len(params) < self._nparams
+                and len(params) + len(self._defaults) >= self._nparams
+            ):
+                params = (*params, *self._defaults[len(params) - self._nparams:])
+            actual_len = len(params)
+
+            if actual_len != self._nparams:
+                if self._defaults:
+                    expected = f"at least {self._nparams - len(self._defaults)}"
+                else:
+                    expected = str(self._nparams)
+                if not self._nparams:
+                    raise TypeError(f"{self} is not a generic class")
+                raise TypeError(
+                    f"Too {'many' if actual_len > self._nparams else 'few'}"
+                    f" arguments for {self};"
+                    f" actual {actual_len}, expected {expected}"
+                )
+            return self.copy_with(params)
+
+    _NoneType = type(None)
+    Generator = _SpecialGenericAlias(
+        collections.abc.Generator, 3, defaults=(_NoneType, _NoneType)
+    )
+    AsyncGenerator = _SpecialGenericAlias(
+        collections.abc.AsyncGenerator, 2, defaults=(_NoneType,)
+    )
+    ContextManager = _SpecialGenericAlias(
+        contextlib.AbstractContextManager,
+        2,
+        name="ContextManager",
+        defaults=(typing.Optional[bool],)
+    )
+    AsyncContextManager = _SpecialGenericAlias(
+        contextlib.AbstractAsyncContextManager,
+        2,
+        name="AsyncContextManager",
+        defaults=(typing.Optional[bool],)
+    )
+
+
 _PROTO_ALLOWLIST = {
     'collections.abc': [
         'Callable', 'Awaitable', 'Iterable', 'Iterator', 'AsyncIterable',
@@ -469,23 +509,11 @@ _PROTO_ALLOWLIST = {
 }
 
 
-_EXCLUDED_ATTRS = {
-    "__abstractmethods__", "__annotations__", "__weakref__", "_is_protocol",
-    "_is_runtime_protocol", "__dict__", "__slots__", "__parameters__",
-    "__orig_bases__", "__module__", "_MutableMapping__marker", "__doc__",
-    "__subclasshook__", "__orig_class__", "__init__", "__new__",
-    "__protocol_attrs__", "__non_callable_proto_members__",
-    "__match_args__",
+_EXCLUDED_ATTRS = frozenset(typing.EXCLUDED_ATTRIBUTES) | {
+    "__match_args__", "__protocol_attrs__", "__non_callable_proto_members__",
+    "__final__",
 }
 
-if sys.version_info >= (3, 9):
-    _EXCLUDED_ATTRS.add("__class_getitem__")
-
-if sys.version_info >= (3, 12):
-    _EXCLUDED_ATTRS.add("__type_params__")
-
-_EXCLUDED_ATTRS = frozenset(_EXCLUDED_ATTRS)
-
 
 def _get_protocol_attrs(cls):
     attrs = set()
@@ -711,13 +739,18 @@ else:
         not their type signatures!
         """
         if not issubclass(cls, typing.Generic) or not getattr(cls, '_is_protocol', False):
-            raise TypeError('@runtime_checkable can be only applied to protocol classes,'
-                            ' got %r' % cls)
+            raise TypeError(f'@runtime_checkable can be only applied to protocol classes,'
+                            f' got {cls!r}')
         cls._is_runtime_protocol = True
 
-        # Only execute the following block if it's a typing_extensions.Protocol class.
-        # typing.Protocol classes don't need it.
-        if isinstance(cls, _ProtocolMeta):
+        # typing.Protocol classes on <=3.11 break if we execute this block,
+        # because typing.Protocol classes on <=3.11 don't have a
+        # `__protocol_attrs__` attribute, and this block relies on the
+        # `__protocol_attrs__` attribute. Meanwhile, typing.Protocol classes on 3.12.2+
+        # break if we *don't* execute this block, because *they* assume that all
+        # protocol classes have a `__non_callable_proto_members__` attribute
+        # (which this block sets)
+        if isinstance(cls, _ProtocolMeta) or sys.version_info >= (3, 12, 2):
             # PEP 544 prohibits using issubclass()
             # with protocols that have non-method members.
             # See gh-113320 for why we compute this attribute here,
@@ -834,7 +867,11 @@ def _ensure_subclassable(mro_entries):
     return inner
 
 
-if hasattr(typing, "ReadOnly"):
+# Update this to something like >=3.13.0b1 if and when
+# PEP 728 is implemented in CPython
+_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"
@@ -845,7 +882,8 @@ if hasattr(typing, "ReadOnly"):
     # Aaaand on 3.12 we add __orig_bases__ to TypedDict
     # to enable better runtime introspection.
     # On 3.13 we deprecate some odd ways of creating TypedDicts.
-    # PEP 705 proposes adding the ReadOnly[] qualifier.
+    # Also on 3.13, PEP 705 adds the ReadOnly[] qualifier.
+    # PEP 728 (still pending) makes more changes.
     TypedDict = typing.TypedDict
     _TypedDictMeta = typing._TypedDictMeta
     is_typeddict = typing.is_typeddict
@@ -904,7 +942,13 @@ else:
                 tp_dict.__orig_bases__ = bases
 
             annotations = {}
-            own_annotations = ns.get('__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)
+            else:
+                own_annotations = {}
             msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
             if _TAKES_MODULE:
                 own_annotations = {
@@ -1122,15 +1166,15 @@ else:
         return val
 
 
-if hasattr(typing, "Required"):  # 3.11+
+if hasattr(typing, "ReadOnly"):  # 3.13+
     get_type_hints = typing.get_type_hints
-else:  # <=3.10
+else:  # <=3.13
     # replaces _strip_annotations()
     def _strip_extras(t):
         """Strips Annotated, Required and NotRequired from a given type."""
         if isinstance(t, _AnnotatedAlias):
             return _strip_extras(t.__origin__)
-        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired):
+        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired, ReadOnly):
             return _strip_extras(t.__args__[0])
         if isinstance(t, typing._GenericAlias):
             stripped_args = tuple(_strip_extras(a) for a in t.__args__)
@@ -1227,7 +1271,7 @@ else:
 
         def __reduce__(self):
             return operator.getitem, (
-                Annotated, (self.__origin__,) + self.__metadata__
+                Annotated, (self.__origin__, *self.__metadata__)
             )
 
         def __eq__(self, other):
@@ -1353,7 +1397,7 @@ else:
             get_args(Callable[[], T][int]) == ([], int)
         """
         if isinstance(tp, _AnnotatedAlias):
-            return (tp.__origin__,) + tp.__metadata__
+            return (tp.__origin__, *tp.__metadata__)
         if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias)):
             if getattr(tp, "_special", False):
                 return ()
@@ -1399,17 +1443,37 @@ else:
     )
 
 
+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):
-    if isinstance(default, (tuple, list)):
-        type_param.__default__ = tuple((typing._type_check(d, "Default must be a type")
-                                        for d in default))
-    elif default != _marker:
-        if isinstance(type_param, ParamSpec) and default is ...:  # ... not valid <3.11
-            type_param.__default__ = default
-        else:
-            type_param.__default__ = typing._type_check(default, "Default must be a type")
-    else:
-        type_param.__default__ = None
+    type_param.has_default = lambda: default is not NoDefault
+    type_param.__default__ = default
 
 
 def _set_module(typevarlike):
@@ -1432,32 +1496,46 @@ class _TypeVarLikeMeta(type):
         return isinstance(__instance, cls._backported_typevarlike)
 
 
-# Add default and infer_variance parameters from PEP 696 and 695
-class TypeVar(metaclass=_TypeVarLikeMeta):
-    """Type variable."""
+if _PEP_696_IMPLEMENTED:
+    from typing import TypeVar
+else:
+    # Add default and infer_variance parameters from PEP 696 and 695
+    class TypeVar(metaclass=_TypeVarLikeMeta):
+        """Type variable."""
 
-    _backported_typevarlike = typing.TypeVar
+        _backported_typevarlike = typing.TypeVar
 
-    def __new__(cls, name, *constraints, bound=None,
-                covariant=False, contravariant=False,
-                default=_marker, infer_variance=False):
-        if hasattr(typing, "TypeAliasType"):
-            # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
-            typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                     covariant=covariant, contravariant=contravariant,
-                                     infer_variance=infer_variance)
-        else:
-            typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                     covariant=covariant, contravariant=contravariant)
-            if infer_variance and (covariant or contravariant):
-                raise ValueError("Variance cannot be specified with infer_variance.")
-            typevar.__infer_variance__ = infer_variance
-        _set_default(typevar, default)
-        _set_module(typevar)
-        return typevar
+        def __new__(cls, name, *constraints, bound=None,
+                    covariant=False, contravariant=False,
+                    default=NoDefault, infer_variance=False):
+            if hasattr(typing, "TypeAliasType"):
+                # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
+                typevar = typing.TypeVar(name, *constraints, bound=bound,
+                                         covariant=covariant, contravariant=contravariant,
+                                         infer_variance=infer_variance)
+            else:
+                typevar = typing.TypeVar(name, *constraints, bound=bound,
+                                         covariant=covariant, contravariant=contravariant)
+                if infer_variance and (covariant or contravariant):
+                    raise ValueError("Variance cannot be specified with infer_variance.")
+                typevar.__infer_variance__ = infer_variance
 
-    def __init_subclass__(cls) -> None:
-        raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
+            _set_default(typevar, default)
+            _set_module(typevar)
+
+            def _tvar_prepare_subst(alias, args):
+                if (
+                    typevar.has_default()
+                    and alias.__parameters__.index(typevar) == len(args)
+                ):
+                    args += (typevar.__default__,)
+                return args
+
+            typevar.__typing_prepare_subst__ = _tvar_prepare_subst
+            return typevar
+
+        def __init_subclass__(cls) -> None:
+            raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
 
 
 # Python 3.10+ has PEP 612
@@ -1522,8 +1600,12 @@ else:
                 return NotImplemented
             return self.__origin__ == other.__origin__
 
+
+if _PEP_696_IMPLEMENTED:
+    from typing import ParamSpec
+
 # 3.10+
-if hasattr(typing, 'ParamSpec'):
+elif hasattr(typing, 'ParamSpec'):
 
     # Add default parameter - PEP 696
     class ParamSpec(metaclass=_TypeVarLikeMeta):
@@ -1533,7 +1615,7 @@ if hasattr(typing, 'ParamSpec'):
 
         def __new__(cls, name, *, bound=None,
                     covariant=False, contravariant=False,
-                    infer_variance=False, default=_marker):
+                    infer_variance=False, default=NoDefault):
             if hasattr(typing, "TypeAliasType"):
                 # PEP 695 implemented, can pass infer_variance to typing.TypeVar
                 paramspec = typing.ParamSpec(name, bound=bound,
@@ -1548,6 +1630,24 @@ if hasattr(typing, 'ParamSpec'):
 
             _set_default(paramspec, default)
             _set_module(paramspec)
+
+            def _paramspec_prepare_subst(alias, args):
+                params = alias.__parameters__
+                i = params.index(paramspec)
+                if i == len(args) and paramspec.has_default():
+                    args = [*args, paramspec.__default__]
+                if i >= len(args):
+                    raise TypeError(f"Too few arguments for {alias}")
+                # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
+                if len(params) == 1 and not typing._is_param_expr(args[0]):
+                    assert i == 0
+                    args = (args,)
+                # Convert lists to tuples to help other libraries cache the results.
+                elif isinstance(args[i], list):
+                    args = (*args[:i], tuple(args[i]), *args[i + 1:])
+                return args
+
+            paramspec.__typing_prepare_subst__ = _paramspec_prepare_subst
             return paramspec
 
         def __init_subclass__(cls) -> None:
@@ -1616,8 +1716,8 @@ else:
             return ParamSpecKwargs(self)
 
         def __init__(self, name, *, bound=None, covariant=False, contravariant=False,
-                     infer_variance=False, default=_marker):
-            super().__init__([self])
+                     infer_variance=False, default=NoDefault):
+            list.__init__(self, [self])
             self.__name__ = name
             self.__covariant__ = bool(covariant)
             self.__contravariant__ = bool(contravariant)
@@ -1711,7 +1811,7 @@ def _concatenate_getitem(self, parameters):
 # 3.10+
 if hasattr(typing, 'Concatenate'):
     Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias  # noqa: F811
+    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
 # 3.9
 elif sys.version_info[:2] >= (3, 9):
     @_ExtensionsSpecialForm
@@ -2246,6 +2346,17 @@ elif sys.version_info[:2] >= (3, 9):  # 3.9+
     class _UnpackAlias(typing._GenericAlias, _root=True):
         __class__ = typing.TypeVar
 
+        @property
+        def __typing_unpacked_tuple_args__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            arg, = self.__args__
+            if isinstance(arg, (typing._GenericAlias, _types.GenericAlias)):
+                if arg.__origin__ is not tuple:
+                    raise TypeError("Unpack[...] must be used with a tuple type")
+                return arg.__args__
+            return None
+
     @_UnpackSpecialForm
     def Unpack(self, parameters):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
@@ -2270,7 +2381,20 @@ else:  # 3.8
         return isinstance(obj, _UnpackAlias)
 
 
-if hasattr(typing, "TypeVarTuple"):  # 3.11+
+if _PEP_696_IMPLEMENTED:
+    from typing import TypeVarTuple
+
+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):
@@ -2278,10 +2402,57 @@ if hasattr(typing, "TypeVarTuple"):  # 3.11+
 
         _backported_typevarlike = typing.TypeVarTuple
 
-        def __new__(cls, name, *, default=_marker):
+        def __new__(cls, name, *, default=NoDefault):
             tvt = typing.TypeVarTuple(name)
             _set_default(tvt, default)
             _set_module(tvt)
+
+            def _typevartuple_prepare_subst(alias, args):
+                params = alias.__parameters__
+                typevartuple_index = params.index(tvt)
+                for param in params[typevartuple_index + 1:]:
+                    if isinstance(param, TypeVarTuple):
+                        raise TypeError(
+                            f"More than one TypeVarTuple parameter in {alias}"
+                        )
+
+                alen = len(args)
+                plen = len(params)
+                left = typevartuple_index
+                right = plen - typevartuple_index - 1
+                var_tuple_index = None
+                fillarg = None
+                for k, arg in enumerate(args):
+                    if not isinstance(arg, type):
+                        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
+                        if subargs and len(subargs) == 2 and subargs[-1] is ...:
+                            if var_tuple_index is not None:
+                                raise TypeError(
+                                    "More than one unpacked "
+                                    "arbitrary-length tuple argument"
+                                )
+                            var_tuple_index = k
+                            fillarg = subargs[0]
+                if var_tuple_index is not None:
+                    left = min(left, var_tuple_index)
+                    right = min(right, alen - var_tuple_index - 1)
+                elif left + right > alen:
+                    raise TypeError(f"Too few arguments for {alias};"
+                                    f" actual {alen}, expected at least {plen - 1}")
+                if left == alen - right and tvt.has_default():
+                    replacement = _unpack_args(tvt.__default__)
+                else:
+                    replacement = args[left: alen - right]
+
+                return (
+                    *args[:left],
+                    *([fillarg] * (typevartuple_index - left)),
+                    replacement,
+                    *([fillarg] * (plen - right - left - typevartuple_index - 1)),
+                    *args[alen - right:],
+                )
+
+            tvt.__typing_prepare_subst__ = _typevartuple_prepare_subst
             return tvt
 
         def __init_subclass__(self, *args, **kwds):
@@ -2338,7 +2509,7 @@ else:  # <=3.10
         def __iter__(self):
             yield self.__unpacked__
 
-        def __init__(self, name, *, default=_marker):
+        def __init__(self, name, *, default=NoDefault):
             self.__name__ = name
             _DefaultMixin.__init__(self, default)
 
@@ -2389,6 +2560,12 @@ else:  # <=3.10
         return obj
 
 
+if hasattr(typing, "_ASSERT_NEVER_REPR_MAX_LENGTH"):  # 3.11+
+    _ASSERT_NEVER_REPR_MAX_LENGTH = typing._ASSERT_NEVER_REPR_MAX_LENGTH
+else:  # <=3.10
+    _ASSERT_NEVER_REPR_MAX_LENGTH = 100
+
+
 if hasattr(typing, "assert_never"):  # 3.11+
     assert_never = typing.assert_never
 else:  # <=3.10
@@ -2412,7 +2589,10 @@ else:  # <=3.10
         At runtime, this throws an exception when called.
 
         """
-        raise AssertionError("Expected code to be unreachable")
+        value = repr(arg)
+        if len(value) > _ASSERT_NEVER_REPR_MAX_LENGTH:
+            value = value[:_ASSERT_NEVER_REPR_MAX_LENGTH] + '...'
+        raise AssertionError(f"Expected code to be unreachable, but got: {value}")
 
 
 if sys.version_info >= (3, 12):  # 3.12+
@@ -2689,10 +2869,222 @@ else:
 #   counting generic parameters, so that when we subscript a generic,
 #   the runtime doesn't try to substitute the Unpack with the subscripted type.
 if not hasattr(typing, "TypeVarTuple"):
-    typing._collect_type_vars = _collect_type_vars
+    def _check_generic(cls, parameters, elen=_marker):
+        """Check correct count for parameters of a generic cls (internal helper).
+
+        This gives a nice error message in case of count mismatch.
+        """
+        if not elen:
+            raise TypeError(f"{cls} is not a generic class")
+        if elen is _marker:
+            if not hasattr(cls, "__parameters__") or not cls.__parameters__:
+                raise TypeError(f"{cls} is not a generic class")
+            elen = len(cls.__parameters__)
+        alen = len(parameters)
+        if alen != elen:
+            expect_val = elen
+            if hasattr(cls, "__parameters__"):
+                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
+                num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
+                if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
+                    return
+
+                # deal with TypeVarLike defaults
+                # required TypeVarLikes cannot appear after a defaulted one.
+                if alen < elen:
+                    # since we validate TypeVarLike default in _collect_type_vars
+                    # or _collect_parameters we can safely check parameters[alen]
+                    if (
+                        getattr(parameters[alen], '__default__', NoDefault)
+                        is not NoDefault
+                    ):
+                        return
+
+                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
+                                         is not NoDefault for p in parameters)
+
+                    elen -= num_default_tv
+
+                    expect_val = f"at least {elen}"
+
+            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}")
+else:
+    # Python 3.11+
+
+    def _check_generic(cls, parameters, elen):
+        """Check correct count for parameters of a generic cls (internal helper).
+
+        This gives a nice error message in case of count mismatch.
+        """
+        if not elen:
+            raise TypeError(f"{cls} is not a generic class")
+        alen = len(parameters)
+        if alen != elen:
+            expect_val = elen
+            if hasattr(cls, "__parameters__"):
+                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
+
+                # deal with TypeVarLike defaults
+                # required TypeVarLikes cannot appear after a defaulted one.
+                if alen < elen:
+                    # since we validate TypeVarLike default in _collect_type_vars
+                    # or _collect_parameters we can safely check parameters[alen]
+                    if (
+                        getattr(parameters[alen], '__default__', NoDefault)
+                        is not NoDefault
+                    ):
+                        return
+
+                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
+                                         is not NoDefault for p in parameters)
+
+                    elen -= num_default_tv
+
+                    expect_val = f"at least {elen}"
+
+            raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments"
+                            f" for {cls}; actual {alen}, expected {expect_val}")
+
+if not _PEP_696_IMPLEMENTED:
     typing._check_generic = _check_generic
 
 
+def _has_generic_or_protocol_as_origin() -> bool:
+    try:
+        frame = sys._getframe(2)
+    # - Catch AttributeError: not all Python implementations have sys._getframe()
+    # - Catch ValueError: maybe we're called from an unexpected module
+    #   and the call stack isn't deep enough
+    except (AttributeError, ValueError):
+        return False  # err on the side of leniency
+    else:
+        # If we somehow get invoked from outside typing.py,
+        # also err on the side of leniency
+        if frame.f_globals.get("__name__") != "typing":
+            return False
+        origin = frame.f_locals.get("origin")
+        # Cannot use "in" because origin may be an object with a buggy __eq__ that
+        # throws an error.
+        return origin is typing.Generic or origin is Protocol or origin is typing.Protocol
+
+
+_TYPEVARTUPLE_TYPES = {TypeVarTuple, getattr(typing, "TypeVarTuple", None)}
+
+
+def _is_unpacked_typevartuple(x) -> bool:
+    if get_origin(x) is not Unpack:
+        return False
+    args = get_args(x)
+    return (
+        bool(args)
+        and len(args) == 1
+        and type(args[0]) in _TYPEVARTUPLE_TYPES
+    )
+
+
+# Python 3.11+ _collect_type_vars was renamed to _collect_parameters
+if hasattr(typing, '_collect_type_vars'):
+    def _collect_type_vars(types, typevar_types=None):
+        """Collect all type variable contained in types in order of
+        first appearance (lexicographic order). For example::
+
+            _collect_type_vars((T, List[S, T])) == (T, S)
+        """
+        if typevar_types is None:
+            typevar_types = typing.TypeVar
+        tvars = []
+
+        # A required TypeVarLike cannot appear after a TypeVarLike with a default
+        # if it was a direct call to `Generic[]` or `Protocol[]`
+        enforce_default_ordering = _has_generic_or_protocol_as_origin()
+        default_encountered = False
+
+        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
+        type_var_tuple_encountered = False
+
+        for t in types:
+            if _is_unpacked_typevartuple(t):
+                type_var_tuple_encountered = True
+            elif isinstance(t, typevar_types) and t not in tvars:
+                if enforce_default_ordering:
+                    has_default = getattr(t, '__default__', NoDefault) is not NoDefault
+                    if has_default:
+                        if type_var_tuple_encountered:
+                            raise TypeError('Type parameter with a default'
+                                            ' follows TypeVarTuple')
+                        default_encountered = True
+                    elif default_encountered:
+                        raise TypeError(f'Type parameter {t!r} without a default'
+                                        ' follows type parameter with a default')
+
+                tvars.append(t)
+            if _should_collect_from_parameters(t):
+                tvars.extend([t for t in t.__parameters__ if t not in tvars])
+        return tuple(tvars)
+
+    typing._collect_type_vars = _collect_type_vars
+else:
+    def _collect_parameters(args):
+        """Collect all type variables and parameter specifications in args
+        in order of first appearance (lexicographic order).
+
+        For example::
+
+            assert _collect_parameters((T, Callable[P, T])) == (T, P)
+        """
+        parameters = []
+
+        # A required TypeVarLike cannot appear after a TypeVarLike with default
+        # if it was a direct call to `Generic[]` or `Protocol[]`
+        enforce_default_ordering = _has_generic_or_protocol_as_origin()
+        default_encountered = False
+
+        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
+        type_var_tuple_encountered = False
+
+        for t in args:
+            if isinstance(t, type):
+                # We don't want __parameters__ descriptor of a bare Python class.
+                pass
+            elif isinstance(t, tuple):
+                # `t` might be a tuple, when `ParamSpec` is substituted with
+                # `[T, int]`, or `[int, *Ts]`, etc.
+                for x in t:
+                    for collected in _collect_parameters([x]):
+                        if collected not in parameters:
+                            parameters.append(collected)
+            elif hasattr(t, '__typing_subst__'):
+                if t not in parameters:
+                    if enforce_default_ordering:
+                        has_default = (
+                            getattr(t, '__default__', NoDefault) is not NoDefault
+                        )
+
+                        if type_var_tuple_encountered and has_default:
+                            raise TypeError('Type parameter with a default'
+                                            ' follows TypeVarTuple')
+
+                        if has_default:
+                            default_encountered = True
+                        elif default_encountered:
+                            raise TypeError(f'Type parameter {t!r} without a default'
+                                            ' follows type parameter with a default')
+
+                    parameters.append(t)
+            else:
+                if _is_unpacked_typevartuple(t):
+                    type_var_tuple_encountered = True
+                for x in getattr(t, '__parameters__', ()):
+                    if x not in parameters:
+                        parameters.append(x)
+
+        return tuple(parameters)
+
+    if not _PEP_696_IMPLEMENTED:
+        typing._collect_parameters = _collect_parameters
+
 # Backport typing.NamedTuple as it exists in Python 3.13.
 # In 3.11, the ability to define generic `NamedTuple`s was supported.
 # This was explicitly disallowed in 3.9-3.10, and only half-worked in <=3.8.
@@ -2725,7 +3117,13 @@ else:
                     raise TypeError(
                         'can only inherit from a NamedTuple type and Generic')
             bases = tuple(tuple if base is _NamedTuple else base for base in bases)
-            types = ns.get('__annotations__', {})
+            if "__annotations__" in ns:
+                types = ns["__annotations__"]
+            elif "__annotate__" in ns:
+                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
+                types = ns["__annotate__"](1)
+            else:
+                types = {}
             default_names = []
             for field_name in types:
                 if field_name in ns:
@@ -2857,7 +3255,7 @@ else:
 if hasattr(collections.abc, "Buffer"):
     Buffer = collections.abc.Buffer
 else:
-    class Buffer(abc.ABC):
+    class Buffer(abc.ABC):  # noqa: B024
         """Base class for classes that implement the buffer protocol.
 
         The buffer protocol allows Python objects to expose a low-level
@@ -3184,6 +3582,23 @@ else:
             return self.documentation == other.documentation
 
 
+_CapsuleType = getattr(_types, "CapsuleType", None)
+
+if _CapsuleType is None:
+    try:
+        import _socket
+    except ImportError:
+        pass
+    else:
+        _CAPI = getattr(_socket, "CAPI", None)
+        if _CAPI is not None:
+            _CapsuleType = type(_CAPI)
+
+if _CapsuleType is not None:
+    CapsuleType = _CapsuleType
+    __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
@@ -3197,7 +3612,6 @@ Container = typing.Container
 Dict = typing.Dict
 ForwardRef = typing.ForwardRef
 FrozenSet = typing.FrozenSet
-Generator = typing.Generator
 Generic = typing.Generic
 Hashable = typing.Hashable
 IO = typing.IO
diff --git a/libs/werkzeug-3.0.1.dist-info/INSTALLER b/libs/tzdata-2024.2.dist-info/INSTALLER
similarity index 100%
rename from libs/werkzeug-3.0.1.dist-info/INSTALLER
rename to libs/tzdata-2024.2.dist-info/INSTALLER
diff --git a/libs/tzdata-2024.1.dist-info/LICENSE b/libs/tzdata-2024.2.dist-info/LICENSE
similarity index 100%
rename from libs/tzdata-2024.1.dist-info/LICENSE
rename to libs/tzdata-2024.2.dist-info/LICENSE
diff --git a/libs/tzdata-2024.1.dist-info/LICENSE_APACHE b/libs/tzdata-2024.2.dist-info/LICENSE_APACHE
similarity index 100%
rename from libs/tzdata-2024.1.dist-info/LICENSE_APACHE
rename to libs/tzdata-2024.2.dist-info/LICENSE_APACHE
diff --git a/libs/tzdata-2024.1.dist-info/METADATA b/libs/tzdata-2024.2.dist-info/METADATA
similarity index 98%
rename from libs/tzdata-2024.1.dist-info/METADATA
rename to libs/tzdata-2024.2.dist-info/METADATA
index 5ca4be319..4feec22ac 100644
--- a/libs/tzdata-2024.1.dist-info/METADATA
+++ b/libs/tzdata-2024.2.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tzdata
-Version: 2024.1
+Version: 2024.2
 Summary: Provider of IANA time zone data
 Home-page: https://github.com/python/tzdata
 Author: Python Software Foundation
diff --git a/libs/tzdata-2024.1.dist-info/RECORD b/libs/tzdata-2024.2.dist-info/RECORD
similarity index 91%
rename from libs/tzdata-2024.1.dist-info/RECORD
rename to libs/tzdata-2024.2.dist-info/RECORD
index 786c5e04e..57b38356b 100644
--- a/libs/tzdata-2024.1.dist-info/RECORD
+++ b/libs/tzdata-2024.2.dist-info/RECORD
@@ -1,12 +1,12 @@
-tzdata-2024.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tzdata-2024.1.dist-info/LICENSE,sha256=M-jlAC01EtP8wigrmV5rrZ0zR4G5xawxhD9ASQDh87Q,592
-tzdata-2024.1.dist-info/LICENSE_APACHE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tzdata-2024.1.dist-info/METADATA,sha256=opWqMTU2QGRjhy337uxoIBXNr84QcEx8I9-iisPqxmA,1393
-tzdata-2024.1.dist-info/RECORD,,
-tzdata-2024.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata-2024.1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-tzdata-2024.1.dist-info/top_level.txt,sha256=MO6QqC0xRrN67Gh9xU_nMmadwBVlYzPNkq_h4gYuzaQ,7
-tzdata/__init__.py,sha256=iofGPw33aJlVNgOXQP4kzxiXOEj8im69E8cgZZS874Q,252
+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
@@ -17,9 +17,9 @@ tzdata/zoneinfo/Africa/Bamako,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4
 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=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+tzdata/zoneinfo/Africa/Blantyre,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
 tzdata/zoneinfo/Africa/Brazzaville,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Bujumbura,sha256=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+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
@@ -30,22 +30,22 @@ tzdata/zoneinfo/Africa/Djibouti,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGet
 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=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
-tzdata/zoneinfo/Africa/Harare,sha256=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+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=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+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=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
-tzdata/zoneinfo/Africa/Lusaka,sha256=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+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=_UqXNoIwqJZ2yYd3lRCpkg_o2RH6BlSBU20QSM0PUp4,131
+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
@@ -86,7 +86,7 @@ tzdata/zoneinfo/America/Asuncion,sha256=PuuUl8VILSBeZWDyLkM67bWl47xPMcJ0fY-rAhvS
 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=F2Tz2IIWs9nqdSb5sdKLrO6Cu0xiGLbQZ3TamKR4v5A,728
+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
@@ -97,14 +97,14 @@ tzdata/zoneinfo/America/Boise,sha256=Jt3omyPSPRoKE-KXVd-wxVON-CDE5oGaJA7Ar90Q2OM
 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=XOYTJdVeHFfKeSGxHcZ_stJ9_Vkqn0q0LmS1mhnGI8o,529
+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=hHey29pNZGuKh_bTiluGQSOGAhiQuCG4VMNGlJCgxPs,691
-tzdata/zoneinfo/America/Ciudad_Juarez,sha256=eJkqieD7ixtltRojAKRk4iNRk-bZZZDPQV2hyR1vMmI,718
+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
@@ -120,7 +120,7 @@ tzdata/zoneinfo/America/Dominica,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9w
 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=x2_eWDUWxIi5gKTGmM_d5V1HFt1-JN-j8dIpqj5Dn7M,1025
+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
@@ -135,7 +135,7 @@ tzdata/zoneinfo/America/Guayaquil,sha256=8OIaCy-SirKKz4I77l6MQFDgSLHtjN0TvklLVEZ
 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=W-QiSzPq2J-hWWQ-uzD6McLKzG8XPEawbJpnXlNp3-Q,286
+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
@@ -167,15 +167,15 @@ tzdata/zoneinfo/America/Manaus,sha256=9kgrhpryB94YOVoshJliiiDSf9mwjb3OZwX0HusNRr
 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=C5CBj73KgB8vbDbDEgqMHfPeMeglQj156WNbwYSxux8,718
+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=KTdHMhhdhJtTg40KW2qSfd6N9PAQ50d_ektYDt2ouy0,654
+tzdata/zoneinfo/America/Merida,sha256=LBpOEv4xxUcL5B7wFSNa3UyE762-EiSXb1KPQNKwwCU,654
 tzdata/zoneinfo/America/Metlakatla,sha256=EVj1LkMCgry6mT8Ln_FpHxpJSU0oSncfbHGWIQ0SI_0,586
-tzdata/zoneinfo/America/Mexico_City,sha256=vhDy1hSceJyFa3bIqn2qRi1kgxtvrCCaaB7s65mljtY,773
+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=GWEQgKgJQV89hVpFOO6nS1AYvdM6Lcw_xeYwMfkV6bg,644
+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
@@ -189,7 +189,7 @@ tzdata/zoneinfo/America/North_Dakota/Center,sha256=M09x4Mx6hcBAwktvwv16YvPRmsuDj
 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=EMAldBXpY3Vgog_8yESXQb3qoS1v69jmWm0JPgs3k9U,718
+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
@@ -207,7 +207,7 @@ tzdata/zoneinfo/America/Regina,sha256=_JHuns225iE-THc9NFp-RBq4PWULAuGw2OLbpOB_UM
 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=x2_eWDUWxIi5gKTGmM_d5V1HFt1-JN-j8dIpqj5Dn7M,1025
+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
@@ -225,7 +225,7 @@ tzdata/zoneinfo/America/Swift_Current,sha256=F-b65Yaax23CsuhSmeTDl6Tv9du4IsvWvMb
 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=x2_eWDUWxIi5gKTGmM_d5V1HFt1-JN-j8dIpqj5Dn7M,1025
+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
@@ -269,14 +269,14 @@ tzdata/zoneinfo/Asia/Bishkek,sha256=RXdxVxaiE5zxX5atQl-7ZesEeZVjsCXBGZ6cJbVU9pE,
 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=hsakX_o0anB6tNBNp_FKGx4k57IcODYubf1u2G_2Vqk,619
+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=ByL6yx7Cuq6axUp5D1n8a9MtmAod_mw6JQP_ltYdOUg,170
+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
@@ -350,14 +350,14 @@ tzdata/zoneinfo/Asia/Yangon,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,1
 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=KmvA_G-yNl76C0A17JdtFg7ju9LHa5JIWh15GOzLxds,1453
+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=IX1jlaiB-DaaGwjnfc5pYr8eEtX7_Wol-T50QNAs3qw,1453
+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
@@ -392,8 +392,8 @@ tzdata/zoneinfo/Brazil/DeNoronha,sha256=Q0r3GtA5y2RGkOj56OTZG5tuBy1B6kfbhyrJqCgf
 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=9q70fJErxHX0_hfgu5Wk0oH5ZZLUWhBIHJI1z7gHgBI,621
-tzdata/zoneinfo/CST6CDT,sha256=ajbQjR1ESk2m3dg1sAR2slqafjcfIhw-SC4SC6F7VBY,951
+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
@@ -407,9 +407,9 @@ tzdata/zoneinfo/Chile/Continental,sha256=_QBpU8K0QqLh5m2yqWfdkypIJDkPAc3dnIAc5jR
 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=ftIfVTZNlKejEciANKFFxES2uv_Z4rTAgyjwvk1lLpE,497
-tzdata/zoneinfo/EST,sha256=Eqcp0sCDGh_NPbcYAbBhmUob540rIs8FUnkmkZDQ0go,111
-tzdata/zoneinfo/EST5EDT,sha256=RAPR1jPCcVa5nvibF24lGKApc2bRw3Y87RbesyI3BP4,951
+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
@@ -473,7 +473,7 @@ tzdata/zoneinfo/Europe/Kaliningrad,sha256=57ov9G8m25w1pPdJF8zoFWzq5I6UoBMVsk2eHP
 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=Nr-w4MM_s8Zhwdu1D4cNOQiTZMwZibYswSH1nB1GUKg,1454
+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
@@ -521,7 +521,7 @@ 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=up2TB-9E2uBD6IGaCSOnR96o_DENUVI9ZCE1zQS0SzY,112
+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
@@ -542,18 +542,18 @@ 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=EgkGCb0euba8FQGgUqAYFx4mRuKeRD6W5GIAyV6yDJ0,621
-tzdata/zoneinfo/MST,sha256=84AZayGFK2nfpYS0-u16q9QWrYYkCwUJcNdOnG7Ai1s,111
-tzdata/zoneinfo/MST7MDT,sha256=yt9ENOc1sfICs1yxJjiii6FhCQkEsEuw67zvs-EeBb4,951
-tzdata/zoneinfo/Mexico/BajaNorte,sha256=x2_eWDUWxIi5gKTGmM_d5V1HFt1-JN-j8dIpqj5Dn7M,1025
-tzdata/zoneinfo/Mexico/BajaSur,sha256=C5CBj73KgB8vbDbDEgqMHfPeMeglQj156WNbwYSxux8,718
-tzdata/zoneinfo/Mexico/General,sha256=vhDy1hSceJyFa3bIqn2qRi1kgxtvrCCaaB7s65mljtY,773
+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=8w8p5P18af0k8f2C3amKrvi4tSK83QUhUCV6QmyeTa8,951
+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
@@ -600,7 +600,7 @@ tzdata/zoneinfo/Pacific/Wallis,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY
 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=Nr-w4MM_s8Zhwdu1D4cNOQiTZMwZibYswSH1nB1GUKg,1454
+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
@@ -622,13 +622,13 @@ tzdata/zoneinfo/US/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 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=pAiBtwIi4Sqi79_Ppm2V4VMiMrJKOUvMdCZTJeAizAc,494
+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=fjC39Eu3wB6I4g7x_VL7HzvDVbiKbLUjfQAEgo7442I,3257
-tzdata/zoneinfo/tzdata.zi,sha256=q6xnElaYdX6HiShmu3FxIV9CeWaQHmnF9XLjV2-bYv0,109388
-tzdata/zoneinfo/zone.tab,sha256=qSLfeCWE3tsCDIIQbr71DMkmCUXTIUEgNZgfN-60d-Y,18846
-tzdata/zoneinfo/zone1970.tab,sha256=FJErvL9wggoFluO2WceYn8ZQ-nA9A073Lub1x2Pzg40,17582
-tzdata/zoneinfo/zonenow.tab,sha256=YoPd7huhHsKlJliOO-eMIBE5-bHBKpbfjkSJQFAto6I,8311
-tzdata/zones,sha256=W13GrYuma2VrkfW_VDfQpCt0Ivs2tvvYE4I63b0Z6jM,9084
+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/werkzeug-3.0.1.dist-info/REQUESTED b/libs/tzdata-2024.2.dist-info/REQUESTED
similarity index 100%
rename from libs/werkzeug-3.0.1.dist-info/REQUESTED
rename to libs/tzdata-2024.2.dist-info/REQUESTED
diff --git a/libs/tzdata-2024.1.dist-info/WHEEL b/libs/tzdata-2024.2.dist-info/WHEEL
similarity index 70%
rename from libs/tzdata-2024.1.dist-info/WHEEL
rename to libs/tzdata-2024.2.dist-info/WHEEL
index 4724c4573..17c0299e4 100644
--- a/libs/tzdata-2024.1.dist-info/WHEEL
+++ b/libs/tzdata-2024.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/tzdata-2024.1.dist-info/top_level.txt b/libs/tzdata-2024.2.dist-info/top_level.txt
similarity index 100%
rename from libs/tzdata-2024.1.dist-info/top_level.txt
rename to libs/tzdata-2024.2.dist-info/top_level.txt
diff --git a/libs/tzdata/__init__.py b/libs/tzdata/__init__.py
index b319ed555..e558a8a53 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.1"
+__version__ = "2024.2"
 
 # This exposes the original IANA version number.
-IANA_VERSION = "2024a"
+IANA_VERSION = "2024b"
diff --git a/libs/tzdata/zoneinfo/Africa/Blantyre b/libs/tzdata/zoneinfo/Africa/Blantyre
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Blantyre and b/libs/tzdata/zoneinfo/Africa/Blantyre differ
diff --git a/libs/tzdata/zoneinfo/Africa/Bujumbura b/libs/tzdata/zoneinfo/Africa/Bujumbura
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Bujumbura and b/libs/tzdata/zoneinfo/Africa/Bujumbura differ
diff --git a/libs/tzdata/zoneinfo/Africa/Gaborone b/libs/tzdata/zoneinfo/Africa/Gaborone
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Gaborone and b/libs/tzdata/zoneinfo/Africa/Gaborone differ
diff --git a/libs/tzdata/zoneinfo/Africa/Harare b/libs/tzdata/zoneinfo/Africa/Harare
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Harare and b/libs/tzdata/zoneinfo/Africa/Harare differ
diff --git a/libs/tzdata/zoneinfo/Africa/Kigali b/libs/tzdata/zoneinfo/Africa/Kigali
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Kigali and b/libs/tzdata/zoneinfo/Africa/Kigali differ
diff --git a/libs/tzdata/zoneinfo/Africa/Lubumbashi b/libs/tzdata/zoneinfo/Africa/Lubumbashi
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Lubumbashi and b/libs/tzdata/zoneinfo/Africa/Lubumbashi differ
diff --git a/libs/tzdata/zoneinfo/Africa/Lusaka b/libs/tzdata/zoneinfo/Africa/Lusaka
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Lusaka and b/libs/tzdata/zoneinfo/Africa/Lusaka differ
diff --git a/libs/tzdata/zoneinfo/Africa/Maputo b/libs/tzdata/zoneinfo/Africa/Maputo
index 651e5cf67..581bb0e08 100644
Binary files a/libs/tzdata/zoneinfo/Africa/Maputo and b/libs/tzdata/zoneinfo/Africa/Maputo differ
diff --git a/libs/tzdata/zoneinfo/America/Bahia_Banderas b/libs/tzdata/zoneinfo/America/Bahia_Banderas
index 48faea2ec..882400bd3 100644
Binary files a/libs/tzdata/zoneinfo/America/Bahia_Banderas and b/libs/tzdata/zoneinfo/America/Bahia_Banderas differ
diff --git a/libs/tzdata/zoneinfo/America/Cancun b/libs/tzdata/zoneinfo/America/Cancun
index 640b259fd..3110cdfd6 100644
Binary files a/libs/tzdata/zoneinfo/America/Cancun and b/libs/tzdata/zoneinfo/America/Cancun differ
diff --git a/libs/tzdata/zoneinfo/America/Chihuahua b/libs/tzdata/zoneinfo/America/Chihuahua
index 5e0a54f00..f65bb1c93 100644
Binary files a/libs/tzdata/zoneinfo/America/Chihuahua and b/libs/tzdata/zoneinfo/America/Chihuahua differ
diff --git a/libs/tzdata/zoneinfo/America/Ciudad_Juarez b/libs/tzdata/zoneinfo/America/Ciudad_Juarez
index f636ee643..5f865ea80 100644
Binary files a/libs/tzdata/zoneinfo/America/Ciudad_Juarez and b/libs/tzdata/zoneinfo/America/Ciudad_Juarez differ
diff --git a/libs/tzdata/zoneinfo/America/Ensenada b/libs/tzdata/zoneinfo/America/Ensenada
index 42087af4c..18d0d14af 100644
Binary files a/libs/tzdata/zoneinfo/America/Ensenada and b/libs/tzdata/zoneinfo/America/Ensenada differ
diff --git a/libs/tzdata/zoneinfo/America/Hermosillo b/libs/tzdata/zoneinfo/America/Hermosillo
index 5c92e2967..ba7b14760 100644
Binary files a/libs/tzdata/zoneinfo/America/Hermosillo and b/libs/tzdata/zoneinfo/America/Hermosillo differ
diff --git a/libs/tzdata/zoneinfo/America/Mazatlan b/libs/tzdata/zoneinfo/America/Mazatlan
index 97d4d36c1..5aa6039ea 100644
Binary files a/libs/tzdata/zoneinfo/America/Mazatlan and b/libs/tzdata/zoneinfo/America/Mazatlan differ
diff --git a/libs/tzdata/zoneinfo/America/Merida b/libs/tzdata/zoneinfo/America/Merida
index e5de1131d..e5c7d8cc2 100644
Binary files a/libs/tzdata/zoneinfo/America/Merida and b/libs/tzdata/zoneinfo/America/Merida differ
diff --git a/libs/tzdata/zoneinfo/America/Mexico_City b/libs/tzdata/zoneinfo/America/Mexico_City
index 80a415c70..181123461 100644
Binary files a/libs/tzdata/zoneinfo/America/Mexico_City and b/libs/tzdata/zoneinfo/America/Mexico_City differ
diff --git a/libs/tzdata/zoneinfo/America/Monterrey b/libs/tzdata/zoneinfo/America/Monterrey
index a5822e2c6..c1e054645 100644
Binary files a/libs/tzdata/zoneinfo/America/Monterrey and b/libs/tzdata/zoneinfo/America/Monterrey differ
diff --git a/libs/tzdata/zoneinfo/America/Ojinaga b/libs/tzdata/zoneinfo/America/Ojinaga
index f7e40c081..1dd08b1ca 100644
Binary files a/libs/tzdata/zoneinfo/America/Ojinaga and b/libs/tzdata/zoneinfo/America/Ojinaga differ
diff --git a/libs/tzdata/zoneinfo/America/Santa_Isabel b/libs/tzdata/zoneinfo/America/Santa_Isabel
index 42087af4c..18d0d14af 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 42087af4c..18d0d14af 100644
Binary files a/libs/tzdata/zoneinfo/America/Tijuana and b/libs/tzdata/zoneinfo/America/Tijuana differ
diff --git a/libs/tzdata/zoneinfo/Asia/Choibalsan b/libs/tzdata/zoneinfo/Asia/Choibalsan
index 0a948c2ea..6f5d3a15a 100644
Binary files a/libs/tzdata/zoneinfo/Asia/Choibalsan and b/libs/tzdata/zoneinfo/Asia/Choibalsan differ
diff --git a/libs/tzdata/zoneinfo/Asia/Dili b/libs/tzdata/zoneinfo/Asia/Dili
index bb7be9f3a..22e705ca1 100644
Binary files a/libs/tzdata/zoneinfo/Asia/Dili and b/libs/tzdata/zoneinfo/Asia/Dili differ
diff --git a/libs/tzdata/zoneinfo/Atlantic/Azores b/libs/tzdata/zoneinfo/Atlantic/Azores
index e6e2616e9..cda1c1d22 100644
Binary files a/libs/tzdata/zoneinfo/Atlantic/Azores and b/libs/tzdata/zoneinfo/Atlantic/Azores differ
diff --git a/libs/tzdata/zoneinfo/Atlantic/Madeira b/libs/tzdata/zoneinfo/Atlantic/Madeira
index cf965c3f9..21e84571e 100644
Binary files a/libs/tzdata/zoneinfo/Atlantic/Madeira and b/libs/tzdata/zoneinfo/Atlantic/Madeira differ
diff --git a/libs/tzdata/zoneinfo/CET b/libs/tzdata/zoneinfo/CET
index 546748d6e..31973271d 100644
Binary files a/libs/tzdata/zoneinfo/CET and b/libs/tzdata/zoneinfo/CET differ
diff --git a/libs/tzdata/zoneinfo/CST6CDT b/libs/tzdata/zoneinfo/CST6CDT
index d93155805..b01688065 100644
Binary files a/libs/tzdata/zoneinfo/CST6CDT and b/libs/tzdata/zoneinfo/CST6CDT differ
diff --git a/libs/tzdata/zoneinfo/EET b/libs/tzdata/zoneinfo/EET
index 378919ea1..231bf9c3b 100644
Binary files a/libs/tzdata/zoneinfo/EET and b/libs/tzdata/zoneinfo/EET differ
diff --git a/libs/tzdata/zoneinfo/EST b/libs/tzdata/zoneinfo/EST
index 3ae969114..9154643f4 100644
Binary files a/libs/tzdata/zoneinfo/EST and b/libs/tzdata/zoneinfo/EST differ
diff --git a/libs/tzdata/zoneinfo/EST5EDT b/libs/tzdata/zoneinfo/EST5EDT
index 50c95e0cb..2b6c2eea1 100644
Binary files a/libs/tzdata/zoneinfo/EST5EDT and b/libs/tzdata/zoneinfo/EST5EDT differ
diff --git a/libs/tzdata/zoneinfo/Europe/Lisbon b/libs/tzdata/zoneinfo/Europe/Lisbon
index f0c70b690..7e9aae727 100644
Binary files a/libs/tzdata/zoneinfo/Europe/Lisbon and b/libs/tzdata/zoneinfo/Europe/Lisbon differ
diff --git a/libs/tzdata/zoneinfo/HST b/libs/tzdata/zoneinfo/HST
index 160a53e04..40e3d492e 100644
Binary files a/libs/tzdata/zoneinfo/HST and b/libs/tzdata/zoneinfo/HST differ
diff --git a/libs/tzdata/zoneinfo/MET b/libs/tzdata/zoneinfo/MET
index 6f0558c3b..31973271d 100644
Binary files a/libs/tzdata/zoneinfo/MET and b/libs/tzdata/zoneinfo/MET differ
diff --git a/libs/tzdata/zoneinfo/MST b/libs/tzdata/zoneinfo/MST
index a0953d1e7..c2bd2f949 100644
Binary files a/libs/tzdata/zoneinfo/MST and b/libs/tzdata/zoneinfo/MST differ
diff --git a/libs/tzdata/zoneinfo/MST7MDT b/libs/tzdata/zoneinfo/MST7MDT
index 137867c8b..09e54e5c7 100644
Binary files a/libs/tzdata/zoneinfo/MST7MDT and b/libs/tzdata/zoneinfo/MST7MDT differ
diff --git a/libs/tzdata/zoneinfo/Mexico/BajaNorte b/libs/tzdata/zoneinfo/Mexico/BajaNorte
index 42087af4c..18d0d14af 100644
Binary files a/libs/tzdata/zoneinfo/Mexico/BajaNorte and b/libs/tzdata/zoneinfo/Mexico/BajaNorte differ
diff --git a/libs/tzdata/zoneinfo/Mexico/BajaSur b/libs/tzdata/zoneinfo/Mexico/BajaSur
index 97d4d36c1..5aa6039ea 100644
Binary files a/libs/tzdata/zoneinfo/Mexico/BajaSur and b/libs/tzdata/zoneinfo/Mexico/BajaSur differ
diff --git a/libs/tzdata/zoneinfo/Mexico/General b/libs/tzdata/zoneinfo/Mexico/General
index 80a415c70..181123461 100644
Binary files a/libs/tzdata/zoneinfo/Mexico/General and b/libs/tzdata/zoneinfo/Mexico/General differ
diff --git a/libs/tzdata/zoneinfo/PST8PDT b/libs/tzdata/zoneinfo/PST8PDT
index fde4833f6..aaf07787a 100644
Binary files a/libs/tzdata/zoneinfo/PST8PDT and b/libs/tzdata/zoneinfo/PST8PDT differ
diff --git a/libs/tzdata/zoneinfo/Portugal b/libs/tzdata/zoneinfo/Portugal
index f0c70b690..7e9aae727 100644
Binary files a/libs/tzdata/zoneinfo/Portugal and b/libs/tzdata/zoneinfo/Portugal differ
diff --git a/libs/tzdata/zoneinfo/WET b/libs/tzdata/zoneinfo/WET
index 423c6c203..7e9aae727 100644
Binary files a/libs/tzdata/zoneinfo/WET and b/libs/tzdata/zoneinfo/WET differ
diff --git a/libs/tzdata/zoneinfo/leapseconds b/libs/tzdata/zoneinfo/leapseconds
index ce150bfe0..6c715cb20 100644
--- a/libs/tzdata/zoneinfo/leapseconds
+++ b/libs/tzdata/zoneinfo/leapseconds
@@ -69,11 +69,11 @@ 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 2024	Dec	28	00:00:00
+#Expires 2025	Jun	28	00:00:00
 
 # POSIX timestamps for the data in this file:
-#updated 1704708379 (2024-01-08 10:06:19 UTC)
-#expires 1735344000 (2024-12-28 00:00:00 UTC)
+#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 December 2024
+#	File expires on 28 June 2025
diff --git a/libs/tzdata/zoneinfo/tzdata.zi b/libs/tzdata/zoneinfo/tzdata.zi
index be1c40859..62e78bb82 100644
--- a/libs/tzdata/zoneinfo/tzdata.zi
+++ b/libs/tzdata/zoneinfo/tzdata.zi
@@ -1,4 +1,4 @@
-# version 2024a
+# version 2024b
 # 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 -
@@ -1324,14 +1324,10 @@ 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 o - F 28 23s 1 S
-R p 1917 1921 - O 14 23s 0 -
-R p 1918 o - Mar 1 23s 1 S
-R p 1919 o - F 28 23s 1 S
-R p 1920 o - F 29 23s 1 S
-R p 1921 o - F 28 23s 1 S
+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 14 23s 0 -
+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
@@ -1349,8 +1345,9 @@ 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 1941 - O 5 23s 0 -
+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
@@ -1360,16 +1357,16 @@ 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 1965 - Ap Su>=1 2s 1 S
+R p 1947 1966 - Ap Su>=1 2s 1 S
 R p 1947 1965 - O Su>=1 2s 0 -
-R p 1977 o - Mar 27 0s 1 S
-R p 1977 o - S 25 0s 0 -
-R p 1978 1979 - Ap Su>=1 0s 1 S
-R p 1978 o - O 1 0s 0 -
-R p 1979 1982 - S lastSu 1s 0 -
-R p 1980 o - Mar lastSu 0s 1 S
-R p 1981 1982 - Mar lastSu 1s 1 S
-R p 1983 o - Mar lastSu 2s 1 S
+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
@@ -1728,7 +1725,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 - May 1 23 1 D
+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
@@ -2096,15 +2093,15 @@ Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
 0 d WE%sT 1981 May
 1 - CET
 Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - -01 1975
+-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 +00/+01 1984 Mar 16
-1 - +01 1986
-0 M +00/+01 2018 O 28 3
-1 M +01/+00
+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
@@ -2115,9 +2112,9 @@ Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
 1 - CET 1986
 1 E CE%sT
 Z Africa/El_Aaiun -0:52:48 - LMT 1934
--1 - -01 1976 Ap 14
-0 M +00/+01 2018 O 28 3
-1 M +01/+00
+-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
@@ -2132,19 +2129,19 @@ Z Africa/Khartoum 2:10:8 - LMT 1931
 Z Africa/Lagos 0:13:35 - LMT 1905 Jul
 0 - GMT 1908 Jul
 0:13:35 - LMT 1914
-0:30 - +0030 1919 S
+0:30 - %z 1919 S
 1 - WAT
-Z Africa/Maputo 2:10:20 - LMT 1903 Mar
+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 - +0230 1928 Jun 30 24
+2:30 - %z 1928 Jun 30 24
 3 - EAT 1930 Ja 4 24
-2:30 - +0230 1936 D 31 24
-2:45 - +0245 1942 Jul 31 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
@@ -2168,7 +2165,7 @@ 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 - +0130 1903 Mar
+1:30 - %z 1903 Mar
 2 - SAST 1942 S 20 2
 2 1 SAST 1943 Mar 21 2
 2 - SAST 1990 Mar 21
@@ -2191,167 +2188,166 @@ Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z America/Araguaina -3:12:48 - LMT 1914
--3 B -03/-02 1990 S 17
--3 - -03 1995 S 14
--3 B -03/-02 2003 S 24
--3 - -03 2012 O 21
--3 B -03/-02 2013 S
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990 Mar 4
--4 - -04 1990 O 28
--4 1 -03 1991 Mar 17
--4 - -04 1991 O 6
--3 1 -02 1992
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar
--4 - -04 1991 May 7
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990 Mar 4
--4 - -04 1990 O 15
--4 1 -03 1991 Mar
--4 - -04 1991 O 15
--4 1 -03 1992 Mar
--4 - -04 1992 O 18
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 23
--4 - -04 2004 S 26
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar
--4 - -04 1991 May 7
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 31
--4 - -04 2004 Jul 25
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1990
--3 1 -02 1990 Mar 14
--4 - -04 1990 O 15
--4 1 -03 1991 Mar
--4 - -04 1991 Jun
--3 - -03 1999 O 3
--4 1 -03 2000 Mar 3
--3 - -03 2004 May 31
--4 - -04 2004 Jul 25
--3 A -03/-02 2008 Ja 21
--4 Sa -04/-03 2009 O 11
--3 - -03
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1991 Mar 3
--4 - -04 1991 O 20
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 Jun
--4 - -04 2004 Jun 13
--3 A -03/-02
+-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 - -04 1930 D
--4 A -04/-03 1969 O 5
--3 A -03/-02 1999 O 3
--4 A -04/-03 2000 Mar 3
--3 - -03 2004 May 30
--4 - -04 2004 Jun 20
--3 A -03/-02 2008 O 18
--3 - -03
+-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 - -04 1972 O
--3 - -03 1974 Ap
--4 y -04/-03
+-4 - %z 1972 O
+-3 - %z 1974 Ap
+-4 y %z
 Z America/Bahia -2:34:4 - LMT 1914
--3 B -03/-02 2003 S 24
--3 - -03 2011 O 16
--3 B -03/-02 2012 O 21
--3 - -03
+-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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-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
@@ -2359,18 +2355,18 @@ Z America/Barbados -3:58:29 - LMT 1911 Au 28
 -4 BB AST/-0330 1945
 -4 BB A%sT
 Z America/Belem -3:13:56 - LMT 1914
--3 B -03/-02 1988 S 12
--3 - -03
+-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 -04/-03 1988 S 12
--4 - -04 1999 S 30
--4 B -04/-03 2000 O 15
--4 - -04
+-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 -05/-04
+-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
@@ -2383,21 +2379,23 @@ Z America/Cambridge_Bay 0 - -00 1920
 -6 - CST 2001 Ap 1 3
 -7 C M%sT
 Z America/Campo_Grande -3:38:28 - LMT 1914
--4 B -04/-03
+-4 B %z
 Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 23
+-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 - -0430 1965
--4 - -04 2007 D 9 3
--4:30 - -0430 2016 May 1 2:30
--4 - -04
+-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 - -04 1967 O
--3 - -03
+-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
@@ -2407,7 +2405,7 @@ Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2416,7 +2414,7 @@ Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2430,12 +2428,12 @@ 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 -04/-03 2003 S 24
--4 - -04 2004 O
--4 B -04/-03
+-4 B %z 2003 S 24
+-4 - %z 2004 O
+-4 B %z
 Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
--3 - -03 1980 Ap 6 2
--3 E -03/-02 1996
+-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
@@ -2467,12 +2465,12 @@ 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 -05/-04 1988 S 12
--5 - -05 1993 S 28
--5 B -05/-04 1994 S 22
--5 - -05 2008 Jun 24
--4 - -04 2013 N 10
--5 - -05
+-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
@@ -2482,12 +2480,12 @@ Z America/Fort_Nelson -8:10:47 - LMT 1884
 -8 C P%sT 2015 Mar 8 2
 -7 - MST
 Z America/Fortaleza -2:34 - LMT 1914
--3 B -03/-02 1990 S 17
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 22
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2514,12 +2512,12 @@ 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 -05/-04
+-5 EC %z
 Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - -04 1915 Mar
--3:45 - -0345 1975 Au
--3 - -03 1992 Mar 29 1
--4 - -04
+-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
@@ -2531,12 +2529,11 @@ 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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-7 - MST 1996
 -7 m M%sT 1999
 -7 - MST
 Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
@@ -2644,23 +2641,23 @@ Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
 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 - -04
+-4 - %z
 Z America/Lima -5:8:12 - LMT 1890
 -5:8:36 - LMT 1908 Jul 28
--5 PE -05/-04
+-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 -03/-02 1990 S 17
--3 - -03 1995 O 13
--3 B -03/-02 1996 S 4
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 22
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2671,10 +2668,10 @@ Z America/Managua -5:45:8 - LMT 1890
 -5 - EST 1997
 -6 NI C%sT
 Z America/Manaus -4:0:4 - LMT 1914
--4 B -04/-03 1988 S 12
--4 - -04 1993 S 28
--4 B -04/-03 1994 S 22
--4 - -04
+-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
@@ -2686,12 +2683,11 @@ Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1942 Ap 24
--7 - MST 1949 Ja 14
--8 - PST 1970
+-7 - MST 1970
 -7 m M%sT
 Z America/Menominee -5:50:27 - LMT 1885 S 18 12
 -6 u C%sT 1946
@@ -2699,8 +2695,8 @@ Z America/Menominee -5:50:27 - LMT 1885 S 18 12
 -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 23
--5 - EST 1982 D 2
+-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
@@ -2713,7 +2709,7 @@ Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
 -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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 m C%sT 2001 S 30 2
@@ -2721,8 +2717,8 @@ Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
 -6 m C%sT
 Z America/Miquelon -3:44:40 - LMT 1911 Jun 15
 -4 - AST 1980 May
--3 - -03 1987
--3 C -03/-02
+-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
@@ -2733,20 +2729,23 @@ Z America/Moncton -4:19:8 - LMT 1883 D 9
 -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 - -04 1923 O
--3:30 U -0330/-03 1942 D 14
--3 U -03/-0230 1960
--3 U -03/-02 1968
--3 U -03/-0230 1970
--3 U -03/-02 1974
--3 U -03/-0130 1974 Mar 10
--3 U -03/-0230 1974 D 22
--3 U -03/-02
+-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
@@ -2763,12 +2762,12 @@ Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z America/Noronha -2:9:40 - LMT 1914
--2 B -02/-01 1990 S 17
--2 - -02 1999 S 30
--2 B -02/-01 2000 O 15
--2 - -02 2001 S 13
--2 B -02/-01 2002 O
--2 - -02
+-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
@@ -2779,12 +2778,12 @@ 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 - -03 1980 Ap 6 2
--3 E -03/-02 2023 Mar 26 1u
--2 - -02 2023 O 29 1u
--2 E -02/-01
+-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 23
+-7 - MST 1927 Jun 10
 -6 - CST 1930 N 15
 -7 m M%sT 1932 Ap
 -6 - CST 1996
@@ -2800,8 +2799,8 @@ Z America/Panama -5:18:8 - LMT 1890
 Z America/Paramaribo -3:40:40 - LMT 1911
 -3:40:52 - PMT 1935
 -3:40:36 - PMT 1945 O
--3:30 - -0330 1984 O
--3 - -03
+-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
@@ -2813,37 +2812,37 @@ 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 -04/-03 1988 S 12
--4 - -04
+-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 - -05 1916 Jul
+-5 - %z 1916 Jul
 -4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
+-4 - %z 1919 Jul
 -4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1946 Au 28 24
--5 1 -04 1947 Mar 31 24
--5 - -05 1947 May 21 23
--4 x -04/-03 2016 D 4
--3 - -03
+-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 -03/-02 1990 S 17
--3 - -03 1999 S 30
--3 B -03/-02 2000 O 15
--3 - -03 2001 S 13
--3 B -03/-02 2002 O
--3 - -03
+-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
@@ -2854,28 +2853,28 @@ Z America/Resolute 0 - -00 1947 Au 31
 -5 - EST 2007 Mar 11 3
 -6 C C%sT
 Z America/Rio_Branco -4:31:12 - LMT 1914
--5 B -05/-04 1988 S 12
--5 - -05 2008 Jun 24
--4 - -04 2013 N 10
--5 - -05
+-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 -04/-03 1988 S 12
--4 - -04 2008 Jun 24
--3 - -03
+-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 - -05 1916 Jul
+-5 - %z 1916 Jul
 -4:42:45 - SMT 1918 S 10
--4 - -04 1919 Jul
+-4 - %z 1919 Jul
 -4:42:45 - SMT 1927 S
--5 x -05/-04 1932 S
--4 - -04 1942 Jun
--5 - -05 1942 Au
--4 - -04 1946 Jul 14 24
--4 1 -03 1946 Au 28 24
--5 1 -04 1947 Mar 31 24
--5 - -05 1947 May 21 23
--4 x -04/-03
+-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
@@ -2883,14 +2882,14 @@ Z America/Santo_Domingo -4:39:36 - LMT 1890
 -5 u E%sT 2000 D 3 1
 -4 - AST
 Z America/Sao_Paulo -3:6:28 - LMT 1914
--3 B -03/-02 1963 O 23
--3 1 -02 1964
--3 B -03/-02
+-3 B %z 1963 O 23
+-3 1 %z 1964
+-3 B %z
 Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
--2 - -02 1980 Ap 6 2
--2 c -02/-01 1981 Mar 29
--1 E -01/+00 2024 Mar 31
--2 E -02/-01
+-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
@@ -2918,15 +2917,21 @@ 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 23
+-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 12
+-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
@@ -2961,31 +2966,31 @@ Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
 -9 u Y%sT 1983 N 30
 -9 u AK%sT
 Z Antarctica/Casey 0 - -00 1969
-8 - +08 2009 O 18 2
-11 - +11 2010 Mar 5 2
-8 - +08 2011 O 28 2
-11 - +11 2012 F 21 17u
-8 - +08 2016 O 22
-11 - +11 2018 Mar 11 4
-8 - +08 2018 O 7 4
-11 - +11 2019 Mar 17 3
-8 - +08 2019 O 4 3
-11 - +11 2020 Mar 8 3
-8 - +08 2020 O 4 0:1
-11 - +11 2021 Mar 14
-8 - +08 2021 O 3 0:1
-11 - +11 2022 Mar 13
-8 - +08 2022 O 2 0:1
-11 - +11 2023 Mar 9 3
-8 - +08
+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 - +07 1964 N
+7 - %z 1964 N
 0 - -00 1969 F
-7 - +07 2009 O 18 2
-5 - +05 2010 Mar 10 20u
-7 - +07 2011 O 28 2
-5 - +05 2012 F 21 20u
-7 - +07
+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
@@ -2996,151 +3001,146 @@ Z Antarctica/Macquarie 0 - -00 1899 N
 10 1 AEDT 2011
 10 AT AE%sT
 Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - +06 2009 O 18 2
-5 - +05
+6 - %z 2009 O 18 2
+5 - %z
 Z Antarctica/Palmer 0 - -00 1965
--4 A -04/-03 1969 O 5
--3 A -03/-02 1982 May
--4 x -04/-03 2016 D 4
--3 - -03
+-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 - -03
+-3 - %z
 Z Antarctica/Troll 0 - -00 2005 F 12
 0 Tr %s
 Z Antarctica/Vostok 0 - -00 1957 D 16
-7 - +07 1994 F
+7 - %z 1994 F
 0 - -00 1994 N
-7 - +07 2023 D 18 2
-5 - +05
+7 - %z 2023 D 18 2
+5 - %z
 Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2004 O 31 2s
-6 - +06 2024 Mar
-5 - +05
+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 - +03
+3 - %z
 Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - +12 1930 Jun 21
-13 R +13/+14 1982 Ap 1 0s
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
+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 - +04 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1994 S 25 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-5 - +05
+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 - +04 1930 Jun 21
-5 R +05/+06 1991 Mar 31 2
-4 R +04/+05 1992 Ja 19 2
-5 - +05
+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 - +03 1930 Jun 21
-5 - +05 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1999 Mar 28 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +03 1982 May
-3 IQ +03/+04
+3 - %z 1982 May
+3 IQ %z
 Z Asia/Baku 3:19:24 - LMT 1924 May 2
-3 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1992 S lastSu 2s
-4 - +04 1996
-4 E +04/+05 1997
-4 AZ +04/+05
+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 - +07
+7 - %z
 Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1995 May 28
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Mar 27 2s
-7 - +07
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1991 Au 31 2
-5 KG +05/+06 2005 Au 12
-6 - +06
+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 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-8 - +08 2016 Mar 27 2
-9 - +09
-Z Asia/Choibalsan 7:38 - LMT 1905 Au
-7 - +07 1978
-8 - +08 1983 Ap
-9 X +09/+10 2008 Mar 31
-8 X +08/+09
+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 - +0530 1942 Ja 5
-5:30 0:30 +06 1942 S
-5:30 1 +0630 1945 O 16 2
-5:30 - +0530 1996 May 25
-6:30 - +0630 1996 O 26 0:30
-6 - +06 2006 Ap 15 0:30
-5:30 - +0530
+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 - +03
+3 - %z
 Z Asia/Dhaka 6:1:40 - LMT 1890
 5:53:20 - HMT 1941 O
-6:30 - +0630 1942 May 15
-5:30 - +0530 1942 S
-6:30 - +0630 1951 S 30
-6 - +06 2009
-6 BD +06/+07
-Z Asia/Dili 8:22:20 - LMT 1912
-8 - +08 1942 F 21 23
-9 - +09 1976 May 3
-8 - +08 2000 S 17
-9 - +09
+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 - +04
+4 - %z
 Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
-5 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 1 +06 1991 S 9 2s
-5 - +05
+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 - +03 2017 O 29 1u
+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
@@ -3162,14 +3162,14 @@ Z Asia/Hebron 2:20:23 - LMT 1900 O
 2 P EE%sT
 Z Asia/Ho_Chi_Minh 7:6:30 - LMT 1906 Jul
 7:6:30 - PLMT 1911 May
-7 - +07 1942 D 31 23
-8 - +08 1945 Mar 14 23
-9 - +09 1945 S 1 24
-7 - +07 1947 Ap
-8 - +08 1955 Jul 1 1
-7 - +07 1959 D 31 23
-8 - +08 1975 Jun 13
-7 - +07
+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
@@ -3177,96 +3177,96 @@ Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 29 17u
 9 - JST 1945 N 18 2
 8 HK HK%sT
 Z Asia/Hovd 6:6:36 - LMT 1905 Au
-6 - +06 1978
-7 X +07/+08
+6 - %z 1978
+7 X %z
 Z Asia/Irkutsk 6:57:5 - LMT 1880
 6:57:5 - IMT 1920 Ja 25
-7 - +07 1930 Jun 21
-8 R +08/+09 1991 Mar 31 2s
-7 R +07/+08 1992 Ja 19 2s
-8 R +08/+09 2011 Mar 27 2s
-9 - +09 2014 O 26 2s
-8 - +08
+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 - +0720 1932 N
-7:30 - +0730 1942 Mar 23
-9 - +09 1945 S 23
-7:30 - +0730 1948 May
-8 - +08 1950 May
-7:30 - +0730 1964
+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 - +09 1944 S
-9:30 - +0930 1964
+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 - +04 1945
-4:30 - +0430
+4 - %z 1945
+4:30 - %z
 Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - +11 1930 Jun 21
-12 R +12/+13 1991 Mar 31 2s
-11 R +11/+12 1992 Ja 19 2s
-12 R +12/+13 2010 Mar 28 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12
+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 - +0530 1942 S
-5:30 1 +0630 1945 O 15
-5:30 - +0530 1951 S 30
-5 - +05 1971 Mar 26
+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 - +0530 1986
-5:45 - +0545
+5:30 - %z 1986
+5:45 - %z
 Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2004
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2011 S 13 0s
-10 - +10 2014 O 26 2s
-9 - +09
+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 +0630 1942 May 15
+5:30 1 %z 1942 May 15
 5:30 - IST 1942 S
-5:30 1 +0630 1945 O 15
+5:30 1 %z 1945 O 15
 5:30 - IST
 Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2011 Mar 27 2s
-8 - +08 2014 O 26 2s
-7 - +07
+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 - +0730 1933
-8 NB +08/+0820 1942 F 16
-9 - +09 1945 S 12
-8 - +08
+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 _ +09/+10 1945 S 30 24
+9 _ %z 1945 S 30 24
 8 _ C%sT
 Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-10 - +10 2016 Ap 24 2s
-11 - +11
+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 - +08 1942 F 9
-9 - +09 1945 S 23
+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
@@ -3277,45 +3277,45 @@ 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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2010 Mar 28 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07
+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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 1993 May 23
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 Jul 24 2s
-7 - +07
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06
+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 - +03 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1989 Mar 26 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 1992 Mar 29 2s
-4 R +04/+05 2004 O 31 2s
-5 - +05
+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 - +0730 1942 Ja 29
-9 - +09 1945 S 23
-7:30 - +0730 1948 May
-8 - +08 1950 May
-7:30 - +0730 1964
+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
@@ -3325,48 +3325,48 @@ Z Asia/Pyongyang 8:23 - LMT 1908 Ap
 8:30 - KST 2018 May 4 23:30
 9 - KST
 Z Asia/Qatar 3:26:8 - LMT 1920
-4 - +04 1972 Jun
-3 - +03
+4 - %z 1972 Jun
+3 - %z
 Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06 2024 Mar
-5 - +05
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1991 S 29 2s
-5 R +05/+06 1992 Ja 19 2s
-6 R +06/+07 1992 Mar 29 2s
-5 R +05/+06 2004 O 31 2s
-6 - +06 2018 D 21
-5 - +05
+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 - +03
+3 - %z
 Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - +09 1945 Au 25
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 1997 Mar lastSu 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10 2016 Mar 27 2s
-11 - +11
+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 - +04 1930 Jun 21
-5 - +05 1981 Ap
-5 1 +06 1981 O
-6 - +06 1982 Ap
-5 R +05/+06 1992
-5 - +05
+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
@@ -3378,161 +3378,147 @@ Z Asia/Shanghai 8:5:43 - LMT 1901
 8 CN C%sT
 Z Asia/Singapore 6:55:25 - LMT 1901
 6:55:25 - SMT 1905 Jun
-7 - +07 1933
-7 0:20 +0720 1936
-7:20 - +0720 1941 S
-7:30 - +0730 1942 F 16
-9 - +09 1945 S 12
-7:30 - +0730 1981 D 31 16u
-8 - +08
+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 - +10 1930 Jun 21
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2014 O 26 2s
-11 - +11
+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 - +05 1930 Jun 21
-6 R +06/+07 1991 Mar 31 2
-5 R +05/+06 1992
-5 - +05
+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 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1992
-3 e +03/+04 1994 S lastSu
-4 e +04/+05 1996 O lastSu
-4 1 +05 1997 Mar lastSu
-4 e +04/+05 2004 Jun 27
-3 R +03/+04 2005 Mar lastSu 2
-4 - +04
+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 +0330/+0430 1977 O 20 24
-4 i +04/+05 1979
-3:30 i +0330/+0430
+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 - +0530 1987 O
-6 - +06
+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 - +06 1930 Jun 21
-7 R +07/+08 1991 Mar 31 2s
-6 R +06/+07 1992 Ja 19 2s
-7 R +07/+08 2002 May 1 3
-6 R +06/+07 2011 Mar 27 2s
-7 - +07 2014 O 26 2s
-6 - +06 2016 May 29 2s
-7 - +07
+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 - +07 1978
-8 X +08/+09
+7 - %z 1978
+8 X %z
 Z Asia/Urumqi 5:50:20 - LMT 1928
-6 - +06
+6 - %z
 Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - +08 1930 Jun 21
-9 R +09/+10 1981 Ap
-11 R +11/+12 1991 Mar 31 2s
-10 R +10/+11 1992 Ja 19 2s
-11 R +11/+12 2011 Mar 27 2s
-12 - +12 2011 S 13 0s
-11 - +11 2014 O 26 2s
-10 - +10
+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 - +09 1930 Jun 21
-10 R +10/+11 1991 Mar 31 2s
-9 R +09/+10 1992 Ja 19 2s
-10 R +10/+11 2011 Mar 27 2s
-11 - +11 2014 O 26 2s
-10 - +10
+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 - +08 1930 Jun 21
-9 R +09/+10 1991 Mar 31 2s
-8 R +08/+09 1992 Ja 19 2s
-9 R +09/+10 2011 Mar 27 2s
-10 - +10 2014 O 26 2s
-9 - +09
+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 - +0630 1942 May
-9 - +09 1945 May 3
-6:30 - +0630
+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 - +04 1930 Jun 21
-5 R +05/+06 1991 Mar 31 2s
-4 R +04/+05 1992 Ja 19 2s
-5 R +05/+06 2011 Mar 27 2s
-6 - +06 2014 O 26 2s
-5 - +05
+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 - +03 1957 Mar
-4 R +04/+05 1991 Mar 31 2s
-3 R +03/+04 1995 S 24 2s
-4 - +04 1997
-4 R +04/+05 2011
-4 AM +04/+05
+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 -02/-01 1942 Ap 25 22s
--2 p +00 1942 Au 15 22s
--2 p -02/-01 1943 Ap 17 22s
--2 p +00 1943 Au 28 22s
--2 p -02/-01 1944 Ap 22 22s
--2 p +00 1944 Au 26 22s
--2 p -02/-01 1945 Ap 21 22s
--2 p +00 1945 Au 25 22s
--2 p -02/-01 1966 Ap 3 2
--1 p -01/+00 1983 S 25 1s
--1 W- -01/+00 1992 S 27 1s
-0 E WE%sT 1993 Mar 28 1u
--1 E -01/+00
+-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 - -01 1946 S 30 1
+-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 - -02 1942 S
--2 1 -01 1945 O 15
--2 - -02 1975 N 25 2
--1 - -01
+-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 -01/+00 1942 Ap 25 22s
--1 p +01 1942 Au 15 22s
--1 p -01/+00 1943 Ap 17 22s
--1 p +01 1943 Au 28 22s
--1 p -01/+00 1944 Ap 22 22s
--1 p +01 1944 Au 26 22s
--1 p -01/+00 1945 Ap 21 22s
--1 p +01 1945 Au 25 22s
--1 p -01/+00 1966 Ap 3 2
-0 p WE%sT 1983 S 25 1s
+-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 - -02
+-2 - %z
 Z Atlantic/Stanley -3:51:24 - LMT 1890
 -3:51:24 - SMT 1912 Mar 12
--4 FK -04/-03 1983 May
--3 FK -03/-02 1985 S 15
--4 FK -04/-03 2010 S 5 2
--3 - -03
+-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
@@ -3550,8 +3536,8 @@ 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 +0845/+0945 1943 Jul
-8:45 AW +0845/+0945
+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
@@ -3562,8 +3548,8 @@ Z Australia/Lindeman 9:55:56 - LMT 1895
 10 Ho AE%sT
 Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
 10 - AEST 1981 Mar
-10:30 LH +1030/+1130 1985 Jul
-10:30 LH +1030/+11
+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
@@ -3573,52 +3559,47 @@ Z Australia/Perth 7:43:24 - LMT 1895 D
 Z Australia/Sydney 10:4:52 - LMT 1895 F
 10 AU AE%sT 1971
 10 AN AE%sT
-Z CET 1 c CE%sT
-Z CST6CDT -6 u C%sT
-Z EET 2 E EE%sT
-Z EST -5 - EST
-Z EST5EDT -5 u E%sT
 Z Etc/GMT 0 - GMT
-Z Etc/GMT+1 -1 - -01
-Z Etc/GMT+10 -10 - -10
-Z Etc/GMT+11 -11 - -11
-Z Etc/GMT+12 -12 - -12
-Z Etc/GMT+2 -2 - -02
-Z Etc/GMT+3 -3 - -03
-Z Etc/GMT+4 -4 - -04
-Z Etc/GMT+5 -5 - -05
-Z Etc/GMT+6 -6 - -06
-Z Etc/GMT+7 -7 - -07
-Z Etc/GMT+8 -8 - -08
-Z Etc/GMT+9 -9 - -09
-Z Etc/GMT-1 1 - +01
-Z Etc/GMT-10 10 - +10
-Z Etc/GMT-11 11 - +11
-Z Etc/GMT-12 12 - +12
-Z Etc/GMT-13 13 - +13
-Z Etc/GMT-14 14 - +14
-Z Etc/GMT-2 2 - +02
-Z Etc/GMT-3 3 - +03
-Z Etc/GMT-4 4 - +04
-Z Etc/GMT-5 5 - +05
-Z Etc/GMT-6 6 - +06
-Z Etc/GMT-7 7 - +07
-Z Etc/GMT-8 8 - +08
-Z Etc/GMT-9 9 - +09
+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 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
+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
@@ -3691,7 +3672,7 @@ Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
 Z Europe/Istanbul 1:55:52 - LMT 1880
 1:56:56 - IMT 1910 O
 2 T EE%sT 1978 Jun 29
-3 T +03/+04 1984 N 1 2
+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
@@ -3700,19 +3681,19 @@ Z Europe/Istanbul 1:55:52 - LMT 1880
 2 E EE%sT 2015 O 25 1u
 2 1 EEST 2015 N 8 1u
 2 E EE%sT 2016 S 7
-3 - +03
+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 - +03 2014 O 26 2s
+3 - %z 2014 O 26 2s
 2 - EET
 Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
+3 - %z 1930 Jun 21
+4 R %z 1989 Mar 26 2s
 3 R MSK/MSD 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
+4 - %z 1992 Mar 29 2s
 3 R MSK/MSD 2011 Mar 27 2s
 4 - MSK 2014 O 26 2s
 3 - MSK
@@ -3727,10 +3708,10 @@ Z Europe/Kyiv 2:2:4 - LMT 1880
 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 Ap 3 2
+0 p WE%sT 1966 O 2 2s
 1 - CET 1976 S 26 1
-0 p WE%sT 1983 S 25 1s
-0 W- WE%sT 1992 S 27 1s
+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
@@ -3754,7 +3735,7 @@ Z Europe/Minsk 1:50:16 - LMT 1880
 3 R MSK/MSD 1990
 3 - MSK 1991 Mar 31 2s
 2 R EE%sT 2011 Mar 27 2s
-3 - +03
+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
@@ -3802,24 +3783,24 @@ Z Europe/Rome 0:49:56 - LMT 1866 D 12
 1 I CE%sT 1980
 1 E CE%sT
 Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 - +04 1935 Ja 27
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1991 S 29 2s
-3 - +03 1991 O 20 3
-4 R +04/+05 2010 Mar 28 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04
+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 - +03 1930 Jun 21
-4 R +04/+05 1988 Mar 27 2s
-3 R +03/+04 1991 Mar 31 2s
-4 - +04 1992 Mar 29 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 D 4 2s
-4 - +04
+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
@@ -3863,14 +3844,14 @@ Z Europe/Tirane 1:19:20 - LMT 1914
 1 q CE%sT 1984 Jul
 1 E CE%sT
 Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - +03 1930 Jun 21
-4 R +04/+05 1989 Mar 26 2s
-3 R +03/+04 1991 Mar 31 2s
-2 R +02/+03 1992 Ja 19 2s
-3 R +03/+04 2011 Mar 27 2s
-4 - +04 2014 O 26 2s
-3 - +03 2016 Mar 27 2s
-4 - +04
+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
@@ -3895,15 +3876,15 @@ Z Europe/Vilnius 1:41:16 - LMT 1880
 2 - EET 2003
 2 E EE%sT
 Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - +03 1930 Jun 21
-4 - +04 1961 N 11
-4 R +04/+05 1988 Mar 27 2s
+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 - +04 1992 Mar 29 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 - +04 2020 D 27 2s
+4 - %z 2020 D 27 2s
 3 - MSK
 Z Europe/Warsaw 1:24 - LMT 1880
 1:24 - WMT 1915 Au 5
@@ -3919,58 +3900,53 @@ Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
 1 CH CE%sT 1981
 1 E CE%sT
 Z Factory 0 - -00
-Z HST -10 - HST
 Z Indian/Chagos 4:49:40 - LMT 1907
-5 - +05 1996
-6 - +06
+5 - %z 1996
+6 - %z
 Z Indian/Maldives 4:54 - LMT 1880
 4:54 - MMT 1960
-5 - +05
+5 - %z
 Z Indian/Mauritius 3:50 - LMT 1907
-4 MU +04/+05
-Z MET 1 c ME%sT
-Z MST -7 - MST
-Z MST7MDT -7 u M%sT
-Z PST8PDT -8 u P%sT
+4 MU %z
 Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
 -11:26:56 - LMT 1911
--11:30 - -1130 1950
--11 WS -11/-10 2011 D 29 24
-13 WS +13/+14
+-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 - +10 1942 Jul
-9 - +09 1945 Au 21
-10 - +10 2014 D 28 2
-11 - +11
+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 - +1215 1946
-12:45 k +1245/+1345
+12:15 - %z 1946
+12:45 k %z
 Z Pacific/Easter -7:17:28 - LMT 1890
 -7:17:28 - EMT 1932 S
--7 x -07/-06 1982 Mar 14 3u
--6 x -06/-05
+-7 x %z 1982 Mar 14 3u
+-6 x %z
 Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
-11 VU +11/+12
+11 VU %z
 Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - -11 2011 D 30
-13 - +13
+-11 - %z 2011 D 30
+13 - %z
 Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ +12/+13
+12 FJ %z
 Z Pacific/Galapagos -5:58:24 - LMT 1931
--5 - -05 1986
--6 EC -06/-05
+-5 - %z 1986
+-6 EC %z
 Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - -09
+-9 - %z
 Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - +11
+11 - %z
 Z Pacific/Guam -14:21 - LMT 1844 D 31
 9:39 - LMT 1901
 10 - GST 1941 D 10
-9 - +09 1944 Jul 31
+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
@@ -3979,74 +3955,73 @@ Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
 -10:30 u H%sT 1947 Jun 8 2
 -10 - HST
 Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - -12 1979 O
--11 - -11 1994 D 31
-13 - +13
+-12 - %z 1979 O
+-11 - %z 1994 D 31
+13 - %z
 Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - -1040 1979 O
--10 - -10 1994 D 31
-14 - +14
+-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 - +11 1914 O
-9 - +09 1919 F
-11 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1945 Au
-11 - +11 1969 O
-12 - +12 1999
-11 - +11
+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 - +11 1937
-10 - +10 1941 Ap
-9 - +09 1944 F 6
-11 - +11 1969 O
--12 - -12 1993 Au 20 24
-12 - +12
+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 - -0930
+-9:30 - %z
 Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - +1130 1942 Au 29
-9 - +09 1945 S 8
-11:30 - +1130 1979 F 10 2
-12 - +12
+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 - -1120 1964 Jul
--11 - -11
+-11:20 - %z 1964 Jul
+-11 - %z
 Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - +1112 1951
-11:30 - +1130 1974 O 27 2s
-11:30 1 +1230 1975 Mar 2 2s
-11:30 - +1130 2015 O 4 2s
-11 - +11 2019 Jul
-11 AN +11/+12
+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 +11/+12
+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 - +09
+9 - %z
 Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - -0830 1998 Ap 27
--8 - -08
+-8:30 - %z 1998 Ap 27
+-8 - %z
 Z Pacific/Port_Moresby 9:48:40 - LMT 1880
 9:48:32 - PMMT 1895
-10 - +10
+10 - %z
 Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
 -10:39:4 - LMT 1952 O 16
--10:30 - -1030 1978 N 12
--10 CK -10/-0930
+-10:30 - %z 1978 N 12
+-10 CK %z
 Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - -10
+-10 - %z
 Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - +12
+12 - %z
 Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - +1220 1961
-13 - +13 1999
-13 TO +13/+14
-Z WET 0 E WE%sT
+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
@@ -4062,6 +4037,8 @@ 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
@@ -4073,6 +4050,9 @@ 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
@@ -4096,6 +4076,9 @@ 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
@@ -4259,6 +4242,7 @@ 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
@@ -4273,6 +4257,7 @@ 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
@@ -4290,5 +4275,7 @@ 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/tzdata/zoneinfo/zone.tab b/libs/tzdata/zoneinfo/zone.tab
index 3fa9306af..bfc0b5933 100644
--- a/libs/tzdata/zoneinfo/zone.tab
+++ b/libs/tzdata/zoneinfo/zone.tab
@@ -264,8 +264,7 @@ 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-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs
 MO	+221150+1133230	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
diff --git a/libs/tzdata/zoneinfo/zone1970.tab b/libs/tzdata/zoneinfo/zone1970.tab
index abd948975..7726f39a0 100644
--- a/libs/tzdata/zoneinfo/zone1970.tab
+++ b/libs/tzdata/zoneinfo/zone1970.tab
@@ -209,8 +209,7 @@ 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, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Hovd, Uvs
 MO	+221150+1133230	Asia/Macau
 MQ	+1436-06105	America/Martinique
 MT	+3554+01431	Europe/Malta
diff --git a/libs/tzdata/zoneinfo/zonenow.tab b/libs/tzdata/zoneinfo/zonenow.tab
index b6f291095..01f536b3b 100644
--- a/libs/tzdata/zoneinfo/zonenow.tab
+++ b/libs/tzdata/zoneinfo/zonenow.tab
@@ -5,7 +5,7 @@
 # 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 coments),
+# 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
@@ -123,8 +123,6 @@ XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
 #
 # -01/+00 (EU DST)
 XX	+3744-02540	Atlantic/Azores	Azores
-# -01/+00 (EU DST) until 2024-03-31; then -02/-01 (EU DST)
-XX	+7029-02158	America/Scoresbysund	Ittoqqortoormiit
 #
 # +00 - GMT
 XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
@@ -199,7 +197,7 @@ XX	+2518+05518	Asia/Dubai	Russia; Caucasus; Persian Gulf; Seychelles; Réunion
 XX	+3431+06912	Asia/Kabul	Afghanistan
 #
 # +05
-XX	+4120+06918	Asia/Tashkent	Russia; west Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
+XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
 #
 # +05 - PKT
 XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
@@ -215,8 +213,6 @@ XX	+2743+08519	Asia/Kathmandu	Nepal
 #
 # +06
 XX	+2343+09025	Asia/Dhaka	Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
-# +06 until 2024-03-01; then +05
-XX	+4315+07657	Asia/Almaty	Kazakhstan (except western areas)
 #
 # +06:30
 XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
diff --git a/libs/tzdata/zones b/libs/tzdata/zones
index b054f0101..3c4a951d4 100644
--- a/libs/tzdata/zones
+++ b/libs/tzdata/zones
@@ -159,7 +159,6 @@ Asia/Barnaul
 Asia/Beirut
 Asia/Bishkek
 Asia/Chita
-Asia/Choibalsan
 Asia/Colombo
 Asia/Damascus
 Asia/Dhaka
@@ -239,11 +238,6 @@ Australia/Lord_Howe
 Australia/Melbourne
 Australia/Perth
 Australia/Sydney
-CET
-CST6CDT
-EET
-EST
-EST5EDT
 Etc/GMT
 Etc/GMT+1
 Etc/GMT+10
@@ -311,14 +305,9 @@ Europe/Volgograd
 Europe/Warsaw
 Europe/Zurich
 Factory
-HST
 Indian/Chagos
 Indian/Maldives
 Indian/Mauritius
-MET
-MST
-MST7MDT
-PST8PDT
 Pacific/Apia
 Pacific/Auckland
 Pacific/Bougainville
@@ -349,7 +338,6 @@ Pacific/Rarotonga
 Pacific/Tahiti
 Pacific/Tarawa
 Pacific/Tongatapu
-WET
 GMT
 Australia/ACT
 Australia/LHI
@@ -365,6 +353,8 @@ Brazil/Acre
 Brazil/DeNoronha
 Brazil/East
 Brazil/West
+CET
+CST6CDT
 Canada/Atlantic
 Canada/Central
 Canada/Eastern
@@ -376,6 +366,9 @@ Canada/Yukon
 Chile/Continental
 Chile/EasterIsland
 Cuba
+EET
+EST
+EST5EDT
 Egypt
 Eire
 Etc/GMT+0
@@ -399,6 +392,9 @@ Jamaica
 Japan
 Kwajalein
 Libya
+MET
+MST
+MST7MDT
 Mexico/BajaNorte
 Mexico/BajaSur
 Mexico/General
@@ -562,6 +558,7 @@ America/Shiprock
 America/Thunder_Bay
 America/Yellowknife
 Antarctica/South_Pole
+Asia/Choibalsan
 Asia/Chongqing
 Asia/Harbin
 Asia/Kashgar
@@ -576,6 +573,7 @@ Europe/Zaporozhye
 Pacific/Enderbury
 Pacific/Johnston
 Pacific/Yap
+WET
 Africa/Asmera
 America/Godthab
 Asia/Ashkhabad
@@ -593,5 +591,7 @@ Asia/Ulan_Bator
 Atlantic/Faeroe
 Europe/Kiev
 Europe/Nicosia
+HST
+PST8PDT
 Pacific/Ponape
 Pacific/Truk
diff --git a/libs/tzlocal-5.2.dist-info/RECORD b/libs/tzlocal-5.2.dist-info/RECORD
index fe9846af8..dcc09b7f9 100644
--- a/libs/tzlocal-5.2.dist-info/RECORD
+++ b/libs/tzlocal-5.2.dist-info/RECORD
@@ -3,7 +3,7 @@ tzlocal-5.2.dist-info/LICENSE.txt,sha256=2ZqyCa6xaq0sJckP_YPBqYHikP__dqQgoqsD4D8
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+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
diff --git a/libs/tzlocal-5.2.dist-info/WHEEL b/libs/tzlocal-5.2.dist-info/WHEEL
index 98c0d20b7..da25d7b42 100644
--- a/libs/tzlocal-5.2.dist-info/WHEEL
+++ b/libs/tzlocal-5.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/urllib3-2.2.1.dist-info/RECORD b/libs/urllib3-2.2.1.dist-info/RECORD
deleted file mode 100644
index 540ff4166..000000000
--- a/libs/urllib3-2.2.1.dist-info/RECORD
+++ /dev/null
@@ -1,42 +0,0 @@
-urllib3-2.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-urllib3-2.2.1.dist-info/METADATA,sha256=uROmjQwfAbwRYjV9PMdc5JF5NA3kRkpoKafPkNzybfc,6434
-urllib3-2.2.1.dist-info/RECORD,,
-urllib3-2.2.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-urllib3-2.2.1.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-urllib3-2.2.1.dist-info/licenses/LICENSE.txt,sha256=Ew46ZNX91dCWp1JpRjSn2d8oRGnehuVzIQAmgEHj1oY,1093
-urllib3/__init__.py,sha256=JMo1tg1nIV1AeJ2vENC_Txfl0e5h6Gzl9DGVk1rWRbo,6979
-urllib3/_base_connection.py,sha256=p-DOG_Me7-sJXO1R9VgDpNmdVU_kIS8VtaC7ptEllA0,5640
-urllib3/_collections.py,sha256=vzKA-7X-9resOamEWq52uV1nHshChjbYDvz47H0mMjw,17400
-urllib3/_request_methods.py,sha256=ucEpHQyQf06b9o1RxKLkCpzGH0ct-v7X2xGpU6rmmlo,9984
-urllib3/_version.py,sha256=12idLAcGmrAURPX52rGioBo33oQ__-ENJEdeqHvUUZg,98
-urllib3/connection.py,sha256=zFgaaoqrICsl7-kBp-_4va9m82sYhioAuy4-4iDpK0I,34704
-urllib3/connectionpool.py,sha256=XjTfYowLwN5ZzRMO41_OTbGNX4ANifgYVpWsVMRuC00,43556
-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=wIDmdJ4doFWqLl5s86l9n0V70gFjQ2HWaPgz69jM52E,9546
-urllib3/contrib/pyopenssl.py,sha256=X31eCYGwB09EkAHX8RhDKC0X0Ki7d0cCVWoMJZUM5bQ,19161
-urllib3/contrib/socks.py,sha256=gFS2-zOw4_vLGpUvExOf3fNVT8liz6vhM2t6lBPn3CY,7572
-urllib3/exceptions.py,sha256=RDaiudtR7rqbVKTKpLSgZBBtwaIqV7eZtervZV_mZag,9393
-urllib3/fields.py,sha256=8vi0PeRo_pE5chPmJA07LZtMkVls4UrBS1k2xM506jM,10843
-urllib3/filepost.py,sha256=-9qJT11cNGjO9dqnI20-oErZuTvNaM18xZZPCjZSbOE,2395
-urllib3/http2.py,sha256=4QQcjTM9UYOQZe0r8KnA8anU9ST4p_s3SB3gRTueyPc,7480
-urllib3/poolmanager.py,sha256=fcC3OwjFKxha06NsOORwbZOzrVt1pyY-bNCbKiqC0l8,22935
-urllib3/py.typed,sha256=UaCuPFa3H8UAakbt-5G8SPacldTOGvJv18pPjUJ5gDY,93
-urllib3/response.py,sha256=lmvseToQbkLXuFyA3jcSyCPjTgSfa6YPA4xUhVqq8QI,43874
-urllib3/util/__init__.py,sha256=-qeS0QceivazvBEKDNFCAI-6ACcdDOE4TMvo7SLNlAQ,1001
-urllib3/util/connection.py,sha256=QeUUEuNmhznpuKNPL-B0IVOkMdMCu8oJX62OC0Vpzug,4462
-urllib3/util/proxy.py,sha256=seP8-Q5B6bB0dMtwPj-YcZZQ30vHuLqRu-tI0JZ2fzs,1148
-urllib3/util/request.py,sha256=PQnBmKUHMQ0hQQ41uhbLNAeA24ke60m6zeiwfwocpGo,8102
-urllib3/util/response.py,sha256=vQE639uoEhj1vpjEdxu5lNIhJCSUZkd7pqllUI0BZOA,3374
-urllib3/util/retry.py,sha256=WB-7x1m7fQH_-Qqtrk2OGvz93GvBTxc-pRn8Vf3p4mg,18384
-urllib3/util/ssl_.py,sha256=FeymdS68RggEROwMB9VLGSqLHq2hRUKnIbQC_bCpGJI,19109
-urllib3/util/ssl_match_hostname.py,sha256=gaWqixoYtQ_GKO8fcRGFj3VXeMoqyxQQuUTPgWeiL_M,5812
-urllib3/util/ssltransport.py,sha256=SF__JQXVcHBQniFJZp3P9q-UeHM310WVwcBwqT9dCLE,9034
-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.1.dist-info/WHEEL b/libs/urllib3-2.2.1.dist-info/WHEEL
deleted file mode 100644
index 5998f3aab..000000000
--- a/libs/urllib3-2.2.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.21.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/zipp-3.17.0.dist-info/INSTALLER b/libs/urllib3-2.2.3.dist-info/INSTALLER
similarity index 100%
rename from libs/zipp-3.17.0.dist-info/INSTALLER
rename to libs/urllib3-2.2.3.dist-info/INSTALLER
diff --git a/libs/urllib3-2.2.1.dist-info/METADATA b/libs/urllib3-2.2.3.dist-info/METADATA
similarity index 98%
rename from libs/urllib3-2.2.1.dist-info/METADATA
rename to libs/urllib3-2.2.3.dist-info/METADATA
index 9da6d09f0..ba2fbba44 100644
--- a/libs/urllib3-2.2.1.dist-info/METADATA
+++ b/libs/urllib3-2.2.3.dist-info/METADATA
@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: urllib3
-Version: 2.2.1
+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
@@ -22,6 +22,7 @@ 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
diff --git a/libs/urllib3-2.2.3.dist-info/RECORD b/libs/urllib3-2.2.3.dist-info/RECORD
new file mode 100644
index 000000000..25833bd90
--- /dev/null
+++ b/libs/urllib3-2.2.3.dist-info/RECORD
@@ -0,0 +1,44 @@
+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/zipp-3.17.0.dist-info/REQUESTED b/libs/urllib3-2.2.3.dist-info/REQUESTED
similarity index 100%
rename from libs/zipp-3.17.0.dist-info/REQUESTED
rename to libs/urllib3-2.2.3.dist-info/REQUESTED
diff --git a/libs/urllib3-2.2.3.dist-info/WHEEL b/libs/urllib3-2.2.3.dist-info/WHEEL
new file mode 100644
index 000000000..12228d414
--- /dev/null
+++ b/libs/urllib3-2.2.3.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.27.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/urllib3-2.2.1.dist-info/licenses/LICENSE.txt b/libs/urllib3-2.2.3.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/urllib3-2.2.1.dist-info/licenses/LICENSE.txt
rename to libs/urllib3-2.2.3.dist-info/licenses/LICENSE.txt
diff --git a/libs/urllib3/_base_connection.py b/libs/urllib3/_base_connection.py
index bb349c744..29ca33487 100644
--- a/libs/urllib3/_base_connection.py
+++ b/libs/urllib3/_base_connection.py
@@ -12,7 +12,7 @@ _TYPE_BODY = typing.Union[bytes, typing.IO[typing.Any], typing.Iterable[bytes],
 class ProxyConfig(typing.NamedTuple):
     ssl_context: ssl.SSLContext | None
     use_forwarding_for_https: bool
-    assert_hostname: None | str | Literal[False]
+    assert_hostname: None | str | typing.Literal[False]
     assert_fingerprint: str | None
 
 
@@ -28,7 +28,7 @@ class _ResponseOptions(typing.NamedTuple):
 
 if typing.TYPE_CHECKING:
     import ssl
-    from typing import Literal, Protocol
+    from typing import Protocol
 
     from .response import BaseHTTPResponse
 
@@ -124,7 +124,7 @@ if typing.TYPE_CHECKING:
 
         # Certificate verification methods
         cert_reqs: int | str | None
-        assert_hostname: None | str | Literal[False]
+        assert_hostname: None | str | typing.Literal[False]
         assert_fingerprint: str | None
         ssl_context: ssl.SSLContext | None
 
@@ -155,7 +155,7 @@ if typing.TYPE_CHECKING:
             proxy: Url | None = None,
             proxy_config: ProxyConfig | None = None,
             cert_reqs: int | str | None = None,
-            assert_hostname: None | str | Literal[False] = None,
+            assert_hostname: None | str | typing.Literal[False] = None,
             assert_fingerprint: str | None = None,
             server_hostname: str | None = None,
             ssl_context: ssl.SSLContext | None = None,
diff --git a/libs/urllib3/_collections.py b/libs/urllib3/_collections.py
index 55b032479..8a4409a12 100644
--- a/libs/urllib3/_collections.py
+++ b/libs/urllib3/_collections.py
@@ -427,7 +427,7 @@ class HTTPHeaderDict(typing.MutableMapping[str, str]):
             val = other.getlist(key)
             self._container[key.lower()] = [key, *val]
 
-    def copy(self) -> HTTPHeaderDict:
+    def copy(self) -> Self:
         clone = type(self)()
         clone._copy_from(self)
         return clone
@@ -462,7 +462,7 @@ class HTTPHeaderDict(typing.MutableMapping[str, str]):
         self.extend(maybe_constructable)
         return self
 
-    def __or__(self, other: object) -> HTTPHeaderDict:
+    def __or__(self, other: object) -> Self:
         # Supports merging header dicts using operator |
         # combining items with add instead of __setitem__
         maybe_constructable = ensure_can_construct_http_header_dict(other)
@@ -472,7 +472,7 @@ class HTTPHeaderDict(typing.MutableMapping[str, str]):
         result.extend(maybe_constructable)
         return result
 
-    def __ror__(self, other: object) -> HTTPHeaderDict:
+    def __ror__(self, other: object) -> Self:
         # Supports merging header dicts using operator | when other is on left side
         # combining items with add instead of __setitem__
         maybe_constructable = ensure_can_construct_http_header_dict(other)
diff --git a/libs/urllib3/_request_methods.py b/libs/urllib3/_request_methods.py
index 632042f03..03186e512 100644
--- a/libs/urllib3/_request_methods.py
+++ b/libs/urllib3/_request_methods.py
@@ -97,8 +97,7 @@ class RequestMethods:
             an iterable of :class:`str`/:class:`bytes`, or a file-like object.
 
         :param fields:
-            Data to encode and send in the request body.  Values are processed
-            by :func:`urllib.parse.urlencode`.
+            Data to encode and send in the URL or request body, depending on ``method``.
 
         :param headers:
             Dictionary of custom headers to send, such as User-Agent,
@@ -164,7 +163,7 @@ class RequestMethods:
             The URL to perform the request on.
 
         :param fields:
-            Data to encode and send in the request body.
+            Data to encode and send in the URL.
 
         :param headers:
             Dictionary of custom headers to send, such as User-Agent,
diff --git a/libs/urllib3/_version.py b/libs/urllib3/_version.py
index 095cf3c16..eb8b5c285 100644
--- a/libs/urllib3/_version.py
+++ b/libs/urllib3/_version.py
@@ -1,4 +1,16 @@
-# This file is protected via CODEOWNERS
-from __future__ import annotations
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
 
-__version__ = "2.2.1"
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '2.2.3'
+__version_tuple__ = version_tuple = (2, 2, 3)
diff --git a/libs/urllib3/connection.py b/libs/urllib3/connection.py
index aa5c547c6..7cbef7d5a 100644
--- a/libs/urllib3/connection.py
+++ b/libs/urllib3/connection.py
@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import datetime
+import http.client
 import logging
 import os
 import re
 import socket
 import sys
+import threading
 import typing
 import warnings
 from http.client import HTTPConnection as _HTTPConnection
@@ -14,13 +16,12 @@ from http.client import ResponseNotReady
 from socket import timeout as SocketTimeout
 
 if typing.TYPE_CHECKING:
-    from typing import Literal
-
     from .response import HTTPResponse
     from .util.ssl_ import _TYPE_PEER_CERT_RET_DICT
     from .util.ssltransport import SSLTransport
 
 from ._collections import HTTPHeaderDict
+from .http2 import probe as http2_probe
 from .util.response import assert_header_parsing
 from .util.timeout import _DEFAULT_TIMEOUT, _TYPE_TIMEOUT, Timeout
 from .util.util import to_str
@@ -234,6 +235,46 @@ class HTTPConnection(_HTTPConnection):
         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 self.debuglevel > 0:
+                        print("header:", line.decode())
+            finally:
+                response.close()
+
     def connect(self) -> None:
         self.sock = self._new_conn()
         if self._tunnel_host:
@@ -241,7 +282,7 @@ class HTTPConnection(_HTTPConnection):
             self._has_connected_to_proxy = True
 
             # TODO: Fix tunnel so it doesn't depend on self.sock state.
-            self._tunnel()  # type: ignore[attr-defined]
+            self._tunnel()
 
         # If there's a proxy to be connected to we are fully connected.
         # This is set twice (once above and here) due to forwarding proxies
@@ -482,6 +523,7 @@ class HTTPConnection(_HTTPConnection):
             headers=headers,
             status=httplib_response.status,
             version=httplib_response.version,
+            version_string=getattr(self, "_http_vsn_str", "HTTP/?"),
             reason=httplib_response.reason,
             preload_content=resp_options.preload_content,
             decode_content=resp_options.decode_content,
@@ -509,6 +551,7 @@ class HTTPSConnection(HTTPConnection):
     ssl_minimum_version: int | None = None
     ssl_maximum_version: int | None = None
     assert_fingerprint: str | None = None
+    _connect_callback: typing.Callable[..., None] | None = None
 
     def __init__(
         self,
@@ -523,7 +566,7 @@ class HTTPSConnection(HTTPConnection):
         proxy: Url | None = None,
         proxy_config: ProxyConfig | None = None,
         cert_reqs: int | str | None = None,
-        assert_hostname: None | str | Literal[False] = None,
+        assert_hostname: None | str | typing.Literal[False] = None,
         assert_fingerprint: str | None = None,
         server_hostname: str | None = None,
         ssl_context: ssl.SSLContext | None = None,
@@ -569,6 +612,7 @@ class HTTPSConnection(HTTPConnection):
             else:
                 cert_reqs = resolve_cert_reqs(None)
         self.cert_reqs = cert_reqs
+        self._connect_callback = None
 
     def set_cert(
         self,
@@ -577,7 +621,7 @@ class HTTPSConnection(HTTPConnection):
         cert_reqs: int | str | None = None,
         key_password: str | None = None,
         ca_certs: str | None = None,
-        assert_hostname: None | str | Literal[False] = None,
+        assert_hostname: None | str | typing.Literal[False] = None,
         assert_fingerprint: str | None = None,
         ca_cert_dir: str | None = None,
         ca_cert_data: None | str | bytes = None,
@@ -612,63 +656,122 @@ class HTTPSConnection(HTTPConnection):
         self.ca_cert_data = ca_cert_data
 
     def connect(self) -> None:
-        sock: socket.socket | ssl.SSLSocket
-        self.sock = sock = self._new_conn()
-        server_hostname: str = self.host
-        tls_in_tls = False
+        # Today we don't need to be doing this step before the /actual/ socket
+        # connection, however in the future we'll need to decide whether to
+        # create a new socket or re-use an existing "shared" socket as a part
+        # of the HTTP/2 handshake dance.
+        if self._tunnel_host is not None and self._tunnel_port is not None:
+            probe_http2_host = self._tunnel_host
+            probe_http2_port = self._tunnel_port
+        else:
+            probe_http2_host = self.host
+            probe_http2_port = self.port
 
-        # Do we need to establish a tunnel?
-        if self._tunnel_host is not None:
-            # 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
-                self.sock = sock = self._connect_tls_proxy(self.host, sock)
-                tls_in_tls = True
-            elif self._tunnel_scheme == "http":
-                self.proxy_is_verified = False
+        # Check if the target origin supports HTTP/2.
+        # If the value comes back as 'None' it means that the current thread
+        # is probing for HTTP/2 support. Otherwise, we're waiting for another
+        # probe to complete, or we get a value right away.
+        target_supports_http2: bool | None
+        if "h2" in ssl_.ALPN_PROTOCOLS:
+            target_supports_http2 = http2_probe.acquire_and_get(
+                host=probe_http2_host, port=probe_http2_port
+            )
+        else:
+            # If HTTP/2 isn't going to be offered it doesn't matter if
+            # the target supports HTTP/2. Don't want to make a probe.
+            target_supports_http2 = False
 
-            # If we're tunneling it means we're connected to our proxy.
-            self._has_connected_to_proxy = True
-
-            self._tunnel()  # type: ignore[attr-defined]
-            # Override the host with the one we're requesting data from.
-            server_hostname = self._tunnel_host
-
-        if self.server_hostname is not None:
-            server_hostname = self.server_hostname
-
-        is_time_off = datetime.date.today() < RECENT_DATE
-        if is_time_off:
-            warnings.warn(
-                (
-                    f"System time is way off (before {RECENT_DATE}). This will probably "
-                    "lead to SSL verification errors"
-                ),
-                SystemTimeWarning,
+        if self._connect_callback is not None:
+            self._connect_callback(
+                "before connect",
+                thread_id=threading.get_ident(),
+                target_supports_http2=target_supports_http2,
             )
 
-        # Remove trailing '.' from fqdn hostnames to allow certificate validation
-        server_hostname_rm_dot = server_hostname.rstrip(".")
+        try:
+            sock: socket.socket | ssl.SSLSocket
+            self.sock = sock = self._new_conn()
+            server_hostname: str = self.host
+            tls_in_tls = False
 
-        sock_and_verified = _ssl_wrap_socket_and_match_hostname(
-            sock=sock,
-            cert_reqs=self.cert_reqs,
-            ssl_version=self.ssl_version,
-            ssl_minimum_version=self.ssl_minimum_version,
-            ssl_maximum_version=self.ssl_maximum_version,
-            ca_certs=self.ca_certs,
-            ca_cert_dir=self.ca_cert_dir,
-            ca_cert_data=self.ca_cert_data,
-            cert_file=self.cert_file,
-            key_file=self.key_file,
-            key_password=self.key_password,
-            server_hostname=server_hostname_rm_dot,
-            ssl_context=self.ssl_context,
-            tls_in_tls=tls_in_tls,
-            assert_hostname=self.assert_hostname,
-            assert_fingerprint=self.assert_fingerprint,
-        )
-        self.sock = sock_and_verified.socket
+            # Do we need to establish a tunnel?
+            if self._tunnel_host is not None:
+                # 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
+                    self.sock = sock = self._connect_tls_proxy(self.host, sock)
+                    tls_in_tls = True
+                elif self._tunnel_scheme == "http":
+                    self.proxy_is_verified = False
+
+                # If we're tunneling it means we're connected to our proxy.
+                self._has_connected_to_proxy = True
+
+                self._tunnel()
+                # Override the host with the one we're requesting data from.
+                server_hostname = self._tunnel_host
+
+            if self.server_hostname is not None:
+                server_hostname = self.server_hostname
+
+            is_time_off = datetime.date.today() < RECENT_DATE
+            if is_time_off:
+                warnings.warn(
+                    (
+                        f"System time is way off (before {RECENT_DATE}). This will probably "
+                        "lead to SSL verification errors"
+                    ),
+                    SystemTimeWarning,
+                )
+
+            # Remove trailing '.' from fqdn hostnames to allow certificate validation
+            server_hostname_rm_dot = server_hostname.rstrip(".")
+
+            sock_and_verified = _ssl_wrap_socket_and_match_hostname(
+                sock=sock,
+                cert_reqs=self.cert_reqs,
+                ssl_version=self.ssl_version,
+                ssl_minimum_version=self.ssl_minimum_version,
+                ssl_maximum_version=self.ssl_maximum_version,
+                ca_certs=self.ca_certs,
+                ca_cert_dir=self.ca_cert_dir,
+                ca_cert_data=self.ca_cert_data,
+                cert_file=self.cert_file,
+                key_file=self.key_file,
+                key_password=self.key_password,
+                server_hostname=server_hostname_rm_dot,
+                ssl_context=self.ssl_context,
+                tls_in_tls=tls_in_tls,
+                assert_hostname=self.assert_hostname,
+                assert_fingerprint=self.assert_fingerprint,
+            )
+            self.sock = sock_and_verified.socket
+
+        # If an error occurs during connection/handshake we may need to release
+        # our lock so another connection can probe the origin.
+        except BaseException:
+            if self._connect_callback is not None:
+                self._connect_callback(
+                    "after connect failure",
+                    thread_id=threading.get_ident(),
+                    target_supports_http2=target_supports_http2,
+                )
+
+            if target_supports_http2 is None:
+                http2_probe.set_and_release(
+                    host=probe_http2_host, port=probe_http2_port, supports_http2=None
+                )
+            raise
+
+        # If this connection doesn't know if the origin supports HTTP/2
+        # we report back to the HTTP/2 probe our result.
+        if target_supports_http2 is None:
+            supports_http2 = sock_and_verified.socket.selected_alpn_protocol() == "h2"
+            http2_probe.set_and_release(
+                host=probe_http2_host,
+                port=probe_http2_port,
+                supports_http2=supports_http2,
+            )
 
         # Forwarding proxies can never have a verified target since
         # the proxy is the one doing the verification. Should instead
@@ -742,7 +845,7 @@ def _ssl_wrap_socket_and_match_hostname(
     ca_certs: str | None,
     ca_cert_dir: str | None,
     ca_cert_data: None | str | bytes,
-    assert_hostname: None | str | Literal[False],
+    assert_hostname: None | str | typing.Literal[False],
     assert_fingerprint: str | None,
     server_hostname: str | None,
     ssl_context: ssl.SSLContext | None,
diff --git a/libs/urllib3/connectionpool.py b/libs/urllib3/connectionpool.py
index bd58ff14d..a2c3cf609 100644
--- a/libs/urllib3/connectionpool.py
+++ b/libs/urllib3/connectionpool.py
@@ -53,7 +53,8 @@ from .util.util import to_str
 
 if typing.TYPE_CHECKING:
     import ssl
-    from typing import Literal
+
+    from typing_extensions import Self
 
     from ._base_connection import BaseHTTPConnection, BaseHTTPSConnection
 
@@ -61,8 +62,6 @@ log = logging.getLogger(__name__)
 
 _TYPE_TIMEOUT = typing.Union[Timeout, float, _TYPE_DEFAULT, None]
 
-_SelfT = typing.TypeVar("_SelfT")
-
 
 # Pool objects
 class ConnectionPool:
@@ -95,7 +94,7 @@ class ConnectionPool:
     def __str__(self) -> str:
         return f"{type(self).__name__}(host={self.host!r}, port={self.port!r})"
 
-    def __enter__(self: _SelfT) -> _SelfT:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(
@@ -103,7 +102,7 @@ class ConnectionPool:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> Literal[False]:
+    ) -> typing.Literal[False]:
         self.close()
         # Return False to re-raise any potential exceptions
         return False
@@ -544,17 +543,14 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         response._connection = response_conn  # type: ignore[attr-defined]
         response._pool = self  # type: ignore[attr-defined]
 
-        # emscripten connection doesn't have _http_vsn_str
-        http_version = getattr(conn, "_http_vsn_str", "HTTP/?")
         log.debug(
-            '%s://%s:%s "%s %s %s" %s %s',
+            '%s://%s:%s "%s %s HTTP/%s" %s %s',
             self.scheme,
             self.host,
             self.port,
             method,
             url,
-            # HTTP version
-            http_version,
+            response.version,
             response.status,
             response.length_remaining,
         )
@@ -1002,7 +998,7 @@ class HTTPSConnectionPool(HTTPConnectionPool):
         ssl_version: int | str | None = None,
         ssl_minimum_version: ssl.TLSVersion | None = None,
         ssl_maximum_version: ssl.TLSVersion | None = None,
-        assert_hostname: str | Literal[False] | None = None,
+        assert_hostname: str | typing.Literal[False] | None = None,
         assert_fingerprint: str | None = None,
         ca_cert_dir: str | None = None,
         **conn_kw: typing.Any,
diff --git a/libs/urllib3/contrib/emscripten/response.py b/libs/urllib3/contrib/emscripten/response.py
index 303b4ee01..cd3d80e43 100644
--- a/libs/urllib3/contrib/emscripten/response.py
+++ b/libs/urllib3/contrib/emscripten/response.py
@@ -45,6 +45,7 @@ class EmscriptenHttpResponseWrapper(BaseHTTPResponse):
             status=internal_response.status_code,
             request_url=url,
             version=0,
+            version_string="HTTP/?",
             reason="",
             decode_content=True,
         )
@@ -155,7 +156,7 @@ class EmscriptenHttpResponseWrapper(BaseHTTPResponse):
                 self.length_is_certain = True
                 # wrap body in IOStream
                 self._response.body = BytesIO(self._response.body)
-            if amt is not None:
+            if amt is not None and amt >= 0:
                 # don't cache partial content
                 cache_content = False
                 data = self._response.body.read(amt)
@@ -211,13 +212,21 @@ class EmscriptenHttpResponseWrapper(BaseHTTPResponse):
 
     def json(self) -> typing.Any:
         """
-        Parses the body of the HTTP response as JSON.
+        Deserializes the body of the HTTP response as a Python object.
 
-        To use a custom JSON decoder pass the result of :attr:`HTTPResponse.data` to the decoder.
+        The body of the HTTP response must be encoded using UTF-8, as per
+        `RFC 8529 Section 8.1 <https://www.rfc-editor.org/rfc/rfc8259#section-8.1>`_.
 
-        This method can raise either `UnicodeDecodeError` or `json.JSONDecodeError`.
+        To use a custom JSON decoder pass the result of :attr:`HTTPResponse.data` to
+        your custom decoder instead.
 
-        Read more :ref:`here <json>`.
+        If the body of the HTTP response is not decodable to UTF-8, a
+        `UnicodeDecodeError` will be raised. If the body of the HTTP response is not a
+        valid JSON document, a `json.JSONDecodeError` will be raised.
+
+        Read more :ref:`here <json_content>`.
+
+        :returns: The body of the HTTP response as a Python object.
         """
         data = self.data.decode("utf-8")
         return _json.loads(data)
diff --git a/libs/urllib3/contrib/pyopenssl.py b/libs/urllib3/contrib/pyopenssl.py
index b89a6dab8..c12cb3174 100644
--- a/libs/urllib3/contrib/pyopenssl.py
+++ b/libs/urllib3/contrib/pyopenssl.py
@@ -400,6 +400,10 @@ class WrappedSocket:
     def version(self) -> str:
         return self.connection.get_protocol_version_name()  # type: ignore[no-any-return]
 
+    def selected_alpn_protocol(self) -> str | None:
+        alpn_proto = self.connection.get_alpn_proto_negotiated()
+        return alpn_proto.decode() if alpn_proto else None
+
 
 WrappedSocket.makefile = socket_cls.makefile  # type: ignore[attr-defined]
 
diff --git a/libs/urllib3/contrib/socks.py b/libs/urllib3/contrib/socks.py
index 5a803916b..c62b5e033 100644
--- a/libs/urllib3/contrib/socks.py
+++ b/libs/urllib3/contrib/socks.py
@@ -71,10 +71,8 @@ try:
 except ImportError:
     ssl = None  # type: ignore[assignment]
 
-from typing import TypedDict
 
-
-class _TYPE_SOCKS_OPTIONS(TypedDict):
+class _TYPE_SOCKS_OPTIONS(typing.TypedDict):
     socks_version: int
     proxy_host: str | None
     proxy_port: str | None
diff --git a/libs/urllib3/http2.py b/libs/urllib3/http2.py
deleted file mode 100644
index 15fa9d915..000000000
--- a/libs/urllib3/http2.py
+++ /dev/null
@@ -1,229 +0,0 @@
-from __future__ import annotations
-
-import threading
-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 urllib3.connection
-import urllib3.util.ssl_
-from urllib3.response import BaseHTTPResponse
-
-from ._collections import HTTPHeaderDict
-from .connection import HTTPSConnection
-from .connectionpool import HTTPSConnectionPool
-
-orig_HTTPSConnection = HTTPSConnection
-
-T = typing.TypeVar("T")
-
-
-class _LockedObject(typing.Generic[T]):
-    """
-    A wrapper class that hides a specific object behind a lock.
-
-    The goal here is to provide a simple way to protect access to an object
-    that cannot safely be simultaneously accessed from multiple threads. The
-    intended use of this class is simple: take hold of it with a context
-    manager, which returns the protected object.
-    """
-
-    def __init__(self, obj: T):
-        self.lock = threading.RLock()
-        self._obj = obj
-
-    def __enter__(self) -> T:
-        self.lock.acquire()
-        return self._obj
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: types.TracebackType | None,
-    ) -> None:
-        self.lock.release()
-
-
-class HTTP2Connection(HTTPSConnection):
-    def __init__(
-        self, host: str, port: int | None = None, **kwargs: typing.Any
-    ) -> None:
-        self._h2_conn = self._new_h2_conn()
-        self._h2_stream: int | None = None
-        self._h2_headers: list[tuple[bytes, bytes]] = []
-
-        if "proxy" in kwargs or "proxy_config" in kwargs:  # Defensive:
-            raise NotImplementedError("Proxies aren't supported with HTTP/2")
-
-        super().__init__(host, port, **kwargs)
-
-    def _new_h2_conn(self) -> _LockedObject[h2.connection.H2Connection]:
-        config = h2.config.H2Configuration(client_side=True)
-        return _LockedObject(h2.connection.H2Connection(config=config))
-
-    def connect(self) -> None:
-        super().connect()
-
-        with self._h2_conn as h2_conn:
-            h2_conn.initiate_connection()
-            self.sock.sendall(h2_conn.data_to_send())
-
-    def putrequest(
-        self,
-        method: str,
-        url: str,
-        skip_host: bool = False,
-        skip_accept_encoding: bool = False,
-    ) -> None:
-        with self._h2_conn as h2_conn:
-            self._request_url = url
-            self._h2_stream = h2_conn.get_next_available_stream_id()
-
-            if ":" in self.host:
-                authority = f"[{self.host}]:{self.port or 443}"
-            else:
-                authority = f"{self.host}:{self.port or 443}"
-
-            self._h2_headers.extend(
-                (
-                    (b":scheme", b"https"),
-                    (b":method", method.encode()),
-                    (b":authority", authority.encode()),
-                    (b":path", url.encode()),
-                )
-            )
-
-    def putheader(self, header: str, *values: str) -> None:  # type: ignore[override]
-        for value in values:
-            self._h2_headers.append(
-                (header.encode("utf-8").lower(), value.encode("utf-8"))
-            )
-
-    def endheaders(self) -> None:  # type: ignore[override]
-        with self._h2_conn as h2_conn:
-            h2_conn.send_headers(
-                stream_id=self._h2_stream,
-                headers=self._h2_headers,
-                end_stream=True,
-            )
-            if data_to_send := h2_conn.data_to_send():
-                self.sock.sendall(data_to_send)
-
-    def send(self, data: bytes) -> None:  # type: ignore[override]  # Defensive:
-        if not data:
-            return
-        raise NotImplementedError("Sending data isn't supported yet")
-
-    def getresponse(  # type: ignore[override]
-        self,
-    ) -> HTTP2Response:
-        status = None
-        data = bytearray()
-        with self._h2_conn as h2_conn:
-            end_stream = False
-            while not end_stream:
-                # TODO: Arbitrary read value.
-                if received_data := self.sock.recv(65535):
-                    events = h2_conn.receive_data(received_data)
-                    for event in events:
-                        if isinstance(event, h2.events.ResponseReceived):
-                            headers = HTTPHeaderDict()
-                            for header, value in event.headers:
-                                if header == b":status":
-                                    status = int(value.decode())
-                                else:
-                                    headers.add(
-                                        header.decode("ascii"), value.decode("ascii")
-                                    )
-
-                        elif isinstance(event, h2.events.DataReceived):
-                            data += event.data
-                            h2_conn.acknowledge_received_data(
-                                event.flow_controlled_length, event.stream_id
-                            )
-
-                        elif isinstance(event, h2.events.StreamEnded):
-                            end_stream = True
-
-                if data_to_send := h2_conn.data_to_send():
-                    self.sock.sendall(data_to_send)
-
-        # We always close to not have to handle connection management.
-        self.close()
-
-        assert status is not None
-        return HTTP2Response(
-            status=status,
-            headers=headers,
-            request_url=self._request_url,
-            data=bytes(data),
-        )
-
-    def close(self) -> None:
-        with self._h2_conn as h2_conn:
-            try:
-                h2_conn.close_connection()
-                if data := h2_conn.data_to_send():
-                    self.sock.sendall(data)
-            except Exception:
-                pass
-
-        # Reset all our HTTP/2 connection state.
-        self._h2_conn = self._new_h2_conn()
-        self._h2_stream = None
-        self._h2_headers = []
-
-        super().close()
-
-
-class HTTP2Response(BaseHTTPResponse):
-    # TODO: This is a woefully incomplete response object, but works for non-streaming.
-    def __init__(
-        self,
-        status: int,
-        headers: HTTPHeaderDict,
-        request_url: str,
-        data: bytes,
-        decode_content: bool = False,  # TODO: support decoding
-    ) -> None:
-        super().__init__(
-            status=status,
-            headers=headers,
-            # Following CPython, we map HTTP versions to major * 10 + minor integers
-            version=20,
-            # No reason phrase in HTTP/2
-            reason=None,
-            decode_content=decode_content,
-            request_url=request_url,
-        )
-        self._data = data
-        self.length_remaining = 0
-
-    @property
-    def data(self) -> bytes:
-        return self._data
-
-    def get_redirect_location(self) -> None:
-        return None
-
-    def close(self) -> None:
-        pass
-
-
-def inject_into_urllib3() -> None:
-    HTTPSConnectionPool.ConnectionCls = HTTP2Connection
-    urllib3.connection.HTTPSConnection = HTTP2Connection  # type: ignore[misc]
-
-    # TODO: Offer 'http/1.1' as well, but for testing purposes this is handy.
-    urllib3.util.ssl_.ALPN_PROTOCOLS = ["h2"]
-
-
-def extract_from_urllib3() -> None:
-    HTTPSConnectionPool.ConnectionCls = orig_HTTPSConnection
-    urllib3.connection.HTTPSConnection = orig_HTTPSConnection  # type: ignore[misc]
-
-    urllib3.util.ssl_.ALPN_PROTOCOLS = ["http/1.1"]
diff --git a/libs/urllib3/http2/__init__.py b/libs/urllib3/http2/__init__.py
new file mode 100644
index 000000000..133e1d8f2
--- /dev/null
+++ b/libs/urllib3/http2/__init__.py
@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+from importlib.metadata import version
+
+__all__ = [
+    "inject_into_urllib3",
+    "extract_from_urllib3",
+]
+
+import typing
+
+orig_HTTPSConnection: typing.Any = None
+
+
+def inject_into_urllib3() -> None:
+    # First check if h2 version is valid
+    h2_version = version("h2")
+    if not h2_version.startswith("4."):
+        raise ImportError(
+            "urllib3 v2 supports h2 version 4.x.x, currently "
+            f"the 'h2' module is compiled with {h2_version!r}. "
+            "See: https://github.com/urllib3/urllib3/issues/3290"
+        )
+
+    # Import here to avoid circular dependencies.
+    from .. import connection as urllib3_connection
+    from .. import util as urllib3_util
+    from ..connectionpool import HTTPSConnectionPool
+    from ..util import ssl_ as urllib3_util_ssl
+    from .connection import HTTP2Connection
+
+    global orig_HTTPSConnection
+    orig_HTTPSConnection = urllib3_connection.HTTPSConnection
+
+    HTTPSConnectionPool.ConnectionCls = HTTP2Connection
+    urllib3_connection.HTTPSConnection = HTTP2Connection  # type: ignore[misc]
+
+    # TODO: Offer 'http/1.1' as well, but for testing purposes this is handy.
+    urllib3_util.ALPN_PROTOCOLS = ["h2"]
+    urllib3_util_ssl.ALPN_PROTOCOLS = ["h2"]
+
+
+def extract_from_urllib3() -> None:
+    from .. import connection as urllib3_connection
+    from .. import util as urllib3_util
+    from ..connectionpool import HTTPSConnectionPool
+    from ..util import ssl_ as urllib3_util_ssl
+
+    HTTPSConnectionPool.ConnectionCls = orig_HTTPSConnection
+    urllib3_connection.HTTPSConnection = orig_HTTPSConnection  # type: ignore[misc]
+
+    urllib3_util.ALPN_PROTOCOLS = ["http/1.1"]
+    urllib3_util_ssl.ALPN_PROTOCOLS = ["http/1.1"]
diff --git a/libs/urllib3/http2/connection.py b/libs/urllib3/http2/connection.py
new file mode 100644
index 000000000..f48614528
--- /dev/null
+++ b/libs/urllib3/http2/connection.py
@@ -0,0 +1,356 @@
+from __future__ import annotations
+
+import logging
+import re
+import threading
+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]
+
+from .._base_connection import _TYPE_BODY
+from .._collections import HTTPHeaderDict
+from ..connection import HTTPSConnection, _get_default_user_agent
+from ..exceptions import ConnectionError
+from ..response import BaseHTTPResponse
+
+orig_HTTPSConnection = HTTPSConnection
+
+T = typing.TypeVar("T")
+
+log = logging.getLogger(__name__)
+
+RE_IS_LEGAL_HEADER_NAME = re.compile(rb"^[!#$%&'*+\-.^_`|~0-9a-z]+$")
+RE_IS_ILLEGAL_HEADER_VALUE = re.compile(rb"[\0\x00\x0a\x0d\r\n]|^[ \r\n\t]|[ \r\n\t]$")
+
+
+def _is_legal_header_name(name: bytes) -> bool:
+    """
+    "An implementation that validates fields according to the definitions in Sections
+    5.1 and 5.5 of [HTTP] only needs an additional check that field names do not
+    include uppercase characters." (https://httpwg.org/specs/rfc9113.html#n-field-validity)
+
+    `http.client._is_legal_header_name` does not validate the field name according to the
+    HTTP 1.1 spec, so we do that here, in addition to checking for uppercase characters.
+
+    This does not allow for the `:` character in the header name, so should not
+    be used to validate pseudo-headers.
+    """
+    return bool(RE_IS_LEGAL_HEADER_NAME.match(name))
+
+
+def _is_illegal_header_value(value: bytes) -> bool:
+    """
+    "A field value MUST NOT contain the zero value (ASCII NUL, 0x00), line feed
+    (ASCII LF, 0x0a), or carriage return (ASCII CR, 0x0d) at any position. A field
+    value MUST NOT start or end with an ASCII whitespace character (ASCII SP or HTAB,
+    0x20 or 0x09)." (https://httpwg.org/specs/rfc9113.html#n-field-validity)
+    """
+    return bool(RE_IS_ILLEGAL_HEADER_VALUE.search(value))
+
+
+class _LockedObject(typing.Generic[T]):
+    """
+    A wrapper class that hides a specific object behind a lock.
+    The goal here is to provide a simple way to protect access to an object
+    that cannot safely be simultaneously accessed from multiple threads. The
+    intended use of this class is simple: take hold of it with a context
+    manager, which returns the protected object.
+    """
+
+    __slots__ = (
+        "lock",
+        "_obj",
+    )
+
+    def __init__(self, obj: T):
+        self.lock = threading.RLock()
+        self._obj = obj
+
+    def __enter__(self) -> T:
+        self.lock.acquire()
+        return self._obj
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: types.TracebackType | None,
+    ) -> None:
+        self.lock.release()
+
+
+class HTTP2Connection(HTTPSConnection):
+    def __init__(
+        self, host: str, port: int | None = None, **kwargs: typing.Any
+    ) -> None:
+        self._h2_conn = self._new_h2_conn()
+        self._h2_stream: int | None = None
+        self._headers: list[tuple[bytes, bytes]] = []
+
+        if "proxy" in kwargs or "proxy_config" in kwargs:  # Defensive:
+            raise NotImplementedError("Proxies aren't supported with HTTP/2")
+
+        super().__init__(host, port, **kwargs)
+
+        if self._tunnel_host is not None:
+            raise NotImplementedError("Tunneling isn't supported with HTTP/2")
+
+    def _new_h2_conn(self) -> _LockedObject[h2.connection.H2Connection]:
+        config = h2.config.H2Configuration(client_side=True)
+        return _LockedObject(h2.connection.H2Connection(config=config))
+
+    def connect(self) -> None:
+        super().connect()
+        with self._h2_conn as conn:
+            conn.initiate_connection()
+            if data_to_send := conn.data_to_send():
+                self.sock.sendall(data_to_send)
+
+    def putrequest(  # type: ignore[override]
+        self,
+        method: str,
+        url: str,
+        **kwargs: typing.Any,
+    ) -> None:
+        """putrequest
+        This deviates from the HTTPConnection method signature since we never need to override
+        sending accept-encoding headers or the host header.
+        """
+        if "skip_host" in kwargs:
+            raise NotImplementedError("`skip_host` isn't supported")
+        if "skip_accept_encoding" in kwargs:
+            raise NotImplementedError("`skip_accept_encoding` isn't supported")
+
+        self._request_url = url or "/"
+        self._validate_path(url)  # type: ignore[attr-defined]
+
+        if ":" in self.host:
+            authority = f"[{self.host}]:{self.port or 443}"
+        else:
+            authority = f"{self.host}:{self.port or 443}"
+
+        self._headers.append((b":scheme", b"https"))
+        self._headers.append((b":method", method.encode()))
+        self._headers.append((b":authority", authority.encode()))
+        self._headers.append((b":path", url.encode()))
+
+        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:
+        # 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.
+        if not _is_legal_header_name(header):
+            raise ValueError(f"Illegal header name {str(header)}")
+
+        for value in values:
+            value = value.encode() if isinstance(value, str) else value
+            if _is_illegal_header_value(value):
+                raise ValueError(f"Illegal header value {str(value)}")
+            self._headers.append((header, value))
+
+    def endheaders(self, message_body: typing.Any = None) -> None:  # type: ignore[override]
+        if self._h2_stream is None:
+            raise ConnectionError("Must call `putrequest` first.")
+
+        with self._h2_conn as conn:
+            conn.send_headers(
+                stream_id=self._h2_stream,
+                headers=self._headers,
+                end_stream=(message_body is None),
+            )
+            if data_to_send := conn.data_to_send():
+                self.sock.sendall(data_to_send)
+        self._headers = []  # Reset headers for the next request.
+
+    def send(self, data: typing.Any) -> None:
+        """Send data to the server.
+        `data` can be: `str`, `bytes`, an iterable, or file-like objects
+        that support a .read() method.
+        """
+        if self._h2_stream is None:
+            raise ConnectionError("Must call `putrequest` first.")
+
+        with self._h2_conn as conn:
+            if data_to_send := conn.data_to_send():
+                self.sock.sendall(data_to_send)
+
+            if hasattr(data, "read"):  # file-like objects
+                while True:
+                    chunk = data.read(self.blocksize)
+                    if not chunk:
+                        break
+                    if isinstance(chunk, str):
+                        chunk = chunk.encode()  # pragma: no cover
+                    conn.send_data(self._h2_stream, chunk, end_stream=False)
+                    if data_to_send := conn.data_to_send():
+                        self.sock.sendall(data_to_send)
+                conn.end_stream(self._h2_stream)
+                return
+
+            if isinstance(data, str):  # str -> bytes
+                data = data.encode()
+
+            try:
+                if isinstance(data, bytes):
+                    conn.send_data(self._h2_stream, data, end_stream=True)
+                    if data_to_send := conn.data_to_send():
+                        self.sock.sendall(data_to_send)
+                else:
+                    for chunk in data:
+                        conn.send_data(self._h2_stream, chunk, end_stream=False)
+                        if data_to_send := conn.data_to_send():
+                            self.sock.sendall(data_to_send)
+                    conn.end_stream(self._h2_stream)
+            except TypeError:
+                raise TypeError(
+                    "`data` should be str, bytes, iterable, or file. got %r"
+                    % type(data)
+                )
+
+    def set_tunnel(
+        self,
+        host: str,
+        port: int | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        scheme: str = "http",
+    ) -> None:
+        raise NotImplementedError(
+            "HTTP/2 does not support setting up a tunnel through a proxy"
+        )
+
+    def getresponse(  # type: ignore[override]
+        self,
+    ) -> HTTP2Response:
+        status = None
+        data = bytearray()
+        with self._h2_conn as conn:
+            end_stream = False
+            while not end_stream:
+                # TODO: Arbitrary read value.
+                if received_data := self.sock.recv(65535):
+                    events = conn.receive_data(received_data)
+                    for event in events:
+                        if isinstance(event, h2.events.ResponseReceived):
+                            headers = HTTPHeaderDict()
+                            for header, value in event.headers:
+                                if header == b":status":
+                                    status = int(value.decode())
+                                else:
+                                    headers.add(
+                                        header.decode("ascii"), value.decode("ascii")
+                                    )
+
+                        elif isinstance(event, h2.events.DataReceived):
+                            data += event.data
+                            conn.acknowledge_received_data(
+                                event.flow_controlled_length, event.stream_id
+                            )
+
+                        elif isinstance(event, h2.events.StreamEnded):
+                            end_stream = True
+
+                if data_to_send := conn.data_to_send():
+                    self.sock.sendall(data_to_send)
+
+        assert status is not None
+        return HTTP2Response(
+            status=status,
+            headers=headers,
+            request_url=self._request_url,
+            data=bytes(data),
+        )
+
+    def request(  # type: ignore[override]
+        self,
+        method: str,
+        url: str,
+        body: _TYPE_BODY | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        *,
+        preload_content: bool = True,
+        decode_content: bool = True,
+        enforce_content_length: bool = True,
+        **kwargs: typing.Any,
+    ) -> None:
+        """Send an HTTP/2 request"""
+        if "chunked" in kwargs:
+            # TODO this is often present from upstream.
+            # raise NotImplementedError("`chunked` isn't supported with HTTP/2")
+            pass
+
+        if self.sock is not None:
+            self.sock.settimeout(self.timeout)
+
+        self.putrequest(method, url)
+
+        headers = headers or {}
+        for k, v in headers.items():
+            if k.lower() == "transfer-encoding" and v == "chunked":
+                continue
+            else:
+                self.putheader(k, v)
+
+        if b"user-agent" not in dict(self._headers):
+            self.putheader(b"user-agent", _get_default_user_agent())
+
+        if body:
+            self.endheaders(message_body=body)
+            self.send(body)
+        else:
+            self.endheaders()
+
+    def close(self) -> None:
+        with self._h2_conn as conn:
+            try:
+                conn.close_connection()
+                if data := conn.data_to_send():
+                    self.sock.sendall(data)
+            except Exception:
+                pass
+
+        # Reset all our HTTP/2 connection state.
+        self._h2_conn = self._new_h2_conn()
+        self._h2_stream = None
+        self._headers = []
+
+        super().close()
+
+
+class HTTP2Response(BaseHTTPResponse):
+    # TODO: This is a woefully incomplete response object, but works for non-streaming.
+    def __init__(
+        self,
+        status: int,
+        headers: HTTPHeaderDict,
+        request_url: str,
+        data: bytes,
+        decode_content: bool = False,  # TODO: support decoding
+    ) -> None:
+        super().__init__(
+            status=status,
+            headers=headers,
+            # Following CPython, we map HTTP versions to major * 10 + minor integers
+            version=20,
+            version_string="HTTP/2",
+            # No reason phrase in HTTP/2
+            reason=None,
+            decode_content=decode_content,
+            request_url=request_url,
+        )
+        self._data = data
+        self.length_remaining = 0
+
+    @property
+    def data(self) -> bytes:
+        return self._data
+
+    def get_redirect_location(self) -> None:
+        return None
+
+    def close(self) -> None:
+        pass
diff --git a/libs/urllib3/http2/probe.py b/libs/urllib3/http2/probe.py
new file mode 100644
index 000000000..9ea900764
--- /dev/null
+++ b/libs/urllib3/http2/probe.py
@@ -0,0 +1,87 @@
+from __future__ import annotations
+
+import threading
+
+
+class _HTTP2ProbeCache:
+    __slots__ = (
+        "_lock",
+        "_cache_locks",
+        "_cache_values",
+    )
+
+    def __init__(self) -> None:
+        self._lock = threading.Lock()
+        self._cache_locks: dict[tuple[str, int], threading.RLock] = {}
+        self._cache_values: dict[tuple[str, int], bool | None] = {}
+
+    def acquire_and_get(self, host: str, port: int) -> bool | None:
+        # By the end of this block we know that
+        # _cache_[values,locks] is available.
+        value = None
+        with self._lock:
+            key = (host, port)
+            try:
+                value = self._cache_values[key]
+                # If it's a known value we return right away.
+                if value is not None:
+                    return value
+            except KeyError:
+                self._cache_locks[key] = threading.RLock()
+                self._cache_values[key] = None
+
+        # If the value is unknown, we acquire the lock to signal
+        # to the requesting thread that the probe is in progress
+        # or that the current thread needs to return their findings.
+        key_lock = self._cache_locks[key]
+        key_lock.acquire()
+        try:
+            # If the by the time we get the lock the value has been
+            # updated we want to return the updated value.
+            value = self._cache_values[key]
+
+        # In case an exception like KeyboardInterrupt is raised here.
+        except BaseException as e:  # Defensive:
+            assert not isinstance(e, KeyError)  # KeyError shouldn't be possible.
+            key_lock.release()
+            raise
+
+        return value
+
+    def set_and_release(
+        self, host: str, port: int, supports_http2: bool | None
+    ) -> None:
+        key = (host, port)
+        key_lock = self._cache_locks[key]
+        with key_lock:  # Uses an RLock, so can be locked again from same thread.
+            if supports_http2 is None and self._cache_values[key] is not None:
+                raise ValueError(
+                    "Cannot reset HTTP/2 support for origin after value has been set."
+                )  # Defensive: not expected in normal usage
+
+        self._cache_values[key] = supports_http2
+        key_lock.release()
+
+    def _values(self) -> dict[tuple[str, int], bool | None]:
+        """This function is for testing purposes only. Gets the current state of the probe cache"""
+        with self._lock:
+            return {k: v for k, v in self._cache_values.items()}
+
+    def _reset(self) -> None:
+        """This function is for testing purposes only. Reset the cache values"""
+        with self._lock:
+            self._cache_locks = {}
+            self._cache_values = {}
+
+
+_HTTP2_PROBE_CACHE = _HTTP2ProbeCache()
+
+set_and_release = _HTTP2_PROBE_CACHE.set_and_release
+acquire_and_get = _HTTP2_PROBE_CACHE.acquire_and_get
+_values = _HTTP2_PROBE_CACHE._values
+_reset = _HTTP2_PROBE_CACHE._reset
+
+__all__ = [
+    "set_and_release",
+    "acquire_and_get",
+]
diff --git a/libs/urllib3/poolmanager.py b/libs/urllib3/poolmanager.py
index 32da0a00a..085d1dbaf 100644
--- a/libs/urllib3/poolmanager.py
+++ b/libs/urllib3/poolmanager.py
@@ -26,7 +26,8 @@ from .util.url import Url, parse_url
 
 if typing.TYPE_CHECKING:
     import ssl
-    from typing import Literal
+
+    from typing_extensions import Self
 
 __all__ = ["PoolManager", "ProxyManager", "proxy_from_url"]
 
@@ -51,8 +52,6 @@ SSL_KEYWORDS = (
 # http.client.HTTPConnection & http.client.HTTPSConnection in Python 3.7
 _DEFAULT_BLOCKSIZE = 16384
 
-_SelfT = typing.TypeVar("_SelfT")
-
 
 class PoolKey(typing.NamedTuple):
     """
@@ -214,7 +213,7 @@ class PoolManager(RequestMethods):
         self.pool_classes_by_scheme = pool_classes_by_scheme
         self.key_fn_by_scheme = key_fn_by_scheme.copy()
 
-    def __enter__(self: _SelfT) -> _SelfT:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(
@@ -222,7 +221,7 @@ class PoolManager(RequestMethods):
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
-    ) -> Literal[False]:
+    ) -> typing.Literal[False]:
         self.clear()
         # Return False to re-raise any potential exceptions
         return False
@@ -553,7 +552,7 @@ class ProxyManager(PoolManager):
         proxy_headers: typing.Mapping[str, str] | None = None,
         proxy_ssl_context: ssl.SSLContext | None = None,
         use_forwarding_for_https: bool = False,
-        proxy_assert_hostname: None | str | Literal[False] = None,
+        proxy_assert_hostname: None | str | typing.Literal[False] = None,
         proxy_assert_fingerprint: str | None = None,
         **connection_pool_kw: typing.Any,
     ) -> None:
diff --git a/libs/urllib3/response.py b/libs/urllib3/response.py
index d31fac9ba..a0273d65b 100644
--- a/libs/urllib3/response.py
+++ b/libs/urllib3/response.py
@@ -26,20 +26,21 @@ except ImportError:
     brotli = None
 
 try:
-    import zstandard as zstd  # type: ignore[import-not-found]
-
+    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 = _zstd_version = tuple(
+    _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:
-        zstd = None
-
-except (AttributeError, ImportError, ValueError):  # Defensive:
-    zstd = None
+        HAS_ZSTD = False
+    else:
+        HAS_ZSTD = True
 
 from . import util
 from ._base_connection import _TYPE_BODY
@@ -61,8 +62,6 @@ from .util.response import is_fp_closed, is_response_to_head
 from .util.retry import Retry
 
 if typing.TYPE_CHECKING:
-    from typing import Literal
-
     from .connectionpool import HTTPConnectionPool
 
 log = logging.getLogger(__name__)
@@ -163,7 +162,7 @@ if brotli is not None:
             return b""
 
 
-if zstd is not None:
+if HAS_ZSTD:
 
     class ZstdDecoder(ContentDecoder):
         def __init__(self) -> None:
@@ -183,7 +182,7 @@ if zstd is not None:
             ret = self._obj.flush()  # note: this is a no-op
             if not self._obj.eof:
                 raise DecodeError("Zstandard data is incomplete")
-            return ret  # type: ignore[no-any-return]
+            return ret
 
 
 class MultiDecoder(ContentDecoder):
@@ -219,7 +218,7 @@ def _get_decoder(mode: str) -> ContentDecoder:
     if brotli is not None and mode == "br":
         return BrotliDecoder()
 
-    if zstd is not None and mode == "zstd":
+    if HAS_ZSTD and mode == "zstd":
         return ZstdDecoder()
 
     return DeflateDecoder()
@@ -302,7 +301,7 @@ class BaseHTTPResponse(io.IOBase):
     CONTENT_DECODERS = ["gzip", "x-gzip", "deflate"]
     if brotli is not None:
         CONTENT_DECODERS += ["br"]
-    if zstd is not None:
+    if HAS_ZSTD:
         CONTENT_DECODERS += ["zstd"]
     REDIRECT_STATUSES = [301, 302, 303, 307, 308]
 
@@ -310,7 +309,7 @@ class BaseHTTPResponse(io.IOBase):
     if brotli is not None:
         DECODER_ERROR_CLASSES += (brotli.error,)
 
-    if zstd is not None:
+    if HAS_ZSTD:
         DECODER_ERROR_CLASSES += (zstd.ZstdError,)
 
     def __init__(
@@ -319,6 +318,7 @@ class BaseHTTPResponse(io.IOBase):
         headers: typing.Mapping[str, str] | typing.Mapping[bytes, bytes] | None = None,
         status: int,
         version: int,
+        version_string: str,
         reason: str | None,
         decode_content: bool,
         request_url: str | None,
@@ -330,6 +330,7 @@ class BaseHTTPResponse(io.IOBase):
             self.headers = HTTPHeaderDict(headers)  # type: ignore[arg-type]
         self.status = status
         self.version = version
+        self.version_string = version_string
         self.reason = reason
         self.decode_content = decode_content
         self._has_decoded_content = False
@@ -346,7 +347,7 @@ class BaseHTTPResponse(io.IOBase):
         self._decoder: ContentDecoder | None = None
         self.length_remaining: int | None
 
-    def get_redirect_location(self) -> str | None | Literal[False]:
+    def get_redirect_location(self) -> str | None | typing.Literal[False]:
         """
         Should we redirect and where to?
 
@@ -364,13 +365,21 @@ class BaseHTTPResponse(io.IOBase):
 
     def json(self) -> typing.Any:
         """
-        Parses the body of the HTTP response as JSON.
+        Deserializes the body of the HTTP response as a Python object.
 
-        To use a custom JSON decoder pass the result of :attr:`HTTPResponse.data` to the decoder.
+        The body of the HTTP response must be encoded using UTF-8, as per
+        `RFC 8529 Section 8.1 <https://www.rfc-editor.org/rfc/rfc8259#section-8.1>`_.
 
-        This method can raise either `UnicodeDecodeError` or `json.JSONDecodeError`.
+        To use a custom JSON decoder pass the result of :attr:`HTTPResponse.data` to
+        your custom decoder instead.
 
-        Read more :ref:`here <json>`.
+        If the body of the HTTP response is not decodable to UTF-8, a
+        `UnicodeDecodeError` will be raised. If the body of the HTTP response is not a
+        valid JSON document, a `json.JSONDecodeError` will be raised.
+
+        Read more :ref:`here <json_content>`.
+
+        :returns: The body of the HTTP response as a Python object.
         """
         data = self.data.decode("utf-8")
         return _json.loads(data)
@@ -567,6 +576,7 @@ class HTTPResponse(BaseHTTPResponse):
         headers: typing.Mapping[str, str] | typing.Mapping[bytes, bytes] | None = None,
         status: int = 0,
         version: int = 0,
+        version_string: str = "HTTP/?",
         reason: str | None = None,
         preload_content: bool = True,
         decode_content: bool = True,
@@ -584,6 +594,7 @@ class HTTPResponse(BaseHTTPResponse):
             headers=headers,
             status=status,
             version=version,
+            version_string=version_string,
             reason=reason,
             decode_content=decode_content,
             request_url=request_url,
@@ -926,7 +937,10 @@ class HTTPResponse(BaseHTTPResponse):
         if decode_content is None:
             decode_content = self.decode_content
 
-        if amt is not None:
+        if amt and amt < 0:
+            # Negative numbers and `None` should be treated the same.
+            amt = None
+        elif amt is not None:
             cache_content = False
 
             if len(self._decoded_buffer) >= amt:
@@ -986,6 +1000,9 @@ class HTTPResponse(BaseHTTPResponse):
         """
         if decode_content is None:
             decode_content = self.decode_content
+        if amt and amt < 0:
+            # Negative numbers and `None` should be treated the same.
+            amt = None
         # try and respond without going to the network
         if self._has_decoded_content:
             if not decode_content:
@@ -1180,6 +1197,11 @@ class HTTPResponse(BaseHTTPResponse):
             if self._fp.fp is None:  # type: ignore[union-attr]
                 return None
 
+            if amt and amt < 0:
+                # Negative numbers and `None` should be treated the same,
+                # but httplib handles only `None` correctly.
+                amt = None
+
             while True:
                 self._update_chunk_length()
                 if self.chunk_left == 0:
diff --git a/libs/urllib3/util/connection.py b/libs/urllib3/util/connection.py
index 5c7da73f4..89bd189fb 100644
--- a/libs/urllib3/util/connection.py
+++ b/libs/urllib3/util/connection.py
@@ -6,7 +6,7 @@ import typing
 from ..exceptions import LocationParseError
 from .timeout import _DEFAULT_TIMEOUT, _TYPE_TIMEOUT
 
-_TYPE_SOCKET_OPTIONS = typing.Sequence[typing.Tuple[int, int, typing.Union[int, bytes]]]
+_TYPE_SOCKET_OPTIONS = typing.List[typing.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 fe0e3485e..82454a099 100644
--- a/libs/urllib3/util/request.py
+++ b/libs/urllib3/util/request.py
@@ -29,7 +29,7 @@ except ImportError:
 else:
     ACCEPT_ENCODING += ",br"
 try:
-    import zstandard as _unused_module_zstd  # type: ignore[import-not-found] # noqa: F401
+    import zstandard as _unused_module_zstd  # noqa: F401
 except ImportError:
     pass
 else:
@@ -227,7 +227,7 @@ def body_to_chunks(
                 if not datablock:
                     break
                 if encode:
-                    datablock = datablock.encode("iso-8859-1")
+                    datablock = datablock.encode("utf-8")
                 yield datablock
 
         chunks = chunk_readable()
diff --git a/libs/urllib3/util/retry.py b/libs/urllib3/util/retry.py
index 7572bfd26..0456cceba 100644
--- a/libs/urllib3/util/retry.py
+++ b/libs/urllib3/util/retry.py
@@ -21,6 +21,8 @@ from ..exceptions import (
 from .util import reraise
 
 if typing.TYPE_CHECKING:
+    from typing_extensions import Self
+
     from ..connectionpool import ConnectionPool
     from ..response import BaseHTTPResponse
 
@@ -187,7 +189,9 @@ class Retry:
     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
 
     #: Default headers to be used for ``remove_headers_on_redirect``
-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
+    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
+        ["Cookie", "Authorization", "Proxy-Authorization"]
+    )
 
     #: Default maximum backoff time.
     DEFAULT_BACKOFF_MAX = 120
@@ -240,7 +244,7 @@ class Retry:
         )
         self.backoff_jitter = backoff_jitter
 
-    def new(self, **kw: typing.Any) -> Retry:
+    def new(self, **kw: typing.Any) -> Self:
         params = dict(
             total=self.total,
             connect=self.connect,
@@ -429,7 +433,7 @@ class Retry:
         error: Exception | None = None,
         _pool: ConnectionPool | None = None,
         _stacktrace: TracebackType | None = None,
-    ) -> Retry:
+    ) -> Self:
         """Return a new Retry object with incremented retry counters.
 
         :param response: A response object, or None, if the server did not
diff --git a/libs/urllib3/util/ssl_.py b/libs/urllib3/util/ssl_.py
index b14cf27b6..5e93be9ce 100644
--- a/libs/urllib3/util/ssl_.py
+++ b/libs/urllib3/util/ssl_.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import hashlib
 import hmac
 import os
 import socket
@@ -7,7 +8,6 @@ import sys
 import typing
 import warnings
 from binascii import unhexlify
-from hashlib import md5, sha1, sha256
 
 from ..exceptions import ProxySchemeUnsupported, SSLError
 from .url import _BRACELESS_IPV6_ADDRZ_RE, _IPV4_RE
@@ -21,7 +21,10 @@ ALPN_PROTOCOLS = ["http/1.1"]
 _TYPE_VERSION_INFO = typing.Tuple[int, int, int, str, int]
 
 # Maps the length of a digest to a possible hash function producing this digest
-HASHFUNC_MAP = {32: md5, 40: sha1, 64: sha256}
+HASHFUNC_MAP = {
+    length: getattr(hashlib, algorithm, None)
+    for length, algorithm in ((32, "md5"), (40, "sha1"), (64, "sha256"))
+}
 
 
 def _is_bpo_43522_fixed(
@@ -78,7 +81,7 @@ def _is_has_never_check_common_name_reliable(
 
 if typing.TYPE_CHECKING:
     from ssl import VerifyMode
-    from typing import Literal, TypedDict
+    from typing import TypedDict
 
     from .ssltransport import SSLTransport as SSLTransportType
 
@@ -159,9 +162,13 @@ def assert_fingerprint(cert: bytes | None, fingerprint: str) -> None:
 
     fingerprint = fingerprint.replace(":", "").lower()
     digest_length = len(fingerprint)
-    hashfunc = HASHFUNC_MAP.get(digest_length)
-    if not hashfunc:
+    if digest_length not in HASHFUNC_MAP:
         raise SSLError(f"Fingerprint of invalid length: {fingerprint}")
+    hashfunc = HASHFUNC_MAP.get(digest_length)
+    if hashfunc is None:
+        raise SSLError(
+            f"Hash function implementation unavailable for fingerprint length: {digest_length}"
+        )
 
     # We need encode() here for py32; works on py2 and p33.
     fingerprint_bytes = unhexlify(fingerprint.encode())
@@ -365,7 +372,7 @@ def ssl_wrap_socket(
     ca_cert_dir: str | None = ...,
     key_password: str | None = ...,
     ca_cert_data: None | str | bytes = ...,
-    tls_in_tls: Literal[False] = ...,
+    tls_in_tls: typing.Literal[False] = ...,
 ) -> ssl.SSLSocket:
     ...
 
@@ -457,10 +464,7 @@ def ssl_wrap_socket(
         else:
             context.load_cert_chain(certfile, keyfile, key_password)
 
-    try:
-        context.set_alpn_protocols(ALPN_PROTOCOLS)
-    except NotImplementedError:  # Defensive: in CI, we always have set_alpn_protocols
-        pass
+    context.set_alpn_protocols(ALPN_PROTOCOLS)
 
     ssl_sock = _ssl_wrap_socket_impl(sock, context, tls_in_tls, server_hostname)
     return ssl_sock
diff --git a/libs/urllib3/util/ssltransport.py b/libs/urllib3/util/ssltransport.py
index fa9f2b37c..d69ccb342 100644
--- a/libs/urllib3/util/ssltransport.py
+++ b/libs/urllib3/util/ssltransport.py
@@ -8,12 +8,11 @@ import typing
 from ..exceptions import ProxySchemeUnsupported
 
 if typing.TYPE_CHECKING:
-    from typing import Literal
+    from typing_extensions import Self
 
     from .ssl_ import _TYPE_PEER_CERT_RET, _TYPE_PEER_CERT_RET_DICT
 
 
-_SelfT = typing.TypeVar("_SelfT", bound="SSLTransport")
 _WriteBuffer = typing.Union[bytearray, memoryview]
 _ReturnValue = typing.TypeVar("_ReturnValue")
 
@@ -70,7 +69,7 @@ class SSLTransport:
         # Perform initial handshake.
         self._ssl_io_loop(self.sslobj.do_handshake)
 
-    def __enter__(self: _SelfT) -> _SelfT:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *_: typing.Any) -> None:
@@ -174,12 +173,12 @@ class SSLTransport:
 
     @typing.overload
     def getpeercert(
-        self, binary_form: Literal[False] = ...
+        self, binary_form: typing.Literal[False] = ...
     ) -> _TYPE_PEER_CERT_RET_DICT | None:
         ...
 
     @typing.overload
-    def getpeercert(self, binary_form: 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:
@@ -194,9 +193,6 @@ class SSLTransport:
     def selected_alpn_protocol(self) -> str | None:
         return self.sslobj.selected_alpn_protocol()
 
-    def selected_npn_protocol(self) -> str | None:
-        return self.sslobj.selected_npn_protocol()
-
     def shared_ciphers(self) -> list[tuple[str, str, int]] | None:
         return self.sslobj.shared_ciphers()
 
diff --git a/libs/version.txt b/libs/version.txt
index fd884e307..c09c8c8da 100644
--- a/libs/version.txt
+++ b/libs/version.txt
@@ -1,92 +1,96 @@
 # Bazarr dependencies
-alembic==1.13.1
-aniso8601==9.0.1
-apprise==1.7.6
+alembic==1.14.0
+aniso8601==10.0.0
+apprise==1.9.2
 apscheduler<=3.10.4
-attrs==23.2.0
-blinker==1.7.0
-charset-normalizer==3.3.2
+attrs==24.3.0
+blinker==1.9.0
+charset-normalizer==3.4.1
 deep-translator==1.11.4
-dogpile.cache==1.3.2
-dynaconf==3.2.4
+dogpile.cache==1.3.3
+dynaconf==3.2.6
 fese==0.3.0
-ffsubsync==0.4.25
-flask-cors==4.0.0
-flask-migrate==4.0.5
+ffsubsync==0.4.27
+flask-cors==5.0.0
+flask-migrate==4.1.0
 flask-restx==1.3.0
-Flask-SocketIO==5.3.6
+Flask-SocketIO==5.5.1
 flask_sqlalchemy==3.1.1
-Flask==3.0.2
+Flask==3.1.0
 ga4mp==2.0.4
 guess_language-spirit==0.5.3
 guessit==3.8.0
 h11==0.14.0
-inflect==7.0.0
+inflect==7.5.0
 jsonschema<=4.17.3  # newer version require other compiled dependency
-knowit==0.5.3
-Mako==1.3.2
-pycountry==23.12.11
+knowit<=0.5.3  # newer version doesn't support Python 3.8 anymore
+Mako==1.3.8
+plexapi>=4.16.1
+pycountry==24.6.1
 pyrsistent==0.20.0
-pysubs2==1.7.2
-python-engineio==4.9.0
-python-socketio==5.11.1
-pytz==2024.1
+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
-rarfile==4.1
+rarfile==4.2
 referencing<=0.23.0  # newer version require other compiled dependency
-requests==2.31.0
-semver==3.0.2
+requests==2.32.3
+semver==3.0.3
 signalrcore==0.9.5
-simple-websocket==1.0.0
-sqlalchemy==2.0.27
-textdistance==4.6.2
+simple-websocket==1.1.0
+sqlalchemy==2.0.37
+textdistance==4.6.3
 unidecode==1.3.8
-waitress==3.0.0
+waitress==3.0.2
 whichcraft==0.6.1
 wsproto==1.2.0
 
 ## indirect dependencies
 
 # Required-by: apprise
-importlib_metadata==7.0.1
-markdown==3.5.2
-requests_oauthlib==1.3.1
+importlib_metadata<=7.2.1  # Newer version raise a KeyError with knowit
+markdown==3.7
+requests_oauthlib==2.0.0
 
 # Required-by: apscheduler
-tzdata==2024.1
+tzdata==2024.2
 tzlocal==5.2
 
 # Required-by: beautifulsoup4
 soupsieve==2.3.2.post1
 
+# Required-by: deathbycaptcha
+filetype==1.2.0
+
 # Required-by: ffsubsync
 auditok<=0.1.5  # do not upgrade unless ffsubsync requirements.txt change
 ffmpeg-python==0.2.0
 future==1.0.0
-rich==13.7.0
+rich==13.9.4
 srt==3.5.3
-tqdm==4.66.2
-typing_extensions==4.10.0
+tqdm==4.67.1
+typing_extensions==4.12.2
 
 # Required-by: flask
-click==8.1.7
-itsdangerous==2.1.2
-jinja2==3.1.3
-werkzeug==3.0.1
+click==8.1.8
+itsdangerous==2.2.0
+jinja2==3.1.5
+werkzeug==3.1.3
 
 # Required-by: guessit
-python-dateutil==2.8.2
-importlib_resources==6.1.2
+python-dateutil==2.9.0
+importlib_resources==6.5.2
 rebulk==3.2.0
-zipp==3.17.0
+zipp==3.21.0
 
 # Required-by: jinja2
-markupsafe==2.1.5
+markupsafe<=2.1.5  # newer version doesn't support Python 3.8 anymore
 
 # Required-by: knowit
 pymediainfo==6.1.0
-pyyaml==6.0.1
-trakit==0.2.1
+pyyaml==6.0.2
+trakit==0.2.2
 
 # Required-by: python-socketio
 bidict==0.23.1
@@ -95,54 +99,54 @@ bidict==0.23.1
 backports.zoneinfo==0.2.1
 
 # Required-by: signalr-client-threads
-websocket-client==1.7.0
+websocket-client==1.8.0
 
 # Required-by: signalrcore
-msgpack==1.0.7
+msgpack==1.1.0
 
 # Required-by: subliminal
 appdirs==1.4.4
-babelfish==0.6.0
+babelfish==0.6.1
 beautifulsoup4==4.12.3
 chardet==5.2.0
 pysrt==1.1.2
-stevedore==5.2.0
+stevedore==5.4.0
 
 # Required-by: subliminal_patch
-cloudscraper==1.2.58  # newer version dropped captcha v1 support
+cloudscraper<=1.2.58  # newer version dropped captcha v1 support
 decorator==5.1.1
-dnspython==2.6.1
-enzyme==0.4.1
-ftfy==6.1.3
+dnspython<=2.6.1  # newer version doesn't support Python 3.8 anymore
+enzyme==0.5.2
+ftfy<=6.2.3  # newer version doesn't support Python 3.8 anymore
 html5lib==1.1
 Js2Py==0.74
 pydantic<=1.10.14  # newer version require other compiled dependency
 pyjsparser==2.7.1
-pyparsing==3.1.1
+pyparsing<=3.1.4  # newer version doesn't support Python 3.8 anymore
 python-anticaptcha==1.0.0
 retry==0.9.2
-six==1.16.0
+six==1.17.0
 wcwidth==0.2.13
 webencodings==0.5.1
 
 # Required-by: subzero
 backports.functools-lru-cache==2.0.0
-fcache==0.5.2
+fcache==0.6.0
 json_tricks==3.17.3
 tld==0.13
-platformdirs==4.2.0
+platformdirs==4.3.6
 
 # Required-by: requests
-certifi==2024.2.2
-idna==3.6
+certifi==2024.12.14
+idna==3.10
 oauthlib==3.2.2
 requests_toolbelt==1.0.0
-urllib3==2.2.1
+urllib3==2.3.0
 
 # Required-by: rich
 colorama==0.4.6
 commonmark==0.9.1
-Pygments==2.17.2
+Pygments==2.19.1
 
 # Required-by: websocket
 pysocks==1.7.1
diff --git a/libs/waitress-3.0.0.dist-info/RECORD b/libs/waitress-3.0.0.dist-info/RECORD
index c21885637..e3399e0ca 100644
--- a/libs/waitress-3.0.0.dist-info/RECORD
+++ b/libs/waitress-3.0.0.dist-info/RECORD
@@ -4,7 +4,7 @@ waitress-3.0.0.dist-info/LICENSE.txt,sha256=PmcdsR32h1FswdtbPWXkqjg-rKPCDOo_r1Og
 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=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+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
diff --git a/libs/waitress-3.0.0.dist-info/WHEEL b/libs/waitress-3.0.0.dist-info/WHEEL
index 98c0d20b7..9b78c4451 100644
--- a/libs/waitress-3.0.0.dist-info/WHEEL
+++ b/libs/waitress-3.0.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/websocket/__init__.py b/libs/websocket/__init__.py
index 2ff758799..559b38a6b 100644
--- a/libs/websocket/__init__.py
+++ b/libs/websocket/__init__.py
@@ -2,7 +2,7 @@
 __init__.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -17,10 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from ._abnf import *
-from ._app import WebSocketApp, setReconnect
+from ._app import WebSocketApp as WebSocketApp, setReconnect as setReconnect
 from ._core import *
 from ._exceptions import *
 from ._logging import *
 from ._socket import *
 
-__version__ = "1.7.0"
+__version__ = "1.8.0"
diff --git a/libs/websocket/_abnf.py b/libs/websocket/_abnf.py
index 416ebc8ff..d7754e0de 100644
--- a/libs/websocket/_abnf.py
+++ b/libs/websocket/_abnf.py
@@ -5,14 +5,14 @@ import sys
 from threading import Lock
 from typing import Callable, Optional, Union
 
-from ._exceptions import *
+from ._exceptions import WebSocketPayloadException, WebSocketProtocolException
 from ._utils import validate_utf8
 
 """
 _abnf.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/_app.py b/libs/websocket/_app.py
index 4d8af3b5b..9fee76546 100644
--- a/libs/websocket/_app.py
+++ b/libs/websocket/_app.py
@@ -13,13 +13,14 @@ from ._exceptions import (
     WebSocketException,
     WebSocketTimeoutException,
 )
+from ._ssl_compat import SSLEOFError
 from ._url import parse_url
 
 """
 _app.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -165,6 +166,7 @@ class WebSocketApp:
         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,
@@ -194,6 +196,10 @@ class WebSocketApp:
             Callback object which is called at opening websocket.
             on_open has one argument.
             The 1st argument is this class object.
+        on_reconnect: function
+            Callback object which is called at reconnecting websocket.
+            on_reconnect has one argument.
+            The 1st argument is this class object.
         on_message: function
             Callback object which is called when received data.
             on_message has 2 arguments.
@@ -244,6 +250,7 @@ class WebSocketApp:
         self.cookie = cookie
 
         self.on_open = on_open
+        self.on_reconnect = on_reconnect
         self.on_message = on_message
         self.on_data = on_data
         self.on_error = on_error
@@ -424,6 +431,7 @@ class WebSocketApp:
         self.ping_interval = ping_interval
         self.ping_timeout = ping_timeout
         self.ping_payload = ping_payload
+        self.has_done_teardown = False
         self.keep_running = True
 
         def teardown(close_frame: ABNF = None):
@@ -495,7 +503,10 @@ class WebSocketApp:
                 if self.ping_interval:
                     self._start_ping_thread()
 
-                self._callback(self.on_open)
+                if reconnecting and self.on_reconnect:
+                    self._callback(self.on_reconnect)
+                else:
+                    self._callback(self.on_open)
 
                 dispatcher.read(self.sock.sock, read, check)
             except (
@@ -516,9 +527,10 @@ class WebSocketApp:
             except (
                 WebSocketConnectionClosedException,
                 KeyboardInterrupt,
+                SSLEOFError,
             ) as e:
                 if custom_dispatcher:
-                    return handleDisconnect(e)
+                    return handleDisconnect(e, bool(reconnect))
                 else:
                     raise e
 
diff --git a/libs/websocket/_cookiejar.py b/libs/websocket/_cookiejar.py
index 61079402b..7480e5fc2 100644
--- a/libs/websocket/_cookiejar.py
+++ b/libs/websocket/_cookiejar.py
@@ -5,7 +5,7 @@ from typing import Optional
 _cookiejar.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -23,13 +23,13 @@ limitations under the License.
 
 class SimpleCookieJar:
     def __init__(self) -> None:
-        self.jar: dict = dict()
+        self.jar: dict = {}
 
     def add(self, set_cookie: Optional[str]) -> None:
         if set_cookie:
-            simpleCookie = http.cookies.SimpleCookie(set_cookie)
+            simple_cookie = http.cookies.SimpleCookie(set_cookie)
 
-            for k, v in simpleCookie.items():
+            for v in simple_cookie.values():
                 if domain := v.get("domain"):
                     if not domain.startswith("."):
                         domain = f".{domain}"
@@ -38,25 +38,25 @@ class SimpleCookieJar:
                         if self.jar.get(domain)
                         else http.cookies.SimpleCookie()
                     )
-                    cookie.update(simpleCookie)
+                    cookie.update(simple_cookie)
                     self.jar[domain.lower()] = cookie
 
     def set(self, set_cookie: str) -> None:
         if set_cookie:
-            simpleCookie = http.cookies.SimpleCookie(set_cookie)
+            simple_cookie = http.cookies.SimpleCookie(set_cookie)
 
-            for k, v in simpleCookie.items():
+            for v in simple_cookie.values():
                 if domain := v.get("domain"):
                     if not domain.startswith("."):
                         domain = f".{domain}"
-                    self.jar[domain.lower()] = simpleCookie
+                    self.jar[domain.lower()] = simple_cookie
 
     def get(self, host: str) -> str:
         if not host:
             return ""
 
         cookies = []
-        for domain, simpleCookie in self.jar.items():
+        for domain, _ in self.jar.items():
             host = host.lower()
             if host.endswith(domain) or host == domain[1:]:
                 cookies.append(self.jar.get(domain))
@@ -66,7 +66,7 @@ class SimpleCookieJar:
                 None,
                 sorted(
                     [
-                        "%s=%s" % (k, v.value)
+                        f"{k}={v.value}"
                         for cookie in filter(None, cookies)
                         for k, v in cookie.items()
                     ]
diff --git a/libs/websocket/_core.py b/libs/websocket/_core.py
index f28ca4b91..f940ed057 100644
--- a/libs/websocket/_core.py
+++ b/libs/websocket/_core.py
@@ -5,20 +5,20 @@ import time
 from typing import Optional, Union
 
 # websocket modules
-from ._abnf import *
-from ._exceptions import *
-from ._handshake import *
-from ._http import *
-from ._logging import *
-from ._socket import *
-from ._ssl_compat import *
-from ._utils import *
+from ._abnf import ABNF, STATUS_NORMAL, continuous_frame, frame_buffer
+from ._exceptions import WebSocketProtocolException, WebSocketConnectionClosedException
+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
 
 """
 _core.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -259,7 +259,7 @@ class WebSocket:
 
         try:
             self.handshake_response = handshake(self.sock, url, *addrs, **options)
-            for attempt in range(options.pop("redirect_limit", 3)):
+            for _ in range(options.pop("redirect_limit", 3)):
                 if self.handshake_response.status in SUPPORTED_REDIRECT_STATUSES:
                     url = self.handshake_response.headers["location"]
                     self.sock.close()
diff --git a/libs/websocket/_exceptions.py b/libs/websocket/_exceptions.py
index c146fa5d1..cd196e44a 100644
--- a/libs/websocket/_exceptions.py
+++ b/libs/websocket/_exceptions.py
@@ -2,7 +2,7 @@
 _exceptions.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/_handshake.py b/libs/websocket/_handshake.py
index e63dc9793..7bd61b82f 100644
--- a/libs/websocket/_handshake.py
+++ b/libs/websocket/_handshake.py
@@ -2,7 +2,7 @@
 _handshake.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -23,10 +23,10 @@ from base64 import encodebytes as base64encode
 from http import HTTPStatus
 
 from ._cookiejar import SimpleCookieJar
-from ._exceptions import *
-from ._http import *
-from ._logging import *
-from ._socket import *
+from ._exceptions import WebSocketException, WebSocketBadStatusException
+from ._http import read_headers
+from ._logging import dump, error
+from ._socket import send
 
 __all__ = ["handshake_response", "handshake", "SUPPORTED_REDIRECT_STATUSES"]
 
diff --git a/libs/websocket/_http.py b/libs/websocket/_http.py
index 977a30f19..9b1bf859d 100644
--- a/libs/websocket/_http.py
+++ b/libs/websocket/_http.py
@@ -2,7 +2,7 @@
 _http.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -21,11 +21,15 @@ import os
 import socket
 from base64 import encodebytes as base64encode
 
-from ._exceptions import *
-from ._logging import *
-from ._socket import *
-from ._ssl_compat import *
-from ._url import *
+from ._exceptions import (
+    WebSocketAddressException,
+    WebSocketException,
+    WebSocketProxyException,
+)
+from ._logging import debug, dump, trace
+from ._socket import DEFAULT_SOCKET_OPTION, recv_line, send
+from ._ssl_compat import HAVE_SSL, ssl
+from ._url import get_proxy_info, parse_url
 
 __all__ = ["proxy_info", "connect", "read_headers"]
 
@@ -283,22 +287,22 @@ def _wrap_sni_socket(sock: socket.socket, sslopt: dict, hostname, check_hostname
 
 
 def _ssl_socket(sock: socket.socket, user_sslopt: dict, hostname):
-    sslopt: dict = dict(cert_reqs=ssl.CERT_REQUIRED)
+    sslopt: dict = {"cert_reqs": ssl.CERT_REQUIRED}
     sslopt.update(user_sslopt)
 
-    certPath = os.environ.get("WEBSOCKET_CLIENT_CA_BUNDLE")
+    cert_path = os.environ.get("WEBSOCKET_CLIENT_CA_BUNDLE")
     if (
-        certPath
-        and os.path.isfile(certPath)
+        cert_path
+        and os.path.isfile(cert_path)
         and user_sslopt.get("ca_certs", None) is None
     ):
-        sslopt["ca_certs"] = certPath
+        sslopt["ca_certs"] = cert_path
     elif (
-        certPath
-        and os.path.isdir(certPath)
+        cert_path
+        and os.path.isdir(cert_path)
         and user_sslopt.get("ca_cert_path", None) is None
     ):
-        sslopt["ca_cert_path"] = certPath
+        sslopt["ca_cert_path"] = cert_path
 
     if sslopt.get("server_hostname", None):
         hostname = sslopt["server_hostname"]
@@ -327,7 +331,7 @@ def _tunnel(sock: socket.socket, host, port: int, auth) -> socket.socket:
     send(sock, connect_header)
 
     try:
-        status, resp_headers, status_message = read_headers(sock)
+        status, _, _ = read_headers(sock)
     except Exception as e:
         raise WebSocketProxyException(str(e))
 
diff --git a/libs/websocket/_logging.py b/libs/websocket/_logging.py
index b88cda374..0f673d3af 100644
--- a/libs/websocket/_logging.py
+++ b/libs/websocket/_logging.py
@@ -4,7 +4,7 @@ import logging
 _logging.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/_socket.py b/libs/websocket/_socket.py
index f0ad27a5d..81094ffc8 100644
--- a/libs/websocket/_socket.py
+++ b/libs/websocket/_socket.py
@@ -3,15 +3,18 @@ import selectors
 import socket
 from typing import Union
 
-from ._exceptions import *
-from ._ssl_compat import *
-from ._utils import *
+from ._exceptions import (
+    WebSocketConnectionClosedException,
+    WebSocketTimeoutException,
+)
+from ._ssl_compat import SSLError, SSLWantReadError, SSLWantWriteError
+from ._utils import extract_error_code, extract_err_message
 
 """
 _socket.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/_ssl_compat.py b/libs/websocket/_ssl_compat.py
index 029a5c6e8..0a8a32b59 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 2023 engn33r
+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.
@@ -16,11 +16,18 @@ 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.
 """
-__all__ = ["HAVE_SSL", "ssl", "SSLError", "SSLWantReadError", "SSLWantWriteError"]
+__all__ = [
+    "HAVE_SSL",
+    "ssl",
+    "SSLError",
+    "SSLEOFError",
+    "SSLWantReadError",
+    "SSLWantWriteError",
+]
 
 try:
     import ssl
-    from ssl import SSLError, SSLWantReadError, SSLWantWriteError
+    from ssl import SSLError, SSLEOFError, SSLWantReadError, SSLWantWriteError
 
     HAVE_SSL = True
 except ImportError:
@@ -28,6 +35,9 @@ except ImportError:
     class SSLError(Exception):
         pass
 
+    class SSLEOFError(Exception):
+        pass
+
     class SSLWantReadError(Exception):
         pass
 
diff --git a/libs/websocket/_url.py b/libs/websocket/_url.py
index 7d53830e1..902131710 100644
--- a/libs/websocket/_url.py
+++ b/libs/websocket/_url.py
@@ -3,12 +3,13 @@ import socket
 import struct
 from typing import Optional
 from urllib.parse import unquote, urlparse
+from ._exceptions import WebSocketProxyException
 
 """
 _url.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -167,6 +168,8 @@ def get_proxy_info(
         return None, 0, None
 
     if proxy_host:
+        if not proxy_port:
+            raise WebSocketProxyException("Cannot use port 0 when proxy_host specified")
         port = proxy_port
         auth = proxy_auth
         return proxy_host, port, auth
diff --git a/libs/websocket/_utils.py b/libs/websocket/_utils.py
index c63adfa59..65f3c0daf 100644
--- a/libs/websocket/_utils.py
+++ b/libs/websocket/_utils.py
@@ -4,7 +4,7 @@ from typing import Union
 _url.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/_wsdump.py b/libs/websocket/_wsdump.py
index 34c3d127e..d4d76dc50 100644
--- a/libs/websocket/_wsdump.py
+++ b/libs/websocket/_wsdump.py
@@ -4,7 +4,7 @@
 wsdump.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
diff --git a/libs/websocket/tests/echo-server.py b/libs/websocket/tests/echo-server.py
index a32c65034..5d1e87087 100644
--- a/libs/websocket/tests/echo-server.py
+++ b/libs/websocket/tests/echo-server.py
@@ -10,7 +10,7 @@ import websockets
 LOCAL_WS_SERVER_PORT = int(os.environ.get("LOCAL_WS_SERVER_PORT", "8765"))
 
 
-async def echo(websocket, path):
+async def echo(websocket):
     async for message in websocket:
         await websocket.send(message)
 
diff --git a/libs/websocket/tests/test_abnf.py b/libs/websocket/tests/test_abnf.py
index df5bc6bd7..a749f13bd 100644
--- a/libs/websocket/tests/test_abnf.py
+++ b/libs/websocket/tests/test_abnf.py
@@ -2,14 +2,14 @@
 #
 import unittest
 
-import websocket as ws
-from websocket._abnf import *
+from websocket._abnf import ABNF, frame_buffer
+from websocket._exceptions import WebSocketProtocolException
 
 """
 test_abnf.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -26,7 +26,7 @@ limitations under the License.
 
 
 class ABNFTest(unittest.TestCase):
-    def testInit(self):
+    def test_init(self):
         a = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_PING)
         self.assertEqual(a.fin, 0)
         self.assertEqual(a.rsv1, 0)
@@ -38,28 +38,28 @@ class ABNFTest(unittest.TestCase):
         self.assertEqual(a_bad.rsv1, 1)
         self.assertEqual(a_bad.opcode, 77)
 
-    def testValidate(self):
+    def test_validate(self):
         a_invalid_ping = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_PING)
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_invalid_ping.validate,
             skip_utf8_validation=False,
         )
         a_bad_rsv_value = ABNF(0, 1, 0, 0, opcode=ABNF.OPCODE_TEXT)
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_bad_rsv_value.validate,
             skip_utf8_validation=False,
         )
         a_bad_opcode = ABNF(0, 0, 0, 0, opcode=77)
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_bad_opcode.validate,
             skip_utf8_validation=False,
         )
         a_bad_close_frame = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x01")
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_bad_close_frame.validate,
             skip_utf8_validation=False,
         )
@@ -67,7 +67,7 @@ class ABNFTest(unittest.TestCase):
             0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x01\x8a\xaa\xff\xdd"
         )
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_bad_close_frame_2.validate,
             skip_utf8_validation=False,
         )
@@ -75,12 +75,12 @@ class ABNFTest(unittest.TestCase):
             0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x03\xe7"
         )
         self.assertRaises(
-            ws._exceptions.WebSocketProtocolException,
+            WebSocketProtocolException,
             a_bad_close_frame_3.validate,
             skip_utf8_validation=True,
         )
 
-    def testMask(self):
+    def test_mask(self):
         abnf_none_data = ABNF(
             0, 0, 0, 0, opcode=ABNF.OPCODE_PING, mask_value=1, data=None
         )
@@ -91,7 +91,7 @@ class ABNFTest(unittest.TestCase):
         )
         self.assertEqual(abnf_str_data._get_masked(bytes_val), b"aaaa\x00")
 
-    def testFormat(self):
+    def test_format(self):
         abnf_bad_rsv_bits = ABNF(2, 0, 0, 0, opcode=ABNF.OPCODE_TEXT)
         self.assertRaises(ValueError, abnf_bad_rsv_bits.format)
         abnf_bad_opcode = ABNF(0, 0, 0, 0, opcode=5)
@@ -110,7 +110,7 @@ class ABNFTest(unittest.TestCase):
         )
         self.assertEqual(b"\x01\x03\x01\x8a\xcc", abnf_no_mask.format())
 
-    def testFrameBuffer(self):
+    def test_frame_buffer(self):
         fb = frame_buffer(0, True)
         self.assertEqual(fb.recv, 0)
         self.assertEqual(fb.skip_utf8_validation, True)
diff --git a/libs/websocket/tests/test_app.py b/libs/websocket/tests/test_app.py
index 5ed9a22ed..18eace544 100644
--- a/libs/websocket/tests/test_app.py
+++ b/libs/websocket/tests/test_app.py
@@ -12,7 +12,7 @@ import websocket as ws
 test_app.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -53,10 +53,13 @@ class WebSocketAppTest(unittest.TestCase):
         WebSocketAppTest.get_mask_key_id = WebSocketAppTest.NotSetYet()
         WebSocketAppTest.on_error_data = WebSocketAppTest.NotSetYet()
 
+    def close(self):
+        pass
+
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testKeepRunning(self):
+    def test_keep_running(self):
         """A WebSocketApp should keep running as long as its self.keep_running
         is not False (in the boolean context).
         """
@@ -69,7 +72,7 @@ class WebSocketAppTest(unittest.TestCase):
             WebSocketAppTest.keep_running_open = self.keep_running
             self.keep_running = False
 
-        def on_message(wsapp, message):
+        def on_message(_, message):
             print(message)
             self.close()
 
@@ -87,7 +90,7 @@ class WebSocketAppTest(unittest.TestCase):
 
     #    @unittest.skipUnless(TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled")
     @unittest.skipUnless(False, "Test disabled for now (requires rel)")
-    def testRunForeverDispatcher(self):
+    def test_run_forever_dispatcher(self):
         """A WebSocketApp should keep running as long as its self.keep_running
         is not False (in the boolean context).
         """
@@ -98,7 +101,7 @@ class WebSocketAppTest(unittest.TestCase):
             self.recv()
             self.send("goodbye!")
 
-        def on_message(wsapp, message):
+        def on_message(_, message):
             print(message)
             self.close()
 
@@ -115,7 +118,7 @@ class WebSocketAppTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testRunForeverTeardownCleanExit(self):
+    def test_run_forever_teardown_clean_exit(self):
         """The WebSocketApp.run_forever() method should return `False` when the application ends gracefully."""
         app = ws.WebSocketApp(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
         threading.Timer(interval=0.2, function=app.close).start()
@@ -123,7 +126,7 @@ class WebSocketAppTest(unittest.TestCase):
         self.assertEqual(teardown, False)
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testSockMaskKey(self):
+    def test_sock_mask_key(self):
         """A WebSocketApp should forward the received mask_key function down
         to the actual socket.
         """
@@ -140,14 +143,14 @@ class WebSocketAppTest(unittest.TestCase):
         self.assertEqual(id(app.get_mask_key), id(my_mask_key_func))
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testInvalidPingIntervalPingTimeout(self):
+    def test_invalid_ping_interval_ping_timeout(self):
         """Test exception handling if ping_interval < ping_timeout"""
 
-        def on_ping(app, msg):
+        def on_ping(app, _):
             print("Got a ping!")
             app.close()
 
-        def on_pong(app, msg):
+        def on_pong(app, _):
             print("Got a pong! No need to respond")
             app.close()
 
@@ -163,14 +166,14 @@ class WebSocketAppTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testPingInterval(self):
+    def test_ping_interval(self):
         """Test WebSocketApp proper ping functionality"""
 
-        def on_ping(app, msg):
+        def on_ping(app, _):
             print("Got a ping!")
             app.close()
 
-        def on_pong(app, msg):
+        def on_pong(app, _):
             print("Got a pong! No need to respond")
             app.close()
 
@@ -182,7 +185,7 @@ class WebSocketAppTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testOpcodeClose(self):
+    def test_opcode_close(self):
         """Test WebSocketApp close opcode"""
 
         app = ws.WebSocketApp("wss://tsock.us1.twilio.com/v3/wsconnect")
@@ -197,7 +200,7 @@ class WebSocketAppTest(unittest.TestCase):
     #     app.run_forever(ping_interval=2, ping_timeout=1, ping_payload="Ping payload")
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testBadPingInterval(self):
+    def test_bad_ping_interval(self):
         """A WebSocketApp handling of negative ping_interval"""
         app = ws.WebSocketApp("wss://api-pub.bitfinex.com/ws/1")
         self.assertRaises(
@@ -208,7 +211,7 @@ class WebSocketAppTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testBadPingTimeout(self):
+    def test_bad_ping_timeout(self):
         """A WebSocketApp handling of negative ping_timeout"""
         app = ws.WebSocketApp("wss://api-pub.bitfinex.com/ws/1")
         self.assertRaises(
@@ -219,7 +222,7 @@ class WebSocketAppTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testCloseStatusCode(self):
+    def test_close_status_code(self):
         """Test extraction of close frame status code and close reason in WebSocketApp"""
 
         def on_close(wsapp, close_status_code, close_msg):
@@ -249,7 +252,7 @@ class WebSocketAppTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testCallbackFunctionException(self):
+    def test_callback_function_exception(self):
         """Test callback function exception handling"""
 
         exc = None
@@ -264,7 +267,7 @@ class WebSocketAppTest(unittest.TestCase):
             nonlocal exc
             exc = err
 
-        def on_pong(app, msg):
+        def on_pong(app, _):
             app.close()
 
         app = ws.WebSocketApp(
@@ -282,7 +285,7 @@ class WebSocketAppTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testCallbackMethodException(self):
+    def test_callback_method_exception(self):
         """Test callback method exception handling"""
 
         class Callbacks:
@@ -297,14 +300,14 @@ class WebSocketAppTest(unittest.TestCase):
                 )
                 self.app.run_forever(ping_interval=2, ping_timeout=1)
 
-            def on_open(self, app):
+            def on_open(self, _):
                 raise RuntimeError("Callback failed")
 
             def on_error(self, app, err):
                 self.passed_app = app
                 self.exc = err
 
-            def on_pong(self, app, msg):
+            def on_pong(self, app, _):
                 app.close()
 
         callbacks = Callbacks()
@@ -316,16 +319,16 @@ class WebSocketAppTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testReconnect(self):
+    def test_reconnect(self):
         """Test reconnect"""
         pong_count = 0
         exc = None
 
-        def on_error(app, err):
+        def on_error(_, err):
             nonlocal exc
             exc = err
 
-        def on_pong(app, msg):
+        def on_pong(app, _):
             nonlocal pong_count
             pong_count += 1
             if pong_count == 1:
diff --git a/libs/websocket/tests/test_cookiejar.py b/libs/websocket/tests/test_cookiejar.py
index 0de87517d..67eddb627 100644
--- a/libs/websocket/tests/test_cookiejar.py
+++ b/libs/websocket/tests/test_cookiejar.py
@@ -6,7 +6,7 @@ from websocket._cookiejar import SimpleCookieJar
 test_cookiejar.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -23,7 +23,7 @@ limitations under the License.
 
 
 class CookieJarTest(unittest.TestCase):
-    def testAdd(self):
+    def test_add(self):
         cookie_jar = SimpleCookieJar()
         cookie_jar.add("")
         self.assertFalse(
@@ -67,7 +67,7 @@ class CookieJarTest(unittest.TestCase):
         self.assertEqual(cookie_jar.get("xyz"), "e=f")
         self.assertEqual(cookie_jar.get("something"), "")
 
-    def testSet(self):
+    def test_set(self):
         cookie_jar = SimpleCookieJar()
         cookie_jar.set("a=b")
         self.assertFalse(
@@ -104,7 +104,7 @@ class CookieJarTest(unittest.TestCase):
         self.assertEqual(cookie_jar.get("xyz"), "e=f")
         self.assertEqual(cookie_jar.get("something"), "")
 
-    def testGet(self):
+    def test_get(self):
         cookie_jar = SimpleCookieJar()
         cookie_jar.set("a=b; c=d; domain=abc.com")
         self.assertEqual(cookie_jar.get("abc.com"), "a=b; c=d")
diff --git a/libs/websocket/tests/test_http.py b/libs/websocket/tests/test_http.py
index 0d6031a3d..f495e6355 100644
--- a/libs/websocket/tests/test_http.py
+++ b/libs/websocket/tests/test_http.py
@@ -7,7 +7,7 @@ import ssl
 import unittest
 
 import websocket
-import websocket as ws
+from websocket._exceptions import WebSocketProxyException, WebSocketException
 from websocket._http import (
     _get_addrinfo_list,
     _start_proxied_socket,
@@ -15,13 +15,14 @@ from websocket._http import (
     connect,
     proxy_info,
     read_headers,
+    HAVE_PYTHON_SOCKS,
 )
 
 """
 test_http.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -93,20 +94,18 @@ class OptsList:
 
 
 class HttpTest(unittest.TestCase):
-    def testReadHeader(self):
-        status, header, status_message = read_headers(
-            HeaderSockMock("data/header01.txt")
-        )
+    def test_read_header(self):
+        status, header, _ = read_headers(HeaderSockMock("data/header01.txt"))
         self.assertEqual(status, 101)
         self.assertEqual(header["connection"], "Upgrade")
         # header02.txt is intentionally malformed
         self.assertRaises(
-            ws.WebSocketException, read_headers, HeaderSockMock("data/header02.txt")
+            WebSocketException, read_headers, HeaderSockMock("data/header02.txt")
         )
 
-    def testTunnel(self):
+    def test_tunnel(self):
         self.assertRaises(
-            ws.WebSocketProxyException,
+            WebSocketProxyException,
             _tunnel,
             HeaderSockMock("data/header01.txt"),
             "example.com",
@@ -114,7 +113,7 @@ class HttpTest(unittest.TestCase):
             ("username", "password"),
         )
         self.assertRaises(
-            ws.WebSocketProxyException,
+            WebSocketProxyException,
             _tunnel,
             HeaderSockMock("data/header02.txt"),
             "example.com",
@@ -123,9 +122,9 @@ class HttpTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testConnect(self):
+    def test_connect(self):
         # Not currently testing an actual proxy connection, so just check whether proxy errors are raised. This requires internet for a DNS lookup
-        if ws._http.HAVE_PYTHON_SOCKS:
+        if HAVE_PYTHON_SOCKS:
             # Need this check, otherwise case where python_socks is not installed triggers
             # websocket._exceptions.WebSocketException: Python Socks is needed for SOCKS proxying but is not available
             self.assertRaises(
@@ -244,7 +243,7 @@ class HttpTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testProxyConnect(self):
+    def test_proxy_connect(self):
         ws = websocket.WebSocket()
         ws.connect(
             f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
@@ -289,7 +288,7 @@ class HttpTest(unittest.TestCase):
         # TODO: Test SOCKS4 and SOCK5 proxies with unit tests
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testSSLopt(self):
+    def test_sslopt(self):
         ssloptions = {
             "check_hostname": False,
             "server_hostname": "ServerName",
@@ -315,7 +314,7 @@ class HttpTest(unittest.TestCase):
         ws_ssl2.connect("wss://api.bitfinex.com/ws/2")
         ws_ssl2.close
 
-    def testProxyInfo(self):
+    def test_proxy_info(self):
         self.assertEqual(
             proxy_info(
                 http_proxy_host="127.0.0.1", http_proxy_port="8080", proxy_type="http"
diff --git a/libs/websocket/tests/test_url.py b/libs/websocket/tests/test_url.py
index 792399ebf..110fdfad7 100644
--- a/libs/websocket/tests/test_url.py
+++ b/libs/websocket/tests/test_url.py
@@ -9,12 +9,13 @@ from websocket._url import (
     get_proxy_info,
     parse_url,
 )
+from websocket._exceptions import WebSocketProxyException
 
 """
 test_url.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -36,7 +37,7 @@ class UrlTest(unittest.TestCase):
         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"))
 
-    def testParseUrl(self):
+    def test_parse_url(self):
         p = parse_url("ws://www.example.com/r")
         self.assertEqual(p[0], "www.example.com")
         self.assertEqual(p[1], 80)
@@ -130,9 +131,13 @@ class IsNoProxyHostTest(unittest.TestCase):
         elif "no_proxy" in os.environ:
             del os.environ["no_proxy"]
 
-    def testMatchAll(self):
+    def test_match_all(self):
         self.assertTrue(_is_no_proxy_host("any.websocket.org", ["*"]))
         self.assertTrue(_is_no_proxy_host("192.168.0.1", ["*"]))
+        self.assertFalse(_is_no_proxy_host("192.168.0.1", ["192.168.1.1"]))
+        self.assertFalse(
+            _is_no_proxy_host("any.websocket.org", ["other.websocket.org"])
+        )
         self.assertTrue(
             _is_no_proxy_host("any.websocket.org", ["other.websocket.org", "*"])
         )
@@ -142,7 +147,7 @@ class IsNoProxyHostTest(unittest.TestCase):
         os.environ["no_proxy"] = "other.websocket.org, *"
         self.assertTrue(_is_no_proxy_host("any.websocket.org", None))
 
-    def testIpAddress(self):
+    def test_ip_address(self):
         self.assertTrue(_is_no_proxy_host("127.0.0.1", ["127.0.0.1"]))
         self.assertFalse(_is_no_proxy_host("127.0.0.2", ["127.0.0.1"]))
         self.assertTrue(
@@ -158,7 +163,7 @@ class IsNoProxyHostTest(unittest.TestCase):
         self.assertTrue(_is_no_proxy_host("127.0.0.1", None))
         self.assertFalse(_is_no_proxy_host("127.0.0.2", None))
 
-    def testIpAddressInRange(self):
+    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"]))
@@ -168,7 +173,7 @@ class IsNoProxyHostTest(unittest.TestCase):
         os.environ["no_proxy"] = "127.0.0.0/24"
         self.assertFalse(_is_no_proxy_host("127.1.0.1", None))
 
-    def testHostnameMatch(self):
+    def test_hostname_match(self):
         self.assertTrue(_is_no_proxy_host("my.websocket.org", ["my.websocket.org"]))
         self.assertTrue(
             _is_no_proxy_host(
@@ -182,7 +187,7 @@ class IsNoProxyHostTest(unittest.TestCase):
         os.environ["no_proxy"] = "other.websocket.org, my.websocket.org"
         self.assertTrue(_is_no_proxy_host("my.websocket.org", None))
 
-    def testHostnameMatchDomain(self):
+    def test_hostname_match_domain(self):
         self.assertTrue(_is_no_proxy_host("any.websocket.org", [".websocket.org"]))
         self.assertTrue(_is_no_proxy_host("my.other.websocket.org", [".websocket.org"]))
         self.assertTrue(
@@ -227,10 +232,13 @@ class ProxyInfoTest(unittest.TestCase):
         elif "no_proxy" in os.environ:
             del os.environ["no_proxy"]
 
-    def testProxyFromArgs(self):
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False, proxy_host="localhost"),
-            ("localhost", 0, None),
+    def test_proxy_from_args(self):
+        self.assertRaises(
+            WebSocketProxyException,
+            get_proxy_info,
+            "echo.websocket.events",
+            False,
+            proxy_host="localhost",
         )
         self.assertEqual(
             get_proxy_info(
@@ -238,10 +246,6 @@ class ProxyInfoTest(unittest.TestCase):
             ),
             ("localhost", 3128, None),
         )
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True, proxy_host="localhost"),
-            ("localhost", 0, None),
-        )
         self.assertEqual(
             get_proxy_info(
                 "echo.websocket.events", True, proxy_host="localhost", proxy_port=3128
@@ -254,9 +258,10 @@ class ProxyInfoTest(unittest.TestCase):
                 "echo.websocket.events",
                 False,
                 proxy_host="localhost",
+                proxy_port=9001,
                 proxy_auth=("a", "b"),
             ),
-            ("localhost", 0, ("a", "b")),
+            ("localhost", 9001, ("a", "b")),
         )
         self.assertEqual(
             get_proxy_info(
@@ -273,9 +278,10 @@ class ProxyInfoTest(unittest.TestCase):
                 "echo.websocket.events",
                 True,
                 proxy_host="localhost",
+                proxy_port=8765,
                 proxy_auth=("a", "b"),
             ),
-            ("localhost", 0, ("a", "b")),
+            ("localhost", 8765, ("a", "b")),
         )
         self.assertEqual(
             get_proxy_info(
@@ -311,7 +317,18 @@ class ProxyInfoTest(unittest.TestCase):
             (None, 0, None),
         )
 
-    def testProxyFromEnv(self):
+        self.assertEqual(
+            get_proxy_info(
+                "echo.websocket.events",
+                True,
+                proxy_host="localhost",
+                proxy_port=3128,
+                no_proxy=[".websocket.events"],
+            ),
+            (None, 0, None),
+        )
+
+    def test_proxy_from_env(self):
         os.environ["http_proxy"] = "http://localhost/"
         self.assertEqual(
             get_proxy_info("echo.websocket.events", False), ("localhost", None, None)
diff --git a/libs/websocket/tests/test_websocket.py b/libs/websocket/tests/test_websocket.py
index 498def578..a1d7ad5be 100644
--- a/libs/websocket/tests/test_websocket.py
+++ b/libs/websocket/tests/test_websocket.py
@@ -7,6 +7,7 @@ import unittest
 from base64 import decodebytes as base64decode
 
 import websocket as ws
+from websocket._exceptions import WebSocketBadStatusException, WebSocketAddressException
 from websocket._handshake import _create_sec_websocket_key
 from websocket._handshake import _validate as _validate_header
 from websocket._http import read_headers
@@ -16,7 +17,7 @@ from websocket._utils import validate_utf8
 test_websocket.py
 websocket - WebSocket client library for Python
 
-Copyright 2023 engn33r
+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.
@@ -33,7 +34,6 @@ limitations under the License.
 
 try:
     import ssl
-    from ssl import SSLError
 except ImportError:
     # dummy class of SSLError for ssl none-support environment.
     class SSLError(Exception):
@@ -95,24 +95,24 @@ class WebSocketTest(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def testDefaultTimeout(self):
+    def test_default_timeout(self):
         self.assertEqual(ws.getdefaulttimeout(), None)
         ws.setdefaulttimeout(10)
         self.assertEqual(ws.getdefaulttimeout(), 10)
         ws.setdefaulttimeout(None)
 
-    def testWSKey(self):
+    def test_ws_key(self):
         key = _create_sec_websocket_key()
         self.assertTrue(key != 24)
         self.assertTrue("¥n" not in key)
 
-    def testNonce(self):
+    def test_nonce(self):
         """WebSocket key should be a random 16-byte nonce."""
         key = _create_sec_websocket_key()
         nonce = base64decode(key.encode("utf-8"))
         self.assertEqual(16, len(nonce))
 
-    def testWsUtils(self):
+    def test_ws_utils(self):
         key = "c6b8hTg4EeGb2gQMztV1/g=="
         required_header = {
             "upgrade": "websocket",
@@ -157,16 +157,12 @@ class WebSocketTest(unittest.TestCase):
         # This case will print out a logging error using the error() function, but that is expected
         self.assertEqual(_validate_header(header, key, ["Sub1", "suB2"]), (False, None))
 
-    def testReadHeader(self):
-        status, header, status_message = read_headers(
-            HeaderSockMock("data/header01.txt")
-        )
+    def test_read_header(self):
+        status, header, _ = read_headers(HeaderSockMock("data/header01.txt"))
         self.assertEqual(status, 101)
         self.assertEqual(header["connection"], "Upgrade")
 
-        status, header, status_message = read_headers(
-            HeaderSockMock("data/header03.txt")
-        )
+        status, header, _ = read_headers(HeaderSockMock("data/header03.txt"))
         self.assertEqual(status, 101)
         self.assertEqual(header["connection"], "Upgrade, Keep-Alive")
 
@@ -175,7 +171,7 @@ class WebSocketTest(unittest.TestCase):
             ws.WebSocketException, read_headers, HeaderSockMock("data/header02.txt")
         )
 
-    def testSend(self):
+    def test_send(self):
         # TODO: add longer frame data
         sock = ws.WebSocket()
         sock.set_mask_key(create_mask_key)
@@ -194,7 +190,7 @@ class WebSocketTest(unittest.TestCase):
 
         self.assertEqual(sock.send_binary(b"1111111111101"), 19)
 
-    def testRecv(self):
+    def test_recv(self):
         # TODO: add longer frame data
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
@@ -210,7 +206,7 @@ class WebSocketTest(unittest.TestCase):
         self.assertEqual(data, "Hello")
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testIter(self):
+    def test_iter(self):
         count = 2
         s = ws.create_connection("wss://api.bitfinex.com/ws/2")
         s.send('{"event": "subscribe", "channel": "ticker"}')
@@ -220,11 +216,11 @@ class WebSocketTest(unittest.TestCase):
                 break
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testNext(self):
+    def test_next(self):
         sock = ws.create_connection("wss://api.bitfinex.com/ws/2")
         self.assertEqual(str, type(next(sock)))
 
-    def testInternalRecvStrict(self):
+    def test_internal_recv_strict(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         s.add_packet(b"foo")
@@ -241,7 +237,7 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.frame_buffer.recv_strict(1)
 
-    def testRecvTimeout(self):
+    def test_recv_timeout(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         s.add_packet(b"\x81")
@@ -258,7 +254,7 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def testRecvWithSimpleFragmentation(self):
+    def test_recv_with_simple_fragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Brevity is "
@@ -270,7 +266,7 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def testRecvWithFireEventOfFragmentation(self):
+    def test_recv_with_fire_event_of_fragmentation(self):
         sock = ws.WebSocket(fire_cont_frame=True)
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Brevity is "
@@ -296,7 +292,7 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def testClose(self):
+    def test_close(self):
         sock = ws.WebSocket()
         sock.connected = True
         sock.close
@@ -308,14 +304,14 @@ class WebSocketTest(unittest.TestCase):
         sock.recv()
         self.assertEqual(sock.connected, False)
 
-    def testRecvContFragmentation(self):
+    def test_recv_cont_fragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=CONT, FIN=1, MSG="the soul of wit"
         s.add_packet(b"\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17")
         self.assertRaises(ws.WebSocketException, sock.recv)
 
-    def testRecvWithProlongedFragmentation(self):
+    def test_recv_with_prolonged_fragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Once more unto the breach, "
@@ -331,7 +327,7 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def testRecvWithFragmentationAndControlFrame(self):
+    def test_recv_with_fragmentation_and_control_frame(self):
         sock = ws.WebSocket()
         sock.set_mask_key(create_mask_key)
         s = sock.sock = SockMock()
@@ -352,7 +348,7 @@ class WebSocketTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testWebSocket(self):
+    def test_websocket(self):
         s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
         self.assertNotEqual(s, None)
         s.send("Hello, World")
@@ -369,7 +365,7 @@ class WebSocketTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testPingPong(self):
+    def test_ping_pong(self):
         s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
         self.assertNotEqual(s, None)
         s.ping("Hello")
@@ -377,17 +373,13 @@ class WebSocketTest(unittest.TestCase):
         s.close()
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testSupportRedirect(self):
+    def test_support_redirect(self):
         s = ws.WebSocket()
-        self.assertRaises(
-            ws._exceptions.WebSocketBadStatusException, s.connect, "ws://google.com/"
-        )
+        self.assertRaises(WebSocketBadStatusException, s.connect, "ws://google.com/")
         # Need to find a URL that has a redirect code leading to a websocket
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testSecureWebSocket(self):
-        import ssl
-
+    def test_secure_websocket(self):
         s = ws.create_connection("wss://api.bitfinex.com/ws/2")
         self.assertNotEqual(s, None)
         self.assertTrue(isinstance(s.sock, ssl.SSLSocket))
@@ -401,7 +393,7 @@ class WebSocketTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testWebSocketWithCustomHeader(self):
+    def test_websocket_with_custom_header(self):
         s = ws.create_connection(
             f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
             headers={"User-Agent": "PythonWebsocketClient"},
@@ -417,7 +409,7 @@ class WebSocketTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testAfterClose(self):
+    def test_after_close(self):
         s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
         self.assertNotEqual(s, None)
         s.close()
@@ -429,7 +421,7 @@ class SockOptTest(unittest.TestCase):
     @unittest.skipUnless(
         TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
     )
-    def testSockOpt(self):
+    def test_sockopt(self):
         sockopt = ((socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),)
         s = ws.create_connection(
             f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}", sockopt=sockopt
@@ -441,7 +433,7 @@ class SockOptTest(unittest.TestCase):
 
 
 class UtilsTest(unittest.TestCase):
-    def testUtf8Validator(self):
+    def test_utf8_validator(self):
         state = validate_utf8(b"\xf0\x90\x80\x80")
         self.assertEqual(state, True)
         state = validate_utf8(
@@ -454,7 +446,7 @@ class UtilsTest(unittest.TestCase):
 
 class HandshakeTest(unittest.TestCase):
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_http_SSL(self):
+    def test_http_ssl(self):
         websock1 = ws.WebSocket(
             sslopt={"cert_chain": ssl.get_default_verify_paths().capath},
             enable_multithread=False,
@@ -466,7 +458,7 @@ class HandshakeTest(unittest.TestCase):
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def testManualHeaders(self):
+    def test_manual_headers(self):
         websock3 = ws.WebSocket(
             sslopt={
                 "ca_certs": ssl.get_default_verify_paths().cafile,
@@ -474,7 +466,7 @@ class HandshakeTest(unittest.TestCase):
             }
         )
         self.assertRaises(
-            ws._exceptions.WebSocketBadStatusException,
+            WebSocketBadStatusException,
             websock3.connect,
             "wss://api.bitfinex.com/ws/2",
             cookie="chocolate",
@@ -490,16 +482,14 @@ class HandshakeTest(unittest.TestCase):
             },
         )
 
-    def testIPv6(self):
+    def test_ipv6(self):
         websock2 = ws.WebSocket()
         self.assertRaises(ValueError, websock2.connect, "2001:4860:4860::8888")
 
-    def testBadURLs(self):
+    def test_bad_urls(self):
         websock3 = ws.WebSocket()
         self.assertRaises(ValueError, websock3.connect, "ws//example.com")
-        self.assertRaises(
-            ws.WebSocketAddressException, websock3.connect, "ws://example"
-        )
+        self.assertRaises(WebSocketAddressException, websock3.connect, "ws://example")
         self.assertRaises(ValueError, websock3.connect, "example.com")
 
 
diff --git a/libs/websocket_client-1.7.0.dist-info/RECORD b/libs/websocket_client-1.7.0.dist-info/RECORD
deleted file mode 100644
index d4c42f22d..000000000
--- a/libs/websocket_client-1.7.0.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-../../bin/wsdump,sha256=ODMg_dbnNIbQ5Nu7nTPqahow2IljtBblXYCyuSebVzM,239
-websocket/__init__.py,sha256=S348n01gQDlBuhOc3mP6fGgEPPH2ZVlVoHlhw4aE8F0,801
-websocket/_abnf.py,sha256=6KCnCt_SUu1Wv6zh4BJqNsowjlqeeArEH3pguBQBJIo,14333
-websocket/_app.py,sha256=eWtcdldn0xPwnGkK3qDxpUsRm1RfeN44aBR3GPEkbw8,23614
-websocket/_cookiejar.py,sha256=zYzD7PgnPDc3cGih6rUbacNctBKP9rew5Y5baVerpME,2418
-websocket/_core.py,sha256=eTNHdf_3M5dS15vlqizeyPQJVqaAN-b7AKOSahT5R3M,20819
-websocket/_exceptions.py,sha256=-FmBq5KmekDV07o_UzoDFn2beG-pUcHoqXIuUBV17-8,2178
-websocket/_handshake.py,sha256=9DeOe8Tr9G6idMcvNfEY4l46huTzeogzE-6rIVluhUE,6508
-websocket/_http.py,sha256=Hj2ZcWCf-Y4qkN3ryRx7WiSBoEZ0kiWnwDzoF9wSQSo,12660
-websocket/_logging.py,sha256=7LCmNoWaSeC7x8ge-U2cXf-OKbLrIPKxRFF6O_GTQgg,2228
-websocket/_socket.py,sha256=kwJ9dDjlziL_CpfgIRK9crsb0ckRIVPbl1DkgHTwBnc,5043
-websocket/_ssl_compat.py,sha256=Mmoh73mcHZ0BSmkHuqfegXvqnzGERhTcbnzfXIM2X90,1085
-websocket/_url.py,sha256=VSiyPeW_VXVASZS0ylqW1nxZsBXvqtg-3_OwDJLpnhk,5086
-websocket/_utils.py,sha256=Q5srXsF2qlFe7YUcTNw6toWE2yfDighdS9IsTU4Khco,6961
-websocket/_wsdump.py,sha256=Y57angSaHi-ens8C0nbl3PeQGx2Lb9Z7gqgOFW3MsV8,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=1FaKzg2V3RFJFWLPxhHdpv6EtGRJeH8AIXIEiElEXkk,488
-websocket/tests/test_abnf.py,sha256=rPK8omNGLNWc7vM2rRWIN4ITiW7Nx0w7DrYOiA9gwP0,4658
-websocket/tests/test_app.py,sha256=gqsYXwYMiysqbPO4AcOV8yhhCVN58tbDxE_e51UewGI,12317
-websocket/tests/test_cookiejar.py,sha256=RDLL84u0Hg6tjJnnyE_y9g1P72x4Wxxo3dimMCuX5aA,4392
-websocket/tests/test_http.py,sha256=QudEl8aGm8YM0ZGhDfYhHXwfDdfXgJQF09QbLJ1H9sA,12427
-websocket/tests/test_url.py,sha256=pHQ-0TiqPc2wCMFS36BOmED6ArEWwbLYIRD5u-S4BUc,17203
-websocket/tests/test_websocket.py,sha256=h_jZIPh3eOtHpYm5P5neiwMv120cc7cgjbwP8AGwi8c,18434
-websocket_client-1.7.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-websocket_client-1.7.0.dist-info/LICENSE,sha256=Sb7oRCI-MIhpjcBBwnuSektU2hvNPp6Cv7fU9pUU3JU,11339
-websocket_client-1.7.0.dist-info/METADATA,sha256=LeUPkJp3tMwLfRDf607-d7NMc-jvlL3b1pmgeL_ZwXc,7887
-websocket_client-1.7.0.dist-info/RECORD,,
-websocket_client-1.7.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-websocket_client-1.7.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-websocket_client-1.7.0.dist-info/entry_points.txt,sha256=IoCGCuANLuLxE3m2QXEd2Ip57qScBjf7RfQnkjn6DNE,50
-websocket_client-1.7.0.dist-info/top_level.txt,sha256=8m_tTpcUlzWGl8v-pj5Wi7XhAFaN1_bLKRHQKCyz5_I,10
diff --git a/libs/websocket_client-1.7.0.dist-info/WHEEL b/libs/websocket_client-1.7.0.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf9..000000000
--- a/libs/websocket_client-1.7.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.8.0.dist-info/INSTALLER
new file mode 100644
index 000000000..a1b589e38
--- /dev/null
+++ b/libs/websocket_client-1.8.0.dist-info/INSTALLER
@@ -0,0 +1 @@
+pip
diff --git a/libs/websocket_client-1.7.0.dist-info/LICENSE b/libs/websocket_client-1.8.0.dist-info/LICENSE
similarity index 99%
rename from libs/websocket_client-1.7.0.dist-info/LICENSE
rename to libs/websocket_client-1.8.0.dist-info/LICENSE
index 88a0d3eb1..62a54ca49 100644
--- a/libs/websocket_client-1.7.0.dist-info/LICENSE
+++ b/libs/websocket_client-1.8.0.dist-info/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 engn33r
+   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.
diff --git a/libs/websocket_client-1.7.0.dist-info/METADATA b/libs/websocket_client-1.8.0.dist-info/METADATA
similarity index 95%
rename from libs/websocket_client-1.7.0.dist-info/METADATA
rename to libs/websocket_client-1.8.0.dist-info/METADATA
index 61847cefe..563e5c052 100644
--- a/libs/websocket_client-1.7.0.dist-info/METADATA
+++ b/libs/websocket_client-1.8.0.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: websocket-client
-Version: 1.7.0
+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
@@ -32,6 +32,7 @@ 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'
@@ -66,20 +67,20 @@ Please see the [contribution guidelines](https://github.com/websocket-client/web
 
 ## Installation
 
-You can use either `python3 setup.py install` or `pip3 install websocket-client`
-to install. This module is tested on Python 3.8+.
+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:
- `pip3 install websocket-client[optional]`
+ `pip install websocket-client[optional]`
 - To install `websockets` to run unit tests using the local echo server, use:
- `pip3 install websocket-client[test]`
+ `pip install websocket-client[test]`
 - To install `Sphinx` and `sphinx_rtd_theme` to build project documentation, use:
- `pip3 install websocket-client[docs]`
+ `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 `pip3 install rel`.
+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 `\`.
 
diff --git a/libs/websocket_client-1.8.0.dist-info/RECORD b/libs/websocket_client-1.8.0.dist-info/RECORD
new file mode 100644
index 000000000..d096dcc42
--- /dev/null
+++ b/libs/websocket_client-1.8.0.dist-info/RECORD
@@ -0,0 +1,34 @@
+../../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/importlib_resources/tests/data02/__init__.py b/libs/websocket_client-1.8.0.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_resources/tests/data02/__init__.py
rename to libs/websocket_client-1.8.0.dist-info/REQUESTED
diff --git a/libs/enzyme-0.4.1.dist-info/WHEEL b/libs/websocket_client-1.8.0.dist-info/WHEEL
similarity index 100%
rename from libs/enzyme-0.4.1.dist-info/WHEEL
rename to libs/websocket_client-1.8.0.dist-info/WHEEL
diff --git a/libs/websocket_client-1.7.0.dist-info/entry_points.txt b/libs/websocket_client-1.8.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/websocket_client-1.7.0.dist-info/entry_points.txt
rename to libs/websocket_client-1.8.0.dist-info/entry_points.txt
diff --git a/libs/websocket_client-1.7.0.dist-info/top_level.txt b/libs/websocket_client-1.8.0.dist-info/top_level.txt
similarity index 100%
rename from libs/websocket_client-1.7.0.dist-info/top_level.txt
rename to libs/websocket_client-1.8.0.dist-info/top_level.txt
diff --git a/libs/werkzeug-3.0.1.dist-info/RECORD b/libs/werkzeug-3.0.1.dist-info/RECORD
deleted file mode 100644
index 434c1e5ba..000000000
--- a/libs/werkzeug-3.0.1.dist-info/RECORD
+++ /dev/null
@@ -1,74 +0,0 @@
-werkzeug-3.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-werkzeug-3.0.1.dist-info/LICENSE.rst,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
-werkzeug-3.0.1.dist-info/METADATA,sha256=VFUXbdFj9EGXq7b-oPcd4u7dsYGytx5CE6WAEV8gkCo,4093
-werkzeug-3.0.1.dist-info/RECORD,,
-werkzeug-3.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug-3.0.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-werkzeug/__init__.py,sha256=HX_PSY5E2vtVlD3R4YblwBRCjg7j3Tlm3LASbYqOSkU,727
-werkzeug/_internal.py,sha256=aVz_qPOvQFpvqBaEKdVuCBnJPekok4miXms5xIM4M04,5542
-werkzeug/_reloader.py,sha256=1O1DDWlqVwYIX8kgJwH5B4a_Uh6acQnw3sQf01JpXtM,14745
-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=8X5XytGDP008Jlj110t8G5h29ntwAyjMH0Mq9PjW6rs,10086
-werkzeug/datastructures/cache_control.py,sha256=RTUipZev50s-1TAn2rYGZrytm_6IOIxQd67fkR5bNF0,6043
-werkzeug/datastructures/cache_control.pyi,sha256=6Q93jRysAKMPWRA72OMksyn7d3ZysuxwGlHp_iwF9pA,3756
-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=2sdbKHhvbQF5FjrJuO6l_m1yZvZ4oPCUTspmdmjQlSU,1433
-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=y92tClxVslJBEGgAwDRsQLExfin2p0x7NfnP_b8w6xc,4191
-werkzeug/datastructures/range.py,sha256=JXSDPseG7iH5giJp3R1SnQC_SqQp634M8Iv6QTsbTxM,5669
-werkzeug/datastructures/range.pyi,sha256=bsM61iNp86gT2lyN0F_Dqg8xsnfPerdmElipuHppiJQ,1792
-werkzeug/datastructures/structures.py,sha256=_bhAf0adEk6WU2uy8jdmuxFMTFcuClY1p7jQ-3wYXj4,31761
-werkzeug/datastructures/structures.pyi,sha256=MRg-RubT3UPjh62i9-7Xht8DVL0zTApRzjs52Hfz_j4,8148
-werkzeug/debug/__init__.py,sha256=WRTLJSvnuK6jlBuQLllTnN57th0HKPjxbS7-d8QJZIc,18760
-werkzeug/debug/console.py,sha256=FIO8gDX2eQ1_4MtpJ4s0i2gR4fFCJZTPwhSVByF4kbo,6068
-werkzeug/debug/repr.py,sha256=ECmIpNVlCppTfCuIuEgrJVfuhr8iDqPSWeVJyxt1QOM,9328
-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=FVBBUirz4kKedIbM08QQCYeEoicoSbnm4BnBF4dCYfA,10562
-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=8Xg7p2JzCC1AMWuse5HYc594OdzC5ToeJbNk49_zZCc,13271
-werkzeug/exceptions.py,sha256=d6VNzGcVgLazIpfwRD8pN_d3yAJNyngBDFvlXQbR-38,26062
-werkzeug/formparser.py,sha256=sCEK0h4lM7Z4UZ8ROYuXQpc0dNTsSo7-ABk9_uHgBFY,15247
-werkzeug/http.py,sha256=oDCppI-07PHsAE2Taxf3wFMWp3LYOjt1VO2EMz_nCYg,43363
-werkzeug/local.py,sha256=Jawgwa7Q7orExtyzVlhbh-4mGWg3v63bspIU5Nnl-DU,22003
-werkzeug/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/middleware/dispatcher.py,sha256=6ltzPtDsIdLTY_T1GW6kxBJL0KZftbipa_WVdKtpVQ8,2601
-werkzeug/middleware/http_proxy.py,sha256=vsSvt84m656x3mV_Fj78y7O2eYHmurWngErTcjeiz8U,7833
-werkzeug/middleware/lint.py,sha256=6CqcwMWro1p-GRUGPgQ1n21KFnTTqc6-81CGTzpcK74,13916
-werkzeug/middleware/profiler.py,sha256=r0BtSk_iLY4JdkjfsXlUnALogjrQSJ2ja-wPDuJN6sw,5561
-werkzeug/middleware/proxy_fix.py,sha256=dcOOSjSok2QsSh1VSNsw-a0Vy_Jn5DunlO6PRbXBq0A,6754
-werkzeug/middleware/shared_data.py,sha256=DeM8OouhfhZs8w5T7Wxw-uKuOHXoH0x5RopzxR2RRjI,9513
-werkzeug/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/routing/__init__.py,sha256=HpvahY7WwkLdV4Cq3Bsc3GrqNon4u6t8-vhbb9E5o00,4819
-werkzeug/routing/converters.py,sha256=nEWOaAfeZWPJMneegi91e0L1MhuH7hmyKoxGNJ6QKW8,7249
-werkzeug/routing/exceptions.py,sha256=yGZ5AUL-buHp-vK8AJbZ0bLIbSckh1UyiGKgRg4ZjaA,4698
-werkzeug/routing/map.py,sha256=ag-ZqsuH8PvWWlFO3mwUNIFEF3t6JeLwxvLP81k7qj0,36350
-werkzeug/routing/matcher.py,sha256=FyPG45iqR1XwxFujejSqfNEKV7IgbR2td7Jp-ocSASY,7817
-werkzeug/routing/rules.py,sha256=F8S1sXXG2QZzmOqBKMWjpQPBNqFpmINDBLn0Yu0FyCE,31895
-werkzeug/sansio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/sansio/http.py,sha256=EZIQJSO6cQfLA_ApVY-bLrVa52x_chCwFYew25eCgRA,5320
-werkzeug/sansio/multipart.py,sha256=u_XLs68tvP2AO704Yq5zZg7ZN0A33SQaZfQE40gsduo,11490
-werkzeug/sansio/request.py,sha256=Y-Q7zQGTpn3XOY-3_68dYPgUcV9uuhSNI9I9aw2n0LA,19954
-werkzeug/sansio/response.py,sha256=CurS5HqPJRt_vCsUuIYa2EOGciUW8GUkIVdpKac6bYo,27647
-werkzeug/sansio/utils.py,sha256=LYgmrN7yr04ZDVk5flPcUJLo1rDnTzhF04OH3-ujCWQ,4950
-werkzeug/security.py,sha256=5ttgIiVZxNtbP7Hao1aCmcL0nPtgNt6UyPDjaPAr1aU,5294
-werkzeug/serving.py,sha256=wjw7TMvCQHzxmHXDrNGQYetP4gYRTbLRo0XRhXIBUCQ,39332
-werkzeug/test.py,sha256=aaU1kP1JTx0RQRRKPH6h9NiO6wqg89APsr9lo44flPw,52633
-werkzeug/testapp.py,sha256=Q7SXVDXeXnnXo7-TWVoAJCTF2GnXxoH-v5_pvjUyTWc,6135
-werkzeug/urls.py,sha256=7rvnhTmjJ9X_VVJO1aMj9V-yDzOIVpgGnLWLR0VhIPw,6849
-werkzeug/user_agent.py,sha256=lSlLYKCcbzCUSkbdAoO8zPk2UR-8Mdn6iu_iA2kYPBA,1416
-werkzeug/utils.py,sha256=DYkOtfDR_Wc3ro3_peReo9KkUC-6yhOvz27_PUAckbA,24654
-werkzeug/wrappers/__init__.py,sha256=kGyK7rOud3qCxll_jFyW15YarJhj1xtdf3ocx9ZheB8,120
-werkzeug/wrappers/request.py,sha256=mIURGEyuGrYhtLJ3roPn8-hyliVuRbSIlwyFsfDHuVQ,24620
-werkzeug/wrappers/response.py,sha256=aiEoV3pHugfcw-1SXjQ8b2t2VeGlDiKGC88fZbaKXPY,32587
-werkzeug/wsgi.py,sha256=P7jB0VpG6X6miies4uk7Zgm7NVm4Yz8Ra6Inr5q_FMs,20894
diff --git a/libs/werkzeug-3.0.6.dist-info/INSTALLER b/libs/werkzeug-3.0.6.dist-info/INSTALLER
new file mode 100644
index 000000000..a1b589e38
--- /dev/null
+++ b/libs/werkzeug-3.0.6.dist-info/INSTALLER
@@ -0,0 +1 @@
+pip
diff --git a/libs/werkzeug-3.0.1.dist-info/LICENSE.rst b/libs/werkzeug-3.0.6.dist-info/LICENSE.txt
similarity index 100%
rename from libs/werkzeug-3.0.1.dist-info/LICENSE.rst
rename to libs/werkzeug-3.0.6.dist-info/LICENSE.txt
diff --git a/libs/werkzeug-3.0.1.dist-info/METADATA b/libs/werkzeug-3.0.6.dist-info/METADATA
similarity index 68%
rename from libs/werkzeug-3.0.1.dist-info/METADATA
rename to libs/werkzeug-3.0.6.dist-info/METADATA
index 8565ec99d..f1c1cd698 100644
--- a/libs/werkzeug-3.0.1.dist-info/METADATA
+++ b/libs/werkzeug-3.0.6.dist-info/METADATA
@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: Werkzeug
-Version: 3.0.1
+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/x-rst
+Description-Content-Type: text/markdown
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -16,6 +16,7 @@ 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/
@@ -26,12 +27,11 @@ Project-URL: Issue Tracker, https://github.com/pallets/werkzeug/issues/
 Project-URL: Source Code, https://github.com/pallets/werkzeug/
 Provides-Extra: watchdog
 
-Werkzeug
-========
+# Werkzeug
 
 *werkzeug* German noun: "tool". Etymology: *werk* ("work"), *zeug* ("stuff")
 
-Werkzeug is a comprehensive `WSGI`_ web application library. It began as
+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.
 
@@ -59,60 +59,41 @@ 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
+[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/
+[WSGI]: https://wsgi.readthedocs.io/en/latest/
+[Flask]: https://www.palletsprojects.com/p/flask/
 
 
-Installing
-----------
+## A Simple Example
 
-Install and update using `pip`_:
+```python
+# save this as app.py
+from werkzeug.wrappers import Request, Response
 
-.. code-block:: text
+@Request.application
+def application(request: Request) -> Response:
+    return Response("Hello, World!")
 
-    pip install -U Werkzeug
+if __name__ == "__main__":
+    from werkzeug.serving import run_simple
+    run_simple("127.0.0.1", 5000, application)
+```
 
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
+```
+$ python -m app
+  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+```
 
 
-A Simple Example
-----------------
-
-.. code-block:: python
-
-    from werkzeug.wrappers import Request, Response
-
-    @Request.application
-    def application(request):
-        return Response('Hello, World!')
-
-    if __name__ == '__main__':
-        from werkzeug.serving import run_simple
-        run_simple('localhost', 4000, application)
-
-
-Donate
-------
+## 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][].
 
-.. _please donate today: https://palletsprojects.com/donate
-
-
-Links
------
-
--   Documentation: https://werkzeug.palletsprojects.com/
--   Changes: https://werkzeug.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/Werkzeug/
--   Source Code: https://github.com/pallets/werkzeug/
--   Issue Tracker: https://github.com/pallets/werkzeug/issues/
--   Chat: https://discord.gg/pallets
+[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
new file mode 100644
index 000000000..ef485e659
--- /dev/null
+++ b/libs/werkzeug-3.0.6.dist-info/RECORD
@@ -0,0 +1,74 @@
+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/importlib_resources/tests/data02/one/__init__.py b/libs/werkzeug-3.0.6.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_resources/tests/data02/one/__init__.py
rename to libs/werkzeug-3.0.6.dist-info/REQUESTED
diff --git a/libs/werkzeug-3.0.6.dist-info/WHEEL b/libs/werkzeug-3.0.6.dist-info/WHEEL
new file mode 100644
index 000000000..e3c6feefa
--- /dev/null
+++ b/libs/werkzeug-3.0.6.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.10.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/werkzeug/_internal.py b/libs/werkzeug/_internal.py
index 70ab68761..7dd2fbccd 100644
--- a/libs/werkzeug/_internal.py
+++ b/libs/werkzeug/_internal.py
@@ -9,6 +9,7 @@ from datetime import timezone
 
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import WSGIEnvironment
+
     from .wrappers.request import Request
 
 _logger: logging.Logger | None = None
@@ -60,7 +61,7 @@ def _has_level_handler(logger: logging.Logger) -> bool:
     return False
 
 
-class _ColorStreamHandler(logging.StreamHandler):
+class _ColorStreamHandler(logging.StreamHandler):  # type: ignore[type-arg]
     """On Windows, wrap stream with Colorama for ANSI style support."""
 
     def __init__(self) -> None:
@@ -97,13 +98,11 @@ def _log(type: str, message: str, *args: t.Any, **kwargs: t.Any) -> None:
 
 
 @t.overload
-def _dt_as_utc(dt: None) -> None:
-    ...
+def _dt_as_utc(dt: None) -> None: ...
 
 
 @t.overload
-def _dt_as_utc(dt: datetime) -> datetime:
-    ...
+def _dt_as_utc(dt: datetime) -> datetime: ...
 
 
 def _dt_as_utc(dt: datetime | None) -> datetime | None:
@@ -149,12 +148,10 @@ class _DictAccessorProperty(t.Generic[_TAccessorValue]):
     @t.overload
     def __get__(
         self, instance: None, owner: type
-    ) -> _DictAccessorProperty[_TAccessorValue]:
-        ...
+    ) -> _DictAccessorProperty[_TAccessorValue]: ...
 
     @t.overload
-    def __get__(self, instance: t.Any, owner: type) -> _TAccessorValue:
-        ...
+    def __get__(self, instance: t.Any, owner: type) -> _TAccessorValue: ...
 
     def __get__(
         self, instance: t.Any | None, owner: type
diff --git a/libs/werkzeug/_reloader.py b/libs/werkzeug/_reloader.py
index c8683593f..8fd50b963 100644
--- a/libs/werkzeug/_reloader.py
+++ b/libs/werkzeug/_reloader.py
@@ -141,7 +141,7 @@ def _find_watchdog_paths(
 
 
 def _find_common_roots(paths: t.Iterable[str]) -> t.Iterable[str]:
-    root: dict[str, dict] = {}
+    root: dict[str, dict[str, t.Any]] = {}
 
     for chunks in sorted((PurePath(x).parts for x in paths), key=len, reverse=True):
         node = root
@@ -153,11 +153,13 @@ def _find_common_roots(paths: t.Iterable[str]) -> t.Iterable[str]:
 
     rv = set()
 
-    def _walk(node: t.Mapping[str, dict], path: tuple[str, ...]) -> None:
+    def _walk(node: t.Mapping[str, dict[str, t.Any]], path: tuple[str, ...]) -> None:
         for prefix, child in node.items():
             _walk(child, path + (prefix,))
 
-        if not node:
+        # If there are no more nodes, and a path has been accumulated, add it.
+        # Path may be empty if the "" entry is in sys.path.
+        if not node and path:
             rv.add(os.path.join(*path))
 
     _walk(root, ())
@@ -279,7 +281,7 @@ class ReloaderLoop:
         self.log_reload(filename)
         sys.exit(3)
 
-    def log_reload(self, filename: str) -> None:
+    def log_reload(self, filename: str | bytes) -> None:
         filename = os.path.abspath(filename)
         _log("info", f" * Detected change in {filename!r}, reloading")
 
@@ -310,17 +312,28 @@ class StatReloaderLoop(ReloaderLoop):
 
 class WatchdogReloaderLoop(ReloaderLoop):
     def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
-        from watchdog.observers import Observer
-        from watchdog.events import PatternMatchingEventHandler
-        from watchdog.events import EVENT_TYPE_OPENED
+        from watchdog.events import EVENT_TYPE_CLOSED
+        from watchdog.events import EVENT_TYPE_CREATED
+        from watchdog.events import EVENT_TYPE_DELETED
+        from watchdog.events import EVENT_TYPE_MODIFIED
+        from watchdog.events import EVENT_TYPE_MOVED
         from watchdog.events import FileModifiedEvent
+        from watchdog.events import PatternMatchingEventHandler
+        from watchdog.observers import Observer
 
         super().__init__(*args, **kwargs)
         trigger_reload = self.trigger_reload
 
         class EventHandler(PatternMatchingEventHandler):
             def on_any_event(self, event: FileModifiedEvent):  # type: ignore
-                if event.event_type == EVENT_TYPE_OPENED:
+                if event.event_type not in {
+                    EVENT_TYPE_CLOSED,
+                    EVENT_TYPE_CREATED,
+                    EVENT_TYPE_DELETED,
+                    EVENT_TYPE_MODIFIED,
+                    EVENT_TYPE_MOVED,
+                }:
+                    # skip events that don't involve changes to the file
                     return
 
                 trigger_reload(event.src_path)
@@ -347,7 +360,7 @@ class WatchdogReloaderLoop(ReloaderLoop):
         )
         self.should_reload = False
 
-    def trigger_reload(self, filename: str) -> None:
+    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
diff --git a/libs/werkzeug/datastructures/auth.py b/libs/werkzeug/datastructures/auth.py
index 494576ded..a3ca0de46 100644
--- a/libs/werkzeug/datastructures/auth.py
+++ b/libs/werkzeug/datastructures/auth.py
@@ -124,7 +124,7 @@ class Authorization:
         if self.type == "basic":
             value = base64.b64encode(
                 f"{self.username}:{self.password}".encode()
-            ).decode("utf8")
+            ).decode("ascii")
             return f"Basic {value}"
 
         if self.token is not None:
@@ -172,7 +172,7 @@ class WWWAuthenticate:
         token: str | None = None,
     ):
         self._type = auth_type.lower()
-        self._parameters: dict[str, str | None] = CallbackDict(  # type: ignore[misc]
+        self._parameters: dict[str, str | None] = CallbackDict(
             values, lambda _: self._trigger_on_update()
         )
         self._token = token
@@ -201,9 +201,7 @@ class WWWAuthenticate:
 
     @parameters.setter
     def parameters(self, value: dict[str, str]) -> None:
-        self._parameters = CallbackDict(  # type: ignore[misc]
-            value, lambda _: self._trigger_on_update()
-        )
+        self._parameters = CallbackDict(value, lambda _: self._trigger_on_update())
         self._trigger_on_update()
 
     @property
diff --git a/libs/werkzeug/datastructures/cache_control.pyi b/libs/werkzeug/datastructures/cache_control.pyi
index 06fe667a2..54ec02082 100644
--- a/libs/werkzeug/datastructures/cache_control.pyi
+++ b/libs/werkzeug/datastructures/cache_control.pyi
@@ -8,15 +8,19 @@ from .mixins import UpdateDictMixin
 
 T = TypeVar("T")
 _CPT = TypeVar("_CPT", str, int, bool)
-_OptCPT = _CPT | None
 
-def cache_control_property(key: str, empty: _OptCPT, type: type[_CPT]) -> property: ...
+def cache_control_property(
+    key: str, empty: _CPT | None, type: type[_CPT]
+) -> property: ...
 
-class _CacheControl(UpdateDictMixin[str, _OptCPT], dict[str, _OptCPT]):
+class _CacheControl(
+    UpdateDictMixin[str, str | int | bool | None], dict[str, str | int | bool | None]
+):
     provided: bool
     def __init__(
         self,
-        values: Mapping[str, _OptCPT] | Iterable[tuple[str, _OptCPT]] = (),
+        values: Mapping[str, str | int | bool | None]
+        | Iterable[tuple[str, str | int | bool | None]] = (),
         on_update: Callable[[_CacheControl], None] | None = None,
     ) -> None: ...
     @property
@@ -48,9 +52,11 @@ class _CacheControl(UpdateDictMixin[str, _OptCPT], dict[str, _OptCPT]):
     def _del_cache_value(self, key: str) -> None: ...
     def to_header(self) -> str: ...
     @staticmethod
-    def cache_property(key: str, empty: _OptCPT, type: type[_CPT]) -> property: ...
+    def cache_property(key: str, empty: _CPT | None, type: type[_CPT]) -> property: ...
 
-class RequestCacheControl(ImmutableDictMixin[str, _OptCPT], _CacheControl):
+class RequestCacheControl(  # type: ignore[misc]
+    ImmutableDictMixin[str, str | int | bool | None], _CacheControl
+):
     @property
     def max_stale(self) -> int | None: ...
     @max_stale.setter
diff --git a/libs/werkzeug/datastructures/file_storage.pyi b/libs/werkzeug/datastructures/file_storage.pyi
index 730789e35..36a7ed9f2 100644
--- a/libs/werkzeug/datastructures/file_storage.pyi
+++ b/libs/werkzeug/datastructures/file_storage.pyi
@@ -15,7 +15,7 @@ class FileStorage:
     def __init__(
         self,
         stream: IO[bytes] | None = None,
-        filename: str | PathLike | None = None,
+        filename: str | PathLike[str] | None = None,
         name: str | None = None,
         content_type: str | None = None,
         content_length: int | None = None,
@@ -30,7 +30,9 @@ class FileStorage:
     def mimetype(self) -> str: ...
     @property
     def mimetype_params(self) -> dict[str, str]: ...
-    def save(self, dst: str | PathLike | IO[bytes], buffer_size: int = ...) -> None: ...
+    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: ...
diff --git a/libs/werkzeug/datastructures/mixins.pyi b/libs/werkzeug/datastructures/mixins.pyi
index 74ed4b81e..40453f703 100644
--- a/libs/werkzeug/datastructures/mixins.pyi
+++ b/libs/werkzeug/datastructures/mixins.pyi
@@ -21,7 +21,7 @@ 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: t.Any) -> NoReturn: ...  # type: ignore
+    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: ...
diff --git a/libs/werkzeug/datastructures/structures.py b/libs/werkzeug/datastructures/structures.py
index 7ea7bee28..4279ceb98 100644
--- a/libs/werkzeug/datastructures/structures.py
+++ b/libs/werkzeug/datastructures/structures.py
@@ -70,8 +70,12 @@ class TypeConversionDict(dict):
                         be looked up.  If not further specified `None` is
                         returned.
         :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 default value is returned.
+                     :class:`MultiDict`.  If a :exc:`ValueError` or a
+                     :exc:`TypeError` is raised by this callable the default
+                     value is returned.
+
+        .. versionchanged:: 3.0.2
+           Returns the default value on :exc:`TypeError`, too.
         """
         try:
             rv = self[key]
@@ -80,7 +84,7 @@ class TypeConversionDict(dict):
         if type is not None:
             try:
                 rv = type(rv)
-            except ValueError:
+            except (ValueError, TypeError):
                 rv = default
         return rv
 
@@ -146,7 +150,7 @@ class MultiDict(TypeConversionDict):
 
     def __init__(self, mapping=None):
         if isinstance(mapping, MultiDict):
-            dict.__init__(self, ((k, l[:]) for k, l in mapping.lists()))
+            dict.__init__(self, ((k, vs[:]) for k, vs in mapping.lists()))
         elif isinstance(mapping, dict):
             tmp = {}
             for key, value in mapping.items():
diff --git a/libs/werkzeug/datastructures/structures.pyi b/libs/werkzeug/datastructures/structures.pyi
index 2e7af35be..7086ddae1 100644
--- a/libs/werkzeug/datastructures/structures.pyi
+++ b/libs/werkzeug/datastructures/structures.pyi
@@ -9,22 +9,20 @@ from typing import NoReturn
 from typing import overload
 from typing import TypeVar
 
-from .mixins import (
-    ImmutableDictMixin,
-    ImmutableListMixin,
-    ImmutableMultiDictMixin,
-    UpdateDictMixin,
-)
+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")
+_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]]
+    mapping: Mapping[K, V | Iterable[V]] | Iterable[tuple[K, V]],
 ) -> Iterator[tuple[K, V]]: ...
 
 class ImmutableList(ImmutableListMixin[V]): ...
@@ -41,7 +39,7 @@ class TypeConversionDict(dict[K, V]):
 
 class ImmutableTypeConversionDict(ImmutableDictMixin[K, V], TypeConversionDict[K, V]):
     def copy(self) -> TypeConversionDict[K, V]: ...
-    def __copy__(self) -> ImmutableTypeConversionDict: ...
+    def __copy__(self) -> ImmutableTypeConversionDict[K, V]: ...
 
 class MultiDict(TypeConversionDict[K, V]):
     def __init__(
@@ -84,16 +82,16 @@ class MultiDict(TypeConversionDict[K, V]):
     def __deepcopy__(self, memo: Any) -> MultiDict[K, V]: ...
 
 class _omd_bucket(Generic[K, V]):
-    prev: _omd_bucket | None
-    next: _omd_bucket | None
+    prev: _omd_bucket[K, V] | None
+    next: _omd_bucket[K, V] | None
     key: K
     value: V
-    def __init__(self, omd: OrderedMultiDict, key: K, value: V) -> None: ...
-    def unlink(self, omd: OrderedMultiDict) -> None: ...
+    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 | None
-    _last_bucket: _omd_bucket | None
+    _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: ...
diff --git a/libs/werkzeug/debug/__init__.py b/libs/werkzeug/debug/__init__.py
index 3b04b534e..0c4cabd89 100644
--- a/libs/werkzeug/debug/__init__.py
+++ b/libs/werkzeug/debug/__init__.py
@@ -13,13 +13,16 @@ import uuid
 from contextlib import ExitStack
 from io import BytesIO
 from itertools import chain
+from multiprocessing import Value
 from os.path import basename
 from os.path import join
 from zlib import adler32
 
 from .._internal import _log
 from ..exceptions import NotFound
+from ..exceptions import SecurityError
 from ..http import parse_cookie
+from ..sansio.utils import host_is_trusted
 from ..security import gen_salt
 from ..utils import send_file
 from ..wrappers.request import Request
@@ -82,7 +85,8 @@ def get_machine_id() -> str | bytes | None:
         try:
             # subprocess may not be available, e.g. Google App Engine
             # https://github.com/pallets/werkzeug/issues/925
-            from subprocess import Popen, PIPE
+            from subprocess import PIPE
+            from subprocess import Popen
 
             dump = Popen(
                 ["ioreg", "-c", "IOPlatformExpertDevice", "-d", "2"], stdout=PIPE
@@ -110,7 +114,7 @@ def get_machine_id() -> str | bytes | None:
                     guid, guid_type = winreg.QueryValueEx(rk, "MachineGuid")
 
                     if guid_type == winreg.REG_SZ:
-                        return guid.encode("utf-8")
+                        return guid.encode()
 
                     return guid
             except OSError:
@@ -169,7 +173,8 @@ def get_pin_and_cookie_name(
         # App Engine. It may also raise a KeyError if the UID does not
         # have a username, such as in Docker.
         username = getpass.getuser()
-    except (ImportError, KeyError):
+    # Python >= 3.13 only raises OSError
+    except (ImportError, KeyError, OSError):
         username = None
 
     mod = sys.modules.get(modname)
@@ -193,7 +198,7 @@ def get_pin_and_cookie_name(
         if not bit:
             continue
         if isinstance(bit, str):
-            bit = bit.encode("utf-8")
+            bit = bit.encode()
         h.update(bit)
     h.update(b"cookiesalt")
 
@@ -283,7 +288,7 @@ class DebuggedApplication:
         self.console_init_func = console_init_func
         self.show_hidden_frames = show_hidden_frames
         self.secret = gen_salt(20)
-        self._failed_pin_auth = 0
+        self._failed_pin_auth = Value("B")
 
         self.pin_logging = pin_logging
         if pin_security:
@@ -297,6 +302,14 @@ class DebuggedApplication:
         else:
             self.pin = None
 
+        self.trusted_hosts: list[str] = [".localhost", "127.0.0.1"]
+        """List of domains to allow requests to the debugger from. A leading dot
+        allows all subdomains. This only allows ``".localhost"`` domains by
+        default.
+
+        .. versionadded:: 3.0.3
+        """
+
     @property
     def pin(self) -> str | None:
         if not hasattr(self, "_pin"):
@@ -343,7 +356,7 @@ class DebuggedApplication:
 
             is_trusted = bool(self.check_pin_trust(environ))
             html = tb.render_debugger_html(
-                evalex=self.evalex,
+                evalex=self.evalex and self.check_host_trust(environ),
                 secret=self.secret,
                 evalex_trusted=is_trusted,
             )
@@ -364,13 +377,16 @@ class DebuggedApplication:
 
             environ["wsgi.errors"].write("".join(tb.render_traceback_text()))
 
-    def execute_command(  # type: ignore[return]
+    def execute_command(
         self,
         request: Request,
         command: str,
         frame: DebugFrameSummary | _ConsoleFrame,
     ) -> Response:
         """Execute a command in a console."""
+        if not self.check_host_trust(request.environ):
+            return SecurityError()  # type: ignore[return-value]
+
         contexts = self.frame_contexts.get(id(frame), [])
 
         with ExitStack() as exit_stack:
@@ -381,6 +397,9 @@ class DebuggedApplication:
 
     def display_console(self, request: Request) -> Response:
         """Display a standalone shell."""
+        if not self.check_host_trust(request.environ):
+            return SecurityError()  # type: ignore[return-value]
+
         if 0 not in self.frames:
             if self.console_init_func is None:
                 ns = {}
@@ -433,12 +452,21 @@ class DebuggedApplication:
             return None
         return (time.time() - PIN_TIME) < ts
 
+    def check_host_trust(self, environ: WSGIEnvironment) -> bool:
+        return host_is_trusted(environ.get("HTTP_HOST"), self.trusted_hosts)
+
     def _fail_pin_auth(self) -> None:
-        time.sleep(5.0 if self._failed_pin_auth > 5 else 0.5)
-        self._failed_pin_auth += 1
+        with self._failed_pin_auth.get_lock():
+            count = self._failed_pin_auth.value
+            self._failed_pin_auth.value = count + 1
+
+        time.sleep(5.0 if count > 5 else 0.5)
 
     def pin_auth(self, request: Request) -> Response:
         """Authenticates with the pin."""
+        if not self.check_host_trust(request.environ):
+            return SecurityError()  # type: ignore[return-value]
+
         exhausted = False
         auth = False
         trust = self.check_pin_trust(request.environ)
@@ -459,7 +487,7 @@ class DebuggedApplication:
             auth = True
 
         # If we failed too many times, then we're locked out.
-        elif self._failed_pin_auth > 10:
+        elif self._failed_pin_auth.value > 10:
             exhausted = True
 
         # Otherwise go through pin based authentication
@@ -467,7 +495,7 @@ class DebuggedApplication:
             entered_pin = request.args["pin"]
 
             if entered_pin.strip().replace("-", "") == pin.replace("-", ""):
-                self._failed_pin_auth = 0
+                self._failed_pin_auth.value = 0
                 auth = True
             else:
                 self._fail_pin_auth()
@@ -488,8 +516,11 @@ class DebuggedApplication:
             rv.delete_cookie(self.pin_cookie_name)
         return rv
 
-    def log_pin_request(self) -> Response:
+    def log_pin_request(self, request: Request) -> Response:
         """Log the pin if needed."""
+        if not self.check_host_trust(request.environ):
+            return SecurityError()  # type: ignore[return-value]
+
         if self.pin_logging and self.pin is not None:
             _log(
                 "info", " * To enable the debugger you need to enter the security pin:"
@@ -516,7 +547,7 @@ class DebuggedApplication:
             elif cmd == "pinauth" and secret == self.secret:
                 response = self.pin_auth(request)  # type: ignore
             elif cmd == "printpin" and secret == self.secret:
-                response = self.log_pin_request()  # type: ignore
+                response = self.log_pin_request(request)  # type: ignore
             elif (
                 self.evalex
                 and cmd is not None
diff --git a/libs/werkzeug/debug/console.py b/libs/werkzeug/debug/console.py
index 03ddc07f2..4e40475a5 100644
--- a/libs/werkzeug/debug/console.py
+++ b/libs/werkzeug/debug/console.py
@@ -13,7 +13,7 @@ from .repr import dump
 from .repr import helper
 
 _stream: ContextVar[HTMLStringO] = ContextVar("werkzeug.debug.console.stream")
-_ipy: ContextVar = ContextVar("werkzeug.debug.console.ipy")
+_ipy: ContextVar[_InteractiveConsole] = ContextVar("werkzeug.debug.console.ipy")
 
 
 class HTMLStringO:
diff --git a/libs/werkzeug/debug/repr.py b/libs/werkzeug/debug/repr.py
index 3bf15a77a..2bbd9d546 100644
--- a/libs/werkzeug/debug/repr.py
+++ b/libs/werkzeug/debug/repr.py
@@ -4,6 +4,7 @@ repr, these expose more information and produce HTML instead of ASCII.
 Together with the CSS and JavaScript of the debugger this gives a
 colorful and more compact output.
 """
+
 from __future__ import annotations
 
 import codecs
@@ -80,9 +81,7 @@ class _Helper:
 helper = _Helper()
 
 
-def _add_subclass_info(
-    inner: str, obj: object, base: t.Type | tuple[t.Type, ...]
-) -> str:
+def _add_subclass_info(inner: str, obj: object, base: type | tuple[type, ...]) -> str:
     if isinstance(base, tuple):
         for cls in base:
             if type(obj) is cls:
@@ -96,9 +95,9 @@ def _add_subclass_info(
 
 
 def _sequence_repr_maker(
-    left: str, right: str, base: t.Type, limit: int = 8
-) -> t.Callable[[DebugReprGenerator, t.Iterable, bool], str]:
-    def proxy(self: DebugReprGenerator, obj: t.Iterable, recursive: bool) -> str:
+    left: str, right: str, base: type, limit: int = 8
+) -> t.Callable[[DebugReprGenerator, t.Iterable[t.Any], bool], str]:
+    def proxy(self: DebugReprGenerator, obj: t.Iterable[t.Any], recursive: bool) -> str:
         if recursive:
             return _add_subclass_info(f"{left}...{right}", obj, base)
         buf = [left]
@@ -130,7 +129,7 @@ class DebugReprGenerator:
         '<span class="module">collections.</span>deque([', "])", deque
     )
 
-    def regex_repr(self, obj: t.Pattern) -> str:
+    def regex_repr(self, obj: t.Pattern[t.AnyStr]) -> str:
         pattern = repr(obj.pattern)
         pattern = codecs.decode(pattern, "unicode-escape", "ignore")
         pattern = f"r{pattern}"
@@ -188,7 +187,7 @@ class DebugReprGenerator:
         buf.append("}")
         return _add_subclass_info("".join(buf), d, dict)
 
-    def object_repr(self, obj: type[dict] | t.Callable | type[list] | None) -> str:
+    def object_repr(self, obj: t.Any) -> str:
         r = repr(obj)
         return f'<span class="object">{escape(r)}</span>'
 
diff --git a/libs/werkzeug/debug/shared/debugger.js b/libs/werkzeug/debug/shared/debugger.js
index f463e9c77..809b14a6e 100644
--- a/libs/werkzeug/debug/shared/debugger.js
+++ b/libs/werkzeug/debug/shared/debugger.js
@@ -37,18 +37,22 @@ function wrapPlainTraceback() {
   plainTraceback.replaceWith(wrapper);
 }
 
+function makeDebugURL(args) {
+  const params = new URLSearchParams(args)
+  params.set("s", SECRET)
+  return `?__debugger__=yes&${params}`
+}
+
 function initPinBox() {
   document.querySelector(".pin-prompt form").addEventListener(
     "submit",
     function (event) {
       event.preventDefault();
-      const pin = encodeURIComponent(this.pin.value);
-      const encodedSecret = encodeURIComponent(SECRET);
       const btn = this.btn;
       btn.disabled = true;
 
       fetch(
-        `${document.location.pathname}?__debugger__=yes&cmd=pinauth&pin=${pin}&s=${encodedSecret}`
+        makeDebugURL({cmd: "pinauth", pin: this.pin.value})
       )
         .then((res) => res.json())
         .then(({auth, exhausted}) => {
@@ -77,10 +81,7 @@ function initPinBox() {
 
 function promptForPin() {
   if (!EVALEX_TRUSTED) {
-    const encodedSecret = encodeURIComponent(SECRET);
-    fetch(
-      `${document.location.pathname}?__debugger__=yes&cmd=printpin&s=${encodedSecret}`
-    );
+    fetch(makeDebugURL({cmd: "printpin"}));
     const pinPrompt = document.getElementsByClassName("pin-prompt")[0];
     fadeIn(pinPrompt);
     document.querySelector('.pin-prompt input[name="pin"]').focus();
@@ -237,7 +238,7 @@ function createConsoleInput() {
 
 function createIconForConsole() {
   const img = document.createElement("img");
-  img.setAttribute("src", "?__debugger__=yes&cmd=resource&f=console.png");
+  img.setAttribute("src", makeDebugURL({cmd: "resource", f: "console.png"}));
   img.setAttribute("title", "Open an interactive python shell in this frame");
   return img;
 }
@@ -263,24 +264,7 @@ function handleConsoleSubmit(e, command, frameID) {
   e.preventDefault();
 
   return new Promise((resolve) => {
-    // Get input command.
-    const cmd = command.value;
-
-    // Setup GET request.
-    const urlPath = "";
-    const params = {
-      __debugger__: "yes",
-      cmd: cmd,
-      frm: frameID,
-      s: SECRET,
-    };
-    const paramString = Object.keys(params)
-      .map((key) => {
-        return "&" + encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
-      })
-      .join("");
-
-    fetch(urlPath + "?" + paramString)
+    fetch(makeDebugURL({cmd: command.value, frm: frameID}))
       .then((res) => {
         return res.text();
       })
diff --git a/libs/werkzeug/debug/tbtools.py b/libs/werkzeug/debug/tbtools.py
index c45f56ef0..e81ed6e18 100644
--- a/libs/werkzeug/debug/tbtools.py
+++ b/libs/werkzeug/debug/tbtools.py
@@ -187,7 +187,7 @@ def _process_traceback(
 
         if hasattr(fs, "colno"):
             frame_args["colno"] = fs.colno
-            frame_args["end_colno"] = fs.end_colno  # type: ignore[attr-defined]
+            frame_args["end_colno"] = fs.end_colno
 
         new_stack.append(DebugFrameSummary(**frame_args))
 
@@ -265,7 +265,9 @@ class DebugTraceback:
     @cached_property
     def all_frames(self) -> list[DebugFrameSummary]:
         return [
-            f for _, te in self.all_tracebacks for f in te.stack  # type: ignore[misc]
+            f  # type: ignore[misc]
+            for _, te in self.all_tracebacks
+            for f in te.stack
         ]
 
     def render_traceback_text(self) -> str:
@@ -294,7 +296,12 @@ class DebugTraceback:
 
                 rows.append("\n".join(row_parts))
 
-        is_syntax_error = issubclass(self._te.exc_type, SyntaxError)
+        if sys.version_info < (3, 13):
+            exc_type_str = self._te.exc_type.__name__
+        else:
+            exc_type_str = self._te.exc_type_str
+
+        is_syntax_error = exc_type_str == "SyntaxError"
 
         if include_title:
             if is_syntax_error:
@@ -323,13 +330,19 @@ class DebugTraceback:
     ) -> str:
         exc_lines = list(self._te.format_exception_only())
         plaintext = "".join(self._te.format())
+
+        if sys.version_info < (3, 13):
+            exc_type_str = self._te.exc_type.__name__
+        else:
+            exc_type_str = self._te.exc_type_str
+
         return PAGE_HTML % {
             "evalex": "true" if evalex else "false",
             "evalex_trusted": "true" if evalex_trusted else "false",
             "console": "false",
             "title": escape(exc_lines[0]),
             "exception": escape("".join(exc_lines)),
-            "exception_type": escape(self._te.exc_type.__name__),
+            "exception_type": escape(exc_type_str),
             "summary": self.render_traceback_html(include_title=False),
             "plaintext": escape(plaintext),
             "plaintext_cs": re.sub("-{2,}", "-", plaintext),
diff --git a/libs/werkzeug/exceptions.py b/libs/werkzeug/exceptions.py
index 253612918..6ce7ef955 100644
--- a/libs/werkzeug/exceptions.py
+++ b/libs/werkzeug/exceptions.py
@@ -43,6 +43,7 @@ code, you can add a second except for a specific subclass of an error:
             return e
 
 """
+
 from __future__ import annotations
 
 import typing as t
@@ -56,6 +57,7 @@ from ._internal import _get_environ
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import StartResponse
     from _typeshed.wsgi import WSGIEnvironment
+
     from .datastructures import WWWAuthenticate
     from .sansio.response import Response
     from .wrappers.request import Request as WSGIRequest
@@ -94,7 +96,7 @@ class HTTPException(Exception):
     def get_description(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> str:
         """Get the description."""
         if self.description is None:
@@ -108,7 +110,7 @@ class HTTPException(Exception):
     def get_body(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> str:
         """Get the HTML body."""
         return (
@@ -122,7 +124,7 @@ class HTTPException(Exception):
     def get_headers(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> list[tuple[str, str]]:
         """Get a list of headers."""
         return [("Content-Type", "text/html; charset=utf-8")]
@@ -130,7 +132,7 @@ class HTTPException(Exception):
     def get_response(
         self,
         environ: WSGIEnvironment | WSGIRequest | None = None,
-        scope: dict | 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.
@@ -312,7 +314,7 @@ class Unauthorized(HTTPException):
     def get_headers(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> list[tuple[str, str]]:
         headers = super().get_headers(environ, scope)
         if self.www_authenticate:
@@ -376,7 +378,7 @@ class MethodNotAllowed(HTTPException):
     def get_headers(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> list[tuple[str, str]]:
         headers = super().get_headers(environ, scope)
         if self.valid_methods:
@@ -536,7 +538,7 @@ class RequestedRangeNotSatisfiable(HTTPException):
     def get_headers(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> list[tuple[str, str]]:
         headers = super().get_headers(environ, scope)
         if self.length is not None:
@@ -645,7 +647,7 @@ class _RetryAfter(HTTPException):
     def get_headers(
         self,
         environ: WSGIEnvironment | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> list[tuple[str, str]]:
         headers = super().get_headers(environ, scope)
 
diff --git a/libs/werkzeug/formparser.py b/libs/werkzeug/formparser.py
index ee30666dd..3c6875e26 100644
--- a/libs/werkzeug/formparser.py
+++ b/libs/werkzeug/formparser.py
@@ -30,9 +30,12 @@ except ImportError:
 
 if t.TYPE_CHECKING:
     import typing as te
+
     from _typeshed.wsgi import WSGIEnvironment
 
-    t_parse_result = t.Tuple[t.IO[bytes], MultiDict, MultiDict]
+    t_parse_result = t.Tuple[
+        t.IO[bytes], MultiDict[str, str], MultiDict[str, FileStorage]
+    ]
 
     class TStreamFactory(te.Protocol):
         def __call__(
@@ -41,8 +44,7 @@ if t.TYPE_CHECKING:
             content_type: str | None,
             filename: str | None,
             content_length: int | None = None,
-        ) -> t.IO[bytes]:
-            ...
+        ) -> t.IO[bytes]: ...
 
 
 F = t.TypeVar("F", bound=t.Callable[..., t.Any])
@@ -69,7 +71,7 @@ def parse_form_data(
     stream_factory: TStreamFactory | None = None,
     max_form_memory_size: int | None = None,
     max_content_length: int | None = None,
-    cls: type[MultiDict] | None = None,
+    cls: type[MultiDict[str, t.Any]] | None = None,
     silent: bool = True,
     *,
     max_form_parts: int | None = None,
@@ -170,7 +172,7 @@ class FormDataParser:
         stream_factory: TStreamFactory | None = None,
         max_form_memory_size: int | None = None,
         max_content_length: int | None = None,
-        cls: type[MultiDict] | None = None,
+        cls: type[MultiDict[str, t.Any]] | None = None,
         silent: bool = True,
         *,
         max_form_parts: int | None = None,
@@ -184,7 +186,7 @@ class FormDataParser:
         self.max_form_parts = max_form_parts
 
         if cls is None:
-            cls = MultiDict
+            cls = t.cast("type[MultiDict[str, t.Any]]", MultiDict)
 
         self.cls = cls
         self.silent = silent
@@ -279,15 +281,11 @@ class FormDataParser:
         ):
             raise RequestEntityTooLarge()
 
-        try:
-            items = parse_qsl(
-                stream.read().decode(),
-                keep_blank_values=True,
-                errors="werkzeug.url_quote",
-            )
-        except ValueError as e:
-            raise RequestEntityTooLarge() from e
-
+        items = parse_qsl(
+            stream.read().decode(),
+            keep_blank_values=True,
+            errors="werkzeug.url_quote",
+        )
         return stream, self.cls(items), self.cls()
 
 
@@ -296,7 +294,7 @@ class MultiPartParser:
         self,
         stream_factory: TStreamFactory | None = None,
         max_form_memory_size: int | None = None,
-        cls: type[MultiDict] | None = None,
+        cls: type[MultiDict[str, t.Any]] | None = None,
         buffer_size: int = 64 * 1024,
         max_form_parts: int | None = None,
     ) -> None:
@@ -309,7 +307,7 @@ class MultiPartParser:
         self.stream_factory = stream_factory
 
         if cls is None:
-            cls = MultiDict
+            cls = t.cast("type[MultiDict[str, t.Any]]", MultiDict)
 
         self.cls = cls
         self.buffer_size = buffer_size
@@ -352,8 +350,9 @@ class MultiPartParser:
 
     def parse(
         self, stream: t.IO[bytes], boundary: bytes, content_length: int | None
-    ) -> tuple[MultiDict, MultiDict]:
+    ) -> tuple[MultiDict[str, str], MultiDict[str, FileStorage]]:
         current_part: Field | File
+        field_size: int | None = None
         container: t.IO[bytes] | list[bytes]
         _write: t.Callable[[bytes], t.Any]
 
@@ -372,13 +371,23 @@ class MultiPartParser:
             while not isinstance(event, (Epilogue, NeedData)):
                 if isinstance(event, Field):
                     current_part = event
+                    field_size = 0
                     container = []
                     _write = container.append
                 elif isinstance(event, File):
                     current_part = event
+                    field_size = None
                     container = self.start_file_streaming(event, content_length)
                     _write = container.write
                 elif isinstance(event, Data):
+                    if self.max_form_memory_size is not None and field_size is not None:
+                        # Ensure that accumulated data events do not exceed limit.
+                        # Also checked within single event in MultipartDecoder.
+                        field_size += len(event.data)
+
+                        if field_size > self.max_form_memory_size:
+                            raise RequestEntityTooLarge()
+
                     _write(event.data)
                     if not event.more_data:
                         if isinstance(current_part, Field):
diff --git a/libs/werkzeug/http.py b/libs/werkzeug/http.py
index 8280f51fa..cb8bc2581 100644
--- a/libs/werkzeug/http.py
+++ b/libs/werkzeug/http.py
@@ -157,19 +157,19 @@ def quote_header_value(value: t.Any, allow_token: bool = True) -> str:
 
     .. versionadded:: 0.5
     """
-    value = str(value)
+    value_str = str(value)
 
-    if not value:
+    if not value_str:
         return '""'
 
     if allow_token:
         token_chars = _token_chars
 
-        if token_chars.issuperset(value):
-            return value
+        if token_chars.issuperset(value_str):
+            return value_str
 
-    value = value.replace("\\", "\\\\").replace('"', '\\"')
-    return f'"{value}"'
+    value_str = value_str.replace("\\", "\\\\").replace('"', '\\"')
+    return f'"{value_str}"'
 
 
 def unquote_header_value(value: str) -> str:
@@ -361,6 +361,10 @@ def parse_dict_header(value: str) -> dict[str, str | None]:
         key, has_value, value = item.partition("=")
         key = key.strip()
 
+        if not key:
+            # =value is not valid
+            continue
+
         if not has_value:
             result[key] = None
             continue
@@ -395,22 +399,8 @@ def parse_dict_header(value: str) -> dict[str, str | None]:
 
 
 # https://httpwg.org/specs/rfc9110.html#parameter
-_parameter_re = re.compile(
-    r"""
-    # don't match multiple empty parts, that causes backtracking
-    \s*;\s*  # find the part delimiter
-    (?:
-        ([\w!#$%&'*+\-.^`|~]+)  # key, one or more token chars
-        =  # equals, with no space on either side
-        (  # value, token or quoted string
-            [\w!#$%&'*+\-.^`|~]+  # one or more token chars
-        |
-            "(?:\\\\|\\"|.)*?"  # quoted string, consuming slash escapes
-        )
-    )?  # optionally match key=value, to account for empty parts
-    """,
-    re.ASCII | re.VERBOSE,
-)
+_parameter_key_re = re.compile(r"([\w!#$%&'*+\-.^`|~]+)=", flags=re.ASCII)
+_parameter_token_value_re = re.compile(r"[\w!#$%&'*+\-.^`|~]+", flags=re.ASCII)
 # https://www.rfc-editor.org/rfc/rfc2231#section-4
 _charset_value_re = re.compile(
     r"""
@@ -492,18 +482,49 @@ def parse_options_header(value: str | None) -> tuple[str, dict[str, str]]:
         # empty (invalid) value, or value without options
         return value, {}
 
-    rest = f";{rest}"
+    # Collect all valid key=value parts without processing the value.
+    parts: list[tuple[str, str]] = []
+
+    while True:
+        if (m := _parameter_key_re.match(rest)) is not None:
+            pk = m.group(1).lower()
+            rest = rest[m.end() :]
+
+            # Value may be a token.
+            if (m := _parameter_token_value_re.match(rest)) is not None:
+                parts.append((pk, m.group()))
+
+            # Value may be a quoted string, find the closing quote.
+            elif rest[:1] == '"':
+                pos = 1
+                length = len(rest)
+
+                while pos < length:
+                    if rest[pos : pos + 2] in {"\\\\", '\\"'}:
+                        # Consume escaped slashes and quotes.
+                        pos += 2
+                    elif rest[pos] == '"':
+                        # Stop at an unescaped quote.
+                        parts.append((pk, rest[: pos + 1]))
+                        rest = rest[pos + 1 :]
+                        break
+                    else:
+                        # Consume any other character.
+                        pos += 1
+
+        # Find the next section delimited by `;`, if any.
+        if (end := rest.find(";")) == -1:
+            break
+
+        rest = rest[end + 1 :].lstrip()
+
     options: dict[str, str] = {}
     encoding: str | None = None
     continued_encoding: str | None = None
 
-    for pk, pv in _parameter_re.findall(rest):
-        if not pk:
-            # empty or invalid part
-            continue
-
-        pk = pk.lower()
-
+    # For each collected part, process optional charset and continuation,
+    # unquote quoted values.
+    for pk, pv in parts:
         if pk[-1] == "*":
             # key*=charset''value becomes key=value, where value is percent encoded
             pk = pk[:-1]
@@ -553,13 +574,11 @@ _TAnyAccept = t.TypeVar("_TAnyAccept", bound="ds.Accept")
 
 
 @t.overload
-def parse_accept_header(value: str | None) -> ds.Accept:
-    ...
+def parse_accept_header(value: str | None) -> ds.Accept: ...
 
 
 @t.overload
-def parse_accept_header(value: str | None, cls: type[_TAnyAccept]) -> _TAnyAccept:
-    ...
+def parse_accept_header(value: str | None, cls: type[_TAnyAccept]) -> _TAnyAccept: ...
 
 
 def parse_accept_header(
@@ -616,26 +635,26 @@ def parse_accept_header(
 
 
 _TAnyCC = t.TypeVar("_TAnyCC", bound="ds.cache_control._CacheControl")
-_t_cc_update = t.Optional[t.Callable[[_TAnyCC], None]]
 
 
 @t.overload
 def parse_cache_control_header(
-    value: str | None, on_update: _t_cc_update, cls: None = None
-) -> ds.RequestCacheControl:
-    ...
+    value: str | None,
+    on_update: t.Callable[[ds.cache_control._CacheControl], None] | None = None,
+) -> ds.RequestCacheControl: ...
 
 
 @t.overload
 def parse_cache_control_header(
-    value: str | None, on_update: _t_cc_update, cls: type[_TAnyCC]
-) -> _TAnyCC:
-    ...
+    value: str | None,
+    on_update: t.Callable[[ds.cache_control._CacheControl], None] | None = None,
+    cls: type[_TAnyCC] = ...,
+) -> _TAnyCC: ...
 
 
 def parse_cache_control_header(
     value: str | None,
-    on_update: _t_cc_update = None,
+    on_update: t.Callable[[ds.cache_control._CacheControl], None] | None = None,
     cls: type[_TAnyCC] | None = None,
 ) -> _TAnyCC:
     """Parse a cache control header.  The RFC differs between response and
@@ -655,7 +674,7 @@ def parse_cache_control_header(
     :return: a `cls` object.
     """
     if cls is None:
-        cls = t.cast(t.Type[_TAnyCC], ds.RequestCacheControl)
+        cls = t.cast("type[_TAnyCC]", ds.RequestCacheControl)
 
     if not value:
         return cls((), on_update)
@@ -664,26 +683,26 @@ def parse_cache_control_header(
 
 
 _TAnyCSP = t.TypeVar("_TAnyCSP", bound="ds.ContentSecurityPolicy")
-_t_csp_update = t.Optional[t.Callable[[_TAnyCSP], None]]
 
 
 @t.overload
 def parse_csp_header(
-    value: str | None, on_update: _t_csp_update, cls: None = None
-) -> ds.ContentSecurityPolicy:
-    ...
+    value: str | None,
+    on_update: t.Callable[[ds.ContentSecurityPolicy], None] | None = None,
+) -> ds.ContentSecurityPolicy: ...
 
 
 @t.overload
 def parse_csp_header(
-    value: str | None, on_update: _t_csp_update, cls: type[_TAnyCSP]
-) -> _TAnyCSP:
-    ...
+    value: str | None,
+    on_update: t.Callable[[ds.ContentSecurityPolicy], None] | None = None,
+    cls: type[_TAnyCSP] = ...,
+) -> _TAnyCSP: ...
 
 
 def parse_csp_header(
     value: str | None,
-    on_update: _t_csp_update = None,
+    on_update: t.Callable[[ds.ContentSecurityPolicy], None] | None = None,
     cls: type[_TAnyCSP] | None = None,
 ) -> _TAnyCSP:
     """Parse a Content Security Policy header.
@@ -699,7 +718,7 @@ def parse_csp_header(
     :return: a `cls` object.
     """
     if cls is None:
-        cls = t.cast(t.Type[_TAnyCSP], ds.ContentSecurityPolicy)
+        cls = t.cast("type[_TAnyCSP]", ds.ContentSecurityPolicy)
 
     if value is None:
         return cls((), on_update)
@@ -1160,7 +1179,7 @@ def is_hop_by_hop_header(header: str) -> bool:
 
 def parse_cookie(
     header: WSGIEnvironment | str | None,
-    cls: type[ds.MultiDict] | None = None,
+    cls: type[ds.MultiDict[str, str]] | None = None,
 ) -> ds.MultiDict[str, str]:
     """Parse a cookie from a string or WSGI environ.
 
diff --git a/libs/werkzeug/local.py b/libs/werkzeug/local.py
index fba80e974..302589bba 100644
--- a/libs/werkzeug/local.py
+++ b/libs/werkzeug/local.py
@@ -20,7 +20,7 @@ T = t.TypeVar("T")
 F = t.TypeVar("F", bound=t.Callable[..., t.Any])
 
 
-def release_local(local: Local | LocalStack) -> None:
+def release_local(local: Local | LocalStack[t.Any]) -> None:
     """Release the data for the current context in a :class:`Local` or
     :class:`LocalStack` without using a :class:`LocalManager`.
 
@@ -64,7 +64,9 @@ class Local:
     def __iter__(self) -> t.Iterator[tuple[str, t.Any]]:
         return iter(self.__storage.get({}).items())
 
-    def __call__(self, name: str, *, unbound_message: str | None = None) -> LocalProxy:
+    def __call__(
+        self, name: str, *, unbound_message: str | None = None
+    ) -> LocalProxy[t.Any]:
         """Create a :class:`LocalProxy` that access an attribute on this
         local namespace.
 
@@ -169,7 +171,7 @@ class LocalStack(t.Generic[T]):
 
     def __call__(
         self, name: str | None = None, *, unbound_message: str | None = None
-    ) -> LocalProxy:
+    ) -> LocalProxy[t.Any]:
         """Create a :class:`LocalProxy` that accesses the top of this
         local stack.
 
@@ -205,7 +207,8 @@ class LocalManager:
 
     def __init__(
         self,
-        locals: None | (Local | LocalStack | t.Iterable[Local | LocalStack]) = None,
+        locals: None
+        | (Local | LocalStack[t.Any] | t.Iterable[Local | LocalStack[t.Any]]) = None,
     ) -> None:
         if locals is None:
             self.locals = []
@@ -269,23 +272,27 @@ class _ProxyLookup:
 
     def __init__(
         self,
-        f: t.Callable | None = None,
-        fallback: t.Callable | None = None,
+        f: t.Callable[..., t.Any] | None = None,
+        fallback: t.Callable[[LocalProxy[t.Any]], t.Any] | None = None,
         class_value: t.Any | None = None,
         is_attr: bool = False,
     ) -> None:
-        bind_f: t.Callable[[LocalProxy, t.Any], t.Callable] | None
+        bind_f: t.Callable[[LocalProxy[t.Any], t.Any], t.Callable[..., t.Any]] | None
 
         if hasattr(f, "__get__"):
             # A Python function, can be turned into a bound method.
 
-            def bind_f(instance: LocalProxy, obj: t.Any) -> t.Callable:
+            def bind_f(
+                instance: LocalProxy[t.Any], obj: t.Any
+            ) -> t.Callable[..., t.Any]:
                 return f.__get__(obj, type(obj))  # type: ignore
 
         elif f is not None:
             # A C function, use partial to bind the first argument.
 
-            def bind_f(instance: LocalProxy, obj: t.Any) -> t.Callable:
+            def bind_f(
+                instance: LocalProxy[t.Any], obj: t.Any
+            ) -> t.Callable[..., t.Any]:
                 return partial(f, obj)
 
         else:
@@ -297,10 +304,10 @@ class _ProxyLookup:
         self.class_value = class_value
         self.is_attr = is_attr
 
-    def __set_name__(self, owner: LocalProxy, name: str) -> None:
+    def __set_name__(self, owner: LocalProxy[t.Any], name: str) -> None:
         self.name = name
 
-    def __get__(self, instance: LocalProxy, owner: type | None = None) -> t.Any:
+    def __get__(self, instance: LocalProxy[t.Any], owner: type | None = None) -> t.Any:
         if instance is None:
             if self.class_value is not None:
                 return self.class_value
@@ -330,7 +337,9 @@ class _ProxyLookup:
     def __repr__(self) -> str:
         return f"proxy {self.name}"
 
-    def __call__(self, instance: LocalProxy, *args: t.Any, **kwargs: t.Any) -> t.Any:
+    def __call__(
+        self, instance: LocalProxy[t.Any], *args: t.Any, **kwargs: t.Any
+    ) -> t.Any:
         """Support calling unbound methods from the class. For example,
         this happens with ``copy.copy``, which does
         ``type(x).__copy__(x)``. ``type(x)`` can't be proxied, so it
@@ -347,12 +356,14 @@ class _ProxyIOp(_ProxyLookup):
     __slots__ = ()
 
     def __init__(
-        self, f: t.Callable | None = None, fallback: t.Callable | None = None
+        self,
+        f: t.Callable[..., t.Any] | None = None,
+        fallback: t.Callable[[LocalProxy[t.Any]], t.Any] | None = None,
     ) -> None:
         super().__init__(f, fallback)
 
-        def bind_f(instance: LocalProxy, obj: t.Any) -> t.Callable:
-            def i_op(self: t.Any, other: t.Any) -> LocalProxy:
+        def bind_f(instance: LocalProxy[t.Any], obj: t.Any) -> t.Callable[..., t.Any]:
+            def i_op(self: t.Any, other: t.Any) -> LocalProxy[t.Any]:
                 f(self, other)  # type: ignore
                 return instance
 
@@ -520,32 +531,33 @@ class LocalProxy(t.Generic[T]):
         object.__setattr__(self, "_LocalProxy__wrapped", local)
         object.__setattr__(self, "_get_current_object", _get_current_object)
 
-    __doc__ = _ProxyLookup(  # type: ignore
+    __doc__ = _ProxyLookup(  # type: ignore[assignment]
         class_value=__doc__, fallback=lambda self: type(self).__doc__, is_attr=True
     )
     __wrapped__ = _ProxyLookup(
-        fallback=lambda self: self._LocalProxy__wrapped, is_attr=True
+        fallback=lambda self: self._LocalProxy__wrapped,  # type: ignore[attr-defined]
+        is_attr=True,
     )
     # __del__ should only delete the proxy
-    __repr__ = _ProxyLookup(  # type: ignore
+    __repr__ = _ProxyLookup(  # type: ignore[assignment]
         repr, fallback=lambda self: f"<{type(self).__name__} unbound>"
     )
-    __str__ = _ProxyLookup(str)  # type: ignore
+    __str__ = _ProxyLookup(str)  # type: ignore[assignment]
     __bytes__ = _ProxyLookup(bytes)
-    __format__ = _ProxyLookup()  # type: ignore
+    __format__ = _ProxyLookup()  # type: ignore[assignment]
     __lt__ = _ProxyLookup(operator.lt)
     __le__ = _ProxyLookup(operator.le)
-    __eq__ = _ProxyLookup(operator.eq)  # type: ignore
-    __ne__ = _ProxyLookup(operator.ne)  # type: ignore
+    __eq__ = _ProxyLookup(operator.eq)  # type: ignore[assignment]
+    __ne__ = _ProxyLookup(operator.ne)  # type: ignore[assignment]
     __gt__ = _ProxyLookup(operator.gt)
     __ge__ = _ProxyLookup(operator.ge)
-    __hash__ = _ProxyLookup(hash)  # type: ignore
+    __hash__ = _ProxyLookup(hash)  # type: ignore[assignment]
     __bool__ = _ProxyLookup(bool, fallback=lambda self: False)
     __getattr__ = _ProxyLookup(getattr)
     # __getattribute__ triggered through __getattr__
-    __setattr__ = _ProxyLookup(setattr)  # type: ignore
-    __delattr__ = _ProxyLookup(delattr)  # type: ignore
-    __dir__ = _ProxyLookup(dir, fallback=lambda self: [])  # type: ignore
+    __setattr__ = _ProxyLookup(setattr)  # type: ignore[assignment]
+    __delattr__ = _ProxyLookup(delattr)  # type: ignore[assignment]
+    __dir__ = _ProxyLookup(dir, fallback=lambda self: [])  # type: ignore[assignment]
     # __get__ (proxying descriptor not supported)
     # __set__ (descriptor)
     # __delete__ (descriptor)
@@ -556,9 +568,7 @@ class LocalProxy(t.Generic[T]):
     # __weakref__ (__getattr__)
     # __init_subclass__ (proxying metaclass not supported)
     # __prepare__ (metaclass)
-    __class__ = _ProxyLookup(
-        fallback=lambda self: type(self), is_attr=True
-    )  # type: ignore
+    __class__ = _ProxyLookup(fallback=lambda self: type(self), is_attr=True)  # type: ignore[assignment]
     __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/dispatcher.py b/libs/werkzeug/middleware/dispatcher.py
index 559fea585..e11bacc52 100644
--- a/libs/werkzeug/middleware/dispatcher.py
+++ b/libs/werkzeug/middleware/dispatcher.py
@@ -30,6 +30,7 @@ and the static files would be served directly by the HTTP server.
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
 import typing as t
diff --git a/libs/werkzeug/middleware/http_proxy.py b/libs/werkzeug/middleware/http_proxy.py
index 59ba9b324..5e239156a 100644
--- a/libs/werkzeug/middleware/http_proxy.py
+++ b/libs/werkzeug/middleware/http_proxy.py
@@ -7,6 +7,7 @@ Basic HTTP Proxy
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
 import typing as t
diff --git a/libs/werkzeug/middleware/lint.py b/libs/werkzeug/middleware/lint.py
index 462959943..de93b526a 100644
--- a/libs/werkzeug/middleware/lint.py
+++ b/libs/werkzeug/middleware/lint.py
@@ -12,6 +12,7 @@ common HTTP errors such as non-empty responses for 304 status codes.
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
 import typing as t
@@ -37,7 +38,7 @@ class HTTPWarning(Warning):
     """Warning class for HTTP warnings."""
 
 
-def check_type(context: str, obj: object, need: t.Type = str) -> None:
+def check_type(context: str, obj: object, need: type = str) -> None:
     if type(obj) is not need:
         warn(
             f"{context!r} requires {need.__name__!r}, got {type(obj).__name__!r}.",
@@ -180,30 +181,44 @@ class GuardedIterator:
                         key
                     ):
                         warn(
-                            f"Entity header {key!r} found in 304 response.", HTTPWarning
+                            f"Entity header {key!r} found in 304 response.",
+                            HTTPWarning,
+                            stacklevel=2,
                         )
                 if bytes_sent:
-                    warn("304 responses must not have a body.", HTTPWarning)
+                    warn(
+                        "304 responses must not have a body.",
+                        HTTPWarning,
+                        stacklevel=2,
+                    )
             elif 100 <= status_code < 200 or status_code == 204:
                 if content_length != 0:
                     warn(
                         f"{status_code} responses must have an empty content length.",
                         HTTPWarning,
+                        stacklevel=2,
                     )
                 if bytes_sent:
-                    warn(f"{status_code} responses must not have a body.", HTTPWarning)
+                    warn(
+                        f"{status_code} responses must not have a body.",
+                        HTTPWarning,
+                        stacklevel=2,
+                    )
             elif content_length is not None and content_length != bytes_sent:
                 warn(
                     "Content-Length and the number of bytes sent to the"
                     " client do not match.",
                     WSGIWarning,
+                    stacklevel=2,
                 )
 
     def __del__(self) -> None:
         if not self.closed:
             try:
                 warn(
-                    "Iterator was garbage collected before it was closed.", WSGIWarning
+                    "Iterator was garbage collected before it was closed.",
+                    WSGIWarning,
+                    stacklevel=2,
                 )
             except Exception:
                 pass
@@ -236,7 +251,7 @@ class LintMiddleware:
         self.app = app
 
     def check_environ(self, environ: WSGIEnvironment) -> None:
-        if type(environ) is not dict:
+        if type(environ) is not dict:  # noqa: E721
             warn(
                 "WSGI environment is not a standard Python dict.",
                 WSGIWarning,
@@ -304,14 +319,14 @@ class LintMiddleware:
         if status_code < 100:
             warn("Status code < 100 detected.", WSGIWarning, stacklevel=3)
 
-        if type(headers) is not list:
+        if type(headers) is not list:  # noqa: E721
             warn("Header list is not a list.", WSGIWarning, stacklevel=3)
 
         for item in headers:
             if type(item) is not tuple or len(item) != 2:
                 warn("Header items must be 2-item tuples.", WSGIWarning, stacklevel=3)
             name, value = item
-            if type(name) is not str or type(value) is not str:
+            if type(name) is not str or type(value) is not str:  # noqa: E721
                 warn(
                     "Header keys and values must be strings.", WSGIWarning, stacklevel=3
                 )
@@ -326,10 +341,10 @@ class LintMiddleware:
         if exc_info is not None and not isinstance(exc_info, tuple):
             warn("Invalid value for exc_info.", WSGIWarning, stacklevel=3)
 
-        headers = Headers(headers)
-        self.check_headers(headers)
+        headers_obj = Headers(headers)
+        self.check_headers(headers_obj)
 
-        return status_code, headers
+        return status_code, headers_obj
 
     def check_headers(self, headers: Headers) -> None:
         etag = headers.get("etag")
@@ -402,13 +417,17 @@ class LintMiddleware:
                 )
 
             if kwargs:
-                warn("'start_response' does not take keyword arguments.", WSGIWarning)
+                warn(
+                    "'start_response' does not take keyword arguments.",
+                    WSGIWarning,
+                    stacklevel=2,
+                )
 
             status: str = args[0]
             headers: list[tuple[str, str]] = args[1]
-            exc_info: None | (
-                tuple[type[BaseException], BaseException, TracebackType]
-            ) = (args[2] if len(args) == 3 else None)
+            exc_info: (
+                None | (tuple[type[BaseException], BaseException, TracebackType])
+            ) = args[2] if len(args) == 3 else None
 
             headers_set[:] = self.check_start_response(status, headers, exc_info)
             return GuardedWrite(start_response(status, headers, exc_info), chunks)
diff --git a/libs/werkzeug/middleware/profiler.py b/libs/werkzeug/middleware/profiler.py
index 1120c83ef..112b87776 100644
--- a/libs/werkzeug/middleware/profiler.py
+++ b/libs/werkzeug/middleware/profiler.py
@@ -11,6 +11,7 @@ that may be slowing down your application.
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
 import os.path
diff --git a/libs/werkzeug/middleware/proxy_fix.py b/libs/werkzeug/middleware/proxy_fix.py
index 8dfbb36c0..cbf4e0bae 100644
--- a/libs/werkzeug/middleware/proxy_fix.py
+++ b/libs/werkzeug/middleware/proxy_fix.py
@@ -21,6 +21,7 @@ setting each header so the middleware knows what to trust.
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
 import typing as t
diff --git a/libs/werkzeug/middleware/shared_data.py b/libs/werkzeug/middleware/shared_data.py
index e3ec7cab8..0f467f2e2 100644
--- a/libs/werkzeug/middleware/shared_data.py
+++ b/libs/werkzeug/middleware/shared_data.py
@@ -8,8 +8,10 @@ Serve Shared Static Files
 :copyright: 2007 Pallets
 :license: BSD-3-Clause
 """
+
 from __future__ import annotations
 
+import collections.abc as cabc
 import importlib.util
 import mimetypes
 import os
@@ -38,7 +40,6 @@ if t.TYPE_CHECKING:
 
 
 class SharedDataMiddleware:
-
     """A WSGI middleware which provides static content for development
     environments or simple server setups. Its usage is quite simple::
 
@@ -103,7 +104,7 @@ class SharedDataMiddleware:
         self,
         app: WSGIApplication,
         exports: (
-            dict[str, str | tuple[str, str]]
+            cabc.Mapping[str, str | tuple[str, str]]
             | t.Iterable[tuple[str, str | tuple[str, str]]]
         ),
         disallow: None = None,
@@ -116,7 +117,7 @@ class SharedDataMiddleware:
         self.cache = cache
         self.cache_timeout = cache_timeout
 
-        if isinstance(exports, dict):
+        if isinstance(exports, cabc.Mapping):
             exports = exports.items()
 
         for key, value in exports:
@@ -218,9 +219,9 @@ class SharedDataMiddleware:
         return loader
 
     def generate_etag(self, mtime: datetime, file_size: int, real_filename: str) -> str:
-        real_filename = os.fsencode(real_filename)
+        fn_str = os.fsencode(real_filename)
         timestamp = mtime.timestamp()
-        checksum = adler32(real_filename) & 0xFFFFFFFF
+        checksum = adler32(fn_str) & 0xFFFFFFFF
         return f"wzsdm-{timestamp}-{file_size}-{checksum}"
 
     def __call__(
diff --git a/libs/werkzeug/routing/__init__.py b/libs/werkzeug/routing/__init__.py
index 84b043fdf..62adc48fb 100644
--- a/libs/werkzeug/routing/__init__.py
+++ b/libs/werkzeug/routing/__init__.py
@@ -105,6 +105,7 @@ method (for example there were only rules for ``GET`` and ``HEAD`` but
 routing tried to match a ``POST`` request) a ``MethodNotAllowed``
 exception is raised.
 """
+
 from .converters import AnyConverter as AnyConverter
 from .converters import BaseConverter as BaseConverter
 from .converters import FloatConverter as FloatConverter
diff --git a/libs/werkzeug/routing/converters.py b/libs/werkzeug/routing/converters.py
index ce01dd1ea..6016a975e 100644
--- a/libs/werkzeug/routing/converters.py
+++ b/libs/werkzeug/routing/converters.py
@@ -131,7 +131,7 @@ class NumberConverter(BaseConverter):
     """
 
     weight = 50
-    num_convert: t.Callable = int
+    num_convert: t.Callable[[t.Any], t.Any] = int
 
     def __init__(
         self,
@@ -152,18 +152,18 @@ class NumberConverter(BaseConverter):
     def to_python(self, value: str) -> t.Any:
         if self.fixed_digits and len(value) != self.fixed_digits:
             raise ValidationError()
-        value = self.num_convert(value)
-        if (self.min is not None and value < self.min) or (
-            self.max is not None and value > self.max
+        value_num = self.num_convert(value)
+        if (self.min is not None and value_num < self.min) or (
+            self.max is not None and value_num > self.max
         ):
             raise ValidationError()
-        return value
+        return value_num
 
     def to_url(self, value: t.Any) -> str:
-        value = str(self.num_convert(value))
+        value_str = str(self.num_convert(value))
         if self.fixed_digits:
-            value = value.zfill(self.fixed_digits)
-        return value
+            value_str = value_str.zfill(self.fixed_digits)
+        return value_str
 
     @property
     def signed_regex(self) -> str:
diff --git a/libs/werkzeug/routing/exceptions.py b/libs/werkzeug/routing/exceptions.py
index 9d0a5281b..eeabd4ed1 100644
--- a/libs/werkzeug/routing/exceptions.py
+++ b/libs/werkzeug/routing/exceptions.py
@@ -10,10 +10,11 @@ from ..utils import redirect
 
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import WSGIEnvironment
-    from .map import MapAdapter
-    from .rules import Rule
+
     from ..wrappers.request import Request
     from ..wrappers.response import Response
+    from .map import MapAdapter
+    from .rules import Rule
 
 
 class RoutingException(Exception):
@@ -40,7 +41,7 @@ class RequestRedirect(HTTPException, RoutingException):
     def get_response(
         self,
         environ: WSGIEnvironment | Request | None = None,
-        scope: dict | None = None,
+        scope: dict[str, t.Any] | None = None,
     ) -> Response:
         return redirect(self.new_url, self.code)
 
@@ -58,7 +59,7 @@ class RequestPath(RoutingException):
 class RequestAliasRedirect(RoutingException):  # noqa: B903
     """This rule is an alias and wants to redirect to the canonical URL."""
 
-    def __init__(self, matched_values: t.Mapping[str, t.Any], endpoint: str) -> None:
+    def __init__(self, matched_values: t.Mapping[str, t.Any], endpoint: t.Any) -> None:
         super().__init__()
         self.matched_values = matched_values
         self.endpoint = endpoint
@@ -71,7 +72,7 @@ class BuildError(RoutingException, LookupError):
 
     def __init__(
         self,
-        endpoint: str,
+        endpoint: t.Any,
         values: t.Mapping[str, t.Any],
         method: str | None,
         adapter: MapAdapter | None = None,
@@ -92,7 +93,10 @@ class BuildError(RoutingException, LookupError):
                 [
                     0.98
                     * difflib.SequenceMatcher(
-                        None, rule.endpoint, self.endpoint
+                        # endpoints can be any type, compare as strings
+                        None,
+                        str(rule.endpoint),
+                        str(self.endpoint),
                     ).ratio(),
                     0.01 * bool(set(self.values or ()).issubset(rule.arguments)),
                     0.01 * bool(rule.methods and self.method in rule.methods),
diff --git a/libs/werkzeug/routing/map.py b/libs/werkzeug/routing/map.py
index 76bbe2f3b..4d15e8824 100644
--- a/libs/werkzeug/routing/map.py
+++ b/libs/werkzeug/routing/map.py
@@ -32,9 +32,10 @@ from .rules import Rule
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import WSGIApplication
     from _typeshed.wsgi import WSGIEnvironment
+
+    from ..wrappers.request import Request
     from .converters import BaseConverter
     from .rules import RuleFactory
-    from ..wrappers.request import Request
 
 
 class Map:
@@ -103,13 +104,12 @@ class Map:
         host_matching: bool = False,
     ) -> None:
         self._matcher = StateMachineMatcher(merge_slashes)
-        self._rules_by_endpoint: dict[str, list[Rule]] = {}
+        self._rules_by_endpoint: dict[t.Any, list[Rule]] = {}
         self._remap = True
         self._remap_lock = self.lock_class()
 
         self.default_subdomain = default_subdomain
         self.strict_slashes = strict_slashes
-        self.merge_slashes = merge_slashes
         self.redirect_defaults = redirect_defaults
         self.host_matching = host_matching
 
@@ -123,7 +123,15 @@ class Map:
         for rulefactory in rules or ():
             self.add(rulefactory)
 
-    def is_endpoint_expecting(self, endpoint: str, *arguments: str) -> bool:
+    @property
+    def merge_slashes(self) -> bool:
+        return self._matcher.merge_slashes
+
+    @merge_slashes.setter
+    def merge_slashes(self, value: bool) -> None:
+        self._matcher.merge_slashes = value
+
+    def is_endpoint_expecting(self, endpoint: t.Any, *arguments: str) -> bool:
         """Iterate over all rules and check if the endpoint expects
         the arguments provided.  This is for example useful if you have
         some URLs that expect a language code and others that do not and
@@ -137,9 +145,9 @@ class Map:
                           checked.
         """
         self.update()
-        arguments = set(arguments)
+        arguments_set = set(arguments)
         for rule in self._rules_by_endpoint[endpoint]:
-            if arguments.issubset(rule.arguments):
+            if arguments_set.issubset(rule.arguments):
                 return True
         return False
 
@@ -147,7 +155,7 @@ class Map:
     def _rules(self) -> list[Rule]:
         return [rule for rules in self._rules_by_endpoint.values() for rule in rules]
 
-    def iter_rules(self, endpoint: str | None = None) -> t.Iterator[Rule]:
+    def iter_rules(self, endpoint: t.Any | None = None) -> t.Iterator[Rule]:
         """Iterate over all rules or the rules of an endpoint.
 
         :param endpoint: if provided only the rules for that endpoint
@@ -372,7 +380,6 @@ class Map:
 
 
 class MapAdapter:
-
     """Returned by :meth:`Map.bind` or :meth:`Map.bind_to_environ` and does
     the URL matching and building based on runtime information.
     """
@@ -463,15 +470,14 @@ class MapAdapter:
             raise
 
     @t.overload
-    def match(  # type: ignore
+    def match(
         self,
         path_info: str | None = None,
         method: str | None = None,
         return_rule: t.Literal[False] = False,
         query_args: t.Mapping[str, t.Any] | str | None = None,
         websocket: bool | None = None,
-    ) -> tuple[str, t.Mapping[str, t.Any]]:
-        ...
+    ) -> tuple[t.Any, t.Mapping[str, t.Any]]: ...
 
     @t.overload
     def match(
@@ -481,8 +487,7 @@ class MapAdapter:
         return_rule: t.Literal[True] = True,
         query_args: t.Mapping[str, t.Any] | str | None = None,
         websocket: bool | None = None,
-    ) -> tuple[Rule, t.Mapping[str, t.Any]]:
-        ...
+    ) -> tuple[Rule, t.Mapping[str, t.Any]]: ...
 
     def match(
         self,
@@ -491,7 +496,7 @@ class MapAdapter:
         return_rule: bool = False,
         query_args: t.Mapping[str, t.Any] | str | None = None,
         websocket: bool | None = None,
-    ) -> tuple[str | Rule, t.Mapping[str, t.Any]]:
+    ) -> tuple[t.Any | Rule, t.Mapping[str, t.Any]]:
         """The usage is simple: you just pass the match method the current
         path info as well as the method (which defaults to `GET`).  The
         following things can then happen:
@@ -765,7 +770,7 @@ class MapAdapter:
     def make_alias_redirect_url(
         self,
         path: str,
-        endpoint: str,
+        endpoint: t.Any,
         values: t.Mapping[str, t.Any],
         method: str,
         query_args: t.Mapping[str, t.Any] | str,
@@ -781,7 +786,7 @@ class MapAdapter:
 
     def _partial_build(
         self,
-        endpoint: str,
+        endpoint: t.Any,
         values: t.Mapping[str, t.Any],
         method: str | None,
         append_unknown: bool,
@@ -822,7 +827,7 @@ class MapAdapter:
 
     def build(
         self,
-        endpoint: str,
+        endpoint: t.Any,
         values: t.Mapping[str, t.Any] | None = None,
         method: str | None = None,
         force_external: bool = False,
diff --git a/libs/werkzeug/routing/matcher.py b/libs/werkzeug/routing/matcher.py
index 0d1210a67..1fd00efca 100644
--- a/libs/werkzeug/routing/matcher.py
+++ b/libs/werkzeug/routing/matcher.py
@@ -177,7 +177,7 @@ class StateMachineMatcher:
                 rv = _match(self._root, [domain, *path.split("/")], [])
             except SlashRequired:
                 raise RequestPath(f"{path}/") from None
-            if rv is None:
+            if rv is None or rv[0].merge_slashes is False:
                 raise NoMatch(have_match_for, websocket_mismatch)
             else:
                 raise RequestPath(f"{path}")
diff --git a/libs/werkzeug/routing/rules.py b/libs/werkzeug/routing/rules.py
index 5c8184ccb..2dad31dd3 100644
--- a/libs/werkzeug/routing/rules.py
+++ b/libs/werkzeug/routing/rules.py
@@ -67,6 +67,7 @@ _part_re = re.compile(
 _simple_rule_re = re.compile(r"<([^>]+)>")
 _converter_args_re = re.compile(
     r"""
+    \s*
     ((?P<name>\w+)\s*=\s*)?
     (?P<value>
         True|False|
@@ -100,7 +101,7 @@ def _pythonize(value: str) -> None | bool | int | float | str:
         return _PYTHON_CONSTANTS[value]
     for convert in int, float:
         try:
-            return convert(value)  # type: ignore
+            return convert(value)
         except ValueError:
             pass
     if value[:1] == value[-1:] and value[0] in "\"'":
@@ -108,12 +109,18 @@ def _pythonize(value: str) -> None | bool | int | float | str:
     return str(value)
 
 
-def parse_converter_args(argstr: str) -> tuple[t.Tuple, dict[str, t.Any]]:
+def parse_converter_args(argstr: str) -> tuple[tuple[t.Any, ...], dict[str, t.Any]]:
     argstr += ","
     args = []
     kwargs = {}
+    position = 0
 
     for item in _converter_args_re.finditer(argstr):
+        if item.start() != position:
+            raise ValueError(
+                f"Cannot parse converter argument '{argstr[position:item.start()]}'"
+            )
+
         value = item.group("stringval")
         if value is None:
             value = item.group("value")
@@ -123,6 +130,7 @@ def parse_converter_args(argstr: str) -> tuple[t.Tuple, dict[str, t.Any]]:
         else:
             name = item.group("name")
             kwargs[name] = value
+        position = item.end()
 
     return tuple(args), kwargs
 
@@ -286,11 +294,18 @@ class RuleTemplateFactory(RuleFactory):
                 )
 
 
-def _prefix_names(src: str) -> ast.stmt:
+_ASTT = t.TypeVar("_ASTT", bound=ast.AST)
+
+
+def _prefix_names(src: str, expected_type: type[_ASTT]) -> _ASTT:
     """ast parse and prefix names with `.` to avoid collision with user vars"""
-    tree = ast.parse(src).body[0]
+    tree: ast.AST = ast.parse(src).body[0]
     if isinstance(tree, ast.Expr):
-        tree = tree.value  # type: ignore
+        tree = tree.value
+    if not isinstance(tree, expected_type):
+        raise TypeError(
+            f"AST node is of type {type(tree).__name__}, not {expected_type.__name__}"
+        )
     for node in ast.walk(tree):
         if isinstance(node, ast.Name):
             node.id = f".{node.id}"
@@ -305,8 +320,11 @@ if kwargs:
 else:
     q = params = ""
 """
-_IF_KWARGS_URL_ENCODE_AST = _prefix_names(_IF_KWARGS_URL_ENCODE_CODE)
-_URL_ENCODE_AST_NAMES = (_prefix_names("q"), _prefix_names("params"))
+_IF_KWARGS_URL_ENCODE_AST = _prefix_names(_IF_KWARGS_URL_ENCODE_CODE, ast.If)
+_URL_ENCODE_AST_NAMES = (
+    _prefix_names("q", ast.Name),
+    _prefix_names("params", ast.Name),
+)
 
 
 class Rule(RuleFactory):
@@ -445,7 +463,7 @@ class Rule(RuleFactory):
         subdomain: str | None = None,
         methods: t.Iterable[str] | None = None,
         build_only: bool = False,
-        endpoint: str | None = None,
+        endpoint: t.Any | None = None,
         strict_slashes: bool | None = None,
         merge_slashes: bool | None = None,
         redirect_to: str | t.Callable[..., str] | None = None,
@@ -485,7 +503,7 @@ class Rule(RuleFactory):
                 )
 
         self.methods = methods
-        self.endpoint: str = endpoint  # type: ignore
+        self.endpoint: t.Any = endpoint
         self.redirect_to = redirect_to
 
         if defaults:
@@ -566,7 +584,7 @@ class Rule(RuleFactory):
         self,
         variable_name: str,
         converter_name: str,
-        args: t.Tuple,
+        args: tuple[t.Any, ...],
         kwargs: t.Mapping[str, t.Any],
     ) -> BaseConverter:
         """Looks up the converter for the given parameter.
@@ -743,13 +761,13 @@ class Rule(RuleFactory):
             else:
                 opl.append((True, data))
 
-        def _convert(elem: str) -> ast.stmt:
-            ret = _prefix_names(_CALL_CONVERTER_CODE_FMT.format(elem=elem))
-            ret.args = [ast.Name(str(elem), ast.Load())]  # type: ignore  # str for py2
+        def _convert(elem: str) -> ast.Call:
+            ret = _prefix_names(_CALL_CONVERTER_CODE_FMT.format(elem=elem), ast.Call)
+            ret.args = [ast.Name(elem, ast.Load())]
             return ret
 
-        def _parts(ops: list[tuple[bool, str]]) -> list[ast.AST]:
-            parts = [
+        def _parts(ops: list[tuple[bool, str]]) -> list[ast.expr]:
+            parts: list[ast.expr] = [
                 _convert(elem) if is_dynamic else ast.Constant(elem)
                 for is_dynamic, elem in ops
             ]
@@ -765,13 +783,14 @@ class Rule(RuleFactory):
 
         dom_parts = _parts(dom_ops)
         url_parts = _parts(url_ops)
+        body: list[ast.stmt]
         if not append_unknown:
             body = []
         else:
             body = [_IF_KWARGS_URL_ENCODE_AST]
             url_parts.extend(_URL_ENCODE_AST_NAMES)
 
-        def _join(parts: list[ast.AST]) -> ast.AST:
+        def _join(parts: list[ast.expr]) -> ast.expr:
             if len(parts) == 1:  # shortcut
                 return parts[0]
             return ast.JoinedStr(parts)
@@ -787,7 +806,7 @@ class Rule(RuleFactory):
         ]
         kargs = [str(k) for k in defaults]
 
-        func_ast: ast.FunctionDef = _prefix_names("def _(): pass")  # type: ignore
+        func_ast = _prefix_names("def _(): pass", ast.FunctionDef)
         func_ast.name = f"<builder:{self.rule!r}>"
         func_ast.args.args.append(ast.arg(".self", None))
         for arg in pargs + kargs:
@@ -807,13 +826,13 @@ class Rule(RuleFactory):
         # bad line numbers cause an assert to fail in debug builds
         for node in ast.walk(module):
             if "lineno" in node._attributes:
-                node.lineno = 1
+                node.lineno = 1  # type: ignore[attr-defined]
             if "end_lineno" in node._attributes:
-                node.end_lineno = node.lineno
+                node.end_lineno = node.lineno  # type: ignore[attr-defined]
             if "col_offset" in node._attributes:
-                node.col_offset = 0
+                node.col_offset = 0  # type: ignore[attr-defined]
             if "end_col_offset" in node._attributes:
-                node.end_col_offset = node.col_offset
+                node.end_col_offset = node.col_offset  # type: ignore[attr-defined]
 
         code = compile(module, "<werkzeug routing>", "exec")
         return self._get_func_code(code, func_ast.name)
@@ -904,6 +923,6 @@ class Rule(RuleFactory):
                 parts.append(f"<{data}>")
             else:
                 parts.append(data)
-        parts = "".join(parts).lstrip("|")
+        parts_str = "".join(parts).lstrip("|")
         methods = f" ({', '.join(self.methods)})" if self.methods is not None else ""
-        return f"<{type(self).__name__} {parts!r}{methods} -> {self.endpoint}>"
+        return f"<{type(self).__name__} {parts_str!r}{methods} -> {self.endpoint}>"
diff --git a/libs/werkzeug/sansio/http.py b/libs/werkzeug/sansio/http.py
index e3cd3330c..b2b887799 100644
--- a/libs/werkzeug/sansio/http.py
+++ b/libs/werkzeug/sansio/http.py
@@ -122,7 +122,7 @@ def _cookie_unslash_replace(m: t.Match[bytes]) -> bytes:
 
 def parse_cookie(
     cookie: str | None = None,
-    cls: type[ds.MultiDict] | None = None,
+    cls: type[ds.MultiDict[str, str]] | None = None,
 ) -> ds.MultiDict[str, str]:
     """Parse a cookie from a string.
 
@@ -141,7 +141,7 @@ def parse_cookie(
     .. versionadded:: 2.2
     """
     if cls is None:
-        cls = ds.MultiDict
+        cls = t.cast("type[ds.MultiDict[str, str]]", ds.MultiDict)
 
     if not cookie:
         return cls()
diff --git a/libs/werkzeug/sansio/multipart.py b/libs/werkzeug/sansio/multipart.py
index fc8735378..731be0336 100644
--- a/libs/werkzeug/sansio/multipart.py
+++ b/libs/werkzeug/sansio/multipart.py
@@ -140,6 +140,8 @@ class MultipartDecoder:
             self.max_form_memory_size is not None
             and len(self.buffer) + len(data) > self.max_form_memory_size
         ):
+            # Ensure that data within single event does not exceed limit.
+            # Also checked across accumulated events in MultiPartParser.
             raise RequestEntityTooLarge()
         else:
             self.buffer.extend(data)
diff --git a/libs/werkzeug/sansio/request.py b/libs/werkzeug/sansio/request.py
index b59bd5bd6..dd0805d71 100644
--- a/libs/werkzeug/sansio/request.py
+++ b/libs/werkzeug/sansio/request.py
@@ -74,7 +74,7 @@ class Request:
     #: possible to use mutable structures, but this is not recommended.
     #:
     #: .. versionadded:: 0.6
-    parameter_storage_class: type[MultiDict] = ImmutableMultiDict
+    parameter_storage_class: type[MultiDict[str, t.Any]] = ImmutableMultiDict
 
     #: The type to be used for dict values from the incoming WSGI
     #: environment. (For example for :attr:`cookies`.) By default an
@@ -84,14 +84,14 @@ class Request:
     #:     Changed to ``ImmutableMultiDict`` to support multiple values.
     #:
     #: .. versionadded:: 0.6
-    dict_storage_class: type[MultiDict] = ImmutableMultiDict
+    dict_storage_class: type[MultiDict[str, t.Any]] = ImmutableMultiDict
 
     #: the type to be used for list values from the incoming WSGI environment.
     #: By default an :class:`~werkzeug.datastructures.ImmutableList` is used
     #: (for example for :attr:`access_list`).
     #:
     #: .. versionadded:: 0.6
-    list_storage_class: type[t.List] = ImmutableList
+    list_storage_class: type[list[t.Any]] = ImmutableList
 
     user_agent_class: type[UserAgent] = UserAgent
     """The class used and returned by the :attr:`user_agent` property to
diff --git a/libs/werkzeug/sansio/response.py b/libs/werkzeug/sansio/response.py
index 271974ecf..9093b0a8c 100644
--- a/libs/werkzeug/sansio/response.py
+++ b/libs/werkzeug/sansio/response.py
@@ -6,32 +6,35 @@ from datetime import timedelta
 from datetime import timezone
 from http import HTTPStatus
 
+from ..datastructures import CallbackDict
+from ..datastructures import ContentRange
+from ..datastructures import ContentSecurityPolicy
 from ..datastructures import Headers
 from ..datastructures import HeaderSet
+from ..datastructures import ResponseCacheControl
+from ..datastructures import WWWAuthenticate
+from ..http import COEP
+from ..http import COOP
+from ..http import dump_age
 from ..http import dump_cookie
+from ..http import dump_header
+from ..http import dump_options_header
+from ..http import http_date
 from ..http import HTTP_STATUS_CODES
+from ..http import parse_age
+from ..http import parse_cache_control_header
+from ..http import parse_content_range_header
+from ..http import parse_csp_header
+from ..http import parse_date
+from ..http import parse_options_header
+from ..http import parse_set_header
+from ..http import quote_etag
+from ..http import unquote_etag
 from ..utils import get_content_type
-from werkzeug.datastructures import CallbackDict
-from werkzeug.datastructures import ContentRange
-from werkzeug.datastructures import ContentSecurityPolicy
-from werkzeug.datastructures import ResponseCacheControl
-from werkzeug.datastructures import WWWAuthenticate
-from werkzeug.http import COEP
-from werkzeug.http import COOP
-from werkzeug.http import dump_age
-from werkzeug.http import dump_header
-from werkzeug.http import dump_options_header
-from werkzeug.http import http_date
-from werkzeug.http import parse_age
-from werkzeug.http import parse_cache_control_header
-from werkzeug.http import parse_content_range_header
-from werkzeug.http import parse_csp_header
-from werkzeug.http import parse_date
-from werkzeug.http import parse_options_header
-from werkzeug.http import parse_set_header
-from werkzeug.http import quote_etag
-from werkzeug.http import unquote_etag
-from werkzeug.utils import header_property
+from ..utils import header_property
+
+if t.TYPE_CHECKING:
+    from ..datastructures.cache_control import _CacheControl
 
 
 def _set_property(name: str, doc: str | None = None) -> property:
@@ -305,7 +308,7 @@ class Response:
         .. versionadded:: 0.5
         """
 
-        def on_update(d: CallbackDict) -> None:
+        def on_update(d: CallbackDict[str, str]) -> None:
             self.headers["Content-Type"] = dump_options_header(self.mimetype, d)
 
         d = parse_options_header(self.headers.get("content-type", ""))[1]
@@ -480,7 +483,7 @@ class Response:
         request/response chain.
         """
 
-        def on_update(cache_control: ResponseCacheControl) -> None:
+        def on_update(cache_control: _CacheControl) -> None:
             if not cache_control and "cache-control" in self.headers:
                 del self.headers["cache-control"]
             elif cache_control:
diff --git a/libs/werkzeug/sansio/utils.py b/libs/werkzeug/sansio/utils.py
index 48ec1bfa0..14fa0ac88 100644
--- a/libs/werkzeug/sansio/utils.py
+++ b/libs/werkzeug/sansio/utils.py
@@ -8,7 +8,7 @@ from ..exceptions import SecurityError
 from ..urls import uri_to_iri
 
 
-def host_is_trusted(hostname: str, trusted_list: t.Iterable[str]) -> bool:
+def host_is_trusted(hostname: str | None, trusted_list: t.Iterable[str]) -> bool:
     """Check if a host matches a list of trusted names.
 
     :param hostname: The name to check.
diff --git a/libs/werkzeug/security.py b/libs/werkzeug/security.py
index 578caf7f3..997597990 100644
--- a/libs/werkzeug/security.py
+++ b/libs/werkzeug/security.py
@@ -24,8 +24,8 @@ def gen_salt(length: int) -> str:
 
 def _hash_internal(method: str, salt: str, password: str) -> tuple[str, str]:
     method, *args = method.split(":")
-    salt = salt.encode("utf-8")
-    password = password.encode("utf-8")
+    salt_bytes = salt.encode()
+    password_bytes = password.encode()
 
     if method == "scrypt":
         if not args:
@@ -40,7 +40,9 @@ def _hash_internal(method: str, salt: str, password: str) -> tuple[str, str]:
 
         maxmem = 132 * n * r * p  # ideally 128, but some extra seems needed
         return (
-            hashlib.scrypt(password, salt=salt, n=n, r=r, p=p, maxmem=maxmem).hex(),
+            hashlib.scrypt(
+                password_bytes, salt=salt_bytes, n=n, r=r, p=p, maxmem=maxmem
+            ).hex(),
             f"scrypt:{n}:{r}:{p}",
         )
     elif method == "pbkdf2":
@@ -59,7 +61,9 @@ def _hash_internal(method: str, salt: str, password: str) -> tuple[str, str]:
             raise ValueError("'pbkdf2' takes 2 arguments.")
 
         return (
-            hashlib.pbkdf2_hmac(hash_name, password, salt, iterations).hex(),
+            hashlib.pbkdf2_hmac(
+                hash_name, password_bytes, salt_bytes, iterations
+            ).hex(),
             f"pbkdf2:{hash_name}:{iterations}",
         )
     else:
@@ -147,6 +151,8 @@ def safe_join(directory: str, *pathnames: str) -> str | None:
         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("../")
         ):
diff --git a/libs/werkzeug/serving.py b/libs/werkzeug/serving.py
index ff5eb8c66..ef32b8811 100644
--- a/libs/werkzeug/serving.py
+++ b/libs/werkzeug/serving.py
@@ -11,6 +11,7 @@ It provides features like interactive debugging and code reloading. Use
     from myapp import create_app
     from werkzeug import run_simple
 """
+
 from __future__ import annotations
 
 import errno
@@ -36,6 +37,12 @@ from .urls import uri_to_iri
 
 try:
     import ssl
+
+    connection_dropped_errors: tuple[type[Exception], ...] = (
+        ConnectionError,
+        socket.timeout,
+        ssl.SSLEOFError,
+    )
 except ImportError:
 
     class _SslDummy:
@@ -46,6 +53,7 @@ except ImportError:
             )
 
     ssl = _SslDummy()  # type: ignore
+    connection_dropped_errors = (ConnectionError, socket.timeout)
 
 _log_add_style = True
 
@@ -360,7 +368,7 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
 
         try:
             execute(self.server.app)
-        except (ConnectionError, socket.timeout) as e:
+        except connection_dropped_errors as e:
             self.connection_dropped(e, environ)
         except Exception as e:
             if self.server.passthrough_errors:
@@ -465,9 +473,11 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
         self.log("info", format, *args)
 
     def log(self, type: str, message: str, *args: t.Any) -> None:
+        # an IPv6 scoped address contains "%" which breaks logging
+        address_string = self.address_string().replace("%", "%%")
         _log(
             type,
-            f"{self.address_string()} - - [{self.log_date_time_string()}] {message}\n",
+            f"{address_string} - - [{self.log_date_time_string()}] {message}\n",
             *args,
         )
 
@@ -496,10 +506,10 @@ def generate_adhoc_ssl_pair(
 ) -> tuple[Certificate, RSAPrivateKeyWithSerialization]:
     try:
         from cryptography import x509
-        from cryptography.x509.oid import NameOID
         from cryptography.hazmat.backends import default_backend
         from cryptography.hazmat.primitives import hashes
         from cryptography.hazmat.primitives.asymmetric import rsa
+        from cryptography.x509.oid import NameOID
     except ImportError:
         raise TypeError(
             "Using ad-hoc certificates requires the cryptography library."
@@ -531,7 +541,10 @@ def generate_adhoc_ssl_pair(
         .not_valid_before(dt.now(timezone.utc))
         .not_valid_after(dt.now(timezone.utc) + timedelta(days=365))
         .add_extension(x509.ExtendedKeyUsage([x509.OID_SERVER_AUTH]), critical=False)
-        .add_extension(x509.SubjectAlternativeName([x509.DNSName(cn)]), critical=False)
+        .add_extension(
+            x509.SubjectAlternativeName([x509.DNSName(cn), x509.DNSName(f"*.{cn}")]),
+            critical=False,
+        )
         .sign(pkey, hashes.SHA256(), backend)
     )
     return cert, pkey
@@ -559,7 +572,7 @@ def make_ssl_devcert(
     """
 
     if host is not None:
-        cn = f"*.{host}/CN={host}"
+        cn = host
     cert, pkey = generate_adhoc_ssl_pair(cn=cn)
 
     from cryptography.hazmat.primitives import serialization
@@ -583,8 +596,8 @@ def make_ssl_devcert(
 
 def generate_adhoc_ssl_context() -> ssl.SSLContext:
     """Generates an adhoc SSL context for the development server."""
-    import tempfile
     import atexit
+    import tempfile
 
     cert, pkey = generate_adhoc_ssl_pair()
 
@@ -1068,6 +1081,9 @@ def run_simple(
         from .debug import DebuggedApplication
 
         application = DebuggedApplication(application, evalex=use_evalex)
+        # Allow the specified hostname to use the debugger, in addition to
+        # localhost domains.
+        application.trusted_hosts.append(hostname)
 
     if not is_running_from_reloader():
         fd = None
diff --git a/libs/werkzeug/test.py b/libs/werkzeug/test.py
index 7b5899a97..38f69bfb9 100644
--- a/libs/werkzeug/test.py
+++ b/libs/werkzeug/test.py
@@ -46,9 +46,9 @@ from .wsgi import ClosingIterator
 from .wsgi import get_current_url
 
 if t.TYPE_CHECKING:
+    import typing_extensions as te
     from _typeshed.wsgi import WSGIApplication
     from _typeshed.wsgi import WSGIEnvironment
-    import typing_extensions as te
 
 
 def stream_encode_multipart(
@@ -172,7 +172,7 @@ def _iter_data(data: t.Mapping[str, t.Any]) -> t.Iterator[tuple[str, t.Any]]:
                 yield key, value
 
 
-_TAnyMultiDict = t.TypeVar("_TAnyMultiDict", bound=MultiDict)
+_TAnyMultiDict = t.TypeVar("_TAnyMultiDict", bound="MultiDict[t.Any, t.Any]")
 
 
 class EnvironBuilder:
@@ -289,10 +289,10 @@ class EnvironBuilder:
     json_dumps = staticmethod(json.dumps)
     del json
 
-    _args: MultiDict | None
+    _args: MultiDict[str, str] | None
     _query_string: str | None
     _input_stream: t.IO[bytes] | None
-    _form: MultiDict | None
+    _form: MultiDict[str, str] | None
     _files: FileMultiDict | None
 
     def __init__(
@@ -506,7 +506,7 @@ class EnvironBuilder:
         .. versionadded:: 0.14
         """
 
-        def on_update(d: CallbackDict) -> None:
+        def on_update(d: CallbackDict[str, str]) -> None:
             self.headers["Content-Type"] = dump_options_header(self.mimetype, d)
 
         d = parse_options_header(self.headers.get("content-type", ""))[1]
@@ -545,7 +545,7 @@ class EnvironBuilder:
 
         return rv  # type: ignore
 
-    def _set_form(self, name: str, value: MultiDict) -> None:
+    def _set_form(self, name: str, value: MultiDict[str, t.Any]) -> None:
         """Common behavior for setting the :attr:`form` and
         :attr:`files` properties.
 
@@ -556,12 +556,12 @@ class EnvironBuilder:
         setattr(self, name, value)
 
     @property
-    def form(self) -> MultiDict:
+    def form(self) -> MultiDict[str, str]:
         """A :class:`MultiDict` of form values."""
         return self._get_form("_form", MultiDict)
 
     @form.setter
-    def form(self, value: MultiDict) -> None:
+    def form(self, value: MultiDict[str, str]) -> None:
         self._set_form("_form", value)
 
     @property
@@ -607,7 +607,7 @@ class EnvironBuilder:
         self._args = None
 
     @property
-    def args(self) -> MultiDict:
+    def args(self) -> MultiDict[str, str]:
         """The URL arguments as :class:`MultiDict`."""
         if self._query_string is not None:
             raise AttributeError("a query string is defined")
@@ -616,7 +616,7 @@ class EnvironBuilder:
         return self._args
 
     @args.setter
-    def args(self, value: MultiDict | None) -> None:
+    def args(self, value: MultiDict[str, str] | None) -> None:
         self._query_string = None
         self._args = value
 
@@ -809,10 +809,12 @@ class Client:
 
         if response_wrapper in {None, Response}:
             response_wrapper = TestResponse
-        elif not isinstance(response_wrapper, TestResponse):
+        elif response_wrapper is not None and not issubclass(
+            response_wrapper, TestResponse
+        ):
             response_wrapper = type(
                 "WrapperTestResponse",
-                (TestResponse, response_wrapper),  # type: ignore
+                (TestResponse, response_wrapper),
                 {},
             )
 
@@ -1111,8 +1113,8 @@ class Client:
             finally:
                 builder.close()
 
-        response = self.run_wsgi_app(request.environ, buffered=buffered)
-        response = self.response_wrapper(*response, request=request)
+        response_parts = self.run_wsgi_app(request.environ, buffered=buffered)
+        response = self.response_wrapper(*response_parts, request=request)
 
         redirects = set()
         history: list[TestResponse] = []
diff --git a/libs/werkzeug/testapp.py b/libs/werkzeug/testapp.py
index 57f1f6fdf..cdf7fac1a 100644
--- a/libs/werkzeug/testapp.py
+++ b/libs/werkzeug/testapp.py
@@ -1,8 +1,10 @@
 """A small application that can be used to test a WSGI server and check
 it for WSGI compliance.
 """
+
 from __future__ import annotations
 
+import importlib.metadata
 import os
 import sys
 import typing as t
@@ -10,7 +12,6 @@ from textwrap import wrap
 
 from markupsafe import escape
 
-from . import __version__ as _werkzeug_version
 from .wrappers.request import Request
 from .wrappers.response import Response
 
@@ -153,13 +154,13 @@ def test_app(req: Request) -> Response:
 
     sys_path = []
     for item, virtual, expanded in iter_sys_path():
-        class_ = []
+        css = []
         if virtual:
-            class_.append("virtual")
+            css.append("virtual")
         if expanded:
-            class_.append("exp")
-        class_ = f' class="{" ".join(class_)}"' if class_ else ""
-        sys_path.append(f"<li{class_}>{escape(item)}")
+            css.append("exp")
+        class_str = f' class="{" ".join(css)}"' if css else ""
+        sys_path.append(f"<li{class_str}>{escape(item)}")
 
     context = {
         "python_version": "<br>".join(escape(sys.version).splitlines()),
@@ -167,7 +168,7 @@ def test_app(req: Request) -> Response:
         "os": escape(os.name),
         "api_version": sys.api_version,
         "byteorder": sys.byteorder,
-        "werkzeug_version": _werkzeug_version,
+        "werkzeug_version": _get_werkzeug_version(),
         "python_eggs": "\n".join(python_eggs),
         "wsgi_env": "\n".join(wsgi_env),
         "sys_path": "\n".join(sys_path),
@@ -175,6 +176,18 @@ def test_app(req: Request) -> Response:
     return Response(TEMPLATE % context, mimetype="text/html")
 
 
+_werkzeug_version = ""
+
+
+def _get_werkzeug_version() -> str:
+    global _werkzeug_version
+
+    if not _werkzeug_version:
+        _werkzeug_version = importlib.metadata.version("werkzeug")
+
+    return _werkzeug_version
+
+
 if __name__ == "__main__":
     from .serving import run_simple
 
diff --git a/libs/werkzeug/urls.py b/libs/werkzeug/urls.py
index 4d61e600b..5bffe3928 100644
--- a/libs/werkzeug/urls.py
+++ b/libs/werkzeug/urls.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 import codecs
 import re
 import typing as t
+import urllib.parse
 from urllib.parse import quote
 from urllib.parse import unquote
 from urllib.parse import urlencode
@@ -164,25 +165,11 @@ def iri_to_uri(iri: str) -> str:
     return urlunsplit((parts.scheme, netloc, path, query, fragment))
 
 
-def _invalid_iri_to_uri(iri: str) -> str:
-    """The URL scheme ``itms-services://`` must contain the ``//`` even though it does
-    not have a host component. There may be other invalid schemes as well. Currently,
-    responses will always call ``iri_to_uri`` on the redirect ``Location`` header, which
-    removes the ``//``. For now, if the IRI only contains ASCII and does not contain
-    spaces, pass it on as-is. In Werkzeug 3.0, this should become a
-    ``response.process_location`` flag.
-
-    :meta private:
-    """
-    try:
-        iri.encode("ascii")
-    except UnicodeError:
-        pass
-    else:
-        if len(iri.split(None, 1)) == 1:
-            return iri
-
-    return iri_to_uri(iri)
+# Python < 3.12
+# itms-services was worked around in previous iri_to_uri implementations, but
+# we can tell Python directly that it needs to preserve the //.
+if "itms-services" not in urllib.parse.uses_netloc:
+    urllib.parse.uses_netloc.append("itms-services")
 
 
 def _decode_idna(domain: str) -> str:
diff --git a/libs/werkzeug/utils.py b/libs/werkzeug/utils.py
index 785ac28b9..59b97b732 100644
--- a/libs/werkzeug/utils.py
+++ b/libs/werkzeug/utils.py
@@ -26,6 +26,7 @@ from .wsgi import wrap_file
 
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import WSGIEnvironment
+
     from .wrappers.request import Request
     from .wrappers.response import Response
 
@@ -316,7 +317,7 @@ def append_slash_redirect(environ: WSGIEnvironment, code: int = 308) -> Response
 
 
 def send_file(
-    path_or_file: os.PathLike | str | t.IO[bytes],
+    path_or_file: os.PathLike[str] | str | t.IO[bytes],
     environ: WSGIEnvironment,
     mimetype: str | None = None,
     as_attachment: bool = False,
@@ -327,7 +328,7 @@ def send_file(
     max_age: None | (int | t.Callable[[str | None], int | None]) = None,
     use_x_sendfile: bool = False,
     response_class: type[Response] | None = None,
-    _root_path: os.PathLike | str | None = None,
+    _root_path: os.PathLike[str] | str | None = None,
 ) -> Response:
     """Send the contents of a file to the client.
 
@@ -415,7 +416,7 @@ def send_file(
     if isinstance(path_or_file, (os.PathLike, str)) or hasattr(
         path_or_file, "__fspath__"
     ):
-        path_or_file = t.cast(t.Union[os.PathLike, str], path_or_file)
+        path_or_file = t.cast("t.Union[os.PathLike[str], str]", path_or_file)
 
         # Flask will pass app.root_path, allowing its send_file wrapper
         # to not have to deal with paths.
@@ -514,7 +515,7 @@ def send_file(
     if isinstance(etag, str):
         rv.set_etag(etag)
     elif etag and path is not None:
-        check = adler32(path.encode("utf-8")) & 0xFFFFFFFF
+        check = adler32(path.encode()) & 0xFFFFFFFF
         rv.set_etag(f"{mtime}-{size}-{check}")
 
     if conditional:
@@ -535,8 +536,8 @@ def send_file(
 
 
 def send_from_directory(
-    directory: os.PathLike | str,
-    path: os.PathLike | str,
+    directory: os.PathLike[str] | str,
+    path: os.PathLike[str] | str,
     environ: WSGIEnvironment,
     **kwargs: t.Any,
 ) -> Response:
@@ -560,20 +561,20 @@ def send_from_directory(
     .. versionadded:: 2.0
         Adapted from Flask's implementation.
     """
-    path = safe_join(os.fspath(directory), os.fspath(path))
+    path_str = safe_join(os.fspath(directory), os.fspath(path))
 
-    if path is None:
+    if path_str is None:
         raise NotFound()
 
     # Flask will pass app.root_path, allowing its send_from_directory
     # wrapper to not have to deal with paths.
     if "_root_path" in kwargs:
-        path = os.path.join(kwargs["_root_path"], path)
+        path_str = os.path.join(kwargs["_root_path"], path_str)
 
-    if not os.path.isfile(path):
+    if not os.path.isfile(path_str):
         raise NotFound()
 
-    return send_file(path, environ, **kwargs)
+    return send_file(path_str, environ, **kwargs)
 
 
 def import_string(import_name: str, silent: bool = False) -> t.Any:
diff --git a/libs/werkzeug/wrappers/__init__.py b/libs/werkzeug/wrappers/__init__.py
index b8c45d71c..b36f228f2 100644
--- a/libs/werkzeug/wrappers/__init__.py
+++ b/libs/werkzeug/wrappers/__init__.py
@@ -1,3 +1,3 @@
 from .request import Request as Request
 from .response import Response as Response
-from .response import ResponseStream
+from .response import ResponseStream as ResponseStream
diff --git a/libs/werkzeug/wrappers/request.py b/libs/werkzeug/wrappers/request.py
index 25b091691..344f28b60 100644
--- a/libs/werkzeug/wrappers/request.py
+++ b/libs/werkzeug/wrappers/request.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc as cabc
 import functools
 import json
 import typing as t
@@ -182,13 +183,13 @@ class Request(_SansIORequest):
         from ..exceptions import HTTPException
 
         @functools.wraps(f)
-        def application(*args):  # type: ignore
+        def application(*args: t.Any) -> cabc.Iterable[bytes]:
             request = cls(args[-2])
             with request:
                 try:
                     resp = f(*args[:-2] + (request,))
                 except HTTPException as e:
-                    resp = e.get_response(args[-2])
+                    resp = t.cast("WSGIApplication", e.get_response(args[-2]))
                 return resp(*args[-2:])
 
         return t.cast("WSGIApplication", application)
@@ -369,13 +370,12 @@ class Request(_SansIORequest):
         return self.get_data(parse_form_data=True)
 
     @t.overload
-    def get_data(  # type: ignore
+    def get_data(
         self,
         cache: bool = True,
         as_text: t.Literal[False] = False,
         parse_form_data: bool = False,
-    ) -> bytes:
-        ...
+    ) -> bytes: ...
 
     @t.overload
     def get_data(
@@ -383,8 +383,7 @@ class Request(_SansIORequest):
         cache: bool = True,
         as_text: t.Literal[True] = ...,
         parse_form_data: bool = False,
-    ) -> str:
-        ...
+    ) -> str: ...
 
     def get_data(
         self, cache: bool = True, as_text: bool = False, parse_form_data: bool = False
@@ -564,14 +563,12 @@ class Request(_SansIORequest):
     @t.overload
     def get_json(
         self, force: bool = ..., silent: t.Literal[False] = ..., cache: bool = ...
-    ) -> t.Any:
-        ...
+    ) -> t.Any: ...
 
     @t.overload
     def get_json(
         self, force: bool = ..., silent: bool = ..., cache: bool = ...
-    ) -> t.Any | None:
-        ...
+    ) -> t.Any | None: ...
 
     def get_json(
         self, force: bool = False, silent: bool = False, cache: bool = True
diff --git a/libs/werkzeug/wrappers/response.py b/libs/werkzeug/wrappers/response.py
index ee5c69478..7f01287c7 100644
--- a/libs/werkzeug/wrappers/response.py
+++ b/libs/werkzeug/wrappers/response.py
@@ -5,26 +5,26 @@ import typing as t
 from http import HTTPStatus
 from urllib.parse import urljoin
 
+from .._internal import _get_environ
 from ..datastructures import Headers
+from ..http import generate_etag
+from ..http import http_date
+from ..http import is_resource_modified
+from ..http import parse_etags
+from ..http import parse_range_header
 from ..http import remove_entity_headers
 from ..sansio.response import Response as _SansIOResponse
-from ..urls import _invalid_iri_to_uri
 from ..urls import iri_to_uri
 from ..utils import cached_property
+from ..wsgi import _RangeWrapper
 from ..wsgi import ClosingIterator
 from ..wsgi import get_current_url
-from werkzeug._internal import _get_environ
-from werkzeug.http import generate_etag
-from werkzeug.http import http_date
-from werkzeug.http import is_resource_modified
-from werkzeug.http import parse_etags
-from werkzeug.http import parse_range_header
-from werkzeug.wsgi import _RangeWrapper
 
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import StartResponse
     from _typeshed.wsgi import WSGIApplication
     from _typeshed.wsgi import WSGIEnvironment
+
     from .request import Request
 
 
@@ -260,12 +260,10 @@ class Response(_SansIOResponse):
         return cls(*run_wsgi_app(app, environ, buffered))
 
     @t.overload
-    def get_data(self, as_text: t.Literal[False] = False) -> bytes:
-        ...
+    def get_data(self, as_text: t.Literal[False] = False) -> bytes: ...
 
     @t.overload
-    def get_data(self, as_text: t.Literal[True]) -> str:
-        ...
+    def get_data(self, as_text: t.Literal[True]) -> str: ...
 
     def get_data(self, as_text: bool = False) -> bytes | str:
         """The string representation of the response body.  Whenever you call
@@ -480,7 +478,7 @@ class Response(_SansIOResponse):
                 content_length = value
 
         if location is not None:
-            location = _invalid_iri_to_uri(location)
+            location = iri_to_uri(location)
 
             if self.autocorrect_location_header:
                 # Make the location header an absolute URL.
@@ -595,12 +593,10 @@ class Response(_SansIOResponse):
         return self.get_json()
 
     @t.overload
-    def get_json(self, force: bool = ..., silent: t.Literal[False] = ...) -> t.Any:
-        ...
+    def get_json(self, force: bool = ..., silent: t.Literal[False] = ...) -> t.Any: ...
 
     @t.overload
-    def get_json(self, force: bool = ..., silent: bool = ...) -> t.Any | None:
-        ...
+    def get_json(self, force: bool = ..., silent: bool = ...) -> t.Any | None: ...
 
     def get_json(self, force: bool = False, silent: bool = False) -> t.Any | None:
         """Parse :attr:`data` as JSON. Useful during testing.
diff --git a/libs/yaml/__init__.py b/libs/yaml/__init__.py
index 824936194..2ec4f203c 100644
--- a/libs/yaml/__init__.py
+++ b/libs/yaml/__init__.py
@@ -8,7 +8,7 @@ from .nodes import *
 from .loader import *
 from .dumper import *
 
-__version__ = '6.0.1'
+__version__ = '6.0.2'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/libs/zipp-3.17.0.dist-info/RECORD b/libs/zipp-3.17.0.dist-info/RECORD
deleted file mode 100644
index 5994e25b6..000000000
--- a/libs/zipp-3.17.0.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-zipp-3.17.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-zipp-3.17.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-zipp-3.17.0.dist-info/METADATA,sha256=bD_qvS324MIYXaThQ1mhk358dp6DCRDAB_Rus_Re2f8,3740
-zipp-3.17.0.dist-info/RECORD,,
-zipp-3.17.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zipp-3.17.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-zipp-3.17.0.dist-info/top_level.txt,sha256=iAbdoSHfaGqBfVb2XuR9JqSQHCoOsOtG6y9C_LSpqFw,5
-zipp/__init__.py,sha256=sJklStuqI1GxLgvyo4slmA_C1dMWUSUGUiY_7_C97Nk,11164
-zipp/glob.py,sha256=HAHyKxFoTE4qpHBRpF7ow1wqyNlTjC7860MVvllW7d8,899
-zipp/py310compat.py,sha256=eZpkW0zRtunkhEh8jjX3gCGe22emoKCBJw72Zt4RkhA,219
diff --git a/libs/zipp-3.17.0.dist-info/WHEEL b/libs/zipp-3.17.0.dist-info/WHEEL
deleted file mode 100644
index 98c0d20b7..000000000
--- a/libs/zipp-3.17.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/zipp-3.20.2.dist-info/INSTALLER b/libs/zipp-3.20.2.dist-info/INSTALLER
new file mode 100644
index 000000000..a1b589e38
--- /dev/null
+++ b/libs/zipp-3.20.2.dist-info/INSTALLER
@@ -0,0 +1 @@
+pip
diff --git a/libs/zipp-3.17.0.dist-info/LICENSE b/libs/zipp-3.20.2.dist-info/LICENSE
similarity index 100%
rename from libs/zipp-3.17.0.dist-info/LICENSE
rename to libs/zipp-3.20.2.dist-info/LICENSE
diff --git a/libs/zipp-3.17.0.dist-info/METADATA b/libs/zipp-3.20.2.dist-info/METADATA
similarity index 55%
rename from libs/zipp-3.17.0.dist-info/METADATA
rename to libs/zipp-3.20.2.dist-info/METADATA
index 14a952664..cf6be8388 100644
--- a/libs/zipp-3.17.0.dist-info/METADATA
+++ b/libs/zipp-3.20.2.dist-info/METADATA
@@ -1,45 +1,49 @@
 Metadata-Version: 2.1
 Name: zipp
-Version: 3.17.0
+Version: 3.20.2
 Summary: Backport of pathlib-compatible object wrapper for zip files
-Home-page: https://github.com/jaraco/zipp
-Author: Jason R. Coombs
-Author-email: jaraco@jaraco.com
+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: 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: jaraco.itertools ; extra == 'testing'
-Requires-Dist: jaraco.functools ; extra == 'testing'
-Requires-Dist: more-itertools ; extra == 'testing'
-Requires-Dist: big-O ; extra == 'testing'
-Requires-Dist: pytest-ignore-flaky ; 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'
+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/workflows/tests/badge.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
 
@@ -47,14 +51,10 @@ Requires-Dist: pytest-mypy >=0.9.1 ; (platform_python_implementation != "PyPy")
     :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/zipp/badge/?version=latest
+..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
 
-.. .. image:: https://readthedocs.org/projects/PROJECT_RTD/badge/?version=latest
-..    :target: https://PROJECT_RTD.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. image:: https://tidelift.com/badges/package/pypi/zipp
@@ -77,7 +77,9 @@ were contributed to different versions in the standard library:
 
    * - zipp
      - stdlib
-   * - 3.15
+   * - 3.18
+     - 3.13
+   * - 3.16
      - 3.12
    * - 3.5
      - 3.11
diff --git a/libs/zipp-3.20.2.dist-info/RECORD b/libs/zipp-3.20.2.dist-info/RECORD
new file mode 100644
index 000000000..1cb96b42f
--- /dev/null
+++ b/libs/zipp-3.20.2.dist-info/RECORD
@@ -0,0 +1,12 @@
+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/importlib_resources/tests/data02/two/__init__.py b/libs/zipp-3.20.2.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_resources/tests/data02/two/__init__.py
rename to libs/zipp-3.20.2.dist-info/REQUESTED
diff --git a/libs/zipp-3.20.2.dist-info/WHEEL b/libs/zipp-3.20.2.dist-info/WHEEL
new file mode 100644
index 000000000..9b78c4451
--- /dev/null
+++ b/libs/zipp-3.20.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (75.3.0)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/zipp-3.17.0.dist-info/top_level.txt b/libs/zipp-3.20.2.dist-info/top_level.txt
similarity index 100%
rename from libs/zipp-3.17.0.dist-info/top_level.txt
rename to libs/zipp-3.20.2.dist-info/top_level.txt
diff --git a/libs/zipp/__init__.py b/libs/zipp/__init__.py
index becd010a9..161a4fb1c 100644
--- a/libs/zipp/__init__.py
+++ b/libs/zipp/__init__.py
@@ -1,3 +1,12 @@
+"""
+A Path-like interface for zipfiles.
+
+This codebase is shared between zipfile.Path in the stdlib
+and zipp in PyPI. See
+https://github.com/python/importlib_metadata/wiki/Development-Methodology
+for more detail.
+"""
+
 import io
 import posixpath
 import zipfile
@@ -5,9 +14,11 @@ import itertools
 import contextlib
 import pathlib
 import re
+import stat
+import sys
 
-from .py310compat import text_encoding
-from .glob import translate
+from .compat.py310 import text_encoding
+from .glob import Translator
 
 
 __all__ = ['Path']
@@ -35,7 +46,7 @@ def _parents(path):
 def _ancestry(path):
     """
     Given a path with elements separated by
-    posixpath.sep, generate all elements of that path
+    posixpath.sep, generate all elements of that path.
 
     >>> list(_ancestry('b/d'))
     ['b/d', 'b']
@@ -47,9 +58,14 @@ def _ancestry(path):
     ['b']
     >>> list(_ancestry(''))
     []
+
+    Multiple separators are treated like a single.
+
+    >>> list(_ancestry('//b//d///f//'))
+    ['//b//d///f', '//b//d', '//b']
     """
     path = path.rstrip(posixpath.sep)
-    while path and path != posixpath.sep:
+    while path.rstrip(posixpath.sep):
         yield path
         path, tail = posixpath.split(path)
 
@@ -179,13 +195,18 @@ class FastLookup(CompleteDirs):
 
 
 def _extract_text_encoding(encoding=None, *args, **kwargs):
-    # stacklevel=3 so that the caller of the caller see any warning.
-    return text_encoding(encoding, 3), 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
+    return text_encoding(encoding, stack_level), args, kwargs
 
 
 class Path:
     """
-    A pathlib-compatible interface for zip files.
+    A :class:`importlib.resources.abc.Traversable` interface for zip files.
+
+    Implements many of the features users enjoy from
+    :class:`pathlib.Path`.
 
     Consider a zip file with this structure::
 
@@ -260,7 +281,7 @@ class Path:
     >>> str(path.parent)
     'mem'
 
-    If the zipfile has no filename, such attribtues are not
+    If the zipfile has no filename, such attributes are not
     valid and accessing them will raise an Exception.
 
     >>> zf.filename = None
@@ -388,16 +409,19 @@ class Path:
 
     def is_symlink(self):
         """
-        Return whether this path is a symlink. Always false (python/cpython#82102).
+        Return whether this path is a symlink.
         """
-        return False
+        info = self.root.getinfo(self.at)
+        mode = info.external_attr >> 16
+        return stat.S_ISLNK(mode)
 
     def glob(self, pattern):
         if not pattern:
             raise ValueError(f"Unacceptable pattern: {pattern!r}")
 
         prefix = re.escape(self.at)
-        matches = re.compile(prefix + translate(pattern)).fullmatch
+        tr = Translator(seps='/')
+        matches = re.compile(prefix + tr.translate(pattern)).fullmatch
         return map(self._next, filter(matches, self.root.namelist()))
 
     def rglob(self, pattern):
diff --git a/libs/zipp/compat/__init__.py b/libs/zipp/compat/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/libs/zipp/compat/overlay.py b/libs/zipp/compat/overlay.py
new file mode 100644
index 000000000..5a97ee7cd
--- /dev/null
+++ b/libs/zipp/compat/overlay.py
@@ -0,0 +1,37 @@
+"""
+Expose zipp.Path as .zipfile.Path.
+
+Includes everything else in ``zipfile`` to match future usage. Just
+use:
+
+>>> from zipp.compat.overlay import zipfile
+
+in place of ``import zipfile``.
+
+Relative imports are supported too.
+
+>>> from zipp.compat.overlay.zipfile import ZipInfo
+
+The ``zipfile`` object added to ``sys.modules`` needs to be
+hashable (#126).
+
+>>> _ = hash(sys.modules['zipp.compat.overlay.zipfile'])
+"""
+
+import importlib
+import sys
+import types
+
+import zipp
+
+
+class HashableNamespace(types.SimpleNamespace):
+    def __hash__(self):
+        return hash(tuple(vars(self)))
+
+
+zipfile = HashableNamespace(**vars(importlib.import_module('zipfile')))
+zipfile.Path = zipp.Path
+zipfile._path = zipp
+
+sys.modules[__name__ + '.zipfile'] = zipfile  # type: ignore[assignment]
diff --git a/libs/zipp/py310compat.py b/libs/zipp/compat/py310.py
similarity index 51%
rename from libs/zipp/py310compat.py
rename to libs/zipp/compat/py310.py
index d5ca53e03..8264a482f 100644
--- a/libs/zipp/py310compat.py
+++ b/libs/zipp/compat/py310.py
@@ -7,5 +7,7 @@ def _text_encoding(encoding, stacklevel=2, /):  # pragma: no cover
 
 
 text_encoding = (
-    io.text_encoding if sys.version_info > (3, 10) else _text_encoding  # type: ignore
+    io.text_encoding  # type: ignore[unused-ignore, attr-defined]
+    if sys.version_info > (3, 10)
+    else _text_encoding
 )
diff --git a/libs/zipp/glob.py b/libs/zipp/glob.py
index 63ff8b9cb..4320f1c0b 100644
--- a/libs/zipp/glob.py
+++ b/libs/zipp/glob.py
@@ -1,18 +1,105 @@
+import os
 import re
 
 
-def translate(pattern):
-    r"""
-    Given a glob pattern, produce a regex that matches it.
+_default_seps = os.sep + str(os.altsep) * bool(os.altsep)
 
-    >>> translate('*.txt')
-    '[^/]*\\.txt'
-    >>> translate('a?txt')
-    'a[^/]txt'
-    >>> translate('**/*')
-    '.*/[^/]*'
+
+class Translator:
     """
-    return ''.join(map(replace, separate(pattern)))
+    >>> Translator('xyz')
+    Traceback (most recent call last):
+    ...
+    AssertionError: Invalid separators
+
+    >>> Translator('')
+    Traceback (most recent call last):
+    ...
+    AssertionError: Invalid separators
+    """
+
+    seps: str
+
+    def __init__(self, seps: str = _default_seps):
+        assert seps and set(seps) <= set(_default_seps), "Invalid separators"
+        self.seps = seps
+
+    def translate(self, pattern):
+        """
+        Given a glob pattern, produce a regex that matches it.
+        """
+        return self.extend(self.match_dirs(self.translate_core(pattern)))
+
+    def extend(self, pattern):
+        r"""
+        Extend regex for pattern-wide concerns.
+
+        Apply '(?s:)' to create a non-matching group that
+        matches newlines (valid on Unix).
+
+        Append '\Z' to imply fullmatch even when match is used.
+        """
+        return rf'(?s:{pattern})\Z'
+
+    def match_dirs(self, pattern):
+        """
+        Ensure that zipfile.Path directory names are matched.
+
+        zipfile.Path directory names always end in a slash.
+        """
+        return rf'{pattern}[/]?'
+
+    def translate_core(self, pattern):
+        r"""
+        Given a glob pattern, produce a regex that matches it.
+
+        >>> t = Translator()
+        >>> t.translate_core('*.txt').replace('\\\\', '')
+        '[^/]*\\.txt'
+        >>> t.translate_core('a?txt')
+        'a[^/]txt'
+        >>> t.translate_core('**/*').replace('\\\\', '')
+        '.*/[^/][^/]*'
+        """
+        self.restrict_rglob(pattern)
+        return ''.join(map(self.replace, separate(self.star_not_empty(pattern))))
+
+    def replace(self, match):
+        """
+        Perform the replacements for a match from :func:`separate`.
+        """
+        return match.group('set') or (
+            re.escape(match.group(0))
+            .replace('\\*\\*', r'.*')
+            .replace('\\*', rf'[^{re.escape(self.seps)}]*')
+            .replace('\\?', r'[^/]')
+        )
+
+    def restrict_rglob(self, pattern):
+        """
+        Raise ValueError if ** appears in anything but a full path segment.
+
+        >>> Translator().translate('**foo')
+        Traceback (most recent call last):
+        ...
+        ValueError: ** must appear alone in a path segment
+        """
+        seps_pattern = rf'[{re.escape(self.seps)}]+'
+        segments = re.split(seps_pattern, pattern)
+        if any('**' in segment and segment != '**' for segment in segments):
+            raise ValueError("** must appear alone in a path segment")
+
+    def star_not_empty(self, pattern):
+        """
+        Ensure that * will not match an empty segment.
+        """
+
+        def handle_segment(match):
+            segment = match.group(0)
+            return '?*' if segment == '*' else segment
+
+        not_seps_pattern = rf'[^{re.escape(self.seps)}]+'
+        return re.sub(not_seps_pattern, handle_segment, pattern)
 
 
 def separate(pattern):
@@ -25,16 +112,3 @@ def separate(pattern):
     ['a', '[?]', 'txt']
     """
     return re.finditer(r'([^\[]+)|(?P<set>[\[].*?[\]])|([\[][^\]]*$)', pattern)
-
-
-def replace(match):
-    """
-    Perform the replacements for a match from :func:`separate`.
-    """
-
-    return match.group('set') or (
-        re.escape(match.group(0))
-        .replace('\\*\\*', r'.*')
-        .replace('\\*', r'[^/]*')
-        .replace('\\?', r'[^/]')
-    )
diff --git a/requirements.txt b/requirements.txt
index 469b8808b..17ea365d7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 setuptools
-lxml>=4.3.0, <5.0.0
+lxml>=4.3.0
 numpy>=1.12.0
 webrtcvad-wheels>=2.0.10
 Pillow>=9.0.0 --only-binary=Pillow