From 9c6c76993b525f3b4a653f3f2d1d06f16e7bd394 Mon Sep 17 00:00:00 2001
From: Donovan Kelly <donovan.a.kelly@pm.me>
Date: Thu, 27 Jun 2024 12:04:52 -0500
Subject: [PATCH] fix pydantic error

---
 src/models.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/models.py b/src/models.py
index 010746b..f710d20 100644
--- a/src/models.py
+++ b/src/models.py
@@ -1,10 +1,9 @@
 import secrets
 from enum import Enum
-
 from pydantic import BaseModel
 
 
-class DarcKeyTypes(str, Enum):
+class DarcKeyType(str, Enum):
     outer_shuffle = "outer_shuffle"
     inner_shuffle = "inner_shuffle"
     alphabet = "alphabet"
@@ -13,7 +12,7 @@ class DarcKeyTypes(str, Enum):
 
 class DarcKey(BaseModel):
     matrix: list[list[int]]
-    key_type: DarcKeyTypes
+    key_type: DarcKeyType
 
     @classmethod
     def _random_shuffle(cls, array: list[int]) -> list[int]:
@@ -34,7 +33,7 @@ class DarcKey(BaseModel):
     def __lshift__(self, other):
         assert len(self.matrix) == len(other.matrix)
         assert len(self.matrix[0]) == len(other.matrix[0])
-        assert other.key_type == DarcKeyTypes.inner_shuffle or other.key_type == DarcKeyTypes.outer_shuffle
+        assert other.key_type == DarcKeyType.inner_shuffle or other.key_type == DarcKeyType.outer_shuffle
         output = []
         for i, el in enumerate(self.matrix):
             row = []
@@ -50,7 +49,7 @@ class DarcKey(BaseModel):
     def __lt__(self, other):
         assert len(other.matrix) == 1
         assert len(self.matrix) == len(other.matrix[0])
-        assert other.key_type == DarcKeyTypes.outer_shuffle
+        assert other.key_type == DarcKeyType.outer_shuffle
         output = []
         for i, _ in enumerate(self.matrix):
             output.append(self.matrix[other.matrix[0][i]])
@@ -62,8 +61,8 @@ class DarcKey(BaseModel):
     def __xor__(self, other):
         assert len(self.matrix) == len(other.matrix)
         assert len(self.matrix[0]) == len(other.matrix[0])
-        assert self.key_type == DarcKeyTypes.alphabet
-        assert other.key_type == DarcKeyTypes.alphabet
+        assert self.key_type == DarcKeyType.alphabet
+        assert other.key_type == DarcKeyType.alphabet
         output = []
         for i, el in enumerate(self.matrix):
             row = []
@@ -76,7 +75,7 @@ class DarcKey(BaseModel):
         )
 
     def __invert__(self):
-        assert self.key_type == DarcKeyTypes.inner_shuffle or self.key_type == DarcKeyTypes.outer_shuffle
+        assert self.key_type == DarcKeyType.inner_shuffle or self.key_type == DarcKeyType.outer_shuffle
 
         output = []
         for i, el in enumerate(self.matrix):
@@ -103,12 +102,11 @@ class DarcKey(BaseModel):
             for j in range(len(self.matrix[0])):
                 if self.matrix[i][j] != other.matrix[i][j]:
                     return False
-
         return True
 
 
 class OuterKey(DarcKey):
-    key_type = DarcKeyTypes.outer_shuffle
+    key_type: DarcKeyType = DarcKeyType.outer_shuffle
 
     @classmethod
     def init_matrix(cls, height: int):
@@ -120,7 +118,7 @@ class OuterKey(DarcKey):
 
 
 class InnerKey(DarcKey):
-    key_type = DarcKeyTypes.inner_shuffle
+    key_type: DarcKeyType = DarcKeyType.inner_shuffle
 
     @classmethod
     def init_matrix(cls, width: int, height: int):
@@ -132,7 +130,7 @@ class InnerKey(DarcKey):
 
 
 class AlphabetKey(DarcKey):
-    key_type = DarcKeyTypes.alphabet
+    key_type: DarcKeyType = DarcKeyType.alphabet
     max_value: int = 255
 
     @classmethod
@@ -146,7 +144,7 @@ class AlphabetKey(DarcKey):
 
 
 class Mask(DarcKey):
-    key_type = DarcKeyTypes.alphabet
+    key_type: DarcKeyType = DarcKeyType.alphabet
     max_value: int = 255
 
     @classmethod