lint: resolve existing mypy type errors

Adds annotations and re-workes dataflow to satisfy existing mypy issues,
without adding any additional type annotations to, eg, function
signatures.

There will probably be many more type errors when annotations are all
added.

3 files changed, 10 insertions, 7 deletions

diff --git a/python/fatcat_tools/transforms/access.py b/python/fatcat_tools/transforms/access.py
index 34212a6a..e3228d30 100644
--- a/python/fatcat_tools/transforms/access.py
+++ b/python/fatcat_tools/transforms/access.py
@@ -39,7 +39,7 @@ def release_access_options(release: ReleaseEntity) -> List[AccessOption]:
     TODO: proper implementation and filtering, instead of just returning first
     option found
     """
-    options = []
+    options: List[AccessOption] = []
     for f in release.files or []:
         thumbnail_url = None
         if f.mimetype == "application/pdf" and f.sha1 and f.urls:
diff --git a/python/fatcat_tools/transforms/elasticsearch.py b/python/fatcat_tools/transforms/elasticsearch.py
index e39e9ea4..d4962205 100644
--- a/python/fatcat_tools/transforms/elasticsearch.py
+++ b/python/fatcat_tools/transforms/elasticsearch.py
@@ -7,6 +7,7 @@ from fatcat_openapi_client import (
     ContainerEntity,
     EntityEdit,
     FileEntity,
+    FileUrl,
     ReleaseEntity,
 )
 
@@ -355,7 +356,7 @@ def _rte_content_helper(release: ReleaseEntity) -> dict:
     - other webarchive or repository URLs
     - any other URL
     """
-    t = dict(
+    t: Dict[str, Any] = dict(
         file_count=len(release.files or []),
         fileset_count=len(release.filesets or []),
         webcapture_count=len(release.webcaptures or []),
@@ -403,7 +404,7 @@ def _rte_content_helper(release: ReleaseEntity) -> dict:
     return t
 
 
-def _rte_url_helper(url_obj) -> dict:
+def _rte_url_helper(url_obj: FileUrl) -> Dict[str, Any]:
     """
     Takes a location URL ('url' and 'rel' keys) and returns generic preservation status.
 
@@ -427,7 +428,9 @@ def _rte_url_helper(url_obj) -> dict:
     return t
 
 
-def container_to_elasticsearch(entity, force_bool=True, stats=None):
+def container_to_elasticsearch(
+    entity: Any, force_bool: bool = True, stats: Optional[Dict[str, Any]] = None
+) -> Dict[str, Any]:
     """
     Converts from an entity model/schema to elasticsearch oriented schema.
 
diff --git a/python/fatcat_tools/transforms/entities.py b/python/fatcat_tools/transforms/entities.py
index 799d5d6c..ee4017d8 100644
--- a/python/fatcat_tools/transforms/entities.py
+++ b/python/fatcat_tools/transforms/entities.py
@@ -1,6 +1,6 @@
 import collections
 import json
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Mapping, Optional
 
 import toml
 from fatcat_openapi_client import ApiClient
@@ -31,12 +31,12 @@ def entity_from_json(
     """
     if not api_client:
         api_client = ApiClient()
-    thing = collections.namedtuple("Thing", ["data"])
+    thing = collections.namedtuple("thing", ["data"])
     thing.data = json_str
     return api_client.deserialize(thing, entity_type)
 
 
-def entity_from_dict(obj: dict, entity_type, api_client=None):
+def entity_from_dict(obj: Mapping[str, Any], entity_type, api_client=None):
     json_str = json.dumps(obj)
     return entity_from_json(json_str, entity_type, api_client=api_client)