chore: improve type annotations

Fix some issues discovered by ty type checker.

Author: nijel

weblate/screenshots/views.py

@@ -31,6 +31,8 @@
 from weblate.utils.views import PathViewMixin
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from tesserocr import PyTessBaseAPI
 
     from weblate.auth.models import AuthenticatedHttpRequest
@@ -416,7 +418,7 @@ def ocr_extract(api, image: str, strings, resolution: int):
 
 
 @contextmanager
-def get_tesseract(language: Language) -> PyTessBaseAPI:
+def get_tesseract(language: Language) -> Generator[PyTessBaseAPI]:
     from tesserocr import OEM, PSM, PyTessBaseAPI
 
     # Get matching language

weblate/trans/models/unit.py

@@ -387,6 +387,7 @@ class OldUnit(TypedDict):
     context: str
     extra_flags: str
     explanation: str
+    automatically_translated: bool
 
 
 class UnitAttributesDict(TypedDict):
@@ -615,11 +616,11 @@ def invalidate_checks_cache(self) -> None:
             if key in self.__dict__:
                 del self.__dict__[key]
 
-    def save_labels(self, new_labels: list[Label], user: User) -> None:
+    def save_labels(self, labels: list[Label], user: User) -> None:
         """Save new labels for the unit."""
         old_labels = set(self.labels.all())
 
-        self.labels.set(new_labels)
+        self.labels.set(labels)
 
         new_labels = set(self.labels.all())
 

weblate/utils/environment.py

@@ -7,18 +7,43 @@
 import ast
 import os
 from pathlib import Path
-from typing import Any
+from typing import Any, Literal, overload
 from urllib.parse import quote
 
 from django.core.exceptions import ImproperlyConfigured
 
 
+@overload
 def get_env_str(
     name: str,
-    default: str | None = None,
+    default: str,
+    *,
     required: bool = False,
     fallback_name: str | None = None,
-) -> str:
+) -> str: ...
+@overload
+def get_env_str(
+    name: str,
+    default: None = None,
+    *,
+    required: Literal[True],
+    fallback_name: str | None = None,
+) -> str: ...
+@overload
+def get_env_str(
+    name: str,
+    default: None = None,
+    *,
+    required: bool = False,
+    fallback_name: str | None = None,
+) -> str | None: ...
+def get_env_str(
+    name,
+    default=None,
+    *,
+    required=False,
+    fallback_name=None,
+):
     file_env = f"{name}_FILE"
     if filename := os.environ.get(file_env):
         try: