Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Commit

Permalink
feat: Add support for REST transport (#290)
Browse files Browse the repository at this point in the history
- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 474644226

Source-Link: googleapis/googleapis@f90b329

Source-Link: googleapis/googleapis-gen@4ad8763
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFkODc2M2JkZTY3NmY5MmEzZWI3MDc1M2FlMWNmZWQwZTgxMzg3ZSJ9

PiperOrigin-RevId: 474571730

Source-Link: googleapis/googleapis@5a9ee4d

Source-Link: googleapis/googleapis-gen@ceafe52
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2VhZmU1MjFmMTM3NjgwZmRlZTJmOWNhOWUxOTQ3Y2RkODI1MDcwZCJ9

fix(deps): require google-api-core>=1.33.1,>=2.8.0
fix(deps): require protobuf >= 3.20.1
  • Loading branch information
gcf-owl-bot[bot] committed Sep 16, 2022
1 parent 8a9b4c9 commit 1e4f58e
Show file tree
Hide file tree
Showing 30 changed files with 4,418 additions and 159 deletions.
10 changes: 10 additions & 0 deletions google/analytics/data_v1alpha/gapic_metadata.json
Expand Up @@ -26,6 +26,16 @@
]
}
}
},
"rest": {
"libraryClient": "AlphaAnalyticsDataClient",
"rpcs": {
"RunFunnelReport": {
"methods": [
"run_funnel_report"
]
}
}
}
}
}
Expand Down
Expand Up @@ -39,6 +39,7 @@
from .transports.base import AlphaAnalyticsDataTransport, DEFAULT_CLIENT_INFO
from .transports.grpc import AlphaAnalyticsDataGrpcTransport
from .transports.grpc_asyncio import AlphaAnalyticsDataGrpcAsyncIOTransport
from .transports.rest import AlphaAnalyticsDataRestTransport


class AlphaAnalyticsDataClientMeta(type):
Expand All @@ -54,6 +55,7 @@ class AlphaAnalyticsDataClientMeta(type):
) # type: Dict[str, Type[AlphaAnalyticsDataTransport]]
_transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport
_transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport
_transport_registry["rest"] = AlphaAnalyticsDataRestTransport

def get_transport_class(
cls,
Expand Down Expand Up @@ -325,6 +327,9 @@ def __init__(
transport (Union[str, AlphaAnalyticsDataTransport]): The
transport to use. If set to None, a transport is chosen
automatically.
NOTE: "rest" transport functionality is currently in a
beta state (preview). We welcome your feedback via an
issue in this library's source repository.
client_options (google.api_core.client_options.ClientOptions): Custom options for the
client. It won't take effect if a ``transport`` instance is provided.
(1) The ``api_endpoint`` property can be used to override the
Expand Down
Expand Up @@ -19,6 +19,8 @@
from .base import AlphaAnalyticsDataTransport
from .grpc import AlphaAnalyticsDataGrpcTransport
from .grpc_asyncio import AlphaAnalyticsDataGrpcAsyncIOTransport
from .rest import AlphaAnalyticsDataRestTransport
from .rest import AlphaAnalyticsDataRestInterceptor


# Compile a registry of transports.
Expand All @@ -27,9 +29,12 @@
) # type: Dict[str, Type[AlphaAnalyticsDataTransport]]
_transport_registry["grpc"] = AlphaAnalyticsDataGrpcTransport
_transport_registry["grpc_asyncio"] = AlphaAnalyticsDataGrpcAsyncIOTransport
_transport_registry["rest"] = AlphaAnalyticsDataRestTransport

__all__ = (
"AlphaAnalyticsDataTransport",
"AlphaAnalyticsDataGrpcTransport",
"AlphaAnalyticsDataGrpcAsyncIOTransport",
"AlphaAnalyticsDataRestTransport",
"AlphaAnalyticsDataRestInterceptor",
)
@@ -0,0 +1,319 @@
# -*- coding: utf-8 -*-
# Copyright 2022 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.
#

from google.auth.transport.requests import AuthorizedSession # type: ignore
import json # type: ignore
import grpc # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.api_core import exceptions as core_exceptions
from google.api_core import retry as retries
from google.api_core import rest_helpers
from google.api_core import rest_streaming
from google.api_core import path_template
from google.api_core import gapic_v1

from google.protobuf import json_format
from requests import __version__ as requests_version
import dataclasses
import re
from typing import Callable, Dict, List, Optional, Sequence, Tuple, Union
import warnings

try:
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
except AttributeError: # pragma: NO COVER
OptionalRetry = Union[retries.Retry, object] # type: ignore


from google.analytics.data_v1alpha.types import analytics_data_api

from .base import (
AlphaAnalyticsDataTransport,
DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO,
)


DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version,
grpc_version=None,
rest_version=requests_version,
)


class AlphaAnalyticsDataRestInterceptor:
"""Interceptor for AlphaAnalyticsData.
Interceptors are used to manipulate requests, request metadata, and responses
in arbitrary ways.
Example use cases include:
* Logging
* Verifying requests according to service or custom semantics
* Stripping extraneous information from responses
These use cases and more can be enabled by injecting an
instance of a custom subclass when constructing the AlphaAnalyticsDataRestTransport.
.. code-block:: python
class MyCustomAlphaAnalyticsDataInterceptor(AlphaAnalyticsDataRestInterceptor):
def pre_run_funnel_report(request, metadata):
logging.log(f"Received request: {request}")
return request, metadata
def post_run_funnel_report(response):
logging.log(f"Received response: {response}")
transport = AlphaAnalyticsDataRestTransport(interceptor=MyCustomAlphaAnalyticsDataInterceptor())
client = AlphaAnalyticsDataClient(transport=transport)
"""

def pre_run_funnel_report(
self,
request: analytics_data_api.RunFunnelReportRequest,
metadata: Sequence[Tuple[str, str]],
) -> Tuple[analytics_data_api.RunFunnelReportRequest, Sequence[Tuple[str, str]]]:
"""Pre-rpc interceptor for run_funnel_report
Override in a subclass to manipulate the request or metadata
before they are sent to the AlphaAnalyticsData server.
"""
return request, metadata

def post_run_funnel_report(
self, response: analytics_data_api.RunFunnelReportResponse
) -> analytics_data_api.RunFunnelReportResponse:
"""Post-rpc interceptor for run_funnel_report
Override in a subclass to manipulate the response
after it is returned by the AlphaAnalyticsData server but before
it is returned to user code.
"""
return response


@dataclasses.dataclass
class AlphaAnalyticsDataRestStub:
_session: AuthorizedSession
_host: str
_interceptor: AlphaAnalyticsDataRestInterceptor


class AlphaAnalyticsDataRestTransport(AlphaAnalyticsDataTransport):
"""REST backend transport for AlphaAnalyticsData.
Google Analytics reporting data service.
This class defines the same methods as the primary client, so the
primary client can load the underlying transport implementation
and call it.
It sends JSON representations of protocol buffers over HTTP/1.1
NOTE: This REST transport functionality is currently in a beta
state (preview). We welcome your feedback via an issue in this
library's source repository. Thank you!
"""

def __init__(
self,
*,
host: str = "analyticsdata.googleapis.com",
credentials: ga_credentials.Credentials = None,
credentials_file: str = None,
scopes: Sequence[str] = None,
client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
quota_project_id: Optional[str] = None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
url_scheme: str = "https",
interceptor: Optional[AlphaAnalyticsDataRestInterceptor] = None,
api_audience: Optional[str] = None,
) -> None:
"""Instantiate the transport.
NOTE: This REST transport functionality is currently in a beta
state (preview). We welcome your feedback via a GitHub issue in
this library's repository. Thank you!
Args:
host (Optional[str]):
The hostname to connect to.
credentials (Optional[google.auth.credentials.Credentials]): The
authorization credentials to attach to requests. These
credentials identify the application to the service; if none
are specified, the client will attempt to ascertain the
credentials from the environment.
credentials_file (Optional[str]): A file with credentials that can
be loaded with :func:`google.auth.load_credentials_from_file`.
This argument is ignored if ``channel`` is provided.
scopes (Optional(Sequence[str])): A list of scopes. This argument is
ignored if ``channel`` is provided.
client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client
certificate to configure mutual TLS HTTP channel. It is ignored
if ``channel`` is provided.
quota_project_id (Optional[str]): An optional project to use for billing
and quota.
client_info (google.api_core.gapic_v1.client_info.ClientInfo):
The client info used to send a user-agent string along with
API requests. If ``None``, then default info will be used.
Generally, you only need to set this if you are developing
your own client library.
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
be used for service account credentials.
url_scheme: the protocol scheme for the API endpoint. Normally
"https", but for testing or local servers,
"http" can be specified.
"""
# Run the base constructor
# TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc.
# TODO: When custom host (api_endpoint) is set, `scopes` must *also* be set on the
# credentials object
maybe_url_match = re.match("^(?P<scheme>http(?:s)?://)?(?P<host>.*)$", host)
if maybe_url_match is None:
raise ValueError(
f"Unexpected hostname structure: {host}"
) # pragma: NO COVER

url_match_items = maybe_url_match.groupdict()

host = f"{url_scheme}://{host}" if not url_match_items["scheme"] else host

super().__init__(
host=host,
credentials=credentials,
client_info=client_info,
always_use_jwt_access=always_use_jwt_access,
api_audience=api_audience,
)
self._session = AuthorizedSession(
self._credentials, default_host=self.DEFAULT_HOST
)
if client_cert_source_for_mtls:
self._session.configure_mtls_channel(client_cert_source_for_mtls)
self._interceptor = interceptor or AlphaAnalyticsDataRestInterceptor()
self._prep_wrapped_messages(client_info)

class _RunFunnelReport(AlphaAnalyticsDataRestStub):
def __hash__(self):
return hash("RunFunnelReport")

def __call__(
self,
request: analytics_data_api.RunFunnelReportRequest,
*,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> analytics_data_api.RunFunnelReportResponse:
r"""Call the run funnel report method over HTTP.
Args:
request (~.analytics_data_api.RunFunnelReportRequest):
The request object. The request for a funnel report.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
metadata (Sequence[Tuple[str, str]]): Strings which should be
sent along with the request as metadata.
Returns:
~.analytics_data_api.RunFunnelReportResponse:
The funnel report response contains
two sub reports. The two sub reports are
different combinations of dimensions and
metrics.
"""

http_options: List[Dict[str, str]] = [
{
"method": "post",
"uri": "/v1alpha/{property=properties/*}:runFunnelReport",
"body": "*",
},
]
request, metadata = self._interceptor.pre_run_funnel_report(
request, metadata
)
pb_request = analytics_data_api.RunFunnelReportRequest.pb(request)
transcoded_request = path_template.transcode(http_options, pb_request)

# Jsonify the request body

body = json_format.MessageToJson(
transcoded_request["body"],
including_default_value_fields=False,
use_integers_for_enums=False,
)
uri = transcoded_request["uri"]
method = transcoded_request["method"]

# Jsonify the query params
query_params = json.loads(
json_format.MessageToJson(
transcoded_request["query_params"],
including_default_value_fields=False,
use_integers_for_enums=False,
)
)

# Send the request
headers = dict(metadata)
headers["Content-Type"] = "application/json"
response = getattr(self._session, method)(
"{host}{uri}".format(host=self._host, uri=uri),
timeout=timeout,
headers=headers,
params=rest_helpers.flatten_query_params(query_params, strict=True),
data=body,
)

# In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception
# subclass.
if response.status_code >= 400:
raise core_exceptions.from_http_response(response)

# Return the response
resp = analytics_data_api.RunFunnelReportResponse()
pb_resp = analytics_data_api.RunFunnelReportResponse.pb(resp)

json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
resp = self._interceptor.post_run_funnel_report(resp)
return resp

@property
def run_funnel_report(
self,
) -> Callable[
[analytics_data_api.RunFunnelReportRequest],
analytics_data_api.RunFunnelReportResponse,
]:
# The return type is fine, but mypy isn't sophisticated enough to determine what's going on here.
# In C++ this would require a dynamic_cast
return self._RunFunnelReport(self._session, self._host, self._interceptor) # type: ignore

@property
def kind(self) -> str:
return "rest"

def close(self):
self._session.close()


__all__ = ("AlphaAnalyticsDataRestTransport",)

0 comments on commit 1e4f58e

Please sign in to comment.