lint/quality fixes

Signed-off-by: dalthecow <[email protected]>

Author: DaltheCow

src/guidellm/logger.py

@@ -72,7 +72,7 @@ def configure_logger(config: LoggingSettings = settings.logging):
         sys.stdout,
         level=config.console_log_level.upper(),
         format="<green>{time:YY-MM-DD HH:mm:ss}</green>|<level>{level: <8}</level> \
-        |<cyan>{name}:{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>"
+        |<cyan>{name}:{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>",
     )
 
     if config.log_file or config.log_file_level:

src/guidellm/presentation/data_models.py

@@ -89,7 +89,7 @@ def from_data(cls, request_loader: Any):
                 if creator == SyntheticDatasetCreator:
                     data_dict = SyntheticDatasetConfig.parse_str(data)
                     dataset_name = data_dict.source
-                if creator == FileDatasetCreator or creator == HFDatasetsCreator:
+                if creator in (FileDatasetCreator, HFDatasetsCreator):
                     dataset_name = data
                 if creator == InMemoryDatasetCreator:
                     dataset_name = "In-memory"

tests/unit/presentation/test_data_models.py

@@ -1,6 +1,7 @@
-import pytest
 from unittest.mock import MagicMock, patch
 
+import pytest
+
 from guidellm.dataset.file import FileDatasetCreator
 from guidellm.dataset.hf_datasets import HFDatasetsCreator
 from guidellm.dataset.in_memory import InMemoryDatasetCreator
@@ -25,79 +26,113 @@ def test_bucket_from_data():
     assert buckets[1].count == 5
     assert bucket_width == 1
 
+
 def mock_processor(cls):
     return mock_generative_benchmark().request_loader.processor
 
+
 def new_handle_create(cls, *args, **kwargs):
     return MagicMock()
 
+
 def new_extract_dataset_name(cls, *args, **kwargs):
     return "data:prideandprejudice.txt.gz"
 
+
 @pytest.mark.smoke
 def test_dataset_from_data_uses_extracted_dataset_name():
     mock_benchmark = mock_generative_benchmark()
     with (
-        patch.object(SyntheticDatasetCreator, 'handle_create', new=new_handle_create),
-        patch.object(SyntheticDatasetCreator, 'extract_dataset_name', new=new_extract_dataset_name)
+        patch.object(SyntheticDatasetCreator, "handle_create", new=new_handle_create),
+        patch.object(
+            SyntheticDatasetCreator,
+            "extract_dataset_name",
+            new=new_extract_dataset_name,
+        ),
     ):
         dataset = Dataset.from_data(mock_benchmark.request_loader)
         assert dataset.name == "data:prideandprejudice.txt.gz"
-        # with unittest.mock.patch.object(PreTrainedTokenizerBase, 'processor', new=mock_processor):
+
 
 def new_is_supported(cls, *args, **kwargs):
     return True
 
+
 @pytest.mark.smoke
 def test_dataset_from_data_with_in_memory_dataset():
     mock_benchmark = mock_generative_benchmark()
-    with patch.object(InMemoryDatasetCreator, 'is_supported', new=new_is_supported):
+    with patch.object(InMemoryDatasetCreator, "is_supported", new=new_is_supported):
         dataset = Dataset.from_data(mock_benchmark.request_loader)
         assert dataset.name == "In-memory"
 
+
 def hardcoded_isnt_supported(cls, *args, **kwargs):
     return False
 
+
 def new_extract_dataset_name_none(cls, *args, **kwargs):
     return None
 
+
 @pytest.mark.smoke
 def test_dataset_from_data_with_synthetic_dataset():
     mock_benchmark = mock_generative_benchmark()
     with (
-        patch.object(SyntheticDatasetCreator, 'handle_create', new=new_handle_create),
-        patch.object(InMemoryDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(SyntheticDatasetCreator, 'is_supported', new=new_is_supported),
-        patch.object(SyntheticDatasetCreator, 'extract_dataset_name', new=new_extract_dataset_name_none)
+        patch.object(SyntheticDatasetCreator, "handle_create", new=new_handle_create),
+        patch.object(
+            InMemoryDatasetCreator, "is_supported", new=hardcoded_isnt_supported
+        ),
+        patch.object(SyntheticDatasetCreator, "is_supported", new=new_is_supported),
+        patch.object(
+            SyntheticDatasetCreator,
+            "extract_dataset_name",
+            new=new_extract_dataset_name_none,
+        ),
     ):
         dataset = Dataset.from_data(mock_benchmark.request_loader)
         assert dataset.name == "data:prideandprejudice.txt.gz"
 
+
 @pytest.mark.smoke
 def test_dataset_from_data_with_file_dataset():
     mock_benchmark = mock_generative_benchmark()
-    mock_benchmark.request_loader.data = 'dataset.yaml'
+    mock_benchmark.request_loader.data = "dataset.yaml"
     with (
-        patch.object(FileDatasetCreator, 'handle_create', new=new_handle_create),
-        patch.object(InMemoryDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(SyntheticDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(FileDatasetCreator, 'is_supported', new=new_is_supported),
-        patch.object(FileDatasetCreator, 'extract_dataset_name', new=new_extract_dataset_name_none)
+        patch.object(FileDatasetCreator, "handle_create", new=new_handle_create),
+        patch.object(
+            InMemoryDatasetCreator, "is_supported", new=hardcoded_isnt_supported
+        ),
+        patch.object(
+            SyntheticDatasetCreator, "is_supported", new=hardcoded_isnt_supported
+        ),
+        patch.object(FileDatasetCreator, "is_supported", new=new_is_supported),
+        patch.object(
+            FileDatasetCreator,
+            "extract_dataset_name",
+            new=new_extract_dataset_name_none,
+        ),
     ):
         dataset = Dataset.from_data(mock_benchmark.request_loader)
         assert dataset.name == "dataset.yaml"
 
+
 @pytest.mark.smoke
 def test_dataset_from_data_with_hf_dataset():
     mock_benchmark = mock_generative_benchmark()
-    mock_benchmark.request_loader.data = 'openai/gsm8k'
+    mock_benchmark.request_loader.data = "openai/gsm8k"
     with (
-        patch.object(HFDatasetsCreator, 'handle_create', new=new_handle_create),
-        patch.object(InMemoryDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(SyntheticDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(FileDatasetCreator, 'is_supported', new=hardcoded_isnt_supported),
-        patch.object(HFDatasetsCreator, 'is_supported', new=new_is_supported),
-        patch.object(HFDatasetsCreator, 'extract_dataset_name', new=new_extract_dataset_name_none)
+        patch.object(HFDatasetsCreator, "handle_create", new=new_handle_create),
+        patch.object(
+            InMemoryDatasetCreator, "is_supported", new=hardcoded_isnt_supported
+        ),
+        patch.object(
+            SyntheticDatasetCreator, "is_supported", new=hardcoded_isnt_supported
+        ),
+        patch.object(FileDatasetCreator, "is_supported", new=hardcoded_isnt_supported),
+        patch.object(HFDatasetsCreator, "is_supported", new=new_is_supported),
+        patch.object(
+            HFDatasetsCreator, "extract_dataset_name", new=new_extract_dataset_name_none
+        ),
     ):
         dataset = Dataset.from_data(mock_benchmark.request_loader)
-        assert dataset.name == "openai/gsm8k"
+        assert dataset.name == "openai/gsm8k"