Refine influxdb api write api option

influxdb_api.py

@@ -383,6 +383,7 @@ def store_realtime_SCADA_data_to_influxdb(get_real_value_time: str, bucket: str
     client = get_new_client()
     if not client.ping():
         print("{} -- Failed to connect to InfluxDB.".format(datetime.now().strftime('%Y-%m-%d %H:%M:%S')))
+
     # 本地变量，用于记录成功写入的数据点数量
     points_written = 0
     lock = threading.Lock()
@@ -396,12 +397,14 @@ def store_realtime_SCADA_data_to_influxdb(get_real_value_time: str, bucket: str
 
     def error_callback(exception):
         print("Error writing batch:", exception)
+
     # 使用异步写入模式配置写入选项和回调函数
     write_api = client.write_api(
-        write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+        write_options= create_write_options(),
         success_callback=success_callback,
         error_callback=error_callback
     )
+
     # 创建一个临时存储点数据的列表
     points_to_write = []
 
@@ -702,6 +705,7 @@ def store_realtime_SCADA_data_to_influxdb(get_real_value_time: str, bucket: str
     if points_to_write:
         write_api.write(bucket=bucket, org=org_name, record=points_to_write)
         write_api.flush()  #
+
     time.sleep(10)
     print("Total points written:", points_written)
     client.close()
@@ -750,10 +754,11 @@ def store_non_realtime_SCADA_data_to_influxdb(get_history_data_end_time: str, bu
     # )
     # 使用异步写入模式配置写入选项和回调函数
     write_api = client.write_api(
-        write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+        write_options=create_write_options(),
         success_callback=success_callback,
         error_callback=error_callback
     )
+
     # 创建一个临时存储点数据的列表
     points_to_write = []
 
@@ -978,8 +983,11 @@ def store_non_realtime_SCADA_data_to_influxdb(get_history_data_end_time: str, bu
     if points_to_write:
         write_api.write(bucket=bucket, org=org_name, record=points_to_write)
         write_api.flush()  # 刷新缓存一次
+
     time.sleep(10)
+
     print("Total points written:", points_written)
+
     client.close()
 
 
@@ -1016,7 +1024,7 @@ def download_history_data_manually(begin_time: str, end_time: str, bucket: str =
     # write_api = client.write_api(write_options=SYNCHRONOUS, success_callback=success_callback, error_callback=error_callback)
     # 使用异步写入模式配置写入选项和回调函数
     write_api = client.write_api(
-        write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+        write_options=create_write_options(),
         success_callback=success_callback,
         error_callback=error_callback
     )
@@ -1430,8 +1438,11 @@ def download_history_data_manually(begin_time: str, end_time: str, bucket: str =
     if points_to_write:
         write_api.write(bucket=bucket, org=org_name, record=points_to_write)
         write_api.flush()  # 刷新缓存一次
+
     time.sleep(10)
+
     print("Total points written:", points_written)
+
     client.close()
 
 ########################SCADA############################################################################################################
@@ -1762,7 +1773,7 @@ def store_realtime_simulation_result_to_influxdb(node_result_list: List[Dict[str
     try:
         # 使用异步写入模式配置写入选项和回调函数
         write_api = client.write_api(
-            write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+            write_options=create_write_options(),
             success_callback=success_callback,
             error_callback=error_callback
         )
@@ -1823,7 +1834,9 @@ def store_realtime_simulation_result_to_influxdb(node_result_list: List[Dict[str
         raise RuntimeError(f"数据写入 InfluxDB 时发生错误: {e}")
 		
     time.sleep(10)
+
     print("Total points written:", points_written)
+
     client.close()
 
 
@@ -2412,7 +2425,7 @@ def store_scheme_simulation_result_to_influxdb(node_result_list: List[Dict[str,
         # )
         # 使用异步写入模式配置写入选项和回调函数
         write_api = client.write_api(
-            write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+            write_options=create_write_options(),
             success_callback=success_callback,
             error_callback=error_callback
         )
@@ -2476,9 +2489,13 @@ def store_scheme_simulation_result_to_influxdb(node_result_list: List[Dict[str,
             write_api.write(bucket=bucket, org=org_name, record=points_to_write)
             write_api.flush()  # 刷新缓存一次
     except Exception as e:
+        client.close()
         raise RuntimeError(f"数据写入 InfluxDB 时发生错误: {e}")
+
     time.sleep(10)
+
     print("Total points written:", points_written)
+
     client.close()
 
 
@@ -2564,7 +2581,7 @@ def fill_scheme_simulation_result_to_SCADA(scheme_Type: str = None, scheme_Name:
     #     max_retry_delay=30000  # 最大重试延迟（毫秒）
     # )
     write_api = client.write_api(
-        write_options=WriteOptions(batch_size=1000, flush_interval=1000),
+        write_options=create_write_options(),
         success_callback=success_callback,
         error_callback=error_callback
     )
@@ -2656,8 +2673,11 @@ def fill_scheme_simulation_result_to_SCADA(scheme_Type: str = None, scheme_Name:
     if points_to_write:
         write_api.write(bucket=bucket, org=org_name, record=points_to_write)
         write_api.flush()  # 刷新缓存一次
+
     time.sleep(10)
+
     print("Total points written:", points_written)
+
     client.close()