Merge pull request #164 from highcharts-for-python/bugfix/162-data-collection-propagation-validation-error

Closes #162.

Author: hcpchris

CHANGES.rst

@@ -1,9 +1,8 @@
 
-Release 1.6.0
+Release 1.7.0
 =========================================
 
 * **ENHANCEMENT:** Align the API to **Highcharts (JS) v.11.4** (#163). In particular, this includes:
-
   * Added ``Accessibility.high_contrast_mode`` support.
   * Added ``OrganizationOptions.hanging_side`` support.
   * Added ``SankeyOptions.node_distance`` support.
@@ -12,6 +11,9 @@ Release 1.6.0
     ``SankeyOptions``) ``.node_width`` support and documentation.
   * Added ``NodeOptions.height`` support.
 
+* **ENHANCEMENT:** Added ``utility_functions.datetime64_to_datetime()`` function to convert 
+  ``numpy.datetime64`` to ``datetime.datetime`` (needed to close #162).
+
 --------------------
 
 Release 1.6.0

highcharts_core/utility_functions.py

@@ -1,5 +1,6 @@
 """Collection of utility functions used across the library."""
 import csv
+import datetime
 import os
 import string
 import random
@@ -907,4 +908,29 @@ def dict_to_ndarray(as_dict):
     columns = [as_dict[key] for key in as_dict]
     as_ndarray = np.column_stack(columns)
 
-    return as_ndarray
+    return as_ndarray
+
+
+def datetime64_to_datetime(dt64):
+    """Convert a NumPy :class:`datetime64 <numpy:numpy.datetime64>` to a Python 
+    :class:`datetime <python:datetime.datetime>`.
+    
+    :param dt64: The NumPy :class:`datetime64 <numpy:numpy.datetime64>` to convert.
+    :type dt64: :class:`numpy.datetime64 <numpy:numpy.datetime64>`
+    
+    :returns: A Python :class:`datetime <python:datetime.datetime>` instance.
+    :rtype: :class:`datetime <python:datetime.datetime>`
+    
+    :raises HighchartsDependencyError: if NumPy is not available in the runtime
+      environment
+
+    """
+    if not HAS_NUMPY:
+        raise errors.HighchartsDependencyError('NumPy is required for this feature. '
+                                               'It was not found in your runtime '
+                                               'environment. Please make sure it is '
+                                               'installed in your runtime '
+                                               'environment.')
+    timestamp = (dt64 - np.datetime64("1970-01-01T00:00:00")) / np.timedelta64(1, "s")
+    
+    return datetime.datetime.fromtimestamp(timestamp, datetime.timezone.utc)

tests/input_files/series/base/bugfix162.csv

@@ -0,0 +1,5 @@
+task_id,name,start,end,parent,dependency
+1,DoThing1,2023-01-01,2023-02-01,,
+2,DoThing1-sub1,2023-01-11,2023-01-14,1,
+3,DoThing1-sub2,2023-01-01,2023-02-01,1,2
+4,DoThing2,2023-02-02,2023-03-01,,

tests/options/series/test_base.py

@@ -923,4 +923,27 @@ def test_convert_to(input_files, filename, target_type, as_cls, error):
         converted = original.convert_to(target_type)
         assert converted is not None
         assert isinstance(converted, SeriesBase)
-        assert isinstance(converted, target_type_cls)
+        assert isinstance(converted, target_type_cls)
+
+
+def test_bugfix162(input_files):
+    from highcharts_core.chart import Chart
+    from highcharts_core.options import HighchartsOptions
+    from highcharts_core.options.series.area import LineSeries
+
+    import pandas as pd
+    from collections import defaultdict
+    
+    filename = 'series/base/bugfix162.csv'
+    input_file = check_input_file(input_files, filename)
+
+    dtype = defaultdict(lambda: "str")
+
+    df = pd.read_csv(input_file, dtype=dtype, parse_dates=["start", "end"])
+    
+    # Creating a Series from the DataFrame
+    my_series = LineSeries.from_pandas(
+        df, property_map={"id": "task_id", "name": "name", "start": "start", "end": "end"}
+    )
+    
+    assert my_series is not None