Merge branch 'main' into release/2.4

Author: Jintao-Huang

docs/source/Instruction/命令行参数.md

@@ -437,6 +437,6 @@ deploy参数继承了infer参数, 除此之外增加了以下参数:
 ## web-ui 参数
 
 - `--🔥host`: 默认为`'127.0.0.1'`. 要使其在非本机上可访问, 可设置为'0.0.0.0'.
-- `--port`: 默认为`None`.
+- `--port`: 默认为`7860`.
 - `--lang`: 默认为`'zh'`.
 - `--share`: 默认为`False`.

docs/source_en/Instruction/Command-line-parameters.md

@@ -437,6 +437,6 @@ deploy parameters inherit from infer parameters, with the following added parame
 ## web-ui Parameters
 
 - `--🔥host`: Default `'127.0.0.1'`. To make it accessible on the local network, you can set it to '0.0.0.0'.
-- `--port`: Default `None`.
+- `--port`: Default `7860`.
 - `--lang`: Default `'zh'`.
 - `--share`: Default `False`.

swift/llm/utils/argument.py

@@ -1799,7 +1799,7 @@ class WebuiArguments:
     share: bool = False
     lang: str = 'zh'
     host: str = '127.0.0.1'
-    port: Optional[int] = None
+    port: int = 7860
 
 
 @dataclass

swift/utils/run_utils.py

@@ -28,7 +28,7 @@ def x_main(argv: Union[List[str], _TArgsClass, NoneType] = None, **kwargs) -> _T
         from swift.llm import AppUIArguments, WebuiArguments
         if (isinstance(args, (AppUIArguments, WebuiArguments)) and 'JUPYTER_NAME' in os.environ
                 and 'dsw-' in os.environ['JUPYTER_NAME'] and 'GRADIO_ROOT_PATH' not in os.environ):
-            os.environ['GRADIO_ROOT_PATH'] = f"/{os.environ['JUPYTER_NAME']}/proxy/7860"
+            os.environ['GRADIO_ROOT_PATH'] = f"/{os.environ['JUPYTER_NAME']}/proxy/{args.port}"
         result = llm_x(args, **kwargs)
         logger.info(f'End time of running main: {datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")}')
         return result