Merge pull request #17 from RedisAI/dtype_issue

Dtype issue fix

Author: Sherin Thomas

redisai/client.py

@@ -54,7 +54,7 @@ def _convert_to_num(dt, arr):
         if isinstance(obj, list):
             _convert_to_num(obj)
         else:
-            if dt in (DType.float.value, DType.double.value):
+            if dt in (DType.float, DType.double):
                 arr[ix] = float(obj)
             else:
                 arr[ix] = int(obj)
@@ -159,6 +159,8 @@ def to_numpy(self):
 
     @staticmethod
     def _to_numpy_type(t):
+        if isinstance(t, DType):
+            t = t.value
         mm = {
             'FLOAT': 'float32',
             'DOUBLE': 'float64'
@@ -237,10 +239,11 @@ def tensorget(self, key, as_type=Tensor, meta_only=False):
         argname = 'META' if meta_only else as_type.ARGNAME
         res = self.execute_command('AI.TENSORGET', key, argname)
         dtype, shape = to_string(res[0]), res[1]
+        dt = DType.__members__[dtype.lower()]
         if meta_only:
-            return as_type(dtype, shape, [])
+            return as_type(dt, shape, [])
         else:
-            return as_type.from_resp(dtype, shape, res[2])
+            return as_type.from_resp(dt, shape, res[2])
 
     def scriptset(self, name, device, script):
         return self.execute_command('AI.SCRIPTSET', name, device.value, script)

setup.py

@@ -2,13 +2,17 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
-exec(open('redisai/version.py').read())
+exec(open('redisai/version.py', encoding='utf-8').read())
+with open('README.md') as f:
+    long_description = f.read()
+
 
 setup(
     name='redisai',
     version=__version__,  # comes from redisai/version.py
-
     description='RedisAI Python Client',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
     url='http://github.com/RedisAI/redisai-py',
     author='RedisLabs',
     author_email='[email protected]',

test/test.py

@@ -40,9 +40,14 @@ def test_set_tensor(self):
 
     def test_numpy_tensor(self):
         con = self.get_client()
-        con.tensorset('x', np.array([2, 3]))
+        input_array = np.array([2, 3])
+        con.tensorset('x', input_array)
         values = con.tensorget('x').value
         self.assertEqual([2, 3], values)
+        values = con.tensorget('x', as_type=BlobTensor)
+        self.assertTrue(np.allclose(input_array, values.to_numpy()))
+        ret = con.tensorset('x', values)
+        self.assertEqual(ret, b'OK')
 
     def test_run_tf_model(self):
         model_path = os.path.join(MODEL_DIR, 'graph.pb')