netbox-validity 3.4.1__tar.gz → 3.4.3__tar.gz

{netbox_validity-3.4.1/netbox_validity.egg-info → netbox_validity-3.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.1
+Version: 3.4.3
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License
@@ -50,7 +50,7 @@ Requires-Dist: jq<2,>=1.4.0
 Requires-Dist: netmiko<5,>=4.0.0
 Requires-Dist: pydantic<3,>=2.0.0
 Requires-Dist: scrapli_netconf==2026.1.12
-Requires-Dist: simpleeval==1.0.3
+Requires-Dist: simpleeval==1.0.7
 Requires-Dist: textfsm<2,>=1.1.3
 Requires-Dist: ttp<1
 Requires-Dist: xmltodict<1

{netbox_validity-3.4.1 → netbox_validity-3.4.3/netbox_validity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.1
+Version: 3.4.3
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License
@@ -50,7 +50,7 @@ Requires-Dist: jq<2,>=1.4.0
 Requires-Dist: netmiko<5,>=4.0.0
 Requires-Dist: pydantic<3,>=2.0.0
 Requires-Dist: scrapli_netconf==2026.1.12
-Requires-Dist: simpleeval==1.0.3
+Requires-Dist: simpleeval==1.0.7
 Requires-Dist: textfsm<2,>=1.1.3
 Requires-Dist: ttp<1
 Requires-Dist: xmltodict<1

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/netbox_validity.egg-info/requires.txt

@@ -7,7 +7,7 @@ jq<2,>=1.4.0
 netmiko<5,>=4.0.0
 pydantic<3,>=2.0.0
 scrapli_netconf==2026.1.12
-simpleeval==1.0.3
+simpleeval==1.0.7
 textfsm<2,>=1.1.3
 ttp<1
 xmltodict<1

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/pyproject.toml

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

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/requirements/base.txt

@@ -7,7 +7,7 @@ jq>=1.4.0,<2
 netmiko>=4.0.0,<5
 pydantic>=2.0.0,<3
 scrapli_netconf==2026.1.12
-simpleeval==1.0.3
+simpleeval==1.0.7
 textfsm>=1.1.3,<2
 ttp<1
 xmltodict<1

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/validity/__init__.py

@@ -16,7 +16,7 @@ class NetBoxValidityConfig(PluginConfig):
     description = "Write and run auto tests for network devices"
     author = "Anton Miasnikov"
     author_email = "anton2008m@gmail.com"
-    version = "3.4.1"
+    version = "3.4.3"
     base_url = "validity"
     django_apps = ["django_bootstrap5"]
     min_version = "4.3.0"

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/validity/graphql/filters.py

@@ -10,7 +10,7 @@ from strawberry.scalars import ID
 from strawberry_django import FilterLookup
 
 from validity import models
-from validity.netbox_changes import BaseModelFilter, NetBoxModelFilter
+from validity.netbox_changes import BaseModelFilter, NetBoxModelFilter, StrFilterLookup
 
 
 @strawberry_django.filter_type(Job, lookups=True)
@@ -20,13 +20,13 @@ class JobFilter(NetBoxModelFilter):
 
 @strawberry_django.filter_type(models.ComplianceSelector, lookups=True)
 class ComplianceSelectorFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.ComplianceTest, lookups=True)
 class ComplianceTestFilter(NetBoxModelFilter):
     id: FilterLookup[ID] | None = strawberry_django.filter_field()
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
     selectors: Annotated["ComplianceSelectorFilter", strawberry.lazy("validity.graphql.filters")] | None = (
         strawberry_django.filter_field()
     )
@@ -53,12 +53,12 @@ class ComplianceTestResultFilter(BaseModelFilter):
 
 @strawberry_django.filter_type(models.Serializer, lookups=True)
 class SerializerFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.NameSet, lookups=True)
 class NameSetFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
     _global: Annotated["bool", strawberry.lazy("builtins")] | None = strawberry_django.filter_field(name="global")
 
 
@@ -69,12 +69,12 @@ class ComplianceReportFilter(BaseModelFilter):
 
 @strawberry_django.filter_type(models.Poller, lookups=True)
 class PollerFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter_type(models.Command, lookups=True)
 class CommandFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
     serializer: Annotated["SerializerFilter", strawberry.lazy("validity.graphql.filters")] | None = (
         strawberry_django.filter_field()
     )
@@ -86,7 +86,7 @@ class CommandFilter(NetBoxModelFilter):
 
 @strawberry_django.filter_type(models.BackupPoint, lookups=True)
 class BackupPointFilter(NetBoxModelFilter):
-    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    name: StrFilterLookup | None = strawberry_django.filter_field()
     data_source: Annotated["DataSourceFilter", strawberry.lazy("core.graphql.filters")] | None = (
         strawberry_django.filter_field()
     )

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/validity/graphql/schema.py

@@ -2,6 +2,7 @@ from typing import Annotated
 
 import strawberry
 import strawberry_django
+from strawberry.types import Info
 
 from validity import models
 from .filters import NameSetFilter
@@ -42,7 +43,7 @@ class Query:
     @strawberry.field
     def validity_nameset_list(
         self,
-        info,
+        info: Info,
         filters: NameSetFilter | None = None,
         global_filter: Annotated[bool | None, strawberry.argument(name="global")] = None,
     ) -> list[NameSetType]:

netbox_validity-3.4.3/validity/netbox_changes/__init__.py

@@ -0,0 +1,24 @@
+"""
+This package contains all duct tape stuff which is required to support
+different versions of NetBox together
+"""
+
+from pydoc import locate
+
+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":
+    from .current import *
+elif config.netbox_version >= "4.4.0":
+    from .old import *
+else:
+    from .oldest import *

{netbox_validity-3.4.1 → netbox_validity-3.4.3}/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.1 → netbox_validity-3.4.3}/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 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}
+    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.1 → netbox_validity-3.4.3}/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, get_logs
 from validity.scripts import Launcher, RunTestsParams, ScriptParams
 from validity.tables import ScriptResultTable
 from .base import LauncherMixin
@@ -52,10 +52,12 @@ class ScriptResultView(PermissionRequiredMixin, TableMixin, ObjectView):
 
     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)
+        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.1/validity/netbox_changes/__init__.py

@@ -1,14 +0,0 @@
-"""
-This package contains all duct tape stuff which is required to support
-different versions of NetBox together
-"""
-
-from validity import config
-
-
-if config.netbox_version >= "4.5.0":
-    from .current import *
-elif config.netbox_version >= "4.4.0":
-    from .old import *
-else:
-    from .oldest import *