Merge branch 'develop' of https://github.com/e2nIEE/pandapower into develop

Author: lthurner

pandapower/convert_format.py

@@ -3,12 +3,13 @@
 # Copyright (c) 2016-2020 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
-import pandas as pd
 import numpy as np
+import pandas as pd
 from packaging import version
+
+from pandapower import __version__
 from pandapower.create import create_empty_network, create_poly_cost
 from pandapower.results import reset_results
-from pandapower import __version__
 
 
 def convert_format(net):

pandapower/file_io.py

@@ -7,17 +7,17 @@
 import json
 import os
 import pickle
-from packaging import version
 from warnings import warn
 
-import pandas as pd
-
 import numpy
+import pandas as pd
+from packaging import version
 
+import pandapower.io_utils as io_utils
 from pandapower.auxiliary import pandapowerNet
-from pandapower.create import create_empty_network
 from pandapower.convert_format import convert_format
-import pandapower.io_utils as io_utils
+from pandapower.create import create_empty_network
+
 
 def to_pickle(net, filename):
     """
@@ -67,7 +67,7 @@ def to_excel(net, filename, include_empty_tables=False, include_results=True):
     """
     writer = pd.ExcelWriter(filename, engine='xlsxwriter')
     dict_net = io_utils.to_dict_of_dfs(net, include_results=include_results,
-                              include_empty_tables=include_empty_tables)
+                                       include_empty_tables=include_empty_tables)
     for item, table in dict_net.items():
         table.to_excel(writer, sheet_name=item)
     writer.save()
@@ -314,7 +314,7 @@ def from_json_dict(json_dict):
         if key == 'dtypes':
             continue
         if key in net and isinstance(net[key], pd.DataFrame) and isinstance(json_dict[key], dict) \
-             or key == "piecewise_linear_cost" or key == "polynomial_cost":
+                or key == "piecewise_linear_cost" or key == "polynomial_cost":
             net[key] = pd.DataFrame.from_dict(json_dict[key], orient="columns")
             net[key].set_index(net[key].index.astype(numpy.int64), inplace=True)
         else:

pandapower/io_utils.py

@@ -21,9 +21,10 @@
 from networkx.readwrite import json_graph
 from numpy import ndarray, generic, equal, isnan, allclose, any as anynp
 from packaging import version
+from pandas.testing import assert_series_equal, assert_frame_equal
+
 from pandapower.auxiliary import pandapowerNet
 from pandapower.create import create_empty_network
-from pandas.testing import assert_series_equal, assert_frame_equal
 
 try:
     from functools import singledispatch
@@ -447,7 +448,7 @@ def rest(self):
                 self.obj = json.loads(self.obj, cls=PPJSONDecoder,
                                       object_hook=partial(pp_hook, net=self.net,
                                                           registry_class=FromSerializableRegistry))
-                                      # backwards compatibility
+                # backwards compatibility
             return class_.from_dict(self.obj, self.net)
         else:
             # for non-pp objects, e.g. tuple
@@ -484,24 +485,28 @@ def __init__(self, **kwargs):
 
 
 def pp_hook(d, net=None, registry_class=FromSerializableRegistry):
-    if '_module' in d and '_class' in d:
-        if "_object" in d:
-            obj = d.pop('_object')
-        elif "_state" in d:
-            obj = d['_state']
-            if d['has_net']:
-                obj['net'] = 'net'
-            if '_init' in obj:
-                del obj['_init']
-            return obj  # backwards compatibility
+    try:
+        if '_module' in d and '_class' in d:
+            if "_object" in d:
+                obj = d.pop('_object')
+            elif "_state" in d:
+                obj = d['_state']
+                if d['has_net']:
+                    obj['net'] = 'net'
+                if '_init' in obj:
+                    del obj['_init']
+                return obj  # backwards compatibility
+            else:
+                # obj = {"_init": d, "_state": dict()}  # backwards compatibility
+                obj = {key: val for key, val in d.items() if key not in ['_module', '_class']}
+            fs = registry_class(obj, d, net, pp_hook)
+            fs.class_name = d.pop('_class', '')
+            fs.module_name = d.pop('_module', '')
+            return fs.from_serializable()
         else:
-            # obj = {"_init": d, "_state": dict()}  # backwards compatibility
-            obj = {key: val for key, val in d.items() if key not in ['_module', '_class']}
-        fs = registry_class(obj, d, net, pp_hook)
-        fs.class_name = d.pop('_class', '')
-        fs.module_name = d.pop('_module', '')
-        return fs.from_serializable()
-    else:
+            return d
+    except TypeError:
+        logger.debug('Loading your grid raised a TypeError. %s raised this exception' % d)
         return d
 
 

pandapower/test/api/test_file_io.py

@@ -16,6 +16,7 @@
 import pandapower.control as control
 import pandapower.networks as networks
 import pandapower.topology as topology
+from pandapower import pp_dir
 from pandapower.io_utils import PPJSONEncoder, PPJSONDecoder
 from pandapower.test.toolbox import assert_net_equal, create_test_network
 from pandapower.timeseries import DFData
@@ -68,6 +69,13 @@ def test_json_basic(net_in, tmp_path):
     assert_net_equal(net_in, net_out)
 
 
+def test_json_controller_none():
+    try:
+        pp.from_json(os.path.join(pp_dir, 'test', 'test_files', 'controller_containing_NoneNan.json'), convert=False)
+    except:
+        raise (UserWarning("empty net with controller containing Nan/None can't be loaded"))
+
+
 def test_json(net_in, tmp_path):
     filename = os.path.join(os.path.abspath(str(tmp_path)), "testfile.json")
     try: