diff --git a/packages/google-cloud-language/.github/.OwlBot.lock.yaml b/packages/google-cloud-language/.github/.OwlBot.lock.yaml index bc893c979e20..7c454abf76f3 100644 --- a/packages/google-cloud-language/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-language/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163 -# created: 2022-04-06T10:30:21.687684602Z + digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416 +# created: 2022-04-20T23:42:53.970438194Z diff --git a/packages/google-cloud-language/docs/conf.py b/packages/google-cloud-language/docs/conf.py index 8296ba537cad..0c13ee093bd7 100644 --- a/packages/google-cloud-language/docs/conf.py +++ b/packages/google-cloud-language/docs/conf.py @@ -24,9 +24,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os import shlex +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/packages/google-cloud-language/google/cloud/language/__init__.py b/packages/google-cloud-language/google/cloud/language/__init__.py index 07624150a737..60d1431a5a0a 100644 --- a/packages/google-cloud-language/google/cloud/language/__init__.py +++ b/packages/google-cloud-language/google/cloud/language/__init__.py @@ -14,40 +14,37 @@ # limitations under the License. # -from google.cloud.language_v1.services.language_service.client import ( - LanguageServiceClient, -) from google.cloud.language_v1.services.language_service.async_client import ( LanguageServiceAsyncClient, ) - -from google.cloud.language_v1.types.language_service import AnalyzeEntitiesRequest -from google.cloud.language_v1.types.language_service import AnalyzeEntitiesResponse -from google.cloud.language_v1.types.language_service import ( - AnalyzeEntitySentimentRequest, +from google.cloud.language_v1.services.language_service.client import ( + LanguageServiceClient, ) from google.cloud.language_v1.types.language_service import ( + AnalyzeEntitiesRequest, + AnalyzeEntitiesResponse, + AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse, + AnalyzeSentimentRequest, + AnalyzeSentimentResponse, + AnalyzeSyntaxRequest, + AnalyzeSyntaxResponse, + AnnotateTextRequest, + AnnotateTextResponse, + ClassificationCategory, + ClassifyTextRequest, + ClassifyTextResponse, + DependencyEdge, + Document, + EncodingType, + Entity, + EntityMention, + PartOfSpeech, + Sentence, + Sentiment, + TextSpan, + Token, ) -from google.cloud.language_v1.types.language_service import AnalyzeSentimentRequest -from google.cloud.language_v1.types.language_service import AnalyzeSentimentResponse -from google.cloud.language_v1.types.language_service import AnalyzeSyntaxRequest -from google.cloud.language_v1.types.language_service import AnalyzeSyntaxResponse -from google.cloud.language_v1.types.language_service import AnnotateTextRequest -from google.cloud.language_v1.types.language_service import AnnotateTextResponse -from google.cloud.language_v1.types.language_service import ClassificationCategory -from google.cloud.language_v1.types.language_service import ClassifyTextRequest -from google.cloud.language_v1.types.language_service import ClassifyTextResponse -from google.cloud.language_v1.types.language_service import DependencyEdge -from google.cloud.language_v1.types.language_service import Document -from google.cloud.language_v1.types.language_service import Entity -from google.cloud.language_v1.types.language_service import EntityMention -from google.cloud.language_v1.types.language_service import PartOfSpeech -from google.cloud.language_v1.types.language_service import Sentence -from google.cloud.language_v1.types.language_service import Sentiment -from google.cloud.language_v1.types.language_service import TextSpan -from google.cloud.language_v1.types.language_service import Token -from google.cloud.language_v1.types.language_service import EncodingType __all__ = ( "LanguageServiceClient", diff --git a/packages/google-cloud-language/google/cloud/language_v1/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/__init__.py index bcca7fb4c65c..9e99392d412e 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/__init__.py @@ -14,32 +14,32 @@ # limitations under the License. # -from .services.language_service import LanguageServiceClient -from .services.language_service import LanguageServiceAsyncClient - -from .types.language_service import AnalyzeEntitiesRequest -from .types.language_service import AnalyzeEntitiesResponse -from .types.language_service import AnalyzeEntitySentimentRequest -from .types.language_service import AnalyzeEntitySentimentResponse -from .types.language_service import AnalyzeSentimentRequest -from .types.language_service import AnalyzeSentimentResponse -from .types.language_service import AnalyzeSyntaxRequest -from .types.language_service import AnalyzeSyntaxResponse -from .types.language_service import AnnotateTextRequest -from .types.language_service import AnnotateTextResponse -from .types.language_service import ClassificationCategory -from .types.language_service import ClassifyTextRequest -from .types.language_service import ClassifyTextResponse -from .types.language_service import DependencyEdge -from .types.language_service import Document -from .types.language_service import Entity -from .types.language_service import EntityMention -from .types.language_service import PartOfSpeech -from .types.language_service import Sentence -from .types.language_service import Sentiment -from .types.language_service import TextSpan -from .types.language_service import Token -from .types.language_service import EncodingType +from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient +from .types.language_service import ( + AnalyzeEntitiesRequest, + AnalyzeEntitiesResponse, + AnalyzeEntitySentimentRequest, + AnalyzeEntitySentimentResponse, + AnalyzeSentimentRequest, + AnalyzeSentimentResponse, + AnalyzeSyntaxRequest, + AnalyzeSyntaxResponse, + AnnotateTextRequest, + AnnotateTextResponse, + ClassificationCategory, + ClassifyTextRequest, + ClassifyTextResponse, + DependencyEdge, + Document, + EncodingType, + Entity, + EntityMention, + PartOfSpeech, + Sentence, + Sentiment, + TextSpan, + Token, +) __all__ = ( "LanguageServiceAsyncClient", diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/__init__.py index d12b0495ff16..6a15301c3cad 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import LanguageServiceClient from .async_client import LanguageServiceAsyncClient +from .client import LanguageServiceClient __all__ = ( "LanguageServiceClient", diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py index 9678415832f9..cf38f87c113f 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/async_client.py @@ -17,14 +17,14 @@ import functools import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources -from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry 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 pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -32,9 +32,10 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.language_v1.types import language_service -from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport + from .client import LanguageServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, LanguageServiceTransport +from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport class LanguageServiceAsyncClient: diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py index a5173c343465..3ac67a03d061 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/client.py @@ -17,17 +17,17 @@ import os import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources 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 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore +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.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -35,7 +35,8 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.language_v1.types import language_service -from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, LanguageServiceTransport from .transports.grpc import LanguageServiceGrpcTransport from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/__init__.py index 2cb702a69d2d..5ec2196c5ddf 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import LanguageServiceGrpcTransport from .grpc_asyncio import LanguageServiceGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py index 65c3cae209e4..770b217e6319 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/base.py @@ -15,15 +15,15 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import pkg_resources -import google.auth # type: ignore import google.api_core 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 pkg_resources from google.cloud.language_v1.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py index b7b421aff12c..5bf182e12746 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc.py @@ -13,19 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import grpc_helpers -from google.api_core import gapic_v1 +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 - import grpc # type: ignore from google.cloud.language_v1.types import language_service -from .base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, LanguageServiceTransport class LanguageServiceGrpcTransport(LanguageServiceTransport): diff --git a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py index 4b10a361e814..06ea02909adb 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1/services/language_service/transports/grpc_asyncio.py @@ -13,19 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers_async +from google.api_core import gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.cloud.language_v1.types import language_service -from .base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, LanguageServiceTransport from .grpc import LanguageServiceGrpcTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1/types/__init__.py b/packages/google-cloud-language/google/cloud/language_v1/types/__init__.py index 6a80ff72bdca..0f35f2e33c6b 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/types/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1/types/__init__.py @@ -29,6 +29,7 @@ ClassifyTextResponse, DependencyEdge, Document, + EncodingType, Entity, EntityMention, PartOfSpeech, @@ -36,7 +37,6 @@ Sentiment, TextSpan, Token, - EncodingType, ) __all__ = ( diff --git a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py index eed340e34f10..2cd79d57f560 100644 --- a/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1/types/language_service.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.cloud.language.v1", manifest={ diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py index bcca7fb4c65c..9e99392d412e 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/__init__.py @@ -14,32 +14,32 @@ # limitations under the License. # -from .services.language_service import LanguageServiceClient -from .services.language_service import LanguageServiceAsyncClient - -from .types.language_service import AnalyzeEntitiesRequest -from .types.language_service import AnalyzeEntitiesResponse -from .types.language_service import AnalyzeEntitySentimentRequest -from .types.language_service import AnalyzeEntitySentimentResponse -from .types.language_service import AnalyzeSentimentRequest -from .types.language_service import AnalyzeSentimentResponse -from .types.language_service import AnalyzeSyntaxRequest -from .types.language_service import AnalyzeSyntaxResponse -from .types.language_service import AnnotateTextRequest -from .types.language_service import AnnotateTextResponse -from .types.language_service import ClassificationCategory -from .types.language_service import ClassifyTextRequest -from .types.language_service import ClassifyTextResponse -from .types.language_service import DependencyEdge -from .types.language_service import Document -from .types.language_service import Entity -from .types.language_service import EntityMention -from .types.language_service import PartOfSpeech -from .types.language_service import Sentence -from .types.language_service import Sentiment -from .types.language_service import TextSpan -from .types.language_service import Token -from .types.language_service import EncodingType +from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient +from .types.language_service import ( + AnalyzeEntitiesRequest, + AnalyzeEntitiesResponse, + AnalyzeEntitySentimentRequest, + AnalyzeEntitySentimentResponse, + AnalyzeSentimentRequest, + AnalyzeSentimentResponse, + AnalyzeSyntaxRequest, + AnalyzeSyntaxResponse, + AnnotateTextRequest, + AnnotateTextResponse, + ClassificationCategory, + ClassifyTextRequest, + ClassifyTextResponse, + DependencyEdge, + Document, + EncodingType, + Entity, + EntityMention, + PartOfSpeech, + Sentence, + Sentiment, + TextSpan, + Token, +) __all__ = ( "LanguageServiceAsyncClient", diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/__init__.py index d12b0495ff16..6a15301c3cad 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import LanguageServiceClient from .async_client import LanguageServiceAsyncClient +from .client import LanguageServiceClient __all__ = ( "LanguageServiceClient", diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py index f20561ed6881..abeaf9e3d8a5 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/async_client.py @@ -17,14 +17,14 @@ import functools import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources -from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry 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 pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -32,9 +32,10 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.language_v1beta2.types import language_service -from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport + from .client import LanguageServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, LanguageServiceTransport +from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport class LanguageServiceAsyncClient: diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py index ac1049b94c38..936f1151d334 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/client.py @@ -17,17 +17,17 @@ import os import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources 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 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore +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.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -35,7 +35,8 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.language_v1beta2.types import language_service -from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, LanguageServiceTransport from .transports.grpc import LanguageServiceGrpcTransport from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/__init__.py index 2cb702a69d2d..5ec2196c5ddf 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import LanguageServiceGrpcTransport from .grpc_asyncio import LanguageServiceGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[LanguageServiceTransport]] _transport_registry["grpc"] = LanguageServiceGrpcTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py index dd29d40aebf9..358e3dced9cd 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/base.py @@ -15,15 +15,15 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import pkg_resources -import google.auth # type: ignore import google.api_core 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 pkg_resources from google.cloud.language_v1beta2.types import language_service diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py index c6b1b540b740..b584552e5d55 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc.py @@ -13,19 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import grpc_helpers -from google.api_core import gapic_v1 +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 - import grpc # type: ignore from google.cloud.language_v1beta2.types import language_service -from .base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, LanguageServiceTransport class LanguageServiceGrpcTransport(LanguageServiceTransport): diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py index 4cb0142e1df3..f4f8e4d3776e 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/services/language_service/transports/grpc_asyncio.py @@ -13,19 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers_async +from google.api_core import gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.cloud.language_v1beta2.types import language_service -from .base import LanguageServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, LanguageServiceTransport from .grpc import LanguageServiceGrpcTransport diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/types/__init__.py b/packages/google-cloud-language/google/cloud/language_v1beta2/types/__init__.py index 6a80ff72bdca..0f35f2e33c6b 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/types/__init__.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/types/__init__.py @@ -29,6 +29,7 @@ ClassifyTextResponse, DependencyEdge, Document, + EncodingType, Entity, EntityMention, PartOfSpeech, @@ -36,7 +37,6 @@ Sentiment, TextSpan, Token, - EncodingType, ) __all__ = ( diff --git a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py index 194002bc80e9..b43b62eda55e 100644 --- a/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py +++ b/packages/google-cloud-language/google/cloud/language_v1beta2/types/language_service.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.cloud.language.v1beta2", manifest={ diff --git a/packages/google-cloud-language/noxfile.py b/packages/google-cloud-language/noxfile.py index 6ee5e8ab96d9..7c1742d2cc93 100644 --- a/packages/google-cloud-language/noxfile.py +++ b/packages/google-cloud-language/noxfile.py @@ -17,6 +17,7 @@ # Generated by synthtool. DO NOT EDIT! from __future__ import absolute_import + import os import pathlib import shutil @@ -25,7 +26,8 @@ import nox BLACK_VERSION = "black==22.3.0" -BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] +ISORT_VERSION = "isort==5.10.1" +LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.8" @@ -83,7 +85,7 @@ def lint(session): session.run( "black", "--check", - *BLACK_PATHS, + *LINT_PATHS, ) session.run("flake8", "google", "tests") @@ -94,7 +96,27 @@ def blacken(session): session.install(BLACK_VERSION) session.run( "black", - *BLACK_PATHS, + *LINT_PATHS, + ) + + +@nox.session(python=DEFAULT_PYTHON_VERSION) +def format(session): + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run( + "isort", + "--fss", + *LINT_PATHS, + ) + session.run( + "black", + *LINT_PATHS, ) diff --git a/packages/google-cloud-language/samples/snippets/api/noxfile.py b/packages/google-cloud-language/samples/snippets/api/noxfile.py index 25f87a215d4c..3b3ffa5d2b0f 100644 --- a/packages/google-cloud-language/samples/snippets/api/noxfile.py +++ b/packages/google-cloud-language/samples/snippets/api/noxfile.py @@ -22,7 +22,6 @@ import nox - # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING # DO NOT EDIT THIS FILE EVER! @@ -30,6 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING BLACK_VERSION = "black==22.3.0" +ISORT_VERSION = "isort==5.10.1" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None: @nox.session def blacken(session: nox.sessions.Session) -> None: + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) python_files = [path for path in os.listdir(".") if path.endswith(".py")] session.run("black", *python_files) +# +# format = isort + black +# + + +@nox.session +def format(session: nox.sessions.Session) -> None: + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run("isort", "--fss", *python_files) + session.run("black", *python_files) + + # # Sample Tests # diff --git a/packages/google-cloud-language/samples/snippets/classify_text/classify_text_tutorial_test.py b/packages/google-cloud-language/samples/snippets/classify_text/classify_text_tutorial_test.py index 5e8211299bf7..5859a771ea23 100644 --- a/packages/google-cloud-language/samples/snippets/classify_text/classify_text_tutorial_test.py +++ b/packages/google-cloud-language/samples/snippets/classify_text/classify_text_tutorial_test.py @@ -17,7 +17,6 @@ import classify_text_tutorial - OUTPUT = "index.json" RESOURCES = os.path.join(os.path.dirname(__file__), "resources") QUERY_TEXT = """Google Home enables users to speak voice commands to interact diff --git a/packages/google-cloud-language/samples/snippets/classify_text/noxfile.py b/packages/google-cloud-language/samples/snippets/classify_text/noxfile.py index 25f87a215d4c..3b3ffa5d2b0f 100644 --- a/packages/google-cloud-language/samples/snippets/classify_text/noxfile.py +++ b/packages/google-cloud-language/samples/snippets/classify_text/noxfile.py @@ -22,7 +22,6 @@ import nox - # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING # DO NOT EDIT THIS FILE EVER! @@ -30,6 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING BLACK_VERSION = "black==22.3.0" +ISORT_VERSION = "isort==5.10.1" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None: @nox.session def blacken(session: nox.sessions.Session) -> None: + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) python_files = [path for path in os.listdir(".") if path.endswith(".py")] session.run("black", *python_files) +# +# format = isort + black +# + + +@nox.session +def format(session: nox.sessions.Session) -> None: + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run("isort", "--fss", *python_files) + session.run("black", *python_files) + + # # Sample Tests # diff --git a/packages/google-cloud-language/samples/snippets/cloud-client/v1/noxfile.py b/packages/google-cloud-language/samples/snippets/cloud-client/v1/noxfile.py index 25f87a215d4c..3b3ffa5d2b0f 100644 --- a/packages/google-cloud-language/samples/snippets/cloud-client/v1/noxfile.py +++ b/packages/google-cloud-language/samples/snippets/cloud-client/v1/noxfile.py @@ -22,7 +22,6 @@ import nox - # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING # DO NOT EDIT THIS FILE EVER! @@ -30,6 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING BLACK_VERSION = "black==22.3.0" +ISORT_VERSION = "isort==5.10.1" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None: @nox.session def blacken(session: nox.sessions.Session) -> None: + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) python_files = [path for path in os.listdir(".") if path.endswith(".py")] session.run("black", *python_files) +# +# format = isort + black +# + + +@nox.session +def format(session: nox.sessions.Session) -> None: + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run("isort", "--fss", *python_files) + session.run("black", *python_files) + + # # Sample Tests # diff --git a/packages/google-cloud-language/samples/snippets/cloud-client/v1/quickstart.py b/packages/google-cloud-language/samples/snippets/cloud-client/v1/quickstart.py index 59c1cd435cc2..bbc914d16149 100644 --- a/packages/google-cloud-language/samples/snippets/cloud-client/v1/quickstart.py +++ b/packages/google-cloud-language/samples/snippets/cloud-client/v1/quickstart.py @@ -22,7 +22,6 @@ def run_quickstart(): from google.cloud import language_v1 # [END language_python_migration_imports] - # Instantiates a client # [START language_python_migration_client] client = language_v1.LanguageServiceClient() diff --git a/packages/google-cloud-language/samples/snippets/generated-samples/v1/language_sentiment_text.py b/packages/google-cloud-language/samples/snippets/generated-samples/v1/language_sentiment_text.py index 4170ddbc4cd0..13447d17c3b3 100644 --- a/packages/google-cloud-language/samples/snippets/generated-samples/v1/language_sentiment_text.py +++ b/packages/google-cloud-language/samples/snippets/generated-samples/v1/language_sentiment_text.py @@ -21,6 +21,7 @@ import sys +# isort: split # [START language_sentiment_text] from google.cloud import language_v1 diff --git a/packages/google-cloud-language/samples/snippets/generated-samples/v1/noxfile.py b/packages/google-cloud-language/samples/snippets/generated-samples/v1/noxfile.py index 25f87a215d4c..3b3ffa5d2b0f 100644 --- a/packages/google-cloud-language/samples/snippets/generated-samples/v1/noxfile.py +++ b/packages/google-cloud-language/samples/snippets/generated-samples/v1/noxfile.py @@ -22,7 +22,6 @@ import nox - # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING # DO NOT EDIT THIS FILE EVER! @@ -30,6 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING BLACK_VERSION = "black==22.3.0" +ISORT_VERSION = "isort==5.10.1" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None: @nox.session def blacken(session: nox.sessions.Session) -> None: + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) python_files = [path for path in os.listdir(".") if path.endswith(".py")] session.run("black", *python_files) +# +# format = isort + black +# + + +@nox.session +def format(session: nox.sessions.Session) -> None: + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run("isort", "--fss", *python_files) + session.run("black", *python_files) + + # # Sample Tests # diff --git a/packages/google-cloud-language/samples/snippets/sentiment/noxfile.py b/packages/google-cloud-language/samples/snippets/sentiment/noxfile.py index 25f87a215d4c..3b3ffa5d2b0f 100644 --- a/packages/google-cloud-language/samples/snippets/sentiment/noxfile.py +++ b/packages/google-cloud-language/samples/snippets/sentiment/noxfile.py @@ -22,7 +22,6 @@ import nox - # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING # DO NOT EDIT THIS FILE EVER! @@ -30,6 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING BLACK_VERSION = "black==22.3.0" +ISORT_VERSION = "isort==5.10.1" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None: @nox.session def blacken(session: nox.sessions.Session) -> None: + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) python_files = [path for path in os.listdir(".") if path.endswith(".py")] session.run("black", *python_files) +# +# format = isort + black +# + + +@nox.session +def format(session: nox.sessions.Session) -> None: + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run("isort", "--fss", *python_files) + session.run("black", *python_files) + + # # Sample Tests # diff --git a/packages/google-cloud-language/setup.py b/packages/google-cloud-language/setup.py index 7547eb607cc2..8c8c73b694d7 100644 --- a/packages/google-cloud-language/setup.py +++ b/packages/google-cloud-language/setup.py @@ -17,7 +17,6 @@ import setuptools - # Package metadata. name = "google-cloud-language" diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py index 08447420e426..a3baefe2a1a6 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1/test_language_service.py @@ -13,32 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import os -import mock - -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule - +import os +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers -from google.api_core import grpc_helpers_async -from google.api_core import path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account +import grpc +from grpc.experimental import aio +import mock +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.language_v1.services.language_service import ( LanguageServiceAsyncClient, + LanguageServiceClient, + transports, ) -from google.cloud.language_v1.services.language_service import LanguageServiceClient -from google.cloud.language_v1.services.language_service import transports from google.cloud.language_v1.types import language_service -from google.oauth2 import service_account -import google.auth def client_cert_source_callback(): diff --git a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py index 6603d4a39b28..ff0e85f6ddbb 100644 --- a/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py +++ b/packages/google-cloud-language/tests/unit/gapic/language_v1beta2/test_language_service.py @@ -13,34 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import os -import mock - -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule - +import os +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers -from google.api_core import grpc_helpers_async -from google.api_core import path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account +import grpc +from grpc.experimental import aio +import mock +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.language_v1beta2.services.language_service import ( LanguageServiceAsyncClient, -) -from google.cloud.language_v1beta2.services.language_service import ( LanguageServiceClient, + transports, ) -from google.cloud.language_v1beta2.services.language_service import transports from google.cloud.language_v1beta2.types import language_service -from google.oauth2 import service_account -import google.auth def client_cert_source_callback():