Mirrors/modelscope
1
0
Fork 0
mirror of https://github.com/modelscope/modelscope.git synced 2026-02-24 12:10:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

ok Merge branch 'master' of github.com:modelscope/modelscope into release/1.30

Browse Source
This commit is contained in:
wangxingjun778
2025-09-11 15:16:38 +08:00
parent 6d0ec7b8fc 593701e207
commit 2dda3a2553
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modelscope/hub/api.py
View File

@@ -284,7 +284,7 @@ class HubApi:
# Use AIGC model endpoint
path = f'{endpoint}/api/v1/models/aigc'
# Best-effort pre-upload weights so server recognizes sha256 (use existing cookies)
aigc_model.preupload_weights(cookies=cookies, headers=self.builder_headers(self.headers))
aigc_model.preupload_weights(cookies=cookies, headers=self.builder_headers(self.headers), endpoint=endpoint)
# Add AIGC-specific fields to body
body.update({
@@ -374,7 +374,7 @@ class HubApi:
if aigc_model is not None:
# Use AIGC model tag endpoint
path = f'{endpoint}/api/v1/models/aigc/repo/tag'
aigc_model.preupload_weights(cookies=cookies, headers=self.builder_headers(self.headers))
aigc_model.preupload_weights(cookies=cookies, headers=self.builder_headers(self.headers), endpoint=endpoint)
# Base body for AIGC model tag
body = {

15
modelscope/hub/utils/aigc.py
View File

@@ -2,12 +2,13 @@
import glob
import os
from typing import List, Optional
from urllib.parse import urlparse
import requests
from tqdm.auto import tqdm
from modelscope.hub.utils.utils import (MODELSCOPE_URL_SCHEME,
encode_image_to_base64, get_domain)
encode_image_to_base64, get_endpoint)
from modelscope.utils.logger import get_logger
logger = get_logger()
@@ -269,7 +270,8 @@ class AigcModel:
*,
cookies: Optional[object] = None,
timeout: int = 300,
headers: Optional[dict] = None) -> None:
headers: Optional[dict] = None,
endpoint: Optional[str] = None) -> None:
"""Pre-upload aigc model weights to the LFS server.
Server may require the sha256 of weights to be registered before creation.
@@ -280,9 +282,12 @@ class AigcModel:
timeout: Request timeout seconds.
headers: Optional headers.
"""
domain: str = get_domain()
base_url: str = f'{MODELSCOPE_URL_SCHEME}lfs.{domain.lstrip("www.")}'
url: str = f'{base_url}/api/v1/models/aigc/weights'
endpoint = endpoint or get_endpoint()
endpoint_host: str = urlparse(endpoint.strip()).hostname.lstrip('www.')
# https://lfs.modelscope.cn or https://pre-lfs.modelscope.cn
url: str = f'{MODELSCOPE_URL_SCHEME}lfs.{endpoint_host}' if not endpoint_host.startswith('pre') \
else f'{MODELSCOPE_URL_SCHEME}pre-lfs.{endpoint_host.lstrip("pre.")}'
file_path = getattr(self, 'target_file', None) or self.model_path
file_path = os.path.abspath(os.path.expanduser(file_path))