- Significant refactoring resulting in a 34% reduction in size of the codebase (excluding the Lightweight Charts package) and greater efficiency.

- Upgraded to Lightweight Charts v4.0.1.
- Added a ‘hover’ item to the returning dictionary from subscribe_click.
- Markers and SubCharts no longer use a UUID for identification, but an 8 character string.

lightweight_charts/util.py

@@ -21,71 +21,56 @@ class ColorError(ValueError):
         return f'{self.msg}'
 
 
+class IDGen(list):
+    def generate(self):
+        var = ''.join(choices(ascii_lowercase, k=8))
+        if var not in self:
+            self.append(var)
+            return var
+        self.generate()
+
+
 def _valid_color(string):
     if string[:3] == 'rgb' or string[:4] == 'rgba' or string[0] == '#':
         return True
     raise ColorError('Colors must be in the format of either rgb, rgba or hex.')
 
 
-LINE_TYPE = Literal['solid', 'dotted', 'dashed', 'large_dashed', 'sparse_dotted']
+def _js_bool(b: bool): return 'true' if b is True else 'false' if b is False else None
 
-POSITION = Literal['above', 'below', 'inside']
 
-SHAPE = Literal['arrow_up', 'arrow_down', 'circle', 'square']
+LINE_STYLE = Literal['solid', 'dotted', 'dashed', 'large_dashed', 'sparse_dotted']
+
+MARKER_POSITION = Literal['above', 'below', 'inside']
+
+MARKER_SHAPE = Literal['arrow_up', 'arrow_down', 'circle', 'square']
 
 CROSSHAIR_MODE = Literal['normal', 'magnet']
 
 PRICE_SCALE_MODE = Literal['normal', 'logarithmic', 'percentage', 'index100']
 
 
-def _line_type(lt: LINE_TYPE):
-    return {
-        'solid': 'Solid',
-        'dotted': 'Dotted',
-        'dashed': 'Dashed',
-        'large_dashed': 'LargeDashed',
-        'sparse_dotted': 'SparseDotted',
-        None: None,
-    }[lt]
+def _line_style(line: LINE_STYLE):
+    js = 'LightweightCharts.LineStyle.'
+    return js+line[:line.index('_')].title() + line[line.index('_') + 1:].title() if '_' in line else js+line.title()
 
 
-def _position(p: POSITION):
+def _crosshair_mode(mode: CROSSHAIR_MODE):
+    return f'LightweightCharts.CrosshairMode.{mode.title()}' if mode else None
+
+
+def _price_scale_mode(mode: PRICE_SCALE_MODE):
+    return f"LightweightCharts.PriceScaleMode.{'IndexedTo100' if mode == 'index100' else mode.title() if mode else None}"
+
+
+def _marker_shape(shape: MARKER_SHAPE):
+    return shape[:shape.index('_')]+shape[shape.index('_')+1:].title() if '_' in shape else shape.title()
+
+
+def _marker_position(p: MARKER_POSITION):
     return {
         'above': 'aboveBar',
         'below': 'belowBar',
         'inside': 'inBar',
         None: None,
-    }[p]
-
-
-def _shape(shape: SHAPE):
-    return {
-        'arrow_up': 'arrowUp',
-        'arrow_down': 'arrowDown',
-        'circle': 'Circle',
-        'square': 'Square',
-        None: None,
-    }[shape]
-
-
-def _crosshair_mode(mode: CROSSHAIR_MODE): return mode.title() if mode else None
-
-
-def _js_bool(b: bool): return 'true' if b is True else 'false' if b is False else None
-
-
-def _price_scale_mode(mode: PRICE_SCALE_MODE):
-    return 'IndexedTo100' if mode == 'index100' else mode.title() if mode else None
-
-
-class IDGen:
-    def __init__(self):
-        self.list = []
-
-    def generate(self):
-        var = ''.join(choices(ascii_lowercase, k=8))
-        if var in self.list:
-            self.generate()
-        else:
-            self.list.append(var)
-            return var
+    }[p]