From f1e8911d4ec2f5cd9c9dc72d48f497306f9ae872 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Sat, 17 Feb 2024 22:01:27 +0530 Subject: [PATCH] fix error --- cloud-functions/python/functions/consolidation/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud-functions/python/functions/consolidation/main.py b/cloud-functions/python/functions/consolidation/main.py index 32a9a01..49f4573 100644 --- a/cloud-functions/python/functions/consolidation/main.py +++ b/cloud-functions/python/functions/consolidation/main.py @@ -2,7 +2,6 @@ import functions_framework from firebase_functions import https_fn # import firebase_admin from firebase_admin import initialize_app, firestore -from google.cloud.firestore import FieldFilter import pandas as pd import datetime import sys @@ -70,12 +69,12 @@ def consolidation(request): output_filename = f'/tmp/data_{datetime.today().strftime("%d_%m_%Y_%H_%M")}.xlsx' - output_path = os.getcwd() + path_delim + output_filename + output_path = output_filename writer = pd.ExcelWriter(output_path, engine = 'openpyxl') df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df.sort_values(by=['testTime'], ascending=False) - column_names = ["_id", "classificationResult", "deviceRatioClass", "prdClassification", "slopeRatioClass", "predictedDenovixRatio", "slopeRatio", "calculatedRatio", "deviceRatio", "kitSerial", "led1Gain1", "led1Gain2", "led1Gain4", "abs1", "led1Average", "led1Buffer", "led1Sample", "led2Gain1", "led2Gain2", "led2Gain4", "abs2", "led2Average", "led2Buffer", "led2Sample", "led3Gain1", "led3Gain2", "led3Gain4", "hb3", "abs3", "led3Average", "led3Buffer", "led3Sample", "led4Gain1", "led4Gain2", "led4Gain4", "hb4", "abs4", "led4Average", "led4Average", "led4Buffer", "led4Sample", "batteryLevel", "batteryVoltage", "solution", "concentration", "volume", "errorMessages", "deviceId", "deviceSerialNumber", "appVersion", "name", "testTime"] + column_names = ["_id", "classificationResult", "deviceRatioClass", "prdClassification", "slopeRatioClass", "predictedDenovixRatio", "slopeRatio", "calculatedRatio", "deviceRatio", "kitSerial", "led1Gain1", "led1Gain2", "led1Gain4", "abs1", "led1Average", "led1Buffer", "led1Sample", "led2Gain1", "led2Gain2", "led2Gain4", "abs2", "led2Average", "led2Buffer", "led2Sample", "led3Gain1", "led3Gain2", "led3Gain4", "hb3", "abs3", "led3Average", "led3Buffer", "led3Sample", "led4Gain1", "led4Gain2", "led4Gain4", "hb4", "abs4", "led4Average", "led4Buffer", "led4Sample", "batteryLevel", "batteryVoltage", "solution", "concentration", "volume", "errorMessages", "deviceId", "deviceSerialNumber", "appVersion", "name", "testTime"] common_columns = [col for col in column_names if col in df.columns] df = df[common_columns]