Merge branch 'master' into feature/better-read-write-performances

# Conflicts:
#	wolframclient/utils/externalevaluate.py

Author: Dorian Birraux

.gitignore

@@ -9,4 +9,5 @@ wolframclient/tests/local_config.json
 .coverage
 .vscode
 *.code-workspace
-/test-reports
+/test-reports
+.DS_Store

setup.py

@@ -26,7 +26,7 @@
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
-    "Topic :: Software Development :: Libraries :: Wolfram Language Library"
+    "Topic :: Software Development :: Libraries"
 ]
 
 
@@ -66,6 +66,7 @@ def load_tests():
         'oauthlib',
         'zmq',
     ],
+    classifiers = CLASSIFIERS,
     project_urls={
         'Source code': 'https://github.com/WolframResearch/WolframClientForPython',
         'Documentation': 'https://wolfr.am/wolframclientdoc',

wolframclient/evaluation/cloud/asynccloudsession.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
+import json
 import logging
 
 from wolframclient.evaluation.base import WolframAsyncEvaluator
@@ -260,7 +261,7 @@ async def perform(self, **kwargs):
 # formatting for http requests, based on aiohttp objects.
 
 
-def _encode_inputs_as_wxf(inputs, multipart, **kwargs):
+def _encode_inputs_as_wxf(form_data, inputs, **kwargs):
     for name, value in inputs.items():
         form_data.add_field(name + "__wxf", export(value, target_format="wxf", **kwargs))
 

wolframclient/evaluation/cloud/oauth.py

@@ -192,17 +192,18 @@ def __init__(
 
     def authenticate(self):
         if logger.isEnabledFor(logging.DEBUG):
-            logger.debug("xauth authentication of user %s", user)
+            logger.debug("xauth authentication of user %s", self.xauth_credentials.user)
         if not self.server.is_xauth():
             raise AuthenticationException(
                 "XAuth is not configured. Missing consumer key and/or secret."
             )
         # todo use xauth server key/secret
         client = self.client_class(self.consumer_key, self.consumer_secret)
-        params = {}
-        params["x_auth_username"] = self.xauth_credentials.user
-        params["x_auth_password"] = self.xauth_credentials.password
-        params["x_auth_mode"] = "client_auth"
+        params = {
+            "x_auth_username": self.xauth_credentials.user,
+            "x_auth_password": self.xauth_credentials.password,
+            "x_auth_mode": "client_auth"
+        }
 
         # avoid dumping password in log files.
         logging.disable(logging.DEBUG)

wolframclient/evaluation/kernel/initkernel.m

@@ -150,14 +150,16 @@ no matter the total size (tested with 80MB) *)
 socketEventHandler[data_] := Block[
 	{expr},
 	ClientLibrary`debug["Evaluating a new expression."];
-	expr = EvaluationData[BinarySerialize[BinaryDeserialize[data]]];
+	expr = EvaluationData[BinaryDeserialize[data]];
 	(* Produce inline InputForm string messages. *)
 	AssociateTo[
-		expr,
-		"MessagesText" -> Map[
-			fmtmsg,
-			expr["MessagesExpressions"]
-		]
+		expr, {
+			"Result" -> BinarySerialize[expr["Result"]],
+			"MessagesText" -> Map[
+				fmtmsg,
+				expr["MessagesExpressions"]
+			]
+		}
 	];
 	ClientLibrary`debug["Done evaluating."];
 	SocketWriteByteArrayFunc[
@@ -167,7 +169,6 @@ no matter the total size (tested with 80MB) *)
 	ClientLibrary`debug["Done responding."];
 ];
 
-
 SendAck[] := WriteString[$OutputSocket, "OK"]
 
 $MaxIdlePause=.001;

wolframclient/evaluation/pool.py

@@ -73,7 +73,7 @@ def __init__(
     ):
         super().__init__(loop)
         if poolsize <= 0:
-            raise ValueError("Invalid pool size value %i. Expecting a positive integer." % i)
+            raise ValueError("Invalid pool size value %i. Expecting a positive integer." % poolsize)
         self._queue = asyncio.Queue(load_factor * poolsize, loop=self._loop)
         self.async_language_session_class = async_language_session_class
         self._evaluators = set()

wolframclient/exception.py

@@ -14,7 +14,7 @@ def __init__(self, response, msg=None):
         else:
             try:
                 self.msg = response.text()
-            except UnicodeDecodeErrors:
+            except UnicodeDecodeError:
                 self.msg = "Failed to decode request body."
 
     def __str__(self):

wolframclient/language/traceback.py

@@ -236,6 +236,7 @@ def _get_lines_from_file(filename, lineno, context_lines, loader=None, module_na
                 break
         source = [force_text(sline, encoding, "replace") for sline in source]
 
+    lineno = min(lineno, len(source) - 1)
     lower_bound = max(0, lineno - context_lines)
     upper_bound = lineno + context_lines
 

wolframclient/serializers/base.py

@@ -134,12 +134,22 @@ def serialize_tzinfo(
     def _serialize_external_object(self, o):
 
         yield "System", "Python"
-        yield "Type", "PythonFunction"
+
+        if callable(o):
+            yield "Type", "PythonFunction"
+            try:
+                # force tuple to avoid calling this method again on `map`.
+                yield "Arguments", tuple(map(force_text, first(inspect.getfullargspec(o))))
+            except TypeError:
+                # this function can fail with TypeError unsupported callable
+                pass
+        else:
+            yield "Type", "PythonObject"
 
         if hasattr(o, "__name__"):
-            yield "Name", force_text(o.__name__)
+            yield "Command", force_text(o.__name__)
         else:
-            yield "Name", force_text(o.__class__.__name__)
+            yield "Command", force_text(o.__class__.__name__)
 
         is_module = inspect.ismodule(o)
 
@@ -155,12 +165,7 @@ def _serialize_external_object(self, o):
         yield "IsMethod", inspect.ismethod(o),
         yield "IsCallable", callable(o),
 
-        if callable(o):
-            try:
-                yield "Arguments", map(force_text, first(inspect.getargspec(o)))
-            except TypeError:
-                # this function can fail with TypeError unsupported callable
-                pass
+
 
     def serialize_external_object(self, obj):
         return self.serialize_function(

wolframclient/serializers/encoder.py

@@ -100,11 +100,13 @@ def update_dispatch(self):
 
 @wolfram_encoder.dispatch(object)
 def encode(serializer, o):
-    if is_iterable(o):
-        return serializer.serialize_iterable(map(serializer.encode, o), length=safe_len(o))
+
     if serializer.allow_external_objects:
         return serializer.serialize_external_object(o)
 
+    if is_iterable(o):
+        return serializer.serialize_iterable(map(serializer.encode, o), length=safe_len(o))
+
     raise NotImplementedError("Cannot serialize object of class %s" % o.__class__)