From bb7a32c7a63afc9f2fe0b3c2f7b9bdf65d30baa3 Mon Sep 17 00:00:00 2001 From: Jordan Woods Date: Thu, 6 Feb 2020 07:42:23 -0600 Subject: [PATCH 1/2] Allow wb/ds item or id in refresh --- tableauserverclient/server/endpoint/datasources_endpoint.py | 3 ++- tableauserverclient/server/endpoint/workbooks_endpoint.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tableauserverclient/server/endpoint/datasources_endpoint.py b/tableauserverclient/server/endpoint/datasources_endpoint.py index c46a7dc74..ba84e583c 100644 --- a/tableauserverclient/server/endpoint/datasources_endpoint.py +++ b/tableauserverclient/server/endpoint/datasources_endpoint.py @@ -147,7 +147,8 @@ def update_connection(self, datasource_item, connection_item): return connection def refresh(self, datasource_item): - url = "{0}/{1}/refresh".format(self.baseurl, datasource_item.id) + id_ = getattr(datasource_item, 'id', datasource_item) + url = "{0}/{1}/refresh".format(self.baseurl, id_) empty_req = RequestFactory.Empty.empty_req() server_response = self.post_request(url, empty_req) new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0] diff --git a/tableauserverclient/server/endpoint/workbooks_endpoint.py b/tableauserverclient/server/endpoint/workbooks_endpoint.py index 445b0ccde..fee03a05a 100644 --- a/tableauserverclient/server/endpoint/workbooks_endpoint.py +++ b/tableauserverclient/server/endpoint/workbooks_endpoint.py @@ -57,7 +57,8 @@ def get_by_id(self, workbook_id): @api(version="2.8") def refresh(self, workbook_id): - url = "{0}/{1}/refresh".format(self.baseurl, workbook_id) + id_ = getattr(workbook_id, 'id', workbook_id) + url = "{0}/{1}/refresh".format(self.baseurl, id_) empty_req = RequestFactory.Empty.empty_req() server_response = self.post_request(url, empty_req) new_job = JobItem.from_response(server_response.content, self.parent_srv.namespace)[0] From 8ff7f7bac7d54cf278b0a606280a7f98d5280b72 Mon Sep 17 00:00:00 2001 From: Jordan Woods Date: Thu, 6 Feb 2020 08:54:50 -0600 Subject: [PATCH 2/2] Permit object or id in Jobs.cancel --- tableauserverclient/server/endpoint/jobs_endpoint.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tableauserverclient/server/endpoint/jobs_endpoint.py b/tableauserverclient/server/endpoint/jobs_endpoint.py index 92285c3db..e70c9c313 100644 --- a/tableauserverclient/server/endpoint/jobs_endpoint.py +++ b/tableauserverclient/server/endpoint/jobs_endpoint.py @@ -35,7 +35,8 @@ def get(self, job_id=None, req_options=None): @api(version='3.1') def cancel(self, job_id): - url = '{0}/{1}'.format(self.baseurl, job_id) + id_ = getattr(job_id, 'id', job_id) + url = '{0}/{1}'.format(self.baseurl, id_) return self.put_request(url) @api(version='2.6')