annet 0.16.10__py3-none-any.whl → 0.16.12__py3-none-any.whl

annet/adapters/netbox/common/client.py

@@ -79,9 +79,11 @@ def collect(func: Func, field: str = "", batch_size: int = 100) -> Func:
 
 
 class BaseNetboxClient(RequestsClient):
-    def __init__(self, url: str, token: str):
+    def __init__(self, url: str, token: str, insecure: bool = False):
         url = url.rstrip("/") + "/api/"
         session = Session()
+        if insecure:
+            session.verify = False
         if token:
             session.headers["Authorization"] = f"Token {token}"
         super().__init__(url, session)

annet/adapters/netbox/common/storage_opts.py

@@ -5,12 +5,18 @@ DEFAULT_URL = "http://localhost"
 
 
 class NetboxStorageOpts:
-    def __init__(self, url: str, token: str):
+    def __init__(self, url: str, token: str, insecure: bool = False):
         self.url = url
         self.token = token
+        self.insecure = insecure
 
     @classmethod
     def parse_params(cls, conf_params: Optional[dict[str, str]], cli_opts: Any):
         url = os.getenv("NETBOX_URL") or conf_params.get("url") or DEFAULT_URL
         token = os.getenv("NETBOX_TOKEN", "").strip() or conf_params.get("token") or ""
-        return cls(url=url, token=token)
+        insecure = False
+        if insecure_env := os.getenv("NETBOX_INSECURE", "").lower():
+            insecure = insecure_env in ("true", "1", "t")
+        else:
+            insecure = bool(conf_params.get("insecure") or False)
+        return cls(url=url, token=token, insecure=insecure)

annet/adapters/netbox/provider.py

@@ -12,7 +12,7 @@ from .v37.storage import NetboxStorageV37
 
 
 def storage_factory(opts: NetboxStorageOpts) -> Storage:
-    client = NetboxStatusClient(opts.url, opts.token)
+    client = NetboxStatusClient(opts.url, opts.token, opts.insecure)
     try:
         status = client.status()
     except ClientError as e:
@@ -27,9 +27,10 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
 
 
 class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
-    def __init__(self, url: Optional[str] = None, token: Optional[str] = None):
+    def __init__(self, url: Optional[str] = None, token: Optional[str] = None, insecure: bool = False):
         self.url = url
         self.token = token
+        self.insecure = insecure
 
     @classmethod
     def with_config(cls, **kwargs: Dict[str, Any]) -> T:

annet/adapters/netbox/v37/storage.py

@@ -2,6 +2,7 @@ from logging import getLogger
 from typing import Any, Optional, List, Union, Dict
 from ipaddress import ip_interface
 from collections import defaultdict
+import ssl
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link, link_constant
@@ -86,9 +87,15 @@ def extend_ip_address(
 
 class NetboxStorageV37(Storage):
     def __init__(self, opts: Optional[NetboxStorageOpts] = None):
+        ctx: ssl.con | ssl.SSLContext = None
+        if opts.insecure:
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
         self.netbox = NetboxV37(
             url=opts.url,
             token=opts.token,
+            ssl_context=ctx,
         )
         self._all_fqdns: Optional[list[str]] = None
 

annet/generators/jsonfragment.py

@@ -96,22 +96,23 @@ class JSONFragment(TreeGenerator):
     def _set_or_replace_dict(self, pointer, value):
         if not pointer:
             if self._json_config == {}:
-                self._json_config = value
+                self._json_config = self.process_value(value)
             else:
-                self._json_config = [self._json_config, value]
+                self._json_config = [self._json_config, self.process_value(value)]
         else:
             self._set_dict(self._json_config, pointer, value)
 
+    def process_scalar_value(self, value: Any) -> Any:
+        return str(value)
+
     def process_value(self, value: Any) -> Any:
-        if isinstance(value, str):
-            return value
-        elif isinstance(value, list):
+        if isinstance(value, (list, set, frozenset)):
             return [self.process_value(x) for x in value]
         elif isinstance(value, dict):
             for k, v in value.items():
                 value[k] = self.process_value(v)
             return value
-        return str(value)
+        return self.process_scalar_value(value)
 
     def _set_dict(self, cfg, pointer, value):
         # pointer has at least one key

annet/implicit.py

@@ -46,6 +46,7 @@ def _implicit_tree(device):
                 !user-interface vty ~
                     protocol inbound all
                 netconf
+                port link-flap trigger error-down
             """
         elif device.hw.Huawei.NE:
             text = """

annet/output.py

@@ -2,9 +2,12 @@ import abc
 import os
 import posixpath
 import sys
-from typing import List, Optional, Tuple, Type, Dict
+from typing import Dict, List, Optional, Tuple, Type
+from urllib.parse import urlparse
 
 import colorama
+from contextlog import get_logger
+
 from annet.annlib.output import (  # pylint: disable=unused-import
     LABEL_NEW_PREFIX,
     OutputWriter,
@@ -17,8 +20,6 @@ from annet.annlib.output import (  # pylint: disable=unused-import
     print_err_label,
     print_label,
 )
-from contextlog import get_logger
-
 from annet.cli_args import FileOutOptions, QueryOptions
 from annet.connectors import Connector
 from annet.storage import Device, storage_connector
@@ -112,9 +113,11 @@ class OutputDriverBasic(OutputDriver):
                 if label.startswith(os.sep):
                     # just in case.
                     label = label.lstrip(os.sep)
+
                 if os.sep not in label:
                     # vendor config
                     label = os.path.basename(label)
+
                 else:
                     # entire generated file
                     parts = label.split(os.sep)
@@ -125,6 +128,7 @@ class OutputDriverBasic(OutputDriver):
                     if query_result_count > 1 or arg_out.dest_force_create_dir:
                         label = os.path.join(hostname, label)
                 file_dest = os.path.join(dest, "errors") if is_fail else dest
+
                 out_file = os.path.normpath(os.path.join(file_dest, label))
                 logger.info("writing '%s'", out_file)
                 dirname = os.path.dirname(out_file)
@@ -164,12 +168,22 @@ class OutputDriverBasic(OutputDriver):
         >>>
         ```
         """
+
         # NOTE: с полученным `config_path` работаем через `posixpath`, а не через `os.path`, потому что
         #       entire-путь POSIX-специфичный; но в конце формируем путь через `os.path` для текущей платформы
         if not posixpath.abspath(config_path):
             raise RuntimeError(f"Want absolute config path, but relative received: {config_path}")
+
         cfg_files = self.cfg_file_names(device)
-        # NOTE: получаем путь без "/" в начале, например, "etc/frr/frr.conf"
+
+        parsed_config_path = urlparse(config_path)
+        scheme, config_path = parsed_config_path.scheme or "file", parsed_config_path.path
+
         relative_config_path = posixpath.relpath(config_path, "/")
+        if scheme != "file":
+            host = parsed_config_path.hostname + f":{parsed_config_path.port}" if parsed_config_path.port else ""
+            relative_config_path = os.path.join(host, relative_config_path)
+
         dest_config_path_parts = [cfg_files[0]] + relative_config_path.split(posixpath.sep)
+
         return os.path.join(*dest_config_path_parts)

{annet-0.16.10.dist-info → annet-0.16.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.10
+Version: 0.16.12
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -19,7 +19,6 @@ Requires-Dist: psutil >=5.8.0
 Requires-Dist: packaging >=23.2
 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.0b7
 Requires-Dist: dataclass-rest ==0.4

{annet-0.16.10.dist-info → annet-0.16.12.dist-info}/RECORD

@@ -11,9 +11,9 @@ annet/executor.py,sha256=Jny-hm0otZA1naPpFWR-R16SbaZioSQ8pkx-Yd2PYlM,19004
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=rOAveprvBaEXbLyaQUhQ0QtOvcDfndlIOpchNhu8M1U,33499
 annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
-annet/implicit.py,sha256=pX1FCZobkx-b5Y9otJDcr2eJQ1BUk_pG-ElKIMUSXWE,5553
+annet/implicit.py,sha256=P-vNhHtckMnEd8K2TiMTJWoegRcyQ_XFmrBaMdanhKU,5603
 annet/lib.py,sha256=lOdz3UJFYkO0wnuzIRRq3FpULQliqBtfmGmKOGVFO4Q,4238
-annet/output.py,sha256=BNPzjuhMa7gSJ8ze_1O-Ey0tTxSyhAiwfztZMQwhMzk,7176
+annet/output.py,sha256=FYMcWCc43-b51KsCiKnXPZHawhgWNoVtY9gRqw__Ce0,7473
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
@@ -29,18 +29,18 @@ annet/adapters/fetchers/stub/fetcher.py,sha256=bJGNJcvjrxSa4d8gly6NkaRcxoK57zbZh
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/file/provider.py,sha256=Wn3sG2TOI6ZWuRHhPSyg8S0Dnrz5LN3VyuqE6S7r5GM,5930
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/provider.py,sha256=IIs37QFHuJHxq4A0WfBS4JENk--v3BxqgNPal1Or4Xc,1470
+annet/adapters/netbox/provider.py,sha256=cEPdHKw4zWA3Wrfmj01spQrkGpwcQdZ0Jjy51m5mvs4,1542
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
+annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=QoTjmuBAg5klOJqeo8HuS2HybIUGsjTkknLkQL_Tiec,1606
 annet/adapters/netbox/common/models.py,sha256=SeWQZV-zvaKvK2YT2Bwf-iapkIs5pr7I7rAI7vlFMB8,6886
 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=iadgWGMb-rfSp3SnFAw8SH5bMKjwvcAsJ74v_z0CCXQ,507
+annet/adapters/netbox/common/storage_opts.py,sha256=0xQeO_OGex73cV9UA5XZn7hLiyhGYwNHYtO5JtMSR4o,815
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v37/storage.py,sha256=Fq72sIHZRXx-lMS_3mzD-thaNNJ_zogaA-aCyXaEn2U,9716
+annet/adapters/netbox/v37/storage.py,sha256=nCcQtjrAvi9sW0_XHZDCFnOk1XIbWUO_pRt1m6E0ELk,9957
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
@@ -74,7 +74,7 @@ annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=7WySkVaXNT3ZAiHcQ0JUKdlhGJAN8cNUxF6c7ilYnO8,2928
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
-annet/generators/jsonfragment.py,sha256=_jcEjfX9hIiEXSbOPbDAx2WvBkTGMRNrJmluUtIE8C4,4107
+annet/generators/jsonfragment.py,sha256=s7zOjX6JR43sIA9wse13GEPU06aeOa75uiA8WBOVDa8,4207
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
 annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
@@ -152,10 +152,10 @@ annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn
 annet_generators/mesh_example/__init__.py,sha256=NfNWgXn1TNiWI6A5tmU6Y-4QV2i33td0Qs3re0MNNMo,218
 annet_generators/mesh_example/bgp.py,sha256=ck--yU_lUdAX9DWaaVQ-C29eQN-EGf1gEpOTBxmMnWA,1317
 annet_generators/mesh_example/mesh_logic.py,sha256=5Wt17LPt-EWe126IFAdaQQGWIOR3mxTJjAMUY8K0c0w,971
-annet-0.16.10.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.10.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.10.dist-info/METADATA,sha256=nS_AbW4YJ7cjneZlyiKTA1CsSPnk1VcOLfi_KkMipdU,776
-annet-0.16.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-annet-0.16.10.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.10.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.10.dist-info/RECORD,,
+annet-0.16.12.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.12.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.12.dist-info/METADATA,sha256=YbWZDXAcXsV-IkxQAak-afnS7CZ3jtGF2IY5HJZiwcY,745
+annet-0.16.12.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+annet-0.16.12.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.12.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.12.dist-info/RECORD,,

{annet-0.16.10.dist-info → annet-0.16.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any