Fix typing problems

Author: Nebucatnetzer

conftest.py

@@ -1,23 +1,29 @@
 import os
+from typing import Generator
+
 import pytest
+from flask.testing import FlaskClient
+from peewee import SqliteDatabase
+from py.path import local  # type: ignore
 
 os.environ["SNAPBIN_TESTING"] = "true"
 # pylint: disable=wrong-import-position
+from snapbin import database
 from snapbin import main
 from snapbin.models.secret import Secret
 
 
 @pytest.fixture(scope="function")
-def memory_db():
-    main.db.init(":memory:")
-    main.db.connect()
-    main.db.create_tables([Secret])
-    yield main.db
-    main.db.close()
+def memory_db() -> Generator[SqliteDatabase, None, None]:
+    database.db.init(":memory:")
+    database.db.connect()
+    database.db.create_tables([Secret])
+    yield database.db
+    database.db.close()
 
 
 @pytest.fixture()
-def app(tmpdir):
+def app(tmpdir: local) -> FlaskClient:
     temp_directory = tmpdir.mkdir("db")
     main.initialize_db(db_path=f"{temp_directory}/test.db")
     main.app.config["TESTING"] = True

flake.nix

@@ -47,6 +47,23 @@
                   # The editable root passed as a string
                   root = "$DEVENV_ROOT/snapbin"; # Use environment variable expansion at runtime
                 };
+                types-peewee =
+                  let
+                    pname = "types-peewee";
+                    version = "3.18.1.20250516";
+                  in
+                  pyfinal.buildPythonPackage {
+                    inherit pname version;
+                    format = "setuptools";
+                    src = pkgs.fetchurl {
+                      url = "https://files.pythonhosted.org/packages/9c/21/65fd9a10a988cc93afe5de22c0c7cffa2e20e9b31a3b964f78769f7d90c9/types_peewee-3.18.1.20250516.tar.gz";
+                      hash = "sha256-wUMNUM9oZnUZhLrUYVSOXBYUNYJ9sSB2pXp5qrFyzC8=";
+                    };
+
+                    # Module doesn't have tests
+                    doCheck = false;
+                    pythonImportsCheck = [ "peewee-stubs" ];
+                  };
               };
             };
 
@@ -68,6 +85,7 @@
               p.python-lsp-server
               p.ruff
               p.snapbin-editable
+              p.types-peewee
             ]);
             pythonProd = pkgs.python312.withPackages (p: [
               p.cryptography

snapbin/main.py

@@ -1,3 +1,4 @@
+# mypy: disable-error-code="no-untyped-call"
 import os
 import uuid
 from typing import Any
@@ -69,7 +70,7 @@ def encrypt(password: str) -> tuple[bytes, bytes]:
     return encrypted_password, encryption_key
 
 
-def decrypt(password: bytes, decryption_key: bytes):
+def decrypt(password: bytes, decryption_key: bytes) -> bytes:
     """
     Decrypt a password (bytes) using the provided key (bytes),
     and return the plain-text password (bytes).
@@ -125,7 +126,7 @@ def get_password(token: str) -> str | None:
         if password is not None:
             if decryption_key is not None:
                 password = decrypt(password, decryption_key)
-                return password.decode("utf-8")
+                return str(password.decode("utf-8"))
         return None
     except DoesNotExist:
         return None
@@ -168,7 +169,7 @@ def clean_input(form_request: Request = request) -> tuple[int, str]:
 
 
 @app.route("/", methods=["POST"])
-def handle_password():
+def handle_password() -> Response:
     if request.is_json:
         request.form = request.get_json()
     ttl, password = clean_input(form_request=request)
@@ -177,7 +178,7 @@ def handle_password():
 
 
 @app.route("/get-secret", methods=["POST"])
-def show_password():
+def show_password() -> Response:
     if request.is_json:
         request.form = request.get_json()
     if empty(request.form.get("key", "")):
@@ -189,7 +190,7 @@ def show_password():
     return jsonify(password=password)
 
 
-def main():
+def main() -> None:
     db_path = os.environ.get("DB_PATH", "snapbin.db")
     initialize_db(db_path=db_path)
     app.run(host="0.0.0.0")

tests.py

@@ -1,24 +1,26 @@
+# mypy: disable-error-code="no-untyped-call"
 import time
 
 import pytest
-
 from cryptography.fernet import Fernet
+from flask.testing import FlaskClient
 from freezegun import freeze_time
+from peewee import SqliteDatabase
 from werkzeug.exceptions import BadRequest
 
 import snapbin.main as snap
 from snapbin.models.secret import Secret
 
 
-def test_get_password(memory_db):
+def test_get_password(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "melatonin overdose 1337!$"
     key = snap.set_password(password, 30)
     assert password == snap.get_password(key), "passwords do not match"
     assert snap.get_password(key) is None, "password should be expired"
 
 
-def test_password_is_not_stored_in_plaintext(memory_db):
+def test_password_is_not_stored_in_plaintext(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "trustno1"
     token = snap.set_password(password, 30)
@@ -27,7 +29,7 @@ def test_password_is_not_stored_in_plaintext(memory_db):
     assert stored_password_text not in password
 
 
-def test_returned_token_format(memory_db):
+def test_returned_token_format(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "trustsome1"
     token = snap.set_password(password, 30)
@@ -41,7 +43,7 @@ def test_returned_token_format(memory_db):
         assert False, "the encryption key is not valid"
 
 
-def test_encryption_key_is_returned(memory_db):
+def test_encryption_key_is_returned(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "trustany1"
     token = snap.set_password(password, 30)
@@ -53,14 +55,14 @@ def test_encryption_key_is_returned(memory_db):
     assert password == decrypted_password
 
 
-def test_password_is_decoded(memory_db):
+def test_password_is_decoded(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "correct horse battery staple"
     key = snap.set_password(password, 30)
     assert not isinstance(snap.get_password(key), bytes)
 
 
-def test_clean_input(memory_db):
+def test_clean_input(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     # Test Bad Data
     with snap.app.test_request_context(
@@ -86,36 +88,36 @@ def test_clean_input(memory_db):
         assert (3600, "foo") == snap.clean_input()
 
 
-def test_password_before_expiration(memory_db):
+def test_password_before_expiration(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "fidelio"
     key = snap.set_password(password, 1)
     assert password == snap.get_password(key)
 
 
-def test_password_after_expiration(memory_db):
+def test_password_after_expiration(memory_db: SqliteDatabase) -> None:
     _ = memory_db
     password = "open sesame"
     key = snap.set_password(password, 1)
     time.sleep(2)
     assert snap.get_password(key) is None
 
 
-def test_preview_password(app):
+def test_preview_password(app: FlaskClient) -> None:
     password = "I like novelty kitten statues!"
     key = snap.set_password(password, 30)
     rv = app.get(f"/{key}")
     assert password not in rv.get_data(as_text=True)
 
 
-def test_show_password(app):
+def test_show_password(app: FlaskClient) -> None:
     password = "I like novelty kitten statues!"
     key = snap.set_password(password, 30)
     rv = app.post("/get-secret", data={"key": key})
     assert password in rv.get_data(as_text=True)
 
 
-def test_set_password_json(app):
+def test_set_password_json(app: FlaskClient) -> None:
     with freeze_time("2020-05-08 12:00:00") as frozen_time:
         password = "my name is my passport. verify me."
         rv = app.post(