cli/automate: fix up errors found with mypy

app/models/__init__.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import Union, List, Optional, Any
 
 from app.extensions import db
 
@@ -38,31 +39,44 @@ class AbstractResource(db.Model):
     deprecation_reason = db.Column(db.String(), nullable=True)
     destroyed = db.Column(db.DateTime(), nullable=True)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, *,
+                 id: Optional[int] = None,
+                 added: Optional[datetime] = None,
+                 updated: Optional[datetime] = None,
+                 deprecated: Optional[datetime] = None,
+                 deprecation_reason: Optional[str] = None,
+                 destroyed: Optional[datetime] = None,
+                 **kwargs: Any) -> None:
+        super().__init__(id=id,
+                         added=added,
+                         updated=updated,
+                         deprecated=deprecated,
+                         deprecation_reason=deprecation_reason,
+                         destroyed=destroyed,
+                         **kwargs)
         if self.added is None:
             self.added = datetime.utcnow()
         if self.updated is None:
             self.updated = datetime.utcnow()
 
-    def deprecate(self, *, reason: str):
+    def deprecate(self, *, reason: str) -> None:
         self.deprecated = datetime.utcnow()
         self.deprecation_reason = reason
         self.updated = datetime.utcnow()
 
-    def destroy(self):
+    def destroy(self) -> None:
         if self.deprecated is None:
             self.deprecated = datetime.utcnow()
         self.destroyed = datetime.utcnow()
         self.updated = datetime.utcnow()
 
     @classmethod
-    def csv_header(cls):
+    def csv_header(cls) -> List[str]:
         return [
             "id", "added", "updated", "deprecated", "deprecation_reason", "destroyed"
         ]
 
-    def csv_row(self):
+    def csv_row(self) -> List[Union[datetime, bool, int, str]]:
         return [
             getattr(self, x) for x in self.csv_header()
         ]

app/models/activity.py

@@ -1,4 +1,5 @@
 import datetime
+from typing import Any, Optional
 
 import requests
 
@@ -13,14 +14,25 @@ class Activity(db.Model):
     text = db.Column(db.Text(), nullable=False)
     added = db.Column(db.DateTime(), nullable=False)
 
-    def __init__(self, **kwargs):
-        if type(kwargs["activity_type"]) != str or len(kwargs["activity_type"]) > 20 or kwargs["activity_type"] == "":
+    def __init__(self, *,
+                 id: Optional[int] = None,
+                 group_id: Optional[int] = None,
+                 activity_type: str,
+                 text: str,
+                 added: Optional[datetime.datetime] = None,
+                 **kwargs: Any) -> None:
+        if type(activity_type) != str or len(activity_type) > 20 or activity_type == "":
             raise TypeError("expected string for activity type between 1 and 20 characters")
-        if type(kwargs["text"]) != str:
+        if type(text) != str:
             raise TypeError("expected string for text")
-        if "added" not in kwargs:
-            kwargs["added"] = datetime.datetime.utcnow()
-        super().__init__(**kwargs)
+        super().__init__(id=id,
+                         group_id=group_id,
+                         activity_type=activity_type,
+                         text=text,
+                         added=added,
+                         **kwargs)
+        if self.added is None:
+            self.added = datetime.datetime.utcnow()
 
     def notify(self) -> int:
         count = 0