chore: ports various util changes

Author: devraj

src/labs/models/utils.py

@@ -73,6 +73,7 @@
     ),
 ]
 
+
 class IdentifierMixin(object):
     """An ID for a given object
 
@@ -81,7 +82,8 @@ class IdentifierMixin(object):
     techniques.
     """
     id: Mapped[pk_uuid]
-    
+
+
 class DateTimeMixin(object):
     """Stores creation and update timestamps
 
@@ -96,6 +98,7 @@ class DateTimeMixin(object):
     updated_at: Mapped[timestamp_req]
     deleted_at: Mapped[timestamp]
 
+
 class CUDByMixin(object):
     """ Adds references to created_by and updated_by users
 
@@ -104,6 +107,7 @@ class CUDByMixin(object):
     last_updated_by_user_id: Mapped[fk_user_uuid_req]
     deleted_by_user_id: Mapped[fk_user_uuid]
 
+
 class ModelCRUDMixin:
     """
     A CRUD Mixin designed to abstract CRUD operations for all
@@ -134,14 +138,17 @@ async def create(
         new_instance = cls(**kwargs)
         async_db_session.add(new_instance)
         await async_db_session.commit()
-        await async_db_session.refresh(new_instance) # Ensure we get the id
+        await async_db_session.refresh(new_instance)  # Ensure we get the id
 
         # This will trigger using the _base_get_query to load any
-        # relationships we need.
-        updated_instance = await cls.get(
-            async_db_session, 
-            new_instance.id
-        )
+        # relationships we need. The if statement is to ensure that tables
+        # like join tables do not always have an id field.
+        updated_instance = new_instance
+        if hasattr(cls, "id"):
+            updated_instance = await cls.get(
+                async_db_session,
+                new_instance.id
+            )
 
         return updated_instance
 
@@ -257,7 +264,6 @@ async def get_all_in_range(
         users = users.scalars().all()
         return users
 
-
     @classmethod
     async def get_all(
         cls,

src/labs/utils/auth.py

@@ -17,7 +17,8 @@
 import bcrypt
 import jwt
 
-from ..settings  import settings
+from ..settings import settings
+
 
 def verify_password(
     plain_password,
@@ -32,6 +33,7 @@ def verify_password(
         str.encode(hashed_password)
     )
 
+
 def hash_password(password) -> str:
     """ Use the crypt context to hash the password
 
@@ -79,5 +81,5 @@ def create_access_token(
         settings.jwt.secret_key.get_secret_value(),
         algorithm=settings.jwt.algorithm
     )
-    
+
     return encoded_jwt