annet 0.14.9__py3-none-any.whl → 0.14.10__py3-none-any.whl

annet/adapters/netbox/common/query.py

@@ -21,3 +21,6 @@ class NetboxQuery(Query):
     def globs(self):
         # We process every query host as a glob
         return self.query
+
+    def is_empty(self) -> bool:
+        return len(self.query) == 0

annet/annlib/rbparser/syntax.py

@@ -31,7 +31,7 @@ def compile_row_regexp(row, flags=0):
         row = row[:-3]
     elif "~/" in row:
         # ~/{regex}/ -> {regex}, () не нужны поскольку уже (?:) - non-captured
-        row = re.sub(r"~/([^/]+)/", r"\1", row)
+        row = re.sub(r"~/(((?!~/).)+)/", r"\1", row)
     else:
         row += r"(?:\s|$)"
     row = re.sub(r"\s+", r"\\s+", row)

annet/cli.py

@@ -1,25 +1,29 @@
 import argparse
+import itertools
+import json
 import operator
 import os
 import platform
 import subprocess
 import shutil
+import sys
 from contextlib import ExitStack, contextmanager
 from typing import Tuple, Iterable
 
+import tabulate
 import yaml
 from contextlog import get_logger
 from valkit.python import valid_logging_level
 
 from annet.deploy import driver_connector, fetcher_connector
-from annet import api, cli_args, filtering
+from annet import api, cli_args, filtering, generators
 from annet.api import collapse_texts, Deployer
 from annet.argparse import ArgParser, subcommand
 from annet.diff import gen_sort_diff
 from annet.gen import Loader, old_raw
 from annet.lib import get_context_path, repair_context_file
 from annet.output import output_driver_connector, OutputDriver
-from annet.storage import get_storage
+from annet.storage import get_storage, Device
 
 
 def fill_base_args(parser: ArgParser, pkg_name: str, logging_config: str):
@@ -60,14 +64,14 @@ def _gen_current_items(
 
 
 @contextmanager
-def get_loader(gen_args: cli_args.GenOptions, args: cli_args.QueryOptions):
+def get_loader(gen_args: cli_args.GenOptions, args: cli_args.QueryOptionsBase):
     exit_stack = ExitStack()
     storages = []
     with exit_stack:
         connector, connector_opts = get_storage()
         storage_opts = connector.opts().parse_params(connector_opts, args)
         storages.append(exit_stack.enter_context(connector.storage()(storage_opts)))
-        yield Loader(*storages, args=gen_args)
+        yield Loader(*storages, args=gen_args, no_empty_warning=args.query.is_empty())
 
 
 @subcommand(is_group=True)
@@ -120,6 +124,62 @@ def show_device_dump(args: cli_args.QueryOptions, arg_out: cli_args.FileOutOptio
         )
 
 
+@subcommand(cli_args.ShowGeneratorsOptions, parent=show)
+def show_generators(args: cli_args.ShowGeneratorsOptions):
+    """ List applicable generators (for a device if query is set) """
+    arg_gens = cli_args.GenOptions(args)
+    with get_loader(arg_gens, args) as loader:
+        device: Device | None = None
+        devices = loader.devices
+        if len(devices) == 1:
+            device = devices[0]
+        elif len(devices) > 1:
+            get_logger().error("cannot show generators for more than one device at once")
+            sys.exit(1)
+        elif len(devices) == 0 and not args.query.is_empty():
+            # the error message will be logged in get_loader()
+            sys.exit(1)
+
+        if not device:
+            found_generators = loader.iter_all_gens()
+        else:
+            found_generators = []
+            gens = loader.resolve_gens(loader.devices)
+            for g in gens.partial[device]:
+                acl_func = g.acl_safe if args.acl_safe else g.acl
+                if g.supports_device(device) and acl_func(device):
+                    found_generators.append(g)
+            for g in gens.entire[device]:
+                if g.supports_device(device) and g.path(device):
+                    found_generators.append(g)
+            for g in gens.json_fragment[device]:
+                if g.supports_device(device) and g.path(device) and g.acl(device):
+                    found_generators.append(g)
+
+    output_data = []
+    for g in found_generators:
+        output_data.append({
+            "name": g.__class__.__name__,
+            "type": g.TYPE,
+            "tags": g.TAGS,
+            "module": g.__class__.__module__,
+            "description": generators.get_description(g.__class__),
+        })
+
+    if args.format == "json":
+        print(json.dumps(output_data))
+
+    elif args.format == "text":
+        keyfunc = operator.itemgetter("type")
+        for gen_type, gens in itertools.groupby(sorted(output_data, key=keyfunc, reverse=True), keyfunc):
+            print(tabulate.tabulate(
+                [(g["name"], ", ".join(g["tags"]), g["module"],  g["description"]) for g in gens],
+                [f"{gen_type}-Class", "Tags", "Module", "Description"],
+                tablefmt="orgtbl",
+            ))
+            print()
+
+
 @subcommand(cli_args.ShowGenOptions)
 def gen(args: cli_args.ShowGenOptions):
     """ Generate configuration for devices """

annet/gen.py

@@ -888,3 +888,6 @@ class Loader:
 
     def resolve_gens(self, devices: Iterable[Device]) -> DeviceGenerators:
         return self._gens.for_devices(devices)
+
+    def iter_all_gens(self) -> Iterator[BaseGenerator]:
+        return self._gens.iter_gens()

annet/implicit.py

@@ -132,6 +132,14 @@ def _implicit_tree(device):
                     !neighbor *
                         no shutdown
             """
+    elif device.hw.Cisco:
+        if device.hw.Cisco.Catalyst:
+            # this configuration is not visible in running-config when enabled
+            text += r"""
+                # line console aaa config
+                !line con 0
+                    authorization exec default
+            """
     return parse_text(text)
 
 

annet/storage.py

@@ -75,10 +75,13 @@ class StorageOpts(abc.ABC):
 
 class Query(abc.ABC):
     @classmethod
-    @abc.abstractclassmethod
+    @abc.abstractmethod
     def new(cls, query: Union[str, Iterable[str]], hosts_range: Optional[slice] = None) -> "Query":
         pass
 
+    def is_empty(self) -> bool:
+        return False
+
 
 class Device(Protocol):
     @property

{annet-0.14.9.dist-info → annet-0.14.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.14.9
+Version: 0.14.10
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.14.9.dist-info → annet-0.14.10.dist-info}/RECORD

@@ -1,22 +1,22 @@
 annet/__init__.py,sha256=oyElxAW97sHgQccGafhaWVBveBn1gSjjdP_xHROaRLg,2139
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=ZHKQriVCysSnox5stZnYxKLaPKzDjXbShxFyNW6LiiQ,12754
-annet/cli.py,sha256=aFFloyl5k2vz8mnm8Q2iwjAOUi4PTFWoVT9JszTkmHo,9969
+annet/cli.py,sha256=yUStwwUKGgGuNw94EvabUEMhBs0YsIsc4omUivst8H0,12366
 annet/cli_args.py,sha256=_Du9Jhe86F4fsx7u9njjvg25jTdoBsdbTEzbuDFgrFU,13248
 annet/connectors.py,sha256=Xgr7fNopRhFAYnkiDxhohBtjlFOLY8v0xLExHmVMr00,2511
 annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=FrYAUuh2TpSVX42SlTN_PhuSHmXG4Wj1nieY9Wqv9so,19122
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=jlAkT_phlIYrpOIqVc0GrApWp3Y8zr8lyxnZgIdL2F4,33533
+annet/gen.py,sha256=8IPejduvYXmezUDolLKg4Imt1TxEp0KJ7kSgMtFcaCY,33628
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
-annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
+annet/implicit.py,sha256=_3eY9NKqpLUm25vlJIP2cHN4gdTgzO6rG6mwCKJYMnQ,5439
 annet/lib.py,sha256=tQQlxZg1A2Q-tp18PoqBuORQmvP5dAAmAPvP6bBA6a0,3764
 annet/output.py,sha256=hJNGzL4Z3KgvqaCBkkmuuiXPhb64F1QV8YHkwnfhaaI,6852
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
-annet/storage.py,sha256=-l64yc0UfGR7Aqb3GlW18Kg1SJgIF1k6cf7-Ca4MhBc,3095
+annet/storage.py,sha256=Wr_D_w7JQD08nD2IvC6bcGJLH6Uv62tKznUyWWWVW5Q,3144
 annet/tabparser.py,sha256=ZjiI43ZVbrpMVR8qNbTbNh_U3oZ26VDc_2Y9wkkDkYA,874
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
@@ -28,7 +28,7 @@ annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
 annet/adapters/netbox/common/manufacturer.py,sha256=i-1mXQheS4ORZav1_xYxMuGBWVWQHolZYkEXNdGyf0g,1361
 annet/adapters/netbox/common/models.py,sha256=Vgxbl_Mm-zOAi2BTlEzDppTTgZjafFEC5F9s_MTd_xU,3263
-annet/adapters/netbox/common/query.py,sha256=OgUuF-bvshpoBUkrOs0tsMUAhjTsttzx3VV30ryFl0Y,577
+annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=idOm1na_2Axdi4MdLN4tAsPvsp5zBtJYD9j7cUiI-W8,400
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -58,7 +58,7 @@ annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
 annet/annlib/rbparser/ordering.py,sha256=DiKqyY8Khz-5MTxNF1GSNtZgtyKwT3YYCXpahIPB6Ps,1779
 annet/annlib/rbparser/platform.py,sha256=iyqy4A-6vUKM4j6hrOA6tsgWBXk7LcvkFrS2QHgkqho,1231
-annet/annlib/rbparser/syntax.py,sha256=eEUmszwPjdw57aofUYNQVcaxHPNV9yx9JNapjYY-BGM,3572
+annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
 annet/api/__init__.py,sha256=-G9wlYePC3ZgNo1p8r17vmx0WLb3UNvCw3ZJ9UhYJ-I,33169
@@ -124,10 +124,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.14.9.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.14.9.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.14.9.dist-info/METADATA,sha256=8qSsN16lENPe9EcC4dGlPk2hN8JDX690OlbbBaoQ_pE,694
-annet-0.14.9.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-annet-0.14.9.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.14.9.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.14.9.dist-info/RECORD,,
+annet-0.14.10.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.14.10.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.14.10.dist-info/METADATA,sha256=OvFvw8iDLiH6ZmTlDQIPwkONw9LHMEIcWldHqTtgAhA,695
+annet-0.14.10.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+annet-0.14.10.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.14.10.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.14.10.dist-info/RECORD,,