convert-*.py: hyperparameters takes precidence over folder name

Author: mofosyne

convert-hf-to-gguf.py

@@ -138,15 +138,15 @@ def get_model_name(metadata, hyperparameters, dir_model, model_arch):
             if metadata is not None and metadata.name is not None:
                 # Explicit Metadata Was Provided By User
                 return metadata.name
-            elif dir_model is not None and dir_model.name is not None:
-                # Use directory folder name
-                return dir_model.name
             elif hyperparameters is not None and "_name_or_path" in hyperparameters:
                 # Hugging Face Hyperparameter Model Name or Model Folder Name is Provided
                 return hyperparameters["_name_or_path"]
             elif hyperparameters is not None and "model_type" in hyperparameters:
                 # Hugging Face Hyperparameter Model Type is Provided
                 return hyperparameters["model_type"]
+            elif dir_model is not None and dir_model.name is not None:
+                # Use directory folder name
+                return dir_model.name
             else:
                 return gguf.MODEL_ARCH_NAMES[model_arch]
         self.model_name = get_model_name(self.metadata, self.hparams, self.dir_model, self.model_arch)