annet 1.1.0__tar.gz → 1.1.2__tar.gz

{annet-1.1.0/annet.egg-info → annet-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.1.0
+Version: 1.1.2
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -14,7 +14,6 @@ Requires-Dist: jsonpointer>=2.4
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: Pygments>=2.14.0
 Requires-Dist: Mako>=1.2.4
-Requires-Dist: Jinja2>=3.1.2
 Requires-Dist: packaging>=23.2
 Requires-Dist: contextlog>=1.1
 Requires-Dist: valkit>=0.1.4
@@ -22,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.2.0; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.2.1; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-1.1.0 → annet-1.1.2}/annet/adapters/netbox/common/query.py

@@ -5,7 +5,7 @@ from typing import cast, List, Union, Iterable, Optional, TypedDict
 from annet.storage import Query
 
 FIELD_VALUE_SEPARATOR = ":"
-ALLOWED_GLOB_GROUPS = ["site", "tag", "role", "device_type"]
+ALLOWED_GLOB_GROUPS = ["site", "tag", "role", "device_type", "status", "tenant"]
 
 
 class Filter(TypedDict, total=False):
@@ -14,6 +14,8 @@ class Filter(TypedDict, total=False):
     role: list[str]
     name: list[str]
     device_type: list[str]
+    status: list[str]
+    tenant: list[str]
 
 
 @dataclass

{annet-1.1.0 → annet-1.1.2}/annet/annlib/lib.py

@@ -18,7 +18,6 @@ from functools import lru_cache
 from typing import List, NamedTuple, Optional, Tuple, Union
 
 import contextlog
-import jinja2
 import mako.template
 
 _logger = contextlog.get_logger()
@@ -292,19 +291,6 @@ def mako_render(template, dedent=False, **kwargs):
     return ret
 
 
-def jinja_render(template, dedent=False, **kwargs):
-    @lru_cache(None)
-    def _compile_jinja(template, dedent):
-        if dedent:
-            template = textwrap.dedent(template).strip()
-        return jinja2.Template(template)
-
-    ret = _compile_jinja(template, dedent).render(**kwargs)
-    if dedent:
-        ret = ret.strip()
-    return ret
-
-
 # =====
 def find_exc_in_stack(
     container_exc: Exception,

{annet-1.1.0 → annet-1.1.2}/annet/annlib/patching.py

@@ -2,7 +2,7 @@ import copy
 import operator
 import textwrap
 from collections import OrderedDict as odict
-from typing import (  # pylint: disable=unused-import
+from typing import (
     Any,
     Dict,
     Iterator,
@@ -177,7 +177,7 @@ class Orderer:
     def rule_weight(self, row, rule, regexp_key):
         return len(set(row).intersection(set(rule["attrs"][regexp_key].pattern))) / len(row)
 
-    def get_order(self, row, cmd_direct):
+    def get_order(self, row, cmd_direct, scope: str | None = None):
         f_order = None
         f_weight = 0
         f_rule = ""
@@ -186,6 +186,12 @@ class Orderer:
         block_exit = platform.VENDOR_EXIT[self.vendor]
 
         for (order, (raw_rule, rule)) in enumerate(ordering.items()):
+            if (
+                (rule_scope := rule["attrs"]["scope"]) is not None
+                and scope not in rule_scope
+            ):
+                continue
+
             if rule["attrs"]["global"]:
                 children.append((raw_rule, rule))
 
@@ -419,7 +425,7 @@ def make_patch(pre, rb, hw, add_comments, orderer=None, _root_pre=None, do_commi
                             patch_row = "%s %s" % (row, comments)
 
                     # pylint: disable=unused-variable
-                    (order, order_direct, ordering, order_rule) = orderer.get_order(row, direct)
+                    (order, order_direct, ordering, order_rule) = orderer.get_order(row, direct, scope="patch")
                     fmt_row = patch_row
                     # fmt_row += "  # %s" % str(order_rule)  # uncomment to debug ordering
 

{annet-1.1.0 → annet-1.1.2}/annet/annlib/rbparser/ordering.py

@@ -2,7 +2,7 @@ import functools
 import re
 from collections import OrderedDict as odict
 
-from valkit.common import valid_bool
+from valkit.common import valid_bool, valid_string_list
 
 from . import platform, syntax
 
@@ -19,6 +19,10 @@ def compile_ordering_text(text, vendor):
             "global": {
                 "validator": valid_bool,
                 "default": False,
+            },
+            "scope": {
+                "validator": valid_string_list,
+                "default": None,
             }
         }),
         reverse_prefix=platform.VENDOR_REVERSES[vendor],
@@ -49,6 +53,7 @@ def _compile_ordering(tree, reverse_prefix):
                     ),
                     "order_reverse": attrs["params"]["order_reverse"],
                     "global": attrs["params"]["global"],
+                    "scope": attrs["params"]["scope"],
                     "raw_rule": attrs["raw_rule"],
                     "context": attrs["context"],
                 },

{annet-1.1.0 → annet-1.1.2}/annet/annlib/rbparser/platform.py

@@ -25,7 +25,7 @@ VENDOR_DIFF = {
     "routeros": "common.default_diff",
     "aruba": "aruba.default_diff",
     "pc": "common.default_diff",
-    "ribbon": "common.default_diff",
+    "ribbon": "juniper.default_diff",
     "b4com": "common.default_diff",
 }
 
@@ -40,7 +40,7 @@ VENDOR_DIFF_ORDERED = {
     "routeros": "common.ordered_diff",
     "aruba": "common.ordered_diff",
     "pc": "common.ordered_diff",
-    "ribbon": "common.ordered_diff",
+    "ribbon": "juniper.ordered_diff",
     "b4com": "common.ordered_diff",
 }
 

{annet-1.1.0 → annet-1.1.2}/annet/annlib/tabparser.py

@@ -387,6 +387,24 @@ class AsrFormatter(BlockExitFormatter):
             yield from super().block_exit(context)
 
 
+class JuniperPatch:
+    def __init__(self):
+        """In the case of comments, odict is not suitable: there may be several identical edit and exit"""
+        self._items = []
+
+    def __setitem__(self, key, value):
+        self._items.append((key, value))
+
+    def keys(self):
+        return list(self)
+
+    def items(self):
+        return self._items
+
+    def __iter__(self):
+        return iter(item[0] for item in self._items)
+
+
 class JuniperFormatter(CommonFormatter):
     patch_set_prefix = "set"
 
@@ -399,7 +417,7 @@ class JuniperFormatter(CommonFormatter):
         comment: str
 
         def __post_init__(self):
-            self.row = self.row.strip()
+            self.row = " ".join(map(lambda x: x.strip("\"'"), self.row.strip().split(" ")))
             self.comment = self.comment.strip()
 
         @classmethod
@@ -458,6 +476,13 @@ class JuniperFormatter(CommonFormatter):
     def patch_plain(self, patch):
         return list(self.cmd_paths(patch).keys())
 
+    def _blocks(self, tree: "PatchTree", is_patch: bool):
+        for row in super()._blocks(tree, is_patch):
+            if isinstance(row, str) and row.startswith(self.Comment.begin):
+                yield f"{self.Comment.begin} {self.Comment.loads(row).comment} {self.Comment.end}"
+            else:
+                yield row
+
     def _formatted_blocks(self, blocks):
         level = 0
         line = None
@@ -469,7 +494,7 @@ class JuniperFormatter(CommonFormatter):
             elif new_line is BlockEnd:
                 level -= 1
                 if isinstance(line, str):
-                    yield line + self._statement_end
+                    yield line + ("" if line.endswith(self.Comment.end) else self._statement_end)
                 yield self._indent * level + self._block_end
             elif isinstance(line, str):
                 yield line + ("" if line.endswith(self.Comment.end) else self._statement_end)
@@ -478,7 +503,8 @@ class JuniperFormatter(CommonFormatter):
             yield line + self._statement_end
 
     def cmd_paths(self, patch, _prev=tuple()):
-        commands = odict()
+        commands = JuniperPatch()
+
         for item in patch.itms:
             key, childs, context = item.row, item.child, item.context
 
@@ -490,33 +516,39 @@ class JuniperFormatter(CommonFormatter):
                     value = (
                         ""
                         if key.startswith("delete")
-                        else context["comment"]
+                        else key.removeprefix(self.Comment.begin).removesuffix(self.Comment.end).strip()
                     )
-
-                    cmd = "\n".join(
-                        (
-                            "edit " + " ".join(_prev),
-                            " ".join(("annotate", context["row"].split(" ")[0], f'"{value}"')),
-                            "exit"
-                        )
+                    cmds = (
+                        f"edit {' '.join(_prev)}",
+                        " ".join(("annotate", context["row"].split(" ")[0], f'"{value}"')),
+                        "exit"
                     )
                 elif key.startswith("delete"):
-                    cmd = " ".join(("delete", *_prev, key.replace("delete", "", 1).strip()))
+                    cmds = (
+                        " ".join(("delete", *_prev, key.replace("delete", "", 1).strip())),
+                    )
                 elif key.startswith("activate"):
-                    cmd = " ".join(("activate", *_prev, key.replace("activate", "", 1).strip()))
+                    cmds = (
+                        " ".join(("activate", *_prev, key.replace("activate", "", 1).strip())),
+                    )
                 elif key.startswith("deactivate"):
-                    cmd = " ".join(("deactivate", *_prev, key.replace("deactivate", "", 1).strip()))
+                    cmds = (
+                        " ".join(("deactivate", *_prev, key.replace("deactivate", "", 1).strip())),
+                    )
                 else:
-                    cmd = " ".join((self.patch_set_prefix, *_prev, key.strip()))
+                    cmds = (
+                        " ".join((self.patch_set_prefix, *_prev, key.strip())),
+                    )
 
                 # Expanding [ a b c ] junipers list of arguments
-                if matches := re.search(r"^(.*)\s+\[(.+)\]$", cmd):
-                    for c in matches.group(2).split(" "):
-                        if c.strip():
-                            cmd = " ".join([matches.group(1), c])
-                            commands[(cmd,)] = context
-                else:
-                    commands[(cmd,)] = context
+                for cmd in cmds:
+                    if matches := re.search(r"^(.*)\s+\[(.+)\]$", cmd):
+                        for c in matches.group(2).split(" "):
+                            if c.strip():
+                                items = " ".join([matches.group(1), c])
+                                commands[(items,)] = context
+                    else:
+                        commands[(cmd,)] = context
 
         return commands
 

{annet-1.1.0 → annet-1.1.2}/annet/api/__init__.py

@@ -700,7 +700,7 @@ async def adeploy(
         ans = deployer.ask_deploy()
         if ans != "y":
             return 2 ** 2
-        progress_bar = None
+
         if sys.stdout.isatty() and not args.no_progress:
             progress_bar = annet.deploy_ui.ProgressBars(odict([(device.fqdn, {}) for device in deploy_cmds]))
             progress_bar.init()

{annet-1.1.0 → annet-1.1.2}/annet/executor.py

@@ -4,7 +4,7 @@ import statistics
 from abc import ABC, abstractmethod
 from functools import partial
 from operator import itemgetter
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, List, Optional
 
 import colorama
 from annet.annlib.command import Command, CommandList, Question  # noqa: F401
@@ -16,28 +16,6 @@ class CommandResult(ABC):
         pass
 
 
-class Connector(ABC):
-    @abstractmethod
-    async def cmd(self, cmd: Union[Command, str]) -> CommandResult:
-        pass
-
-    @abstractmethod
-    async def download(self, files: List[str]) -> Dict[str, str]:
-        pass
-
-    @abstractmethod
-    async def upload(self, files: Dict[str, str]):
-        pass
-
-    @abstractmethod
-    def get_conn_trace(self) -> str:
-        pass
-
-    @abstractmethod
-    async def aclose(self) -> str:
-        pass
-
-
 class ExecutorException(Exception):
     def __init__(self, *args: List[Any], auxiliary: Optional[Any] = None, **kwargs: object):
         self.auxiliary = auxiliary

{annet-1.1.0 → annet-1.1.2}/annet/generators/entire.py

@@ -14,7 +14,6 @@ from typing import (
 
 from annet.lib import (
     flatten,
-    jinja_render,
     mako_render,
 )
 from .base import BaseGenerator, _filter_str
@@ -70,9 +69,6 @@ class Entire(BaseGenerator):
     def mako(self, text, **kwargs) -> str:
         return mako_render(text, dedent=True, device=self.__device, **kwargs)
 
-    def jinja(self, text, **kwargs) -> str:
-        return jinja_render(text, dedent=True, device=self.__device, **kwargs)
-
     # =====
 
     @classmethod

{annet-1.1.0 → annet-1.1.2}/annet/lib.py

@@ -24,7 +24,6 @@ from annet.annlib.lib import (  # pylint: disable=unused-import
     huawei_expand_vlandb,
     huawei_iface_ranges,
     is_relative,
-    jinja_render,
     jun_activate,
     jun_is_inactive,
     juniper_fmt_prefix_lists_acl,
@@ -151,10 +150,15 @@ def do_async(coro: Awaitable[ReturnType], new_thread=False) -> ReturnType:
 
         def wrapper(main):
             nonlocal res
-            res = asyncio.run(main)
+            try:
+                res = asyncio.run(main)
+            except BaseException as e:
+                res = e
         thread = threading.Thread(target=wrapper, args=(coro,))
         thread.start()
         thread.join()
+        if isinstance(res, BaseException):
+            raise res
         return res
     else:
         return asyncio.run(coro)

{annet-1.1.0 → annet-1.1.2}/annet/rulebook/juniper/__init__.py

@@ -12,8 +12,8 @@ def comment_processor(item: common.DiffItem):
     if item.op in (Op.REMOVED, Op.ADDED) and item.row.startswith(JuniperFormatter.Comment.begin):
         comment = JuniperFormatter.Comment.loads(item.row)
 
+        item.diff_pre["attrs"]["context"]["comment"] = True
         item.diff_pre["attrs"]["context"]["row"] = comment.row
-        item.diff_pre["attrs"]["context"]["comment"] = comment.comment
         item.diff_pre["key"] = item.diff_pre["raw_rule"] = (
             f"{JuniperFormatter.Comment.begin} {comment.row} {JuniperFormatter.Comment.end}"
         )

annet-1.1.2/annet/rulebook/texts/juniper.order

@@ -0,0 +1,4 @@
+# Правило на все команды
+* %global
+# Добавляем веса комментам, чтобы они катились всегда после команд, но только в патче
+*/\/\*(?:(?!\*\/).)*\*\// %global %scope=patch

{annet-1.1.0 → annet-1.1.2/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.1.0
+Version: 1.1.2
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -14,7 +14,6 @@ Requires-Dist: jsonpointer>=2.4
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: Pygments>=2.14.0
 Requires-Dist: Mako>=1.2.4
-Requires-Dist: Jinja2>=3.1.2
 Requires-Dist: packaging>=23.2
 Requires-Dist: contextlog>=1.1
 Requires-Dist: valkit>=0.1.4
@@ -22,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.2.0; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.2.1; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-1.1.0 → annet-1.1.2}/annet.egg-info/requires.txt

@@ -5,7 +5,6 @@ jsonpointer>=2.4
 PyYAML>=6.0.1
 Pygments>=2.14.0
 Mako>=1.2.4
-Jinja2>=3.1.2
 packaging>=23.2
 contextlog>=1.1
 valkit>=0.1.4
@@ -14,4 +13,4 @@ adaptix==3.0.0b7
 dataclass-rest==0.4
 
 [netbox]
-annetbox[sync]>=0.2.0
+annetbox[sync]>=0.2.1

{annet-1.1.0 → annet-1.1.2}/requirements.txt

@@ -5,7 +5,6 @@ jsonpointer>=2.4
 PyYAML>=6.0.1
 Pygments>=2.14.0
 Mako>=1.2.4
-Jinja2>=3.1.2
 packaging>=23.2
 contextlog>=1.1
 valkit>=0.1.4

{annet-1.1.0 → annet-1.1.2}/setup.py

@@ -44,7 +44,7 @@ if __name__ == "__main__":
           ],
         },
         extras_require={
-            "netbox": ["annetbox[sync]>=0.2.0"],
+            "netbox": ["annetbox[sync]>=0.2.1"],
         },
         python_requires=">=3.10",
         install_requires=requirements(),

annet-1.1.0/annet/rulebook/texts/juniper.order

@@ -1,4 +0,0 @@
-# Правило на все команды
-* %global
-# Добавляем веса комментам, чтобы они катились всегда после команд
-*/\/\*(?:(?!\*\/).)*\*\// %global