feat: ciso8601 as optional dependency #98

Author: rolincova

ciso-requirements.txt

@@ -0,0 +1 @@
+ciso8601>=2.1.1

influxdb_client/client/flux_csv_parser.py

@@ -1,10 +1,11 @@
 import base64
 import codecs
 import csv as csv_parser
+import sys
 from enum import Enum
 from typing import List
 
-import ciso8601
+from dateutil import parser
 from urllib3 import HTTPResponse
 
 from influxdb_client.client.flux_table import FluxTable, FluxColumn, FluxRecord
@@ -194,7 +195,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 ciso8601.parse_datetime(str_val)
+            return parse_string_to_datetime(str_val)
             # return timestamp_parser(str_val)
 
         if "duration" == column.data_type:
@@ -230,4 +231,31 @@ def add_column_names_and_tags(table, csv):
 
     def _insert_table(self, table, table_index):
         if self._serialization_mode is FluxSerializationMode.tables:
-            self.tables.insert(table_index, table)
+            self.tables.insert(table_index, table)
+
+
+def parse_string_to_datetime(date):
+    if is_module_available("ciso8601"):
+        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

influxdb_client/client/write/point.py

@@ -4,10 +4,10 @@
 from decimal import Decimal
 from numbers import Integral
 
-import ciso8601
 from pytz import UTC
 from six import iteritems
 
+from influxdb_client.client.flux_csv_parser import parse_string_to_datetime
 from influxdb_client.domain.write_precision import WritePrecision
 
 EPOCH = UTC.localize(datetime.utcfromtimestamp(0))
@@ -153,7 +153,7 @@ def _convert_timestamp(timestamp, precision=DEFAULT_WRITE_PRECISION):
         return timestamp  # assume precision is correct if timestamp is int
 
     if isinstance(timestamp, str):
-        timestamp = ciso8601.parse_datetime(timestamp)
+        timestamp = parse_string_to_datetime(timestamp)
 
     if isinstance(timestamp, timedelta) or isinstance(timestamp, datetime):
 

requirements.txt

@@ -4,5 +4,4 @@ six >= 1.10
 python_dateutil >= 2.5.3
 setuptools >= 21.0.0
 urllib3 >= 1.15.1
-ciso8601>=2.1.1
 pytz>=2019.1

scripts/ci-test.sh

@@ -9,6 +9,7 @@ python --version
 pip install -r requirements.txt --user
 pip install -r extra-requirements.txt --user
 pip install -r test-requirements.txt --user
+pip install -r ciso-requirements.txt --user
 pip install pytest pytest-cov --user
 pip install twine --user
 python setup.py sdist bdist_wheel