Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-09 17:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

newer pandas in requirements

Browse source
This commit is contained in:
avollkopf 2023-01-29 12:26:03 +01:00
parent 90f94525be
commit 679d10d4dc
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cbpi/controller/log_file_controller.py
View file

@ -154,15 +154,12 @@ class LogController:
return data return data
async def get_data2(self, ids) -> dict: async def get_data2(self, ids) -> dict:
def dateparse(time_in_secs):
return datetime.datetime.strptime(time_in_secs, '%Y-%m-%d %H:%M:%S')
dateparse = lambda dates: [datetime.datetime.strptime(d, '%Y-%m-%d %H:%M:%S') for d in dates]
result = dict() result = dict()
for id in ids: for id in ids:
# df = pd.read_csv("./logs/sensor_%s.log" % id, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime',"Values"], header=None)
# concat all logs
all_filenames = glob.glob(os.path.join(self.logsFolderPath,f"sensor_{id}.log*")) all_filenames = glob.glob(os.path.join(self.logsFolderPath,f"sensor_{id}.log*"))
df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames]) df = pd.concat([pd.read_csv(f, parse_dates=['DateTime'], date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames])
df = df.resample('60s').max() df = df.resample('60s').max()
df = df.dropna() df = df.dropna()
result[id] = {"time": df.index.astype(str).tolist(), "value":df.Values.tolist()} result[id] = {"time": df.index.astype(str).tolist(), "value":df.Values.tolist()}

2
requirements.txt
View file

@ -11,7 +11,7 @@ cryptography==36.0.1
requests==2.28.1 requests==2.28.1
voluptuous==0.13.1 voluptuous==0.13.1
pyfiglet==0.8.post1 pyfiglet==0.8.post1
pandas==1.4.1 pandas==1.5.3
shortuuid==1.0.11 shortuuid==1.0.11
tabulate==0.9.0 tabulate==0.9.0
numpy==1.24.1 numpy==1.24.1

2
setup.py
View file

@ -61,7 +61,7 @@ setup(name='cbpi4',
'cbpi4gui', 'cbpi4gui',
'importlib_metadata', 'importlib_metadata',
'numpy==1.24.1', 'numpy==1.24.1',
'pandas==1.4.1'] + ( 'pandas==1.5.3'] + (
['RPi.GPIO==0.7.1'] if raspberrypi else [] ), ['RPi.GPIO==0.7.1'] if raspberrypi else [] ),
dependency_links=[ dependency_links=[