google-cloud-devicestreaming 0.3.0__tar.gz → 0.4.0__tar.gz

{google_cloud_devicestreaming-0.3.0/google_cloud_devicestreaming.egg-info → google_cloud_devicestreaming-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-devicestreaming
-Version: 0.3.0
+Version: 0.4.0
 Summary: Google Cloud Devicestreaming API client library
 Home-page: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-devicestreaming
 Author: Google LLC
@@ -12,8 +12,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -22,15 +20,15 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Internet
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 License-File: LICENSE
-Requires-Dist: google-api-core[grpc]!=2.0.*,!=2.1.*,!=2.10.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,<3.0.0,>=1.34.1
+Requires-Dist: google-api-core[grpc]<3.0.0,>=2.11.0
 Requires-Dist: google-auth!=2.24.0,!=2.25.0,<3.0.0,>=2.14.1
 Requires-Dist: grpcio<2.0.0,>=1.33.2
 Requires-Dist: grpcio<2.0.0,>=1.75.1; python_version >= "3.14"
 Requires-Dist: proto-plus<2.0.0,>=1.22.3
 Requires-Dist: proto-plus<2.0.0,>=1.25.0; python_version >= "3.13"
-Requires-Dist: protobuf!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<7.0.0,>=3.20.2
+Requires-Dist: protobuf<8.0.0,>=4.25.8
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -106,14 +104,14 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7, including 3.14
+Python >= 3.9, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
 
 Unsupported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Python <= 3.6
+Python <= 3.8
 
 If you are using an `end-of-life`_
 version of Python, we recommend that you update as soon as possible to an actively supported version.

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/README.rst

@@ -61,14 +61,14 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7, including 3.14
+Python >= 3.9, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
 
 Unsupported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Python <= 3.6
+Python <= 3.8
 
 If you are using an `end-of-life`_
 version of Python, we recommend that you update as soon as possible to an actively supported version.

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.3.0"  # {x-release-please-version}
+__version__ = "0.4.0"  # {x-release-please-version}

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/__init__.py

@@ -28,6 +28,7 @@ else:  # pragma: NO COVER
     # this code path once we drop support for Python 3.7
     import importlib_metadata as metadata
 
+
 from .services.direct_access_service import (
     DirectAccessServiceAsyncClient,
     DirectAccessServiceClient,

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.3.0"  # {x-release-please-version}
+__version__ = "0.4.0"  # {x-release-please-version}

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/async_client.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from collections import OrderedDict
 import logging as std_logging
 import re
+from collections import OrderedDict
 from typing import (
     AsyncIterable,
     AsyncIterator,
@@ -32,13 +32,13 @@ from typing import (
     Union,
 )
 
+import google.protobuf
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry_async as retries
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
-import google.protobuf
 
 from google.cloud.devicestreaming_v1 import gapic_version as package_version
 
@@ -47,9 +47,9 @@ try:
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
 
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 
 from google.cloud.devicestreaming_v1.services.direct_access_service import pagers
 from google.cloud.devicestreaming_v1.types import adb_service, service
@@ -133,7 +133,10 @@ class DirectAccessServiceAsyncClient:
         Returns:
             DirectAccessServiceAsyncClient: The constructed client.
         """
-        return DirectAccessServiceClient.from_service_account_info.__func__(DirectAccessServiceAsyncClient, info, *args, **kwargs)  # type: ignore
+        sa_info_func = (
+            DirectAccessServiceClient.from_service_account_info.__func__  # type: ignore
+        )
+        return sa_info_func(DirectAccessServiceAsyncClient, info, *args, **kwargs)
 
     @classmethod
     def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -149,7 +152,10 @@ class DirectAccessServiceAsyncClient:
         Returns:
             DirectAccessServiceAsyncClient: The constructed client.
         """
-        return DirectAccessServiceClient.from_service_account_file.__func__(DirectAccessServiceAsyncClient, filename, *args, **kwargs)  # type: ignore
+        sa_file_func = (
+            DirectAccessServiceClient.from_service_account_file.__func__  # type: ignore
+        )
+        return sa_file_func(DirectAccessServiceAsyncClient, filename, *args, **kwargs)
 
     from_service_account_json = from_service_account_file
 
@@ -187,7 +193,9 @@ class DirectAccessServiceAsyncClient:
         Raises:
             google.auth.exceptions.MutualTLSChannelError: If any errors happen.
         """
-        return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source(client_options)  # type: ignore
+        return DirectAccessServiceClient.get_mtls_endpoint_and_cert_source(
+            client_options
+        )  # type: ignore
 
     @property
     def transport(self) -> DirectAccessServiceTransport:
@@ -199,7 +207,7 @@ class DirectAccessServiceAsyncClient:
         return self._client.transport
 
     @property
-    def api_endpoint(self):
+    def api_endpoint(self) -> str:
         """Return the API endpoint used by the client instance.
 
         Returns:

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/client.py

@@ -13,12 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from collections import OrderedDict
-from http import HTTPStatus
 import json
 import logging as std_logging
 import os
 import re
+import warnings
+from collections import OrderedDict
+from http import HTTPStatus
 from typing import (
     Callable,
     Dict,
@@ -34,8 +35,8 @@ from typing import (
     Union,
     cast,
 )
-import warnings
 
+import google.protobuf
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
@@ -45,7 +46,6 @@ from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
-import google.protobuf
 
 from google.cloud.devicestreaming_v1 import gapic_version as package_version
 
@@ -63,9 +63,9 @@ except ImportError:  # pragma: NO COVER
 
 _LOGGER = std_logging.getLogger(__name__)
 
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 
 from google.cloud.devicestreaming_v1.services.direct_access_service import pagers
 from google.cloud.devicestreaming_v1.types import adb_service, service
@@ -84,9 +84,7 @@ class DirectAccessServiceClientMeta(type):
     objects.
     """
 
-    _transport_registry = (
-        OrderedDict()
-    )  # type: Dict[str, Type[DirectAccessServiceTransport]]
+    _transport_registry = OrderedDict()  # type: Dict[str, Type[DirectAccessServiceTransport]]
     _transport_registry["grpc"] = DirectAccessServiceGrpcTransport
     _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport
     _transport_registry["rest"] = DirectAccessServiceRestTransport
@@ -128,7 +126,7 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
     """
 
     @staticmethod
-    def _get_default_mtls_endpoint(api_endpoint):
+    def _get_default_mtls_endpoint(api_endpoint) -> Optional[str]:
         """Converts api endpoint to mTLS endpoint.
 
         Convert "*.sandbox.googleapis.com" and "*.googleapis.com" to
@@ -136,7 +134,7 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
         Args:
             api_endpoint (Optional[str]): the api endpoint to convert.
         Returns:
-            str: converted mTLS api endpoint.
+            Optional[str]: converted mTLS api endpoint.
         """
         if not api_endpoint:
             return api_endpoint
@@ -146,6 +144,10 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
         )
 
         m = mtls_endpoint_re.match(api_endpoint)
+        if m is None:
+            # Could not parse api_endpoint; return as-is.
+            return api_endpoint
+
         name, mtls, sandbox, googledomain = m.groups()
         if mtls or not googledomain:
             return api_endpoint
@@ -450,7 +452,7 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
     @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
-    ):
+    ) -> str:
         """Return the API endpoint used by the client.
 
         Args:
@@ -547,7 +549,7 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
             error._details.append(json.dumps(cred_info))
 
     @property
-    def api_endpoint(self):
+    def api_endpoint(self) -> str:
         """Return the API endpoint used by the client instance.
 
         Returns:
@@ -638,18 +640,16 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
 
         universe_domain_opt = getattr(self._client_options, "universe_domain", None)
 
-        (
-            self._use_client_cert,
-            self._use_mtls_endpoint,
-            self._universe_domain_env,
-        ) = DirectAccessServiceClient._read_environment_variables()
+        self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = (
+            DirectAccessServiceClient._read_environment_variables()
+        )
         self._client_cert_source = DirectAccessServiceClient._get_client_cert_source(
             self._client_options.client_cert_source, self._use_client_cert
         )
         self._universe_domain = DirectAccessServiceClient._get_universe_domain(
             universe_domain_opt, self._universe_domain_env
         )
-        self._api_endpoint = None  # updated below, depending on `transport`
+        self._api_endpoint: str = ""  # updated below, depending on `transport`
 
         # Initialize the universe domain validation.
         self._is_universe_domain_valid = False
@@ -677,8 +677,7 @@ class DirectAccessServiceClient(metaclass=DirectAccessServiceClientMeta):
                 )
             if self._client_options.scopes:
                 raise ValueError(
-                    "When providing a transport instance, provide its scopes "
-                    "directly."
+                    "When providing a transport instance, provide its scopes directly."
                 )
             self._transport = cast(DirectAccessServiceTransport, transport)
             self._api_endpoint = self._transport.host

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/pagers.py

@@ -67,7 +67,7 @@ class ListDeviceSessionsPager:
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiate the pager.
 
@@ -143,7 +143,7 @@ class ListDeviceSessionsAsyncPager:
         *,
         retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiates the pager.
 

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/__init__.py

@@ -22,9 +22,7 @@ from .grpc_asyncio import DirectAccessServiceGrpcAsyncIOTransport
 from .rest import DirectAccessServiceRestInterceptor, DirectAccessServiceRestTransport
 
 # Compile a registry of transports.
-_transport_registry = (
-    OrderedDict()
-)  # type: Dict[str, Type[DirectAccessServiceTransport]]
+_transport_registry = OrderedDict()  # type: Dict[str, Type[DirectAccessServiceTransport]]
 _transport_registry["grpc"] = DirectAccessServiceGrpcTransport
 _transport_registry["grpc_asyncio"] = DirectAccessServiceGrpcAsyncIOTransport
 _transport_registry["rest"] = DirectAccessServiceRestTransport

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/base.py

@@ -17,14 +17,14 @@ import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
 
 import google.api_core
+import google.auth  # type: ignore
+import google.protobuf
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
-import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
-import google.protobuf
-from google.protobuf import empty_pb2  # type: ignore
 
 from google.cloud.devicestreaming_v1 import gapic_version as package_version
 from google.cloud.devicestreaming_v1.types import adb_service, service
@@ -81,10 +81,12 @@ class DirectAccessServiceTransport(abc.ABC):
                 your own client library.
             always_use_jwt_access (Optional[bool]): Whether self signed JWT should
                 be used for service account credentials.
+            api_audience (Optional[str]): The intended audience for the API calls
+                to the service that will be set when using certain 3rd party
+                authentication flows. Audience is typically a resource identifier.
+                If not set, the host value will be used as a default.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -99,11 +101,16 @@ class DirectAccessServiceTransport(abc.ABC):
 
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
-                credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
+                credentials_file,
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
         elif credentials is None and not self._ignore_credentials:
             credentials, _ = google.auth.default(
-                **scopes_kwargs, quota_project_id=quota_project_id
+                scopes=scopes,
+                quota_project_id=quota_project_id,
+                default_scopes=self.AUTH_SCOPES,
             )
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
@@ -127,6 +134,8 @@ class DirectAccessServiceTransport(abc.ABC):
             host += ":443"
         self._host = host
 
+        self._wrapped_methods: Dict[Callable, Callable] = {}
+
     @property
     def host(self):
         return self._host

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc.py

@@ -16,18 +16,18 @@
 import json
 import logging as std_logging
 import pickle
-from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 import warnings
+from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1, grpc_helpers
 import google.auth  # type: ignore
-from google.auth import credentials as ga_credentials  # type: ignore
-from google.auth.transport.grpc import SslCredentials  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
-from google.protobuf.json_format import MessageToJson
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 import google.protobuf.message
 import grpc  # type: ignore
 import proto  # type: ignore
+from google.api_core import gapic_v1, grpc_helpers
+from google.auth import credentials as ga_credentials  # type: ignore
+from google.auth.transport.grpc import SslCredentials  # type: ignore
+from google.protobuf.json_format import MessageToJson
 
 from google.cloud.devicestreaming_v1.types import adb_service, service
 
@@ -55,7 +55,7 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # pragma: NO
             elif isinstance(request, google.protobuf.message.Message):
                 request_payload = MessageToJson(request)
             else:
-                request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
+                request_payload = f"{type(request).__name__}: {pickle.dumps(request)!r}"
 
             request_metadata = {
                 key: value.decode("utf-8") if isinstance(value, bytes) else value
@@ -90,7 +90,7 @@ class _LoggingClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # pragma: NO
             elif isinstance(result, google.protobuf.message.Message):
                 response_payload = MessageToJson(result)
             else:
-                response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
+                response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}"
             grpc_response = {
                 "payload": response_payload,
                 "metadata": metadata,
@@ -195,6 +195,10 @@ class DirectAccessServiceGrpcTransport(DirectAccessServiceTransport):
                 your own client library.
             always_use_jwt_access (Optional[bool]): Whether self signed JWT should
                 be used for service account credentials.
+            api_audience (Optional[str]): The intended audience for the API calls
+                to the service that will be set when using certain 3rd party
+                authentication flows. Audience is typically a resource identifier.
+                If not set, the host value will be used as a default.
 
         Raises:
           google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/grpc_asyncio.py

@@ -17,20 +17,20 @@ import inspect
 import json
 import logging as std_logging
 import pickle
-from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 import warnings
+from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
+import google.protobuf.message
+import grpc  # type: ignore
+import proto  # type: ignore
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1, grpc_helpers_async
 from google.api_core import retry_async as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf.json_format import MessageToJson
-import google.protobuf.message
-import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore
-import proto  # type: ignore
 
 from google.cloud.devicestreaming_v1.types import adb_service, service
 
@@ -61,7 +61,7 @@ class _LoggingClientAIOInterceptor(
             elif isinstance(request, google.protobuf.message.Message):
                 request_payload = MessageToJson(request)
             else:
-                request_payload = f"{type(request).__name__}: {pickle.dumps(request)}"
+                request_payload = f"{type(request).__name__}: {pickle.dumps(request)!r}"
 
             request_metadata = {
                 key: value.decode("utf-8") if isinstance(value, bytes) else value
@@ -96,7 +96,7 @@ class _LoggingClientAIOInterceptor(
             elif isinstance(result, google.protobuf.message.Message):
                 response_payload = MessageToJson(result)
             else:
-                response_payload = f"{type(result).__name__}: {pickle.dumps(result)}"
+                response_payload = f"{type(result).__name__}: {pickle.dumps(result)!r}"
             grpc_response = {
                 "payload": response_payload,
                 "metadata": metadata,
@@ -246,6 +246,10 @@ class DirectAccessServiceGrpcAsyncIOTransport(DirectAccessServiceTransport):
                 your own client library.
             always_use_jwt_access (Optional[bool]): Whether self signed JWT should
                 be used for service account credentials.
+            api_audience (Optional[str]): The intended audience for the API calls
+                to the service that will be set when using certain 3rd party
+                authentication flows. Audience is typically a resource identifier.
+                If not set, the host value will be used as a default.
 
         Raises:
             google.auth.exceptions.MutualTlsChannelError: If mutual TLS transport

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest.py

@@ -16,16 +16,16 @@
 import dataclasses
 import json  # type: ignore
 import logging
-from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 import warnings
+from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
+import google.protobuf
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1, rest_helpers, rest_streaming
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.requests import AuthorizedSession  # type: ignore
-import google.protobuf
-from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import json_format
 from requests import __version__ as requests_version
 
@@ -400,6 +400,12 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
             url_scheme: the protocol scheme for the API endpoint.  Normally
                 "https", but for testing or local servers,
                 "http" can be specified.
+            interceptor (Optional[DirectAccessServiceRestInterceptor]): Interceptor used
+                to manipulate requests, request metadata, and responses.
+            api_audience (Optional[str]): The intended audience for the API calls
+                to the service that will be set when using certain 3rd party
+                authentication flows. Audience is typically a resource identifier.
+                If not set, the host value will be used as a default.
         """
         # Run the base constructor
         # TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc.
@@ -493,9 +499,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
                     be of type `bytes`.
             """
 
-            http_options = (
-                _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options()
-            )
+            http_options = _BaseDirectAccessServiceRestTransport._BaseCancelDeviceSession._get_http_options()
 
             request, metadata = self._interceptor.pre_cancel_device_session(
                 request, metadata
@@ -521,7 +525,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
                 )
                 method = transcoded_request["method"]
                 try:
-                    request_payload = json_format.MessageToJson(request)
+                    request_payload = type(request).to_json(request)
                 except:
                     request_payload = None
                 http_request = {
@@ -617,9 +621,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
 
             """
 
-            http_options = (
-                _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options()
-            )
+            http_options = _BaseDirectAccessServiceRestTransport._BaseCreateDeviceSession._get_http_options()
 
             request, metadata = self._interceptor.pre_create_device_session(
                 request, metadata
@@ -774,9 +776,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
 
             """
 
-            http_options = (
-                _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options()
-            )
+            http_options = _BaseDirectAccessServiceRestTransport._BaseGetDeviceSession._get_http_options()
 
             request, metadata = self._interceptor.pre_get_device_session(
                 request, metadata
@@ -924,9 +924,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
 
             """
 
-            http_options = (
-                _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options()
-            )
+            http_options = _BaseDirectAccessServiceRestTransport._BaseListDeviceSessions._get_http_options()
 
             request, metadata = self._interceptor.pre_list_device_sessions(
                 request, metadata
@@ -1079,9 +1077,7 @@ class DirectAccessServiceRestTransport(_BaseDirectAccessServiceRestTransport):
 
             """
 
-            http_options = (
-                _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options()
-            )
+            http_options = _BaseDirectAccessServiceRestTransport._BaseUpdateDeviceSession._get_http_options()
 
             request, metadata = self._interceptor.pre_update_device_session(
                 request, metadata

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/services/direct_access_service/transports/rest_base.py

@@ -17,8 +17,8 @@ import json  # type: ignore
 import re
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
 from google.api_core import gapic_v1, path_template
-from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import json_format
 
 from google.cloud.devicestreaming_v1.types import adb_service, service

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/types/adb_service.py

@@ -158,6 +158,7 @@ class StatusUpdate(proto.Message):
             CONNECTING (14):
                 The ADB device is in the "connecting" status.
         """
+
         DEVICE_STATE_UNSPECIFIED = 0
         DEVICE = 1
         RECOVERY = 2

{google_cloud_devicestreaming-0.3.0 → google_cloud_devicestreaming-0.4.0}/google/cloud/devicestreaming_v1/types/service.py

@@ -17,9 +17,9 @@ from __future__ import annotations
 
 from typing import MutableMapping, MutableSequence
 
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
+import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 import proto  # type: ignore
 
 __protobuf__ = proto.module(
@@ -275,6 +275,7 @@ class DeviceSession(proto.Message):
                 internal reason, such as an infrastructure
                 failure.
         """
+
         SESSION_STATE_UNSPECIFIED = 0
         REQUESTED = 1
         PENDING = 2