Merge branch 'tiangolo:master' into master

.github/actions/notify-translations/Dockerfile

@@ -0,0 +1,7 @@
+FROM python:3.7
+
+RUN pip install httpx PyGithub "pydantic==1.5.1" "pyyaml>=5.3.1,<6.0.0"
+
+COPY ./app /app
+
+CMD ["python", "/app/main.py"]

.github/actions/notify-translations/action.yml

@@ -0,0 +1,10 @@
+name: "Notify Translations"
+description: "Notify in the issue for a translation when there's a new PR available"
+author: "Sebastián Ramírez <tiangolo@gmail.com>"
+inputs:
+  token:
+    description: 'Token, to read the GitHub API. Can be passed in using {{ secrets.GITHUB_TOKEN }}'
+    required: true
+runs:
+  using: 'docker'
+  image: 'Dockerfile'

.github/actions/notify-translations/app/main.py

@@ -0,0 +1,87 @@
+import logging
+from pathlib import Path
+from typing import Dict, Optional
+
+import yaml
+from github import Github
+from pydantic import BaseModel, BaseSettings, SecretStr
+
+awaiting_label = "awaiting review"
+lang_all_label = "lang-all"
+approved_label = "approved-2"
+translations_path = Path(__file__).parent / "translations.yml"
+
+
+class Settings(BaseSettings):
+    github_repository: str
+    input_token: SecretStr
+    github_event_path: Path
+    github_event_name: Optional[str] = None
+    input_debug: Optional[bool] = False
+
+
+class PartialGitHubEventIssue(BaseModel):
+    number: int
+
+
+class PartialGitHubEvent(BaseModel):
+    pull_request: PartialGitHubEventIssue
+
+
+if __name__ == "__main__":
+    settings = Settings()
+    if settings.input_debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+    logging.debug(f"Using config: {settings.json()}")
+    g = Github(settings.input_token.get_secret_value())
+    repo = g.get_repo(settings.github_repository)
+    if not settings.github_event_path.is_file():
+        raise RuntimeError(
+            f"No github event file available at: {settings.github_event_path}"
+        )
+    contents = settings.github_event_path.read_text()
+    github_event = PartialGitHubEvent.parse_raw(contents)
+    translations_map: Dict[str, int] = yaml.safe_load(translations_path.read_text())
+    logging.debug(f"Using translations map: {translations_map}")
+    pr = repo.get_pull(github_event.pull_request.number)
+    logging.debug(f"Processing PR: {pr.number}")
+    if pr.state == "open":
+        logging.debug(f"PR is open: {pr.number}")
+        label_strs = set([label.name for label in pr.get_labels()])
+        if lang_all_label in label_strs and awaiting_label in label_strs:
+            logging.info(
+                f"This PR seems to be a language translation and awaiting reviews: {pr.number}"
+            )
+            if approved_label in label_strs:
+                message = (
+                    f"It seems this PR already has the approved label: {pr.number}"
+                )
+                logging.error(message)
+                raise RuntimeError(message)
+            langs = []
+            for label in label_strs:
+                if label.startswith("lang-") and not label == lang_all_label:
+                    langs.append(label[5:])
+            for lang in langs:
+                if lang in translations_map:
+                    num = translations_map[lang]
+                    logging.info(f"Found a translation issue for language: {lang} in issue: {num}")
+                    issue = repo.get_issue(num)
+                    message = f"Good news everyone! 😉 There's a new translation PR to be reviewed: #{pr.number} 🎉"
+                    already_notified = False
+                    logging.info(f"Checking current comments in issue: {num} to see if already notified about this PR: {pr.number}")
+                    for comment in issue.get_comments():
+                        if message in comment.body:
+                            already_notified = True
+                    if not already_notified:
+                        logging.info(f"Writing comment in issue: {num} about PR: {pr.number}")
+                        issue.create_comment(message)
+                    else:
+                        logging.info(f"Issue: {num} was already notified of PR: {pr.number}")
+    else:
+        logging.info(
+            f"Changing labels in a closed PR doesn't trigger comments, PR: {pr.number}"
+        )
+    logging.info("Finished")

.github/actions/notify-translations/app/translations.yml

@@ -0,0 +1,14 @@
+pt: 1211
+es: 1218
+zh: 1228
+ru: 1362
+it: 1556
+ja: 1572
+uk: 1748
+tr: 1892
+fr: 1972
+ko: 2017
+sq: 2041
+pl: 3169
+de: 3716
+id: 3717

.github/actions/people/app/main.py

@@ -476,38 +476,38 @@ def get_top_users(
     )
 
     tiers = get_individual_sponsors(settings=settings)
-    sponsors_50 = []
-    for login, sponsor in tiers[50].items():
-        sponsors_50.append(
-            {"login": login, "avatarUrl": sponsor.avatarUrl, "url": sponsor.url}
-        )
     keys = list(tiers.keys())
     keys.sort(reverse=True)
     sponsors = []
     for key in keys:
-        if key >= 50:
-            continue
+        sponsor_group = []
         for login, sponsor in tiers[key].items():
-            sponsors.append(
+            sponsor_group.append(
                 {"login": login, "avatarUrl": sponsor.avatarUrl, "url": sponsor.url}
             )
+        sponsors.append(sponsor_group)
 
     people = {
         "maintainers": maintainers,
         "experts": experts,
         "last_month_active": last_month_active,
         "top_contributors": top_contributors,
         "top_reviewers": top_reviewers,
-        "sponsors_50": sponsors_50,
+    }
+    github_sponsors = {
         "sponsors": sponsors,
     }
     people_path = Path("./docs/en/data/people.yml")
+    github_sponsors_path = Path("./docs/en/data/github_sponsors.yml")
     people_old_content = people_path.read_text(encoding="utf-8")
-    new_content = yaml.dump(people, sort_keys=False, width=200, allow_unicode=True)
-    if people_old_content == new_content:
+    github_sponsors_old_content = github_sponsors_path.read_text(encoding="utf-8")
+    new_people_content = yaml.dump(people, sort_keys=False, width=200, allow_unicode=True)
+    new_github_sponsors_content = yaml.dump(github_sponsors, sort_keys=False, width=200, allow_unicode=True)
+    if people_old_content == new_people_content and github_sponsors_old_content == new_github_sponsors_content:
         logging.info("The FastAPI People data hasn't changed, finishing.")
         sys.exit(0)
-    people_path.write_text(new_content, encoding="utf-8")
+    people_path.write_text(new_people_content, encoding="utf-8")
+    github_sponsors_path.write_text(new_github_sponsors_content, encoding="utf-8")
     logging.info("Setting up GitHub Actions git user")
     subprocess.run(["git", "config", "user.name", "github-actions"], check=True)
     subprocess.run(

.github/workflows/notify-translations.yml

@@ -0,0 +1,21 @@
+name: Notify Translations
+
+on:
+  pull_request_target:
+    types:
+      - labeled
+
+jobs:
+  notify-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      # Allow debugging with tmate
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
+        with:
+          limit-access-to-actor: true
+      - uses: ./.github/actions/notify-translations
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
       fail-fast: false
-    
+
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

README.md

@@ -44,11 +44,12 @@ The key features are:
 
 <!-- sponsors -->
 
-<a href="https://www.deta.sh/?ref=fastapi" target="_blank" title="The launchpad for all your (team's) ideas"><img src="https://fastapi.tiangolo.com/img/sponsors/deta.svg"></a>
 <a href="https://bit.ly/2QSouzH" target="_blank" title="Jina: build neural search-as-a-service for any kind of data in just minutes."><img src="https://fastapi.tiangolo.com/img/sponsors/jina.svg"></a>
+<a href="https://www.deta.sh/?ref=fastapi" target="_blank" title="The launchpad for all your (team's) ideas"><img src="https://fastapi.tiangolo.com/img/sponsors/deta.svg"></a>
 <a href="https://www.investsuite.com/jobs" target="_blank" title="Wealthtech jobs with FastAPI"><img src="https://fastapi.tiangolo.com/img/sponsors/investsuite.svg"></a>
 <a href="https://www.vim.so/?utm_source=FastAPI" target="_blank" title="We help you master vim with interactive exercises"><img src="https://fastapi.tiangolo.com/img/sponsors/vimso.png"></a>
 <a href="https://talkpython.fm/fastapi-sponsor" target="_blank" title="FastAPI video courses on demand from people you trust"><img src="https://fastapi.tiangolo.com/img/sponsors/talkpython.png"></a>
+<a href="https://testdriven.io/courses/tdd-fastapi/" target="_blank" title="Learn to build high-quality web apps with best practices"><img src="https://fastapi.tiangolo.com/img/sponsors/testdriven.svg"></a>
 
 <!-- /sponsors -->