Add abstract_kernels

Fix #45
Jaded-Encoding-Thaumaturgy · Nov 11, 2023 · e801c9e · e801c9e
1 parent 1f55fdc
commit e801c9e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/vskernels/kernels/abstract.py b/vskernels/kernels/abstract.py
@@ -331,9 +331,9 @@ def from_param(
         cls: type[Kernel], kernel: ScalerT | DescalerT | ResamplerT | KernelT | None = None,
         func_except: FuncExceptT | None = None
     ) -> type[Scaler] | type[Descaler] | type[Resampler] | type[Kernel]:
-        from ..util import excluded_kernels
+        from ..util import abstract_kernels
         return BaseScaler.from_param(
-            cls, Kernel, kernel, UnknownKernelError, excluded_kernels, func_except  # type: ignore
+            cls, Kernel, kernel, UnknownKernelError, abstract_kernels, func_except  # type: ignore
         )
 
     @overload
@@ -369,9 +369,9 @@ def ensure_obj(
         cls: type[Kernel], kernel: ScalerT | DescalerT | ResamplerT | KernelT | None = None,
         func_except: FuncExceptT | None = None
     ) -> Scaler | Descaler | Resampler | Kernel:
-        from ..util import excluded_kernels
+        from ..util import abstract_kernels
         return BaseScaler.ensure_obj(
-            cls, Kernel, kernel, UnknownKernelError, excluded_kernels, func_except  # type: ignore
+            cls, Kernel, kernel, UnknownKernelError, abstract_kernels, func_except  # type: ignore
         )
 
 

diff --git a/vskernels/util.py b/vskernels/util.py
@@ -17,7 +17,7 @@
 from .kernels.docs import Example
 
 __all__ = [
-    'excluded_kernels',
+    'abstract_kernels', 'excluded_kernels',
     'NoShift', 'NoScale',
 
     'LinearLight',
@@ -106,13 +106,16 @@ class inner_no_scale(kernel_t, NoScaleBase):  # type: ignore
         return inner_no_scale
 
 
+abstract_kernels = [
+    Kernel, FmtConv, Example, Impulse, Placebo, ComplexKernel,
+    ZimgDescaler, ZimgComplexKernel, LinearDescaler
+]
+
+
 @to_singleton
 class excluded_kernels(list[type]):
     def __init__(self) -> None:
-        super().__init__([
-            Kernel, FmtConv, Example, Impulse, Placebo, ComplexKernel,
-            ZimgDescaler, ZimgComplexKernel, LinearDescaler
-        ])
+        super().__init__(abstract_kernels)
 
         self.exclude_sub = [
             NoShiftBase, NoScaleBase, BicubicAuto, MemeKernel