chore: Disallow relative imports

bchampp · bchampp · commit d4f4d3e61f31 · 2026-01-30T13:36:55.000-05:00
Update the linting configuration in SAM CLI to disallow relative imports.
Add TID (flake8-tidy-imports) rule to ruff configuration with
ban-relative-imports set to 'all'. Convert all instances of relative
imports to absolute imports throughout the codebase.

This improves code clarity and makes import paths more explicit.
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,9 +10,13 @@ select = [
     "F",  # Pyflakes
     "PL", # pylint
     "I",  # isort
+    "TID", # flake8-tidy-imports
 ]
 ignore = ["PLR0913", "PLC0415", "PLW1641"]
 
+[tool.ruff.lint.flake8-tidy-imports]
+ban-relative-imports = "all"
+
 [tool.ruff.lint.pylint]
 max-branches = 25
 max-returns = 8
diff --git a/samcli/cli/options.py b/samcli/cli/options.py
@@ -5,7 +5,7 @@
 
 import click
 
-from .context import Context
+from samcli.cli.context import Context
 
 
 def debug_option(f):
diff --git a/samcli/commands/bootstrap/__init__.py b/samcli/commands/bootstrap/__init__.py
@@ -3,4 +3,4 @@
 """
 
 # Expose the cli object here
-from .command import cli  # pragma: no cover
+from samcli.commands.bootstrap.command import cli  # pragma: no cover
diff --git a/samcli/commands/init/__init__.py b/samcli/commands/init/__init__.py
@@ -2,4 +2,4 @@
 Expose top level cli command for `init`
 """
 
-from .command import cli
+from samcli.commands.init.command import cli
diff --git a/samcli/commands/pipeline/bootstrap/cli.py b/samcli/commands/pipeline/bootstrap/cli.py
@@ -23,7 +23,7 @@
 from samcli.lib.telemetry.metric import track_command
 from samcli.lib.utils.version_checker import check_newer_version
 
-from .guided_context import BITBUCKET, GITHUB_ACTIONS, GITLAB, IAM, OPEN_ID_CONNECT
+from samcli.commands.pipeline.bootstrap.guided_context import BITBUCKET, GITHUB_ACTIONS, GITLAB, IAM, OPEN_ID_CONNECT
 
 SHORT_HELP = "Generates the required AWS resources to connect your CI/CD system."
 
diff --git a/samcli/commands/pipeline/init/interactive_init_flow.py b/samcli/commands/pipeline/init/interactive_init_flow.py
@@ -27,13 +27,9 @@
 from samcli.lib.utils.colors import Colored
 from samcli.lib.utils.git_repo import CloneRepoException, GitRepo
 
-from ..bootstrap.cli import (
-    PIPELINE_CONFIG_DIR,
-    PIPELINE_CONFIG_FILENAME,
-    _get_bootstrap_command_names,
-)
-from ..bootstrap.cli import do_cli as do_bootstrap
-from .pipeline_templates_manifest import PipelineTemplateMetadata, PipelineTemplatesManifest, Provider
+from samcli.commands.pipeline.bootstrap.cli import PIPELINE_CONFIG_DIR, PIPELINE_CONFIG_FILENAME, _get_bootstrap_command_names
+from samcli.commands.pipeline.bootstrap.cli import do_cli as do_bootstrap
+from samcli.commands.pipeline.init.pipeline_templates_manifest import PipelineTemplateMetadata, PipelineTemplatesManifest, Provider
 
 LOG = logging.getLogger(__name__)
 shared_path: Path = GlobalConfig().config_dir
diff --git a/samcli/hook_packages/terraform/__init__.py b/samcli/hook_packages/terraform/__init__.py
@@ -2,4 +2,4 @@
 Expose top level prepare hook
 """
 
-from .main import prepare
+from samcli.hook_packages.terraform.main import prepare
diff --git a/samcli/hook_packages/terraform/main.py b/samcli/hook_packages/terraform/main.py
@@ -2,7 +2,7 @@
 Module for Terraform hook entry points
 """
 
-from .hooks.prepare.hook import prepare as prepare_hook
+from samcli.hook_packages.terraform.hooks.prepare.hook import prepare as prepare_hook
 
 
 def prepare(params: dict) -> dict:
diff --git a/samcli/lib/cookiecutter/interactive_flow.py b/samcli/lib/cookiecutter/interactive_flow.py
@@ -4,8 +4,8 @@
 
 import click
 
-from ..utils.colors import Colored
-from .question import Question
+from samcli.lib.utils.colors import Colored
+from samcli.lib.cookiecutter.question import Question
 
 
 class InteractiveFlow:
diff --git a/samcli/lib/cookiecutter/interactive_flow_creator.py b/samcli/lib/cookiecutter/interactive_flow_creator.py
@@ -7,8 +7,8 @@
 from samcli.commands.exceptions import UserException
 from samcli.yamlhelper import parse_yaml_file
 
-from .interactive_flow import InteractiveFlow
-from .question import Question, QuestionFactory
+from samcli.lib.cookiecutter.interactive_flow import InteractiveFlow
+from samcli.lib.cookiecutter.question import Question, QuestionFactory
 
 
 class QuestionsNotFoundException(UserException):
diff --git a/samcli/lib/cookiecutter/plugin.py b/samcli/lib/cookiecutter/plugin.py
@@ -4,8 +4,8 @@
 
 from typing import NamedTuple
 
-from .interactive_flow import InteractiveFlow
-from .processor import Processor
+from samcli.lib.cookiecutter.interactive_flow import InteractiveFlow
+from samcli.lib.cookiecutter.processor import Processor
 
 
 class Plugin(NamedTuple):
diff --git a/samcli/lib/cookiecutter/template.py b/samcli/lib/cookiecutter/template.py
@@ -12,10 +12,10 @@
 from samcli.commands.exceptions import UserException
 from samcli.lib.init.arbitrary_project import generate_non_cookiecutter_project
 
-from .exceptions import GenerateProjectFailedError, InvalidLocationError, PostprocessingError, PreprocessingError
-from .interactive_flow import InteractiveFlow
-from .plugin import Plugin
-from .processor import Processor
+from samcli.lib.cookiecutter.exceptions import GenerateProjectFailedError, InvalidLocationError, PostprocessingError, PreprocessingError
+from samcli.lib.cookiecutter.interactive_flow import InteractiveFlow
+from samcli.lib.cookiecutter.plugin import Plugin
+from samcli.lib.cookiecutter.processor import Processor
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/lib/hook/hook_config.py b/samcli/lib/hook/hook_config.py
@@ -6,7 +6,7 @@
 
 import jsonschema
 
-from .exceptions import InvalidHookPackageConfigException
+from samcli.lib.hook.exceptions import InvalidHookPackageConfigException
 
 
 class HookFunctionality(NamedTuple):
diff --git a/samcli/lib/hook/hook_wrapper.py b/samcli/lib/hook/hook_wrapper.py
@@ -7,11 +7,8 @@
 from pathlib import Path
 from typing import Dict, List, Optional, cast
 
-from .exceptions import (
-    HookPackageExecuteFunctionalityException,
-    InvalidHookWrapperException,
-)
-from .hook_config import HookPackageConfig
+from samcli.lib.hook.exceptions import HookPackageExecuteFunctionalityException, InvalidHookWrapperException
+from samcli.lib.hook.hook_config import HookPackageConfig
 
 LOG = logging.getLogger(__name__)
 INTERNAL_PACKAGES_ROOT = Path(__file__).parent / ".." / ".." / "hook_packages"
diff --git a/samcli/lib/init/__init__.py b/samcli/lib/init/__init__.py
@@ -23,8 +23,8 @@
 from samcli.lib.utils.packagetype import ZIP
 from samcli.local.common.runtime_template import RUNTIME_DEP_TEMPLATE_MAPPING, is_custom_runtime
 
-from .arbitrary_project import generate_non_cookiecutter_project
-from .exceptions import GenerateProjectFailedError, InvalidLocationError
+from samcli.lib.init.arbitrary_project import generate_non_cookiecutter_project
+from samcli.lib.init.exceptions import GenerateProjectFailedError, InvalidLocationError
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/lib/init/arbitrary_project.py b/samcli/lib/init/arbitrary_project.py
@@ -10,7 +10,7 @@
 
 from samcli.lib.utils import osutils
 
-from .exceptions import ArbitraryProjectDownloadFailed
+from samcli.lib.init.exceptions import ArbitraryProjectDownloadFailed
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/lib/providers/sam_function_provider.py b/samcli/lib/providers/sam_function_provider.py
@@ -25,10 +25,10 @@
     AWS_SERVERLESS_LAYERVERSION,
 )
 
-from ..build.constants import DEPRECATED_RUNTIMES
-from .provider import Function, LayerVersion, Stack, get_full_path, get_function_build_info
-from .sam_base_provider import SamBaseProvider
-from .sam_stack_provider import SamLocalStackProvider
+from samcli.lib.build.constants import DEPRECATED_RUNTIMES
+from samcli.lib.providers.provider import Function, LayerVersion, Stack, get_full_path, get_function_build_info
+from samcli.lib.providers.sam_base_provider import SamBaseProvider
+from samcli.lib.providers.sam_stack_provider import SamLocalStackProvider
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/lib/providers/sam_layer_provider.py b/samcli/lib/providers/sam_layer_provider.py
@@ -7,9 +7,9 @@
 
 from samcli.lib.utils.resources import AWS_LAMBDA_LAYERVERSION, AWS_SERVERLESS_LAYERVERSION
 
-from .provider import LayerVersion, Stack
-from .sam_base_provider import SamBaseProvider
-from .sam_stack_provider import SamLocalStackProvider
+from samcli.lib.providers.provider import LayerVersion, Stack
+from samcli.lib.providers.sam_base_provider import SamBaseProvider
+from samcli.lib.providers.sam_stack_provider import SamLocalStackProvider
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/lib/samlib/wrapper.py b/samcli/lib/samlib/wrapper.py
@@ -27,7 +27,7 @@
 
 from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
 
-from .local_uri_plugin import SupportLocalUriPlugin
+from samcli.lib.samlib.local_uri_plugin import SupportLocalUriPlugin
 
 
 class SamTranslatorWrapper:
diff --git a/samcli/local/docker/lambda_container.py b/samcli/local/docker/lambda_container.py
@@ -10,8 +10,8 @@
 from samcli.local.docker.exceptions import InvalidRuntimeException
 from samcli.local.docker.lambda_debug_settings import LambdaDebugSettings
 
-from .container import DEFAULT_CONTAINER_HOST_INTERFACE, Container
-from .lambda_image import LambdaImage, Runtime
+from samcli.local.docker.container import DEFAULT_CONTAINER_HOST_INTERFACE, Container
+from samcli.local.docker.lambda_image import LambdaImage, Runtime
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/local/lambda_service/local_lambda_http_service.py b/samcli/local/lambda_service/local_lambda_http_service.py
@@ -17,7 +17,7 @@
 from samcli.local.lambdafn.exceptions import DurableExecutionNotFound, FunctionNotFound, UnsupportedInvocationType
 from samcli.local.services.base_local_service import BaseLocalService, LambdaOutputParser
 
-from .lambda_error_responses import LambdaErrorResponses
+from samcli.local.lambda_service.lambda_error_responses import LambdaErrorResponses
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/local/lambdafn/config.py b/samcli/local/lambdafn/config.py
@@ -4,7 +4,7 @@
 
 from samcli.commands.local.cli_common.user_exceptions import InvalidSamTemplateException
 
-from .env_vars import EnvironmentVariables
+from samcli.local.lambdafn.env_vars import EnvironmentVariables
 
 
 class FunctionConfig:
diff --git a/samcli/local/lambdafn/runtime.py b/samcli/local/lambdafn/runtime.py
@@ -22,9 +22,9 @@
 from samcli.local.docker.lambda_container import LambdaContainer
 from samcli.local.lambdafn.exceptions import UnsupportedInvocationType
 
-from ...lib.providers.provider import LayerVersion
-from ...lib.utils.stream_writer import StreamWriter
-from .zip import unzip
+from samcli.lib.providers.provider import LayerVersion
+from samcli.lib.utils.stream_writer import StreamWriter
+from samcli.local.lambdafn.zip import unzip
 
 LOG = logging.getLogger(__name__)
 
diff --git a/samcli/vendor/serverlessrepo/__init__.py b/samcli/vendor/serverlessrepo/__init__.py
@@ -1,5 +1,3 @@
 """Common library for AWS Serverless Application Repository."""
 
-from .publish import (  # noqa: F401
-    publish_application,
-)
+from samcli.vendor.serverlessrepo.publish import publish_application
diff --git a/samcli/vendor/serverlessrepo/application_metadata.py b/samcli/vendor/serverlessrepo/application_metadata.py
@@ -1,6 +1,6 @@
 """Module containing class to store SAR application metadata."""
 
-from .exceptions import InvalidApplicationMetadataError
+from samcli.vendor.serverlessrepo.exceptions import InvalidApplicationMetadataError
 
 
 class ApplicationMetadata(object):
diff --git a/samcli/vendor/serverlessrepo/parser.py b/samcli/vendor/serverlessrepo/parser.py
@@ -9,8 +9,8 @@
 
 from samcli.yamlhelper import intrinsics_multi_constructor
 
-from .application_metadata import ApplicationMetadata
-from .exceptions import ApplicationMetadataNotFoundError
+from samcli.vendor.serverlessrepo.application_metadata import ApplicationMetadata
+from samcli.vendor.serverlessrepo.exceptions import ApplicationMetadataNotFoundError
 
 METADATA = "Metadata"
 SERVERLESS_REPO_APPLICATION = "AWS::ServerlessRepo::Application"
diff --git a/samcli/vendor/serverlessrepo/publish.py b/samcli/vendor/serverlessrepo/publish.py
@@ -9,15 +9,9 @@
 
 from samcli.yamlhelper import yaml_dump
 
-from .application_metadata import ApplicationMetadata
-from .exceptions import (
-    DuplicateSemanticVersionError,
-    InvalidS3UriError,
-    MissingSemanticVersionError,
-    S3PermissionsRequired,
-    ServerlessRepoClientError,
-)
-from .parser import get_app_metadata, parse_application_id, parse_template, strip_app_metadata
+from samcli.vendor.serverlessrepo.application_metadata import ApplicationMetadata
+from samcli.vendor.serverlessrepo.exceptions import DuplicateSemanticVersionError, InvalidS3UriError, MissingSemanticVersionError, S3PermissionsRequired, ServerlessRepoClientError
+from samcli.vendor.serverlessrepo.parser import get_app_metadata, parse_application_id, parse_template, strip_app_metadata
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/integration/buildcmd/test_build_cmd_rust.py b/tests/integration/buildcmd/test_build_cmd_rust.py
@@ -12,11 +12,7 @@
     RUNNING_ON_CI,
     CI_OVERRIDE,
 )
-from .build_integ_base import (
-    BuildIntegRustBase,
-    rust_parameterized_class,
-    show_container_in_test_name,
-)
+from tests.integration.buildcmd.build_integ_base import BuildIntegRustBase, rust_parameterized_class, show_container_in_test_name
 
 LOG = logging.getLogger(__name__)
 
diff --git a/tests/integration/local/invoke/test_integrations_do_cli.py b/tests/integration/local/invoke/test_integrations_do_cli.py
@@ -9,7 +9,7 @@
 import pytest
 
 from tests.integration.local.invoke.layer_utils import LayerUtils
-from .invoke_integ_base import InvokeIntegBase
+from tests.integration.local.invoke.invoke_integ_base import InvokeIntegBase
 from tests.testing_utils import IS_WINDOWS, RUNNING_ON_CI, RUNNING_TEST_FOR_MASTER_ON_CI, RUN_BY_CANARY
 
 from samcli.commands.local.invoke.cli import cli
diff --git a/tests/integration/local/start_api/test_start_api.py b/tests/integration/local/start_api/test_start_api.py
@@ -21,8 +21,8 @@
 from samcli.commands.local.cli_common.options import get_default_layer_cache_dir
 from samcli.local.apigw.route import Route
 from tests.testing_utils import IS_WINDOWS
-from .start_api_integ_base import StartApiIntegBaseClass, WritableStartApiIntegBaseClass
-from ..invoke.layer_utils import LayerUtils
+from tests.integration.local.start_api.start_api_integ_base import StartApiIntegBaseClass, WritableStartApiIntegBaseClass
+from tests.integration.local.invoke.layer_utils import LayerUtils
 
 
 @parameterized_class(
diff --git a/tests/integration/local/start_lambda/test_start_lambda.py b/tests/integration/local/start_lambda/test_start_lambda.py
@@ -16,7 +16,7 @@
 from samcli.commands.local.cli_common.invoke_context import ContainersInitializationMode
 from tests.testing_utils import IS_WINDOWS, get_sam_command, kill_process
 from tests.integration.local.common_utils import random_port, InvalidAddressException, wait_for_local_process
-from .start_lambda_api_integ_base import StartLambdaIntegBaseClass, WatchWarmContainersIntegBaseClass
+from tests.integration.local.start_lambda.start_lambda_api_integ_base import StartLambdaIntegBaseClass, WatchWarmContainersIntegBaseClass
 
 
 class TestParallelRequests(StartLambdaIntegBaseClass):
diff --git a/tests/integration/package/test_package_command_image.py b/tests/integration/package/test_package_command_image.py
@@ -12,7 +12,7 @@
 
 from samcli.commands._utils.template import get_template_data
 from samcli.local.docker.utils import get_validated_container_client
-from .package_integ_base import PackageIntegBase
+from tests.integration.package.package_integ_base import PackageIntegBase
 from tests.testing_utils import RUNNING_ON_CI, RUNNING_TEST_FOR_MASTER_ON_CI, RUN_BY_CANARY, MAX_ERROR_OUTPUT_LENGTH
 
 
diff --git a/tests/integration/package/test_package_command_zip.py b/tests/integration/package/test_package_command_zip.py
@@ -8,7 +8,7 @@
 from parameterized import parameterized, param
 
 from samcli.lib.utils.hash import dir_checksum
-from .package_integ_base import PackageIntegBase
+from tests.integration.package.package_integ_base import PackageIntegBase
 from tests.testing_utils import RUNNING_ON_CI, RUNNING_TEST_FOR_MASTER_ON_CI, RUN_BY_CANARY
 
 # Package tests require credentials and CI/CD will only add credentials to the env if the PR is from the same repo.
diff --git a/tests/integration/publish/test_command_integ.py b/tests/integration/publish/test_command_integ.py
@@ -9,7 +9,7 @@
 from parameterized import parameterized
 
 from samcli.commands.publish.command import SEMANTIC_VERSION
-from .publish_app_integ_base import PublishAppIntegBase
+from tests.integration.publish.publish_app_integ_base import PublishAppIntegBase
 from tests.testing_utils import RUNNING_ON_CI, RUNNING_TEST_FOR_MASTER_ON_CI, RUN_BY_CANARY
 from tests.testing_utils import run_command
 
diff --git a/tests/integration/telemetry/test_experimental_metric.py b/tests/integration/telemetry/test_experimental_metric.py
@@ -5,9 +5,9 @@
 from unittest import skip
 from unittest.mock import ANY
 
-from .integ_base import IntegBase, TelemetryServer
+from tests.integration.telemetry.integ_base import IntegBase, TelemetryServer
 from samcli import __version__ as SAM_CLI_VERSION
-from ...testing_utils import strip_nightly_installer_suffix
+from tests.testing_utils import strip_nightly_installer_suffix
 
 
 class TestExperimentalMetric(IntegBase):
diff --git a/tests/integration/telemetry/test_installed_metric.py b/tests/integration/telemetry/test_installed_metric.py
@@ -1,9 +1,9 @@
 import platform
 
 from unittest.mock import ANY
-from .integ_base import IntegBase, TelemetryServer, EXPECTED_TELEMETRY_PROMPT
+from tests.integration.telemetry.integ_base import IntegBase, TelemetryServer, EXPECTED_TELEMETRY_PROMPT
 from samcli import __version__ as SAM_CLI_VERSION
-from ...testing_utils import strip_nightly_installer_suffix
+from tests.testing_utils import strip_nightly_installer_suffix
 
 
 class TestSendInstalledMetric(IntegBase):
diff --git a/tests/integration/telemetry/test_prompt.py b/tests/integration/telemetry/test_prompt.py
@@ -1,5 +1,5 @@
 from parameterized import parameterized
-from .integ_base import IntegBase, EXPECTED_TELEMETRY_PROMPT
+from tests.integration.telemetry.integ_base import IntegBase, EXPECTED_TELEMETRY_PROMPT
 
 
 class TestTelemetryPrompt(IntegBase):
diff --git a/tests/integration/telemetry/test_telemetry_contract.py b/tests/integration/telemetry/test_telemetry_contract.py
@@ -1,4 +1,4 @@
-from .integ_base import IntegBase, TelemetryServer
+from tests.integration.telemetry.integ_base import IntegBase, TelemetryServer
 
 
 class TestTelemetryContract(IntegBase):
diff --git a/tests/regression/package/test_package_regression.py b/tests/regression/package/test_package_regression.py
