cribl-control-plane 0.2.1rc1__py3-none-any.whl → 0.2.1rc2__py3-none-any.whl

cribl_control_plane/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "cribl-control-plane"
-__version__: str = "0.2.1rc1"
-__openapi_doc_version__: str = "4.15.0-alpha.1761420802292-a60a4283"
+__version__: str = "0.2.1rc2"
+__openapi_doc_version__: str = "4.15.0-alpha.1761606328595-4d5d0f38"
 __gen_version__: str = "2.730.5"
-__user_agent__: str = "speakeasy-sdk/python 0.2.1rc1 2.730.5 4.15.0-alpha.1761420802292-a60a4283 cribl-control-plane"
+__user_agent__: str = "speakeasy-sdk/python 0.2.1rc2 2.730.5 4.15.0-alpha.1761606328595-4d5d0f38 cribl-control-plane"
 
 try:
     if __package__ is not None:

cribl_control_plane/errors/__init__.py

@@ -9,7 +9,10 @@ import sys
 if TYPE_CHECKING:
     from .apierror import APIError
     from .error import Error, ErrorData
-    from .healthstatus_error import HealthStatusError, HealthStatusErrorData
+    from .healthserverstatus_error import (
+        HealthServerStatusError,
+        HealthServerStatusErrorData,
+    )
     from .no_response_error import NoResponseError
     from .responsevalidationerror import ResponseValidationError
 
@@ -18,8 +21,8 @@ __all__ = [
     "CriblControlPlaneError",
     "Error",
     "ErrorData",
-    "HealthStatusError",
-    "HealthStatusErrorData",
+    "HealthServerStatusError",
+    "HealthServerStatusErrorData",
     "NoResponseError",
     "ResponseValidationError",
 ]
@@ -28,8 +31,8 @@ _dynamic_imports: dict[str, str] = {
     "APIError": ".apierror",
     "Error": ".error",
     "ErrorData": ".error",
-    "HealthStatusError": ".healthstatus_error",
-    "HealthStatusErrorData": ".healthstatus_error",
+    "HealthServerStatusError": ".healthserverstatus_error",
+    "HealthServerStatusErrorData": ".healthserverstatus_error",
     "NoResponseError": ".no_response_error",
     "ResponseValidationError": ".responsevalidationerror",
 }

cribl_control_plane/errors/{healthstatus_error.py → healthserverstatus_error.py}

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from cribl_control_plane.errors import CriblControlPlaneError
-from cribl_control_plane.models import healthstatus as models_healthstatus
+from cribl_control_plane.models import healthserverstatus as models_healthserverstatus
 from cribl_control_plane.types import BaseModel
 from cribl_control_plane.utils import validate_open_enum
 from dataclasses import dataclass, field
@@ -13,25 +13,26 @@ from typing import Optional
 from typing_extensions import Annotated
 
 
-class HealthStatusErrorData(BaseModel):
+class HealthServerStatusErrorData(BaseModel):
+    start_time: Annotated[float, pydantic.Field(alias="startTime")]
+
     status: Annotated[
-        models_healthstatus.Status, PlainValidator(validate_open_enum(False))
+        models_healthserverstatus.Status, PlainValidator(validate_open_enum(False))
     ]
 
-    start_time: Annotated[float, pydantic.Field(alias="startTime")]
-
     role: Annotated[
-        Optional[models_healthstatus.Role], PlainValidator(validate_open_enum(False))
+        Optional[models_healthserverstatus.Role],
+        PlainValidator(validate_open_enum(False)),
     ] = None
 
 
 @dataclass(unsafe_hash=True)
-class HealthStatusError(CriblControlPlaneError):
-    data: HealthStatusErrorData = field(hash=False)
+class HealthServerStatusError(CriblControlPlaneError):
+    data: HealthServerStatusErrorData = field(hash=False)
 
     def __init__(
         self,
-        data: HealthStatusErrorData,
+        data: HealthServerStatusErrorData,
         raw_response: httpx.Response,
         body: Optional[str] = None,
     ):

cribl_control_plane/groups_sdk.py

@@ -6,7 +6,6 @@ from cribl_control_plane import errors, models, utils
 from cribl_control_plane._hooks import HookContext
 from cribl_control_plane.acl import ACL
 from cribl_control_plane.groups_configs import GroupsConfigs
-from cribl_control_plane.mappings import Mappings
 from cribl_control_plane.types import OptionalNullable, UNSET
 from cribl_control_plane.utils import get_security_from_env
 from cribl_control_plane.utils.unmarshal_json_response import unmarshal_json_response
@@ -16,7 +15,6 @@ from typing import Any, List, Mapping, Optional, Union
 class GroupsSDK(BaseSDK):
     r"""Actions related to Groups"""
 
-    mappings: Mappings
     configs: GroupsConfigs
     acl: ACL
 
@@ -28,7 +26,6 @@ class GroupsSDK(BaseSDK):
         self._init_sdks()
 
     def _init_sdks(self):
-        self.mappings = Mappings(self.sdk_configuration, parent_ref=self.parent_ref)
         self.configs = GroupsConfigs(self.sdk_configuration, parent_ref=self.parent_ref)
         self.acl = ACL(self.sdk_configuration, parent_ref=self.parent_ref)
 
@@ -224,11 +221,14 @@ class GroupsSDK(BaseSDK):
         cloud: Optional[
             Union[models.ConfigGroupCloud, models.ConfigGroupCloudTypedDict]
         ] = None,
-        config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
-        git: Optional[Union[models.Git, models.GitTypedDict]] = None,
+        estimated_ingest_rate: Optional[
+            models.GroupCreateRequestEstimatedIngestRate
+        ] = None,
+        git: Optional[
+            Union[models.GroupCreateRequestGit, models.GroupCreateRequestGitTypedDict]
+        ] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
         is_fleet: Optional[bool] = None,
@@ -243,9 +243,10 @@ class GroupsSDK(BaseSDK):
         name: Optional[str] = None,
         on_prem: Optional[bool] = None,
         provisioned: Optional[bool] = None,
+        source_group_id: Optional[str] = None,
         streamtags: Optional[List[str]] = None,
         tags: Optional[str] = None,
-        type_: Optional[models.ConfigGroupType] = None,
+        type_: Optional[models.GroupCreateRequestType] = None,
         upgrade_version: Optional[str] = None,
         worker_count: Optional[float] = None,
         worker_remote_access: Optional[bool] = None,
@@ -261,7 +262,6 @@ class GroupsSDK(BaseSDK):
         :param product: Name of the Cribl product to add the Worker Group or Edge Fleet to.
         :param id:
         :param cloud:
-        :param config_version:
         :param deploying_worker_count:
         :param description:
         :param estimated_ingest_rate: Maximum expected volume of data ingested by the @{group}. (This setting is available only on @{group}s consisting of Cribl-managed Cribl.Cloud @{node}s.)
@@ -275,6 +275,7 @@ class GroupsSDK(BaseSDK):
         :param name:
         :param on_prem:
         :param provisioned:
+        :param source_group_id:
         :param streamtags:
         :param tags:
         :param type:
@@ -298,15 +299,16 @@ class GroupsSDK(BaseSDK):
 
         request = models.CreateConfigGroupByProductRequest(
             product=product,
-            config_group=models.ConfigGroup(
+            group_create_request=models.GroupCreateRequest(
                 cloud=utils.get_pydantic_model(
                     cloud, Optional[models.ConfigGroupCloud]
                 ),
-                config_version=config_version,
                 deploying_worker_count=deploying_worker_count,
                 description=description,
                 estimated_ingest_rate=estimated_ingest_rate,
-                git=utils.get_pydantic_model(git, Optional[models.Git]),
+                git=utils.get_pydantic_model(
+                    git, Optional[models.GroupCreateRequestGit]
+                ),
                 id=id,
                 incompatible_worker_count=incompatible_worker_count,
                 inherits=inherits,
@@ -319,6 +321,7 @@ class GroupsSDK(BaseSDK):
                 name=name,
                 on_prem=on_prem,
                 provisioned=provisioned,
+                source_group_id=source_group_id,
                 streamtags=streamtags,
                 tags=tags,
                 type=type_,
@@ -342,7 +345,11 @@ class GroupsSDK(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request.config_group, False, False, "json", models.ConfigGroup
+                request.group_create_request,
+                False,
+                False,
+                "json",
+                models.GroupCreateRequest,
             ),
             timeout_ms=timeout_ms,
         )
@@ -395,11 +402,14 @@ class GroupsSDK(BaseSDK):
         cloud: Optional[
             Union[models.ConfigGroupCloud, models.ConfigGroupCloudTypedDict]
         ] = None,
-        config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
-        git: Optional[Union[models.Git, models.GitTypedDict]] = None,
+        estimated_ingest_rate: Optional[
+            models.GroupCreateRequestEstimatedIngestRate
+        ] = None,
+        git: Optional[
+            Union[models.GroupCreateRequestGit, models.GroupCreateRequestGitTypedDict]
+        ] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
         is_fleet: Optional[bool] = None,
@@ -414,9 +424,10 @@ class GroupsSDK(BaseSDK):
         name: Optional[str] = None,
         on_prem: Optional[bool] = None,
         provisioned: Optional[bool] = None,
+        source_group_id: Optional[str] = None,
         streamtags: Optional[List[str]] = None,
         tags: Optional[str] = None,
-        type_: Optional[models.ConfigGroupType] = None,
+        type_: Optional[models.GroupCreateRequestType] = None,
         upgrade_version: Optional[str] = None,
         worker_count: Optional[float] = None,
         worker_remote_access: Optional[bool] = None,
@@ -432,7 +443,6 @@ class GroupsSDK(BaseSDK):
         :param product: Name of the Cribl product to add the Worker Group or Edge Fleet to.
         :param id:
         :param cloud:
-        :param config_version:
         :param deploying_worker_count:
         :param description:
         :param estimated_ingest_rate: Maximum expected volume of data ingested by the @{group}. (This setting is available only on @{group}s consisting of Cribl-managed Cribl.Cloud @{node}s.)
@@ -446,6 +456,7 @@ class GroupsSDK(BaseSDK):
         :param name:
         :param on_prem:
         :param provisioned:
+        :param source_group_id:
         :param streamtags:
         :param tags:
         :param type:
@@ -469,15 +480,16 @@ class GroupsSDK(BaseSDK):
 
         request = models.CreateConfigGroupByProductRequest(
             product=product,
-            config_group=models.ConfigGroup(
+            group_create_request=models.GroupCreateRequest(
                 cloud=utils.get_pydantic_model(
                     cloud, Optional[models.ConfigGroupCloud]
                 ),
-                config_version=config_version,
                 deploying_worker_count=deploying_worker_count,
                 description=description,
                 estimated_ingest_rate=estimated_ingest_rate,
-                git=utils.get_pydantic_model(git, Optional[models.Git]),
+                git=utils.get_pydantic_model(
+                    git, Optional[models.GroupCreateRequestGit]
+                ),
                 id=id,
                 incompatible_worker_count=incompatible_worker_count,
                 inherits=inherits,
@@ -490,6 +502,7 @@ class GroupsSDK(BaseSDK):
                 name=name,
                 on_prem=on_prem,
                 provisioned=provisioned,
+                source_group_id=source_group_id,
                 streamtags=streamtags,
                 tags=tags,
                 type=type_,
@@ -513,7 +526,11 @@ class GroupsSDK(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request.config_group, False, False, "json", models.ConfigGroup
+                request.group_create_request,
+                False,
+                False,
+                "json",
+                models.GroupCreateRequest,
             ),
             timeout_ms=timeout_ms,
         )
@@ -760,8 +777,10 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
-        git: Optional[Union[models.Git, models.GitTypedDict]] = None,
+        estimated_ingest_rate: Optional[models.ConfigGroupEstimatedIngestRate] = None,
+        git: Optional[
+            Union[models.ConfigGroupGit, models.ConfigGroupGitTypedDict]
+        ] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
         is_fleet: Optional[bool] = None,
@@ -841,7 +860,7 @@ class GroupsSDK(BaseSDK):
                 deploying_worker_count=deploying_worker_count,
                 description=description,
                 estimated_ingest_rate=estimated_ingest_rate,
-                git=utils.get_pydantic_model(git, Optional[models.Git]),
+                git=utils.get_pydantic_model(git, Optional[models.ConfigGroupGit]),
                 id=id,
                 incompatible_worker_count=incompatible_worker_count,
                 inherits=inherits,
@@ -934,8 +953,10 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
-        git: Optional[Union[models.Git, models.GitTypedDict]] = None,
+        estimated_ingest_rate: Optional[models.ConfigGroupEstimatedIngestRate] = None,
+        git: Optional[
+            Union[models.ConfigGroupGit, models.ConfigGroupGitTypedDict]
+        ] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
         is_fleet: Optional[bool] = None,
@@ -1015,7 +1036,7 @@ class GroupsSDK(BaseSDK):
                 deploying_worker_count=deploying_worker_count,
                 description=description,
                 estimated_ingest_rate=estimated_ingest_rate,
-                git=utils.get_pydantic_model(git, Optional[models.Git]),
+                git=utils.get_pydantic_model(git, Optional[models.ConfigGroupGit]),
                 id=id,
                 incompatible_worker_count=incompatible_worker_count,
                 inherits=inherits,

cribl_control_plane/health.py

@@ -18,9 +18,11 @@ class Health(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.GetHealthInfoResponse:
+    ) -> models.HealthServerStatus:
         r"""Retrieve health status of the server
 
+        Get the current health status of the server.
+
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -62,31 +64,32 @@ class Health(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="getHealthInfo",
+                operation_id="getHealth",
                 oauth2_scopes=[],
                 security_source=None,
             ),
             request=req,
-            error_status_codes=["420", "4XX", "5XX"],
+            error_status_codes=["420", "4XX", "500", "5XX"],
             retry_config=retry_config,
         )
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(models.HealthStatus, http_res)
+            return unmarshal_json_response(models.HealthServerStatus, http_res)
         if utils.match_response(http_res, "420", "application/json"):
             response_data = unmarshal_json_response(
-                errors.HealthStatusErrorData, http_res
+                errors.HealthServerStatusErrorData, http_res
             )
-            raise errors.HealthStatusError(response_data, http_res)
+            raise errors.HealthServerStatusError(response_data, http_res)
+        if utils.match_response(http_res, "500", "application/json"):
+            response_data = unmarshal_json_response(errors.ErrorData, http_res)
+            raise errors.Error(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise errors.APIError("API error occurred", http_res, http_res_text)
-        if utils.match_response(http_res, "default", "application/json"):
-            return unmarshal_json_response(models.Error, http_res)
 
         raise errors.APIError("Unexpected response received", http_res)
 
@@ -97,9 +100,11 @@ class Health(BaseSDK):
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.GetHealthInfoResponse:
+    ) -> models.HealthServerStatus:
         r"""Retrieve health status of the server
 
+        Get the current health status of the server.
+
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -141,30 +146,31 @@ class Health(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="getHealthInfo",
+                operation_id="getHealth",
                 oauth2_scopes=[],
                 security_source=None,
             ),
             request=req,
-            error_status_codes=["420", "4XX", "5XX"],
+            error_status_codes=["420", "4XX", "500", "5XX"],
             retry_config=retry_config,
         )
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return unmarshal_json_response(models.HealthStatus, http_res)
+            return unmarshal_json_response(models.HealthServerStatus, http_res)
         if utils.match_response(http_res, "420", "application/json"):
             response_data = unmarshal_json_response(
-                errors.HealthStatusErrorData, http_res
+                errors.HealthServerStatusErrorData, http_res
             )
-            raise errors.HealthStatusError(response_data, http_res)
+            raise errors.HealthServerStatusError(response_data, http_res)
+        if utils.match_response(http_res, "500", "application/json"):
+            response_data = unmarshal_json_response(errors.ErrorData, http_res)
+            raise errors.Error(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise errors.APIError("API error occurred", http_res, http_res_text)
-        if utils.match_response(http_res, "default", "application/json"):
-            return unmarshal_json_response(models.Error, http_res)
 
         raise errors.APIError("Unexpected response received", http_res)