Merge pull request #245 in LCL/wolframclientforpython from bugfix/406949-better-traceback to master

* commit '3fad63e629e9e39a27df7adf7a8dfba65e649e10':
  PacletInfo.m edited online with Bitbucket
  improving error message
  code lint
  better low level handling of missing python installation
  using 12.2 for now
  bumping version
  removing stdout proxy implementation

Author: crazyeng

PacletInfo.m

@@ -1,7 +1,7 @@
 Paclet[
     Name -> "WolframClientForPython",
     Version -> "1.1.5",
-    MathematicaVersion -> "11.3+",
+    MathematicaVersion -> "12.3+",
     Loading -> Automatic,
     Extensions -> {}
 ]

wolframclient/cli/commands/benchmark.py

@@ -82,7 +82,7 @@ def report(self):
         self.table_line()
 
         # running export to do all lazy loadings
-        binary_deserialize(export(1, target_format = 'wxf'))
+        binary_deserialize(export(1, target_format="wxf"))
 
         self.table_line("* Binary deserialize")
         self.table_line()

wolframclient/cli/commands/start_externalevaluate.py

@@ -1,9 +1,11 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
+import sys
 
 from wolframclient.cli.utils import SimpleCommand
 from wolframclient.utils.api import externalevaluate as ev
+from wolframclient.utils.api import zmq
 
 
 class Command(SimpleCommand):
@@ -19,4 +21,11 @@ def handle(self, port=None, installpath=None, **opts):
         if installpath:
             os.environ["WOLFRAM_INSTALLATION_DIRECTORY"] = installpath
 
+        try:
+            zmq.Context
+        except ImportError as e:
+            print("Error importing zmq: %s. Please install zmq. https://zeromq.org/languages/python/" % e, file=sys.stderr)
+            sys.stderr.flush()
+            sys.exit(1)
+
         ev.start_zmq_loop(port=port)

wolframclient/evaluation/kernel/kernelcontroller.py

@@ -19,7 +19,7 @@
 from wolframclient.utils.api import json, os, time, zmq
 
 if six.WINDOWS:
-    from subprocess import STARTUPINFO, STARTF_USESHOWWINDOW
+    from subprocess import STARTF_USESHOWWINDOW, STARTUPINFO
 
 __all__ = ["WolframKernelController"]
 

wolframclient/tests/deserializers/wxf_deserialize.py

@@ -21,6 +21,7 @@
 from wolframclient.utils.datastructures import immutabledict
 from wolframclient.utils.tests import TestCase as BaseTestCase
 
+
 class TestCase(BaseTestCase):
     def test_token_dimensions(self):
         token = WXFToken(None)
@@ -200,7 +201,7 @@ def test_compressed_input(self):
         self.assertEqual(expr, res)
 
     def test_nested_associations(self):
-        expr = immutabledict((('a', 2), ('a', 3)))
+        expr = immutabledict((("a", 2), ("a", 3)))
         expr = immutabledict(((expr, expr), (2, 3)))
         wxf = export(expr, target_format="wxf", compress=True)
         res = binary_deserialize(wxf, consumer=WXFConsumer())

wolframclient/tests/evaluation/__init__.py

@@ -9,10 +9,10 @@
 # The evaluation modules is only supported on python 3.5+, because of asyncio
 # We need to prevent the test suite from loading this module containing coroutines.
 if six.PY_35:
+    from wolframclient.tests.evaluation import test_async_cloud as m4
     from wolframclient.tests.evaluation import test_cloud as m1
-    from wolframclient.tests.evaluation import test_kernel as m2
     from wolframclient.tests.evaluation import test_coroutine as m3
-    from wolframclient.tests.evaluation import test_async_cloud as m4
+    from wolframclient.tests.evaluation import test_kernel as m2
 
     test_modules = (m1, m2, m3, m4)
 else:

wolframclient/tests/externalevaluate/ev_loop.py

@@ -3,7 +3,6 @@
 from threading import Thread
 
 import zmq
-
 from wolframclient.language import wl
 from wolframclient.serializers import export
 from wolframclient.utils.externalevaluate import EXPORT_KWARGS, StdoutProxy, start_zmq_loop

wolframclient/tests/serializers/pandas.py

@@ -37,13 +37,13 @@ def sparse_series_dict(self):
         d["b"] = 1
         d["a"] = 0
         d["c"] = 2
-        return pandas.Series(d, dtype='Sparse[int]')
+        return pandas.Series(d, dtype="Sparse[int]")
 
     def sparse_series_dict_indexed(self):
         constructor_dict = {1: 1.0}
         index = [0, 1, 2]
         # Series with index passed in
-        series = pandas.Series(constructor_dict, dtype='Sparse[float]')
+        series = pandas.Series(constructor_dict, dtype="Sparse[float]")
         return pandas.Series(series, index=index)
 
     def multiindex_series(self):

wolframclient/tests/serializers/wxf_pythonarray.py

@@ -33,7 +33,7 @@ def test_python_array(self):
 
     def test_generators(self):
 
-        array = NumericArray((i for i in range(10)), "Integer8", shape=(10, ))
+        array = NumericArray((i for i in range(10)), "Integer8", shape=(10,))
 
         self.assertEqual(
             export(numpy.arange(10).astype(numpy.int8), target_format="wxf"),
@@ -49,4 +49,4 @@ def test_generators(self):
             export(array, target_format="wxf"),
         )
 
-        self.assertEqual(len(array), 10)
+        self.assertEqual(len(array), 10)

wolframclient/utils/externalevaluate.py

@@ -94,59 +94,18 @@ def execute_from_string(code, globals={}, **opts):
         return env[last_expr.name]
 
 
-class SideEffectSender(logging.Handler):
-    def emit(self, record):
-        if isinstance(sys.stdout, StdoutProxy):
-            sys.stdout.send_side_effect(record.msg)
+class SocketWriter:
 
+    keep_listening = wl.ExternalEvaluate.Private.ExternalEvaluateKeepListening
 
-class SocketWriter:
     def __init__(self, socket):
         self.socket = socket
 
     def write(self, bytes):
         self.socket.send(zmq.Frame(bytes))
 
-
-class StdoutProxy:
-
-    keep_listening = wl.ExternalEvaluate.Private.ExternalEvaluateKeepListening
-
-    def __init__(self, stream):
-        self.stream = stream
-        self.clear()
-
-    def clear(self):
-        self.current_line = []
-        self.lines = []
-
-    def write(self, message):
-        messages = force_text(message).split("\n")
-
-        if len(messages) == 1:
-            self.current_line.extend(messages)
-        else:
-            self.current_line.append(messages.pop(0))
-            rest = messages.pop(-1)
-
-            self.lines.extend(messages)
-            self.flush()
-            if rest:
-                self.current_line.append(rest)
-
-    def flush(self):
-        if self.current_line or self.lines:
-            self.send_lines("".join(self.current_line), *self.lines)
-            self.clear()
-
-    def send_lines(self, *lines):
-        if len(lines) == 1:
-            return self.send_side_effect(wl.Print(*lines))
-        elif lines:
-            return self.send_side_effect(wl.CompoundExpression(*map(wl.Print, lines)))
-
     def send_side_effect(self, expr):
-        self.stream.write(export(self.keep_listening(expr), **EXPORT_KWARGS))
+        self.write(export(self.keep_listening(expr), **EXPORT_KWARGS))
 
 
 def evaluate_message(input=None, return_type=None, args=None, **opts):
@@ -201,7 +160,6 @@ def start_zmq_instance(port=None, write_to_stdout=True, **opts):
 
 def start_zmq_loop(
     message_limit=float("inf"),
-    redirect_stdout=True,
     export_kwargs=EXPORT_KWARGS,
     evaluate_message=evaluate_message,
     exception_class=None,
@@ -210,22 +168,17 @@ def start_zmq_loop(
 ):
 
     handler = to_wl(exception_class=exception_class, **export_kwargs)(handle_message)
-
     socket = start_zmq_instance(**opts)
-
     stream = SocketWriter(socket)
-
     messages = 0
 
-    if redirect_stdout:
-        sys.stdout = StdoutProxy(stream)
+    class SideEffectSender(logging.Handler):
+        def emit(self, record):
+            stream.send_side_effect(record.msg)
 
     side_effect_logger.addHandler(SideEffectSender())
 
     # now sit in a while loop, evaluating input
     while messages < message_limit:
         stream.write(handler(socket, evaluate_message=evaluate_message, consumer=consumer))
         messages += 1
-
-    if redirect_stdout:
-        sys.stdout = sys.__stdout__