chore: simplification and lint

Author: toondaey

cognite/extractorutils/unstable/core/base.py

@@ -220,17 +220,13 @@ def _setup_logging(self) -> None:
                 case LogConsoleHandlerConfig() as console_handler:
                     sh = logging.StreamHandler()
                     sh.setFormatter(fmt)
-                    level_for_handler = _resolve_log_level(
-                        self.log_level_override if self.log_level_override else console_handler.level.value
-                    )
+                    level_for_handler = _resolve_log_level(self.log_level_override or console_handler.level.value)
                     sh.setLevel(level_for_handler)
 
                     root.addHandler(sh)
 
                 case LogFileHandlerConfig() as file_handler:
-                    level_for_handler = _resolve_log_level(
-                        self.log_level_override if self.log_level_override else file_handler.level.value
-                    )
+                    level_for_handler = _resolve_log_level(self.log_level_override or file_handler.level.value)
                     try:
                         fh = RobustFileHandler(
                             filename=file_handler.path,

cognite/extractorutils/unstable/core/runtime.py

@@ -38,15 +38,15 @@ def main() -> None:
 from typing import Any, Generic, TypeVar
 from uuid import uuid4
 
-from requests.exceptions import ConnectionError as RequestsConnectionError
-from typing_extensions import assert_never
-
 from cognite.client import CogniteClient
 from cognite.client.exceptions import (
     CogniteAPIError,
     CogniteAuthError,
     CogniteConnectionError,
 )
+from requests.exceptions import ConnectionError as RequestsConnectionError
+from typing_extensions import assert_never
+
 from cognite.extractorutils.threading import CancellationToken
 from cognite.extractorutils.unstable.configuration.exceptions import InvalidArgumentError, InvalidConfigError
 from cognite.extractorutils.unstable.configuration.loaders import (
@@ -180,8 +180,8 @@ def _create_argparser(self) -> ArgumentParser:
             choices=["debug", "info", "warning", "error", "critical"],
             type=str,
             required=False,
-            default="info",
-            help="Set the logging level for the runtime. Default is 'info'.",
+            default=None,
+            help="Set the logging level for the runtime.",
         )
         argparser.add_argument(
             "--skip-init-checks",

tests/conftest.py

@@ -5,7 +5,6 @@
 from enum import Enum
 
 import pytest
-
 from cognite.client import CogniteClient
 from cognite.client.config import ClientConfig
 from cognite.client.credentials import OAuthClientCredentials

tests/test_unstable/conftest.py

@@ -1,18 +1,21 @@
 import gzip
 import json
 import os
+from pathlib import Path
+import shutil
 from collections.abc import Callable, Generator, Iterator
+import tempfile
 from threading import RLock
 from time import sleep, time
 from typing import Any
 from uuid import uuid4
 
 import pytest
 import requests_mock
-
 from cognite.client import CogniteClient
 from cognite.client.config import ClientConfig
 from cognite.client.credentials import OAuthClientCredentials
+
 from cognite.extractorutils.unstable.configuration.models import (
     ConnectionConfig,
     ExtractorConfig,
@@ -37,9 +40,29 @@ def reset_singleton() -> Iterator[None]:
 
 
 @pytest.fixture(autouse=True)
-def reset_environment() -> Generator[None, None, None]:
+def reset_environment(test_dirs: list[str]) -> Generator[None, None, None]:
     yield
     os.chdir(working_dir)
+    # if len(test_dirs) > 0:
+    #     for tmp_dir in test_dirs:
+    #         os.chown(tmp_dir, os.getuid(), os.getgid())
+    #         shutil.rmtree(tmp_dir)
+
+
+@pytest.fixture
+def test_dirs() -> list[str]:  # list[tuple[Path, int, int]]:
+    return []
+    # tmp_dir = Path(f"{tempfile.gettempdir()}/{str(uuid4())!s}")
+    # os.mkdir(tmp_dir)
+    # stats = os.stat(tmp_dir)
+    # original_uid = stats.st_uid
+    # original_gid = stats.st_gid
+    # os.chown(tmp_dir, os.getuid(), os.getgid())
+    #
+    # yield (tmp_dir, original_uid, original_gid)
+    #
+    # os.chown(tmp_dir, original_uid, original_gid)
+    # shutil.rmtree(tmp_dir)
 
 
 @pytest.fixture

tests/test_unstable/test_base.py

@@ -6,9 +6,9 @@
 from pathlib import Path
 
 import pytest
-
 from cognite.client import CogniteClient
 from cognite.client.exceptions import CogniteNotFoundError
+
 from cognite.extractorutils.statestore.watermark import LocalStateStore, RawStateStore
 from cognite.extractorutils.unstable.configuration.models import (
     ConnectionConfig,
@@ -163,7 +163,7 @@ def test_local_state_store_integration(local_state_file: Path, connection_config
 
 
 @pytest.fixture(scope="function")
-def raw_db_table_name() -> str:
+def raw_db_table_name() -> tuple[str, str]:
     """Provides a unique database name for a single test function run."""
     test_id = random.randint(0, int(1e9))
     return f"test_db_{test_id}", f"test_table_{test_id}"