update

toolbox/bilibili/video/video_manager.py

@@ -67,8 +67,8 @@ class BilibiliVideoUploader20200810(BilibiliClient):
         stop=stop_after_attempt(3),
         before_sleep=before_sleep_log(logger, logging.ERROR),
     )
-    def get_upload_video_id(self, upos_uri, auth, **kwargs):
-        url = f"https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}?uploads&output=json"
+    def get_upload_video_id(self, endpoint, upos_uri, auth, **kwargs):
+        url = f"https:{endpoint}/{upos_uri}?uploads&output=json"
         response = requests.request(
             method="POST",
             url=url,
@@ -87,18 +87,7 @@ class BilibiliVideoUploader20200810(BilibiliClient):
         return js
 
     def upload_video_in_chunks(self, endpoint, upos_uri, auth, upload_id, fileio, filesize, chunk_size, chunks):
-        """
-        Upload the video in chunks.
-        :param upos_uri: str, get from `pre_upload`
-        :param auth: str, get from `pre_upload`
-        :param upload_id: str, get from `get_upload_video_id`
-        :param fileio: io.BufferedReader, the io stream of the video to be uploaded
-        :param filesize: int, the size of the video to be uploaded
-        :param chunk_size: int, the size of each chunk to be uploaded
-        :param chunks: int, the number of chunks to be uploaded
-        :return:
-        """
-        url = f"https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}"
+        url = f"https:{endpoint}/{upos_uri}"
         params = {
             "partNumber": None,  # start from 1
             "uploadId":	upload_id,
@@ -110,7 +99,7 @@ class BilibiliVideoUploader20200810(BilibiliClient):
             "total": filesize,
         }
 
-        process_bar = tqdm(desc="bilibili_upload_video", total=chunks)
+        process_bar = tqdm(desc=f"bilibili_upload_video({endpoint})", total=chunks)
         for chunknum in range(chunks):
             start = fileio.tell()
             batchbytes = fileio.read(chunk_size)
@@ -139,8 +128,8 @@ class BilibiliVideoUploader20200810(BilibiliClient):
         stop=stop_after_attempt(3),
         before_sleep=before_sleep_log(logger, logging.ERROR),
     )
-    def finish_upload(self, upos_uri, auth, filename, upload_id, biz_id, chunks):
-        url = f"https://upos-sz-upcdnbda2.bilivideo.com/{upos_uri}"
+    def finish_upload(self, endpoint, upos_uri, auth, filename, upload_id, biz_id, chunks):
+        url = f"https:{endpoint}/{upos_uri}"
         params = {
             "output": "json",
             "name":	filename,
@@ -178,13 +167,6 @@ class BilibiliVideoUploader20200810(BilibiliClient):
         before_sleep=before_sleep_log(logger, logging.ERROR),
     )
     def publish_video(self, bilibili_filename, metadata: dict):
-        """
-        publish the uploaded video
-        https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/creativecenter/upload.md
-        :param bilibili_filename:
-        :param metadata:
-        :return:
-        """
         url = f'https://member.bilibili.com/x/vu/web/add?csrf={self.cookies["bili_jct"]}'
 
         data = {
@@ -233,20 +215,25 @@ class BilibiliVideoUploader20200810(BilibiliClient):
         filesize = filename.stat().st_size
 
         js = self.pre_upload(filename=filename, filesize=filesize)
+        endpoint = js["endpoint"]
         upos_uri = js["upos_uri"].split("//")[-1]
         auth = js["auth"]
         biz_id = js["biz_id"]
         chunk_size = js["chunk_size"]
         chunks = math.ceil(filesize / chunk_size)
 
-        upload_video_id_response = self.get_upload_video_id(upos_uri=upos_uri, auth=auth)
+        upload_video_id_response = self.get_upload_video_id(
+            endpoint=endpoint,
+            upos_uri=upos_uri,
+            auth=auth,
+        )
         upload_id = upload_video_id_response["upload_id"]
         key = upload_video_id_response["key"]
 
         bilibili_filename = re.search(r"/(.*)\.", key).group(1)
         fileio = filename.open(mode="rb")
         self.upload_video_in_chunks(
-            endpoint="",
+            endpoint=endpoint,
             upos_uri=upos_uri,
             auth=auth,
             upload_id=upload_id,
@@ -259,14 +246,15 @@ class BilibiliVideoUploader20200810(BilibiliClient):
 
         # notify the all chunks have been uploaded
         self.finish_upload(
+            endpoint=endpoint,
             upos_uri=upos_uri, auth=auth, filename=filename,
             upload_id=upload_id, biz_id=biz_id, chunks=chunks
         )
-
-        return biz_id, bilibili_filename
+        return biz_id, upload_id, bilibili_filename
 
     def upload_video_and_publish(self, filename: str, metadata: dict):
-        _, bilibili_filename = self.upload_video_file(filename)
+        _, upload_id, bilibili_filename = self.upload_video_file(filename)
+        logger.info(f"finish uploading, upload_id: {upload_id}, bilibili_filename: {bilibili_filename}, filename: {filename}")
         publish_video_response = self.publish_video(bilibili_filename=bilibili_filename, metadata=metadata)
 
         bvid = None
@@ -283,38 +271,6 @@ class BilibiliVideoUploader20200810(BilibiliClient):
                 raise KeyError(f"publish_video failed; KeyError: {error}, publish_video_response: {publish_video_response}")
         return bvid
 
-    @retry(
-        wait=wait_fixed(10),
-        stop=stop_after_attempt(3),
-        before_sleep=before_sleep_log(logger, logging.ERROR),
-    )
-    def predict_tid(self, title: str, upload_id: str, bilibili_filename: str):
-        csrf = self.cookies["bili_jct"]
-        url = f"https://member.bilibili.com/x/vupre/web/archive/types/predict"
-        params = {
-            "csrf": csrf,
-        }
-        data = {
-            "title": title,
-            "upload_id": upload_id,
-            "filename": bilibili_filename,
-        }
-        response = requests.request(
-            method="POST",
-            url=url,
-            headers={
-                "TE": "Trailers",
-                **self.headers,
-            },
-            params=params,
-            json=data,
-            cookies=self.cookies,
-        )
-        if response.status_code != 200:
-            raise AssertionError(f"request failed; status_code: {response.status_code}, text: {response.text}")
-        js = response.json()
-        return js
-
 
 class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
     def __init__(self):
@@ -339,11 +295,6 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
             "build": "2140000",
             "size": filesize,
         }
-        # response = self.session.get(
-        #     url,
-        #     params=params,
-        #     headers={"TE": "Trailers"}
-        # )
         response = requests.request(
             # method="GET",
             method="POST",
@@ -368,7 +319,8 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
         stop=stop_after_attempt(3),
         before_sleep=before_sleep_log(logger, logging.ERROR),
     )
-    def get_upload_video_id(self, endpoint, upos_uri, auth,
+    def get_upload_video_id(self,
+                            endpoint, upos_uri, auth,
                             filesize, chunk_size, biz_id,
                             **kwargs
                             ):
@@ -377,7 +329,6 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
             "profile": "ugcfx/bup",
             "filesize": filesize,
             "partsize": chunk_size,
-            # "biz_id": biz_id,
         }
         response = requests.request(
             method="POST",
@@ -397,43 +348,6 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
             raise AssertionError(f"request failed;")
         return js
 
-    def upload_video_in_chunks(self, endpoint, upos_uri, auth, upload_id, fileio, filesize, chunk_size, chunks):
-        url = f"https:{endpoint}/{upos_uri}"
-
-        params = {
-            "partNumber": None,  # start from 1
-            "uploadId":	upload_id,
-            "chunk": None,  # start from 0
-            "chunks": chunks,
-            "size":	None,  # current batch size
-            "start": None,
-            "end":	None,
-            "total": filesize,
-        }
-        process_bar = tqdm(desc="bilibili_upload_video", total=chunks)
-        for chunknum in range(chunks):
-            start = fileio.tell()
-            batchbytes = fileio.read(chunk_size)
-            params["partNumber"] = chunknum + 1
-            params["chunk"] = chunknum
-            params["size"] = len(batchbytes)
-            params["start"] = start
-            params["end"] = fileio.tell()
-            response = requests.request(
-                method="OPTIONS",
-                url=url,
-                headers={
-                    "X-Upos-Auth": auth,
-                    **self.headers,
-                },
-                params=params,
-                data=batchbytes,
-                cookies=self.cookies,
-            )
-            if response.status_code != 200:
-                raise AssertionError(f"request failed; status_code: {response.status_code}, text: {response.text}")
-            process_bar.update(1)
-
     @retry(
         wait=wait_fixed(10),
         stop=stop_after_attempt(3),
@@ -449,14 +363,12 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
             "uploadId": upload_id,
             "biz_id": biz_id
         }
-        print(params)
         data = {
             "parts": [
                 {"partNumber": i+1, "eTag": "etag"}
                 for i in range(chunks)
             ]
         }
-        print(data)
         response = requests.request(
             method="POST",
             url=url,
@@ -481,14 +393,6 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
         before_sleep=before_sleep_log(logger, logging.ERROR),
     )
     def publish_video(self, bilibili_filename, metadata: dict):
-        """
-        publish the uploaded video
-
-        https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/creativecenter/upload.md
-        :param bilibili_filename:
-        :param metadata:
-        :return:
-        """
         url = f'https://member.bilibili.com/x/vu/web/add?csrf={self.cookies["bili_jct"]}'
 
         data = {
@@ -569,7 +473,6 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
         )
         fileio.close()
 
-        # notify the all chunks have been uploaded
         self.finish_upload(
             endpoint=endpoint,
             upos_uri=upos_uri, auth=auth, filename=filename.name,
@@ -578,30 +481,9 @@ class BilibiliVideoUploader20221109(BilibiliVideoUploader20200810):
 
         return biz_id, upload_id, bilibili_filename
 
-    def upload_video_and_publish(self, filename: str, metadata: dict):
-        _, upload_id, bilibili_filename = self.upload_video_file(filename)
-        logger.info(f"finish uploading, upload_id: {upload_id}, bilibili_filename: {bilibili_filename}, filename: {filename}")
-        tid = self.predict_tid(
-            title=metadata["title"],
-            upload_id=upload_id,
-            bilibili_filename=bilibili_filename,
-        )
-        metadata["tid"] = tid
-        logger.info(f"predict tid, tid: {tid}, filename: {filename}")
-        publish_video_response = self.publish_video(bilibili_filename=bilibili_filename, metadata=metadata)
-
-        bvid = None
-        status_code = publish_video_response["code"]
-        if status_code == 137022:
-            message = publish_video_response["message"]
-            logger.info(f"publish_video failed; code: {status_code}, message: {message}")
-        else:
-            bvid = publish_video_response["data"]["bvid"]
-        return bvid
-
 
-BilibiliVideoUploader = BilibiliVideoUploader20200810
-# BilibiliVideoUploader = BilibiliVideoUploader20221109
+# BilibiliVideoUploader = BilibiliVideoUploader20200810
+BilibiliVideoUploader = BilibiliVideoUploader20221109
 
 
 def get_args():
@@ -613,7 +495,7 @@ def get_args():
     )
     parser.add_argument(
         "--filename",
-        default=(project_path / "data/tasks/chenjieshen_douyin_video_to_bilibili/video/douyin/陈杰森/7548332163859533083_20250910T170000_千万不要帮朋友担保！否则你可能背上一身债！.mp4").as_posix(),
+        default=(project_path / "data/tasks/chenjieshen_douyin_video_to_bilibili/video/douyin/陈杰森/754766069892763162520250908_101827首富黄光裕王者归来携国美杀入AI社交赛道 资本新秀陈杰森对话商业传奇二资本市场背后首富眼中的.mp4").as_posix(),
         type=str
     )
     args = parser.parse_args()