Chore: Fix import woes

amotl · amotl · commit 4ccdcf6e1363 · 2025-04-23T13:26:10.000+02:00
diff --git a/cratedb_toolkit/adapter/pymongo/api.py b/cratedb_toolkit/adapter/pymongo/api.py
@@ -3,7 +3,7 @@
 import pymongo.collection
 
 from cratedb_toolkit.adapter.pymongo.collection import collection_factory
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 from cratedb_toolkit.util.pandas import patch_pandas_sqltable_with_extended_mapping
 from cratedb_toolkit.util.sqlalchemy import patch_types_map
 
diff --git a/cratedb_toolkit/adapter/pymongo/collection.py b/cratedb_toolkit/adapter/pymongo/collection.py
@@ -18,7 +18,7 @@
 
 from cratedb_toolkit.adapter.pymongo.cursor import cursor_factory
 from cratedb_toolkit.adapter.pymongo.util import AmendedObjectId as ObjectId
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/adapter/pymongo/cursor.py b/cratedb_toolkit/adapter/pymongo/cursor.py
@@ -23,7 +23,7 @@
 
 from cratedb_toolkit.adapter.pymongo.reactor import mongodb_query, table_to_model
 from cratedb_toolkit.adapter.pymongo.util import AmendedObjectId
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/adapter/rockset/server/api/document.py b/cratedb_toolkit/adapter/rockset/server/api/document.py
@@ -17,7 +17,7 @@
 from vasuki import generate_nagamani19_hash
 
 from cratedb_toolkit.adapter.rockset.server.dependencies import database_adapter
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger()
 
diff --git a/cratedb_toolkit/adapter/rockset/server/api/query.py b/cratedb_toolkit/adapter/rockset/server/api/query.py
@@ -17,8 +17,7 @@
 from vasuki import generate_nagamani19_hash
 
 from cratedb_toolkit.adapter.rockset.server.dependencies import database_adapter
-from cratedb_toolkit.util import DatabaseAdapter
-from cratedb_toolkit.util.database import get_table_names
+from cratedb_toolkit.util.database import DatabaseAdapter, get_table_names
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/adapter/rockset/server/dependencies.py b/cratedb_toolkit/adapter/rockset/server/dependencies.py
@@ -3,7 +3,7 @@
 import os
 from functools import lru_cache
 
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 
 @lru_cache
diff --git a/cratedb_toolkit/cfr/cli.py b/cratedb_toolkit/cfr/cli.py
@@ -13,9 +13,9 @@
 from cratedb_toolkit.cfr.info import InfoRecorder
 from cratedb_toolkit.cfr.systable import Archive, SystemTableExporter, SystemTableImporter
 from cratedb_toolkit.model import DatabaseAddress
-from cratedb_toolkit.util import DatabaseAdapter
 from cratedb_toolkit.util.cli import docstring_format_verbatim, error_logger, make_command
 from cratedb_toolkit.util.data import jd, path_from_url
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/cfr/info.py b/cratedb_toolkit/cfr/info.py
@@ -7,7 +7,7 @@
 import sqlalchemy as sa
 
 from cratedb_toolkit.info.core import InfoContainer, JobInfoContainer
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/cfr/systable.py b/cratedb_toolkit/cfr/systable.py
@@ -30,8 +30,8 @@
 from tqdm import tqdm
 
 from cratedb_toolkit.info.core import InfoContainer
-from cratedb_toolkit.util import DatabaseAdapter
 from cratedb_toolkit.util.cli import error_logger
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/cluster/cli.py b/cratedb_toolkit/cluster/cli.py
@@ -5,8 +5,8 @@
 
 from cratedb_toolkit.cluster.util import get_cluster_info
 from cratedb_toolkit.exception import CroudException
-from cratedb_toolkit.util import jd
 from cratedb_toolkit.util.cli import boot_click, make_command
+from cratedb_toolkit.util.data import jd
 
 
 @click.group(cls=ClickAliasedGroup)  # type: ignore[arg-type]
diff --git a/cratedb_toolkit/cmd/tail/cli.py b/cratedb_toolkit/cmd/tail/cli.py
@@ -5,8 +5,8 @@
 
 from cratedb_toolkit.cmd.tail.main import TableTailer
 from cratedb_toolkit.model import TableAddress
-from cratedb_toolkit.util import DatabaseAdapter
 from cratedb_toolkit.util.cli import boot_click
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/cmd/tail/main.py b/cratedb_toolkit/cmd/tail/main.py
@@ -11,7 +11,7 @@
 import yaml
 
 from cratedb_toolkit.model import TableAddress
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/datasets/model.py b/cratedb_toolkit/datasets/model.py
@@ -4,7 +4,7 @@
 import requests
 import sqlparse
 
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 try:
     from typing import Literal
diff --git a/cratedb_toolkit/info/cli.py b/cratedb_toolkit/info/cli.py
@@ -6,9 +6,9 @@
 
 from cratedb_toolkit.api.cli import make_cli
 from cratedb_toolkit.info.core import InfoContainer, JobInfoContainer, LogContainer
-from cratedb_toolkit.util import DatabaseAdapter
 from cratedb_toolkit.util.cli import make_command
 from cratedb_toolkit.util.data import jd
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/info/http.py b/cratedb_toolkit/info/http.py
@@ -9,7 +9,7 @@
 
 from cratedb_toolkit.info.core import InfoContainer
 from cratedb_toolkit.info.util import get_baseinfo
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 from cratedb_toolkit.util.service import start_service
 
 logger = logging.getLogger(__name__)
diff --git a/cratedb_toolkit/info/model.py b/cratedb_toolkit/info/model.py
@@ -5,7 +5,7 @@
 from abc import abstractmethod
 
 from cratedb_toolkit.info.util import get_baseinfo
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 
 @dataclasses.dataclass
diff --git a/cratedb_toolkit/io/dynamodb/copy.py b/cratedb_toolkit/io/dynamodb/copy.py
@@ -10,8 +10,8 @@
 from cratedb_toolkit.io.core import BulkProcessor
 from cratedb_toolkit.io.dynamodb.adapter import DynamoDBAdapter
 from cratedb_toolkit.model import DatabaseAddress
-from cratedb_toolkit.util import DatabaseAdapter
 from cratedb_toolkit.util.data import asbool
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/io/kinesis/relay.py b/cratedb_toolkit/io/kinesis/relay.py
@@ -10,7 +10,7 @@
 
 from cratedb_toolkit.io.kinesis.adapter import KinesisAdapter
 from cratedb_toolkit.model import DatabaseAddress
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/io/mongodb/cdc.py b/cratedb_toolkit/io/mongodb/cdc.py
@@ -22,7 +22,7 @@
 from cratedb_toolkit.io.mongodb.model import DocumentDict
 from cratedb_toolkit.io.mongodb.transform import TransformationManager
 from cratedb_toolkit.model import DatabaseAddress
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 from cratedb_toolkit.util.process import FixedBackoff
 
 logger = logging.getLogger(__name__)
diff --git a/cratedb_toolkit/io/mongodb/copy.py b/cratedb_toolkit/io/mongodb/copy.py
@@ -13,7 +13,7 @@
 from cratedb_toolkit.io.mongodb.adapter import mongodb_adapter_factory
 from cratedb_toolkit.io.mongodb.transform import TransformationManager
 from cratedb_toolkit.model import DatabaseAddress
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/model.py b/cratedb_toolkit/model.py
@@ -128,7 +128,7 @@ def fullname(self):
         """
         Return a full-qualified quoted table identifier.
         """
-        from cratedb_toolkit.util import DatabaseAdapter
+        from cratedb_toolkit.util.database import DatabaseAdapter
 
         return DatabaseAdapter.quote_relation_name(f"{self.schema}.{self.table}")
 
diff --git a/cratedb_toolkit/testing/testcontainers/cratedb.py b/cratedb_toolkit/testing/testcontainers/cratedb.py
@@ -23,7 +23,7 @@
 from testcontainers.core.waiting_utils import wait_container_is_ready, wait_for_logs
 
 from cratedb_toolkit.testing.testcontainers.util import KeepaliveContainer, asbool
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/cratedb_toolkit/util/__init__.py b/cratedb_toolkit/util/__init__.py
@@ -1,3 +0,0 @@
-from cratedb_toolkit.util.cli import boot_with_dburi  # noqa: F401
-from cratedb_toolkit.util.data import jd  # noqa: F401
-from cratedb_toolkit.util.database import DatabaseAdapter  # noqa: F401
diff --git a/examples/retention_edit.py b/examples/retention_edit.py
@@ -35,7 +35,9 @@
 from cratedb_toolkit.retention.model import JobSettings, RetentionPolicy, RetentionStrategy
 from cratedb_toolkit.retention.setup.schema import setup_schema
 from cratedb_toolkit.retention.store import RetentionPolicyStore
-from cratedb_toolkit.util import DatabaseAdapter, boot_with_dburi, jd
+from cratedb_toolkit.util.cli import boot_with_dburi
+from cratedb_toolkit.util.data import jd
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/examples/retention_retire_cutoff.py b/examples/retention_retire_cutoff.py
@@ -42,7 +42,8 @@
 from cratedb_toolkit.retention.model import JobSettings, RetentionPolicy, RetentionStrategy
 from cratedb_toolkit.retention.setup.schema import setup_schema
 from cratedb_toolkit.retention.store import RetentionPolicyStore
-from cratedb_toolkit.util import DatabaseAdapter, boot_with_dburi
+from cratedb_toolkit.util.cli import boot_with_dburi
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/datasets/conftest.py b/tests/datasets/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 from tests.conftest import TESTDRIVE_DATA_SCHEMA
 
 
diff --git a/tests/datasets/test_loading.py b/tests/datasets/test_loading.py
@@ -7,7 +7,7 @@
 from cratedb_toolkit.datasets import load_dataset
 from cratedb_toolkit.datasets.model import Dataset
 from cratedb_toolkit.datasets.store import registry
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 
 class Enumerator:
diff --git a/tests/sqlalchemy/conftest.py b/tests/sqlalchemy/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 from tests.conftest import TESTDRIVE_DATA_SCHEMA
 
 
diff --git a/tests/util/database.py b/tests/util/database.py
@@ -1,6 +1,6 @@
 import pytest
 
-from cratedb_toolkit.util import DatabaseAdapter
+from cratedb_toolkit.util.database import DatabaseAdapter
 
 
 def test_quote_relation_name_single():
