Fix Model.load fail if model_params is str (#2805)

allennlp/models/model.py

@@ -319,7 +319,7 @@ def load(cls,
         """
 
         # Peak at the class of the model.
-        model_type = config["model"]["type"]
+        model_type = config["model"] if isinstance(config["model"], str) else config["model"]["type"]
 
         # Load using an overridable _load method.
         # This allows subclasses of Model to override _load.
@@ -354,9 +354,10 @@ def extend_embedder_vocab(self, embedding_sources_mapping: Dict[str, str] = None
                                     model_path=model_path)
 
 def remove_pretrained_embedding_params(params: Params):
-    keys = params.keys()
-    if 'pretrained_file' in keys:
-        del params['pretrained_file']
-    for value in params.values():
-        if isinstance(value, Params):
-            remove_pretrained_embedding_params(value)
+    if isinstance(params, Params):  # The model could possible be a string, for example.
+        keys = params.keys()
+        if 'pretrained_file' in keys:
+            del params['pretrained_file']
+        for value in params.values():
+            if isinstance(value, Params):
+                remove_pretrained_embedding_params(value)