influxdb3-python 0.3.5__tar.gz → 0.4.0__tar.gz

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: influxdb3-python
-Version: 0.3.5
+Version: 0.4.0
 Summary: Community Python client for InfluxDB 3.0
 Home-page: https://github.com/InfluxCommunity/influxdb3-python
 Author: InfluxData
@@ -8,11 +8,12 @@ Author-email: contact@influxdata.com
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: reactivex>=4.0.4
@@ -40,11 +41,14 @@ Requires-Dist: polars; extra == "dataframe"
     <a href="https://pypi.org/project/influxdb3-python/">
         <img src="https://img.shields.io/pypi/dm/influxdb3-python.svg" alt="PyPI downloads">
     </a>
-    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml">
+        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml/badge.svg?branch=main" alt="CodeQL analysis">
     </a>
-        <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://dl.circleci.com/status-badge/redirect/gh/InfluxCommunity/influxdb3-python/tree/main">
+        <img src="https://dl.circleci.com/status-badge/img/gh/InfluxCommunity/influxdb3-python/tree/main.svg?style=svg" alt="CircleCI">
+    </a>
+    <a href="https://codecov.io/gh/InfluxCommunity/influxdb3-python">
+        <img src="https://codecov.io/gh/InfluxCommunity/influxdb3-python/branch/main/graph/badge.svg" alt="Code Cov"/>
     </a>
     <a href="https://influxcommunity.slack.com">
         <img src="https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social" alt="Community Slack">

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/README.md

@@ -9,11 +9,14 @@
     <a href="https://pypi.org/project/influxdb3-python/">
         <img src="https://img.shields.io/pypi/dm/influxdb3-python.svg" alt="PyPI downloads">
     </a>
-    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml">
+        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml/badge.svg?branch=main" alt="CodeQL analysis">
     </a>
-        <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://dl.circleci.com/status-badge/redirect/gh/InfluxCommunity/influxdb3-python/tree/main">
+        <img src="https://dl.circleci.com/status-badge/img/gh/InfluxCommunity/influxdb3-python/tree/main.svg?style=svg" alt="CircleCI">
+    </a>
+    <a href="https://codecov.io/gh/InfluxCommunity/influxdb3-python">
+        <img src="https://codecov.io/gh/InfluxCommunity/influxdb3-python/branch/main/graph/badge.svg" alt="Code Cov"/>
     </a>
     <a href="https://influxcommunity.slack.com">
         <img src="https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social" alt="Community Slack">

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb3_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: influxdb3-python
-Version: 0.3.5
+Version: 0.4.0
 Summary: Community Python client for InfluxDB 3.0
 Home-page: https://github.com/InfluxCommunity/influxdb3-python
 Author: InfluxData
@@ -8,11 +8,12 @@ Author-email: contact@influxdata.com
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: reactivex>=4.0.4
@@ -40,11 +41,14 @@ Requires-Dist: polars; extra == "dataframe"
     <a href="https://pypi.org/project/influxdb3-python/">
         <img src="https://img.shields.io/pypi/dm/influxdb3-python.svg" alt="PyPI downloads">
     </a>
-    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/pylint.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml">
+        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/codeql-analysis.yml/badge.svg?branch=main" alt="CodeQL analysis">
     </a>
-        <a href="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml">
-        <img src="https://github.com/InfluxCommunity/influxdb3-python/actions/workflows/python-publish.yml/badge.svg" alt="Lint Code Base">
+    <a href="https://dl.circleci.com/status-badge/redirect/gh/InfluxCommunity/influxdb3-python/tree/main">
+        <img src="https://dl.circleci.com/status-badge/img/gh/InfluxCommunity/influxdb3-python/tree/main.svg?style=svg" alt="CircleCI">
+    </a>
+    <a href="https://codecov.io/gh/InfluxCommunity/influxdb3-python">
+        <img src="https://codecov.io/gh/InfluxCommunity/influxdb3-python/branch/main/graph/badge.svg" alt="Code Cov"/>
     </a>
     <a href="https://influxcommunity.slack.com">
         <img src="https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social" alt="Community Slack">

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb3_python.egg-info/SOURCES.txt

@@ -39,4 +39,5 @@ influxdb_client_3/write_client/service/_base_service.py
 influxdb_client_3/write_client/service/signin_service.py
 influxdb_client_3/write_client/service/signout_service.py
 influxdb_client_3/write_client/service/write_service.py
+tests/test_dataframe_serializer.py
 tests/test_influxdb_client_3.py

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/__init__.py

@@ -1,20 +1,24 @@
-import urllib.parse, json
+import json
+import urllib.parse
+
 import pyarrow as pa
-from influxdb_client_3.write_client import InfluxDBClient as _InfluxDBClient, WriteOptions, Point
-from influxdb_client_3.write_client.client.write_api import WriteApi as _WriteApi, SYNCHRONOUS, ASYNCHRONOUS, PointSettings
-from influxdb_client_3.write_client.domain.write_precision import WritePrecision
-from influxdb_client_3.write_client.client.exceptions import InfluxDBError
 from pyarrow.flight import FlightClient, Ticket, FlightCallOptions
+
 from influxdb_client_3.read_file import UploadFile
-import urllib.parse
+from influxdb_client_3.write_client import InfluxDBClient as _InfluxDBClient, WriteOptions, Point
+from influxdb_client_3.write_client.client.exceptions import InfluxDBError
+from influxdb_client_3.write_client.client.write_api import WriteApi as _WriteApi, SYNCHRONOUS, ASYNCHRONOUS, \
+    PointSettings
+from influxdb_client_3.write_client.domain.write_precision import WritePrecision
+
 try:
     import polars as pl
+
     polars = True
 except ImportError:
     polars = False
 
 
-
 def write_client_options(**kwargs):
     """
     Function for providing additional arguments for the WriteApi client.
@@ -24,9 +28,11 @@ def write_client_options(**kwargs):
     """
     return kwargs
 
+
 def default_client_options(**kwargs):
     return kwargs
 
+
 def flight_client_options(**kwargs):
     """
     Function for providing additional arguments for the FlightClient.
@@ -36,6 +42,7 @@ def flight_client_options(**kwargs):
     """
     return kwargs
 
+
 def file_parser_options(**kwargs):
     """
     Function for providing additional arguments for the file parser.
@@ -43,7 +50,7 @@ def file_parser_options(**kwargs):
     :param kwargs: Additional arguments for the file parser.
     :return: dict with the arguments.
     """
-    return kwargs  
+    return kwargs
 
 
 def _deep_merge(target, source):
@@ -67,6 +74,7 @@ def _deep_merge(target, source):
         target = source
     return target
 
+
 class InfluxDBClient3:
     def __init__(
             self,
@@ -99,11 +107,12 @@ class InfluxDBClient3:
         self._org = org if org is not None else "default"
         self._database = database
         self._token = token
-        self._write_client_options = write_client_options if write_client_options is not None else default_client_options(write_options=SYNCHRONOUS)
-        
+        self._write_client_options = write_client_options if write_client_options is not None \
+            else default_client_options(write_options=SYNCHRONOUS)
+
         # Parse the host input
         parsed_url = urllib.parse.urlparse(host)
-        
+
         # Determine the protocol (scheme), hostname, and port
         scheme = parsed_url.scheme if parsed_url.scheme else "https"
         hostname = parsed_url.hostname if parsed_url.hostname else host
@@ -118,10 +127,10 @@ class InfluxDBClient3:
             token=self._token,
             org=self._org,
             **kwargs)
-        
+
         self._write_api = _WriteApi(influxdb_client=self._client, **self._write_client_options)
         self._flight_client_options = flight_client_options or {}
-        
+
         if query_port_overwrite is not None:
             port = query_port_overwrite
         self._flight_client = FlightClient(f"grpc+tls://{hostname}:{port}", **self._flight_client_options)
@@ -134,7 +143,7 @@ class InfluxDBClient3:
             return defaults
         return _deep_merge(defaults, {key: value for key, value in custom.items()})
 
-    def write(self, record=None, database=None ,**kwargs):
+    def write(self, record=None, database=None, **kwargs):
         """
         Write data to InfluxDB.
 
@@ -151,9 +160,9 @@ class InfluxDBClient3:
             self._write_api.write(bucket=database, record=record, **kwargs)
         except InfluxDBError as e:
             raise e
-          
 
-    def write_file(self, file, measurement_name=None, tag_columns=None, timestamp_column='time', database=None, file_parser_options=None ,**kwargs):
+    def write_file(self, file, measurement_name=None, tag_columns=None, timestamp_column='time', database=None,
+                   file_parser_options=None, **kwargs):
         """
         Write data from a file to InfluxDB.
 
@@ -177,10 +186,10 @@ class InfluxDBClient3:
         try:
             table = UploadFile(file, file_parser_options).load_file()
             df = table.to_pandas() if isinstance(table, pa.Table) else table
-            self._process_dataframe(df, measurement_name, tag_columns or [], timestamp_column, database=database, **kwargs)
+            self._process_dataframe(df, measurement_name, tag_columns or [], timestamp_column, database=database,
+                                    **kwargs)
         except Exception as e:
             raise e
-            
 
     def _process_dataframe(self, df, measurement_name, tag_columns, timestamp_column, database, **kwargs):
         # This function is factored out for clarity.
@@ -204,9 +213,8 @@ class InfluxDBClient3:
                                   data_frame_measurement_name=measurement_name,
                                   data_frame_tag_columns=tag_columns,
                                   data_frame_timestamp_column=timestamp_column, **kwargs)
-  
-    
-    def query(self, query, language="sql", mode="all", database=None,**kwargs ):
+
+    def query(self, query, language="sql", mode="all", database=None, **kwargs):
         """
         Query data from InfluxDB.
 
@@ -223,12 +231,10 @@ class InfluxDBClient3:
         """
         if mode == "polars" and polars is False:
             raise ImportError("Polars is not installed. Please install it with `pip install polars`.")
-        
-    
 
         if database is None:
             database = self._database
-        
+
         try:
             # Create an authorization header
             optargs = {
@@ -237,7 +243,7 @@ class InfluxDBClient3:
             }
             opts = self._merge_options(optargs, kwargs)
             _options = FlightCallOptions(**opts)
-            
+
             ticket_data = {"database": database, "sql_query": query, "query_type": language}
             ticket = Ticket(json.dumps(ticket_data).encode('utf-8'))
             flight_reader = self._flight_client.do_get(ticket, _options)
@@ -249,7 +255,7 @@ class InfluxDBClient3:
                 "chunk": lambda: flight_reader,
                 "reader": flight_reader.to_reader,
                 "schema": lambda: flight_reader.schema
-                
+
             }.get(mode, flight_reader.read_all)
 
             return mode_func() if callable(mode_func) else mode_func
@@ -267,7 +273,8 @@ class InfluxDBClient3:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
-        
+
+
 __all__ = [
     "InfluxDBClient3",
     "Point",

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/read_file.py

@@ -12,6 +12,7 @@ class UploadFile:
     """
     Class for uploading and reading different types of files.
     """
+
     def __init__(self, file, file_parser_options=None):
         """
         Initialize an UploadFile instance.
@@ -44,7 +45,7 @@ class UploadFile:
         else:
             raise ValueError("Unsupported file type")
 
-    def load_feather(self, file ):
+    def load_feather(self, file):
         """
         Load a Feather file.
 
@@ -99,6 +100,7 @@ class UploadFile:
         try:
             import pandas as pd
         except ImportError:
-            raise ImportError("Pandas is required for write_file(). Please install it using 'pip install pandas' or 'pip install influxdb3-python[pandas]'")
-        
-        return pd.read_json(file, **self._kwargs)
+            raise ImportError("Pandas is required for write_file(). Please install it using 'pip install pandas' or "
+                              "'pip install influxdb3-python[pandas]'")
+
+        return pd.read_json(file, **self._kwargs)

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/write_client/_sync/api_client.py

@@ -267,7 +267,7 @@ class ApiClient(object):
         if data is None:
             return None
 
-        if type(klass) == str:
+        if klass is str:
             if klass.startswith('list['):
                 sub_kls = re.match(r'list\[(.*)\]', klass).group(1)
                 return [self.__deserialize(sub_data, sub_kls)
@@ -348,13 +348,13 @@ class ApiClient(object):
                                    _preload_content, _request_timeout, urlopen_kw)
         else:
             thread = self.pool.apply_async(self.__call_api, (resource_path,
-                                           method, path_params, query_params,
-                                           header_params, body,
-                                           post_params, files,
-                                           response_type, auth_settings,
-                                           _return_http_data_only,
-                                           collection_formats,
-                                           _preload_content, _request_timeout, urlopen_kw))
+                                                             method, path_params, query_params,
+                                                             header_params, body,
+                                                             post_params, files,
+                                                             response_type, auth_settings,
+                                                             _return_http_data_only,
+                                                             collection_formats,
+                                                             _preload_content, _request_timeout, urlopen_kw))
         return thread
 
     def request(self, method, url, query_params=None, headers=None,

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/write_client/client/_base.py

@@ -5,16 +5,13 @@ import base64
 import configparser
 import logging
 import os
-from datetime import datetime, timedelta
-from typing import List, Generator, Any, Union, Iterable, AsyncGenerator
-
-from urllib3 import HTTPResponse
+from typing import Iterable
 
+from influxdb_client_3.write_client.client.write.dataframe_serializer import DataframeSerializer, \
+    PolarsDataframeSerializer
 from influxdb_client_3.write_client.configuration import Configuration
-from influxdb_client_3.write_client.service.write_service import WriteService
-
-from influxdb_client_3.write_client.client.write.dataframe_serializer import DataframeSerializer
 from influxdb_client_3.write_client.rest import _UTF_8_encoding
+from influxdb_client_3.write_client.service.write_service import WriteService
 
 try:
     import dataclasses
@@ -208,7 +205,6 @@ class _BaseClient(object):
                    profilers=profilers, **kwargs)
 
 
-  
 class _BaseWriteApi(object):
     def __init__(self, influxdb_client, point_settings=None):
         self._influxdb_client = influxdb_client
@@ -252,9 +248,14 @@ class _BaseWriteApi(object):
         elif isinstance(record, dict):
             self._serialize(Point.from_dict(record, write_precision=write_precision, **kwargs),
                             write_precision, payload, **kwargs)
-        elif 'DataFrame' in type(record).__name__:
+        elif 'polars' in str(type(record)):
+            serializer = PolarsDataframeSerializer(record, self._point_settings, write_precision, **kwargs)
+            self._serialize(serializer.serialize(), write_precision, payload, **kwargs)
+
+        elif 'pandas' in str(type(record)):
             serializer = DataframeSerializer(record, self._point_settings, write_precision, **kwargs)
             self._serialize(serializer.serialize(), write_precision, payload, **kwargs)
+
         elif hasattr(record, "_asdict"):
             # noinspection PyProtectedMember
             self._serialize(record._asdict(), write_precision, payload, **kwargs)
@@ -265,7 +266,6 @@ class _BaseWriteApi(object):
                 self._serialize(item, write_precision, payload, **kwargs)
 
 
-
 class _Configuration(Configuration):
     def __init__(self):
         Configuration.__init__(self)

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/write_client/client/influxdb_client.py

@@ -3,8 +3,6 @@
 from __future__ import absolute_import
 
 import logging
-import warnings
-
 
 from influxdb_client_3.write_client.client._base import _BaseClient
 from influxdb_client_3.write_client.client.write_api import WriteApi, WriteOptions, PointSettings
@@ -284,7 +282,6 @@ class InfluxDBClient(_BaseClient):
         """
         return WriteApi(influxdb_client=self, write_options=write_options, point_settings=point_settings, **kwargs)
 
-
     def close(self):
         """Shutdown the client."""
         self.__del__()
@@ -294,8 +291,3 @@ class InfluxDBClient(_BaseClient):
         if self.api_client:
             self.api_client.__del__()
             self.api_client = None
-
-
-
-
-

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/write_client/client/write/dataframe_serializer.py

@@ -9,20 +9,22 @@ import math
 import re
 
 from influxdb_client_3.write_client.domain import WritePrecision
-from influxdb_client_3.write_client.client.write.point import _ESCAPE_KEY, _ESCAPE_STRING, _ESCAPE_MEASUREMENT, DEFAULT_WRITE_PRECISION
+from influxdb_client_3.write_client.client.write.point import _ESCAPE_KEY, _ESCAPE_STRING, _ESCAPE_MEASUREMENT, \
+    DEFAULT_WRITE_PRECISION
 
 logger = logging.getLogger('influxdb_client.client.write.dataframe_serializer')
 
 
+def _not_nan(x):
+    from ...extras import pd
+    return not pd.isna(x)
+
+
 def _itertuples(data_frame):
     cols = [data_frame.iloc[:, k] for k in range(len(data_frame.columns))]
     return zip(data_frame.index, *cols)
 
 
-def _not_nan(x):
-    return x == x
-
-
 def _any_not_nan(p, indexes):
     return any(map(lambda x: _not_nan(p[x]), indexes))
 
@@ -175,7 +177,7 @@ class DataframeSerializer:
                 # This column is a tag column.
                 if null_columns.iloc[index]:
                     key_value = f"""{{
-                            '' if {val_format} == '' or type({val_format}) == float and math.isnan({val_format}) else
+                            '' if {val_format} == '' or pd.isna({val_format}) else
                             f',{key_format}={{str({val_format}).translate(_ESCAPE_STRING)}}'
                         }}"""
                 else:
@@ -191,20 +193,22 @@ class DataframeSerializer:
             # It's important to omit it because when the first
             # field column has no nulls, we don't run the comma-removal
             # regexp substitution step.
+
             sep = '' if len(field_indexes) == 0 else ','
-            if issubclass(value.type, np.integer):
-                field_value = f"{sep}{key_format}={{{val_format}}}i"
-            elif issubclass(value.type, np.bool_):
-                field_value = f'{sep}{key_format}={{{val_format}}}'
-            elif issubclass(value.type, np.floating):
+
+            if (issubclass(value.type, np.integer) or issubclass(value.type, np.floating) or
+                    issubclass(value.type, np.bool_)):
+                suffix = 'i' if issubclass(value.type, np.integer) else ''
                 if null_columns.iloc[index]:
-                    field_value = f"""{{"" if math.isnan({val_format}) else f"{sep}{key_format}={{{val_format}}}"}}"""
+                    field_value = (
+                        f"""{{"" if pd.isna({val_format}) else f"{sep}{key_format}={{{val_format}}}{suffix}"}}"""
+                    )
                 else:
-                    field_value = f'{sep}{key_format}={{{val_format}}}'
+                    field_value = f'{sep}{key_format}={{{val_format}}}{suffix}'
             else:
                 if null_columns.iloc[index]:
                     field_value = f"""{{
-                            '' if type({val_format}) == float and math.isnan({val_format}) else
+                            '' if pd.isna({val_format}) else
                             f'{sep}{key_format}="{{str({val_format}).translate(_ESCAPE_STRING)}}"'
                         }}"""
                 else:
@@ -229,7 +233,7 @@ class DataframeSerializer:
             '_ESCAPE_KEY': _ESCAPE_KEY,
             '_ESCAPE_STRING': _ESCAPE_STRING,
             'keys': keys,
-            'math': math,
+            'pd': pd,
         })
 
         for k, v in dict(data_frame.dtypes).items():
@@ -297,8 +301,7 @@ class PolarsDataframeSerializer:
         :key data_frame_timestamp_column: name of DataFrame column which contains a timestamp.
         :key data_frame_timestamp_timezone: name of the timezone which is used for timestamp column
         """
-        
-        
+
         self.data_frame = data_frame
         self.point_settings = point_settings
         self.precision = precision
@@ -311,7 +314,9 @@ class PolarsDataframeSerializer:
         self.column_indices = {name: index for index, name in enumerate(data_frame.columns)}
 
         if self.timestamp_column is None or self.timestamp_column not in self.column_indices:
-            raise ValueError(f"Timestamp column {self.timestamp_column} not found in DataFrame. Please define a valid timestamp column.")
+            raise ValueError(
+                f"Timestamp column {self.timestamp_column} not found in DataFrame. Please define a valid timestamp "
+                f"column.")
 
         #
         # prepare chunks
@@ -321,43 +326,45 @@ class PolarsDataframeSerializer:
             self.chunk_size = chunk_size
         else:
             self.number_of_chunks = None
-    
-    def escape_value(self,value):
+
+    def escape_key(self, value):
         return str(value).translate(_ESCAPE_KEY)
 
-    
+    def escape_value(self, value):
+        return str(value).translate(_ESCAPE_STRING)
+
     def to_line_protocol(self, row):
         # Filter out None or empty values for tags
         tags = ""
-      
+
         tags = ",".join(
-            f'{self.escape_value(col)}={self.escape_value(row[self.column_indices[col]])}' 
+            f'{self.escape_key(col)}={self.escape_key(row[self.column_indices[col]])}'
             for col in self.tag_columns
             if row[self.column_indices[col]] is not None and row[self.column_indices[col]] != ""
         )
 
         if self.point_settings.defaultTags:
             default_tags = ",".join(
-                f'{self.escape_value(key)}={self.escape_value(value)}'
+                f'{self.escape_key(key)}={self.escape_key(value)}'
                 for key, value in self.point_settings.defaultTags.items()
             )
             # Ensure there's a comma between existing tags and default tags if both are present
             if tags and default_tags:
                 tags += ","
             tags += default_tags
-    
-
 
-        
         # add escape symbols for special characters to tags
 
         fields = ",".join(
-            f"{col}=\"{row[self.column_indices[col]]}\"" if isinstance(row[self.column_indices[col]], str)
+            f"{col}=\"{self.escape_value(row[self.column_indices[col]])}\"" if isinstance(row[self.column_indices[col]],
+                                                                                          str)
+            else f"{col}={str(row[self.column_indices[col]]).lower()}" if isinstance(row[self.column_indices[col]],
+                                                                                     bool)  # Check for bool first
             else f"{col}={row[self.column_indices[col]]}i" if isinstance(row[self.column_indices[col]], int)
             else f"{col}={row[self.column_indices[col]]}"
             for col in self.column_indices
-            if col not in self.tag_columns + [self.timestamp_column]
-            and row[self.column_indices[col]] is not None and row[self.column_indices[col]] != ""
+            if col not in self.tag_columns + [self.timestamp_column] and
+            row[self.column_indices[col]] is not None and row[self.column_indices[col]] != ""
         )
 
         # Access the Unix timestamp
@@ -369,26 +376,31 @@ class PolarsDataframeSerializer:
 
         return line_protocol
 
-    
     def serialize(self, chunk_idx: int = None):
         from ...extras import pl
-        
+
         df = self.data_frame
 
-        # Convert timestamp to unix timestamp
-        if self.precision is None:
-            df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="ns").alias(self.timestamp_column))
-        elif self.precision == 'ns':
-            df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="ns").alias(self.timestamp_column))
-        elif self.precision == 'us':
-            df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="us").alias(self.timestamp_column))
-        elif self.precision == 'ms':
-            df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="ms").alias(self.timestamp_column))
-        elif self.precision == 's':
-            df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="s").alias(self.timestamp_column))
+        # Check if the timestamp column is already an integer
+        if df[self.timestamp_column].dtype in [pl.Int32, pl.Int64]:
+            # The timestamp column is already an integer, assuming it's in Unix format
+            pass
         else:
-            raise ValueError(f"Unsupported precision: {self.precision}")
-        
+            # Convert timestamp to Unix timestamp based on specified precision
+            if self.precision in [None, 'ns']:
+                df = df.with_columns(
+                    pl.col(self.timestamp_column).dt.epoch(time_unit="ns").alias(self.timestamp_column))
+            elif self.precision == 'us':
+                df = df.with_columns(
+                    pl.col(self.timestamp_column).dt.epoch(time_unit="us").alias(self.timestamp_column))
+            elif self.precision == 'ms':
+                df = df.with_columns(
+                    pl.col(self.timestamp_column).dt.epoch(time_unit="ms").alias(self.timestamp_column))
+            elif self.precision == 's':
+                df = df.with_columns(pl.col(self.timestamp_column).dt.epoch(time_unit="s").alias(self.timestamp_column))
+            else:
+                raise ValueError(f"Unsupported precision: {self.precision}")
+
         if chunk_idx is None:
             chunk = df
         else:
@@ -396,18 +408,13 @@ class PolarsDataframeSerializer:
             chunk = df[chunk_idx * self.chunk_size:(chunk_idx + 1) * self.chunk_size]
 
         # Apply the UDF to each row
-        line_protocol_expr = chunk.apply(self.to_line_protocol,return_dtype=pl.Object)
+        line_protocol_expr = chunk.apply(self.to_line_protocol, return_dtype=pl.Object)
 
         lp = line_protocol_expr['map'].to_list()
 
-
         return lp
 
 
-
-     
-
-
 def data_frame_to_list_of_points(data_frame, point_settings, precision=DEFAULT_WRITE_PRECISION, **kwargs):
     """
     Serialize DataFrame into LineProtocols.
@@ -424,6 +431,7 @@ def data_frame_to_list_of_points(data_frame, point_settings, precision=DEFAULT_W
     """  # noqa: E501
     return DataframeSerializer(data_frame, point_settings, precision, **kwargs).serialize()
 
+
 def polars_data_frame_to_list_of_points(data_frame, point_settings, precision=DEFAULT_WRITE_PRECISION, **kwargs):
     """
     Serialize DataFrame into LineProtocols.
@@ -438,4 +446,4 @@ def polars_data_frame_to_list_of_points(data_frame, point_settings, precision=DE
                                       or other formats and types supported by `pandas.to_datetime <https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.to_datetime.html#pandas.to_datetime>`_ - ``DataFrame``
     :key data_frame_timestamp_timezone: name of the timezone which is used for timestamp column - ``DataFrame``
     """  # noqa: E501
-    return PolarsDataframeSerializer(data_frame, point_settings, precision, **kwargs).serialize()
+    return PolarsDataframeSerializer(data_frame, point_settings, precision, **kwargs).serialize()

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/influxdb_client_3/write_client/client/write_api.py

@@ -19,14 +19,14 @@ from reactivex.subject import Subject
 from influxdb_client_3.write_client.domain import WritePrecision
 from influxdb_client_3.write_client.client._base import _BaseWriteApi, _HAS_DATACLASS
 from influxdb_client_3.write_client.client.util.helpers import get_org_query_param
-from influxdb_client_3.write_client.client.write.dataframe_serializer import DataframeSerializer, PolarsDataframeSerializer
+from influxdb_client_3.write_client.client.write.dataframe_serializer import (DataframeSerializer,
+                                                                              PolarsDataframeSerializer)
 from influxdb_client_3.write_client.client.write.point import Point, DEFAULT_WRITE_PRECISION
 from influxdb_client_3.write_client.client.write.retry import WritesRetry
 from influxdb_client_3.write_client.rest import _UTF_8_encoding
 
 logger = logging.getLogger('influxdb_client_3.write_client.client.write_api')
 
-
 if _HAS_DATACLASS:
     import dataclasses
     from dataclasses import dataclass
@@ -460,10 +460,11 @@ You can use native asynchronous version of the client:
         elif isinstance(data, dict):
             self._write_batching(bucket, org, Point.from_dict(data, write_precision=precision, **kwargs),
                                  precision, **kwargs)
-            
+
         elif 'polars' in str(type(data)):
-            serializer = PolarsDataframeSerializer(data, self._point_settings, precision, self._write_options.batch_size,
-                                             **kwargs)
+            serializer = PolarsDataframeSerializer(data,
+                                                   self._point_settings, precision,
+                                                   self._write_options.batch_size, **kwargs)
             for chunk_idx in range(serializer.number_of_chunks):
                 self._write_batching(bucket, org,
                                      serializer.serialize(chunk_idx),
@@ -477,7 +478,6 @@ You can use native asynchronous version of the client:
                                      serializer.serialize(chunk_idx),
                                      precision, **kwargs)
 
-
         elif hasattr(data, "_asdict"):
             # noinspection PyProtectedMember
             self._write_batching(bucket, org, data._asdict(), precision, **kwargs)

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/setup.py

@@ -47,14 +47,15 @@ setup(
     packages=find_packages(exclude=['tests', 'tests.*', 'examples', 'examples.*']),
     extras_require={'pandas': ['pandas'], 'polars': ['polars'], 'dataframe': ['pandas', 'polars']},
     install_requires=requires,
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ]
-)
+)

influxdb3_python-0.4.0/tests/test_dataframe_serializer.py

@@ -0,0 +1,45 @@
+import unittest
+
+from influxdb_client_3 import PointSettings
+from influxdb_client_3.write_client.client.write.dataframe_serializer import DataframeSerializer
+import pandas as pd
+
+
+class TestDataFrameSerializer(unittest.TestCase):
+
+    def test_nullable_types(self):
+        df = pd.DataFrame({
+            "bool_nulls": [True, None, False],
+            "int_nulls": [None, 1, 2],
+            "float_nulls": [1.0, 2.0, None],
+            "str_nulls": ["a", "b", None],
+        })
+        df['bool_nulls_pd'] = df['bool_nulls'].astype(pd.BooleanDtype())
+        df['int_nulls_pd'] = df['int_nulls'].astype(pd.Int64Dtype())
+        df['float_nulls_pd'] = df['float_nulls'].astype(pd.Float64Dtype())
+        df['str_nulls_pd'] = df['str_nulls'].astype(pd.StringDtype())
+
+        df.index = pd.to_datetime(["2021-01-01", "2021-01-02", "2021-01-03"])
+
+        ps = PointSettings()
+
+        serializer = DataframeSerializer(df, ps, data_frame_measurement_name="test")
+
+        lines = serializer.serialize()
+
+        # make sure there are no `<NA>` values in the serialized lines
+        # first line should not have "int"
+        first_line = lines[0]
+        self.assertNotIn('<NA>', first_line)
+        self.assertNotIn('int_nulls', first_line)
+
+        # the second line should not have "bool"
+        second_line = lines[1]
+        self.assertNotIn('<NA>', second_line)
+        self.assertNotIn('bool_nulls', second_line)
+
+        # the third line should not have "str" or "float"
+        third_line = lines[2]
+        self.assertNotIn('<NA>', third_line)
+        self.assertNotIn('str_nulls', third_line)
+        self.assertNotIn('float_nulls', third_line)

{influxdb3-python-0.3.5 → influxdb3_python-0.4.0}/tests/test_influxdb_client_3.py

@@ -1,7 +1,9 @@
 import unittest
-from unittest.mock import patch, Mock
+from unittest.mock import patch
+
 from influxdb_client_3 import InfluxDBClient3
 
+
 class TestInfluxDBClient3(unittest.TestCase):
 
     @patch('influxdb_client_3._InfluxDBClient')
@@ -25,14 +27,6 @@ class TestInfluxDBClient3(unittest.TestCase):
         self.assertEqual(self.client._write_api, self.mock_write_api.return_value)
         self.assertEqual(self.client._flight_client, self.mock_flight_client.return_value)
 
-    @patch('influxdb_client_3._WriteApi.write')
-    def test_write(self, mock_write):
-        record = "test_record"
-        self.client.write(record=record)
-        mock_write.assert_called_once_with(bucket=self.client._database, record=record)
-
-    # Add more tests for other methods
-
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()