Review fixes

Author: markurtz

src/guidellm/utils/pydantic_utils.py

@@ -28,7 +28,6 @@
 
 
 BaseModelT = TypeVar("BaseModelT", bound=BaseModel)
-T = TypeVar("T", bound=BaseModel)
 SuccessfulT = TypeVar("SuccessfulT")
 ErroredT = TypeVar("ErroredT")
 IncompleteT = TypeVar("IncompleteT")
@@ -90,7 +89,7 @@ class MyModel(StandardBaseModel):
     )
 
     @classmethod
-    def get_default(cls: type[T], field: str) -> Any:
+    def get_default(cls: type[BaseModelT], field: str) -> Any:
         """
         Get default value for a model field.
 

src/guidellm/utils/singleton.py

@@ -94,9 +94,6 @@ def __new__(cls, *args, **kwargs):  # noqa: ARG004
         lock_attr_name = f"_singleton_lock_{cls.__name__}"
         instance_attr_name = f"_singleton_instance_{cls.__name__}"
 
-        if not hasattr(cls, lock_attr_name):
-            setattr(cls, lock_attr_name, threading.Lock())
-
         with getattr(cls, lock_attr_name):
             instance_exists = (
                 hasattr(cls, instance_attr_name)
@@ -109,6 +106,11 @@ def __new__(cls, *args, **kwargs):  # noqa: ARG004
                 instance._init_lock = threading.Lock()
             return getattr(cls, instance_attr_name)
 
+    def __init_subclass__(cls, *args, **kwargs):
+        super().__init_subclass__(*args, **kwargs)
+        lock_attr_name = f"_singleton_lock_{cls.__name__}"
+        setattr(cls, lock_attr_name, threading.Lock())
+
     def __init__(self):
         """Initialize the singleton instance with thread-safe initialization."""
         with self._init_lock: