studio/blender-studio-tools
13
32
Fork 19
Code Issues 21 Pull Requests 4 Projects Releases 1 Activity

WIP: Project Tools: Remove Requests Module from studio scripts #279

Closed
Nick Alberelli wants to merge 4 commits from TinyNick/blender-studio-pipeline:fix/remove-request-from-update-addons into main
pull from: TinyNick/blender-studio-pipeline:fix/remove-request-from-update-addons
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 4 Files Changed 3 +50 -48
1 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57bb7a44d4 - Show all commits

98
scripts/pipeline-release/pipeline_release.py
View File

@ -4,15 +4,15 @@ import os
from pathlib import Path from pathlib import Path
import shutil import shutil
import hashlib import hashlib
import subprocess
import tempfile import tempfile
import sys import sys
import requests from urllib.request import Request, urlopen
from urllib.error import HTTPError
from http.client import HTTPResponse
import json import json
from requests import Response
BASE_PATH = "https://projects.blender.org/api/v1" BASE_PATH = "https://projects.blender.org/api/v1"
REPO_PATH = '/studio/blender-studio-pipeline' REPO_PATH = '/TinyNick/blender-studio-pipeline'
RELEASE_PATH = BASE_PATH + f'/repos{REPO_PATH}/releases' RELEASE_PATH = BASE_PATH + f'/repos{REPO_PATH}/releases'
TAG_PATH = BASE_PATH + f'/repos{REPO_PATH}/tags' TAG_PATH = BASE_PATH + f'/repos{REPO_PATH}/tags'
API_TOKEN = None API_TOKEN = None
@ -46,7 +46,7 @@ def remove_existing_release_assets(release_id: int) -> None:
None None
""" """
all_assets = send_get_request(RELEASE_PATH + f"/{release_id}/assets").json() all_assets = send_get_request(RELEASE_PATH + f"/{release_id}/assets")
for asset in all_assets: for asset in all_assets:
if asset["name"] == ZIP_NAME + ".zip" or asset["name"] == ZIP_NAME + ".zip.sha256": if asset["name"] == ZIP_NAME + ".zip" or asset["name"] == ZIP_NAME + ".zip.sha256":
send_delete_request(RELEASE_PATH + f"/{release_id}/assets/{asset['id']}") send_delete_request(RELEASE_PATH + f"/{release_id}/assets/{asset['id']}")
@ -64,23 +64,29 @@ def upload_asset_to_release(release_id: int, file: str) -> None:
None None
""" """
file_name = Path(file.name).name file_name = Path(file).name
payload = open(file, 'rb') zip_file = open(file, 'rb')
file_content = [ zip_data = zip_file.read()
('attachment', (file_name, payload, 'application/zip')),
] url = f"{RELEASE_PATH}/{release_id}/assets?name={file_name}&token={API_TOKEN}"
req = Request(url, data=zip_data)
print(f"Uploading '{file_name}'......", end="") print(f"Uploading '{file_name}'......", end="")
response = requests.post( # TODO DEBUG WHY THIS RETURNS 500 ERROR
url=f"{RELEASE_PATH}/{release_id}/assets?name={file_name}&token={API_TOKEN}", with urlopen(req) as response:
files=file_content, response_data = json.loads(response.read().decode("utf-8"))
) print(response, response_data)
response.raise_for_status() # response = requests.post(
# url=f"{RELEASE_PATH}/{release_id}/assets?name={file_name}&token={API_TOKEN}",
# files=file_content,
# )
# response.raise_for_status()
if not response.status_code == 201: # if not response.status_code == 201:
print(f"Failed to upload.") # print(f"Failed to upload.")
else: # else:
print(f"Completed") # print(f"Completed")
def get_release() -> dict: def get_release() -> dict:
@ -94,7 +100,7 @@ def get_release() -> dict:
""" """
# Remove Previous Release so Release is always based on Current Commit # Remove Previous Release so Release is always based on Current Commit
for release in send_get_request(RELEASE_PATH).json(): for release in send_get_request(RELEASE_PATH):
if release["name"] == RELEASE_TITLE and release["tag_name"] == RELEASE_VERSION: if release["name"] == RELEASE_TITLE and release["tag_name"] == RELEASE_VERSION:
send_delete_request(RELEASE_PATH + f"/{release['id']}") send_delete_request(RELEASE_PATH + f"/{release['id']}")
send_delete_request(TAG_PATH + f"/{release['tag_name']}") send_delete_request(TAG_PATH + f"/{release['tag_name']}")
@ -114,7 +120,7 @@ def create_new_release() -> dict:
""" """
# Create New Tag # Create New Tag
existing_tag = send_get_request(TAG_PATH + f'/{RELEASE_VERSION}') existing_tag = send_get_request(TAG_PATH + f'/{RELEASE_VERSION}')
if existing_tag.status_code == 404: if not existing_tag:
tag_content = { tag_content = {
"message": RELEASE_DESCRIPTION, "message": RELEASE_DESCRIPTION,
"tag_name": RELEASE_VERSION, "tag_name": RELEASE_VERSION,
@ -133,7 +139,7 @@ def create_new_release() -> dict:
"target_commitish": "string", # will default to latest "target_commitish": "string", # will default to latest
} }
return send_post_request(RELEASE_PATH, release_content).json() return send_post_request(RELEASE_PATH, release_content)
def get_api_token() -> None: def get_api_token() -> None:
@ -150,10 +156,10 @@ def get_api_token() -> None:
sys.exit(1) sys.exit(1)
API_TOKEN = open(api_token_file, 'r').read() API_TOKEN = open(api_token_file, 'r').read()
# Don't use send_get_request() so we can print custom error message to user # Don't use send_get_request() so we can print custom error message to user
response = requests.get(url=f"{BASE_PATH}/settings/api?token={API_TOKEN}") response_data = urlopen(url=f"{BASE_PATH}/settings/api?token={API_TOKEN}")
if response.status_code != 200: if response_data.status != 200:
print("API Token is invalid") print("API Token is invalid")
print(f"Error: {response.status_code}: '{response.reason}'") print(f"Error: {response_data.status}: '{response_data.msg}'")
sys.exit(1) sys.exit(1)
@ -217,36 +223,32 @@ def generate_checksum(archive_path: Path) -> str:
return digest.hexdigest() return digest.hexdigest()
def send_delete_request(url) -> Response: def send_delete_request(url) -> HTTPResponse:
response = requests.delete(url=f"{url}?token={API_TOKEN}") response = urlopen(Request(url=f"{url}?token={API_TOKEN}", method="DELETE"))
if response.status_code != 204: if response.status != 204:
print(f"Error: {response.status_code}: '{response.reason}'") print(f"Error: {response.status}: '{response.msg}'")
sys.exit(1) sys.exit(1)
return response return response
def send_get_request(url: str) -> Response: def send_get_request(url: str):
response = requests.get(url=f"{url}?token={API_TOKEN}") try:
if not (response.status_code == 200 or response.status_code == 404): response = urlopen(f"{url}?token={API_TOKEN}")
print(f"Error: {response.status_code}: '{response.reason}'") except HTTPError as e:
if e.code == 404:
return
print(f"Error: {e.code}: '{e.reason}'")
sys.exit(1) sys.exit(1)
return response return json.loads(response.read().decode("utf-8"))
def send_post_request(url: str, data: dict) -> Response: def send_post_request(url: str, data: dict):
header_cont = { data = json.dumps(data)
'Content-type': 'application/json', req = Request(url=f"{url}?token={API_TOKEN}", data=bytes(data.encode("utf-8")), method="POST")
} req.add_header("Content-type", "application/json; charset=UTF-8")
response = requests.post( resp = urlopen(req)
url=f"{url}?token={API_TOKEN}", response_data = json.loads(resp.read().decode("utf-8"))
headers=header_cont, return response_data
data=json.dumps(data),
)
response_json = response.json()
if response.status_code != 201:
print(response_json["message"])
sys.exit(1)
return response
if __name__ == "__main__": if __name__ == "__main__":