Updated

Author: dat-a-man

Makefile

@@ -1,36 +1,30 @@
-# some useful commands for developing
-
-
-update-rest-api:
-	poetry run python dlt_init_openapi/utils/update_rest_api.py
-
 dev:
 	poetry install --all-extras
 
 # lint
-lint: update-rest-api
+lint:
 	rm -rf tests/_local
 	poetry run flake8 dlt_init_openapi tests
 	poetry run mypy dlt_init_openapi tests
 	poetry run black tests dlt_init_openapi --check
 	poetry run isort --profile black tests dlt_init_openapi --check --diff
 
 # format the whole project
-format: update-rest-api
+format:
 	rm -rf tests/_local
 	poetry run isort --profile black tests dlt_init_openapi
 	poetry run black tests dlt_init_openapi
 
 # all tests excluding the checks on e2e tests
-test: update-rest-api
+test:
 	poetry run python dlt_init_openapi/utils/update_rest_api.py
 	poetry run pytest tests --ignore=tests/e2e
 
 # test without running all the specs through a source
-test-fast: update-rest-api
+test-fast:
 	poetry run pytest tests -m "not slow" --ignore=tests/e2e
 
-test-slow: update-rest-api
+test-slow:
 	poetry run pytest tests -m "slow" --ignore=tests/e2e
 
 # dev helpers

dlt_init_openapi/cli/__init__.py

@@ -10,7 +10,6 @@
 from dlt_init_openapi.cli.cli_endpoint_selection import questionary_endpoint_selection
 from dlt_init_openapi.config import Config
 from dlt_init_openapi.exceptions import DltOpenAPITerminalException
-from dlt_init_openapi.utils import update_rest_api
 
 app = typer.Typer(add_completion=False)
 
@@ -50,7 +49,6 @@ def init(
         "--allow-openapi-2",
         help="Allow to use OpenAPI v2. specs. Migration of the spec to 3.0 is recommended though.",
     ),
-    update_rest_api_source: bool = typer.Option(False, help="Update the locally cached rest_api verified source."),
     version: bool = typer.Option(False, "--version", callback=_print_version, help="Print the version and exit"),
 ) -> None:
     """Generate a new dlt pipeline"""
@@ -64,7 +62,6 @@ def init(
         interactive=interactive,
         log_level=log_level,
         global_limit=global_limit,
-        update_rest_api_source=update_rest_api_source,
         allow_openapi_2=allow_openapi_2,
     )
 
@@ -100,7 +97,6 @@ def _init_command_wrapped(
     try:
 
         # sync rest api
-        update_rest_api.update_rest_api(force=update_rest_api_source)
 
         config = _load_config(
             path=config_path,

dlt_init_openapi/config.py

@@ -11,12 +11,10 @@
 
 from .typing import TEndpointFilter
 
-# In dlt>=1.11.0, the rest_api is part of the main package
-# For backwards compatibility, we keep a stub directory
-REST_API_SOURCE_LOCATION = str(pathlib.Path(__file__).parent / "rest_api")
+
 
 # Placeholder for SecretsTomlConfig to resolve ImportError in tests
-SecretsTomlConfig = Dict[str, Any]
+# SecretsTomlConfig = Dict[str, Any]
 
 
 class Config(BaseModel):

dlt_init_openapi/renderer/default/__init__.py

@@ -8,7 +8,7 @@
 from jinja2 import Environment, PackageLoader
 from loguru import logger
 
-from dlt_init_openapi.config import REST_API_SOURCE_LOCATION, Config
+from dlt_init_openapi.config import Config
 from dlt_init_openapi.parser.openapi_parser import OpenapiParser
 from dlt_init_openapi.renderer.base_renderer import BaseRenderer
 from dlt_init_openapi.utils import misc
@@ -67,8 +67,6 @@ def run(self, openapi: OpenapiParser, dry: bool = False) -> None:
         self._build_meta_files()
         self._run_post_hooks()
 
-        # copy rest api source into project dir
-        shutil.copytree(REST_API_SOURCE_LOCATION, str(self.config.project_dir / "rest_api"))
 
     def _build_meta_files(self) -> None:
         requirements_template = self.env.get_template("requirements.txt.j2")

dlt_init_openapi/utils/update_rest_api.py

@@ -8,8 +8,7 @@
 from dlt.sources.rest_api.typing import ClientConfig, EndpointResource, RESTAPIConfig
 
 from dlt_init_openapi import Project, _get_project_for_url_or_path
-from dlt_init_openapi.config import REST_API_SOURCE_LOCATION, Config, SecretsTomlConfig
-from dlt_init_openapi.parser.context import OpenapiContext
+from dlt_init_openapi.config import Config
 from tests.cases import case_path
 
 LOCAL_DIR = "tests/_local/"
@@ -43,7 +42,6 @@ def get_source_or_dict_from_open_api(
     This function renders the source into a string and returns the extracted
     dict for further inspection
     """
-    shutil.copytree(REST_API_SOURCE_LOCATION, LOCAL_DIR + "rest_api", dirs_exist_ok=True)
 
     TOP = """
 # type: ignore
@@ -83,8 +81,6 @@ def get_source_or_dict_from_open_api(
     module = importlib.import_module(local.replace("/", "."))
     importlib.reload(module)
 
-    shutil.rmtree(LOCAL_DIR + "rest_api")
-
     return cast(DltSource, module.test_source())