reduce from 3 to 2 packages

src/nominatim_db/tools/add_osm_data.py

@@ -12,8 +12,8 @@ from pathlib import Path
 import logging
 import urllib
 
-from nominatim_core.db.connection import connect
-from nominatim_core.utils.url_utils import get_url
+from ..db.connection import connect
+from ..utils.url_utils import get_url
 from .exec_utils import run_osm2pgsql
 
 LOG = logging.getLogger()

src/nominatim_db/tools/admin.py

@@ -13,10 +13,10 @@ import logging
 from psycopg2.extras import Json, register_hstore
 from psycopg2 import DataError
 
-from nominatim_core.typing import DictCursorResult
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect, Cursor
-from nominatim_core.errors import UsageError
+from ..typing import DictCursorResult
+from ..config import Configuration
+from ..db.connection import connect, Cursor
+from ..errors import UsageError
 from ..tokenizer import factory as tokenizer_factory
 from ..data.place_info import PlaceInfo
 

src/nominatim_db/tools/check_database.py

@@ -11,10 +11,10 @@ from typing import Callable, Optional, Any, Union, Tuple, Mapping, List
 from enum import Enum
 from textwrap import dedent
 
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect, Connection
-from nominatim_core.db import properties
-from nominatim_core.errors import UsageError
+from ..config import Configuration
+from ..db.connection import connect, Connection
+from ..db import properties
+from ..errors import UsageError
 from ..tokenizer import factory as tokenizer_factory
 from . import freeze
 from ..version import NOMINATIM_VERSION, parse_version

src/nominatim_db/tools/collect_os_info.py

@@ -17,8 +17,8 @@ from typing import List, Optional, Tuple, Union
 import psutil
 from psycopg2.extensions import make_dsn, parse_dsn
 
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect
+from ..config import Configuration
+from ..db.connection import connect
 from ..version import NOMINATIM_VERSION
 
 

src/nominatim_db/tools/convert_sqlite.py

@@ -16,8 +16,8 @@ import sqlalchemy as sa
 
 import nominatim_api as napi
 from nominatim_api.search.query_analyzer_factory import make_query_analyzer
-from nominatim_core.typing import SaSelect, SaRow
-from nominatim_core.db.sqlalchemy_types import Geometry, IntArray
+from nominatim_api.typing import SaSelect, SaRow
+from nominatim_api.sql.sqlalchemy_types import Geometry, IntArray
 
 LOG = logging.getLogger()
 

src/nominatim_db/tools/database_import.py

@@ -17,11 +17,11 @@ from pathlib import Path
 import psutil
 from psycopg2 import sql as pysql
 
-from nominatim_core.errors import UsageError
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect, get_pg_env, Connection
-from nominatim_core.db.async_connection import DBConnection
-from nominatim_core.db.sql_preprocessor import SQLPreprocessor
+from ..errors import UsageError
+from ..config import Configuration
+from ..db.connection import connect, get_pg_env, Connection
+from ..db.async_connection import DBConnection
+from ..db.sql_preprocessor import SQLPreprocessor
 from .exec_utils import run_osm2pgsql
 from ..version import POSTGRESQL_REQUIRED_VERSION, POSTGIS_REQUIRED_VERSION
 

src/nominatim_db/tools/exec_utils.py

@@ -13,8 +13,8 @@ import os
 import subprocess
 import shutil
 
-from nominatim_core.typing import StrPath
-from nominatim_core.db.connection import get_pg_env
+from ..typing import StrPath
+from ..db.connection import get_pg_env
 
 LOG = logging.getLogger()
 

src/nominatim_db/tools/freeze.py

@@ -12,7 +12,7 @@ from pathlib import Path
 
 from psycopg2 import sql as pysql
 
-from nominatim_core.db.connection import Connection
+from ..db.connection import Connection
 
 UPDATE_TABLES = [
     'address_levels',

src/nominatim_db/tools/migration.py

@@ -12,10 +12,10 @@ import logging
 
 from psycopg2 import sql as pysql
 
-from nominatim_core.errors import UsageError
-from nominatim_core.config import Configuration
-from nominatim_core.db import properties
-from nominatim_core.db.connection import connect, Connection
+from ..errors import UsageError
+from ..config import Configuration
+from ..db import properties
+from ..db.connection import connect, Connection
 from ..version import NominatimVersion, NOMINATIM_VERSION, parse_version
 from ..tokenizer import factory as tokenizer_factory
 from . import refresh

src/nominatim_db/tools/postcodes.py

@@ -18,8 +18,8 @@ from math import isfinite
 
 from psycopg2 import sql as pysql
 
-from nominatim_core.db.connection import connect, Connection
-from nominatim_core.utils.centroid import PointsCentroid
+from ..db.connection import connect, Connection
+from ..utils.centroid import PointsCentroid
 from ..data.postcode_format import PostcodeFormatter, CountryPostcodeMatcher
 from ..tokenizer.base import AbstractAnalyzer, AbstractTokenizer
 

src/nominatim_db/tools/refresh.py

@@ -16,10 +16,10 @@ from pathlib import Path
 
 from psycopg2 import sql as pysql
 
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import Connection, connect
-from nominatim_core.db.utils import execute_file, CopyBuffer
-from nominatim_core.db.sql_preprocessor import SQLPreprocessor
+from ..config import Configuration
+from ..db.connection import Connection, connect
+from ..db.utils import execute_file, CopyBuffer
+from ..db.sql_preprocessor import SQLPreprocessor
 from ..version import NOMINATIM_VERSION
 
 LOG = logging.getLogger()

src/nominatim_db/tools/replication.py

@@ -18,9 +18,9 @@ import urllib.request as urlrequest
 
 import requests
 
-from nominatim_core.errors import UsageError
-from nominatim_core.db import status
-from nominatim_core.db.connection import Connection, connect
+from ..errors import UsageError
+from ..db import status
+from ..db.connection import Connection, connect
 from .exec_utils import run_osm2pgsql
 
 try:

src/nominatim_db/tools/special_phrases/sp_csv_loader.py

@@ -13,7 +13,7 @@ from typing import Iterable
 import csv
 import os
 
-from nominatim_core.errors import UsageError
+from ...errors import UsageError
 from .special_phrase import SpecialPhrase
 
 class SPCsvLoader:

src/nominatim_db/tools/special_phrases/sp_importer.py

@@ -19,9 +19,9 @@ import re
 
 from psycopg2.sql import Identifier, SQL
 
-from nominatim_core.typing import Protocol
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import Connection
+from ...typing import Protocol
+from ...config import Configuration
+from ...db.connection import Connection
 from .importer_statistics import SpecialPhrasesImporterStatistics
 from .special_phrase import SpecialPhrase
 from ...tokenizer.base import AbstractTokenizer

src/nominatim_db/tools/special_phrases/sp_wiki_loader.py

@@ -11,8 +11,8 @@ from typing import Iterable
 import re
 import logging
 
-from nominatim_core.config import Configuration
-from nominatim_core.utils.url_utils import get_url
+from ...config import Configuration
+from ...utils.url_utils import get_url
 from .special_phrase import SpecialPhrase
 
 LOG = logging.getLogger()

src/nominatim_db/tools/tiger_data.py

@@ -16,11 +16,11 @@ import tarfile
 
 from psycopg2.extras import Json
 
-from nominatim_core.config import Configuration
-from nominatim_core.db.connection import connect
-from nominatim_core.db.async_connection import WorkerPool
-from nominatim_core.db.sql_preprocessor import SQLPreprocessor
-from nominatim_core.errors import UsageError
+from ..config import Configuration
+from ..db.connection import connect
+from ..db.async_connection import WorkerPool
+from ..db.sql_preprocessor import SQLPreprocessor
+from ..errors import UsageError
 from ..data.place_info import PlaceInfo
 from ..tokenizer.base import AbstractAnalyzer, AbstractTokenizer
 from . import freeze