eea.plotly 1.5__tar.gz → 1.7__tar.gz

{eea_plotly-1.5/eea.plotly.egg-info → eea_plotly-1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eea.plotly
-Version: 1.5
+Version: 1.7
 Summary: volto-plotlycharts backend support
 Home-page: https://github.com/eea/eea.plotly
 Author: European Environment Agency: IDM2 A-Team
@@ -23,7 +23,7 @@ Requires-Dist: setuptools
 Requires-Dist: plone.volto
 Requires-Dist: collective.folderishtypes
 Requires-Dist: plotly==5.24.1
-Requires-Dist: kaleido
+Requires-Dist: kaleido==0.2.1
 Provides-Extra: test
 Requires-Dist: plone.app.testing; extra == "test"
 Dynamic: author
@@ -145,6 +145,17 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+1.7 - (2025-07-06)
+---------------------------
+* Change: soer_miniature improved logic
+  [razvanMiu]
+
+1.6 - (2025-06-24)
+---------------------------
+* Change: pin kaleido version to 0.2.1
+* Refactor: soer_miniature adapter logic (new step functions, data trimming, axis ranges)
+  [razvanMiu]
+
 1.5 - (2025-06-05)
 ---------------------------
 * Change: soer_miniature: hide xaxis ticklabels if no data

{eea_plotly-1.5 → eea_plotly-1.7}/docs/HISTORY.txt

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+1.7 - (2025-07-06)
+---------------------------
+* Change: soer_miniature improved logic
+  [razvanMiu]
+
+1.6 - (2025-06-24)
+---------------------------
+* Change: pin kaleido version to 0.2.1
+* Refactor: soer_miniature adapter logic (new step functions, data trimming, axis ranges)
+  [razvanMiu]
+
 1.5 - (2025-06-05)
 ---------------------------
 * Change: soer_miniature: hide xaxis ticklabels if no data

{eea_plotly-1.5 → eea_plotly-1.7}/eea/plotly/browser/preview.py

@@ -9,6 +9,7 @@ from zope.publisher.interfaces import IPublishTraverse
 from Products.Five.browser import BrowserView
 from eea.plotly.controlpanel import IPlotlySettings
 from eea.plotly.utils import sanitizeVisualization
+from eea.plotly.io_json import JSONEncoder
 
 from .preview_adapter.adapter import get_preview_adapter
 
@@ -74,7 +75,9 @@ class PlotlyPreview(BrowserView):
 
         get_preview_adapter(self, self.name)
 
-        fig = pio.from_json(json.dumps(self.visualization), skip_invalid=True)
+        fig = pio.from_json(
+            json.dumps(self.visualization, cls=JSONEncoder),
+            skip_invalid=True)
 
         if "template" not in self.visualization["layout"]:
             fig.update_layout(template=None)

eea_plotly-1.7/eea/plotly/browser/preview_adapter/soer_miniature.py

@@ -0,0 +1,159 @@
+""" SOER miniature theme for Plotly visualizations. """
+import math
+
+SOER_TRACES_COUNT = 5
+
+
+def nice_step(vmin, vmax, target_ticks=5):
+    """Calculate a 'nice' step size for axis ticks, similar to Plotly/D3."""
+    span = abs(vmax - vmin)
+    if span == 0:
+        return 1  # fallback
+
+    raw_step = span / max(target_ticks - 1, 1)
+    magnitude = 10 ** math.floor(math.log10(raw_step))
+    residual = raw_step / magnitude
+
+    if residual <= 1:
+        nice_multiplier = 1
+    elif residual <= 2:
+        nice_multiplier = 2
+    elif residual <= 2.5:
+        nice_multiplier = 2.5
+    elif residual <= 5:
+        nice_multiplier = 5
+    else:
+        nice_multiplier = 10
+
+    return nice_multiplier * magnitude
+
+
+def exact_step(vmin, vmax, target_ticks=5):
+    """Get the exact step size to have target_ticks between vmin and vmax."""
+    if target_ticks < 2:
+        raise ValueError("target_ticks must be at least 2 to define a range.")
+    return abs(vmax - vmin) / (target_ticks - 1)
+
+
+def getMin(arr):
+    """ Get minimum value from array """
+    return min(float(v) for v in arr if v is not None)
+
+
+def getMax(arr):
+    """ Get maximum value from array """
+    return max(float(v) for v in arr if v is not None)
+
+
+def serialize(context):
+    """ Serialize the context for SOER miniature theme"""
+    if context.visualization is None:
+        return False
+
+    data = context.visualization["data"]
+    layout = context.visualization["layout"]
+
+    if len(data) < SOER_TRACES_COUNT:
+        layout["xaxis"]["showticklabels"] = False
+        return False
+
+    min_year = float("inf")
+    max_year = float("-inf")
+    first_val = None
+    new_x = []
+    new_y = []
+    new_text = []
+
+    if data[0].get("x") is not None and data[0].get("y") is not None:
+        x_len = len(data[0].get("x") or [])
+        y_len = len(data[0].get("y") or [])
+        text_len = len(data[0].get("text") or [])
+
+        for index, val in enumerate(data[0]["y"]):
+            if val and not first_val:
+                first_val = val
+            if not first_val:
+                continue
+            year = data[0]["x"][index] if index < x_len else None
+            text = data[0]["text"][index] if index < text_len else None
+            new_x.append(year)
+            new_y.append(val)
+            new_text.append(text)
+            if val and year > max_year:
+                max_year = year
+            if val and year < min_year:
+                min_year = year
+
+        data[0]["x"] = new_x
+        data[0]["y"] = new_y
+        data[0]["text"] = new_text
+        y_len = len(data[0]["y"])
+        y4_len = len(data[4].get("y") or [])
+
+        if y4_len >= y_len:
+            data[4]["x"] = new_x
+            data[4]["y"] = data[4]["y"][y4_len - y_len:y4_len + 1]
+        elif data[4].get("x") is None or data[4].get("y") is None:
+            data[4] = {
+                "type": "scatter",
+                "x": new_x,
+                "y": [None] * len(new_y),
+                "visible": True,
+                "marker": {
+                    "color": "rgba(0, 0, 0, 1)",
+                    "line": {
+                        "color": "rgba(0, 0, 0, 1)"
+                    }
+                }
+            }
+            data[4]["y"][len(data[4]["y"]) - 1] = new_y[-1]
+
+        layout["xaxis"]["tickmode"] = "array"
+        layout["xaxis"]["tickvals"] = [min_year, max_year, 2030]
+        layout["xaxis"]["range"] = [
+            min_year - 2, 2032]
+        layout["xaxis"]["autorange"] = True
+
+    y_values = (
+        (data[0].get("y") or []) +
+        (data[1].get("y") or []) +
+        (data[4].get("y") or [])
+    )
+
+    if y_values:
+        top = (
+            layout.get("margin", {}).get("t") or
+            layout.get("template", {}).get("margin", {}).get("t")
+        ) or 0
+        min_y = getMin(y_values)
+        max_y = getMax(y_values)
+
+        min_y = min_y if min_y < 0 else 0
+        max_y = max_y if max_y > 0 else 0
+
+        nticks = max(int((context.height - top) / 100), 2)
+
+        step = exact_step(min_y, max_y, nticks)
+
+        layout["yaxis"]["tickmode"] = "linear"
+        layout["yaxis"]["nticks"] = nticks
+        layout["yaxis"]["tick0"] = min_y - step
+        layout["yaxis"]["dtick"] = step
+
+        layout["yaxis"]["range"] = [
+            min_y - step, max_y + 2 * step]
+        layout["yaxis"]["autorange"] = False
+
+    if "text" in data[0]:
+        data[0]["text"] = [
+            (t if t is None else " " + str(t))
+            for t in data[0]["text"]]
+
+    data[1]["x"] = None
+    data[1]["y"] = None
+    data[2]["x"] = None
+    data[2]["y"] = None
+    data[3]["x"] = None
+    data[3]["y"] = None
+
+    return True

{eea_plotly-1.5 → eea_plotly-1.7}/eea/plotly/deserializer/dxcontent.py

@@ -12,6 +12,7 @@ from zope.event import notify
 from zope.lifecycleevent import Attributes, ObjectModifiedEvent
 from eea.plotly.behaviors import IPlotlyVisualization
 from eea.plotly.io_csv import CsvWriter
+from eea.plotly.io_json import JSONEncoder
 
 
 @implementer(IDeserializeFromJson)
@@ -99,7 +100,9 @@ class DeserializeVisualizationFromJson(DeserializeFromJson):
                 "data": self.context.visualization.get("data", []),
                 "layout": self.context.visualization.get("layout", {}),
                 "frames": self.context.visualization.get("frames", [])
-            }),
+            },
+                cls=JSONEncoder
+            ),
             skip_invalid=True
         )
 

eea_plotly-1.7/eea/plotly/io_json.py

@@ -0,0 +1,12 @@
+"""JSON encoder that handles Decimal values."""
+import decimal
+import json
+
+
+class JSONEncoder(json.JSONEncoder):
+    """JSON encoder that handles Decimal values."""
+
+    def default(self, o):
+        if isinstance(o, decimal.Decimal):
+            return str(o)
+        return super().default(o)

eea_plotly-1.7/eea/plotly/version.txt

@@ -0,0 +1 @@
+1.7

{eea_plotly-1.5 → eea_plotly-1.7/eea.plotly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eea.plotly
-Version: 1.5
+Version: 1.7
 Summary: volto-plotlycharts backend support
 Home-page: https://github.com/eea/eea.plotly
 Author: European Environment Agency: IDM2 A-Team
@@ -23,7 +23,7 @@ Requires-Dist: setuptools
 Requires-Dist: plone.volto
 Requires-Dist: collective.folderishtypes
 Requires-Dist: plotly==5.24.1
-Requires-Dist: kaleido
+Requires-Dist: kaleido==0.2.1
 Provides-Extra: test
 Requires-Dist: plone.app.testing; extra == "test"
 Dynamic: author
@@ -145,6 +145,17 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+1.7 - (2025-07-06)
+---------------------------
+* Change: soer_miniature improved logic
+  [razvanMiu]
+
+1.6 - (2025-06-24)
+---------------------------
+* Change: pin kaleido version to 0.2.1
+* Refactor: soer_miniature adapter logic (new step functions, data trimming, axis ranges)
+  [razvanMiu]
+
 1.5 - (2025-06-05)
 ---------------------------
 * Change: soer_miniature: hide xaxis ticklabels if no data

{eea_plotly-1.5 → eea_plotly-1.7}/eea.plotly.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ eea/plotly/configure.zcml
 eea/plotly/controlpanel.py
 eea/plotly/interfaces.py
 eea/plotly/io_csv.py
+eea/plotly/io_json.py
 eea/plotly/permissions.zcml
 eea/plotly/profiles.zcml
 eea/plotly/setuphandlers.py

{eea_plotly-1.5 → eea_plotly-1.7}/eea.plotly.egg-info/requires.txt

@@ -2,7 +2,7 @@ setuptools
 plone.volto
 collective.folderishtypes
 plotly==5.24.1
-kaleido
+kaleido==0.2.1
 
 [test]
 plone.app.testing

{eea_plotly-1.5 → eea_plotly-1.7}/setup.py

@@ -46,7 +46,7 @@ setup(
         # -*- Extra requirements: -*-
         "collective.folderishtypes",
         'plotly==5.24.1',
-        'kaleido',
+        'kaleido==0.2.1',
     ],
     extras_require={
         'test': [

eea_plotly-1.5/eea/plotly/browser/preview_adapter/soer_miniature.py

@@ -1,80 +0,0 @@
-""" SOER miniature theme for Plotly visualizations. """
-import math
-
-
-def nice_step(vmin, vmax, target_ticks=5):
-    """ Calculate a 'nice' step size for the axis ticks. """
-    span = abs(vmax - vmin)
-    if span == 0:
-        return 1  # arbitrary fallback
-
-    # Initial guess for raw step size
-    raw_step = span / target_ticks
-
-    # Determine the power of 10
-    magnitude = 10 ** math.floor(math.log10(raw_step))
-    residual = raw_step / magnitude
-
-    # Choose a nice multiplier
-    if residual < 1.5:
-        nice_multiplier = 1
-    elif residual < 3:
-        nice_multiplier = 2
-    elif residual < 7:
-        nice_multiplier = 5
-    else:
-        nice_multiplier = 10
-
-    return nice_multiplier * magnitude
-
-
-def getMin(arr):
-    """ Get minimum value from array """
-    return min(float(v) for v in arr if v is not None)
-
-
-def getMax(arr):
-    """ Get maximum value from array """
-    return max(float(v) for v in arr if v is not None)
-
-
-def serialize(context):
-    """ Serialize the context for SOER miniature theme"""
-
-    # Solve x axis range
-    if context.visualization is None or len(context.visualization["data"]) < 2:
-        context.visualization["layout"]["xaxis"]["showticklabels"] = False
-        return False
-
-    years = context.visualization["data"][0].get("x", [])
-    tickvals = context.visualization["layout"]["xaxis"].get("tickvals", [])
-
-    if tickvals and years:
-        min_year = getMin(tickvals)
-        max_year = getMax(years)
-
-        context.visualization["layout"]["xaxis"]["range"] = [
-            min_year - 2, max_year + 2]
-        context.visualization["layout"]["xaxis"]["autorange"] = False
-
-    # Solve y axis range
-
-    y_values = context.visualization["data"][0].get(
-        "y", []) + context.visualization["data"][1].get("y", [])
-
-    if y_values:
-        min_y = getMin(y_values)
-        max_y = getMax(y_values)
-
-        step = nice_step(min_y, max_y, 10)
-
-        context.visualization["layout"]["yaxis"]["range"] = [
-            min_y - step, max_y + step]
-        context.visualization["layout"]["yaxis"]["autorange"] = False
-
-    if "text" in context.visualization["data"][0]:
-        context.visualization["data"][0]["text"] = [
-            (t if t is None else " " + str(t))
-            for t in context.visualization["data"][0]["text"]]
-
-    return True

eea_plotly-1.5/eea/plotly/version.txt

@@ -1 +0,0 @@
-1.5