From e53e8cb75bc02a478c7f7d973beb0e559b7d6cae Mon Sep 17 00:00:00 2001 From: koooge Date: Wed, 22 May 2019 18:25:55 +0900 Subject: [PATCH 1/4] Upgrade gspread 3.1.0 for supporting team drive Signed-off-by: koooge --- redash/query_runner/google_spreadsheets.py | 7 +------ requirements_all_ds.txt | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py index 3c22f45b7b..c7fa482aa0 100644 --- a/redash/query_runner/google_spreadsheets.py +++ b/redash/query_runner/google_spreadsheets.py @@ -12,7 +12,6 @@ try: import gspread - from gspread.httpsession import HTTPSession from oauth2client.service_account import ServiceAccountCredentials enabled = True @@ -166,11 +165,7 @@ def _get_spreadsheet_service(self): key = json_loads(b64decode(self.configuration['jsonKeyFile'])) creds = ServiceAccountCredentials.from_json_keyfile_dict(key, scope) - timeout_session = HTTPSession() - timeout_session.requests_session = TimeoutSession() - spreadsheetservice = gspread.Client(auth=creds, http_session=timeout_session) - spreadsheetservice.login() - return spreadsheetservice + return gspread.authorize(creds) def test_connection(self): self._get_spreadsheet_service() diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt index f40320cc2a..5e827115ef 100644 --- a/requirements_all_ds.txt +++ b/requirements_all_ds.txt @@ -1,5 +1,5 @@ google-api-python-client==1.5.1 -gspread==0.6.2 +gspread==3.1.0 impyla==0.10.0 influxdb==2.7.1 MySQL-python==1.2.5 From e9074a3de1af6962fc99f028f47cf3550d201bb7 Mon Sep 17 00:00:00 2001 From: koooge Date: Wed, 29 May 2019 10:58:04 +0900 Subject: [PATCH 2/4] Revert "Upgrade gspread 3.1.0 for supporting team drive" This reverts commit e53e8cb75bc02a478c7f7d973beb0e559b7d6cae. --- redash/query_runner/google_spreadsheets.py | 7 ++++++- requirements_all_ds.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py index c7fa482aa0..3c22f45b7b 100644 --- a/redash/query_runner/google_spreadsheets.py +++ b/redash/query_runner/google_spreadsheets.py @@ -12,6 +12,7 @@ try: import gspread + from gspread.httpsession import HTTPSession from oauth2client.service_account import ServiceAccountCredentials enabled = True @@ -165,7 +166,11 @@ def _get_spreadsheet_service(self): key = json_loads(b64decode(self.configuration['jsonKeyFile'])) creds = ServiceAccountCredentials.from_json_keyfile_dict(key, scope) - return gspread.authorize(creds) + timeout_session = HTTPSession() + timeout_session.requests_session = TimeoutSession() + spreadsheetservice = gspread.Client(auth=creds, http_session=timeout_session) + spreadsheetservice.login() + return spreadsheetservice def test_connection(self): self._get_spreadsheet_service() diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt index 5e827115ef..f40320cc2a 100644 --- a/requirements_all_ds.txt +++ b/requirements_all_ds.txt @@ -1,5 +1,5 @@ google-api-python-client==1.5.1 -gspread==3.1.0 +gspread==0.6.2 impyla==0.10.0 influxdb==2.7.1 MySQL-python==1.2.5 From 9382c41200ee99b886338f77b52fe88f0641ed14 Mon Sep 17 00:00:00 2001 From: koooge Date: Wed, 29 May 2019 11:00:25 +0900 Subject: [PATCH 3/4] Upgrade gspread 3.1.0 for supporting team drive Signed-off-by: koooge --- redash/query_runner/google_spreadsheets.py | 5 ++--- requirements_all_ds.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py index 3c22f45b7b..ba433ee30c 100644 --- a/redash/query_runner/google_spreadsheets.py +++ b/redash/query_runner/google_spreadsheets.py @@ -12,7 +12,6 @@ try: import gspread - from gspread.httpsession import HTTPSession from oauth2client.service_account import ServiceAccountCredentials enabled = True @@ -166,9 +165,9 @@ def _get_spreadsheet_service(self): key = json_loads(b64decode(self.configuration['jsonKeyFile'])) creds = ServiceAccountCredentials.from_json_keyfile_dict(key, scope) - timeout_session = HTTPSession() + timeout_session = Session() timeout_session.requests_session = TimeoutSession() - spreadsheetservice = gspread.Client(auth=creds, http_session=timeout_session) + spreadsheetservice = gspread.Client(auth=creds, session=timeout_session) spreadsheetservice.login() return spreadsheetservice diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt index f40320cc2a..5e827115ef 100644 --- a/requirements_all_ds.txt +++ b/requirements_all_ds.txt @@ -1,5 +1,5 @@ google-api-python-client==1.5.1 -gspread==0.6.2 +gspread==3.1.0 impyla==0.10.0 influxdb==2.7.1 MySQL-python==1.2.5 From 60cd1274dd60a631bef1eeb145168687a61f42f1 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Thu, 6 Jun 2019 10:23:36 +0300 Subject: [PATCH 4/4] Update Sheets query runner name --- redash/query_runner/google_spreadsheets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py index ba433ee30c..f14d2d446c 100644 --- a/redash/query_runner/google_spreadsheets.py +++ b/redash/query_runner/google_spreadsheets.py @@ -134,6 +134,10 @@ def __init__(self, configuration): @classmethod def annotate_query(cls): return False + + @classmethod + def name(cls): + return "Google Sheets" @classmethod def type(cls):