fix data model changes

pages/5_Anomaly_Detection_Consumption.py

@@ -8,7 +8,7 @@ import plotly.graph_objects as go
 
 
 if 'api_token' not in st.session_state:
-    st.session_state.api_token = DEFAULT_TOKEN = os.getenv('NILM_API_TOKEN')
+    st.session_state.api_token = os.getenv('NILM_API_TOKEN')
 
 page_id = 5
 if 'current_page' not in st.session_state:

samples/1_short_term_consumption.json

@@ -15,10 +15,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 1,
                 "datacellar:fieldName": "outdoorTemperature",
-                "datacellar:description": "Temperature readings",
+                "datacellar:fieldDescription": "Temperature readings",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "Celsius",
+                    "datacellar:unit": "Celsius",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -28,10 +28,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 2,
                 "datacellar:fieldName": "consumedPower",
-                "datacellar:description": "Power consumption readings",
+                "datacellar:fieldDescription": "Power consumption readings",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "kWh",
+                    "datacellar:unit": "W",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -44,9 +44,11 @@
             "@type": "datacellar:TimeSeries",
             "datacellar:datasetFieldID": 1,
             "datacellar:startDate": "2006-12-17 01:00:00",
-            "datacellar:endDate": "2006-12-20 00:00:00",
+            "datacellar:endDate": "2006-12-25 07:00:00",
+            "datacellar:latitude": 48.7786,
+            "datacellar:longitude": 2.2906,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2006-12-17 01:00:00",
@@ -409,375 +411,375 @@
                 }
             ]
         },
-{
-    "@type": "datacellar:TimeSeries",
-    "datacellar:datasetFieldID": 2,
-	"datacellar:startDate": "2006-12-17 01:00:00",
-	"datacellar:endDate": "2006-12-20 00:00:00",
-    "datacellar:granularity": "1 hour",
-    "datacellar:dataPoints": [
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 01:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 02:00:00",
-            "datacellar:value": 0.347
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 03:00:00",
-            "datacellar:value": 0.240
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 04:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 05:00:00",
-            "datacellar:value": 0.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 06:00:00",
-            "datacellar:value": 0.800
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 07:00:00",
-            "datacellar:value": 2.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 08:00:00",
-            "datacellar:value": 2.700
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 09:00:00",
-            "datacellar:value": 0.875
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 10:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 11:00:00",
-            "datacellar:value": 0.860
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 12:00:00",
-            "datacellar:value": 0.950
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 13:00:00",
-            "datacellar:value": 0.880
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 14:00:00",
-            "datacellar:value": 0.850
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 15:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 16:00:00",
-            "datacellar:value": 1.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 17:00:00",
-            "datacellar:value": 2.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 18:00:00",
-            "datacellar:value": 3.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 19:00:00",
-            "datacellar:value": 3.125
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 20:00:00",
-            "datacellar:value": 3.250
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 21:00:00",
-            "datacellar:value": 3.125
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 22:00:00",
-            "datacellar:value": 1.300
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-17 23:00:00",
-            "datacellar:value": 0.700
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 00:00:00",
-            "datacellar:value": 0.400
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 01:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 02:00:00",
-            "datacellar:value": 0.347
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 03:00:00",
-            "datacellar:value": 0.240
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 04:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 05:00:00",
-            "datacellar:value": 0.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 06:00:00",
-            "datacellar:value": 0.800
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 07:00:00",
-            "datacellar:value": 2.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 08:00:00",
-            "datacellar:value": 2.700
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 09:00:00",
-            "datacellar:value": 0.875
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 10:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 11:00:00",
-            "datacellar:value": 0.860
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 12:00:00",
-            "datacellar:value": 0.950
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 13:00:00",
-            "datacellar:value": 0.880
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 14:00:00",
-            "datacellar:value": 0.850
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 15:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 16:00:00",
-            "datacellar:value": 1.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 17:00:00",
-            "datacellar:value": 2.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 18:00:00",
-            "datacellar:value": 3.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 19:00:00",
-            "datacellar:value": 3.125
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 20:00:00",
-            "datacellar:value": 3.250
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 21:00:00",
-            "datacellar:value": 3.125
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 22:00:00",
-            "datacellar:value": 1.300
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-18 23:00:00",
-            "datacellar:value": 0.700
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 00:00:00",
-            "datacellar:value": 0.400
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 01:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 02:00:00",
-            "datacellar:value": 0.347
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 03:00:00",
-            "datacellar:value": 0.240
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 04:00:00",
-            "datacellar:value": 0.293
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 05:00:00",
-            "datacellar:value": 0.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 06:00:00",
-            "datacellar:value": 0.800
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 07:00:00",
-            "datacellar:value": 2.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 08:00:00",
-            "datacellar:value": 2.700
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 09:00:00",
-            "datacellar:value": 0.875
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 10:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 11:00:00",
-            "datacellar:value": 0.860
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 12:00:00",
-            "datacellar:value": 0.950
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 13:00:00",
-            "datacellar:value": 0.880
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 14:00:00",
-            "datacellar:value": 0.850
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 15:00:00",
-            "datacellar:value": 0.920
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 16:00:00",
-            "datacellar:value": 1.500
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 17:00:00",
-            "datacellar:value": 2.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 18:00:00",
-            "datacellar:value": 3.000
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 19:00:00",
-            "datacellar:value": 3.125
-        },
-
-                
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 20:00:00",
-            "datacellar:value": 3.250
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 21:00:00",
-            "datacellar:value": 3.125
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 22:00:00",
-            "datacellar:value": 1.300
-        },
-        {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-19 23:00:00",
-            "datacellar:value": 0.700
-        },
         {
-            "@type": "datacellar:DataPoint",
-            "datacellar:timeStamp": "2006-12-20 00:00:00",
-            "datacellar:value": 0.400
-        }
+            "@type": "datacellar:TimeSeries",
+            "datacellar:datasetFieldID": 2,
+            "datacellar:startDate": "2006-12-17 01:00:00",
+            "datacellar:endDate": "2006-12-25 07:00:00",
+            "datacellar:latitude": 48.7786,
+            "datacellar:longitude": 2.2906,
+            "datacellar:granularity": "1 hour",
+            "datacellar:timeseriesDataPoints": [
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 01:00:00",
+                    "datacellar:value": -8.335
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 02:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 03:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 04:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 05:00:00",
+                    "datacellar:value": -9.445
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 06:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 07:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 08:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 09:00:00",
+                    "datacellar:value": -8.335
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 10:00:00",
+                    "datacellar:value": -17.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 11:00:00",
+                    "datacellar:value": 1.665
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 12:00:00",
+                    "datacellar:value": 3.335
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 13:00:00",
+                    "datacellar:value": 4.445
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 14:00:00",
+                    "datacellar:value": 6.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 15:00:00",
+                    "datacellar:value": 6.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 16:00:00",
+                    "datacellar:value": 6.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 17:00:00",
+                    "datacellar:value": 6.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 18:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 19:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 20:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 21:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 22:00:00",
+                    "datacellar:value": 2.5
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-17 23:00:00",
+                    "datacellar:value": 2.5
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 00:00:00",
+                    "datacellar:value": 2.5
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 01:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 02:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 03:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 04:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 05:00:00",
+                    "datacellar:value": 2.5
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 06:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 07:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 08:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 09:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 10:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 11:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 12:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 13:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 14:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 15:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 16:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 17:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 18:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 19:00:00",
+                    "datacellar:value": 4.445
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 20:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 21:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 22:00:00",
+                    "datacellar:value": 3.335
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-18 23:00:00",
+                    "datacellar:value": 2.22
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 00:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 01:00:00",
+                    "datacellar:value": 1.665
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 02:00:00",
+                    "datacellar:value": 1.665
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 03:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 04:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 05:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 06:00:00",
+                    "datacellar:value": 0.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 07:00:00",
+                    "datacellar:value": 0.555
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 08:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 09:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 10:00:00",
+                    "datacellar:value": 1.11
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 11:00:00",
+                    "datacellar:value": 1.665
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 12:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 13:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 14:00:00",
+                    "datacellar:value": 4.445
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 15:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 16:00:00",
+                    "datacellar:value": 5.0
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 17:00:00",
+                    "datacellar:value": 3.89
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 18:00:00",
+                    "datacellar:value": 3.335
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 19:00:00",
+                    "datacellar:value": 2.78
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 20:00:00",
+                    "datacellar:value": 2.5
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 21:00:00",
+                    "datacellar:value": 2.22
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 22:00:00",
+                    "datacellar:value": 2.22
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-19 23:00:00",
+                    "datacellar:value": 2.22
+                },
+                {
+                    "@type": "datacellar:DataPoint",
+                    "datacellar:timeStamp": "2006-12-20 00:00:00",
+                    "datacellar:value": 1.11
+                }
             ]
         }
     ],

samples/2_long_term_consumption.json

@@ -15,10 +15,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 1,
                 "datacellar:fieldName": "outdoorTemperature",
-                "datacellar:description": "Temperature readings",
+                "datacellar:fieldDescription": "Temperature readings",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "Celsius",
+                    "datacellar:unit": "Celsius",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -28,10 +28,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 2,
                 "datacellar:fieldName": "consumedPower",
-                "datacellar:description": "Power consumption readings",
+                "datacellar:fieldDescription": "Power consumption readings",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "kWh",
+                    "datacellar:unit": "kW",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -45,10 +45,12 @@
         {
             "@type": "datacellar:TimeSeries",
             "datacellar:datasetFieldID": 1,
-            "datacellar:startDate": "Datetime",
+            "datacellar:startDate": "2006-12-17 01:00:00",
             "datacellar:endDate": "2006-12-25 07:00:00",
+            "datacellar:latitude": 48.7786,
+            "datacellar:longitude": 2.2906,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2006-12-17 01:00:00",
@@ -1049,10 +1051,12 @@
         {
             "@type": "datacellar:TimeSeries",
             "datacellar:datasetFieldID": 2,
-            "datacellar:startDate": "Datetime",
+            "datacellar:startDate": "2006-12-17 01:00:00",
             "datacellar:endDate": "2006-12-25 07:00:00",
+            "datacellar:latitude": 48.7786,
+            "datacellar:longitude": 2.2906,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2006-12-17 01:00:00",

samples/3_short_term_production.json

@@ -15,10 +15,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 1,
                 "datacellar:fieldName": "generatedPower",
-                "datacellar:description": "Power generation readings",
+                "datacellar:fieldDescription": "Power generation readings",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "kWh",
+                    "datacellar:unit": "kW",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -28,10 +28,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 2,
                 "datacellar:fieldName": "outdoorTemperature",
-                "datacellar:description": "Temperature",
+                "datacellar:fieldDescription": "Temperature",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "K",
+                    "datacellar:unit": "K",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -41,10 +41,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 3,
                 "datacellar:fieldName": "dewPoint",
-                "datacellar:description": "Temperature at which condensation occurs",
+                "datacellar:fieldDescription": "Temperature at which condensation occurs",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "K",
+                    "datacellar:unit": "K",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -54,10 +54,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 4,
                 "datacellar:fieldName": "feelsLike",
-                "datacellar:description": "Human perception of weather temperature",
+                "datacellar:fieldDescription": "Human perception of weather temperature",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "K",
+                    "datacellar:unit": "K",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -67,10 +67,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 5,
                 "datacellar:fieldName": "minTemperature",
-                "datacellar:description": "Minimum temperature",
+                "datacellar:fieldDescription": "Minimum temperature",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "K",
+                    "datacellar:unit": "K",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -80,10 +80,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 6,
                 "datacellar:fieldName": "maxTemperature",
-                "datacellar:description": "Maximum temperature",
+                "datacellar:fieldDescription": "Maximum temperature",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "K",
+                    "datacellar:unit": "K",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -93,10 +93,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 7,
                 "datacellar:fieldName": "pressure",
-                "datacellar:description": "Pressure",
+                "datacellar:fieldDescription": "Pressure",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "hPa",
+                    "datacellar:unit": "hPa",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -106,10 +106,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 8,
                 "datacellar:fieldName": "humidity",
-                "datacellar:description": "Humidity",
+                "datacellar:fieldDescription": "Humidity",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "%",
+                    "datacellar:unit": "%",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -119,10 +119,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 9,
                 "datacellar:fieldName": "windSpeed",
-                "datacellar:description": "Wind speed",
+                "datacellar:fieldDescription": "Wind speed",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "m/s",
+                    "datacellar:unit": "m/s",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -132,10 +132,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 10,
                 "datacellar:fieldName": "windDeg",
-                "datacellar:description": "Wind direction",
+                "datacellar:fieldDescription": "Wind direction",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "deg",
+                    "datacellar:unit": "deg",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -145,10 +145,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 11,
                 "datacellar:fieldName": "windGust",
-                "datacellar:description": "Wind gust",
+                "datacellar:fieldDescription": "Wind gust",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "m/s",
+                    "datacellar:unit": "m/s",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -158,10 +158,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 12,
                 "datacellar:fieldName": "rain1H",
-                "datacellar:description": "Rain volume for the last hour",
+                "datacellar:fieldDescription": "Rain volume for the last hour",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "mm",
+                    "datacellar:unit": "mm",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -171,10 +171,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 13,
                 "datacellar:fieldName": "cloudsAll",
-                "datacellar:description": "Cloudiness",
+                "datacellar:fieldDescription": "Cloudiness",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "%",
+                    "datacellar:unit": "%",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -184,10 +184,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 14,
                 "datacellar:fieldName": "weatherDescription",
-                "datacellar:description": "Categorical weather conditions",
+                "datacellar:fieldDescription": "Categorical weather conditions",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "-",
+                    "datacellar:unit": "-",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -201,8 +201,10 @@
             "datacellar:datasetFieldID": 1,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -450,8 +452,10 @@
             "datacellar:datasetFieldID": 2,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -699,8 +703,10 @@
             "datacellar:datasetFieldID": 3,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -948,8 +954,10 @@
             "datacellar:datasetFieldID": 4,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -1197,8 +1205,10 @@
             "datacellar:datasetFieldID": 5,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -1446,8 +1456,10 @@
             "datacellar:datasetFieldID": 6,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -1695,8 +1707,10 @@
             "datacellar:datasetFieldID": 7,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -1944,8 +1958,10 @@
             "datacellar:datasetFieldID": 8,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -2193,8 +2209,10 @@
             "datacellar:datasetFieldID": 9,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -2442,8 +2460,10 @@
             "datacellar:datasetFieldID": 10,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -2691,8 +2711,10 @@
             "datacellar:datasetFieldID": 11,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -2940,8 +2962,10 @@
             "datacellar:datasetFieldID": 12,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -3189,8 +3213,10 @@
             "datacellar:datasetFieldID": 13,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",
@@ -3438,8 +3464,10 @@
             "datacellar:datasetFieldID": 14,
             "datacellar:startDate": "2010-07-01 00:00:00",
             "datacellar:endDate": "2011-06-30 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2010-07-01 00:00:00",

samples/4_NILM.json

@@ -15,11 +15,10 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 1,
                 "datacellar:fieldName": "consumedPower",
-                "datacellar:description": "Aggregate consumption metric",
-                "datacellar:timeseriesMetadataType": "datacellar:EnergyMeter",
+                "datacellar:fieldDescription": "Aggregate consumption metric",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "W",
+                    "datacellar:unit": "W",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -33,9 +32,11 @@
             "datacellar:datasetFieldID": 1,
             "datacellar:startDate": "2013-05-26 09:00:30",
             "datacellar:endDate": "2013-05-26 12:20:24",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:timeZone": 0,
             "datacellar:granularity": "6 seconds",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2013-05-26 09:00:34",
@@ -9711,13 +9712,7 @@
                     "datacellar:timeStamp": "2013-05-26 12:20:19",
                     "datacellar:value": 408
                 }
-            ],
-            "datacellar:timeSeriesMetadata":{
-				"@type":"datacellar:EnergyMeter",
-				"datacellar:deviceID":1,
-				"datacellar:loadType":"aggregate",
-				"datacellar:programmable":false
-			}
+            ]
         }
     ],
     "datacellar:datasetMetadataList": [

samples/6_anomaly_detection_production.json

@@ -15,11 +15,11 @@
                 "@type": "datacellar:DatasetField",
                 "datacellar:datasetFieldID": 1,
                 "datacellar:fieldName": "generatedEnergy",
-                "datacellar:description": "Generated energy",
+                "datacellar:fieldDescription": "Generated energy",
                 "datacellar:timeseriesMetadataType": "",
                 "datacellar:type": {
                     "@type": "datacellar:FieldType",
-                    "datacellar:unitText": "kWh",
+                    "datacellar:unit": "kWh",
                     "datacellar:averagable": true,
                     "datacellar:summable": false,
                     "datacellar:anonymizable": false
@@ -33,9 +33,11 @@
             "datacellar:datasetFieldID": 1,
             "datacellar:startDate": "2023-05-22 00:00:00",
             "datacellar:endDate": "2023-06-05 23:00:00",
+            "datacellar:latitude": 40.7128,
+            "datacellar:longitude": -74.006,
             "datacellar:timeZone": 0,
             "datacellar:granularity": "1 hour",
-            "datacellar:dataPoints": [
+            "datacellar:timeseriesDataPoints": [
                 {
                     "@type": "datacellar:DataPoint",
                     "datacellar:timeStamp": "2023-05-22 00:00:00",

utils.py

@@ -22,7 +22,7 @@ def get_series_name_and_unit(series, dataset_description):
                  if f['datacellar:datasetFieldID'] == field_id), None)
     
     name = field['datacellar:fieldName'] if field else f'Series {field_id}'
-    unit = field['datacellar:type']['datacellar:unitText'] if field else 'Unknown'
+    unit = field['datacellar:type']['datacellar:unit'] if field else 'Unknown'
     
     # Override name if metadata contains loadType
     if 'datacellar:timeSeriesMetadata' in series:
@@ -45,7 +45,7 @@ def process_series(series, dataset_description, is_input=False):
         tuple: (DataFrame, unit, name) of the processed series
     """
     name, unit = get_series_name_and_unit(series, dataset_description)
-    df = pd.DataFrame(series['datacellar:dataPoints'])
+    df = pd.DataFrame(series['datacellar:timeseriesDataPoints'])
     
     # Convert timestamp to datetime and ensure values are numeric
     df['datacellar:timeStamp'] = pd.to_datetime(df['datacellar:timeStamp'])
@@ -68,7 +68,7 @@ def load_and_process_data(json_data, input_data=None):
             "@type": "datacellar:DatasetField",
             "datacellar:datasetFieldID": 0,
             "datacellar:fieldName": "anomaly",
-            "datacellar:description": "Anomalies",
+            "datacellar:fieldDescription": "Anomalies",
             "datacellar:type": {
                 "@type": "datacellar:boolean",
                 "datacellar:unitText": "-"
@@ -79,7 +79,7 @@ def load_and_process_data(json_data, input_data=None):
     try:
         for series in json_data['datacellar:timeSeriesList']:
             # Check if series has any data points
-            if series.get('datacellar:dataPoints'):
+            if series.get('datacellar:timeseriesDataPoints'):
                 df, unit, _ = process_series(series, dataset_description)
                 # Additional check for non-empty DataFrame
                 if not df.empty and df['datacellar:value'].notna().any():
@@ -93,7 +93,7 @@ def load_and_process_data(json_data, input_data=None):
     if input_data:
         input_description = input_data['datacellar:datasetSelfDescription']
         for series in input_data['datacellar:timeSeriesList']:
-            if series.get('datacellar:dataPoints'):
+            if series.get('datacellar:timeseriesDataPoints'):
                 df, unit, _ = process_series(series, input_description, is_input=True)
                 if not df.empty and df['datacellar:value'].notna().any():
                     if unit not in series_by_unit: