update

app.py

@@ -20,11 +20,10 @@ if __name__ == '__main__':
         start_date = site_metadata['start_date']
         end_date = site_metadata['end_date']
         all_timestamps = get_timestamps(start_date, end_date)
-        payload = METADATA['query']
-        payload['metrics'][0]['tags']['c3'] = list(column_renamer.keys())
-        obj = Compliance(site, payload, column_renamer, all_tags, list(tags_data.keys()))
+        obj = Compliance(site, column_renamer, all_tags, list(tags_data.keys()))
         day_df = obj.start_calculation(all_timestamps)
+        day_df = day_df[day_df['event_date'] <= end_date]
         final_df_list.append(day_df)
     df = pd.concat(final_df_list)
     # df.set_index('client_name').to_sql("project_compliance", POSTGRES_URI, if_exists='replace')
-    # df.to_csv('overall-compliance.csv', index=False)
+    df.to_csv('delta-overall-compliance.csv', index=False)

conf/data.yml

@@ -89,6 +89,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "Ac20_delta":
+          "delta": site_113$dept_120$line_302$tag_7025
+      uom: "% - Conversion Rate"
       tags:
         "Vaporiser Reboiler E-2002A:Steam Flow(FIC-2022)":
           "upper": site_113$dept_120$line_302$equipment_3713$tag_6151
@@ -186,6 +191,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "Ac20_delta":
+          "delta": site_113$dept_120$line_302$tag_7026
+      uom: "% - Conversion Rate"
       tags:
         "Vaporizer Acid Feed Flow":
           "upper": site_113$dept_120$line_302$equipment_3467$tag_6146
@@ -275,6 +285,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "Ac20_delta":
+          "delta": site_113$dept_120$line_305$equipment_3473$tag_5993
+      uom: "KG - Flow"
       tags:
         "Bharuch-Unit 4.AC2O.Anhydride Distillation Section.Column C-2042.Feed flow":
           "upper": site_113$dept_120$line_305$equipment_3466$tag_5987
@@ -316,6 +331,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "CTCMP_delta":
+          "delta": site_114$dept_129$line_326$equipment_3913$tag_6083
+      uom: "% - Quality"
       tags:
         "Reactor R-7205.Temperature":
           "upper": site_114$dept_129$line_326$equipment_3913$tag_6205
@@ -353,6 +373,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "CTCMP_delta":
+          "delta": site_114$dept_129$line_326$equipment_3903$tag_6083
+      uom: "% - Quality"
       tags:
         "Reactor R-7204.Pressure 2":
           "upper": site_114$dept_129$line_326$equipment_3903$tag_6116
@@ -386,6 +411,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "CTCMP_delta":
+          "delta": site_114$dept_129$line_326$equipment_3900$tag_6083
+      uom: "% - Quality"
       tags:
         "Reactor R-7203.Flow":
           "upper": site_114$dept_129$line_326$equipment_3900$tag_6145
@@ -428,6 +458,11 @@ metadata:
       compliance_percentage: 50
       start_date: "2022-08-01"
       end_date: "2022-12-31"
+      location: "Bharuch"
+      delta_data:
+        "3cp_delta":
+          "delta": site_116$dept_134$line_351$equipment_4119$tag_6907
+      uom: "KG"
       tags:
         "Super Heater E-2104A.Inlet Flow":
           "upper": site_116$dept_134$line_350$equipment_4154$tag_6845