Skip to content

Commit a56aa35

Browse files
quantumsheepquantumsheep
committed
feat: change fields sorting
1 parent 8a38c56 commit a56aa35

File tree

218 files changed

+43956
-22372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+43956
-22372
lines changed

‎scaleway-async/scaleway_async/account/v2/marshalling.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ def unmarshal_Project(data: Any) -> Project:
2121

2222
args: Dict[str, Any] = {}
2323

24-
field = data.get("description", None)
25-
args["description"] = field
26-
27-
field = data.get("organization_id", None)
28-
args["organization_id"] = field
24+
field = data.get("id", None)
25+
args["id"] = field
2926

3027
field = data.get("name", None)
3128
args["name"] = field
3229

33-
field = data.get("id", None)
34-
args["id"] = field
30+
field = data.get("organization_id", None)
31+
args["organization_id"] = field
32+
33+
field = data.get("description", None)
34+
args["description"] = field
3535

3636
field = data.get("created_at", None)
3737
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -50,14 +50,14 @@ def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
5050

5151
args: Dict[str, Any] = {}
5252

53+
field = data.get("total_count", None)
54+
args["total_count"] = field
55+
5356
field = data.get("projects", None)
5457
args["projects"] = (
5558
[unmarshal_Project(v) for v in field] if field is not None else None
5659
)
5760

58-
field = data.get("total_count", None)
59-
args["total_count"] = field
60-
6161
return ListProjectsResponse(**args)
6262

6363

‎scaleway-async/scaleway_async/account/v2/types.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ def __str__(self) -> str:
2424

2525
@dataclass
2626
class Project:
27-
description: str
27+
id: str
2828
"""
29-
Description of the Project.
29+
ID of the Project.
3030
"""
3131

32-
organization_id: str
32+
name: str
3333
"""
34-
Organization ID of the Project.
34+
Name of the Project.
3535
"""
3636

37-
name: str
37+
organization_id: str
3838
"""
39-
Name of the Project.
39+
Organization ID of the Project.
4040
"""
4141

42-
id: str
42+
description: str
4343
"""
44-
ID of the Project.
44+
Description of the Project.
4545
"""
4646

4747
created_at: Optional[datetime]
@@ -124,14 +124,14 @@ class ListProjectsRequest:
124124

125125
@dataclass
126126
class ListProjectsResponse:
127-
projects: List[Project]
127+
total_count: int
128128
"""
129-
Paginated returned Projects.
129+
Total number of Projects.
130130
"""
131131

132-
total_count: int
132+
projects: List[Project]
133133
"""
134-
Total number of Projects.
134+
Paginated returned Projects.
135135
"""
136136

137137

‎scaleway-async/scaleway_async/account/v3/marshalling.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ def unmarshal_Project(data: Any) -> Project:
2121

2222
args: Dict[str, Any] = {}
2323

24-
field = data.get("description", None)
25-
args["description"] = field
26-
27-
field = data.get("organization_id", None)
28-
args["organization_id"] = field
24+
field = data.get("id", None)
25+
args["id"] = field
2926

3027
field = data.get("name", None)
3128
args["name"] = field
3229

33-
field = data.get("id", None)
34-
args["id"] = field
30+
field = data.get("organization_id", None)
31+
args["organization_id"] = field
32+
33+
field = data.get("description", None)
34+
args["description"] = field
3535

3636
field = data.get("created_at", None)
3737
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -50,14 +50,14 @@ def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
5050

5151
args: Dict[str, Any] = {}
5252

53+
field = data.get("total_count", None)
54+
args["total_count"] = field
55+
5356
field = data.get("projects", None)
5457
args["projects"] = (
5558
[unmarshal_Project(v) for v in field] if field is not None else None
5659
)
5760

58-
field = data.get("total_count", None)
59-
args["total_count"] = field
60-
6161
return ListProjectsResponse(**args)
6262

6363

‎scaleway-async/scaleway_async/account/v3/types.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ def __str__(self) -> str:
2424

2525
@dataclass
2626
class Project:
27-
description: str
27+
id: str
2828
"""
29-
Description of the Project.
29+
ID of the Project.
3030
"""
3131

32-
organization_id: str
32+
name: str
3333
"""
34-
Organization ID of the Project.
34+
Name of the Project.
3535
"""
3636

37-
name: str
37+
organization_id: str
3838
"""
39-
Name of the Project.
39+
Organization ID of the Project.
4040
"""
4141

42-
id: str
42+
description: str
4343
"""
44-
ID of the Project.
44+
Description of the Project.
4545
"""
4646

4747
created_at: Optional[datetime]
@@ -57,14 +57,14 @@ class Project:
5757

5858
@dataclass
5959
class ListProjectsResponse:
60-
projects: List[Project]
60+
total_count: int
6161
"""
62-
Paginated returned Projects.
62+
Total number of Projects.
6363
"""
6464

65-
total_count: int
65+
projects: List[Project]
6666
"""
67-
Total number of Projects.
67+
Paginated returned Projects.
6868
"""
6969

7070

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

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ def unmarshal_OS(data: Any) -> OS:
2828

2929
args: Dict[str, Any] = {}
3030

31-
field = data.get("compatible_server_types", None)
32-
args["compatible_server_types"] = field
31+
field = data.get("id", None)
32+
args["id"] = field
3333

34-
field = data.get("image_url", None)
35-
args["image_url"] = field
34+
field = data.get("name", None)
35+
args["name"] = field
3636

3737
field = data.get("label", None)
3838
args["label"] = field
3939

40-
field = data.get("name", None)
41-
args["name"] = field
40+
field = data.get("image_url", None)
41+
args["image_url"] = field
4242

43-
field = data.get("id", None)
44-
args["id"] = field
43+
field = data.get("compatible_server_types", None)
44+
args["compatible_server_types"] = field
4545

4646
return OS(**args)
4747

@@ -54,12 +54,12 @@ def unmarshal_ServerTypeCPU(data: Any) -> ServerTypeCPU:
5454

5555
args: Dict[str, Any] = {}
5656

57-
field = data.get("core_count", None)
58-
args["core_count"] = field
59-
6057
field = data.get("name", None)
6158
args["name"] = field
6259

60+
field = data.get("core_count", None)
61+
args["core_count"] = field
62+
6363
return ServerTypeCPU(**args)
6464

6565

@@ -71,12 +71,12 @@ def unmarshal_ServerTypeDisk(data: Any) -> ServerTypeDisk:
7171

7272
args: Dict[str, Any] = {}
7373

74-
field = data.get("type_", None)
75-
args["type_"] = field
76-
7774
field = data.get("capacity", None)
7875
args["capacity"] = field
7976

77+
field = data.get("type_", None)
78+
args["type_"] = field
79+
8080
return ServerTypeDisk(**args)
8181

8282

@@ -88,12 +88,12 @@ def unmarshal_ServerTypeMemory(data: Any) -> ServerTypeMemory:
8888

8989
args: Dict[str, Any] = {}
9090

91-
field = data.get("type_", None)
92-
args["type_"] = field
93-
9491
field = data.get("capacity", None)
9592
args["capacity"] = field
9693

94+
field = data.get("type_", None)
95+
args["type_"] = field
96+
9797
return ServerTypeMemory(**args)
9898

9999

@@ -105,20 +105,20 @@ def unmarshal_ServerType(data: Any) -> ServerType:
105105

106106
args: Dict[str, Any] = {}
107107

108-
field = data.get("stock", None)
109-
args["stock"] = field
108+
field = data.get("cpu", None)
109+
args["cpu"] = unmarshal_ServerTypeCPU(field)
110110

111-
field = data.get("memory", None)
112-
args["memory"] = unmarshal_ServerTypeMemory(field)
111+
field = data.get("disk", None)
112+
args["disk"] = unmarshal_ServerTypeDisk(field)
113113

114114
field = data.get("name", None)
115115
args["name"] = field
116116

117-
field = data.get("disk", None)
118-
args["disk"] = unmarshal_ServerTypeDisk(field)
117+
field = data.get("memory", None)
118+
args["memory"] = unmarshal_ServerTypeMemory(field)
119119

120-
field = data.get("cpu", None)
121-
args["cpu"] = unmarshal_ServerTypeCPU(field)
120+
field = data.get("stock", None)
121+
args["stock"] = field
122122

123123
field = data.get("minimum_lease_duration", None)
124124
args["minimum_lease_duration"] = field
@@ -134,32 +134,32 @@ def unmarshal_Server(data: Any) -> Server:
134134

135135
args: Dict[str, Any] = {}
136136

137-
field = data.get("zone", None)
138-
args["zone"] = field
137+
field = data.get("id", None)
138+
args["id"] = field
139139

140-
field = data.get("status", None)
141-
args["status"] = field
140+
field = data.get("type_", None)
141+
args["type_"] = field
142142

143-
field = data.get("vnc_url", None)
144-
args["vnc_url"] = field
143+
field = data.get("name", None)
144+
args["name"] = field
145145

146-
field = data.get("ip", None)
147-
args["ip"] = field
146+
field = data.get("project_id", None)
147+
args["project_id"] = field
148148

149149
field = data.get("organization_id", None)
150150
args["organization_id"] = field
151151

152-
field = data.get("project_id", None)
153-
args["project_id"] = field
152+
field = data.get("ip", None)
153+
args["ip"] = field
154154

155-
field = data.get("name", None)
156-
args["name"] = field
155+
field = data.get("vnc_url", None)
156+
args["vnc_url"] = field
157157

158-
field = data.get("type_", None)
159-
args["type_"] = field
158+
field = data.get("status", None)
159+
args["status"] = field
160160

161-
field = data.get("id", None)
162-
args["id"] = field
161+
field = data.get("zone", None)
162+
args["zone"] = field
163163

164164
field = data.get("created_at", None)
165165
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -181,12 +181,12 @@ def unmarshal_ListOSResponse(data: Any) -> ListOSResponse:
181181

182182
args: Dict[str, Any] = {}
183183

184-
field = data.get("os", None)
185-
args["os"] = [unmarshal_OS(v) for v in field] if field is not None else None
186-
187184
field = data.get("total_count", None)
188185
args["total_count"] = field
189186

187+
field = data.get("os", None)
188+
args["os"] = [unmarshal_OS(v) for v in field] if field is not None else None
189+
190190
return ListOSResponse(**args)
191191

192192

@@ -214,14 +214,14 @@ def unmarshal_ListServersResponse(data: Any) -> ListServersResponse:
214214

215215
args: Dict[str, Any] = {}
216216

217+
field = data.get("total_count", None)
218+
args["total_count"] = field
219+
217220
field = data.get("servers", None)
218221
args["servers"] = (
219222
[unmarshal_Server(v) for v in field] if field is not None else None
220223
)
221224

222-
field = data.get("total_count", None)
223-
args["total_count"] = field
224-
225225
return ListServersResponse(**args)
226226

227227

0 commit comments

Comments
 (0)