Skip to content
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.

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

Use urllib3 for HTTP requests #53

Merged
merged 6 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions build_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
import tomllib
from collections.abc import Iterator

from requests import Session
from urllib3 import PoolManager


def get_languages(requests: Session) -> Iterator[tuple[str, bool]]:
data = requests.get(
'https://raw.githubusercontent.com/'
'python/docsbuild-scripts/refs/heads/main/config.toml',
timeout=10,
).text
config = tomllib.loads(data)
def get_languages(http: PoolManager) -> Iterator[tuple[str, bool]]:
data = http.request(
'GET',
'https://raw.githubusercontent.com/python/docsbuild-scripts/refs/heads/main/config.toml',
).data
config = tomllib.loads(data.decode())
for code, language in config['languages'].items():
language_code = code.lower().replace('_', '-')
in_switcher = language.get('in_prod', config['defaults']['in_prod'])
Expand All @@ -26,7 +25,7 @@ def get_languages(requests: Session) -> Iterator[tuple[str, bool]]:

def main() -> None:
languages = {
language: in_switcher for language, in_switcher in get_languages(Session())
language: in_switcher for language, in_switcher in get_languages(PoolManager())
}
print(languages)
for code in ('en', 'pl', 'ar', 'zh-cn', 'id'):
Expand Down
11 changes: 6 additions & 5 deletions generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
# "docutils",
# ]
# ///
import logging
import subprocess
from collections.abc import Iterator
from dataclasses import dataclass
from datetime import datetime, timezone
from logging import info
from pathlib import Path
from tempfile import TemporaryDirectory

from requests import Session
from git import Repo
from jinja2 import Template
from urllib3 import PoolManager

import contribute
import build_status
Expand All @@ -45,13 +45,13 @@ def get_completion_progress() -> Iterator['LanguageProjectData']:
)
subprocess.run(['make', '-C', cpython_dir / 'Doc', 'venv'], check=True)
subprocess.run(['make', '-C', cpython_dir / 'Doc', 'gettext'], check=True)
languages_built = dict(build_status.get_languages(session := Session()))
languages_built = dict(build_status.get_languages(http := PoolManager()))
for language, repo in get_languages_and_repos(devguide_dir):
built = language.code in languages_built
if repo:
completion, translators_data = get_completion(clones_dir, repo)
visitors_num = (
get_number_of_visitors(language.code, session) if built else 0
get_number_of_visitors(language.code, http) if built else 0
)
else:
completion = 0.0
Expand Down Expand Up @@ -84,7 +84,8 @@ class LanguageProjectData:


if __name__ == '__main__':
info(f'starting at {generation_time}')
logging.basicConfig(level=logging.INFO)
logging.info(f'starting at {generation_time}')
template = Template(Path('template.html.jinja').read_text())

output = template.render(
Expand Down
16 changes: 9 additions & 7 deletions visitors.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import csv
import io
import urllib
import urllib.parse
import zipfile

from requests import Session
from urllib3 import PoolManager


def get_number_of_visitors(language: str, requests: Session) -> int:
def get_number_of_visitors(language: str, http: PoolManager) -> int:
params = urllib.parse.urlencode(
{'filters': f'[["contains","event:page",["/{language}/"]]]', 'period': 'all'}
)
r = requests.get(
f'https://plausible.io/docs.python.org/export?{params}', timeout=20
)
r = http.request('GET', f'https://plausible.io/docs.python.org/export?{params}')
with (
zipfile.ZipFile(io.BytesIO(r.content), 'r') as z,
zipfile.ZipFile(io.BytesIO(r.data), 'r') as z,
z.open('visitors.csv') as csv_file,
):
csv_reader = csv.DictReader(io.TextIOWrapper(csv_file))
return sum(int(row['visitors']) for row in csv_reader)


if __name__ == '__main__':
print(get_number_of_visitors('pl', PoolManager()))
Loading