Skip to content

Commit 4f36865

Browse files
quantumsheepquantumsheep
committed
fix: marshalling if
1 parent c94dbdf commit 4f36865

File tree

70 files changed

+13238
-7002
lines changed

Some content is hidden

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

70 files changed

+13238
-7002
lines changed

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,28 @@ def unmarshal_Project(data: Any) -> Project:
2222
args: Dict[str, Any] = {}
2323

2424
field = data.get("id", None)
25-
args["id"] = field
25+
if field is not None:
26+
args["id"] = field
2627

2728
field = data.get("name", None)
28-
args["name"] = field
29+
if field is not None:
30+
args["name"] = field
2931

3032
field = data.get("organization_id", None)
31-
args["organization_id"] = field
33+
if field is not None:
34+
args["organization_id"] = field
3235

3336
field = data.get("description", None)
34-
args["description"] = field
37+
if field is not None:
38+
args["description"] = field
3539

3640
field = data.get("created_at", None)
37-
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
41+
if field is not None:
42+
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
3843

3944
field = data.get("updated_at", None)
40-
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
45+
if field is not None:
46+
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
4147

4248
return Project(**args)
4349

@@ -51,12 +57,14 @@ def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
5157
args: Dict[str, Any] = {}
5258

5359
field = data.get("total_count", None)
54-
args["total_count"] = field
60+
if field is not None:
61+
args["total_count"] = field
5562

5663
field = data.get("projects", None)
57-
args["projects"] = (
58-
[unmarshal_Project(v) for v in field] if field is not None else None
59-
)
64+
if field is not None:
65+
args["projects"] = (
66+
[unmarshal_Project(v) for v in field] if field is not None else None
67+
)
6068

6169
return ListProjectsResponse(**args)
6270

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,28 @@ def unmarshal_Project(data: Any) -> Project:
2222
args: Dict[str, Any] = {}
2323

2424
field = data.get("id", None)
25-
args["id"] = field
25+
if field is not None:
26+
args["id"] = field
2627

2728
field = data.get("name", None)
28-
args["name"] = field
29+
if field is not None:
30+
args["name"] = field
2931

3032
field = data.get("organization_id", None)
31-
args["organization_id"] = field
33+
if field is not None:
34+
args["organization_id"] = field
3235

3336
field = data.get("description", None)
34-
args["description"] = field
37+
if field is not None:
38+
args["description"] = field
3539

3640
field = data.get("created_at", None)
37-
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
41+
if field is not None:
42+
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
3843

3944
field = data.get("updated_at", None)
40-
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
45+
if field is not None:
46+
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
4147

4248
return Project(**args)
4349

@@ -51,12 +57,14 @@ def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
5157
args: Dict[str, Any] = {}
5258

5359
field = data.get("total_count", None)
54-
args["total_count"] = field
60+
if field is not None:
61+
args["total_count"] = field
5562

5663
field = data.get("projects", None)
57-
args["projects"] = (
58-
[unmarshal_Project(v) for v in field] if field is not None else None
59-
)
64+
if field is not None:
65+
args["projects"] = (
66+
[unmarshal_Project(v) for v in field] if field is not None else None
67+
)
6068

6169
return ListProjectsResponse(**args)
6270

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

Lines changed: 74 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,24 @@ def unmarshal_OS(data: Any) -> OS:
2929
args: Dict[str, Any] = {}
3030

3131
field = data.get("id", None)
32-
args["id"] = field
32+
if field is not None:
33+
args["id"] = field
3334

3435
field = data.get("name", None)
35-
args["name"] = field
36+
if field is not None:
37+
args["name"] = field
3638

3739
field = data.get("label", None)
38-
args["label"] = field
40+
if field is not None:
41+
args["label"] = field
3942

4043
field = data.get("image_url", None)
41-
args["image_url"] = field
44+
if field is not None:
45+
args["image_url"] = field
4246

4347
field = data.get("compatible_server_types", None)
44-
args["compatible_server_types"] = field
48+
if field is not None:
49+
args["compatible_server_types"] = field
4550

4651
return OS(**args)
4752

@@ -55,10 +60,12 @@ def unmarshal_ServerTypeCPU(data: Any) -> ServerTypeCPU:
5560
args: Dict[str, Any] = {}
5661

5762
field = data.get("name", None)
58-
args["name"] = field
63+
if field is not None:
64+
args["name"] = field
5965

6066
field = data.get("core_count", None)
61-
args["core_count"] = field
67+
if field is not None:
68+
args["core_count"] = field
6269

6370
return ServerTypeCPU(**args)
6471

@@ -72,10 +79,12 @@ def unmarshal_ServerTypeDisk(data: Any) -> ServerTypeDisk:
7279
args: Dict[str, Any] = {}
7380

7481
field = data.get("capacity", None)
75-
args["capacity"] = field
82+
if field is not None:
83+
args["capacity"] = field
7684

7785
field = data.get("type_", None)
78-
args["type_"] = field
86+
if field is not None:
87+
args["type_"] = field
7988

8089
return ServerTypeDisk(**args)
8190

@@ -89,10 +98,12 @@ def unmarshal_ServerTypeMemory(data: Any) -> ServerTypeMemory:
8998
args: Dict[str, Any] = {}
9099

91100
field = data.get("capacity", None)
92-
args["capacity"] = field
101+
if field is not None:
102+
args["capacity"] = field
93103

94104
field = data.get("type_", None)
95-
args["type_"] = field
105+
if field is not None:
106+
args["type_"] = field
96107

97108
return ServerTypeMemory(**args)
98109

@@ -106,22 +117,28 @@ def unmarshal_ServerType(data: Any) -> ServerType:
106117
args: Dict[str, Any] = {}
107118

108119
field = data.get("name", None)
109-
args["name"] = field
120+
if field is not None:
121+
args["name"] = field
110122

111123
field = data.get("stock", None)
112-
args["stock"] = field
124+
if field is not None:
125+
args["stock"] = field
113126

114127
field = data.get("cpu", None)
115-
args["cpu"] = unmarshal_ServerTypeCPU(field)
128+
if field is not None:
129+
args["cpu"] = unmarshal_ServerTypeCPU(field)
116130

117131
field = data.get("disk", None)
118-
args["disk"] = unmarshal_ServerTypeDisk(field)
132+
if field is not None:
133+
args["disk"] = unmarshal_ServerTypeDisk(field)
119134

120135
field = data.get("memory", None)
121-
args["memory"] = unmarshal_ServerTypeMemory(field)
136+
if field is not None:
137+
args["memory"] = unmarshal_ServerTypeMemory(field)
122138

123139
field = data.get("minimum_lease_duration", None)
124-
args["minimum_lease_duration"] = field
140+
if field is not None:
141+
args["minimum_lease_duration"] = field
125142

126143
return ServerType(**args)
127144

@@ -135,40 +152,54 @@ def unmarshal_Server(data: Any) -> Server:
135152
args: Dict[str, Any] = {}
136153

137154
field = data.get("id", None)
138-
args["id"] = field
155+
if field is not None:
156+
args["id"] = field
139157

140158
field = data.get("type_", None)
141-
args["type_"] = field
159+
if field is not None:
160+
args["type_"] = field
142161

143162
field = data.get("name", None)
144-
args["name"] = field
163+
if field is not None:
164+
args["name"] = field
145165

146166
field = data.get("project_id", None)
147-
args["project_id"] = field
167+
if field is not None:
168+
args["project_id"] = field
148169

149170
field = data.get("organization_id", None)
150-
args["organization_id"] = field
171+
if field is not None:
172+
args["organization_id"] = field
151173

152174
field = data.get("ip", None)
153-
args["ip"] = field
175+
if field is not None:
176+
args["ip"] = field
154177

155178
field = data.get("vnc_url", None)
156-
args["vnc_url"] = field
179+
if field is not None:
180+
args["vnc_url"] = field
157181

158182
field = data.get("status", None)
159-
args["status"] = field
183+
if field is not None:
184+
args["status"] = field
160185

161186
field = data.get("zone", None)
162-
args["zone"] = field
187+
if field is not None:
188+
args["zone"] = field
163189

164190
field = data.get("created_at", None)
165-
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
191+
if field is not None:
192+
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
166193

167194
field = data.get("updated_at", None)
168-
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
195+
if field is not None:
196+
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
169197

170198
field = data.get("deletable_at", None)
171-
args["deletable_at"] = parser.isoparse(field) if isinstance(field, str) else field
199+
if field is not None:
200+
args["deletable_at"] = (
201+
parser.isoparse(field) if isinstance(field, str) else field
202+
)
172203

173204
return Server(**args)
174205

@@ -182,10 +213,12 @@ def unmarshal_ListOSResponse(data: Any) -> ListOSResponse:
182213
args: Dict[str, Any] = {}
183214

184215
field = data.get("total_count", None)
185-
args["total_count"] = field
216+
if field is not None:
217+
args["total_count"] = field
186218

187219
field = data.get("os", None)
188-
args["os"] = [unmarshal_OS(v) for v in field] if field is not None else None
220+
if field is not None:
221+
args["os"] = [unmarshal_OS(v) for v in field] if field is not None else None
189222

190223
return ListOSResponse(**args)
191224

@@ -199,9 +232,10 @@ def unmarshal_ListServerTypesResponse(data: Any) -> ListServerTypesResponse:
199232
args: Dict[str, Any] = {}
200233

201234
field = data.get("server_types", None)
202-
args["server_types"] = (
203-
[unmarshal_ServerType(v) for v in field] if field is not None else None
204-
)
235+
if field is not None:
236+
args["server_types"] = (
237+
[unmarshal_ServerType(v) for v in field] if field is not None else None
238+
)
205239

206240
return ListServerTypesResponse(**args)
207241

@@ -215,12 +249,14 @@ def unmarshal_ListServersResponse(data: Any) -> ListServersResponse:
215249
args: Dict[str, Any] = {}
216250

217251
field = data.get("total_count", None)
218-
args["total_count"] = field
252+
if field is not None:
253+
args["total_count"] = field
219254

220255
field = data.get("servers", None)
221-
args["servers"] = (
222-
[unmarshal_Server(v) for v in field] if field is not None else None
223-
)
256+
if field is not None:
257+
args["servers"] = (
258+
[unmarshal_Server(v) for v in field] if field is not None else None
259+
)
224260

225261
return ListServersResponse(**args)
226262

0 commit comments

Comments
 (0)