update cli

AllentDan · Feb 22, 2024 · ce486c5 · ce486c5
1 parent 00a4972
commit ce486c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lmdeploy/cli/serve.py b/lmdeploy/cli/serve.py
@@ -206,8 +206,10 @@ def gradio(args):
                 quant_policy=args.quant_policy,
                 rope_scaling_factor=args.rope_scaling_factor,
                 cache_max_entry_count=args.cache_max_entry_count)
-        chat_template_config = ChatTemplateConfig(
-            model_name=args.model_name).from_json(args.chat_template)
+        chat_template_config = ChatTemplateConfig(model_name=args.model_name)
+        if args.chat_template:
+            chat_template_config = ChatTemplateConfig.from_json(
+                args.chat_template)
         run(args.model_path_or_server,
             server_name=args.server_name,
             server_port=args.server_port,
@@ -238,8 +240,7 @@ def api_server(args):
                 quant_policy=args.quant_policy,
                 rope_scaling_factor=args.rope_scaling_factor,
                 cache_max_entry_count=args.cache_max_entry_count)
-        chat_template_config = ChatTemplateConfig(
-            model_name=args.model_name).from_json(args.chat_template)
+        chat_template_config = ChatTemplateConfig(model_name=args.model_name)
         run_api_server(args.model_path,
                        backend=args.backend,
                        backend_config=backend_config,

diff --git a/lmdeploy/model.py b/lmdeploy/model.py
@@ -68,10 +68,8 @@ def to_json(self, file_path=None):
         return json_str
 
     @classmethod
-    def from_json(cls, file_or_string=None):
+    def from_json(cls, file_or_string):
         """Construct a dataclass instance from a JSON file or JSON string."""
-        if file_or_string is None:
-            return cls
         try:
             # Try to open the input_data as a file path
             with open(file_or_string, 'r', encoding='utf-8') as file: