feat: ciso8601 as optional dependency #98

Author: rolincova

influxdb_client/client/flux_csv_parser.py

@@ -36,6 +36,8 @@ def __init__(self, response: HTTPResponse, serialization_mode: FluxSerialization
         self._serialization_mode = serialization_mode
         self._data_frame_index = data_frame_index
         self._data_frame_values = []
+
+        self._parse_function = get_date_parse_function()
         pass
 
     def __enter__(self):
@@ -195,7 +197,7 @@ def _to_value(self, str_val, column):
         if "dateTime:RFC3339" == column.data_type or "dateTime:RFC3339Nano" == column.data_type:
             # todo nanosecods precision
             # return str_val
-            return parse_string_to_datetime(str_val)
+            return self._parse_function(str_val)
             # return timestamp_parser(str_val)
 
         if "duration" == column.data_type:
@@ -234,28 +236,9 @@ def _insert_table(self, table, table_index):
             self.tables.insert(table_index, table)
 
 
-def parse_string_to_datetime(date):
-    if is_module_available("ciso8601"):
+def get_date_parse_function():
+    try:
         import ciso8601
-        return ciso8601.parse_datetime(date)
-    else:
-        return parser.parse(date)
-
-
-def is_module_available(module_name):
-    module = None
-
-    if sys.version_info < (3, 0):
-        # python 2
-        import importlib
-        module = importlib.find_loader(module_name)
-    elif sys.version_info <= (3, 3):
-        # python 3.0 to 3.3
-        import pkgutil
-        module = pkgutil.find_loader(module_name)
-    elif sys.version_info >= (3, 4):
-        # python 3.4 and above
-        import importlib
-        module = importlib.util.find_spec(module_name)
-
-    return module is not None
+        return ciso8601.parse_datetime
+    except ModuleNotFoundError:
+        return parser.parse

influxdb_client/client/write/point.py

@@ -4,10 +4,11 @@
 from decimal import Decimal
 from numbers import Integral
 
+from dateutil.parser import parser
 from pytz import UTC
 from six import iteritems
 
-from influxdb_client.client.flux_csv_parser import parse_string_to_datetime
+from influxdb_client.client.flux_csv_parser import get_date_parse_function
 from influxdb_client.domain.write_precision import WritePrecision
 
 EPOCH = UTC.localize(datetime.utcfromtimestamp(0))
@@ -46,6 +47,9 @@ def __init__(self, measurement_name):
         self._time = None
         self._write_precision = DEFAULT_WRITE_PRECISION
 
+        self._parse_function = get_date_parse_function()
+        pass
+
     def time(self, time, write_precision=DEFAULT_WRITE_PRECISION):
         """
         Specify timestamp for DataPoint with declared precision.
@@ -80,7 +84,7 @@ def to_line_protocol(self):
         _fields = _append_fields(self._fields)
         if not _fields:
             return ""
-        _time = _append_time(self._time, self._write_precision)
+        _time = _append_time(self._time, self._write_precision, self._parse_function)
 
         return f"{_measurement}{_tags}{_fields}{_time}"
 
@@ -127,10 +131,10 @@ def _append_fields(fields):
     return f"{','.join(_return)}"
 
 
-def _append_time(time, write_precision):
+def _append_time(time, write_precision, _parse_function):
     if time is None:
         return ''
-    return f" {int(_convert_timestamp(time, write_precision))}"
+    return f" {int(_convert_timestamp(time, write_precision, _parse_function))}"
 
 
 def _escape_key(tag):
@@ -148,12 +152,12 @@ def _escape_string(value):
     return str(value).translate(_ESCAPE_STRING)
 
 
-def _convert_timestamp(timestamp, precision=DEFAULT_WRITE_PRECISION):
+def _convert_timestamp(timestamp, precision=DEFAULT_WRITE_PRECISION, _parse_function=parser.parse):
     if isinstance(timestamp, Integral):
         return timestamp  # assume precision is correct if timestamp is int
 
     if isinstance(timestamp, str):
-        timestamp = parse_string_to_datetime(timestamp)
+        timestamp = _parse_function(timestamp)
 
     if isinstance(timestamp, timedelta) or isinstance(timestamp, datetime):