Refactor docs for building scripts, use MkDocs hooks, simplify (remove) configs for languages (#9742)

*  Add MkDocs hooks to re-use all config from en, and auto-generate missing docs files form en

* 🔧 Update MkDocs config for es

* 🔧 Simplify configs for all languages

*  Compute available languages from MkDocs Material for config overrides in hooks

* 🔧 Update config for MkDocs for en, to make paths compatible for other languages

* ♻️ Refactor scripts/docs.py to remove all custom logic that is now handled by the MkDocs hooks

* 🔧 Remove ta language as it's incomplete (no translations and causing errors)

* 🔥 Remove ta lang, no translations available

* 🔥 Remove dummy overrides directories, no longer needed

*  Use the same missing-translation.md file contents for hooks

* ️ Restore and refactor new-lang command

* 📝 Update docs for contributing with new simplified workflow for translations

* 🔊 Enable logs so that MkDocs can show its standard output on the docs.py script
This commit is contained in:
Sebastián Ramírez
2023-06-25 14:33:58 +02:00
committed by GitHub
parent c563b5bcf1
commit 5656ed09ef
52 changed files with 202 additions and 4572 deletions

View File

@@ -1,4 +1,5 @@
import json
import logging
import os
import re
import shutil
@@ -6,7 +7,7 @@ import subprocess
from http.server import HTTPServer, SimpleHTTPRequestHandler
from multiprocessing import Pool
from pathlib import Path
from typing import Dict, List, Optional, Tuple
from typing import Any, Dict, List, Optional, Union
import mkdocs.commands.build
import mkdocs.commands.serve
@@ -16,6 +17,8 @@ import typer
import yaml
from jinja2 import Template
logging.basicConfig(level=logging.INFO)
app = typer.Typer()
mkdocs_name = "mkdocs.yml"
@@ -27,19 +30,21 @@ missing_translation_snippet = """
docs_path = Path("docs")
en_docs_path = Path("docs/en")
en_config_path: Path = en_docs_path / mkdocs_name
site_path = Path("site").absolute()
build_site_path = Path("site_build").absolute()
def get_en_config() -> dict:
def get_en_config() -> Dict[str, Any]:
return mkdocs.utils.yaml_load(en_config_path.read_text(encoding="utf-8"))
def get_lang_paths():
def get_lang_paths() -> List[Path]:
return sorted(docs_path.iterdir())
def lang_callback(lang: Optional[str]):
def lang_callback(lang: Optional[str]) -> Union[str, None]:
if lang is None:
return
return None
if not lang.isalpha() or len(lang) != 2:
typer.echo("Use a 2 letter language code, like: es")
raise typer.Abort()
@@ -54,35 +59,6 @@ def complete_existing_lang(incomplete: str):
yield lang_path.name
def get_base_lang_config(lang: str):
en_config = get_en_config()
fastapi_url_base = "https://fastapi.tiangolo.com/"
new_config = en_config.copy()
new_config["site_url"] = en_config["site_url"] + f"{lang}/"
new_config["theme"]["logo"] = fastapi_url_base + en_config["theme"]["logo"]
new_config["theme"]["favicon"] = fastapi_url_base + en_config["theme"]["favicon"]
new_config["theme"]["language"] = lang
new_config["nav"] = en_config["nav"][:2]
extra_css = []
css: str
for css in en_config["extra_css"]:
if css.startswith("http"):
extra_css.append(css)
else:
extra_css.append(fastapi_url_base + css)
new_config["extra_css"] = extra_css
extra_js = []
js: str
for js in en_config["extra_javascript"]:
if js.startswith("http"):
extra_js.append(js)
else:
extra_js.append(fastapi_url_base + js)
new_config["extra_javascript"] = extra_js
return new_config
@app.command()
def new_lang(lang: str = typer.Argument(..., callback=lang_callback)):
"""
@@ -95,12 +71,8 @@ def new_lang(lang: str = typer.Argument(..., callback=lang_callback)):
typer.echo(f"The language was already created: {lang}")
raise typer.Abort()
new_path.mkdir()
new_config = get_base_lang_config(lang)
new_config_path: Path = Path(new_path) / mkdocs_name
new_config_path.write_text(
yaml.dump(new_config, sort_keys=False, width=200, allow_unicode=True),
encoding="utf-8",
)
new_config_path.write_text("INHERIT: ../en/mkdocs.yml\n", encoding="utf-8")
new_config_docs_path: Path = new_path / "docs"
new_config_docs_path.mkdir()
en_index_path: Path = en_docs_path / "docs" / "index.md"
@@ -108,11 +80,8 @@ def new_lang(lang: str = typer.Argument(..., callback=lang_callback)):
en_index_content = en_index_path.read_text(encoding="utf-8")
new_index_content = f"{missing_translation_snippet}\n\n{en_index_content}"
new_index_path.write_text(new_index_content, encoding="utf-8")
new_overrides_gitignore_path = new_path / "overrides" / ".gitignore"
new_overrides_gitignore_path.parent.mkdir(parents=True, exist_ok=True)
new_overrides_gitignore_path.write_text("")
typer.secho(f"Successfully initialized: {new_path}", color=typer.colors.GREEN)
update_languages(lang=None)
update_languages()
@app.command()
@@ -120,95 +89,29 @@ def build_lang(
lang: str = typer.Argument(
..., callback=lang_callback, autocompletion=complete_existing_lang
)
):
) -> None:
"""
Build the docs for a language, filling missing pages with translation notifications.
Build the docs for a language.
"""
lang_path: Path = Path("docs") / lang
if not lang_path.is_dir():
typer.echo(f"The language translation doesn't seem to exist yet: {lang}")
raise typer.Abort()
typer.echo(f"Building docs for: {lang}")
build_dir_path = Path("docs_build")
build_dir_path.mkdir(exist_ok=True)
build_lang_path = build_dir_path / lang
en_lang_path = Path("docs/en")
site_path = Path("site").absolute()
build_site_path = Path("site_build").absolute()
build_site_dist_path = build_site_path / lang
if lang == "en":
dist_path = site_path
# Don't remove en dist_path as it might already contain other languages.
# When running build_all(), that function already removes site_path.
# All this is only relevant locally, on GitHub Actions all this is done through
# artifacts and multiple workflows, so it doesn't matter if directories are
# removed or not.
else:
dist_path: Path = site_path / lang
shutil.rmtree(build_lang_path, ignore_errors=True)
shutil.copytree(lang_path, build_lang_path)
if not lang == "en":
shutil.copytree(en_docs_path / "data", build_lang_path / "data")
overrides_src = en_docs_path / "overrides"
overrides_dest = build_lang_path / "overrides"
for path in overrides_src.iterdir():
dest_path = overrides_dest / path.name
if not dest_path.exists():
shutil.copy(path, dest_path)
en_config_path: Path = en_lang_path / mkdocs_name
en_config: dict = mkdocs.utils.yaml_load(
en_config_path.read_text(encoding="utf-8")
)
nav = en_config["nav"]
lang_config_path: Path = lang_path / mkdocs_name
lang_config: dict = mkdocs.utils.yaml_load(
lang_config_path.read_text(encoding="utf-8")
)
lang_nav = lang_config["nav"]
# Exclude first 2 entries FastAPI and Languages, for custom handling
use_nav = nav[2:]
lang_use_nav = lang_nav[2:]
file_to_nav = get_file_to_nav_map(use_nav)
sections = get_sections(use_nav)
lang_file_to_nav = get_file_to_nav_map(lang_use_nav)
use_lang_file_to_nav = get_file_to_nav_map(lang_use_nav)
for file in file_to_nav:
file_path = Path(file)
lang_file_path: Path = build_lang_path / "docs" / file_path
en_file_path: Path = en_lang_path / "docs" / file_path
lang_file_path.parent.mkdir(parents=True, exist_ok=True)
if not lang_file_path.is_file():
en_text = en_file_path.read_text(encoding="utf-8")
lang_text = get_text_with_translate_missing(en_text)
lang_file_path.write_text(lang_text, encoding="utf-8")
file_key = file_to_nav[file]
use_lang_file_to_nav[file] = file_key
if file_key:
composite_key = ()
new_key = ()
for key_part in file_key:
composite_key += (key_part,)
key_first_file = sections[composite_key]
if key_first_file in lang_file_to_nav:
new_key = lang_file_to_nav[key_first_file]
else:
new_key += (key_part,)
use_lang_file_to_nav[file] = new_key
key_to_section = {(): []}
for file, orig_file_key in file_to_nav.items():
if file in use_lang_file_to_nav:
file_key = use_lang_file_to_nav[file]
else:
file_key = orig_file_key
section = get_key_section(key_to_section=key_to_section, key=file_key)
section.append(file)
new_nav = key_to_section[()]
export_lang_nav = [lang_nav[0], nav[1]] + new_nav
lang_config["nav"] = export_lang_nav
build_lang_config_path: Path = build_lang_path / mkdocs_name
build_lang_config_path.write_text(
yaml.dump(lang_config, sort_keys=False, width=200, allow_unicode=True),
encoding="utf-8",
)
dist_path = site_path / lang
shutil.rmtree(dist_path, ignore_errors=True)
current_dir = os.getcwd()
os.chdir(build_lang_path)
os.chdir(lang_path)
shutil.rmtree(build_site_dist_path, ignore_errors=True)
shutil.rmtree(dist_path, ignore_errors=True)
subprocess.run(["mkdocs", "build", "--site-dir", build_site_dist_path], check=True)
shutil.copytree(build_site_dist_path, dist_path, dirs_exist_ok=True)
os.chdir(current_dir)
@@ -227,7 +130,7 @@ index_sponsors_template = """
"""
def generate_readme_content():
def generate_readme_content() -> str:
en_index = en_docs_path / "docs" / "index.md"
content = en_index.read_text("utf-8")
match_start = re.search(r"<!-- sponsors -->", content)
@@ -247,7 +150,7 @@ def generate_readme_content():
@app.command()
def generate_readme():
def generate_readme() -> None:
"""
Generate README.md content from main index.md
"""
@@ -258,7 +161,7 @@ def generate_readme():
@app.command()
def verify_readme():
def verify_readme() -> None:
"""
Verify README.md content from main index.md
"""
@@ -275,12 +178,13 @@ def verify_readme():
@app.command()
def build_all():
def build_all() -> None:
"""
Build mkdocs site for en, and then build each language inside, end result is located
at directory ./site/ with each language inside.
"""
update_languages(lang=None)
update_languages()
shutil.rmtree(site_path, ignore_errors=True)
langs = [lang.name for lang in get_lang_paths() if lang.is_dir()]
cpu_count = os.cpu_count() or 1
process_pool_size = cpu_count * 4
@@ -289,34 +193,16 @@ def build_all():
p.map(build_lang, langs)
def update_single_lang(lang: str):
lang_path = docs_path / lang
typer.echo(f"Updating {lang_path.name}")
update_config(lang_path.name)
@app.command()
def update_languages(
lang: str = typer.Argument(
None, callback=lang_callback, autocompletion=complete_existing_lang
)
):
def update_languages() -> None:
"""
Update the mkdocs.yml file Languages section including all the available languages.
The LANG argument is a 2-letter language code. If it's not provided, update all the
mkdocs.yml files (for all the languages).
"""
if lang is None:
for lang_path in get_lang_paths():
if lang_path.is_dir():
update_single_lang(lang_path.name)
else:
update_single_lang(lang)
update_config()
@app.command()
def serve():
def serve() -> None:
"""
A quick server to preview a built site with translations.
@@ -342,7 +228,7 @@ def live(
lang: str = typer.Argument(
None, callback=lang_callback, autocompletion=complete_existing_lang
)
):
) -> None:
"""
Serve with livereload a docs site for a specific language.
@@ -359,18 +245,8 @@ def live(
mkdocs.commands.serve.serve(dev_addr="127.0.0.1:8008")
def update_config(lang: str):
lang_path: Path = docs_path / lang
config_path = lang_path / mkdocs_name
current_config: dict = mkdocs.utils.yaml_load(
config_path.read_text(encoding="utf-8")
)
if lang == "en":
config = get_en_config()
else:
config = get_base_lang_config(lang)
config["nav"] = current_config["nav"]
config["theme"]["language"] = current_config["theme"]["language"]
def update_config() -> None:
config = get_en_config()
languages = [{"en": "/"}]
alternate: List[Dict[str, str]] = config["extra"].get("alternate", [])
alternate_dict = {alt["link"]: alt["name"] for alt in alternate}
@@ -390,7 +266,7 @@ def update_config(lang: str):
new_alternate.append({"link": url, "name": use_name})
config["nav"][1] = {"Languages": languages}
config["extra"]["alternate"] = new_alternate
config_path.write_text(
en_config_path.write_text(
yaml.dump(config, sort_keys=False, width=200, allow_unicode=True),
encoding="utf-8",
)
@@ -405,56 +281,5 @@ def langs_json():
print(json.dumps(langs))
def get_key_section(
*, key_to_section: Dict[Tuple[str, ...], list], key: Tuple[str, ...]
) -> list:
if key in key_to_section:
return key_to_section[key]
super_key = key[:-1]
title = key[-1]
super_section = get_key_section(key_to_section=key_to_section, key=super_key)
new_section = []
super_section.append({title: new_section})
key_to_section[key] = new_section
return new_section
def get_text_with_translate_missing(text: str) -> str:
lines = text.splitlines()
lines.insert(1, missing_translation_snippet)
new_text = "\n".join(lines)
return new_text
def get_file_to_nav_map(nav: list) -> Dict[str, Tuple[str, ...]]:
file_to_nav = {}
for item in nav:
if type(item) is str:
file_to_nav[item] = ()
elif type(item) is dict:
item_key = list(item.keys())[0]
sub_nav = item[item_key]
sub_file_to_nav = get_file_to_nav_map(sub_nav)
for k, v in sub_file_to_nav.items():
file_to_nav[k] = (item_key,) + v
return file_to_nav
def get_sections(nav: list) -> Dict[Tuple[str, ...], str]:
sections = {}
for item in nav:
if type(item) is str:
continue
elif type(item) is dict:
item_key = list(item.keys())[0]
sub_nav = item[item_key]
sections[(item_key,)] = sub_nav[0]
sub_sections = get_sections(sub_nav)
for k, v in sub_sections.items():
new_key = (item_key,) + k
sections[new_key] = v
return sections
if __name__ == "__main__":
app()