From a4ad78cec3a8f0857e6ff8812b184803d2d553af Mon Sep 17 00:00:00 2001
From: Keith Edmunds <kae@tiger-computing.co.uk>
Date: Tue, 19 Apr 2022 09:47:30 +0100
Subject: [PATCH] Fix up Python type checking

---
 app/dbconfig.py |  3 +--
 app/helpers.py  |  6 +++---
 app/log.py      |  8 ++++----
 poetry.lock     | 14 +++++++++++++-
 pyproject.toml  |  1 +
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/dbconfig.py b/app/dbconfig.py
index 6edec31..26ea7ac 100644
--- a/app/dbconfig.py
+++ b/app/dbconfig.py
@@ -57,9 +57,8 @@ engine = sqlalchemy.create_engine(
 )
 
 
-# Session = scoped_session(sessionmaker(bind=engine))
 @contextmanager
-def Session():
+def Session() -> Session:
     frame = inspect.stack()[2]
     file = frame.filename
     function = frame.function
diff --git a/app/helpers.py b/app/helpers.py
index 669045c..384796b 100644
--- a/app/helpers.py
+++ b/app/helpers.py
@@ -19,7 +19,7 @@ def ask_yes_no(title: str, question: str) -> bool:
 
 def fade_point(
         audio_segment: AudioSegment, fade_threshold: int = 0,
-        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE):
+        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE) -> int:
     """
     Returns the millisecond/index of the point where the volume drops below
     the maximum and doesn't get louder again.
@@ -115,7 +115,7 @@ def get_relative_date(past_date: datetime, reference_date: datetime = None) \
 def leading_silence(
         audio_segment: AudioSegment,
         silence_threshold: int = Config.DBFS_SILENCE,
-        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE):
+        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE) -> int:
     """
     Returns the millisecond/index that the leading silence ends.
     audio_segment - the segment to find silence in
@@ -220,7 +220,7 @@ def show_warning(title: str, msg: str) -> None:
 
 def trailing_silence(
         audio_segment: AudioSegment, silence_threshold: int = -50,
-        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE):
+        chunk_size: int = Config.AUDIO_SEGMENT_CHUNK_SIZE) -> int:
     """Return fade point from start in milliseconds"""
 
     return fade_point(audio_segment, silence_threshold, chunk_size)
diff --git a/app/log.py b/app/log.py
index bec254e..da8c534 100644
--- a/app/log.py
+++ b/app/log.py
@@ -59,7 +59,7 @@ def log_uncaught_exceptions(ex_cls, ex, tb):
 sys.excepthook = log_uncaught_exceptions
 
 
-def DEBUG(msg, force_stderr=True):
+def DEBUG(msg: str, force_stderr: bool = True) -> None:
     """
     Outupt a log message at level DEBUG. If force_stderr is True,
     output this message to stderr regardless of default stderr level
@@ -75,15 +75,15 @@ def DEBUG(msg, force_stderr=True):
         log.debug(msg)
 
 
-def EXCEPTION(msg):
+def EXCEPTION(msg: str) -> None:
     log.exception(msg, exc_info=True, stack_info=True)
 
 
-def ERROR(msg):
+def ERROR(msg: str) -> None:
     log.error(msg)
 
 
-def INFO(msg):
+def INFO(msg: str) -> None:
     log.info(msg)
 
 
diff --git a/poetry.lock b/poetry.lock
index 7e539a8..817c87d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -587,6 +587,14 @@ python-versions = ">=3.7"
 [package.extras]
 test = ["pytest"]
 
+[[package]]
+name = "types-psutil"
+version = "5.8.22"
+description = "Typing stubs for psutil"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "typing-extensions"
 version = "4.1.1"
@@ -606,7 +614,7 @@ python-versions = "*"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.9"
-content-hash = "08353ac7c54559da365ff26807f5179fefe388b62bc52884ee475a4a644e924a"
+content-hash = "32b91fc8cb421cc92689db4fc1a4647044714d6e2a72194fe7caf2e25c821b55"
 
 [metadata.files]
 alembic = [
@@ -1015,6 +1023,10 @@ traitlets = [
     {file = "traitlets-5.1.1-py3-none-any.whl", hash = "sha256:2d313cc50a42cd6c277e7d7dc8d4d7fedd06a2c215f78766ae7b1a66277e0033"},
     {file = "traitlets-5.1.1.tar.gz", hash = "sha256:059f456c5a7c1c82b98c2e8c799f39c9b8128f6d0d46941ee118daace9eb70c7"},
 ]
+types-psutil = [
+    {file = "types-psutil-5.8.22.tar.gz", hash = "sha256:7556f37aaa2982d02b1accf45fe9d4d25e56473b58de16086101dd818ccbcf3d"},
+    {file = "types_psutil-5.8.22-py3-none-any.whl", hash = "sha256:aa98bb5e1b702a70902172e69083a8e00802b6a7d7f03e2c7ba736b92919b8c6"},
+]
 typing-extensions = [
     {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"},
     {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"},
diff --git a/pyproject.toml b/pyproject.toml
index 32b9191..734b4f2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,6 +17,7 @@ psutil = "^5.9.0"
 PyQtWebEngine = "^5.15.5"
 pydub = "^0.25.1"
 PyQt5-sip = "^12.9.1"
+types-psutil = "^5.8.22"
 
 [tool.poetry.dev-dependencies]
 ipdb = "^0.13.9"