Update hill_cipher.py

Author: lighting9999

ciphers/hill_cipher.py

@@ -33,12 +33,10 @@
 https://www.youtube.com/watch?v=kfmNeskzs2o
 https://www.youtube.com/watch?v=4RhLNDqcjpA
 """
-
 import string
 import numpy as np
 from maths.greatest_common_divisor import greatest_common_divisor
 
-
 class HillCipher:
     key_string = string.ascii_uppercase + string.digits  # 36 alphanumeric chars
     modulus = np.vectorize(lambda x: x % 36)  # Mod 36 operation
@@ -62,14 +60,15 @@ def check_determinant(self) -> None:
         det = round(np.linalg.det(self.encrypt_key))
         if det < 0:
             det %= len(self.key_string)
-
+        
+        error_msg = f"Det {det} not coprime with 36. Try another key."
         if greatest_common_divisor(det, len(self.key_string)) != 1:
-            raise ValueError(f"Det {det} not coprime with 36. Try another key.")
+            raise ValueError(error_msg)
 
     def process_text(self, text: str) -> str:
         """Convert to uppercase, remove invalid chars, pad to multiple of break_key"""
         chars = [c for c in text.upper() if c in self.key_string]
-        last = chars[-1] if chars else "A"
+        last = chars[-1] if chars else 'A'
         while len(chars) % self.break_key != 0:
             chars.append(last)
         return "".join(chars)
@@ -79,30 +78,24 @@ def encrypt(self, text: str) -> str:
         text = self.process_text(text.upper())
         encrypted = ""
         for i in range(0, len(text), self.break_key):
-            batch = text[i : i + self.break_key]
+            batch = text[i:i+self.break_key]
             vec = [self.replace_letters(c) for c in batch]
             batch_vec = np.array([vec]).T
-            batch_encrypted = self.modulus(self.encrypt_key.dot(batch_vec)).T.tolist()[
-                0
-            ]
-            encrypted += "".join(
-                self.replace_digits(int(round(n))) for n in batch_encrypted
-            )
+            batch_encrypted = self.modulus(self.encrypt_key.dot(batch_vec)).T.tolist()[0]
+            encrypted += "".join(self.replace_digits(round(n)) for n in batch_encrypted)
         return encrypted
 
     def make_decrypt_key(self) -> np.ndarray:
         """Calculate decryption key matrix"""
         det = round(np.linalg.det(self.encrypt_key))
         if det < 0:
             det %= len(self.key_string)
-
+        
         # Find modular inverse of det
         det_inv = next(i for i in range(36) if (det * i) % 36 == 1)
-
+        
         # Calculate inverse key
-        inv_key = (
-            det_inv * np.linalg.det(self.encrypt_key) * np.linalg.inv(self.encrypt_key)
-        )
+        inv_key = det_inv * np.linalg.det(self.encrypt_key) * np.linalg.inv(self.encrypt_key)
         return self.to_int(self.modulus(inv_key))
 
     def decrypt(self, text: str) -> str:
@@ -111,35 +104,30 @@ def decrypt(self, text: str) -> str:
         text = self.process_text(text.upper())
         decrypted = ""
         for i in range(0, len(text), self.break_key):
-            batch = text[i : i + self.break_key]
+            batch = text[i:i+self.break_key]
             vec = [self.replace_letters(c) for c in batch]
             batch_vec = np.array([vec]).T
             batch_decrypted = self.modulus(decrypt_key.dot(batch_vec)).T.tolist()[0]
-            decrypted += "".join(
-                self.replace_digits(int(round(n))) for n in batch_decrypted
-            )
+            decrypted += "".join(self.replace_digits(round(n)) for n in batch_decrypted)
         return decrypted
 
-
 def main() -> None:
     """CLI for Hill Cipher"""
     n = int(input("Enter key order: "))
     print(f"Enter {n} rows of space-separated integers:")
     matrix = [list(map(int, input().split())) for _ in range(n)]
-
+    
     hc = HillCipher(np.array(matrix))
-
+    
     option = input("1. Encrypt\n2. Decrypt\nChoose: ")
     text = input("Enter text: ")
-
+    
     if option == "1":
         print("Encrypted:", hc.encrypt(text))
     elif option == "2":
         print("Decrypted:", hc.decrypt(text))
 
-
 if __name__ == "__main__":
     import doctest
-
     doctest.testmod()
     main()