Skip to content

Commit 647e29f

Browse files
authored
feat: handle non-existing fields (#215)
1 parent 87b8104 commit 647e29f

File tree

54 files changed

+4728
-4298
lines changed

Some content is hidden

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

54 files changed

+4728
-4298
lines changed

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

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

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

24-
field = data.get("created_at")
24+
field = data.get("created_at", None)
2525
args["created_at"] = parser.isoparse(field) if type(field) is str else field
2626

27-
field = data.get("description")
27+
field = data.get("description", None)
2828
args["description"] = field
2929

30-
field = data.get("id")
30+
field = data.get("id", None)
3131
args["id"] = field
3232

33-
field = data.get("name")
33+
field = data.get("name", None)
3434
args["name"] = field
3535

36-
field = data.get("organization_id")
36+
field = data.get("organization_id", None)
3737
args["organization_id"] = field
3838

39-
field = data.get("updated_at")
39+
field = data.get("updated_at", None)
4040
args["updated_at"] = parser.isoparse(field) if type(field) is str else field
4141

4242
return Project(**args)
@@ -50,10 +50,12 @@ def unmarshal_ListProjectsResponse(data: Any) -> ListProjectsResponse:
5050

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

53-
field = data.get("projects")
54-
args["projects"] = [unmarshal_Project(v) for v in data["projects"]]
53+
field = data.get("projects", None)
54+
args["projects"] = (
55+
[unmarshal_Project(v) for v in field] if field is not None else None
56+
)
5557

56-
field = data.get("total_count")
58+
field = data.get("total_count", None)
5759
args["total_count"] = field
5860

5961
return ListProjectsResponse(**args)

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

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ def unmarshal_ServerTypeCPU(data: Any) -> ServerTypeCPU:
2828

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

31-
field = data.get("core_count")
31+
field = data.get("core_count", None)
3232
args["core_count"] = field
3333

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

3737
return ServerTypeCPU(**args)
@@ -45,10 +45,10 @@ def unmarshal_ServerTypeDisk(data: Any) -> ServerTypeDisk:
4545

4646
args: Dict[str, Any] = {}
4747

48-
field = data.get("capacity")
48+
field = data.get("capacity", None)
4949
args["capacity"] = field
5050

51-
field = data.get("type_")
51+
field = data.get("type_", None)
5252
args["type_"] = field
5353

5454
return ServerTypeDisk(**args)
@@ -62,10 +62,10 @@ def unmarshal_ServerTypeMemory(data: Any) -> ServerTypeMemory:
6262

6363
args: Dict[str, Any] = {}
6464

65-
field = data.get("capacity")
65+
field = data.get("capacity", None)
6666
args["capacity"] = field
6767

68-
field = data.get("type_")
68+
field = data.get("type_", None)
6969
args["type_"] = field
7070

7171
return ServerTypeMemory(**args)
@@ -79,19 +79,19 @@ def unmarshal_OS(data: Any) -> OS:
7979

8080
args: Dict[str, Any] = {}
8181

82-
field = data.get("compatible_server_types")
82+
field = data.get("compatible_server_types", None)
8383
args["compatible_server_types"] = field
8484

85-
field = data.get("id")
85+
field = data.get("id", None)
8686
args["id"] = field
8787

88-
field = data.get("image_url")
88+
field = data.get("image_url", None)
8989
args["image_url"] = field
9090

91-
field = data.get("label")
91+
field = data.get("label", None)
9292
args["label"] = field
9393

94-
field = data.get("name")
94+
field = data.get("name", None)
9595
args["name"] = field
9696

9797
return OS(**args)
@@ -105,40 +105,40 @@ def unmarshal_Server(data: Any) -> Server:
105105

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

108-
field = data.get("created_at")
108+
field = data.get("created_at", None)
109109
args["created_at"] = parser.isoparse(field) if type(field) is str else field
110110

111-
field = data.get("deletable_at")
111+
field = data.get("deletable_at", None)
112112
args["deletable_at"] = parser.isoparse(field) if type(field) is str else field
113113

114-
field = data.get("id")
114+
field = data.get("id", None)
115115
args["id"] = field
116116

117-
field = data.get("ip")
117+
field = data.get("ip", None)
118118
args["ip"] = field
119119

120-
field = data.get("name")
120+
field = data.get("name", None)
121121
args["name"] = field
122122

123-
field = data.get("organization_id")
123+
field = data.get("organization_id", None)
124124
args["organization_id"] = field
125125

126-
field = data.get("project_id")
126+
field = data.get("project_id", None)
127127
args["project_id"] = field
128128

129-
field = data.get("status")
129+
field = data.get("status", None)
130130
args["status"] = field
131131

132-
field = data.get("type_")
132+
field = data.get("type_", None)
133133
args["type_"] = field
134134

135-
field = data.get("updated_at")
135+
field = data.get("updated_at", None)
136136
args["updated_at"] = parser.isoparse(field) if type(field) is str else field
137137

138-
field = data.get("vnc_url")
138+
field = data.get("vnc_url", None)
139139
args["vnc_url"] = field
140140

141-
field = data.get("zone")
141+
field = data.get("zone", None)
142142
args["zone"] = field
143143

144144
return Server(**args)
@@ -152,22 +152,22 @@ def unmarshal_ServerType(data: Any) -> ServerType:
152152

153153
args: Dict[str, Any] = {}
154154

155-
field = data.get("cpu")
155+
field = data.get("cpu", None)
156156
args["cpu"] = unmarshal_ServerTypeCPU(field) if field is not None else None
157157

158-
field = data.get("disk")
158+
field = data.get("disk", None)
159159
args["disk"] = unmarshal_ServerTypeDisk(field) if field is not None else None
160160

161-
field = data.get("memory")
161+
field = data.get("memory", None)
162162
args["memory"] = unmarshal_ServerTypeMemory(field) if field is not None else None
163163

164-
field = data.get("minimum_lease_duration")
164+
field = data.get("minimum_lease_duration", None)
165165
args["minimum_lease_duration"] = field
166166

167-
field = data.get("name")
167+
field = data.get("name", None)
168168
args["name"] = field
169169

170-
field = data.get("stock")
170+
field = data.get("stock", None)
171171
args["stock"] = field
172172

173173
return ServerType(**args)
@@ -181,10 +181,10 @@ def unmarshal_ListOSResponse(data: Any) -> ListOSResponse:
181181

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

184-
field = data.get("os")
185-
args["os"] = [unmarshal_OS(v) for v in data["os"]]
184+
field = data.get("os", None)
185+
args["os"] = [unmarshal_OS(v) for v in field] if field is not None else None
186186

187-
field = data.get("total_count")
187+
field = data.get("total_count", None)
188188
args["total_count"] = field
189189

190190
return ListOSResponse(**args)
@@ -198,8 +198,10 @@ def unmarshal_ListServerTypesResponse(data: Any) -> ListServerTypesResponse:
198198

199199
args: Dict[str, Any] = {}
200200

201-
field = data.get("server_types")
202-
args["server_types"] = [unmarshal_ServerType(v) for v in data["server_types"]]
201+
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+
)
203205

204206
return ListServerTypesResponse(**args)
205207

@@ -212,10 +214,12 @@ def unmarshal_ListServersResponse(data: Any) -> ListServersResponse:
212214

213215
args: Dict[str, Any] = {}
214216

215-
field = data.get("servers")
216-
args["servers"] = [unmarshal_Server(v) for v in data["servers"]]
217+
field = data.get("servers", None)
218+
args["servers"] = (
219+
[unmarshal_Server(v) for v in field] if field is not None else None
220+
)
217221

218-
field = data.get("total_count")
222+
field = data.get("total_count", None)
219223
args["total_count"] = field
220224

221225
return ListServersResponse(**args)

0 commit comments

Comments
 (0)