Skip to content

Commit 24738de

Browse files
committed
Regenerate endpoint params
1 parent 7341ccf commit 24738de

4 files changed

Lines changed: 68 additions & 66 deletions

File tree

tests/test_async_client.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -528,19 +528,21 @@ async def test_async_generated_endpoint_methods_call_request_helpers(self):
528528
get_mock.await_args_list,
529529
[
530530
mock.call("/assembly_notifications/assembly%2Fwith%3Fchars"),
531-
mock.call("/templates/builtin/builtin%2Fwith%3Fchars"),
532-
mock.call("/templates/template%2Fwith%3Fchars/full"),
533-
mock.call("/templates/builtin/builtin%2Ffull%3Fchars/full"),
534-
mock.call("/queues/job_slots"),
535-
mock.call("/template_credentials"),
536-
mock.call("/template_credentials/types"),
537-
mock.call("/template_credentials/cred%2Fwith%3Fchars"),
531+
mock.call("/templates/builtin/builtin%2Fwith%3Fchars", params=None),
532+
mock.call("/templates/template%2Fwith%3Fchars/full", params=None),
533+
mock.call("/templates/builtin/builtin%2Ffull%3Fchars/full", params=None),
534+
mock.call("/queues/job_slots", params=None),
535+
mock.call("/template_credentials", params=None),
536+
mock.call("/template_credentials/types", params=None),
537+
mock.call("/template_credentials/cred%2Fwith%3Fchars", params=None),
538538
],
539539
)
540540
put_mock.assert_awaited_once_with(
541541
"/template_credentials/cred%2Fwith%3Fchars", data=credential_data
542542
)
543-
delete_mock.assert_awaited_once_with("/template_credentials/cred%2Fwith%3Fchars")
543+
delete_mock.assert_awaited_once_with(
544+
"/template_credentials/cred%2Fwith%3Fchars", data=None
545+
)
544546

545547
async def test_async_generated_endpoint_methods_reject_empty_path_ids(self):
546548
client = AsyncTransloadit("key", "secret", service=self.server.base_url)

tests/test_client.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def test_quotes_path_ids(self):
118118
self.assertEqual(
119119
get_mock.call_args_list,
120120
[
121-
mock.call('/assemblies/assembly%2Fwith%3Fchars'),
122-
mock.call('/templates/template%2Fwith%3Fchars'),
121+
mock.call('/assemblies/assembly%2Fwith%3Fchars', params=None),
122+
mock.call('/templates/template%2Fwith%3Fchars', params=None),
123123
],
124124
)
125125

@@ -206,19 +206,19 @@ def test_generated_endpoint_methods_call_request_helpers(self):
206206
get_mock.call_args_list,
207207
[
208208
mock.call("/assembly_notifications/assembly%2Fwith%3Fchars"),
209-
mock.call("/templates/builtin/builtin%2Fwith%3Fchars"),
210-
mock.call("/templates/template%2Fwith%3Fchars/full"),
211-
mock.call("/templates/builtin/builtin%2Ffull%3Fchars/full"),
212-
mock.call("/queues/job_slots"),
213-
mock.call("/template_credentials"),
214-
mock.call("/template_credentials/types"),
215-
mock.call("/template_credentials/cred%2Fwith%3Fchars"),
209+
mock.call("/templates/builtin/builtin%2Fwith%3Fchars", params=None),
210+
mock.call("/templates/template%2Fwith%3Fchars/full", params=None),
211+
mock.call("/templates/builtin/builtin%2Ffull%3Fchars/full", params=None),
212+
mock.call("/queues/job_slots", params=None),
213+
mock.call("/template_credentials", params=None),
214+
mock.call("/template_credentials/types", params=None),
215+
mock.call("/template_credentials/cred%2Fwith%3Fchars", params=None),
216216
],
217217
)
218218
put_mock.assert_called_once_with(
219219
"/template_credentials/cred%2Fwith%3Fchars", data=credential_data
220220
)
221-
delete_mock.assert_called_once_with("/template_credentials/cred%2Fwith%3Fchars")
221+
delete_mock.assert_called_once_with("/template_credentials/cred%2Fwith%3Fchars", data=None)
222222

223223
def test_generated_endpoint_methods_reject_empty_path_ids(self):
224224
methods = [

transloadit/async_client.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ async def list_assemblies(self, params: Optional[dict] = None):
7474
"""
7575
return await self.request.get("/assemblies", params=params)
7676

77-
async def get_assembly(self, assembly_id: str = None, assembly_url: str = None):
77+
async def get_assembly(self, assembly_id: str = None, assembly_url: str = None, params: Optional[dict] = None):
7878
"""
7979
Retrieve an Assembly Status.
8080
"""
8181
if not (assembly_id or assembly_url):
8282
raise ValueError("Either 'assembly_id' or 'assembly_url' cannot be None.")
8383

8484
url = assembly_url if assembly_url else f"/assemblies/{_quote_path_segment(assembly_id)}"
85-
return await self.request.get(url)
85+
return await self.request.get(url, params=params)
8686

8787
async def cancel_assembly(self, assembly_id: str = None, assembly_url: str = None):
8888
"""
@@ -118,11 +118,11 @@ async def list_assembly_notifications(self, assembly_id: str):
118118

119119
return await self.request.get(f"/assembly_notifications/{_quote_path_segment(assembly_id)}")
120120

121-
async def get_bill(self, month: int, year: int):
121+
async def get_bill(self, month: int, year: int, params: Optional[dict] = None):
122122
"""
123123
Retrieve a month’s bill.
124124
"""
125-
return await self.request.get(f"/bill/{year}-{month:02d}")
125+
return await self.request.get(f"/bill/{year}-{month:02d}", params=params)
126126

127127
async def list_templates(self, params: Optional[dict] = None):
128128
"""
@@ -136,37 +136,37 @@ async def create_template(self, data: Optional[dict] = None):
136136
"""
137137
return await self.request.post("/templates", data=data)
138138

139-
async def get_template(self, template_id: str):
139+
async def get_template(self, template_id: str, params: Optional[dict] = None):
140140
"""
141141
Retrieve a Template.
142142
"""
143143
template_id = require_path_id(template_id, "template_id")
144144

145-
return await self.request.get(f"/templates/{_quote_path_segment(template_id)}")
145+
return await self.request.get(f"/templates/{_quote_path_segment(template_id)}", params=params)
146146

147-
async def get_builtin_template(self, builtin_template_slug: str):
147+
async def get_builtin_template(self, builtin_template_slug: str, params: Optional[dict] = None):
148148
"""
149149
Get Builtin Template.
150150
"""
151151
builtin_template_slug = require_path_id(builtin_template_slug, "builtin_template_slug")
152152

153-
return await self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}")
153+
return await self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}", params=params)
154154

155-
async def get_template_full(self, template_id_or_name: str):
155+
async def get_template_full(self, template_id_or_name: str, params: Optional[dict] = None):
156156
"""
157157
Get Template Full.
158158
"""
159159
template_id_or_name = require_path_id(template_id_or_name, "template_id_or_name")
160160

161-
return await self.request.get(f"/templates/{_quote_path_segment(template_id_or_name)}/full")
161+
return await self.request.get(f"/templates/{_quote_path_segment(template_id_or_name)}/full", params=params)
162162

163-
async def get_builtin_template_full(self, builtin_template_slug: str):
163+
async def get_builtin_template_full(self, builtin_template_slug: str, params: Optional[dict] = None):
164164
"""
165165
Get Builtin Template Full.
166166
"""
167167
builtin_template_slug = require_path_id(builtin_template_slug, "builtin_template_slug")
168168

169-
return await self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}/full")
169+
return await self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}/full", params=params)
170170

171171
async def update_template(self, template_id: str, data: Optional[dict] = None):
172172
"""
@@ -176,31 +176,31 @@ async def update_template(self, template_id: str, data: Optional[dict] = None):
176176

177177
return await self.request.put(f"/templates/{_quote_path_segment(template_id)}", data=data)
178178

179-
async def delete_template(self, template_id: str):
179+
async def delete_template(self, template_id: str, data: Optional[dict] = None):
180180
"""
181181
Delete a Template.
182182
"""
183183
template_id = require_path_id(template_id, "template_id")
184184

185-
return await self.request.delete(f"/templates/{_quote_path_segment(template_id)}")
185+
return await self.request.delete(f"/templates/{_quote_path_segment(template_id)}", data=data)
186186

187-
async def list_priority_job_slots(self):
187+
async def list_priority_job_slots(self, params: Optional[dict] = None):
188188
"""
189189
Retrieve currently used priority job slots.
190190
"""
191-
return await self.request.get("/queues/job_slots")
191+
return await self.request.get("/queues/job_slots", params=params)
192192

193-
async def list_template_credentials(self):
193+
async def list_template_credentials(self, params: Optional[dict] = None):
194194
"""
195195
Retrieve list of Template Credentials.
196196
"""
197-
return await self.request.get("/template_credentials")
197+
return await self.request.get("/template_credentials", params=params)
198198

199-
async def list_template_credential_types(self):
199+
async def list_template_credential_types(self, params: Optional[dict] = None):
200200
"""
201201
List Template Credential Types.
202202
"""
203-
return await self.request.get("/template_credentials/types")
203+
return await self.request.get("/template_credentials/types", params=params)
204204

205205
async def validate_template_credential_oauth_on_create(self, data: Optional[dict] = None):
206206
"""
@@ -214,21 +214,21 @@ async def create_template_credentials(self, data: Optional[dict] = None):
214214
"""
215215
return await self.request.post("/template_credentials", data=data)
216216

217-
async def get_template_credentials(self, identifier: str):
217+
async def get_template_credentials(self, identifier: str, params: Optional[dict] = None):
218218
"""
219219
Retrieve a Template Credential.
220220
"""
221221
identifier = require_path_id(identifier, "identifier")
222222

223-
return await self.request.get(f"/template_credentials/{_quote_path_segment(identifier)}")
223+
return await self.request.get(f"/template_credentials/{_quote_path_segment(identifier)}", params=params)
224224

225-
async def delete_template_credentials(self, identifier: str):
225+
async def delete_template_credentials(self, identifier: str, data: Optional[dict] = None):
226226
"""
227227
Delete a Template Credential.
228228
"""
229229
identifier = require_path_id(identifier, "identifier")
230230

231-
return await self.request.delete(f"/template_credentials/{_quote_path_segment(identifier)}")
231+
return await self.request.delete(f"/template_credentials/{_quote_path_segment(identifier)}", data=data)
232232

233233
async def update_template_credentials(self, identifier: str, data: Optional[dict] = None):
234234
"""

transloadit/client.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ def list_assemblies(self, params: Optional[dict] = None):
8282
"""
8383
return self.request.get("/assemblies", params=params)
8484

85-
def get_assembly(self, assembly_id: str = None, assembly_url: str = None):
85+
def get_assembly(self, assembly_id: str = None, assembly_url: str = None, params: Optional[dict] = None):
8686
"""
8787
Retrieve an Assembly Status.
8888
"""
8989
if not (assembly_id or assembly_url):
9090
raise ValueError("Either 'assembly_id' or 'assembly_url' cannot be None.")
9191

9292
url = assembly_url if assembly_url else f"/assemblies/{_quote_path_segment(assembly_id)}"
93-
return self.request.get(url)
93+
return self.request.get(url, params=params)
9494

9595
def cancel_assembly(self, assembly_id: str = None, assembly_url: str = None):
9696
"""
@@ -126,11 +126,11 @@ def list_assembly_notifications(self, assembly_id: str):
126126

127127
return self.request.get(f"/assembly_notifications/{_quote_path_segment(assembly_id)}")
128128

129-
def get_bill(self, month: int, year: int):
129+
def get_bill(self, month: int, year: int, params: Optional[dict] = None):
130130
"""
131131
Retrieve a month’s bill.
132132
"""
133-
return self.request.get(f"/bill/{year}-{month:02d}")
133+
return self.request.get(f"/bill/{year}-{month:02d}", params=params)
134134

135135
def list_templates(self, params: Optional[dict] = None):
136136
"""
@@ -144,37 +144,37 @@ def create_template(self, data: Optional[dict] = None):
144144
"""
145145
return self.request.post("/templates", data=data)
146146

147-
def get_template(self, template_id: str):
147+
def get_template(self, template_id: str, params: Optional[dict] = None):
148148
"""
149149
Retrieve a Template.
150150
"""
151151
template_id = require_path_id(template_id, "template_id")
152152

153-
return self.request.get(f"/templates/{_quote_path_segment(template_id)}")
153+
return self.request.get(f"/templates/{_quote_path_segment(template_id)}", params=params)
154154

155-
def get_builtin_template(self, builtin_template_slug: str):
155+
def get_builtin_template(self, builtin_template_slug: str, params: Optional[dict] = None):
156156
"""
157157
Get Builtin Template.
158158
"""
159159
builtin_template_slug = require_path_id(builtin_template_slug, "builtin_template_slug")
160160

161-
return self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}")
161+
return self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}", params=params)
162162

163-
def get_template_full(self, template_id_or_name: str):
163+
def get_template_full(self, template_id_or_name: str, params: Optional[dict] = None):
164164
"""
165165
Get Template Full.
166166
"""
167167
template_id_or_name = require_path_id(template_id_or_name, "template_id_or_name")
168168

169-
return self.request.get(f"/templates/{_quote_path_segment(template_id_or_name)}/full")
169+
return self.request.get(f"/templates/{_quote_path_segment(template_id_or_name)}/full", params=params)
170170

171-
def get_builtin_template_full(self, builtin_template_slug: str):
171+
def get_builtin_template_full(self, builtin_template_slug: str, params: Optional[dict] = None):
172172
"""
173173
Get Builtin Template Full.
174174
"""
175175
builtin_template_slug = require_path_id(builtin_template_slug, "builtin_template_slug")
176176

177-
return self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}/full")
177+
return self.request.get(f"/templates/builtin/{_quote_path_segment(builtin_template_slug)}/full", params=params)
178178

179179
def update_template(self, template_id: str, data: Optional[dict] = None):
180180
"""
@@ -184,31 +184,31 @@ def update_template(self, template_id: str, data: Optional[dict] = None):
184184

185185
return self.request.put(f"/templates/{_quote_path_segment(template_id)}", data=data)
186186

187-
def delete_template(self, template_id: str):
187+
def delete_template(self, template_id: str, data: Optional[dict] = None):
188188
"""
189189
Delete a Template.
190190
"""
191191
template_id = require_path_id(template_id, "template_id")
192192

193-
return self.request.delete(f"/templates/{_quote_path_segment(template_id)}")
193+
return self.request.delete(f"/templates/{_quote_path_segment(template_id)}", data=data)
194194

195-
def list_priority_job_slots(self):
195+
def list_priority_job_slots(self, params: Optional[dict] = None):
196196
"""
197197
Retrieve currently used priority job slots.
198198
"""
199-
return self.request.get("/queues/job_slots")
199+
return self.request.get("/queues/job_slots", params=params)
200200

201-
def list_template_credentials(self):
201+
def list_template_credentials(self, params: Optional[dict] = None):
202202
"""
203203
Retrieve list of Template Credentials.
204204
"""
205-
return self.request.get("/template_credentials")
205+
return self.request.get("/template_credentials", params=params)
206206

207-
def list_template_credential_types(self):
207+
def list_template_credential_types(self, params: Optional[dict] = None):
208208
"""
209209
List Template Credential Types.
210210
"""
211-
return self.request.get("/template_credentials/types")
211+
return self.request.get("/template_credentials/types", params=params)
212212

213213
def validate_template_credential_oauth_on_create(self, data: Optional[dict] = None):
214214
"""
@@ -222,21 +222,21 @@ def create_template_credentials(self, data: Optional[dict] = None):
222222
"""
223223
return self.request.post("/template_credentials", data=data)
224224

225-
def get_template_credentials(self, identifier: str):
225+
def get_template_credentials(self, identifier: str, params: Optional[dict] = None):
226226
"""
227227
Retrieve a Template Credential.
228228
"""
229229
identifier = require_path_id(identifier, "identifier")
230230

231-
return self.request.get(f"/template_credentials/{_quote_path_segment(identifier)}")
231+
return self.request.get(f"/template_credentials/{_quote_path_segment(identifier)}", params=params)
232232

233-
def delete_template_credentials(self, identifier: str):
233+
def delete_template_credentials(self, identifier: str, data: Optional[dict] = None):
234234
"""
235235
Delete a Template Credential.
236236
"""
237237
identifier = require_path_id(identifier, "identifier")
238238

239-
return self.request.delete(f"/template_credentials/{_quote_path_segment(identifier)}")
239+
return self.request.delete(f"/template_credentials/{_quote_path_segment(identifier)}", data=data)
240240

241241
def update_template_credentials(self, identifier: str, data: Optional[dict] = None):
242242
"""

0 commit comments

Comments
 (0)