From 8c3f7d58c6c94234dfb7871b1cfc65804ae8cf7c Mon Sep 17 00:00:00 2001
From: LiuXL <liuxl_l@qq.com>
Date: Wed, 6 Nov 2024 16:55:37 +0800
Subject: [PATCH 1/2] Default model revision could be "master" when use
 ModelScope.

---
 fastchat/model/model_adapter.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fastchat/model/model_adapter.py b/fastchat/model/model_adapter.py
index 9625df6db..44efa04cc 100644
--- a/fastchat/model/model_adapter.py
+++ b/fastchat/model/model_adapter.py
@@ -360,9 +360,17 @@ def load_model(
         # lazy import so that modelscope is not required for normal use.
         try:
             from modelscope.hub.snapshot_download import snapshot_download
+            from modelscope.hub.errors import NotExistError
 
             if not os.path.exists(model_path):
-                model_path = snapshot_download(model_id=model_path, revision=revision)
+                try:
+                    model_path = snapshot_download(model_id=model_path, revision=revision)
+                except NotExistError as e:
+                    # Default model revision could be "master" when use ModelScope.
+                    if revision == "main":
+                        revision = "master"
+                        kwargs["revision"] = revision
+                    model_path = snapshot_download(model_id=model_path, revision=revision)
         except ImportError as e:
             warnings.warn(
                 "Use model from www.modelscope.cn need pip install modelscope"

From ec8039411c9f79300a0e93590d0a138c2f4f87be Mon Sep 17 00:00:00 2001
From: LiuXL <liuxl_l@qq.com>
Date: Wed, 6 Nov 2024 17:10:47 +0800
Subject: [PATCH 2/2] format.sh model_adapter.py

---
 fastchat/model/model_adapter.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fastchat/model/model_adapter.py b/fastchat/model/model_adapter.py
index 44efa04cc..e773d5c80 100644
--- a/fastchat/model/model_adapter.py
+++ b/fastchat/model/model_adapter.py
@@ -364,13 +364,17 @@ def load_model(
 
             if not os.path.exists(model_path):
                 try:
-                    model_path = snapshot_download(model_id=model_path, revision=revision)
+                    model_path = snapshot_download(
+                        model_id=model_path, revision=revision
+                    )
                 except NotExistError as e:
                     # Default model revision could be "master" when use ModelScope.
                     if revision == "main":
                         revision = "master"
                         kwargs["revision"] = revision
-                    model_path = snapshot_download(model_id=model_path, revision=revision)
+                    model_path = snapshot_download(
+                        model_id=model_path, revision=revision
+                    )
         except ImportError as e:
             warnings.warn(
                 "Use model from www.modelscope.cn need pip install modelscope"