release 1.1.0

Author: leon332157

README.md

@@ -5,10 +5,12 @@ A Python client for [jsonstore.io](https://www.jsonstore.io/)
 ```bash
 pip install json-store-client
 ```
+#### An optional installation of [ujson](https://pypi.org/project/ujson/) is recommended for faster json processing.
+##### Also installing [cchardet](https://pypi.org/project/cchardet/) and [aiodns](https://pypi.org/project/aiodns/) are recommended by aiohttp for faster performance.
 
 ## Usage
 
-#### Demo of storing a Python object with json-store-client in async on [repl.it](https://repl.it/@leon332157/json-store-client-demo).
+#### Demo of storing a Python json-friendly object with json-store-client in async on [repl.it](https://repl.it/@leon332157/json-store-client-demo).
 
 ```python
 from json_store_client import *
@@ -73,7 +75,7 @@ Both return the client to use for data operations.
 Storing data in jsonstore with a key.
 
 ###### key (str): The key to be stored on jsonstore
-###### data (any): The data to be stored under the key. It can be any Python objects. Will be processed with [jsonpickle](https://github.com/jsonpickle/jsonpickle)
+###### data (any): The data to be stored under the key. It can be any Python objects.
 ###### timeout (int): The timeout for the http request. Default 5 seconds
 
 
@@ -82,7 +84,7 @@ Storing data in jsonstore with a key.
 
 Storing data in jsonstore with a dictionary mapping.
 
-###### data (dict):  A dict of {key(s):value(s)} to be updated. Value(s) can be any python object, will be dumped with [jsonpickle](https://github.com/jsonpickle/jsonpickle)
+###### data (dict):  A dict of {key(s):value(s)} to be updated. 
 ###### timeout (int): The timeout for the http request. Default 5 seconds
 
 > **Note:** If there is already some data stored under the key, it will be overwritten.

json_store_client/__init__.py

@@ -44,16 +44,19 @@
 
     await client.delete('test_key')
 """
-import json
+try:
+    import ujson as json
+except ImportError:
+    import json
+from asyncio import get_event_loop
 from warnings import warn
 
 import aiohttp
-import jsonpickle
-import pkg_resources
 import requests
 
 DEFAULT_TIMEOUT_SECONDS = 5
-VERSION = '1.0.2'
+VERSION = '1.1.0'
+__all__ = ['JsonstoreError', 'Client', 'AsyncClient', 'EmptyResponseWarning']
 
 
 class JsonstoreError(Exception):
@@ -98,7 +101,7 @@ def retrieve(self, key: str, timeout: int = DEFAULT_TIMEOUT_SECONDS):
             if not json_resp or not json_resp['result']:
                 warn('Jsonstore returned null, please make sure something is saved under this key.', EmptyResponseWarning)
                 return None
-            return jsonpickle.decode(json_resp['result'])
+            return json_resp['result']
         except (ValueError, KeyError) as e:
             raise JsonstoreError(str(e))
 
@@ -108,13 +111,13 @@ def store(self, key: str, data, timeout: int = DEFAULT_TIMEOUT_SECONDS):
         """Save data in jsonstore under a key.
 
         :param key:str Name of key to a resource
-        :param data:any Data to be updated/saved, will be processed with jsonpickle.
+        :param data Data to be updated/saved..
         :param timeout:int Timeout of the request in seconds
         """
         if not isinstance(key, str):
             raise TypeError("Key must be str, not {}".format(key.__class__.__name__))
         url = self.__finalize_url(key)
-        json_data = json.dumps(jsonpickle.encode(data))
+        json_data = json.dumps(data)
         resp = self.session.post(url, data=json_data, timeout=timeout)
         self.__check_response(resp)
         return json_data
@@ -173,17 +176,20 @@ def __finalize_url(self, key):
 class AsyncClient:
     def __init__(self, token: str):
         self.version = VERSION
-        self.session = aiohttp.ClientSession(headers={
-            'Accept': 'application/json',
-            'Content-type': 'application/json',
-            'User-Agent': f'Mozilla/5.0 Python/json-store-client/{self.version}'
-            })
+        self.session = get_event_loop().run_until_complete(self.__create_session())
         if not isinstance(token, str):
             raise TypeError("Token must be str, not {}".format(token.__class__.__name__))
         if token.startswith('https://'):
             token = token.split('/')[-1]
         self.__base_url = f'https://www.jsonstore.io/{token}'
 
+    async def __create_session(self):
+        return aiohttp.ClientSession(headers={
+            'Accept': 'application/json',
+            'Content-type': 'application/json',
+            'User-Agent': f'Mozilla/5.0 Python/json-store-client/{self.version}'
+            })
+
     async def retrieve(self, key: str, timeout: int = DEFAULT_TIMEOUT_SECONDS):
         """Get gets value from jsonstore.
 
@@ -196,11 +202,12 @@ async def retrieve(self, key: str, timeout: int = DEFAULT_TIMEOUT_SECONDS):
         url = await self.__finalize_url(key)
         try:
             async with self.session.get(url, timeout=timeout) as s:
-                json_resp = await s.json()
+                json_resp = json.loads(await s.text())
             if not json_resp or not json_resp['result']:
-                warn('JSONSTORE WARNING: Jsonstore returned null, please make sure something is saved under this key.')
+                warn('JSONSTORE WARNING: Jsonstore returned null, please make sure something is saved under this key.',
+                     EmptyResponseWarning)
                 return None
-            return jsonpickle.decode(json_resp['result'])
+            return json_resp['result']
         except (ValueError, KeyError) as e:
             raise JsonstoreError(str(e))
 
@@ -210,13 +217,13 @@ async def store(self, key: str, data, timeout: int = DEFAULT_TIMEOUT_SECONDS):
         """Save data in jsonstore under a key.
 
         :param key:str Name of key to a resource
-        :param data:any Data to be updated/saved, will be processed with jsonpickle.
+        :param data Data to be updated/saved.
         :param timeout:int Timeout of the request in seconds
         """
         if not isinstance(key, str):
             raise TypeError("Key must be str, not {}".format(key.__class__.__name__))
         url = await self.__finalize_url(key)
-        json_data = json.dumps(jsonpickle.encode(data))
+        json_data = json.dumps(data)
         async with self.session.post(url, data=json_data, timeout=timeout) as s:
             s.raise_for_status()
         return json_data
@@ -226,7 +233,7 @@ async def store(self, key: str, data, timeout: int = DEFAULT_TIMEOUT_SECONDS):
     async def store_multiple(self, data: dict, timeout: int = DEFAULT_TIMEOUT_SECONDS):
         """Save data in jsonstore with a dict mapping.
 
-        :param data:dict A dict of {key(s):value(s)} to be updated. Value(s) can be any python object, will be processed with jsonpickle.
+        :param data:dict A dict of {key(s):value(s)} to be updated.
         :param timeout:int Timeout of the request in seconds
         """
         if not isinstance(data, dict):

requirements.txt

@@ -1,3 +1,4 @@
 requests>=2.22.0
 aiohttp>=3.5.4
-jsonpickle==1.1
+jsonpickle==1.1
+ujson==1.35

setup.py

@@ -3,11 +3,11 @@
 with open("README.md", "r") as fh:
     long_description = fh.read()
 requires = [
-    'requests', 'jsonpickle', 'aiohttp'
+    'requests', 'aiohttp'
     ]
 setuptools.setup(
     name="json-store-client",
-    version="1.0.2",
+    version="1.1.0",
     author="leon332157",
     author_email="[email protected]",
     description="A client library for jsonstore",

tests.py

@@ -1,10 +1,22 @@
+import asyncio
+import random
 import unittest
+
 import json_store_client
-import random
 
 TOKEN = "4aca8a426a3d8f3b0230f8dd83806b10d25237e22393bdcddb710f548c373d7e"
 KEY = 'testKey'
-DATA = {'testDataKey': 'testDataValue'}
+DATA = {'testDataKey': 'testDataValue' + '😀'}
+
+
+def async_test(f):
+    def wrapper(*args, **kwargs):
+        coro = asyncio.coroutine(f)
+        future = coro(*args, **kwargs)
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(future)
+
+    return wrapper
 
 
 class TestSyncClient(unittest.TestCase):
@@ -19,12 +31,12 @@ def testEmptyKey(self):
             self.client.get(str(random.randint(0, 10)))
 
     def testSave(self):
-        self.assertEqual(self.client.store(KEY, DATA), '"{\\"testDataKey\\": \\"testDataValue\\"}"')
+        self.assertEqual(self.client.store(KEY, DATA), '{"testDataKey":"testDataValue\\ud83d\\ude00"}')
         self.assertEqual(self.client.get(KEY), DATA)
 
     def testSaveMultiple(self):
         self.assertIsNone(self.client.store_multiple(DATA))
-        self.assertEqual(self.client.get('testDataKey'), 'testDataValue')
+        self.assertEqual(self.client.get('testDataKey'), 'testDataValue😀')
 
     def testDelete(self):
         self.assertEqual(self.client.delete(KEY), KEY)
@@ -40,21 +52,26 @@ def setUp(self):
     def testInit(self):
         self.assertIsInstance(self.client, json_store_client.AsyncClient)
 
+    @async_test
     async def testEmptyKey(self):
         with self.assertWarns(json_store_client.EmptyResponseWarning):
             await self.client.get(str(random.randint(0, 10)))
 
+    @async_test
     async def testSave(self):
-        self.assertEqual(await self.client.store(KEY, DATA), '"{\\"testDataKey\\": \\"testDataValue\\"}"')
+        self.assertEqual(await self.client.store(KEY, DATA), '{"testDataKey":"testDataValue\\ud83d\\ude00"}')
         self.assertEqual(await self.client.get(KEY), DATA)
 
+    @async_test
     async def testSaveMultiple(self):
         self.assertIsNone(await self.client.store_multiple(DATA))
-        self.assertEqual(await self.client.get('testDataKey'), 'testDataValue')
+        self.assertEqual(await self.client.get('testDataKey'), 'testDataValue😀')
 
+    @async_test
     async def testDelete(self):
         self.assertEqual(await self.client.delete(KEY), KEY)
 
+    @async_test
     async def doCleanups(self):
         await self.client.session.close()