feat: v2

feat: remove instance utils

regen

Signed-off-by: Nathanael DEMACON <quantumsheep@users.noreply.github.com>

Author: quantumsheep

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         env:
           POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
       - name: Wait for package to be available
-        run: sleep 10
+        run: sleep 60
 
   release:
     needs:

docs/poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scaleway-docs"
-version = "1.0.0"
+version = "2.0.0"
 description = ""
 authors = ["Scaleway <opensource@scaleway.com>"]
 license = "BSD"

docs/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scaleway-async"
-version = "0.0.1"
+version = "2.0.0"
 description = "Scaleway SDK for Python"
 authors = ["Scaleway <opensource@scaleway.com>"]
 license = "BSD"
@@ -24,7 +24,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-scaleway-core = "^1"
+scaleway-core = "*"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }

scaleway-async/poetry.lock

@@ -1,13 +1,23 @@
 # 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 ListProjectsRequestOrderBy
-from .types import ListProjectsResponse
 from .types import Project
+from .types import CreateProjectRequest
+from .types import DeleteProjectRequest
+from .types import GetProjectRequest
+from .types import ListProjectsRequest
+from .types import ListProjectsResponse
+from .types import UpdateProjectRequest
 from .api import AccountV2API
 
 __all__ = [
     "ListProjectsRequestOrderBy",
-    "ListProjectsResponse",
     "Project",
+    "CreateProjectRequest",
+    "DeleteProjectRequest",
+    "GetProjectRequest",
+    "ListProjectsRequest",
+    "ListProjectsResponse",
+    "UpdateProjectRequest",
     "AccountV2API",
 ]

scaleway-async/pyproject.toml

@@ -5,30 +5,27 @@
 
 from scaleway_core.api import API
 from scaleway_core.utils import (
-    fetch_all_pages_async,
     random_name,
     validate_path_param,
+    fetch_all_pages_async,
 )
 from .types import (
     ListProjectsRequestOrderBy,
+    CreateProjectRequest,
     ListProjectsResponse,
     Project,
-    CreateProjectRequest,
     UpdateProjectRequest,
 )
 from .marshalling import (
-    marshal_CreateProjectRequest,
-    marshal_UpdateProjectRequest,
     unmarshal_Project,
     unmarshal_ListProjectsResponse,
+    marshal_CreateProjectRequest,
+    marshal_UpdateProjectRequest,
 )
 
 
 class AccountV2API(API):
     """
-    Account API.
-
-    User related data.
     This API allows you to manage projects.
     """
 
@@ -57,7 +54,7 @@ async def create_project(
 
         res = self._request(
             "POST",
-            f"/account/v2/projects",
+            "/account/v2/projects",
             body=marshal_CreateProjectRequest(
                 CreateProjectRequest(
                     name=name or random_name(prefix="proj"),
@@ -78,7 +75,7 @@ async def list_projects(
         name: Optional[str] = None,
         page: Optional[int] = None,
         page_size: Optional[int] = None,
-        order_by: ListProjectsRequestOrderBy = ListProjectsRequestOrderBy.CREATED_AT_ASC,
+        order_by: Optional[ListProjectsRequestOrderBy] = None,
         project_ids: Optional[List[str]] = None,
     ) -> ListProjectsResponse:
         """
@@ -102,7 +99,7 @@ async def list_projects(
 
         res = self._request(
             "GET",
-            f"/account/v2/projects",
+            "/account/v2/projects",
             params={
                 "name": name,
                 "order_by": order_by,
@@ -137,7 +134,7 @@ async def list_projects_all(
         :param page_size: Maximum number of Project per page.
         :param order_by: Sort order of the returned Projects.
         :param project_ids: Project IDs to filter for. The results will be limited to any Projects with an ID in this array.
-        :return: :class:`List[ListProjectsResponse] <List[ListProjectsResponse]>`
+        :return: :class:`List[Project] <List[Project]>`
         :deprecated
 
         Usage:
@@ -195,7 +192,7 @@ async def delete_project(
         self,
         *,
         project_id: Optional[str] = None,
-    ) -> Optional[None]:
+    ) -> None:
         """
         Delete an existing Project.
         Deprecated in favor of Account API v3.
@@ -219,7 +216,6 @@ async def delete_project(
         )
 
         self._throw_on_error(res)
-        return None
 
     async def update_project(
         self,

scaleway-async/scaleway_async/account/v2/__init__.py

@@ -2,61 +2,69 @@
 # If you have any remark or suggestion do not hesitate to open an issue.
 
 from typing import Any, Dict
+from dateutil import parser
 
 from scaleway_core.profile import ProfileDefaults
-from dateutil import parser
 from .types import (
-    ListProjectsResponse,
     Project,
+    ListProjectsResponse,
     CreateProjectRequest,
     UpdateProjectRequest,
 )
 
 
 def unmarshal_Project(data: Any) -> Project:
-    if type(data) is not dict:
+    if not isinstance(data, dict):
         raise TypeError(
-            f"Unmarshalling the type 'Project' failed as data isn't a dictionary."
+            "Unmarshalling the type 'Project' failed as data isn't a dictionary."
         )
 
     args: Dict[str, Any] = {}
 
-    field = data.get("created_at", None)
-    args["created_at"] = parser.isoparse(field) if type(field) is str else field
-
-    field = data.get("description", None)
-    args["description"] = field
-
     field = data.get("id", None)
-    args["id"] = field
+    if field is not None:
+        args["id"] = field
 
     field = data.get("name", None)
-    args["name"] = field
+    if field is not None:
+        args["name"] = field
 
     field = data.get("organization_id", None)
-    args["organization_id"] = field
+    if field is not None:
+        args["organization_id"] = field
+
+    field = data.get("description", None)
+    if field is not None:
+        args["description"] = field
+
+    field = data.get("created_at", None)
+    if field is not None:
+        args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
 
     field = data.get("updated_at", None)
-    args["updated_at"] = parser.isoparse(field) if type(field) is str else field
+    if field is not None:
+        args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
 
     return Project(**args)
 
 
 def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
-    if type(data) is not dict:
+    if not isinstance(data, dict):
         raise TypeError(
-            f"Unmarshalling the type 'ListProjectsResponse' failed as data isn't a dictionary."
+            "Unmarshalling the type 'ListProjectsResponse' failed as data isn't a dictionary."
         )
 
     args: Dict[str, Any] = {}
 
-    field = data.get("projects", None)
-    args["projects"] = (
-        [unmarshal_Project(v) for v in field] if field is not None else None
-    )
-
     field = data.get("total_count", None)
-    args["total_count"] = field
+    if field is not None:
+        args["total_count"] = field
+
+    field = data.get("projects", None)
+    if field is not None:
+        args["projects"] = (
+            [unmarshal_Project(v) for v in field] if field is not None else None
+        )
 
     return ListProjectsResponse(**args)
 
@@ -67,9 +75,6 @@ def marshal_CreateProjectRequest(
 ) -> Dict[str, Any]:
     output: Dict[str, Any] = {}
 
-    if request.description is not None:
-        output["description"] = request.description
-
     if request.name is not None:
         output["name"] = request.name
 
@@ -78,6 +83,9 @@ def marshal_CreateProjectRequest(
             request.organization_id or defaults.default_organization_id
         )
 
+    if request.description is not None:
+        output["description"] = request.description
+
     return output
 
 
@@ -87,10 +95,10 @@ def marshal_UpdateProjectRequest(
 ) -> Dict[str, Any]:
     output: Dict[str, Any] = {}
 
-    if request.description is not None:
-        output["description"] = request.description
-
     if request.name is not None:
         output["name"] = request.name
 
+    if request.description is not None:
+        output["description"] = request.description
+
     return output

scaleway-async/scaleway_async/account/v2/api.py

@@ -22,29 +22,8 @@ def __str__(self) -> str:
         return str(self.value)
 
 
-@dataclass
-class ListProjectsResponse:
-    """
-    List projects response.
-    """
-
-    total_count: int
-    """
-    Total number of Projects.
-    """
-
-    projects: List[Project]
-    """
-    Paginated returned Projects.
-    """
-
-
 @dataclass
 class Project:
-    """
-    Project.
-    """
-
     id: str
     """
     ID of the Project.
@@ -60,6 +39,11 @@ class Project:
     Organization ID of the Project.
     """
 
+    description: str
+    """
+    Description of the Project.
+    """
+
     created_at: Optional[datetime]
     """
     Creation date of the Project.
@@ -70,11 +54,6 @@ class Project:
     Update date of the Project.
     """
 
-    description: str
-    """
-    Description of the Project.
-    """
-
 
 @dataclass
 class CreateProjectRequest:
@@ -94,6 +73,22 @@ class CreateProjectRequest:
     """
 
 
+@dataclass
+class DeleteProjectRequest:
+    project_id: Optional[str]
+    """
+    Project ID of the Project.
+    """
+
+
+@dataclass
+class GetProjectRequest:
+    project_id: Optional[str]
+    """
+    Project ID of the Project.
+    """
+
+
 @dataclass
 class ListProjectsRequest:
     organization_id: Optional[str]
@@ -128,18 +123,15 @@ class ListProjectsRequest:
 
 
 @dataclass
-class GetProjectRequest:
-    project_id: Optional[str]
+class ListProjectsResponse:
+    total_count: int
     """
-    Project ID of the Project.
+    Total number of Projects.
     """
 
-
-@dataclass
-class DeleteProjectRequest:
-    project_id: Optional[str]
+    projects: List[Project]
     """
-    Project ID of the Project.
+    Paginated returned Projects.
     """