Skip to content

Commit 3749e7e

Browse files
crazyengDorian Birraux
authored andcommitted
automatic code refactor
1 parent 4689ea8 commit 3749e7e

10 files changed

Lines changed: 23 additions & 25 deletions

File tree

wolframclient/evaluation/cloud/asynccloudsession.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ async def start(self):
8686
if not self.started:
8787
if self.http_session is None or self.http_session.closed:
8888
self.http_session = self.http_sessionclass(
89-
headers={"User-Agent": "WolframClientForPython/1.0"})
89+
headers={"User-Agent": "WolframClientForPython/1.0"}
90+
)
9091
if not self.anonymous():
9192
await self._authenticate()
9293
except Exception as e:

wolframclient/evaluation/cloud/oauth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def authenticate(self):
202202
params = {
203203
"x_auth_username": self.xauth_credentials.user,
204204
"x_auth_password": self.xauth_credentials.password,
205-
"x_auth_mode": "client_auth"
205+
"x_auth_mode": "client_auth",
206206
}
207207

208208
# avoid dumping password in log files.

wolframclient/evaluation/kernel/kernelcontroller.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,7 @@ def _cancel_tasks(self):
592592

593593
def __repr__(self):
594594
if self.started:
595-
return '<%s[%s ✅], "%s", pid:%i, kernel sockets: (in:%s, out:%s)>'\
596-
% (
595+
return '<%s[%s ✅], "%s", pid:%i, kernel sockets: (in:%s, out:%s)>' % (
597596
self.__class__.__name__,
598597
self.name,
599598
self.kernel,

wolframclient/evaluation/kernel/localsession.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,4 @@ def set_parameter(self, parameter_name, parameter_value):
283283
set_parameter.__doc__ = WolframKernelController.set_parameter.__doc__
284284

285285
def __repr__(self):
286-
return "<%s: %s>" % (
287-
self.__class__.__name__,
288-
self.kernel_controller,
289-
)
286+
return "<%s: %s>" % (self.__class__.__name__, self.kernel_controller)

wolframclient/evaluation/pool.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import itertools
44
import logging
55
from asyncio import CancelledError
6-
from wolframclient.utils.asyncio import get_event_loop
76

87
from wolframclient.evaluation.base import WolframAsyncEvaluator
98
from wolframclient.evaluation.kernel.asyncsession import WolframLanguageAsyncSession
@@ -71,7 +70,9 @@ def __init__(
7170
):
7271
super().__init__()
7372
if poolsize <= 0:
74-
raise ValueError("Invalid pool size value %i. Expecting a positive integer." % poolsize)
73+
raise ValueError(
74+
"Invalid pool size value %i. Expecting a positive integer." % poolsize
75+
)
7576
self._queue = asyncio.Queue(load_factor * poolsize)
7677
self.async_language_session_class = async_language_session_class
7778
self._evaluators = set()
@@ -94,9 +95,7 @@ def __init__(
9495

9596
def _add_evaluator(self, evaluator, **kwargs):
9697
if evaluator is None or isinstance(evaluator, six.string_types):
97-
self._evaluators.add(
98-
self.async_language_session_class(kernel=evaluator, **kwargs)
99-
)
98+
self._evaluators.add(self.async_language_session_class(kernel=evaluator, **kwargs))
10099
elif isinstance(evaluator, WolframAsyncEvaluator):
101100
if evaluator in self._evaluators:
102101
self._evaluators.add(evaluator.duplicate())
@@ -167,7 +166,9 @@ async def _async_start_kernel(self, kernel):
167166
)
168167
await kernel.stop()
169168
except asyncio.CancelledError:
170-
logger.info("Cancelled signal during kernel termination following a failed start.")
169+
logger.info(
170+
"Cancelled signal during kernel termination following a failed start."
171+
)
171172
except Exception as e2:
172173
logger.info("Exception raised during clean-up after failed start: %s", e2)
173174

@@ -193,7 +194,8 @@ async def start(self):
193194
self.stopped = False
194195
# keep track of the init tasks. We have to wait before terminating.
195196
self._kernel_start_tasks = {
196-
asyncio.ensure_future(self._async_start_kernel(kernel)) for kernel in self._evaluators
197+
asyncio.ensure_future(self._async_start_kernel(kernel))
198+
for kernel in self._evaluators
197199
}
198200
# uninitialized kernels are removed if they failed to start
199201
# if they do start, the task is added to _kernel_evaluation_loop_tasks.
@@ -205,7 +207,9 @@ async def start(self):
205207
_, self._kernel_start_tasks = await asyncio.wait(
206208
self._kernel_start_tasks, return_when=asyncio.FIRST_COMPLETED
207209
)
208-
logger.info("Pool initialized with %i running kernels", len(self._kernel_evaluation_loop_tasks))
210+
logger.info(
211+
"Pool initialized with %i running kernels", len(self._kernel_evaluation_loop_tasks)
212+
)
209213

210214
async def stop(self):
211215

@@ -288,6 +292,7 @@ def parallel_evaluate(expressions, evaluator_spec=None, max_evaluators=4):
288292
Note that each evaluation should be independent and not rely on any previous one. There is no guarantee that two
289293
given expressions evaluate on the same kernel.
290294
"""
295+
291296
async def cor():
292297
async with WolframEvaluatorPool(evaluator_spec, poolsize=max_evaluators) as pool:
293298
return await pool.evaluate_all(expressions)

wolframclient/language/decorators.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
}
1616

1717

18-
def safe_wl_execute(
19-
function, args=(), opts={}, export_opts={}, exception_class=None
20-
):
18+
def safe_wl_execute(function, args=(), opts={}, export_opts={}, exception_class=None):
2119

2220
__traceback_hidden_variables__ = True
2321

wolframclient/serializers/base.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ def _serialize_external_object(self, o):
165165
yield "IsMethod", inspect.ismethod(o),
166166
yield "IsCallable", callable(o),
167167

168-
169-
170168
def serialize_external_object(self, obj):
171169
return self.serialize_function(
172170
self.serialize_symbol(callable(obj) and b"ExternalFunction" or b"ExternalObject"),

wolframclient/serializers/wxfencoder/streaming.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class ExactSizeReader(object):
3232
def __init__(self, reader):
3333
self._reader = reader
3434

35-
3635
def read(self, size=-1):
3736
"""Read from an underlying readable object.
3837
@@ -60,6 +59,7 @@ def _read_rest(self, data, size=-1):
6059
yield chunk
6160
out_len += len(chunk)
6261

62+
6363
class ZipCompressedReader(object):
6464
"""A buffer implementation reading zip compressed data from a source buffer and returning uncompressed data.
6565

wolframclient/utils/asyncio.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import asyncio
44
import functools
55

6-
from wolframclient.utils.functional import first, iterate
7-
86

97
def run_in_loop(cor, loop=None):
108
@functools.wraps(cor)
@@ -23,9 +21,10 @@ def get_event_loop(loop=None):
2321
return loop
2422

2523

26-
if hasattr(asyncio, 'run'):
24+
if hasattr(asyncio, "run"):
2725
run = asyncio.run
2826
else:
27+
2928
def run(main):
3029
loop = get_event_loop()
3130
return loop.run_until_complete(main)

wolframclient/utils/externalevaluate.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def __init__(self, socket):
9292
def write(self, bytes):
9393
self.socket.send(zmq.Frame(bytes))
9494

95+
9596
class StdoutProxy:
9697

9798
keep_listening = wl.ExternalEvaluate.Private.ExternalEvaluateKeepListening

0 commit comments

Comments
 (0)