Add no_implicit_reexport to mypy and fix errors

Reasoning: https://justincaustin.com/blog/mypy-tips-and-tricks#no-implicit-re-export

Author: mildbyte

mypy.ini

@@ -18,6 +18,9 @@ warn_unreachable = True
 
 check_untyped_defs = True
 
+# Disallow importing c from a.b if it imports c itself (unless specified in __all__)
+no_implicit_reexport = True
+
 exclude = ^(engine|examples|docs|test)
 
 [pydantic-mypy]

splitgraph/cloud/__init__.py

@@ -66,10 +66,12 @@
     START_EXPORT,
     START_LOAD,
 )
-from splitgraph.config import CONFIG, create_config_dict, get_singleton
+from splitgraph.config import CONFIG
 from splitgraph.config.config import (
+    create_config_dict,
     get_all_in_subsection,
     get_from_subsection,
+    get_singleton,
     set_in_subsection,
 )
 from splitgraph.config.export import overwrite_config

splitgraph/cloud/project/dbt.py

@@ -29,7 +29,7 @@ def generate_dbt_project(repositories: List[str], basedir: Path) -> None:
         f.write(DBT_PROJECT_TEMPLATE)
 
     # Generate models/staging/sources.yml
-    yml = ruamel.yaml.YAML()
+    yml = ruamel.yaml.main.YAML()
     sources_yml = yml.load(SOURCES_YML_TEMPLATE)
     sources_yml["sources"][0]["name"] = get_source_name(repositories[0])
     sources_yml["sources"][0]["schema"] = repositories[0]

splitgraph/cloud/project/generation.py

@@ -9,10 +9,11 @@
 
 import ruamel.yaml
 from pydantic import BaseModel, Field
-from ruamel.yaml import CommentedMap as CM
-from ruamel.yaml import CommentedSeq as CS
+from ruamel.yaml.comments import CommentedMap as CM
+from ruamel.yaml.comments import CommentedSeq as CS
 
-from splitgraph.cloud import GQLAPIClient, Plugin
+from splitgraph.cloud import GQLAPIClient
+from splitgraph.cloud.models import Plugin
 from splitgraph.cloud.project.dbt import (
     generate_dbt_plugin_params,
     generate_dbt_project,
@@ -120,7 +121,7 @@ def stub_plugin(plugin: Plugin, namespace: str, repository: str, is_live: bool =
     """
     Generate a splitgraph.yml file based on a plugin's JSONSchemas.
     """
-    yml = ruamel.yaml.YAML()
+    yml = ruamel.yaml.main.YAML()
     repositories_yaml = (
         SPLITGRAPH_YML_TEMPLATE.replace("CREDENTIAL_NAME", plugin.plugin_name)
         .replace("NAMESPACE", namespace)
@@ -179,7 +180,7 @@ def generate_project(
     decoded_seed = ProjectSeed.decode(seed)
     credentials, repositories, repository_info = generate_splitgraph_yml(all_plugins, decoded_seed)
 
-    yml = ruamel.yaml.YAML()
+    yml = ruamel.yaml.main.YAML()
     with open(os.path.join(basedir, "splitgraph.credentials.yml"), "w") as f:
         yml.dump(credentials, f)
 

splitgraph/commandline/__init__.py

@@ -90,7 +90,8 @@ def _do_version_check():
     from packaging.version import Version
 
     from splitgraph.cloud import RESTAPIClient
-    from splitgraph.config import CONFIG, get_singleton
+    from splitgraph.config import CONFIG
+    from splitgraph.config.config import get_singleton
 
     api_client = RESTAPIClient(get_singleton(CONFIG, "SG_UPDATE_REMOTE"))
     latest = api_client.get_latest_version()

splitgraph/commandline/cloud.py

@@ -1177,7 +1177,7 @@ def stub_c(remote, plugin_name, repository, output_file):
     if not plugin:
         raise click.UsageError("Plugin %s not found on remote %s" % (plugin_name, remote))
 
-    yml = ruamel.yaml.YAML()
+    yml = ruamel.yaml.main.YAML()
     output = stub_plugin(plugin, repository.namespace, repository.repository)
     yml.dump(output, output_file)
 

splitgraph/commandline/engine.py

@@ -9,7 +9,8 @@
 from tqdm import tqdm
 
 from splitgraph.__version__ import __version__
-from splitgraph.config import CONFIG, SG_CMD_ASCII, get_singleton
+from splitgraph.config import CONFIG, SG_CMD_ASCII
+from splitgraph.config.config import get_singleton
 from splitgraph.config.management import patch_and_save_config
 from splitgraph.exceptions import DockerUnavailableError, EngineSetupError
 from splitgraph.utils.docker import copy_to_container, get_docker_client

splitgraph/config/export.py

@@ -1,8 +1,7 @@
 """Routines for exporting the config back into text."""
 from typing import Dict, cast
 
-from splitgraph.config import get_singleton
-from splitgraph.config.config import get_all_in_section
+from splitgraph.config.config import get_all_in_section, get_singleton
 from splitgraph.config.keys import DEFAULTS, KEYS, SENSITIVE_KEY_SUFFIXES, ConfigDict
 
 

splitgraph/core/engine.py

@@ -6,7 +6,8 @@
 
 from psycopg2.sql import SQL, Identifier
 
-from splitgraph.config import CONFIG, SPLITGRAPH_API_SCHEMA, get_singleton
+from splitgraph.config import CONFIG, SPLITGRAPH_API_SCHEMA
+from splitgraph.config.config import get_singleton
 from splitgraph.engine import ResultShape
 from splitgraph.exceptions import RepositoryNotFoundError
 

splitgraph/core/fdw_checkout.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, Callable, Optional
 
 import splitgraph.config
-from splitgraph.config import get_singleton
+from splitgraph.config.config import get_singleton
 from splitgraph.core.object_manager import ObjectManager
 from splitgraph.core.output import pretty_size
 from splitgraph.core.repository import Repository

splitgraph/core/image.py

@@ -23,8 +23,8 @@
     FDW_CLASS,
     SPLITGRAPH_API_SCHEMA,
     SPLITGRAPH_META_SCHEMA,
-    get_singleton,
 )
+from splitgraph.config.config import get_singleton
 from splitgraph.engine import ResultShape
 from splitgraph.exceptions import SplitGraphError, TableNotFoundError
 

splitgraph/core/object_manager.py

@@ -21,7 +21,8 @@
 
 from psycopg2.sql import SQL, Identifier
 
-from splitgraph.config import CONFIG, SPLITGRAPH_META_SCHEMA, get_singleton
+from splitgraph.config import CONFIG, SPLITGRAPH_META_SCHEMA
+from splitgraph.config.config import get_singleton
 from splitgraph.core.fragment_manager import FragmentManager
 from splitgraph.core.types import Quals
 from splitgraph.engine import ResultShape

splitgraph/core/repository.py

@@ -29,8 +29,8 @@
     FDW_CLASS,
     SPLITGRAPH_API_SCHEMA,
     SPLITGRAPH_META_SCHEMA,
-    get_singleton,
 )
+from splitgraph.config.config import get_singleton
 from splitgraph.core.fragment_manager import ExtraIndexInfo
 from splitgraph.core.image import Image
 from splitgraph.core.image_manager import ImageManager

splitgraph/engine/config.py

@@ -1,8 +1,8 @@
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, Dict, Iterator, Optional, Union, cast
 
-from splitgraph.config import CONFIG, get_singleton
-from splitgraph.config.config import get_all_in_section
+from splitgraph.config import CONFIG
+from splitgraph.config.config import get_all_in_section, get_singleton
 from splitgraph.config.keys import ConfigDict
 
 if TYPE_CHECKING:

splitgraph/hooks/data_source/__init__.py

@@ -5,8 +5,8 @@
 from importlib import import_module
 from typing import Any, Dict, List, Optional, Type, cast
 
-from ...config import CONFIG, get_singleton
-from ...config.config import get_all_in_section
+from ...config import CONFIG
+from ...config.config import get_all_in_section, get_singleton
 from ...config.keys import DEFAULTS
 from ...exceptions import DataSourceError
 from .base import DataSource

splitgraph/hooks/s3.py

@@ -7,7 +7,8 @@
 
 from tqdm import tqdm
 
-from splitgraph.config import CONFIG, SG_CMD_ASCII, get_singleton
+from splitgraph.config import CONFIG, SG_CMD_ASCII
+from splitgraph.config.config import get_singleton
 from splitgraph.engine import ResultShape
 from splitgraph.engine.config import get_engine
 from splitgraph.engine.postgres.psycopg import PsycopgEngine

splitgraph/ingestion/csv/fdw.py

@@ -11,7 +11,7 @@
 from urllib3 import HTTPResponse
 
 import splitgraph.config
-from splitgraph.config import get_singleton
+from splitgraph.config.config import get_singleton
 from splitgraph.exceptions import get_exception_name
 from splitgraph.ingestion.common import generate_column_names
 from splitgraph.ingestion.csv.common import (

splitgraph/ingestion/dbt/utils.py

@@ -8,7 +8,7 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
 
 from docker.types import LogConfig
-from ruamel.yaml import YAMLError
+from ruamel.yaml.error import YAMLError
 
 from splitgraph.ingestion.airbyte.docker_utils import (
     detect_network_mode,

splitgraph/ingestion/socrata/fdw.py

@@ -5,7 +5,7 @@
 from typing import Any, Dict, Optional
 
 import splitgraph.config
-from splitgraph.config import get_singleton
+from splitgraph.config.config import get_singleton
 from splitgraph.ingestion.socrata.querying import (
     cols_to_socrata,
     estimate_socrata_rows_width,

splitgraph/utils/yaml.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ruamel.yaml import YAML
+from ruamel.yaml.main import YAML
 
 
 def safe_load(stream) -> Any: