Merge pull request #210 in LCL/wolframclientforpython from ECE-124/externalfunction to master

* commit '55460c8ac2e6982cef62514138eeaef67135c02c':
  using command instead of name
  returning ExternalFunction when the last expression is a class or a function

Author: crazyeng

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,13 +165,7 @@ def _serialize_external_object(self, o):
         yield "IsMethod", inspect.ismethod(o),
         yield "IsCallable", callable(o),
 
-        if callable(o):
-            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
+
 
     def serialize_external_object(self, obj):
         return self.serialize_function(

wolframclient/utils/externalevaluate.py

@@ -64,7 +64,9 @@ def execute_from_string(code, globals={}, **opts):
     if not expressions:
         return
 
-    if isinstance(last(expressions), ast.Expr):
+    last_expr = last(expressions)
+
+    if isinstance(last_expr, ast.Expr):
         result = expressions.pop(-1)
 
     if expressions:
@@ -73,6 +75,9 @@ def execute_from_string(code, globals={}, **opts):
     if result:
         return eval(compile(ast.Expression(result.value), "", "eval"), env)
 
+    elif isinstance(last_expr, (ast.FunctionDef, ast.ClassDef)):
+        return env[last_expr.name]
+
 
 class SideEffectSender(logging.Handler):
     def emit(self, record):