annet 0.5__py3-none-any.whl → 0.7__py3-none-any.whl

annet/adapters/netbox/v37/api_models.py

@@ -0,0 +1,37 @@
+from dataclasses import dataclass
+from datetime import datetime
+from typing import List, Optional, Any
+
+from annet.adapters.netbox.common.models import (
+    Entity, Label, DeviceType, DeviceIp,
+)
+
+
+@dataclass
+class Interface(Entity):
+    device: Entity
+    enabled: bool
+    display: str = ""  # added in 3.x
+
+
+@dataclass
+class Device(Entity):
+    display: str  # renamed in 3.x from display_name
+    device_type: DeviceType
+    device_role: Entity
+    tenant: Optional[Entity]
+    platform: Optional[Entity]
+    serial: str
+    asset_tag: Optional[str]
+    site: Entity
+    rack: Optional[Entity]
+    position: Optional[float]
+    face: Optional[Label]
+    status: Label
+    primary_ip: Optional[DeviceIp]
+    primary_ip4: Optional[DeviceIp]
+    primary_ip6: Optional[DeviceIp]
+    tags: List[Entity]
+    custom_fields: dict[str, Any]
+    created: datetime
+    last_updated: datetime

annet/adapters/netbox/v37/client.py

@@ -0,0 +1,62 @@
+from datetime import datetime
+from typing import List, Optional
+
+import dateutil.parser
+from adaptix import Retort, loader
+from dataclass_rest import get
+from dataclass_rest.client_protocol import FactoryProtocol
+
+from annet.adapters.netbox.common.client import (
+    BaseNetboxClient, collect, PagingResponse,
+)
+from annet.adapters.netbox.common.models import IpAddress
+from .api_models import Device, Interface
+
+
+class NetboxV37(BaseNetboxClient):
+    def _init_response_body_factory(self) -> FactoryProtocol:
+        return Retort(recipe=[
+            loader(datetime, dateutil.parser.parse)
+        ])
+
+    @get("dcim/interfaces")
+    def interfaces(
+            self,
+            device_id: Optional[List[int]] = None,
+            limit: int = 20,
+            offset: int = 0,
+    ) -> PagingResponse[Interface]:
+        pass
+
+    all_interfaces = collect(interfaces, field="device_id")
+
+    @get("ipam/ip-addresses")
+    def ip_addresses(
+            self,
+            interface_id: Optional[List[int]] = None,
+            limit: int = 20,
+            offset: int = 0,
+    ) -> PagingResponse[IpAddress]:
+        pass
+
+    all_ip_addresses = collect(ip_addresses, field="interface_id")
+
+    @get("dcim/devices")
+    def devices(
+            self,
+            name: Optional[List[str]] = None,
+            name__ic: Optional[List[str]] = None,
+            tag: Optional[List[str]] = None,
+            limit: int = 20,
+            offset: int = 0,
+    ) -> PagingResponse[Device]:
+        pass
+
+    all_devices = collect(devices)
+
+    @get("dcim/devices/{device_id}")
+    def get_device(
+            self,
+            device_id: int,
+    ) -> Device:
+        pass

annet/adapters/netbox/v37/storage.py

@@ -0,0 +1,143 @@
+from logging import getLogger
+from typing import Optional, List
+
+from adaptix import P
+from adaptix.conversion import impl_converter, link
+
+from annet.adapters.netbox.common import models
+from annet.adapters.netbox.common.manufacturer import (
+    is_supported, get_hw, get_breed,
+)
+from annet.adapters.netbox.common.query import NetboxQuery
+from annet.adapters.netbox.common.storage_opts import NetboxStorageOpts
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.storage import Storage
+from . import api_models
+from .client import NetboxV37
+
+logger = getLogger(__name__)
+
+
+@impl_converter(recipe=[
+    link(P[api_models.Device].name, P[models.NetboxDevice].hostname),
+    link(P[api_models.Device].name, P[models.NetboxDevice].fqdn),
+])
+def extend_device_base(
+        device: api_models.Device,
+        interfaces: List[models.Interface],
+        hw: Optional[HardwareView],
+        breed: str,
+        neighbours_ids: List[int],
+) -> models.NetboxDevice:
+    ...
+
+
+def extend_device(
+        device: api_models.Device,
+) -> models.NetboxDevice:
+    return extend_device_base(
+        device=device,
+        interfaces=[],
+        breed=get_breed(
+            device.device_type.manufacturer.name,
+            device.device_type.model,
+        ),
+        hw=get_hw(
+            device.device_type.manufacturer.name,
+            device.device_type.model,
+        ),
+        neighbours_ids=[],
+    )
+
+
+@impl_converter
+def extend_interface(
+        interface: api_models.Interface, ip_addresses: List[models.IpAddress],
+) -> models.Interface:
+    ...
+
+
+class NetboxStorageV37(Storage):
+    def __init__(self, opts: Optional[NetboxStorageOpts] = None):
+        self.netbox = NetboxV37(
+            url=opts.url,
+            token=opts.token,
+        )
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, _, __, ___):
+        pass
+
+    def resolve_object_ids_by_query(self, query: NetboxQuery):
+        return [
+            d.id for d in self._load_devices(query)
+        ]
+
+    def resolve_fdnds_by_query(self, query: NetboxQuery):
+        return [
+            d.name for d in self._load_devices(query)
+        ]
+
+    def make_devices(
+            self,
+            query: NetboxQuery,
+            preload_neighbors=False,
+            use_mesh=None,
+            preload_extra_fields=False,
+            **kwargs,
+    ) -> List[models.NetboxDevice]:
+        device_ids = {
+            device.id: extend_device(device=device)
+            for device in self._load_devices(query)
+        }
+        if not device_ids:
+            return []
+
+        interfaces = self._load_interfaces(list(device_ids))
+        for interface in interfaces:
+            device_ids[interface.device.id].interfaces.append(interface)
+        return list(device_ids.values())
+
+    def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
+        return [
+            device
+            for device in self.netbox.all_devices(
+                name__ic=query.globs,
+            ).results
+            if _match_query(query, device)
+            if is_supported(device.device_type.manufacturer.name)
+        ]
+
+    def _load_interfaces(self, device_ids: List[int]) -> List[
+        models.Interface]:
+        interfaces = self.netbox.all_interfaces(device_id=device_ids)
+        extended_ifaces = {
+            interface.id: extend_interface(interface, [])
+            for interface in interfaces.results
+        }
+
+        ips = self.netbox.all_ip_addresses(interface_id=list(extended_ifaces))
+        for ip in ips.results:
+            extended_ifaces[ip.assigned_object_id].ip_addresses.append(ip)
+        return list(extended_ifaces.values())
+
+    def get_device(
+            self, obj_id, preload_neighbors=False, use_mesh=None,
+            **kwargs,
+    ) -> models.NetboxDevice:
+        device = self.netbox.get_device(obj_id)
+        res = extend_device(device=device)
+        res.interfaces = self._load_interfaces([device.id])
+        return res
+
+    def flush_perf(self):
+        pass
+
+
+def _match_query(query: NetboxQuery, device_data: api_models.Device) -> bool:
+    for subquery in query.globs:
+        if subquery.strip() in device_data.name:
+            return True
+    return False

annet/annlib/filter_acl.py

@@ -116,7 +116,7 @@ def get_op(line: str) -> typing.Tuple[str, str, str]:
             break
     if opidx >= 0:
         op = line[opidx]
-        indent = line[:opidx] + line[opidx+1:rowstart]
+        indent = line[:opidx] + line[opidx + 1:rowstart]
     if op != " ":
         indent = indent + " "
     return op, indent, line[rowstart:]

annet/api/__init__.py

@@ -188,7 +188,9 @@ def _print_pre_as_diff(pre, show_rules, indent, file=None, _level=0):
 def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
     progress_logger = get_logger("progress")
     args = cast(cli_args.QueryOptions, pool.args[0])
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         hosts = storage.resolve_fdnds_by_query(args.query)
     perc = int(pool.tasks_done / len(hosts) * 100)
     fqdn = hosts[task_result.device_id]
@@ -210,7 +212,9 @@ def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
 # =====
 def gen(args: cli_args.ShowGenOptions):
     """ Сгенерировать конфиг для устройств """
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         loader = ann_gen.Loader(storage, args)
         stdin = args.stdin(storage=storage, filter_acl=args.filter_acl, config=None)
 
@@ -243,7 +247,9 @@ def _diff_files(old_files, new_files, context=3):
 def patch(args: cli_args.ShowPatchOptions):
     """ Сгенерировать патч для устройств """
     global live_configs  # pylint: disable=global-statement
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         loader = ann_gen.Loader(storage, args)
         if args.config == "running":
             fetcher = annet.deploy.fetcher_connector.get()
@@ -286,7 +292,9 @@ def _patch_worker(device_id, args: cli_args.ShowPatchOptions, stdin, loader: ann
 # =====
 def res_diff_patch(device_id, args: cli_args.ShowPatchOptions, stdin, loader: ann_gen.Loader, filterer: filtering.Filterer) -> Iterable[
     Tuple[OldNewResult, Dict, Dict]]:
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in ann_gen.old_new(
             args,
             storage,
@@ -314,7 +322,9 @@ def res_diff_patch(device_id, args: cli_args.ShowPatchOptions, stdin, loader: an
 
 def diff(args: cli_args.DiffOptions, loader: ann_gen.Loader, filterer: filtering.Filterer) -> Mapping[Device, Union[Diff, PCDiff]]:
     ret = {}
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in ann_gen.old_new(
             args,
             storage,
@@ -331,16 +341,15 @@ def diff(args: cli_args.DiffOptions, loader: ann_gen.Loader, filterer: filtering
             acl_rules = res.get_acl_rules(args.acl_safe)
             new_files = res.get_new_files(args.acl_safe)
             new_json_fragment_files = res.get_new_file_fragments()
+            pc_diff_files = []
             if res.old_files or new_files:
-                ret[device] = PCDiff(
-                    hostname=device.hostname,
-                    diff_files=list(_pc_diff(device.hostname, res.old_files, new_files)),
-                )
-            elif res.old_json_fragment_files or new_json_fragment_files:
-                ret[device] = PCDiff(
-                    hostname=device.hostname,
-                    diff_files=list(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files)),
-                )
+                pc_diff_files.extend(_pc_diff(device.hostname, res.old_files, new_files))
+            if res.old_json_fragment_files or new_json_fragment_files:
+                pc_diff_files.extend(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files))
+
+            if pc_diff_files:
+                pc_diff_files.sort(key=lambda f: f.label)
+                ret[device] = PCDiff(hostname=device.hostname, diff_files=pc_diff_files)
             elif old is not None:
                 rb = rulebook.get_rulebook(device.hw)
                 diff_tree = patching.make_diff(old, new, rb, [acl_rules, res.filter_acl_rules])
@@ -625,7 +634,9 @@ def deploy(args: cli_args.DeployOptions) -> ExitCode:
     """ Сгенерировать конфиг для устройств и задеплоить его """
     ret: ExitCode = 0
     deployer = Deployer(args)
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         global live_configs  # pylint: disable=global-statement
         loader = ann_gen.Loader(storage, args)
         filterer = filtering.filterer_connector.get()
@@ -761,7 +772,7 @@ def _json_fragment_diff(
 
 def guess_hw(config_text: str):
     """Пытаемся угадать вендора и hw на основе
-    текста конфига и annushka/rulebook/texts/*.rul"""
+    текста конфига и annet/rulebook/texts/*.rul"""
     scores = {}
     hw_provider = hardware_connector.get()
     for vendor in VENDOR_REVERSES:

annet/cli.py

@@ -54,7 +54,9 @@ def show_current(args: cli_args.QueryOptions, config, arg_out: cli_args.FileOutO
                         entire_data = ""
                     yield (output_driver.entire_config_dest_path(device, entire_path), entire_data, False)
 
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         ids = storage.resolve_object_ids_by_query(args.query)
         if not ids:
             get_logger().error("No devices found for %s", args.query)
@@ -80,7 +82,9 @@ def gen(args: cli_args.ShowGenOptions):
 @subcommand(cli_args.ShowDiffOptions)
 def diff(args: cli_args.ShowDiffOptions):
     """ Сгенерировать конфиг для устройств и показать дифф по рулбуку с текущим """
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         filterer = filtering.filterer_connector.get()
         loader = Loader(storage, args)
         output_driver_connector.get().write_output(

annet/cli_args.py

@@ -433,6 +433,11 @@ class FileOutOptions(ArgGroup):
     no_label = opt_no_label
     no_color = opt_no_color
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.dest:
+            self.no_color = True
+
 
 class DiffOptions(GenOptions, ComocutorOptions):
     clear = opt_clear
@@ -467,6 +472,11 @@ class ShowDiffOptions(DiffOptions, FileOutOptions):
     show_rules = opt_show_rules
     no_collapse = opt_no_collapse
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.dest:
+            self.no_collapse = True
+
 
 class ShowPatchOptions(PatchOptions, FileOutOptions):
     indent = opt_indent

annet/deploy.py

@@ -2,17 +2,22 @@
 
 
 import abc
+import itertools
 import re
 from collections import namedtuple
 from contextlib import contextmanager
-from typing import Dict, List, Optional, Type
+from typing import Dict, List, Optional, Type, Any, OrderedDict
 
 from contextlog import get_logger
 
 from annet import text_term_format
+from annet.annlib.command import Command, Question, CommandList
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.annlib.rbparser.deploying import MakeMessageMatcher, Answer
 from annet.cli_args import DeployOptions
 from annet.connectors import Connector
 from annet.output import TextArgs
+from annet.rulebook import get_rulebook, deploying
 from annet.storage import Device
 
 
@@ -439,3 +444,93 @@ def init_colors():
         None: curses.color_pair(8),
         "cyan_blue": curses.color_pair(9),
     }
+
+
+class RulebookQuestionHandler:
+    def __init__(self, dialogs):
+        self._dialogs = dialogs
+
+    def __call__(self, dev: Connector, cmd: Command, match_content: bytes):
+        content = match_content.strip()
+        content = content.decode()
+        for matcher, answer in self._dialogs.items():
+            if matcher(content):
+                return Command(answer.text)
+
+        get_logger().info("no answer in rulebook. dialogs=%s match_content=%s", self._dialogs, match_content)
+        return None
+
+
+def rb_question_to_question(q: MakeMessageMatcher, a: Answer) -> Question:  # TODO: drop MakeMessageMatcher
+    if not a.send_nl:
+        raise Exception("not supported false send_nl")
+    text: str = q._text  # pylint: disable=protected-access
+    is_regexp = False
+    if text.startswith("/") and text.endswith("/"):
+        is_regexp = True
+        text = text[1:-1]
+    res = Question(question=text, answer=a.text, is_regexp=is_regexp)
+    return res
+
+
+def make_cmd_params(rule: Dict[str, Any]) -> Dict[str, Any]:
+    if rule:
+        qa_handler = RulebookQuestionHandler(rule["attrs"]["dialogs"])
+        qa_list: List[Question] = []
+        for matcher, answer in qa_handler._dialogs.items():  # pylint: disable=protected-access
+            qa_list.append(rb_question_to_question(matcher, answer))
+        return {
+            "questions": qa_list,
+            "timeout": rule["attrs"]["timeout"],
+        }
+    return {
+        "timeout": 30,
+    }
+
+
+def make_apply_commands(rule, hw, do_commit, do_finalize):
+    apply_logic = rule["attrs"]["apply_logic"]
+    before, after = apply_logic(hw, do_commit=do_commit, do_finalize=do_finalize)
+    return before, after
+
+
+def fill_cmd_params(rules: OrderedDict, cmd: Command):
+    rule = deploying.match_deploy_rule(rules, (cmd.cmd,), {})
+    if rule:
+        cmd_params = make_cmd_params(rule)
+        cmd.questions = cmd_params.get("questions", None)
+        cmd.timeout = cmd_params["timeout"]
+
+
+def apply_deploy_rulebook(hw: HardwareView, cmd_paths, do_finalize=True, do_commit=True):
+    rules = get_rulebook(hw)["deploying"]
+    cmds_with_apply = []
+    for cmd_path, context in cmd_paths.items():
+        rule = deploying.match_deploy_rule(rules, cmd_path, context)
+        cmd_params = make_cmd_params(rule)
+        before, after = make_apply_commands(rule, hw, do_commit, do_finalize)
+
+        cmd = Command(cmd_path[-1], **cmd_params)
+        # XXX более чистый способ передавать-мета инфу о команде
+        cmd.level = len(cmd_path) - 1
+        cmds_with_apply.append((cmd, before, after))
+
+    def _key(item):
+        _cmd, before, after = item
+        return (tuple(cmd.cmd for cmd in before), tuple(cmd.cmd for cmd in after))
+
+    cmdlist = CommandList()
+    for _k, cmd_before_after in itertools.groupby(cmds_with_apply, key=_key):
+        cmd_before_after = list(cmd_before_after)
+        _, before, after = cmd_before_after[0]
+        for c in before:
+            c.level = 0
+            fill_cmd_params(rules, c)
+            cmdlist.add_cmd(c)
+        for cmd, _before, _after in cmd_before_after:
+            cmdlist.add_cmd(cmd)
+        for c in after:
+            c.level = 0
+            fill_cmd_params(rules, c)
+            cmdlist.add_cmd(c)
+    return cmdlist

annet/diff.py

@@ -30,8 +30,7 @@ def gen_sort_diff(
     :param diffs: Маппинг устройства в дифф
     :param args: Параметры коммандной строки
     """
-    # NOCDEV-2201 non-null --dest implies --no-collapse
-    if args.no_collapse or args.dest:
+    if args.no_collapse:
         devices_to_diff = {(dev,): diff for dev, diff in diffs.items()}
     else:
         non_pc_diffs = {dev: diff for dev, diff in diffs.items() if not isinstance(diff, PCDiff)}

annet/gen.py

@@ -425,7 +425,9 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
     if span:
         span.set_attribute("device.id", device_id)
 
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in old_new(
             args,
             storage,
@@ -465,7 +467,9 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
 
 
 def old_new_worker(device_id, args: DeployOptions, config, stdin, loader: "Loader", filterer: Filterer):
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         yield from old_new(
             args,
             storage,
@@ -693,7 +697,7 @@ def _old_new_get_config_cli(ctx: OldNewDeviceContext, device: Device) -> str:
 def _old_new_get_config_files(ctx: OldNewDeviceContext, device: Device) -> DeviceDownloadedFiles:
     old_files = DeviceDownloadedFiles()
 
-    for attr in ('failed_files', 'failed_running', 'failed_packages'):
+    for attr in ("failed_files", "failed_running", "failed_packages"):
         if device in getattr(ctx, attr):
             exc = getattr(ctx, attr).get(device)
             exc = exc or Exception(f"I can't get device {attr[len('failed_'):]} and I don't know why")

annet/generators/__init__.py

@@ -538,15 +538,7 @@ def _get_generators(module_paths: Union[List[str], dict], storage, device=None):
         module = importlib.import_module(module_path)
         if hasattr(module, "get_generators"):
             generators: List[BaseGenerator] = module.get_generators(storage)
-            if device is None:
-                res_generators += generators
-            else:
-                logger = get_logger()
-                for gen in generators:
-                    if gen.supports_vendor(device.hw.vendor):
-                        res_generators.append(gen)
-                    else:
-                        logger.info("generator %s does not support device vendor %s, skipping", gen, device.hw.vendor)
+            res_generators += generators
     return res_generators
 
 
@@ -706,6 +698,12 @@ class PartialGenerator(TreeGenerator):
     def run(self, device) -> Iterable[Union[str, tuple]]:
         if hasattr(self, "run_" + device.hw.vendor):
             return getattr(self, "run_" + device.hw.vendor)(device)
+        logger = get_logger()
+        logger.info(
+            "generator %s is not supported for vendor %s",
+            self,
+            device.hw.vendor,
+        )
         return iter(())
 
     def get_user_runner(self, device):

annet/output.py

@@ -133,7 +133,9 @@ class OutputDriverBasic(OutputDriver):
         ret = []
         fqdns = {}
         if args:
-            with storage_connector.get().storage()(args) as storage:
+            connector = storage_connector.get()
+            storage_opts = connector.opts().from_cli_opts(args)
+            with connector.storage()(storage_opts) as storage:
                 fqdns = storage.resolve_fdnds_by_query(args.query)
         for (assignment, exc) in fail.items():
             label = assignment

annet/rulebook/aruba/ap_env.py

@@ -4,15 +4,15 @@ from annet.annlib.types import Op
 
 
 try:
-    from annet.executor import CommandList
+    from annet.executor import CommandList, Command
 except ImportError:
-    from noc.annushka.annet.executor import CommandList
+    from noc.annushka.annet.executor import CommandList, Command
 
 
 def apply(hw, do_commit, do_finalize, **_):
     before, after = CommandList(), CommandList()
     if do_commit:
-        after.add_cmd("write memory")
+        after.add_cmd(Command("write memory"))
     return (before, after)
 
 

annet/rulebook/texts/huawei.rul

@@ -325,7 +325,7 @@ interface *                             %logic=huawei.iface.permanent
     trust upstream
 %if hw.Huawei.CE:
     trust *
-%else
+%else:
     trust
 %endif
     dhcp snooping check dhcp-rate enable
@@ -442,7 +442,7 @@ snmp-agent trap source
 snmp-agent packet max-size
 %if hw.Huawei.Quidway:
 snmp-agent protocol source-interface %logic=huawei.misc.undo_redo
-%else
+%else:
 snmp-agent protocol source-interface *
 %endif
 snmp-agent ~

{annet-0.5.dist-info → annet-0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.5
+Version: 0.7
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,4 +21,6 @@ Requires-Dist: contextlog >=1.1
 Requires-Dist: valkit >=0.1.4
 Requires-Dist: aiohttp >=3.8.4
 Requires-Dist: yarl >=1.8.2
+Requires-Dist: adaptix ==3.0.0b2
+Requires-Dist: dataclass-rest ==0.4