Add Serializable type annotation to command()

MarkKoz · 64json · commit 18946018fddf · 2019-06-11T15:50:09.000+09:00
* Move _Number type alias to __init__.py
diff --git a/algorithm_visualizer/__init__.py b/algorithm_visualizer/__init__.py
@@ -1,6 +1,7 @@
 import atexit
 import json
 import os
+from typing import Union
 
 from algorithm_visualizer import randomize as Randomize
 from algorithm_visualizer.commander import Commander
@@ -11,6 +12,10 @@
     "Array1DTracer", "Array2DTracer", "ChartTracer", "LogTracer", "Tracer"
 )
 
+# Types which are serializable by the default JSONEncoder
+_Serializable = Union[dict, list, str, int, float, bool, None]
+_Number = Union[int, float]
+
 
 @atexit.register
 def execute():
diff --git a/algorithm_visualizer/commander.py b/algorithm_visualizer/commander.py
@@ -1,14 +1,14 @@
 import string
 from typing import Any, Dict, List, Optional
 
-from algorithm_visualizer import randomize
+from algorithm_visualizer import Randomize, _Serializable
 
 _MAX_COMMANDS = 1000000
 _MAX_OBJECTS = 100
 
 
 class Commander:
-    _keyRandomizer = randomize.String(8, string.ascii_lowercase + string.digits)
+    _keyRandomizer = Randomize.String(8, string.ascii_lowercase + string.digits)
     _objectCount = 0
     commands: List[Dict[str, Any]] = []
 
@@ -18,7 +18,7 @@ def __init__(self, *args):
         self.command(self.__class__.__name__, *args)
 
     @classmethod
-    def _command(cls, key: Optional[str], method: str, *args):
+    def _command(cls, key: Optional[str], method: str, *args: _Serializable):
         cmd = {
             "key": key,
             "method": method,
diff --git a/algorithm_visualizer/randomize.py b/algorithm_visualizer/randomize.py
@@ -1,9 +1,9 @@
 import abc
 import random
 import string
-from typing import List, NoReturn, Sequence, Union
+from typing import List, NoReturn, Sequence
 
-_Number = Union[float, int]
+from algorithm_visualizer import _Number
 
 
 class Randomizer(metaclass=abc.ABCMeta):
