Features/resume default v2 (#463)

YangSen-qn · YangSen-qn · web-flow · commit 44f31b0bb651 · 2025-07-11T15:21:31.000+08:00
* resume up api version default to v2

* version to 7.17.0

* ci: platform ubuntu-20.04 -&gt; ubuntu-22.04

* ci: windows-2019 -&gt; windows-2022

---------

Co-authored-by: YangSen-qn &lt;yangsen@qiniu.com&gt;
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -7,7 +7,7 @@ jobs:
       max-parallel: 1
       matrix:
         python_version: ['2.7', '3.4', '3.5', '3.6', '3.7', '3.8', '3.9']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -84,7 +84,7 @@ jobs:
       max-parallel: 1
       matrix:
         python_version: ['2.7', '3.5', '3.9']
-    runs-on: windows-2019
+    runs-on: windows-2022
     # make sure only one test running,
     # remove this when cases could run in parallel.
     needs: test
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 
 *.py[cod]
 
+tests/cases/env
 my-test-env.sh
 
 ##
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## 7.17.0
+* 对象存储，分片上传默认使用 V2 接口
+
 ## 7.16.0
 * 对象存储，优化并发场景的区域查询
 * CDN，查询域名带宽，支持 `data_type` 参数
diff --git a/examples/upload.py b/examples/upload.py
@@ -2,7 +2,7 @@
 # flake8: noqa
 # import hashlib
 
-from qiniu import Auth, put_file, urlsafe_base64_encode
+from qiniu import Auth, put_file_v2, urlsafe_base64_encode
 import qiniu.config
 from qiniu.compat import is_py2, is_py3
 
@@ -37,7 +37,7 @@
 #     'x-qn-meta-md5': hasher.hexdigest()
 # }
 
-ret, info = put_file(
+ret, info = put_file_v2(
     token,
     key,
     localfile
diff --git a/examples/upload_callback.py b/examples/upload_callback.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file
+from qiniu import Auth, put_file_v2
 
 access_key = '...'
 secret_key = '...'
@@ -22,6 +22,6 @@
 
 localfile = './sync/bbb.jpg'
 
-ret, info = put_file(token, key, localfile)
+ret, info = put_file_v2(token, key, localfile)
 print(info)
 assert ret['key'] == key
diff --git a/examples/upload_pfops.py b/examples/upload_pfops.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from qiniu import Auth, put_file, urlsafe_base64_encode
+from qiniu import Auth, urlsafe_base64_encode, put_file_v2
 
 access_key = '...'
 secret_key = '...'
@@ -33,6 +33,6 @@
 
 localfile = './python_video.flv'
 
-ret, info = put_file(token, key, localfile)
+ret, info = put_file_v2(token, key, localfile)
 print(info)
 assert ret['key'] == key
diff --git a/examples/upload_with_qvmzone.py b/examples/upload_with_qvmzone.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file, urlsafe_base64_encode
+from qiniu import Auth, put_file_v2
 import qiniu.config
 from qiniu import Zone, set_default
 
@@ -34,6 +34,6 @@
     scheme='http')
 set_default(default_zone=zone)
 
-ret, info = put_file(token, key, localfile)
+ret, info = put_file_v2(token, key, localfile)
 print(info)
 assert ret['key'] == key
diff --git a/examples/upload_with_zone.py b/examples/upload_with_zone.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file
+from qiniu import Auth, put_file_v2
 from qiniu import Zone, set_default
 
 # 需要填写你的 Access Key 和 Secret Key
@@ -38,5 +38,5 @@
     scheme='https')
 set_default(default_zone=zone)
 
-ret, info = put_file(token, key, localfile)
+ret, info = put_file_v2(token, key, localfile)
 print(info)
diff --git a/qiniu/__init__.py b/qiniu/__init__.py
@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.16.0'
+__version__ = '7.17.0'
 
 from .auth import Auth, QiniuMacAuth
 
@@ -19,7 +19,7 @@
 
 from .services.storage.bucket import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, \
     build_batch_stat, build_batch_delete, build_batch_restoreAr, build_batch_restore_ar
-from .services.storage.uploader import put_data, put_file, put_stream
+from .services.storage.uploader import put_data, put_file, put_file_v2, put_stream, put_stream_v2
 from .services.storage.upload_progress_recorder import UploadProgressRecorder
 from .services.cdn.manager import CdnManager, DataType, create_timestamp_anti_leech_url, DomainManager
 from .services.processing.pfop import PersistentFop
diff --git a/qiniu/http/regions_provider.py b/qiniu/http/regions_provider.py
@@ -161,7 +161,6 @@ def __init__(self, fd):
 
     def __enter__(self):
         with _file_threading_lockers_lock:
-            global _file_threading_lockers
             threading_lock = _file_threading_lockers.get(self._file_path, threading.Lock())
             # Could use keyword style `acquire(blocking=False)` when min version of python update to >= 3
             if not threading_lock.acquire(False):
@@ -170,7 +169,6 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         with _file_threading_lockers_lock:
-            global _file_threading_lockers
             threading_lock = _file_threading_lockers.get(self._file_path)
             if threading_lock and threading_lock.locked():
                 threading_lock.release()
diff --git a/qiniu/services/storage/legacy.py b/qiniu/services/storage/legacy.py
@@ -6,11 +6,12 @@
 from qiniu import config, http
 from qiniu.auth import Auth
 from qiniu.compat import json
-from qiniu.utils import _file_iter, crc32, rfc_from_timestamp, urlsafe_base64_encode
+from qiniu.utils import _file_iter, crc32, rfc_from_timestamp, urlsafe_base64_encode, deprecated
 
 from qiniu.services.storage.upload_progress_recorder import UploadProgressRecorder
 
 
+@deprecated("use uploader instead")
 class _Resume(object):
     """deprecated 断点续上传类
 
@@ -85,7 +86,7 @@ def recovery_from_record(self):
                 return 0, None, None
         try:
             if not record['modify_time'] or record['size'] != self.size or \
-                   record['modify_time'] != self.modify_time:
+                    record['modify_time'] != self.modify_time:
                 if self.version == 'v1':
                     return 0
                 elif self.version == 'v2':
@@ -106,8 +107,8 @@ def recovery_from_record(self):
             return record['offset']
         elif self.version == 'v2':
             if not record.__contains__('etags') or len(record['etags']) == 0 or \
-               not record.__contains__('expired_at') or float(record['expired_at']) < time.time() or \
-               not record.__contains__('upload_id'):
+                    not record.__contains__('expired_at') or float(record['expired_at']) < time.time() or \
+                    not record.__contains__('upload_id'):
                 return 0, None, None
             self.blockStatus = record['etags']
             return record['offset'], record['upload_id'], record['expired_at']
@@ -178,7 +179,7 @@ def _upload_v2(self):
         offset, self.uploadId, self.expiredAt = self.recovery_from_record()
         is_resumed = False
         if offset > 0 and self.blockStatus != [] and self.uploadId is not None \
-           and self.expiredAt is not None:
+                and self.expiredAt is not None:
             self.recovery_index = self.blockStatus[-1]['partNumber'] + 1
             is_resumed = True
         else:
@@ -201,7 +202,7 @@ def _upload_v2(self):
                 if config.get_default('default_zone').up_host_backup:
                     host = config.get_default('default_zone').up_host_backup
                 else:
-                    host = config.get_default('default_zone')\
+                    host = config.get_default('default_zone') \
                         .get_up_host_backup_by_token(self.up_token, self.hostscache_dir)
 
             if info.need_retry():
diff --git a/qiniu/services/storage/uploader.py b/qiniu/services/storage/uploader.py
diff --git a/qiniu/utils.py b/qiniu/utils.py
diff --git a/tests/cases/test_http/conftest.py b/tests/cases/test_http/conftest.py
diff --git a/tests/cases/test_services/test_storage/test_uploader.py b/tests/cases/test_services/test_storage/test_uploader.py
diff --git a/tests/mock_server/main.py b/tests/mock_server/main.py
