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

cribl_control_plane/models/inputdatadogagent.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 InputDatadogAgentType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatadogAgentType(str, Enum):
     DATADOG_AGENT = "datadog_agent"
 
 
@@ -26,14 +23,14 @@ class InputDatadogAgentConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputDatadogAgentMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatadogAgentMode(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 InputDatadogAgentCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatadogAgentCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputDatadogAgentPqTypedDict(TypedDict):
 
 
 class InputDatadogAgentPq(BaseModel):
-    mode: Annotated[
-        Optional[InputDatadogAgentMode], PlainValidator(validate_open_enum(False))
-    ] = InputDatadogAgentMode.ALWAYS
+    mode: Optional[InputDatadogAgentMode] = InputDatadogAgentMode.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 InputDatadogAgentPq(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[InputDatadogAgentCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputDatadogAgentCompression.NONE
+    compress: Optional[InputDatadogAgentCompression] = InputDatadogAgentCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputDatadogAgentMinimumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatadogAgentMinimumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputDatadogAgentMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatadogAgentMaximumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -157,19 +149,11 @@ class InputDatadogAgentTLSSettingsServerSide(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputDatadogAgentMinimumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputDatadogAgentMinimumTLSVersion], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputDatadogAgentMaximumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputDatadogAgentMaximumTLSVersion], pydantic.Field(alias="maxVersion")
     ] = None
 
 
@@ -204,11 +188,11 @@ class InputDatadogAgentProxyMode(BaseModel):
 
 
 class InputDatadogAgentTypedDict(TypedDict):
-    type: InputDatadogAgentType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputDatadogAgentType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -257,14 +241,14 @@ class InputDatadogAgentTypedDict(TypedDict):
 
 
 class InputDatadogAgent(BaseModel):
-    type: Annotated[InputDatadogAgentType, PlainValidator(validate_open_enum(False))]
-
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputDatadogAgentType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputdatagen.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 InputDatagenType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatagenType(str, Enum):
     DATAGEN = "datagen"
 
 
@@ -26,14 +23,14 @@ class InputDatagenConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputDatagenMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatagenMode(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 InputDatagenCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputDatagenCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputDatagenPqTypedDict(TypedDict):
 
 
 class InputDatagenPq(BaseModel):
-    mode: Annotated[
-        Optional[InputDatagenMode], PlainValidator(validate_open_enum(False))
-    ] = InputDatagenMode.ALWAYS
+    mode: Optional[InputDatagenMode] = InputDatagenMode.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 InputDatagenPq(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[InputDatagenCompression], PlainValidator(validate_open_enum(False))
-    ] = InputDatagenCompression.NONE
+    compress: Optional[InputDatagenCompression] = InputDatagenCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
@@ -143,7 +136,7 @@ class InputDatagenTypedDict(TypedDict):
 
 
 class InputDatagen(BaseModel):
-    type: Annotated[InputDatagenType, PlainValidator(validate_open_enum(False))]
+    type: InputDatagenType
 
     samples: List[Sample]
 

cribl_control_plane/models/inputedgeprometheus.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 InputEdgePrometheusType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusType(str, Enum):
     EDGE_PROMETHEUS = "edge_prometheus"
 
 
@@ -26,14 +23,14 @@ class InputEdgePrometheusConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputEdgePrometheusMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusMode(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 InputEdgePrometheusPqCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusPqCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputEdgePrometheusPqTypedDict(TypedDict):
 
 
 class InputEdgePrometheusPq(BaseModel):
-    mode: Annotated[
-        Optional[InputEdgePrometheusMode], PlainValidator(validate_open_enum(False))
-    ] = InputEdgePrometheusMode.ALWAYS
+    mode: Optional[InputEdgePrometheusMode] = InputEdgePrometheusMode.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 InputEdgePrometheusPq(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[InputEdgePrometheusPqCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputEdgePrometheusPqCompression.NONE
+    compress: Optional[InputEdgePrometheusPqCompression] = (
+        InputEdgePrometheusPqCompression.NONE
+    )
     r"""Codec to use to compress the persisted data"""
 
 
-class InputEdgePrometheusDiscoveryType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusDiscoveryType(str, Enum):
     r"""Target discovery mechanism. Use static to manually enter a list of targets."""
 
     STATIC = "static"
@@ -101,9 +95,7 @@ class InputEdgePrometheusDiscoveryType(str, Enum, metaclass=utils.OpenEnumMeta):
     K8S_PODS = "k8s-pods"
 
 
-class InputEdgePrometheusPersistenceCompression(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
+class InputEdgePrometheusPersistenceCompression(str, Enum):
     r"""Data compression format. Default is gzip."""
 
     NONE = "none"
@@ -136,10 +128,9 @@ class InputEdgePrometheusDiskSpooling(BaseModel):
     max_data_time: Annotated[Optional[str], pydantic.Field(alias="maxDataTime")] = "24h"
     r"""Maximum amount of time to retain data before older buckets are deleted. Examples: 2h, 4d. Default is 24h."""
 
-    compress: Annotated[
-        Optional[InputEdgePrometheusPersistenceCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputEdgePrometheusPersistenceCompression.GZIP
+    compress: Optional[InputEdgePrometheusPersistenceCompression] = (
+        InputEdgePrometheusPersistenceCompression.GZIP
+    )
     r"""Data compression format. Default is gzip."""
 
 
@@ -156,9 +147,7 @@ class InputEdgePrometheusMetadatum(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputEdgePrometheusAuthTypeAuthenticationMethod(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
+class InputEdgePrometheusAuthTypeAuthenticationMethod(str, Enum):
     r"""Enter credentials directly, or select a stored secret"""
 
     MANUAL = "manual"
@@ -166,7 +155,7 @@ class InputEdgePrometheusAuthTypeAuthenticationMethod(
     KUBERNETES = "kubernetes"
 
 
-class TargetProtocol(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusTargetProtocol(str, Enum):
     r"""Protocol to use when collecting metrics"""
 
     HTTP = "http"
@@ -176,7 +165,7 @@ class TargetProtocol(str, Enum, metaclass=utils.OpenEnumMeta):
 class TargetTypedDict(TypedDict):
     host: str
     r"""Name of host from which to pull metrics."""
-    protocol: NotRequired[TargetProtocol]
+    protocol: NotRequired[InputEdgePrometheusTargetProtocol]
     r"""Protocol to use when collecting metrics"""
     port: NotRequired[float]
     r"""The port number in the metrics URL for discovered targets."""
@@ -188,9 +177,9 @@ class Target(BaseModel):
     host: str
     r"""Name of host from which to pull metrics."""
 
-    protocol: Annotated[
-        Optional[TargetProtocol], PlainValidator(validate_open_enum(False))
-    ] = TargetProtocol.HTTP
+    protocol: Optional[InputEdgePrometheusTargetProtocol] = (
+        InputEdgePrometheusTargetProtocol.HTTP
+    )
     r"""Protocol to use when collecting metrics"""
 
     port: Optional[float] = 9090
@@ -200,7 +189,7 @@ class Target(BaseModel):
     r"""Path to use when collecting metrics from discovered targets"""
 
 
-class InputEdgePrometheusRecordType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusRecordType(str, Enum):
     r"""DNS Record type to resolve"""
 
     SRV = "SRV"
@@ -208,7 +197,7 @@ class InputEdgePrometheusRecordType(str, Enum, metaclass=utils.OpenEnumMeta):
     AAAA = "AAAA"
 
 
-class ScrapeProtocolProtocol(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusScrapeProtocolProtocol(str, Enum):
     r"""Protocol to use when collecting metrics"""
 
     HTTP = "http"
@@ -230,9 +219,7 @@ class InputEdgePrometheusSearchFilter(BaseModel):
     r"""Search Filter Values, if empty only \"running\" EC2 instances will be returned"""
 
 
-class InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
+class InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod(str, Enum):
     r"""AWS authentication method. Choose Auto to use IAM roles."""
 
     AUTO = "auto"
@@ -240,7 +227,7 @@ class InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod(
     SECRET = "secret"
 
 
-class InputEdgePrometheusSignatureVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputEdgePrometheusSignatureVersion(str, Enum):
     r"""Signature version to use for signing EC2 requests"""
 
     V2 = "v2"
@@ -263,9 +250,9 @@ class PodFilter(BaseModel):
 
 
 class InputEdgePrometheusTypedDict(TypedDict):
-    type: InputEdgePrometheusType
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputEdgePrometheusType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -299,7 +286,7 @@ class InputEdgePrometheusTypedDict(TypedDict):
     r"""List of DNS names to resolve"""
     record_type: NotRequired[InputEdgePrometheusRecordType]
     r"""DNS Record type to resolve"""
-    scrape_protocol: NotRequired[ScrapeProtocolProtocol]
+    scrape_protocol: NotRequired[InputEdgePrometheusScrapeProtocolProtocol]
     r"""Protocol to use when collecting metrics"""
     scrape_path: NotRequired[str]
     r"""Path to use when collecting metrics from discovered targets"""
@@ -353,11 +340,11 @@ class InputEdgePrometheusTypedDict(TypedDict):
 
 
 class InputEdgePrometheus(BaseModel):
-    type: Annotated[InputEdgePrometheusType, PlainValidator(validate_open_enum(False))]
-
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputEdgePrometheusType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -388,10 +375,7 @@ class InputEdgePrometheus(BaseModel):
     r"""Other dimensions to include in events"""
 
     discovery_type: Annotated[
-        Annotated[
-            Optional[InputEdgePrometheusDiscoveryType],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputEdgePrometheusDiscoveryType],
         pydantic.Field(alias="discoveryType"),
     ] = InputEdgePrometheusDiscoveryType.STATIC
     r"""Target discovery mechanism. Use static to manually enter a list of targets."""
@@ -408,10 +392,7 @@ class InputEdgePrometheus(BaseModel):
     r"""Fields to add to events from this input"""
 
     auth_type: Annotated[
-        Annotated[
-            Optional[InputEdgePrometheusAuthTypeAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputEdgePrometheusAuthTypeAuthenticationMethod],
         pydantic.Field(alias="authType"),
     ] = InputEdgePrometheusAuthTypeAuthenticationMethod.MANUAL
     r"""Enter credentials directly, or select a stored secret"""
@@ -424,20 +405,14 @@ class InputEdgePrometheus(BaseModel):
     r"""List of DNS names to resolve"""
 
     record_type: Annotated[
-        Annotated[
-            Optional[InputEdgePrometheusRecordType],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="recordType"),
+        Optional[InputEdgePrometheusRecordType], pydantic.Field(alias="recordType")
     ] = InputEdgePrometheusRecordType.SRV
     r"""DNS Record type to resolve"""
 
     scrape_protocol: Annotated[
-        Annotated[
-            Optional[ScrapeProtocolProtocol], PlainValidator(validate_open_enum(False))
-        ],
+        Optional[InputEdgePrometheusScrapeProtocolProtocol],
         pydantic.Field(alias="scrapeProtocol"),
-    ] = ScrapeProtocolProtocol.HTTP
+    ] = InputEdgePrometheusScrapeProtocolProtocol.HTTP
     r"""Protocol to use when collecting metrics"""
 
     scrape_path: Annotated[Optional[str], pydantic.Field(alias="scrapePath")] = (
@@ -458,10 +433,7 @@ class InputEdgePrometheus(BaseModel):
     r"""EC2 Instance Search Filter"""
 
     aws_authentication_method: Annotated[
-        Annotated[
-            Optional[InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod],
         pydantic.Field(alias="awsAuthenticationMethod"),
     ] = InputEdgePrometheusAwsAuthenticationMethodAuthenticationMethod.AUTO
     r"""AWS authentication method. Choose Auto to use IAM roles."""
@@ -477,10 +449,7 @@ class InputEdgePrometheus(BaseModel):
     r"""EC2 service endpoint. If empty, defaults to the AWS Region-specific endpoint. Otherwise, it must point to EC2-compatible endpoint."""
 
     signature_version: Annotated[
-        Annotated[
-            Optional[InputEdgePrometheusSignatureVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputEdgePrometheusSignatureVersion],
         pydantic.Field(alias="signatureVersion"),
     ] = InputEdgePrometheusSignatureVersion.V4
     r"""Signature version to use for signing EC2 requests"""

cribl_control_plane/models/inputelastic.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 InputElasticType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticType(str, Enum):
     ELASTIC = "elastic"
 
 
@@ -26,14 +23,14 @@ class InputElasticConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputElasticMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticMode(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 InputElasticCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputElasticPqTypedDict(TypedDict):
 
 
 class InputElasticPq(BaseModel):
-    mode: Annotated[
-        Optional[InputElasticMode], PlainValidator(validate_open_enum(False))
-    ] = InputElasticMode.ALWAYS
+    mode: Optional[InputElasticMode] = InputElasticMode.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,20 +79,18 @@ class InputElasticPq(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[InputElasticCompression], PlainValidator(validate_open_enum(False))
-    ] = InputElasticCompression.NONE
+    compress: Optional[InputElasticCompression] = InputElasticCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputElasticMinimumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticMinimumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputElasticMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticMaximumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -156,30 +149,22 @@ class InputElasticTLSSettingsServerSide(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputElasticMinimumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputElasticMinimumTLSVersion], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputElasticMaximumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputElasticMaximumTLSVersion], pydantic.Field(alias="maxVersion")
     ] = None
 
 
-class InputElasticAuthenticationType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticAuthenticationType(str, Enum):
     NONE = "none"
     BASIC = "basic"
     CREDENTIALS_SECRET = "credentialsSecret"
     AUTH_TOKENS = "authTokens"
 
 
-class InputElasticAPIVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticAPIVersion(str, Enum):
     r"""The API version to use for communicating with the server"""
 
     SIX_DOT_8_DOT_4 = "6.8.4"
@@ -211,7 +196,7 @@ class InputElasticMetadatum(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputElasticAuthenticationMethod(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputElasticAuthenticationMethod(str, Enum):
     r"""Enter credentials directly, or select a stored secret"""
 
     NONE = "none"
@@ -255,21 +240,17 @@ class InputElasticProxyMode(BaseModel):
     r"""Amount of time, in seconds, to wait for a proxy request to complete before canceling it"""
 
     auth_type: Annotated[
-        Annotated[
-            Optional[InputElasticAuthenticationMethod],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authType"),
+        Optional[InputElasticAuthenticationMethod], pydantic.Field(alias="authType")
     ] = InputElasticAuthenticationMethod.NONE
     r"""Enter credentials directly, or select a stored secret"""
 
 
 class InputElasticTypedDict(TypedDict):
-    type: InputElasticType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputElasticType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -331,14 +312,14 @@ class InputElasticTypedDict(TypedDict):
 
 
 class InputElastic(BaseModel):
-    type: Annotated[InputElasticType, PlainValidator(validate_open_enum(False))]
-
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputElasticType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -427,18 +408,11 @@ class InputElastic(BaseModel):
     r"""Absolute path on which to listen for Elasticsearch API requests. Defaults to /. _bulk will be appended automatically. For example, /myPath becomes /myPath/_bulk. Requests can then be made to either /myPath/_bulk or /myPath/<myIndexName>/_bulk. Other entries are faked as success."""
 
     auth_type: Annotated[
-        Annotated[
-            Optional[InputElasticAuthenticationType],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="authType"),
+        Optional[InputElasticAuthenticationType], pydantic.Field(alias="authType")
     ] = InputElasticAuthenticationType.NONE
 
     api_version: Annotated[
-        Annotated[
-            Optional[InputElasticAPIVersion], PlainValidator(validate_open_enum(False))
-        ],
-        pydantic.Field(alias="apiVersion"),
+        Optional[InputElasticAPIVersion], pydantic.Field(alias="apiVersion")
     ] = InputElasticAPIVersion.EIGHT_DOT_3_DOT_2
     r"""The API version to use for communicating with the server"""