Skip to content

Commit 0d03698

Browse files
chore(python): add nox session to sort python imports (#25)
Source-Link: googleapis/synthtool@1b71c10 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416 Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 8b0f30d commit 0d03698

File tree

24 files changed

+237
-260
lines changed

24 files changed

+237
-260
lines changed

packages/google-cloud-video-stitcher/.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163
17-
# created: 2022-04-06T10:30:21.687684602Z
16+
digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416
17+
# created: 2022-04-20T23:42:53.970438194Z

packages/google-cloud-video-stitcher/docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# All configuration values have a default; values that are commented out
2525
# serve to show the default.
2626

27-
import sys
2827
import os
2928
import shlex
29+
import sys
3030

3131
# If extensions (or modules to document with autodoc) are in another directory,
3232
# add these directories to sys.path here. If the directory is relative to the

packages/google-cloud-video-stitcher/google/cloud/video/stitcher/__init__.py

Lines changed: 39 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -14,109 +14,73 @@
1414
# limitations under the License.
1515
#
1616

17+
from google.cloud.video.stitcher_v1.services.video_stitcher_service.async_client import (
18+
VideoStitcherServiceAsyncClient,
19+
)
1720
from google.cloud.video.stitcher_v1.services.video_stitcher_service.client import (
1821
VideoStitcherServiceClient,
1922
)
20-
from google.cloud.video.stitcher_v1.services.video_stitcher_service.async_client import (
21-
VideoStitcherServiceAsyncClient,
23+
from google.cloud.video.stitcher_v1.types.ad_tag_details import (
24+
AdRequest,
25+
LiveAdTagDetail,
26+
RequestMetadata,
27+
ResponseMetadata,
28+
VodAdTagDetail,
29+
)
30+
from google.cloud.video.stitcher_v1.types.cdn_keys import (
31+
AkamaiCdnKey,
32+
CdnKey,
33+
GoogleCdnKey,
34+
)
35+
from google.cloud.video.stitcher_v1.types.companions import (
36+
Companion,
37+
CompanionAds,
38+
HtmlAdResource,
39+
IframeAdResource,
40+
StaticAdResource,
41+
)
42+
from google.cloud.video.stitcher_v1.types.events import Event, ProgressEvent
43+
from google.cloud.video.stitcher_v1.types.sessions import (
44+
AdTag,
45+
Interstitials,
46+
LiveSession,
47+
ManifestOptions,
48+
RenditionFilter,
49+
VodSession,
50+
VodSessionAd,
51+
VodSessionAdBreak,
52+
VodSessionContent,
2253
)
23-
24-
from google.cloud.video.stitcher_v1.types.ad_tag_details import AdRequest
25-
from google.cloud.video.stitcher_v1.types.ad_tag_details import LiveAdTagDetail
26-
from google.cloud.video.stitcher_v1.types.ad_tag_details import RequestMetadata
27-
from google.cloud.video.stitcher_v1.types.ad_tag_details import ResponseMetadata
28-
from google.cloud.video.stitcher_v1.types.ad_tag_details import VodAdTagDetail
29-
from google.cloud.video.stitcher_v1.types.cdn_keys import AkamaiCdnKey
30-
from google.cloud.video.stitcher_v1.types.cdn_keys import CdnKey
31-
from google.cloud.video.stitcher_v1.types.cdn_keys import GoogleCdnKey
32-
from google.cloud.video.stitcher_v1.types.companions import Companion
33-
from google.cloud.video.stitcher_v1.types.companions import CompanionAds
34-
from google.cloud.video.stitcher_v1.types.companions import HtmlAdResource
35-
from google.cloud.video.stitcher_v1.types.companions import IframeAdResource
36-
from google.cloud.video.stitcher_v1.types.companions import StaticAdResource
37-
from google.cloud.video.stitcher_v1.types.events import Event
38-
from google.cloud.video.stitcher_v1.types.events import ProgressEvent
39-
from google.cloud.video.stitcher_v1.types.sessions import AdTag
40-
from google.cloud.video.stitcher_v1.types.sessions import Interstitials
41-
from google.cloud.video.stitcher_v1.types.sessions import LiveSession
42-
from google.cloud.video.stitcher_v1.types.sessions import ManifestOptions
43-
from google.cloud.video.stitcher_v1.types.sessions import RenditionFilter
44-
from google.cloud.video.stitcher_v1.types.sessions import VodSession
45-
from google.cloud.video.stitcher_v1.types.sessions import VodSessionAd
46-
from google.cloud.video.stitcher_v1.types.sessions import VodSessionAdBreak
47-
from google.cloud.video.stitcher_v1.types.sessions import VodSessionContent
4854
from google.cloud.video.stitcher_v1.types.slates import Slate
49-
from google.cloud.video.stitcher_v1.types.stitch_details import AdStitchDetail
50-
from google.cloud.video.stitcher_v1.types.stitch_details import VodStitchDetail
51-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
52-
CreateCdnKeyRequest,
55+
from google.cloud.video.stitcher_v1.types.stitch_details import (
56+
AdStitchDetail,
57+
VodStitchDetail,
5358
)
5459
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
60+
CreateCdnKeyRequest,
5561
CreateLiveSessionRequest,
56-
)
57-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
5862
CreateSlateRequest,
59-
)
60-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
6163
CreateVodSessionRequest,
62-
)
63-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
6464
DeleteCdnKeyRequest,
65-
)
66-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
6765
DeleteSlateRequest,
68-
)
69-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import GetCdnKeyRequest
70-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
66+
GetCdnKeyRequest,
7167
GetLiveAdTagDetailRequest,
72-
)
73-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
7468
GetLiveSessionRequest,
75-
)
76-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import GetSlateRequest
77-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
69+
GetSlateRequest,
7870
GetVodAdTagDetailRequest,
79-
)
80-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
8171
GetVodSessionRequest,
82-
)
83-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
8472
GetVodStitchDetailRequest,
85-
)
86-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
8773
ListCdnKeysRequest,
88-
)
89-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
9074
ListCdnKeysResponse,
91-
)
92-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
9375
ListLiveAdTagDetailsRequest,
94-
)
95-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
9676
ListLiveAdTagDetailsResponse,
97-
)
98-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
9977
ListSlatesRequest,
100-
)
101-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
10278
ListSlatesResponse,
103-
)
104-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
10579
ListVodAdTagDetailsRequest,
106-
)
107-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
10880
ListVodAdTagDetailsResponse,
109-
)
110-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
11181
ListVodStitchDetailsRequest,
112-
)
113-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
11482
ListVodStitchDetailsResponse,
115-
)
116-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
11783
UpdateCdnKeyRequest,
118-
)
119-
from google.cloud.video.stitcher_v1.types.video_stitcher_service import (
12084
UpdateSlateRequest,
12185
)
12286

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/__init__.py

Lines changed: 59 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -14,61 +14,66 @@
1414
# limitations under the License.
1515
#
1616

17-
from .services.video_stitcher_service import VideoStitcherServiceClient
18-
from .services.video_stitcher_service import VideoStitcherServiceAsyncClient
19-
20-
from .types.ad_tag_details import AdRequest
21-
from .types.ad_tag_details import LiveAdTagDetail
22-
from .types.ad_tag_details import RequestMetadata
23-
from .types.ad_tag_details import ResponseMetadata
24-
from .types.ad_tag_details import VodAdTagDetail
25-
from .types.cdn_keys import AkamaiCdnKey
26-
from .types.cdn_keys import CdnKey
27-
from .types.cdn_keys import GoogleCdnKey
28-
from .types.companions import Companion
29-
from .types.companions import CompanionAds
30-
from .types.companions import HtmlAdResource
31-
from .types.companions import IframeAdResource
32-
from .types.companions import StaticAdResource
33-
from .types.events import Event
34-
from .types.events import ProgressEvent
35-
from .types.sessions import AdTag
36-
from .types.sessions import Interstitials
37-
from .types.sessions import LiveSession
38-
from .types.sessions import ManifestOptions
39-
from .types.sessions import RenditionFilter
40-
from .types.sessions import VodSession
41-
from .types.sessions import VodSessionAd
42-
from .types.sessions import VodSessionAdBreak
43-
from .types.sessions import VodSessionContent
17+
from .services.video_stitcher_service import (
18+
VideoStitcherServiceAsyncClient,
19+
VideoStitcherServiceClient,
20+
)
21+
from .types.ad_tag_details import (
22+
AdRequest,
23+
LiveAdTagDetail,
24+
RequestMetadata,
25+
ResponseMetadata,
26+
VodAdTagDetail,
27+
)
28+
from .types.cdn_keys import AkamaiCdnKey, CdnKey, GoogleCdnKey
29+
from .types.companions import (
30+
Companion,
31+
CompanionAds,
32+
HtmlAdResource,
33+
IframeAdResource,
34+
StaticAdResource,
35+
)
36+
from .types.events import Event, ProgressEvent
37+
from .types.sessions import (
38+
AdTag,
39+
Interstitials,
40+
LiveSession,
41+
ManifestOptions,
42+
RenditionFilter,
43+
VodSession,
44+
VodSessionAd,
45+
VodSessionAdBreak,
46+
VodSessionContent,
47+
)
4448
from .types.slates import Slate
45-
from .types.stitch_details import AdStitchDetail
46-
from .types.stitch_details import VodStitchDetail
47-
from .types.video_stitcher_service import CreateCdnKeyRequest
48-
from .types.video_stitcher_service import CreateLiveSessionRequest
49-
from .types.video_stitcher_service import CreateSlateRequest
50-
from .types.video_stitcher_service import CreateVodSessionRequest
51-
from .types.video_stitcher_service import DeleteCdnKeyRequest
52-
from .types.video_stitcher_service import DeleteSlateRequest
53-
from .types.video_stitcher_service import GetCdnKeyRequest
54-
from .types.video_stitcher_service import GetLiveAdTagDetailRequest
55-
from .types.video_stitcher_service import GetLiveSessionRequest
56-
from .types.video_stitcher_service import GetSlateRequest
57-
from .types.video_stitcher_service import GetVodAdTagDetailRequest
58-
from .types.video_stitcher_service import GetVodSessionRequest
59-
from .types.video_stitcher_service import GetVodStitchDetailRequest
60-
from .types.video_stitcher_service import ListCdnKeysRequest
61-
from .types.video_stitcher_service import ListCdnKeysResponse
62-
from .types.video_stitcher_service import ListLiveAdTagDetailsRequest
63-
from .types.video_stitcher_service import ListLiveAdTagDetailsResponse
64-
from .types.video_stitcher_service import ListSlatesRequest
65-
from .types.video_stitcher_service import ListSlatesResponse
66-
from .types.video_stitcher_service import ListVodAdTagDetailsRequest
67-
from .types.video_stitcher_service import ListVodAdTagDetailsResponse
68-
from .types.video_stitcher_service import ListVodStitchDetailsRequest
69-
from .types.video_stitcher_service import ListVodStitchDetailsResponse
70-
from .types.video_stitcher_service import UpdateCdnKeyRequest
71-
from .types.video_stitcher_service import UpdateSlateRequest
49+
from .types.stitch_details import AdStitchDetail, VodStitchDetail
50+
from .types.video_stitcher_service import (
51+
CreateCdnKeyRequest,
52+
CreateLiveSessionRequest,
53+
CreateSlateRequest,
54+
CreateVodSessionRequest,
55+
DeleteCdnKeyRequest,
56+
DeleteSlateRequest,
57+
GetCdnKeyRequest,
58+
GetLiveAdTagDetailRequest,
59+
GetLiveSessionRequest,
60+
GetSlateRequest,
61+
GetVodAdTagDetailRequest,
62+
GetVodSessionRequest,
63+
GetVodStitchDetailRequest,
64+
ListCdnKeysRequest,
65+
ListCdnKeysResponse,
66+
ListLiveAdTagDetailsRequest,
67+
ListLiveAdTagDetailsResponse,
68+
ListSlatesRequest,
69+
ListSlatesResponse,
70+
ListVodAdTagDetailsRequest,
71+
ListVodAdTagDetailsResponse,
72+
ListVodStitchDetailsRequest,
73+
ListVodStitchDetailsResponse,
74+
UpdateCdnKeyRequest,
75+
UpdateSlateRequest,
76+
)
7277

7378
__all__ = (
7479
"VideoStitcherServiceAsyncClient",

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .client import VideoStitcherServiceClient
1716
from .async_client import VideoStitcherServiceAsyncClient
17+
from .client import VideoStitcherServiceClient
1818

1919
__all__ = (
2020
"VideoStitcherServiceClient",

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/async_client.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,35 @@
1717
import functools
1818
import re
1919
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
20-
import pkg_resources
2120

22-
from google.api_core.client_options import ClientOptions
2321
from google.api_core import exceptions as core_exceptions
2422
from google.api_core import gapic_v1
2523
from google.api_core import retry as retries
24+
from google.api_core.client_options import ClientOptions
2625
from google.auth import credentials as ga_credentials # type: ignore
2726
from google.oauth2 import service_account # type: ignore
27+
import pkg_resources
2828

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

34-
from google.cloud.video.stitcher_v1.services.video_stitcher_service import pagers
35-
from google.cloud.video.stitcher_v1.types import ad_tag_details
36-
from google.cloud.video.stitcher_v1.types import cdn_keys
37-
from google.cloud.video.stitcher_v1.types import sessions
38-
from google.cloud.video.stitcher_v1.types import slates
39-
from google.cloud.video.stitcher_v1.types import stitch_details
40-
from google.cloud.video.stitcher_v1.types import video_stitcher_service
4134
from google.protobuf import field_mask_pb2 # type: ignore
42-
from .transports.base import VideoStitcherServiceTransport, DEFAULT_CLIENT_INFO
43-
from .transports.grpc_asyncio import VideoStitcherServiceGrpcAsyncIOTransport
35+
36+
from google.cloud.video.stitcher_v1.services.video_stitcher_service import pagers
37+
from google.cloud.video.stitcher_v1.types import (
38+
ad_tag_details,
39+
cdn_keys,
40+
sessions,
41+
slates,
42+
stitch_details,
43+
video_stitcher_service,
44+
)
45+
4446
from .client import VideoStitcherServiceClient
47+
from .transports.base import DEFAULT_CLIENT_INFO, VideoStitcherServiceTransport
48+
from .transports.grpc_asyncio import VideoStitcherServiceGrpcAsyncIOTransport
4549

4650

4751
class VideoStitcherServiceAsyncClient:

packages/google-cloud-video-stitcher/google/cloud/video/stitcher_v1/services/video_stitcher_service/client.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,36 @@
1717
import os
1818
import re
1919
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
20-
import pkg_resources
2120

2221
from google.api_core import client_options as client_options_lib
2322
from google.api_core import exceptions as core_exceptions
2423
from google.api_core import gapic_v1
2524
from google.api_core import retry as retries
2625
from google.auth import credentials as ga_credentials # type: ignore
26+
from google.auth.exceptions import MutualTLSChannelError # type: ignore
2727
from google.auth.transport import mtls # type: ignore
2828
from google.auth.transport.grpc import SslCredentials # type: ignore
29-
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3029
from google.oauth2 import service_account # type: ignore
30+
import pkg_resources
3131

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

37-
from google.cloud.video.stitcher_v1.services.video_stitcher_service import pagers
38-
from google.cloud.video.stitcher_v1.types import ad_tag_details
39-
from google.cloud.video.stitcher_v1.types import cdn_keys
40-
from google.cloud.video.stitcher_v1.types import sessions
41-
from google.cloud.video.stitcher_v1.types import slates
42-
from google.cloud.video.stitcher_v1.types import stitch_details
43-
from google.cloud.video.stitcher_v1.types import video_stitcher_service
4437
from google.protobuf import field_mask_pb2 # type: ignore
45-
from .transports.base import VideoStitcherServiceTransport, DEFAULT_CLIENT_INFO
38+
39+
from google.cloud.video.stitcher_v1.services.video_stitcher_service import pagers
40+
from google.cloud.video.stitcher_v1.types import (
41+
ad_tag_details,
42+
cdn_keys,
43+
sessions,
44+
slates,
45+
stitch_details,
46+
video_stitcher_service,
47+
)
48+
49+
from .transports.base import DEFAULT_CLIENT_INFO, VideoStitcherServiceTransport
4650
from .transports.grpc import VideoStitcherServiceGrpcTransport
4751
from .transports.grpc_asyncio import VideoStitcherServiceGrpcAsyncIOTransport
4852

0 commit comments

Comments
 (0)