Infer variant extendability from enum type

src/client/actions.py

@@ -29,7 +29,7 @@ class RuleType(ExtendableStrEnum):
     APPROVE_ALL_ASSIGNMENTS = 'APPROVE_ALL_ASSIGNMENTS'
 
 
-class RuleAction(BaseParameters, spec_enum=RuleType, spec_field='type', extend_spec=True):
+class RuleAction(BaseParameters, spec_enum=RuleType, spec_field='type'):
     """Base class for all actions in quality controls configurations
     """
 

src/client/collectors.py

@@ -39,7 +39,7 @@ def _captcha_deprecation_warning(*args, **kwargs):
     )
 
 
-class CollectorConfig(BaseParameters, spec_enum='Type', spec_field='type', extend_spec=True):
+class CollectorConfig(BaseParameters, spec_enum='Type', spec_field='type'):
     """Base class for all collectors.
 
     Attributes:

src/client/conditions.py

@@ -67,7 +67,7 @@ class RuleConditionKey(ExtendableStrEnum):
     TOTAL_SUBMITTED_COUNT = 'total_submitted_count'
 
 
-class RuleCondition(BaseTolokaObject, spec_enum=RuleConditionKey, spec_field='key', extend_spec=True):
+class RuleCondition(BaseTolokaObject, spec_enum=RuleConditionKey, spec_field='key'):
     operator: Any
     value: Any
 

src/client/filter.py

@@ -176,7 +176,7 @@ def structure(cls, data):
 
 
 @inherit_docstrings
-class Profile(Condition, spec_value=Condition.Category.PROFILE, spec_field='key', spec_enum='Key', extend_spec=True):
+class Profile(Condition, spec_value=Condition.Category.PROFILE, spec_field='key', spec_enum='Key'):
     """A base class for a category of filters that use Toloker's profile.
     """
 
@@ -197,7 +197,7 @@ class Key(ExtendableStrEnum):
 
 
 @inherit_docstrings
-class Computed(Condition, spec_value=Condition.Category.COMPUTED, spec_field='key', spec_enum='Key', extend_spec=True):
+class Computed(Condition, spec_value=Condition.Category.COMPUTED, spec_field='key', spec_enum='Key'):
     """A base class for a category of filters that use connection and client information.
     """
 

src/client/primitives/base.py

@@ -33,7 +33,9 @@
 
 class VariantRegistry:
 
-    def __init__(self, field: str, enum: Type[E], extendable: bool = False):
+    def __init__(self, field: str, enum: Type[E], extendable: Optional[bool] = None):
+        if extendable is None:
+            extendable = isinstance(enum, ExtendableStrEnumMetaclass)
         if extendable and not isinstance(enum, ExtendableStrEnumMetaclass):
             raise ValueError('VariantRegistry could be extendable only if spec_enum is extendable.')
         self.field: str = field
@@ -56,13 +58,14 @@ def register(self, type_: type, value: E) -> type:
 
     def generate_subtype(self, type_: type, value: E) -> type:
         if not self.extendable:
-            raise NotImplementedError("Only extendable VariantRegistry can generate subtype")
+            raise NotImplementedError('Only extendable VariantRegistry can generate subtype')
 
         generated_type_name = '_Generated' + value.value.title() + type_.__name__
         BaseTolokaObjectMetaclass(generated_type_name, (type_,), {}, spec_value=value)
-        logger.error(f'{generated_type_name} class was generated. Probably it is a new functionality on the platform.\n'
-                    'If you want it to be supported by toloka-kit faster '
-                    'you can make feature request here: https://github.com/Toloka/toloka-kit/issues/new/choose.')
+        logger.info(f'{generated_type_name} class was generated. '
+                    f'Probably it is a new functionality on the platform.\n'
+                    f'If you want it to be supported by toloka-kit faster you can make feature request here:'
+                    f'https://github.com/Toloka/toloka-kit/issues/new/choose.')
         return self.registered_classes[value]
 
     def __getitem__(self, value: E) -> type:
@@ -194,7 +197,7 @@ def __init_subclass__(
             spec_enum: Optional[Union[str, Type[E]]] = None,
             spec_field: Optional[str] = None,
             spec_value=None,
-            extend_spec: bool = False,
+            extend_spec: Optional[bool] = None,
     ):
         super().__init_subclass__()
         # Completing a variant type

src/client/project/field_spec.py

@@ -46,7 +46,7 @@ class FieldType(ExtendableStrEnum):
     ARRAY_JSON = 'array_json'
 
 
-class FieldSpec(BaseTolokaObject, spec_enum=FieldType, spec_field='type', extend_spec=True):
+class FieldSpec(BaseTolokaObject, spec_enum=FieldType, spec_field='type'):
     """A base class for field specifications used in project's `input_spec` and `output_spec`
     for input and response data validation specification respectively. Use subclasses of this
     class defined below to define the data type (string, integer, URL, etc.) and specify

src/client/project/template_builder/base.py

@@ -124,7 +124,7 @@ def structure(cls, data: dict):
         return super().structure(data)
 
 
-class BaseComponent(BaseTemplate, spec_enum=ComponentType, spec_field='type', extend_spec=True):
+class BaseComponent(BaseTemplate, spec_enum=ComponentType, spec_field='type'):
 
     @classmethod
     def structure(cls, data: dict):

tests/utils/test_variant_type.py

@@ -2,8 +2,9 @@
 from typing import Any, Optional
 
 import pytest
-from toloka.client._converter import converter
+from toloka.client.exceptions import SpecClassIdentificationError
 from toloka.client.primitives.base import BaseTolokaObject
+from toloka.client._converter import converter
 from toloka.util._extendable_enum import ExtendableStrEnum
 
 
@@ -14,11 +15,11 @@ class ItemType(ExtendableStrEnum):
 
 
 @unique
-class SetMethod(ExtendableStrEnum):
+class SetMethod(Enum):
     POP = 'pop'
 
 
-class MethodCall(BaseTolokaObject, spec_enum=ItemType, spec_field='type', extend_spec=True):
+class MethodCall(BaseTolokaObject, spec_enum=ItemType, spec_field='type'):
     pass
 
 
@@ -30,7 +31,7 @@ class SetPopMethodCall(SetMethodCall, spec_value=SetMethod.POP):
     pass
 
 
-class ListMethodCall(MethodCall, spec_value=ItemType.LIST, spec_enum='Method', spec_field='method', extend_spec=True):
+class ListMethodCall(MethodCall, spec_value=ItemType.LIST, spec_enum='Method', spec_field='method'):
 
     @unique
     class Method(ExtendableStrEnum):
@@ -116,6 +117,10 @@ def test_structure_unknown_variant():
     assert converter.unstructure(
         method_call_with_unknown_both_levels_variants) == unstructured_with_unknown_both_levels_variants
 
+    with pytest.raises(SpecClassIdentificationError):
+        unstructured_unextendable = {'type': 'set', 'method': 'new_method'}
+        converter.structure(unstructured_unextendable, MethodCall)
+
 
 def test_unstructure_variant():
     assert {'type': 'set', 'method': 'pop'} == converter.unstructure(SetPopMethodCall())