Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raise type conversion error in datetime #1001

Merged
merged 8 commits into from Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/source/release_notes.rst
Expand Up @@ -9,6 +9,7 @@ Future Release
* Pass additional progress information in callback functions (:pr:`979`)
* Add the ability to generate optional extra stats with ``DataFrame.ww.describe_dict`` (:pr:`988`)
* Fixes
* Raise type conversion error in ``Datetime`` logical type (:pr:`1001`)
* Changes
* Remove version restriction for dask requirements (:pr:`998`)
* Documentation Changes
Expand Down
22 changes: 14 additions & 8 deletions woodwork/logical_types.py
Expand Up @@ -183,14 +183,20 @@ def transform(self, series):
"""Converts the series data to a formatted datetime."""
new_dtype = self._get_valid_dtype(type(series))
if new_dtype != str(series.dtype):
if dd and isinstance(series, dd.Series):
name = series.name
series = dd.to_datetime(series, format=self.datetime_format)
series.name = name
elif ks and isinstance(series, ks.Series):
series = ks.Series(ks.to_datetime(series.to_numpy(), format=self.datetime_format), name=series.name)
else:
series = pd.to_datetime(series, format=self.datetime_format)
try:
if dd and isinstance(series, dd.Series):
name = series.name
series = dd.to_datetime(series, format=self.datetime_format)
series.name = name
elif ks and isinstance(series, ks.Series):
series = ks.Series(ks.to_datetime(series.to_numpy(), format=self.datetime_format), name=series.name)
else:
series = pd.to_datetime(series, format=self.datetime_format)
except (TypeError, ValueError):
message = f'Error converting datatype for {series.name} from type {str(series.dtype)} '
message += f'to type {new_dtype}. Please confirm the underlying data is consistent with '
message += f'logical type {type(self)}.'
jeff-hernandez marked this conversation as resolved.
Show resolved Hide resolved
raise TypeConversionError(message)
return super().transform(series)


Expand Down
9 changes: 9 additions & 0 deletions woodwork/tests/logical_types/test_logical_types.py
Expand Up @@ -3,6 +3,7 @@
import pandas as pd
import pytest

from woodwork.exceptions import TypeConversionError
from woodwork.logical_types import (
Boolean,
Categorical,
Expand Down Expand Up @@ -110,6 +111,14 @@ def test_datetime_transform(datetimes):
assert str(transform.dtype) == 'datetime64[ns]'


def test_datetime_conversion_error():
series = pd.Series(['a', 'b', 'c'])
match = 'Error converting datatype for None from type object to type datetime64[ns]. '
jeff-hernandez marked this conversation as resolved.
Show resolved Hide resolved
match += 'Please confirm the underlying data is consistent with logical type Datetime.'
with pytest.raises(TypeConversionError, match=re.escape(match)):
Datetime().transform(series)


def test_ordinal_transform(sample_series):
series_type = str(type(sample_series))
dask = 'dask' in series_type
Expand Down