modified falcon.API to falcon.App and CORS to falcon.CORSmiddleware

myems-api/app.py

@@ -1,5 +1,4 @@
 import falcon
-from falcon_cors import CORS
 from falcon_multipart.middleware import MultipartMiddleware
 from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \
     costcenter, point, knowledgefile, meter, tariff, user, storetype, timezone, \
@@ -91,11 +90,8 @@ from reports import virtualmetercost
 
 # https://github.com/lwcolton/falcon-cors
 # https://github.com/yohanboniface/falcon-multipart
-cors = CORS(allow_all_origins=True,
+
-            allow_credentials_all_origins=True,
+api = falcon.App(middleware=[falcon.CORSMiddleware(), MultipartMiddleware()])
-            allow_all_headers=True,
-            allow_all_methods=True)
-api = falcon.API(middleware=[cors.middleware, MultipartMiddleware()])
 
 
 ########################################################################################################################

myems-api/core/combinedequipment.py

@@ -56,7 +56,7 @@ class CombinedEquipmentCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -199,7 +199,7 @@ class CombinedEquipmentItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -560,7 +560,7 @@ class CombinedEquipmentEquipmentCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -818,7 +818,7 @@ class CombinedEquipmentParameterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1127,7 +1127,7 @@ class CombinedEquipmentParameterItem:
                            "numerator_meter": numerator_meter,
                            "denominator_meter": denominator_meter}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -1433,7 +1433,7 @@ class CombinedEquipmentMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1623,7 +1623,7 @@ class CombinedEquipmentOfflineMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1814,7 +1814,7 @@ class CombinedEquipmentVirtualMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/contact.py

@@ -42,7 +42,7 @@ class ContactCollection:
                                "description": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -155,7 +155,7 @@ class ContactItem:
                   "email": row[3],
                   "phone": row[4],
                   "description": row[5]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/costcenter.py

@@ -35,7 +35,7 @@ class CostCenterCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2], "external_id": row[3]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -130,7 +130,7 @@ class CostCenterItem:
                                    description='API.COST_CENTER_NOT_FOUND')
 
         result = {"id": row[0], "name": row[1], "uuid": row[2], "external_id": row[3]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -404,7 +404,7 @@ class CostCenterTariffCollection:
                                "unit_of_price": row[4]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/costfile.py

@@ -46,7 +46,7 @@ class CostFileCollection:
                                "status": row[4]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -186,7 +186,7 @@ class CostFileItem:
                   "uuid": row[2],
                   "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
                   "status": row[4]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -281,4 +281,4 @@ class CostFileRestore:
         except Exception as ex:
             raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR',
                                    description='API.FAILED_TO_RESTORE_COST_FILE')
-        resp.body = json.dumps('success')
+        resp.text = json.dumps('success')

myems-api/core/datasource.py

@@ -65,7 +65,7 @@ class DataSourceCollection:
 
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -220,7 +220,7 @@ class DataSourceItem:
                   "last_seen_datetime": last_seen_datetime
                   }
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -416,4 +416,4 @@ class DataSourcePointCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/core/distributioncircuit.py

@@ -57,7 +57,7 @@ class DistributionCircuitCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -227,7 +227,7 @@ class DistributionCircuitItem:
                            "customers": row['customers'],
                            "meters": row['meters']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -434,7 +434,7 @@ class DistributionCircuitPointCollection:
                                                         "uuid": row['distribution_circuit_uuid']}}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/distributionsystem.py

@@ -41,7 +41,7 @@ class DistributionSystemCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -141,7 +141,7 @@ class DistributionSystemItem:
                            "svg": row['svg'],
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -290,4 +290,4 @@ class DistributionSystemDistributionCircuitCollection:
                                "customers": row['customers'], "meters": row['meters']}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/core/emailmessage.py

@@ -85,7 +85,7 @@ class EmailMessageCollection:
                                "status": row[8]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class EmailMessageItem:
@@ -144,7 +144,7 @@ class EmailMessageItem:
                   "scheduled_datetime": row[7].timestamp() * 1000 if isinstance(row[7], datetime) else None,
                   "status": row[8]}
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/emailserver.py

@@ -42,7 +42,7 @@ class EmailServerCollection:
                                "from_addr": row[6]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -174,7 +174,7 @@ class EmailServerItem:
                   "password": str(base64.b64decode(bytearray(row[5], 'utf-8')), 'utf-8')
                   if row[5] is not None else None,
                   "from_addr": row[5]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/energycategory.py

@@ -36,7 +36,7 @@ class EnergyCategoryCollection:
                                "kgce": row[4], "kgco2e": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -144,7 +144,7 @@ class EnergyCategoryItem:
                   "unit_of_measure": row[3],
                   "kgce": row[4],
                   "kgco2e": row[5]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/energyflowdiagram.py

@@ -118,7 +118,7 @@ class EnergyFlowDiagramCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -280,7 +280,7 @@ class EnergyFlowDiagramItem:
                            "links": link_list_dict.get(row['id'], None),
                            }
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -471,7 +471,7 @@ class EnergyFlowDiagramLinkCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -715,7 +715,7 @@ class EnergyFlowDiagramLinkItem:
                            "source_node": source_node,
                            "target_node": target_node,
                            "meter": meter}
-            resp.body = json.dumps(meta_result)
+            resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -968,7 +968,7 @@ class EnergyFlowDiagramNodeCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1064,7 +1064,7 @@ class EnergyFlowDiagramNodeItem:
             meta_result = {"id": row['id'],
                            "name": row['name']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger

myems-api/core/energyitem.py

@@ -49,7 +49,7 @@ class EnergyItemCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -160,7 +160,7 @@ class EnergyItemItem:
                   "name": row['name'],
                   "uuid": row['uuid'],
                   "energy_category": energy_category}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/equipment.py

@@ -56,7 +56,7 @@ class EquipmentCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -199,7 +199,7 @@ class EquipmentItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -661,7 +661,7 @@ class EquipmentParameterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -971,7 +971,7 @@ class EquipmentParameterItem:
                            "numerator_meter": numerator_meter,
                            "denominator_meter": denominator_meter}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -1277,7 +1277,7 @@ class EquipmentMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1466,7 +1466,7 @@ class EquipmentOfflineMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1656,7 +1656,7 @@ class EquipmentVirtualMeterCollection:
                                "is_output": bool(row['is_output'])}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/gateway.py

@@ -49,7 +49,7 @@ class GatewayCollection:
                                }
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -142,7 +142,7 @@ class GatewayItem:
                   "token": row['token'],
                   "last_seen_datetime": last_seen_datetime}
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -298,5 +298,5 @@ class GatewayDataSourceCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 

myems-api/core/knowledgefile.py

@@ -70,7 +70,7 @@ class KnowledgeFileCollection:
                                }
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -229,7 +229,7 @@ class KnowledgeFileItem:
                   "uuid": row[2],
                   "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
                   "user_display_name": user_dict.get(row[4], None)}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -324,5 +324,5 @@ class KnowledgeFileRestore:
         except Exception as ex:
             raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR',
                                    description='API.FAILED_TO_RESTORE_KNOWLEDGE_FILE')
-        resp.body = json.dumps('success')
+        resp.text = json.dumps('success')
 

myems-api/core/menu.py

@@ -39,7 +39,7 @@ class MenuCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class MenuItem:
@@ -77,7 +77,7 @@ class MenuItem:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -184,7 +184,7 @@ class MenuChildrenCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class MenuWebCollection:
@@ -233,4 +233,4 @@ class MenuWebCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/core/meter.py

@@ -99,7 +99,7 @@ class MeterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -368,7 +368,7 @@ class MeterItem:
                            "master_meter": master_meter,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -844,7 +844,7 @@ class MeterSubmeterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class MeterPointCollection:
@@ -892,7 +892,7 @@ class MeterPointCollection:
                                "address": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/notification.py

@@ -145,7 +145,7 @@ class NotificationCollection:
                                "url": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class NotificationItem:
@@ -241,7 +241,7 @@ class NotificationItem:
                        "message": row[4],
                        "url": row[5]}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger

myems-api/core/offlinemeter.py

@@ -85,7 +85,7 @@ class OfflineMeterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -313,7 +313,7 @@ class OfflineMeterItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger

myems-api/core/offlinemeterfile.py

@@ -46,7 +46,7 @@ class OfflineMeterFileCollection:
                                "status": row[4]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -189,7 +189,7 @@ class OfflineMeterFileItem:
                   "uuid": row[2],
                   "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
                   "status": row[4]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -284,4 +284,4 @@ class OfflineMeterFileRestore:
         except Exception as ex:
             raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR',
                                    description='API.FAILED_TO_RESTORE_OFFLINE_METER_FILE')
-        resp.body = json.dumps('success')
+        resp.text = json.dumps('success')

myems-api/core/point.py

@@ -58,7 +58,7 @@ class PointCollection:
                                "description": row['description']}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -250,7 +250,7 @@ class PointItem:
                   "is_virtual": bool(row['is_virtual']),
                   "address": row['address'],
                   "description": row['description']}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/privilege.py

@@ -36,7 +36,7 @@ class PrivilegeCollection:
                                "data": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/rule.py

@@ -64,7 +64,7 @@ class RuleCollection:
                                }
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -240,7 +240,7 @@ class RuleItem:
                   "last_run_datetime": last_run_datetime,
                   "next_run_datetime": next_run_datetime,
                   }
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/sensor.py

@@ -38,7 +38,7 @@ class SensorCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -128,7 +128,7 @@ class SensorItem:
                            "uuid": row['uuid'],
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -314,7 +314,7 @@ class SensorPointCollection:
                                "address": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/shopfloor.py

@@ -82,7 +82,7 @@ class ShopfloorCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -274,7 +274,7 @@ class ShopfloorItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -560,7 +560,7 @@ class ShopfloorEquipmentCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -743,7 +743,7 @@ class ShopfloorMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -925,7 +925,7 @@ class ShopfloorOfflineMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1107,7 +1107,7 @@ class ShopfloorPointCollection:
                 meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1276,7 +1276,7 @@ class ShopfloorSensorCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1458,7 +1458,7 @@ class ShopfloorVirtualMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/space.py

@@ -102,7 +102,7 @@ class SpaceCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -356,7 +356,7 @@ class SpaceItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -813,7 +813,7 @@ class SpaceChildrenCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class SpaceCombinedEquipmentCollection:
@@ -857,7 +857,7 @@ class SpaceCombinedEquipmentCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1026,7 +1026,7 @@ class SpaceEquipmentCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1208,7 +1208,7 @@ class SpaceMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1392,7 +1392,7 @@ class SpaceOfflineMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1574,7 +1574,7 @@ class SpacePointCollection:
                 meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1743,7 +1743,7 @@ class SpaceSensorCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1911,7 +1911,7 @@ class SpaceShopfloorCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -2079,7 +2079,7 @@ class SpaceStoreCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -2247,7 +2247,7 @@ class SpaceTenantCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -2429,7 +2429,7 @@ class SpaceVirtualMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -2666,4 +2666,4 @@ class SpaceTreeCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = JsonExporter(sort_keys=True).export(node_dict[space_id], )
+        resp.text = JsonExporter(sort_keys=True).export(node_dict[space_id], )

myems-api/core/store.py

@@ -88,7 +88,7 @@ class StoreCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -330,7 +330,7 @@ class StoreItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -658,7 +658,7 @@ class StoreMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -840,7 +840,7 @@ class StoreOfflineMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1022,7 +1022,7 @@ class StorePointCollection:
                 meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1191,7 +1191,7 @@ class StoreSensorCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1373,7 +1373,7 @@ class StoreVirtualMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/storetype.py

@@ -36,7 +36,7 @@ class StoreTypeCollection:
                                "description": row[3], "simplified_code": row[4]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -145,7 +145,7 @@ class StoreTypeItem:
                   "uuid": row[2],
                   "description": row[3],
                   "simplified_code": row[4]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/tariff.py

@@ -95,7 +95,7 @@ class TariffCollection:
         cursor.close()
         cnx.disconnect()
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -306,7 +306,7 @@ class TariffItem:
         cursor.close()
         cnx.disconnect()
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/tenant.py

@@ -105,7 +105,7 @@ class TenantCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -397,7 +397,7 @@ class TenantItem:
                            "cost_center": cost_center,
                            "description": row['description']}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger
@@ -761,7 +761,7 @@ class TenantMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -943,7 +943,7 @@ class TenantOfflineMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1125,7 +1125,7 @@ class TenantPointCollection:
                 meta_result = {"id": row['id'], "name": row['name'], "data_source": data_source}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1294,7 +1294,7 @@ class TenantSensorCollection:
                 meta_result = {"id": row[0], "name": row[1], "uuid": row[2]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -1476,7 +1476,7 @@ class TenantVirtualMeterCollection:
                                "energy_category": energy_category}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/tenanttype.py

@@ -36,7 +36,7 @@ class TenantTypeCollection:
                                "description": row[3], "simplified_code": row[4]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -145,7 +145,7 @@ class TenantTypeItem:
                   "uuid": row[2],
                   "description": row[3],
                   "simplified_code": row[4]}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/textmessage.py

@@ -82,7 +82,7 @@ class TextMessageCollection:
                                "status": row[7]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class TextMessageItem:
@@ -140,7 +140,7 @@ class TextMessageItem:
                   "acknowledge_code": row[6],
                   "status": row[7]}
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/timezone.py

@@ -33,7 +33,7 @@ class TimezoneCollection:
                 meta_result = {"id": row[0], "name": row[1], "description": row[2], "utc_offset": row[3]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class TimezoneItem:
@@ -71,7 +71,7 @@ class TimezoneItem:
         cursor.close()
         cnx.disconnect()
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/core/user.py

@@ -63,7 +63,7 @@ class UserCollection:
                                    password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     def on_post(req, resp):
@@ -244,7 +244,7 @@ class UserItem:
                       "name": row[7]} if row[6] is not None else None,
                   "account_expiration_datetime": account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
                   "password_expiration_datetime": password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -545,7 +545,7 @@ class UserLogin:
 
         result['token'] = token
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
         resp.status = falcon.HTTP_200
         write_log(user_uuid=user_uuid, request_method='PUT', resource_type='UserLogin',
                   resource_id=None, request_body=None)
@@ -592,7 +592,7 @@ class UserLogout:
         if rowcount is None or rowcount == 0:
             raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
                                    description='API.USER_SESSION_NOT_FOUND')
-        resp.body = json.dumps("OK")
+        resp.text = json.dumps("OK")
         resp.status = falcon.HTTP_200
 
 
@@ -707,7 +707,7 @@ class ChangePassword:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps("OK")
+        resp.text = json.dumps("OK")
         resp.status = falcon.HTTP_200
         write_log(user_uuid=user_uuid, request_method='PUT', resource_type='ChangePassword',
                   resource_id=None, request_body=None)
@@ -823,7 +823,7 @@ class ResetPassword:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps("OK")
+        resp.text = json.dumps("OK")
         resp.status = falcon.HTTP_200
         write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='ResetPassword',
                   resource_id=user_id, request_body=None)

myems-api/core/version.py

@@ -18,5 +18,5 @@ class VersionItem:
         result = {"version": 'MyEMS v1.3.4',
                   "release-date": '2021-11-06',
                   "website": "https://myems.io"}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 

myems-api/core/virtualmeter.py

@@ -143,7 +143,7 @@ class VirtualMeterCollection:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger
@@ -502,7 +502,7 @@ class VirtualMeterItem:
 
         cursor.close()
         cnx.disconnect()
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger

myems-api/core/webmessage.py

@@ -95,7 +95,7 @@ class WebMessageCollection:
                                "reply": row[6]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class WebMessageStatusNewCollection:
@@ -159,7 +159,7 @@ class WebMessageStatusNewCollection:
                                "status": row[5]}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class WebMessageItem:
@@ -227,7 +227,7 @@ class WebMessageItem:
                        "status": row[5],
                        "reply": row[6]}
 
-        resp.body = json.dumps(meta_result)
+        resp.text = json.dumps(meta_result)
 
     @staticmethod
     @user_logger

myems-api/core/wechatmessage.py

@@ -73,7 +73,7 @@ class WechatMessageCollection(object):
                                "acknowledge_code": row[7],
                                "status": row[8]}
                 result.append(meta_result)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class WechatMessageItem:
@@ -122,7 +122,7 @@ class WechatMessageItem:
                   "acknowledge_code": row[7],
                   "status": row[8]}
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     @user_logger

myems-api/reports/advancedreport.py

@@ -105,7 +105,7 @@ class AdvancedReportCollection:
                                "file_bytes_base64": base64_message}
                 result.append(meta_result)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
 
 class AdvancedReportItem:
@@ -155,7 +155,7 @@ class AdvancedReportItem:
                   row['create_datetime_utc'].replace(tzinfo=timezone.utc).timestamp() * 1000,
                   "file_type": row['file_type'],
                   "file_bytes_base64": base64_message}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)
 
     @staticmethod
     def on_delete(req, resp, id_):

myems-api/reports/combinedequipmentbatch.py

@@ -239,4 +239,4 @@ class Reporting:
                                                          space_name,
                                                          reporting_period_start_datetime_local,
                                                          reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentcost.py

@@ -596,4 +596,4 @@ class Reporting:
                                                                                    reporting_start_datetime_local,
                                                                                    reporting_end_datetime_local,
                                                                                    period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentefficiency.py

@@ -801,4 +801,4 @@ class Reporting:
                                                                   reporting_end_datetime_local,
                                                                   period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentenergycategory.py

@@ -630,4 +630,4 @@ class Reporting:
                                                                   reporting_start_datetime_local,
                                                                   reporting_end_datetime_local,
                                                                   period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentenergyitem.py

@@ -594,4 +594,4 @@ class Reporting:
                                                                                          reporting_end_datetime_local,
                                                                                          period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentincome.py

@@ -570,4 +570,4 @@ class Reporting:
                                                                                      reporting_start_datetime_local,
                                                                                      reporting_end_datetime_local,
                                                                                      period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentload.py

@@ -622,4 +622,4 @@ class Reporting:
                                                                                    reporting_end_datetime_local,
                                                                                    period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentoutput.py

@@ -559,4 +559,4 @@ class Reporting:
                                                                                      reporting_end_datetime_local,
                                                                                      period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentsaving.py

@@ -791,4 +791,4 @@ class Reporting:
                                                                                      reporting_end_datetime_local,
                                                                                      period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/combinedequipmentstatistics.py

@@ -640,4 +640,4 @@ class Reporting:
                                                                                          reporting_end_datetime_local,
                                                                                          period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/dashboard.py

@@ -824,4 +824,4 @@ class Reporting:
                 result['child_space_cost']['subtotals_array'].append(
                     child_space_cost[energy_category_id]['subtotals'])
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/distributionsystem.py

@@ -160,4 +160,4 @@ class Reporting:
 
         result = circuit_list
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/energyflowdiagram.py

@@ -264,4 +264,4 @@ class Reporting:
                 result['links'].append({'source': link['source_node']['name'],
                                         'target': link['target_node']['name'],
                                         'value': link['value']})
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentbatch.py

@@ -239,4 +239,4 @@ class Reporting:
                                                  space_name,
                                                  reporting_period_start_datetime_local,
                                                  reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentcost.py

@@ -523,4 +523,4 @@ class Reporting:
                                                                            reporting_start_datetime_local,
                                                                            reporting_end_datetime_local,
                                                                            period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentefficiency.py

@@ -667,4 +667,4 @@ class Reporting:
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentenergycategory.py

@@ -556,4 +556,4 @@ class Reporting:
                                                                                      reporting_start_datetime_local,
                                                                                      reporting_end_datetime_local,
                                                                                      period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentenergyitem.py

@@ -527,4 +527,4 @@ class Reporting:
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentincome.py

@@ -500,4 +500,4 @@ class Reporting:
                                                                              reporting_start_datetime_local,
                                                                              reporting_end_datetime_local,
                                                                              period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentload.py

@@ -537,4 +537,4 @@ class Reporting:
                                                                            reporting_start_datetime_local,
                                                                            reporting_end_datetime_local,
                                                                            period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentoutput.py

@@ -488,4 +488,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentsaving.py

@@ -678,4 +678,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmentstatistics.py

@@ -571,4 +571,4 @@ class Reporting:
                                                                                  reporting_start_datetime_local,
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/equipmenttracking.py

@@ -111,4 +111,4 @@ class Reporting:
         result['excel_bytes_base64'] = \
             excelexporters.equipmenttracking.export(result,
                                                     space_name)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddcombinedequipmentfault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddequipmentfault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddshopfloorfault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddspacefault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddstorefault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/fddtenantfault.py

@@ -15,4 +15,4 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         result = {}
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/meterbatch.py

@@ -233,4 +233,4 @@ class Reporting:
                                              space_name,
                                              reporting_period_start_datetime_local,
                                              reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/metercost.py

@@ -479,4 +479,4 @@ class Reporting:
                                             reporting_period_end_datetime_local,
                                             period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/meterenergy.py

@@ -415,4 +415,4 @@ class Reporting:
                                               reporting_period_end_datetime_local,
                                               period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/meterrealtime.py

@@ -204,4 +204,4 @@ class Reporting:
 
         }
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/metersubmetersbalance.py

@@ -347,4 +347,4 @@ class Reporting:
                                                         reporting_period_end_datetime_local,
                                                         period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/metertracking.py

@@ -224,4 +224,4 @@ class Reporting:
                                                 space_name,
                                                 reporting_period_start_datetime_local,
                                                 reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/metertrend.py

@@ -277,4 +277,4 @@ class Reporting:
                                                                             reporting_period_end_datetime_local,
                                                                             None)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/offlinemetercost.py

@@ -388,4 +388,4 @@ class Reporting:
                                                    reporting_period_end_datetime_local,
                                                    period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/offlinemeterenergy.py

@@ -324,4 +324,4 @@ class Reporting:
                                                      reporting_period_end_datetime,
                                                      period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorbatch.py

@@ -238,4 +238,4 @@ class Reporting:
                                                                             space_name,
                                                                             reporting_period_start_datetime_local,
                                                                             reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorcost.py

@@ -547,4 +547,4 @@ class Reporting:
                                                                            reporting_start_datetime_local,
                                                                            reporting_end_datetime_local,
                                                                            period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorenergycategory.py

@@ -581,4 +581,4 @@ class Reporting:
                                                                                      reporting_start_datetime_local,
                                                                                      reporting_end_datetime_local,
                                                                                      period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorenergyitem.py

@@ -544,4 +544,4 @@ class Reporting:
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorload.py

@@ -567,4 +567,4 @@ class Reporting:
                                                                            reporting_start_datetime_local,
                                                                            reporting_end_datetime_local,
                                                                            period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorsaving.py

@@ -704,4 +704,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/shopfloorstatistics.py

@@ -630,4 +630,4 @@ class Reporting:
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spacecost.py

@@ -605,4 +605,4 @@ class Reporting:
                                                                        reporting_start_datetime_local,
                                                                        reporting_end_datetime_local,
                                                                        period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceefficiency.py

@@ -747,4 +747,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceenergycategory.py

@@ -651,4 +651,4 @@ class Reporting:
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceenergyitem.py

@@ -603,4 +603,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceincome.py

@@ -579,4 +579,4 @@ class Reporting:
                                                                          reporting_start_datetime_local,
                                                                          reporting_end_datetime_local,
                                                                          period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceload.py

@@ -567,4 +567,4 @@ class Reporting:
                                                                        reporting_end_datetime_local,
                                                                        period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spaceoutput.py

@@ -564,4 +564,4 @@ class Reporting:
                                                                          reporting_end_datetime_local,
                                                                          period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spacesaving.py

@@ -794,4 +794,4 @@ class Reporting:
                                                                          reporting_end_datetime_local,
                                                                          period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/spacestatistics.py

@@ -627,4 +627,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/storebatch.py

@@ -237,4 +237,4 @@ class Reporting:
                                                                         space_name,
                                                                         reporting_period_start_datetime_local,
                                                                         reporting_period_end_datetime_local)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/storecost.py

@@ -545,4 +545,4 @@ class Reporting:
                                                                        reporting_start_datetime_local,
                                                                        reporting_end_datetime_local,
                                                                        period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/storeenergycategory.py

@@ -580,4 +580,4 @@ class Reporting:
                                                                                  reporting_start_datetime_local,
                                                                                  reporting_end_datetime_local,
                                                                                  period_type)
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/storeenergyitem.py

@@ -544,4 +544,4 @@ class Reporting:
                                                                              reporting_end_datetime_local,
                                                                              period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)

myems-api/reports/storeload.py

@@ -568,4 +568,4 @@ class Reporting:
                                                                        reporting_end_datetime_local,
                                                                        period_type)
 
-        resp.body = json.dumps(result)
+        resp.text = json.dumps(result)