Merge pull request #8 from fugle-dev/upgradeCore

chore: apply new core, use convert_ws_object

Author: bistin

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+## [0.3.0](https://github.com/fugle-dev/fugle-trade-python/compare/0.2.7...0.3.0) - 
+
+### Added
+
+- add convert_ws_object from core and apply [MR_8](https://github.com/fugle-dev/fugle-trade-python/pull/8)
+
+
 ## [0.2.7](https://github.com/fugle-dev/fugle-trade-python/compare/0.2.6...0.2.7) - 
 
 ### Added
@@ -21,4 +28,4 @@
 - feat: mock fugle_trade_core and test sdk [MR 1](https://github.com/fugle-dev/fugle-trade-python/pull/1)
 
 ## 0.2.4 
-  Public release
+  Public release

CONTRIBUTING.md

@@ -0,0 +1,26 @@
+## Local development
+
+### Installation
+
+```sh
+pip install poetry
+poetry install
+```
+
+### Test
+
+```sh
+poetry run pytest
+```
+
+or 
+
+```sh
+pytest
+```
+
+### Quick Test For Development
+
+```sh
+python -m examples.index
+```

README.md

@@ -1,30 +1,5 @@
 # Fugle Trade Python SDK
 
-## Installation
-
-```sh
-pip install poetry
-poetry install
-```
-
-## Test
-
-```sh
-poetry run pytest
-```
-
-or 
-
-```sh
-pytest
-```
-
-## Quick Test For Development
-
-```sh
-python -m examples.index
-```
-
 ## 事前準備
 
 可以參考 https://developer.fugle.tw/docs/trading/prerequisites 完成申請金鑰相關步驟

fugle_trade/websocket.py

@@ -3,35 +3,8 @@
 """
 
 import json
-import re
 from websocket import WebSocketApp
-
-def convert_to_snakecase(original_dict):
-    transformed_dict = {}
-    array_items = []
-    if not isinstance(original_dict, list):
-        for k in original_dict.keys():
-            value = re.sub(r'(?<!^)(?=[A-Z])', '_', k).lower()
-            if not isinstance(original_dict[k], list):
-                if isinstance(original_dict[k], dict):
-                    transformed_dict[value] = convert_to_snakecase(original_dict[k])
-                else:
-                    transformed_dict[value] = original_dict[k]
-            else:
-
-                array_items = []
-                for i in range(len(original_dict[k])):
-                    if isinstance(original_dict[k][i], dict):
-                        array_items.append(convert_to_snakecase(original_dict[k][i]))
-                        transformed_dict[value] = array_items
-                    else:
-                        transformed_dict[value] = original_dict[k]
-    else:
-        array_items = []
-        for item in original_dict:
-            array_items.append(convert_to_snakecase(item))
-        transformed_dict.update(array_items)
-    return transformed_dict
+from fugle_trade_core.fugle_trade_core import convert_ws_object
 
 class WebsocketHandler():
     """Handle Websocket connection"""
@@ -44,17 +17,15 @@ def __init__(self):
         self.on_close = default_fun
 
     def ws_on_message(self, _, in_message):
-        """callback function for websocket message, pipe to order or dealt based on message type"""
-        message = json.loads(in_message)
-        # if message['data']['$type'] == "System.String" :
-        #     return
+        """callback function for websocket message, pipe to order or dealt
+        based on message type"""
         try:
-            data = json.loads(message['data']['$value'])
-            if data['Kind'] == "ACK":
-                self.on_order(convert_to_snakecase(data))
+            data = json.loads(convert_ws_object(in_message))
+            if data['kind'] == "ACK":
+                self.on_order(data)
 
-            if data['Kind'] == "MAT":
-                self.on_dealt(convert_to_snakecase(data))
+            if data['kind'] == "MAT":
+                self.on_dealt(data)
         except:
             pass
 

poetry.lock

@@ -1,8 +1,14 @@
 [tool.poetry]
 name = "fugle-trade"
-version = "0.2.7"
+version = "0.3.0"
 description = ""
-authors = ["bistin <[email protected]>"]
+authors = ["Fortuna Intelligence Co., Ltd. <[email protected]>"]
+license = "MIT"
+readme = "README.md"
+homepage = "https://github.com/fugle-dev/fugle-trade-python#readme"
+repository = "https://github.com/fugle-dev/fugle-trade-python"
+documentation = "https://developer.fugle.tw/docs/trading/intro"
+keywords = ["fugle", "trade", "stock"]
 
 
 [[tool.poetry.source]]
@@ -14,7 +20,7 @@ python = "^3.7"
 websocket-client = "1.2.1"
 keyring = "23.5.0"
 "keyrings.cryptfile" = "1.3.8"
-fugle-trade-core = "0.2.5"
+fugle-trade-core = "0.3.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"

pyproject.toml

@@ -4,6 +4,11 @@
 
 JSON_ROOT = os.path.realpath(os.path.dirname(__file__)) + '/fixtures'
 
+def convert_ws_object(in_message):
+    message = json.loads(in_message)
+    data = json.loads(message['data']['$value'])
+    return convert_to_snakecase(data)
+
 def convert_to_snakecase(original_dict):
     transformed_dict = {}
     array_items = []