nbforager 0.1.15__tar.gz → 0.2.2__tar.gz

nbforager-0.2.2/LICENCE.txt

@@ -0,0 +1,177 @@
+                             Apache License
+                       Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+Copyright 2023 Vladimirs Prusakovs

{nbforager-0.1.15 → nbforager-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nbforager
-Version: 0.1.15
+Version: 0.2.2
 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.
 Home-page: https://github.com/vladimirs-git/nbforager
 License: Apache-2.0
@@ -17,15 +17,18 @@ 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
 Provides-Extra: test
 Requires-Dist: ciscoconfparse (>=1.9,<2.0)
 Requires-Dist: netports (>=0.12.1,<0.13.0)
 Requires-Dist: pydantic (>=2,<3)
+Requires-Dist: pynetbox (>=7.3.3,<8.0.0)
 Requires-Dist: requests (>=2,<3)
+Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: tomli (==2.0.1)
 Requires-Dist: vhelpers (>=0.1,<0.2)
 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.1.15.tar.gz
+Project-URL: Download URL, https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.2.2.tar.gz
 Project-URL: Repository, https://github.com/vladimirs-git/nbforager
 Description-Content-Type: text/x-rst
 
@@ -40,7 +43,7 @@ Python package designed to help work with the `Netbox`_ REST API.
 
 - `NbApi`_ Request data from Netbox using filter parameters identical to those in the Web UI filter form. Filter parameters use the ``OR`` operator.
 - `NbForager`_ The REST API returns objects that contain a brief representation of related objects. NbForager replaces brief data with full and objects look like a recursive multidimensional dictionary.
-- `NbBranch`_ Extract typed values from a Netbox object dictionary by using a chain of keys.
+- `NbParser`_ Extract typed values from a Netbox object dictionary by using a chain of keys.
 
 Checked with Python >= 3.8, Netbox >= v3.6.
 Fully documented on `Read the Docs`_.
@@ -115,7 +118,7 @@ Request objects using filtering parameters. Assemble multidimensional dictionary
 
     from pprint import pprint
 
-    from nbforager import NbForager, NbBranch
+    from nbforager import NbForager, NbParser
 
     HOST = "demo.netbox.dev"
     TOKEN = "1234567890123456789012345678901234567890"
@@ -167,8 +170,8 @@ Request objects using filtering parameters. Assemble multidimensional dictionary
     region = device["site"]["region"]["name"]
     print(f"{region=}")  # region="North Carolina"
 
-    # Use NbBranch to ensure the data type if any dictionary in the chain is missing.
-    region = NbBranch(device).str("site", "region", "name")
+    # Use NbParser to ensure the data type if any dictionary in the chain is missing.
+    region = NbParser(device).str("site", "region", "name")
     print(f"{region=}")  # region="North Carolina"
 
 
@@ -227,5 +230,5 @@ Create, get, update and delete ip-addresses.
 .. _`Read the Docs`: https://nbforager.readthedocs.io/en/latest/
 .. _`NbApi`: https://nbforager.readthedocs.io/en/latest/api/nb_api.html#nbapi
 .. _`NbForager`: https://nbforager.readthedocs.io/en/latest/foragers/nb_forager.html#nbforager
-.. _`NbBranch`: https://nbforager.readthedocs.io/en/latest/branch/nb_branch.html#nbbranch
+.. _`NbParser`: https://nbforager.readthedocs.io/en/latest/parser/nb_parser.html#nbparser
 

{nbforager-0.1.15 → nbforager-0.2.2}/README.rst

@@ -9,7 +9,7 @@ Python package designed to help work with the `Netbox`_ REST API.
 
 - `NbApi`_ Request data from Netbox using filter parameters identical to those in the Web UI filter form. Filter parameters use the ``OR`` operator.
 - `NbForager`_ The REST API returns objects that contain a brief representation of related objects. NbForager replaces brief data with full and objects look like a recursive multidimensional dictionary.
-- `NbBranch`_ Extract typed values from a Netbox object dictionary by using a chain of keys.
+- `NbParser`_ Extract typed values from a Netbox object dictionary by using a chain of keys.
 
 Checked with Python >= 3.8, Netbox >= v3.6.
 Fully documented on `Read the Docs`_.
@@ -84,7 +84,7 @@ Request objects using filtering parameters. Assemble multidimensional dictionary
 
     from pprint import pprint
 
-    from nbforager import NbForager, NbBranch
+    from nbforager import NbForager, NbParser
 
     HOST = "demo.netbox.dev"
     TOKEN = "1234567890123456789012345678901234567890"
@@ -136,8 +136,8 @@ Request objects using filtering parameters. Assemble multidimensional dictionary
     region = device["site"]["region"]["name"]
     print(f"{region=}")  # region="North Carolina"
 
-    # Use NbBranch to ensure the data type if any dictionary in the chain is missing.
-    region = NbBranch(device).str("site", "region", "name")
+    # Use NbParser to ensure the data type if any dictionary in the chain is missing.
+    region = NbParser(device).str("site", "region", "name")
     print(f"{region=}")  # region="North Carolina"
 
 
@@ -196,4 +196,4 @@ Create, get, update and delete ip-addresses.
 .. _`Read the Docs`: https://nbforager.readthedocs.io/en/latest/
 .. _`NbApi`: https://nbforager.readthedocs.io/en/latest/api/nb_api.html#nbapi
 .. _`NbForager`: https://nbforager.readthedocs.io/en/latest/foragers/nb_forager.html#nbforager
-.. _`NbBranch`: https://nbforager.readthedocs.io/en/latest/branch/nb_branch.html#nbbranch
+.. _`NbParser`: https://nbforager.readthedocs.io/en/latest/parser/nb_parser.html#nbparser

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/__init__.py

@@ -1,15 +1,15 @@
 """nbforager."""
 
-from nbforager.branch.nb_branch import NbBranch
-from nbforager.branch.nb_custom import NbCustom
-from nbforager.branch.nb_value import NbValue
 from nbforager.nb_api import NbApi
 from nbforager.nb_forager import NbForager
 from nbforager.nb_tree import NbTree
+from nbforager.parser.nb_custom import NbCustom
+from nbforager.parser.nb_parser import NbParser
+from nbforager.parser.nb_value import NbValue
 
 __all__ = [
     "NbApi",
-    "NbBranch",
+    "NbParser",
     "NbCustom",
     "NbForager",
     "NbTree",

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/api/base_c.py

@@ -33,6 +33,7 @@ LONERS: DLStr = {
     "dcim/devices/": ["airflow"],
     "ipam/aggregates/": ["prefix"],
     "ipam/prefixes/": ["within_include"],
+    "ipam/vlan-groups/": ["site"],
     "extras/content-types/": ["id", "app_label", "model"],
 }
 
@@ -51,6 +52,7 @@ class BaseC:
         "cid",
         "vid",
         "asn",
+        "device_id",
     ]
     _init_params = [
         "host",
@@ -71,11 +73,11 @@ class BaseC:
     _reserved_keys: DLStr = {
         "ipam/": [
             # ipam aggregates, prefixes, ip_addresses
-            "ipv4",
-            "aggregate",
-            "super_prefix",
-            "sub_prefixes",
-            "ip_addresses",
+            "_ipv4",
+            "_aggregate",
+            "_super_prefix",
+            "_sub_prefixes",
+            "_ip_addresses",
             # evonetbox
             "overlapped",
             "warnings",
@@ -83,19 +85,25 @@ class BaseC:
             "nbnets__subnets",
         ],
         "dcim/devices/": [
-            "interfaces",
-            "front_ports",
-            "rear_ports",
-            "console_ports",
-            "console_server_ports",
-            "power_ports",
-            "power_outlets",
-            "module_bays",
-            "device_bays",
-            "inventory_items",
+            "_interfaces",
+            "_front_ports",
+            "_rear_ports",
+            "_console_ports",
+            "_console_server_ports",
+            "_power_ports",
+            "_power_outlets",
+            "_module_bays",
+            "_device_bays",
+            "_inventory_items",
+        ],
+        "dcim/interfaces/": [
+            "_ip_addresses",
         ],
         "virtualization/virtual-machines/": [
-            "interfaces",
+            "_interfaces",
+        ],
+        "virtualization/interfaces/": [
+            "_ip_addresses",
         ],
     }
 
@@ -187,9 +195,14 @@ class BaseC:
 
     @property
     def url(self) -> str:
-        """Base URL with the application and model path."""
+        """URL to the API endpoint of the Netbox object."""
         return f"{self.url_base}{self.path}"
 
+    @property
+    def url_ui(self) -> str:
+        """URL to the UI endpoint to the Netbox object."""
+        return self.url.replace("/api/", "/", 1)
+
     @property
     def url_base(self) -> str:
         """Base URL without the application and model path."""
@@ -509,6 +522,7 @@ class BaseC:
         """
         params_d: DList = _lists_wo_dupl(kwargs)
         params_d = self._change_params_name_to_id(params_d)
+        params_d = self._change_params_exceptions(params_d)
         params_ld: LDList = h.make_combinations(self._loners, params_d)
         params_ld = h.change_params_or(params_ld)
         params_ld = h.join_params(params_ld, self._default_get)
@@ -552,9 +566,6 @@ class BaseC:
             params_d = result["params_d"]
             if not result["count"]:
                 continue
-            if count <= self.limit:
-                params.append(params_d)
-                continue
             params_: LDAny = h.generate_offsets(count, self.limit, params_d)
             params.extend(params_)
         return params
@@ -614,6 +625,9 @@ class BaseC:
         """Change parameter with name to parameter with id.
 
         Request all related objects from the Netbox, find the name, and replace it with the ID.
+
+        Described in: nb_api.rst Extended filtering parameters
+
         :param params_d: Parameters that need to update.
         :return: Updated parameters.
         """
@@ -640,6 +654,27 @@ class BaseC:
         params_d_.update(need_add)
         return params_d_
 
+    def _change_params_exceptions(self, params_d: DList) -> DList:
+        """Process exceptions that work differently than
+
+        Described in: nb_api.rst Extended filtering parameters
+
+        ipam/vlan-groups/ need site=1 instead of site_id=1.
+
+        :param params_d: Parameters that need to update.
+        :return: Updated parameters.
+        """
+        if self.extended_get is False:
+            return params_d
+
+        params_d_: DList = {}
+        for key, params in params_d.items():
+            if self.path == "ipam/vlan-groups/":
+                if key == "site_id":
+                    key = "site"
+            params_d_[key] = params
+        return params_d_
+
     @staticmethod
     def _msg_status_code(response: Response) -> str:
         """Return message ready for logging ConnectionError."""

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/exceptions.py

@@ -5,5 +5,5 @@ class NbApiError(Exception):
     """Invalid dict key in Netbox data."""
 
 
-class NbBranchError(Exception):
+class NbParserError(Exception):
     """Parsing error in Netbox data."""

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/base_fa.py

@@ -4,13 +4,14 @@ from nbforager import helpers as h
 from nbforager.api import ConnectorA
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 from nbforager.types_ import LStr
 
 
 class BaseAF:
     """Base for Application Foragers."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init BaseAF.
 
         :param root: Dictionary where data from Netbox needs to be saved.
@@ -18,6 +19,7 @@ class BaseAF:
         self.api = api
         self.root: NbTree = root
         self.tree: NbTree = tree
+        self.pynb: PyTree = pynb
         self.app: str = h.attr_name(self)
         self.connector: ConnectorA = getattr(api, self.app)  # connector to application
 

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/circuits.py

@@ -5,19 +5,20 @@ from nbforager.foragers.base_fa import BaseAF
 from nbforager.foragers.forager import Forager
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 
 
 class CircuitsAF(BaseAF):
     """Circuits Forager."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init CircuitsAF.
 
         :param api: NbApi object, connector to Netbox API.
         :param root: NbTree object where raw data from Netbox needs to be saved.
         :param tree: NbTree object where transformed data from Netbox needs to be saved.
         """
-        super().__init__(api, root, tree)
+        super().__init__(api, root, tree, pynb)
         self.circuit_terminations = self.CircuitTerminationsF(self)
         self.circuit_types = self.CircuitTypesF(self)
         self.circuits = self.CircuitsF(self)

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/core.py

@@ -5,19 +5,20 @@ from nbforager.foragers.base_fa import BaseAF
 from nbforager.foragers.forager import Forager
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 
 
 class CoreAF(BaseAF):
     """Core Forager."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init CoreAF.
 
         :param api: NbApi object, connector to Netbox API.
         :param root: NbTree object where raw data from Netbox needs to be saved.
         :param tree: NbTree object where transformed data from Netbox needs to be saved.
         """
-        super().__init__(api, root, tree)
+        super().__init__(api, root, tree, pynb)
         self.data_files = self.DataFilesF(self)
         self.data_sources = self.DataSourcesF(self)
         self.jobs = self.JobsF(self)

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/dcim.py

@@ -5,19 +5,20 @@ from nbforager.foragers.base_fa import BaseAF
 from nbforager.foragers.forager import Forager
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 
 
 class DcimAF(BaseAF):
     """DCIM Forager."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init DcimAF.
 
         :param api: NbApi object, connector to Netbox API.
         :param root: NbTree object where raw data from Netbox needs to be saved.
         :param tree: NbTree object where transformed data from Netbox needs to be saved.
         """
-        super().__init__(api, root, tree)
+        super().__init__(api, root, tree, pynb)
         self.cable_terminations = self.CableTerminationsF(self)
         self.cables = self.CablesF(self)
         # connected_device, is not model

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/extras.py

@@ -5,19 +5,20 @@ from nbforager.foragers.base_fa import BaseAF
 from nbforager.foragers.forager import Forager
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 
 
 class ExtrasAF(BaseAF):
     """Extras Forager."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init ExtrasAF.
 
         :param api: NbApi object, connector to Netbox API.
         :param root: NbTree object where raw data from Netbox needs to be saved.
         :param tree: NbTree object where transformed data from Netbox needs to be saved.
         """
-        super().__init__(api, root, tree)
+        super().__init__(api, root, tree, pynb)
         self.bookmarks = self.BookmarksF(self)
         self.config_contexts = self.ConfigContextsF(self)
         self.config_templates = self.ConfigTemplatesF(self)

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/forager.py

@@ -13,10 +13,11 @@ from urllib.parse import urlparse, parse_qs
 from vhelpers import vlist, vstr
 
 from nbforager import helpers as h
-from nbforager.branch.nb_branch import NbBranch
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree, missed_urls
-from nbforager.types_ import LDAny, DiDAny, LStr, LT2StrDAny, DList, LDList, TLists
+from nbforager.parser.nb_parser import NbParser
+from nbforager.py_tree import PyTree
+from nbforager.types_ import LDAny, DiDAny, LStr, LT2StrDAny, DList, LDList, TLists, DiAny
 
 
 class Forager:
@@ -39,6 +40,7 @@ class Forager:
         self.root_d: DiDAny = getattr(getattr(self.root, app), model)
         self.tree: NbTree = forager_a.tree
         self.tree_d: DiDAny = getattr(getattr(self.tree, app), model)
+        self.pynb: PyTree = forager_a.pynb
 
     def __repr__(self) -> str:
         """__repr__."""
@@ -316,6 +318,17 @@ class Forager:
             model_d: DiDAny = self._get_root_data(path)
             model_d[int(digit)] = data
 
+    def _get_pynb_data(self, path: str) -> DiAny:
+        """Get data in self pynb by app/model path.
+
+        :param path: The app/model path.
+
+        :return: The model data.
+        """
+        app, model = h.path_to_attrs(path)
+        data = getattr(getattr(self.pynb, app), model)
+        return data
+
     def _get_root_data(self, path: str) -> DiDAny:
         """Get data in self root by app/model path.
 
@@ -353,7 +366,7 @@ def _find(objects: LDAny, **kwargs) -> LDAny:
             if vlist.is_in(values_, values):
                 objects_.append(data)
         else:
-            value_ = NbBranch(data).any(*keys)
+            value_ = NbParser(data).any(*keys)
             if value_ in values:
                 objects_.append(data)
 

{nbforager-0.1.15 → nbforager-0.2.2}/nbforager/foragers/ipam.py

@@ -5,19 +5,20 @@ from nbforager.foragers.base_fa import BaseAF
 from nbforager.foragers.forager import Forager
 from nbforager.nb_api import NbApi
 from nbforager.nb_tree import NbTree
+from nbforager.py_tree import PyTree
 
 
 class IpamAF(BaseAF):
     """IPAM Forager."""
 
-    def __init__(self, api: NbApi, root: NbTree, tree: NbTree):
+    def __init__(self, api: NbApi, root: NbTree, tree: NbTree, pynb: PyTree):
         """Init IpamAF.
 
         :param api: NbApi object, connector to Netbox API.
         :param root: NbTree object where raw data from Netbox needs to be saved.
         :param tree: NbTree object where transformed data from Netbox needs to be saved.
         """
-        super().__init__(api, root, tree)
+        super().__init__(api, root, tree, pynb)
         self.aggregates = self.AggregatesF(self)
         self.asn_ranges = self.AsnRangesF(self)
         self.asns = self.AsnsF(self)