Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit de04d7e

Browse files
silviulicaaaltay
silviulica
authored and
aaltay
committed
Skip modules without a __name__ attribute
----Release Notes---- Fix pickling issue when the seaborn package is loaded. [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=123164433
1 parent cb60c6c commit de04d7e

3 files changed

Lines changed: 72 additions & 71 deletions

File tree

‎google/cloud/dataflow/internal/pickler.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,13 @@ def new_save_module_dict(pickler, obj):
136136
if not known_module_dicts or '__file__' in obj or '__package__' in obj:
137137
if obj_id not in known_module_dicts:
138138
for m in sys.modules.values():
139-
if m and m.__name__ != '__main__':
140-
known_module_dicts[id(m.__dict__)] = m
139+
try:
140+
if m and m.__name__ != '__main__':
141+
known_module_dicts[id(m.__dict__)] = m
142+
except AttributeError:
143+
# Skip modules that do not have the __name__ attribute.
144+
pass
145+
# TODO(silviuc): Must investigate the disabled if branch below.
141146
if obj_id in known_module_dicts and dill.dill.is_dill(pickler) and False:
142147
return pickler.save_reduce(
143148
getattr, (known_module_dicts[obj_id], '__dict__'), obj=obj)

‎google/cloud/dataflow/internal/windmill_pb2.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,9 +2261,8 @@
22612261
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n5com.google.cloud.dataflow.sdk.runners.worker.windmillB\010Windmill'))
22622262
_WATERMARKHOLD.fields_by_name['timestamps'].has_options = True
22632263
_WATERMARKHOLD.fields_by_name['timestamps']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\020\001'))
2264-
import abc
2265-
import six
22662264
from grpc.beta import implementations as beta_implementations
2265+
from grpc.beta import interfaces as beta_interfaces
22672266
from grpc.framework.common import cardinality
22682267
from grpc.framework.interfaces.face import utilities as face_utilities
22692268
# @@protoc_insertion_point(module_scope)

‎google/cloud/dataflow/internal/windmill_service_pb2.py‎

Lines changed: 64 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -45,77 +45,83 @@
4545

4646
DESCRIPTOR.has_options = True
4747
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n5com.google.cloud.dataflow.sdk.runners.worker.windmill'))
48-
import abc
49-
import six
5048
from grpc.beta import implementations as beta_implementations
49+
from grpc.beta import interfaces as beta_interfaces
5150
from grpc.framework.common import cardinality
5251
from grpc.framework.interfaces.face import utilities as face_utilities
5352

54-
class BetaCloudWindmillServiceV1Alpha1Servicer(six.with_metaclass(abc.ABCMeta, object)):
55-
"""<fill me in later!>"""
56-
@abc.abstractmethod
53+
54+
class BetaCloudWindmillServiceV1Alpha1Servicer(object):
55+
"""The Cloud Windmill Service API used by GCE to acquire and process streaming
56+
Dataflow work.
57+
"""
5758
def GetWork(self, request, context):
58-
raise NotImplementedError()
59-
@abc.abstractmethod
59+
"""Gets streaming Dataflow work.
60+
"""
61+
context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
6062
def GetData(self, request, context):
61-
raise NotImplementedError()
62-
@abc.abstractmethod
63+
"""Gets data from Windmill.
64+
"""
65+
context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
6366
def CommitWork(self, request, context):
64-
raise NotImplementedError()
65-
@abc.abstractmethod
67+
"""Commits previously acquired work.
68+
"""
69+
context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
6670
def GetConfig(self, request, context):
67-
raise NotImplementedError()
68-
@abc.abstractmethod
71+
"""Gets dependant configuration from windmill.
72+
"""
73+
context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
6974
def ReportStats(self, request, context):
70-
raise NotImplementedError()
71-
72-
class BetaCloudWindmillServiceV1Alpha1Stub(six.with_metaclass(abc.ABCMeta, object)):
73-
"""The interface to which stubs will conform."""
74-
@abc.abstractmethod
75-
def GetWork(self, request, timeout):
75+
"""Reports stats to Windmill.
76+
"""
77+
context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
78+
79+
80+
class BetaCloudWindmillServiceV1Alpha1Stub(object):
81+
"""The Cloud Windmill Service API used by GCE to acquire and process streaming
82+
Dataflow work.
83+
"""
84+
def GetWork(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
85+
"""Gets streaming Dataflow work.
86+
"""
7687
raise NotImplementedError()
7788
GetWork.future = None
78-
@abc.abstractmethod
79-
def GetData(self, request, timeout):
89+
def GetData(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
90+
"""Gets data from Windmill.
91+
"""
8092
raise NotImplementedError()
8193
GetData.future = None
82-
@abc.abstractmethod
83-
def CommitWork(self, request, timeout):
94+
def CommitWork(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
95+
"""Commits previously acquired work.
96+
"""
8497
raise NotImplementedError()
8598
CommitWork.future = None
86-
@abc.abstractmethod
87-
def GetConfig(self, request, timeout):
99+
def GetConfig(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
100+
"""Gets dependant configuration from windmill.
101+
"""
88102
raise NotImplementedError()
89103
GetConfig.future = None
90-
@abc.abstractmethod
91-
def ReportStats(self, request, timeout):
104+
def ReportStats(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
105+
"""Reports stats to Windmill.
106+
"""
92107
raise NotImplementedError()
93108
ReportStats.future = None
94109

110+
95111
def beta_create_CloudWindmillServiceV1Alpha1_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
96-
import windmill_pb2
97-
import windmill_pb2
98-
import windmill_pb2
99-
import windmill_pb2
100-
import windmill_pb2
101-
import windmill_pb2
102-
import windmill_pb2
103-
import windmill_pb2
104-
import windmill_pb2
105-
import windmill_pb2
106112
request_deserializers = {
107-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill_pb2.CommitWorkRequest.FromString,
108-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill_pb2.GetConfigRequest.FromString,
109-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill_pb2.GetDataRequest.FromString,
110-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill_pb2.GetWorkRequest.FromString,
111-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill_pb2.ReportStatsRequest.FromString,
113+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill__pb2.CommitWorkRequest.FromString,
114+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill__pb2.GetConfigRequest.FromString,
115+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill__pb2.GetDataRequest.FromString,
116+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill__pb2.GetWorkRequest.FromString,
117+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill__pb2.ReportStatsRequest.FromString,
112118
}
113119
response_serializers = {
114-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill_pb2.CommitWorkResponse.SerializeToString,
115-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill_pb2.GetConfigResponse.SerializeToString,
116-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill_pb2.GetDataResponse.SerializeToString,
117-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill_pb2.GetWorkResponse.SerializeToString,
118-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill_pb2.ReportStatsResponse.SerializeToString,
120+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill__pb2.CommitWorkResponse.SerializeToString,
121+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill__pb2.GetConfigResponse.SerializeToString,
122+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill__pb2.GetDataResponse.SerializeToString,
123+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill__pb2.GetWorkResponse.SerializeToString,
124+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill__pb2.ReportStatsResponse.SerializeToString,
119125
}
120126
method_implementations = {
121127
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): face_utilities.unary_unary_inline(servicer.CommitWork),
@@ -127,30 +133,21 @@ def beta_create_CloudWindmillServiceV1Alpha1_server(servicer, pool=None, pool_si
127133
server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
128134
return beta_implementations.server(method_implementations, options=server_options)
129135

136+
130137
def beta_create_CloudWindmillServiceV1Alpha1_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
131-
import windmill_pb2
132-
import windmill_pb2
133-
import windmill_pb2
134-
import windmill_pb2
135-
import windmill_pb2
136-
import windmill_pb2
137-
import windmill_pb2
138-
import windmill_pb2
139-
import windmill_pb2
140-
import windmill_pb2
141138
request_serializers = {
142-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill_pb2.CommitWorkRequest.SerializeToString,
143-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill_pb2.GetConfigRequest.SerializeToString,
144-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill_pb2.GetDataRequest.SerializeToString,
145-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill_pb2.GetWorkRequest.SerializeToString,
146-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill_pb2.ReportStatsRequest.SerializeToString,
139+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill__pb2.CommitWorkRequest.SerializeToString,
140+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill__pb2.GetConfigRequest.SerializeToString,
141+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill__pb2.GetDataRequest.SerializeToString,
142+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill__pb2.GetWorkRequest.SerializeToString,
143+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill__pb2.ReportStatsRequest.SerializeToString,
147144
}
148145
response_deserializers = {
149-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill_pb2.CommitWorkResponse.FromString,
150-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill_pb2.GetConfigResponse.FromString,
151-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill_pb2.GetDataResponse.FromString,
152-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill_pb2.GetWorkResponse.FromString,
153-
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill_pb2.ReportStatsResponse.FromString,
146+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'CommitWork'): windmill__pb2.CommitWorkResponse.FromString,
147+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetConfig'): windmill__pb2.GetConfigResponse.FromString,
148+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetData'): windmill__pb2.GetDataResponse.FromString,
149+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'GetWork'): windmill__pb2.GetWorkResponse.FromString,
150+
('google.dataflow.windmillservice.v1alpha1.CloudWindmillServiceV1Alpha1', 'ReportStats'): windmill__pb2.ReportStatsResponse.FromString,
154151
}
155152
cardinalities = {
156153
'CommitWork': cardinality.Cardinality.UNARY_UNARY,

0 commit comments

Comments
 (0)