From 8faa7fc87f62590b5c4119dc63d08347ed8eb901 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 28 Dec 2020 09:19:45 -0800 Subject: [PATCH] fix: remove gRPC send/recv limit (#12) --- .../notebook_service/transports/__init__.py | 1 - .../notebook_service/transports/grpc.py | 19 +++++++++++++------ .../transports/grpc_asyncio.py | 15 ++++++++++++--- .../cloud/notebooks_v1beta1/types/__init__.py | 1 - notebooks-v1beta1-py.tar.gz | 0 synth.metadata | 7 +++---- .../test_notebook_service.py | 8 ++++++++ 7 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 notebooks-v1beta1-py.tar.gz diff --git a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/__init__.py b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/__init__.py index be496c8..bc1ba94 100644 --- a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/__init__.py +++ b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/__init__.py @@ -28,7 +28,6 @@ _transport_registry["grpc"] = NotebookServiceGrpcTransport _transport_registry["grpc_asyncio"] = NotebookServiceGrpcAsyncIOTransport - __all__ = ( "NotebookServiceTransport", "NotebookServiceGrpcTransport", diff --git a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py index e2b843f..9b30743 100644 --- a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py +++ b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc.py @@ -150,6 +150,10 @@ def __init__( ssl_credentials=ssl_credentials, scopes=scopes or self.AUTH_SCOPES, quota_project_id=quota_project_id, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._ssl_channel_credentials = ssl_credentials else: @@ -168,9 +172,14 @@ def __init__( ssl_credentials=ssl_channel_credentials, scopes=scopes or self.AUTH_SCOPES, quota_project_id=quota_project_id, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._stubs = {} # type: Dict[str, Callable] + self._operations_client = None # Run the base constructor. super().__init__( @@ -194,7 +203,7 @@ def create_channel( ) -> grpc.Channel: """Create and return a gRPC channel object. Args: - address (Optionsl[str]): The host for the channel to use. + address (Optional[str]): The host for the channel to use. credentials (Optional[~.Credentials]): The authorization credentials to attach to requests. These credentials identify this application to the service. If @@ -241,13 +250,11 @@ def operations_client(self) -> operations_v1.OperationsClient: client. """ # Sanity check: Only create a new client if we do not already have one. - if "operations_client" not in self.__dict__: - self.__dict__["operations_client"] = operations_v1.OperationsClient( - self.grpc_channel - ) + if self._operations_client is None: + self._operations_client = operations_v1.OperationsClient(self.grpc_channel) # Return the client from cache. - return self.__dict__["operations_client"] + return self._operations_client @property def list_instances( diff --git a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py index 5ee2c81..a68037d 100644 --- a/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py +++ b/google/cloud/notebooks_v1beta1/services/notebook_service/transports/grpc_asyncio.py @@ -195,6 +195,10 @@ def __init__( ssl_credentials=ssl_credentials, scopes=scopes or self.AUTH_SCOPES, quota_project_id=quota_project_id, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) self._ssl_channel_credentials = ssl_credentials else: @@ -213,6 +217,10 @@ def __init__( ssl_credentials=ssl_channel_credentials, scopes=scopes or self.AUTH_SCOPES, quota_project_id=quota_project_id, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) # Run the base constructor. @@ -226,6 +234,7 @@ def __init__( ) self._stubs = {} + self._operations_client = None @property def grpc_channel(self) -> aio.Channel: @@ -245,13 +254,13 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient: client. """ # Sanity check: Only create a new client if we do not already have one. - if "operations_client" not in self.__dict__: - self.__dict__["operations_client"] = operations_v1.OperationsAsyncClient( + if self._operations_client is None: + self._operations_client = operations_v1.OperationsAsyncClient( self.grpc_channel ) # Return the client from cache. - return self.__dict__["operations_client"] + return self._operations_client @property def list_instances( diff --git a/google/cloud/notebooks_v1beta1/types/__init__.py b/google/cloud/notebooks_v1beta1/types/__init__.py index 22938b5..853a88d 100644 --- a/google/cloud/notebooks_v1beta1/types/__init__.py +++ b/google/cloud/notebooks_v1beta1/types/__init__.py @@ -47,7 +47,6 @@ DeleteEnvironmentRequest, ) - __all__ = ( "Environment", "VmImage", diff --git a/notebooks-v1beta1-py.tar.gz b/notebooks-v1beta1-py.tar.gz deleted file mode 100644 index e69de29..0000000 diff --git a/synth.metadata b/synth.metadata index 6dd9f2a..15d3a4b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-notebooks.git", - "sha": "8e42088da1eb05c053a8255a2ac36790a95b00d2" + "sha": "c636859c53d40e4be9211e1ced0922395a16d880" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "830887bae22f690647a0fd8b5c9eccd8d6858d74", - "internalRef": "345047174" + "sha": "dd372aa22ded7a8ba6f0e03a80e06358a3fa0907", + "internalRef": "347055288" } }, { @@ -114,7 +114,6 @@ "google/cloud/notebooks_v1beta1/types/instance.py", "google/cloud/notebooks_v1beta1/types/service.py", "mypy.ini", - "notebooks-v1beta1-py.tar.gz", "noxfile.py", "renovate.json", "scripts/decrypt-secrets.sh", diff --git a/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py b/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py index ff762dc..d0c6432 100644 --- a/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py +++ b/tests/unit/gapic/notebooks_v1beta1/test_notebook_service.py @@ -3555,6 +3555,10 @@ def test_notebook_service_transport_channel_mtls_with_client_cert_source( scopes=("https://www.googleapis.com/auth/cloud-platform",), ssl_credentials=mock_ssl_cred, quota_project_id=None, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) assert transport.grpc_channel == mock_grpc_channel assert transport._ssl_channel_credentials == mock_ssl_cred @@ -3596,6 +3600,10 @@ def test_notebook_service_transport_channel_mtls_with_adc(transport_class): scopes=("https://www.googleapis.com/auth/cloud-platform",), ssl_credentials=mock_ssl_cred, quota_project_id=None, + options=[ + ("grpc.max_send_message_length", -1), + ("grpc.max_receive_message_length", -1), + ], ) assert transport.grpc_channel == mock_grpc_channel