From 0277bfaeb7e79f17474d9249a317897f670cce8f Mon Sep 17 00:00:00 2001 From: Vincent1218 Date: Fri, 15 Oct 2021 15:32:24 +0800 Subject: [PATCH] New Function --- README.md | 35 ++++++++-- build/lib/influxdbDataProcessor/__init__.py | 5 +- build/lib/influxdbDataProcessor/processor.py | 62 +++++++++++++++++- dist/influxdb-data-processor-0.0.4.tar.gz | Bin 0 -> 3179 bytes ...uxdb_data_processor-0.0.4-py3-none-any.whl | Bin 0 -> 4191 bytes influxdbDataProcessor/__init__.py | 5 +- influxdbDataProcessor/processor.py | 62 +++++++++++++++++- influxdb_data_processor.egg-info/PKG-INFO | 37 ++++++++--- setup.py | 2 +- 9 files changed, 184 insertions(+), 24 deletions(-) create mode 100644 dist/influxdb-data-processor-0.0.4.tar.gz create mode 100644 dist/influxdb_data_processor-0.0.4-py3-none-any.whl diff --git a/README.md b/README.md index 8b5dc1f..f70e799 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ Developed by Chai Wen Xuan 2021 ```python import pandas as pd -from influxdbDataProcessor.processor import processcsvdata +from influxdbDataProcessor.processor import processCsvData -df = processcsvdata() +df = processCsvData() ``` -#### Required input: +#### User will be required to input: 1. Token 2. influxDb url 3. Organization @@ -29,7 +29,7 @@ df = processcsvdata() 7. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') #### CSV file format: -- Only two column ("Measurement", "Field") +- Contains two column ("Measurement", "Field") ### Processing array data @@ -37,12 +37,15 @@ df = processcsvdata() ```python import pandas as pd -from influxdbDataProcessor.processor import processarraydata +from influxdbDataProcessor.processor import processArrayData -df = processarraydata(measurementArr,fieldArr) +measurementArr = ["Air Conditioner"] +fieldArr = ["Temperature"] + +df = processArrayData(measurementArr,fieldArr) ``` -#### Required input: +#### User will be required to input: 1. Token 2. influxDb url 3. Organization @@ -50,6 +53,24 @@ df = processarraydata(measurementArr,fieldArr) 5. Sampling frequency (1 day: '1d', 1hour: '1h', 1 minute: '1t', 1 second: '1s') 6. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') +### Ready input by user before calling function +```python +import pandas as pd + +from influxdbDataProcessor.processor import processArrayData + +df = processData(token,url,org,bucket,samplerange,length,mea,field) +``` + +#### User will be required to input: +1. Token +2. influxDb url +3. Organization +4. Bucket name +5. Sampling frequency (1 day: '1d', 1hour: '1h', 1 minute: '1t', 1 second: '1s') +6. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') +7. MeasurementArr +8. FieldArr diff --git a/build/lib/influxdbDataProcessor/__init__.py b/build/lib/influxdbDataProcessor/__init__.py index 57617c6..58832e7 100644 --- a/build/lib/influxdbDataProcessor/__init__.py +++ b/build/lib/influxdbDataProcessor/__init__.py @@ -1,2 +1,3 @@ -from influxdbDataProcessor.processor import processcsvdata -from influxdbDataProcessor.processor import processarraydata \ No newline at end of file +from influxdbDataProcessor.processor import processCsvData +from influxdbDataProcessor.processor import processArrayData +from influxdbDataProcessor.processor import processData \ No newline at end of file diff --git a/build/lib/influxdbDataProcessor/processor.py b/build/lib/influxdbDataProcessor/processor.py index 22cda89..64a9efa 100644 --- a/build/lib/influxdbDataProcessor/processor.py +++ b/build/lib/influxdbDataProcessor/processor.py @@ -3,7 +3,7 @@ import numpy as np import scipy as sp -def processcsvdata(): +def processCsvData(): print("Token: ") token = input() @@ -95,7 +95,7 @@ def processcsvdata(): return df_final -def processarraydata(mea,field): +def processArrayData(mea,field): print("Token: ") token = input() @@ -171,3 +171,61 @@ def processarraydata(mea,field): return df_final +def processData(token,url,org,bucket,samplerange,length,mea,field): + + client = influxdb_client.InfluxDBClient( + url=url, + token=token, + org=org + ) + + query_api = client.query_api() + + df_final = pd.DataFrame([]) + + print(len(mea)) + for i in range(len(mea)): + query = ' from(bucket:"' + bucket + '")\ + |> range(start: -' + length + ')\ + |> filter(fn:(r) => r._measurement == "' + mea[i] + '")\ + |> filter(fn:(r) => r._field == "' + field[i] + '" )' + + print("Measurement : ", mea[i]) + print("field : ", field[i]) + + result = query_api.query(org=org, query=query) + if len(result): + for table in result: + dev_name = table.records[0]["dev_name"] + df = pd.DataFrame([], columns=["Time", str(dev_name) + " Value"]) + print("dev_name: ", dev_name) + for record in table.records: + # print(record["dev_name"]) + value = record.get_value() + if value.is_integer(): + pass + else: + value = np.nan + + df = df.append( + pd.DataFrame([[record.get_time(), value]], columns=["Time", str(dev_name) + " Value"]), + ignore_index=True) + + df['Time'] = pd.to_datetime(df['Time']) + df.index = df['Time'] + del df['Time'] + # print(df[:11]) + df_interpol = df.resample(samplerange).mean() + # print(df_interpol[:11]) + + for x in df: + df_interpol[x] = df_interpol[x].interpolate(method="quadratic") + + if df_final.empty: + df_final = df_interpol + else: + df_final = pd.concat([df_final, df_interpol], axis=1) + # print(df_interpol) + + return df_final + diff --git a/dist/influxdb-data-processor-0.0.4.tar.gz b/dist/influxdb-data-processor-0.0.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..88cd7cfcc35f784458178a05610dcf988c141be0 GIT binary patch literal 3179 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 Bgr5Ka literal 0 HcmV?d00001 diff --git a/dist/influxdb_data_processor-0.0.4-py3-none-any.whl b/dist/influxdb_data_processor-0.0.4-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..2bd5f6eeca51befb396be5b1795162318b11d41b GIT binary patch literal 4191 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 literal 0 HcmV?d00001 diff --git a/influxdbDataProcessor/__init__.py b/influxdbDataProcessor/__init__.py index 57617c6..58832e7 100644 --- a/influxdbDataProcessor/__init__.py +++ b/influxdbDataProcessor/__init__.py @@ -1,2 +1,3 @@ -from influxdbDataProcessor.processor import processcsvdata -from influxdbDataProcessor.processor import processarraydata \ No newline at end of file +from influxdbDataProcessor.processor import processCsvData +from influxdbDataProcessor.processor import processArrayData +from influxdbDataProcessor.processor import processData \ No newline at end of file diff --git a/influxdbDataProcessor/processor.py b/influxdbDataProcessor/processor.py index 22cda89..64a9efa 100644 --- a/influxdbDataProcessor/processor.py +++ b/influxdbDataProcessor/processor.py @@ -3,7 +3,7 @@ import numpy as np import scipy as sp -def processcsvdata(): +def processCsvData(): print("Token: ") token = input() @@ -95,7 +95,7 @@ def processcsvdata(): return df_final -def processarraydata(mea,field): +def processArrayData(mea,field): print("Token: ") token = input() @@ -171,3 +171,61 @@ def processarraydata(mea,field): return df_final +def processData(token,url,org,bucket,samplerange,length,mea,field): + + client = influxdb_client.InfluxDBClient( + url=url, + token=token, + org=org + ) + + query_api = client.query_api() + + df_final = pd.DataFrame([]) + + print(len(mea)) + for i in range(len(mea)): + query = ' from(bucket:"' + bucket + '")\ + |> range(start: -' + length + ')\ + |> filter(fn:(r) => r._measurement == "' + mea[i] + '")\ + |> filter(fn:(r) => r._field == "' + field[i] + '" )' + + print("Measurement : ", mea[i]) + print("field : ", field[i]) + + result = query_api.query(org=org, query=query) + if len(result): + for table in result: + dev_name = table.records[0]["dev_name"] + df = pd.DataFrame([], columns=["Time", str(dev_name) + " Value"]) + print("dev_name: ", dev_name) + for record in table.records: + # print(record["dev_name"]) + value = record.get_value() + if value.is_integer(): + pass + else: + value = np.nan + + df = df.append( + pd.DataFrame([[record.get_time(), value]], columns=["Time", str(dev_name) + " Value"]), + ignore_index=True) + + df['Time'] = pd.to_datetime(df['Time']) + df.index = df['Time'] + del df['Time'] + # print(df[:11]) + df_interpol = df.resample(samplerange).mean() + # print(df_interpol[:11]) + + for x in df: + df_interpol[x] = df_interpol[x].interpolate(method="quadratic") + + if df_final.empty: + df_final = df_interpol + else: + df_final = pd.concat([df_final, df_interpol], axis=1) + # print(df_interpol) + + return df_final + diff --git a/influxdb_data_processor.egg-info/PKG-INFO b/influxdb_data_processor.egg-info/PKG-INFO index 1c2b10d..79e71ab 100644 --- a/influxdb_data_processor.egg-info/PKG-INFO +++ b/influxdb_data_processor.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: influxdb-data-processor -Version: 0.0.3 +Version: 0.0.4 Summary: A data processor for data in influxDB Home-page: UNKNOWN Author: Pikacent (Chai Wen Xuan) @@ -23,12 +23,12 @@ Description: ```python import pandas as pd - from influxdbDataProcessor.processor import processcsvdata + from influxdbDataProcessor.processor import processCsvData - df = processcsvdata() + df = processCsvData() ``` - #### Required input: + #### User will be required to input: 1. Token 2. influxDb url 3. Organization @@ -38,7 +38,7 @@ Description: 7. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') #### CSV file format: - - Only two column ("Measurement", "Field") + - Contains two column ("Measurement", "Field") ### Processing array data @@ -46,12 +46,15 @@ Description: ```python import pandas as pd - from influxdbDataProcessor.processor import processarraydata + from influxdbDataProcessor.processor import processArrayData - df = processarraydata(measurementArr,fieldArr) + measurementArr = ["Air Conditioner"] + fieldArr = ["Temperature"] + + df = processArrayData(measurementArr,fieldArr) ``` - #### Required input: + #### User will be required to input: 1. Token 2. influxDb url 3. Organization @@ -59,6 +62,24 @@ Description: 5. Sampling frequency (1 day: '1d', 1hour: '1h', 1 minute: '1t', 1 second: '1s') 6. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') + ### Ready input by user before calling function + ```python + import pandas as pd + + from influxdbDataProcessor.processor import processArrayData + + df = processData(token,url,org,bucket,samplerange,length,mea,field) + ``` + + #### User will be required to input: + 1. Token + 2. influxDb url + 3. Organization + 4. Bucket name + 5. Sampling frequency (1 day: '1d', 1hour: '1h', 1 minute: '1t', 1 second: '1s') + 6. Data range (1 day: '1d', 1hour: '1h', 1 minute: '1m', 1 second: '1s') + 7. MeasurementArr + 8. FieldArr diff --git a/setup.py b/setup.py index 8b964c7..9ec6b5f 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with codecs.open(os.path.join(here, "README.md"), encoding="utf-8") as fh: long_description = "\n" + fh.read() -VERSION = '0.0.3' +VERSION = '0.0.4' DESCRIPTION = 'A data processor for data in influxDB' # Setting up