lets-plot 4.3.3__cp312-cp312-win_amd64.whl → 4.4.0__cp312-cp312-win_amd64.whl

lets_plot/plot/series_meta.py

@@ -0,0 +1,123 @@
+#  Copyright (c) 2024. JetBrains s.r.o.
+#  Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+from datetime import datetime
+from typing import Union, Dict, Iterable
+
+from lets_plot._type_utils import is_polars_dataframe
+from lets_plot.plot.util import is_pandas_data_frame
+
+TYPE_INTEGER = 'int'
+TYPE_FLOATING = 'float'
+TYPE_STRING = 'str'
+TYPE_BOOLEAN = 'bool'
+TYPE_DATE_TIME = 'datetime'
+TYPE_UNKNOWN = 'unknown'
+
+
+def infer_type(data: Union[Dict, 'pandas.DataFrame', 'polars.DataFrame']) -> Dict[str, str]:
+    type_info = {}
+
+    if is_pandas_data_frame(data):
+        import pandas as pd
+        import numpy as np  # np is a dependency of pandas, we can import it without checking
+
+        for var_name, var_content in data.items():
+            if data.empty:
+                type_info[var_name] = TYPE_UNKNOWN
+                continue
+
+            inferred_type = pd.api.types.infer_dtype(var_content.values, skipna=True)
+            if inferred_type == "categorical":
+                dtype = var_content.cat.categories.dtype
+
+                if np.issubdtype(dtype, np.integer):
+                    type_info[var_name] = TYPE_INTEGER
+                elif np.issubdtype(dtype, np.floating):
+                    type_info[var_name] = TYPE_FLOATING
+                elif np.issubdtype(dtype, np.object_):
+                    # Check if all elements are strings
+                    if all(isinstance(x, str) for x in var_content.cat.categories):
+                        type_info[var_name] = TYPE_STRING
+                    else:
+                        type_info[var_name] = TYPE_UNKNOWN
+                else:
+                    type_info[var_name] = TYPE_UNKNOWN
+            else:
+                # see https://pandas.pydata.org/docs/reference/api/pandas.api.types.infer_dtype.html
+                if inferred_type == 'string':
+                    type_info[var_name] = TYPE_STRING
+                elif inferred_type == 'floating':
+                    type_info[var_name] = TYPE_FLOATING
+                elif inferred_type == 'integer':
+                    type_info[var_name] = TYPE_INTEGER
+                elif inferred_type == 'boolean':
+                    type_info[var_name] = TYPE_BOOLEAN
+                elif inferred_type == 'datetime64' or inferred_type == 'datetime':
+                    type_info[var_name] = TYPE_DATE_TIME
+                elif inferred_type == "date":
+                    type_info[var_name] = TYPE_DATE_TIME
+                elif inferred_type == 'empty':  # for columns with all None values
+                    type_info[var_name] = TYPE_UNKNOWN
+                else:
+                    type_info[var_name] = 'unknown(pandas:' + inferred_type + ')'
+    elif is_polars_dataframe(data):
+        import polars as pl
+        from polars.datatypes.group import INTEGER_DTYPES, FLOAT_DTYPES
+        for var_name, var_type in data.schema.items():
+
+            # https://docs.pola.rs/api/python/stable/reference/datatypes.html
+            if var_type in FLOAT_DTYPES:
+                type_info[var_name] = TYPE_FLOATING
+            elif var_type in INTEGER_DTYPES:
+                type_info[var_name] = TYPE_INTEGER
+            elif var_type == pl.datatypes.String:
+                type_info[var_name] = TYPE_STRING
+            elif var_type == pl.datatypes.Boolean:
+                type_info[var_name] = TYPE_BOOLEAN
+            elif var_type == pl.datatypes.Date or var_type == pl.datatypes.Datetime:
+                type_info[var_name] = TYPE_DATE_TIME
+            else:
+                type_info[var_name] = 'unknown(polars:' + str(var_type) + ')'
+    elif isinstance(data, dict):
+        for var_name, var_content in data.items():
+            if isinstance(var_content, Iterable):
+                if not any(True for _ in var_content):  # empty
+                    type_info[var_name] = TYPE_UNKNOWN
+                    continue
+
+                type_set = set(type(val) for val in var_content)
+                if None in type_set:
+                    type_set.remove(None)
+
+                if len(type_set) > 1:
+                    type_info[var_name] = 'unknown(mixed types)'
+                    continue
+
+                try:
+                    import numpy
+                except ImportError:
+                    numpy = None
+
+                type_obj = list(type_set)[0]
+                if type_obj == bool:
+                    type_info[var_name] = TYPE_BOOLEAN
+                elif issubclass(type_obj, int):
+                    type_info[var_name] = TYPE_INTEGER
+                elif issubclass(type_obj, float):
+                    type_info[var_name] = TYPE_FLOATING
+                elif issubclass(type_obj, str):
+                    type_info[var_name] = TYPE_STRING
+                elif issubclass(type_obj, datetime):
+                    type_info[var_name] = TYPE_DATE_TIME
+                elif numpy and issubclass(type_obj, numpy.datetime64):
+                    type_info[var_name] = TYPE_DATE_TIME
+                elif numpy and issubclass(type_obj, numpy.timedelta64):
+                    type_info[var_name] = TYPE_DATE_TIME
+                elif numpy and issubclass(type_obj, numpy.integer):
+                    type_info[var_name] = TYPE_INTEGER
+                elif numpy and issubclass(type_obj, numpy.floating):
+                    type_info[var_name] = TYPE_FLOATING
+                else:
+                    type_info[var_name] = 'unknown(python:' + str(type_obj) + ')'
+
+    return type_info

lets_plot/plot/stat.py

@@ -498,11 +498,10 @@ def stat_sum(mapping=None, *, data=None, geom=None, position=None, show_legend=N
     --------
     .. jupyter-execute::
         :linenos:
-        :emphasize-lines: 10
+        :emphasize-lines: 9
 
         import numpy as np
         from lets_plot import *
-        from lets_plot.mapping import as_discrete
         LetsPlot.setup_html()
         n = 50
         np.random.seed(42)
@@ -515,11 +514,10 @@ def stat_sum(mapping=None, *, data=None, geom=None, position=None, show_legend=N
 
     .. jupyter-execute::
         :linenos:
-        :emphasize-lines: 10
+        :emphasize-lines: 9
 
         import numpy as np
         from lets_plot import *
-        from lets_plot.mapping import as_discrete
         LetsPlot.setup_html()
         n = 50
         np.random.seed(42)

lets_plot/plot/theme_.py

@@ -69,6 +69,9 @@ def theme(*,
           plot_margin=None,
           plot_inset=None,
 
+          plot_title_position=None,
+          plot_caption_position=None,
+
           strip_background=None,  # ToDo: x/y
           strip_text=None,  # ToDo: x/y
           # ToDo: strip.placement
@@ -232,6 +235,14 @@ def theme(*,
         - a list of four numbers - the insets are applied to the top, right, bottom and left in that order.
 
         It is acceptable to use None for any side; in this case, the default value for the plot inset side will be used.
+    plot_title_position : {'panel', 'plot'}, default='panel'
+        Alignment of the plot title/subtitle.
+        A value of 'panel' means that title and subtitle are aligned to the plot panels.
+        A value of 'plot' means that title and subtitle are aligned to the entire plot (excluding margins).
+    plot_caption_position : {'panel', 'plot'}, default='panel'
+        Alignment of the plot caption.
+        A value of 'panel' means that caption is aligned to the plot panels.
+        A value of 'plot' means that caption is aligned to the entire plot (excluding margins).
     strip_background : str or dict
         Background of facet labels.
         Set 'blank' or result of `element_blank()` to draw nothing.
@@ -388,6 +399,7 @@ def element_rect(
     linetype : int or str
         Type of the line.
         Codes and names: 0 = 'blank', 1 = 'solid', 2 = 'dashed', 3 = 'dotted', 4 = 'dotdash', 5 = 'longdash', 6 = 'twodash'.
+        For more info see https://lets-plot.org/python/pages/aesthetics.html#line-types.
     blank : bool, default=False
         If True - draws nothing, and assigns no space.
 

lets_plot/plot/tooltip.py

@@ -155,7 +155,7 @@ class layer_tooltips(FeatureSpec):
         - field='^X' - for all positional x,
         - field='^Y' - for all positional y.
 
-        |
+        ----
 
         The string template in `format` will allow to change lines
         for the default tooltip without `line` specifying.
@@ -163,7 +163,7 @@ class layer_tooltips(FeatureSpec):
         Aes and var formats are not interchangeable, i.e. var format
         will not be applied to aes, mapped to this variable.
 
-        |
+        ----
 
         For more info see https://lets-plot.org/python/pages/formats.html.
 
@@ -420,29 +420,29 @@ class layer_tooltips(FeatureSpec):
         The resulting string will be at the beginning of the general tooltip, centered and highlighted in bold.
         A long title can be split into multiple lines using `\\\\n` as a text separator.
 
-    Examples
-    --------
-    .. jupyter-execute::
-        :linenos:
-        :emphasize-lines: 15
+        Examples
+        --------
+        .. jupyter-execute::
+            :linenos:
+            :emphasize-lines: 15
 
-        import numpy as np
-        from lets_plot import *
-        LetsPlot.setup_html()
-        n = 100
-        np.random.seed(42)
-        data = {
-            'id': np.arange(n),
-            'x': np.random.normal(size=n),
-            'y': np.random.normal(size=n),
-            'c': np.random.choice(['a', 'b'], size=n),
-            'w': np.random.randint(1, 11, size=n)
-        }
-        ggplot(data, aes('x', 'y')) + \\
-            geom_point(aes(color='c', size='w'), show_legend=False, \\
-                       tooltips=layer_tooltips().title('@id')
-                                                .line('color|@c')
-                                                .line('size|@w'))
+            import numpy as np
+            from lets_plot import *
+            LetsPlot.setup_html()
+            n = 100
+            np.random.seed(42)
+            data = {
+                'id': np.arange(n),
+                'x': np.random.normal(size=n),
+                'y': np.random.normal(size=n),
+                'c': np.random.choice(['a', 'b'], size=n),
+                'w': np.random.randint(1, 11, size=n)
+            }
+            ggplot(data, aes('x', 'y')) + \\
+                geom_point(aes(color='c', size='w'), show_legend=False, \\
+                           tooltips=layer_tooltips().title('@id')
+                                                    .line('color|@c')
+                                                    .line('size|@w'))
 
         """
         self._tooltip_title = value

lets_plot/plot/util.py

@@ -2,14 +2,13 @@
 # Copyright (c) 2019. JetBrains s.r.o.
 # Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 #
-from collections.abc import Iterable
-from datetime import datetime
-from typing import Any, Tuple, Sequence, Optional, Dict
+from typing import Any, Tuple, Sequence, Optional, Dict, List
 
-from lets_plot._type_utils import is_dict_or_dataframe, is_polars_dataframe
+from lets_plot._type_utils import is_pandas_data_frame
 from lets_plot.geo_data_internals.utils import find_geo_names
 from lets_plot.mapping import MappingMeta
-from lets_plot.plot.core import aes
+from lets_plot.plot.core import aes, FeatureSpec
+from lets_plot.plot.series_meta import infer_type, TYPE_UNKNOWN
 
 
 def as_boolean(val, *, default):
@@ -19,104 +18,94 @@ def as_boolean(val, *, default):
     return bool(val) and val != 'False'
 
 
-def as_annotated_data(raw_data: Any, raw_mapping: Any) -> Tuple:
-    data_meta = {}
+def as_annotated_data(data: Any, mapping_spec: FeatureSpec) -> Tuple:
+    data_type_by_var: Dict[str, str] = {}  # VarName to Type
+    mapping_meta_by_var: Dict[str, Dict[str, MappingMeta]] = {}  # VarName to Dict[Aes, MappingMeta]
+    mappings = {}  # Aes to VarName
 
-    # data
-    data = raw_data
-
-    if is_data_pub_stream(data):
-        data = {}
-        for col_name in raw_data.col_names:
-            data[col_name] = []
-
-        data_meta.update({'pubsub': {'channel_id': raw_data.channel_id, 'col_names': raw_data.col_names}})
-
-    # mapping
-    mapping = {}
-    mapping_meta = []
-    # series annotations
-    series_meta = []
-
-    class VariableMeta:
-        def __init__(self):
-            self.levels = None
-            self.aesthetics = []
-            self.order = None
-
-    variables_meta: Dict[str, VariableMeta] = {}
-
-    if is_data_frame(data):
-        dtypes = data.dtypes.to_dict().items()
-        for column_name, dtype in dtypes:
-            if dtype.name == 'category' and dtype.ordered:
-                var_meta = VariableMeta()
-                var_meta.levels = dtype.categories.to_list()
-                variables_meta[column_name] = var_meta
-
-    if raw_mapping is not None:
-        for aesthetic, variable in raw_mapping.as_dict().items():
-            if aesthetic == 'name':  # ignore FeatureSpec.name property
+    # fill mapping_meta_by_var, mappings and data_type_by_var.
+    if mapping_spec is not None:
+        for key, spec in mapping_spec.props().items():
+            # key is either an aesthetic name or 'name' (FeatureSpec.name property)
+            if key == 'name':  # ignore FeatureSpec.name property
                 continue
-
-            if isinstance(variable, MappingMeta):
-                mapping[aesthetic] = variable.variable
-                if variable.variable in variables_meta:
-                    var_meta = variables_meta[variable.variable]
-                else:
-                    var_meta = VariableMeta()
-                var_meta.aesthetics.append(aesthetic)
-                if variable.levels is not None:
-                    var_meta.levels = variable.levels
-                order = variable.parameters.get('order')
-                if order is not None:
-                    var_meta.order = order
-                variables_meta[variable.variable] = var_meta
+                
+            if isinstance(spec, MappingMeta):
+                mappings[key] = spec.variable
+                mapping_meta_by_var.setdefault(spec.variable, {})[key] = spec
+                data_type_by_var[spec.variable] = TYPE_UNKNOWN
             else:
-                mapping[aesthetic] = variable
-
-    for variableName, settings in variables_meta.items():
-        if settings.levels is not None:
-            # series annotations
-            series_meta.append({
-                'column': variableName,
-                'factor_levels': settings.levels,
-                'order': settings.order
-            })
-        else:
-            # mapping annotations
-            for aesthetic in settings.aesthetics:
-                value = raw_mapping.as_dict().get(aesthetic)
-                if value is not None and isinstance(value, MappingMeta):
-                    mapping_meta.append({
-                        'aes': aesthetic,
-                        'annotation': value.annotation,
-                        'parameters': value.parameters
-                    })
-
-    data_as_dict = None
-    if is_dict_or_dataframe(data):
-        data_as_dict = data
-    elif is_polars_dataframe(data):
-        data_as_dict = data.to_dict()
-
-    if data_as_dict is not None:
-        for column_name, values in data_as_dict.items():
-            if isinstance(values, Iterable):
-                not_empty_series = any(True for _ in values)
-                if not_empty_series and all(isinstance(val, datetime) for val in values):
-                    series_meta.append({
-                        'column': column_name,
-                        'type': 'datetime'
-                    })
-
-    if len(series_meta) > 0:
-        data_meta.update({'series_annotations': series_meta})
-
-    if len(mapping_meta) > 0:
-        data_meta.update({'mapping_annotations': mapping_meta})
-
-    return data, aes(**mapping), {'data_meta': data_meta}
+                mappings[key] = spec  # spec is a variable name
+
+    data_type_by_var.update(infer_type(data))
+
+    # fill series annotations
+    series_annotations = {}  # var to series_annotation
+    for var_name, data_type in data_type_by_var.items():
+        series_annotation = {}
+
+        if data_type != TYPE_UNKNOWN:
+            series_annotation['type'] = data_type
+
+        if is_pandas_data_frame(data) and data[var_name].dtype.name == 'category' and data[var_name].dtype.ordered:
+            series_annotation['factor_levels'] = data[var_name].cat.categories.to_list()
+        elif var_name in mapping_meta_by_var:
+            levels = last_not_none(list(map(lambda mm: mm.levels, mapping_meta_by_var[var_name].values())))
+            if levels is not None:
+                series_annotation['factor_levels'] = levels
+
+        if 'factor_levels' in series_annotation and var_name in mapping_meta_by_var:
+            order = last_not_none(list(map(lambda mm: mm.parameters['order'], mapping_meta_by_var[var_name].values())))
+            if order is not None:
+                series_annotation['order'] = order
+
+        if len(series_annotation) > 0:
+            series_annotation['column'] = var_name
+            series_annotations[var_name] = series_annotation
+
+    # fill mapping annotations
+    mapping_annotations = []
+    for var_name, meta_data in mapping_meta_by_var.items():
+        for aesthetic, mapping_meta in meta_data.items():
+            if mapping_meta.annotation == 'as_discrete':
+                if 'factor_levels' in series_annotations.get(var_name, {}):
+                    #  there is a bug - if label is set then levels are not applied
+                    continue
+
+                mapping_annotation = {}
+
+                # Note that the label is always set; otherwise, the scale title will appear as 'color.cyl'
+                label = mapping_meta.parameters.get('label')
+                if label is not None:
+                    mapping_annotation.setdefault('parameters', {})['label'] = label
+
+                if mapping_meta.levels is not None:
+                    mapping_annotation['levels'] = mapping_meta.levels
+
+                order_by = mapping_meta.parameters.get('order_by')
+                if order_by is not None:
+                    mapping_annotation.setdefault('parameters', {})['order_by'] = order_by
+
+                order = mapping_meta.parameters.get('order')
+                if order is not None:
+                    mapping_annotation.setdefault('parameters', {})['order'] = order
+
+                # add mapping meta if custom label is set or if series annotation for var doesn't contain order options
+                # otherwise don't add mapping meta - it's redundant, nothing unique compared to series annotation
+                if len(mapping_annotation):
+                    mapping_annotation['aes'] = aesthetic
+                    mapping_annotation['annotation'] = 'as_discrete'
+                    mapping_annotations.append(mapping_annotation)
+
+    data_meta = {}
+
+    if len(series_annotations) > 0:
+        data_meta.update({'series_annotations': list(series_annotations.values())})
+
+    if len(mapping_annotations) > 0:
+        data_meta.update({'mapping_annotations': mapping_annotations})
+
+    return data, aes(**mappings), {'data_meta': data_meta}
 
 
 def is_data_pub_stream(data: Any) -> bool:
@@ -147,7 +136,8 @@ def normalize_map_join(map_join):
                 data_names = [map_join[0]]
                 map_names = [map_join[1]]
             elif len(map_join) > 2:  # ['foo', 'bar', 'baz'] -> error
-                raise ValueError("map_join of type list[str] expected to have 1 or 2 items, but was {}".format(len(map_join)))
+                raise ValueError(
+                    "map_join of type list[str] expected to have 1 or 2 items, but was {}".format(len(map_join)))
             else:
                 raise invalid_map_join_format()
         elif all(isinstance(v, Sequence) and not isinstance(v, str) for v in map_join):  # all items are lists
@@ -217,17 +207,20 @@ def geo_data_frame_to_crs(gdf: 'GeoDataFrame', use_crs: Optional[str]):
     return gdf.to_crs('EPSG:4326' if use_crs is None else use_crs)
 
 
-def is_ndarray(data) -> bool:
-    try:
-        from numpy import ndarray
-        return isinstance(data, ndarray)
-    except ImportError:
-        return False
+def key_int2str(data):
+    if is_pandas_data_frame(data):
+        if data.columns.inferred_type == 'integer' or data.columns.inferred_type == 'mixed-integer':
+            data.columns = data.columns.astype(str)
+        return data
 
+    if isinstance(data, dict):
+        return {(str(k) if isinstance(k, int) else k): v for k, v in data.items()}
 
-def is_data_frame(data: Any) -> bool:
-    try:
-        from pandas import DataFrame
-        return isinstance(data, DataFrame)
-    except ImportError:
-        return False
+    return data
+
+
+def last_not_none(lst: List) -> Optional[Any]:
+    for i in reversed(lst):
+        if i is not None:
+            return i
+    return None

{lets_plot-4.3.3.dist-info → lets_plot-4.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lets-plot
-Version: 4.3.3
+Version: 4.4.0
 Summary: An open source library for statistical plotting
 Home-page: https://lets-plot.org
 Author: JetBrains
@@ -36,7 +36,7 @@ Requires-Dist: palettable
 
 [![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![License MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://raw.githubusercontent.com/JetBrains/lets-plot-kotlin/master/LICENSE)
-[![Latest Release](https://img.shields.io/github/v/release/JetBrains/lets-plot)](https://github.com/JetBrains/lets-plot-kotlin/releases/latest)
+[![Latest Release](https://img.shields.io/github/v/release/JetBrains/lets-plot)](https://github.com/JetBrains/lets-plot/releases/latest)
 
 
 **Lets-Plot** is a multiplatform plotting library built on the principles of the Grammar of Graphics. 
@@ -88,61 +88,37 @@ Also read:
 - [Scientific mode in PyCharm](https://www.jetbrains.com/help/pycharm/matplotlib-support.html)
 - [Scientific mode in IntelliJ IDEA](https://www.jetbrains.com/help/idea/matplotlib-support.html)
 
-## What is new in 4.3.0
+## What is new in 4.4.0
 
-- #### `coord_polar()`
-
-    The polar coordinate system is most commonly used for pie charts, but</br>
-    it can also be used for constructing **Spider or Radar charts** using the `flat` option.
-    
-    <br>
-    <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24a/images/polar_coord_pie.png" alt="f-24a/images/polar_coord_pie.png" width="256" height="214">
-    <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24a/images/radar_chart.png" alt="f-24a/images/radar_chart.png" width="256" height="196">
-    
-    See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/coord_polar.ipynb).  
-
-- #### In the `theme()`:
-
-    - `panel_inset`  parameter - primarily used for plots with polar coordinates.
-    
-        See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/theme_panel_inset.ipynb).
-    
-    - `panel_border_ontop` parameter - enables the drawing of panel border on top of the plot geoms.
-    - `panel_grid_ontop, panel_grid_ontop_x, panel_grid_ontop_y` parameters - enable the drawing of grid lines on top of the plot geoms.
-
-- #### `geom_curve()` 
-
-    <br>
-    <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24a/images/curve_annotation.png" alt="f-24a/images/curve_annotation.png" width="338" height="296">
-    
-    See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/geom_curve.ipynb).
-
-- #### [**UNIQUE**] Visualizing Graph-like Data with `geom_segment()` and `geom_curve()`
+- #### Waterfall Plot
+  <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24e/images/waterfall.png" alt="f-24e/images/waterfall.png" width="460" height="220">
+  
+  See [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24e/waterfall_plot.ipynb).
 
-  - Aesthetics `size_start, size_end, stroke_start` and `stroke_end` enable better alignment of</br>
-    segments/curves with nodes of the graph by considering the size of the nodes.
+- #### **`geom_band()`**:
+  <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24e/images/geom_band.png" alt="f-24e/images/geom_band.png.png" width="615" height="220">
 
-  - The `spacer` parameter allows for additional manual fine-tuning.
+  See [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24e/geom_band.ipynb).
 
-    <br>
-    <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24a/images/graph_simple.png" alt="f-24a/images/graph_simple.png" width="256" height="168">
-    <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24a/images/graph_on_map.png" alt="f-24a/images/graph_on_map.png" width="256" height="184">
+- #### Custom Legends 
+  - `manual_key` parameter in plot layer
+  - `layer_key()` function
+  <br>
+  <img src="https://raw.githubusercontent.com/JetBrains/lets-plot/master/docs/f-24e/images/custom_legend.png" alt="f-24e/images/custom_legend.png.png" width="294" height="147">
 
-  See:
-  - [A simple graph example](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/graph_edges.ipynb)
-  - [An interactive map example](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/geom_curve_on_map.ipynb)
-  
+  See [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24e/manual_legend.ipynb).
+   
+- #### Customizing Legends Appearence
+  The `override_aes` parameter in the `guide_legend()` function.
+     
+  See [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24e/legend_override_aes.ipynb).
 
-- #### The `alpha_stroke` Parameter in `geom_label()`
 
-  Use the `alpha_stroke` parameter to apply `alpha` to entire `label`. By default, `alpha` is only applied to the label background.
+- #### And More
 
-  See: [example notebook](https://nbviewer.org/github/JetBrains/lets-plot/blob/master/docs/f-24a/geom_label_alpha_stroke.ipynb).
+  See [CHANGELOG.md](https://github.com/JetBrains/lets-plot/blob/master/CHANGELOG.md) for a full list of changes.
 
-- #### Showing Plots in External Browser
 
-  The [setup_show_ext()](https://lets-plot.org/python/pages/api/lets_plot.LetsPlot.html#lets_plot.LetsPlot.setup_show_ext) directive allows plots to be displayed in an external browser window.
-                                          
 ## Recent Updates in the [Gallery](https://lets-plot.org/python/pages/gallery.html)
 
   <a href="https://nbviewer.org/github/JetBrains/lets-plot-docs/blob/master/source/examples/demo/venn_diagram.ipynb">
@@ -175,7 +151,7 @@ Also read:
 
 ## Change Log
 
-See [CHANGELOG.md](https://github.com/JetBrains/lets-plot/blob/master/CHANGELOG.md) for other changes and fixes.
+[CHANGELOG.md](https://github.com/JetBrains/lets-plot/blob/master/CHANGELOG.md)
 
 
 ## Code of Conduct