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

cribl_control_plane/models/inputgrafana_union.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, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
-class InputGrafanaType2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaType2(str, Enum):
     GRAFANA = "grafana"
 
 
@@ -26,14 +23,14 @@ class InputGrafanaConnection2(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputGrafanaMode2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMode2(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 InputGrafanaCompression2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaCompression2(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputGrafanaPq2TypedDict(TypedDict):
 
 
 class InputGrafanaPq2(BaseModel):
-    mode: Annotated[
-        Optional[InputGrafanaMode2], PlainValidator(validate_open_enum(False))
-    ] = InputGrafanaMode2.ALWAYS
+    mode: Optional[InputGrafanaMode2] = InputGrafanaMode2.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 InputGrafanaPq2(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[InputGrafanaCompression2], PlainValidator(validate_open_enum(False))
-    ] = InputGrafanaCompression2.NONE
+    compress: Optional[InputGrafanaCompression2] = InputGrafanaCompression2.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputGrafanaMinimumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMinimumTLSVersion2(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputGrafanaMaximumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMaximumTLSVersion2(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -156,25 +149,15 @@ class InputGrafanaTLSSettingsServerSide2(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputGrafanaMinimumTLSVersion2],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputGrafanaMinimumTLSVersion2], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputGrafanaMaximumTLSVersion2],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputGrafanaMaximumTLSVersion2], pydantic.Field(alias="maxVersion")
     ] = None
 
 
-class InputGrafanaPrometheusAuthAuthenticationType2(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
+class InputGrafanaPrometheusAuthAuthenticationType2(str, Enum):
     r"""Remote Write authentication type"""
 
     NONE = "none"
@@ -246,10 +229,7 @@ class InputGrafanaPrometheusAuth2TypedDict(TypedDict):
 
 class InputGrafanaPrometheusAuth2(BaseModel):
     auth_type: Annotated[
-        Annotated[
-            Optional[InputGrafanaPrometheusAuthAuthenticationType2],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputGrafanaPrometheusAuthAuthenticationType2],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaPrometheusAuthAuthenticationType2.NONE
     r"""Remote Write authentication type"""
@@ -306,7 +286,7 @@ class InputGrafanaPrometheusAuth2(BaseModel):
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
 
-class InputGrafanaLokiAuthAuthenticationType2(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaLokiAuthAuthenticationType2(str, Enum):
     r"""Loki logs authentication type"""
 
     NONE = "none"
@@ -378,10 +358,7 @@ class InputGrafanaLokiAuth2TypedDict(TypedDict):
 
 class InputGrafanaLokiAuth2(BaseModel):
     auth_type: Annotated[
-        Annotated[
-            Optional[InputGrafanaLokiAuthAuthenticationType2],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputGrafanaLokiAuthAuthenticationType2],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaLokiAuthAuthenticationType2.NONE
     r"""Loki logs authentication type"""
@@ -451,12 +428,12 @@ class InputGrafanaMetadatum2(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputGrafana2TypedDict(TypedDict):
-    type: InputGrafanaType2
+class InputGrafanaGrafana2TypedDict(TypedDict):
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputGrafanaType2]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -507,15 +484,15 @@ class InputGrafana2TypedDict(TypedDict):
     description: NotRequired[str]
 
 
-class InputGrafana2(BaseModel):
-    type: Annotated[InputGrafanaType2, PlainValidator(validate_open_enum(False))]
-
+class InputGrafanaGrafana2(BaseModel):
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputGrafanaType2] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -624,7 +601,7 @@ class InputGrafana2(BaseModel):
     description: Optional[str] = None
 
 
-class InputGrafanaType1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaType1(str, Enum):
     GRAFANA = "grafana"
 
 
@@ -639,14 +616,14 @@ class InputGrafanaConnection1(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputGrafanaMode1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMode1(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 InputGrafanaCompression1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaCompression1(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -671,9 +648,7 @@ class InputGrafanaPq1TypedDict(TypedDict):
 
 
 class InputGrafanaPq1(BaseModel):
-    mode: Annotated[
-        Optional[InputGrafanaMode1], PlainValidator(validate_open_enum(False))
-    ] = InputGrafanaMode1.ALWAYS
+    mode: Optional[InputGrafanaMode1] = InputGrafanaMode1.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[
@@ -697,20 +672,18 @@ class InputGrafanaPq1(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[InputGrafanaCompression1], PlainValidator(validate_open_enum(False))
-    ] = InputGrafanaCompression1.NONE
+    compress: Optional[InputGrafanaCompression1] = InputGrafanaCompression1.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputGrafanaMinimumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMinimumTLSVersion1(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputGrafanaMaximumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaMaximumTLSVersion1(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -769,25 +742,15 @@ class InputGrafanaTLSSettingsServerSide1(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputGrafanaMinimumTLSVersion1],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputGrafanaMinimumTLSVersion1], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputGrafanaMaximumTLSVersion1],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputGrafanaMaximumTLSVersion1], pydantic.Field(alias="maxVersion")
     ] = None
 
 
-class InputGrafanaPrometheusAuthAuthenticationType1(
-    str, Enum, metaclass=utils.OpenEnumMeta
-):
+class InputGrafanaPrometheusAuthAuthenticationType1(str, Enum):
     r"""Remote Write authentication type"""
 
     NONE = "none"
@@ -859,10 +822,7 @@ class InputGrafanaPrometheusAuth1TypedDict(TypedDict):
 
 class InputGrafanaPrometheusAuth1(BaseModel):
     auth_type: Annotated[
-        Annotated[
-            Optional[InputGrafanaPrometheusAuthAuthenticationType1],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputGrafanaPrometheusAuthAuthenticationType1],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaPrometheusAuthAuthenticationType1.NONE
     r"""Remote Write authentication type"""
@@ -919,7 +879,7 @@ class InputGrafanaPrometheusAuth1(BaseModel):
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
 
-class InputGrafanaLokiAuthAuthenticationType1(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputGrafanaLokiAuthAuthenticationType1(str, Enum):
     r"""Loki logs authentication type"""
 
     NONE = "none"
@@ -991,10 +951,7 @@ class InputGrafanaLokiAuth1TypedDict(TypedDict):
 
 class InputGrafanaLokiAuth1(BaseModel):
     auth_type: Annotated[
-        Annotated[
-            Optional[InputGrafanaLokiAuthAuthenticationType1],
-            PlainValidator(validate_open_enum(False)),
-        ],
+        Optional[InputGrafanaLokiAuthAuthenticationType1],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaLokiAuthAuthenticationType1.NONE
     r"""Loki logs authentication type"""
@@ -1064,12 +1021,12 @@ class InputGrafanaMetadatum1(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputGrafana1TypedDict(TypedDict):
-    type: InputGrafanaType1
+class InputGrafanaGrafana1TypedDict(TypedDict):
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputGrafanaType1]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -1120,15 +1077,15 @@ class InputGrafana1TypedDict(TypedDict):
     description: NotRequired[str]
 
 
-class InputGrafana1(BaseModel):
-    type: Annotated[InputGrafanaType1, PlainValidator(validate_open_enum(False))]
-
+class InputGrafanaGrafana1(BaseModel):
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputGrafanaType1] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -1238,10 +1195,11 @@ class InputGrafana1(BaseModel):
 
 
 InputGrafanaUnionTypedDict = TypeAliasType(
-    "InputGrafanaUnionTypedDict", Union[InputGrafana1TypedDict, InputGrafana2TypedDict]
+    "InputGrafanaUnionTypedDict",
+    Union[InputGrafanaGrafana1TypedDict, InputGrafanaGrafana2TypedDict],
 )
 
 
 InputGrafanaUnion = TypeAliasType(
-    "InputGrafanaUnion", Union[InputGrafana1, InputGrafana2]
+    "InputGrafanaUnion", Union[InputGrafanaGrafana1, InputGrafanaGrafana2]
 )

cribl_control_plane/models/inputhttp.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 InputHTTPType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPType(str, Enum):
     HTTP = "http"
 
 
@@ -26,14 +23,14 @@ class InputHTTPConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputHTTPMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPMode(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 InputHTTPCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputHTTPPqTypedDict(TypedDict):
 
 
 class InputHTTPPq(BaseModel):
-    mode: Annotated[
-        Optional[InputHTTPMode], PlainValidator(validate_open_enum(False))
-    ] = InputHTTPMode.ALWAYS
+    mode: Optional[InputHTTPMode] = InputHTTPMode.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 InputHTTPPq(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[InputHTTPCompression], PlainValidator(validate_open_enum(False))
-    ] = InputHTTPCompression.NONE
+    compress: Optional[InputHTTPCompression] = InputHTTPCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputHTTPMinimumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPMinimumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputHTTPMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPMaximumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -156,19 +149,11 @@ class InputHTTPTLSSettingsServerSide(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputHTTPMinimumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputHTTPMinimumTLSVersion], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputHTTPMaximumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputHTTPMaximumTLSVersion], pydantic.Field(alias="maxVersion")
     ] = None
 
 
@@ -217,11 +202,11 @@ class InputHTTPAuthTokensExt(BaseModel):
 
 
 class InputHTTPTypedDict(TypedDict):
-    type: InputHTTPType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputHTTPType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -278,14 +263,14 @@ class InputHTTPTypedDict(TypedDict):
 
 
 class InputHTTP(BaseModel):
-    type: Annotated[InputHTTPType, PlainValidator(validate_open_enum(False))]
-
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputHTTPType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputhttpraw.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 InputHTTPRawType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPRawType(str, Enum):
     HTTP_RAW = "http_raw"
 
 
@@ -26,14 +23,14 @@ class InputHTTPRawConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputHTTPRawMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPRawMode(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 InputHTTPRawCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPRawCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputHTTPRawPqTypedDict(TypedDict):
 
 
 class InputHTTPRawPq(BaseModel):
-    mode: Annotated[
-        Optional[InputHTTPRawMode], PlainValidator(validate_open_enum(False))
-    ] = InputHTTPRawMode.ALWAYS
+    mode: Optional[InputHTTPRawMode] = InputHTTPRawMode.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 InputHTTPRawPq(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[InputHTTPRawCompression], PlainValidator(validate_open_enum(False))
-    ] = InputHTTPRawCompression.NONE
+    compress: Optional[InputHTTPRawCompression] = InputHTTPRawCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
-class InputHTTPRawMinimumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPRawMinimumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputHTTPRawMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputHTTPRawMaximumTLSVersion(str, Enum):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -156,19 +149,11 @@ class InputHTTPRawTLSSettingsServerSide(BaseModel):
     ] = None
 
     min_version: Annotated[
-        Annotated[
-            Optional[InputHTTPRawMinimumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="minVersion"),
+        Optional[InputHTTPRawMinimumTLSVersion], pydantic.Field(alias="minVersion")
     ] = None
 
     max_version: Annotated[
-        Annotated[
-            Optional[InputHTTPRawMaximumTLSVersion],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="maxVersion"),
+        Optional[InputHTTPRawMaximumTLSVersion], pydantic.Field(alias="maxVersion")
     ] = None
 
 
@@ -217,11 +202,11 @@ class InputHTTPRawAuthTokensExt(BaseModel):
 
 
 class InputHTTPRawTypedDict(TypedDict):
-    type: InputHTTPRawType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputHTTPRawType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -279,14 +264,14 @@ class InputHTTPRawTypedDict(TypedDict):
 
 
 class InputHTTPRaw(BaseModel):
-    type: Annotated[InputHTTPRawType, PlainValidator(validate_open_enum(False))]
-
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputHTTPRawType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputjournalfiles.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 InputJournalFilesType(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputJournalFilesType(str, Enum):
     JOURNAL_FILES = "journal_files"
 
 
@@ -26,14 +23,14 @@ class InputJournalFilesConnection(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputJournalFilesMode(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputJournalFilesMode(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 InputJournalFilesCompression(str, Enum, metaclass=utils.OpenEnumMeta):
+class InputJournalFilesCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
@@ -58,9 +55,7 @@ class InputJournalFilesPqTypedDict(TypedDict):
 
 
 class InputJournalFilesPq(BaseModel):
-    mode: Annotated[
-        Optional[InputJournalFilesMode], PlainValidator(validate_open_enum(False))
-    ] = InputJournalFilesMode.ALWAYS
+    mode: Optional[InputJournalFilesMode] = InputJournalFilesMode.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,10 +79,7 @@ class InputJournalFilesPq(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[InputJournalFilesCompression],
-        PlainValidator(validate_open_enum(False)),
-    ] = InputJournalFilesCompression.NONE
+    compress: Optional[InputJournalFilesCompression] = InputJournalFilesCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
 
@@ -120,13 +112,13 @@ class InputJournalFilesMetadatum(BaseModel):
 
 
 class InputJournalFilesTypedDict(TypedDict):
-    type: InputJournalFilesType
     path: str
     r"""Directory path to search for journals. Environment variables will be resolved, e.g. $CRIBL_EDGE_FS_ROOT/var/log/journal/$MACHINE_ID."""
     journals: List[str]
     r"""The full path of discovered journals are matched against this wildcard list."""
     id: NotRequired[str]
     r"""Unique ID for this input"""
+    type: NotRequired[InputJournalFilesType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -155,8 +147,6 @@ class InputJournalFilesTypedDict(TypedDict):
 
 
 class InputJournalFiles(BaseModel):
-    type: Annotated[InputJournalFilesType, PlainValidator(validate_open_enum(False))]
-
     path: str
     r"""Directory path to search for journals. Environment variables will be resolved, e.g. $CRIBL_EDGE_FS_ROOT/var/log/journal/$MACHINE_ID."""
 
@@ -166,6 +156,8 @@ class InputJournalFiles(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
+    type: Optional[InputJournalFilesType] = None
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None