annet 1.1.0__tar.gz → 1.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.1.0
+Version: 1.1.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -22,7 +22,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.1}/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.1}/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.1}/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.1}/annet/annlib/tabparser.py

@@ -458,6 +458,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 +476,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)

{annet-1.1.0 → annet-1.1.1}/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.1/annet/rulebook/texts/juniper.order

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.1.0
+Version: 1.1.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -22,7 +22,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.1}/annet.egg-info/requires.txt

@@ -14,4 +14,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.1}/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