Linting and improving the Makefile

Author: angelosantos4

Makefile

@@ -29,11 +29,13 @@ venv: poetry.lock
 format: venv
 	poetry run black nodestream tests
 	poetry run isort nodestream tests
+	poetry run ruff check nodestream tests --fix
 
 .PHONY: lint
 lint: venv
 	poetry run black nodestream tests --check
 	poetry run ruff check nodestream tests
+	poetry run isort nodestream tests --check-only
 
 .PHONY: test-unit
 test-unit: venv

nodestream/cli/operations/run_pipeline.py

@@ -1,3 +1,4 @@
+from logging import getLogger
 from typing import Iterable, Optional
 
 from yaml import safe_dump
@@ -9,7 +10,6 @@
 from ...utils import StringSuggester
 from ..commands.nodestream_command import NodestreamCommand
 from .operation import Operation
-from logging import getLogger
 
 STATS_TABLE_COLS = ["Statistic", "Value"]
 

nodestream/databases/query_executor_with_statistics.py

@@ -1,9 +1,9 @@
 from typing import Iterable
 
 from ..metrics import (
+    Metric,
     Metrics,
     NodestreamMetricRegistry,
-    Metric,
 )
 from ..model import IngestionHook, Node, RelationshipWithNodes, TimeToLiveConfiguration
 from .query_executor import (

nodestream/metrics.py

@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from contextvars import ContextVar
-from logging import getLogger
-from typing import Optional, Union, Dict
 from dataclasses import dataclass
+from logging import getLogger
+from typing import Dict, Optional, Union
 
 from cleo.commands.command import Command
 

tests/unit/cli/operations/test_run_pipeline.py

@@ -3,10 +3,10 @@
 
 from nodestream.cli.operations.run_pipeline import (
     WARNING_NO_TARGETS_PROVIDED,
+    JsonProgressIndicator,
     ProgressIndicator,
     RunPipeline,
     SpinnerProgressIndicator,
-    JsonProgressIndicator,
 )
 from nodestream.metrics import Metrics
 from nodestream.project import PipelineConfiguration, PipelineDefinition, Project

tests/unit/databases/test_query_executor_with_statistics.py

@@ -1,11 +1,12 @@
-import pytest
 from unittest.mock import call
 
+import pytest
+
 from nodestream.databases.query_executor_with_statistics import (
     QueryExecutorWithStatistics,
 )
 from nodestream.metrics import Metrics, NodestreamMetricRegistry
-from nodestream.model import Node, RelationshipWithNodes, Relationship
+from nodestream.model import Node, Relationship, RelationshipWithNodes
 
 
 @pytest.fixture

tests/unit/pipeline/test_pipeline.py

@@ -1,6 +1,7 @@
 import pytest
 
 from nodestream.pipeline import Extractor
+from nodestream.pipeline.channel import Channel
 from nodestream.pipeline.object_storage import NullObjectStore
 from nodestream.pipeline.pipeline import (
     Pipeline,
@@ -12,7 +13,6 @@
     StepInput,
     StepOutput,
 )
-from nodestream.pipeline.channel import Channel
 
 
 @pytest.fixture

tests/unit/test_metrics.py

@@ -7,8 +7,8 @@
     ConsoleMetricHandler,
     JsonLogMetricHandler,
     Metric,
-    NodestreamMetricRegistry,
     Metrics,
+    NodestreamMetricRegistry,
     NullMetricHandler,
     PrometheusMetricHandler,
 )