netbox-validity 3.4.2__tar.gz → 3.5.0__tar.gz

{netbox_validity-3.4.2/netbox_validity.egg-info → netbox_validity-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.2
+Version: 3.5.0
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License
@@ -59,9 +59,9 @@ Requires-Dist: debugpy==1.8.19; extra == "dev"
 Requires-Dist: factory_boy==3.3.3; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pre-commit==4.5.1; extra == "dev"
-Requires-Dist: pytest==9.0.2; extra == "dev"
-Requires-Dist: pytest-cov==7.0.0; extra == "dev"
-Requires-Dist: pytest-django==4.11.1; extra == "dev"
+Requires-Dist: pytest==9.0.3; extra == "dev"
+Requires-Dist: pytest-cov==7.1.0; extra == "dev"
+Requires-Dist: pytest-django==4.12.0; extra == "dev"
 Requires-Dist: pytest-subtests==0.15.0; extra == "dev"
 Requires-Dist: ruff==0.14.11; extra == "dev"
 Requires-Dist: tomli==2.4.0; extra == "dev"

{netbox_validity-3.4.2 → netbox_validity-3.5.0/netbox_validity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.2
+Version: 3.5.0
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License
@@ -59,9 +59,9 @@ Requires-Dist: debugpy==1.8.19; extra == "dev"
 Requires-Dist: factory_boy==3.3.3; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pre-commit==4.5.1; extra == "dev"
-Requires-Dist: pytest==9.0.2; extra == "dev"
-Requires-Dist: pytest-cov==7.0.0; extra == "dev"
-Requires-Dist: pytest-django==4.11.1; extra == "dev"
+Requires-Dist: pytest==9.0.3; extra == "dev"
+Requires-Dist: pytest-cov==7.1.0; extra == "dev"
+Requires-Dist: pytest-django==4.12.0; extra == "dev"
 Requires-Dist: pytest-subtests==0.15.0; extra == "dev"
 Requires-Dist: ruff==0.14.11; extra == "dev"
 Requires-Dist: tomli==2.4.0; extra == "dev"

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/netbox_validity.egg-info/requires.txt

@@ -17,9 +17,9 @@ debugpy==1.8.19
 factory_boy==3.3.3
 ipython
 pre-commit==4.5.1
-pytest==9.0.2
-pytest-cov==7.0.0
-pytest-django==4.11.1
+pytest==9.0.3
+pytest-cov==7.1.0
+pytest-django==4.12.0
 pytest-subtests==0.15.0
 ruff==0.14.11
 tomli==2.4.0

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-validity"
-version = "3.4.2"
+version = "3.5.0"
 description = "NetBox plugin for network devices validation"
 authors = [
     {name = "Anton Miasnikov", email = "anton2008m@gmail.com"},

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/requirements/dev.txt

@@ -2,9 +2,9 @@ debugpy==1.8.19
 factory_boy==3.3.3
 ipython
 pre-commit==4.5.1
-pytest==9.0.2
-pytest-cov==7.0.0
-pytest-django==4.11.1
+pytest==9.0.3
+pytest-cov==7.1.0
+pytest-django==4.12.0
 pytest-subtests==0.15.0
 ruff==0.14.11
 tomli==2.4.0

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/__init__.py

@@ -16,11 +16,11 @@ class NetBoxValidityConfig(PluginConfig):
     description = "Write and run auto tests for network devices"
     author = "Anton Miasnikov"
     author_email = "anton2008m@gmail.com"
-    version = "3.4.2"
+    version = "3.5.0"
     base_url = "validity"
     django_apps = ["django_bootstrap5"]
-    min_version = "4.3.0"
-    max_version = "4.5.99"
+    min_version = "4.4.0"
+    max_version = "4.6.99"
     graphql_schema = "graphql.schema"
 
     # custom field

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/api/helpers.py

@@ -1,5 +1,4 @@
 from django.core.exceptions import ValidationError
-from django.db.models import ManyToManyField
 from rest_framework.permissions import BasePermission
 from rest_framework.relations import PrimaryKeyRelatedField
 from rest_framework.serializers import HyperlinkedIdentityField, JSONField, ModelSerializer
@@ -82,7 +81,7 @@ class SubformValidationMixin:
     def _validate(self, attrs):
         instance = self.instance or self.Meta.model()
         for field, field_value in attrs.items():
-            if not isinstance(instance._meta.get_field(field), ManyToManyField):
+            if not instance._meta.get_field(field).many_to_many:
                 setattr(instance, field, field_value)
         if not instance.subform_type:
             return

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/choices.py

@@ -1,11 +1,12 @@
 from typing import Optional, TypeVar
 
 from django.db.models import IntegerChoices, TextChoices
-from django.db.models.enums import ChoicesMeta
 from django.utils.translation import gettext_lazy as _
 
+from validity.netbox_changes import ChoicesType
 
-class ColoredChoiceMeta(ChoicesMeta):
+
+class ColoredChoiceMeta(ChoicesType):
     """
     Allows to write choice fields with a color like that:
         option1 = 'red'

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/netbox_changes/__init__.py

@@ -10,11 +10,15 @@ from strawberry_django import FilterLookup
 from validity import config
 
 
+def get_base_table_kwargs(self):
+    return {"user": self.request.user} if config.netbox_version < "4.5.4" else {}
+
+
 StrFilterLookup = locate("strawberry_django.StrFilterLookup") if config.netbox_version >= "4.5.5" else FilterLookup[str]
 
-if config.netbox_version >= "4.5.0":
+if config.netbox_version >= "4.6.0":
     from .current import *
-elif config.netbox_version >= "4.4.0":
+elif config.netbox_version >= "4.5.0":
     from .old import *
 else:
     from .oldest import *

netbox_validity-3.5.0/validity/netbox_changes/current.py

@@ -0,0 +1,8 @@
+# NetBox 4.6
+
+from pydoc import locate
+
+from .old import *
+
+
+ChoicesType = locate("django.db.models.enums.ChoicesType")

netbox_validity-3.4.2/validity/netbox_changes/current.py → netbox_validity-3.5.0/validity/netbox_changes/old.py

@@ -1,7 +1,7 @@
 # NetBox 4.5
 from pydoc import locate
 
-from .old import *
+from .oldest import *
 
 
 BaseModelFilter = locate("netbox.graphql.filters.BaseModelFilter")

netbox_validity-3.5.0/validity/netbox_changes/oldest.py

@@ -0,0 +1,7 @@
+# NetBox 4.4
+from pydoc import locate
+
+
+BaseModelFilter = locate("netbox.graphql.filter_mixins.BaseFilterMixin")
+NetBoxModelFilter = locate("netbox.graphql.filter_mixins.NetBoxModelFilterMixin")
+ChoicesType = locate("django.db.models.enums.ChoicesMeta")

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/scripts/keeper.py

@@ -5,7 +5,6 @@ from core.choices import JobStatusChoices
 from core.models import Job
 
 from validity import di
-from validity.netbox_changes import set_logs
 from validity.utils.logger import Logger
 from .exceptions import AbortScript
 
@@ -48,7 +47,7 @@ class JobKeeper:
         self, status: str = JobStatusChoices.STATUS_COMPLETED, error: str | None = None, output=None
     ) -> None:
         self.job.data = self.job.data or {}
-        set_logs(self.job, [log.serialized for log in self.logger.messages])
+        self.job.log_entries = [log.serialized for log in self.logger.messages]
         output = output or self.job.data.get("output")
         self.job.data["output"] = output
         self.job.terminate(status, error)

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/scripts/runtests/combine.py

@@ -10,10 +10,10 @@ from core.models import Job
 from dimi import Singleton
 from django.db.models import QuerySet
 from django.urls import reverse
+from extras.events import enqueue_event, flush_events
 
 from validity import di
 from validity.models import ComplianceReport, ComplianceTestResult
-from validity.netbox_changes import enqueue
 from validity.utils.logger import Logger, Message
 from ..data_models import FullRunTestsParams, RequestInfo, TestResultRatio
 from ..exceptions import AbortScript
@@ -22,6 +22,12 @@ from ..launch import Launcher
 from ..parent_jobs import JobExtractor
 
 
+def enqueue(report: "ComplianceReport", request: "RequestInfo"):
+    queue = {}
+    enqueue_event(queue, report, request, "object_created")
+    flush_events(queue.values())
+
+
 @di.dependency(scope=Singleton)
 @dataclass(repr=False, kw_only=True)
 class CombineWorker:

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/utils/orm.py

@@ -206,10 +206,15 @@ class CustomFieldBuilder:
     content_type_model: type
     db_alias: str = ""
 
-    def create(self, *, bind_to, object_type=None, **cf_params):
+    def create(self, *, bind_to, name, object_type=None, **cf_params):
         db = self.db_alias or self.cf_model.objects.db
-        if object_type is not None:
-            cf_params["related_object_type"] = object_type
-        custom_field = self.cf_model.objects.using(db).create(**cf_params)
+        cf_params["related_object_type"] = object_type
+
+        # get_or_create handles #182 - compatibility with netbox-branching weird behaviour
+        custom_field, created = self.cf_model.objects.using(db).get_or_create(name=name, defaults=cf_params)
+        if not created:
+            for field, value in cf_params.items():
+                setattr(custom_field, field, value)
+            custom_field.save(force_update=True, update_fields=cf_params.keys())
         custom_field.object_types.set(self.content_type_model.objects.get_for_model(model).pk for model in bind_to)
         return custom_field

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/views/base.py

@@ -13,7 +13,7 @@ from django_tables2 import SingleTableMixin, Table
 from utilities.views import ObjectPermissionRequiredMixin as _ObjectPermissionRequiredMixin
 from utilities.views import ViewTab
 
-from validity import filtersets, forms, models, scripts, tables
+from validity import filtersets, forms, models, netbox_changes, scripts, tables
 from validity.utils.misc import partialcls
 
 
@@ -100,8 +100,7 @@ class TestResultBaseView(ObjectPermissionRequiredMixin, SingleTableMixin, Filter
         table.exclude = (self.result_relation,)
         return table
 
-    def get_table_kwargs(self):
-        return {"user": self.request.user}
+    get_table_kwargs = netbox_changes.get_base_table_kwargs
 
     def get_queryset(self):
         return self.queryset.filter(**{self.result_relation: self.kwargs["pk"]})

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/views/report.py

@@ -8,7 +8,7 @@ from django_tables2 import SingleTableMixin
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
-from validity import config, filtersets, forms, models, tables
+from validity import filtersets, forms, models, netbox_changes, tables
 from validity.choices import DeviceGroupByChoices, SeverityChoices
 from .base import FilterViewWithForm, ObjectPermissionRequiredMixin, TestResultBaseView
 
@@ -102,8 +102,7 @@ class ReportDeviceView(ObjectPermissionRequiredMixin, SingleTableMixin, FilterVi
         table.configure(self.request)
         return table
 
-    def get_table_kwargs(self):
-        return {"user": self.request.user} if config.netbox_version < "4.5.4" else {}
+    get_table_kwargs = netbox_changes.get_base_table_kwargs
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return super().get_context_data(**kwargs) | {

{netbox_validity-3.4.2 → netbox_validity-3.5.0}/validity/views/script.py

@@ -12,7 +12,7 @@ from utilities.htmx import htmx_partial
 
 from validity import di
 from validity.forms import RunTestsForm
-from validity.netbox_changes import get_logs
+from validity.netbox_changes import get_base_table_kwargs
 from validity.scripts import Launcher, RunTestsParams, ScriptParams
 from validity.tables import ScriptResultTable
 from .base import LauncherMixin
@@ -51,11 +51,13 @@ class ScriptResultView(PermissionRequiredMixin, TableMixin, ObjectView):
     permission_required = "core.view_job"
 
     def get_table(self, job, request, bulk_actions=False):
-        logs = [entry | {"index": i} for i, entry in enumerate(get_logs(job), start=1)]
-        table = self.table_class(logs, user=request.user)
+        logs = [entry | {"index": i} for i, entry in enumerate(job.log_entries, start=1)]
+        table = self.table_class(logs, **self.get_table_kwargs())
         table.configure(request)
         return table
 
+    get_table_kwargs = get_base_table_kwargs
+
     def get(self, request, **kwargs):
         job = self.get_object(**kwargs)
         table = self.get_table(job, request) if job.completed else None

netbox_validity-3.4.2/validity/netbox_changes/old.py

@@ -1,23 +0,0 @@
-# NetBox 4.4
-from typing import TYPE_CHECKING
-
-from .oldest import *
-
-
-if TYPE_CHECKING:
-    from validity.models import ComplianceReport
-    from validity.scripts.data_models import RequestInfo
-
-
-def get_logs(job):
-    return job.log_entries
-
-
-def set_logs(job, logs):
-    job.log_entries = logs
-
-
-def enqueue(report: "ComplianceReport", request: "RequestInfo"):
-    queue = {}
-    enqueue_event(queue, report, request, "object_created")
-    flush_events(queue.values())

netbox_validity-3.4.2/validity/netbox_changes/oldest.py

@@ -1,30 +0,0 @@
-# NetBox 4.3
-from pydoc import locate
-from typing import TYPE_CHECKING
-
-from extras.events import enqueue_event, flush_events
-
-
-if TYPE_CHECKING:
-    from validity.models import ComplianceReport
-    from validity.scripts.data_models import RequestInfo
-
-
-BaseModelFilter = locate("netbox.graphql.filter_mixins.BaseFilterMixin")
-NetBoxModelFilter = locate("netbox.graphql.filter_mixins.NetBoxModelFilterMixin")
-
-
-def get_logs(job):
-    return job.data["log"]
-
-
-def set_logs(job, logs):
-    if not isinstance(job.data, dict):
-        job.data = {}
-    job.data["log"] = logs
-
-
-def enqueue(report: "ComplianceReport", request: "RequestInfo"):
-    queue = {}
-    enqueue_event(queue, report, request.get_user(), request.id, "object_created")
-    flush_events(queue.values())