nbforager 0.6.0__tar.gz → 0.8.0__tar.gz

{nbforager-0.6.0 → nbforager-0.8.0}/PKG-INFO

@@ -1,33 +1,29 @@
 Metadata-Version: 2.3
 Name: nbforager
-Version: 0.6.0
+Version: 0.8.0
 Summary: Python package designed to assist in working with the Netbox REST API. The filter parameters are identical to those in the Web UI filter form. It replaces brief data with full information, and Netbox objects are represented as a recursive multidimensional dictionary.
 License: Apache-2.0
 Keywords: netbox
 Author: Vladimirs Prusakovs
 Author-email: vladimir.prusakovs@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: test
 Requires-Dist: ciscoconfparse (>=1.9,<2.0)
-Requires-Dist: netports (>=0.14,<1.0.0)
+Requires-Dist: netports (>=0.17)
 Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: requests (>=2,<3)
-Requires-Dist: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: tomli (==2.0.1)
-Requires-Dist: vhelpers (>=0.3,<1.0.0)
+Requires-Dist: tabulate (>=0.9,<0.10)
+Requires-Dist: vhelpers (>=0.3)
 Project-URL: Bug Tracker, https://github.com/vladimirs-git/nbforager/issues
-Project-URL: Download URL, https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.6.0.tar.gz
+Project-URL: Download URL, https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.8.0.tar.gz
 Project-URL: homepage, https://github.com/vladimirs-git/nbforager
 Project-URL: repository, https://github.com/vladimirs-git/nbforager
 Description-Content-Type: text/x-rst

{nbforager-0.6.0 → nbforager-0.8.0}/nbforager/helpers.py

@@ -2,15 +2,325 @@
 
 import itertools
 import urllib
+from copy import deepcopy
 from typing import Any
 from urllib.parse import ParseResult, urlencode, urlparse, parse_qs
 
 from vhelpers import vlist, vparam, vint
 
 from nbforager.exceptions import NbApiError
-from nbforager.types_ import LStr, LDAny, DDDLInt, LValue, LParam, LDList, DList, DLStr
+from nbforager.types_ import LStr, LDAny, DDDLInt, LValue, LParam, LDList, DList, DLStr, ODLStr
 from nbforager.types_ import LTInt2, DAny, SeqStr, SStr, TValues, TLists, T2Str, T3Str, T3StrInt
 
+# Netbox v3.5
+DEPENDENT_MODELS: DLStr = {
+    "circuits/circuit-terminations": [
+        "circuits/circuits",
+        "circuits/provider-networks",
+        "dcim/cable-terminations",
+        "dcim/sites",
+        "extras/tags",
+    ],
+    "circuits/circuit-types": ["extras/tags"],
+    "circuits/circuits": [
+        "circuits/circuit-types",
+        "circuits/provider-accounts",
+        "circuits/providers",
+        "extras/tags",
+        "tenancy/tenants",
+    ],
+    "circuits/provider-accounts": ["circuits/providers", "extras/tags"],
+    "circuits/provider-networks": ["circuits/providers", "extras/tags"],
+    "circuits/providers": ["extras/tags", "ipam/asns"],
+    "core/data-files": ["core/data-sources"],
+    "core/data-sources": ["extras/tags"],
+    "core/jobs": ["extras/content-types"],
+    "dcim/cable-terminations": [
+        "dcim/cables",
+        "dcim/devices",
+        "dcim/locations",
+        "dcim/racks",
+        "dcim/sites",
+    ],
+    "dcim/cables": ["extras/tags", "tenancy/tenants"],
+    "dcim/console-port-templates": ["dcim/device-types", "dcim/module-types"],
+    "dcim/console-ports": [
+        "dcim/cable-terminations",
+        "dcim/devices",
+        "dcim/modules",
+        "extras/tags",
+    ],
+    "dcim/console-server-port-templates": ["dcim/device-types", "dcim/module-types"],
+    "dcim/console-server-ports": [
+        "dcim/cable-terminations",
+        "dcim/devices",
+        "dcim/modules",
+        "extras/tags",
+    ],
+    "dcim/device-bay-templates": ["dcim/device-types"],
+    "dcim/device-bays": ["dcim/devices", "extras/tags"],
+    "dcim/device-roles": ["extras/config-templates", "extras/tags"],
+    "dcim/device-types": ["dcim/manufacturers", "extras/tags"],
+    "dcim/devices": [
+        "dcim/device-roles",
+        "dcim/device-types",
+        "dcim/locations",
+        "dcim/platforms",
+        "dcim/racks",
+        "dcim/sites",
+        "dcim/virtual-chassis",
+        "extras/config-templates",
+        "extras/tags",
+        "tenancy/tenants",
+        "virtualization/clusters",
+    ],
+    "dcim/front-port-templates": [
+        "dcim/device-types",
+        "dcim/module-types",
+        "dcim/rear-port-templates",
+    ],
+    "dcim/front-ports": [
+        "dcim/cable-terminations",
+        "dcim/devices",
+        "dcim/modules",
+        "dcim/rear-ports",
+        "extras/tags",
+    ],
+    "dcim/interface-templates": ["dcim/device-types", "dcim/module-types"],
+    "dcim/interfaces": [
+        "dcim/cable-terminations",
+        "dcim/devices",
+        "dcim/modules",
+        "dcim/virtual-device-contexts",
+        "extras/tags",
+        "ipam/ip-addresses",
+        "ipam/l2vpn-terminations",
+        "ipam/vlans",
+        "ipam/vrfs",
+        "virtualization/interfaces",
+        "wireless/wireless-lans",
+    ],
+    "dcim/inventory-item-roles": ["extras/tags"],
+    "dcim/inventory-item-templates": [
+        "dcim/device-types",
+        "dcim/inventory-item-roles",
+        "dcim/manufacturers",
+    ],
+    "dcim/inventory-items": [
+        "dcim/devices",
+        "dcim/inventory-item-roles",
+        "dcim/manufacturers",
+        "extras/tags",
+    ],
+    "dcim/locations": ["dcim/sites", "extras/tags", "ipam/vlan-groups", "tenancy/tenants"],
+    "dcim/manufacturers": ["extras/tags"],
+    "dcim/module-bay-templates": ["dcim/device-types"],
+    "dcim/module-bays": ["dcim/devices", "extras/tags"],
+    "dcim/module-types": ["dcim/manufacturers", "extras/tags"],
+    "dcim/modules": ["dcim/devices", "dcim/module-bays", "dcim/module-types", "extras/tags"],
+    "dcim/platforms": ["dcim/manufacturers", "extras/config-templates", "extras/tags"],
+    "dcim/power-feeds": [
+        "dcim/cable-terminations",
+        "dcim/power-panels",
+        "dcim/racks",
+        "extras/tags",
+    ],
+    "dcim/power-outlet-templates": [
+        "dcim/device-types",
+        "dcim/module-types",
+        "dcim/power-port-templates",
+    ],
+    "dcim/power-outlets": [
+        "dcim/cable-terminations",
+        "dcim/devices",
+        "dcim/modules",
+        "dcim/power-ports",
+        "extras/tags",
+    ],
+    "dcim/power-panels": ["dcim/locations", "dcim/sites", "extras/tags"],
+    "dcim/power-port-templates": ["dcim/device-types", "dcim/module-types"],
+    "dcim/power-ports": ["dcim/cable-terminations", "dcim/devices", "dcim/modules", "extras/tags"],
+    "dcim/rack-reservations": ["dcim/racks", "extras/tags", "tenancy/tenants", "users/users"],
+    "dcim/rack-roles": ["extras/tags"],
+    "dcim/racks": [
+        "dcim/locations",
+        "dcim/rack-roles",
+        "dcim/sites",
+        "extras/tags",
+        "ipam/vlan-groups",
+        "tenancy/tenants",
+    ],
+    "dcim/rear-port-templates": ["dcim/device-types", "dcim/module-types"],
+    "dcim/rear-ports": ["dcim/cable-terminations", "dcim/devices", "dcim/modules", "extras/tags"],
+    "dcim/regions": ["extras/tags", "ipam/vlan-groups"],
+    "dcim/site-groups": ["extras/tags", "ipam/vlan-groups"],
+    "dcim/sites": [
+        "dcim/regions",
+        "dcim/site-groups",
+        "extras/tags",
+        "ipam/asns",
+        "ipam/vlan-groups",
+        "tenancy/tenants",
+    ],
+    "dcim/virtual-chassis": ["dcim/devices", "extras/tags"],
+    "dcim/virtual-device-contexts": ["dcim/devices", "extras/tags", "tenancy/tenants"],
+    "extras/branchs": ["users/users"],
+    "extras/config-contexts": [
+        "dcim/device-roles",
+        "dcim/device-types",
+        "dcim/locations",
+        "dcim/platforms",
+        "dcim/regions",
+        "dcim/site-groups",
+        "dcim/sites",
+        "extras/tags",
+        "tenancy/tenant-groups",
+        "tenancy/tenants",
+        "virtualization/cluster-groups",
+        "virtualization/cluster-types",
+        "virtualization/clusters",
+    ],
+    "extras/config-templates": ["extras/tags"],
+    "extras/content-types": [],
+    "extras/custom-fields": ["extras/content-types"],
+    "extras/custom-links": ["extras/content-types"],
+    "extras/dashboards": ["users/users"],
+    "extras/export-templates": ["extras/content-types"],
+    "extras/image-attachments": ["extras/content-types"],
+    "extras/journal-entries": ["extras/content-types", "extras/tags", "users/users"],
+    "extras/object-changes": ["users/users"],
+    "extras/saved-filters": ["extras/content-types", "users/users"],
+    "extras/tagged-items": ["extras/content-types", "extras/tags"],
+    "extras/tags": [],
+    "extras/webhooks": ["extras/content-types"],
+    "ipam/aggregates": ["extras/tags", "ipam/rirs", "tenancy/tenants"],
+    "ipam/asn-ranges": ["extras/tags", "ipam/rirs", "tenancy/tenants"],
+    "ipam/asns": ["extras/tags", "ipam/rirs", "tenancy/tenants"],
+    "ipam/fhrp-group-assignments": ["extras/content-types", "ipam/fhrp-groups"],
+    "ipam/fhrp-groups": ["extras/tags", "ipam/ip-addresses"],
+    "ipam/ip-addresses": ["extras/tags", "ipam/vrfs", "tenancy/tenants"],
+    "ipam/ip-ranges": ["extras/tags", "ipam/roles", "ipam/vrfs", "tenancy/tenants"],
+    "ipam/l2vpn-terminations": ["extras/tags", "ipam/l2vpns"],
+    "ipam/l2vpns": ["extras/tags", "ipam/route-targets", "tenancy/tenants"],
+    "ipam/prefixes": [
+        "dcim/sites",
+        "extras/tags",
+        "ipam/roles",
+        "ipam/vlans",
+        "ipam/vrfs",
+        "tenancy/tenants",
+    ],
+    "ipam/rirs": ["extras/tags"],
+    "ipam/roles": ["extras/tags"],
+    "ipam/route-targets": ["extras/tags", "tenancy/tenants"],
+    "ipam/service-templates": ["extras/tags"],
+    "ipam/services": [
+        "dcim/devices",
+        "extras/tags",
+        "ipam/ip-addresses",
+        "virtualization/virtual-machines",
+    ],
+    "ipam/vlan-groups": ["extras/content-types", "extras/tags"],
+    "ipam/vlans": [
+        "dcim/sites",
+        "extras/tags",
+        "ipam/l2vpn-terminations",
+        "ipam/roles",
+        "ipam/vlan-groups",
+        "tenancy/tenants",
+    ],
+    "ipam/vrfs": ["extras/tags", "ipam/route-targets", "tenancy/tenants"],
+    "nb_config_checker/tasks": ["extras/tags", "users/users"],
+    "social_django/user-social-auths": ["users/users"],
+    "taggit/tagged-items": ["extras/content-types"],
+    "tenancy/contact-assignments": [
+        "extras/content-types",
+        "tenancy/contact-roles",
+        "tenancy/contacts",
+    ],
+    "tenancy/contact-groups": ["extras/tags"],
+    "tenancy/contact-roles": ["extras/tags"],
+    "tenancy/contacts": ["extras/tags", "tenancy/contact-groups"],
+    "tenancy/tenant-groups": ["extras/tags"],
+    "tenancy/tenants": ["extras/tags", "tenancy/tenant-groups"],
+    "users/groups": [],
+    "users/permissions": ["extras/content-types", "users/groups", "users/users"],
+    "users/tokens": ["users/users"],
+    "users/user-preferences": ["users/users"],
+    "users/users": [],
+    "virtualization/cluster-groups": ["extras/tags", "ipam/vlan-groups"],
+    "virtualization/cluster-types": ["extras/tags"],
+    "virtualization/clusters": [
+        "dcim/sites",
+        "extras/tags",
+        "ipam/vlan-groups",
+        "tenancy/tenants",
+        "virtualization/cluster-groups",
+        "virtualization/cluster-types",
+    ],
+    "virtualization/interfaces": [
+        "extras/tags",
+        "ipam/ip-addresses",
+        "ipam/l2vpn-terminations",
+        "ipam/vlans",
+        "ipam/vrfs",
+        "virtualization/virtual-machines",
+    ],
+    "virtualization/virtual-machines": [
+        "dcim/device-roles",
+        "dcim/devices",
+        "dcim/platforms",
+        "dcim/sites",
+        "extras/tags",
+        "tenancy/tenants",
+        "virtualization/clusters",
+    ],
+    "wireless/wireless-lan-groups": ["extras/tags"],
+    "wireless/wireless-lans": [
+        "extras/tags",
+        "ipam/vlans",
+        "tenancy/tenants",
+        "wireless/wireless-lan-groups",
+    ],
+    "wireless/wireless-links": ["extras/tags", "tenancy/tenants"],
+}
+"""Models dependency for Netbox v3.5"""
+
+
+def dependency_ordered_paths(dependency: ODLStr = None) -> LStr:
+    """Order paths based on dependencies. Models with the lowes count dependencies will be first.
+
+    :param dependency: Dictionary representing dependencies,
+        where key is the parent model and value is a list of child models.
+    :return: Ordered paths based on dependencies.
+    :raises ValueError: If circular dependency, too many iterations.
+    """
+    paths: LStr = []
+
+    idx = 0
+    dependency_: DLStr = dependency if dependency else DEPENDENT_MODELS
+    dependency_ = deepcopy(dependency_)
+
+    while dependency_:
+        for parent, children in dependency_.items():
+            if parent in paths:
+                continue
+            diff = set(children).difference(set(paths))
+            if parent == "dcim/devices":
+                diff.discard("dcim/virtual-chassis")
+            if not diff:
+                paths.append(parent)
+
+        dependency_ = {k: v for k, v in dependency_.items() if k not in paths}
+        if not dependency_:
+            break
+
+        idx += 1
+        if idx >= 100:
+            raise ValueError("Circular dependency, too many iterations")
+
+    return paths
+
 
 # =========================== app model id ===========================
 

{nbforager-0.6.0 → nbforager-0.8.0}/nbforager/nb_api.py

@@ -282,6 +282,9 @@ class NbApi:
                 app_paths.append(path)
         return app_paths
 
+    def connectors(self) -> ODDAny:
+        """Return list of Connector instances ordered"""
+
     def copy(self, **kwargs) -> NbApi:
         """Create a duplicate of the object.
 

{nbforager-0.6.0 → nbforager-0.8.0}/nbforager/parser/nb_parser.py

@@ -117,7 +117,7 @@ class NbParser:
 
         :param keys: Chaining dictionary keys to retrieve the desired value.
 
-        :return: Boolean value or an empty string if the value is absent.
+        :return: Boolean value or False if the value is absent.
         :rtype: bool
         """
         return self._get_keys(type_=bool, keys=keys, data=self.data)

{nbforager-0.6.0 → nbforager-0.8.0}/pyproject.toml

@@ -1,16 +1,17 @@
 [tool.poetry]
 name = "nbforager"
-version = "0.6.0"
+version = "0.8.0"
 description = "Python package designed to assist in working with the Netbox REST API. The filter parameters are identical to those in the Web UI filter form. It replaces brief data with full information, and Netbox objects are represented as a recursive multidimensional dictionary."
 authors = ["Vladimirs Prusakovs <vladimir.prusakovs@gmail.com>"]
 readme = "README.rst"
+package-mode = true
 license = "Apache-2.0"
 keywords = ["netbox"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.11",
     "Natural Language :: English",
 ]
 
@@ -18,18 +19,17 @@ classifiers = [
 homepage = "https://github.com/vladimirs-git/nbforager"
 repository = "https://github.com/vladimirs-git/nbforager"
 "Bug Tracker" = "https://github.com/vladimirs-git/nbforager/issues"
-"Download URL" = "https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.6.0.tar.gz"
+"Download URL" = "https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.8.0.tar.gz"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.11"
 #
 ciscoconfparse = "^1.9"
-netports = ">=0.14,<1.0.0"
+netports = ">=0.17"
 pydantic = "^2"
 requests = "^2"
-tabulate = "^0.9.0"
-tomli = "2.0.1"
-vhelpers = ">=0.3,<1.0.0"
+tabulate = "^0.9"
+vhelpers = ">=0.3"
 
 [tool.poetry.group.test.dependencies]
 dictdiffer = "^0.9.0"
@@ -44,30 +44,28 @@ sphinx-rtd-theme = "^1.3.0"
 sphinxnotes-strike = "^1.2"
 
 [tool.poetry.group.dev.dependencies]
-poetry = "^1.8.3"
+poetry = "^2.1.2"
 #
-mypy = "^1.14.1"
-pygments = "^2.16.1"
-pylint = "^3.2.7"
-pytest-cov = "^5.0.0"
+mypy = "^1.15.0"
+pygments = "^2.19.1"  # rst-lint
+pylint = "^3.3.6"
+pytest-cov = "^6.1.1"
 restructuredtext-lint = "^1.4.0"
-ruff = "^0.9.9"
-twine = "^4.0.2"
-types-pyyaml = "^6.0.12.12"
-types-requests = "^2.31.0.9"
-types-tabulate = "^0.9.0.3"
-typing-extensions = "^4.12.2"
-
-[tool.setuptools.package-data]
-nbforager = ["py.typed"]
+ruff = "^0.11.4"
+twine = "^6.1.0"
+#types-pyyaml = "^6.0.12.12"
+types-requests = "^2.32.0.20250328"
+types-tabulate = "^0.9.0.20241207"
+typing-extensions = "^4.9.0"
 
 [tool.poetry.extras]
 test = ["pytest"]
 
 [tool.pylint]
-disable = "fixme"
+#disable = "fixme"
 max-args = 10
 max-attributes = 10
+max-bool-expr = 10
 max-line-length = 100
 max-locals = 20
 max-nested-blocks = 6
@@ -84,13 +82,14 @@ disable = [
     "protected-access",
     "redefined-builtin",
     "redefined-outer-name",
+    "too-many-positional-arguments",
     "too-many-statements",
     "unused-import",
     "use-dict-literal",
 ]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.11"
 exclude = ["_notes"]
 
 [[tool.mypy.overrides]]
@@ -107,17 +106,20 @@ exclude = [
     "_notes",
     "dist",
     "examples",
+    "sdist",
     "temp",
     "tmp",
     "venv",
 ]
 line-length = 100
 indent-width = 4
-target-version = "py38"
-#select = ["E4", "E7", "E9", "F"]
-#ignore = []
-#fixable = ["ALL"]
-#unfixable = []
+target-version = "py311"
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "F401",  # imported but unused
+    "F811",  # Redefinition of unused
+]
 
 [tool.ruff.format]
 quote-style = "double"