Resolve changelog conflict for axis_types support

Author: Khanz9664

CHANGELOG.md

@@ -5,7 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 ### Added
-- Add `get_computed_values()` method to `BaseFigure` for programmatically accessing values calculated by Plotly.js (starting with computed axis ranges) [[#5552](https://github.com/plotly/plotly.py/issues/5552)]
+- Add `get_computed_values()` method to `BaseFigure` for programmatically accessing values calculated by Plotly.js, supporting `axis_ranges` and `axis_types` retrieval via a single-pass layout traversal [[#5552](https://github.com/plotly/plotly.py/issues/5552)]
+
 ### Fixed
 - Update tests to be compatible with numpy 2.4 [[#5522](https://github.com/plotly/plotly.py/pull/5522)], with thanks to @thunze for the contribution!
 

plotly/basedatatypes.py

@@ -3489,7 +3489,7 @@ def get_computed_values(self, include=None):
 
         This method provides a lightweight interface to access information that is
         not explicitly defined in the source figure but is computed by the
-        rendering engine (e.g., autoranged axis limits).
+        rendering engine (e.g., autoranged axis limits, detected axis types).
 
         Note: This initial implementation relies on full_figure_for_development()
         (via Kaleido) to extract computed values. While the returned object is
@@ -3501,6 +3501,8 @@ def get_computed_values(self, include=None):
         include: list or tuple of str
             The calculated values to retrieve. Supported keys include:
               - 'axis_ranges': The final [min, max] range for each axis.
+              - 'axis_types': The detected type for each axis (e.g. 'linear',
+                'log', 'date', 'category').
             If None, defaults to ['axis_ranges'].
 
         Returns
@@ -3514,6 +3516,10 @@ def get_computed_values(self, include=None):
         >>> fig = go.Figure(go.Scatter(x=[1, 2, 3], y=[10, 20, 30]))
         >>> fig.get_computed_values(include=['axis_ranges'])
         {'axis_ranges': {'xaxis': [0.8, 3.2], 'yaxis': [8.0, 32.0]}}
+
+        >>> fig.get_computed_values(include=['axis_ranges', 'axis_types'])
+        {'axis_ranges': {'xaxis': [0.8, 3.2], 'yaxis': [8.0, 32.0]},
+         'axis_types': {'xaxis': 'linear', 'yaxis': 'linear'}}
         """
         # Validate input
         # --------------
@@ -3529,7 +3535,7 @@ def get_computed_values(self, include=None):
         if not include:
             return {}
 
-        supported_keys = ["axis_ranges"]
+        supported_keys = ["axis_ranges", "axis_types"]
         for key in include:
             if key not in supported_keys:
                 raise ValueError(
@@ -3543,20 +3549,22 @@ def get_computed_values(self, include=None):
         full_fig_dict = self.full_figure_for_development(warn=False, as_dict=True)
         full_layout = full_fig_dict.get("layout", {})
 
+        # Initialize result buckets for each requested key
         result = {}
-
-        # Extract axis ranges
-        # -------------------
         if "axis_ranges" in include:
-            axis_ranges = {}
-            for key, val in full_layout.items():
-                if key.startswith(("xaxis", "yaxis")):
-                    # Safety checks for axis object and range property
-                    if isinstance(val, dict) and "range" in val:
-                        # Explicit conversion to list for JSON serialization consistency
-                        axis_ranges[key] = list(val["range"])
-
-            result["axis_ranges"] = axis_ranges
+            result["axis_ranges"] = {}
+        if "axis_types" in include:
+            result["axis_types"] = {}
+
+        # Single-pass traversal: extract all requested properties in one iteration
+        # -------------------------------------------------------------------------
+        for key, val in full_layout.items():
+            if key.startswith(("xaxis", "yaxis")) and isinstance(val, dict):
+                if "axis_ranges" in include and "range" in val:
+                    # Explicit conversion to list for JSON serialization consistency
+                    result["axis_ranges"][key] = list(val["range"])
+                if "axis_types" in include and "type" in val:
+                    result["axis_types"][key] = val["type"]
 
         return result
 

tests/test_core/test_update_objects/test_get_computed_values.py

@@ -85,7 +85,7 @@ def test_invalid_include_parameter(self):
         # Test unsupported key and deterministic error message
         with self.assertRaisesRegex(
             ValueError,
-            r"Unsupported key 'invalid'.*Supported keys are: \['axis_ranges'\]",
+            r"Unsupported key 'invalid'.*Supported keys are: \['axis_ranges', 'axis_types'\]",
         ):
             fig.get_computed_values(include=["invalid"])
 
@@ -105,3 +105,48 @@ def test_safe_extraction_handling(self):
 
         expected = {"axis_ranges": {"xaxis2": [1, 2]}}
         self.assertEqual(computed, expected)
+
+    def test_get_computed_axis_types(self):
+        # Verify standalone extraction of axis types
+        fig = go.Figure()
+        mock_full_fig = {
+            "layout": {
+                "xaxis": {"range": [0, 10], "type": "linear"},
+                "yaxis": {"range": [0, 100], "type": "log"},
+                "xaxis2": {"type": "date"},
+            }
+        }
+        fig.full_figure_for_development = MagicMock(return_value=mock_full_fig)
+
+        computed = fig.get_computed_values(include=["axis_types"])
+
+        expected = {"axis_types": {"xaxis": "linear", "yaxis": "log", "xaxis2": "date"}}
+        self.assertEqual(computed, expected)
+        # axis_ranges should not be present when not requested
+        self.assertNotIn("axis_ranges", computed)
+
+    def test_get_computed_values_combined(self):
+        # Verify that requesting multiple keys returns all of them correctly
+        fig = go.Figure()
+        mock_full_fig = {
+            "layout": {
+                "xaxis": {"range": [0, 1], "type": "linear"},
+                "yaxis": {"range": [0, 10], "type": "log"},
+                # axis with no range — should appear in axis_types but not axis_ranges
+                "xaxis2": {"type": "date"},
+            }
+        }
+        fig.full_figure_for_development = MagicMock(return_value=mock_full_fig)
+
+        computed = fig.get_computed_values(include=["axis_ranges", "axis_types"])
+
+        self.assertEqual(
+            computed["axis_ranges"],
+            {"xaxis": [0, 1], "yaxis": [0, 10]},
+        )
+        self.assertEqual(
+            computed["axis_types"],
+            {"xaxis": "linear", "yaxis": "log", "xaxis2": "date"},
+        )
+        # Verify single call to the rendering engine despite two keys
+        fig.full_figure_for_development.assert_called_once()