From c578c9c571677bf9a44931a9cdcd1d68400ae905 Mon Sep 17 00:00:00 2001 From: armandobelardo Date: Thu, 8 Aug 2024 09:05:44 -0400 Subject: [PATCH] seed --- .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../alias/src/seed/core/http_client.py | 3 +- .../alias/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../audiences/src/seed/core/http_client.py | 3 +- .../audiences/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../basic-auth/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../bytes/src/seed/core/http_client.py | 3 +- .../bytes/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../code-samples/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../custom-auth/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../enum/strenum/src/seed/core/http_client.py | 3 +- .../strenum/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../readme/src/seed/core/http_client.py | 3 +- .../readme/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../pydantic-v1/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../union-utils/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../extends/src/seed/core/http_client.py | 3 +- .../extends/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../file-upload/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../folders/src/seed/core/http_client.py | 3 +- .../folders/tests/utils/test_http_client.py | 14 + .../.mock/proto/google/api/annotations.proto | 31 -- .../proto/google/api/field_behavior.proto | 104 ----- .../grpc/.mock/proto/google/api/http.proto | 379 ------------------ .../grpc/.mock/proto/user/v1/user.proto | 55 --- .../grpc/src/seed/core/http_client.py | 3 +- .../grpc/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../imdb/src/seed/core/http_client.py | 3 +- .../imdb/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../mixed-case/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../object/src/seed/core/http_client.py | 3 +- .../object/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../optional/src/seed/core/http_client.py | 3 +- .../optional/tests/utils/test_http_client.py | 14 + .../package-yml/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../pagination/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../plain-text/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + seed/python-sdk/seed.yml | 1 - .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../union-utils/src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../unknown/src/seed/core/http_client.py | 3 +- .../unknown/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../variables/src/seed/core/http_client.py | 3 +- .../variables/tests/utils/test_http_client.py | 14 + .../src/seed/core/http_client.py | 3 +- .../tests/utils/test_http_client.py | 14 + .../version/src/seed/core/http_client.py | 3 +- .../version/tests/utils/test_http_client.py | 14 + .../websocket/src/seed/core/http_client.py | 3 +- .../websocket/tests/utils/test_http_client.py | 14 + 157 files changed, 1216 insertions(+), 646 deletions(-) delete mode 100644 seed/python-sdk/grpc/.mock/proto/google/api/annotations.proto delete mode 100644 seed/python-sdk/grpc/.mock/proto/google/api/field_behavior.proto delete mode 100644 seed/python-sdk/grpc/.mock/proto/google/api/http.proto delete mode 100644 seed/python-sdk/grpc/.mock/proto/user/v1/user.proto diff --git a/seed/python-sdk/alias-extends/src/seed/core/http_client.py b/seed/python-sdk/alias-extends/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/alias-extends/src/seed/core/http_client.py +++ b/seed/python-sdk/alias-extends/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/alias-extends/tests/utils/test_http_client.py b/seed/python-sdk/alias-extends/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/alias-extends/tests/utils/test_http_client.py +++ b/seed/python-sdk/alias-extends/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/alias/src/seed/core/http_client.py b/seed/python-sdk/alias/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/alias/src/seed/core/http_client.py +++ b/seed/python-sdk/alias/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/alias/tests/utils/test_http_client.py b/seed/python-sdk/alias/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/alias/tests/utils/test_http_client.py +++ b/seed/python-sdk/alias/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/api-wide-base-path/src/seed/core/http_client.py b/seed/python-sdk/api-wide-base-path/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/api-wide-base-path/src/seed/core/http_client.py +++ b/seed/python-sdk/api-wide-base-path/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/api-wide-base-path/tests/utils/test_http_client.py b/seed/python-sdk/api-wide-base-path/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/api-wide-base-path/tests/utils/test_http_client.py +++ b/seed/python-sdk/api-wide-base-path/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/audiences/src/seed/core/http_client.py b/seed/python-sdk/audiences/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/audiences/src/seed/core/http_client.py +++ b/seed/python-sdk/audiences/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/audiences/tests/utils/test_http_client.py b/seed/python-sdk/audiences/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/audiences/tests/utils/test_http_client.py +++ b/seed/python-sdk/audiences/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/auth-environment-variables/src/seed/core/http_client.py b/seed/python-sdk/auth-environment-variables/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/auth-environment-variables/src/seed/core/http_client.py +++ b/seed/python-sdk/auth-environment-variables/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/auth-environment-variables/tests/utils/test_http_client.py b/seed/python-sdk/auth-environment-variables/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/auth-environment-variables/tests/utils/test_http_client.py +++ b/seed/python-sdk/auth-environment-variables/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/basic-auth-environment-variables/src/seed/core/http_client.py b/seed/python-sdk/basic-auth-environment-variables/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/basic-auth-environment-variables/src/seed/core/http_client.py +++ b/seed/python-sdk/basic-auth-environment-variables/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/basic-auth-environment-variables/tests/utils/test_http_client.py b/seed/python-sdk/basic-auth-environment-variables/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/basic-auth-environment-variables/tests/utils/test_http_client.py +++ b/seed/python-sdk/basic-auth-environment-variables/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/basic-auth/src/seed/core/http_client.py b/seed/python-sdk/basic-auth/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/basic-auth/src/seed/core/http_client.py +++ b/seed/python-sdk/basic-auth/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/basic-auth/tests/utils/test_http_client.py b/seed/python-sdk/basic-auth/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/basic-auth/tests/utils/test_http_client.py +++ b/seed/python-sdk/basic-auth/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/bearer-token-environment-variable/src/seed/core/http_client.py b/seed/python-sdk/bearer-token-environment-variable/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/bearer-token-environment-variable/src/seed/core/http_client.py +++ b/seed/python-sdk/bearer-token-environment-variable/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/bearer-token-environment-variable/tests/utils/test_http_client.py b/seed/python-sdk/bearer-token-environment-variable/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/bearer-token-environment-variable/tests/utils/test_http_client.py +++ b/seed/python-sdk/bearer-token-environment-variable/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/bytes/src/seed/core/http_client.py b/seed/python-sdk/bytes/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/bytes/src/seed/core/http_client.py +++ b/seed/python-sdk/bytes/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/bytes/tests/utils/test_http_client.py b/seed/python-sdk/bytes/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/bytes/tests/utils/test_http_client.py +++ b/seed/python-sdk/bytes/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/circular-references-advanced/src/seed/core/http_client.py b/seed/python-sdk/circular-references-advanced/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/circular-references-advanced/src/seed/core/http_client.py +++ b/seed/python-sdk/circular-references-advanced/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/circular-references-advanced/tests/utils/test_http_client.py b/seed/python-sdk/circular-references-advanced/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/circular-references-advanced/tests/utils/test_http_client.py +++ b/seed/python-sdk/circular-references-advanced/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/circular-references/src/seed/core/http_client.py b/seed/python-sdk/circular-references/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/circular-references/src/seed/core/http_client.py +++ b/seed/python-sdk/circular-references/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/circular-references/tests/utils/test_http_client.py b/seed/python-sdk/circular-references/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/circular-references/tests/utils/test_http_client.py +++ b/seed/python-sdk/circular-references/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/code-samples/src/seed/core/http_client.py b/seed/python-sdk/code-samples/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/code-samples/src/seed/core/http_client.py +++ b/seed/python-sdk/code-samples/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/code-samples/tests/utils/test_http_client.py b/seed/python-sdk/code-samples/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/code-samples/tests/utils/test_http_client.py +++ b/seed/python-sdk/code-samples/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/custom-auth/src/seed/core/http_client.py b/seed/python-sdk/custom-auth/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/custom-auth/src/seed/core/http_client.py +++ b/seed/python-sdk/custom-auth/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/custom-auth/tests/utils/test_http_client.py b/seed/python-sdk/custom-auth/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/custom-auth/tests/utils/test_http_client.py +++ b/seed/python-sdk/custom-auth/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/enum/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/enum/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/enum/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/enum/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/enum/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/enum/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/enum/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/enum/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/enum/strenum/src/seed/core/http_client.py b/seed/python-sdk/enum/strenum/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/enum/strenum/src/seed/core/http_client.py +++ b/seed/python-sdk/enum/strenum/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/enum/strenum/tests/utils/test_http_client.py b/seed/python-sdk/enum/strenum/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/enum/strenum/tests/utils/test_http_client.py +++ b/seed/python-sdk/enum/strenum/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/error-property/src/seed/core/http_client.py b/seed/python-sdk/error-property/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/error-property/src/seed/core/http_client.py +++ b/seed/python-sdk/error-property/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/error-property/tests/utils/test_http_client.py b/seed/python-sdk/error-property/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/error-property/tests/utils/test_http_client.py +++ b/seed/python-sdk/error-property/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/examples/client-filename/src/seed/core/http_client.py b/seed/python-sdk/examples/client-filename/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/examples/client-filename/src/seed/core/http_client.py +++ b/seed/python-sdk/examples/client-filename/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/examples/client-filename/tests/utils/test_http_client.py b/seed/python-sdk/examples/client-filename/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/examples/client-filename/tests/utils/test_http_client.py +++ b/seed/python-sdk/examples/client-filename/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/examples/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/examples/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/examples/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/examples/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/examples/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/examples/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/examples/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/examples/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/examples/readme/src/seed/core/http_client.py b/seed/python-sdk/examples/readme/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/examples/readme/src/seed/core/http_client.py +++ b/seed/python-sdk/examples/readme/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/examples/readme/tests/utils/test_http_client.py b/seed/python-sdk/examples/readme/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/examples/readme/tests/utils/test_http_client.py +++ b/seed/python-sdk/examples/readme/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/deps_with_min_python_version/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/deps_with_min_python_version/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/deps_with_min_python_version/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/deps_with_min_python_version/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/deps_with_min_python_version/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/deps_with_min_python_version/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/deps_with_min_python_version/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/deps_with_min_python_version/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/extra_dependencies/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/extra_dependencies/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/extra_dependencies/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/extra_dependencies/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/extra_dependencies/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/extra_dependencies/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/extra_dependencies/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/extra_dependencies/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/extra_dev_dependencies/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/extra_dev_dependencies/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/extra_dev_dependencies/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/extra_dev_dependencies/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/extra_dev_dependencies/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/extra_dev_dependencies/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/extra_dev_dependencies/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/extra_dev_dependencies/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/five-second-timeout/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/five-second-timeout/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/five-second-timeout/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/five-second-timeout/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/five-second-timeout/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/five-second-timeout/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/five-second-timeout/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/five-second-timeout/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/follow_redirects_by_default/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/follow_redirects_by_default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/follow_redirects_by_default/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/follow_redirects_by_default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/follow_redirects_by_default/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/follow_redirects_by_default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/follow_redirects_by_default/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/follow_redirects_by_default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/improved_imports/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/improved_imports/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/improved_imports/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/improved_imports/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/improved_imports/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/improved_imports/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/improved_imports/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/improved_imports/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/infinite-timeout/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/infinite-timeout/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/infinite-timeout/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/infinite-timeout/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/infinite-timeout/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/infinite-timeout/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/infinite-timeout/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/infinite-timeout/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/inline_request_params/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/inline_request_params/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/inline_request_params/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/inline_request_params/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/inline_request_params/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/inline_request_params/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/inline_request_params/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/inline_request_params/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/pydantic-extra-fields/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/pydantic-extra-fields/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/pydantic-extra-fields/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-extra-fields/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/pydantic-extra-fields/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/pydantic-extra-fields/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/pydantic-extra-fields/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-extra-fields/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/pydantic-v1-wrapped/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/pydantic-v1-wrapped/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/pydantic-v1-wrapped/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-v1-wrapped/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/pydantic-v1-wrapped/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/pydantic-v1-wrapped/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/pydantic-v1-wrapped/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-v1-wrapped/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/pydantic-v1/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/pydantic-v1/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/pydantic-v1/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-v1/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/pydantic-v1/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/pydantic-v1/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/pydantic-v1/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/pydantic-v1/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/skip-pydantic-validation/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/skip-pydantic-validation/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/skip-pydantic-validation/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/skip-pydantic-validation/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/skip-pydantic-validation/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/skip-pydantic-validation/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/skip-pydantic-validation/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/skip-pydantic-validation/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/exhaustive/union-utils/src/seed/core/http_client.py b/seed/python-sdk/exhaustive/union-utils/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/exhaustive/union-utils/src/seed/core/http_client.py +++ b/seed/python-sdk/exhaustive/union-utils/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/exhaustive/union-utils/tests/utils/test_http_client.py b/seed/python-sdk/exhaustive/union-utils/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/exhaustive/union-utils/tests/utils/test_http_client.py +++ b/seed/python-sdk/exhaustive/union-utils/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/extends/src/seed/core/http_client.py b/seed/python-sdk/extends/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/extends/src/seed/core/http_client.py +++ b/seed/python-sdk/extends/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/extends/tests/utils/test_http_client.py b/seed/python-sdk/extends/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/extends/tests/utils/test_http_client.py +++ b/seed/python-sdk/extends/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/extra-properties/src/seed/core/http_client.py b/seed/python-sdk/extra-properties/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/extra-properties/src/seed/core/http_client.py +++ b/seed/python-sdk/extra-properties/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/extra-properties/tests/utils/test_http_client.py b/seed/python-sdk/extra-properties/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/extra-properties/tests/utils/test_http_client.py +++ b/seed/python-sdk/extra-properties/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/file-download/src/seed/core/http_client.py b/seed/python-sdk/file-download/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/file-download/src/seed/core/http_client.py +++ b/seed/python-sdk/file-download/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/file-download/tests/utils/test_http_client.py b/seed/python-sdk/file-download/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/file-download/tests/utils/test_http_client.py +++ b/seed/python-sdk/file-download/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/file-upload/src/seed/core/http_client.py b/seed/python-sdk/file-upload/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/file-upload/src/seed/core/http_client.py +++ b/seed/python-sdk/file-upload/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/file-upload/tests/utils/test_http_client.py b/seed/python-sdk/file-upload/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/file-upload/tests/utils/test_http_client.py +++ b/seed/python-sdk/file-upload/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/folders/src/seed/core/http_client.py b/seed/python-sdk/folders/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/folders/src/seed/core/http_client.py +++ b/seed/python-sdk/folders/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/folders/tests/utils/test_http_client.py b/seed/python-sdk/folders/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/folders/tests/utils/test_http_client.py +++ b/seed/python-sdk/folders/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/grpc/.mock/proto/google/api/annotations.proto b/seed/python-sdk/grpc/.mock/proto/google/api/annotations.proto deleted file mode 100644 index efdab3db6ca..00000000000 --- a/seed/python-sdk/grpc/.mock/proto/google/api/annotations.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2015 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/http.proto"; -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "AnnotationsProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.MethodOptions { - // See `HttpRule`. - HttpRule http = 72295728; -} diff --git a/seed/python-sdk/grpc/.mock/proto/google/api/field_behavior.proto b/seed/python-sdk/grpc/.mock/proto/google/api/field_behavior.proto deleted file mode 100644 index 344cb0b1fc2..00000000000 --- a/seed/python-sdk/grpc/.mock/proto/google/api/field_behavior.proto +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "FieldBehaviorProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.FieldOptions { - // A designation of a specific field behavior (required, output only, etc.) - // in protobuf messages. - // - // Examples: - // - // string name = 1 [(google.api.field_behavior) = REQUIRED]; - // State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; - // google.protobuf.Duration ttl = 1 - // [(google.api.field_behavior) = INPUT_ONLY]; - // google.protobuf.Timestamp expire_time = 1 - // [(google.api.field_behavior) = OUTPUT_ONLY, - // (google.api.field_behavior) = IMMUTABLE]; - repeated google.api.FieldBehavior field_behavior = 1052; -} - -// An indicator of the behavior of a given field (for example, that a field -// is required in requests, or given as output but ignored as input). -// This **does not** change the behavior in protocol buffers itself; it only -// denotes the behavior and may affect how API tooling handles the field. -// -// Note: This enum **may** receive new values in the future. -enum FieldBehavior { - // Conventional default for enums. Do not use this. - FIELD_BEHAVIOR_UNSPECIFIED = 0; - - // Specifically denotes a field as optional. - // While all fields in protocol buffers are optional, this may be specified - // for emphasis if appropriate. - OPTIONAL = 1; - - // Denotes a field as required. - // This indicates that the field **must** be provided as part of the request, - // and failure to do so will cause an error (usually `INVALID_ARGUMENT`). - REQUIRED = 2; - - // Denotes a field as output only. - // This indicates that the field is provided in responses, but including the - // field in a request does nothing (the server *must* ignore it and - // *must not* throw an error as a result of the field's presence). - OUTPUT_ONLY = 3; - - // Denotes a field as input only. - // This indicates that the field is provided in requests, and the - // corresponding field is not included in output. - INPUT_ONLY = 4; - - // Denotes a field as immutable. - // This indicates that the field may be set once in a request to create a - // resource, but may not be changed thereafter. - IMMUTABLE = 5; - - // Denotes that a (repeated) field is an unordered list. - // This indicates that the service may provide the elements of the list - // in any arbitrary order, rather than the order the user originally - // provided. Additionally, the list's order may or may not be stable. - UNORDERED_LIST = 6; - - // Denotes that this field returns a non-empty default value if not set. - // This indicates that if the user provides the empty value in a request, - // a non-empty value will be returned. The user will not be aware of what - // non-empty value to expect. - NON_EMPTY_DEFAULT = 7; - - // Denotes that the field in a resource (a message annotated with - // google.api.resource) is used in the resource name to uniquely identify the - // resource. For AIP-compliant APIs, this should only be applied to the - // `name` field on the resource. - // - // This behavior should not be applied to references to other resources within - // the message. - // - // The identifier field of resources often have different field behavior - // depending on the request it is embedded in (e.g. for Create methods name - // is optional and unused, while for Update methods it is required). Instead - // of method-specific annotations, only `IDENTIFIER` is required. - IDENTIFIER = 8; -} diff --git a/seed/python-sdk/grpc/.mock/proto/google/api/http.proto b/seed/python-sdk/grpc/.mock/proto/google/api/http.proto deleted file mode 100644 index 31d867a27d5..00000000000 --- a/seed/python-sdk/grpc/.mock/proto/google/api/http.proto +++ /dev/null @@ -1,379 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Defines the HTTP configuration for an API service. It contains a list of -// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method -// to one or more HTTP REST API methods. -message Http { - // A list of HTTP configuration rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated HttpRule rules = 1; - - // When set to true, URL path parameters will be fully URI-decoded except in - // cases of single segment matches in reserved expansion, where "%2F" will be - // left encoded. - // - // The default behavior is to not decode RFC 6570 reserved characters in multi - // segment matches. - bool fully_decode_reserved_expansion = 2; -} - -// # gRPC Transcoding -// -// gRPC Transcoding is a feature for mapping between a gRPC method and one or -// more HTTP REST endpoints. It allows developers to build a single API service -// that supports both gRPC APIs and REST APIs. Many systems, including [Google -// APIs](https://github.com/googleapis/googleapis), -// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC -// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), -// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature -// and use it for large scale production services. -// -// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies -// how different portions of the gRPC request message are mapped to the URL -// path, URL query parameters, and HTTP request body. It also controls how the -// gRPC response message is mapped to the HTTP response body. `HttpRule` is -// typically specified as an `google.api.http` annotation on the gRPC method. -// -// Each mapping specifies a URL path template and an HTTP method. The path -// template may refer to one or more fields in the gRPC request message, as long -// as each field is a non-repeated field with a primitive (non-message) type. -// The path template controls how fields of the request message are mapped to -// the URL path. -// -// Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/{name=messages/*}" -// }; -// } -// } -// message GetMessageRequest { -// string name = 1; // Mapped to URL path. -// } -// message Message { -// string text = 1; // The resource content. -// } -// -// This enables an HTTP REST to gRPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` -// -// Any fields in the request message which are not bound by the path template -// automatically become HTTP query parameters if there is no HTTP request body. -// For example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get:"/v1/messages/{message_id}" -// }; -// } -// } -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // Mapped to URL path. -// int64 revision = 2; // Mapped to URL query parameter `revision`. -// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. -// } -// -// This enables a HTTP JSON to RPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | -// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: -// "foo"))` -// -// Note that fields which are mapped to URL query parameters must have a -// primitive type or a repeated primitive type or a non-repeated message type. -// In the case of a repeated type, the parameter can be repeated in the URL -// as `...?param=A¶m=B`. In the case of a message type, each field of the -// message is mapped to a separate parameter, such as -// `...?foo.a=A&foo.b=B&foo.c=C`. -// -// For HTTP methods that allow a request body, the `body` field -// specifies the mapping. Consider a REST update method on the -// message resource collection: -// -// service Messaging { -// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "message" -// }; -// } -// } -// message UpdateMessageRequest { -// string message_id = 1; // mapped to the URL -// Message message = 2; // mapped to the body -// } -// -// The following HTTP JSON to RPC mapping is enabled, where the -// representation of the JSON in the request body is determined by -// protos JSON encoding: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" message { text: "Hi!" })` -// -// The special name `*` can be used in the body mapping to define that -// every field not bound by the path template should be mapped to the -// request body. This enables the following alternative definition of -// the update method: -// -// service Messaging { -// rpc UpdateMessage(Message) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "*" -// }; -// } -// } -// message Message { -// string message_id = 1; -// string text = 2; -// } -// -// -// The following HTTP JSON to RPC mapping is enabled: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" text: "Hi!")` -// -// Note that when using `*` in the body mapping, it is not possible to -// have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice when -// defining REST APIs. The common usage of `*` is in custom methods -// which don't use the URL at all for transferring data. -// -// It is possible to define multiple HTTP methods for one RPC by using -// the `additional_bindings` option. Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/messages/{message_id}" -// additional_bindings { -// get: "/v1/users/{user_id}/messages/{message_id}" -// } -// }; -// } -// } -// message GetMessageRequest { -// string message_id = 1; -// string user_id = 2; -// } -// -// This enables the following two alternative HTTP JSON to RPC mappings: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: -// "123456")` -// -// ## Rules for HTTP mapping -// -// 1. Leaf request fields (recursive expansion nested messages in the request -// message) are classified into three categories: -// - Fields referred by the path template. They are passed via the URL path. -// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They -// are passed via the HTTP -// request body. -// - All other fields are passed via the URL query parameters, and the -// parameter name is the field path in the request message. A repeated -// field can be represented as multiple query parameters under the same -// name. -// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL -// query parameter, all fields -// are passed via URL path and HTTP request body. -// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP -// request body, all -// fields are passed via URL path and URL query parameters. -// -// ### Path template syntax -// -// Template = "/" Segments [ Verb ] ; -// Segments = Segment { "/" Segment } ; -// Segment = "*" | "**" | LITERAL | Variable ; -// Variable = "{" FieldPath [ "=" Segments ] "}" ; -// FieldPath = IDENT { "." IDENT } ; -// Verb = ":" LITERAL ; -// -// The syntax `*` matches a single URL path segment. The syntax `**` matches -// zero or more URL path segments, which must be the last part of the URL path -// except the `Verb`. -// -// The syntax `Variable` matches part of the URL path as specified by its -// template. A variable template must not contain other variables. If a variable -// matches a single path segment, its template may be omitted, e.g. `{var}` -// is equivalent to `{var=*}`. -// -// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` -// contains any reserved character, such characters should be percent-encoded -// before the matching. -// -// If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path on the client -// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The -// server side does the reverse decoding. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{var}`. -// -// If a variable contains multiple path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path on the -// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. -// The server side does the reverse decoding, except "%2F" and "%2f" are left -// unchanged. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{+var}`. -// -// ## Using gRPC API Service Configuration -// -// gRPC API Service Configuration (service config) is a configuration language -// for configuring a gRPC service to become a user-facing product. The -// service config is simply the YAML representation of the `google.api.Service` -// proto message. -// -// As an alternative to annotating your proto file, you can configure gRPC -// transcoding in your service config YAML files. You do this by specifying a -// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same -// effect as the proto annotation. This can be particularly useful if you -// have a proto that is reused in multiple services. Note that any transcoding -// specified in the service config will override any matching transcoding -// configuration in the proto. -// -// Example: -// -// http: -// rules: -// # Selects a gRPC method and applies HttpRule to it. -// - selector: example.v1.Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// ## Special notes -// -// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the -// proto to JSON conversion must follow the [proto3 -// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). -// -// While the single segment variable follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion, the multi segment variable **does not** follow RFC 6570 Section -// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion -// does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding -// for multi segment variables. -// -// The path variables **must not** refer to any repeated or mapped field, -// because client libraries are not capable of handling such variable expansion. -// -// The path variables **must not** capture the leading "/" character. The reason -// is that the most common use case "{var}" does not capture the leading "/" -// character. For consistency, all path variables must share the same behavior. -// -// Repeated message fields must not be mapped to URL query parameters, because -// no client library can support such complicated mapping. -// -// If an API needs to use a JSON array for request or response body, it can map -// the request or response body to a repeated field. However, some gRPC -// Transcoding implementations may not support this feature. -message HttpRule { - // Selects a method to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax - // details. - string selector = 1; - - // Determines the URL pattern is matched by this rules. This pattern can be - // used with any of the {get|put|post|delete|patch} methods. A custom method - // can be defined using the 'custom' field. - oneof pattern { - // Maps to HTTP GET. Used for listing and getting information about - // resources. - string get = 2; - - // Maps to HTTP PUT. Used for replacing a resource. - string put = 3; - - // Maps to HTTP POST. Used for creating a resource or performing an action. - string post = 4; - - // Maps to HTTP DELETE. Used for deleting a resource. - string delete = 5; - - // Maps to HTTP PATCH. Used for updating a resource. - string patch = 6; - - // The custom pattern is used for specifying an HTTP method that is not - // included in the `pattern` field, such as HEAD, or "*" to leave the - // HTTP method unspecified for this rule. The wild-card rule is useful - // for services that provide content to Web (HTML) clients. - CustomHttpPattern custom = 8; - } - - // The name of the request field whose value is mapped to the HTTP request - // body, or `*` for mapping all request fields not captured by the path - // pattern to the HTTP body, or omitted for not having any HTTP request body. - // - // NOTE: the referred field must be present at the top-level of the request - // message type. - string body = 7; - - // Optional. The name of the response field whose value is mapped to the HTTP - // response body. When omitted, the entire response message will be used - // as the HTTP response body. - // - // NOTE: The referred field must be present at the top-level of the response - // message type. - string response_body = 12; - - // Additional HTTP bindings for the selector. Nested bindings must - // not contain an `additional_bindings` field themselves (that is, - // the nesting may only be one level deep). - repeated HttpRule additional_bindings = 11; -} - -// A custom pattern is used for defining custom HTTP verb. -message CustomHttpPattern { - // The name of this custom HTTP verb. - string kind = 1; - - // The path matched by this custom verb. - string path = 2; -} diff --git a/seed/python-sdk/grpc/.mock/proto/user/v1/user.proto b/seed/python-sdk/grpc/.mock/proto/user/v1/user.proto deleted file mode 100644 index adab9ceefb9..00000000000 --- a/seed/python-sdk/grpc/.mock/proto/user/v1/user.proto +++ /dev/null @@ -1,55 +0,0 @@ -syntax = "proto3"; - -package user.v1; - -import "google/api/annotations.proto"; -import "google/api/field_behavior.proto"; -import "google/protobuf/struct.proto"; - -option csharp_namespace = "User.V1"; - -message User { - string username = 1 [ - (google.api.field_behavior) = REQUIRED - ]; - string email = 2; - uint32 age = 3; - float weight = 4; - google.protobuf.Struct metadata = 5; -} - -message CreateUserRequest { - string username = 1 [ - (google.api.field_behavior) = REQUIRED - ]; - string email = 2; - uint32 age = 3; - float weight = 4; - google.protobuf.Struct metadata = 5; -} - -message CreateUserResponse { - User user = 1; -} - -message GetUserRequest { - string username = 1; - string email = 2; - uint32 age = 3; - float weight = 4; -} - -service UserService { - rpc CreateUser(CreateUserRequest) returns (CreateUserResponse) { - option (google.api.http) = { - post: "/users" - body: "*" - }; - } - - rpc GetUser(GetUserRequest) returns (User) { - option (google.api.http) = { - get: "/users" - }; - } -} diff --git a/seed/python-sdk/grpc/src/seed/core/http_client.py b/seed/python-sdk/grpc/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/grpc/src/seed/core/http_client.py +++ b/seed/python-sdk/grpc/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/grpc/tests/utils/test_http_client.py b/seed/python-sdk/grpc/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/grpc/tests/utils/test_http_client.py +++ b/seed/python-sdk/grpc/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/idempotency-headers/src/seed/core/http_client.py b/seed/python-sdk/idempotency-headers/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/idempotency-headers/src/seed/core/http_client.py +++ b/seed/python-sdk/idempotency-headers/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/idempotency-headers/tests/utils/test_http_client.py b/seed/python-sdk/idempotency-headers/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/idempotency-headers/tests/utils/test_http_client.py +++ b/seed/python-sdk/idempotency-headers/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/imdb/src/seed/core/http_client.py b/seed/python-sdk/imdb/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/imdb/src/seed/core/http_client.py +++ b/seed/python-sdk/imdb/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/imdb/tests/utils/test_http_client.py b/seed/python-sdk/imdb/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/imdb/tests/utils/test_http_client.py +++ b/seed/python-sdk/imdb/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/literal/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/literal/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/literal/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/literal/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/literal/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/literal/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/literal/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/literal/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/literal/use_typeddict_requests/src/seed/core/http_client.py b/seed/python-sdk/literal/use_typeddict_requests/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/literal/use_typeddict_requests/src/seed/core/http_client.py +++ b/seed/python-sdk/literal/use_typeddict_requests/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/literal/use_typeddict_requests/tests/utils/test_http_client.py b/seed/python-sdk/literal/use_typeddict_requests/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/literal/use_typeddict_requests/tests/utils/test_http_client.py +++ b/seed/python-sdk/literal/use_typeddict_requests/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/mixed-case/src/seed/core/http_client.py b/seed/python-sdk/mixed-case/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/mixed-case/src/seed/core/http_client.py +++ b/seed/python-sdk/mixed-case/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/mixed-case/tests/utils/test_http_client.py b/seed/python-sdk/mixed-case/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/mixed-case/tests/utils/test_http_client.py +++ b/seed/python-sdk/mixed-case/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/multi-line-docs/src/seed/core/http_client.py b/seed/python-sdk/multi-line-docs/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/multi-line-docs/src/seed/core/http_client.py +++ b/seed/python-sdk/multi-line-docs/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/multi-line-docs/tests/utils/test_http_client.py b/seed/python-sdk/multi-line-docs/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/multi-line-docs/tests/utils/test_http_client.py +++ b/seed/python-sdk/multi-line-docs/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/multi-url-environment-no-default/src/seed/core/http_client.py b/seed/python-sdk/multi-url-environment-no-default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/multi-url-environment-no-default/src/seed/core/http_client.py +++ b/seed/python-sdk/multi-url-environment-no-default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/multi-url-environment-no-default/tests/utils/test_http_client.py b/seed/python-sdk/multi-url-environment-no-default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/multi-url-environment-no-default/tests/utils/test_http_client.py +++ b/seed/python-sdk/multi-url-environment-no-default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/multi-url-environment/src/seed/core/http_client.py b/seed/python-sdk/multi-url-environment/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/multi-url-environment/src/seed/core/http_client.py +++ b/seed/python-sdk/multi-url-environment/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/multi-url-environment/tests/utils/test_http_client.py b/seed/python-sdk/multi-url-environment/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/multi-url-environment/tests/utils/test_http_client.py +++ b/seed/python-sdk/multi-url-environment/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/no-environment/src/seed/core/http_client.py b/seed/python-sdk/no-environment/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/no-environment/src/seed/core/http_client.py +++ b/seed/python-sdk/no-environment/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/no-environment/tests/utils/test_http_client.py b/seed/python-sdk/no-environment/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/no-environment/tests/utils/test_http_client.py +++ b/seed/python-sdk/no-environment/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/oauth-client-credentials-default/src/seed/core/http_client.py b/seed/python-sdk/oauth-client-credentials-default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/oauth-client-credentials-default/src/seed/core/http_client.py +++ b/seed/python-sdk/oauth-client-credentials-default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/oauth-client-credentials-default/tests/utils/test_http_client.py b/seed/python-sdk/oauth-client-credentials-default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/oauth-client-credentials-default/tests/utils/test_http_client.py +++ b/seed/python-sdk/oauth-client-credentials-default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/oauth-client-credentials-environment-variables/src/seed/core/http_client.py b/seed/python-sdk/oauth-client-credentials-environment-variables/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/oauth-client-credentials-environment-variables/src/seed/core/http_client.py +++ b/seed/python-sdk/oauth-client-credentials-environment-variables/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/oauth-client-credentials-environment-variables/tests/utils/test_http_client.py b/seed/python-sdk/oauth-client-credentials-environment-variables/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/oauth-client-credentials-environment-variables/tests/utils/test_http_client.py +++ b/seed/python-sdk/oauth-client-credentials-environment-variables/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/oauth-client-credentials-nested-root/src/seed/core/http_client.py b/seed/python-sdk/oauth-client-credentials-nested-root/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/oauth-client-credentials-nested-root/src/seed/core/http_client.py +++ b/seed/python-sdk/oauth-client-credentials-nested-root/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/oauth-client-credentials-nested-root/tests/utils/test_http_client.py b/seed/python-sdk/oauth-client-credentials-nested-root/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/oauth-client-credentials-nested-root/tests/utils/test_http_client.py +++ b/seed/python-sdk/oauth-client-credentials-nested-root/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/oauth-client-credentials/src/seed/core/http_client.py b/seed/python-sdk/oauth-client-credentials/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/oauth-client-credentials/src/seed/core/http_client.py +++ b/seed/python-sdk/oauth-client-credentials/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/oauth-client-credentials/tests/utils/test_http_client.py b/seed/python-sdk/oauth-client-credentials/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/oauth-client-credentials/tests/utils/test_http_client.py +++ b/seed/python-sdk/oauth-client-credentials/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/object/src/seed/core/http_client.py b/seed/python-sdk/object/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/object/src/seed/core/http_client.py +++ b/seed/python-sdk/object/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/object/tests/utils/test_http_client.py b/seed/python-sdk/object/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/object/tests/utils/test_http_client.py +++ b/seed/python-sdk/object/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/objects-with-imports/src/seed/core/http_client.py b/seed/python-sdk/objects-with-imports/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/objects-with-imports/src/seed/core/http_client.py +++ b/seed/python-sdk/objects-with-imports/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/objects-with-imports/tests/utils/test_http_client.py b/seed/python-sdk/objects-with-imports/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/objects-with-imports/tests/utils/test_http_client.py +++ b/seed/python-sdk/objects-with-imports/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/optional/src/seed/core/http_client.py b/seed/python-sdk/optional/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/optional/src/seed/core/http_client.py +++ b/seed/python-sdk/optional/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/optional/tests/utils/test_http_client.py b/seed/python-sdk/optional/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/optional/tests/utils/test_http_client.py +++ b/seed/python-sdk/optional/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/package-yml/src/seed/core/http_client.py b/seed/python-sdk/package-yml/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/package-yml/src/seed/core/http_client.py +++ b/seed/python-sdk/package-yml/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/package-yml/tests/utils/test_http_client.py b/seed/python-sdk/package-yml/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/package-yml/tests/utils/test_http_client.py +++ b/seed/python-sdk/package-yml/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/pagination/src/seed/core/http_client.py b/seed/python-sdk/pagination/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/pagination/src/seed/core/http_client.py +++ b/seed/python-sdk/pagination/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/pagination/tests/utils/test_http_client.py b/seed/python-sdk/pagination/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/pagination/tests/utils/test_http_client.py +++ b/seed/python-sdk/pagination/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/plain-text/src/seed/core/http_client.py b/seed/python-sdk/plain-text/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/plain-text/src/seed/core/http_client.py +++ b/seed/python-sdk/plain-text/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/plain-text/tests/utils/test_http_client.py b/seed/python-sdk/plain-text/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/plain-text/tests/utils/test_http_client.py +++ b/seed/python-sdk/plain-text/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/query-parameters/src/seed/core/http_client.py b/seed/python-sdk/query-parameters/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/query-parameters/src/seed/core/http_client.py +++ b/seed/python-sdk/query-parameters/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/query-parameters/tests/utils/test_http_client.py b/seed/python-sdk/query-parameters/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/query-parameters/tests/utils/test_http_client.py +++ b/seed/python-sdk/query-parameters/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/reserved-keywords/src/seed/core/http_client.py b/seed/python-sdk/reserved-keywords/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/reserved-keywords/src/seed/core/http_client.py +++ b/seed/python-sdk/reserved-keywords/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/reserved-keywords/tests/utils/test_http_client.py b/seed/python-sdk/reserved-keywords/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/reserved-keywords/tests/utils/test_http_client.py +++ b/seed/python-sdk/reserved-keywords/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/seed.yml b/seed/python-sdk/seed.yml index 77f972aa466..3520e8dcf20 100644 --- a/seed/python-sdk/seed.yml +++ b/seed/python-sdk/seed.yml @@ -177,7 +177,6 @@ allowedFailures: - exhaustive:pydantic-v1-wrapped # TODO(FER-1837): Address this list - - response-property - websocket - exhaustive:union-utils - extra-properties diff --git a/seed/python-sdk/server-sent-events/src/seed/core/http_client.py b/seed/python-sdk/server-sent-events/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/server-sent-events/src/seed/core/http_client.py +++ b/seed/python-sdk/server-sent-events/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/server-sent-events/tests/utils/test_http_client.py b/seed/python-sdk/server-sent-events/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/server-sent-events/tests/utils/test_http_client.py +++ b/seed/python-sdk/server-sent-events/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/single-url-environment-default/src/seed/core/http_client.py b/seed/python-sdk/single-url-environment-default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/single-url-environment-default/src/seed/core/http_client.py +++ b/seed/python-sdk/single-url-environment-default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/single-url-environment-default/tests/utils/test_http_client.py b/seed/python-sdk/single-url-environment-default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/single-url-environment-default/tests/utils/test_http_client.py +++ b/seed/python-sdk/single-url-environment-default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/single-url-environment-no-default/src/seed/core/http_client.py b/seed/python-sdk/single-url-environment-no-default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/single-url-environment-no-default/src/seed/core/http_client.py +++ b/seed/python-sdk/single-url-environment-no-default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/single-url-environment-no-default/tests/utils/test_http_client.py b/seed/python-sdk/single-url-environment-no-default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/single-url-environment-no-default/tests/utils/test_http_client.py +++ b/seed/python-sdk/single-url-environment-no-default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/streaming-parameter/src/seed/core/http_client.py b/seed/python-sdk/streaming-parameter/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/streaming-parameter/src/seed/core/http_client.py +++ b/seed/python-sdk/streaming-parameter/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/streaming-parameter/tests/utils/test_http_client.py b/seed/python-sdk/streaming-parameter/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/streaming-parameter/tests/utils/test_http_client.py +++ b/seed/python-sdk/streaming-parameter/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/streaming/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/streaming/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/streaming/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/streaming/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/streaming/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/streaming/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/streaming/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/streaming/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/streaming/skip-pydantic-validation/src/seed/core/http_client.py b/seed/python-sdk/streaming/skip-pydantic-validation/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/streaming/skip-pydantic-validation/src/seed/core/http_client.py +++ b/seed/python-sdk/streaming/skip-pydantic-validation/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/streaming/skip-pydantic-validation/tests/utils/test_http_client.py b/seed/python-sdk/streaming/skip-pydantic-validation/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/streaming/skip-pydantic-validation/tests/utils/test_http_client.py +++ b/seed/python-sdk/streaming/skip-pydantic-validation/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/undiscriminated-unions/src/seed/core/http_client.py b/seed/python-sdk/undiscriminated-unions/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/undiscriminated-unions/src/seed/core/http_client.py +++ b/seed/python-sdk/undiscriminated-unions/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/undiscriminated-unions/tests/utils/test_http_client.py b/seed/python-sdk/undiscriminated-unions/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/undiscriminated-unions/tests/utils/test_http_client.py +++ b/seed/python-sdk/undiscriminated-unions/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/unions/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/unions/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/unions/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/unions/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/unions/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/unions/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/unions/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/unions/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/unions/union-utils/src/seed/core/http_client.py b/seed/python-sdk/unions/union-utils/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/unions/union-utils/src/seed/core/http_client.py +++ b/seed/python-sdk/unions/union-utils/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/unions/union-utils/tests/utils/test_http_client.py b/seed/python-sdk/unions/union-utils/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/unions/union-utils/tests/utils/test_http_client.py +++ b/seed/python-sdk/unions/union-utils/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/unknown/src/seed/core/http_client.py b/seed/python-sdk/unknown/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/unknown/src/seed/core/http_client.py +++ b/seed/python-sdk/unknown/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/unknown/tests/utils/test_http_client.py b/seed/python-sdk/unknown/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/unknown/tests/utils/test_http_client.py +++ b/seed/python-sdk/unknown/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/validation/no-custom-config/src/seed/core/http_client.py b/seed/python-sdk/validation/no-custom-config/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/validation/no-custom-config/src/seed/core/http_client.py +++ b/seed/python-sdk/validation/no-custom-config/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/validation/no-custom-config/tests/utils/test_http_client.py b/seed/python-sdk/validation/no-custom-config/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/validation/no-custom-config/tests/utils/test_http_client.py +++ b/seed/python-sdk/validation/no-custom-config/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/validation/with-defaults/src/seed/core/http_client.py b/seed/python-sdk/validation/with-defaults/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/validation/with-defaults/src/seed/core/http_client.py +++ b/seed/python-sdk/validation/with-defaults/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/validation/with-defaults/tests/utils/test_http_client.py b/seed/python-sdk/validation/with-defaults/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/validation/with-defaults/tests/utils/test_http_client.py +++ b/seed/python-sdk/validation/with-defaults/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/variables/src/seed/core/http_client.py b/seed/python-sdk/variables/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/variables/src/seed/core/http_client.py +++ b/seed/python-sdk/variables/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/variables/tests/utils/test_http_client.py b/seed/python-sdk/variables/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/variables/tests/utils/test_http_client.py +++ b/seed/python-sdk/variables/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/version-no-default/src/seed/core/http_client.py b/seed/python-sdk/version-no-default/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/version-no-default/src/seed/core/http_client.py +++ b/seed/python-sdk/version-no-default/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/version-no-default/tests/utils/test_http_client.py b/seed/python-sdk/version-no-default/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/version-no-default/tests/utils/test_http_client.py +++ b/seed/python-sdk/version-no-default/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/version/src/seed/core/http_client.py b/seed/python-sdk/version/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/version/src/seed/core/http_client.py +++ b/seed/python-sdk/version/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/version/tests/utils/test_http_client.py b/seed/python-sdk/version/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/version/tests/utils/test_http_client.py +++ b/seed/python-sdk/version/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None diff --git a/seed/python-sdk/websocket/src/seed/core/http_client.py b/seed/python-sdk/websocket/src/seed/core/http_client.py index 9333d8a7f15..356880bbc3e 100644 --- a/seed/python-sdk/websocket/src/seed/core/http_client.py +++ b/seed/python-sdk/websocket/src/seed/core/http_client.py @@ -142,7 +142,8 @@ def get_request_body( # If both data and json are None, we send json data in the event extra properties are specified json_body = maybe_filter_request_body(json, request_options, omit) - return json_body, data_body + # If you have an empty JSON body, you should just send None + return (json_body if json_body != {} else None), data_body if data_body != {} else None class HttpClient: diff --git a/seed/python-sdk/websocket/tests/utils/test_http_client.py b/seed/python-sdk/websocket/tests/utils/test_http_client.py index edd11ca7afb..a541bae6531 100644 --- a/seed/python-sdk/websocket/tests/utils/test_http_client.py +++ b/seed/python-sdk/websocket/tests/utils/test_http_client.py @@ -45,3 +45,17 @@ def test_get_none_request_body() -> None: assert json_body_extras == {"see you": "later"} assert data_body_extras is None + + +def test_get_empty_json_request_body() -> None: + unrelated_request_options: RequestOptions = {"max_retries": 3} + json_body, data_body = get_request_body(json=None, data=None, request_options=unrelated_request_options, omit=None) + assert json_body is None + assert data_body is None + + json_body_extras, data_body_extras = get_request_body( + json={}, data=None, request_options=unrelated_request_options, omit=None + ) + + assert json_body_extras is None + assert data_body_extras is None