cribl-control-plane 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

cribl_control_plane/models/inputwef.py

@@ -1,17 +1,14 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from cribl_control_plane import utils
 from cribl_control_plane.types import BaseModel
-from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
-from pydantic.functional_validators import PlainValidator
 from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class InputWefType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefType(str, Enum):
     WEF = "wef"
 
 
@@ -26,14 +23,14 @@ class InputWefConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputWefMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefMode(str, Enum):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     SMART = "smart"
     ALWAYS = "always"
 
 
-class InputWefCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputWefPqTypedDict(TypedDict):
 
 
 class InputWefPq(BaseModel):
-    mode: Annotated[
-        Optional[InputWefMode], PlainValidator(validate_open_enum(False))
-    ] = InputWefMode.ALWAYS
+    mode: Optional[InputWefMode] = InputWefMode.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -84,27 +79,25 @@ class InputWefPq(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Annotated[
-        Optional[InputWefCompression], PlainValidator(validate_open_enum(False))
-    ] = InputWefCompression.NONE
+    compress: Optional[InputWefCompression] = InputWefCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputWefAuthenticationMethod(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefAuthenticationMethod(str, Enum):
     r"""How to authenticate incoming client connections"""
 
     CLIENT_CERT = "clientCert"
     KERBEROS = "kerberos"
 
 
-class InputWefMinimumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefMinimumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputWefMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefMaximumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -175,19 +168,11 @@ class MTLSSettings(BaseModel):
     r"""Regex matching allowable common names in peer certificates' subject attribute"""
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputWefMinimumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputWefMinimumTLSVersion], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputWefMaximumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputWefMaximumTLSVersion], pydantic.Field(alias="maxVersion")
     ] = None
 
     ocsp_check: Annotated[Optional[bool], pydantic.Field(alias="ocspCheck")] = False
@@ -203,25 +188,25 @@ class MTLSSettings(BaseModel):
     r"""If enabled, checks will fail on any OCSP error. Otherwise, checks will fail only when a certificate is revoked, ignoring other errors."""
 
 
-class InputWefFormat(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWefFormat(str, Enum):
     r"""Content format in which the endpoint should deliver events"""
 
     RAW = "Raw"
     RENDERED_TEXT = "RenderedText"
 
 
-class QueryBuilderMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class QueryBuilderMode(str, Enum):
     SIMPLE = "simple"
     XML = "xml"
 
 
-class SubscriptionMetadatumTypedDict(TypedDict):
+class InputWefSubscriptionMetadatumTypedDict(TypedDict):
     name: str
     value: str
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class SubscriptionMetadatum(BaseModel):
+class InputWefSubscriptionMetadatum(BaseModel):
     name: str
 
     value: str
@@ -249,7 +234,7 @@ class SubscriptionTypedDict(TypedDict):
     locale: NotRequired[str]
     r"""The RFC-3066 locale the Windows clients should use when sending events. Defaults to \"en-US\"."""
     query_selector: NotRequired[QueryBuilderMode]
-    metadata: NotRequired[List[SubscriptionMetadatumTypedDict]]
+    metadata: NotRequired[List[InputWefSubscriptionMetadatumTypedDict]]
     r"""Fields to add to events ingested under this subscription"""
 
 
@@ -263,8 +248,7 @@ class Subscription(BaseModel):
     r"""Version UUID for this subscription. If any subscription parameters are modified, this value will change."""
 
     content_format: Annotated[
-        Annotated[Optional[InputWefFormat], PlainValidator(validate_open_enum(False))],
-        pydantic.Field(alias="contentFormat"),
+        Optional[InputWefFormat], pydantic.Field(alias="contentFormat")
     ] = InputWefFormat.RAW
     r"""Content format in which the endpoint should deliver events"""
 
@@ -293,13 +277,10 @@ class Subscription(BaseModel):
     r"""The RFC-3066 locale the Windows clients should use when sending events. Defaults to \"en-US\"."""
 
     query_selector: Annotated[
-        Annotated[
-            Optional[QueryBuilderMode], PlainValidator(validate_open_enum(False))
-        ],
-        pydantic.Field(alias="querySelector"),
+        Optional[QueryBuilderMode], pydantic.Field(alias="querySelector")
     ] = QueryBuilderMode.SIMPLE
 
-    metadata: Optional[List[SubscriptionMetadatum]] = None
+    metadata: Optional[List[InputWefSubscriptionMetadatum]] = None
     r"""Fields to add to events ingested under this subscription"""
 
 
@@ -317,11 +298,11 @@ class InputWefMetadatum(BaseModel):
 
 
 class InputWefTypedDict(TypedDict):
-    type: InputWefType
     subscriptions: List[SubscriptionTypedDict]
     r"""Subscriptions to events on forwarding endpoints"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputWefType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -377,14 +358,14 @@ class InputWefTypedDict(TypedDict):
 
 
 class InputWef(BaseModel):
-    type: Annotated[InputWefType, PlainValidator(validate_open_enum(False))]
-
     subscriptions: List[Subscription]
     r"""Subscriptions to events on forwarding endpoints"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputWefType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -416,11 +397,7 @@ class InputWef(BaseModel):
     r"""Port to listen on"""
 
     auth_method: Annotated[
-        Annotated[
-            Optional[InputWefAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authMethod"),
+        Optional[InputWefAuthenticationMethod], pydantic.Field(alias="authMethod")
     ] = InputWefAuthenticationMethod.CLIENT_CERT
     r"""How to authenticate incoming client connections"""
 

cribl_control_plane/models/inputwindowsmetrics.py

@@ -1,17 +1,14 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from cribl_control_plane import utils
 from cribl_control_plane.types import BaseModel
-from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
-from pydantic.functional_validators import PlainValidator
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class InputWindowsMetricsType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsType(str, Enum):
     WINDOWS_METRICS = "windows_metrics"
 
 
@@ -26,14 +23,14 @@ class InputWindowsMetricsConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputWindowsMetricsPqMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsPqMode(str, Enum):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     SMART = "smart"
     ALWAYS = "always"
 
 
-class InputWindowsMetricsCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputWindowsMetricsPqTypedDict(TypedDict):
 
 
 class InputWindowsMetricsPq(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsPqMode], PlainValidator(validate_open_enum(False))
-    ] = InputWindowsMetricsPqMode.ALWAYS
+    mode: Optional[InputWindowsMetricsPqMode] = InputWindowsMetricsPqMode.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -84,14 +79,13 @@ class InputWindowsMetricsPq(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Annotated[
-        Optional[InputWindowsMetricsCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWindowsMetricsCompression.NONE
+    compress: Optional[InputWindowsMetricsCompression] = (
+        InputWindowsMetricsCompression.NONE
+    )
     r"""Codec to use to compress the persisted data"""
 
 
-class InputWindowsMetricsHostMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsHostMode(str, Enum):
     r"""Select level of detail for host metrics"""
 
     BASIC = "basic"
@@ -100,7 +94,7 @@ class InputWindowsMetricsHostMode(str, Enum, metaclass=utils.OpenEnumMeta):
     DISABLED = "disabled"
 
 
-class InputWindowsMetricsSystemMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsSystemMode(str, Enum):
     r"""Select the level of details for system metrics"""
 
     BASIC = "basic"
@@ -117,17 +111,14 @@ class InputWindowsMetricsSystemTypedDict(TypedDict):
 
 
 class InputWindowsMetricsSystem(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsSystemMode],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWindowsMetricsSystemMode.BASIC
+    mode: Optional[InputWindowsMetricsSystemMode] = InputWindowsMetricsSystemMode.BASIC
     r"""Select the level of details for system metrics"""
 
     detail: Optional[bool] = False
     r"""Generate metrics for all system information"""
 
 
-class InputWindowsMetricsCPUMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsCPUMode(str, Enum):
     r"""Select the level of details for CPU metrics"""
 
     BASIC = "basic"
@@ -148,9 +139,7 @@ class InputWindowsMetricsCPUTypedDict(TypedDict):
 
 
 class InputWindowsMetricsCPU(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsCPUMode], PlainValidator(validate_open_enum(False))
-    ] = InputWindowsMetricsCPUMode.BASIC
+    mode: Optional[InputWindowsMetricsCPUMode] = InputWindowsMetricsCPUMode.BASIC
     r"""Select the level of details for CPU metrics"""
 
     per_cpu: Annotated[Optional[bool], pydantic.Field(alias="perCpu")] = False
@@ -163,7 +152,7 @@ class InputWindowsMetricsCPU(BaseModel):
     r"""Generate raw, monotonic CPU time counters"""
 
 
-class InputWindowsMetricsMemoryMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsMemoryMode(str, Enum):
     r"""Select the level of details for memory metrics"""
 
     BASIC = "basic"
@@ -180,17 +169,14 @@ class InputWindowsMetricsMemoryTypedDict(TypedDict):
 
 
 class InputWindowsMetricsMemory(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsMemoryMode],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWindowsMetricsMemoryMode.BASIC
+    mode: Optional[InputWindowsMetricsMemoryMode] = InputWindowsMetricsMemoryMode.BASIC
     r"""Select the level of details for memory metrics"""
 
     detail: Optional[bool] = False
     r"""Generate metrics for all memory states"""
 
 
-class InputWindowsMetricsNetworkMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsNetworkMode(str, Enum):
     r"""Select the level of details for network metrics"""
 
     BASIC = "basic"
@@ -211,10 +197,9 @@ class InputWindowsMetricsNetworkTypedDict(TypedDict):
 
 
 class InputWindowsMetricsNetwork(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsNetworkMode],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWindowsMetricsNetworkMode.BASIC
+    mode: Optional[InputWindowsMetricsNetworkMode] = (
+        InputWindowsMetricsNetworkMode.BASIC
+    )
     r"""Select the level of details for network metrics"""
 
     devices: Optional[List[str]] = None
@@ -229,7 +214,7 @@ class InputWindowsMetricsNetwork(BaseModel):
     r"""Generate full network metrics"""
 
 
-class InputWindowsMetricsDiskMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsDiskMode(str, Enum):
     r"""Select the level of details for disk metrics"""
 
     BASIC = "basic"
@@ -248,9 +233,7 @@ class InputWindowsMetricsDiskTypedDict(TypedDict):
 
 
 class InputWindowsMetricsDisk(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsDiskMode], PlainValidator(validate_open_enum(False))
-    ] = InputWindowsMetricsDiskMode.BASIC
+    mode: Optional[InputWindowsMetricsDiskMode] = InputWindowsMetricsDiskMode.BASIC
     r"""Select the level of details for disk metrics"""
 
     volumes: Optional[List[str]] = None
@@ -287,9 +270,7 @@ class InputWindowsMetricsHostTypedDict(TypedDict):
 
 
 class InputWindowsMetricsHost(BaseModel):
-    mode: Annotated[
-        Optional[InputWindowsMetricsHostMode], PlainValidator(validate_open_enum(False))
-    ] = InputWindowsMetricsHostMode.BASIC
+    mode: Optional[InputWindowsMetricsHostMode] = InputWindowsMetricsHostMode.BASIC
     r"""Select level of detail for host metrics"""
 
     custom: Optional[InputWindowsMetricsCustom] = None
@@ -334,7 +315,7 @@ class InputWindowsMetricsMetadatum(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputWindowsMetricsDataCompressionFormat(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWindowsMetricsDataCompressionFormat(str, Enum):
     NONE = "none"
     GZIP = "gzip"
 
@@ -366,10 +347,9 @@ class InputWindowsMetricsPersistence(BaseModel):
     max_data_time: Annotated[Optional[str], pydantic.Field(alias="maxDataTime")] = "24h"
     r"""Maximum amount of time to retain data (examples: 2h, 4d). When limit is reached, older data will be deleted."""
 
-    compress: Annotated[
-        Optional[InputWindowsMetricsDataCompressionFormat],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWindowsMetricsDataCompressionFormat.GZIP
+    compress: Optional[InputWindowsMetricsDataCompressionFormat] = (
+        InputWindowsMetricsDataCompressionFormat.GZIP
+    )
 
     dest_path: Annotated[Optional[str], pydantic.Field(alias="destPath")] = (
         "$CRIBL_HOME/state/windows_metrics"
@@ -411,7 +391,7 @@ class InputWindowsMetrics(BaseModel):
     id: str
     r"""Unique ID for this input"""
 
-    type: Annotated[InputWindowsMetricsType, PlainValidator(validate_open_enum(False))]
+    type: InputWindowsMetricsType
 
     disabled: Optional[bool] = False
 

cribl_control_plane/models/inputwineventlogs.py

@@ -1,17 +1,14 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from cribl_control_plane import utils
 from cribl_control_plane.types import BaseModel
-from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
-from pydantic.functional_validators import PlainValidator
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class InputWinEventLogsType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWinEventLogsType(str, Enum):
     WIN_EVENT_LOGS = "win_event_logs"
 
 
@@ -26,14 +23,14 @@ class InputWinEventLogsConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputWinEventLogsMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWinEventLogsMode(str, Enum):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     SMART = "smart"
     ALWAYS = "always"
 
 
-class InputWinEventLogsCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWinEventLogsCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputWinEventLogsPqTypedDict(TypedDict):
 
 
 class InputWinEventLogsPq(BaseModel):
-    mode: Annotated[
-        Optional[InputWinEventLogsMode], PlainValidator(validate_open_enum(False))
-    ] = InputWinEventLogsMode.ALWAYS
+    mode: Optional[InputWinEventLogsMode] = InputWinEventLogsMode.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -84,21 +79,18 @@ class InputWinEventLogsPq(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Annotated[
-        Optional[InputWinEventLogsCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputWinEventLogsCompression.NONE
+    compress: Optional[InputWinEventLogsCompression] = InputWinEventLogsCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class ReadMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class ReadMode(str, Enum):
     r"""Read all stored and future event logs, or only future events"""
 
     OLDEST = "oldest"
     NEWEST = "newest"
 
 
-class EventFormat(str, Enum, metaclass=utils.OpenEnumMeta):
+class EventFormat(str, Enum):
     r"""Format of individual events"""
 
     JSON = "json"
@@ -156,7 +148,7 @@ class InputWinEventLogsTypedDict(TypedDict):
 
 
 class InputWinEventLogs(BaseModel):
-    type: Annotated[InputWinEventLogsType, PlainValidator(validate_open_enum(False))]
+    type: InputWinEventLogsType
 
     log_names: Annotated[List[str], pydantic.Field(alias="logNames")]
     r"""Enter the event logs to collect. Run \"Get-WinEvent -ListLog *\" in PowerShell to see the available logs."""
@@ -188,15 +180,13 @@ class InputWinEventLogs(BaseModel):
 
     pq: Optional[InputWinEventLogsPq] = None
 
-    read_mode: Annotated[
-        Annotated[Optional[ReadMode], PlainValidator(validate_open_enum(False))],
-        pydantic.Field(alias="readMode"),
-    ] = ReadMode.OLDEST
+    read_mode: Annotated[Optional[ReadMode], pydantic.Field(alias="readMode")] = (
+        ReadMode.OLDEST
+    )
     r"""Read all stored and future event logs, or only future events"""
 
     event_format: Annotated[
-        Annotated[Optional[EventFormat], PlainValidator(validate_open_enum(False))],
-        pydantic.Field(alias="eventFormat"),
+        Optional[EventFormat], pydantic.Field(alias="eventFormat")
     ] = EventFormat.JSON
     r"""Format of individual events"""
 

cribl_control_plane/models/inputwiz.py

@@ -1,17 +1,14 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from cribl_control_plane import utils
 from cribl_control_plane.types import BaseModel
-from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
-from pydantic.functional_validators import PlainValidator
 from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class InputWizType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWizType(str, Enum):
     WIZ = "wiz"
 
 
@@ -26,14 +23,14 @@ class InputWizConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputWizMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWizMode(str, Enum):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     SMART = "smart"
     ALWAYS = "always"
 
 
-class InputWizCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWizCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputWizPqTypedDict(TypedDict):
 
 
 class InputWizPq(BaseModel):
-    mode: Annotated[
-        Optional[InputWizMode], PlainValidator(validate_open_enum(False))
-    ] = InputWizMode.ALWAYS
+    mode: Optional[InputWizMode] = InputWizMode.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -84,9 +79,7 @@ class InputWizPq(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Annotated[
-        Optional[InputWizCompression], PlainValidator(validate_open_enum(False))
-    ] = InputWizCompression.NONE
+    compress: Optional[InputWizCompression] = InputWizCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
@@ -121,7 +114,7 @@ class InputWizMetadatum(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputWizRetryType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWizRetryType(str, Enum):
     r"""The algorithm to use when performing HTTP retries"""
 
     NONE = "none"
@@ -149,9 +142,7 @@ class InputWizRetryRulesTypedDict(TypedDict):
 
 
 class InputWizRetryRules(BaseModel):
-    type: Annotated[
-        Optional[InputWizRetryType], PlainValidator(validate_open_enum(False))
-    ] = InputWizRetryType.BACKOFF
+    type: Optional[InputWizRetryType] = InputWizRetryType.BACKOFF
     r"""The algorithm to use when performing HTTP retries"""
 
     interval: Optional[float] = 1000
@@ -182,7 +173,7 @@ class InputWizRetryRules(BaseModel):
     r"""Retry request when a connection reset (ECONNRESET) error occurs"""
 
 
-class InputWizAuthenticationMethod(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputWizAuthenticationMethod(str, Enum):
     r"""Enter client secret directly, or select a stored secret"""
 
     MANUAL = "manual"
@@ -190,7 +181,6 @@ class InputWizAuthenticationMethod(str, Enum, metaclass=utils.OpenEnumMeta):
 
 
 class InputWizTypedDict(TypedDict):
-    type: InputWizType
     auth_url: str
     r"""The authentication URL to generate an OAuth token"""
     client_id: str
@@ -198,6 +188,7 @@ class InputWizTypedDict(TypedDict):
     content_config: List[InputWizContentConfigTypedDict]
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputWizType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -239,8 +230,6 @@ class InputWizTypedDict(TypedDict):
 
 
 class InputWiz(BaseModel):
-    type: Annotated[InputWizType, PlainValidator(validate_open_enum(False))]
-
     auth_url: Annotated[str, pydantic.Field(alias="authUrl")]
     r"""The authentication URL to generate an OAuth token"""
 
@@ -254,6 +243,8 @@ class InputWiz(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputWizType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -317,11 +308,7 @@ class InputWiz(BaseModel):
     ] = None
 
     auth_type: Annotated[
-        Annotated[
-            Optional[InputWizAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authType"),
+        Optional[InputWizAuthenticationMethod], pydantic.Field(alias="authType")
     ] = InputWizAuthenticationMethod.MANUAL
     r"""Enter client secret directly, or select a stored secret"""