working implementation of python array

Author: crazyeng

wolframclient/language/array.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from wolframclient.serializers.wxfencoder import constants
-from wolframclient.utils import six
+from wolframclient.utils.encoding import concatenate_bytes
 
 try:
     from collections.abc import Sequence
@@ -14,14 +14,11 @@ def __init__(self, array, type, shape=None):
 
         self.array = array
         self.shape = shape or (len(array),)
-
-        if isinstance(type, six.string_types):
-            self.type = constants.ARRAY_TYPES[type]
-        else:
-            self.type = type
+        self.type = type
+        self.struct = constants.STRUCT_MAPPING[type]
 
     def tobytes(self):
-        raise NotImplementedError("aaa")
+        return concatenate_bytes(self.struct.pack(el) for el in self.array)
 
     def __getitem__(self, k):
         return self.array[k]

wolframclient/serializers/encoders/builtin.py

@@ -2,6 +2,7 @@
 
 import math
 
+from wolframclient.language.array import PythonArray
 from wolframclient.language.expression import WLFunction, WLInputExpression, WLSymbol
 from wolframclient.serializers.serializable import WLSerializable
 from wolframclient.serializers.utils import safe_len
@@ -173,3 +174,8 @@ def encode_serializable(serializer, o):
 @encoder.dispatch(Association)
 def encode_association(serializer, o):
     return _to_key_value(serializer.serialize_association, serializer, o)
+
+
+@encoder.dispatch(PythonArray)
+def encode_array(serializer, o):
+    return serializer.serialize_numeric_array(o.tobytes(), o.shape, o.type)

wolframclient/tests/serializers/wxf_pythonarray.py

@@ -2,21 +2,24 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from functools import partial
-
+from wolframclient.language.array import PythonArray
 from wolframclient.serializers import export
 from wolframclient.utils.api import numpy
-from wolframclient.utils.pythonarray import PythonArray
 from wolframclient.utils.tests import TestCase as BaseTestCase
 
 
 class TestCase(BaseTestCase):
-
-    export = partial(export, target_format="wl")
-
     def test_python_array(self):
 
-        for array, numpy_type, wl_type in (([1, 2, 3], numpy.uint64, "Integer64"),):
-
-            print(self.export(numpy.array(array, numpy_type)))
-            print(self.export(PythonArray(array, wl_type)))
+        for array, numpy_type, wl_type in (
+            ([1, 2, 3], numpy.int8, "Integer8"),
+            ([1, 2, 3], numpy.int32, "Integer32"),
+            ([1, 2, 3], numpy.int64, "Integer64"),
+            ([1.2, 2.3, 3], numpy.float32, "Real32"),
+            ([1.2, 2.3, 3], numpy.float64, "Real64"),
+        ):
+
+            self.assertEqual(
+                export(numpy.array(array, numpy_type), target_format="wxf"),
+                export(PythonArray(array, wl_type), target_format="wxf"),
+            )