clean repo

Author: Insmael

.gitignore

@@ -1,7 +1,30 @@
-__pycache__/*
-*/__pycache__/*
-.vscode/*
-build/*
-cryptomarket_api.egg-info/*
-dist/*
-p-env/*
+.vscode/
+p-env/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST

cryptomarket/websockets/account_client.py

@@ -25,12 +25,14 @@ def __init__(
             api_key, 
             api_secret, 
             subscription_keys={
+                # transaction
+                "subscribeTransactions":"transaction",
+                "unsubscribeTransactions":"transaction",
+                "updateTransaction":"transaction",
+                # balance
                 "unsubscribeBalance":"balance", 
                 "subscribeBalance":"balance",
                 "balance":"balance",
-                "subscribeTransactions":"transaction",
-                "subscribeTransactions":"transaction",
-                "updateTransaction":"transaction"
             },
             on_connect=on_connect, 
             on_error=on_error, 
@@ -211,22 +213,24 @@ def subscribe_to_balance(self, callback: callable, result_callback: callable=Non
 
         https://api.exchange.cryptomkt.com/#subscription-to-the-balance
 
-        :param callback: A callable to call with each update of the result data. It takes one argument, the balance feed.
+        :param callback: A callable to call with each update of the result data. It takes one argument, the balance feed, a list of balances.
         :param result_callback: A callable to call with the subscription result. It takes two arguments, err and result. err is None for successful calls, result is None for calls with error: callback(err, result).
 
-        :returns: A transaction of the account as feed for the callback.
+        :returns: A list of balances of the account as feed for the callback.
 
         .. code-block:: python
-        {
-            "id": "76b70d1c-3dd7-423e-976e-902e516aae0e",
-            "index": 7173627250,
-            "type": "bankToExchange",
-            "status": "success",
-            "currency": "BTG",
-            "amount": "0.00001000",
-            "createdAt": "2021-01-31T08:19:33.892Z",
-            "updatedAt": "2021-01-31T08:19:33.967Z"
-        }
+        [
+            {
+                "currency": "BTC",
+                "available": "0.00005821",
+                "reserved": "0"
+            },
+            {
+                "currency": "DOGE",
+                "available": "11",
+                "reserved": "0"
+            }
+        ]
         """
         self.send_subscription(method='subscribeBalance', callback=callback, params={}, result_callback=result_callback)
 

cryptomarket/websockets/client_base.py

@@ -3,7 +3,7 @@
 from cryptomarket.exceptions import CryptomarketAPIException
 from cryptomarket.websockets.callback_cache import CallbackCache
 from cryptomarket.websockets.manager import WebsocketManager
-from types import Dict
+from typing import Dict
 
 
 class ClientBase:
@@ -76,7 +76,13 @@ def handle(self, message):
             self.handle_response(message)
 
     def handle_notification(self, message):
-        callback = self.callback_cache.get_subscription_callback("subscription")
+        method = message['method']
+        if 'params' not in message:
+            return
+        params = message['params']
+        key = self.build_key(method, params)
+
+        callback = self.callback_cache.get_subscription_callback(key)
         if callback is not None:
             if type(message["params"])==list:
                 for feed in message["params"]:
@@ -101,4 +107,4 @@ def handle_response(self, response):
     def build_key(self, method, params):
         if not method in self.subscription_keys: 
             return "subscription"
-        return self.subscription_map[method]
+        return self.subscription_keys[method]

cryptomarket/websockets/trading_client.py

@@ -25,6 +25,7 @@ def __init__(
             api_key, 
             api_secret, 
             subscription_keys={
+                # reports
                 "subscribeReports":"reports",
                 'activeOrders':'reports',
                 'report':'reports',

cryptomarket_sdk.egg-info/PKG-INFO

@@ -0,0 +1,2 @@
+requests==2.22.0
+websocket-client==1.1.0