Merge branch 'main' into v1.6749.0

Author: remyleone

scaleway-async/poetry.lock

@@ -28,7 +28,7 @@ scaleway-core = "*"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }
-ruff = ">=0.5.0,<0.11.13"
+ruff = ">=0.5.0,<0.12.2"
 mypy = "^1.5.1"
 
 [build-system]

scaleway-async/pyproject.toml

@@ -19,11 +19,14 @@
 from .types import ServerTypeGPU
 from .types import ServerTypeMemory
 from .types import ServerTypeNetwork
+from .types import BatchCreateServersRequestBatchInnerCreateServerRequest
 from .types import Server
 from .types import ConnectivityDiagnosticServerHealth
 from .types import ServerPrivateNetwork
 from .types import ServerType
 from .types import CommitmentTypeValue
+from .types import BatchCreateServersRequest
+from .types import BatchCreateServersResponse
 from .types import ConnectivityDiagnostic
 from .types import CreateServerRequest
 from .types import DeleteServerRequest
@@ -72,11 +75,14 @@
     "ServerTypeGPU",
     "ServerTypeMemory",
     "ServerTypeNetwork",
+    "BatchCreateServersRequestBatchInnerCreateServerRequest",
     "Server",
     "ConnectivityDiagnosticServerHealth",
     "ServerPrivateNetwork",
     "ServerType",
     "CommitmentTypeValue",
+    "BatchCreateServersRequest",
+    "BatchCreateServersResponse",
     "ConnectivityDiagnostic",
     "CreateServerRequest",
     "DeleteServerRequest",

scaleway-async/scaleway_async/applesilicon/v1alpha1/__init__.py

@@ -18,6 +18,9 @@
     CommitmentType,
     ListServerPrivateNetworksRequestOrderBy,
     ListServersRequestOrderBy,
+    BatchCreateServersRequest,
+    BatchCreateServersRequestBatchInnerCreateServerRequest,
+    BatchCreateServersResponse,
     CommitmentTypeValue,
     ConnectivityDiagnostic,
     CreateServerRequest,
@@ -46,13 +49,15 @@
     unmarshal_Server,
     unmarshal_ServerPrivateNetwork,
     unmarshal_ServerType,
+    unmarshal_BatchCreateServersResponse,
     unmarshal_ConnectivityDiagnostic,
     unmarshal_ListOSResponse,
     unmarshal_ListServerPrivateNetworksResponse,
     unmarshal_ListServerTypesResponse,
     unmarshal_ListServersResponse,
     unmarshal_SetServerPrivateNetworksResponse,
     unmarshal_StartConnectivityDiagnosticResponse,
+    marshal_BatchCreateServersRequest,
     marshal_CreateServerRequest,
     marshal_PrivateNetworkApiAddServerPrivateNetworkRequest,
     marshal_PrivateNetworkApiSetServerPrivateNetworksRequest,
@@ -184,6 +189,66 @@ async def create_server(
         self._throw_on_error(res)
         return unmarshal_Server(res.json())
 
+    async def batch_create_servers(
+        self,
+        *,
+        type_: str,
+        enable_vpc: bool,
+        public_bandwidth_bps: int,
+        zone: Optional[ScwZone] = None,
+        project_id: Optional[str] = None,
+        os_id: Optional[str] = None,
+        commitment_type: Optional[CommitmentType] = None,
+        requests: Optional[
+            List[BatchCreateServersRequestBatchInnerCreateServerRequest]
+        ] = None,
+    ) -> BatchCreateServersResponse:
+        """
+        Create multiple servers atomically.
+        Create multiple servers in the targeted zone specifying their configurations. If the request cannot entirely be fullfilled, no servers are created.
+        :param type_: Create servers of the given type.
+        :param enable_vpc: Activate the Private Network feature for these servers. This feature is configured through the Apple Silicon - Private Networks API.
+        :param public_bandwidth_bps: Public bandwidth to configure for these servers. This defaults to the minimum bandwidth for the corresponding server type. For compatible server types, the bandwidth can be increased which incurs additional costs.
+        :param zone: Zone to target. If none is passed will use default zone from the config.
+        :param project_id: Create servers in the given project ID.
+        :param os_id: Create servers & install the given os_id, when no os_id provided the default OS for this server type is chosen. Requesting a non-default OS will induce an extended delivery time.
+        :param commitment_type: Activate commitment for these servers. If not specified, there is a 24h commitment due to Apple licensing (commitment_type `duration_24h`). It can be updated with the Update Server request. Available commitment depends on server type.
+        :param requests: List of servers to create.
+        :return: :class:`BatchCreateServersResponse <BatchCreateServersResponse>`
+
+        Usage:
+        ::
+
+            result = await api.batch_create_servers(
+                type="example",
+                enable_vpc=False,
+                public_bandwidth_bps=1,
+            )
+        """
+
+        param_zone = validate_path_param("zone", zone or self.client.default_zone)
+
+        res = self._request(
+            "POST",
+            f"/apple-silicon/v1alpha1/zones/{param_zone}/batch-create-servers",
+            body=marshal_BatchCreateServersRequest(
+                BatchCreateServersRequest(
+                    type_=type_,
+                    enable_vpc=enable_vpc,
+                    public_bandwidth_bps=public_bandwidth_bps,
+                    zone=zone,
+                    project_id=project_id,
+                    os_id=os_id,
+                    commitment_type=commitment_type,
+                    requests=requests,
+                ),
+                self.client,
+            ),
+        )
+
+        self._throw_on_error(res)
+        return unmarshal_BatchCreateServersResponse(res.json())
+
     async def list_servers(
         self,
         *,

scaleway-async/scaleway_async/applesilicon/v1alpha1/api.py

@@ -17,6 +17,7 @@
     ServerTypeMemory,
     ServerTypeNetwork,
     ServerType,
+    BatchCreateServersResponse,
     ConnectivityDiagnosticServerHealth,
     ConnectivityDiagnostic,
     ListOSResponse,
@@ -25,6 +26,8 @@
     ListServersResponse,
     SetServerPrivateNetworksResponse,
     StartConnectivityDiagnosticResponse,
+    BatchCreateServersRequestBatchInnerCreateServerRequest,
+    BatchCreateServersRequest,
     CreateServerRequest,
     PrivateNetworkApiAddServerPrivateNetworkRequest,
     PrivateNetworkApiSetServerPrivateNetworksRequest,
@@ -417,6 +420,23 @@ def unmarshal_ServerType(data: Any) -> ServerType:
     return ServerType(**args)
 
 
+def unmarshal_BatchCreateServersResponse(data: Any) -> BatchCreateServersResponse:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'BatchCreateServersResponse' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    field = data.get("servers", None)
+    if field is not None:
+        args["servers"] = (
+            [unmarshal_Server(v) for v in field] if field is not None else None
+        )
+
+    return BatchCreateServersResponse(**args)
+
+
 def unmarshal_ConnectivityDiagnosticServerHealth(
     data: Any,
 ) -> ConnectivityDiagnosticServerHealth:
@@ -619,6 +639,53 @@ def unmarshal_StartConnectivityDiagnosticResponse(
     return StartConnectivityDiagnosticResponse(**args)
 
 
+def marshal_BatchCreateServersRequestBatchInnerCreateServerRequest(
+    request: BatchCreateServersRequestBatchInnerCreateServerRequest,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.name is not None:
+        output["name"] = request.name
+
+    return output
+
+
+def marshal_BatchCreateServersRequest(
+    request: BatchCreateServersRequest,
+    defaults: ProfileDefaults,
+) -> Dict[str, Any]:
+    output: Dict[str, Any] = {}
+
+    if request.type_ is not None:
+        output["type"] = request.type_
+
+    if request.enable_vpc is not None:
+        output["enable_vpc"] = request.enable_vpc
+
+    if request.public_bandwidth_bps is not None:
+        output["public_bandwidth_bps"] = request.public_bandwidth_bps
+
+    if request.project_id is not None:
+        output["project_id"] = request.project_id or defaults.default_project_id
+
+    if request.os_id is not None:
+        output["os_id"] = request.os_id
+
+    if request.commitment_type is not None:
+        output["commitment_type"] = str(request.commitment_type)
+
+    if request.requests is not None:
+        output["requests"] = [
+            marshal_BatchCreateServersRequestBatchInnerCreateServerRequest(
+                item, defaults
+            )
+            for item in request.requests
+        ]
+
+    return output
+
+
 def marshal_CreateServerRequest(
     request: CreateServerRequest,
     defaults: ProfileDefaults,

scaleway-async/scaleway_async/applesilicon/v1alpha1/marshalling.py

@@ -199,6 +199,11 @@ class ServerTypeNetwork:
     supported_bandwidth: List[int]
 
 
+@dataclass
+class BatchCreateServersRequestBatchInnerCreateServerRequest:
+    name: str
+
+
 @dataclass
 class Server:
     id: str
@@ -423,6 +428,57 @@ class CommitmentTypeValue:
     commitment_type: CommitmentType
 
 
+@dataclass
+class BatchCreateServersRequest:
+    type_: str
+    """
+    Create servers of the given type.
+    """
+
+    enable_vpc: bool
+    """
+    Activate the Private Network feature for these servers. This feature is configured through the Apple Silicon - Private Networks API.
+    """
+
+    public_bandwidth_bps: int
+    """
+    Public bandwidth to configure for these servers. This defaults to the minimum bandwidth for the corresponding server type. For compatible server types, the bandwidth can be increased which incurs additional costs.
+    """
+
+    zone: Optional[ScwZone]
+    """
+    Zone to target. If none is passed will use default zone from the config.
+    """
+
+    project_id: Optional[str]
+    """
+    Create servers in the given project ID.
+    """
+
+    os_id: Optional[str]
+    """
+    Create servers & install the given os_id, when no os_id provided the default OS for this server type is chosen. Requesting a non-default OS will induce an extended delivery time.
+    """
+
+    commitment_type: Optional[CommitmentType]
+    """
+    Activate commitment for these servers. If not specified, there is a 24h commitment due to Apple licensing (commitment_type `duration_24h`). It can be updated with the Update Server request. Available commitment depends on server type.
+    """
+
+    requests: Optional[List[BatchCreateServersRequestBatchInnerCreateServerRequest]]
+    """
+    List of servers to create.
+    """
+
+
+@dataclass
+class BatchCreateServersResponse:
+    servers: List[Server]
+    """
+    List of created servers.
+    """
+
+
 @dataclass
 class ConnectivityDiagnostic:
     id: str

scaleway-async/scaleway_async/applesilicon/v1alpha1/types.py

@@ -1,6 +1,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # If you have any remark or suggestion do not hesitate to open an issue.
 from .types import AlertState
+from .types import AlertStatus
 from .types import DataSourceOrigin
 from .types import DataSourceType
 from .types import GrafanaUserRole
@@ -78,6 +79,7 @@
 
 __all__ = [
     "AlertState",
+    "AlertStatus",
     "DataSourceOrigin",
     "DataSourceType",
     "GrafanaUserRole",

scaleway-async/scaleway_async/cockpit/v1/__init__.py

@@ -13,6 +13,7 @@
 )
 from .types import (
     AlertState,
+    AlertStatus,
     DataSourceOrigin,
     DataSourceType,
     GrafanaUserRole,
@@ -1473,7 +1474,7 @@ async def list_alerts(
         *,
         region: Optional[ScwRegion] = None,
         project_id: Optional[str] = None,
-        is_enabled: Optional[bool] = None,
+        rule_status: Optional[AlertStatus] = None,
         is_preconfigured: Optional[bool] = None,
         state: Optional[AlertState] = None,
         data_source_id: Optional[str] = None,
@@ -1483,7 +1484,7 @@ async def list_alerts(
         List preconfigured and/or custom alerts for the specified Project and data source.
         :param region: Region to target. If none is passed will use default region from the config.
         :param project_id: Project ID to filter for, only alerts from this Project will be returned.
-        :param is_enabled: True returns only enabled alerts. False returns only disabled alerts. If omitted, no alert filtering is applied. Other filters may still apply.
+        :param rule_status: Returns only alerts with the given activation status. If omitted, no alert filtering is applied. Other filters may still apply.
         :param is_preconfigured: True returns only preconfigured alerts. False returns only custom alerts. If omitted, no filtering is applied on alert types. Other filters may still apply.
         :param state: Valid values to filter on are `inactive`, `pending` and `firing`. If omitted, no filtering is applied on alert states. Other filters may still apply.
         :param data_source_id: If omitted, only alerts from the default Scaleway metrics data source will be listed.
@@ -1504,9 +1505,9 @@ async def list_alerts(
             f"/cockpit/v1/regions/{param_region}/alerts",
             params={
                 "data_source_id": data_source_id,
-                "is_enabled": is_enabled,
                 "is_preconfigured": is_preconfigured,
                 "project_id": project_id or self.client.default_project_id,
+                "rule_status": rule_status,
                 "state": state,
             },
         )

scaleway-async/scaleway_async/cockpit/v1/api.py

@@ -559,9 +559,9 @@ def unmarshal_Alert(data: Any) -> Alert:
     if field is not None:
         args["duration"] = field
 
-    field = data.get("enabled", None)
+    field = data.get("rule_status", None)
     if field is not None:
-        args["enabled"] = field
+        args["rule_status"] = field
 
     field = data.get("annotations", None)
     if field is not None: