From 0cfd2758c144734f5abcbef34bb7ff7d88ae8744 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Tue, 16 Jun 2020 14:46:33 -0500 Subject: [PATCH 1/6] added url input to create alert function --- sentera/_version.py | 2 +- sentera/api.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sentera/_version.py b/sentera/_version.py index b875e60..a22f0c5 100644 --- a/sentera/_version.py +++ b/sentera/_version.py @@ -1,3 +1,3 @@ """Defines package version. Parsed by setup.py and imported by __init__.py.""" -__version__ = "2.2.0" +__version__ = "2.2.1" diff --git a/sentera/api.py b/sentera/api.py index 59ba9eb..a0f5144 100644 --- a/sentera/api.py +++ b/sentera/api.py @@ -101,7 +101,7 @@ def get_weather( return weather_df -def create_alert(field_sentera_id, name, message, token, key=None): +def create_alert(field_sentera_id, name, message, token, url=None, key=None): """ Create alert content and post alert mutation to https://api.sentera.com/graphql. @@ -109,14 +109,21 @@ def create_alert(field_sentera_id, name, message, token, key=None): :param name: name of the alert (string) :param message: brief description of the alert being made (string) :param token: an authorization token needed to post the alert to the specified field (string) + :param url: url link to more information about the alert (string) :param key: (optional) A client-defined key to help identify the alert. :return: result of the request.post """ - query = """mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $key: String) { + query = """mutation CreateAlert ( + $field_sentera_id: ID!, + $name: String!, + $message: String!, + $url: String, + $key: String) { create_alert ( field_sentera_id: $field_sentera_id name: $name message: $message + url: $url key: $key ) { @@ -137,6 +144,7 @@ def create_alert(field_sentera_id, name, message, token, key=None): "field_sentera_id": field_sentera_id, "name": name, "message": message, + "url": url, "key": key, } data = {"query": query, "variables": variables} From 7f3eafc95980b59cafb68aae39bd926dfa1c37b0 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Tue, 16 Jun 2020 15:17:26 -0500 Subject: [PATCH 2/6] changed tests to include url --- sentera/tests/test_api.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sentera/tests/test_api.py b/sentera/tests/test_api.py index 4639a23..5ad480d 100644 --- a/sentera/tests/test_api.py +++ b/sentera/tests/test_api.py @@ -10,8 +10,8 @@ @httpretty.httprettified def test_create_alert_with_key_success(): def request_callback(request, uri, response_headers): - mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $key: String) {\\n create_alert (" - variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "key": "corn_rust"}' + mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $url: String, $key: String) {\\n create_alert (" + variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "url": "https://www.sentera.com", "key": "corn_rust"}' assert variables in request.body assert mutation in request.body return [ @@ -23,6 +23,7 @@ def request_callback(request, uri, response_headers): "create_alert": { "sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "key": "corn_rust", + "url": "https://www.sentera.com", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "created_at": "2020-03-26T18:20:03Z", @@ -40,6 +41,7 @@ def request_callback(request, uri, response_headers): name="Southern Corn Rust Alert", message="Current weather conditions indicate things.", token="token123", + url="https://www.sentera.com", key="corn_rust", ) assert response["data"]["create_alert"]["key"] == "corn_rust" @@ -49,8 +51,8 @@ def request_callback(request, uri, response_headers): @httpretty.httprettified def test_create_alert_without_key_success(): def request_callback(request, uri, response_headers): - mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $key: String) {\\n create_alert (" - variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "key": null}' + mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $url: String, $key: String) {\\n create_alert (" + variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "url": null, "key": null}' assert variables in request.body assert mutation in request.body return [ @@ -62,6 +64,7 @@ def request_callback(request, uri, response_headers): "create_alert": { "sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "key": None, + "url": None, "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "created_at": "2020-03-26T18:20:03Z", From 04e2836f3d3aab103a83e3351eb85c52a841b3d6 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Wed, 17 Jun 2020 10:16:57 -0500 Subject: [PATCH 3/6] added url --- sentera/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sentera/api.py b/sentera/api.py index a0f5144..9683bee 100644 --- a/sentera/api.py +++ b/sentera/api.py @@ -109,7 +109,7 @@ def create_alert(field_sentera_id, name, message, token, url=None, key=None): :param name: name of the alert (string) :param message: brief description of the alert being made (string) :param token: an authorization token needed to post the alert to the specified field (string) - :param url: url link to more information about the alert (string) + :param url: (optional) url link to more information about the alert (string) :param key: (optional) A client-defined key to help identify the alert. :return: result of the request.post """ @@ -130,6 +130,7 @@ def create_alert(field_sentera_id, name, message, token, url=None, key=None): sentera_id name message + url key created_by { sentera_id From 7ab55241515b35530af61feeed5b9cb06818a068 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Wed, 17 Jun 2020 13:56:19 -0500 Subject: [PATCH 4/6] added url field to create alert --- sentera/api.py | 14 +++++++------- sentera/tests/test_api.py | 15 ++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sentera/api.py b/sentera/api.py index 9683bee..9bfd383 100644 --- a/sentera/api.py +++ b/sentera/api.py @@ -101,7 +101,7 @@ def get_weather( return weather_df -def create_alert(field_sentera_id, name, message, token, url=None, key=None): +def create_alert(field_sentera_id, name, message, token, key=None, url=None): """ Create alert content and post alert mutation to https://api.sentera.com/graphql. @@ -109,29 +109,29 @@ def create_alert(field_sentera_id, name, message, token, url=None, key=None): :param name: name of the alert (string) :param message: brief description of the alert being made (string) :param token: an authorization token needed to post the alert to the specified field (string) - :param url: (optional) url link to more information about the alert (string) :param key: (optional) A client-defined key to help identify the alert. + :param url: (optional) url link to more information about the alert (url) :return: result of the request.post """ query = """mutation CreateAlert ( $field_sentera_id: ID!, $name: String!, $message: String!, - $url: String, - $key: String) { + $key: String, + $url: Url) { create_alert ( field_sentera_id: $field_sentera_id name: $name message: $message - url: $url key: $key + url: $url ) { sentera_id name message - url key + url created_by { sentera_id first_name @@ -145,8 +145,8 @@ def create_alert(field_sentera_id, name, message, token, url=None, key=None): "field_sentera_id": field_sentera_id, "name": name, "message": message, - "url": url, "key": key, + "url": url, } data = {"query": query, "variables": variables} result = _run_sentera_query(data, token) diff --git a/sentera/tests/test_api.py b/sentera/tests/test_api.py index 5ad480d..445b5ac 100644 --- a/sentera/tests/test_api.py +++ b/sentera/tests/test_api.py @@ -10,8 +10,9 @@ @httpretty.httprettified def test_create_alert_with_key_success(): def request_callback(request, uri, response_headers): - mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $url: String, $key: String) {\\n create_alert (" - variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "url": "https://www.sentera.com", "key": "corn_rust"}' + mutation = b"mutation CreateAlert (\\n $field_sentera_id: ID!,\\n $name: String!,\\n $message: String!,\\n $key: String,\\n $url: Url) {\\n create_alert (" + variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "key": "corn_rust", "url": "https://www.sentera.com"}' + print(request.body) assert variables in request.body assert mutation in request.body return [ @@ -23,9 +24,9 @@ def request_callback(request, uri, response_headers): "create_alert": { "sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "key": "corn_rust", - "url": "https://www.sentera.com", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", + "url": "https://www.sentera.com", "created_at": "2020-03-26T18:20:03Z", } } @@ -41,8 +42,8 @@ def request_callback(request, uri, response_headers): name="Southern Corn Rust Alert", message="Current weather conditions indicate things.", token="token123", - url="https://www.sentera.com", key="corn_rust", + url="https://www.sentera.com", ) assert response["data"]["create_alert"]["key"] == "corn_rust" assert len(httpretty.latest_requests()) == 1 @@ -51,8 +52,8 @@ def request_callback(request, uri, response_headers): @httpretty.httprettified def test_create_alert_without_key_success(): def request_callback(request, uri, response_headers): - mutation = b"mutation CreateAlert ($field_sentera_id: ID!, $name: String!, $message: String!, $url: String, $key: String) {\\n create_alert (" - variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "url": null, "key": null}' + mutation = b"mutation CreateAlert (\\n $field_sentera_id: ID!,\\n $name: String!,\\n $message: String!,\\n $key: String,\\n $url: Url) {\\n create_alert (" + variables = b'"variables": {"field_sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", "key": null, "url": null}' assert variables in request.body assert mutation in request.body return [ @@ -64,9 +65,9 @@ def request_callback(request, uri, response_headers): "create_alert": { "sentera_id": "gyq8ll6_AL_8brhbkSentera_CV_shar_e599fde_200326_182003", "key": None, - "url": None, "name": "Southern Corn Rust Alert", "message": "Current weather conditions indicate things.", + "url": None, "created_at": "2020-03-26T18:20:03Z", } } From 76d16f9eed4d80768f8d7764d11dfc82efab3d06 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Fri, 19 Jun 2020 12:51:11 -0500 Subject: [PATCH 5/6] bumped minor version number --- sentera/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentera/_version.py b/sentera/_version.py index a22f0c5..0476fef 100644 --- a/sentera/_version.py +++ b/sentera/_version.py @@ -1,3 +1,3 @@ """Defines package version. Parsed by setup.py and imported by __init__.py.""" -__version__ = "2.2.1" +__version__ = "2.3.0" From b7d95a3117ba7fd02d3c131a7d2291f00946ca63 Mon Sep 17 00:00:00 2001 From: ZachMarston Date: Thu, 25 Jun 2020 14:45:52 -0500 Subject: [PATCH 6/6] formatting change --- sentera/_version.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sentera/_version.py b/sentera/_version.py index 18866fd..0476fef 100644 --- a/sentera/_version.py +++ b/sentera/_version.py @@ -1,4 +1,3 @@ """Defines package version. Parsed by setup.py and imported by __init__.py.""" __version__ = "2.3.0" -