Skip to content

Re-use single session instead of opening many connections #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugovk wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Re-use single session instead of opening many connections #390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7601b46
Re-use single session instead of opening many connections
hugovk May 11, 2026
ce78dc7
More f-strings
hugovk May 25, 2026
011195e
And some more f-strings
hugovk May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions add_to_pydotorg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ def run_cmd(

tag_cre = re.compile(r"(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:([ab]|rc)(\d+))?$")

headers = {"Authorization": f"ApiKey {auth_info}", "Content-Type": "application/json"}
session = requests.Session()
session.headers.update(
{"Authorization": f"ApiKey {auth_info}", "Content-Type": "application/json"}
)

github_oidc_provider = "https://github.com/login/oauth"
google_oidc_provider = "https://accounts.google.com"
Expand Down Expand Up @@ -173,7 +176,7 @@ def slug_for(release: str) -> str:


def sigfile_for(release: str, rfile: str) -> str:
return download_root + f"{release}/{rfile}.asc"
return f"{download_root}{release}/{rfile}.asc"


def sha256sum_for(filename: str) -> str:
Expand Down Expand Up @@ -232,7 +235,7 @@ def build_file_dict(
"release": f"/api/v1/downloads/release/{rel_pk}/",
"description": add_desc,
"is_source": os_pk == 3,
"url": download_root + f"{base_version(release)}/{rfile}",
"url": f"{download_root}{base_version(release)}/{rfile}",
"sha256_sum": sha256sum_for(filename),
"filesize": filesize_for(filename),
"download_button": add_download,
Expand All @@ -243,20 +246,20 @@ def build_file_dict(
# Upload Sigstore signature
if os.path.exists(filename + ".sig"):
d["sigstore_signature_file"] = (
download_root + f"{base_version(release)}/{rfile}.sig"
f"{download_root}{base_version(release)}/{rfile}.sig"
)
# Upload Sigstore certificate
if os.path.exists(filename + ".crt"):
d["sigstore_cert_file"] = download_root + f"{base_version(release)}/{rfile}.crt"
d["sigstore_cert_file"] = f"{download_root}{base_version(release)}/{rfile}.crt"
# Upload Sigstore bundle
if os.path.exists(filename + ".sigstore"):
d["sigstore_bundle_file"] = (
download_root + f"{base_version(release)}/{rfile}.sigstore"
f"{download_root}{base_version(release)}/{rfile}.sigstore"
)
# Upload SPDX SBOM file
if os.path.exists(filename + ".spdx.json"):
d["sbom_spdx2_file"] = (
download_root + f"{base_version(release)}/{rfile}.spdx.json"
f"{download_root}{base_version(release)}/{rfile}.spdx.json"
)

return d
Expand Down Expand Up @@ -295,9 +298,9 @@ def list_files(

def query_object(base_url: str, objtype: str, **params: Any) -> int:
"""Find an API object by query parameters."""
uri = base_url + f"downloads/{objtype}/"
uri = f"{base_url}downloads/{objtype}/"
uri += "?" + "&".join(f"{k}={v}" for k, v in params.items())
resp = requests.get(uri, headers=headers)
resp = session.get(uri)
if resp.status_code != 200 or not json.loads(resp.text)["objects"]:
raise RuntimeError(f"no object for {objtype} params={params!r}")
obj = json.loads(resp.text)["objects"][0]
Expand All @@ -306,11 +309,7 @@ def query_object(base_url: str, objtype: str, **params: Any) -> int:

def post_object(base_url: str, objtype: str, datadict: dict[str, Any]) -> int:
"""Create a new API object."""
resp = requests.post(
base_url + "downloads/" + objtype + "/",
data=json.dumps(datadict),
headers=headers,
)
resp = session.post(f"{base_url}downloads/{objtype}/", data=json.dumps(datadict))
if resp.status_code != 201:
try:
info = json.loads(resp.text)
Expand All @@ -329,7 +328,7 @@ def sign_release_files_with_sigstore(
ftp_root: str, release: str, release_files: list[tuple[str, str, str, bool, str]]
) -> None:
filenames = [
ftp_root + f"{base_version(release)}/{rfile}" for rfile, *_ in release_files
f"{ftp_root}{base_version(release)}/{rfile}" for rfile, *_ in release_files
]

def has_sigstore_signature(filename: str) -> bool:
Expand Down Expand Up @@ -472,9 +471,7 @@ def main() -> None:
raise RuntimeError(f"duplicate slug generated: {key}")
file_dicts[key] = file_dict
print("Deleting previous release files")
resp = requests.delete(
args.base_url + f"downloads/release_file/?release={rel_pk}", headers=headers
)
resp = session.delete(f"{args.base_url}downloads/release_file/?release={rel_pk}")
if resp.status_code != 204:
raise RuntimeError(f"deleting previous releases failed: {resp.status_code}")
for file_dict in file_dicts.values():
Expand Down
Loading